Administrator 3 년 전
부모
커밋
62fb51ae6e
100개의 변경된 파일5817개의 추가작업 그리고 674개의 파일을 삭제
  1. 13 0
      .idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_4_1.xml
  2. 13 0
      .idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_4.xml
  3. 13 0
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_7_RELEASE.xml
  4. 675 382
      .idea/workspace.xml
  5. 3 1
      sooka-auth/src/main/resources/application-dev.yml
  6. 2 1
      sooka-auth/src/main/resources/application.yml
  7. 2 2
      sooka-auth/src/main/resources/bootstrap.yml
  8. 3 1
      sooka-auth/target/classes/application-dev.yml
  9. 2 1
      sooka-auth/target/classes/application.yml
  10. 2 2
      sooka-auth/target/classes/bootstrap.yml
  11. BIN
      sooka-auth/target/classes/com/sooka/AuthApplication.class
  12. BIN
      sooka-auth/target/classes/com/sooka/ServletInitializer.class
  13. BIN
      sooka-auth/target/classes/com/sooka/api/ZsjApi.class
  14. BIN
      sooka-auth/target/classes/com/sooka/exception/ServiceExceptionHandler.class
  15. BIN
      sooka-auth/target/classes/com/sooka/model/db/IntDetailed.class
  16. BIN
      sooka-auth/target/classes/com/sooka/network/http/Http$SignParams.class
  17. BIN
      sooka-auth/target/classes/com/sooka/network/http/Http.class
  18. BIN
      sooka-auth/target/classes/com/sooka/network/http/HttpRequest.class
  19. BIN
      sooka-auth/target/classes/com/sooka/service/AuthService.class
  20. BIN
      sooka-auth/target/classes/com/sooka/service/impl/AuthServiceImpl.class
  21. BIN
      sooka-auth/target/classes/com/sooka/utils/DateUtils.class
  22. BIN
      sooka-auth/target/classes/com/sooka/utils/HttpUtil.class
  23. 14 14
      sooka-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  24. 1 1
      sooka-auth/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
  25. BIN
      sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar
  26. BIN
      sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar.original
  27. 9 10
      sooka-auth/target/surefire-reports/TEST-com.sooka.AuthApplicationTests.xml
  28. 1 1
      sooka-auth/target/surefire-reports/com.sooka.AuthApplicationTests.txt
  29. 1 1
      sooka-common/target/maven-archiver/pom.properties
  30. 3 3
      sooka-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  31. 0 0
      sooka-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
  32. BIN
      sooka-common/target/sooka-common-0.0.1-SNAPSHOT.jar
  33. 1 2
      sooka-gateway/pom.xml
  34. 4 3
      sooka-gateway/src/main/resources/application.yml
  35. 2 2
      sooka-gateway/src/main/resources/bootstrap.yml
  36. 6 5
      sooka-gateway/target/classes/application.yml
  37. 2 2
      sooka-gateway/target/classes/bootstrap.yml
  38. BIN
      sooka-gateway/target/classes/com/sooka/gateway/GatewayApplication.class
  39. BIN
      sooka-gateway/target/classes/com/sooka/gateway/config/FeignConfig$RMappingJackson2HttpMessageConverter.class
  40. BIN
      sooka-gateway/target/classes/com/sooka/gateway/config/FeignConfig.class
  41. BIN
      sooka-gateway/target/classes/com/sooka/gateway/feign/DeptFeignService.class
  42. BIN
      sooka-gateway/target/classes/com/sooka/gateway/filter/AuthAndLogFilter.class
  43. BIN
      sooka-gateway/target/classes/com/sooka/gateway/utils/R.class
  44. 6 6
      sooka-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  45. 1 1
      sooka-gateway/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
  46. BIN
      sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar
  47. BIN
      sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar.original
  48. 9 10
      sooka-gateway/target/surefire-reports/TEST-com.sooka.gateway.GatewayApplicationTests.xml
  49. 1 1
      sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt
  50. 1 1
      sooka-jersey/target/maven-archiver/pom.properties
  51. 3 3
      sooka-jersey/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  52. 0 0
      sooka-jersey/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
  53. BIN
      sooka-jersey/target/sooka-jersey-0.0.1-SNAPSHOT.jar
  54. 7 0
      test-api/pom.xml
  55. 59 0
      test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java
  56. 179 0
      test-api/src/main/java/com/sooka/api/Guiji_Library.java
  57. 84 0
      test-api/src/main/java/com/sooka/api/Guiji_naturalresources.java
  58. 7 0
      test-api/src/main/java/com/sooka/base/BaseApi.java
  59. 114 0
      test-api/src/main/java/com/sooka/base/BaseEntity.java
  60. 20 0
      test-api/src/main/java/com/sooka/base/BaseGuijiBean.java
  61. 42 0
      test-api/src/main/java/com/sooka/base/BaseService.java
  62. 86 0
      test-api/src/main/java/com/sooka/base/util/CharsetKit.java
  63. 999 0
      test-api/src/main/java/com/sooka/base/util/Convert.java
  64. 91 0
      test-api/src/main/java/com/sooka/base/util/StrFormatter.java
  65. 408 0
      test-api/src/main/java/com/sooka/base/util/StringUtils.java
  66. 7 0
      test-api/src/main/java/com/sooka/mapper/Guiji_Housingconstruction.java
  67. 33 0
      test-api/src/main/java/com/sooka/mapper/Guiji_Library_Mapper.java
  68. 47 0
      test-api/src/main/java/com/sooka/mapper/Guiji_Library_Mapper2.java
  69. 20 0
      test-api/src/main/java/com/sooka/mapper/Guiji_naturalresources_Mapper.java
  70. 29 0
      test-api/src/main/java/com/sooka/mapper/Guiji_naturalresources_Mapper2.java
  71. 0 9
      test-api/src/main/java/com/sooka/model/bo/BaseBean.java
  72. 22 0
      test-api/src/main/java/com/sooka/model/bo/BaseBean_Guiji.java
  73. 4 0
      test-api/src/main/java/com/sooka/model/bo/BaseBean_Share.java
  74. 13 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_housingconstruction_yhjjxx_Bean.java
  75. 34 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_library_baseinfo_Bean.java
  76. 27 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_library_borrow_Bean.java
  77. 36 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_library_creditpoints_Bean.java
  78. 26 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_library_give_Bean.java
  79. 132 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjxx_Bean.java
  80. 53 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjzxx_Bean.java
  81. 107 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_qlrjbxx_Bean.java
  82. 1 1
      test-api/src/main/java/com/sooka/model/bo/PeoplemarryInfodouble_Bean.java
  83. 1 1
      test-api/src/main/java/com/sooka/model/bo/PeoplemarryInfosingle_Bean.java
  84. 24 0
      test-api/src/main/java/com/sooka/service/Guiji_Library_Service.java
  85. 21 0
      test-api/src/main/java/com/sooka/service/Guiji_naturalresources_Service.java
  86. 4 0
      test-api/src/main/java/com/sooka/service/impl/ABaseService.java
  87. 261 0
      test-api/src/main/java/com/sooka/service/impl/Guiji_Library_ServiceImpl.java
  88. 255 0
      test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java
  89. 209 0
      test-api/src/main/java/com/sooka/system/domain/TGuijiLibraryCreditpoints.java
  90. 201 182
      test-api/src/main/java/com/sooka/utils/HttpUtil.java
  91. 26 0
      test-api/src/main/java/com/sooka/utils/Test.java
  92. 60 23
      test-api/src/main/resources/application-dev.yml
  93. 6 1
      test-api/src/main/resources/application.yml
  94. 1 1
      test-api/src/main/resources/bootstrap.yml
  95. 221 0
      test-api/src/main/resources/mapper/Guiji_Libaray_Mapper2.xml
  96. 169 0
      test-api/src/main/resources/mapper/Guiji_Library_Mapper.xml
  97. 340 0
      test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml
  98. 394 0
      test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper2.xml
  99. 144 0
      test-api/src/main/resources/mapper/TGuijiLibraryCreditpointsMapper.xml
  100. 0 0
      test-api/target/classes/application-dev.yml

+ 13 - 0
.idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_4_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.4.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/dynamic-datasource-spring-boot-starter/3.4.1/dynamic-datasource-spring-boot-starter-3.4.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/dynamic-datasource-spring-boot-starter/3.4.1/dynamic-datasource-spring-boot-starter-3.4.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/dynamic-datasource-spring-boot-starter/3.4.1/dynamic-datasource-spring-boot-starter-3.4.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_4.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.aspectj:aspectjweaver:1.9.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.4/aspectjweaver-1.9.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.4/aspectjweaver-1.9.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.4/aspectjweaver-1.9.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_7_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.7.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.1.7.RELEASE/spring-boot-starter-aop-2.1.7.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.1.7.RELEASE/spring-boot-starter-aop-2.1.7.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.1.7.RELEASE/spring-boot-starter-aop-2.1.7.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 675 - 382
.idea/workspace.xml


+ 3 - 1
sooka-auth/src/main/resources/application-dev.yml

@@ -9,7 +9,9 @@ spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
 #    url: jdbc:mysql://36.97.65.105:53306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-    url: jdbc:mysql://172.18.128.5:3306/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#    url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+
 
     username: thsjzt
     password: thsjzt

+ 2 - 1
sooka-auth/src/main/resources/application.yml

@@ -6,4 +6,5 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+#        server-addr: 172.17.5.4:8848
+        server-addr: 10.0.51.4:8848

+ 2 - 2
sooka-auth/src/main/resources/bootstrap.yml

@@ -4,5 +4,5 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1:8848
-        file-extension: yaml
+        server-addr: 10.0.51.4:8848
+        file-extension: yaml

+ 3 - 1
sooka-auth/target/classes/application-dev.yml

@@ -9,7 +9,9 @@ spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
 #    url: jdbc:mysql://36.97.65.105:53306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-    url: jdbc:mysql://172.18.128.5:3306/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#    url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+
 
     username: thsjzt
     password: thsjzt

+ 2 - 1
sooka-auth/target/classes/application.yml

@@ -6,4 +6,5 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+#        server-addr: 172.17.5.4:8848
+        server-addr: 10.0.51.4:8848

+ 2 - 2
sooka-auth/target/classes/bootstrap.yml

@@ -4,5 +4,5 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1:8848
-        file-extension: yaml
+        server-addr: 10.0.51.4:8848
+        file-extension: yaml

BIN
sooka-auth/target/classes/com/sooka/AuthApplication.class


BIN
sooka-auth/target/classes/com/sooka/ServletInitializer.class


BIN
sooka-auth/target/classes/com/sooka/api/ZsjApi.class


BIN
sooka-auth/target/classes/com/sooka/exception/ServiceExceptionHandler.class


BIN
sooka-auth/target/classes/com/sooka/model/db/IntDetailed.class


BIN
sooka-auth/target/classes/com/sooka/network/http/Http$SignParams.class


BIN
sooka-auth/target/classes/com/sooka/network/http/Http.class


BIN
sooka-auth/target/classes/com/sooka/network/http/HttpRequest.class


BIN
sooka-auth/target/classes/com/sooka/service/AuthService.class


BIN
sooka-auth/target/classes/com/sooka/service/impl/AuthServiceImpl.class


BIN
sooka-auth/target/classes/com/sooka/utils/DateUtils.class


BIN
sooka-auth/target/classes/com/sooka/utils/HttpUtil.class


+ 14 - 14
sooka-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,14 +1,14 @@
-E:\首佳工作目录\thsjzt\sooka-auth\src\main\java\com\sooka\api\ZsjApi.java
-E:\首佳工作目录\thsjzt\sooka-auth\src\main\java\com\sooka\model\db\IntDetailed.java
-E:\首佳工作目录\thsjzt\sooka-auth\src\main\java\com\sooka\utils\Const.java
-E:\首佳工作目录\thsjzt\sooka-auth\src\main\java\com\sooka\ServletInitializer.java
-E:\首佳工作目录\thsjzt\sooka-auth\src\main\java\com\sooka\network\http\HttpQueue.java
-E:\首佳工作目录\thsjzt\sooka-auth\src\main\java\com\sooka\exception\ServiceExceptionHandler.java
-E:\首佳工作目录\thsjzt\sooka-auth\src\main\java\com\sooka\mapper\AuthMapper.java
-E:\首佳工作目录\thsjzt\sooka-auth\src\main\java\com\sooka\utils\HttpUtil.java
-E:\首佳工作目录\thsjzt\sooka-auth\src\main\java\com\sooka\network\http\Http.java
-E:\首佳工作目录\thsjzt\sooka-auth\src\main\java\com\sooka\service\AuthService.java
-E:\首佳工作目录\thsjzt\sooka-auth\src\main\java\com\sooka\network\http\HttpRequest.java
-E:\首佳工作目录\thsjzt\sooka-auth\src\main\java\com\sooka\service\impl\AuthServiceImpl.java
-E:\首佳工作目录\thsjzt\sooka-auth\src\main\java\com\sooka\utils\DateUtils.java
-E:\首佳工作目录\thsjzt\sooka-auth\src\main\java\com\sooka\AuthApplication.java
+E:\首佳工作目录\thsjzt_cloud\sooka-auth\src\main\java\com\sooka\network\http\Http.java
+E:\首佳工作目录\thsjzt_cloud\sooka-auth\src\main\java\com\sooka\network\http\HttpQueue.java
+E:\首佳工作目录\thsjzt_cloud\sooka-auth\src\main\java\com\sooka\service\AuthService.java
+E:\首佳工作目录\thsjzt_cloud\sooka-auth\src\main\java\com\sooka\api\ZsjApi.java
+E:\首佳工作目录\thsjzt_cloud\sooka-auth\src\main\java\com\sooka\mapper\AuthMapper.java
+E:\首佳工作目录\thsjzt_cloud\sooka-auth\src\main\java\com\sooka\exception\ServiceExceptionHandler.java
+E:\首佳工作目录\thsjzt_cloud\sooka-auth\src\main\java\com\sooka\network\http\HttpRequest.java
+E:\首佳工作目录\thsjzt_cloud\sooka-auth\src\main\java\com\sooka\utils\DateUtils.java
+E:\首佳工作目录\thsjzt_cloud\sooka-auth\src\main\java\com\sooka\service\impl\AuthServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\sooka-auth\src\main\java\com\sooka\ServletInitializer.java
+E:\首佳工作目录\thsjzt_cloud\sooka-auth\src\main\java\com\sooka\utils\Const.java
+E:\首佳工作目录\thsjzt_cloud\sooka-auth\src\main\java\com\sooka\AuthApplication.java
+E:\首佳工作目录\thsjzt_cloud\sooka-auth\src\main\java\com\sooka\utils\HttpUtil.java
+E:\首佳工作目录\thsjzt_cloud\sooka-auth\src\main\java\com\sooka\model\db\IntDetailed.java

+ 1 - 1
sooka-auth/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1 +1 @@
-E:\Ê׼ѹ¤×÷Ŀ¼\thsjzt\sooka-auth\src\test\java\com\sooka\AuthApplicationTests.java
+E:\首佳工作目录\thsjzt_cloud\sooka-auth\src\test\java\com\sooka\AuthApplicationTests.java

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


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


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 9 - 10
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: 23.64 s - in com.sooka.AuthApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.303 s - in com.sooka.AuthApplicationTests

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Jul 20 12:24:52 CST 2021
+#Thu Sep 02 18:26:53 CST 2021
 version=0.0.1-SNAPSHOT
 groupId=com.sooka
 artifactId=sooka-common

+ 3 - 3
sooka-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,3 +1,3 @@
-E:\首佳工作目录\thsjzt\sooka-common\src\main\java\com\sooka\model\ResultModel.java
-E:\首佳工作目录\thsjzt\sooka-common\src\main\java\com\sooka\enums\ResultEnum.java
-E:\首佳工作目录\thsjzt\sooka-common\src\main\java\com\sooka\utils\MyMapper.java
+E:\首佳工作目录\thsjzt_cloud\sooka-common\src\main\java\com\sooka\utils\MyMapper.java
+E:\首佳工作目录\thsjzt_cloud\sooka-common\src\main\java\com\sooka\enums\ResultEnum.java
+E:\首佳工作目录\thsjzt_cloud\sooka-common\src\main\java\com\sooka\model\ResultModel.java

+ 0 - 0
sooka-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst


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


+ 1 - 2
sooka-gateway/pom.xml

@@ -62,8 +62,7 @@
 			<version>2.2.3.RELEASE</version>
 		</dependency>
 
-
-	</dependencies>
+    </dependencies>
 
 	<dependencyManagement>
 		<dependencies>

+ 4 - 3
sooka-gateway/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 99
+  port: 5509
 
 spring:
   application:
@@ -7,7 +7,8 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+        server-addr: 172.17.5.4:8848
+#        server-addr: 10.0.51.4:8848
     gateway:
       discovery:
         locator:
@@ -28,7 +29,7 @@ spring:
           predicates:
             - Path=/api/test/**
           filters:
-            - RewritePath=/api/(?<segment>.*),/api/$\{segment}
+            - RewritePath=/test/(?<segment>.*),/$\{segment}
 
 gate:
   ignore:

+ 2 - 2
sooka-gateway/src/main/resources/bootstrap.yml

@@ -4,5 +4,5 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1:8848
-        file-extension: yaml
+        server-addr: 10.0.51.4:8848
+        file-extension: yaml

+ 6 - 5
sooka-gateway/target/classes/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 99
+  port: 5509
 
 spring:
   application:
@@ -7,7 +7,8 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+        server-addr: 172.17.5.4:8848
+#        server-addr: 10.0.51.4:8848
     gateway:
       discovery:
         locator:
@@ -24,11 +25,11 @@ spring:
 
 
         - id: admin_route
-          uri: lb://renren-fast
+          uri: lb://test-api
           predicates:
-            - Path=/api/**
+            - Path=/api/test/**
           filters:
-            - RewritePath=/api/(?<segment>.*),/renren-fast/$\{segment}
+            - RewritePath=/test/(?<segment>.*),/$\{segment}
 
 gate:
   ignore:

+ 2 - 2
sooka-gateway/target/classes/bootstrap.yml

@@ -4,5 +4,5 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1:8848
-        file-extension: yaml
+        server-addr: 10.0.51.4:8848
+        file-extension: yaml

BIN
sooka-gateway/target/classes/com/sooka/gateway/GatewayApplication.class


BIN
sooka-gateway/target/classes/com/sooka/gateway/config/FeignConfig$RMappingJackson2HttpMessageConverter.class


BIN
sooka-gateway/target/classes/com/sooka/gateway/config/FeignConfig.class


BIN
sooka-gateway/target/classes/com/sooka/gateway/feign/DeptFeignService.class


BIN
sooka-gateway/target/classes/com/sooka/gateway/filter/AuthAndLogFilter.class


BIN
sooka-gateway/target/classes/com/sooka/gateway/utils/R.class


+ 6 - 6
sooka-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,6 +1,6 @@
-E:\首佳工作目录\thsjzt\sooka-gateway\src\main\java\com\sooka\gateway\feign\DeptFeignService.java
-E:\首佳工作目录\thsjzt\sooka-gateway\src\main\java\com\sooka\gateway\utils\R.java
-E:\首佳工作目录\thsjzt\sooka-gateway\src\main\java\com\sooka\gateway\config\FeignConfig.java
-E:\首佳工作目录\thsjzt\sooka-gateway\src\main\java\com\sooka\gateway\config\MyCorsConfiguration.java
-E:\首佳工作目录\thsjzt\sooka-gateway\src\main\java\com\sooka\gateway\filter\AuthAndLogFilter.java
-E:\首佳工作目录\thsjzt\sooka-gateway\src\main\java\com\sooka\gateway\GatewayApplication.java
+E:\首佳工作目录\thsjzt_cloud\sooka-gateway\src\main\java\com\sooka\gateway\filter\AuthAndLogFilter.java
+E:\首佳工作目录\thsjzt_cloud\sooka-gateway\src\main\java\com\sooka\gateway\config\FeignConfig.java
+E:\首佳工作目录\thsjzt_cloud\sooka-gateway\src\main\java\com\sooka\gateway\feign\DeptFeignService.java
+E:\首佳工作目录\thsjzt_cloud\sooka-gateway\src\main\java\com\sooka\gateway\GatewayApplication.java
+E:\首佳工作目录\thsjzt_cloud\sooka-gateway\src\main\java\com\sooka\gateway\config\MyCorsConfiguration.java
+E:\首佳工作目录\thsjzt_cloud\sooka-gateway\src\main\java\com\sooka\gateway\utils\R.java

+ 1 - 1
sooka-gateway/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1 +1 @@
-E:\Ê׼ѹ¤×÷Ŀ¼\thsjzt\sooka-gateway\src\test\java\com\sooka\gateway\GatewayApplicationTests.java
+E:\首佳工作目录\thsjzt_cloud\sooka-gateway\src\test\java\com\sooka\gateway\GatewayApplicationTests.java

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


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


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 9 - 10
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: 21.069 s - in com.sooka.gateway.GatewayApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.301 s - in com.sooka.gateway.GatewayApplicationTests

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Jul 20 12:33:46 CST 2021
+#Thu Sep 02 18:27:31 CST 2021
 version=0.0.1-SNAPSHOT
 groupId=com.sooka.jersey
 artifactId=sooka-jersey

+ 3 - 3
sooka-jersey/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,3 +1,3 @@
-E:\首佳工作目录\thsjzt\sooka-jersey\src\main\java\com\sooka\jersey\provider\LocalDateTimeConverter.java
-E:\首佳工作目录\thsjzt\sooka-jersey\src\main\java\com\sooka\jersey\provider\GsonProvider.java
-E:\首佳工作目录\thsjzt\sooka-jersey\src\main\java\com\sooka\jersey\utils\JsonUtils.java
+E:\首佳工作目录\thsjzt_cloud\sooka-jersey\src\main\java\com\sooka\jersey\provider\GsonProvider.java
+E:\首佳工作目录\thsjzt_cloud\sooka-jersey\src\main\java\com\sooka\jersey\provider\LocalDateTimeConverter.java
+E:\首佳工作目录\thsjzt_cloud\sooka-jersey\src\main\java\com\sooka\jersey\utils\JsonUtils.java

+ 0 - 0
sooka-jersey/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst


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


+ 7 - 0
test-api/pom.xml

@@ -38,6 +38,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+
+
 
         <!--war-->
         <dependency>

+ 59 - 0
test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java

@@ -0,0 +1,59 @@
+package com.sooka.api;
+
+import com.sooka.base.BaseApi;
+import com.sooka.model.ResultModel;
+import com.sooka.model.bo.Guiji_library_baseinfo_Bean;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/")
+public class Guiji_Housingconstruction extends BaseApi {
+
+    //503026
+    @POST
+    @Path("/guiji_housingconstruction_yhjbxx")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel yhjbxx(String str) {
+        System.out.println("yhjbxx:" + str);
+        ResultModel r = new ResultModel();
+        r.setCode(00000);
+        r.setMessage("成功");
+        return r;
+    }
+
+    //用水量检测
+    @POST
+    @Path("/guiji_housingconstruction_ysljc")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel ysljc(String str) {
+        System.out.println("ysljc:" + str);
+        ResultModel r = new ResultModel();
+        r.setCode(00000);
+        r.setMessage("成功");
+        return r;
+    }
+
+    //自来水客服热线
+    @POST
+    @Path("/guiji_housingconstruction_zlskfrx")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel zlskfrx(String str) {
+        System.out.println("zlskfrx:" + str);
+        ResultModel r = new ResultModel();
+        r.setCode(00000);
+        r.setMessage("成功");
+        return r;
+    }
+
+
+}

+ 179 - 0
test-api/src/main/java/com/sooka/api/Guiji_Library.java

@@ -0,0 +1,179 @@
+package com.sooka.api;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.JsonObject;
+import com.sooka.base.BaseApi;
+import com.sooka.model.ResultModel;
+import com.sooka.model.bo.Guiji_library_baseinfo_Bean;
+import com.sooka.model.bo.Guiji_library_borrow_Bean;
+import com.sooka.model.bo.Guiji_library_creditpoints_Bean;
+import com.sooka.model.bo.Guiji_library_give_Bean;
+import com.sooka.model.vo.PeoplemarryInfodouble_VO;
+import com.sooka.service.Guiji_Library_Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+
+@Path("/")
+public class Guiji_Library extends BaseApi {
+
+
+    @Autowired
+    Guiji_Library_Service guiji_library_service;
+
+
+    //503033
+
+
+    //人员基本信息
+    @POST
+    @Path("/guiji_library_baseinfo")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel baseinfo(String str) {
+        System.out.println("baseinfo:" + str);
+
+        ResultModel r = guiji_library_service.add_guiji_library_baseinfo(str);
+        return r;
+    }
+
+    //图书借
+    @POST
+    @Path("/guiji_library_borrow")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel borrow(String str) {
+        System.out.println("borrow:" + str);
+//        ResultModel r = new ResultModel();
+//        r.setCode(00000);
+//        r.setMessage("成功");
+//
+//        Guiji_library_borrow_Bean bean = new Guiji_library_borrow_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");
+//
+//        bean.setCardno(Data.getString("cardno"));
+//        bean.setName(Data.getString("name"));
+//        bean.setBarcode(Data.getString("barcode"));
+//        bean.setTitle(Data.getString("title"));
+//        bean.setOperationDate(Data.getString("operationDate"));
+
+        ResultModel r = guiji_library_service.add_guiji_library_borrow(str);
+        return r;
+    }
+
+    //图书还
+    @POST
+    @Path("/guiji_library_give")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel give(String str) {
+        System.out.println("give:" + str);
+//        ResultModel r = new ResultModel();
+//        r.setCode(00000);
+//        r.setMessage("成功");
+//        Guiji_library_give_Bean bean = new Guiji_library_give_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");
+//
+//        bean.setCardno(Data.getString("cardno"));
+//        bean.setName(Data.getString("name"));
+//        bean.setBarcode(Data.getString("barcode"));
+//        bean.setTitle(Data.getString("title"));
+//        bean.setOperationDate(Data.getString("operationDate"));
+
+        ResultModel r = guiji_library_service.add_guiji_library_give(str);
+        return r;
+    }
+
+    //信用积分
+    @POST
+    @Path("/guiji_library_creditpoints")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel creditpoints(String str) {
+        System.out.println("creditpoints:" + str);
+//        ResultModel r = new ResultModel();
+//        r.setCode(00000);
+//        r.setMessage("成功");
+//        Guiji_library_creditpoints_Bean bean = new Guiji_library_creditpoints_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");
+//
+//        bean.setCardno(Data.getString("cardno"));
+//        bean.setName(Data.getString("name"));
+//        bean.setBarcode(Data.getString("barcode"));
+//        bean.setRecordType(Data.getString("recordType"));
+//        bean.setFinancialType(Data.getString("financialType"));
+//        bean.setMoney(Data.getString("money"));
+//        bean.setOperator(Data.getString("operator"));
+//        bean.setOperationDate(Data.getString("operationDate"));
+
+
+        ResultModel r = guiji_library_service.add_creditpoints(str);
+        return r;
+    }
+
+    //-----------------------------------------------
+    @POST
+    @Path("/guiji_library_baseinfo_select")
+//     指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_library_baseinfo_select(Guiji_library_baseinfo_Bean bean) {
+        return guiji_library_service.select_guiji_library_baseinfo(bean);
+    }
+
+    @POST
+    @Path("/guiji_library_borrow_select")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_library_borrow_select(Guiji_library_borrow_Bean bean) {
+        return guiji_library_service.select_guiji_library_borrow(bean);
+    }
+
+    @POST
+    @Path("/guiji_library_give_select")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_library_give_select(Guiji_library_give_Bean bean) {
+        return guiji_library_service.select_guiji_library_give(bean);
+    }
+    @POST
+    @Path("/guiji_library_creditpoints_select")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_library_creditpoints_select(Guiji_library_creditpoints_Bean bean) {
+        return guiji_library_service.select_guiji_library_creditpoints(bean);
+    }
+
+}

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

@@ -0,0 +1,84 @@
+package com.sooka.api;
+
+import com.sooka.base.BaseApi;
+import com.sooka.model.ResultModel;
+import com.sooka.model.bo.Guiji_library_baseinfo_Bean;
+import com.sooka.model.bo.Guiji_naturalresources_qlrjbxx_Bean;
+import com.sooka.service.Guiji_naturalresources_Service;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/")
+public class Guiji_naturalresources extends BaseApi {
+
+    @Autowired
+    Guiji_naturalresources_Service guiji_naturalresources_service;
+
+
+    @POST
+    @Path("/guiji_naturalresources_qlrjbxx")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel qlrjbxx(String str) {
+        System.out.println("qlrjbxx:" + str);
+        return guiji_naturalresources_service.add_guiji_naturalresources_qlrjbxx(str);
+    }
+
+    @POST
+    @Path("/guiji_naturalresources_bdcdjxx")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel bdcdjxx(String str) {
+        System.out.println("bdcdjxx:" + str);
+        return guiji_naturalresources_service.add_guiji_naturalresources_bdcdjxx(str);
+    }
+
+    @POST
+    @Path("/guiji_naturalresources_bdcdjzxx")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel bdcdjzxx(String str) {
+        System.out.println("bdcdjzxx:" + str);
+        return guiji_naturalresources_service.add_guiji_naturalresources_bdcdjzxx(str);
+    }
+
+
+    //---------------------------------------------------------------------------------------------------
+    @POST
+    @Path("/guiji_naturalresources_qlrjbxx_select_geren")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel qlrjbxx_select_genren(Guiji_naturalresources_qlrjbxx_Bean bean) {
+        return guiji_naturalresources_service.qlrjbxx_select_genren(bean);
+    }
+
+
+    @POST
+    @Path("/guiji_naturalresources_qlrjbxx_select_qiye")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel qlrjbxx_select_qiye(Guiji_naturalresources_qlrjbxx_Bean bean) {
+        return guiji_naturalresources_service.qlrjbxx_select_qiye(bean);
+    }
+
+    @POST
+    @Path("/guiji_naturalresources_qlrjbxx_select_qita")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel qlrjbxx_select_qita(Guiji_naturalresources_qlrjbxx_Bean bean) {
+        return guiji_naturalresources_service.qlrjbxx_select_qita(bean);
+    }
+
+
+}

+ 7 - 0
test-api/src/main/java/com/sooka/base/BaseApi.java

@@ -1,5 +1,9 @@
 package com.sooka.base;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.sooka.model.bo.Guiji_library_baseinfo_Bean;
+
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.SecurityContext;
 
@@ -22,4 +26,7 @@ public class BaseApi {
 //    }
 
 
+
+
+
 }

+ 114 - 0
test-api/src/main/java/com/sooka/base/BaseEntity.java

@@ -0,0 +1,114 @@
+package com.sooka.base;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * Entity基类
+ *
+ * @author lei_wang
+ */
+public class BaseEntity implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 搜索值 */
+    private String searchValue;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 备注 */
+    private String remark;
+
+    /** 请求参数 */
+    private Map<String, Object> params;
+
+    public String getSearchValue()
+    {
+        return searchValue;
+    }
+
+    public void setSearchValue(String searchValue)
+    {
+        this.searchValue = searchValue;
+    }
+
+    public String getCreateBy()
+    {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy)
+    {
+        this.createBy = createBy;
+    }
+
+    public Date getCreateTime()
+    {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime)
+    {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy()
+    {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy)
+    {
+        this.updateBy = updateBy;
+    }
+
+    public Date getUpdateTime()
+    {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime)
+    {
+        this.updateTime = updateTime;
+    }
+
+    public String getRemark()
+    {
+        return remark;
+    }
+
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
+    }
+
+    public Map<String, Object> getParams()
+    {
+        if (params == null)
+        {
+            params = new HashMap<>();
+        }
+        return params;
+    }
+
+    public void setParams(Map<String, Object> params)
+    {
+        this.params = params;
+    }
+}

+ 20 - 0
test-api/src/main/java/com/sooka/base/BaseGuijiBean.java

@@ -0,0 +1,20 @@
+package com.sooka.base;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class BaseGuijiBean {
+
+    String id;
+    String cd_time;
+    String cd_batch;
+    String cd_operation;
+    String cd_source;
+
+    JSONObject Data;
+
+
+}

+ 42 - 0
test-api/src/main/java/com/sooka/base/BaseService.java

@@ -0,0 +1,42 @@
+package com.sooka.base;
+
+import com.alibaba.fastjson.JSON;
+
+import com.alibaba.fastjson.JSONObject;
+import com.sooka.model.ResultModel;
+import com.sooka.model.bo.BaseBean_Guiji;
+import com.sooka.model.bo.Guiji_library_baseinfo_Bean;
+
+public class BaseService {
+
+
+    public BaseGuijiBean getBaseGuiji(String str) {
+        BaseGuijiBean bean = new BaseGuijiBean();
+        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"));
+        bean.setData(jsonObject.getJSONObject("Data"));
+        return bean;
+    }
+
+
+    public ResultModel getResultModel() {
+        return new ResultModel();
+    }
+
+    public BaseBean_Guiji initBaseGuijiBean(String str, BaseBean_Guiji 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");
+        bean.setData(Data);
+        return bean;
+    }
+
+}

+ 86 - 0
test-api/src/main/java/com/sooka/base/util/CharsetKit.java

@@ -0,0 +1,86 @@
+package com.sooka.base.util;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+
+/**
+ * 字符集工具类
+ *
+ * @author lei_wang
+ */
+public class CharsetKit
+{
+    /** ISO-8859-1 */
+    public static final String ISO_8859_1 = "ISO-8859-1";
+    /** UTF-8 */
+    public static final String UTF_8 = "UTF-8";
+    /** GBK */
+    public static final String GBK = "GBK";
+
+    /** ISO-8859-1 */
+    public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
+    /** UTF-8 */
+    public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
+    /** GBK */
+    public static final Charset CHARSET_GBK = Charset.forName(GBK);
+
+    /**
+     * 转换为Charset对象
+     *
+     * @param charset 字符集,为空则返回默认字符集
+     * @return Charset
+     */
+    public static Charset charset(String charset)
+    {
+        return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
+    }
+
+    /**
+     * 转换字符串的字符集编码
+     *
+     * @param source 字符串
+     * @param srcCharset 源字符集,默认ISO-8859-1
+     * @param destCharset 目标字符集,默认UTF-8
+     * @return 转换后的字符集
+     */
+    public static String convert(String source, String srcCharset, String destCharset)
+    {
+        return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
+    }
+
+    /**
+     * 转换字符串的字符集编码
+     *
+     * @param source 字符串
+     * @param srcCharset 源字符集,默认ISO-8859-1
+     * @param destCharset 目标字符集,默认UTF-8
+     * @return 转换后的字符集
+     */
+    public static String convert(String source, Charset srcCharset, Charset destCharset)
+    {
+        if (null == srcCharset)
+        {
+            srcCharset = StandardCharsets.ISO_8859_1;
+        }
+
+        if (null == destCharset)
+        {
+            srcCharset = StandardCharsets.UTF_8;
+        }
+
+        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
+        {
+            return source;
+        }
+        return new String(source.getBytes(srcCharset), destCharset);
+    }
+
+    /**
+     * @return 系统字符集编码
+     */
+    public static String systemCharset()
+    {
+        return Charset.defaultCharset().name();
+    }
+}

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 999 - 0
test-api/src/main/java/com/sooka/base/util/Convert.java


+ 91 - 0
test-api/src/main/java/com/sooka/base/util/StrFormatter.java

@@ -0,0 +1,91 @@
+package com.sooka.base.util;
+
+
+/**
+ * 字符串格式化
+ *
+ * @author lei_wang
+ */
+public class StrFormatter
+{
+    public static final String EMPTY_JSON = "{}";
+    public static final char C_BACKSLASH = '\\';
+    public static final char C_DELIM_START = '{';
+    public static final char C_DELIM_END = '}';
+
+    /**
+     * 格式化字符串<br>
+     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
+     * 如果想输出 {} 使用 \\转义 { 即可,如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
+     * 例:<br>
+     * 通常使用:format("this is {} for {}", "a", "b") -> this is a for b<br>
+     * 转义{}: format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
+     * 转义\: format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
+     *
+     * @param strPattern 字符串模板
+     * @param argArray 参数列表
+     * @return 结果
+     */
+    public static String format(final String strPattern, final Object... argArray)
+    {
+        if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray))
+        {
+            return strPattern;
+        }
+        final int strPatternLength = strPattern.length();
+
+        // 初始化定义好的长度以获得更好的性能
+        StringBuilder sbuf = new StringBuilder(strPatternLength + 50);
+
+        int handledPosition = 0;
+        int delimIndex;// 占位符所在位置
+        for (int argIndex = 0; argIndex < argArray.length; argIndex++)
+        {
+            delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition);
+            if (delimIndex == -1)
+            {
+                if (handledPosition == 0)
+                {
+                    return strPattern;
+                }
+                else
+                { // 字符串模板剩余部分不再包含占位符,加入剩余部分后返回结果
+                    sbuf.append(strPattern, handledPosition, strPatternLength);
+                    return sbuf.toString();
+                }
+            }
+            else
+            {
+                if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH)
+                {
+                    if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH)
+                    {
+                        // 转义符之前还有一个转义符,占位符依旧有效
+                        sbuf.append(strPattern, handledPosition, delimIndex - 1);
+                        sbuf.append(Convert.utf8Str(argArray[argIndex]));
+                        handledPosition = delimIndex + 2;
+                    }
+                    else
+                    {
+                        // 占位符被转义
+                        argIndex--;
+                        sbuf.append(strPattern, handledPosition, delimIndex - 1);
+                        sbuf.append(C_DELIM_START);
+                        handledPosition = delimIndex + 1;
+                    }
+                }
+                else
+                {
+                    // 正常占位符
+                    sbuf.append(strPattern, handledPosition, delimIndex);
+                    sbuf.append(Convert.utf8Str(argArray[argIndex]));
+                    handledPosition = delimIndex + 2;
+                }
+            }
+        }
+        // 加入最后一个占位符后所有的字符
+        sbuf.append(strPattern, handledPosition, strPattern.length());
+
+        return sbuf.toString();
+    }
+}

+ 408 - 0
test-api/src/main/java/com/sooka/base/util/StringUtils.java

@@ -0,0 +1,408 @@
+package com.sooka.base.util;
+
+import java.util.Collection;
+import java.util.Map;
+
+
+/**
+ * 字符串工具类
+ *
+ * @author lei_wang
+ */
+public class StringUtils extends org.apache.commons.lang3.StringUtils
+{
+    /** 空字符串 */
+    private static final String NULLSTR = "";
+
+    /** 下划线 */
+    private static final char SEPARATOR = '_';
+
+    /**
+     * 获取参数不为空值
+     *
+     * @param value defaultValue 要判断的value
+     * @return value 返回值
+     */
+    public static <T> T nvl(T value, T defaultValue)
+    {
+        return value != null ? value : defaultValue;
+    }
+
+    /**
+     * * 判断一个Collection是否为空, 包含List,Set,Queue
+     *
+     * @param coll 要判断的Collection
+     * @return true:为空 false:非空
+     */
+    public static boolean isEmpty(Collection<?> coll)
+    {
+        return isNull(coll) || coll.isEmpty();
+    }
+
+    /**
+     * * 判断一个Collection是否非空,包含List,Set,Queue
+     *
+     * @param coll 要判断的Collection
+     * @return true:非空 false:空
+     */
+    public static boolean isNotEmpty(Collection<?> coll)
+    {
+        return !isEmpty(coll);
+    }
+
+    /**
+     * * 判断一个对象数组是否为空
+     *
+     * @param objects 要判断的对象数组
+     ** @return true:为空 false:非空
+     */
+    public static boolean isEmpty(Object[] objects)
+    {
+        return isNull(objects) || (objects.length == 0);
+    }
+
+    /**
+     * * 判断一个对象数组是否非空
+     *
+     * @param objects 要判断的对象数组
+     * @return true:非空 false:空
+     */
+    public static boolean isNotEmpty(Object[] objects)
+    {
+        return !isEmpty(objects);
+    }
+
+    /**
+     * * 判断一个Map是否为空
+     *
+     * @param map 要判断的Map
+     * @return true:为空 false:非空
+     */
+    public static boolean isEmpty(Map<?, ?> map)
+    {
+        return isNull(map) || map.isEmpty();
+    }
+
+    /**
+     * * 判断一个Map是否为空
+     *
+     * @param map 要判断的Map
+     * @return true:非空 false:空
+     */
+    public static boolean isNotEmpty(Map<?, ?> map)
+    {
+        return !isEmpty(map);
+    }
+
+    /**
+     * * 判断一个字符串是否为空串
+     *
+     * @param str String
+     * @return true:为空 false:非空
+     */
+    public static boolean isEmpty(String str)
+    {
+        return isNull(str) || NULLSTR.equals(str.trim());
+    }
+
+    /**
+     * * 判断一个字符串是否为非空串
+     *
+     * @param str String
+     * @return true:非空串 false:空串
+     */
+    public static boolean isNotEmpty(String str)
+    {
+        return !isEmpty(str);
+    }
+
+    /**
+     * * 判断一个对象是否为空
+     *
+     * @param object Object
+     * @return true:为空 false:非空
+     */
+    public static boolean isNull(Object object)
+    {
+        return object == null;
+    }
+
+    /**
+     * * 判断一个对象是否非空
+     *
+     * @param object Object
+     * @return true:非空 false:空
+     */
+    public static boolean isNotNull(Object object)
+    {
+        return !isNull(object);
+    }
+
+    /**
+     * * 判断一个对象是否是数组类型(Java基本型别的数组)
+     *
+     * @param object 对象
+     * @return true:是数组 false:不是数组
+     */
+    public static boolean isArray(Object object)
+    {
+        return isNotNull(object) && object.getClass().isArray();
+    }
+
+    /**
+     * 去空格
+     */
+    public static String trim(String str)
+    {
+        return (str == null ? "" : str.trim());
+    }
+
+    /**
+     * 截取字符串
+     *
+     * @param str 字符串
+     * @param start 开始
+     * @return 结果
+     */
+    public static String substring(final String str, int start)
+    {
+        if (str == null)
+        {
+            return NULLSTR;
+        }
+
+        if (start < 0)
+        {
+            start = str.length() + start;
+        }
+
+        if (start < 0)
+        {
+            start = 0;
+        }
+        if (start > str.length())
+        {
+            return NULLSTR;
+        }
+
+        return str.substring(start);
+    }
+
+    /**
+     * 截取字符串
+     *
+     * @param str 字符串
+     * @param start 开始
+     * @param end 结束
+     * @return 结果
+     */
+    public static String substring(final String str, int start, int end)
+    {
+        if (str == null)
+        {
+            return NULLSTR;
+        }
+
+        if (end < 0)
+        {
+            end = str.length() + end;
+        }
+        if (start < 0)
+        {
+            start = str.length() + start;
+        }
+
+        if (end > str.length())
+        {
+            end = str.length();
+        }
+
+        if (start > end)
+        {
+            return NULLSTR;
+        }
+
+        if (start < 0)
+        {
+            start = 0;
+        }
+        if (end < 0)
+        {
+            end = 0;
+        }
+
+        return str.substring(start, end);
+    }
+
+    /**
+     * 格式化文本, {} 表示占位符<br>
+     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
+     * 如果想输出 {} 使用 \\转义 { 即可,如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
+     * 例:<br>
+     * 通常使用:format("this is {} for {}", "a", "b") -> this is a for b<br>
+     * 转义{}: format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
+     * 转义\: format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
+     *
+     * @param template 文本模板,被替换的部分用 {} 表示
+     * @param params 参数值
+     * @return 格式化后的文本
+     */
+    public static String format(String template, Object... params)
+    {
+        if (isEmpty(params) || isEmpty(template))
+        {
+            return template;
+        }
+        return StrFormatter.format(template, params);
+    }
+
+    /**
+     * 下划线转驼峰命名
+     */
+    public static String toUnderScoreCase(String str)
+    {
+        if (str == null)
+        {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        // 前置字符是否大写
+        boolean preCharIsUpperCase = true;
+        // 当前字符是否大写
+        boolean curreCharIsUpperCase = true;
+        // 下一字符是否大写
+        boolean nexteCharIsUpperCase = true;
+        for (int i = 0; i < str.length(); i++)
+        {
+            char c = str.charAt(i);
+            if (i > 0)
+            {
+                preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
+            }
+            else
+            {
+                preCharIsUpperCase = false;
+            }
+
+            curreCharIsUpperCase = Character.isUpperCase(c);
+
+            if (i < (str.length() - 1))
+            {
+                nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
+            }
+
+            if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase)
+            {
+                sb.append(SEPARATOR);
+            }
+            else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase)
+            {
+                sb.append(SEPARATOR);
+            }
+            sb.append(Character.toLowerCase(c));
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 是否包含字符串
+     *
+     * @param str 验证字符串
+     * @param strs 字符串组
+     * @return 包含返回true
+     */
+    public static boolean inStringIgnoreCase(String str, String... strs)
+    {
+        if (str != null && strs != null)
+        {
+            for (String s : strs)
+            {
+                if (str.equalsIgnoreCase(trim(s)))
+                {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空,则返回空字符串。 例如:HELLO_WORLD->HelloWorld
+     *
+     * @param name 转换前的下划线大写方式命名的字符串
+     * @return 转换后的驼峰式命名的字符串
+     */
+    public static String convertToCamelCase(String name)
+    {
+        StringBuilder result = new StringBuilder();
+        // 快速检查
+        if (name == null || name.isEmpty())
+        {
+            // 没必要转换
+            return "";
+        }
+        else if (!name.contains("_"))
+        {
+            // 不含下划线,仅将首字母大写
+            return name.substring(0, 1).toUpperCase() + name.substring(1);
+        }
+        // 用下划线将原始字符串分割
+        String[] camels = name.split("_");
+        for (String camel : camels)
+        {
+            // 跳过原始字符串中开头、结尾的下换线或双重下划线
+            if (camel.isEmpty())
+            {
+                continue;
+            }
+            // 首字母大写
+            result.append(camel.substring(0, 1).toUpperCase());
+            result.append(camel.substring(1).toLowerCase());
+        }
+        return result.toString();
+    }
+
+    /**
+     * 驼峰式命名法
+     * 例如:user_name->userName
+     */
+    public static String toCamelCase(String s)
+    {
+        if (s == null)
+        {
+            return null;
+        }
+        if (s.indexOf(SEPARATOR) == -1)
+        {
+            return s;
+        }
+        s = s.toLowerCase();
+        StringBuilder sb = new StringBuilder(s.length());
+        boolean upperCase = false;
+        for (int i = 0; i < s.length(); i++)
+        {
+            char c = s.charAt(i);
+
+            if (c == SEPARATOR)
+            {
+                upperCase = true;
+            }
+            else if (upperCase)
+            {
+                sb.append(Character.toUpperCase(c));
+                upperCase = false;
+            }
+            else
+            {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T cast(Object obj)
+    {
+        return (T) obj;
+    }
+}

+ 7 - 0
test-api/src/main/java/com/sooka/mapper/Guiji_Housingconstruction.java

@@ -0,0 +1,7 @@
+package com.sooka.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface Guiji_Housingconstruction {
+}

+ 33 - 0
test-api/src/main/java/com/sooka/mapper/Guiji_Library_Mapper.java

@@ -0,0 +1,33 @@
+package com.sooka.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.sooka.model.bo.Guiji_library_baseinfo_Bean;
+import com.sooka.model.bo.Guiji_library_borrow_Bean;
+import com.sooka.model.bo.Guiji_library_creditpoints_Bean;
+import com.sooka.model.bo.Guiji_library_give_Bean;
+import com.sooka.utils.MyMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+@DS("db1")
+public interface Guiji_Library_Mapper extends MyMapper<Guiji_library_baseinfo_Bean> {
+
+    public void add_guiji_library_baseinfo(Guiji_library_baseinfo_Bean baseinfo_bean);
+
+    public void update_guiji_library_baseinfo(Guiji_library_baseinfo_Bean baseinfo_bean);
+
+
+    public void add_guiji_library_borrow(Guiji_library_borrow_Bean bean);
+
+    public void update_guiji_library_borrow(Guiji_library_borrow_Bean baseinfo_bean);
+
+
+    public void add_guiji_library_give(Guiji_library_give_Bean bean);
+
+    public void update_guiji_library_give(Guiji_library_give_Bean baseinfo_bean);
+
+
+    public void add_guiji_library_creditpoints(Guiji_library_creditpoints_Bean bean);
+    public void update_guiji_library_creditpoints(Guiji_library_creditpoints_Bean baseinfo_bean);
+
+}

+ 47 - 0
test-api/src/main/java/com/sooka/mapper/Guiji_Library_Mapper2.java

@@ -0,0 +1,47 @@
+package com.sooka.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.sooka.model.bo.Guiji_library_baseinfo_Bean;
+import com.sooka.model.bo.Guiji_library_borrow_Bean;
+import com.sooka.model.bo.Guiji_library_creditpoints_Bean;
+import com.sooka.model.bo.Guiji_library_give_Bean;
+import com.sooka.utils.MyMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+@DS("db2")
+public interface Guiji_Library_Mapper2 extends MyMapper<Guiji_library_baseinfo_Bean> {
+
+    public void add_guiji_library_baseinfo(Guiji_library_baseinfo_Bean baseinfo_bean);
+
+    public void update_guiji_library_baseinfo(Guiji_library_baseinfo_Bean baseinfo_bean);
+
+
+
+
+    public void add_guiji_library_borrow(Guiji_library_borrow_Bean bean);
+
+    public void update_guiji_library_borrow(Guiji_library_borrow_Bean baseinfo_bean);
+
+
+
+
+    public void add_guiji_library_give(Guiji_library_give_Bean bean);
+
+    public void update_guiji_library_give(Guiji_library_give_Bean baseinfo_bean);
+
+
+
+
+    public void add_guiji_library_creditpoints(Guiji_library_creditpoints_Bean bean);
+    public void update_guiji_library_creditpoints(Guiji_library_creditpoints_Bean baseinfo_bean);
+
+
+    public List select_guiji_library_baseinfo(Guiji_library_baseinfo_Bean baseinfo_bean);
+    public List select_guiji_library_borrow(Guiji_library_borrow_Bean baseinfo_bean);
+    public List select_guiji_library_give(Guiji_library_give_Bean baseinfo_bean);
+    public List select_guiji_library_creditpoints(Guiji_library_creditpoints_Bean baseinfo_bean);
+
+}

+ 20 - 0
test-api/src/main/java/com/sooka/mapper/Guiji_naturalresources_Mapper.java

@@ -0,0 +1,20 @@
+package com.sooka.mapper;
+
+import com.sooka.model.bo.Guiji_naturalresources_bdcdjxx_Bean;
+import com.sooka.model.bo.Guiji_naturalresources_bdcdjzxx_Bean;
+import com.sooka.model.bo.Guiji_naturalresources_qlrjbxx_Bean;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface Guiji_naturalresources_Mapper {
+
+    public void add_guiji_naturalresources_qlrjbxx(Guiji_naturalresources_qlrjbxx_Bean bdcdjxx_bean);
+    public void update_guiji_naturalresources_qlrjbxx(Guiji_naturalresources_qlrjbxx_Bean bdcdjxx_bean);
+
+    public void add_guiji_naturalresources_bdcdjxx(Guiji_naturalresources_bdcdjxx_Bean bdcdjxx_bean);
+    public void update_guiji_naturalresources_bdcdjxx(Guiji_naturalresources_bdcdjxx_Bean bdcdjxx_bean);
+
+    public void add_guiji_naturalresources_bdcdjzxx(Guiji_naturalresources_bdcdjzxx_Bean bdcdjzxx_bean);
+    public void update_guiji_naturalresources_bdcdjzxx(Guiji_naturalresources_bdcdjzxx_Bean bdcdjzxx_bean);
+
+}

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

@@ -0,0 +1,29 @@
+package com.sooka.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.sooka.model.bo.Guiji_naturalresources_bdcdjxx_Bean;
+import com.sooka.model.bo.Guiji_naturalresources_bdcdjzxx_Bean;
+import com.sooka.model.bo.Guiji_naturalresources_qlrjbxx_Bean;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+@DS("db2")
+public interface Guiji_naturalresources_Mapper2 {
+
+    public void add_guiji_naturalresources_qlrjbxx(Guiji_naturalresources_qlrjbxx_Bean bdcdjxx_bean);
+    public void update_guiji_naturalresources_qlrjbxx(Guiji_naturalresources_qlrjbxx_Bean bdcdjxx_bean);
+
+    public void add_guiji_naturalresources_bdcdjxx(Guiji_naturalresources_bdcdjxx_Bean bdcdjxx_bean);
+    public void update_guiji_naturalresources_bdcdjxx(Guiji_naturalresources_bdcdjxx_Bean bdcdjxx_bean);
+
+    public void add_guiji_naturalresources_bdcdjzxx(Guiji_naturalresources_bdcdjzxx_Bean bdcdjzxx_bean);
+    public void update_guiji_naturalresources_bdcdjzxx(Guiji_naturalresources_bdcdjzxx_Bean bdcdjzxx_bean);
+
+    List qlrjbxx_select_genren(Guiji_naturalresources_qlrjbxx_Bean bean);
+
+    List qlrjbxx_select_qiye(Guiji_naturalresources_qlrjbxx_Bean bean);
+
+    List qlrjbxx_select_qita(Guiji_naturalresources_qlrjbxx_Bean bean);
+}

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

@@ -1,9 +0,0 @@
-package com.sooka.model.bo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class BaseBean {
-}

+ 22 - 0
test-api/src/main/java/com/sooka/model/bo/BaseBean_Guiji.java

@@ -0,0 +1,22 @@
+package com.sooka.model.bo;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class BaseBean_Guiji {
+
+    String id;
+    String cd_source;
+    String cd_time;
+    String cd_batch;
+    String cd_operation;
+
+    JSONObject Data;
+
+
+}

+ 4 - 0
test-api/src/main/java/com/sooka/model/bo/BaseBean_Share.java

@@ -0,0 +1,4 @@
+package com.sooka.model.bo;
+
+public class BaseBean_Share {
+}

+ 13 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_housingconstruction_yhjjxx_Bean.java

@@ -0,0 +1,13 @@
+package com.sooka.model.bo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+//住建 自来水 用户基本信息
+@Getter
+@Setter
+public class Guiji_housingconstruction_yhjjxx_Bean {
+
+
+
+}

+ 34 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_library_baseinfo_Bean.java

@@ -0,0 +1,34 @@
+package com.sooka.model.bo;
+
+import com.google.gson.annotations.Expose;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class Guiji_library_baseinfo_Bean extends BaseBean_Guiji {
+
+    //读者证号
+    @Expose
+    String cardno;
+    //读者姓名
+    @Expose
+    String name;
+    //身份证号
+    @Expose
+    String idCardNo;
+    //性别
+    @Expose
+    String sex;
+    //地址
+    @Expose
+    String address;
+    //出生日期
+    @Expose
+    String birthday;
+    //证件有效期
+    @Expose
+    String endDate;
+
+
+}

+ 27 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_library_borrow_Bean.java

@@ -0,0 +1,27 @@
+package com.sooka.model.bo;
+
+import com.google.gson.annotations.Expose;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class Guiji_library_borrow_Bean extends BaseBean_Guiji {
+
+    //读者证号
+    @Expose
+    String cardno;
+    //读者姓名
+    @Expose
+    String name;
+    //图书条码号
+    @Expose
+    String barcode;
+    //书籍题名
+    @Expose
+    String title;
+    //借出时间
+    @Expose
+    String operationDate;
+
+}

+ 36 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_library_creditpoints_Bean.java

@@ -0,0 +1,36 @@
+package com.sooka.model.bo;
+
+import com.google.gson.annotations.Expose;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class Guiji_library_creditpoints_Bean extends BaseBean_Guiji {
+    //读者证号
+    @Expose
+    String cardno;
+    //读者姓名
+    @Expose
+    String name;
+    //图书条码号
+    @Expose
+    String barcode;
+    //记录类型
+    @Expose
+    String recordType;
+    //财经类型
+    @Expose
+    String financialType;
+    //金额
+    @Expose
+    String money;
+    //操作员
+    @Expose
+    String operator;
+    //操作时间
+    @Expose
+    String operationDate;
+
+
+}

+ 26 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_library_give_Bean.java

@@ -0,0 +1,26 @@
+package com.sooka.model.bo;
+
+import com.google.gson.annotations.Expose;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class Guiji_library_give_Bean extends BaseBean_Guiji {
+
+    //读者证号
+    @Expose
+    String cardno;
+    //读者姓名
+    @Expose
+    String name;
+    //图书条码号
+    @Expose
+    String barcode;
+    //书籍题名
+    @Expose
+    String title;
+    //归还时间
+    @Expose
+    String operationDate;
+}

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

@@ -0,0 +1,132 @@
+package com.sooka.model.bo;
+
+import com.google.gson.annotations.Expose;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 不动产登记证信息
+ */
+@Getter
+@Setter
+public class Guiji_naturalresources_bdcdjxx_Bean extends BaseBean_Guiji {
+
+    //登记编号
+    @Expose
+    String DJBH;
+    //不动产坐落
+    @Expose
+    String FDZL;
+    //共有方式
+    @Expose
+    String GYFS;
+    //权利类型
+    @Expose
+    String QLLX;
+    //产别
+    @Expose
+    String CQXZ;
+    //持证方式
+    @Expose
+    String CZFS;
+    //计税价格
+    @Expose
+    String ZPGJ;
+    //契税
+    @Expose
+    String QSJE;
+    //总成交价
+    @Expose
+    String ZCJJ;
+    //契税基数
+    @Expose
+    String QSJS;
+    //维修资金
+    @Expose
+    String WXZJ;
+    //增值税
+    @Expose
+    String YYS;
+    //完税时间
+    @Expose
+    String WSRQ;
+    //协议/合同日期
+    @Expose
+    String CQAZHTRQ;
+    //登记原因
+    @Expose
+    String DJYY;
+    //附记
+    @Expose
+    String FJ;
+    //房号
+    @Expose
+    String HH;
+    //总层数
+    @Expose
+    String ZCS;
+    //所在层
+    @Expose
+    String SZC;
+    //房屋用途
+    @Expose
+    String GHYT;
+    //建筑结构
+    @Expose
+    String FWJG;
+    //房屋性质
+    @Expose
+    String FWXZ;
+    //建筑面积
+    @Expose
+    String SCJZMJ ;
+    //专有面积
+    @Expose
+    String SCZYJZMJ;
+    //分摊面积
+    @Expose
+    String SCFTJZMJ;
+    //竣工时间
+    @Expose
+    String JGSJ;
+    //户室坐落
+    @Expose
+    String FWZL;
+    //土地性质
+    @Expose
+    String TDQLXZ ;
+    //土地类型
+    @Expose
+    String TDQLLX;
+    //土地用途
+    @Expose
+    String TDYT;
+    //土地使用开始
+    @Expose
+    String TDSYQXKS;
+    //土地使用结束
+    @Expose
+    String TDSYQXJS;
+    //土地使用年限
+    @Expose
+    String SYNX;
+    //独有土地面积
+    @Expose
+    String DYTDMJ;
+    //分摊土地面积
+    @Expose
+    String FTTDMJ;
+    //共有土地面积
+    @Expose
+    String GYTDMJ;
+    //宗地代码
+    @Expose
+    String ZDDM;
+    //不动产单元号
+    @Expose
+    String BDCDYH;
+    //不动产ID
+    @Expose
+    String BDCID;
+
+}

+ 53 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjzxx_Bean.java

@@ -0,0 +1,53 @@
+package com.sooka.model.bo;
+
+import com.google.gson.annotations.Expose;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 不动产登记征信息
+ */
+@Getter
+@Setter
+public class Guiji_naturalresources_bdcdjzxx_Bean extends BaseBean_Guiji {
+
+
+    //登记编号
+    @Expose
+    String DJBH;
+    //权利人
+    @Expose
+    String QLRMC;
+    //共有情况
+    @Expose
+    String GYFS;
+    //坐落
+    @Expose
+    String FWZL;
+    //不动产单元号
+    @Expose
+    String BDCDYH;
+    //权利类型
+    @Expose
+    String QLLX;
+    //权利性质
+    @Expose
+    String QLXZ;
+    //用途
+    @Expose
+    String YT;
+    //面积
+    @Expose
+    String MJ;
+    //使用期限
+    @Expose
+    String QZRQ;
+    //权利其他状况
+    @Expose
+    String TQ;
+    //附记
+    @Expose
+    String BZ;
+
+
+}

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

@@ -0,0 +1,107 @@
+package com.sooka.model.bo;
+
+import com.google.gson.annotations.Expose;
+import lombok.Getter;
+import lombok.Setter;
+
+
+/**
+ * 权利人基本信息
+ */
+
+@Getter
+@Setter
+public class Guiji_naturalresources_qlrjbxx_Bean extends BaseBean_Guiji {
+    //登记编号
+    @Expose
+    String DJBH;
+    //权利人类别
+    // 1-产权人; 2-抵押权人; 3-抵押人; 4-债务人; 5-异议人; 6-预告权利人; 7-预告义务人;8-转让方代理人;9-受让方代理人;10-备案权利人;11-需役地权利人;12-供役地权利人;13-债务人代理人
+    @Expose
+    String QLRLX;
+    //权利编号
+    @Expose
+    String QLBH;
+    //权利人编号
+    @Expose
+    String QLRBH;
+    //权利类别
+    @Expose
+    String QLLB;
+    //姓名
+    @Expose
+    String QLRMC;
+    //顺序号
+    @Expose
+    String SXH;
+    //证件类别
+    @Expose
+    String ZJLB;
+    //证件号码
+    @Expose
+    String ZJHM;
+    //发证机关
+    @Expose
+    String FZJG;
+    //所属行业
+    @Expose
+    String SSHY;
+    //国家/地区
+    @Expose
+    String GJDQ;
+    //户籍所在省市
+    @Expose
+    String HJSZSS;
+    //性别
+    @Expose
+    String XB;
+    //电话
+    @Expose
+    String DH;
+    //地址
+    @Expose
+    String DZ;
+    //邮编
+    @Expose
+    String YB;
+    //工作单位
+    @Expose
+    String GZDW;
+    //电子邮件
+    @Expose
+    String DZYJ;
+    //取得方式
+    @Expose
+    String QDFS;
+    //权利人性质
+    @Expose
+    String QLRXZ;
+    //权利面积
+    @Expose
+    String QLMJ;
+    //权利比例
+    @Expose
+    String QLBL;
+    //共有方式
+    @Expose
+    String GYFS;
+    //权属状态
+    @Expose
+    String QSZT;
+    //权证号
+    String QZH;
+    //证书编号
+    String ZSBH;
+    //法人类型
+    String FRLX;
+    //法人代表
+    String FRDB;
+    //出生日期
+    String CSRQ;
+    //身份证图片路径
+    String SFZTP;
+    //备注
+    String BZ;
+
+
+}

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

@@ -7,7 +7,7 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class PeoplemarryInfodouble_Bean extends BaseBean {
+public class PeoplemarryInfodouble_Bean extends BaseBean_Share {
 
     @Expose
     private String code;

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

@@ -6,7 +6,7 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class PeoplemarryInfosingle_Bean extends BaseBean {
+public class PeoplemarryInfosingle_Bean extends BaseBean_Share {
 
     @Expose
     private String code;

+ 24 - 0
test-api/src/main/java/com/sooka/service/Guiji_Library_Service.java

@@ -0,0 +1,24 @@
+package com.sooka.service;
+
+import com.sooka.model.ResultModel;
+import com.sooka.model.bo.Guiji_library_baseinfo_Bean;
+import com.sooka.model.bo.Guiji_library_borrow_Bean;
+import com.sooka.model.bo.Guiji_library_creditpoints_Bean;
+import com.sooka.model.bo.Guiji_library_give_Bean;
+
+public interface Guiji_Library_Service {
+
+    public ResultModel add_guiji_library_baseinfo(String str);
+
+    public ResultModel add_guiji_library_borrow(String str);
+
+    public ResultModel add_guiji_library_give(String str);
+
+    public ResultModel add_creditpoints(String str);
+
+
+    public ResultModel select_guiji_library_baseinfo(Guiji_library_baseinfo_Bean bean);
+    public ResultModel select_guiji_library_borrow(Guiji_library_borrow_Bean bean);
+    public ResultModel select_guiji_library_give(Guiji_library_give_Bean bean);
+    public ResultModel select_guiji_library_creditpoints(Guiji_library_creditpoints_Bean bean);
+}

+ 21 - 0
test-api/src/main/java/com/sooka/service/Guiji_naturalresources_Service.java

@@ -0,0 +1,21 @@
+package com.sooka.service;
+
+import com.sooka.model.ResultModel;
+import com.sooka.model.bo.Guiji_naturalresources_qlrjbxx_Bean;
+
+public interface Guiji_naturalresources_Service {
+
+
+    public ResultModel add_guiji_naturalresources_qlrjbxx(String str);
+
+    public ResultModel add_guiji_naturalresources_bdcdjxx(String str);
+
+    public ResultModel add_guiji_naturalresources_bdcdjzxx(String str);
+
+
+    //查询
+    public ResultModel qlrjbxx_select_genren(Guiji_naturalresources_qlrjbxx_Bean bean);
+    public ResultModel qlrjbxx_select_qiye(Guiji_naturalresources_qlrjbxx_Bean bean);
+    public ResultModel qlrjbxx_select_qita(Guiji_naturalresources_qlrjbxx_Bean bean);
+
+}

+ 4 - 0
test-api/src/main/java/com/sooka/service/impl/ABaseService.java

@@ -1,14 +1,18 @@
 package com.sooka.service.impl;
 
+import com.sooka.mapper.Guiji_Library_Mapper;
 import com.sooka.utils.TokenUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public class ABaseService {
+
     public Map header = new HashMap();
 
     public void initHeader(){
+
         header = TokenUtil.map;
         String token = TokenUtil.getToken();
         header.put("Authorization", token);

+ 261 - 0
test-api/src/main/java/com/sooka/service/impl/Guiji_Library_ServiceImpl.java

@@ -0,0 +1,261 @@
+package com.sooka.service.impl;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.sooka.base.BaseGuijiBean;
+import com.sooka.base.BaseService;
+import com.sooka.mapper.Guiji_Library_Mapper;
+import com.sooka.mapper.Guiji_Library_Mapper2;
+import com.sooka.model.ResultModel;
+import com.sooka.model.bo.*;
+import com.sooka.service.Guiji_Library_Service;
+
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class Guiji_Library_ServiceImpl extends BaseService implements Guiji_Library_Service {
+
+    @Resource
+    Guiji_Library_Mapper guiji_library_mapper;
+    @Resource
+    Guiji_Library_Mapper2 guiji_library_mapper2;
+
+    @Override
+    public ResultModel add_guiji_library_baseinfo(String str) {
+        ResultModel r = new ResultModel();
+        try {
+            Guiji_library_baseinfo_Bean bean = new Guiji_library_baseinfo_Bean();
+            initBaseGuijiBean(str,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");
+
+            JSONObject Data = bean.getData();
+
+            bean.setCardno(Data.getString("cardno"));
+            bean.setName(Data.getString("name"));
+            bean.setIdCardNo(Data.getString("idCardNo"));
+            String sex = Data.getString("sex");
+            if (sex != null && sex.equals("F")) {
+                bean.setSex(Data.getString("男"));
+            } else if (sex != null && sex.equals("M")) {
+                bean.setSex(Data.getString("女"));
+            }
+            bean.setAddress(Data.getString("address"));
+            bean.setBirthday(Data.getString("birthday"));
+            bean.setEndDate(Data.getString("endDate"));
+            r.setCode(00000);
+            r.setMessage("成功");
+
+            if (bean.getCd_operation().equals("I")) {
+                guiji_library_mapper.add_guiji_library_baseinfo(bean);
+                guiji_library_mapper2.add_guiji_library_baseinfo(bean);
+            } else {
+                guiji_library_mapper.update_guiji_library_baseinfo(bean);
+                guiji_library_mapper2.update_guiji_library_baseinfo(bean);
+            }
+        } catch (Exception e) {
+            r.setCode(99999);
+            r.setMessage("失败");
+            e.printStackTrace();
+        }
+        return r;
+    }
+
+    @Override
+    public ResultModel add_guiji_library_borrow(String str) {
+        ResultModel r = new ResultModel();
+        try {
+            Guiji_library_borrow_Bean bean = new Guiji_library_borrow_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");
+
+            bean.setCardno(Data.getString("cardno"));
+            bean.setName(Data.getString("name"));
+            bean.setBarcode(Data.getString("barcode"));
+            bean.setTitle(Data.getString("title"));
+            bean.setOperationDate(Data.getString("operationDate"));
+
+
+            r.setCode(00000);
+            r.setMessage("成功");
+
+            if (bean.getCd_operation().equals("I")) {
+                guiji_library_mapper.add_guiji_library_borrow(bean);
+                guiji_library_mapper2.add_guiji_library_borrow(bean);
+            } else {
+                guiji_library_mapper.update_guiji_library_borrow(bean);
+                guiji_library_mapper2.update_guiji_library_borrow(bean);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        }
+        return r;
+
+    }
+
+    @Override
+    public ResultModel add_guiji_library_give(String str) {
+        ResultModel r = new ResultModel();
+        try {
+            Guiji_library_give_Bean bean = new Guiji_library_give_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");
+
+            bean.setCardno(Data.getString("cardno"));
+            bean.setName(Data.getString("name"));
+            bean.setBarcode(Data.getString("barcode"));
+            bean.setTitle(Data.getString("title"));
+            bean.setOperationDate(Data.getString("operationDate"));
+
+
+            r.setCode(00000);
+            r.setMessage("成功");
+
+            if (bean.getCd_operation().equals("I")) {
+                guiji_library_mapper.add_guiji_library_give(bean);
+                guiji_library_mapper2.add_guiji_library_give(bean);
+            } else {
+                guiji_library_mapper.update_guiji_library_give(bean);
+                guiji_library_mapper2.update_guiji_library_give(bean);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        }
+        return r;
+    }
+
+    @Override
+    public ResultModel add_creditpoints(String str) {
+        ResultModel r = new ResultModel();
+        try {
+            Guiji_library_creditpoints_Bean bean = new Guiji_library_creditpoints_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");
+
+            bean.setCardno(Data.getString("cardno"));
+            bean.setName(Data.getString("name"));
+            bean.setBarcode(Data.getString("barcode"));
+            bean.setRecordType(Data.getString("recordType"));
+            bean.setFinancialType(Data.getString("financialType"));
+            bean.setMoney(Data.getString("money"));
+            bean.setOperator(Data.getString("operator"));
+            bean.setOperationDate(Data.getString("operationDate"));
+
+
+            r.setCode(00000);
+            r.setMessage("成功");
+
+            if (bean.getCd_operation().equals("I")) {
+                guiji_library_mapper.add_guiji_library_creditpoints(bean);
+                guiji_library_mapper2.add_guiji_library_creditpoints(bean);
+            } else {
+                guiji_library_mapper.update_guiji_library_creditpoints(bean);
+                guiji_library_mapper2.update_guiji_library_creditpoints(bean);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        }
+        return r;
+    }
+
+    @Override
+    public ResultModel select_guiji_library_baseinfo(Guiji_library_baseinfo_Bean bean) {
+        ResultModel r = getResultModel();
+        try{
+            List ls = guiji_library_mapper2.select_guiji_library_baseinfo(bean);
+            r.setData(ls);
+            r.setCode(00000);
+            r.setMessage("成功");
+        }catch(Exception e){
+            e.printStackTrace();
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        }
+        return r;
+    }
+
+    @Override
+    public ResultModel select_guiji_library_borrow(Guiji_library_borrow_Bean bean) {
+        ResultModel r = getResultModel();
+        try{
+            List ls = guiji_library_mapper2.select_guiji_library_borrow(bean);
+            r.setData(ls);
+            r.setCode(00000);
+            r.setMessage("成功");
+        }catch(Exception e){
+            e.printStackTrace();
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        }
+        return r;
+    }
+
+    @Override
+    public ResultModel select_guiji_library_give(Guiji_library_give_Bean bean) {
+        ResultModel r = getResultModel();
+        try{
+            List ls = guiji_library_mapper2.select_guiji_library_give(bean);
+            r.setData(ls);
+            r.setCode(00000);
+            r.setMessage("成功");
+        }catch(Exception e){
+            e.printStackTrace();
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        }
+        return r;
+    }
+
+    @Override
+    public ResultModel select_guiji_library_creditpoints(Guiji_library_creditpoints_Bean bean) {
+        ResultModel r = getResultModel();
+        try{
+            List ls = guiji_library_mapper2.select_guiji_library_creditpoints(bean);
+            r.setData(ls);
+            r.setCode(00000);
+            r.setMessage("成功");
+        }catch(Exception e){
+            e.printStackTrace();
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        }
+        return r;
+    }
+
+
+}

+ 255 - 0
test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java

@@ -0,0 +1,255 @@
+package com.sooka.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.sooka.base.BaseService;
+import com.sooka.mapper.Guiji_naturalresources_Mapper;
+import com.sooka.mapper.Guiji_naturalresources_Mapper2;
+import com.sooka.model.ResultModel;
+import com.sooka.model.bo.Guiji_naturalresources_bdcdjxx_Bean;
+import com.sooka.model.bo.Guiji_naturalresources_bdcdjzxx_Bean;
+import com.sooka.model.bo.Guiji_naturalresources_qlrjbxx_Bean;
+import com.sooka.service.Guiji_naturalresources_Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class Guiji_naturalresources_ServiceImpl extends BaseService implements Guiji_naturalresources_Service {
+
+
+    @Autowired
+    Guiji_naturalresources_Mapper guiji_naturalresources_mapper;
+    @Autowired
+    Guiji_naturalresources_Mapper2 guiji_naturalresources_mapper2;
+
+    @Override
+    public ResultModel add_guiji_naturalresources_qlrjbxx(String str) {
+        ResultModel r = new ResultModel();
+        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");
+
+            bean.setDJBH(Data.getString("DJBH"));
+            bean.setQLRLX(Data.getString("QLRLX"));
+            bean.setQLBH(Data.getString("QLBH"));
+            bean.setQLRBH(Data.getString("QLRBH"));
+            bean.setQLLB(Data.getString("QLLB"));
+            bean.setQLRMC(Data.getString("QLRMC"));
+            bean.setSXH(Data.getString("SXH"));
+            bean.setZJLB(Data.getString("ZJLB"));
+            bean.setZJHM(Data.getString("ZJHM"));
+            bean.setFZJG(Data.getString("FZJG"));
+            bean.setSSHY(Data.getString("SSHY"));
+            bean.setGJDQ(Data.getString("GJDQ"));
+            bean.setHJSZSS(Data.getString("HJSZSS"));
+            bean.setXB(Data.getString("XB"));
+            bean.setDH(Data.getString("DH"));
+            bean.setDZ(Data.getString("DZ"));
+            bean.setYB(Data.getString("YB"));
+            bean.setGZDW(Data.getString("GZDW"));
+            bean.setDZYJ(Data.getString("DZYJ"));
+            bean.setQDFS(Data.getString("QDFS"));
+            bean.setQLRXZ(Data.getString("QLRXZ"));
+            bean.setQLMJ(Data.getString("QLMJ"));
+            bean.setQLBL(Data.getString("QLBL"));
+            bean.setGYFS(Data.getString("GYFS"));
+            bean.setQSZT(Data.getString("QSZT"));
+            bean.setQZH(Data.getString("QZH"));
+            bean.setZSBH(Data.getString("ZSBH"));
+            bean.setFRLX(Data.getString("FRLX"));
+            bean.setFRDB(Data.getString("FRDB"));
+            bean.setCSRQ(Data.getString("CSRQ"));
+            bean.setSFZTP(Data.getString("SFZTP"));
+            bean.setBZ(Data.getString("BZ"));
+            r.setCode(00000);
+            r.setMessage("成功");
+
+            if (bean.getCd_operation().equals("I")) {
+                guiji_naturalresources_mapper.add_guiji_naturalresources_qlrjbxx(bean);
+                guiji_naturalresources_mapper2.add_guiji_naturalresources_qlrjbxx(bean);
+            } else {
+                guiji_naturalresources_mapper.update_guiji_naturalresources_qlrjbxx(bean);
+                guiji_naturalresources_mapper2.update_guiji_naturalresources_qlrjbxx(bean);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        }
+        return r;
+    }
+
+    @Override
+    public ResultModel add_guiji_naturalresources_bdcdjxx(String str) {
+        ResultModel r = new ResultModel();
+        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");
+
+            bean.setDJBH(Data.getString("DJBH"));
+            bean.setFDZL(Data.getString("FDZL"));
+            bean.setGYFS(Data.getString("GYFS"));
+            bean.setQLLX(Data.getString("QLLX"));
+            bean.setCQXZ(Data.getString("CQXZ"));
+            bean.setCZFS(Data.getString("CZFS"));
+            bean.setZPGJ(Data.getString("ZPGJ"));
+            bean.setQSJE(Data.getString("QSJE"));
+            bean.setZCJJ(Data.getString("ZCJJ"));
+            bean.setQSJS(Data.getString("QSJS"));
+            bean.setWXZJ(Data.getString("WXZJ"));
+            bean.setYYS(Data.getString("YYS"));
+            bean.setWSRQ(Data.getString("WSRQ"));
+            bean.setCQAZHTRQ(Data.getString("CQAZHTRQ"));
+            bean.setDJYY(Data.getString("DJYY"));
+            bean.setFJ(Data.getString("FJ"));
+            bean.setHH(Data.getString("HH"));
+            bean.setZCS(Data.getString("ZCS"));
+            bean.setSZC(Data.getString("SZC"));
+            bean.setGHYT(Data.getString("GHYT"));
+            bean.setFWJG(Data.getString("FWJG"));
+            bean.setFWXZ(Data.getString("FWXZ"));
+            bean.setSCJZMJ(Data.getString("SCJZMJ"));
+            bean.setSCZYJZMJ(Data.getString("SCZYJZMJ"));
+            bean.setSCFTJZMJ(Data.getString("SCFTJZMJ"));
+            bean.setJGSJ(Data.getString("JGSJ"));
+            bean.setFWZL(Data.getString("FWZL"));
+            bean.setTDQLXZ(Data.getString("TDQLXZ"));
+            bean.setTDQLLX(Data.getString("TDQLLX"));
+            bean.setTDYT(Data.getString("TDYT"));
+            bean.setTDSYQXKS(Data.getString("TDSYQXKS"));
+            bean.setTDSYQXJS(Data.getString("TDSYQXJS"));
+            bean.setSYNX(Data.getString("SYNX"));
+            bean.setDYTDMJ(Data.getString("DYTDMJ"));
+            bean.setFTTDMJ(Data.getString("FTTDMJ"));
+            bean.setGYTDMJ(Data.getString("GYTDMJ"));
+            bean.setZDDM(Data.getString("ZDDM"));
+            bean.setBDCDYH(Data.getString("BDCDYH"));
+            bean.setBDCID(Data.getString("BDCID"));
+
+            r.setCode(00000);
+            r.setMessage("成功");
+
+            if (bean.getCd_operation().equals("I")) {
+                guiji_naturalresources_mapper.add_guiji_naturalresources_bdcdjxx(bean);
+                guiji_naturalresources_mapper2.add_guiji_naturalresources_bdcdjxx(bean);
+            } else {
+                guiji_naturalresources_mapper.update_guiji_naturalresources_bdcdjxx(bean);
+                guiji_naturalresources_mapper2.update_guiji_naturalresources_bdcdjxx(bean);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        }
+        return r;
+    }
+
+    @Override
+    public ResultModel add_guiji_naturalresources_bdcdjzxx(String str) {
+        ResultModel r = new ResultModel();
+        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");
+
+            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.setYT(Data.getString("YT"));
+            bean.setMJ(Data.getString("MJ"));
+            bean.setQZRQ(Data.getString("QZRQ"));
+            bean.setTQ(Data.getString("TQ"));
+            bean.setBZ(Data.getString("BZ"));
+
+            if (bean.getCd_operation().equals("I")) {
+                guiji_naturalresources_mapper.add_guiji_naturalresources_bdcdjzxx(bean);
+                guiji_naturalresources_mapper2.add_guiji_naturalresources_bdcdjzxx(bean);
+            } else {
+                guiji_naturalresources_mapper.update_guiji_naturalresources_bdcdjzxx(bean);
+                guiji_naturalresources_mapper2.add_guiji_naturalresources_bdcdjzxx(bean);
+            }
+            r.setCode(00000);
+            r.setMessage("成功");
+        } catch (Exception e) {
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        }
+        return r;
+    }
+
+
+
+
+    @Override
+    public ResultModel qlrjbxx_select_genren(Guiji_naturalresources_qlrjbxx_Bean bean) {
+        ResultModel r = getResultModel();
+        try{
+            List ls = guiji_naturalresources_mapper2.qlrjbxx_select_genren(bean);
+            r.setData(ls);
+            r.setCode(00000);
+            r.setMessage("成功");
+        }catch(Exception e){
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        }
+        return r;
+    }
+
+    @Override
+    public ResultModel qlrjbxx_select_qiye(Guiji_naturalresources_qlrjbxx_Bean bean) {
+        ResultModel r = getResultModel();
+        try{
+            List ls = guiji_naturalresources_mapper2.qlrjbxx_select_qiye(bean);
+            r.setData(ls);
+            r.setCode(00000);
+            r.setMessage("成功");
+        }catch(Exception e){
+            e.printStackTrace();
+
+            r.setCode(99999);
+            r.setMessage("失败");
+        }
+        return r;
+    }
+
+    @Override
+    public ResultModel qlrjbxx_select_qita(Guiji_naturalresources_qlrjbxx_Bean bean) {
+        ResultModel r = getResultModel();
+        try{
+            List ls = guiji_naturalresources_mapper2.qlrjbxx_select_qita(bean);
+            r.setData(ls);
+            r.setCode(00000);
+            r.setMessage("成功");
+        }catch(Exception e){
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        }
+        return r;
+    }
+}

+ 209 - 0
test-api/src/main/java/com/sooka/system/domain/TGuijiLibraryCreditpoints.java

@@ -0,0 +1,209 @@
+package com.sooka.system.domain;
+
+import java.util.Date;
+
+import com.sooka.base.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 【请填写功能名称】对象 t_guiji_library_creditpoints
+ *
+ * @author lei
+ * @date 2021-08-24
+ */
+public class TGuijiLibraryCreditpoints extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+
+    /** 状态 */
+
+    private String status;
+
+    /** 删除时间 */
+    private String delFlag;
+
+    /** id */
+    private Date cdTime;
+
+    /** 批次号 */
+
+    private String cdBatch;
+
+    /** 源单位编号 */
+
+    private String cdSource;
+
+    /** 操作(I\U\D) */
+
+    private String cdOperation;
+
+    /** 读者证号 */
+
+    private String cardno;
+
+    /** 读者姓名 */
+
+    private String name;
+
+    /** 图书条码号 */
+
+    private String barcode;
+
+    /** 记录类型 */
+
+    private String recordtype;
+
+    /** 财经类型 */
+    private String financialtype;
+
+    /** 金额 */
+    private String money;
+
+    /** 操作员 */
+    private String operator;
+
+    /** 时间戳 */
+    private String operationdate;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCdTime(Date cdTime)
+    {
+        this.cdTime = cdTime;
+    }
+
+    public Date getCdTime()
+    {
+        return cdTime;
+    }
+    public void setCdBatch(String cdBatch)
+    {
+        this.cdBatch = cdBatch;
+    }
+
+    public String getCdBatch()
+    {
+        return cdBatch;
+    }
+    public void setCdSource(String cdSource)
+    {
+        this.cdSource = cdSource;
+    }
+
+    public String getCdSource()
+    {
+        return cdSource;
+    }
+    public void setCdOperation(String cdOperation)
+    {
+        this.cdOperation = cdOperation;
+    }
+
+    public String getCdOperation()
+    {
+        return cdOperation;
+    }
+    public void setCardno(String cardno)
+    {
+        this.cardno = cardno;
+    }
+
+    public String getCardno()
+    {
+        return cardno;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setBarcode(String barcode)
+    {
+        this.barcode = barcode;
+    }
+
+    public String getBarcode()
+    {
+        return barcode;
+    }
+    public void setRecordtype(String recordtype)
+    {
+        this.recordtype = recordtype;
+    }
+
+    public String getRecordtype()
+    {
+        return recordtype;
+    }
+    public void setFinancialtype(String financialtype)
+    {
+        this.financialtype = financialtype;
+    }
+
+    public String getFinancialtype()
+    {
+        return financialtype;
+    }
+    public void setMoney(String money)
+    {
+        this.money = money;
+    }
+
+    public String getMoney()
+    {
+        return money;
+    }
+    public void setOperator(String operator)
+    {
+        this.operator = operator;
+    }
+
+    public String getOperator()
+    {
+        return operator;
+    }
+    public void setOperationdate(String operationdate)
+    {
+        this.operationdate = operationdate;
+    }
+
+    public String getOperationdate()
+    {
+        return operationdate;
+    }
+
+
+}

+ 201 - 182
test-api/src/main/java/com/sooka/utils/HttpUtil.java

@@ -1,5 +1,7 @@
 package com.sooka.utils;
 
+import com.alibaba.fastjson.JSONObject;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -15,187 +17,204 @@ import javax.servlet.http.HttpServletRequest;
 
 public class HttpUtil {
 
-	public static String doGet(String geturl, String params) {
-		String realUrl = geturl + "?" + params;
-		System.out.println(realUrl);
-
-		try {
-			// 1.通过�? URL 上调�? openConnection 方法创建连接对象
-			URL url = new URL(realUrl);
-			URLConnection conn = url.openConnection();
-
-			// 2.处理设置参数和一般请求属�?
-			// 2.1设置参数
-			// 可以根据请求的需要设置参�?
-			conn.setUseCaches(false);
-			conn.setConnectTimeout(5000); // 请求超时时间
-
-			// 2.2请求属�??
-			// 设置通用的请求属�? 更多的头字段信息可以查阅HTTP协议
-			conn.setRequestProperty("accept", "*/*");
-			conn.setRequestProperty("connection", "Keep-Alive");
-
-			conn.setRequestProperty("contentType", "UTF-8");
-			// 3.使用 connect 方法建立到远程对象的实际连接�?
-			conn.connect();
-
-			// 4.远程对象变为可用。远程对象的头字段和内容变为可访问�??
-			// 4.1获取响应的头字段
-			Map<String, List<String>> headers = conn.getHeaderFields();
-			System.out.println(headers); // 输出头字�?
-
-			// 4.2获取响应正文
-			BufferedReader reader = null;
-			StringBuffer resultBuffer = new StringBuffer();
-			String tempLine = null;
-
-			reader = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
-			while ((tempLine = reader.readLine()) != null) {
-				resultBuffer.append(tempLine);
-			}
-			// System.out.println(resultBuffer);
-			reader.close();
-			return resultBuffer.toString();
-		} catch (MalformedURLException e) {
-			// TODO 自动生成�? catch �?
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO 自动生成�? catch �?
-			e.printStackTrace();
-		} finally {
-
-		}
-		return null;
-
-	}
-
-	public static String doPost(String url, String param) {
-		PrintWriter out = null;
-		BufferedReader in = null;
-		String result = "";
-		try {
-			URL realUrl = new URL(url);
-			// 打开和URL之间的连�?
-			URLConnection conn = realUrl.openConnection();
-			// 设置通用的请求属�?
-			conn.setRequestProperty("accept", "*/*");
-			conn.setRequestProperty("connection", "Keep-Alive");
-			conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)");
-			conn.setRequestProperty("contentType", "UTF-8");
-			// 发�?�POST请求必须设置如下两行
-			conn.setDoOutput(true);
-			conn.setDoInput(true);
-			// 获取URLConnection对象对应的输出流
-			out = new PrintWriter(conn.getOutputStream());
-			// 发�?�请求参�?
-			out.print(param);
-			System.out.println(param + "##################################");
-			// flush输出流的缓冲
-			out.flush();
-			// 定义BufferedReader输入流来读取URL的响�?
-			in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
-			String line;
-			while ((line = in.readLine()) != null) {
-				result += "/n" + line;
-			}
-		} catch (Exception e) {
-			System.out.println("发�?�POST请求出现异常�?" + e);
-			e.printStackTrace();
-		}
-		// 使用finally块来关闭输出流�?�输入流
-		finally {
-			try {
-				if (out != null) {
-					out.close();
-				}
-				if (in != null) {
-					in.close();
-				}
-			} catch (IOException ex) {
-				ex.printStackTrace();
-			}
-		}
-		return result;
-	}
-
-	public static String getOsAndBrowserInfo(HttpServletRequest request) {
-		String browserDetails = request.getHeader("User-Agent");
-		String userAgent = browserDetails;
-		String user = userAgent.toLowerCase();
-
-		String os = "";
-		String browser = "";
-
-		// =================OS Info=======================
-		if (userAgent.toLowerCase().indexOf("windows") >= 0) {
-			os += "Windows";
-		}
-		if (userAgent.toLowerCase().indexOf("micromessenger") >= 0) {
-			os += "weixin";
-		}
-		if (userAgent.toLowerCase().indexOf("mac") >= 0) {
-			os += "Mac";
-		}
-		if (userAgent.toLowerCase().indexOf("x11") >= 0) {
-			os += "Unix";
-		}
-		if (userAgent.toLowerCase().indexOf("android") >= 0) {
-			os += "Android";
-		}
-		if (userAgent.toLowerCase().indexOf("iphone") >= 0) {
-			os += "IPhone";
-		}
-		{
-			os += "UnKnown, More-Info: " + userAgent;
-		}
-		// ===============Browser===========================
-		if (user.contains("edge")) {
-			browser = (userAgent.substring(userAgent.indexOf("Edge")).split(" ")[0]).replace("/", "-");
-		} else if (user.contains("msie")) {
-			String substring = userAgent.substring(userAgent.indexOf("MSIE")).split(";")[0];
-			browser = substring.split(" ")[0].replace("MSIE", "IE") + "-" + substring.split(" ")[1];
-		} else if (user.contains("safari") && user.contains("version")) {
-			browser = (userAgent.substring(userAgent.indexOf("Safari")).split(" ")[0]).split("/")[0] + "-"
-					+ (userAgent.substring(userAgent.indexOf("Version")).split(" ")[0]).split("/")[1];
-		} else if (user.contains("opr") || user.contains("opera")) {
-			if (user.contains("opera")) {
-				browser = (userAgent.substring(userAgent.indexOf("Opera")).split(" ")[0]).split("/")[0] + "-"
-						+ (userAgent.substring(userAgent.indexOf("Version")).split(" ")[0]).split("/")[1];
-			} else if (user.contains("opr")) {
-				browser = ((userAgent.substring(userAgent.indexOf("OPR")).split(" ")[0]).replace("/", "-"))
-						.replace("OPR", "Opera");
-			}
-
-		} else if (user.contains("chrome")) {
-			browser = (userAgent.substring(userAgent.indexOf("Chrome")).split(" ")[0]).replace("/", "-");
-		} else if ((user.indexOf("mozilla/7.0") > -1) || (user.indexOf("netscape6") != -1)
-				|| (user.indexOf("mozilla/4.7") != -1) || (user.indexOf("mozilla/4.78") != -1)
-				|| (user.indexOf("mozilla/4.08") != -1) || (user.indexOf("mozilla/3") != -1)) {
-			browser = "Netscape-?";
-
-		} else if (user.contains("firefox")) {
-			browser = (userAgent.substring(userAgent.indexOf("Firefox")).split(" ")[0]).replace("/", "-");
-		} else if (user.contains("rv")) {
-			String IEVersion = (userAgent.substring(userAgent.indexOf("rv")).split(" ")[0]).replace("rv:", "-");
-			browser = "IE" + IEVersion.substring(0, IEVersion.length() - 1);
-		} else {
-			browser = "UnKnown, More-Info: " + userAgent;
-		}
-
-		return os + " --- " + browser;
-	}
-
-	public static void main(String[] args) {
-		String s = "云南";
-		s = URLEncoder.encode(s);
-
-		String str = "http://localhost:8080/tw_system/PushController_4S/sendMessage_Sign.action";
-		String parm = "ticker=" + s
-				+ "&title=bbbbb&text=bbbbb&extrafield_key=bbbbb&extrafield_value=bbbb&app_type=2&alias=77f15c6704974bd1a8dd3dd9e71c10da";
-
-		HttpUtil httpUtil = new HttpUtil();
-		// String str ="http://www.sohu.com";
-		httpUtil.doGet(str, parm);
-	}
+    public static String doGet(String geturl, String params) {
+        String realUrl = geturl + "?" + params;
+        System.out.println(realUrl);
+
+        try {
+            // 1.通过�? URL 上调�? openConnection 方法创建连接对象
+            URL url = new URL(realUrl);
+            URLConnection conn = url.openConnection();
+
+            // 2.处理设置参数和一般请求属�?
+            // 2.1设置参数
+            // 可以根据请求的需要设置参�?
+            conn.setUseCaches(false);
+            conn.setConnectTimeout(5000); // 请求超时时间
+
+            // 2.2请求属�??
+            // 设置通用的请求属�? 更多的头字段信息可以查阅HTTP协议
+            conn.setRequestProperty("accept", "*/*");
+            conn.setRequestProperty("connection", "Keep-Alive");
+
+            conn.setRequestProperty("contentType", "UTF-8");
+            // 3.使用 connect 方法建立到远程对象的实际连接�?
+            conn.connect();
+
+            // 4.远程对象变为可用。远程对象的头字段和内容变为可访问�??
+            // 4.1获取响应的头字段
+            Map<String, List<String>> headers = conn.getHeaderFields();
+            System.out.println(headers); // 输出头字�?
+
+            // 4.2获取响应正文
+            BufferedReader reader = null;
+            StringBuffer resultBuffer = new StringBuffer();
+            String tempLine = null;
+
+            reader = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
+            while ((tempLine = reader.readLine()) != null) {
+                resultBuffer.append(tempLine);
+            }
+            // System.out.println(resultBuffer);
+            reader.close();
+            return resultBuffer.toString();
+        } catch (MalformedURLException e) {
+            // TODO 自动生成�? catch �?
+            e.printStackTrace();
+        } catch (IOException e) {
+            // TODO 自动生成�? catch �?
+            e.printStackTrace();
+        } finally {
+
+        }
+        return null;
+
+    }
+
+    public static String doPost(String url, String param) {
+        PrintWriter out = null;
+        BufferedReader in = null;
+        String result = "";
+        try {
+            URL realUrl = new URL(url);
+            // 打开和URL之间的连�?
+            URLConnection conn = realUrl.openConnection();
+            // 设置通用的请求属�?
+            conn.setRequestProperty("accept", "*/*");
+            conn.setRequestProperty("connection", "Keep-Alive");
+            conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)");
+            conn.setRequestProperty("content-Type", "application/json;charset=UTF-8");
+
+            //
+//
+
+
+
+            String secret_key = "2b33af7ddde94db6a27290189ae6ab00";
+            String intCode = "00007";
+            conn.setRequestProperty("secretKey", secret_key);
+            conn.setRequestProperty("intCode", intCode);
+
+
+
+
+
+            // 发�?�POST请求必须设置如下两行
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+            // 获取URLConnection对象对应的输出流
+            out = new PrintWriter(conn.getOutputStream());
+            // 发�?�请求参�?
+//            out.print(param);
+            out.print(param);
+            System.out.println(param + "##################################");
+            // flush输出流的缓冲
+            out.flush();
+            // 定义BufferedReader输入流来读取URL的响�?
+            in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
+            String line;
+            while ((line = in.readLine()) != null) {
+                result += "/n" + line;
+            }
+            System.out.println("result========"+result);
+        } catch (Exception e) {
+            System.out.println("发�?�POST请求出现异常�?" + e);
+            e.printStackTrace();
+        }
+        // 使用finally块来关闭输出流�?�输入流
+        finally {
+            try {
+                if (out != null) {
+                    out.close();
+                }
+                if (in != null) {
+                    in.close();
+                }
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
+        }
+        return result;
+    }
+
+    public static String getOsAndBrowserInfo(HttpServletRequest request) {
+        String browserDetails = request.getHeader("User-Agent");
+        String userAgent = browserDetails;
+        String user = userAgent.toLowerCase();
+
+        String os = "";
+        String browser = "";
+
+        // =================OS Info=======================
+        if (userAgent.toLowerCase().indexOf("windows") >= 0) {
+            os += "Windows";
+        }
+        if (userAgent.toLowerCase().indexOf("micromessenger") >= 0) {
+            os += "weixin";
+        }
+        if (userAgent.toLowerCase().indexOf("mac") >= 0) {
+            os += "Mac";
+        }
+        if (userAgent.toLowerCase().indexOf("x11") >= 0) {
+            os += "Unix";
+        }
+        if (userAgent.toLowerCase().indexOf("android") >= 0) {
+            os += "Android";
+        }
+        if (userAgent.toLowerCase().indexOf("iphone") >= 0) {
+            os += "IPhone";
+        }
+        {
+            os += "UnKnown, More-Info: " + userAgent;
+        }
+        // ===============Browser===========================
+        if (user.contains("edge")) {
+            browser = (userAgent.substring(userAgent.indexOf("Edge")).split(" ")[0]).replace("/", "-");
+        } else if (user.contains("msie")) {
+            String substring = userAgent.substring(userAgent.indexOf("MSIE")).split(";")[0];
+            browser = substring.split(" ")[0].replace("MSIE", "IE") + "-" + substring.split(" ")[1];
+        } else if (user.contains("safari") && user.contains("version")) {
+            browser = (userAgent.substring(userAgent.indexOf("Safari")).split(" ")[0]).split("/")[0] + "-"
+                    + (userAgent.substring(userAgent.indexOf("Version")).split(" ")[0]).split("/")[1];
+        } else if (user.contains("opr") || user.contains("opera")) {
+            if (user.contains("opera")) {
+                browser = (userAgent.substring(userAgent.indexOf("Opera")).split(" ")[0]).split("/")[0] + "-"
+                        + (userAgent.substring(userAgent.indexOf("Version")).split(" ")[0]).split("/")[1];
+            } else if (user.contains("opr")) {
+                browser = ((userAgent.substring(userAgent.indexOf("OPR")).split(" ")[0]).replace("/", "-"))
+                        .replace("OPR", "Opera");
+            }
+
+        } else if (user.contains("chrome")) {
+            browser = (userAgent.substring(userAgent.indexOf("Chrome")).split(" ")[0]).replace("/", "-");
+        } else if ((user.indexOf("mozilla/7.0") > -1) || (user.indexOf("netscape6") != -1)
+                || (user.indexOf("mozilla/4.7") != -1) || (user.indexOf("mozilla/4.78") != -1)
+                || (user.indexOf("mozilla/4.08") != -1) || (user.indexOf("mozilla/3") != -1)) {
+            browser = "Netscape-?";
+
+        } else if (user.contains("firefox")) {
+            browser = (userAgent.substring(userAgent.indexOf("Firefox")).split(" ")[0]).replace("/", "-");
+        } else if (user.contains("rv")) {
+            String IEVersion = (userAgent.substring(userAgent.indexOf("rv")).split(" ")[0]).replace("rv:", "-");
+            browser = "IE" + IEVersion.substring(0, IEVersion.length() - 1);
+        } else {
+            browser = "UnKnown, More-Info: " + userAgent;
+        }
+
+        return os + " --- " + browser;
+    }
+
+    public static void main(String[] args) {
+        String s = "云南";
+        s = URLEncoder.encode(s);
+
+        String str = "http://localhost:8080/tw_system/PushController_4S/sendMessage_Sign.action";
+        String parm = "ticker=" + s
+                + "&title=bbbbb&text=bbbbb&extrafield_key=bbbbb&extrafield_value=bbbb&app_type=2&alias=77f15c6704974bd1a8dd3dd9e71c10da";
+
+        HttpUtil httpUtil = new HttpUtil();
+        // String str ="http://www.sohu.com";
+        httpUtil.doGet(str, parm);
+    }
 
 }

+ 26 - 0
test-api/src/main/java/com/sooka/utils/Test.java

@@ -0,0 +1,26 @@
+package com.sooka.utils;
+
+public class Test {
+
+    public static void main(String[] args){
+       String url="http://172.17.5.4:7777/api/test/guiji_library_baseinfo";
+
+
+//        for(int i=300000;i<600000;i++){
+//            String str = "{\"Data\":{\"name\":\"孙一石\",\"cardno\":\"008091\",\"idCardNo\":\"\",\"sex\":\"F\",\"birthday\":\"\",\"address\":\"\",\"endDate\":\"20150128\"},\"id\":\""+i+"\",\"cd_time\":\"2021-08-31 17:03:42\",\"cd_batch\":\"202108314033\",\"cd_operation\":\"I\",\"cd_source\":\"503033\"}\n";
+//
+//            HttpUtil.doPost(url,str);
+//
+//        }
+
+
+
+
+        String str = "{\"Data\":{\"name\":\"孙一石\",\"cardno\":\"008091\",\"idCardNo\":\"\",\"sex\":\"F\",\"birthday\":\"\",\"address\":\"\",\"endDate\":\"20150128\"},\"id\":\""+"0"+"\",\"cd_time\":\"2021-08-31 17:03:42\",\"cd_batch\":\"202108314033\",\"cd_operation\":\"D\",\"cd_source\":\"503033\"}\n";
+        HttpUtil.doPost(url,str);
+
+
+    }
+
+
+}

+ 60 - 23
test-api/src/main/resources/application-dev.yml

@@ -7,31 +7,68 @@ 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
+
     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
     #    username: jl503034
     #    password: Cs56DIi9
-    url: jdbc:mysql://192.168.1.144:3306/s-zsj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-    username: root
-    password: 123456
-    # 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
+#    url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+#    url: jdbc:mysql://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+
   jersey:
     application-path: api
 
@@ -43,7 +80,7 @@ spring:
 # mybatis \配置
 mybatis:
   type-aliases-package: com.sooka.pojo
-  mapper-locations: classpath:mapper/*.xml
+  mapper-locations: classpath:mapper/*.xml,system/*.xml
 # 通用mapper配置
 mapper:
   mappers: com.sooka.utils.MyMapper
@@ -69,4 +106,4 @@ server:
 ############################################################
 xd:
   # 基础地址
-  base_url: http://syggzy.jlsy.gov.cn/EpointWebService/rest/projectinformation
+  base_url: http://syggzy.jlsy.gov.cn/EpointWebService/rest/projectinformation

+ 6 - 1
test-api/src/main/resources/application.yml

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

+ 1 - 1
test-api/src/main/resources/bootstrap.yml

@@ -4,5 +4,5 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1:8848
+        server-addr: 10.0.51.4:8848
         file-extension: yaml

+ 221 - 0
test-api/src/main/resources/mapper/Guiji_Libaray_Mapper2.xml

@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.sooka.mapper.Guiji_Library_Mapper2">
+
+
+    <sql id="global_name">
+        id,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{id},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
+    <parameterMap id="pm_baseinfo" type="com.sooka.model.bo.Guiji_library_baseinfo_Bean"></parameterMap>
+
+    <insert id="add_guiji_library_baseinfo" parameterMap="pm_baseinfo">
+        insert into t_guiji_library_baseinfo (
+        <include refid="global_name"></include>
+        cardno,name,idCardNo,sex,birthday,address,endDate)
+        values (
+        <include refid="global_value"></include>
+        #{cardno},#{name},#{idCardNo},#{sex},#{birthday},#{address},#{endDate}
+        )
+    </insert>
+    <resultMap id="rm_baseinfo" type="com.sooka.model.bo.Guiji_library_baseinfo_Bean"></resultMap>
+
+    <select id="select_guiji_library_baseinfo" parameterMap="pm_baseinfo" resultMap="rm_baseinfo">
+        select cardno,name,idCardNo,sex,birthday,address,endDate from t_guiji_library_baseinfo
+        where
+        <if test="name != null and name != ''">
+            name like concat('%',#{name},'%')
+        </if>
+        <if test="name == null or name == ''">
+            1=2
+        </if>
+    </select>
+
+    <update id="update_guiji_library_baseinfo" parameterMap="pm_baseinfo">
+        update t_guiji_library_baseinfo
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="cardno != null and cardno != ''">
+                cardno = #{cardno},
+            </if>
+            <if test="name != null and name != ''">
+                name = #{name} ,
+            </if>
+            <if test="idCardNo != null and idCardNo != ''">
+                idCardNo = #{idCardNo},
+            </if>
+            <if test="sex != null and sex != ''">
+                sex = #{sex},
+            </if>
+            <if test="birthday != null and birthday != ''">
+                birthday = #{birthday},
+            </if>
+            <if test="address != null and address != ''">
+                address = #{address},
+            </if>
+            <if test="endDate != null and endDate != ''">
+                endDate = #{endDate},
+            </if>
+
+        </trim>
+        where id = #{id}
+    </update>
+
+
+
+
+    <parameterMap id="pm_borrow" type="com.sooka.model.bo.Guiji_library_borrow_Bean"></parameterMap>
+    <insert id="add_guiji_library_borrow" parameterMap="pm_borrow">
+        insert into t_guiji_library_borrow (
+        <include refid="global_name"></include>
+        cardno,name,barcode,title,operationDate)
+        values (
+        <include refid="global_value"></include>
+        #{cardno},#{name},#{barcode},#{title},#{operationDate}
+        )
+    </insert>
+    <resultMap id="rm_borrow" type="com.sooka.model.bo.Guiji_library_borrow_Bean"></resultMap>
+    <select id="select_guiji_library_borrow" parameterMap="pm_borrow" resultMap="rm_borrow">
+        select cardno,name,barcode,title,operationDate from t_guiji_library_borrow
+        where
+        <if test="name != null and name != ''">
+             name like concat('%',#{name},'%')
+            or barcode=#{barcode}
+        </if>
+        <if test="name == null or name == ''">
+            1=2
+        </if>
+    </select>
+    <update id="update_guiji_library_borrow" parameterMap="pm_borrow">
+        update t_guiji_library_borrow
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="cardno != null and cardno != ''">
+                cardno = #{cardno},
+            </if>
+            <if test="name != null and name != ''">
+                name= #{name},
+            </if>
+            <if test="barcode != null and barcode != ''">
+                barcode= #{barcode},
+            </if>
+            <if test="title != null and title != ''">
+                title= #{title},
+            </if>
+            <if test="operationDate != null and operationDate != ''">
+                operationDate = #{operationDate},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <parameterMap id="pm_give" type="com.sooka.model.bo.Guiji_library_give_Bean"></parameterMap>
+    <insert id="add_guiji_library_give" parameterMap="pm_give">
+        insert into t_guiji_library_give (
+        <include refid="global_name"></include>
+        cardno,name,barcode,title,operationDate)
+        values (
+        <include refid="global_value"></include>
+        #{cardno},#{name},#{barcode},#{title},#{operationDate}
+        )
+    </insert>
+    <resultMap id="rm_give" type="com.sooka.model.bo.Guiji_library_give_Bean"></resultMap>
+    <select id="select_guiji_library_give" parameterMap="pm_give" resultMap="rm_give">
+        select cardno,name,barcode,title,operationDate from t_guiji_library_give
+        where
+        <if test="name != null and name != ''">
+            name like concat('%',#{name},'%')
+            or barcode=#{barcode}
+        </if>
+        <if test="name == null or name == ''">
+            1=2
+        </if>
+    </select>
+
+    <update id="update_guiji_library_give" parameterMap="pm_give">
+        update t_guiji_library_give
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="cardno != null and cardno != ''">
+                cardno = #{cardno},
+            </if>
+            <if test="name != null and name != ''">
+                name= #{name},
+            </if>
+            <if test="barcode != null and barcode != ''">
+                barcode= #{barcode},
+            </if>
+            <if test="title != null and title != ''">
+                title= #{title},
+            </if>
+            <if test="operationDate != null and operationDate != ''">
+                operationDate = #{operationDate},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <parameterMap id="pm_creditpoints" type="com.sooka.model.bo.Guiji_library_creditpoints_Bean"></parameterMap>
+    <insert id="add_guiji_library_creditpoints" parameterMap="pm_creditpoints">
+        insert into t_guiji_library_creditpoints (
+        <include refid="global_name"></include>
+        cardno,name,barcode,recordType,financialType,money,operator,operationDate)
+        values (
+        <include refid="global_value"></include>
+        #{cardno},#{name},#{barcode},#{recordType},#{financialType},#{money},#{operator},#{operationDate}
+        )
+    </insert>
+
+    <resultMap id="rm_creditpoints" type="com.sooka.model.bo.Guiji_library_creditpoints_Bean"></resultMap>
+
+    <select id="select_guiji_library_creditpoints" parameterMap="pm_creditpoints" resultMap="rm_creditpoints">
+        select cardno,name,barcode,recordType,financialType,money,operator,operationDate from
+        t_guiji_library_creditpoints where
+        <if test="name != null and name != ''">
+            name like  concat('%',#{name},'%')
+            or cardno=#{cardno}
+        </if>
+        <if test="name ==null or name =='' ">
+            1=2
+        </if>
+    </select>
+
+    <update id="update_guiji_library_creditpoints">
+        update t_guiji_library_creditpoints
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="cardno != null and cardno != ''">
+                cardno = #{cardno},
+            </if>
+            <if test="name != null and name != ''">
+                name= #{name},
+            </if>
+            <if test="barcode != null and barcode != ''">
+                barcode= #{barcode},
+            </if>
+            <if test="recordType != null and recordType != ''">
+                recordType= #{recordType},
+            </if>
+            <if test="financialType != null and financialType != ''">
+                financialType = #{financialType},
+            </if>
+            <if test="money != null and money != ''">
+                money = #{money},
+            </if>
+            <if test="operator != null and operator != ''">
+                operator = #{operator},
+            </if>
+            <if test="operationDate != null and operationDate != ''">
+                operationDate = #{operationDate},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+</mapper>

+ 169 - 0
test-api/src/main/resources/mapper/Guiji_Library_Mapper.xml

@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.sooka.mapper.Guiji_Library_Mapper">
+
+    <parameterMap id="pm_baseinfo" type="com.sooka.model.bo.Guiji_library_baseinfo_Bean"></parameterMap>
+
+    <sql id="global_name">
+        id,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{id},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
+
+    <insert id="add_guiji_library_baseinfo" parameterMap="pm_baseinfo">
+        insert into t_guiji_library_baseinfo (
+        <include refid="global_name"></include>
+        cardno,name,idCardNo,sex,birthday,address,endDate)
+        values (
+        <include refid="global_value"></include>
+        #{cardno},#{name},#{idCardNo},#{sex},#{birthday},#{address},#{endDate}
+        )
+    </insert>
+
+    <update id="update_guiji_library_baseinfo" parameterMap="pm_baseinfo">
+        update t_guiji_library_baseinfo
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="cardno != null and cardno != ''">
+                cardno = #{cardno},
+            </if>
+            <if test="name != null and name != ''">
+                name = #{name} ,
+            </if>
+            <if test="idCardNo != null and idCardNo != ''">
+                idCardNo = #{idCardNo},
+            </if>
+            <if test="sex != null and sex != ''">
+                sex = #{sex},
+            </if>
+            <if test="birthday != null and birthday != ''">
+                birthday = #{birthday},
+            </if>
+            <if test="address != null and address != ''">
+                address = #{address},
+            </if>
+            <if test="endDate != null and endDate != ''">
+                endDate = #{endDate},
+            </if>
+
+        </trim>
+        where id = #{id}
+    </update>
+
+
+    <parameterMap id="pm_borrow" type="com.sooka.model.bo.Guiji_library_borrow_Bean"></parameterMap>
+    <insert id="add_guiji_library_borrow" parameterMap="pm_borrow">
+        insert into t_guiji_library_borrow (
+        <include refid="global_name"></include>
+        cardno,name,barcode,title,operationDate)
+        values (
+        <include refid="global_value"></include>
+        #{cardno},#{name},#{barcode},#{title},#{operationDate}
+        )
+    </insert>
+    <update id="update_guiji_library_borrow" parameterMap="pm_borrow">
+        update t_guiji_library_borrow
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="cardno != null and cardno != ''">
+                cardno = #{cardno},
+            </if>
+            <if test="name != null and name != ''">
+                name= #{name},
+            </if>
+            <if test="barcode != null and barcode != ''">
+                barcode= #{barcode},
+            </if>
+            <if test="title != null and title != ''">
+                title= #{title},
+            </if>
+            <if test="operationDate != null and operationDate != ''">
+                operationDate = #{operationDate},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <parameterMap id="pm_give" type="com.sooka.model.bo.Guiji_library_give_Bean"></parameterMap>
+    <insert id="add_guiji_library_give" parameterMap="pm_give">
+        insert into t_guiji_library_give (
+        <include refid="global_name"></include>
+        cardno,name,barcode,title,operationDate)
+        values (
+        <include refid="global_value"></include>
+        #{cardno},#{name},#{barcode},#{title},#{operationDate}
+        )
+    </insert>
+
+    <update id="update_guiji_library_give" parameterMap="pm_give">
+        update t_guiji_library_give
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="cardno != null and cardno != ''">
+                cardno = #{cardno},
+            </if>
+            <if test="name != null and name != ''">
+                name= #{name},
+            </if>
+            <if test="barcode != null and barcode != ''">
+                barcode= #{barcode},
+            </if>
+            <if test="title != null and title != ''">
+                title= #{title},
+            </if>
+            <if test="operationDate != null and operationDate != ''">
+                operationDate = #{operationDate},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <parameterMap id="pm_creditpoints" type="com.sooka.model.bo.Guiji_library_creditpoints_Bean"></parameterMap>
+    <insert id="add_guiji_library_creditpoints" parameterMap="pm_creditpoints">
+        insert into t_guiji_library_creditpoints (
+        <include refid="global_name"></include>
+        cardno,name,barcode,recordType,financialType,money,operator,operationDate)
+        values (
+        <include refid="global_value"></include>
+        #{cardno},#{name},#{barcode},#{recordType},#{financialType},#{money},#{operator},#{operationDate}
+        )
+    </insert>
+
+    <update id="update_guiji_library_creditpoints">
+        update t_guiji_library_creditpoints
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="cardno != null and cardno != ''">
+                cardno = #{cardno},
+            </if>
+            <if test="name != null and name != ''">
+                name= #{name},
+            </if>
+            <if test="barcode != null and barcode != ''">
+                barcode= #{barcode},
+            </if>
+            <if test="recordType != null and recordType != ''">
+                recordType= #{recordType},
+            </if>
+            <if test="financialType != null and financialType != ''">
+                financialType = #{financialType},
+            </if>
+            <if test="money != null and money != ''">
+                money = #{money},
+            </if>
+            <if test="operator != null and operator != ''">
+                operator = #{operator},
+            </if>
+            <if test="operationDate != null and operationDate != ''">
+                operationDate = #{operationDate},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+</mapper>

+ 340 - 0
test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml

@@ -0,0 +1,340 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.sooka.mapper.Guiji_naturalresources_Mapper">
+
+    <sql id="global_name">
+        id,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{id},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
+
+    <parameterMap id="pm_qlrjbxx" type="com.sooka.model.bo.Guiji_naturalresources_qlrjbxx_Bean"></parameterMap>
+    <insert id="add_guiji_naturalresources_qlrjbxx" parameterMap="pm_qlrjbxx">
+        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)
+        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}
+        )
+    </insert>
+    <update id="update_guiji_naturalresources_qlrjbxx" parameterMap="pm_qlrjbxx">
+        update t_guiji_naturalresources_qlrjbxx
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="DJBH != null and DJBH != ''">
+                DJBH = #{DJBH},
+            </if>
+            <if test="QLRLX != null and QLRLX != ''">
+                QLRLX = #{QLRLX},
+            </if>
+            <if test="QLBH != null and QLBH != ''">
+                QLBH = #{QLBH},
+            </if>
+            <if test="QLRBH != null and QLRBH != ''">
+                QLRBH = #{QLRBH},
+            </if>
+            <if test="QLLB != null and QLLB != ''">
+                QLLB = #{QLLB},
+            </if>
+            <if test="QLRMC != null and QLRMC != ''">
+                QLRMC = #{QLRMC},
+            </if>
+            <if test="SXH != null and SXH != ''">
+                SXH = #{SXH},
+            </if>
+            <if test="ZJLB != null and ZJLB != ''">
+                ZJLB = #{ZJLB},
+            </if>
+            <if test="ZJHM != null and ZJHM != ''">
+                ZJHM = #{ZJHM},
+            </if>
+            <if test="FZJG != null and FZJG != ''">
+                FZJG = #{FZJG},
+            </if>
+            <if test="SSHY != null and SSHY != ''">
+                SSHY = #{SSHY},
+            </if>
+            <if test="GJDQ != null and GJDQ != ''">
+                GJDQ = #{GJDQ},
+            </if>
+            <if test="HJSZSS != null and HJSZSS != ''">
+                HJSZSS = #{HJSZSS},
+            </if>
+            <if test="XB != null and XB != ''">
+                XB = #{XB},
+            </if>
+            <if test="DH != null and DH != ''">
+                DH = #{DH},
+            </if>
+            <if test="DZ != null and DZ != ''">
+                DZ = #{DZ},
+            </if>
+            <if test="YB != null and YB != ''">
+                YB = #{YB},
+            </if>
+            <if test="GZDW != null and GZDW != ''">
+                GZDW = #{GZDW},
+            </if>
+            <if test="DZYJ != null and DZYJ != ''">
+                DZYJ = #{DZYJ},
+            </if>
+            <if test="QDFS != null and QDFS != ''">
+                QDFS = #{QDFS},
+            </if>
+            <if test="QLRXZ != null and QLRXZ != ''">
+                QLRXZ = #{QLRXZ},
+            </if>
+            <if test="QLMJ != null and QLMJ != ''">
+                QLMJ = #{QLMJ},
+            </if>
+            <if test="QLBL != null and QLBL != ''">
+                QLBL = #{QLBL},
+            </if>
+            <if test="GYFS != null and GYFS != ''">
+                GYFS = #{GYFS},
+            </if>
+            <if test="QSZT != null and QSZT != ''">
+                QSZT = #{QSZT},
+            </if>
+            <if test="QZH != null and QZH != ''">
+                QZH = #{QZH},
+            </if>
+            <if test="ZSBH != null and ZSBH != ''">
+                ZSBH = #{ZSBH},
+            </if>
+            <if test="FRLX != null and FRLX != ''">
+                FRLX = #{FRLX},
+            </if>
+            <if test="FRDB != null and FRDB != ''">
+                FRDB = #{FRDB},
+            </if>
+            <if test="CSRQ != null and CSRQ != ''">
+                CSRQ = #{CSRQ},
+            </if>
+            <if test="SFZTP != null and SFZTP != ''">
+                cardno = #{cardno},
+            </if>
+            <if test="BZ != null and BZ != ''">
+                BZ = #{BZ},
+            </if>
+
+
+        </trim>
+    </update>
+
+
+    <parameterMap id="pm_bdcdjzxx" type="com.sooka.model.bo.Guiji_naturalresources_bdcdjzxx_Bean"></parameterMap>
+    <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
+        )
+        values (
+        <include refid="global_value"></include>
+        #{DJBH},#{QLRMC},#{GYFS},#{FWZL},#{BDCDYH},#{QLLX},#{QLXZ},#{YT},#{MJ},#{QZRQ},#{TQ},#{BZ})
+    </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>
+            <if test="QLRMC != null and QLRMC != ''">
+                QLRMC = #{QLRMC},
+            </if>
+            <if test="GYFS != null and GYFS != ''">
+                GYFS = #{GYFS},
+            </if>
+            <if test="FWZL != null and FWZL != ''">
+                FWZL = #{FWZL},
+            </if>
+            <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>
+            <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>
+            <if test="BZ != null and BZ != ''">
+                BZ = #{BZ},
+            </if>
+        </trim>
+    </update>
+
+    <parameterMap id="pm_bdcdjxx" type="com.sooka.model.bo.Guiji_naturalresources_bdcdjxx_Bean"></parameterMap>
+
+    <insert id="add_guiji_naturalresources_bdcdjxx" parameterMap="pm_bdcdjxx">
+        insert into t_guiji_naturalresources_bdcdjxx (
+        <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
+        )
+        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}
+        )
+
+
+    </insert>
+    <update id="update_guiji_naturalresources_bdcdjxx" parameterMap="pm_bdcdjxx">
+        update t_gguiji_naturalresources_bdcdjxx
+
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="DJBH != null and DJBH != ''">
+                DJBH = #{DJBH}
+            </if>
+            <if test="FDZL != null and FDZL != ''">
+                FDZL = #{FDZL}
+            </if>
+            <if test="GYFS != null and GYFS != ''">
+                GYFS = #{GYFS}
+            </if>
+            <if test="QLLX != null and QLLX != ''">
+                QLLX = #{QLLX}
+            </if>
+            <if test="CQXZ != null and CQXZ != ''">
+                CQXZ = #{CQXZ}
+            </if>
+            <if test="CZFS != null and CZFS != ''">
+                CZFS = #{CZFS}
+            </if>
+            <if test="ZPGJ != null and ZPGJ != ''">
+                ZPGJ = #{ZPGJ}
+            </if>
+
+            <if test="QSJE != null and QSJE != ''">
+                QSJE = #{QSJE}
+            </if>
+            <if test="ZCJJ != null and ZCJJ != ''">
+                ZCJJ = #{ZCJJ}
+            </if>
+            <if test="QSJS != null and QSJS != ''">
+                QSJS = #{QSJS}
+            </if>
+            <if test="WXZJ != null and WXZJ != ''">
+                WXZJ = #{WXZJ}
+            </if>
+            <if test="YYS != null and YYS != ''">
+                YYS = #{YYS}
+            </if>
+            <if test="WSRQ != null and WSRQ != ''">
+                WSRQ = #{WSRQ}
+            </if>
+            <if test="CQAZHTRQ != null and CQAZHTRQ != ''">
+                CQAZHTRQ = #{CQAZHTRQ}
+            </if>
+
+            <if test="DJYY != null and DJYY != ''">
+                DJYY = #{DJYY}
+            </if>
+            <if test="FJ != null and FJ != ''">
+                FJ = #{FJ}
+            </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="GHYT != null and GHYT != ''">
+                GHYT = #{GHYT}
+            </if>
+            <if test="FWJG != null and FWJG != ''">
+                FWJG = #{FWJG}
+            </if>
+            <if test="FWXZ != null and FWXZ != ''">
+                FWXZ = #{FWXZ}
+            </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="JGSJ != null and JGSJ != ''">
+                JGSJ = #{JGSJ}
+            </if>
+            ,,,,,,,,,,,,,,,,,,,
+
+            <if test="FWZL != null and FWZL != ''">
+                FWZL = #{FWZL}
+            </if>
+            <if test="TDQLXZ != null and TDQLXZ != ''">
+                TDQLXZ = #{TDQLXZ}
+            </if>
+            <if test="TDQLLX != null and TDQLLX != ''">
+                TDQLLX = #{TDQLLX}
+            </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="SYNX != null and SYNX != ''">
+                SYNX = #{SYNX}
+            </if>
+            <if test="DYTDMJ != null and DYTDMJ != ''">
+                DYTDMJ = #{DYTDMJ}
+            </if>
+            <if test="FTTDMJ != null and FTTDMJ != ''">
+                FTTDMJ = #{FTTDMJ}
+            </if>
+            <if test="GYTDMJ != null and GYTDMJ != ''">
+                GYTDMJ = #{GYTDMJ}
+            </if>
+            <if test="ZDDM != null and ZDDM != ''">
+                ZDDM = #{ZDDM}
+            </if>
+            <if test="BDCDYH != null and BDCDYH != ''">
+                BDCDYH = #{BDCDYH}
+            </if>
+            <if test="BDCID != null and BDCID != ''">
+                BDCID = #{BDCID}
+            </if>
+
+        </trim>
+    </update>
+
+
+</mapper>

+ 394 - 0
test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper2.xml

@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.sooka.mapper.Guiji_naturalresources_Mapper2">
+
+    <sql id="global_name">
+        id,create_time,cd_time,cd_batch,cd_operation,cd_source,
+    </sql>
+    <sql id="global_value">
+        #{id},now(),#{cd_time},#{cd_batch},#{cd_operation},#{cd_source},
+    </sql>
+
+    <sql id="update_sql">
+        create_time = now(),cd_batch = #{cd_batch},cd_operation = #{cd_operation},cd_source =#{cd_source},
+    </sql>
+
+
+    <parameterMap id="pm_qlrjbxx" type="com.sooka.model.bo.Guiji_naturalresources_qlrjbxx_Bean"></parameterMap>
+    <insert id="add_guiji_naturalresources_qlrjbxx" parameterMap="pm_qlrjbxx">
+        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)
+        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}
+        )
+    </insert>
+    <update id="update_guiji_naturalresources_qlrjbxx" parameterMap="pm_qlrjbxx">
+        update t_guiji_naturalresources_qlrjbxx
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="DJBH != null and DJBH != ''">
+                DJBH = #{DJBH},
+            </if>
+            <if test="QLRLX != null and QLRLX != ''">
+                QLRLX = #{QLRLX},
+            </if>
+            <if test="QLBH != null and QLBH != ''">
+                QLBH = #{QLBH},
+            </if>
+            <if test="QLRBH != null and QLRBH != ''">
+                QLRBH = #{QLRBH},
+            </if>
+            <if test="QLLB != null and QLLB != ''">
+                QLLB = #{QLLB},
+            </if>
+            <if test="QLRMC != null and QLRMC != ''">
+                QLRMC = #{QLRMC},
+            </if>
+            <if test="SXH != null and SXH != ''">
+                SXH = #{SXH},
+            </if>
+            <if test="ZJLB != null and ZJLB != ''">
+                ZJLB = #{ZJLB},
+            </if>
+            <if test="ZJHM != null and ZJHM != ''">
+                ZJHM = #{ZJHM},
+            </if>
+            <if test="FZJG != null and FZJG != ''">
+                FZJG = #{FZJG},
+            </if>
+            <if test="SSHY != null and SSHY != ''">
+                SSHY = #{SSHY},
+            </if>
+            <if test="GJDQ != null and GJDQ != ''">
+                GJDQ = #{GJDQ},
+            </if>
+            <if test="HJSZSS != null and HJSZSS != ''">
+                HJSZSS = #{HJSZSS},
+            </if>
+            <if test="XB != null and XB != ''">
+                XB = #{XB},
+            </if>
+            <if test="DH != null and DH != ''">
+                DH = #{DH},
+            </if>
+            <if test="DZ != null and DZ != ''">
+                DZ = #{DZ},
+            </if>
+            <if test="YB != null and YB != ''">
+                YB = #{YB},
+            </if>
+            <if test="GZDW != null and GZDW != ''">
+                GZDW = #{GZDW},
+            </if>
+            <if test="DZYJ != null and DZYJ != ''">
+                DZYJ = #{DZYJ},
+            </if>
+            <if test="QDFS != null and QDFS != ''">
+                QDFS = #{QDFS},
+            </if>
+            <if test="QLRXZ != null and QLRXZ != ''">
+                QLRXZ = #{QLRXZ},
+            </if>
+            <if test="QLMJ != null and QLMJ != ''">
+                QLMJ = #{QLMJ},
+            </if>
+            <if test="QLBL != null and QLBL != ''">
+                QLBL = #{QLBL},
+            </if>
+            <if test="GYFS != null and GYFS != ''">
+                GYFS = #{GYFS},
+            </if>
+            <if test="QSZT != null and QSZT != ''">
+                QSZT = #{QSZT},
+            </if>
+            <if test="QZH != null and QZH != ''">
+                QZH = #{QZH},
+            </if>
+            <if test="ZSBH != null and ZSBH != ''">
+                ZSBH = #{ZSBH},
+            </if>
+            <if test="FRLX != null and FRLX != ''">
+                FRLX = #{FRLX},
+            </if>
+            <if test="FRDB != null and FRDB != ''">
+                FRDB = #{FRDB},
+            </if>
+            <if test="CSRQ != null and CSRQ != ''">
+                CSRQ = #{CSRQ},
+            </if>
+            <if test="SFZTP != null and SFZTP != ''">
+                cardno = #{cardno},
+            </if>
+            <if test="BZ != null and BZ != ''">
+                BZ = #{BZ},
+            </if>
+
+
+        </trim>
+    </update>
+
+
+    <parameterMap id="pm_bdcdjzxx" type="com.sooka.model.bo.Guiji_naturalresources_bdcdjzxx_Bean"></parameterMap>
+    <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
+        )
+        values (
+        <include refid="global_value"></include>
+        #{DJBH},#{QLRMC},#{GYFS},#{FWZL},#{BDCDYH},#{QLLX},#{QLXZ},#{YT},#{MJ},#{QZRQ},#{TQ},#{BZ})
+    </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>
+            <if test="QLRMC != null and QLRMC != ''">
+                QLRMC = #{QLRMC},
+            </if>
+            <if test="GYFS != null and GYFS != ''">
+                GYFS = #{GYFS},
+            </if>
+            <if test="FWZL != null and FWZL != ''">
+                FWZL = #{FWZL},
+            </if>
+            <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>
+            <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>
+            <if test="BZ != null and BZ != ''">
+                BZ = #{BZ},
+            </if>
+        </trim>
+    </update>
+
+    <parameterMap id="pm_bdcdjxx" type="com.sooka.model.bo.Guiji_naturalresources_bdcdjxx_Bean"></parameterMap>
+
+    <insert id="add_guiji_naturalresources_bdcdjxx" parameterMap="pm_bdcdjxx">
+        insert into t_guiji_naturalresources_bdcdjxx (
+        <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
+        )
+        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}
+        )
+
+
+    </insert>
+    <update id="update_guiji_naturalresources_bdcdjxx" parameterMap="pm_bdcdjxx">
+        update t_gguiji_naturalresources_bdcdjxx
+
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="DJBH != null and DJBH != ''">
+                DJBH = #{DJBH}
+            </if>
+            <if test="FDZL != null and FDZL != ''">
+                FDZL = #{FDZL}
+            </if>
+            <if test="GYFS != null and GYFS != ''">
+                GYFS = #{GYFS}
+            </if>
+            <if test="QLLX != null and QLLX != ''">
+                QLLX = #{QLLX}
+            </if>
+            <if test="CQXZ != null and CQXZ != ''">
+                CQXZ = #{CQXZ}
+            </if>
+            <if test="CZFS != null and CZFS != ''">
+                CZFS = #{CZFS}
+            </if>
+            <if test="ZPGJ != null and ZPGJ != ''">
+                ZPGJ = #{ZPGJ}
+            </if>
+
+            <if test="QSJE != null and QSJE != ''">
+                QSJE = #{QSJE}
+            </if>
+            <if test="ZCJJ != null and ZCJJ != ''">
+                ZCJJ = #{ZCJJ}
+            </if>
+            <if test="QSJS != null and QSJS != ''">
+                QSJS = #{QSJS}
+            </if>
+            <if test="WXZJ != null and WXZJ != ''">
+                WXZJ = #{WXZJ}
+            </if>
+            <if test="YYS != null and YYS != ''">
+                YYS = #{YYS}
+            </if>
+            <if test="WSRQ != null and WSRQ != ''">
+                WSRQ = #{WSRQ}
+            </if>
+            <if test="CQAZHTRQ != null and CQAZHTRQ != ''">
+                CQAZHTRQ = #{CQAZHTRQ}
+            </if>
+
+            <if test="DJYY != null and DJYY != ''">
+                DJYY = #{DJYY}
+            </if>
+            <if test="FJ != null and FJ != ''">
+                FJ = #{FJ}
+            </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="GHYT != null and GHYT != ''">
+                GHYT = #{GHYT}
+            </if>
+            <if test="FWJG != null and FWJG != ''">
+                FWJG = #{FWJG}
+            </if>
+            <if test="FWXZ != null and FWXZ != ''">
+                FWXZ = #{FWXZ}
+            </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="JGSJ != null and JGSJ != ''">
+                JGSJ = #{JGSJ}
+            </if>
+            ,,,,,,,,,,,,,,,,,,,
+
+            <if test="FWZL != null and FWZL != ''">
+                FWZL = #{FWZL}
+            </if>
+            <if test="TDQLXZ != null and TDQLXZ != ''">
+                TDQLXZ = #{TDQLXZ}
+            </if>
+            <if test="TDQLLX != null and TDQLLX != ''">
+                TDQLLX = #{TDQLLX}
+            </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="SYNX != null and SYNX != ''">
+                SYNX = #{SYNX}
+            </if>
+            <if test="DYTDMJ != null and DYTDMJ != ''">
+                DYTDMJ = #{DYTDMJ}
+            </if>
+            <if test="FTTDMJ != null and FTTDMJ != ''">
+                FTTDMJ = #{FTTDMJ}
+            </if>
+            <if test="GYTDMJ != null and GYTDMJ != ''">
+                GYTDMJ = #{GYTDMJ}
+            </if>
+            <if test="ZDDM != null and ZDDM != ''">
+                ZDDM = #{ZDDM}
+            </if>
+            <if test="BDCDYH != null and BDCDYH != ''">
+                BDCDYH = #{BDCDYH}
+            </if>
+            <if test="BDCID != null and BDCID != ''">
+                BDCID = #{BDCID}
+            </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>

+ 144 - 0
test-api/src/main/resources/mapper/TGuijiLibraryCreditpointsMapper.xml

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sooka.mapper.TGuijiLibraryCreditpointsMapper">
+
+    <!--<resultMap type="com.sooka.system.mapper.TGuijiLibraryCreditpoints" id="TGuijiLibraryCreditpointsResult">-->
+        <!--<result property="id"    column="id"    />-->
+        <!--<result property="status"    column="status"    />-->
+        <!--<result property="remark"    column="remark"    />-->
+        <!--<result property="delFlag"    column="del_flag"    />-->
+        <!--<result property="createBy"    column="create_by"    />-->
+        <!--<result property="createTime"    column="create_time"    />-->
+        <!--<result property="updateBy"    column="update_by"    />-->
+        <!--<result property="updateTime"    column="update_time"    />-->
+        <!--<result property="cdTime"    column="cd_time"    />-->
+        <!--<result property="cdBatch"    column="cd_batch"    />-->
+        <!--<result property="cdSource"    column="cd_source"    />-->
+        <!--<result property="cdOperation"    column="cd_operation"    />-->
+        <!--<result property="cardno"    column="cardno"    />-->
+        <!--<result property="name"    column="name"    />-->
+        <!--<result property="barcode"    column="barcode"    />-->
+        <!--<result property="recordtype"    column="recordtype"    />-->
+        <!--<result property="financialtype"    column="financialtype"    />-->
+        <!--<result property="money"    column="money"    />-->
+        <!--<result property="operator"    column="operator"    />-->
+        <!--<result property="operationdate"    column="operationdate"    />-->
+    <!--</resultMap>-->
+    <!--<parameterMap id="TGuijiLibraryCreditpoints" type="com.sooka.system.domain.TGuijiLibraryCreditpoints"></parameterMap>-->
+
+    <!--<sql id="selectTGuijiLibraryCreditpointsVo">-->
+        <!--select id, status, remark, del_flag, create_by, create_time, update_by, update_time, cd_time, cd_batch, cd_source, cd_operation, cardno, name, barcode, recordtype, financialtype, money, operator, operationdate from t_guiji_library_creditpoints-->
+    <!--</sql>-->
+
+    <!--<select id="selectTGuijiLibraryCreditpointsList" parameterMap="TGuijiLibraryCreditpoints" resultMap="TGuijiLibraryCreditpointsResult">-->
+        <!--<include refid="selectTGuijiLibraryCreditpointsVo"/>-->
+        <!--<where>-->
+            <!--<if test="status != null  and status != ''"> and status = #{status}</if>-->
+            <!--<if test="cdTime != null "> and cd_time = #{cdTime}</if>-->
+            <!--<if test="cdBatch != null  and cdBatch != ''"> and cd_batch = #{cdBatch}</if>-->
+            <!--<if test="cdSource != null  and cdSource != ''"> and cd_source = #{cdSource}</if>-->
+            <!--<if test="cdOperation != null  and cdOperation != ''"> and cd_operation = #{cdOperation}</if>-->
+            <!--<if test="cardno != null  and cardno != ''"> and cardno = #{cardno}</if>-->
+            <!--<if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>-->
+            <!--<if test="barcode != null  and barcode != ''"> and barcode = #{barcode}</if>-->
+            <!--<if test="recordtype != null  and recordtype != ''"> and recordtype = #{recordtype}</if>-->
+            <!--<if test="financialtype != null  and financialtype != ''"> and financialtype = #{financialtype}</if>-->
+            <!--<if test="money != null  and money != ''"> and money = #{money}</if>-->
+            <!--<if test="operator != null  and operator != ''"> and operator = #{operator}</if>-->
+            <!--<if test="operationdate != null  and operationdate != ''"> and operationdate = #{operationdate}</if>-->
+        <!--</where>-->
+    <!--</select>-->
+
+    <!--<select id="selectTGuijiLibraryCreditpointsById" parameterType="String" resultMap="TGuijiLibraryCreditpointsResult">-->
+        <!--<include refid="selectTGuijiLibraryCreditpointsVo"/>-->
+        <!--where id = #{id}-->
+    <!--</select>-->
+
+    <!--<insert id="insertTGuijiLibraryCreditpoints" parameterMap="TGuijiLibraryCreditpoints">-->
+        <!--insert into t_guiji_library_creditpoints-->
+        <!--<trim prefix="(" suffix=")" suffixOverrides=",">-->
+            <!--<if test="id != null">id,</if>-->
+            <!--<if test="status != null">status,</if>-->
+            <!--<if test="remark != null">remark,</if>-->
+            <!--<if test="delFlag != null">del_flag,</if>-->
+            <!--<if test="createBy != null">create_by,</if>-->
+            <!--<if test="createTime != null">create_time,</if>-->
+            <!--<if test="updateBy != null">update_by,</if>-->
+            <!--<if test="updateTime != null">update_time,</if>-->
+            <!--<if test="cdTime != null">cd_time,</if>-->
+            <!--<if test="cdBatch != null">cd_batch,</if>-->
+            <!--<if test="cdSource != null">cd_source,</if>-->
+            <!--<if test="cdOperation != null">cd_operation,</if>-->
+            <!--<if test="cardno != null">cardno,</if>-->
+            <!--<if test="name != null">name,</if>-->
+            <!--<if test="barcode != null">barcode,</if>-->
+            <!--<if test="recordtype != null">recordtype,</if>-->
+            <!--<if test="financialtype != null">financialtype,</if>-->
+            <!--<if test="money != null">money,</if>-->
+            <!--<if test="operator != null">operator,</if>-->
+            <!--<if test="operationdate != null">operationdate,</if>-->
+         <!--</trim>-->
+        <!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->
+            <!--<if test="id != null">#{id},</if>-->
+            <!--<if test="status != null">#{status},</if>-->
+            <!--<if test="remark != null">#{remark},</if>-->
+            <!--<if test="delFlag != null">#{delFlag},</if>-->
+            <!--<if test="createBy != null">#{createBy},</if>-->
+            <!--<if test="createTime != null">#{createTime},</if>-->
+            <!--<if test="updateBy != null">#{updateBy},</if>-->
+            <!--<if test="updateTime != null">#{updateTime},</if>-->
+            <!--<if test="cdTime != null">#{cdTime},</if>-->
+            <!--<if test="cdBatch != null">#{cdBatch},</if>-->
+            <!--<if test="cdSource != null">#{cdSource},</if>-->
+            <!--<if test="cdOperation != null">#{cdOperation},</if>-->
+            <!--<if test="cardno != null">#{cardno},</if>-->
+            <!--<if test="name != null">#{name},</if>-->
+            <!--<if test="barcode != null">#{barcode},</if>-->
+            <!--<if test="recordtype != null">#{recordtype},</if>-->
+            <!--<if test="financialtype != null">#{financialtype},</if>-->
+            <!--<if test="money != null">#{money},</if>-->
+            <!--<if test="operator != null">#{operator},</if>-->
+            <!--<if test="operationdate != null">#{operationdate},</if>-->
+         <!--</trim>-->
+    <!--</insert>-->
+
+    <!--<update id="updateTGuijiLibraryCreditpoints" parameterMap="TGuijiLibraryCreditpoints">-->
+        <!--update t_guiji_library_creditpoints-->
+        <!--<trim prefix="SET" suffixOverrides=",">-->
+            <!--<if test="status != null">status = #{status},</if>-->
+            <!--<if test="remark != null">remark = #{remark},</if>-->
+            <!--<if test="delFlag != null">del_flag = #{delFlag},</if>-->
+            <!--<if test="createBy != null">create_by = #{createBy},</if>-->
+            <!--<if test="createTime != null">create_time = #{createTime},</if>-->
+            <!--<if test="updateBy != null">update_by = #{updateBy},</if>-->
+            <!--<if test="updateTime != null">update_time = #{updateTime},</if>-->
+            <!--<if test="cdTime != null">cd_time = #{cdTime},</if>-->
+            <!--<if test="cdBatch != null">cd_batch = #{cdBatch},</if>-->
+            <!--<if test="cdSource != null">cd_source = #{cdSource},</if>-->
+            <!--<if test="cdOperation != null">cd_operation = #{cdOperation},</if>-->
+            <!--<if test="cardno != null">cardno = #{cardno},</if>-->
+            <!--<if test="name != null">name = #{name},</if>-->
+            <!--<if test="barcode != null">barcode = #{barcode},</if>-->
+            <!--<if test="recordtype != null">recordtype = #{recordtype},</if>-->
+            <!--<if test="financialtype != null">financialtype = #{financialtype},</if>-->
+            <!--<if test="money != null">money = #{money},</if>-->
+            <!--<if test="operator != null">operator = #{operator},</if>-->
+            <!--<if test="operationdate != null">operationdate = #{operationdate},</if>-->
+        <!--</trim>-->
+        <!--where id = #{id}-->
+    <!--</update>-->
+
+    <!--<delete id="deleteTGuijiLibraryCreditpointsById" parameterType="String">-->
+        <!--delete from t_guiji_library_creditpoints where id = #{id}-->
+    <!--</delete>-->
+
+    <!--<delete id="deleteTGuijiLibraryCreditpointsByIds" parameterType="String">-->
+        <!--delete from t_guiji_library_creditpoints where id in-->
+        <!--<foreach item="id" collection="array" open="(" separator="," close=")">-->
+            <!--#{id}-->
+        <!--</foreach>-->
+    <!--</delete>-->
+
+</mapper>

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


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.