diff --git a/dsUtils/src/main/java/com/dsideal/Code/WxRecordController.txt b/dsUtils/src/main/java/com/dsideal/Code/WxRecordController.txt index 4d8d2961..41e83d58 100644 --- a/dsUtils/src/main/java/com/dsideal/Code/WxRecordController.txt +++ b/dsUtils/src/main/java/com/dsideal/Code/WxRecordController.txt @@ -1,6 +1,19 @@ /* 下面代码开始维护维修记录表 */ - //增加维修记录表 + /**增加维修记录表 + * + * @param station_id 场站ID + * @param station_name 场站名称 + * @param equipmentId 桩ID + * @param equipmentName 桩名称 + * @param connectorId 枪ID + * @param connectorNo 枪名称 + * @param wx_openid 维修人员的微信open_id + * @param status_id 维修单状态: 1:正在维修,2:维修完成,3:无法维修 + * @param type_id 故障类型id + * @param type_name 故障类型名称 + * @param memo 维修情况说明 + */ @Before({POST.class}) //@JwtCheckInterface({}) //@EmptyInterface({""}) @@ -20,7 +33,20 @@ renderJson(RetKit.renderSuccess()); } - //按ID修改维修记录表 + /**按ID修改维修记录表 + * + * @param station_id 场站ID + * @param station_name 场站名称 + * @param equipmentId 桩ID + * @param equipmentName 桩名称 + * @param connectorId 枪ID + * @param connectorNo 枪名称 + * @param wx_openid 维修人员的微信open_id + * @param status_id 维修单状态: 1:正在维修,2:维修完成,3:无法维修 + * @param type_id 故障类型id + * @param type_name 故障类型名称 + * @param memo 维修情况说明 + */ @Before({POST.class}) //@JwtCheckInterface({}) //@EmptyInterface({""}) diff --git a/dsUtils/src/main/java/com/dsideal/Code/WxRecordModel.txt b/dsUtils/src/main/java/com/dsideal/Code/WxRecordModel.txt index a50bebf3..5e7fa68f 100644 --- a/dsUtils/src/main/java/com/dsideal/Code/WxRecordModel.txt +++ b/dsUtils/src/main/java/com/dsideal/Code/WxRecordModel.txt @@ -1,4 +1,17 @@ - //增加维修记录表 + /**增加维修记录表 + * + * @param station_id 场站ID + * @param station_name 场站名称 + * @param equipmentId 桩ID + * @param equipmentName 桩名称 + * @param connectorId 枪ID + * @param connectorNo 枪名称 + * @param wx_openid 维修人员的微信open_id + * @param status_id 维修单状态: 1:正在维修,2:维修完成,3:无法维修 + * @param type_id 故障类型id + * @param type_name 故障类型名称 + * @param memo 维修情况说明 + */ public void addWxRecord(int station_id , String station_name , int equipmentId , String equipmentName , int connectorId , String connectorNo , String wx_openid , int status_id , int type_id , String type_name , String memo ){ Record record = new Record(); record.set("station_id",station_id); @@ -22,7 +35,20 @@ Db.update(sql,id); } - //修改维修记录表 + /**修改维修记录表 + * + * @param station_id 场站ID + * @param station_name 场站名称 + * @param equipmentId 桩ID + * @param equipmentName 桩名称 + * @param connectorId 枪ID + * @param connectorNo 枪名称 + * @param wx_openid 维修人员的微信open_id + * @param status_id 维修单状态: 1:正在维修,2:维修完成,3:无法维修 + * @param type_id 故障类型id + * @param type_name 故障类型名称 + * @param memo 维修情况说明 + */ public void updateWxRecordById(int id,int station_id , String station_name , int equipmentId , String equipmentName , int connectorId , String connectorNo , String wx_openid , int status_id , int type_id , String type_name , String memo ){ String sql="update t_wx_record set station_id= ?,station_name= ?,equipmentId= ?,equipmentName= ?,connectorId= ?,connectorNo= ?,wx_openid= ?,status_id= ?,create_time= DateTime.now(),type_id= ?,type_name= ?,memo= ? where id=?"; Db.update(sql,station_id , station_name , equipmentId , equipmentName , connectorId , connectorNo , wx_openid , status_id , type_id , type_name , memo , id); diff --git a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java index 9a1d95b8..332bc4c4 100644 --- a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java +++ b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java @@ -1,7 +1,6 @@ package com.dsideal.Tools; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.RuntimeUtil; import cn.hutool.json.JSONObject; import com.dsideal.Utils.dsKit; import com.jfinal.kit.PropKit; @@ -54,7 +53,9 @@ public class GenerateCode { //表结构的描述JSON对象 JSONObject jo = new JSONObject(); //字段,不包含主键 - Map map = new LinkedHashMap<>(); + Map dataTypeMap = new LinkedHashMap<>(); + //字段描述 + Map commentMap = new LinkedHashMap<>(); //表注释 String comment = ""; @@ -78,6 +79,8 @@ public class GenerateCode { while (rs.next()) { String Type = rs.getString("Type"); String Field = rs.getString("Field"); + String Comment = rs.getString("Comment"); + commentMap.put(Field, Comment); fields.add(Field); if (Type.contains("(")) { @@ -88,15 +91,16 @@ public class GenerateCode { //记录主键 if (rs.getString("Key").equals("PRI")) { jo.put("key", Field); - jo.put("key_type", dataTypeMap.get(Type)); + jo.put("key_type", GenerateCode.dataTypeMap.get(Type)); } else {//否则记录到map中 - map.put(Field, dataTypeMap.get(Type)); + dataTypeMap.put(Field, GenerateCode.dataTypeMap.get(Type)); } } //关闭连接 rs.close(); stmt.close(); - jo.put("fields", map); + jo.put("fields", dataTypeMap); + jo.put("fieldsComment", commentMap); jo.put("beanNameWithoutT", beanNameWithoutT); jo.put("comment", comment); jo.put("table", table); @@ -192,6 +196,8 @@ public class GenerateCode { //不带主键的其它字段,拼接成java的函数声明内容 // 迭代map将按照插入顺序 Map fields = (Map) jo.get("fields"); + Map fieldsComment = (Map) jo.get("fieldsComment"); + String fullParameters = "";//带数据类型+字段名称 String parameters = "";//不带数据类型,只有字段名称 for (Map.Entry entry : fields.entrySet()) { @@ -228,7 +234,15 @@ public class GenerateCode { sb.append("/* 下面代码开始维护" + comment + " */\n"); sb.append("\n"); //1、增加 - sb.append(" //增加" + comment + "\n"); + sb.append(" /**增加" + comment + "\n"); + sb.append(" *\n"); + //迭代 + for (Map.Entry entry : fields.entrySet()) { + if (!entry.getKey().equals("create_time")) { + sb.append(" * @param " + entry.getKey() + " " + fieldsComment.get(entry.getKey()) + "\n"); + } + } + sb.append(" */\n"); sb.append(" @Before({POST.class})\n"); sb.append(" //@JwtCheckInterface({})\n"); sb.append(" //@EmptyInterface({\"\"})\n"); @@ -252,7 +266,15 @@ public class GenerateCode { //3、修改 sb.append("\n"); - sb.append(" //按ID修改" + comment + "\n"); + sb.append(" /**按ID修改" + comment + "\n"); + sb.append(" *\n"); + //迭代 + for (Map.Entry entry : fields.entrySet()) { + if (!entry.getKey().equals("create_time")) { + sb.append(" * @param " + entry.getKey() + " " + fieldsComment.get(entry.getKey()) + "\n"); + } + } + sb.append(" */\n"); sb.append(" @Before({POST.class})\n"); sb.append(" //@JwtCheckInterface({})\n"); sb.append(" //@EmptyInterface({\"\"})\n"); @@ -292,7 +314,15 @@ public class GenerateCode { sb.append("\n"); sb = new StringBuilder(); //1、增加 - sb.append(" //增加" + comment + "\n"); + sb.append(" /**增加" + comment + "\n"); + sb.append(" *\n"); + //迭代 + for (Map.Entry entry : fields.entrySet()) { + if (!entry.getKey().equals("create_time")) { + sb.append(" * @param " + entry.getKey() + " " + fieldsComment.get(entry.getKey()) + "\n"); + } + } + sb.append(" */\n"); sb.append(" public void add" + beanNameWithoutT + "(" + fullParameters + "){\n"); sb.append(" Record record = new Record();\n"); for (Map.Entry entry : fields.entrySet()) { @@ -314,7 +344,16 @@ public class GenerateCode { sb.append("\n"); //3、修改 - sb.append(" //修改" + comment + "\n"); + sb.append(" /**修改" + comment + "\n"); + sb.append(" *\n"); + //迭代 + for (Map.Entry entry : fields.entrySet()) { + if (!entry.getKey().equals("create_time")) { + sb.append(" * @param " + entry.getKey() + " " + fieldsComment.get(entry.getKey()) + "\n"); + } + } + sb.append(" */\n"); + sb.append(" public void update" + beanNameWithoutT + "ById(" + key_type + " " + key + "," + fullParameters + "){\n"); sb.append(" String sql=\"update " + table + " set "); for (Map.Entry entry : fields.entrySet()) { @@ -328,7 +367,7 @@ public class GenerateCode { sb.append(" where " + key + "=?\";\n"); sb.append(" Db.update(sql,"); for (Map.Entry entry : fields.entrySet()) { - if(!entry.getKey().equals("create_time")){ + if (!entry.getKey().equals("create_time")) { sb.append(entry.getKey() + " , "); } }