From 3d27942c3d844d4d55b8ff6c96ae6529b25a80e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Thu, 10 Oct 2024 10:37:45 +0800 Subject: [PATCH] 'commit' --- .../java/com/dsideal/Tools/GenerateCode.java | 34 --- .../com/dsideal/ZhuQue/Bean/TWxRecord.java | 63 ------ .../java/com/dsideal/ZhuQue/Bean/WxRecord.txt | 2 +- .../dsideal/base/Bean/TSysLoginperson.java | 203 ------------------ 4 files changed, 1 insertion(+), 301 deletions(-) delete mode 100644 dsUtils/src/main/java/com/dsideal/ZhuQue/Bean/TWxRecord.java delete mode 100644 dsUtils/src/main/java/com/dsideal/base/Bean/TSysLoginperson.java diff --git a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java index a2dc21e7..c66c0ea3 100644 --- a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java +++ b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java @@ -58,7 +58,6 @@ public class GenerateCode { //字段，不包含主键 Map map = new LinkedHashMap<>(); - StringBuilder sb = new StringBuilder(); //表注释 String comment = ""; Statement stmt = conn.createStatement(); @@ -74,16 +73,6 @@ public class GenerateCode { //类名 String beanNameWithoutT = dsKit.toCamelCase(dsKit.capitalizeFirstLetter(table)); - //包名 - sb.append("package " + beanPackage + ";\n"); - sb.append("\n"); - - sb.append("import lombok.Setter;\n"); - sb.append("import lombok.Getter;\n"); - - //表描述 - sb.append("// " + comment + "\n"); - sb.append("public class " + beanNameWithoutT + " {\n"); List fields = new ArrayList<>(); //字段信息 @@ -105,34 +94,12 @@ public class GenerateCode { } else {//否则记录到map中 map.put(Field, dataTypeMap.get(Type)); } - - sb.append(" // " + rs.getString("Comment") + "\n"); - sb.append(" @Getter\n"); - sb.append(" @Setter\n"); - sb.append(" private " + dataTypeMap.get(Type) + " " + Field + ";\n"); } - sb.append("\n"); - sb.append(" public String toString(){\n"); - sb.append(" return \"{"); - - for (int i = 0; i < fields.size(); i++) { - String field = fields.get(i); - sb.append(" " + field + ": \" + " + field + " +\""); - if (i < fields.size() - 1) { - sb.append(","); - } - } - sb.append("}\";\n"); - sb.append(" }\n"); - sb.append("}\n"); - String fileName = beanPath + File.separator + beanNameWithoutT + ".java"; - FileUtil.writeUtf8String(sb.toString(), fileName); //关闭连接 rs.close(); stmt.close(); jo.put("fields", map); jo.put("beanNameWithoutT", beanNameWithoutT); - jo.put("beanName", dsKit.toCamelCase(table)); jo.put("comment", comment); jo.put("table",table); return jo; @@ -245,7 +212,6 @@ public class GenerateCode { if (beanNameWithoutT.startsWith("T")) { beanNameWithoutT = beanNameWithoutT.substring(1); } - String beanName = jo.getStr("beanName"); //表的描述 String comment = jo.getStr("comment"); diff --git a/dsUtils/src/main/java/com/dsideal/ZhuQue/Bean/TWxRecord.java b/dsUtils/src/main/java/com/dsideal/ZhuQue/Bean/TWxRecord.java deleted file mode 100644 index a62196a6..00000000 --- a/dsUtils/src/main/java/com/dsideal/ZhuQue/Bean/TWxRecord.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.dsideal.ZhuQue.Bean; - -import lombok.Setter; -import lombok.Getter; -// 维修记录表 -public class TWxRecord { - // 主键 - @Getter - @Setter - private int id; - // 场站ID - @Getter - @Setter - private int station_id; - // 场站名称 - @Getter - @Setter - private String station_name; - // 桩ID - @Getter - @Setter - private int equipmentId; - // 桩名称 - @Getter - @Setter - private String equipmentName; - // 枪ID - @Getter - @Setter - private int connectorId; - // 枪名称 - @Getter - @Setter - private String connectorNo; - // 维修人员的微信open_id - @Getter - @Setter - private String wx_openid; - // 维修单状态： 1：正在维修，2：维修完成，3：无法维修 - @Getter - @Setter - private int status_id; - // 创建时间 - @Getter - @Setter - private java.util.Date create_time; - // 故障类型id - @Getter - @Setter - private int type_id; - // 故障类型名称 - @Getter - @Setter - private String type_name; - // 维修情况说明 - @Getter - @Setter - private String memo; - - public String toString(){ - return "{ id: " + id +", station_id: " + station_id +", station_name: " + station_name +", equipmentId: " + equipmentId +", equipmentName: " + equipmentName +", connectorId: " + connectorId +", connectorNo: " + connectorNo +", wx_openid: " + wx_openid +", status_id: " + status_id +", create_time: " + create_time +", type_id: " + type_id +", type_name: " + type_name +", memo: " + memo +"}"; - } -} diff --git a/dsUtils/src/main/java/com/dsideal/ZhuQue/Bean/WxRecord.txt b/dsUtils/src/main/java/com/dsideal/ZhuQue/Bean/WxRecord.txt index fb4daabc..3e8fe25d 100644 --- a/dsUtils/src/main/java/com/dsideal/ZhuQue/Bean/WxRecord.txt +++ b/dsUtils/src/main/java/com/dsideal/ZhuQue/Bean/WxRecord.txt @@ -64,5 +64,5 @@ public boolean addWxRecord(int station_id , String station_name , int equipmentI record.set("type_id",type_id); record.set("type_name",type_name); record.set("memo",memo); - Db.save("t_wx_record","id",record); + Db.save("t_wx_record","id",record); } diff --git a/dsUtils/src/main/java/com/dsideal/base/Bean/TSysLoginperson.java b/dsUtils/src/main/java/com/dsideal/base/Bean/TSysLoginperson.java deleted file mode 100644 index a1829e95..00000000 --- a/dsUtils/src/main/java/com/dsideal/base/Bean/TSysLoginperson.java +++ /dev/null @@ -1,203 +0,0 @@ -package com.dsideal.base.Bean; - -import lombok.Setter; -import lombok.Getter; -// -public class TSysLoginperson { - // 人员ID - @Getter - @Setter - private String person_id; - // 人员姓名 - @Getter - @Setter - private String person_name; - // 身份ID - @Getter - @Setter - private int identity_id; - // 登录名 - @Getter - @Setter - private String login_name; - // 密码 - @Getter - @Setter - private String pwd; - // 原始密码 - @Getter - @Setter - private String original_pwd; - // md5后的密码，用于CAS验证 - @Getter - @Setter - private String pwdmd5; - // 性别 - @Getter - @Setter - private int xb; - // 民族 - @Getter - @Setter - private String mz; - // 政治面貌 - @Getter - @Setter - private String zzmm; - // 身份证号 - @Getter - @Setter - private String idcard_code; - // 出生日期 - @Getter - @Setter - private java.util.Date birthday; - // 创建时间 - @Getter - @Setter - private java.util.Date create_time; - // 在单位内部的排序号 - @Getter - @Setter - private int sort_id; - // 手机号 - @Getter - @Setter - private String telephone; - // 绑定微信的openid - @Getter - @Setter - private String wx_openid; - // 绑定QQ的openid - @Getter - @Setter - private String qq_openid; - // 电子邮箱 - @Getter - @Setter - private String email; - // 人员状态 - @Getter - @Setter - private String status_code; - // 是不是可用 - @Getter - @Setter - private int b_use; - // 身份主键序列 - @Getter - @Setter - private int identity_pk_num; - // 市ID - @Getter - @Setter - private String city_id; - // 县区ID - @Getter - @Setter - private String area_id; - // 主校ID - @Getter - @Setter - private String main_school_id; - // 单位ID - @Getter - @Setter - private String bureau_id; - // 所在部门 - @Getter - @Setter - private String org_id; - // 学生所在班级 - @Getter - @Setter - private String s_class_id; - // 学籍号 规定为16位 - @Getter - @Setter - private String s_xjh; - // 学籍辅号 规定为13位 - @Getter - @Setter - private String s_xjfh; - // 学生来源 1：正常入学 2：借读 9：其他 - @Getter - @Setter - private int s_source; - // 学生是哪个学段的 - @Getter - @Setter - private int s_stage_id; - // 进城务工随迁子女 - @Getter - @Setter - private int s_suiqian; - // 是否留守儿童 - @Getter - @Setter - private int s_liushou; - // 是否孤儿 - @Getter - @Setter - private int s_guer; - // 是否残疾 - @Getter - @Setter - private int s_canji; - // 如果是家长，那么他是哪个孩子的家长 - @Getter - @Setter - private String p_child_id; - // 职务与分管,json形式 - @Getter - @Setter - private String t_duty_charge; - // 最高学历 字典表t_dm_xl - @Getter - @Setter - private String t_xl_id; - // 职称 - @Getter - @Setter - private String t_zc_id; - // 学段 - @Getter - @Setter - private int t_stage_id; - // 主教学科 - @Getter - @Setter - private int t_subject_id; - // 从教年月日 - @Getter - @Setter - private java.util.Date t_teaching_date; - // 是否骨干教师 - @Getter - @Setter - private int t_gugan; - // - @Getter - @Setter - private java.util.Date update_ts; - // 整数主键 - @Getter - @Setter - private int id_int; - // 操作人员 - @Getter - @Setter - private String operator; - // 操作者IP - @Getter - @Setter - private long ip_address; - // 微信小程序的openid - @Getter - @Setter - 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 +"}"; - } -}