'commit'

10 months ago · d3988cbbdd
parent d92184994f
commit d3988cbbdd
8 changed files with 88 additions and 113 deletions
--- 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<Record> 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");
    }
 }
--- a/dsUtils/src/main/java/com/dsideal/ZhuQue/Bean/WxRecord.txt
+++ 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<Record> listPage = wm.getWxRecordList(stage_id, pageNum, pageSize);
+      renderJson(RetKit.renderSuccess(listPage));
+    }
+
+-------------------下面是Model部分-------------------
+
--- 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
+

--- a/dsUtils/src/main/resources/log4j.properties
+++ b/dsUtils/src/main/resources/log4j.properties
@ -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) %
--- a/dsUtils/src/main/resources/logback.xml
+++ b/dsUtils/src/main/resources/logback.xml
@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration debug="false">
-    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <property name="LOG_HOME" value="/usr/local/tomcat8/logs"/>
-    <!-- 控制台输出 -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} %boldYellow([%thread]) %highlight(%-5level) %boldGreen(%logger{40})
-                - %msg%n
-            </pattern>
-        </encoder>
-    </appender>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_HOME}/dsBase.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/dsBase.log.%d{yyyy-MM-dd}.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <MaxHistory>30</MaxHistory>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40} - %msg%n</pattern>
-        </encoder>
-        <!--日志文件最大的大小-->
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
-    </appender>
-
-    <root level="DEBUG">
-        <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE" />
-    </root>
-    <logger level="debug" additivity="false">
-    </logger>
-</configuration>
--- 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
+

--- a/dsUtils/target/classes/log4j.properties
+++ b/dsUtils/target/classes/log4j.properties
@ -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) %
--- a/dsUtils/target/classes/logback.xml
+++ b/dsUtils/target/classes/logback.xml
@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration debug="false">
-    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <property name="LOG_HOME" value="/usr/local/tomcat8/logs"/>
-    <!-- 控制台输出 -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} %boldYellow([%thread]) %highlight(%-5level) %boldGreen(%logger{40})
-                - %msg%n
-            </pattern>
-        </encoder>
-    </appender>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_HOME}/dsBase.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/dsBase.log.%d{yyyy-MM-dd}.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <MaxHistory>30</MaxHistory>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40} - %msg%n</pattern>
-        </encoder>
-        <!--日志文件最大的大小-->
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
-    </appender>
-
-    <root level="DEBUG">
-        <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE" />
-    </root>
-    <logger level="debug" additivity="false">
-    </logger>
-</configuration>