From 568aa31cd119093fbbf9c5bf0e488cfb80bbcc75 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:34:23 +0800 Subject: [PATCH] 'commit' --- .../java/com/dsideal/Tools/GenerateCode.java | 61 +++++++++++++------ .../java/com/dsideal/ZhuQue/Bean/WxRecord.txt | 16 +++++ 2 files changed, 57 insertions(+), 20 deletions(-) diff --git a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java index dc328dd0..a2dc21e7 100644 --- a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java +++ b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java @@ -72,8 +72,7 @@ public class GenerateCode { } } //类名 - table = dsKit.capitalizeFirstLetter(table); - String className = dsKit.toCamelCase(table); + String beanNameWithoutT = dsKit.toCamelCase(dsKit.capitalizeFirstLetter(table)); //包名 sb.append("package " + beanPackage + ";\n"); @@ -84,7 +83,7 @@ public class GenerateCode { //表描述 sb.append("// " + comment + "\n"); - sb.append("public class " + className + " {\n"); + sb.append("public class " + beanNameWithoutT + " {\n"); List fields = new ArrayList<>(); //字段信息 @@ -126,14 +125,16 @@ public class GenerateCode { sb.append("}\";\n"); sb.append(" }\n"); sb.append("}\n"); - String fileName = beanPath + File.separator + className + ".java"; + String fileName = beanPath + File.separator + beanNameWithoutT + ".java"; FileUtil.writeUtf8String(sb.toString(), fileName); //关闭连接 rs.close(); stmt.close(); jo.put("fields", map); - jo.put("beanName", className); + jo.put("beanNameWithoutT", beanNameWithoutT); + jo.put("beanName", dsKit.toCamelCase(table)); jo.put("comment", comment); + jo.put("table",table); return jo; } @@ -240,16 +241,20 @@ public class GenerateCode { fullParameters = fullParameters.substring(0, fullParameters.length() - 1); parameters = parameters.substring(0, parameters.length() - 1); //后缀名称 - String beanName = jo.getStr("beanName"); - if (beanName.startsWith("T")) { - beanName = beanName.substring(1); + String beanNameWithoutT = jo.getStr("beanNameWithoutT"); + if (beanNameWithoutT.startsWith("T")) { + beanNameWithoutT = beanNameWithoutT.substring(1); } + String beanName = jo.getStr("beanName"); //表的描述 String comment = jo.getStr("comment"); //主键 String key = jo.getStr("key"); String key_type = jo.getStr("key_type"); + //表名 + String table = jo.getStr("table"); + StringBuilder sb = new StringBuilder(); sb.append("-------------------下面是Controller部分-------------------\n"); sb.append("\n"); @@ -259,8 +264,8 @@ public class GenerateCode { sb.append(" //@JwtCheckInterface({})\n"); sb.append(" //@EmptyInterface({\"\"})\n"); sb.append(" //@IsNumericInterface({})\n"); - sb.append(" public void add" + beanName + "(" + fullParameters + "){\n"); - sb.append(" "+PropKit.get("daoName")+".add" + beanName + "(" + parameters + ")\n"); + sb.append(" public void add" + beanNameWithoutT + "(" + fullParameters + "){\n"); + sb.append(" " + PropKit.get("daoName") + ".add" + beanNameWithoutT + "(" + parameters + ")\n"); sb.append(" renderJson(RetKit.renderSuccess(\"操作成功\"));\n"); sb.append(" }\n"); @@ -271,8 +276,8 @@ public class GenerateCode { sb.append(" //@JwtCheckInterface({})\n"); sb.append(" //@EmptyInterface({\"\"})\n"); sb.append(" //@IsNumericInterface({\"id\"})\n"); - sb.append(" public void del" + beanName + "ById(" + key_type + " " + key + "){\n"); - sb.append(" "+PropKit.get("daoName")+".del" + beanName + "ById(" + key + ");\n"); + sb.append(" public void del" + beanNameWithoutT + "ById(" + key_type + " " + key + "){\n"); + sb.append(" " + PropKit.get("daoName") + ".del" + beanNameWithoutT + "ById(" + key + ");\n"); sb.append(" renderJson(RetKit.renderSuccess(\"操作成功\"));\n"); sb.append(" }\n"); @@ -283,8 +288,8 @@ public class GenerateCode { sb.append(" //@JwtCheckInterface({})\n"); sb.append(" //@EmptyInterface({\"\"})\n"); sb.append(" //@IsNumericInterface({\"id\"})\n"); - sb.append(" public void update" + beanName + "ById(" + key_type + " " + key + "," + fullParameters + "){\n"); - sb.append(" "+PropKit.get("daoName")+".update" + beanName + "ById(" + parameters + ");\n"); + sb.append(" public void update" + beanNameWithoutT + "ById(" + key_type + " " + key + "," + fullParameters + "){\n"); + sb.append(" " + PropKit.get("daoName") + ".update" + beanNameWithoutT + "ById(" + parameters + ");\n"); sb.append(" renderJson(RetKit.renderSuccess(\"操作成功\"));\n"); sb.append(" }\n"); sb.append("\n"); @@ -295,8 +300,8 @@ public class GenerateCode { sb.append(" //@JwtCheckInterface({})\n"); sb.append(" //@EmptyInterface({\"\"})\n"); sb.append(" //@IsNumericInterface({\"id\"})\n"); - sb.append(" public void get" + beanName + "ById(" + key_type + " " + key + "){\n"); - sb.append(" renderJson(RetKit.renderSuccess("+PropKit.get("daoName")+".get" + beanName + "ById(" + key + ")));\n"); + sb.append(" public void get" + beanNameWithoutT + "ById(" + key_type + " " + key + "){\n"); + sb.append(" renderJson(RetKit.renderSuccess(" + PropKit.get("daoName") + ".get" + beanNameWithoutT + "ById(" + key + ")));\n"); sb.append(" }\n"); sb.append("\n"); @@ -305,8 +310,8 @@ public class GenerateCode { sb.append(" @Before({GET.class})\n"); sb.append(" //@JwtCheckInterface({})\n"); sb.append(" //@EmptyInterface({\"\"})\n"); - sb.append(" public void get" + beanName + "List(int pageNum, int pageSize){\n"); - sb.append(" Page listPage = "+PropKit.get("daoName")+".get" + beanName + "List(stage_id, pageNum, pageSize);\n"); + sb.append(" public void get" + beanNameWithoutT + "List(int pageNum, int pageSize){\n"); + sb.append(" Page listPage = " + PropKit.get("daoName") + ".get" + beanNameWithoutT + "List(stage_id, pageNum, pageSize);\n"); sb.append(" renderJson(RetKit.renderSuccess(listPage));\n"); sb.append(" }\n"); sb.append("\n"); @@ -314,9 +319,25 @@ public class GenerateCode { sb.append("-------------------下面是Model部分-------------------\n"); sb.append("\n"); + //1、增加 + sb.append("public boolean add" + beanNameWithoutT + "(" + fullParameters + "){\n"); + sb.append(" Record record = new Record();\n"); + for (Map.Entry entry : fields.entrySet()) { + sb.append(" record.set(\"" + entry.getKey() + "\"," +entry.getKey() + ");\n"); + } + sb.append(" Db.save(\""+table+"\",\""+key+"\",record);\n"); + sb.append("}\n"); + //2、删除 + + //3、修改 + + //4、单条查询 + + //5、分页查询 + System.out.println(sb); - System.out.println(beanPath+"/"+beanName+".txt"); - FileUtil.writeUtf8String(sb.toString(),beanPath+"/"+beanName+".txt"); + System.out.println(beanPath + "/" + beanNameWithoutT + ".txt"); + FileUtil.writeUtf8String(sb.toString(), beanPath + "/" + beanNameWithoutT + ".txt"); } } 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 24c93dde..fb4daabc 100644 --- a/dsUtils/src/main/java/com/dsideal/ZhuQue/Bean/WxRecord.txt +++ b/dsUtils/src/main/java/com/dsideal/ZhuQue/Bean/WxRecord.txt @@ -50,3 +50,19 @@ -------------------下面是Model部分------------------- +public boolean 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); + record.set("station_name",station_name); + record.set("equipmentId",equipmentId); + record.set("equipmentName",equipmentName); + record.set("connectorId",connectorId); + record.set("connectorNo",connectorNo); + record.set("wx_openid",wx_openid); + record.set("status_id",status_id); + record.set("create_time",create_time); + record.set("type_id",type_id); + record.set("type_name",type_name); + record.set("memo",memo); + Db.save("t_wx_record","id",record); +}