Administrator 3 years ago
parent
commit
7dd40017f3
38 changed files with 1529 additions and 798 deletions
  1. 347 332
      .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. 1 1
      sooka-common/target/maven-archiver/pom.properties
  7. BIN
      sooka-common/target/sooka-common-0.0.1-SNAPSHOT.jar
  8. BIN
      sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar
  9. BIN
      sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar.original
  10. 4 4
      sooka-gateway/target/surefire-reports/TEST-com.sooka.gateway.GatewayApplicationTests.xml
  11. 1 1
      sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt
  12. 1 1
      sooka-jersey/target/maven-archiver/pom.properties
  13. BIN
      sooka-jersey/target/sooka-jersey-0.0.1-SNAPSHOT.jar
  14. 14 12
      test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java
  15. 17 2
      test-api/src/main/java/com/sooka/api/Guiji_civiladministration.java
  16. 3 3
      test-api/src/main/java/com/sooka/api/Guiji_naturalresources.java
  17. 19 0
      test-api/src/main/java/com/sooka/api_pagefile/Test.java
  18. 1 1
      test-api/src/main/java/com/sooka/mapper/Guiji_Housingconstruction_Mapper.java
  19. 21 1
      test-api/src/main/java/com/sooka/model/bo/Guiji_housingconstruction_ysljc_Bean.java
  20. 3 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjxx_Bean.java
  21. 109 14
      test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjzxx_Bean.java
  22. 6 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_qlrjbxx_Bean.java
  23. 1 1
      test-api/src/main/java/com/sooka/service/Guiji_civiladministration_Service.java
  24. 37 1
      test-api/src/main/java/com/sooka/service/impl/Guiji_Housingconstruction_ServiceImpl.java
  25. 20 19
      test-api/src/main/java/com/sooka/service/impl/Guiji_civiladministration_ServiceImpl.java
  26. 47 23
      test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java
  27. 159 0
      test-api/src/main/java/com/sooka/utils/UnicodeUtil.java
  28. 2 2
      test-api/src/main/resources/application.yml
  29. 40 0
      test-api/src/main/resources/mapper/Guiji_Housingconstruction_Mapper.xml
  30. 37 0
      test-api/src/main/resources/mapper/Guiji_Housingconstruction_Mapper2.xml
  31. 172 60
      test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml
  32. 133 75
      test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper2.xml
  33. 143 56
      test-api/target/classes/application-dev.yml
  34. 2 2
      test-api/target/classes/application.yml
  35. 179 177
      test-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  36. 4 4
      test-api/target/surefire-reports/TEST-com.sooka.ZsjApiApplicationTests.xml
  37. 1 1
      test-api/target/surefire-reports/com.sooka.ZsjApiApplicationTests.txt
  38. BIN
      test-api/target/test-api-0.0.1-SNAPSHOT.jar.original

File diff suppressed because it is too large
+ 347 - 332
.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: 8.419 s - in com.sooka.AuthApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.14 s - in com.sooka.AuthApplicationTests

+ 1 - 1
sooka-common/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Sep 14 11:31:00 CST 2021
+#Fri Sep 17 08:49:57 CST 2021
 version=0.0.1-SNAPSHOT
 groupId=com.sooka
 artifactId=sooka-common

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: 9.004 s - in com.sooka.gateway.GatewayApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.952 s - in com.sooka.gateway.GatewayApplicationTests

+ 1 - 1
sooka-jersey/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Sep 14 11:31:21 CST 2021
+#Fri Sep 17 08:50:25 CST 2021
 version=0.0.1-SNAPSHOT
 groupId=com.sooka.jersey
 artifactId=sooka-jersey

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


+ 14 - 12
test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java

@@ -44,6 +44,7 @@ public class Guiji_Housingconstruction extends BaseApi {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     public ResultModel forward_guiji_housingconstruction_yhjbxx(String str) {
+        System.out.println("yhjbxx_forward:"+str);
         ResultModel r = guiji_housingconstruction_service.add_guiji_housingconstruction_yhjbxx(str);
         return r;
     }
@@ -56,26 +57,25 @@ public class Guiji_Housingconstruction extends BaseApi {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     public ResultModel ysljc(String str) {
-        System.out.println("-------------------------");
-//        System.out.println("ysljc:" + str);
-        System.out.println("------------------------");
+        System.out.println("ysljc:" + str);
         ResultModel r = new ResultModel();
-        r.setCode(00000);
-        r.setMessage("成功");
+        HttpUtil.doPost(forward_url + "/api/guiji_housingconstruction_ysljc_forward", str);
+
         return r;
     }
 
     //用水量检测
     @POST
-    @Path("/forward_guiji_housingconstruction_ysljc")
+    @Path("/guiji_housingconstruction_ysljc_forward")
     // 指定请求与返回的相应体为JSON
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
-    public ResultModel forward_guiji_housingconstruction_ysljc(String str) {
-//        System.out.println("ysljc:" + str);
+    public ResultModel guiji_housingconstruction_ysljc_forward(String str) {
+        System.out.println("ysljc_forward:" + str);
         ResultModel r = new ResultModel();
         r.setCode(00000);
         r.setMessage("成功");
+        guiji_housingconstruction_service.add_guiji_housingconstruction_ysljc(str);
         return r;
     }
 
@@ -86,7 +86,8 @@ public class Guiji_Housingconstruction extends BaseApi {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     public ResultModel zlskfrx(String str) {
-//        System.out.println("zlskfrx:" + str);
+        System.out.println("zlskfrx:" + str);
+        HttpUtil.doPost(forward_url + "/api/guiji_housingconstruction_zlskfrx_forward", str);
         ResultModel r = new ResultModel();
         r.setCode(00000);
         r.setMessage("成功");
@@ -94,12 +95,13 @@ public class Guiji_Housingconstruction extends BaseApi {
     }
 
     @POST
-    @Path("/forward_guiji_housingconstruction_zlskfrx")
+    @Path("/guiji_housingconstruction_zlskfrx_forward")
     // 指定请求与返回的相应体为JSON
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
-    public ResultModel forward_guiji_housingconstruction_zlskfrx(String str) {
-//        System.out.println("zlskfrx:" + str);
+    public ResultModel guiji_housingconstruction_zlskfrx_forward(String str) {
+        System.out.println("zlskfrx_forward:" + str);
+        guiji_housingconstruction_service.add_guiji_housingconstruction_zlskfrx(str);
         ResultModel r = new ResultModel();
         r.setCode(00000);
         r.setMessage("成功");

+ 17 - 2
test-api/src/main/java/com/sooka/api/Guiji_civiladministration.java

@@ -2,7 +2,9 @@ package com.sooka.api;
 
 import com.sooka.base.BaseApi;
 import com.sooka.model.ResultModel;
+import com.sooka.service.Guiji_civiladministration_Service;
 import com.sooka.utils.HttpUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -14,6 +16,9 @@ import javax.ws.rs.core.MediaType;
 @Path("/")
 public class Guiji_civiladministration extends BaseApi {
 
+    @Autowired
+    Guiji_civiladministration_Service guiji_civiladministration_service;
+
     //逝者信息数据
     @POST
     @Path("/guiji_civiladministration_szxxsj")
@@ -22,11 +27,21 @@ public class Guiji_civiladministration extends BaseApi {
     @Produces(MediaType.APPLICATION_JSON)
     public ResultModel szxxsj(String str) {
         System.out.println("szxxsj:" + str);
-//        HttpUtil.doPost(forward_url + "/api/guiji_healthcommission_xx_forward", str);
+        HttpUtil.doPost(forward_url + "/api/guiji_civiladministration_szxxsj_forward", str);
         ResultModel r = new ResultModel();
         r.setCode(0);
         r.setMessage("成功");
         return r;
     }
-
+    //逝者信息数据
+    @POST
+    @Path("/guiji_civiladministration_szxxsj_forward")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel szxxsj_forward(String str) {
+        System.out.println("szxxsj_forward:" + str);
+        ResultModel r = guiji_civiladministration_service.add_guiji_civiladministration_szxxsj(str);
+        return r;
+    }
 }

+ 3 - 3
test-api/src/main/java/com/sooka/api/Guiji_naturalresources.java

@@ -26,7 +26,7 @@ public class Guiji_naturalresources extends BaseApi {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     public ResultModel qlrjbxx(String str) {
-//        System.out.println("qlrjbxx:" + str);
+        System.out.println("qlrjbxx:" + str);
         return guiji_naturalresources_service.add_guiji_naturalresources_qlrjbxx(str);
     }
 
@@ -36,7 +36,7 @@ public class Guiji_naturalresources extends BaseApi {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     public ResultModel bdcdjxx(String str) {
-//        System.out.println("bdcdjxx:" + str);
+        System.out.println("bdcdjxx:" + str);
         return guiji_naturalresources_service.add_guiji_naturalresources_bdcdjxx(str);
     }
 
@@ -46,7 +46,7 @@ public class Guiji_naturalresources extends BaseApi {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     public ResultModel bdcdjzxx(String str) {
-//        System.out.println("bdcdjzxx:" + str);
+        System.out.println("bdcdjzxx:" + str);
         return guiji_naturalresources_service.add_guiji_naturalresources_bdcdjzxx(str);
     }
 

File diff suppressed because it is too large
+ 19 - 0
test-api/src/main/java/com/sooka/api_pagefile/Test.java


+ 1 - 1
test-api/src/main/java/com/sooka/mapper/Guiji_Housingconstruction_Mapper.java

@@ -13,7 +13,7 @@ public interface Guiji_Housingconstruction_Mapper {
     public void add_guiji_housingconstruction_yhjbxx(Guiji_housingconstruction_yhjjxx_Bean bean);
     public void update_guiji_housingconstruction_yhjbxx(Guiji_housingconstruction_yhjjxx_Bean bean);
 
-    //用水量检测 - 通用户基本信息是一个接口
+    //用水量检测
     public void add_guiji_housingconstruction_ysljc(Guiji_housingconstruction_ysljc_Bean bean);
     public void update_guiji_housingconstruction_ysljc(Guiji_housingconstruction_ysljc_Bean bean);
 

+ 21 - 1
test-api/src/main/java/com/sooka/model/bo/Guiji_housingconstruction_ysljc_Bean.java

@@ -1,10 +1,30 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
-//用水量检测 --- 同用户基本信息是一个接口
+//用水量检测
 @Getter
 @Setter
 public class Guiji_housingconstruction_ysljc_Bean extends BaseBean_Guiji {
+
+    @Expose
+    String ssid;
+    //传感器名称
+    @Expose
+    String name;
+    //地区名称
+    @Expose
+    String dnm;
+    //站点名称
+    @Expose
+    String snm;
+    //数值
+    @Expose
+    String value;
+    //时间戳
+    @Expose
+    String time;
+
 }

+ 3 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjxx_Bean.java

@@ -128,5 +128,8 @@ public class Guiji_naturalresources_bdcdjxx_Bean extends BaseBean_Guiji {
     //不动产ID
     @Expose
     String BDCID;
+    //推送单位
+    @Expose
+    String TSDW;
 
 }

+ 109 - 14
test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjzxx_Bean.java

@@ -10,15 +10,13 @@ import lombok.Setter;
 @Getter
 @Setter
 public class Guiji_naturalresources_bdcdjzxx_Bean extends BaseBean_Guiji {
-
-
     //登记编号
     @Expose
     String DJBH;
     //权利人
     @Expose
     String QLRMC;
-    //共有情况
+    //共有方式
     @Expose
     String GYFS;
     //坐落
@@ -27,27 +25,124 @@ public class Guiji_naturalresources_bdcdjzxx_Bean extends BaseBean_Guiji {
     //不动产单元号
     @Expose
     String BDCDYH;
-    //权利类型
-    @Expose
-    String QLLX;
-    //权利性质
+    //证书编号
     @Expose
-    String QLXZ;
+    String ZSBH;
     //用途
     @Expose
     String YT;
-    //面积
+    //面积/抵押总面积
     @Expose
     String MJ;
-    //使用期限
-    @Expose
-    String QZRQ;
-    //权利其他状况
+    //权证号
     @Expose
-    String TQ;
+    String QZH;
     //附记
     @Expose
     String BZ;
+    //推送单位
+    @Expose
+    String TSDW;
+    //房屋性质
+    @Expose
+    String FWXZ;
+    //登记日期
+    @Expose
+    String DBSJ;
+    //抵押权人
+    @Expose
+    String DYQR;
+    //抵押人
+    @Expose
+    String DYR;
+    //抵押总套数
+    @Expose
+    String DYZTS;
+    //债权金额
+    @Expose
+    String CQJE;
+    //债务履行起始
+    @Expose
+    String ZWLXQS;
+    //债务履行终止
+    @Expose
+    String ZWLXQZ;
+    //他项权证号
+    @Expose
+    String TXQZH;
+    //抵押预告登记权利人
+    @Expose
+    String DYYGQLR;
+    //抵押预告登记义务人
+    @Expose
+    String DYYGYWR;
+    //抵押预告证明号
+    @Expose
+    String DYYGZMH;
+    //抵押预告登记类型
+    @Expose
+    String DYYGDJLX;
+    //预告登记权利人
+    @Expose
+    String YGQLR;
+    //预告登记义务人
+    @Expose
+    String YGYWR;
+    //预告证明号
+    @Expose
+    String YGZMH;
+    //预告登记类型
+    @Expose
+    String YGDJLX;
+    //层次
+    @Expose
+    String CS;
+    //结构
+    @Expose
+    String FWJG;
+    //房号
+    @Expose
+    String HH;
+    //总层数
+    @Expose
+    String ZCS;
+    //所在层
+    @Expose
+    String SZC;
+    //建筑面积
+    @Expose
+    String SCJZMJ;
+    //套内面积
+    @Expose
+    String SCZYJZMJ;
+    //分摊面积
+    @Expose
+    String SCFTJZMJ;
+    //土地性质
+    @Expose
+    String XZ;
+    //土地使用取得方式
+    @Expose
+    String LX;
+    //土地用途
+    @Expose
+    String TDYT;
+    //土地使用开始
+    @Expose
+    String TDSYQXKS;
+    //土地使用结束
+    @Expose
+    String TDSYQXJS;
+    //业务类型
+    @Expose
+    String YWMS;
+    //证书名称
+    @Expose
+    String ZSMC;
+
+    //
+    @Expose
+    String QLLX;
 
 
 }

+ 6 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_qlrjbxx_Bean.java

@@ -102,6 +102,12 @@ public class Guiji_naturalresources_qlrjbxx_Bean extends BaseBean_Guiji {
     String SFZTP;
     //备注
     String BZ;
+    //推送单位
+    @Expose
+    String TSDW;
+    //权利其他状况
+    @Expose
+    String TQ;
 
 
 }

+ 1 - 1
test-api/src/main/java/com/sooka/service/Guiji_civiladministration_Service.java

@@ -6,6 +6,6 @@ import com.sooka.model.ResultModel;
 
 public interface Guiji_civiladministration_Service {
 
-    public ResultModel guiji_civiladministration_szxxsj(String str);
+    public ResultModel add_guiji_civiladministration_szxxsj(String str);
 
 }

+ 37 - 1
test-api/src/main/java/com/sooka/service/impl/Guiji_Housingconstruction_ServiceImpl.java

@@ -7,9 +7,11 @@ import com.sooka.mapper.Guiji_Housingconstruction_Mapper;
 import com.sooka.mapper.Guiji_Housingconstruction_Mapper2;
 import com.sooka.model.ResultModel;
 import com.sooka.model.bo.Guiji_housingconstruction_yhjjxx_Bean;
+import com.sooka.model.bo.Guiji_housingconstruction_ysljc_Bean;
 import com.sooka.model.bo.Guiji_housingconstruction_ysxt_Bean;
 import com.sooka.model.bo.Guiji_housingconstruction_zlskfrx_Bean;
 import com.sooka.service.Guiji_Housingconstruction_Service;
+import com.sooka.utils.UnicodeUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -57,9 +59,42 @@ public class Guiji_Housingconstruction_ServiceImpl extends BaseService implement
         return r;
     }
 
+    //用水量检测
+//    {"Key": "7f7837ae31734fc797080f3969fa88c6", "cd_batch": "2021-09-17", "cd_time": "2021-09-17 14:07:59", "cd_source": "503026", "cd_operation": "I", "Data": {"ssid": "HD72_20210615_A1", "dnm": "\u8427\u5c71\u6c61\u6c34\u5206\u533a", "snm": "20210615", "value": 0.267, "time": 1623639600, "name": "\u538b\u529b"}, "id": "60c801e975fe470e60497f76HD72_20210615_A11623639600"}
+
     @Override
     public ResultModel add_guiji_housingconstruction_ysljc(String str) {
-        return null;
+        ResultModel r = new ResultModel();
+        try{
+            Guiji_housingconstruction_ysljc_Bean bean = new Guiji_housingconstruction_ysljc_Bean();
+            initBaseGuijiBean(str,bean);
+
+            JSONObject Data = bean.getData();
+            bean.setSsid(UnicodeUtil.decode(Data.getString("ssid")));
+            bean.setName(UnicodeUtil.decode(Data.getString("name")));
+            bean.setDnm(UnicodeUtil.decode(Data.getString("dnm")));
+            bean.setSnm(Data.getString("snm"));
+            bean.setValue(Data.getString("value"));
+            bean.setTime(Data.getString("time"));
+
+            if (bean.getCd_operation().equals("I")) {
+                guiji_housingconstruction_mapper.add_guiji_housingconstruction_ysljc(bean);
+                guiji_housingconstruction_mapper2.add_guiji_housingconstruction_ysljc(bean);
+            } else {
+                guiji_housingconstruction_mapper.update_guiji_housingconstruction_ysljc(bean);
+                guiji_housingconstruction_mapper2.update_guiji_housingconstruction_ysljc(bean);
+            }
+
+
+            r.setCode(0);
+            r.setMessage("成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        }
+
+        return r;
     }
 
     @Override
@@ -70,6 +105,7 @@ public class Guiji_Housingconstruction_ServiceImpl extends BaseService implement
             initBaseGuijiBean(str,bean);
             JSONObject Data = bean.getData();
 
+            bean.setId(Data.getString("CaseId"));
             bean.setCaseId(Data.getString("CaseId"));
             bean.setIncomingCall(Data.getString("IncomingCall"));
             bean.setName(Data.getString("Name"));

+ 20 - 19
test-api/src/main/java/com/sooka/service/impl/Guiji_civiladministration_ServiceImpl.java

@@ -8,6 +8,7 @@ import com.sooka.model.ResultModel;
 import com.sooka.model.bo.Guiji_civiladministration_szxxsj_Bean;
 import com.sooka.model.bo.Guiji_healthcommission_tjxx_Bean;
 import com.sooka.service.Guiji_civiladministration_Service;
+import org.bouncycastle.util.encoders.Base64;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -23,41 +24,41 @@ public class Guiji_civiladministration_ServiceImpl extends BaseService implement
 
     //逝者信息数据
     @Override
-    public ResultModel guiji_civiladministration_szxxsj(String str) {
+    public ResultModel add_guiji_civiladministration_szxxsj(String str) {
         ResultModel r = getResultModel();
         try {
             Guiji_civiladministration_szxxsj_Bean bean = new Guiji_civiladministration_szxxsj_Bean();
             initBaseGuijiBean(str, bean);
             JSONObject Data = bean.getData();
 
-            bean.setId(Data.getString("id"));
-            bean.setDNAME(Data.getString("DNAME"));
-            bean.setDSFZH(Data.getString("DSFZH"));
-            bean.setDSEX(Data.getString("DSEX"));
-            bean.setDMZ(Data.getString("DMZ"));
+            bean.setDNAME(new String(Base64.decode(Data.getString("DNAME")),"UTF-8"));
+            bean.setDSFZH(new String(Base64.decode(Data.getString("DSFZH")),"UTF-8"));
+            bean.setDSEX(new String (Base64.decode(Data.getString("DSEX")),"UTF-8"));
+            bean.setDMZ(new String (Base64.decode(Data.getString("DMZ")),"UTF-8"));
             bean.setDAGE(Data.getString("DAGE"));
             bean.setBIRTH(Data.getString("BIRTH"));
-            bean.setDHJLY(Data.getString("DHJLY"));
-            bean.setDXZQH(Data.getString("DXZQH"));
-            bean.setADDRESS(Data.getString("ADDRESS"));
+            bean.setDHJLY(new String (Base64.decode(Data.getString("DHJLY")),"UTF-8"));
+            bean.setDXZQH(new String (Base64.decode(Data.getString("DXZQH")),"UTF-8"));
+            bean.setADDRESS(new String (Base64.decode(Data.getString("ADDRESS")),"UTF-8"));
             bean.setDTIME(Data.getString("DTIME"));
-            bean.setDREASON(Data.getString("DREASON"));
-            bean.setDADDRESS(Data.getString("DADDRESS"));
+            bean.setDREASON(new String (Base64.decode(Data.getString("DREASON")),"UTF-8"));
+            bean.setDADDRESS(new String (Base64.decode(Data.getString("DADDRESS")),"UTF-8"));
             bean.setHHSJ(Data.getString("HHSJ"));
-            bean.setRELATIONSHIP(Data.getString("RELATIONSHIP"));
-            bean.setLINKMAN(Data.getString("LINKMAN"));
-            bean.setLINKMANPHONE(Data.getString("LINKMANPHONE"));
-            bean.setLINKMANADDRESS(Data.getString("LINKMANADDRESS"));
+            bean.setRELATIONSHIP(new String (Base64.decode(Data.getString("RELATIONSHIP")),"UTF-8"));
+            bean.setLINKMAN(new String (Base64.decode(Data.getString("LINKMAN")),"UTF-8"));
+            bean.setLINKMANPHONE(new String (Base64.decode(Data.getString("LINKMANPHONE")),"UTF-8"));
+            bean.setLINKMANADDRESS(new String (Base64.decode(Data.getString("LINKMANADDRESS")),"UTF-8"));
             bean.setOPERTM(Data.getString("OPERTM"));
-            bean.setOPERID(Data.getString("OPERID"));
-            bean.setOPERDW(Data.getString("OPERDW"));
+            bean.setOPERID(new String (Base64.decode(Data.getString("OPERID")),"UTF-8"));
+            bean.setOPERDW(new String (Base64.decode(Data.getString("OPERDW")),"UTF-8"));
+
 
 
             if (bean.getCd_operation().equals("I")) {
                 guiji_civiladministration_mapper.add_guiji_civiladministration_szxxsj(bean);
-                guiji_civiladministration_mapper.update_guiji_civiladministration_szxxsj(bean);
-            } else {
                 guiji_civiladministration_mapper2.add_guiji_civiladministration_szxxsj(bean);
+            } else {
+                guiji_civiladministration_mapper.update_guiji_civiladministration_szxxsj(bean);
                 guiji_civiladministration_mapper2.update_guiji_civiladministration_szxxsj(bean);
             }
 

+ 47 - 23
test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java

@@ -2,6 +2,7 @@ package com.sooka.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.google.gson.annotations.Expose;
 import com.sooka.base.BaseService;
 import com.sooka.mapper.Guiji_naturalresources_Mapper;
 import com.sooka.mapper.Guiji_naturalresources_Mapper2;
@@ -30,12 +31,8 @@ public class Guiji_naturalresources_ServiceImpl extends BaseService implements G
         try {
             Guiji_naturalresources_qlrjbxx_Bean bean = new Guiji_naturalresources_qlrjbxx_Bean();
             JSONObject jsonObject = JSON.parseObject(str);
-            bean.setId(jsonObject.getString("id"));
-            bean.setCd_time(jsonObject.getString("cd_time"));
-            bean.setCd_batch(jsonObject.getString("cd_batch"));
-            bean.setCd_operation(jsonObject.getString("cd_operation"));
-            bean.setCd_source(jsonObject.getString("cd_source"));
-            JSONObject Data = jsonObject.getJSONObject("Data");
+            initBaseGuijiBean(str,bean);
+            JSONObject Data = bean.getData();
 
             bean.setDJBH(Data.getString("DJBH"));
             bean.setQLRLX(Data.getString("QLRLX"));
@@ -69,6 +66,8 @@ public class Guiji_naturalresources_ServiceImpl extends BaseService implements G
             bean.setCSRQ(Data.getString("CSRQ"));
             bean.setSFZTP(Data.getString("SFZTP"));
             bean.setBZ(Data.getString("BZ"));
+            bean.setTSDW(Data.getString("TSDW"));
+            bean.setTQ(Data.getString("TQ"));
             r.setCode(00000);
             r.setMessage("成功");
 
@@ -93,13 +92,8 @@ public class Guiji_naturalresources_ServiceImpl extends BaseService implements G
         try {
             Guiji_naturalresources_bdcdjxx_Bean bean = new Guiji_naturalresources_bdcdjxx_Bean();
             JSONObject jsonObject = JSON.parseObject(str);
-            bean.setId(jsonObject.getString("id"));
-            bean.setCd_time(jsonObject.getString("cd_time"));
-            bean.setCd_batch(jsonObject.getString("cd_batch"));
-            bean.setCd_operation(jsonObject.getString("cd_operation"));
-            bean.setCd_source(jsonObject.getString("cd_source"));
-            JSONObject Data = jsonObject.getJSONObject("Data");
-
+            initBaseGuijiBean(str,bean);
+            JSONObject Data = bean.getData();
             bean.setDJBH(Data.getString("DJBH"));
             bean.setFDZL(Data.getString("FDZL"));
             bean.setGYFS(Data.getString("GYFS"));
@@ -139,6 +133,7 @@ public class Guiji_naturalresources_ServiceImpl extends BaseService implements G
             bean.setZDDM(Data.getString("ZDDM"));
             bean.setBDCDYH(Data.getString("BDCDYH"));
             bean.setBDCID(Data.getString("BDCID"));
+            bean.setTSDW(Data.getString("TSDW"));
 
             r.setCode(00000);
             r.setMessage("成功");
@@ -164,25 +159,54 @@ public class Guiji_naturalresources_ServiceImpl extends BaseService implements G
         try {
             Guiji_naturalresources_bdcdjzxx_Bean bean = new Guiji_naturalresources_bdcdjzxx_Bean();
             JSONObject jsonObject = JSON.parseObject(str);
-            bean.setId(jsonObject.getString("id"));
-            bean.setCd_time(jsonObject.getString("cd_time"));
-            bean.setCd_batch(jsonObject.getString("cd_batch"));
-            bean.setCd_operation(jsonObject.getString("cd_operation"));
-            bean.setCd_source(jsonObject.getString("cd_source"));
-            JSONObject Data = jsonObject.getJSONObject("Data");
+
+            initBaseGuijiBean(str,bean);
+            JSONObject Data = bean.getData();
 
             bean.setDJBH(Data.getString("DJBH"));
             bean.setQLRMC(Data.getString("QLRMC"));
             bean.setGYFS(Data.getString("GYFS"));
             bean.setFWZL(Data.getString("FWZL"));
             bean.setBDCDYH(Data.getString("BDCDYH"));
-            bean.setQLLX(Data.getString("QLLX"));
-            bean.setQLXZ(Data.getString("QLXZ"));
+            bean.setZSBH(Data.getString("ZSBH"));
             bean.setYT(Data.getString("YT"));
             bean.setMJ(Data.getString("MJ"));
-            bean.setQZRQ(Data.getString("QZRQ"));
-            bean.setTQ(Data.getString("TQ"));
+            bean.setQZH(Data.getString("QZH"));
             bean.setBZ(Data.getString("BZ"));
+            bean.setTSDW(Data.getString("TSDW"));
+            bean.setFWXZ(Data.getString("FWXZ"));
+            bean.setDBSJ(Data.getString("DBSJ"));
+            bean.setDYQR(Data.getString("DYQR"));
+            bean.setDYR(Data.getString("DYR"));
+            bean.setDYZTS(Data.getString("DYZTS"));
+            bean.setCQJE(Data.getString("CQJE"));
+            bean.setZWLXQS(Data.getString("ZWLXQS"));
+            bean.setZWLXQZ(Data.getString("ZWLXQZ"));
+            bean.setTXQZH(Data.getString("TXQZH"));
+            bean.setDYYGQLR(Data.getString("DYYGQLR"));
+            bean.setDYYGYWR(Data.getString("DYYGYWR"));
+            bean.setDYYGZMH(Data.getString("DYYGZMH"));
+            bean.setDYYGDJLX(Data.getString("DYYGDJLX"));
+            bean.setYGQLR(Data.getString("YGQLR"));
+            bean.setYGYWR(Data.getString("YGYWR"));
+            bean.setYGZMH(Data.getString("YGZMH"));
+            bean.setYGDJLX(Data.getString("YGDJLX"));
+            bean.setCS(Data.getString("CS"));
+            bean.setFWJG(Data.getString("FWJG"));
+            bean.setHH(Data.getString("HH"));
+            bean.setZCS(Data.getString("ZCS"));
+            bean.setSZC(Data.getString("SZC"));
+            bean.setSCJZMJ(Data.getString("SCJZMJ"));
+            bean.setSCZYJZMJ(Data.getString("SCZYJZMJ"));
+            bean.setSCFTJZMJ(Data.getString("SCFTJZMJ"));
+            bean.setXZ(Data.getString("XZ"));
+            bean.setLX(Data.getString("LX"));
+            bean.setTDYT(Data.getString("TDYT"));
+            bean.setTDSYQXKS(Data.getString("TDSYQXKS"));
+            bean.setTDSYQXJS(Data.getString("TDSYQXJS"));
+            bean.setYWMS(Data.getString("YWMS"));
+            bean.setZSMC(Data.getString("ZSMC"));
+            bean.setTSDW(Data.getString("TSDW"));
 
             if (bean.getCd_operation().equals("I")) {
                 guiji_naturalresources_mapper.add_guiji_naturalresources_bdcdjzxx(bean);

+ 159 - 0
test-api/src/main/java/com/sooka/utils/UnicodeUtil.java

@@ -0,0 +1,159 @@
+package com.sooka.utils;
+
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class UnicodeUtil {
+
+    //编码
+    public static String encode(String string) {
+        StringBuilder sbr = new StringBuilder(string.length() * 4);
+        for (char ch : string.toCharArray()) {
+            if (ch > 0xfff) {
+                sbr.append("\\u");
+                sbr.append(Integer.toHexString(ch).toUpperCase(Locale.ENGLISH));
+            } else if (ch > 0xff) {
+                sbr.append("\\u0");
+                sbr.append(Integer.toHexString(ch).toUpperCase(Locale.ENGLISH));
+            } else if (ch > 0x7f) {
+                sbr.append("\\u00");
+                sbr.append(Integer.toHexString(ch).toUpperCase(Locale.ENGLISH));
+            } else if (ch < 32) {
+                switch (ch) {
+                    case '\b':
+                        sbr.append('\\');
+                        sbr.append('b');
+                        break;
+                    case '\n':
+                        sbr.append('\\');
+                        sbr.append('n');
+                        break;
+                    case '\t':
+                        sbr.append('\\');
+                        sbr.append('t');
+                        break;
+                    case '\f':
+                        sbr.append('\\');
+                        sbr.append('f');
+                        break;
+                    case '\r':
+                        sbr.append('\\');
+                        sbr.append('r');
+                        break;
+                    default:
+                        if (ch > 0xf) {
+                            sbr.append("\\u00");
+                            sbr.append(Integer.toHexString(ch).toUpperCase(Locale.ENGLISH));
+                        } else {
+                            sbr.append("\\u000");
+                            sbr.append(Integer.toHexString(ch).toUpperCase(Locale.ENGLISH));
+                        }
+                        break;
+                }
+            } else {
+                switch (ch) {
+                    case '\'':
+                        sbr.append("\\u0027");
+                        break;
+                    case '"':
+                    case '\\':
+                        sbr.append("\\");
+                        sbr.append(ch);
+                        break;
+                    default:
+                        sbr.append(ch);
+                        break;
+                }
+            }
+        }
+        return sbr.toString();
+    }
+
+    //解码
+    public static String decode(String unicode) {
+        char[] chars = unicode.toCharArray();
+        StringBuilder buffer = new StringBuilder();
+        for (int i = 0, len = chars.length; i < len; ) {
+            char c = chars[i++];
+            switch (c) {
+                case 0:
+                case '\n':
+                case '\r':
+                    break;
+                case '\\':
+                    c = chars[i++];
+                    switch (c) {
+                        case 'b':
+                            buffer.append('\b');
+                            break;
+                        case 't':
+                            buffer.append('\t');
+                            break;
+                        case 'n':
+                            buffer.append('\n');
+                            break;
+                        case 'f':
+                            buffer.append('\f');
+                            break;
+                        case 'r':
+                            buffer.append('\r');
+                            break;
+                        case 'u':
+                            buffer.append((char) Integer.parseInt(new String(new char[]{//
+                                    chars[i++], chars[i++], chars[i++], chars[i++] //
+                            }), 16));//
+                            break;
+                        case 'x':
+                            buffer.append((char) Integer.parseInt(new String(new char[]{//
+                                    chars[i++], chars[i++] //
+                            }), 16));//
+                            break;
+                        default:
+                            buffer.append(c);
+                    }
+                    break;
+                default:
+                    buffer.append(c);
+            }
+        }
+        return buffer.toString();
+    }
+
+    /**
+     * 方法2
+     *
+     * @param unicodeStr
+     * @return
+     */
+    public static String unicodeToString(String unicodeStr) {
+        Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))");
+        Matcher matcher = pattern.matcher(unicodeStr);
+        char ch;
+        while (matcher.find()) {
+            ch = (char) Integer.parseInt(matcher.group(2), 16);
+            unicodeStr = unicodeStr.replace(matcher.group(1), ch + "");
+        }
+        return unicodeStr;
+    }
+
+    public static void main(String[] args) {
+        String unicode = encode("你好Unicode");
+        System.out.println(unicode);
+
+        StringBuilder sbr = new StringBuilder();
+        for (int i = 0; i < 1000; i++) {
+            sbr.append(unicode);
+        }
+        unicode = sbr.toString();
+
+        //System.out.println(decode(unicode));
+        long l = System.currentTimeMillis();
+
+        for (int i = 0; i < 10000; i++) {
+            decode(unicode);
+            //unicodeToString(unicode);
+        }
+        System.out.println(System.currentTimeMillis() - l);
+    }
+}

+ 2 - 2
test-api/src/main/resources/application.yml

@@ -9,6 +9,6 @@ spring:
 #vpn
 #        server-addr: 172.17.5.4:8848
 #内网
-#        server-addr: 172.18.128.78
+        server-addr: 172.18.128.78
 #互联网
-        server-addr: 10.0.51.4:8848
+#        server-addr: 10.0.51.4:8848

+ 40 - 0
test-api/src/main/resources/mapper/Guiji_Housingconstruction_Mapper.xml

@@ -53,6 +53,42 @@
         where id = #{id}
     </update>
 
+    <parameterMap id="pm_ysljc" type="com.sooka.model.bo.Guiji_housingconstruction_ysljc_Bean"></parameterMap>
+    <insert id="add_guiji_housingconstruction_ysljc" parameterMap="pm_ysljc">
+        insert into t_guiji_housingconstruction_ysljc (
+        <include refid="global_name"></include>
+        ssid,name,dnm,snm,value,time
+        )
+        values (
+        <include refid="global_value"></include>
+        #{ssid},#{name},#{dnm},#{snm},#{value},#{time}
+        )
+    </insert>
+    <update id="update_guiji_housingconstruction_ysljc" parameterMap="pm_ysljc">
+        update t_guiji_housingconstruction_ysljc
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="ssid != null and ssid != ''">
+                ssid = #{ssid},
+            </if>
+            <if test="name != null and name != ''">
+                name = #{name},
+            </if>
+            <if test="dnm != null and dnm != ''">
+                dnm = #{dnm},
+            </if>
+            <if test="snm != null and snm != ''">
+                snm = #{snm},
+            </if>
+            <if test="value != null and value != ''">
+                value = #{value},
+            </if>
+            <if test="time != null and time != ''">
+                time = #{time},
+            </if>
+        </trim>
+        where id=#{id}
+    </update>
 
 
     <parameterMap id="pm_zlskfrx" type="com.sooka.model.bo.Guiji_housingconstruction_zlskfrx_Bean"></parameterMap>
@@ -66,6 +102,7 @@
         )
     </insert>
 
+
     <update id="update_guiji_housingconstruction_zlskfrx" parameterMap="pm_zlskfrx">
         update t_guiji_housingconstruction_zlskfrx
         <trim prefix="SET" suffixOverrides=",">
@@ -80,6 +117,9 @@
                 Address= #{Address},
             </if>
             <if test="Content != null and Content != ''">
+                Content = #{Content},
+            </if>
+            <if test="CreateOn != null and CreateOn != ''">
                 CreateOn = #{CreateOn},
             </if>
         </trim>

+ 37 - 0
test-api/src/main/resources/mapper/Guiji_Housingconstruction_Mapper2.xml

@@ -53,6 +53,39 @@
         where id = #{id}
     </update>
 
+    <parameterMap id="pm_ysljc" type="com.sooka.model.bo.Guiji_housingconstruction_ysljc_Bean"></parameterMap>
+    <insert id="add_guiji_housingconstruction_ysljc" parameterMap="pm_ysljc">
+        insert into t_guiji_housingconstruction_ysljc (
+        <include refid="global_name"></include>
+        name,dnm,snm,value,time
+        )
+        values (
+        <include refid="global_value"></include>
+        #{name},#{dnm},#{snm},#{value},#{time}
+        )
+    </insert>
+    <update id="update_guiji_housingconstruction_ysljc" parameterMap="pm_ysljc">
+        update t_guiji_housingconstruction_ysljc
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="name != null and name != ''">
+                name = #{name},
+            </if>
+            <if test="dnm != null and dnm != ''">
+                dnm = #{dnm},
+            </if>
+            <if test="snm != null and snm != ''">
+                snm = #{snm},
+            </if>
+            <if test="value != null and value != ''">
+                value = #{value},
+            </if>
+            <if test="time != null and time != ''">
+                time = #{time},
+            </if>
+        </trim>
+        where id=#{id}
+    </update>
 
 
     <parameterMap id="pm_zlskfrx" type="com.sooka.model.bo.Guiji_housingconstruction_zlskfrx_Bean"></parameterMap>
@@ -66,6 +99,7 @@
         )
     </insert>
 
+
     <update id="update_guiji_housingconstruction_zlskfrx" parameterMap="pm_zlskfrx">
         update t_guiji_housingconstruction_zlskfrx
         <trim prefix="SET" suffixOverrides=",">
@@ -80,6 +114,9 @@
                 Address= #{Address},
             </if>
             <if test="Content != null and Content != ''">
+                Content = #{Content},
+            </if>
+            <if test="CreateOn != null and CreateOn != ''">
                 CreateOn = #{CreateOn},
             </if>
         </trim>

+ 172 - 60
test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml

@@ -19,12 +19,13 @@
         insert into t_guiji_naturalresources_qlrjbxx (
         <include refid="global_name"></include>
         DJBH,QLRLX,QLBH,QLRBH,QLLB,QLRMC,SXH,ZJLB,ZJHM,FZJG,SSHY,GJDQ,HJSZSS,XB,DH,DZ,YB,GZDW,DZYJ,
-        QDFS,QLRXZ,QLMJ,QLBL,GYFS,QSZT,QZH,ZSBH,FRLX,FRDB,CSRQ,SFZTP,BZ)
+        QDFS,QLRXZ,QLMJ,QLBL,GYFS,QSZT,QZH,ZSBH,FRLX,FRDB,CSRQ,SFZTP,BZ,TSDW,TQ)
         values (
         <include refid="global_value"></include>
         #{DJBH},#{QLRLX},#{QLBH},#{QLRBH},#{QLLB},#{QLRMC},#{SXH},#{ZJLB},#{ZJHM},#{FZJG},
         #{SSHY},#{GJDQ},#{HJSZSS},#{XB},#{DH},#{DZ},#{YB},#{GZDW},#{DZYJ},#{QDFS},#{QLRXZ},
-        #{QLMJ},#{QLBL},#{GYFS},#{QSZT},#{QZH},#{ZSBH},#{FRLX},#{FRDB},#{CSRQ},#{SFZTP},#{BZ}
+        #{QLMJ},#{QLBL},#{GYFS},#{QSZT},#{QZH},#{ZSBH},#{FRLX},#{FRDB},#{CSRQ},#{SFZTP}
+        ,#{BZ},#{TSDW},#{TQ}
         )
     </insert>
     <update id="update_guiji_naturalresources_qlrjbxx" parameterMap="pm_qlrjbxx">
@@ -127,8 +128,12 @@
             <if test="BZ != null and BZ != ''">
                 BZ = #{BZ},
             </if>
-
-
+            <if test="TSDW != null and TSDW != ''">
+                TSDW = #{TSDW},
+            </if>
+            <if test="TQ != null and TQ != ''">
+                TQ = #{TQ},
+            </if>
         </trim>
     </update>
 
@@ -137,16 +142,25 @@
     <insert id="add_guiji_naturalresources_bdcdjzxx" parameterMap="pm_bdcdjzxx">
         insert into t_guiji_naturalresources_bdcdjzxx (
         <include refid="global_name"></include>
-        DJBH,QLRMC,GYFS,FWZL,BDCDYH,QLLX,QLXZ,YT,MJ,QZRQ,TQ,BZ
+        DJBH,QLRMC,GYFS,FWZL,BDCDYH,ZSBH,YT,MJ,QZH,BZ,TSDW,FWXZ,DBSJ,DYQR,DYR,DYZTS,CQJE,ZWLXQS,ZWLXQZ,
+        TXQZH,DYYGQLR,DYYGYWR,DYYGZMH,DYYGDJLX,YGQLR,YGYWR,YGZMH,YGDJLX,CS,FWJG,HH,ZCS,SZC,SCJZMJ,SCZYJZMJ,
+        SCFTJZMJ,XZ,LX,TDYT,TDSYQXKS,TDSYQXJS,YWMS,ZSMC
         )
         values (
         <include refid="global_value"></include>
-        #{DJBH},#{QLRMC},#{GYFS},#{FWZL},#{BDCDYH},#{QLLX},#{QLXZ},#{YT},#{MJ},#{QZRQ},#{TQ},#{BZ})
+        #{DJBH},#{QLRMC},#{GYFS},#{FWZL},#{BDCDYH},#{ZSBH},#{YT},#{MJ},#{QZH},#{BZ},#{TSDW},#{FWXZ},
+        #{DBSJ},#{DYQR},#{DYR},#{DYZTS},#{CQJE},#{ZWLXQS},#{ZWLXQZ},#{TXQZH},#{DYYGQLR},#{DYYGYWR},
+        #{DYYGZMH},#{DYYGDJLX},#{YGQLR},#{YGYWR},#{YGZMH},#{YGDJLX},#{CS},#{FWJG},#{HH},#{ZCS},#{SZC},
+        #{SCJZMJ},#{SCZYJZMJ},#{SCFTJZMJ},#{XZ},#{LX},
+        #{TDYT},#{TDSYQXKS},#{TDSYQXJS},#{YWMS},#{ZSMC}
+        )
     </insert>
     <update id="update_guiji_naturalresources_bdcdjzxx" parameterMap="pm_bdcdjzxx">
         update t_guiji_naturalresources_bdcdjzxx
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
+
+
             <if test="DJBH != null and DJBH != ''">
                 DJBH = #{DJBH},
             </if>
@@ -162,27 +176,125 @@
             <if test="BDCDYH != null and BDCDYH != ''">
                 BDCDYH = #{BDCDYH},
             </if>
-            <if test="QLLX != null and QLLX != ''">
-                QLLX = #{QLLX},
-            </if>
-            <if test="QLXZ != null and QLXZ != ''">
-                QLXZ = #{QLXZ},
+            <if test="ZSBH != null and ZSBH != ''">
+                ZSBH = #{ZSBH},
             </if>
+
+
             <if test="YT != null and YT != ''">
                 YT = #{YT},
             </if>
             <if test="MJ != null and MJ != ''">
                 MJ = #{MJ},
             </if>
-            <if test="QZRQ != null and QZRQ != ''">
-                QZRQ = #{QZRQ},
-            </if>
-            <if test="TQ != null and TQ != ''">
-                TQ = #{TQ},
+            <if test="QZH != null and QZH != ''">
+                QZH = #{QZH},
             </if>
             <if test="BZ != null and BZ != ''">
                 BZ = #{BZ},
             </if>
+            <if test="TSDW != null and TSDW != ''">
+                TSDW = #{TSDW},
+            </if>
+            <if test="FWXZ != null and FWXZ != ''">
+                FWXZ = #{FWXZ},
+            </if>
+            <if test="DBSJ != null and DBSJ != ''">
+                DBSJ = #{DBSJ},
+            </if>
+            <if test="DYQR != null and DYQR != ''">
+                DYQR = #{DYQR},
+            </if>
+
+            <if test="DYZTS != null and DYZTS != ''">
+                DYZTS = #{DYZTS},
+            </if>
+            <if test="DYR != null and DYR != ''">
+                DYR = #{DYR},
+            </if>
+            <if test="CQJE != null and CQJE != ''">
+                CQJE = #{CQJE},
+            </if>
+            <if test="ZWLXQS != null and ZWLXQS != ''">
+                ZWLXQS = #{ZWLXQS},
+            </if>
+            <if test="ZWLXQZ != null and ZWLXQZ != ''">
+                ZWLXQZ = #{ZWLXQZ},
+            </if>
+            <if test="TXQZH != null and TXQZH != ''">
+                TXQZH = #{TXQZH},
+            </if>
+            <if test="DYYGQLR != null and DYYGQLR != ''">
+                DYYGQLR = #{DYYGQLR},
+            </if>
+            <if test="DYYGYWR != null and DYYGYWR != ''">
+                DYYGYWR = #{DYYGYWR},
+            </if>
+            <if test="DYYGZMH != null and DYYGZMH != ''">
+                DYYGZMH = #{DYYGZMH},
+            </if>
+            <if test="DYYGDJLX != null and DYYGDJLX != ''">
+                DYYGDJLX = #{DYYGDJLX},
+            </if>
+            <if test="YGQLR != null and YGQLR != ''">
+                YGQLR = #{YGQLR},
+            </if>
+
+            <if test="YGYWR != null and YGYWR != ''">
+                YGYWR = #{YGYWR},
+            </if>
+            <if test="YGZMH != null and YGZMH != ''">
+                YGZMH = #{YGZMH},
+            </if>
+            <if test="YGDJLX != null and YGDJLX != ''">
+                YGDJLX = #{YGDJLX},
+            </if>
+            <if test="CS != null and CS != ''">
+                CS = #{CS},
+            </if>
+            <if test="FWJG != null and FWJG != ''">
+                FWJG = #{FWJG},
+            </if>
+            <if test="HH != null and HH != ''">
+                HH = #{HH},
+            </if>
+            <if test="ZCS != null and ZCS != ''">
+                ZCS = #{ZCS},
+            </if>
+            <if test="SZC != null and SZC != ''">
+                SZC = #{SZC},
+            </if>
+            <if test="SCJZMJ != null and SCJZMJ != ''">
+                SCJZMJ = #{SCJZMJ},
+            </if>
+            <if test="SCZYJZMJ != null and SCZYJZMJ != ''">
+                SCZYJZMJ = #{SCZYJZMJ},
+            </if>
+            <if test="SCFTJZMJ != null and SCFTJZMJ != ''">
+                SCFTJZMJ  = #{SCFTJZMJ},
+            </if>
+            <if test="XZ != null and XZ != ''">
+                XZ = #{XZ},
+            </if>
+            <if test="LX != null and LX != ''">
+                LX = #{LX},
+            </if>
+            <if test="TDYT != null and TDYT != ''">
+                TDYT = #{TDYT},
+            </if>
+            <if test="TDSYQXKS != null and TDSYQXKS != ''">
+                TDSYQXKS = #{TDSYQXKS},
+            </if>
+            <if test="TDSYQXJS != null and TDSYQXJS != ''">
+                TDSYQXJS = #{TDSYQXJS},
+            </if>
+            <if test="YWMS != null and YWMS != ''">
+                YWMS = #{YWMS},
+            </if>
+            <if test="ZSMC != null and ZSMC != ''">
+                ZSMC = #{ZSMC},
+            </if>
+
         </trim>
     </update>
 
@@ -193,14 +305,14 @@
         <include refid="global_name"></include>
         DJBH,FDZL,GYFS,QLLX,CQXZ,CZFS,ZPGJ,QSJE,ZCJJ,QSJS,WXZJ,YYS,WSRQ,CQAZHTRQ,DJYY,FJ,HH,ZCS,SZC,GHYT,
         FWJG,FWXZ,SCJZMJ,SCZYJZMJ,SCFTJZMJ,JGSJ,FWZL,TDQLXZ,TDQLLX,TDYT,TDSYQXKS,TDSYQXJS,SYNX,DYTDMJ,
-        FTTDMJ,GYTDMJ,ZDDM,BDCDYH,BDCID
+        FTTDMJ,GYTDMJ,ZDDM,BDCDYH,BDCID,TSDW
         )
         values (
         <include refid="global_value"></include>
         #{DJBH},#{FDZL},#{GYFS},#{QLLX},#{CQXZ},#{CZFS},#{ZPGJ},#{QSJE},#{ZCJJ},#{QSJS},#{WXZJ},#{YYS},#{WSRQ},
         #{CQAZHTRQ},#{DJYY},#{FJ},#{HH},#{ZCS},#{SZC},#{GHYT},#{FWJG},#{FWXZ},
         #{SCJZMJ},#{SCZYJZMJ},#{SCFTJZMJ},#{JGSJ},#{FWZL},#{TDQLXZ},#{TDQLLX},#{TDYT},#{TDSYQXKS},
-        #{TDSYQXJS},#{SYNX},#{DYTDMJ},#{FTTDMJ},#{GYTDMJ},#{ZDDM},#{BDCDYH},#{BDCID}
+        #{TDSYQXJS},#{SYNX},#{DYTDMJ},#{FTTDMJ},#{GYTDMJ},#{ZDDM},#{BDCDYH},#{BDCID},#{TSDW}
         )
 
 
@@ -211,128 +323,128 @@
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
             <if test="DJBH != null and DJBH != ''">
-                DJBH = #{DJBH}
+                DJBH = #{DJBH},
             </if>
             <if test="FDZL != null and FDZL != ''">
-                FDZL = #{FDZL}
+                FDZL = #{FDZL},
             </if>
             <if test="GYFS != null and GYFS != ''">
-                GYFS = #{GYFS}
+                GYFS = #{GYFS},
             </if>
             <if test="QLLX != null and QLLX != ''">
-                QLLX = #{QLLX}
+                QLLX = #{QLLX},
             </if>
             <if test="CQXZ != null and CQXZ != ''">
-                CQXZ = #{CQXZ}
+                CQXZ = #{CQXZ},
             </if>
             <if test="CZFS != null and CZFS != ''">
-                CZFS = #{CZFS}
+                CZFS = #{CZFS},
             </if>
             <if test="ZPGJ != null and ZPGJ != ''">
-                ZPGJ = #{ZPGJ}
+                ZPGJ = #{ZPGJ},
             </if>
 
             <if test="QSJE != null and QSJE != ''">
-                QSJE = #{QSJE}
+                QSJE = #{QSJE},
             </if>
             <if test="ZCJJ != null and ZCJJ != ''">
-                ZCJJ = #{ZCJJ}
+                ZCJJ = #{ZCJJ},
             </if>
             <if test="QSJS != null and QSJS != ''">
-                QSJS = #{QSJS}
+                QSJS = #{QSJS},
             </if>
             <if test="WXZJ != null and WXZJ != ''">
-                WXZJ = #{WXZJ}
+                WXZJ = #{WXZJ},
             </if>
             <if test="YYS != null and YYS != ''">
-                YYS = #{YYS}
+                YYS = #{YYS},
             </if>
             <if test="WSRQ != null and WSRQ != ''">
-                WSRQ = #{WSRQ}
+                WSRQ = #{WSRQ},
             </if>
             <if test="CQAZHTRQ != null and CQAZHTRQ != ''">
-                CQAZHTRQ = #{CQAZHTRQ}
+                CQAZHTRQ = #{CQAZHTRQ},
             </if>
 
             <if test="DJYY != null and DJYY != ''">
-                DJYY = #{DJYY}
+                DJYY = #{DJYY},
             </if>
             <if test="FJ != null and FJ != ''">
-                FJ = #{FJ}
+                FJ = #{FJ},
             </if>
             <if test="HH != null and HH != ''">
-                HH = #{HH}
+                HH = #{HH},
             </if>
             <if test="ZCS != null and ZCS != ''">
-                ZCS = #{ZCS}
+                ZCS = #{ZCS},
             </if>
             <if test="SZC != null and SZC != ''">
-                SZC = #{SZC}
+                SZC = #{SZC},
             </if>
 
             <if test="GHYT != null and GHYT != ''">
-                GHYT = #{GHYT}
+                GHYT = #{GHYT},
             </if>
             <if test="FWJG != null and FWJG != ''">
-                FWJG = #{FWJG}
+                FWJG = #{FWJG},
             </if>
             <if test="FWXZ != null and FWXZ != ''">
-                FWXZ = #{FWXZ}
+                FWXZ = #{FWXZ},
             </if>
             <if test="SCJZMJ != null and SCJZMJ != ''">
-                SCJZMJ = #{SCJZMJ}
+                SCJZMJ = #{SCJZMJ},
             </if>
             <if test="SCZYJZMJ != null and SCZYJZMJ != ''">
-                SCZYJZMJ = #{SCZYJZMJ}
+                SCZYJZMJ = #{SCZYJZMJ},
             </if>
             <if test="SCFTJZMJ != null and SCFTJZMJ != ''">
-                SCFTJZMJ = #{SCFTJZMJ}
+                SCFTJZMJ = #{SCFTJZMJ},
             </if>
             <if test="JGSJ != null and JGSJ != ''">
-                JGSJ = #{JGSJ}
+                JGSJ = #{JGSJ},
             </if>
-            ,,,,,,,,,,,,,,,,,,,
-
             <if test="FWZL != null and FWZL != ''">
-                FWZL = #{FWZL}
+                FWZL = #{FWZL},
             </if>
             <if test="TDQLXZ != null and TDQLXZ != ''">
-                TDQLXZ = #{TDQLXZ}
+                TDQLXZ = #{TDQLXZ},
             </if>
             <if test="TDQLLX != null and TDQLLX != ''">
-                TDQLLX = #{TDQLLX}
+                TDQLLX = #{TDQLLX},
             </if>
             <if test="TDYT != null and TDYT != ''">
-                TDYT = #{TDYT}
+                TDYT = #{TDYT},
             </if>
             <if test="TDSYQXKS != null and TDSYQXKS != ''">
-                TDSYQXKS = #{TDSYQXKS}
+                TDSYQXKS = #{TDSYQXKS},
             </if>
             <if test="TDSYQXJS != null and TDSYQXJS != ''">
-                TDSYQXJS = #{TDSYQXJS}
+                TDSYQXJS = #{TDSYQXJS},
             </if>
             <if test="SYNX != null and SYNX != ''">
-                SYNX = #{SYNX}
+                SYNX = #{SYNX},
             </if>
             <if test="DYTDMJ != null and DYTDMJ != ''">
-                DYTDMJ = #{DYTDMJ}
+                DYTDMJ = #{DYTDMJ},
             </if>
             <if test="FTTDMJ != null and FTTDMJ != ''">
-                FTTDMJ = #{FTTDMJ}
+                FTTDMJ = #{FTTDMJ},
             </if>
             <if test="GYTDMJ != null and GYTDMJ != ''">
-                GYTDMJ = #{GYTDMJ}
+                GYTDMJ = #{GYTDMJ},
             </if>
             <if test="ZDDM != null and ZDDM != ''">
-                ZDDM = #{ZDDM}
+                ZDDM = #{ZDDM},
             </if>
             <if test="BDCDYH != null and BDCDYH != ''">
-                BDCDYH = #{BDCDYH}
+                BDCDYH = #{BDCDYH},
             </if>
             <if test="BDCID != null and BDCID != ''">
-                BDCID = #{BDCID}
+                BDCID = #{BDCID},
+            </if>
+            <if test="TSDW != null and TSDW != ''">
+                TSDW = #{TSDW},
             </if>
-
         </trim>
     </update>
 

+ 133 - 75
test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper2.xml

@@ -19,12 +19,13 @@
         insert into t_guiji_naturalresources_qlrjbxx (
         <include refid="global_name"></include>
         DJBH,QLRLX,QLBH,QLRBH,QLLB,QLRMC,SXH,ZJLB,ZJHM,FZJG,SSHY,GJDQ,HJSZSS,XB,DH,DZ,YB,GZDW,DZYJ,
-        QDFS,QLRXZ,QLMJ,QLBL,GYFS,QSZT,QZH,ZSBH,FRLX,FRDB,CSRQ,SFZTP,BZ)
+        QDFS,QLRXZ,QLMJ,QLBL,GYFS,QSZT,QZH,ZSBH,FRLX,FRDB,CSRQ,SFZTP,BZ,TSDW,TQ)
         values (
         <include refid="global_value"></include>
         #{DJBH},#{QLRLX},#{QLBH},#{QLRBH},#{QLLB},#{QLRMC},#{SXH},#{ZJLB},#{ZJHM},#{FZJG},
         #{SSHY},#{GJDQ},#{HJSZSS},#{XB},#{DH},#{DZ},#{YB},#{GZDW},#{DZYJ},#{QDFS},#{QLRXZ},
-        #{QLMJ},#{QLBL},#{GYFS},#{QSZT},#{QZH},#{ZSBH},#{FRLX},#{FRDB},#{CSRQ},#{SFZTP},#{BZ}
+        #{QLMJ},#{QLBL},#{GYFS},#{QSZT},#{QZH},#{ZSBH},#{FRLX},#{FRDB},#{CSRQ},#{SFZTP}
+        ,#{BZ},#{TSDW},#{TQ}
         )
     </insert>
     <update id="update_guiji_naturalresources_qlrjbxx" parameterMap="pm_qlrjbxx">
@@ -127,8 +128,12 @@
             <if test="BZ != null and BZ != ''">
                 BZ = #{BZ},
             </if>
-
-
+            <if test="TSDW != null and TSDW != ''">
+                TSDW = #{TSDW},
+            </if>
+            <if test="TQ != null and TQ != ''">
+                TQ = #{TQ},
+            </if>
         </trim>
     </update>
 
@@ -137,16 +142,25 @@
     <insert id="add_guiji_naturalresources_bdcdjzxx" parameterMap="pm_bdcdjzxx">
         insert into t_guiji_naturalresources_bdcdjzxx (
         <include refid="global_name"></include>
-        DJBH,QLRMC,GYFS,FWZL,BDCDYH,QLLX,QLXZ,YT,MJ,QZRQ,TQ,BZ
+        DJBH,QLRMC,GYFS,FWZL,BDCDYH,ZSBH,YT,MJ,QZH,BZ,TSDW,FWXZ,DBSJ,DYQR,DYR,DYZTS,CQJE,ZWLXQS,ZWLXQZ,
+        TXQZH,DYYGQLR,DYYGYWR,DYYGZMH,DYYGDJLX,YGQLR,YGYWR,YGZMH,YGDJLX,CS,FWJG,HH,ZCS,SZC,SCJZMJ,SCZYJZMJ,
+        SCFTJZMJ,XZ,LX,TDYT,TDSYQXKS,TDSYQXJS,YWMS,ZSMC
         )
         values (
         <include refid="global_value"></include>
-        #{DJBH},#{QLRMC},#{GYFS},#{FWZL},#{BDCDYH},#{QLLX},#{QLXZ},#{YT},#{MJ},#{QZRQ},#{TQ},#{BZ})
+        #{DJBH},#{QLRMC},#{GYFS},#{FWZL},#{BDCDYH},#{ZSBH},#{YT},#{MJ},#{QZH},#{BZ},#{TSDW},#{FWXZ},
+        #{DBSJ},#{DYQR},#{DYR},#{DYZTS},#{CQJE},#{ZWLXQS},#{ZWLXQZ},#{TXQZH},#{DYYGQLR},#{DYYGYWR},
+        #{DYYGZMH},#{DYYGDJLX},#{YGQLR},#{YGYWR},#{YGZMH},#{YGDJLX},#{CS},#{FWJG},#{HH},#{ZCS},#{SZC},
+        #{SCJZMJ},#{SCZYJZMJ},#{SCFTJZMJ},#{XZ},#{LX},
+        #{TDYT},#{TDSYQXKS},#{TDSYQXJS},#{YWMS},#{ZSMC}
+        )
     </insert>
     <update id="update_guiji_naturalresources_bdcdjzxx" parameterMap="pm_bdcdjzxx">
         update t_guiji_naturalresources_bdcdjzxx
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
+
+
             <if test="DJBH != null and DJBH != ''">
                 DJBH = #{DJBH},
             </if>
@@ -162,27 +176,125 @@
             <if test="BDCDYH != null and BDCDYH != ''">
                 BDCDYH = #{BDCDYH},
             </if>
-            <if test="QLLX != null and QLLX != ''">
-                QLLX = #{QLLX},
-            </if>
-            <if test="QLXZ != null and QLXZ != ''">
-                QLXZ = #{QLXZ},
+            <if test="ZSBH != null and ZSBH != ''">
+                ZSBH = #{ZSBH},
             </if>
+
+
             <if test="YT != null and YT != ''">
                 YT = #{YT},
             </if>
             <if test="MJ != null and MJ != ''">
                 MJ = #{MJ},
             </if>
-            <if test="QZRQ != null and QZRQ != ''">
-                QZRQ = #{QZRQ},
-            </if>
-            <if test="TQ != null and TQ != ''">
-                TQ = #{TQ},
+            <if test="QZH != null and QZH != ''">
+                QZH = #{QZH},
             </if>
             <if test="BZ != null and BZ != ''">
                 BZ = #{BZ},
             </if>
+            <if test="TSDW != null and TSDW != ''">
+                TSDW = #{TSDW},
+            </if>
+            <if test="FWXZ != null and FWXZ != ''">
+                FWXZ = #{FWXZ},
+            </if>
+            <if test="DBSJ != null and DBSJ != ''">
+                DBSJ = #{DBSJ},
+            </if>
+            <if test="DYQR != null and DYQR != ''">
+                DYQR = #{DYQR},
+            </if>
+
+            <if test="DYZTS != null and DYZTS != ''">
+                DYZTS = #{DYZTS},
+            </if>
+            <if test="DYR != null and DYR != ''">
+                DYR = #{DYR},
+            </if>
+            <if test="CQJE != null and CQJE != ''">
+                CQJE = #{CQJE},
+            </if>
+            <if test="ZWLXQS != null and ZWLXQS != ''">
+                ZWLXQS = #{ZWLXQS},
+            </if>
+            <if test="ZWLXQZ != null and ZWLXQZ != ''">
+                ZWLXQZ = #{ZWLXQZ},
+            </if>
+            <if test="TXQZH != null and TXQZH != ''">
+                TXQZH = #{TXQZH},
+            </if>
+            <if test="DYYGQLR != null and DYYGQLR != ''">
+                DYYGQLR = #{DYYGQLR},
+            </if>
+            <if test="DYYGYWR != null and DYYGYWR != ''">
+                DYYGYWR = #{DYYGYWR},
+            </if>
+            <if test="DYYGZMH != null and DYYGZMH != ''">
+                DYYGZMH = #{DYYGZMH},
+            </if>
+            <if test="DYYGDJLX != null and DYYGDJLX != ''">
+                DYYGDJLX = #{DYYGDJLX},
+            </if>
+            <if test="YGQLR != null and YGQLR != ''">
+                YGQLR = #{YGQLR},
+            </if>
+
+            <if test="YGYWR != null and YGYWR != ''">
+                YGYWR = #{YGYWR},
+            </if>
+            <if test="YGZMH != null and YGZMH != ''">
+                YGZMH = #{YGZMH},
+            </if>
+            <if test="YGDJLX != null and YGDJLX != ''">
+                YGDJLX = #{YGDJLX},
+            </if>
+            <if test="CS != null and CS != ''">
+                CS = #{CS},
+            </if>
+            <if test="FWJG != null and FWJG != ''">
+                FWJG = #{FWJG},
+            </if>
+            <if test="HH != null and HH != ''">
+                HH = #{HH},
+            </if>
+            <if test="ZCS != null and ZCS != ''">
+                ZCS = #{ZCS},
+            </if>
+            <if test="SZC != null and SZC != ''">
+                SZC = #{SZC},
+            </if>
+            <if test="SCJZMJ != null and SCJZMJ != ''">
+                SCJZMJ = #{SCJZMJ},
+            </if>
+            <if test="SCZYJZMJ != null and SCZYJZMJ != ''">
+                SCZYJZMJ = #{SCZYJZMJ},
+            </if>
+            <if test="SCFTJZMJ != null and SCFTJZMJ != ''">
+                SCFTJZMJ  = #{SCFTJZMJ},
+            </if>
+            <if test="XZ != null and XZ != ''">
+                XZ = #{XZ},
+            </if>
+            <if test="LX != null and LX != ''">
+                LX = #{LX},
+            </if>
+            <if test="TDYT != null and TDYT != ''">
+                TDYT = #{TDYT},
+            </if>
+            <if test="TDSYQXKS != null and TDSYQXKS != ''">
+                TDSYQXKS = #{TDSYQXKS},
+            </if>
+            <if test="TDSYQXJS != null and TDSYQXJS != ''">
+                TDSYQXJS = #{TDSYQXJS},
+            </if>
+            <if test="YWMS != null and YWMS != ''">
+                YWMS = #{YWMS},
+            </if>
+            <if test="ZSMC != null and ZSMC != ''">
+                ZSMC = #{ZSMC},
+            </if>
+
         </trim>
     </update>
 
@@ -193,14 +305,14 @@
         <include refid="global_name"></include>
         DJBH,FDZL,GYFS,QLLX,CQXZ,CZFS,ZPGJ,QSJE,ZCJJ,QSJS,WXZJ,YYS,WSRQ,CQAZHTRQ,DJYY,FJ,HH,ZCS,SZC,GHYT,
         FWJG,FWXZ,SCJZMJ,SCZYJZMJ,SCFTJZMJ,JGSJ,FWZL,TDQLXZ,TDQLLX,TDYT,TDSYQXKS,TDSYQXJS,SYNX,DYTDMJ,
-        FTTDMJ,GYTDMJ,ZDDM,BDCDYH,BDCID
+        FTTDMJ,GYTDMJ,ZDDM,BDCDYH,BDCID,TSDW
         )
         values (
         <include refid="global_value"></include>
         #{DJBH},#{FDZL},#{GYFS},#{QLLX},#{CQXZ},#{CZFS},#{ZPGJ},#{QSJE},#{ZCJJ},#{QSJS},#{WXZJ},#{YYS},#{WSRQ},
         #{CQAZHTRQ},#{DJYY},#{FJ},#{HH},#{ZCS},#{SZC},#{GHYT},#{FWJG},#{FWXZ},
         #{SCJZMJ},#{SCZYJZMJ},#{SCFTJZMJ},#{JGSJ},#{FWZL},#{TDQLXZ},#{TDQLLX},#{TDYT},#{TDSYQXKS},
-        #{TDSYQXJS},#{SYNX},#{DYTDMJ},#{FTTDMJ},#{GYTDMJ},#{ZDDM},#{BDCDYH},#{BDCID}
+        #{TDSYQXJS},#{SYNX},#{DYTDMJ},#{FTTDMJ},#{GYTDMJ},#{ZDDM},#{BDCDYH},#{BDCID},#{TSDW}
         )
 
 
@@ -291,8 +403,6 @@
             <if test="JGSJ != null and JGSJ != ''">
                 JGSJ = #{JGSJ}
             </if>
-            ,,,,,,,,,,,,,,,,,,,
-
             <if test="FWZL != null and FWZL != ''">
                 FWZL = #{FWZL}
             </if>
@@ -332,63 +442,11 @@
             <if test="BDCID != null and BDCID != ''">
                 BDCID = #{BDCID}
             </if>
-
+            <if test="TSDW != null and TSDW != ''">
+                TSDW = #{TSDW}
+            </if>
         </trim>
     </update>
 
 
-
-
-
-
-    <resultMap id="rm_qlrjbxx" type="com.sooka.model.bo.Guiji_naturalresources_qlrjbxx_Bean"></resultMap>
-
-    <select id="qlrjbxx_select_genren" resultMap="rm_qlrjbxx">
-        select DJBH,QLRLX,QLBH,QLRBH,QLLB,QLRMC,SXH,ZJLB,ZJHM,FZJG,SSHY,GJDQ,
-        HJSZSS,XB,DH,DZ,YB,GZDW,DZYJ,
-        QDFS,QLRXZ,QLMJ,QLBL,GYFS,QSZT,QZH,ZSBH,FRLX,FRDB,CSRQ,SFZTP,BZ
-        from t_guiji_naturalresources_qlrjbxx
-        where QLRXZ = '个人'
-
-        <if test="DJBH != null and DJBH != ''">
-            and DJBH = #{DJBH}
-        </if>
-        <if test="DJBH == null or DJBH == ''">
-            and 1=2
-        </if>
-
-    </select>
-
-    <select id="qlrjbxx_select_qiye" resultMap="rm_qlrjbxx">
-        select DJBH,QLRLX,QLBH,QLRBH,QLLB,QLRMC,SXH,ZJLB,ZJHM,FZJG,SSHY,GJDQ,
-        HJSZSS,XB,DH,DZ,YB,GZDW,DZYJ,
-        QDFS,QLRXZ,QLMJ,QLBL,GYFS,QSZT,QZH,ZSBH,FRLX,FRDB,CSRQ,SFZTP,BZ
-        from t_guiji_naturalresources_qlrjbxx
-        where QLRXZ = '企业'
-
-        <if test="DJBH != null and DJBH != ''">
-            and DJBH = #{DJBH}
-        </if>
-        <if test="DJBH == null or DJBH == ''">
-            and 1=2
-        </if>
-    </select>
-
-    <select id="qlrjbxx_select_qita" resultMap="rm_qlrjbxx">
-
-        select DJBH,QLRLX,QLBH,QLRBH,QLLB,QLRMC,SXH,ZJLB,ZJHM,FZJG,SSHY,GJDQ,
-        HJSZSS,XB,DH,DZ,YB,GZDW,DZYJ,
-        QDFS,QLRXZ,QLMJ,QLBL,GYFS,QSZT,QZH,ZSBH,FRLX,FRDB,CSRQ,SFZTP,BZ
-        from t_guiji_naturalresources_qlrjbxx
-        where (QLRXZ != '个人' and QLRXZ != '企业')
-
-        <if test="DJBH != null and DJBH != ''">
-            and DJBH = #{DJBH}
-        </if>
-        <if test="DJBH == null or DJBH == ''">
-            and 1=2
-        </if>
-
-    </select>
-
 </mapper>

+ 143 - 56
test-api/target/classes/application-dev.yml

@@ -1,5 +1,4 @@
 
-
 spring:
   ############################################################
   #
@@ -7,61 +6,149 @@ spring:
   #
   ############################################################
   # jdbc_config   datasource
-#  datasource:
-#    dynamic:
-#      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
-#
-#          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://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-##          username: thsjzt
-##          password: thsjzt
-#
-#          url: jdbc:mysql://59.198.246.77:32368/jl503033?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          username: jl503033
-#          password: Bx82TIg0
-#                  # 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
+  datasource:
+    dynamic:
+      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
+
+          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
+          password: Bx82TIg0
+                  # 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
+        db3:
+          url: jdbc:mysql://59.198.246.77:32368/jl503029?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          username: jl503029
+          password: Lp18NUg8
+                  # 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
+        db4:
+          url: jdbc:mysql://59.198.246.77:32368/jl503011?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          username: jl503011
+          password: Oq82TSa8
+                  # 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
+        db5:
+          url: jdbc:mysql://59.198.246.77:32368/jl503026?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          username: jl503026
+          password: Sw80ABr2
+                  # 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
+        db6:
+          url: jdbc:mysql://59.198.246.77:32368/jl503008?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          username: jl503008
+          password: Jl10PEr0
+                  # 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
+
+
+
+
+
 
 #    driver-class-name: com.mysql.cj.jdbc.Driver
 #        url: jdbc:mysql://59.198.246.77:32368/jl503034?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8

+ 2 - 2
test-api/target/classes/application.yml

@@ -9,6 +9,6 @@ spring:
 #vpn
 #        server-addr: 172.17.5.4:8848
 #内网
-#        server-addr: 172.18.128.78
+        server-addr: 172.18.128.78
 #互联网
-        server-addr: 10.0.51.4:8848
+#        server-addr: 10.0.51.4:8848

+ 179 - 177
test-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,99 +1,49 @@
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetLaborContractNewRecordInfoListQuery_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Portraitandbrief_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicbackandforthhongkongandmacaolistquery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\Guiji_Healthcommission_Mapper.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetSsjksSwsxzyInfo_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicautodrivingcertlistquery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Jldpfpopulation_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicadministrativelicenseinfolistquery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicsecuritytrainingpermitlistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\CheckBrief_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetJptsstaFpzyz_Api.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetEmploymentRegisterInfoListQuery_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetJptsstaZdsswfajdsr_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Esb2xy_getNcpLoseContacts_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicdriverillegalinfolistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetEmploymentEntrepreneurshipCardListQuery_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\utils\Test.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\Guiji_naturalresources.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_healthcommission_yyryxx_Bean.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicenterprisevehiclemanageinfolistquery_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetLaborContractCancelRecordBookListQuery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetTaxPlayerStatus_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicpasstohongkongandmacaolistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Socialorganization_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\License_qrcode_get_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetLaborContractRenewRecordBookListQuery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\QueryEBaseinfos_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Foundationlegalperson_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Birthcertificate_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Socialincorporation_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetEmploymentEntrepreneurshipCardListQuery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Deathcertificate_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetSwDjz1Info_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlichouseholdregistercertlistquery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetJptsstaXzcf_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\PeoplemarryInfodouble_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\BaseBean_Share.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicaccountcancelcertlistquery_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetSwDjz1Info_Api.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetYbNsrInfo_Api.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Socialorganization_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\BheckBrief_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\QueryAoOpaDetails_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Guiji_healthcommission_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\base\util\DateUtils.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\CheckBrief_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetCegnirEnterpriseCerditRating_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Guiji_Library_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Dqjglistquery_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetTaxPlayerStatus_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicresidentidcardlistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Foundationlegalperson_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\base\BaseGuijiBean.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Portraitandcomposite_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetJptsstaQsxx_Api.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_library_creditpoints_Bean.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetLaborContractRenewRecordInfoListQuery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\Guiji_civiladministration_Mapper.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\Guiji_Library_Mapper2.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\Guiji_naturalresources_Mapper2.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Download_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\QueryEBaseinfos_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicresidencepermitlistquery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Guiji_Housingconstruction_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetCrediPublicKey_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\BheckBrief_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicdriverillegalinfolistquery_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\Guiji_Housingconstruction.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\QueryAoOpaDetails_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetJptsstaQsxx_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\BaseBean_Guiji.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetJptsstaHmd_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetJptsstaXzxk_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicresidencepermitlistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\TestBean.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetSocialSecurityCardPersonBaseInfoListQuery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetSocialSecurityCertificate_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetSwzsxx3_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetEnterpriseUniscId_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\TestService.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api_pagefile\Test.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Guiji_Library_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicresidentidcardlistquery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetLaborContractCancelRecordInfoListQuery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\PeoplemarryInfosingle_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetEnterpriseSupervise_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetEmploymentRegisterInfoListQuery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetQyDjInfo_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetJptsstaXzxk_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetJptsstaFpzyz_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicautopilotcertlistquery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicbasicpopulationinfolistquery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Esb2xy_getNcpInterantionalContacts_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicdrunkdrivingillegalactinfolistquery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetLaborContractCancelRecordBookListQuery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicresidencepermitlistquery_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\Guiji_civiladministration_Mapper2.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicbackandforthhongkongandmacaolistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetCegnirEnterpriseCerditRating_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicaccounttransfercertlistquery_VO.java
@@ -103,96 +53,52 @@ E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetU
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\Guiji_civiladministration.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicbackandforthhongkongandmacaolistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_housingconstruction_yhjjxx_Bean.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicdriverbasicinfolistquery_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\License_qrcode_get_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetSocialSecurityCardInfoListQuery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Birthcertificate_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetSsjksSwsxzyInfo_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Jldpfpopulation_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicinformationnetworksecuritycertlistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetLaborContractNewRecordInfoListQuery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetEmploymentRegisterStateListQuery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetSwzsxx3_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetLaborContractRenewRecordInfoListQuery_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetUnemploymentRegisterInfoListQuery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Esb2xy_getNhcNcpAreaClassification_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\Guiji_Healthcommission_Mapper2.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicsecurityguardcertlistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetPath_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\utils\TokenUtil.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_housingconstruction_ysxt_Bean.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetEmploymentRegisterStateListQuery_ServiceImpl.java
-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\system\domain\TGuijiLibraryCreditpoints.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetNcpSuspectedDiagnosis_Service.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\service\GetYbNsrInfo_Service.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\service\impl\QueryELiIlldisdetails_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetTaxPlayerStatus_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\QueryEBaseinfos_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\QueryAoOpaDetails_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\QueryELiIlldisdetails_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetJptsstaZdsswfajdsr_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetLaborContractRenewRecordBookListQuery_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetJptsstaXzxk_Api.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\DeleteCrediPublicKey_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\DeleteCrediPublicKey_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_naturalresources_bdcdjzxx_Bean.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetEnterprisePopularFeelings_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Business_license_qrcode_result_query_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicsecuritytrainingpermitlistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatliccitizenpassportcertlistquery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetQsWszInfo_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetQsWszInfo_Api.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicsecuritytrainingpermitlistquery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicsecurityguardcertlistquery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Immovablesinfolistquery_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicaccountcancelcertlistquery_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetEnterpriseUniscId_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetSwzsxx1_Api.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetSwzsxx1_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Birthcertificate_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlichighlytoxicchemicalsroadtransportpermitlistquery_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetSsjksSwsxzyInfo_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicdrunkdrivingillegalactinfolistquery_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetEnterpriseSupervise_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Guiji_Housingconstruction_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetNcpSuspectedDiagnosis_Api.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\base\util\StringUtils.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Esb2xy_getNcpInterantionalContacts_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatliccitizenpassportcertlistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetQyDjInfo_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\base\BaseEntity.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetEmploymentEntrepreneurshipCardListQuery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetLaborContractCancelRecordBookListQuery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\QueryEPbBaseinfos_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Jldpfpopulation_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\PostCreditAdministrativeLicense_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicinformationnetworksecuritycertlistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetLaborContractCancelRecordInfoListQuery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicbasicpopulationinfolistquery_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetSwDjz1Info_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\TestServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_library_give_Bean.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetLaborContractNewRecordBookListQuery_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetEnterpriseRegister_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\PeoplemarryInfodouble_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Immovablesinfolistquery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetEnterpriseCoordinate_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetSwzsxx2_Api.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicdriverbasicinfolistquery_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Deathcertificate_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\BheckBrief_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Download_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Familyplanning_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\network\http\Http.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Immovablescertlistquery_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetNcpSuspectedDiagnosis_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetYbNsrInfo_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_housingconstruction_zlskfrx_Bean.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\provider\AuthRequestFilter.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_naturalresources_bdcdjxx_Bean.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Business_license_qrcode_result_query_Service.java
@@ -200,14 +106,189 @@ E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Esb
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetLaborContractRenewRecordInfoListQuery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetQsWszInfo_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Dqjglistquery_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicsecurityservicepermitlistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Esb2xy_getNhcNcpAreaClassification_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\PostCreditAdministrativeLicense_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicaccountcancelcertlistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\utils\TrustAllTrustManager.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\Guiji_Housingconstruction_Mapper.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Business_license_qrcode_result_query_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_healthcommission_tjxx_Bean.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Privatenonenterprise_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetJptsstaFpzyz_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\Sfz_Api.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\network\http\HttpRequest.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetEnterpriseRegister_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Guiji_healthcommission_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetLaborContractNewRecordBookListQuery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetQyDjInfo_Api.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatcreadministrativepenaltylistquery_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetEnterprisePopularFeelings_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetEmploymentRegisterStateListQuery_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Sydwlistquery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\QueryEPbBaseinfos_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetEnterpriseRiskWarning_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetLaborContractNewRecordBookListQuery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlichouseholdregistercertlistquery_Service.java
+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\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
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetLaborContractNewRecordInfoListQuery_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_library_baseinfo_Bean.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Guiji_naturalresources_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicblastingoperationunitpermitlistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Familyplanning_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\Guiji_healthcommission.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\Guiji_Library_Mapper.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Esb2xy_getNcpLoseContacts_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlichouseholdregistercertlistquery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\base\util\Convert.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\PostCreditAdministrativePenalty_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetSocialSecurityCardInfoListQuery_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetJptsstaXzcf_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\Guiji_Housingconstruction_Mapper2.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\utils\HttpUtil.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetJptsstaFpzyz_Service.java
+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\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
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlichighlytoxicchemicalsroadtransportpermitlistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Socialincorporation_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Guiji_naturalresources_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\MyConsulListener.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetSwzsxx2_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicentryexitpermitlistquery_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Dqjglistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Socialincorporation_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetLaborContractRenewRecordBookListQuery_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicenterprisevehiclemanageinfolistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\PeoplemarryInfosingle_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Guiji_civiladministration_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetSwzsxx1_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicbasicpopulationinfolistquery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetJptsstaZdsswfajdsr_Api.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Portraitandcomposite_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicsecurityservicepermitlistquery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetSocialSecurityCardPersonBaseInfoListQuery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_healthcommission_xx_Bean.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatcreadministrativepenaltylistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicadministrativelicenseinfolistquery_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Esb2xy_getNcpInterantionalMsg_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Guiji_civiladministration_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\utils\HttpUtil2.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Sydwlistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetJptsstaHmd_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlichotelindustryspeciallicenselistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Esb2xy_getNcpLoseContacts_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Esb2xy_getNcpSuspectedDiagnosis_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\base\BaseService.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\PeoplemarryInfodouble_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Portraitandbrief_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicbackandforthhongkongandmacaolistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\Guiji_Healthcommission_Mapper.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicautodrivingcertlistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicadministrativelicenseinfolistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetJptsstaFpzyz_Api.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetEmploymentRegisterInfoListQuery_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetJptsstaZdsswfajdsr_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\utils\Test.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_healthcommission_yyryxx_Bean.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicenterprisevehiclemanageinfolistquery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetLaborContractCancelRecordBookListQuery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicpasstohongkongandmacaolistquery_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\License_qrcode_get_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetLaborContractRenewRecordBookListQuery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetEmploymentEntrepreneurshipCardListQuery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetSwDjz1Info_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetJptsstaXzcf_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicaccountcancelcertlistquery_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetSwDjz1Info_Api.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetYbNsrInfo_Api.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Socialorganization_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Guiji_healthcommission_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetCegnirEnterpriseCerditRating_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Guiji_Library_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Dqjglistquery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetTaxPlayerStatus_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicresidentidcardlistquery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\base\BaseGuijiBean.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetJptsstaQsxx_Api.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_library_creditpoints_Bean.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\Guiji_naturalresources_Mapper2.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\QueryEBaseinfos_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicresidencepermitlistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetCrediPublicKey_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\BheckBrief_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\Guiji_Housingconstruction.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetJptsstaHmd_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetJptsstaXzxk_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicresidencepermitlistquery_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetSwzsxx3_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetEnterpriseUniscId_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\TestService.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetLaborContractCancelRecordInfoListQuery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetEnterpriseSupervise_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetEmploymentRegisterInfoListQuery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicautopilotcertlistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicbasicpopulationinfolistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Esb2xy_getNcpInterantionalContacts_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicdrunkdrivingillegalactinfolistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\Guiji_civiladministration_Mapper2.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicdriverbasicinfolistquery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\License_qrcode_get_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetSsjksSwsxzyInfo_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicinformationnetworksecuritycertlistquery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetSwzsxx3_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetLaborContractRenewRecordInfoListQuery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetUnemploymentRegisterInfoListQuery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\Guiji_Healthcommission_Mapper2.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicsecurityguardcertlistquery_ServiceImpl.java
+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\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
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\QueryEBaseinfos_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\QueryELiIlldisdetails_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetJptsstaXzxk_Api.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\DeleteCrediPublicKey_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicsecuritytrainingpermitlistquery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetQsWszInfo_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicsecuritytrainingpermitlistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicsecurityguardcertlistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicaccountcancelcertlistquery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetEnterpriseUniscId_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetSwzsxx1_Api.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetSwzsxx1_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Birthcertificate_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlichighlytoxicchemicalsroadtransportpermitlistquery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetSsjksSwsxzyInfo_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetEnterpriseSupervise_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Esb2xy_getNcpInterantionalContacts_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatliccitizenpassportcertlistquery_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Jldpfpopulation_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetSwDjz1Info_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetLaborContractNewRecordBookListQuery_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetEnterpriseRegister_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Immovablesinfolistquery_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetEnterpriseCoordinate_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetSwzsxx2_Api.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Deathcertificate_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Familyplanning_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Immovablescertlistquery_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetNcpSuspectedDiagnosis_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_housingconstruction_zlskfrx_Bean.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicsecurityservicepermitlistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Foundationlegalperson_Bean.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetSwzsxx2_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Foundationlegalperson_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetJptsstaXzcf_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\PostCreditAdministrativeLicense_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicaccountcancelcertlistquery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetEnterpriseRiskWarning_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetSwzsxx1_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetLaborContractCancelRecordInfoListQuery_Service.java
@@ -215,169 +296,90 @@ E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Soc
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_naturalresources_qlrjbxx_Bean.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetJptsstaHmd_Api.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetJptsstaQsxx_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\utils\TrustAllTrustManager.java
 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\mapper\Guiji_Housingconstruction_Mapper.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Business_license_qrcode_result_query_VO.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
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\base\util\CharsetKit.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_healthcommission_tjxx_Bean.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Privatenonenterprise_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatcreadministrativepenaltylistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicpasstohongkongandmacaolistquery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetSwDjz1Info_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetJptsstaFpzyz_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\Sfz_Api.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\network\http\HttpRequest.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicdriverbasicinfolistquery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetEnterpriseRegister_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlichotelindustryspeciallicenselistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicblastingoperationunitpermitlistquery_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Guiji_healthcommission_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetCegnirEnterpriseCerditRating_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetLaborContractNewRecordBookListQuery_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetQyDjInfo_Api.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\network\http\HttpQueue.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatcreadministrativepenaltylistquery_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetEnterprisePopularFeelings_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetEmploymentRegisterStateListQuery_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Sydwlistquery_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\QueryEPbBaseinfos_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetPath_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Privatenonenterprise_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\Application.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Immovablescertlistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\QueryELiIlldisdetails_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetEnterpriseRiskWarning_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicresidentidcardlistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetQsWszInfo_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetLaborContractNewRecordBookListQuery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlichouseholdregistercertlistquery_Service.java
-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\service\Gatlicautopilotcertlistquery_Service.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\bo\BaseBean_MZ.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\model\vo\Download_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicadministrativelicenseinfolistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicblastingoperationunitpermitlistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetSwzsxx3_VO.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\GetEnterpriseRegister_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
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\QueryEPbBaseinfos_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetLaborContractNewRecordInfoListQuery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\PeoplemarryInfosingle_Bean.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Familyplanning_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_library_baseinfo_Bean.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Esb2xy_getNhcNcpAreaClassification_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Guiji_naturalresources_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\License_qrcode_get_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicblastingoperationunitpermitlistquery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetEnterpriseCoordinate_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Familyplanning_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\Guiji_healthcommission.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\Guiji_Library_Mapper.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Esb2xy_getNcpLoseContacts_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlichouseholdregistercertlistquery_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\base\util\Convert.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicautopilotcertlistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicpasstohongkongandmacaolistquery_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\PostCreditAdministrativePenalty_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\TestVO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetSocialSecurityCardInfoListQuery_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetJptsstaXzcf_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_housingconstruction_ysljc_Bean.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\mapper\Guiji_Housingconstruction_Mapper2.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Esb2xy_getNcpInterantionalMsg_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\utils\HttpUtil.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetJptsstaFpzyz_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\ABaseService.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetSwzsxx2_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Deathcertificate_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicautodrivingcertlistquery_ServiceImpl.java
-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\service\Esb2xy_getNcpSuspectedDiagnosis_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetSsjksSwsxzyInfo_Api.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\api\PeoplemarryInfosingle_Api.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicautodrivingcertlistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicenterprisevehiclemanageinfolistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\PostCreditAdministrativeLicense_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
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicentryexitpermitlistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetJptsstaXzcf_Api.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlichighlytoxicchemicalsroadtransportpermitlistquery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Esb2xy_getNcpInterantionalMsg_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\TestApiApplication.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Socialincorporation_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetJptsstaZdsswfajdsr_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Guiji_naturalresources_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\MyConsulListener.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicinformationnetworksecuritycertlistquery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\exception\ServiceExceptionHandler.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicentryexitpermitlistquery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetSwzsxx2_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicentryexitpermitlistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Sydwlistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\base\BaseApi.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Dqjglistquery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Socialincorporation_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetLaborContractRenewRecordBookListQuery_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicenterprisevehiclemanageinfolistquery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicsecurityservicepermitlistquery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\PeoplemarryInfosingle_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetSwzsxx3_Api.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Guiji_civiladministration_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\ServletInitializer.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_civiladministration_szxxsj_Bean.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetSocialSecurityCardInfoListQuery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetEnterpriseCoordinate_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlichighlytoxicchemicalsroadtransportpermitlistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\BaseVO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\GetSwzsxx1_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicbasicpopulationinfolistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\PeoplemarryInfodouble_Bean.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\GetJptsstaZdsswfajdsr_Api.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Portraitandcomposite_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\utils\Const.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetSocialSecurityCertificate_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\PeoplemarryInfodouble_Api.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetQyDjInfo_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicsecurityguardcertlistquery_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicsecurityservicepermitlistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetJptsstaQsxx_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetSocialSecurityCardPersonBaseInfoListQuery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\PostCreditAdministrativePenalty_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\DeleteCrediPublicKey_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_healthcommission_xx_Bean.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatcreadministrativepenaltylistquery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicadministrativelicenseinfolistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetEnterpriseSupervise_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Esb2xy_getNcpInterantionalMsg_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Guiji_civiladministration_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\utils\HttpUtil2.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Sydwlistquery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetJptsstaHmd_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\api\Guiji_Library.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetYbNsrInfo_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetJptsstaXzxk_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\PeoplemarryInfosingle_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicdrunkdrivingillegalactinfolistquery_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlichotelindustryspeciallicenselistquery_VO.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Esb2xy_getNcpLoseContacts_ServiceImpl.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Esb2xy_getNcpSuspectedDiagnosis_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicdriverillegalinfolistquery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetEnterpriseRiskWarning_Service.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\base\BaseService.java
-E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\PeoplemarryInfodouble_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicaccounttransfercertlistquery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlichotelindustryspeciallicenselistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Privatenonenterprise_Service.java

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


+ 1 - 1
test-api/target/surefire-reports/com.sooka.ZsjApiApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.sooka.ZsjApiApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.078 s - in com.sooka.ZsjApiApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.466 s - in com.sooka.ZsjApiApplicationTests

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