From 91f8734233ddecbe345360be1aef0cfa2b4d63e3 Mon Sep 17 00:00:00 2001 From: WMJ Date: Sat, 13 May 2017 17:47:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=80=9A=E8=BF=87server?= =?UTF-8?q?=E7=9A=84models=E6=96=87=E4=BB=B6=E7=94=9F=E6=88=90=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Client/.idea/misc.xml | 2 +- .../timemanager/db/{dbAccess => }/DAO.java | 2 +- .../timemanager/db/Models/Affairs.java | 50 +++ .../timemanager/db/Models/Group.java | 51 +++ .../timemanager/db/Models/Group_User.java | 50 +++ .../timemanager/db/Models/HaveAffair.java | 48 +++ .../timemanager/db/Models/InGroup.java | 49 +++ .../timemanager/db/Models/School.java | 50 +++ .../db/Models/SingleAffairsTime.java | 47 +++ .../db/Models/SuccessiveAffairsTime.java | 47 +++ .../timemanager/db/Models/User.java | 52 ++- .../timemanager/db/dbAccess/UserDAO.java | 16 - .../db/dbHelper/Affairs_migration.java | 33 ++ .../db/dbHelper/Group_User_migration.java | 33 ++ .../db/dbHelper/Group_migration.java | 51 +-- .../db/dbHelper/HaveAffair_migration.java | 33 ++ .../db/dbHelper/InGroup_migration.java | 33 ++ .../db/dbHelper/School_migration.java | 14 +- .../dbHelper/SingleAffairsTime_migration.java | 33 ++ .../SuccessiveAffairsTime_migration.java | 33 ++ .../db/dbHelper/User_migration.java | 25 +- Client/migrate.py | 7 - MyModel/.idea/MyModel.iml | 11 + .../inspectionProfiles/profiles_settings.xml | 7 + MyModel/.idea/misc.xml | 4 + MyModel/.idea/modules.xml | 8 + MyModel/.idea/workspace.xml | 374 ++++++++++++++++++ .../Affair.java => MyModel/Affair123.java | 0 MyModel/Migrations/Affairs_migration.java | 33 ++ MyModel/Migrations/Group_User_migration.java | 33 ++ MyModel/Migrations/Group_migration.java | 33 ++ MyModel/Migrations/HaveAffair_migration.java | 33 ++ MyModel/Migrations/InGroup_migration.java | 33 ++ .../School(models.Model):\n_migration.java" | 0 MyModel/Migrations/School_migration.java | 33 ++ .../SingleAffairsTime_migration.java | 33 ++ .../SuccessiveAffairsTime_migration.java | 33 ++ .../User(models.Model):\n_migration.java" | 0 MyModel/Migrations/User_migration.java | 33 ++ MyModel/Models/Affairs.java | 43 ++ MyModel/Models/Group.java | 43 ++ MyModel/Models/Group_User.java | 43 ++ MyModel/Models/HaveAffair.java | 43 ++ MyModel/Models/InGroup.java | 43 ++ MyModel/Models/School.java | 43 ++ MyModel/Models/SingleAffairsTime.java | 43 ++ MyModel/Models/SuccessiveAffairsTime.java | 43 ++ MyModel/Models/User.java | 43 ++ MyModel/migrate.py | 136 +++++++ MyModel/migrationTemplate.txt | 33 ++ MyModel/modelTemplate.txt | 44 +++ MyModel/models.txt | 83 ++++ Server/.idea/workspace.xml | 205 +++------- .../dbHelperbk}/Affair_migration.java | 0 Server/dbHelperbk/Group_migration.java | 44 +++ .../dbHelperbk}/Group_user_migration.java | 0 .../dbHelperbk}/Have_Affair_migration.java | 0 .../dbHelperbk}/In_Group_migration.java | 2 +- Server/dbHelperbk/School_migration.java | 39 ++ .../Single_Affairs_Time_migration.java | 0 .../Successive_Affairs_Time_migration.java | 0 Server/dbHelperbk/User_migration.java | 50 +++ 62 files changed, 2245 insertions(+), 238 deletions(-) rename Client/app/src/main/java/wesayallright/timemanager/db/{dbAccess => }/DAO.java (99%) create mode 100644 Client/app/src/main/java/wesayallright/timemanager/db/Models/Affairs.java create mode 100644 Client/app/src/main/java/wesayallright/timemanager/db/Models/Group.java create mode 100644 Client/app/src/main/java/wesayallright/timemanager/db/Models/Group_User.java create mode 100644 Client/app/src/main/java/wesayallright/timemanager/db/Models/HaveAffair.java create mode 100644 Client/app/src/main/java/wesayallright/timemanager/db/Models/InGroup.java create mode 100644 Client/app/src/main/java/wesayallright/timemanager/db/Models/School.java create mode 100644 Client/app/src/main/java/wesayallright/timemanager/db/Models/SingleAffairsTime.java create mode 100644 Client/app/src/main/java/wesayallright/timemanager/db/Models/SuccessiveAffairsTime.java delete mode 100644 Client/app/src/main/java/wesayallright/timemanager/db/dbAccess/UserDAO.java create mode 100644 Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Affairs_migration.java create mode 100644 Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Group_User_migration.java create mode 100644 Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/HaveAffair_migration.java create mode 100644 Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/InGroup_migration.java create mode 100644 Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/SingleAffairsTime_migration.java create mode 100644 Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/SuccessiveAffairsTime_migration.java delete mode 100644 Client/migrate.py create mode 100644 MyModel/.idea/MyModel.iml create mode 100644 MyModel/.idea/inspectionProfiles/profiles_settings.xml create mode 100644 MyModel/.idea/misc.xml create mode 100644 MyModel/.idea/modules.xml create mode 100644 MyModel/.idea/workspace.xml rename Client/app/src/main/java/wesayallright/timemanager/db/Models/Affair.java => MyModel/Affair123.java (100%) create mode 100644 MyModel/Migrations/Affairs_migration.java create mode 100644 MyModel/Migrations/Group_User_migration.java create mode 100644 MyModel/Migrations/Group_migration.java create mode 100644 MyModel/Migrations/HaveAffair_migration.java create mode 100644 MyModel/Migrations/InGroup_migration.java create mode 100644 "MyModel/Migrations/School(models.Model):\n_migration.java" create mode 100644 MyModel/Migrations/School_migration.java create mode 100644 MyModel/Migrations/SingleAffairsTime_migration.java create mode 100644 MyModel/Migrations/SuccessiveAffairsTime_migration.java create mode 100644 "MyModel/Migrations/User(models.Model):\n_migration.java" create mode 100644 MyModel/Migrations/User_migration.java create mode 100644 MyModel/Models/Affairs.java create mode 100644 MyModel/Models/Group.java create mode 100644 MyModel/Models/Group_User.java create mode 100644 MyModel/Models/HaveAffair.java create mode 100644 MyModel/Models/InGroup.java create mode 100644 MyModel/Models/School.java create mode 100644 MyModel/Models/SingleAffairsTime.java create mode 100644 MyModel/Models/SuccessiveAffairsTime.java create mode 100644 MyModel/Models/User.java create mode 100644 MyModel/migrate.py create mode 100644 MyModel/migrationTemplate.txt create mode 100644 MyModel/modelTemplate.txt create mode 100644 MyModel/models.txt rename {Client/app/src/main/java/wesayallright/timemanager/db/dbHelper => Server/dbHelperbk}/Affair_migration.java (100%) create mode 100644 Server/dbHelperbk/Group_migration.java rename {Client/app/src/main/java/wesayallright/timemanager/db/dbHelper => Server/dbHelperbk}/Group_user_migration.java (100%) rename {Client/app/src/main/java/wesayallright/timemanager/db/dbHelper => Server/dbHelperbk}/Have_Affair_migration.java (100%) rename {Client/app/src/main/java/wesayallright/timemanager/db/dbHelper => Server/dbHelperbk}/In_Group_migration.java (94%) create mode 100644 Server/dbHelperbk/School_migration.java rename {Client/app/src/main/java/wesayallright/timemanager/db/dbHelper => Server/dbHelperbk}/Single_Affairs_Time_migration.java (100%) rename {Client/app/src/main/java/wesayallright/timemanager/db/dbHelper => Server/dbHelperbk}/Successive_Affairs_Time_migration.java (100%) create mode 100644 Server/dbHelperbk/User_migration.java diff --git a/Client/.idea/misc.xml b/Client/.idea/misc.xml index 0207dec..3ed251c 100644 --- a/Client/.idea/misc.xml +++ b/Client/.idea/misc.xml @@ -27,7 +27,7 @@ - + diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbAccess/DAO.java b/Client/app/src/main/java/wesayallright/timemanager/db/DAO.java similarity index 99% rename from Client/app/src/main/java/wesayallright/timemanager/db/dbAccess/DAO.java rename to Client/app/src/main/java/wesayallright/timemanager/db/DAO.java index 8e7c3b5..bcf400e 100644 --- a/Client/app/src/main/java/wesayallright/timemanager/db/dbAccess/DAO.java +++ b/Client/app/src/main/java/wesayallright/timemanager/db/DAO.java @@ -1,4 +1,4 @@ -package wesayallright.timemanager.db.dbAccess; +package wesayallright.timemanager.db; import android.annotation.TargetApi; import android.content.Context; diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/Models/Affairs.java b/Client/app/src/main/java/wesayallright/timemanager/db/Models/Affairs.java new file mode 100644 index 0000000..45b1481 --- /dev/null +++ b/Client/app/src/main/java/wesayallright/timemanager/db/Models/Affairs.java @@ -0,0 +1,50 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import java.util.Date; + +import wesayallright.timemanager.db.DAO; +import wesayallright.timemanager.db.dbHelper.Affairs_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:46:14 + * + */ + +public class Affairs extends DAO { + private SQLiteDatabase db; + private Affairs_migration helper; + + public String name; + public String place; + public String details; + public User organizer_index; + + public Integer id; + + + + public Affairs(Context c) { + super(c, Affairs_migration.class, Affairs_migration.TABLE_NAME); + helper = new Affairs_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/Models/Group.java b/Client/app/src/main/java/wesayallright/timemanager/db/Models/Group.java new file mode 100644 index 0000000..7a837e6 --- /dev/null +++ b/Client/app/src/main/java/wesayallright/timemanager/db/Models/Group.java @@ -0,0 +1,51 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import java.util.Date; + +import wesayallright.timemanager.db.DAO; +import wesayallright.timemanager.db.dbHelper.Group_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:46:14 + * + */ + +public class Group extends DAO { + private SQLiteDatabase db; + private Group_migration helper; + + public String group_id; + public String name; + public String introduction; + public Date establish_date; + public Date update_date; + + public Integer id; + + + + public Group(Context c) { + super(c, Group_migration.class, Group_migration.TABLE_NAME); + helper = new Group_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/Models/Group_User.java b/Client/app/src/main/java/wesayallright/timemanager/db/Models/Group_User.java new file mode 100644 index 0000000..732a8d5 --- /dev/null +++ b/Client/app/src/main/java/wesayallright/timemanager/db/Models/Group_User.java @@ -0,0 +1,50 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import java.util.Date; + +import wesayallright.timemanager.db.DAO; +import wesayallright.timemanager.db.dbHelper.Group_User_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:46:14 + * + */ + +public class Group_User extends DAO { + private SQLiteDatabase db; + private Group_User_migration helper; + + public Group group_index; + public User user_index; + public Boolean visible; + public Date update_time; + + public Integer id; + + + + public Group_User(Context c) { + super(c, Group_User_migration.class, Group_User_migration.TABLE_NAME); + helper = new Group_User_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/Models/HaveAffair.java b/Client/app/src/main/java/wesayallright/timemanager/db/Models/HaveAffair.java new file mode 100644 index 0000000..046296a --- /dev/null +++ b/Client/app/src/main/java/wesayallright/timemanager/db/Models/HaveAffair.java @@ -0,0 +1,48 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import java.util.Date; + +import wesayallright.timemanager.db.DAO; +import wesayallright.timemanager.db.dbHelper.HaveAffair_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:46:14 + * + */ + +public class HaveAffair extends DAO { + private SQLiteDatabase db; + private HaveAffair_migration helper; + + public User user_index; + public Affairs affair_index; + + public Integer id; + + + + public HaveAffair(Context c) { + super(c, HaveAffair_migration.class, HaveAffair_migration.TABLE_NAME); + helper = new HaveAffair_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/Models/InGroup.java b/Client/app/src/main/java/wesayallright/timemanager/db/Models/InGroup.java new file mode 100644 index 0000000..1c0c086 --- /dev/null +++ b/Client/app/src/main/java/wesayallright/timemanager/db/Models/InGroup.java @@ -0,0 +1,49 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import java.util.Date; + +import wesayallright.timemanager.db.DAO; +import wesayallright.timemanager.db.dbHelper.InGroup_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:46:14 + * + */ + +public class InGroup extends DAO { + private SQLiteDatabase db; + private InGroup_migration helper; + + public User user_index; + public Group group_index; + public Group_User role_index; + + public Integer id; + + + + public InGroup(Context c) { + super(c, InGroup_migration.class, InGroup_migration.TABLE_NAME); + helper = new InGroup_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/Models/School.java b/Client/app/src/main/java/wesayallright/timemanager/db/Models/School.java new file mode 100644 index 0000000..83db542 --- /dev/null +++ b/Client/app/src/main/java/wesayallright/timemanager/db/Models/School.java @@ -0,0 +1,50 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import java.util.Date; + +import wesayallright.timemanager.db.DAO; +import wesayallright.timemanager.db.dbHelper.School_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:46:14 + * + */ + +public class School extends DAO { + private SQLiteDatabase db; + private School_migration helper; + + public String school_id; + public String name; + public String province; + public String city; + + public Integer id; + + + + public School(Context c) { + super(c, School_migration.class, School_migration.TABLE_NAME); + helper = new School_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/Models/SingleAffairsTime.java b/Client/app/src/main/java/wesayallright/timemanager/db/Models/SingleAffairsTime.java new file mode 100644 index 0000000..3195099 --- /dev/null +++ b/Client/app/src/main/java/wesayallright/timemanager/db/Models/SingleAffairsTime.java @@ -0,0 +1,47 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import java.util.Date; + +import wesayallright.timemanager.db.DAO; +import wesayallright.timemanager.db.dbHelper.SingleAffairsTime_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:46:14 + * + */ + +public class SingleAffairsTime extends DAO { + private SQLiteDatabase db; + private SingleAffairsTime_migration helper; + + public Affairs affair_index; + + public Integer id; + + + + public SingleAffairsTime(Context c) { + super(c, SingleAffairsTime_migration.class, SingleAffairsTime_migration.TABLE_NAME); + helper = new SingleAffairsTime_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/Models/SuccessiveAffairsTime.java b/Client/app/src/main/java/wesayallright/timemanager/db/Models/SuccessiveAffairsTime.java new file mode 100644 index 0000000..4590144 --- /dev/null +++ b/Client/app/src/main/java/wesayallright/timemanager/db/Models/SuccessiveAffairsTime.java @@ -0,0 +1,47 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import java.util.Date; + +import wesayallright.timemanager.db.DAO; +import wesayallright.timemanager.db.dbHelper.SuccessiveAffairsTime_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:46:14 + * + */ + +public class SuccessiveAffairsTime extends DAO { + private SQLiteDatabase db; + private SuccessiveAffairsTime_migration helper; + + public Affairs affair_index; + + public Integer id; + + + + public SuccessiveAffairsTime(Context c) { + super(c, SuccessiveAffairsTime_migration.class, SuccessiveAffairsTime_migration.TABLE_NAME); + helper = new SuccessiveAffairsTime_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/Models/User.java b/Client/app/src/main/java/wesayallright/timemanager/db/Models/User.java index 1dffb05..67d8ee1 100644 --- a/Client/app/src/main/java/wesayallright/timemanager/db/Models/User.java +++ b/Client/app/src/main/java/wesayallright/timemanager/db/Models/User.java @@ -1,9 +1,55 @@ + package wesayallright.timemanager.db.Models; +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import java.util.Date; + +import wesayallright.timemanager.db.DAO; +import wesayallright.timemanager.db.dbHelper.User_migration; + /** - * Created by mj on 17-5-11. + * MyModel 自动生成 at: 2017-05-13 17:46:14 + * */ -public class User { - public int id; +public class User extends DAO { + private SQLiteDatabase db; + private User_migration helper; + + public String user_id; + public String password; + public String stu_id; + public String nickname; + public String realname; + public Date birthday; + public String mobile; + public String email; + public Date updatetime; + + public Integer id; + + + + public User(Context c) { + super(c, User_migration.class, User_migration.TABLE_NAME); + helper = new User_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } } diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbAccess/UserDAO.java b/Client/app/src/main/java/wesayallright/timemanager/db/dbAccess/UserDAO.java deleted file mode 100644 index 0d78b34..0000000 --- a/Client/app/src/main/java/wesayallright/timemanager/db/dbAccess/UserDAO.java +++ /dev/null @@ -1,16 +0,0 @@ -package wesayallright.timemanager.db.dbAccess; - -import wesayallright.timemanager.db.Models.User; - -/** - * Created by mj on 17-5-12. - * User Data Access Object - */ - -public class UserDAO { - - public User[] where(String key, String operator, String value) { - return new User[1]; - } - -} diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Affairs_migration.java b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Affairs_migration.java new file mode 100644 index 0000000..fa44dbe --- /dev/null +++ b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Affairs_migration.java @@ -0,0 +1,33 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * MyModel 自动生成 at: 2017-05-13 17:46:14 + */ + +public class Affairs_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "Affairs"; + public Affairs_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = " CREATE TABLE IF NOT EXISTS Affairs (name vchar(20) NOT NULL ,place vchar(30) NOT NULL ,details vchar(100) NOT NULL ,organizer_index_id integer NOT NULL REFERENCE User ,id INTEGER NOT NULL PRIMER KEY)"; + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} + diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Group_User_migration.java b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Group_User_migration.java new file mode 100644 index 0000000..f4515a3 --- /dev/null +++ b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Group_User_migration.java @@ -0,0 +1,33 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * MyModel 自动生成 at: 2017-05-13 17:46:14 + */ + +public class Group_User_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "Group_User"; + public Group_User_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = " CREATE TABLE IF NOT EXISTS Group_User (group_index_id integer NOT NULL REFERENCE Group ,user_index_id integer NOT NULL REFERENCE User ,visible bool NOT NULL ,update_time datetime NOT NULL ,id INTEGER NOT NULL PRIMER KEY)"; + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} + diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Group_migration.java b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Group_migration.java index 237c7ec..f49562b 100644 --- a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Group_migration.java +++ b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Group_migration.java @@ -3,42 +3,31 @@ package wesayallright.timemanager.db.dbHelper; import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; - import wesayallright.timemanager.InnerLayer.Package; /** - * Created by mj on 17-5-11. - * 群组列表 + * MyModel 自动生成 at: 2017-05-13 17:46:14 */ -public class Group_migration extends SQLiteOpenHelper{ +public class Group_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "Group"; + public Group_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } - private static final int DB_VERSION = 1; - public static final String TABLE_NAME = "groups"; - public Group_migration(Context context) { - super(context, Package.DB_NAME, null, DB_VERSION); - } - - @Override - public void onCreate(SQLiteDatabase db) { - String sql = "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + - "(\"id\" integer NOT NULL PRIMARY KEY, " + - "\"name\" varchar(50) NOT NULL, " + - "\"introduction\" varchar(100) NOT NULL, " + - "\"establish_date\" date NOT NULL, " + - "\"update_date\" date NOT NULL, " + - "\"is_public\" bool NOT NULL, " + - "\"max_member\" smallint unsigned NOT NULL, " + - "\"group_id\" varchar(10) NOT NULL)"; - - db.execSQL(sql); - } - - @Override - public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; - db.execSQL(sql); - onCreate(db); - } + @Override + public void onCreate(SQLiteDatabase db) { + String sql = " CREATE TABLE IF NOT EXISTS Group (group_id vchar(10) NOT NULL ,name vchar(50) NOT NULL ,introduction vchar(100) NOT NULL ,establish_date date NOT NULL ,update_date date NOT NULL ,id INTEGER NOT NULL PRIMER KEY)"; + db.execSQL(sql); + } + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } } + diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/HaveAffair_migration.java b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/HaveAffair_migration.java new file mode 100644 index 0000000..2447a00 --- /dev/null +++ b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/HaveAffair_migration.java @@ -0,0 +1,33 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * MyModel 自动生成 at: 2017-05-13 17:46:14 + */ + +public class HaveAffair_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "HaveAffair"; + public HaveAffair_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = " CREATE TABLE IF NOT EXISTS HaveAffair (user_index_id integer NOT NULL REFERENCE User ,affair_index_id integer NOT NULL REFERENCE Affairs ,id INTEGER NOT NULL PRIMER KEY)"; + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} + diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/InGroup_migration.java b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/InGroup_migration.java new file mode 100644 index 0000000..a0dbd76 --- /dev/null +++ b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/InGroup_migration.java @@ -0,0 +1,33 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * MyModel 自动生成 at: 2017-05-13 17:46:14 + */ + +public class InGroup_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "InGroup"; + public InGroup_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = " CREATE TABLE IF NOT EXISTS InGroup (user_index_id integer NOT NULL REFERENCE User ,group_index_id integer NOT NULL REFERENCE Group ,role_index_id integer NOT NULL REFERENCE Group_User ,id INTEGER NOT NULL PRIMER KEY)"; + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} + diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/School_migration.java b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/School_migration.java index 3d33e75..79e67d2 100644 --- a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/School_migration.java +++ b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/School_migration.java @@ -6,27 +6,20 @@ import android.database.sqlite.SQLiteOpenHelper; import wesayallright.timemanager.InnerLayer.Package; /** - * Created by mj on 17-5-11. - * 学校表 + * MyModel 自动生成 at: 2017-05-13 17:46:14 */ public class School_migration extends SQLiteOpenHelper { private static final int DB_VERSION = 1; - public static final String TABLE_NAME = "schools"; + public static final String TABLE_NAME = "School"; public School_migration(Context context) { super(context, Package.DB_NAME, null, DB_VERSION); } @Override public void onCreate(SQLiteDatabase db) { - String sql = "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + - "(\"id\" integer NOT NULL PRIMARY KEY , " + - "\"name\" varchar(30) NOT NULL, " + - "\"province\" varchar(20) NOT NULL, " + - "\"city\" varchar(30) NOT NULL, " + - "\"school_id\" varchar(10) NOT NULL)"; - + String sql = " CREATE TABLE IF NOT EXISTS School (school_id vchar(10) NOT NULL ,name vchar(30) NOT NULL ,province vchar(20) NOT NULL ,city vchar(30) NOT NULL ,id INTEGER NOT NULL PRIMER KEY)"; db.execSQL(sql); } @@ -37,3 +30,4 @@ public class School_migration extends SQLiteOpenHelper onCreate(db); } } + diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/SingleAffairsTime_migration.java b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/SingleAffairsTime_migration.java new file mode 100644 index 0000000..ca9b644 --- /dev/null +++ b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/SingleAffairsTime_migration.java @@ -0,0 +1,33 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * MyModel 自动生成 at: 2017-05-13 17:46:14 + */ + +public class SingleAffairsTime_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "SingleAffairsTime"; + public SingleAffairsTime_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = " CREATE TABLE IF NOT EXISTS SingleAffairsTime (affair_index_id integer NOT NULL REFERENCE Affairs ,id INTEGER NOT NULL PRIMER KEY)"; + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} + diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/SuccessiveAffairsTime_migration.java b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/SuccessiveAffairsTime_migration.java new file mode 100644 index 0000000..c60cc47 --- /dev/null +++ b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/SuccessiveAffairsTime_migration.java @@ -0,0 +1,33 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * MyModel 自动生成 at: 2017-05-13 17:46:14 + */ + +public class SuccessiveAffairsTime_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "SuccessiveAffairsTime"; + public SuccessiveAffairsTime_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = " CREATE TABLE IF NOT EXISTS SuccessiveAffairsTime (affair_index_id integer NOT NULL REFERENCE Affairs ,id INTEGER NOT NULL PRIMER KEY)"; + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} + diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/User_migration.java b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/User_migration.java index 2d2b955..e233a81 100644 --- a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/User_migration.java +++ b/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/User_migration.java @@ -6,38 +6,20 @@ import android.database.sqlite.SQLiteOpenHelper; import wesayallright.timemanager.InnerLayer.Package; /** - * Created by mj on 17-5-11. - * 用户表 + * MyModel 自动生成 at: 2017-05-13 17:46:14 */ public class User_migration extends SQLiteOpenHelper { private static final int DB_VERSION = 1; - public static final String TABLE_NAME = "users"; + public static final String TABLE_NAME = "User"; public User_migration(Context context) { super(context, Package.DB_NAME, null, DB_VERSION); } @Override public void onCreate(SQLiteDatabase db) { - String sql = "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + - "(\"id\" integer NOT NULL PRIMARY KEY , " + - "\"password\" varchar(64) NOT NULL, " + - "\"stu_id\" varchar(20) NOT NULL, " + - "\"nickname\" varchar(15) NOT NULL, " + - "\"realname\" varchar(10) NULL, " + - "\"gender\" smallint NOT NULL, " + - "\"birthday\" date NULL, " + - "\"mobile\" varchar(21) NOT NULL, " + - "\"email\" varchar(254) NULL, " + - "\"updatetime\" date NOT NULL, " + - "\"major\" varchar(30) NOT NULL, " + - "\"entry_date\" date NOT NULL, " + - "\"school_index_id\" integer NOT NULL REFERENCES \""+ School_migration.TABLE_NAME+"\" (\"id\"), " + - "\"user_id\" varchar(10) NOT NULL)"; - - - + String sql = " CREATE TABLE IF NOT EXISTS User (user_id vchar(10) NOT NULL ,password vchar(64) NOT NULL ,stu_id vchar(20) NOT NULL ,nickname vchar(15) NOT NULL ,realname vchar(10) NOT NULL ,birthday date NOT NULL ,mobile vchar(21) NOT NULL ,email vchar NOT NULL ,updatetime date NOT NULL ,id INTEGER NOT NULL PRIMER KEY)"; db.execSQL(sql); } @@ -48,3 +30,4 @@ public class User_migration extends SQLiteOpenHelper onCreate(db); } } + diff --git a/Client/migrate.py b/Client/migrate.py deleted file mode 100644 index 049e308..0000000 --- a/Client/migrate.py +++ /dev/null @@ -1,7 +0,0 @@ -import os - -os.chdir('app/src/main/java/wesayallright/timemanager/db/dbHelper/') - -files = os.walk(os.getcwd()) -for root, dirs, file in files: - f = open(file, 'r') \ No newline at end of file diff --git a/MyModel/.idea/MyModel.iml b/MyModel/.idea/MyModel.iml new file mode 100644 index 0000000..6711606 --- /dev/null +++ b/MyModel/.idea/MyModel.iml @@ -0,0 +1,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/MyModel/.idea/inspectionProfiles/profiles_settings.xml b/MyModel/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..c23ecac --- /dev/null +++ b/MyModel/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/MyModel/.idea/misc.xml b/MyModel/.idea/misc.xml new file mode 100644 index 0000000..0c153f3 --- /dev/null +++ b/MyModel/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/MyModel/.idea/modules.xml b/MyModel/.idea/modules.xml new file mode 100644 index 0000000..6e47f45 --- /dev/null +++ b/MyModel/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/MyModel/.idea/workspace.xml b/MyModel/.idea/workspace.xml new file mode 100644 index 0000000..d116429 --- /dev/null +++ b/MyModel/.idea/workspace.xml @@ -0,0 +1,374 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + ", + ' " + content + + + ' + ':' + content_model + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1494657794216 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/Models/Affair.java b/MyModel/Affair123.java similarity index 100% rename from Client/app/src/main/java/wesayallright/timemanager/db/Models/Affair.java rename to MyModel/Affair123.java diff --git a/MyModel/Migrations/Affairs_migration.java b/MyModel/Migrations/Affairs_migration.java new file mode 100644 index 0000000..1b3862e --- /dev/null +++ b/MyModel/Migrations/Affairs_migration.java @@ -0,0 +1,33 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + */ + +public class Affairs_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "Affairs"; + public Affair_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = " CREATE TABLE IF NOT EXISTS Affairs (name vchar(20) NOT NULL ,place vchar(30) NOT NULL ,details vchar(100) NOT NULL ,organizer_index_id integer NOT NULL REFERENCE User ,id INTEGER NOT NULL PRIMER KEY)"; + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} + diff --git a/MyModel/Migrations/Group_User_migration.java b/MyModel/Migrations/Group_User_migration.java new file mode 100644 index 0000000..5021ca7 --- /dev/null +++ b/MyModel/Migrations/Group_User_migration.java @@ -0,0 +1,33 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + */ + +public class Group_User_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "Group_User"; + public Affair_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = " CREATE TABLE IF NOT EXISTS Group_User (group_index_id integer NOT NULL REFERENCE Group ,user_index_id integer NOT NULL REFERENCE User ,visible bool NOT NULL ,update_time datetime NOT NULL ,id INTEGER NOT NULL PRIMER KEY)"; + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} + diff --git a/MyModel/Migrations/Group_migration.java b/MyModel/Migrations/Group_migration.java new file mode 100644 index 0000000..e4df8fb --- /dev/null +++ b/MyModel/Migrations/Group_migration.java @@ -0,0 +1,33 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + */ + +public class Group_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "Group"; + public Affair_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = " CREATE TABLE IF NOT EXISTS Group (group_id vchar(10) NOT NULL ,name vchar(50) NOT NULL ,introduction vchar(100) NOT NULL ,establish_date date NOT NULL ,update_date date NOT NULL ,id INTEGER NOT NULL PRIMER KEY)"; + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} + diff --git a/MyModel/Migrations/HaveAffair_migration.java b/MyModel/Migrations/HaveAffair_migration.java new file mode 100644 index 0000000..ae90692 --- /dev/null +++ b/MyModel/Migrations/HaveAffair_migration.java @@ -0,0 +1,33 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + */ + +public class HaveAffair_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "HaveAffair"; + public Affair_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = " CREATE TABLE IF NOT EXISTS HaveAffair (user_index_id integer NOT NULL REFERENCE User ,affair_index_id integer NOT NULL REFERENCE Affairs ,id INTEGER NOT NULL PRIMER KEY)"; + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} + diff --git a/MyModel/Migrations/InGroup_migration.java b/MyModel/Migrations/InGroup_migration.java new file mode 100644 index 0000000..3cbfb99 --- /dev/null +++ b/MyModel/Migrations/InGroup_migration.java @@ -0,0 +1,33 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + */ + +public class InGroup_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "InGroup"; + public Affair_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = " CREATE TABLE IF NOT EXISTS InGroup (user_index_id integer NOT NULL REFERENCE User ,group_index_id integer NOT NULL REFERENCE Group ,role_index_id integer NOT NULL REFERENCE Group_User ,id INTEGER NOT NULL PRIMER KEY)"; + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} + diff --git "a/MyModel/Migrations/School(models.Model):\n_migration.java" "b/MyModel/Migrations/School(models.Model):\n_migration.java" new file mode 100644 index 0000000..e69de29 diff --git a/MyModel/Migrations/School_migration.java b/MyModel/Migrations/School_migration.java new file mode 100644 index 0000000..9236e66 --- /dev/null +++ b/MyModel/Migrations/School_migration.java @@ -0,0 +1,33 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + */ + +public class School_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "School"; + public Affair_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = " CREATE TABLE IF NOT EXISTS School (school_id vchar(10) NOT NULL ,name vchar(30) NOT NULL ,province vchar(20) NOT NULL ,city vchar(30) NOT NULL ,id INTEGER NOT NULL PRIMER KEY)"; + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} + diff --git a/MyModel/Migrations/SingleAffairsTime_migration.java b/MyModel/Migrations/SingleAffairsTime_migration.java new file mode 100644 index 0000000..d7a7794 --- /dev/null +++ b/MyModel/Migrations/SingleAffairsTime_migration.java @@ -0,0 +1,33 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + */ + +public class SingleAffairsTime_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "SingleAffairsTime"; + public Affair_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = " CREATE TABLE IF NOT EXISTS SingleAffairsTime (affair_index_id integer NOT NULL REFERENCE Affairs ,id INTEGER NOT NULL PRIMER KEY)"; + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} + diff --git a/MyModel/Migrations/SuccessiveAffairsTime_migration.java b/MyModel/Migrations/SuccessiveAffairsTime_migration.java new file mode 100644 index 0000000..81fb38b --- /dev/null +++ b/MyModel/Migrations/SuccessiveAffairsTime_migration.java @@ -0,0 +1,33 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + */ + +public class SuccessiveAffairsTime_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "SuccessiveAffairsTime"; + public Affair_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = " CREATE TABLE IF NOT EXISTS SuccessiveAffairsTime (affair_index_id integer NOT NULL REFERENCE Affairs ,id INTEGER NOT NULL PRIMER KEY)"; + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} + diff --git "a/MyModel/Migrations/User(models.Model):\n_migration.java" "b/MyModel/Migrations/User(models.Model):\n_migration.java" new file mode 100644 index 0000000..e69de29 diff --git a/MyModel/Migrations/User_migration.java b/MyModel/Migrations/User_migration.java new file mode 100644 index 0000000..a3522d2 --- /dev/null +++ b/MyModel/Migrations/User_migration.java @@ -0,0 +1,33 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + */ + +public class User_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "User"; + public Affair_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = " CREATE TABLE IF NOT EXISTS User (user_id vchar(10) NOT NULL ,password vchar(64) NOT NULL ,stu_id vchar(20) NOT NULL ,nickname vchar(15) NOT NULL ,realname vchar(10) NOT NULL ,birthday date NOT NULL ,mobile vchar(21) NOT NULL ,email vchar NOT NULL ,updatetime date NOT NULL ,id INTEGER NOT NULL PRIMER KEY)"; + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} + diff --git a/MyModel/Models/Affairs.java b/MyModel/Models/Affairs.java new file mode 100644 index 0000000..4d24985 --- /dev/null +++ b/MyModel/Models/Affairs.java @@ -0,0 +1,43 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; + +import wesayallright.timemanager.db.dbAccess.DAO; +import wesayallright.timemanager.db.dbHelper.Affairs_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + * + */ + +public class Affairs extends DAO { + private SQLiteDatabase db; + private Affair_migration helper; + + CREATE TABLE IF NOT EXISTS Affairs (name vchar(20) NOT NULL ,place vchar(30) NOT NULL ,details vchar(100) NOT NULL ,organizer_index_id integer NOT NULL REFERENCE User ,id INTEGER NOT NULL PRIMER KEY) + + + public Affairs(Context c) { + super(c, Affairs_migration.class, Affairs_migration.TABLE_NAME); + helper = new Affairs_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/MyModel/Models/Group.java b/MyModel/Models/Group.java new file mode 100644 index 0000000..9b419a2 --- /dev/null +++ b/MyModel/Models/Group.java @@ -0,0 +1,43 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; + +import wesayallright.timemanager.db.dbAccess.DAO; +import wesayallright.timemanager.db.dbHelper.Group_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + * + */ + +public class Group extends DAO { + private SQLiteDatabase db; + private Affair_migration helper; + + CREATE TABLE IF NOT EXISTS Group (group_id vchar(10) NOT NULL ,name vchar(50) NOT NULL ,introduction vchar(100) NOT NULL ,establish_date date NOT NULL ,update_date date NOT NULL ,id INTEGER NOT NULL PRIMER KEY) + + + public Group(Context c) { + super(c, Group_migration.class, Group_migration.TABLE_NAME); + helper = new Group_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/MyModel/Models/Group_User.java b/MyModel/Models/Group_User.java new file mode 100644 index 0000000..b2f388c --- /dev/null +++ b/MyModel/Models/Group_User.java @@ -0,0 +1,43 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; + +import wesayallright.timemanager.db.dbAccess.DAO; +import wesayallright.timemanager.db.dbHelper.Group_User_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + * + */ + +public class Group_User extends DAO { + private SQLiteDatabase db; + private Affair_migration helper; + + CREATE TABLE IF NOT EXISTS Group_User (group_index_id integer NOT NULL REFERENCE Group ,user_index_id integer NOT NULL REFERENCE User ,visible bool NOT NULL ,update_time datetime NOT NULL ,id INTEGER NOT NULL PRIMER KEY) + + + public Group_User(Context c) { + super(c, Group_User_migration.class, Group_User_migration.TABLE_NAME); + helper = new Group_User_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/MyModel/Models/HaveAffair.java b/MyModel/Models/HaveAffair.java new file mode 100644 index 0000000..3b46bf3 --- /dev/null +++ b/MyModel/Models/HaveAffair.java @@ -0,0 +1,43 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; + +import wesayallright.timemanager.db.dbAccess.DAO; +import wesayallright.timemanager.db.dbHelper.HaveAffair_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + * + */ + +public class HaveAffair extends DAO { + private SQLiteDatabase db; + private Affair_migration helper; + + CREATE TABLE IF NOT EXISTS HaveAffair (user_index_id integer NOT NULL REFERENCE User ,affair_index_id integer NOT NULL REFERENCE Affairs ,id INTEGER NOT NULL PRIMER KEY) + + + public HaveAffair(Context c) { + super(c, HaveAffair_migration.class, HaveAffair_migration.TABLE_NAME); + helper = new HaveAffair_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/MyModel/Models/InGroup.java b/MyModel/Models/InGroup.java new file mode 100644 index 0000000..3832938 --- /dev/null +++ b/MyModel/Models/InGroup.java @@ -0,0 +1,43 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; + +import wesayallright.timemanager.db.dbAccess.DAO; +import wesayallright.timemanager.db.dbHelper.InGroup_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + * + */ + +public class InGroup extends DAO { + private SQLiteDatabase db; + private Affair_migration helper; + + CREATE TABLE IF NOT EXISTS InGroup (user_index_id integer NOT NULL REFERENCE User ,group_index_id integer NOT NULL REFERENCE Group ,role_index_id integer NOT NULL REFERENCE Group_User ,id INTEGER NOT NULL PRIMER KEY) + + + public InGroup(Context c) { + super(c, InGroup_migration.class, InGroup_migration.TABLE_NAME); + helper = new InGroup_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/MyModel/Models/School.java b/MyModel/Models/School.java new file mode 100644 index 0000000..bdefeff --- /dev/null +++ b/MyModel/Models/School.java @@ -0,0 +1,43 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; + +import wesayallright.timemanager.db.dbAccess.DAO; +import wesayallright.timemanager.db.dbHelper.School_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + * + */ + +public class School extends DAO { + private SQLiteDatabase db; + private Affair_migration helper; + + CREATE TABLE IF NOT EXISTS School (school_id vchar(10) NOT NULL ,name vchar(30) NOT NULL ,province vchar(20) NOT NULL ,city vchar(30) NOT NULL ,id INTEGER NOT NULL PRIMER KEY) + + + public School(Context c) { + super(c, School_migration.class, School_migration.TABLE_NAME); + helper = new School_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/MyModel/Models/SingleAffairsTime.java b/MyModel/Models/SingleAffairsTime.java new file mode 100644 index 0000000..7f6ab72 --- /dev/null +++ b/MyModel/Models/SingleAffairsTime.java @@ -0,0 +1,43 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; + +import wesayallright.timemanager.db.dbAccess.DAO; +import wesayallright.timemanager.db.dbHelper.SingleAffairsTime_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + * + */ + +public class SingleAffairsTime extends DAO { + private SQLiteDatabase db; + private Affair_migration helper; + + CREATE TABLE IF NOT EXISTS SingleAffairsTime (affair_index_id integer NOT NULL REFERENCE Affairs ,id INTEGER NOT NULL PRIMER KEY) + + + public SingleAffairsTime(Context c) { + super(c, SingleAffairsTime_migration.class, SingleAffairsTime_migration.TABLE_NAME); + helper = new SingleAffairsTime_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/MyModel/Models/SuccessiveAffairsTime.java b/MyModel/Models/SuccessiveAffairsTime.java new file mode 100644 index 0000000..1388aa8 --- /dev/null +++ b/MyModel/Models/SuccessiveAffairsTime.java @@ -0,0 +1,43 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; + +import wesayallright.timemanager.db.dbAccess.DAO; +import wesayallright.timemanager.db.dbHelper.SuccessiveAffairsTime_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + * + */ + +public class SuccessiveAffairsTime extends DAO { + private SQLiteDatabase db; + private Affair_migration helper; + + CREATE TABLE IF NOT EXISTS SuccessiveAffairsTime (affair_index_id integer NOT NULL REFERENCE Affairs ,id INTEGER NOT NULL PRIMER KEY) + + + public SuccessiveAffairsTime(Context c) { + super(c, SuccessiveAffairsTime_migration.class, SuccessiveAffairsTime_migration.TABLE_NAME); + helper = new SuccessiveAffairsTime_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/MyModel/Models/User.java b/MyModel/Models/User.java new file mode 100644 index 0000000..1b4b8aa --- /dev/null +++ b/MyModel/Models/User.java @@ -0,0 +1,43 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; + +import wesayallright.timemanager.db.dbAccess.DAO; +import wesayallright.timemanager.db.dbHelper.User_migration; + +/** + * MyModel 自动生成 at: 2017-05-13 17:29:43 + * + */ + +public class User extends DAO { + private SQLiteDatabase db; + private Affair_migration helper; + + CREATE TABLE IF NOT EXISTS User (user_id vchar(10) NOT NULL ,password vchar(64) NOT NULL ,stu_id vchar(20) NOT NULL ,nickname vchar(15) NOT NULL ,realname vchar(10) NOT NULL ,birthday date NOT NULL ,mobile vchar(21) NOT NULL ,email vchar NOT NULL ,updatetime date NOT NULL ,id INTEGER NOT NULL PRIMER KEY) + + + public User(Context c) { + super(c, User_migration.class, User_migration.TABLE_NAME); + helper = new User_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/MyModel/migrate.py b/MyModel/migrate.py new file mode 100644 index 0000000..842768b --- /dev/null +++ b/MyModel/migrate.py @@ -0,0 +1,136 @@ +import os +import re +import time + + +def main(modelsTemplateFile, modelsDir, migrationsDir): + convert2JaveType = { + 'CharField': 'String', + 'IntegerField': 'Integer', + 'BooleanField': 'Boolean', + 'SmallIntegerField': 'Short', + 'DateField': 'Date', + 'TimeField': 'Date', + 'DateTimeField': 'Date', + 'ForeignKey': 'Object', + 'EmailField': 'String' + } + convert2SQLType = { + 'CharField': 'vchar', + 'IntegerField': 'integer', + 'BooleanField': 'bool', + 'SmallIntegerField': 'smallint', + 'DateField': 'date', + 'TimeField': 'time', + 'DateTimeField': 'datetime', + 'ForeignKey': 'integer', + 'EmailField': 'vchar' + } + models = open(modelsTemplateFile, 'r') + modelTemplate = open('modelTemplate.txt', 'r') + migrationTemplate = open('migrationTemplate.txt', 'r') + line = models.readline() + + while line != '': + sp = line.split(' ') + if sp[0] == 'class': + tableName = sp[1].split('(')[0] + comment = "MyModel 自动生成 at: " + time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()) + content_model = '' + content_migration = '' + declaredPrimerKey = False + + modelFile = open(modelsDir + tableName + '.java', 'w') + migrationFile = open(migrationsDir + tableName + '_migration.java', 'w') + + line = models.readline() + pattern = re.compile('\s+(\S+)\s+=\s+models\.(\w+)\((.+)\)') + + while line != '' and line[0] == ' ': + if len(line) >= 4 and(line[4:6] == 'def' or line[5] == ' '): + line = models.readline() + continue + + m = pattern.match(line) + if m is not None: + fieldName = m.group(1) + fieldType = m.group(2) + fieldPropertys = m.group(3).split(',') + # model + content_model += ' public ' + if fieldType == 'ForeignKey': + content_model += fieldPropertys[0] + ' ' + else: + content_model += convert2JaveType.get(fieldType) + ' ' + content_model += fieldName + ';\n' + # migration + declaredNullable = False + if fieldType == 'ForeignKey': + content_migration += fieldName.lower() + '_id ' + convert2SQLType.get(fieldType) + else: + content_migration += fieldName.lower() + ' ' + convert2SQLType.get(fieldType) + isForeignKey = False + for p in fieldPropertys: + if not isForeignKey and fieldType == 'ForeignKey': + isForeignKey = True + continue + p = p.split("=") + p[0].lower() + p[1].lower() + if p[0] == 'max_length': + content_migration += "(" + p[1] + ')' + elif p[0] == 'primer_key' and p[1] != 'false': + declaredPrimerKey = True + content_migration += ' primer key' + elif p[0] == 'null': + declaredNullable = True + if p[1] == 'true': + content_migration += ' NULL' + else: + content_migration += ' NOT NULL' + + if not declaredNullable: + content_migration += ' NOT NULL' + if fieldType == 'ForeignKey': + content_migration += " REFERENCE " + fieldPropertys[0] + isForeignKey = False + content_migration += ' ,' + + line = models.readline() + if not declaredPrimerKey: + content_migration += 'id INTEGER NOT NULL PRIMER KEY,' + content_model += '\n public Integer id;\n' + content_migration = content_migration[:len(content_migration) - 1] + content_migration = " CREATE TABLE IF NOT EXISTS " + tableName + " (" +content_migration + ")" + + modelTemplate.seek(0, 0) + template = modelTemplate.read() + template = re.sub('{{comment}}', comment, template) + template = re.sub('{{tableName}}', tableName, template) + template = re.sub('{{content}}', content_model, template) + modelFile.write(template) + print("成功生成" + tableName + '.java') + modelFile.close() + + migrationTemplate.seek(0, 0) + template = migrationTemplate.read() + template = re.sub('{{comment}}', comment, template) + template = re.sub('{{tableName}}', tableName, template) + template = re.sub('{{content}}', content_migration, template) + migrationFile.write(template) + print("成功生成" + tableName + '_migration.java') + migrationFile.close() + + + else: + line = models.readline() + + models.close() + migrationTemplate.close() + modelTemplate.close() + + +if __name__ == '__main__': + main("../Server/Resource/models.py", + "../Client/app/src/main/java/wesayallright/timemanager/db/Models/", + "../Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/") diff --git a/MyModel/migrationTemplate.txt b/MyModel/migrationTemplate.txt new file mode 100644 index 0000000..91147e3 --- /dev/null +++ b/MyModel/migrationTemplate.txt @@ -0,0 +1,33 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * {{comment}} + */ + +public class {{tableName}}_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "{{tableName}}"; + public {{tableName}}_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = "{{content}}"; + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} + diff --git a/MyModel/modelTemplate.txt b/MyModel/modelTemplate.txt new file mode 100644 index 0000000..7092d01 --- /dev/null +++ b/MyModel/modelTemplate.txt @@ -0,0 +1,44 @@ + +package wesayallright.timemanager.db.Models; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import java.util.Date; + +import wesayallright.timemanager.db.DAO; +import wesayallright.timemanager.db.dbHelper.{{tableName}}_migration; + +/** + * {{comment}} + * + */ + +public class {{tableName}} extends DAO { + private SQLiteDatabase db; + private {{tableName}}_migration helper; + + {{content}} + + + public {{tableName}}(Context c) { + super(c, {{tableName}}_migration.class, {{tableName}}_migration.TABLE_NAME); + helper = new {{tableName}}_migration(c); + db = helper.getWritableDatabase(); + } + + + public void save() { + super.saveOrInsert(this); + } + + public void insert() { + super.insert(this); + } + public void delete() { + super.delete(this); + } + + public int valueOf() { + return id; + } +} diff --git a/MyModel/models.txt b/MyModel/models.txt new file mode 100644 index 0000000..46c486f --- /dev/null +++ b/MyModel/models.txt @@ -0,0 +1,83 @@ +from django.db import models +from django.contrib.auth.hashers import make_password, check_password + +class School(models.Model): + school_id = models.CharField(max_length=10) + name = models.CharField(max_length=30) + province = models.CharField(max_length=20) + city = models.CharField(max_length=30) + def __str__(self): + return self.name + +class User(models.Model): + user_id = models.CharField(max_length=10) + password = models.CharField(max_length=64) + stu_id = models.CharField(max_length=20) # 学号 + nickname = models.CharField(max_length=15) + realname = models.CharField(max_length=10, null=True) + gender = models.SmallIntegerField() # 1是男, 2是女, 3以上是其他 + birthday = models.DateField(null=True) + mobile = models.CharField(max_length=21) # 手机号是21位 + email = models.EmailField(null=True) + updatetime = models.DateField(auto_now_add=True) + + school_index = models.ForeignKey(School, on_delete=models.CASCADE) + major = models.CharField(max_length=30) + entry_date = models.DateField() + def __str__(self): + return self.realname + +class Group(models.Model): + group_id = models.CharField(max_length=10) + name = models.CharField(max_length=50) + introduction = models.CharField(max_length=100, default="无") + establish_date = models.DateField(auto_now=True) + update_date = models.DateField(auto_now_add=True) + is_public = models.BooleanField() + max_member = models.PositiveSmallIntegerField() + def __str__(self): + return self.group_name + +class Group_User(models.Model): + group_index = models.ForeignKey(Group, on_delete=models.CASCADE) + user_index = models.ForeignKey(User, on_delete=models.CASCADE) + privilege = models.SmallIntegerField() # 1是创建者, 2是管理员, 3是普通成员 + visible = models.BooleanField(default=True) + update_time = models.DateTimeField(auto_now_add=True) + + +class Affairs(models.Model): + name = models.CharField(max_length=20) + type = models.SmallIntegerField() # 1是课程, 2是目标, 3是活动 + place = models.CharField(max_length=30, default="未填写") + details = models.CharField(max_length=100, default="无") + organizer_index = models.ForeignKey(User) + def __str__(self): + return self.name + + +class SingleAffairsTime(models.Model): + ''' 单一时间 ''' + affair_index = models.ForeignKey(Affairs) + dateTime = models.DateTimeField() + + +class SuccessiveAffairsTime(models.Model): + ''' 连续时间 ''' + affair_index = models.ForeignKey(Affairs) + time = models.TimeField() + startData = models.DateField() + lastData = models.DateField() + every = models.SmallIntegerField() # 从最低一位到第7位分别对于星期一到日 + + +class HaveAffair(models.Model): + user_index = models.ForeignKey(User) + affair_index = models.ForeignKey(Affairs) + + +class InGroup(models.Model): + user_index = models.ForeignKey(User) + group_index = models.ForeignKey(Group) + role_index = models.ForeignKey(Group_User) + diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml index e5dbecb..2ef1c10 100644 --- a/Server/.idea/workspace.xml +++ b/Server/.idea/workspace.xml @@ -3,8 +3,8 @@ - + @@ -15,39 +15,20 @@ + + + - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -55,40 +36,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -97,6 +44,7 @@ @@ -107,8 +55,8 @@ DEFINITION_ORDER - @@ -126,8 +74,8 @@ - + @@ -178,7 +126,7 @@ - + - + + + - + + + + + + + - - + - + - + @@ -440,31 +412,10 @@ - - - - - - - - - - - - - - - - - - - - - @@ -482,9 +433,6 @@ - - - @@ -500,9 +448,6 @@ - - - @@ -510,7 +455,6 @@ - @@ -518,9 +462,6 @@ - - - @@ -538,9 +479,6 @@ - - - @@ -556,9 +494,6 @@ - - - @@ -566,7 +501,6 @@ - @@ -574,9 +508,6 @@ - - - @@ -594,9 +525,6 @@ - - - @@ -612,9 +540,6 @@ - - - @@ -622,7 +547,6 @@ - @@ -630,9 +554,6 @@ - - - @@ -650,9 +571,6 @@ - - - @@ -668,7 +586,6 @@ - @@ -676,9 +593,6 @@ - - - @@ -696,9 +610,6 @@ - - - @@ -713,9 +624,6 @@ - - - @@ -738,9 +646,6 @@ - - - @@ -820,9 +725,6 @@ - - - @@ -838,9 +740,6 @@ - - - @@ -848,9 +747,6 @@ - - - @@ -858,14 +754,29 @@ + + + + + + + + + + + + + + + - - + + diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Affair_migration.java b/Server/dbHelperbk/Affair_migration.java similarity index 100% rename from Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Affair_migration.java rename to Server/dbHelperbk/Affair_migration.java diff --git a/Server/dbHelperbk/Group_migration.java b/Server/dbHelperbk/Group_migration.java new file mode 100644 index 0000000..237c7ec --- /dev/null +++ b/Server/dbHelperbk/Group_migration.java @@ -0,0 +1,44 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; + +import wesayallright.timemanager.InnerLayer.Package; + +/** + * Created by mj on 17-5-11. + * 群组列表 + */ + +public class Group_migration extends SQLiteOpenHelper{ + + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "groups"; + public Group_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + + "(\"id\" integer NOT NULL PRIMARY KEY, " + + "\"name\" varchar(50) NOT NULL, " + + "\"introduction\" varchar(100) NOT NULL, " + + "\"establish_date\" date NOT NULL, " + + "\"update_date\" date NOT NULL, " + + "\"is_public\" bool NOT NULL, " + + "\"max_member\" smallint unsigned NOT NULL, " + + "\"group_id\" varchar(10) NOT NULL)"; + + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } + +} diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Group_user_migration.java b/Server/dbHelperbk/Group_user_migration.java similarity index 100% rename from Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Group_user_migration.java rename to Server/dbHelperbk/Group_user_migration.java diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Have_Affair_migration.java b/Server/dbHelperbk/Have_Affair_migration.java similarity index 100% rename from Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Have_Affair_migration.java rename to Server/dbHelperbk/Have_Affair_migration.java diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/In_Group_migration.java b/Server/dbHelperbk/In_Group_migration.java similarity index 94% rename from Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/In_Group_migration.java rename to Server/dbHelperbk/In_Group_migration.java index f890511..089ea50 100644 --- a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/In_Group_migration.java +++ b/Server/dbHelperbk/In_Group_migration.java @@ -22,7 +22,7 @@ public class In_Group_migration extends SQLiteOpenHelper @Override public void onCreate(SQLiteDatabase db) { String sql = "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + - "(\"id\" integer NOT NULL PRIMARY KEY AUTOINCREMENT, " + + "(\"id\" integer NOT NULL PRIMARY KEY, " + "\"group_index_id\" integer NOT NULL REFERENCES \""+ Group_migration.TABLE_NAME+"\" (\"id\"), " + "\"role_index_id\" integer NOT NULL REFERENCES \""+Group_user_migration.TABLE_NAME+"\" (\"id\"), " + "\"user_index_id\" integer NOT NULL REFERENCES \""+User_migration.TABLE_NAME+"\" (\"id\"))"; diff --git a/Server/dbHelperbk/School_migration.java b/Server/dbHelperbk/School_migration.java new file mode 100644 index 0000000..3d33e75 --- /dev/null +++ b/Server/dbHelperbk/School_migration.java @@ -0,0 +1,39 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * Created by mj on 17-5-11. + * 学校表 + */ + +public class School_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "schools"; + public School_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + + "(\"id\" integer NOT NULL PRIMARY KEY , " + + "\"name\" varchar(30) NOT NULL, " + + "\"province\" varchar(20) NOT NULL, " + + "\"city\" varchar(30) NOT NULL, " + + "\"school_id\" varchar(10) NOT NULL)"; + + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +} diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Single_Affairs_Time_migration.java b/Server/dbHelperbk/Single_Affairs_Time_migration.java similarity index 100% rename from Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Single_Affairs_Time_migration.java rename to Server/dbHelperbk/Single_Affairs_Time_migration.java diff --git a/Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Successive_Affairs_Time_migration.java b/Server/dbHelperbk/Successive_Affairs_Time_migration.java similarity index 100% rename from Client/app/src/main/java/wesayallright/timemanager/db/dbHelper/Successive_Affairs_Time_migration.java rename to Server/dbHelperbk/Successive_Affairs_Time_migration.java diff --git a/Server/dbHelperbk/User_migration.java b/Server/dbHelperbk/User_migration.java new file mode 100644 index 0000000..2d2b955 --- /dev/null +++ b/Server/dbHelperbk/User_migration.java @@ -0,0 +1,50 @@ +package wesayallright.timemanager.db.dbHelper; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import wesayallright.timemanager.InnerLayer.Package; + +/** + * Created by mj on 17-5-11. + * 用户表 + */ + +public class User_migration extends SQLiteOpenHelper +{ + private static final int DB_VERSION = 1; + public static final String TABLE_NAME = "users"; + public User_migration(Context context) { + super(context, Package.DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + String sql = "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + + "(\"id\" integer NOT NULL PRIMARY KEY , " + + "\"password\" varchar(64) NOT NULL, " + + "\"stu_id\" varchar(20) NOT NULL, " + + "\"nickname\" varchar(15) NOT NULL, " + + "\"realname\" varchar(10) NULL, " + + "\"gender\" smallint NOT NULL, " + + "\"birthday\" date NULL, " + + "\"mobile\" varchar(21) NOT NULL, " + + "\"email\" varchar(254) NULL, " + + "\"updatetime\" date NOT NULL, " + + "\"major\" varchar(30) NOT NULL, " + + "\"entry_date\" date NOT NULL, " + + "\"school_index_id\" integer NOT NULL REFERENCES \""+ School_migration.TABLE_NAME+"\" (\"id\"), " + + "\"user_id\" varchar(10) NOT NULL)"; + + + + db.execSQL(sql); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + String sql = "DROP TABLE IF EXISTS " + TABLE_NAME; + db.execSQL(sql); + onCreate(db); + } +}