'commit'

dsUtils/src/main/java/com/dsideal/base/Model/TSysLoginperson.java

@@ -7,195 +7,195 @@ public class TSysLoginperson {
     // 人员ID
     @Getter
     @Setter
-    private null person_id;
+    private String person_id;
     // 人员姓名
     @Getter
     @Setter
-    private null person_name;
+    private String person_name;
     // 身份ID
     @Getter
     @Setter
-    private null identity_id;
+    private int identity_id;
     // 登录名
     @Getter
     @Setter
-    private null login_name;
+    private String login_name;
     // 密码
     @Getter
     @Setter
-    private null pwd;
+    private String pwd;
     // 原始密码
     @Getter
     @Setter
-    private null original_pwd;
+    private String original_pwd;
     // md5后的密码，用于CAS验证
     @Getter
     @Setter
-    private null pwdmd5;
+    private String pwdmd5;
     // 性别
     @Getter
     @Setter
-    private null xb;
+    private int xb;
     // 民族
     @Getter
     @Setter
-    private null mz;
+    private String mz;
     // 政治面貌
     @Getter
     @Setter
-    private null zzmm;
+    private String zzmm;
     // 身份证号
     @Getter
     @Setter
-    private null idcard_code;
+    private String idcard_code;
     // 出生日期
     @Getter
     @Setter
-    private null birthday;
+    private java.util.Date birthday;
     // 创建时间
     @Getter
     @Setter
-    private null create_time;
+    private java.util.Date create_time;
     // 在单位内部的排序号
     @Getter
     @Setter
-    private null sort_id;
+    private int sort_id;
     // 手机号
     @Getter
     @Setter
-    private null telephone;
+    private String telephone;
     // 绑定微信的openid
     @Getter
     @Setter
-    private null wx_openid;
+    private String wx_openid;
     // 绑定QQ的openid
     @Getter
     @Setter
-    private null qq_openid;
+    private String qq_openid;
     // 电子邮箱
     @Getter
     @Setter
-    private null email;
+    private String email;
     // 人员状态
     @Getter
     @Setter
-    private null status_code;
+    private String status_code;
     // 是不是可用
     @Getter
     @Setter
-    private null b_use;
+    private int b_use;
     // 身份主键序列
     @Getter
     @Setter
-    private null identity_pk_num;
+    private int identity_pk_num;
     // 市ID
     @Getter
     @Setter
-    private null city_id;
+    private String city_id;
     // 县区ID
     @Getter
     @Setter
-    private null area_id;
+    private String area_id;
     // 主校ID
     @Getter
     @Setter
-    private null main_school_id;
+    private String main_school_id;
     // 单位ID
     @Getter
     @Setter
-    private null bureau_id;
+    private String bureau_id;
     // 所在部门
     @Getter
     @Setter
-    private null org_id;
+    private String org_id;
     // 学生所在班级
     @Getter
     @Setter
-    private null s_class_id;
+    private String s_class_id;
     // 学籍号 规定为16位
     @Getter
     @Setter
-    private null s_xjh;
+    private String s_xjh;
     // 学籍辅号 规定为13位
     @Getter
     @Setter
-    private null s_xjfh;
+    private String s_xjfh;
     // 学生来源 1：正常入学 2：借读 9：其他
     @Getter
     @Setter
-    private null s_source;
+    private int s_source;
     // 学生是哪个学段的
     @Getter
     @Setter
-    private null s_stage_id;
+    private int s_stage_id;
     // 进城务工随迁子女
     @Getter
     @Setter
-    private null s_suiqian;
+    private int s_suiqian;
     // 是否留守儿童
     @Getter
     @Setter
-    private null s_liushou;
+    private int s_liushou;
     // 是否孤儿
     @Getter
     @Setter
-    private null s_guer;
+    private int s_guer;
     // 是否残疾
     @Getter
     @Setter
-    private null s_canji;
+    private int s_canji;
     // 如果是家长，那么他是哪个孩子的家长
     @Getter
     @Setter
-    private null p_child_id;
+    private String p_child_id;
     // 职务与分管,json形式
     @Getter
     @Setter
-    private null t_duty_charge;
+    private String t_duty_charge;
     // 最高学历 字典表t_dm_xl
     @Getter
     @Setter
-    private null t_xl_id;
+    private String t_xl_id;
     // 职称
     @Getter
     @Setter
-    private null t_zc_id;
+    private String t_zc_id;
     // 学段
     @Getter
     @Setter
-    private null t_stage_id;
+    private int t_stage_id;
     // 主教学科
     @Getter
     @Setter
-    private null t_subject_id;
+    private int t_subject_id;
     // 从教年月日
     @Getter
     @Setter
-    private null t_teaching_date;
+    private java.util.Date t_teaching_date;
     // 是否骨干教师
     @Getter
     @Setter
-    private null t_gugan;
+    private int t_gugan;
     // 
     @Getter
     @Setter
-    private null update_ts;
+    private java.util.Date update_ts;
     // 整数主键
     @Getter
     @Setter
-    private null id_int;
+    private int id_int;
     // 操作人员
     @Getter
     @Setter
-    private null operator;
+    private String operator;
     // 操作者IP
     @Getter
     @Setter
-    private null ip_address;
+    private long ip_address;
     // 微信小程序的openid
     @Getter
     @Setter
-    private null mini_openid;
+    private String mini_openid;
 
     public String toString(){
         return "{ person_id: " + person_id +", person_name: " + person_name +", identity_id: " + identity_id +", login_name: " + login_name +", pwd: " + pwd +", original_pwd: " + original_pwd +", pwdmd5: " + pwdmd5 +", xb: " + xb +", mz: " + mz +", zzmm: " + zzmm +", idcard_code: " + idcard_code +", birthday: " + birthday +", create_time: " + create_time +", sort_id: " + sort_id +", telephone: " + telephone +", wx_openid: " + wx_openid +", qq_openid: " + qq_openid +", email: " + email +", status_code: " + status_code +", b_use: " + b_use +", identity_pk_num: " + identity_pk_num +", city_id: " + city_id +", area_id: " + area_id +", main_school_id: " + main_school_id +", bureau_id: " + bureau_id +", org_id: " + org_id +", s_class_id: " + s_class_id +", s_xjh: " + s_xjh +", s_xjfh: " + s_xjfh +", s_source: " + s_source +", s_stage_id: " + s_stage_id +", s_suiqian: " + s_suiqian +", s_liushou: " + s_liushou +", s_guer: " + s_guer +", s_canji: " + s_canji +", p_child_id: " + p_child_id +", t_duty_charge: " + t_duty_charge +", t_xl_id: " + t_xl_id +", t_zc_id: " + t_zc_id +", t_stage_id: " + t_stage_id +", t_subject_id: " + t_subject_id +", t_teaching_date: " + t_teaching_date +", t_gugan: " + t_gugan +", update_ts: " + update_ts +", id_int: " + id_int +", operator: " + operator +", ip_address: " + ip_address +", mini_openid: " + mini_openid +"}";

dsUtils/src/main/java/com/dsideal/getJavaBean.java

@@ -128,6 +128,31 @@ public class getJavaBean {
         beanPackage = PropKit.get("beanPackage");
         beanPath = PropKit.get("beanPath");
         beanPath = beanPath + "/" + beanPackage.replace(".", "/");
+        if (!FileUtil.exist(beanPath)) {
+            FileUtil.mkdir(beanPath);
+        }
+        //mysql与java的数据类型映射
+        dataTypeMap.put("INT", "int");
+        dataTypeMap.put("BIGINT", "long");
+        dataTypeMap.put("DOUBLE", "double");
+        dataTypeMap.put("FLOAT", "float");
+        dataTypeMap.put("TINYINT", "int");
+        dataTypeMap.put("DATE", "java.util.Date");
+        dataTypeMap.put("TIMESTAMP", "java.util.Date");
+        dataTypeMap.put("BIGINT UNSIGNED", "long");
+        dataTypeMap.put("INT UNSIGNED", "long");
+        dataTypeMap.put("MEDIUMINT", "int");
+        dataTypeMap.put("MEDIUMINT UNSIGNED", "long");
+        dataTypeMap.put("SMALLINT", "int");
+        dataTypeMap.put("SMALLINT UNSIGNED", "long");
+        dataTypeMap.put("TINYINT UNSIGNED", "long");
+        dataTypeMap.put("LONGTEXT", "String");
+        dataTypeMap.put("VARCHAR", "String");
+        dataTypeMap.put("CHAR", "String");
+        dataTypeMap.put("TEXT", "String");
+        dataTypeMap.put("DATETIME", "java.util.Date");
+        dataTypeMap.put("DECIMAL", "BigDecimal");
+        dataTypeMap.put("BOOLEAN", "boolean");
 
         // 配置Druid数据源插件
         HikariCpPlugin hpPlugin = new HikariCpPlugin(PropKit.get("jdbcUrl"), PropKit.get("user"),