Administrator 3 years ago
parent
commit
6beea4a450
71 changed files with 1546 additions and 642 deletions
  1. 301 416
      .idea/workspace.xml
  2. BIN
      sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar
  3. BIN
      sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar.original
  4. 4 4
      sooka-auth/target/surefire-reports/TEST-com.sooka.AuthApplicationTests.xml
  5. 1 1
      sooka-auth/target/surefire-reports/com.sooka.AuthApplicationTests.txt
  6. BIN
      sooka-common/target/sooka-common-0.0.1-SNAPSHOT.jar
  7. BIN
      sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar
  8. BIN
      sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar.original
  9. 4 4
      sooka-gateway/target/surefire-reports/TEST-com.sooka.gateway.GatewayApplicationTests.xml
  10. 1 1
      sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt
  11. BIN
      sooka-jersey/target/sooka-jersey-0.0.1-SNAPSHOT.jar
  12. 29 0
      test-api/src/main/java/com/sooka/api/Guiji_Gjj.java
  13. 33 4
      test-api/src/main/java/com/sooka/api_pagefile/application-dev-172.17.5.4(政务外网).yml
  14. 4 2
      test-api/src/main/java/com/sooka/model/bo/TgjjBaseBean.java
  15. 1 10
      test-api/src/main/java/com/sooka/model/bo/TgjjBsxx.java
  16. 1 9
      test-api/src/main/java/com/sooka/model/bo/TgjjDbxx.java
  17. 0 10
      test-api/src/main/java/com/sooka/model/bo/TgjjDkxx.java
  18. 1 9
      test-api/src/main/java/com/sooka/model/bo/TgjjDwckzhbdxx.java
  19. 1 9
      test-api/src/main/java/com/sooka/model/bo/TgjjDwxx.java
  20. 1 9
      test-api/src/main/java/com/sooka/model/bo/TgjjDwzhxx.java
  21. 0 9
      test-api/src/main/java/com/sooka/model/bo/TgjjGrckzhbdxx.java
  22. 0 11
      test-api/src/main/java/com/sooka/model/bo/TgjjGrdkyqxx.java
  23. 0 10
      test-api/src/main/java/com/sooka/model/bo/TgjjGrdkzhbdxx.java
  24. 0 10
      test-api/src/main/java/com/sooka/model/bo/TgjjGrdkzhxx.java
  25. 0 9
      test-api/src/main/java/com/sooka/model/bo/TgjjGrxx.java
  26. 0 9
      test-api/src/main/java/com/sooka/model/bo/TgjjGrzhxx.java
  27. 1 9
      test-api/src/main/java/com/sooka/model/bo/TgjjGtjkrxx.java
  28. 0 11
      test-api/src/main/java/com/sooka/model/bo/TgjjHmdxx.java
  29. 0 11
      test-api/src/main/java/com/sooka/model/bo/TgjjKjhzb.java
  30. 0 12
      test-api/src/main/java/com/sooka/model/bo/TgjjZcxx.java
  31. 7 0
      test-api/src/main/java/com/sooka/service/Guiji_Gjj_Service.java
  32. 353 0
      test-api/src/main/java/com/sooka/service/impl/Guiji_Gjj_ServiceImpl.java
  33. 7 0
      test-api/src/main/resources/application-dev.yml
  34. 2 6
      test-api/src/main/resources/mapper/TgjjBsxxMapper.xml
  35. 20 12
      test-api/src/main/resources/mapper/TgjjBsxxMapper2.xml
  36. 1 1
      test-api/src/main/resources/mapper/TgjjDbxxMapper.xml
  37. 11 1
      test-api/src/main/resources/mapper/TgjjDbxxMapper2.xml
  38. 1 1
      test-api/src/main/resources/mapper/TgjjDkxxMapper.xml
  39. 11 1
      test-api/src/main/resources/mapper/TgjjDkxxMapper2.xml
  40. 1 1
      test-api/src/main/resources/mapper/TgjjDwckzhbdxxMapper.xml
  41. 11 1
      test-api/src/main/resources/mapper/TgjjDwckzhbdxxMapper2.xml
  42. 1 1
      test-api/src/main/resources/mapper/TgjjDwxxMapper.xml
  43. 11 1
      test-api/src/main/resources/mapper/TgjjDwxxMapper2.xml
  44. 1 1
      test-api/src/main/resources/mapper/TgjjDwzhxxMapper.xml
  45. 11 1
      test-api/src/main/resources/mapper/TgjjDwzhxxMapper2.xml
  46. 1 1
      test-api/src/main/resources/mapper/TgjjGrckzhbdxxMapper.xml
  47. 11 1
      test-api/src/main/resources/mapper/TgjjGrckzhbdxxMapper2.xml
  48. 1 1
      test-api/src/main/resources/mapper/TgjjGrdkyqxxMapper.xml
  49. 11 1
      test-api/src/main/resources/mapper/TgjjGrdkyqxxMapper2.xml
  50. 1 1
      test-api/src/main/resources/mapper/TgjjGrdkzhbdxxMapper.xml
  51. 11 1
      test-api/src/main/resources/mapper/TgjjGrdkzhbdxxMapper2.xml
  52. 1 1
      test-api/src/main/resources/mapper/TgjjGrdkzhxxMapper.xml
  53. 11 1
      test-api/src/main/resources/mapper/TgjjGrdkzhxxMapper2.xml
  54. 1 1
      test-api/src/main/resources/mapper/TgjjGrxxMapper.xml
  55. 11 1
      test-api/src/main/resources/mapper/TgjjGrxxMapper2.xml
  56. 1 1
      test-api/src/main/resources/mapper/TgjjGrzhxxMapper.xml
  57. 11 1
      test-api/src/main/resources/mapper/TgjjGrzhxxMapper2.xml
  58. 1 1
      test-api/src/main/resources/mapper/TgjjGtjkrxxMapper.xml
  59. 11 1
      test-api/src/main/resources/mapper/TgjjGtjkrxxMapper2.xml
  60. 1 1
      test-api/src/main/resources/mapper/TgjjHmdxxMapper.xml
  61. 11 1
      test-api/src/main/resources/mapper/TgjjHmdxxMapper2.xml
  62. 1 1
      test-api/src/main/resources/mapper/TgjjKjhzbMapper.xml
  63. 11 1
      test-api/src/main/resources/mapper/TgjjKjhzbMapper2.xml
  64. 1 1
      test-api/src/main/resources/mapper/TgjjZcxxMapper.xml
  65. 11 1
      test-api/src/main/resources/mapper/TgjjZcxxMapper2.xml
  66. 7 0
      test-api/target/classes/application-dev.yml
  67. 3 0
      test-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  68. 4 0
      test-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  69. 551 4
      test-api/target/surefire-reports/TEST-com.sooka.ZsjApiApplicationTests.xml
  70. 29 1
      test-api/target/surefire-reports/com.sooka.ZsjApiApplicationTests.txt
  71. BIN
      test-api/target/test-api-0.0.1-SNAPSHOT.jar.original

File diff suppressed because it is too large
+ 301 - 416
.idea/workspace.xml


BIN
sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar


BIN
sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar.original


File diff suppressed because it is too large
+ 4 - 4
sooka-auth/target/surefire-reports/TEST-com.sooka.AuthApplicationTests.xml


+ 1 - 1
sooka-auth/target/surefire-reports/com.sooka.AuthApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.sooka.AuthApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.749 s - in com.sooka.AuthApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.994 s - in com.sooka.AuthApplicationTests

BIN
sooka-common/target/sooka-common-0.0.1-SNAPSHOT.jar


BIN
sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar


BIN
sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar.original


File diff suppressed because it is too large
+ 4 - 4
sooka-gateway/target/surefire-reports/TEST-com.sooka.gateway.GatewayApplicationTests.xml


+ 1 - 1
sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.sooka.gateway.GatewayApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.712 s - in com.sooka.gateway.GatewayApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 15.807 s - in com.sooka.gateway.GatewayApplicationTests

BIN
sooka-jersey/target/sooka-jersey-0.0.1-SNAPSHOT.jar


+ 29 - 0
test-api/src/main/java/com/sooka/api/Guiji_Gjj.java

@@ -0,0 +1,29 @@
+package com.sooka.api;
+
+import com.sooka.base.BaseApi;
+import com.sooka.model.ResultModel;
+import com.sooka.service.Guiji_Gjj_Service;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import javax.annotation.Resource;
+
+
+@Configuration      //1.主要用于标记配置类,兼备Component的效果。
+@EnableScheduling
+public class Guiji_Gjj extends BaseApi  {
+
+    @Resource
+    Guiji_Gjj_Service guiji_gjj_service;
+
+    final String scheduTime_1 = "0 10 09 ? * *";
+    final String scheduTime_2 = "0 0 0-23 * * ?";
+
+
+    @Scheduled(cron = scheduTime_1)
+    public ResultModel guiji_housingconstruction_hqryzxsjjk() {
+        guiji_gjj_service.data_schedu("2021-11-15 09:05:00","2021-11-15 10:05:00");
+        return null;
+    }
+}

+ 33 - 4
test-api/src/main/java/com/sooka/api_pagefile/application-dev-172.17.5.4(政务外网).yml

@@ -11,8 +11,8 @@ spring:
       primary: db1
       datasource:
         db1:
-#          url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+#          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
 
           username: thsjzt
           password: thsjzt
@@ -35,8 +35,8 @@ spring:
             max-lifetime: 28740000
             connection-test-query: SELECT 1
         db1_gjj:
-#          url: jdbc:mysql://172.18.128.8:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          url: jdbc:mysql://172.17.5.7:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          url: jdbc:mysql://172.18.128.8:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+#          url: jdbc:mysql://172.17.5.7:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
 
           username: thsjzt
           password: thsjzt
@@ -58,6 +58,35 @@ spring:
         # 一个连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认:30分钟1800000ms
             max-lifetime: 28740000
             connection-test-query: SELECT 1
+        db_gjj_s:
+          url: jdbc:mysql://59.198.246.77:32368/jl503001?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          username: jl503001
+          password: Lg83RJp5
+#          url: jdbc:mysql://172.18.128.8:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+#          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+#          username: thsjzt
+#          password: thsjzt
+
+
+
+            # Hikari will use the above plus the following to setup connection pooling
+          type: com.zaxxer.hikari.HikariDataSource
+          hikari:
+        # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没有的连接则发生SQLException,默认:30秒
+            connection-timeout: 30000
+              # 最小连接数
+            minimum-idle: 5
+        # 最大连接数
+            maximum-pool-size: 15
+        # 自动提交
+            auto-commit: true
+        # 一个连接idle状态的最大时长(毫秒),超时则被释放(retired),默认:10分钟
+            idle-timeout: 600000
+        # 连接池的名字
+            pool-name: DatebookHikariCP
+        # 一个连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认:30分钟1800000ms
+            max-lifetime: 28740000
+            connection-test-query: SELECT 1
         db2:
           url: jdbc:mysql://59.198.246.77:32368/jl503033?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
           username: jl503033

+ 4 - 2
test-api/src/main/java/com/sooka/model/bo/TgjjBaseBean.java

@@ -8,11 +8,13 @@ import lombok.Setter;
 public class TgjjBaseBean {
 
     private Long ID;
-    public String cd_source;
+    public String cd_source ="503001";
     public String cd_time;
-    public String cd_batch;
+    public String cd_batch="2021111600001";
     public String cd_operation;
 
+    private Long CLLX;
+
     public String search_begintime;
     public String search_endtime;
 

+ 1 - 10
test-api/src/main/java/com/sooka/model/bo/TgjjBsxx.java

@@ -49,7 +49,7 @@ public class TgjjBsxx extends TgjjBaseBean
 
     private Date lastUpdateTime;
 
-    private Long CLLX;
+
 
     public void setJKHTBH(String JKHTBH)
     {
@@ -186,15 +186,6 @@ public class TgjjBsxx extends TgjjBaseBean
     {
         return lastUpdateTime;
     }
-    public void setCLLX(Long CLLX)
-    {
-        this.CLLX = CLLX;
-    }
-
-    public Long getCLLX()
-    {
-        return CLLX;
-    }
 
     @Override
     public String toString() {

+ 1 - 9
test-api/src/main/java/com/sooka/model/bo/TgjjDbxx.java

@@ -60,7 +60,7 @@ public class TgjjDbxx extends TgjjBaseBean
 
     private String DYFWGFHTH;
 
-    private Long CLLX;
+
 
 
     public void setDBHTBH(String DBHTBH)
@@ -252,15 +252,7 @@ public class TgjjDbxx extends TgjjBaseBean
     {
         return DYFWGFHTH;
     }
-    public void setCLLX(Long CLLX)
-    {
-        this.CLLX = CLLX;
-    }
 
-    public Long getCLLX()
-    {
-        return CLLX;
-    }
 
     @Override
     public String toString() {

+ 0 - 10
test-api/src/main/java/com/sooka/model/bo/TgjjDkxx.java

@@ -92,8 +92,6 @@ public class TgjjDkxx extends TgjjBaseBean
 
     private String DKD;
 
-   private Long CLLX;
-
 
     public void setJKHTBH(String JKHTBH)
     {
@@ -428,15 +426,7 @@ public class TgjjDkxx extends TgjjBaseBean
     {
         return DKD;
     }
-    public void setCLLX(Long CLLX)
-    {
-        this.CLLX = CLLX;
-    }
 
-    public Long getCLLX()
-    {
-        return CLLX;
-    }
 
     @Override
     public String toString() {

+ 1 - 9
test-api/src/main/java/com/sooka/model/bo/TgjjDwckzhbdxx.java

@@ -43,7 +43,7 @@ public class TgjjDwckzhbdxx extends TgjjBaseBean
 
     private Date lastUpdateTime;
 
-    private Long CLLX;
+
 
 
     public void setDWZH(String DWZH)
@@ -154,15 +154,7 @@ public class TgjjDwckzhbdxx extends TgjjBaseBean
     {
         return lastUpdateTime;
     }
-    public void setCLLX(Long CLLX)
-    {
-        this.CLLX = CLLX;
-    }
 
-    public Long getCLLX()
-    {
-        return CLLX;
-    }
 
     @Override
     public String toString() {

+ 1 - 9
test-api/src/main/java/com/sooka/model/bo/TgjjDwxx.java

@@ -69,7 +69,7 @@ public class TgjjDwxx extends TgjjBaseBean
 
     private String DWXZ;
 
-    private Long CLLX;
+
 
 
     public void setDWMC(String DWMC)
@@ -306,15 +306,7 @@ public class TgjjDwxx extends TgjjBaseBean
     {
         return DWXZ;
     }
-    public void setCLLX(Long CLLX)
-    {
-        this.CLLX = CLLX;
-    }
 
-    public Long getCLLX()
-    {
-        return CLLX;
-    }
 
     @Override
     public String toString() {

+ 1 - 9
test-api/src/main/java/com/sooka/model/bo/TgjjDwzhxx.java

@@ -41,7 +41,7 @@ public class TgjjDwzhxx extends TgjjBaseBean
 
     private Date lastUpdateTime;
 
-    private Long CLLX;
+
 
 
     public void setDWZH(String DWZH)
@@ -152,15 +152,7 @@ public class TgjjDwzhxx extends TgjjBaseBean
     {
         return lastUpdateTime;
     }
-    public void setCLLX(Long CLLX)
-    {
-        this.CLLX = CLLX;
-    }
 
-    public Long getCLLX()
-    {
-        return CLLX;
-    }
 
     @Override
     public String toString() {

+ 0 - 9
test-api/src/main/java/com/sooka/model/bo/TgjjGrckzhbdxx.java

@@ -46,7 +46,6 @@ public class TgjjGrckzhbdxx extends TgjjBaseBean
 
     private Date lastUpdateTime;
 
-    private Long CLLX;
 
 
     public void setGRZH(String GRZH)
@@ -175,15 +174,7 @@ public class TgjjGrckzhbdxx extends TgjjBaseBean
     {
         return lastUpdateTime;
     }
-    public void setCLLX(Long CLLX)
-    {
-        this.CLLX = CLLX;
-    }
 
-    public Long getCLLX()
-    {
-        return CLLX;
-    }
 
     @Override
     public String toString() {

+ 0 - 11
test-api/src/main/java/com/sooka/model/bo/TgjjGrdkyqxx.java

@@ -44,9 +44,6 @@ public class TgjjGrdkyqxx extends TgjjBaseBean
 
     private Date lastUpdateTime;
 
-    private Long CLLX;
-
-
     public void setIDXH(String IDXH)
     {
         this.IDXH = IDXH;
@@ -164,15 +161,7 @@ public class TgjjGrdkyqxx extends TgjjBaseBean
     {
         return lastUpdateTime;
     }
-    public void setCLLX(Long CLLX)
-    {
-        this.CLLX = CLLX;
-    }
 
-    public Long getCLLX()
-    {
-        return CLLX;
-    }
 
     @Override
     public String toString() {

+ 0 - 10
test-api/src/main/java/com/sooka/model/bo/TgjjGrdkzhbdxx.java

@@ -47,8 +47,6 @@ public class TgjjGrdkzhbdxx extends TgjjBaseBean
 
     private Date lastUpdateTime;
 
-    private Long CLLX;
-
 
     public void setDKZH(String DKZH)
     {
@@ -185,15 +183,7 @@ public class TgjjGrdkzhbdxx extends TgjjBaseBean
     {
         return lastUpdateTime;
     }
-    public void setCLLX(Long CLLX)
-    {
-        this.CLLX = CLLX;
-    }
 
-    public Long getCLLX()
-    {
-        return CLLX;
-    }
 
     @Override
     public String toString() {

+ 0 - 10
test-api/src/main/java/com/sooka/model/bo/TgjjGrdkzhxx.java

@@ -69,8 +69,6 @@ public class TgjjGrdkzhxx extends TgjjBaseBean
 
     private Date SCHKFSRQ;
 
-    private Long CLLX;
-
 
     public void setDKZH(String DKZH)
     {
@@ -306,15 +304,7 @@ public class TgjjGrdkzhxx extends TgjjBaseBean
     {
         return SCHKFSRQ;
     }
-    public void setCLLX(Long CLLX)
-    {
-        this.CLLX = CLLX;
-    }
 
-    public Long getCLLX()
-    {
-        return CLLX;
-    }
 
     @Override
     public String toString() {

+ 0 - 9
test-api/src/main/java/com/sooka/model/bo/TgjjGrxx.java

@@ -56,7 +56,6 @@ public class TgjjGrxx extends TgjjBaseBean
 
     private Date lastUpdateTime;
 
-    private Long CLLX;
 
 
     public void setGRZH(String GRZH)
@@ -230,15 +229,7 @@ public class TgjjGrxx extends TgjjBaseBean
     {
         return lastUpdateTime;
     }
-    public void setCLLX(Long CLLX)
-    {
-        this.CLLX = CLLX;
-    }
 
-    public Long getCLLX()
-    {
-        return CLLX;
-    }
 
     @Override
     public String toString() {

+ 0 - 9
test-api/src/main/java/com/sooka/model/bo/TgjjGrzhxx.java

@@ -54,7 +54,6 @@ public class TgjjGrzhxx extends TgjjBaseBean
 
     private Date lastUpdateTime;
 
-    private Long CLLX;
 
 
     public void setDWZH(String DWZH)
@@ -228,15 +227,7 @@ public class TgjjGrzhxx extends TgjjBaseBean
     {
         return lastUpdateTime;
     }
-    public void setCLLX(Long CLLX)
-    {
-        this.CLLX = CLLX;
-    }
 
-    public Long getCLLX()
-    {
-        return CLLX;
-    }
 
     @Override
     public String toString() {

+ 1 - 9
test-api/src/main/java/com/sooka/model/bo/TgjjGtjkrxx.java

@@ -37,7 +37,7 @@ public class TgjjGtjkrxx extends TgjjBaseBean
 
     private Date lastUpdateTime;
 
-    private Long CLLX;
+
 
     public void setGTJKRGJJZH(String GTJKRGJJZH)
     {
@@ -129,15 +129,7 @@ public class TgjjGtjkrxx extends TgjjBaseBean
     {
         return lastUpdateTime;
     }
-    public void setCLLX(Long CLLX)
-    {
-        this.CLLX = CLLX;
-    }
 
-    public Long getCLLX()
-    {
-        return CLLX;
-    }
 
     @Override
     public String toString() {

+ 0 - 11
test-api/src/main/java/com/sooka/model/bo/TgjjHmdxx.java

@@ -43,8 +43,6 @@ public class TgjjHmdxx extends TgjjBaseBean
 
     private Date lastUpdateTime;
 
-   private Long CLLX;
-
 
     public void setBLJLID(String BLJLID)
     {
@@ -163,15 +161,6 @@ public class TgjjHmdxx extends TgjjBaseBean
     {
         return lastUpdateTime;
     }
-    public void setCLLX(Long CLLX)
-    {
-        this.CLLX = CLLX;
-    }
-
-    public Long getCLLX()
-    {
-        return CLLX;
-    }
 
     @Override
     public String toString() {

+ 0 - 11
test-api/src/main/java/com/sooka/model/bo/TgjjKjhzb.java

@@ -116,9 +116,6 @@ public class TgjjKjhzb extends TgjjBaseBean
 
     private Date lastUpdateTime;
 
-    private Long CLLX;
-
-
     public void setZXBH(String ZXBH)
     {
         this.ZXBH = ZXBH;
@@ -560,15 +557,7 @@ public class TgjjKjhzb extends TgjjBaseBean
     {
         return lastUpdateTime;
     }
-    public void setCLLX(Long CLLX)
-    {
-        this.CLLX = CLLX;
-    }
 
-    public Long getCLLX()
-    {
-        return CLLX;
-    }
 
     @Override
     public String toString() {

+ 0 - 12
test-api/src/main/java/com/sooka/model/bo/TgjjZcxx.java

@@ -55,9 +55,6 @@ public class TgjjZcxx extends TgjjBaseBean
 
     private Date lastUpdateTime;
 
-    private Long CLLX;
-
-
     public void setDWJCBLSX(BigDecimal DWJCBLSX)
     {
         this.DWJCBLSX = DWJCBLSX;
@@ -229,15 +226,6 @@ public class TgjjZcxx extends TgjjBaseBean
     {
         return lastUpdateTime;
     }
-    public void setCLLX(Long CLLX)
-    {
-        this.CLLX = CLLX;
-    }
-
-    public Long getCLLX()
-    {
-        return CLLX;
-    }
 
     @Override
     public String toString() {

+ 7 - 0
test-api/src/main/java/com/sooka/service/Guiji_Gjj_Service.java

@@ -0,0 +1,7 @@
+package com.sooka.service;
+
+public interface Guiji_Gjj_Service {
+
+    public void data_schedu(String begin_time,String end_time);
+
+}

+ 353 - 0
test-api/src/main/java/com/sooka/service/impl/Guiji_Gjj_ServiceImpl.java

@@ -0,0 +1,353 @@
+package com.sooka.service.impl;
+
+import com.sooka.mapper.*;
+import com.sooka.model.bo.*;
+import com.sooka.service.Guiji_Gjj_Service;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class Guiji_Gjj_ServiceImpl implements Guiji_Gjj_Service {
+
+    @Resource
+    TgjjBsxxMapper tgjjBsxxMapper;
+    @Resource
+    TgjjBsxxMapper2 tgjjBsxxMapper2;
+    @Resource
+    TgjjDbxxMapper tgjjDbxxMapper;
+    @Resource
+    TgjjDbxxMapper2 tgjjDbxxMapper2;
+    @Resource
+    TgjjDkxxMapper tgjjDkxxMapper;
+    @Resource
+    TgjjDkxxMapper2 tgjjDkxxMapper2;
+    @Resource
+    TgjjDwckzhbdxxMapper tgjjDwckzhbdxxMapper;
+    @Resource
+    TgjjDwckzhbdxxMapper2 tgjjDwckzhbdxxMapper2;
+    @Resource
+    TgjjDwxxMapper tgjjDwxxMapper;
+    @Resource
+    TgjjDwxxMapper2 tgjjDwxxMapper2;
+    @Resource
+    TgjjDwzhxxMapper tgjjDwzhxxMapper;
+    @Resource
+    TgjjDwzhxxMapper2 tgjjDwzhxxMapper2;
+    @Resource
+    TgjjGrckzhbdxxMapper tgjjGrckzhbdxxMapper;
+    @Resource
+    TgjjGrckzhbdxxMapper2 tgjjGrckzhbdxxMapper2;
+    @Resource
+    TgjjGrdkyqxxMapper tgjjGrdkyqxxMapper;
+    @Resource
+    TgjjGrdkyqxxMapper2 tgjjGrdkyqxxMapper2;
+    @Resource
+    TgjjGrdkzhbdxxMapper tgjjGrdkzhbdxxMapper;
+    @Resource
+    TgjjGrdkzhbdxxMapper2 tgjjGrdkzhbdxxMapper2;
+    @Resource
+    TgjjGrdkzhxxMapper tgjjGrdkzhxxMapper;
+    @Resource
+    TgjjGrdkzhxxMapper2 tgjjGrdkzhxxMapper2;
+    @Resource
+    TgjjGrxxMapper tgjjGrxxMapper;
+    @Resource
+    TgjjGrxxMapper2 tgjjGrxxMapper2;
+    @Resource
+    TgjjGrzhxxMapper tgjjGrzhxxMapper;
+    @Resource
+    TgjjGrzhxxMapper2 tgjjGrzhxxMapper2;
+    @Resource
+    TgjjGtjkrxxMapper tgjjGtjkrxxMapper;
+    @Resource
+    TgjjGtjkrxxMapper2 tgjjGtjkrxxMapper2;
+    @Resource
+    TgjjHmdxxMapper tgjjHmdxxMapper;
+    @Resource
+    TgjjHmdxxMapper2 tgjjHmdxxMapper2;
+    @Resource
+    TgjjKjhzbMapper tgjjKjhzbMapper;
+    @Resource
+    TgjjKjhzbMapper2 tgjjKjhzbMapper2;
+    @Resource
+    TgjjZcxxMapper tgjjZcxxMapper;
+    @Resource
+    TgjjZcxxMapper2 tgjjZcxxMapper2;
+
+    SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    SimpleDateFormat f2 = new SimpleDateFormat("yyyyMMdd");
+
+    public Long make_cd_operation(TgjjBaseBean t){
+        Date d = new Date();
+        t.setCd_time(f.format(d));
+        t.setCd_batch(f2.format(d)+"00001");
+        if(t.getCLLX() == 1){
+            t.setCd_operation("I");
+        }else{
+            if(t.getCLLX() == 2){
+                t.setCd_operation("U");
+            }else if(t.getCLLX() == 3){
+                t.setCd_operation("D");
+            }
+        }
+        return t.getCLLX();
+    }
+
+
+    @Override
+    public void data_schedu(String begin_time,String end_time) {
+
+
+
+
+        TgjjBsxx tgjjBsxx = new TgjjBsxx();
+        tgjjBsxx.setSearch_begintime(begin_time);
+        tgjjBsxx.setSearch_endtime(end_time);
+        List<TgjjBsxx> ls_tgjjBsxx = tgjjBsxxMapper.selectTgjjBsxxList(tgjjBsxx);
+        System.out.println("=========bsxx======"+ls_tgjjBsxx.size());
+        for(int i=0;i<ls_tgjjBsxx.size();i++){
+            System.out.println("==========="+i);
+            TgjjBsxx t = ls_tgjjBsxx.get(i);
+            make_cd_operation(t);
+            if(t.getCLLX() == 1){
+                tgjjBsxxMapper2.insertTgjjBsxx(t);
+            }else{
+                tgjjBsxxMapper2.updateTgjjBsxx(t);
+            }
+        }
+
+
+        TgjjDbxx tgjjDbxx = new TgjjDbxx();
+        tgjjDbxx.setSearch_begintime(begin_time);
+        tgjjDbxx.setSearch_endtime(end_time);
+        List<TgjjDbxx> ls_tgjjDbxx = tgjjDbxxMapper.selectTgjjDbxxList(tgjjDbxx);
+        for(int i=0;i<ls_tgjjDbxx.size();i++){
+            TgjjDbxx t = ls_tgjjDbxx.get(i);
+            make_cd_operation(t);
+            if(t.getCLLX() == 1){
+                tgjjDbxxMapper2.insertTgjjDbxx(t);
+            }else{
+                tgjjDbxxMapper2.updateTgjjDbxx(t);
+            }
+
+        }
+
+
+        TgjjDkxx tgjjDkxx = new TgjjDkxx();
+        tgjjDkxx.setSearch_begintime(begin_time);
+        tgjjDkxx.setSearch_endtime(end_time);
+        List<TgjjDkxx> ls_tgjjDkxx = tgjjDkxxMapper.selectTgjjDkxxList(tgjjDkxx);
+        for(int i=0;i<ls_tgjjDkxx.size();i++){
+            TgjjDkxx t = ls_tgjjDkxx.get(i);
+            make_cd_operation(t);
+            if(t.getCLLX() == 1){
+                tgjjDkxxMapper2.insertTgjjDkxx(t);
+            }else{
+                tgjjDkxxMapper2.updateTgjjDkxx(t);
+            }
+        }
+
+        TgjjDwckzhbdxx tgjjDwckzhbdxx = new TgjjDwckzhbdxx();
+        tgjjDwckzhbdxx.setSearch_begintime(begin_time);
+        tgjjDwckzhbdxx.setSearch_endtime(end_time);
+        List<TgjjDwckzhbdxx> ls_tgjjDwckzhbdxx = tgjjDwckzhbdxxMapper.selectTgjjDwckzhbdxxList(tgjjDwckzhbdxx);
+        for(int i=0;i<ls_tgjjDwckzhbdxx.size();i++){
+            TgjjDwckzhbdxx t = ls_tgjjDwckzhbdxx.get(i);
+            make_cd_operation(t);
+            if(t.getCLLX() == 1){
+                tgjjDwckzhbdxxMapper2.insertTgjjDwckzhbdxx(t);
+            }else{
+                tgjjDwckzhbdxxMapper2.updateTgjjDwckzhbdxx(t);
+            }
+
+        }
+
+        TgjjDwxx tgjjDwxx = new TgjjDwxx();
+        tgjjDwxx.setSearch_begintime(begin_time);
+        tgjjDwxx.setSearch_endtime(end_time);
+        List<TgjjDwxx> ls_tgjjDwxx = tgjjDwxxMapper.selectTgjjDwxxList(tgjjDwxx);
+        for(int i=0;i<ls_tgjjDwxx.size();i++){
+            TgjjDwxx t = ls_tgjjDwxx.get(i);
+            make_cd_operation(t);
+            if(t.getCLLX() == 1){
+                tgjjDwxxMapper2.insertTgjjDwxx(t);
+            }else{
+                tgjjDwxxMapper2.updateTgjjDwxx(t);
+            }
+        }
+
+        TgjjDwzhxx dwzhxx = new TgjjDwzhxx();
+        dwzhxx.setSearch_begintime(begin_time);
+        dwzhxx.setSearch_endtime(end_time);
+        List<TgjjDwzhxx> ls_dwzhxx = tgjjDwzhxxMapper.selectTgjjDwzhxxList(dwzhxx);
+        for (int i = 0; i < ls_dwzhxx.size(); i++) {
+            TgjjDwzhxx t = ls_dwzhxx.get(i);
+            make_cd_operation(t);
+            if(t.getCLLX() == 1){
+                tgjjDwzhxxMapper2.insertTgjjDwzhxx(t);
+            }else{
+                tgjjDwzhxxMapper2.updateTgjjDwzhxx(t);
+            }
+        }
+
+
+        TgjjGrckzhbdxx tgjjGrckzhbdxx = new TgjjGrckzhbdxx();
+        tgjjGrckzhbdxx.setSearch_begintime(begin_time);
+        tgjjGrckzhbdxx.setSearch_endtime(end_time);
+        List<TgjjGrckzhbdxx> ls_tgjjGrckzhbdxx = tgjjGrckzhbdxxMapper.selectTgjjGrckzhbdxxList(tgjjGrckzhbdxx);
+        for (int i = 0; i < ls_tgjjGrckzhbdxx.size(); i++) {
+            TgjjGrckzhbdxx t = ls_tgjjGrckzhbdxx.get(i);
+            make_cd_operation(t);
+            if(t.getCLLX() == 1){
+                tgjjGrckzhbdxxMapper2.insertTgjjGrckzhbdxx(t);
+            }else{
+                tgjjGrckzhbdxxMapper2.updateTgjjGrckzhbdxx(t);
+            }
+
+        }
+
+
+        TgjjGrdkyqxx tgjjGrdkyqxx = new TgjjGrdkyqxx();
+        tgjjGrdkyqxx.setSearch_begintime(begin_time);
+        tgjjGrdkyqxx.setSearch_endtime(end_time);
+        List<TgjjGrdkyqxx> ls_tgjjGrdkyqxx = tgjjGrdkyqxxMapper.selectTgjjGrdkyqxxList(tgjjGrdkyqxx);
+        for (int i = 0; i < ls_tgjjGrdkyqxx.size(); i++) {
+            TgjjGrdkyqxx t = ls_tgjjGrdkyqxx.get(i);
+            make_cd_operation(t);
+            if(t.getCLLX() == 1){
+                tgjjGrdkyqxxMapper2.insertTgjjGrdkyqxx(t);
+            }else{
+                tgjjGrdkyqxxMapper2.updateTgjjGrdkyqxx(t);
+            }
+
+        }
+
+        TgjjGrdkzhbdxx tgjjGrdkzhbdxx = new TgjjGrdkzhbdxx();
+        tgjjGrdkzhbdxx.setSearch_begintime(begin_time);
+        tgjjGrdkzhbdxx.setSearch_begintime(end_time);
+        List<TgjjGrdkzhbdxx> ls_tgjjGrdkzhbdxx = tgjjGrdkzhbdxxMapper.selectTgjjGrdkzhbdxxList(tgjjGrdkzhbdxx);
+        for (int i = 0; i < ls_tgjjGrdkzhbdxx.size(); i++) {
+            TgjjGrdkzhbdxx  t = ls_tgjjGrdkzhbdxx.get(i);
+            make_cd_operation(t);
+            if(t.getCLLX() == 1){
+                tgjjGrdkzhbdxxMapper2.insertTgjjGrdkzhbdxx(t);
+            }else{
+                tgjjGrdkzhbdxxMapper2.updateTgjjGrdkzhbdxx(t);
+            }
+        }
+
+        TgjjGrdkzhxx tgjjGrdkzhxx = new TgjjGrdkzhxx();
+        tgjjGrdkzhxx.setSearch_begintime(begin_time);
+        tgjjGrdkzhxx.setSearch_begintime(end_time);
+        List<TgjjGrdkzhxx> ls_tgjjGrdkzhxx = tgjjGrdkzhxxMapper.selectTgjjGrdkzhxxList(tgjjGrdkzhxx);
+        for (int i = 0; i < ls_tgjjGrdkzhxx.size(); i++) {
+            TgjjGrdkzhxx t = ls_tgjjGrdkzhxx.get(i);
+            make_cd_operation(t);
+            if(t.getCLLX() == 1){
+                tgjjGrdkzhxxMapper2.insertTgjjGrdkzhxx(t);
+            }else{
+                tgjjGrdkzhxxMapper2.updateTgjjGrdkzhxx(t);
+            }
+
+        }
+
+        TgjjGrxx tgjjGrxx = new TgjjGrxx();
+        tgjjGrxx.setSearch_begintime(begin_time);
+        tgjjGrxx.setSearch_begintime(end_time);
+        List<TgjjGrxx> ls_tgjjGrxx = tgjjGrxxMapper.selectTgjjGrxxList(tgjjGrxx);
+        for (int i = 0; i < ls_tgjjGrxx.size(); i++) {
+            TgjjGrxx t = ls_tgjjGrxx.get(i);
+            make_cd_operation(t);
+            if(t.getCLLX() == 1){
+                tgjjGrxxMapper2.insertTgjjGrxx(t);
+            }else{
+                tgjjGrxxMapper2.updateTgjjGrxx(t);
+            }
+
+        }
+
+        TgjjGrzhxx tgjjGrzhxx = new TgjjGrzhxx();
+        tgjjGrzhxx.setSearch_begintime(begin_time);
+        tgjjGrzhxx.setSearch_begintime(end_time);
+        List<TgjjGrzhxx> ls_tgjjGrzhxx = tgjjGrzhxxMapper.selectTgjjGrzhxxList(tgjjGrzhxx);
+        for (int i = 0; i < ls_tgjjGrzhxx.size(); i++) {
+            TgjjGrzhxx t = ls_tgjjGrzhxx.get(i);
+            make_cd_operation(t);
+            if(t.getCLLX() == 1){
+                tgjjGrzhxxMapper2.insertTgjjGrzhxx(t);
+            }else{
+                tgjjGrzhxxMapper2.updateTgjjGrzhxx(t);
+            }
+
+        }
+
+        TgjjGtjkrxx tgjjGtjkrxx = new TgjjGtjkrxx();
+        tgjjGtjkrxx.setSearch_begintime(begin_time);
+        tgjjGtjkrxx.setSearch_begintime(end_time);
+        List<TgjjGtjkrxx> ls_tgjjGtjkrxx = tgjjGtjkrxxMapper.selectTgjjGtjkrxxList(tgjjGtjkrxx);
+        for (int i = 0; i < ls_tgjjGtjkrxx.size(); i++) {
+            TgjjGtjkrxx t = ls_tgjjGtjkrxx.get(i);
+            make_cd_operation(t);
+            if(t.getCLLX() == 1){
+                tgjjGtjkrxxMapper2.insertTgjjGtjkrxx(t);
+            }else{
+                tgjjGtjkrxxMapper2.updateTgjjGtjkrxx(t);
+            }
+
+        }
+
+        TgjjHmdxx tgjjHmdxx = new TgjjHmdxx();
+        tgjjHmdxx.setSearch_begintime(begin_time);
+        tgjjHmdxx.setSearch_begintime(end_time);
+        List<TgjjHmdxx> ls_tgjjHmdxx = tgjjHmdxxMapper.selectTgjjHmdxxList(tgjjHmdxx);
+        for (int i = 0; i < ls_tgjjHmdxx.size(); i++) {
+            TgjjHmdxx t = ls_tgjjHmdxx.get(i);
+            make_cd_operation(t);
+            if(t.getCLLX() == 1){
+                tgjjHmdxxMapper2.insertTgjjHmdxx(t);
+            }else{
+                tgjjHmdxxMapper2.updateTgjjHmdxx(t);
+            }
+
+        }
+
+        TgjjKjhzb tgjjKjhzb = new TgjjKjhzb();
+        tgjjKjhzb.setSearch_begintime(begin_time);
+        tgjjKjhzb.setSearch_endtime(end_time);
+        List<TgjjKjhzb> ls_tgjjKjhzb = tgjjKjhzbMapper.selectTgjjKjhzbList(tgjjKjhzb);
+        for (int i = 0; i < ls_tgjjKjhzb.size(); i++) {
+            TgjjKjhzb t = ls_tgjjKjhzb.get(i);
+            make_cd_operation(t);
+            if(t.getCLLX() == 1){
+                tgjjKjhzbMapper2.insertTgjjKjhzb(t);
+            }else{
+                tgjjKjhzbMapper2.updateTgjjKjhzb(t);
+            }
+
+        }
+
+
+
+
+
+        TgjjZcxx tgjjZcxx = new TgjjZcxx();
+        tgjjBsxx.setSearch_begintime(begin_time);
+        tgjjBsxx.setSearch_endtime(end_time);
+        List<TgjjZcxx> ls_tgjjZcxx = tgjjZcxxMapper.selectTgjjZcxxList(tgjjZcxx);
+        for(int i=0;i<ls_tgjjZcxx.size();i++){
+            TgjjZcxx t = ls_tgjjZcxx.get(i);
+            make_cd_operation(t);
+            if(t.getCLLX() == 1){
+                tgjjZcxxMapper2.insertTgjjZcxx(t);
+            }else{
+                tgjjZcxxMapper2.updateTgjjZcxx(t);
+            }
+        }
+        System.out.println("*******");
+
+    }
+}

+ 7 - 0
test-api/src/main/resources/application-dev.yml

@@ -62,6 +62,13 @@ spring:
           url: jdbc:mysql://59.198.246.77:32368/jl503001?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
           username: jl503001
           password: Lg83RJp5
+#          url: jdbc:mysql://172.18.128.8:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+#          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+#          username: thsjzt
+#          password: thsjzt
+
+
+
             # Hikari will use the above plus the following to setup connection pooling
           type: com.zaxxer.hikari.HikariDataSource
           hikari:

+ 2 - 6
test-api/src/main/resources/mapper/TgjjBsxxMapper.xml

@@ -6,8 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.sooka.model.bo.TgjjBsxx" id="TgjjBsxxResult">
     </resultMap>
-    <parameterMap id="TgjjBsxx" type="com.sooka.model.bo.TgjjBsxx">
-    </parameterMap>
+    <parameterMap id="TgjjBsxx" type="com.sooka.model.bo.TgjjBsxx"></parameterMap>
 
     <sql id="selectTgjjBsxxVo">
         select ID, JKHTBH, JKRXM, JKRZJLX, JKRZJH, SFST, SFSB, DKLX, YDFKRQ, YDDQRQ, DKKHRQ, SCHKRQ, DKZT, DKJQRQ, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_bsxx
@@ -32,9 +31,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ZXBH != null  and ZXBH != ''"> and ZXBH = #{ZXBH}</if>
             <if test="lastUpdateTime != null "> and LAST_UPDATE_TIME = #{lastUpdateTime}</if>
             <if test="CLLX != null "> and CLLX = #{CLLX}</if>
-            <if test="search_begintime != null"> and  LAST_UPDATE_TIME >= #{search_begintime}</if>
-            <if test="search_endtime != null"> and  LAST_UPDATE_TIME &lt; #{search_endtime}</if>
-
         </where>
     </select>
 
@@ -65,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="JKHTBH != null">#{JKHTBH},</if>
             <if test="JKRXM != null">#{JKRXM},</if>
             <if test="JKRZJLX != null">#{JKRZJLX},</if>

+ 20 - 12
test-api/src/main/resources/mapper/TgjjBsxxMapper2.xml

@@ -1,13 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.mapper.TgjjBsxxMapper2">
 
+    <sql id="global_name">
+        ID,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{ID},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
+
+
     <resultMap type="com.sooka.model.bo.TgjjBsxx" id="TgjjBsxxResult">
     </resultMap>
-    <parameterMap id="TgjjBsxx" type="com.sooka.model.bo.TgjjBsxx">
-    </parameterMap>
+    <parameterMap id="TgjjBsxx" type="com.sooka.model.bo.TgjjBsxx"></parameterMap>
 
     <sql id="selectTgjjBsxxVo">
         select ID, JKHTBH, JKRXM, JKRZJLX, JKRZJH, SFST, SFSB, DKLX, YDFKRQ, YDDQRQ, DKKHRQ, SCHKRQ, DKZT, DKJQRQ, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_bsxx
@@ -32,9 +43,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ZXBH != null  and ZXBH != ''"> and ZXBH = #{ZXBH}</if>
             <if test="lastUpdateTime != null "> and LAST_UPDATE_TIME = #{lastUpdateTime}</if>
             <if test="CLLX != null "> and CLLX = #{CLLX}</if>
-            <if test="search_begintime != null"> and  LAST_UPDATE_TIME >= #{search_begintime}</if>
-            <if test="search_endtime != null"> and  LAST_UPDATE_TIME &lt; #{search_endtime}</if>
-
         </where>
     </select>
 
@@ -46,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTgjjBsxx" parameterMap="TgjjBsxx" useGeneratedKeys="true" keyProperty="ID">
         insert into tgjj_bsxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ID != null">ID,</if>
+            <include refid="global_name"></include>
             <if test="JKHTBH != null">JKHTBH,</if>
             <if test="JKRXM != null">JKRXM,</if>
             <if test="JKRZJLX != null">JKRZJLX,</if>
@@ -63,9 +71,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ZXBH != null">ZXBH,</if>
             <if test="lastUpdateTime != null">LAST_UPDATE_TIME,</if>
             <if test="CLLX != null">CLLX,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <include refid="global_value"></include>
             <if test="JKHTBH != null">#{JKHTBH},</if>
             <if test="JKRXM != null">#{JKRXM},</if>
             <if test="JKRZJLX != null">#{JKRZJLX},</if>
@@ -82,12 +90,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ZXBH != null">#{ZXBH},</if>
             <if test="lastUpdateTime != null">#{lastUpdateTime},</if>
             <if test="CLLX != null">#{CLLX},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateTgjjBsxx" parameterMap="TgjjBsxx">
         update tgjj_bsxx
         <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
             <if test="JKHTBH != null">JKHTBH = #{JKHTBH},</if>
             <if test="JKRXM != null">JKRXM = #{JKRXM},</if>
             <if test="JKRZJLX != null">JKRZJLX = #{JKRZJLX},</if>
@@ -109,5 +118,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
 
-
 </mapper>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjDbxxMapper.xml

@@ -75,7 +75,7 @@
             <if test="CLLX != null">CLLX,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="DBHTBH != null">#{DBHTBH},</if>
             <if test="JKHTBH != null">#{JKHTBH},</if>
             <if test="DBJGMC != null">#{DBJGMC},</if>

+ 11 - 1
test-api/src/main/resources/mapper/TgjjDbxxMapper2.xml

@@ -4,6 +4,16 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.mapper.TgjjDbxxMapper2">
 
+    <sql id="global_name">
+        ID,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{ID},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
     <resultMap type="com.sooka.model.bo.TgjjDbxx" id="TgjjDbxxResult">
     </resultMap>
     <parameterMap id="TgjjDbxx" type="com.sooka.model.bo.TgjjDbxx"></parameterMap>
@@ -75,7 +85,7 @@
             <if test="CLLX != null">CLLX,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="DBHTBH != null">#{DBHTBH},</if>
             <if test="JKHTBH != null">#{JKHTBH},</if>
             <if test="DBJGMC != null">#{DBJGMC},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjDkxxMapper.xml

@@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="JKHTBH != null">#{JKHTBH},</if>
             <if test="GFHTBH != null">#{GFHTBH},</if>
             <if test="SWTYHMC != null">#{SWTYHMC},</if>

+ 11 - 1
test-api/src/main/resources/mapper/TgjjDkxxMapper2.xml

@@ -4,6 +4,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.mapper.TgjjDkxxMapper2">
 
+    <sql id="global_name">
+        ID,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{ID},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
     <resultMap type="com.sooka.model.bo.TgjjDkxx" id="TgjjDkxxResult">
     </resultMap>
     <parameterMap id="TgjjDkxx" type="com.sooka.model.bo.TgjjDkxx"></parameterMap>
@@ -108,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="JKHTBH != null">#{JKHTBH},</if>
             <if test="GFHTBH != null">#{GFHTBH},</if>
             <if test="SWTYHMC != null">#{SWTYHMC},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjDwckzhbdxxMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="DWZH != null">#{DWZH},</if>
             <if test="JZRQ != null">#{JZRQ},</if>
             <if test="FSE != null">#{FSE},</if>

+ 11 - 1
test-api/src/main/resources/mapper/TgjjDwckzhbdxxMapper2.xml

@@ -4,6 +4,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.mapper.TgjjDwckzhbdxxMapper2">
 
+    <sql id="global_name">
+        ID,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{ID},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
     <resultMap type="com.sooka.model.bo.TgjjDwckzhbdxx" id="TgjjDwckzhbdxxResult">
 
     </resultMap>
@@ -59,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="DWZH != null">#{DWZH},</if>
             <if test="JZRQ != null">#{JZRQ},</if>
             <if test="FSE != null">#{FSE},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjDwxxMapper.xml

@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="DWMC != null">#{DWMC},</if>
             <if test="DWZH != null">#{DWZH},</if>
             <if test="DWDZ != null">#{DWDZ},</if>

+ 11 - 1
test-api/src/main/resources/mapper/TgjjDwxxMapper2.xml

@@ -4,6 +4,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.mapper.TgjjDwxxMapper2">
 
+    <sql id="global_name">
+        ID,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{ID},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
     <resultMap type="com.sooka.model.bo.TgjjDwxx" id="TgjjDwxxResult">
 
     </resultMap>
@@ -87,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="DWMC != null">#{DWMC},</if>
             <if test="DWZH != null">#{DWZH},</if>
             <if test="DWDZ != null">#{DWDZ},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjDwzhxxMapper.xml

@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="DWZH != null">#{DWZH},</if>
             <if test="DWJCBL != null">#{DWJCBL},</if>
             <if test="GRJCBL != null">#{GRJCBL},</if>

+ 11 - 1
test-api/src/main/resources/mapper/TgjjDwzhxxMapper2.xml

@@ -4,6 +4,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.mapper.TgjjDwzhxxMapper2">
 
+    <sql id="global_name">
+        ID,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{ID},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
     <resultMap type="com.sooka.model.bo.TgjjDwzhxx" id="TgjjDwzhxxResult">
     </resultMap>
     <parameterMap id="TgjjDwzhxx" type="com.sooka.model.bo.TgjjDwzhxx"></parameterMap>
@@ -58,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="DWZH != null">#{DWZH},</if>
             <if test="DWJCBL != null">#{DWJCBL},</if>
             <if test="GRJCBL != null">#{GRJCBL},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjGrckzhbdxxMapper.xml

@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="GRZH != null">#{GRZH},</if>
             <if test="JZRQ != null">#{JZRQ},</if>
             <if test="GJHTQYWLX != null">#{GJHTQYWLX},</if>

+ 11 - 1
test-api/src/main/resources/mapper/TgjjGrckzhbdxxMapper2.xml

@@ -4,6 +4,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.mapper.TgjjGrckzhbdxxMapper2">
 
+    <sql id="global_name">
+        ID,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{ID},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
     <resultMap type="com.sooka.model.bo.TgjjGrckzhbdxx" id="TgjjGrckzhbdxxResult">
 
     </resultMap>
@@ -63,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="GRZH != null">#{GRZH},</if>
             <if test="JZRQ != null">#{JZRQ},</if>
             <if test="GJHTQYWLX != null">#{GJHTQYWLX},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjGrdkyqxxMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="IDXH != null">#{IDXH},</if>
             <if test="DKZH != null">#{DKZH},</if>
             <if test="YQQC != null">#{YQQC},</if>

+ 11 - 1
test-api/src/main/resources/mapper/TgjjGrdkyqxxMapper2.xml

@@ -4,6 +4,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.mapper.TgjjGrdkyqxxMapper2">
 
+    <sql id="global_name">
+        ID,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{ID},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
     <resultMap type="com.sooka.model.bo.TgjjGrdkyqxx" id="TgjjGrdkyqxxResult">
 
     </resultMap>
@@ -61,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="IDXH != null">#{IDXH},</if>
             <if test="DKZH != null">#{DKZH},</if>
             <if test="YQQC != null">#{YQQC},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjGrdkzhbdxxMapper.xml

@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="DKZH != null">#{DKZH},</if>
             <if test="YWLSH != null">#{YWLSH},</if>
             <if test="DKYWMXLX != null">#{DKYWMXLX},</if>

+ 11 - 1
test-api/src/main/resources/mapper/TgjjGrdkzhbdxxMapper2.xml

@@ -4,6 +4,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.mapper.TgjjGrdkzhbdxxMapper2">
 
+    <sql id="global_name">
+        ID,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{ID},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
     <resultMap type="com.sooka.model.bo.TgjjGrdkzhbdxx" id="TgjjGrdkzhbdxxResult">
 
     </resultMap>
@@ -65,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="DKZH != null">#{DKZH},</if>
             <if test="YWLSH != null">#{YWLSH},</if>
             <if test="DKYWMXLX != null">#{DKYWMXLX},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjGrdkzhxxMapper.xml

@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="DKZH != null">#{DKZH},</if>
             <if test="JKHTBH != null">#{JKHTBH},</if>
             <if test="DKFXDJ != null">#{DKFXDJ},</if>

+ 11 - 1
test-api/src/main/resources/mapper/TgjjGrdkzhxxMapper2.xml

@@ -4,6 +4,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.mapper.TgjjGrdkzhxxMapper2">
 
+    <sql id="global_name">
+        ID,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{ID},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
     <resultMap type="com.sooka.model.bo.TgjjGrdkzhxx" id="TgjjGrdkzhxxResult">
 
     </resultMap>
@@ -87,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="DKZH != null">#{DKZH},</if>
             <if test="JKHTBH != null">#{JKHTBH},</if>
             <if test="DKFXDJ != null">#{DKFXDJ},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjGrxxMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="GRZH != null and GRZH != ''">#{GRZH},</if>
             <if test="XINGMING != null">#{XINGMING},</if>
             <if test="XMQP != null">#{XMQP},</if>

+ 11 - 1
test-api/src/main/resources/mapper/TgjjGrxxMapper2.xml

@@ -4,6 +4,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.mapper.TgjjGrxxMapper2">
 
+    <sql id="global_name">
+        ID,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{ID},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
     <resultMap type="com.sooka.model.bo.TgjjGrxx" id="TgjjGrxxResult">
 
     </resultMap>
@@ -73,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="GRZH != null and GRZH != ''">#{GRZH},</if>
             <if test="XINGMING != null">#{XINGMING},</if>
             <if test="XMQP != null">#{XMQP},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjGrzhxxMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="DWZH != null">#{DWZH},</if>
             <if test="GRJCBL != null">#{GRJCBL},</if>
             <if test="JZNY != null">#{JZNY},</if>

+ 11 - 1
test-api/src/main/resources/mapper/TgjjGrzhxxMapper2.xml

@@ -4,6 +4,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.mapper.TgjjGrzhxxMapper2">
 
+    <sql id="global_name">
+        ID,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{ID},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
     <resultMap type="com.sooka.model.bo.TgjjGrzhxx" id="TgjjGrzhxxResult">
 
     </resultMap>
@@ -73,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="DWZH != null">#{DWZH},</if>
             <if test="GRJCBL != null">#{GRJCBL},</if>
             <if test="JZNY != null">#{JZNY},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjGtjkrxxMapper.xml

@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="GTJKRGJJZH != null">#{GTJKRGJJZH},</if>
             <if test="JKHTBH != null">#{JKHTBH},</if>
             <if test="GTJKRXM != null">#{GTJKRXM},</if>

+ 11 - 1
test-api/src/main/resources/mapper/TgjjGtjkrxxMapper2.xml

@@ -4,6 +4,16 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.mapper.TgjjGtjkrxxMapper2">
 
+    <sql id="global_name">
+        ID,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{ID},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
     <resultMap type="com.sooka.model.bo.TgjjGtjkrxx" id="TgjjGtjkrxxResult">
 
     </resultMap>
@@ -55,7 +65,7 @@
             <if test="CLLX != null">CLLX,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="GTJKRGJJZH != null">#{GTJKRGJJZH},</if>
             <if test="JKHTBH != null">#{JKHTBH},</if>
             <if test="GTJKRXM != null">#{GTJKRXM},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjHmdxxMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="BLJLID != null">#{BLJLID},</if>
             <if test="XINGMING != null">#{XINGMING},</if>
             <if test="ZJLX != null">#{ZJLX},</if>

+ 11 - 1
test-api/src/main/resources/mapper/TgjjHmdxxMapper2.xml

@@ -4,6 +4,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.mapper.TgjjHmdxxMapper2">
 
+    <sql id="global_name">
+        ID,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{ID},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
     <resultMap type="com.sooka.model.bo.TgjjHmdxx" id="TgjjHmdxxResult">
 
     </resultMap>
@@ -61,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="BLJLID != null">#{BLJLID},</if>
             <if test="XINGMING != null">#{XINGMING},</if>
             <if test="ZJLX != null">#{ZJLX},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjKjhzbMapper.xml

@@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="ZXBH != null">#{ZXBH},</if>
             <if test="BBQC != null">#{BBQC},</if>
             <if test="ZFGJJCK != null">#{ZFGJJCK},</if>

+ 11 - 1
test-api/src/main/resources/mapper/TgjjKjhzbMapper2.xml

@@ -4,6 +4,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.mapper.TgjjKjhzbMappe2r">
 
+    <sql id="global_name">
+        ID,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{ID},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
     <resultMap type="com.sooka.model.bo.TgjjKjhzb" id="TgjjKjhzbResult">
 
     </resultMap>
@@ -133,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="ZXBH != null">#{ZXBH},</if>
             <if test="BBQC != null">#{BBQC},</if>
             <if test="ZFGJJCK != null">#{ZFGJJCK},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjZcxxMapper.xml

@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="DWJCBLSX != null">#{DWJCBLSX},</if>
             <if test="DWJCBLXX != null">#{DWJCBLXX},</if>
             <if test="GRJCBLSX != null">#{GRJCBLSX},</if>

+ 11 - 1
test-api/src/main/resources/mapper/TgjjZcxxMapper2.xml

@@ -4,6 +4,16 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.mapper.TgjjZcxxMapper2">
 
+    <sql id="global_name">
+        ID,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{ID},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
     <resultMap type="com.sooka.model.bo.TgjjZcxx" id="TgjjZcxxResult">
     </resultMap>
     <parameterMap id="TgjjZcxx" type="com.sooka.model.bo.TgjjZcxx"></parameterMap>
@@ -72,7 +82,7 @@
             <if test="CLLX != null">CLLX,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID}</if>
+            <if test="ID != null">#{ID},</if>
             <if test="DWJCBLSX != null">#{DWJCBLSX},</if>
             <if test="DWJCBLXX != null">#{DWJCBLXX},</if>
             <if test="GRJCBLSX != null">#{GRJCBLSX},</if>

+ 7 - 0
test-api/target/classes/application-dev.yml

@@ -62,6 +62,13 @@ spring:
           url: jdbc:mysql://59.198.246.77:32368/jl503001?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
           username: jl503001
           password: Lg83RJp5
+#          url: jdbc:mysql://172.18.128.8:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+#          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+#          username: thsjzt
+#          password: thsjzt
+
+
+
             # Hikari will use the above plus the following to setup connection pooling
           type: com.zaxxer.hikari.HikariDataSource
           hikari:

+ 3 - 0
test-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -10,6 +10,7 @@ com\sooka\api\GetNcpSuspectedDiagnosis_Api.class
 com\sooka\model\vo\Sydwlistquery_VO.class
 com\sooka\service\Gatlicautodrivingcertlistquery_Service.class
 com\sooka\model\bo\TgjjGrzhxx.class
+com\sooka\model\bo\TgjjBaseBean.class
 com\sooka\service\GetLaborContractRenewRecordBookListQuery_Service.class
 com\sooka\model\bo\TgjjDwzhxx.class
 com\sooka\model\vo\GetJptsstaZdsswfajdsr_VO.class
@@ -376,6 +377,7 @@ com\sooka\service\Gatcreadministrativepenaltylistquery_Service.class
 com\sooka\base\BaseService.class
 com\sooka\mapper\TgjjGrdkyqxxMapper.class
 com\sooka\model\bo\BaseBean_Share.class
+com\sooka\service\Guiji_Gjj_Service.class
 com\sooka\model\vo\GetSwzsxx2_VO.class
 com\sooka\service\impl\GetLaborContractRenewRecordBookListQuery_ServiceImpl.class
 com\sooka\model\vo\GetJptsstaHmd_VO.class
@@ -438,4 +440,5 @@ com\sooka\api\Guiji_Housingconstruction.class
 com\sooka\model\vo\Gatlicblastingoperationunitpermitlistquery_VO.class
 com\sooka\service\impl\GetYbNsrInfo_ServiceImpl.class
 com\sooka\service\impl\Gatlicautopilotcertlistquery_ServiceImpl.class
+com\sooka\service\impl\Guiji_Gjj_ServiceImpl.class
 com\sooka\model\vo\Gatlichouseholdregistercertlistquery_VO.class

+ 4 - 0
test-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -147,6 +147,7 @@ E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatl
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetUnemploymentRegisterInfoListQuery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\Guiji_naturalresources_Mapper.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\CheckBrief_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\Guiji_Gjj.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetNcpSuspectedDiagnosis_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Esb2xy_getNcpSuspectedDiagnosis_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Portraitandbrief_ServiceImpl.java
@@ -171,6 +172,7 @@ E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetJ
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetEnterpriseUniscId_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\base\util\StrFormatter.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\PostCreditAdministrativePenalty_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Guiji_Gjj_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Immovablesinfolistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Immovablescertlistquery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatliccitizenpassportcertlistquery_ServiceImpl.java
@@ -288,6 +290,7 @@ E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\TgjjG
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Portraitandbrief_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetSocialSecurityCardPersonBaseInfoListQuery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetCrediPublicKey_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\TgjjBaseBean.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetPath_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetEnterprisePopularFeelings_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\utils\UnicodeUtil.java
@@ -339,6 +342,7 @@ E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicaccounttransfercertlistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Portraitandcomposite_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetJptsstaHmd_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Guiji_Gjj_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\TgjjGrzhxx.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetCrediPublicKey_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetSocialSecurityCertificate_Service.java

File diff suppressed because it is too large
+ 551 - 4
test-api/target/surefire-reports/TEST-com.sooka.ZsjApiApplicationTests.xml


File diff suppressed because it is too large
+ 29 - 1
test-api/target/surefire-reports/com.sooka.ZsjApiApplicationTests.txt


BIN
test-api/target/test-api-0.0.1-SNAPSHOT.jar.original