From d3988cbbdde05730939af1ad2803e6d8b9447c2d 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:20:33 +0800 Subject: [PATCH] 'commit' --- .../java/com/dsideal/Tools/GenerateCode.java | 35 +++++++++++-- .../java/com/dsideal/ZhuQue/Bean/WxRecord.txt | 52 +++++++++++++++++++ .../src/main/resources/application.properties | 6 +-- dsUtils/src/main/resources/log4j.properties | 12 ----- dsUtils/src/main/resources/logback.xml | 39 -------------- dsUtils/target/classes/application.properties | 6 +-- dsUtils/target/classes/log4j.properties | 12 ----- dsUtils/target/classes/logback.xml | 39 -------------- 8 files changed, 88 insertions(+), 113 deletions(-) create mode 100644 dsUtils/src/main/java/com/dsideal/ZhuQue/Bean/WxRecord.txt delete mode 100644 dsUtils/src/main/resources/log4j.properties delete mode 100644 dsUtils/src/main/resources/logback.xml delete mode 100644 dsUtils/target/classes/log4j.properties delete mode 100644 dsUtils/target/classes/logback.xml diff --git a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java index 6552a222..dc328dd0 100644 --- a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java +++ b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java @@ -250,16 +250,17 @@ public class GenerateCode { //主键 String key = jo.getStr("key"); String key_type = jo.getStr("key_type"); - - //1、增加 StringBuilder sb = new StringBuilder(); + sb.append("-------------------下面是Controller部分-------------------\n"); + sb.append("\n"); + //1、增加 sb.append(" //增加" + comment + "\n"); sb.append(" @Before({POST.class})\n"); sb.append(" //@JwtCheckInterface({})\n"); sb.append(" //@EmptyInterface({\"\"})\n"); sb.append(" //@IsNumericInterface({})\n"); sb.append(" public void add" + beanName + "(" + fullParameters + "){\n"); - sb.append(" model.add" + beanName + "(" + parameters + ")\n"); + sb.append(" "+PropKit.get("daoName")+".add" + beanName + "(" + parameters + ")\n"); sb.append(" renderJson(RetKit.renderSuccess(\"操作成功\"));\n"); sb.append(" }\n"); @@ -271,7 +272,7 @@ public class GenerateCode { sb.append(" //@EmptyInterface({\"\"})\n"); sb.append(" //@IsNumericInterface({\"id\"})\n"); sb.append(" public void del" + beanName + "ById(" + key_type + " " + key + "){\n"); - sb.append(" model.del" + beanName + "ById(" + key + ");\n"); + sb.append(" "+PropKit.get("daoName")+".del" + beanName + "ById(" + key + ");\n"); sb.append(" renderJson(RetKit.renderSuccess(\"操作成功\"));\n"); sb.append(" }\n"); @@ -283,15 +284,39 @@ public class GenerateCode { sb.append(" //@EmptyInterface({\"\"})\n"); sb.append(" //@IsNumericInterface({\"id\"})\n"); sb.append(" public void update" + beanName + "ById(" + key_type + " " + key + "," + fullParameters + "){\n"); - sb.append(" model.update" + beanName + "ById(" + parameters + ");\n"); + sb.append(" "+PropKit.get("daoName")+".update" + beanName + "ById(" + parameters + ");\n"); sb.append(" renderJson(RetKit.renderSuccess(\"操作成功\"));\n"); sb.append(" }\n"); sb.append("\n"); //4、单条查询 + sb.append(" //按ID查询" + comment + "\n"); + sb.append(" @Before({GET.class})\n"); + 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(" }\n"); + sb.append("\n"); //5、分页查询 + sb.append(" //分页查询" + comment + "\n"); + 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(" renderJson(RetKit.renderSuccess(listPage));\n"); + sb.append(" }\n"); + sb.append("\n"); + + sb.append("-------------------下面是Model部分-------------------\n"); + sb.append("\n"); System.out.println(sb); + + System.out.println(beanPath+"/"+beanName+".txt"); + FileUtil.writeUtf8String(sb.toString(),beanPath+"/"+beanName+".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 new file mode 100644 index 00000000..24c93dde --- /dev/null +++ b/dsUtils/src/main/java/com/dsideal/ZhuQue/Bean/WxRecord.txt @@ -0,0 +1,52 @@ +-------------------下面是Controller部分------------------- + + //增加维修记录表 + @Before({POST.class}) + //@JwtCheckInterface({}) + //@EmptyInterface({""}) + //@IsNumericInterface({}) + 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 ,){ + wm.addWxRecord(station_id , station_name , equipmentId , equipmentName , connectorId , connectorNo , wx_openid , status_id , type_id , type_name , memo ,) + renderJson(RetKit.renderSuccess("操作成功")); + } + + //按ID删除维修记录表 + @Before({POST.class}) + //@JwtCheckInterface({}) + //@EmptyInterface({""}) + //@IsNumericInterface({"id"}) + public void delWxRecordById(int id){ + wm.delWxRecordById(id); + renderJson(RetKit.renderSuccess("操作成功")); + } + + //按ID修改维修记录表 + @Before({POST.class}) + //@JwtCheckInterface({}) + //@EmptyInterface({""}) + //@IsNumericInterface({"id"}) + 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 ,){ + wm.updateWxRecordById(station_id , station_name , equipmentId , equipmentName , connectorId , connectorNo , wx_openid , status_id , type_id , type_name , memo ,); + renderJson(RetKit.renderSuccess("操作成功")); + } + + //按ID查询维修记录表 + @Before({GET.class}) + //@JwtCheckInterface({}) + //@EmptyInterface({""}) + //@IsNumericInterface({"id"}) + public void getWxRecordById(int id){ + renderJson(RetKit.renderSuccess(wm.getWxRecordById(id))); + } + + //分页查询维修记录表 + @Before({GET.class}) + //@JwtCheckInterface({}) + //@EmptyInterface({""}) + public void getWxRecordList(int pageNum, int pageSize){ + Page listPage = wm.getWxRecordList(stage_id, pageNum, pageSize); + renderJson(RetKit.renderSuccess(listPage)); + } + +-------------------下面是Model部分------------------- + diff --git a/dsUtils/src/main/resources/application.properties b/dsUtils/src/main/resources/application.properties index 293016c0..057cb68e 100644 --- a/dsUtils/src/main/resources/application.properties +++ b/dsUtils/src/main/resources/application.properties @@ -3,13 +3,13 @@ driverClassName=com.mysql.cj.jdbc.Driver user=root password=DsideaL147258369 jdbcUrl=jdbc:mysql://10.10.14.210:22066/ds_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false - # ???? beanPath=D:/dsWork/dsProject/dsUtils/src/main/java - # ??bean??? beanPackage=com.dsideal.ZhuQue.Bean - # ??????? tableName=t_wx_record +# dao??? +daoName=wm + diff --git a/dsUtils/src/main/resources/log4j.properties b/dsUtils/src/main/resources/log4j.properties deleted file mode 100644 index 625cca1e..00000000 --- a/dsUtils/src/main/resources/log4j.properties +++ /dev/null @@ -1,12 +0,0 @@ -log4j.rootLogger=WARN, console -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.conversionPattern=%5p [%t] (%F:%L) - %m%n - -log4j.appender.mq=org.apache.rocketmq.logappender.log4j.RocketmqLog4jAppender -log4j.appender.mq.Topic=TOPIC_MEIWEI_SMS_NOTICE_TEST -log4j.appender.mq.Tag=PID_MEIWEI_SMS_RETRY_TIMEOUT -log4j.appender.mq.ProducerGroup=meiwei-producer-retry -log4j.appender.mq.NameServerAddress=127.0.0.1:9876;127.0.0.1:9877 -log4j.appender.mq.layout=org.apache.log4j.PatternLayout -log4j.appender.mq.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-4r [%t] (%F:%L) % \ No newline at end of file diff --git a/dsUtils/src/main/resources/logback.xml b/dsUtils/src/main/resources/logback.xml deleted file mode 100644 index 2c24fb65..00000000 --- a/dsUtils/src/main/resources/logback.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - %date{yyyy-MM-dd HH:mm:ss.SSS} %boldYellow([%thread]) %highlight(%-5level) %boldGreen(%logger{40}) - - %msg%n - - - - - - ${LOG_HOME}/dsBase.log - - - ${LOG_HOME}/dsBase.log.%d{yyyy-MM-dd}.log - - 30 - - - - %date{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40} - %msg%n - - - - 100MB - - - - - - - - - - \ No newline at end of file diff --git a/dsUtils/target/classes/application.properties b/dsUtils/target/classes/application.properties index 293016c0..057cb68e 100644 --- a/dsUtils/target/classes/application.properties +++ b/dsUtils/target/classes/application.properties @@ -3,13 +3,13 @@ driverClassName=com.mysql.cj.jdbc.Driver user=root password=DsideaL147258369 jdbcUrl=jdbc:mysql://10.10.14.210:22066/ds_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false - # ???? beanPath=D:/dsWork/dsProject/dsUtils/src/main/java - # ??bean??? beanPackage=com.dsideal.ZhuQue.Bean - # ??????? tableName=t_wx_record +# dao??? +daoName=wm + diff --git a/dsUtils/target/classes/log4j.properties b/dsUtils/target/classes/log4j.properties deleted file mode 100644 index 625cca1e..00000000 --- a/dsUtils/target/classes/log4j.properties +++ /dev/null @@ -1,12 +0,0 @@ -log4j.rootLogger=WARN, console -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.conversionPattern=%5p [%t] (%F:%L) - %m%n - -log4j.appender.mq=org.apache.rocketmq.logappender.log4j.RocketmqLog4jAppender -log4j.appender.mq.Topic=TOPIC_MEIWEI_SMS_NOTICE_TEST -log4j.appender.mq.Tag=PID_MEIWEI_SMS_RETRY_TIMEOUT -log4j.appender.mq.ProducerGroup=meiwei-producer-retry -log4j.appender.mq.NameServerAddress=127.0.0.1:9876;127.0.0.1:9877 -log4j.appender.mq.layout=org.apache.log4j.PatternLayout -log4j.appender.mq.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-4r [%t] (%F:%L) % \ No newline at end of file diff --git a/dsUtils/target/classes/logback.xml b/dsUtils/target/classes/logback.xml deleted file mode 100644 index 2c24fb65..00000000 --- a/dsUtils/target/classes/logback.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - %date{yyyy-MM-dd HH:mm:ss.SSS} %boldYellow([%thread]) %highlight(%-5level) %boldGreen(%logger{40}) - - %msg%n - - - - - - ${LOG_HOME}/dsBase.log - - - ${LOG_HOME}/dsBase.log.%d{yyyy-MM-dd}.log - - 30 - - - - %date{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40} - %msg%n - - - - 100MB - - - - - - - - - - \ No newline at end of file