Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/sonarlint/issuestore/index.pb
#	test-api/test-api.iml
wangzhe 1 год назад
Родитель
Сommit
fd876d4aea
100 измененных файлов с 4960 добавлено и 624 удалено
  1. 4 4
      .idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_5_0.xml
  2. 1 1
      .idea/misc.xml
  3. 4 0
      .idea/sonarlint/issuestore/1/d/1d9925f45ee7b01aeb1b268d12c0d92850b1683d
  4. 7 0
      .idea/sonarlint/issuestore/3/f/3fe862fe75f2a494d2b59abe04d118172ba3b3e8
  5. 0 0
      .idea/sonarlint/issuestore/5/2/52cf7f113303094b566de8035621ed491e1d0c1c
  6. 17 0
      .idea/sonarlint/issuestore/5/4/54af339577e10ff9d977335e6adcc45d8e85a7a4
  7. 19 0
      .idea/sonarlint/issuestore/6/9/69fd2838ebb53173a4b73ccd02ff1ebc5486cbd5
  8. 5 0
      .idea/sonarlint/issuestore/6/f/6fa6a8299634e12ab4fe4018f9a319eca334adf5
  9. 2 0
      .idea/sonarlint/issuestore/7/5/75b1f77addd94fd682329865c76c9fffbef103c5
  10. 21 0
      .idea/sonarlint/issuestore/7/6/766bc3cf530662221a1e0ce0895d6c6215fb5ca9
  11. 576 0
      .idea/sonarlint/issuestore/d/a/daa38303f16cd676e8410f685a3f89d3df715875
  12. 15 0
      .idea/sonarlint/issuestore/e/5/e5d1411d6e5b2700a2a985e66fd39ef3f4b35269
  13. 748 568
      .idea/workspace.xml
  14. 30 0
      sooka-auth/src/main/java/com/sooka/mapper/AuthCNMDMapper.java
  15. 9 9
      sooka-auth/src/main/java/com/sooka/model/db/IntDetailed.java
  16. 52 0
      sooka-auth/src/main/java/com/sooka/model/db/IntDetailed_SP.java
  17. 85 22
      sooka-auth/src/main/java/com/sooka/service/impl/AuthServiceImpl.java
  18. 130 0
      sooka-auth/src/main/java/com/sooka/utils/SecretKeyUtil.java
  19. 5 3
      sooka-auth/src/main/resources/application-dev.yml
  20. 5 1
      sooka-auth/src/main/resources/application.yml
  21. 36 0
      sooka-auth/src/main/resources/mapper/AuthCNMDMapper.xml
  22. 8 8
      sooka-common/src/main/java/com/sooka/enums/ResultEnum.java
  23. BIN
      sooka-common/target/classes/com/sooka/enums/ResultEnum.class
  24. 12 1
      test-api/pom.xml
  25. 2 1
      test-api/src/main/java/com/sooka/Application.java
  26. 356 0
      test-api/src/main/java/com/sooka/api/Guiji_City_Real_Estate.java
  27. 90 0
      test-api/src/main/java/com/sooka/api/Guiji_Funeral.java
  28. 244 0
      test-api/src/main/java/com/sooka/api/Guiji_Gas.java
  29. 17 1
      test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java
  30. 61 0
      test-api/src/main/java/com/sooka/api/Guiji_Medicine.java
  31. 35 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_10_MarryInfoDouble_Api.java
  32. 36 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_11_DataNew_Api.java
  33. 44 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_1_LaborContractNewRecordInfoListQuery_Api.java
  34. 35 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_2_LaborContractRenewRecordInfoListQuery_Api.java
  35. 35 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_3_LaborContractCancelRecordBookListQuery_Api.java
  36. 35 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_4_LaborContractNewRecordBookListQuery_Api.java
  37. 35 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_5_LaborContractRenewRecordBookListQuery_Api.java
  38. 35 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_6_EBaseinfos_Api.java
  39. 35 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_7_QsWszInfo_Api.java
  40. 35 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_8_Fpxxxx_Api.java
  41. 35 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_9_Api_1680488576658_Api.java
  42. 22 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/ResultModel_SP_Bean.java
  43. 49 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_11_DataNew_VO.java
  44. 29 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_1_LaborContractNewRecordInfoListQuery_VO.java
  45. 29 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_2_LaborContractRenewRecordInfoListQuery_VO.java
  46. 29 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_3_LaborContractCancelRecordBookListQuery_VO.java
  47. 29 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_4_LaborLaborContractNewRecordBookListQuery_VO.java
  48. 29 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_5_LaborContractRenewRecordBookListQuery_VO.java
  49. 49 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_6_EBaseinfos_VO.java
  50. 37 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_7_QsWszInfo_VO.java
  51. 57 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_8_Fpxxxx_VO.java
  52. 54 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_9_Api_1680488576658_VO.java
  53. 29 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/service/SP_LaborContract_Service.java
  54. 774 0
      test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/service/impl/SP_LaborContract_ServiceImpl.java
  55. 55 1
      test-api/src/main/java/com/sooka/base/util/Generator.java
  56. 28 0
      test-api/src/main/java/com/sooka/mapper/Guiji_City_Real_Estate_Mapper2.java
  57. 9 0
      test-api/src/main/java/com/sooka/mapper/Guiji_Funeral_Mapper2.java
  58. 19 0
      test-api/src/main/java/com/sooka/mapper/Guiji_Gas_Mapper2.java
  59. 6 1
      test-api/src/main/java/com/sooka/mapper/Guiji_Medicine_Mapper2.java
  60. 20 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate10_estate_unseal_Bean.java
  61. 15 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate11_pre_order_cancel_notice_Bean.java
  62. 23 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate12_pre_order_cancel_mortgage_Bean.java
  63. 10 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate13_file_additional_Bean.java
  64. 17 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate14_pre_sale_Bean.java
  65. 17 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate15_pre_sale_change_Bean.java
  66. 17 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate16_on_sale_Bean.java
  67. 17 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate17_on_sale_change_Bean.java
  68. 17 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate18_pre_to_on_Bean.java
  69. 20 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate19_pre_sale_record_Bean.java
  70. 10 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate1_housing_initial_Bean.java
  71. 21 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate20_pre_sale_record_change_Bean.java
  72. 19 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate21_on_sale_record_Bean.java
  73. 20 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate22_on_sale_record_change_Bean.java
  74. 17 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate23_pre_sale_additional_Bean.java
  75. 19 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate24_record_additional_Bean.java
  76. 20 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate25_contract_check_out_Bean.java
  77. 20 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate2_housing_stock_Bean.java
  78. 24 1
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate3_housing_commercial_Bean.java
  79. 19 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate4_housing_relocation_Bean.java
  80. 22 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate5_mortgage_general_Bean.java
  81. 22 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate6_mortgage_business_Bean.java
  82. 22 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate7_mortgage_construction_Bean.java
  83. 24 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate8_mortgage_change_Bean.java
  84. 25 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate9_mortgage_cancel_Bean.java
  85. 22 1
      test-api/src/main/java/com/sooka/model/bo/Guiji_funeral1_the_dead_Bean.java
  86. 21 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_funeral2_pay_Bean.java
  87. 20 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_funeral3_freeze_Bean.java
  88. 19 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_funeral4_ashes_storage_Bean.java
  89. 19 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_funeral5_ashes_renew_Bean.java
  90. 21 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_funeral6_ashes_remove_Bean.java
  91. 6 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_gas10_SC_user_infor_Bean.java
  92. 7 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_gas11_SC_gas_meter_infor_Bean.java
  93. 5 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_gas12_SC_gas_purchase_infor_Bean.java
  94. 7 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_gas13_SC_meter_reading_infor_Bean.java
  95. 5 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_gas14_XinKer_user_infor_Bean.java
  96. 9 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_gas15_XinKer_acceptance_infor_Bean.java
  97. 6 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_gas16_XinKer_disposition_info_Bean.java
  98. 10 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_gas1_Zenner_user_infor_Bean.java
  99. 17 1
      test-api/src/main/java/com/sooka/model/bo/Guiji_gas2_Zenner_gas_meter_infor_Bean.java
  100. 0 0
      test-api/src/main/java/com/sooka/model/bo/Guiji_gas3_Zenner_gas_purchase_infor_Bean.java

+ 4 - 4
.idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_5_0.xml

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

+ 1 - 1
.idea/misc.xml

@@ -7,7 +7,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>
 </project>

+ 4 - 0
.idea/sonarlint/issuestore/1/d/1d9925f45ee7b01aeb1b268d12c0d92850b1683d

@@ -0,0 +1,4 @@
+
+J
+java:S3740	"/Provide the parametrized type for this generic.(þ—«Ìûÿÿÿÿ
+k	java:S114"QRename this interface name to match the regular expression '^[A-Z][a-zA-Z0-9]*$'.(ôÅýôÿÿÿÿÿ

+ 7 - 0
.idea/sonarlint/issuestore/3/f/3fe862fe75f2a494d2b59abe04d118172ba3b3e8

@@ -0,0 +1,7 @@
+
+J
+java:S3740"/Provide the parametrized type for this generic.(¾Ð¥¯ùÿÿÿÿ
+g	java:S101"MRename this class name to match the regular expression '^[A-Z][a-zA-Z0-9]*$'.(³õ¥ªúÿÿÿÿ
+Q
+java:S1128"6Remove this unused import 'com.sooka.model.vo.TestVO'.(‘ªÆŸüÿÿÿÿ
+‚	java:S116"hRename this field "peoplemarryInfosingle_service" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(®×ÔÔýÿÿÿÿ

+ 0 - 0
.idea/sonarlint/issuestore/5/2/52cf7f113303094b566de8035621ed491e1d0c1c


+ 17 - 0
.idea/sonarlint/issuestore/5/4/54af339577e10ff9d977335e6adcc45d8e85a7a4

@@ -0,0 +1,17 @@
+
+`
+java:S3252%"EUse static access with "com.alibaba.fastjson.JSON" for "parseObject".(¾ì±ÿýÿÿÿÿ
+]	java:S125"<This block of commented-out lines of code should be removed.(«»ˆÈùÿÿÿÿ8ŽžÒæ‹1
+g	java:S101"MRename this class name to match the regular expression '^[A-Z][a-zA-Z0-9]*$'.(õ‘àÊúÿÿÿÿ
+k	java:S117)"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(�Ãó¾ùÿÿÿÿ
+B
+java:S14818"&Remove this unused "s" local variable.(Þ¶þ8…¾Óæ‹1
+X	java:S125<"<This block of commented-out lines of code should be removed.(ÎùÔ…8…¾Óæ‹1
+Q
+java:S18548"5Remove this useless assignment to local variable "s".(Þ¶þ8…¾Óæ‹1
+>
+java:S11482"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+]	java:S125	"<This block of commented-out lines of code should be removed.(�Ö”Ÿýÿÿÿÿ8ôúÒæ‹1
+S	java:S106#"9Replace this use of System.out or System.err by a logger.(®ýáëûÿÿÿÿ
+L
+java:S3740"/Provide the parametrized type for this generic.(“ßáƒ8߆¹æ‹1

+ 19 - 0
.idea/sonarlint/issuestore/6/9/69fd2838ebb53173a4b73ccd02ff1ebc5486cbd5

@@ -0,0 +1,19 @@
+
+J
+java:S3740?"/Provide the parametrized type for this generic.(‡‡°�ûÿÿÿÿ
+g	java:S101"MRename this class name to match the regular expression '^[A-Z][a-zA-Z0-9]*$'.(�¥³îøÿÿÿÿ
+k	java:S117,"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(�Ãó¾ùÿÿÿÿ
+>
+java:S11485"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+M
+java:S1128"7Remove this unused import 'com.google.gson.JsonObject'.(µÊ´½
+E
+java:S1128"*Remove this unused import 'java.util.Map'.(¼è½Òþÿÿÿÿ
+L
+java:S1128"6Remove this unused import 'com.sooka.utils.TokenUtil'.(ç¾ÞÔ
+I
+java:S1128".Remove this unused import 'java.util.HashMap'.(™˜”€ùÿÿÿÿ
+S	java:S106&"9Replace this use of System.out or System.err by a logger.(®ýáëûÿÿÿÿ
+`
+java:S3252("EUse static access with "com.alibaba.fastjson.JSON" for "parseObject".(¾ì±ÿýÿÿÿÿ
+N	java:S106@"9Replace this use of System.out or System.err by a logger.(ÿþ«Ä

+ 5 - 0
.idea/sonarlint/issuestore/6/f/6fa6a8299634e12ab4fe4018f9a319eca334adf5

@@ -0,0 +1,5 @@
+
+k	java:S114"QRename this interface name to match the regular expression '^[A-Z][a-zA-Z0-9]*$'.(÷ý‹ãøÿÿÿÿ
+E
+java:S3740	"/Provide the parametrized type for this generic.(å¿¢Á
+Z	java:S106
"9Replace this use of System.out or System.err by a logger.(°�¢êúÿÿÿÿ8��Õæ‹1

+ 2 - 0
.idea/sonarlint/issuestore/7/5/75b1f77addd94fd682329865c76c9fffbef103c5

@@ -0,0 +1,2 @@
+
+b	java:S101	"MRename this class name to match the regular expression '^[A-Z][a-zA-Z0-9]*$'.(ŒÝ¢©

+ 21 - 0
.idea/sonarlint/issuestore/7/6/766bc3cf530662221a1e0ce0895d6c6215fb5ca9

@@ -0,0 +1,21 @@
+
+g	java:S116"ORename this field "TNMJ" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(²½çúÿÿÿÿ
+a	java:S116"NRename this field "HTH" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(³ƒÙû
+b	java:S116"ORename this field "YWZH" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(¿‹•³
+b	java:S116"PRename this field "SFZLX" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ô�¡m
+`	java:S116"MRename this field "FH" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(‚¤Š�
+g	java:S116"ORename this field "FWZL" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Ú´Å¡øÿÿÿÿ
+g	java:S116"ORename this field "SFZH" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(—½ý�ÿÿÿÿÿ
+b	java:S116"ORename this field "LXDZ" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(‡°ŸŠ
+g	java:S116"ORename this field "FWXZ" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ÿªËÎúÿÿÿÿ
+b	java:S116"ORename this field "HTRQ" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(œýæ¢
+`	java:S116"MRename this field "ZL" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ãüß»
+g	java:S116"ORename this field "FWYT" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(‹è±�ÿÿÿÿÿ
+a	java:S116"ORename this field "ZXRQ" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(õÏç3
+b	java:S116"ORename this field "JZMJ" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ª�Ø”
+`	java:S116"MRename this field "ZH" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ø·îÊ
+b	java:S116"ORename this field "ZXYY" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ž�’Ý
+c	java:S116"PRename this field "MSRXM" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(é÷È‚
+g	java:S116"ORename this field "FTMJ" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ûü´ûùÿÿÿÿ
+g	java:S116"ORename this field "HTZJ" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(öƒëêøÿÿÿÿ
+e	java:S101"MRename this class name to match the regular expression '^[A-Z][a-zA-Z0-9]*$'.(ŸãÀ¾þÿÿÿÿ

+ 576 - 0
.idea/sonarlint/issuestore/d/a/daa38303f16cd676e8410f685a3f89d3df715875

@@ -0,0 +1,576 @@
+
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+\
+java:S1192"HDefine a constant instead of duplicating this literal "DYRZJHM" 6 times.(¥‡¶÷
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+a
+java:S1192"HDefine a constant instead of duplicating this literal "ZWLXQXQ" 6 times.(ŠŽ—°úÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+|	java:S116"iRename this field "guiji_city_real_estate_mapper2" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Ç·ÚÖ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+_
+java:S1192"FDefine a constant instead of duplicating this literal "CMRXM" 5 times.(ªÇ•‡ûÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+a
+java:S1192"HDefine a constant instead of duplicating this literal "ZWLXQXZ" 5 times.(ÖƒÔáûÿÿÿÿ
+s
+java:S1192"ZDefine a constant instead of duplicating this literal "platform_interfacetype_1" 25 times.(ö„ÁÝýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+b
+java:S1192"IDefine a constant instead of duplicating this literal "results" 50 times.(Ôÿÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(´²ÙÃúÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(Ðûþ®ýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(íÓ´Ÿüÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+Z
+java:S1192"FDefine a constant instead of duplicating this literal "CSRXM" 3 times.(Üë¼á
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+O	java:S125"<This block of commented-out lines of code should be removed.(½Ÿá„
+k
+java:S1192"WDefine a constant instead of duplicating this literal "platformInterfacetype" 50 times.(½šÌ‰
+[
+java:S1192"GDefine a constant instead of duplicating this literal "param" 50 times.(ÞºÚÁ
+C
+java:S3740"/Provide the parametrized type for this generic.(¶«”à
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+O	java:S125"<This block of commented-out lines of code should be removed.(½Ÿá„
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(Úâ�¶øÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(ØŒ°€
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(깸ä
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¯ËÐÃ
+C
+java:S3740"/Provide the parametrized type for this generic.(ÜÖˆå
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+€	java:S116"hRename this field "guiji_city_real_estate_mapper" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(¡Œœ­øÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+`	java:S101"MRename this class name to match the regular expression '^[A-Z][a-zA-Z0-9]*$'.( ƒ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+O	java:S125"<This block of commented-out lines of code should be removed.(½Ÿá„
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+v
+java:S1192"]Define a constant instead of duplicating this literal "/system/interfaceLog/addLog" 50 times.(ü”¨ßÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+b
+java:S1192"IDefine a constant instead of duplicating this literal "DYQRZJHM" 6 times.(’–üÐúÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(„Ìùòþÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(õþŒƒûÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+Z
+java:S1192"FDefine a constant instead of duplicating this literal "MSRXM" 9 times.(ý‡ˆ´
+`
+java:S1192"GDefine a constant instead of duplicating this literal "DYHTBH" 6 times.(þ¼½üÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+g
+java:S1192"SDefine a constant instead of duplicating this literal "interfaceinfoName" 50 times.(„Ø�ï
+_
+java:S1192"FDefine a constant instead of duplicating this literal "SFZLX" 9 times.(ö‹ÆÐúÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(ò‘õ¾ûÿÿÿÿ
+Z
+java:S1192"FDefine a constant instead of duplicating this literal "TXQZH" 5 times.(л³�
+H
+java:S3740"/Provide the parametrized type for this generic.(²àƒ‹üÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+_
+java:S1192"FDefine a constant instead of duplicating this literal "SYQZH" 4 times.(ù»¬�ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+\
+java:S1192"HDefine a constant instead of duplicating this literal "ZWRZJHM" 6 times.(‰ø»Ã
+n
+java:S1192"ZDefine a constant instead of duplicating this literal "platform_interfacetype_2" 25 times.(½šÌ‰
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(”£¢Ýøÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+d
+java:S1192"PDefine a constant instead of duplicating this literal "ä¹°å�—人姓å��" 8 times.(�»ðõ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(”µÉÌúÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(žÃ¸íùÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(ÎÚ­¼
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+k
+java:S1192"RDefine a constant instead of duplicating this literal "operationStatus" 100 times.(§ Èœýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(©Áöôþÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+\
+java:S1192"HDefine a constant instead of duplicating this literal "XSBAZMH" 3 times.(£¼­ˆ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(’ù€Æüÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+c
+java:S1192"PDefine a constant instead of duplicating this literal "抵押人姓å��" 5 times.(ÙûÙ$
+j
+java:S1192"QDefine a constant instead of duplicating this literal "interfaceinfoId" 50 times.(£ê¥¦øÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+g
+java:S1192"NDefine a constant instead of duplicating this literal "exceptionLog" 50 times.(¨ïò…øÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¥£¾²
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+i	java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(°¿Þ�ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+C
+java:S3740"/Provide the parametrized type for this generic.(ù�£­
+C
+java:S3740"/Provide the parametrized type for this generic.(¨þôª
+H
+java:S3740"/Provide the parametrized type for this generic.(íÆÕµýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(‹²õèÿÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ
+H
+java:S3740"/Provide the parametrized type for this generic.(í·éÚýÿÿÿÿ
+<
+java:S1148"#Use a logger to log this exception.(€ÉÔ…ýÿÿÿÿ

+ 15 - 0
.idea/sonarlint/issuestore/e/5/e5d1411d6e5b2700a2a985e66fd39ef3f4b35269

@@ -0,0 +1,15 @@
+
+D
+java:S1172"+Remove this unused method parameter "args".(ü�ÎÆýÿÿÿÿ
+5
+java:S1643"Use a StringBuilder instead.(ùµ¾©ýÿÿÿÿ
+Q	java:S106"9Replace this use of System.out or System.err by a logger.(¼ó´Öüÿÿÿÿ
+Q	java:S106"9Replace this use of System.out or System.err by a logger.(ÞÉÚ�úÿÿÿÿ
+L	java:S106"9Replace this use of System.out or System.err by a logger.(…‰íå
+T	java:S125"<This block of commented-out lines of code should be removed.(š´æ™ûÿÿÿÿ
+Q	java:S106"9Replace this use of System.out or System.err by a logger.(‡¤ááÿÿÿÿÿ
+Q	java:S106"9Replace this use of System.out or System.err by a logger.( ®—¢úÿÿÿÿ
+L	java:S106"9Replace this use of System.out or System.err by a logger.(ݲš
+5
+java:S1643"Use a StringBuilder instead.(ŸÙ—Çûÿÿÿÿ
+O	java:S125"<This block of commented-out lines of code should be removed.(éð‘º

Разница между файлами не показана из-за своего большого размера
+ 748 - 568
.idea/workspace.xml


+ 30 - 0
sooka-auth/src/main/java/com/sooka/mapper/AuthCNMDMapper.java

@@ -0,0 +1,30 @@
+package com.sooka.mapper;
+
+
+import com.sooka.model.db.IntDetailed;
+import com.sooka.model.db.IntDetailed_SP;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * 中央必备映射器目录
+ * CentralNecessaryMappersDirectory
+ *
+ * @author wangzhe
+ * @date 2023-06-17 09:56:17
+ */
+
+@Mapper
+public interface AuthCNMDMapper {
+
+    /**
+     * 查询申请记录明细
+     *
+     * @param intDetailed 查询条件
+     * @return 申请明细集合
+     */
+    public List<IntDetailed_SP> selectIntDetailedList(IntDetailed_SP intDetailed);
+}

+ 9 - 9
sooka-auth/src/main/java/com/sooka/model/db/IntDetailed.java

@@ -35,20 +35,20 @@ public class IntDetailed {
     private String intId;
 
     /** 开始时间 */
-    @Column
-    private String strAt;
+//    @Column
+//    private String strAt;
 
     /** 结束时间 */
-    @Column
-    private String endAt;
+//    @Column
+//    private String endAt;
 
     /** secret_key */
     @Column
     private String secretKey;
 
     /** 状态 */
-    @Column
-    private String status;
+//    @Column
+//    private String status;
 
     @Override
     public String toString() {
@@ -56,10 +56,10 @@ public class IntDetailed {
                 "id='" + id + '\'' +
                 ", recordId='" + recordId + '\'' +
                 ", intId='" + intId + '\'' +
-                ", strAt='" + strAt + '\'' +
-                ", endAt='" + endAt + '\'' +
+//                ", strAt='" + strAt + '\'' +
+//                ", endAt='" + endAt + '\'' +
                 ", secretKey='" + secretKey + '\'' +
-                ", status='" + status + '\'' +
+//                ", status='" + status + '\'' +
                 '}';
     }
 }

+ 52 - 0
sooka-auth/src/main/java/com/sooka/model/db/IntDetailed_SP.java

@@ -0,0 +1,52 @@
+package com.sooka.model.db;
+
+//import com.sooka.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 申请明细对象 int_detailed
+ *
+ * @author yhliang
+ * @date 2021-07-06
+ */
+@Data
+public class IntDetailed_SP // extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private String id;
+
+    private String subId;
+
+    /** 记录表id */
+    private String recordId;
+
+    /** 接口表id */
+    private String intId;
+
+    /** 接口名称 */
+    private String interfaceName;
+
+    /** 接口地址 */
+    private String interfaceAddress;
+
+    /** 接口编码 */
+    private String code;
+
+    /** 接口编码 二期 */
+    private String codeSp;
+
+    /** secret_key */
+    private String secretKey;
+
+    /** secret_content */
+    private String secretContent;
+
+    /** 用途 */
+    private String purpose;
+
+    /** 附件 */
+    private String file;
+
+}

+ 85 - 22
sooka-auth/src/main/java/com/sooka/service/impl/AuthServiceImpl.java

@@ -1,16 +1,19 @@
 package com.sooka.service.impl;
 
-
 import com.sooka.enums.ResultEnum;
+import com.sooka.mapper.AuthCNMDMapper;
 import com.sooka.model.ResultModel;
 import com.sooka.model.db.IntDetailed;
+import com.sooka.model.db.IntDetailed_SP;
 import com.sooka.service.AuthService;
 import com.sooka.mapper.AuthMapper;
-import com.sooka.utils.DateUtils;
+import com.sooka.utils.SecretKeyUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -18,40 +21,100 @@ import java.util.Objects;
 @Service
 public class AuthServiceImpl implements AuthService {
 
-    @Autowired
-    private AuthMapper authMapper;
+    @Resource
+    private AuthCNMDMapper authCNMDMapper;
+//    @Autowired
+//    private AuthMapper authMapper;
 
     @Override
     public ResultModel auth(String secretKey, String intCode) {
-
-        Example userExample = new Example(IntDetailed.class);
-        Example.Criteria criteria = userExample.createCriteria();
+        System.out.println("进入 com.sooka.service.impl");
+//        Example userExample = new Example(IntDetailed.class);
+//        Example.Criteria criteria = userExample.createCriteria();
 
         // 小于等于
-        criteria.andLessThanOrEqualTo("strAt", DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN));
+        // 原授权码到期验证
+        // criteria.andLessThanOrEqualTo("strAt", DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN));
 
         // 大于等于
-        criteria.andGreaterThanOrEqualTo("endAt", DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN));
+        // 原授权码到期验证
+        // criteria.andGreaterThanOrEqualTo("endAt", DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN));
 
         // 等于
-        criteria.andEqualTo("secretKey", secretKey);
-
-
-        List<IntDetailed> list = authMapper.selectByExample(userExample);
-
-        if (list == null || list.size() != 1) {
-            return ResultModel.error(ResultEnum.ERROR_AUTH_EXPIRES);
+//        criteria.andEqualTo("secretKey", secretKey);
+
+//        List<IntDetailed> list = authMapper.selectByExample(userExample);
+
+        IntDetailed_SP intDetailedParam = new IntDetailed_SP();
+        intDetailedParam.setSecretKey(secretKey);
+        System.out.println("start querying...");
+        List<IntDetailed_SP> list = authCNMDMapper.selectIntDetailedList(intDetailedParam);
+        System.out.println("query finished. list.size=" + list.size());
+
+
+        // 原授权码到期验证
+        // if (list == null || list.size() != 1) {
+        //     return ResultModel.error(ResultEnum.ERROR_AUTH_EXPIRES);
+        // }
+        // IntDetailed intDetailed = list.get(0);
+
+        // 新授权码到期验证
+        boolean isAuthExpires;
+        IntDetailed_SP intDetailed;
+        if(list == null){
+            System.out.println("无此密钥" + secretKey);
+        }else if(list.size() == 0){
+            System.out.println("存在0个密钥" + secretKey);
+        }else if(list.size() > 1){
+            System.out.println("存在多个异常密钥" + secretKey);
+        }else if(list.size() == 1){
+            System.out.println("存在1个密钥 secretKey=" + list.get(0).getSecretKey());
         }
+        if (list != null && list.size() == 1) {
+            intDetailed = list.get(0);
+            if(intDetailed.getRecordId() != null){ // 新接口解析密钥判断授权时效
+                // 解密后的明文是:123/政数局/2022-10-20 - 2022-10-29/b29c94d72ee74c6d94b573d90020ea59
+//                String duration = SecretKeyUtil.AESDncode("3fc674da58", intDetailed.getSecretKey().split("/")[2]);
+                String secret_key = intDetailed.getSecretKey();
+                System.out.println("secret_key=" + secret_key);
+                String secret_content = SecretKeyUtil.AESDncode("3fc674da58", secret_key);
+                System.out.println("secret_content=" + secret_content);
+                String duration = secret_content.split("/")[2];
+//                String duration = intDetailed.getSecretContent().split("/")[2];
+                System.out.println("duration=" + duration);
+                // 2022-10-20 - 2022-10-29
+                String startTime = duration.split(" - ")[0];
+                String endTime = duration.split(" - ")[1];
+                String nowTime = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+                if(nowTime.compareTo(startTime) != -1 && endTime.compareTo(nowTime) != -1){
+                    isAuthExpires = false; // 授权有效
+                    System.out.println("授权有效");
+                }else {
+                    isAuthExpires = true; // 授权已到期
+                    System.out.println("授权已到期");
+                }
+            }else { // legacy
+                isAuthExpires = false; // 旧接口按照原密钥接收数据,授权长期有效
+                System.out.println("旧接口按照原密钥接收数据,授权长期有效");
+            }
+        }else { // 授权失效或无此密钥及存在多个异常密钥,提示授权码到期请重新申请
+            String a ="1HjlUwOjkNCuvi+E8+r+4oYWPV1lDMF6l8E7GovGe9h4GtK4nDBXQKirD57TTku+08MHkHsS04X8xpKGQTrNOxG5LfweCxtHbmoUczwF9Y8=";
+            intDetailed = null;
+            isAuthExpires = true;
+            System.out.println("授权失效或无此密钥及存在多个异常密钥,提示授权码到期请重新申请");
+        }
+         if (isAuthExpires) {
+             return ResultModel.error(ResultEnum.ERROR_AUTH_EXPIRES);
+         }
 
-        IntDetailed intDetailed = list.get(0);
-
-        if (!Objects.equals(intCode, intDetailed.getIntCode())) {
+        if (!Objects.equals(intCode, intDetailed.getCode()) && !Objects.equals(intCode, intDetailed.getCodeSp())) {// 旧秘钥验证 && 新秘钥验证
             return ResultModel.error(ResultEnum.ERROR_INT_SECRET_KEY_MISMATCH);
         }
 
-        if (!"1".equalsIgnoreCase(intDetailed.getStatus())) {
-            return ResultModel.error(ResultEnum.ERROR_INTERFACE_DISABLED);
-        }
+        // // 原申请接口状态验证
+        // if (!"1".equalsIgnoreCase(intDetailed.getStatus())) {
+        //     return ResultModel.error(ResultEnum.ERROR_INTERFACE_DISABLED);
+        // }
 
         return ResultModel.ok(list);
     }

+ 130 - 0
sooka-auth/src/main/java/com/sooka/utils/SecretKeyUtil.java

@@ -0,0 +1,130 @@
+package com.sooka.utils;
+
+import sun.misc.BASE64Decoder;
+import sun.misc.BASE64Encoder;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.SecureRandom;
+
+/**
+ * 秘钥生成器工具类
+ *
+ * @author lei_wang
+ */
+public class SecretKeyUtil {
+
+
+    /**
+     * 加密
+     * 1.构造**生成器
+     * 2.根据ecnodeRules规则初始化**生成器
+     * 3.产生**
+     * 4.创建和初始化密码器
+     * 5.内容加密
+     * 6.返回字符串
+     */
+    public static String AESEncode(String encodeRules, String content) {
+        try {
+            //1.构造**生成器,指定为AES算法,不区分大小写
+            KeyGenerator aes = KeyGenerator.getInstance("AES");
+            //2.根据ecnodeRules规则初始化**生成器
+            //生成一个128位的随机源,根据传入的字节数组
+//            aes.init(128, new SecureRandom(encodeRules.getBytes()));
+            SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
+            secureRandom.setSeed(encodeRules.getBytes());
+            aes.init(128, secureRandom);
+            //3.产生原始对称**
+            SecretKey original_key = aes.generateKey();
+            //4.获得原始对称**的字节数组
+            byte[] raw = original_key.getEncoded();
+            //5.根据字节数组生成AES**
+            SecretKey key = new SecretKeySpec(raw, "AES");
+            //6.根据指定算法AES自成密码器
+            Cipher cipher = Cipher.getInstance("AES");
+            //7.初始化密码器,第一个参数为加密(Encrypt_mode)或者解密解密(Decrypt_mode)操作,第二个参数为使用的KEY
+            cipher.init(Cipher.ENCRYPT_MODE, key);
+            //8.获取加密内容的字节数组(这里要设置为utf-8)不然内容中如果有中文和英文混合中文就会解密为乱码
+            byte[] byte_encode = content.getBytes("utf-8");
+            //9.根据密码器的初始化方式--加密:将数据加密
+            byte[] byte_AES = cipher.doFinal(byte_encode);
+            //10.将加密后的数据转换为字符串
+            //这里用Base64Encoder中会找不到包
+            //解决办法:
+            //在项目的Build path中先移除JRE System Library,再添加库JRE System Library,重新编译后就一切正常了。
+            String AES_encode = new String(new BASE64Encoder().encode(byte_AES));
+            //11.将字符串返回
+            return AES_encode;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //如果有错就返加nulll
+        return null;
+    }
+
+    /**
+     * 解密
+     * 解密过程:
+     * 1.同加密1-4步
+     * 2.将加密后的字符串反纺成byte[]数组
+     * 3.将加密内容解密
+     */
+    public static String AESDncode(String encodeRules, String content) {
+        try {
+            //1.构造**生成器,指定为AES算法,不区分大小写
+            KeyGenerator keyGenerator = KeyGenerator.getInstance("AES");
+            //2.根据ecnodeRules规则初始化**生成器
+            //生成一个128位的随机源,根据传入的字节数组
+//            keyGenerator.init(128, new SecureRandom(encodeRules.getBytes()));
+            SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
+            secureRandom.setSeed(encodeRules.getBytes());
+            keyGenerator.init(128, secureRandom);
+            //3.产生原始对称**
+            SecretKey original_key = keyGenerator.generateKey();
+            //4.获得原始对称**的字节数组
+            byte[] raw = original_key.getEncoded();
+            //5.根据字节数组生成AES**
+            SecretKey key = new SecretKeySpec(raw, "AES");
+            //6.根据指定算法AES自成密码器
+            Cipher cipher = Cipher.getInstance("AES");
+            //7.初始化密码器,第一个参数为加密(Encrypt_mode)或者解密(Decrypt_mode)操作,第二个参数为使用的KEY
+            cipher.init(Cipher.DECRYPT_MODE, key);
+            //8.将加密并编码后的内容解码成字节数组
+            byte[] byte_content = new BASE64Decoder().decodeBuffer(content);
+            /*
+             * 解密
+             */
+            byte[] byte_decode = cipher.doFinal(byte_content);
+            String AES_decode = new String(byte_decode, "utf-8");
+            return AES_decode;
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            e.printStackTrace();
+        }
+        //如果有错就返加nulll
+        return null;
+    }
+
+    public static void main(String[] args) {
+        /*
+         * 加密
+         */
+//        String str = SecretKeyUtil.AESEncode("3fc674da58", "123/政数局/2022-10-20 - 2022-10-29/b29c94d72ee74c6d94b573d90020ea59");
+        String str = "1HjlUwOjkNCuvi+E8+r+4oYWPV1lDMF6l8E7GovGe9h4GtK4nDBXQKirD57TTku+08MHkHsS04X8xpKGQTrNOxG5LfweCxtHbmoUczwF9Y8=";
+        System.out.println("加密后的密文是:" + str);
+
+        /*
+         * 解密
+         */
+        System.out.println("解密后的明文是:" + SecretKeyUtil.AESDncode("3fc674da58", str));
+
+        /*
+         * 解密
+         */
+        System.out.println("解密后的明文是:" + SecretKeyUtil.AESDncode("3fc674da58", "fu0uwO5T2p9Dn3j9TvhpKbC2nCDoDli1TUONB6uZH7rzXgn6vAQK+h/yjYy5iWLY/l/67wygmv825wvKmpjoxTtc3ANl4VhVxhkosEsv5Lc="));
+        System.out.println("解密后的明文是:" + SecretKeyUtil.AESDncode("3fc674da58", "1HjlUwOjkNCuvi+E8+r+4oYWPV1lDMF6l8E7GovGe9h4GtK4nDBXQKirD57TTku+08MHkHsS04X8\n" +
+                "xpKGQTrNOxG5LfweCxtHbmoUczwF9Y8="));
+    }
+}

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

@@ -9,10 +9,12 @@ 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://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+  # 政务网 Vpn
 #    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
-
-
+  # 政务网 dzzw
+    url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: thsjzt
     password: thsjzt
     # Hikari will use the above plus the following to setup connection pooling

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

@@ -6,5 +6,9 @@ spring:
   cloud:
     nacos:
       discovery:
+        # 政务网 Vpn
 #        server-addr: 172.17.5.4:8848
-        server-addr: 10.0.51.4:8848
+        # 政务网 dzzw
+        server-addr: 172.18.128.78:8848
+        # 互联网
+#        server-addr: 10.0.51.4:8848

+ 36 - 0
sooka-auth/src/main/resources/mapper/AuthCNMDMapper.xml

@@ -0,0 +1,36 @@
+<?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.AuthCNMDMapper" >
+
+
+    <resultMap type="com.sooka.model.db.IntDetailed_SP" id="IntDetailedResult">
+        <result property="subId"    column="sub_id"    />
+        <result property="recordId"    column="record_id"    />
+        <result property="intId"    column="int_id"    />
+        <result property="secretKey"    column="secret_key"    />
+        <result property="secretContent"    column="secret_content"    />
+        <result property="purpose"    column="purpose"    />
+        <result property="file"    column="file"    />
+        <result property="interfaceName"    column="interface_name"    />
+        <result property="interfaceAddress"    column="interface_address"    />
+        <result property="code"    column="int_code"    />
+        <result property="codeSp"    column="code_sp"    />
+    </resultMap>
+    <select id="selectIntDetailedList" parameterType="com.sooka.model.db.IntDetailed_SP" resultMap="IntDetailedResult">
+        SELECT
+            id,
+            record_id,
+            int_id,
+            secret_key,
+            secret_content,
+            purpose,
+            file,
+            int_code,
+            (select code from t_u_interfaceinfo where id = int_id) as code_sp
+        FROM
+            int_detailed
+        WHERE
+            replace(replace(secret_key, CHAR(10), ''), CHAR(13), '') = #{secretKey}
+    </select>
+
+</mapper>

+ 8 - 8
sooka-common/src/main/java/com/sooka/enums/ResultEnum.java

@@ -6,16 +6,16 @@ import lombok.Getter;
 public enum ResultEnum {
 
 
-    OK(1000, "成功。。。"),
+    OK(1000, "成功"),
 
-    ERROR(2000, "系统错误。。。"),
-    PARAM_EMPTY(2001, "参数为空。。。"),
+    ERROR(2000, "系统错误"),
+    PARAM_EMPTY(2001, "参数为空"),
 
-    ERROR_INVALID_SECRET_KEY(2002,"授权码无效,请填写正确的授权码。。。"),
-    ERROR_AUTH_EXPIRES(2003,"授权码到期,请重新申请。。。"),
-    ERROR_INTERFACE_DISABLED(2004,"该接口暂时停止使用,请稍后再试。。。"),
-    ERROR_INT_CODE(2005,"请填写正确的接口编码。。。"),
-    ERROR_INT_SECRET_KEY_MISMATCH(2006,"授权码与接口不匹配,请核实。。。")
+    ERROR_INVALID_SECRET_KEY(2002,"授权码无效,请填写正确的授权码"),
+    ERROR_AUTH_EXPIRES(2003,"授权码到期,请重新申请"),
+    ERROR_INTERFACE_DISABLED(2004,"该接口暂时停止使用,请稍后再试"),
+    ERROR_INT_CODE(2005,"请填写正确的接口编码"),
+    ERROR_INT_SECRET_KEY_MISMATCH(2006,"授权码与接口不匹配,请核实")
 
     ;
 

BIN
sooka-common/target/classes/com/sooka/enums/ResultEnum.class


+ 12 - 1
test-api/pom.xml

@@ -17,6 +17,11 @@
 
     <properties>
         <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <!-- 编译时的编码 -->
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+
     </properties>
 
     <dependencies>
@@ -25,6 +30,9 @@
             <groupId>com.sooka.jersey</groupId>
             <artifactId>sooka-jersey</artifactId>
             <version>0.0.1-SNAPSHOT</version>
+            <!--<groupId>com.sun.jersey</groupId>-->
+            <!--<artifactId>jersey-client</artifactId>-->
+            <!--<version>1.19</version>-->
         </dependency>
 
         <dependency>
@@ -41,7 +49,10 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>RELEASE</version>
+            <!--<version>RELEASE</version>-->
+            <!--<groupId>com.baomidou</groupId>-->
+            <!--<artifactId>mybatis-plus-boot-starter</artifactId>-->
+            <version>3.3.1</version>
         </dependency>
 
         <!--war-->

+ 2 - 1
test-api/src/main/java/com/sooka/Application.java

@@ -52,7 +52,8 @@ public class Application extends ResourceConfig {
      * @return
      */
     private Set<Class<?>> findAllClasses(){
-        String scanPackages = "com.sooka.api.*";
+//        String scanPackages = "com.sooka.api.*";
+        String scanPackages = "com.sooka.**.*";
         ClassLoader loader = this.getClass().getClassLoader();
         Resource[] resources = new Resource[0];
         try {

+ 356 - 0
test-api/src/main/java/com/sooka/api/Guiji_City_Real_Estate.java

@@ -2,6 +2,7 @@ package com.sooka.api;
 
 import com.sooka.base.BaseApi;
 import com.sooka.model.ResultModel;
+import com.sooka.model.bo.*;
 import com.sooka.service.Guiji_City_Real_Estate_Service;
 import com.sooka.service.Guiji_Gas_Service;
 import com.sooka.utils.HttpUtil;
@@ -875,4 +876,359 @@ public class Guiji_City_Real_Estate extends BaseApi {
         ResultModel r = guiji_city_real_estate_service.guiji_real_estate_contract_check_out(str);
         return r;
     }
+
+
+    /**
+     * 查询接口
+     */
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 商品房初始信息
+     */
+    @POST
+    @Path("/select_real_estate_housing_initial")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_housing_initial(Guiji_City_Real_Estate1_housing_initial_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_housing_initial(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 存量房信息
+     */
+    @POST
+    @Path("/select_real_estate_housing_stock")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_housing_stock(Guiji_City_Real_Estate2_housing_stock_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_housing_stock(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 商品房信息
+     */
+    @POST
+    @Path("/select_real_estate_housing_commercial")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_housing_commercial(Guiji_City_Real_Estate3_housing_commercial_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_housing_commercial(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 回迁房信息
+     */
+    @POST
+    @Path("/select_real_estate_housing_relocation")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_housing_relocation(Guiji_City_Real_Estate4_housing_relocation_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_housing_relocation(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 一般抵押信息
+     */
+    @POST
+    @Path("/select_real_estate_mortgage_general")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_mortgage_general(Guiji_City_Real_Estate5_mortgage_general_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_mortgage_general(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 最商额抵押信息
+     */
+    @POST
+    @Path("/select_real_estate_mortgage_business")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_mortgage_business(Guiji_City_Real_Estate6_mortgage_business_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_mortgage_business(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 在建工程抵押信息
+     */
+    @POST
+    @Path("/select_real_estate_mortgage_construction")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_mortgage_construction(Guiji_City_Real_Estate7_mortgage_construction_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_mortgage_construction(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 一般抵押权变更信息
+     */
+    @POST
+    @Path("/select_real_estate_mortgage_change")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_mortgage_change(Guiji_City_Real_Estate8_mortgage_change_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_mortgage_change(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 一般抵押权注销信息
+     */
+    @POST
+    @Path("/select_real_estate_mortgage_cancel")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_mortgage_cancel(Guiji_City_Real_Estate9_mortgage_cancel_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_mortgage_cancel(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 解封信息
+     */
+    @POST
+    @Path("/select_real_estate_unseal")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_unseal(Guiji_City_Real_Estate10_estate_unseal_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_unseal(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 预购商品房预告注销信息
+     */
+    @POST
+    @Path("/select_real_estate_pre_order_cancel_notice")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_pre_order_cancel_notice(Guiji_City_Real_Estate11_pre_order_cancel_notice_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_pre_order_cancel_notice(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 预购商品房抵押权注销信息
+     */
+    @POST
+    @Path("/select_real_estate_pre_order_cancel_mortgage")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_pre_order_cancel_mortgage(Guiji_City_Real_Estate12_pre_order_cancel_mortgage_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_pre_order_cancel_mortgage(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 档案补录信息
+     */
+    @POST
+    @Path("/select_real_estate_file_additional")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_file_additional(Guiji_City_Real_Estate13_file_additional_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_file_additional(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 预售信息
+     */
+    @POST
+    @Path("/select_real_estate_pre_sale")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_pre_sale(Guiji_City_Real_Estate14_pre_sale_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_pre_sale(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 预售变更信息
+     */
+    @POST
+    @Path("/select_real_estate_pre_sale_change")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_pre_sale_change(Guiji_City_Real_Estate15_pre_sale_change_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_pre_sale_change(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 现售信息
+     */
+    @POST
+    @Path("/select_real_estate_on_sale")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_on_sale(Guiji_City_Real_Estate16_on_sale_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_on_sale(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 现售变更信息
+     */
+    @POST
+    @Path("/select_real_estate_on_sale_change")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_on_sale_change(Guiji_City_Real_Estate17_on_sale_change_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_on_sale_change(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 预转现信息
+     */
+    @POST
+    @Path("/select_real_estate_pre_to_on")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_pre_to_on(Guiji_City_Real_Estate18_pre_to_on_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_pre_to_on(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 预售备案信息
+     */
+    @POST
+    @Path("/select_real_estate_pre_sale_record")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_pre_sale_record(Guiji_City_Real_Estate19_pre_sale_record_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_pre_sale_record(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 预售备案变更信息
+     */
+    @POST
+    @Path("/select_real_estate_pre_sale_record_change")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_pre_sale_record_change(Guiji_City_Real_Estate20_pre_sale_record_change_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_pre_sale_record_change(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 现售备案信息
+     */
+    @POST
+    @Path("/select_real_estate_on_sale_record")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_on_sale_record(Guiji_City_Real_Estate21_on_sale_record_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_on_sale_record(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 现售备案变更信息
+     */
+    @POST
+    @Path("/select_real_estate_on_sale_record_change")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_on_sale_record_change(Guiji_City_Real_Estate22_on_sale_record_change_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_on_sale_record_change(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 预售补录信息
+     */
+    @POST
+    @Path("/select_real_estate_pre_sale_additional")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_pre_sale_additional(Guiji_City_Real_Estate23_pre_sale_additional_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_pre_sale_additional(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 备案补录信息
+     */
+    @POST
+    @Path("/select_real_estate_record_additional")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_record_additional(Guiji_City_Real_Estate24_record_additional_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_record_additional(bean);
+        return r;
+    }
+
+    /**
+     * 市房地产
+     * @param bean
+     * @return 合同退房信息
+     */
+    @POST
+    @Path("/select_real_estate_contract_check_out")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel select_real_estate_contract_check_out(Guiji_City_Real_Estate25_contract_check_out_Bean bean) {
+        ResultModel r = guiji_city_real_estate_service.select_real_estate_contract_check_out(bean);
+        return r;
+    }
 }

+ 90 - 0
test-api/src/main/java/com/sooka/api/Guiji_Funeral.java

@@ -2,6 +2,7 @@ package com.sooka.api;
 
 import com.sooka.base.BaseApi;
 import com.sooka.model.ResultModel;
+import com.sooka.model.bo.*;
 import com.sooka.service.Guiji_Funeral_Service;
 import com.sooka.service.Guiji_Medicine_Service;
 import com.sooka.utils.HttpUtil;
@@ -241,4 +242,93 @@ public class Guiji_Funeral extends BaseApi {
         ResultModel r = guiji_funeral_service.guiji_funeral6(str);
         return r;
     }
+
+    
+    /**
+     * 查询接口
+     */
+
+    /**
+     * 市殡葬
+     * @param bean
+     * @return 逝者基本信息
+     */
+    @POST
+    @Path("/guiji_select_funeral_the_dead")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_funeral_the_dead(Guiji_funeral1_the_dead_Bean bean) {
+        ResultModel r = guiji_funeral_service.select_funeral_the_dead(bean);
+        return r;
+    }
+
+    /**
+     * 市殡葬
+     * @param bean
+     * @return 缴费基本信息
+     */
+    @POST
+    @Path("/guiji_select_funeral_pay")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_funeral_pay(Guiji_funeral2_pay_Bean bean) {
+        ResultModel r = guiji_funeral_service.select_funeral_pay(bean);
+        return r;
+    }
+
+    /**
+     * 市殡葬
+     * @param bean
+     * @return 冷冻基本信息
+     */
+    @POST
+    @Path("/guiji_select_funeral_freeze")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_funeral_freeze(Guiji_funeral3_freeze_Bean bean) {
+        ResultModel r = guiji_funeral_service.select_funeral_freeze(bean);
+        return r;
+    }
+
+    /**
+     * 市殡葬
+     * @param bean
+     * @return 骨灰寄存基本信息
+     */
+    @POST
+    @Path("/guiji_select_ashes_storage")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_ashes_storage(Guiji_funeral4_ashes_storage_Bean bean) {
+        ResultModel r = guiji_funeral_service.select_ashes_storage(bean);
+        return r;
+    }
+
+    /**
+     * 市殡葬
+     * @param bean
+     * @return 骨灰续存基本信息
+     */
+    @POST
+    @Path("/guiji_select_ashes_renew")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_ashes_renew(Guiji_funeral5_ashes_renew_Bean bean) {
+        ResultModel r = guiji_funeral_service.select_ashes_renew(bean);
+        return r;
+    }
+
+    /**
+     * 市殡葬
+     * @param bean
+     * @return 骨灰取走基本信息
+     */
+    @POST
+    @Path("/guiji_select_ashes_remove")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_ashes_remove(Guiji_funeral6_ashes_remove_Bean bean) {
+        ResultModel r = guiji_funeral_service.select_ashes_remove(bean);
+        return r;
+    }
 }

+ 244 - 0
test-api/src/main/java/com/sooka/api/Guiji_Gas.java

@@ -2,6 +2,7 @@ package com.sooka.api;
 
 import com.sooka.base.BaseApi;
 import com.sooka.model.ResultModel;
+import com.sooka.model.bo.*;
 import com.sooka.service.Guiji_Gas_Service;
 import com.sooka.service.Guiji_Medicine_Service;
 import com.sooka.utils.HttpUtil;
@@ -603,4 +604,247 @@ public class Guiji_Gas extends BaseApi {
         ResultModel r = guiji_gas_service.guiji_gas_XinKer_disposition_info(str);
         return r;
     }
+
+
+    /**
+     * 查询接口
+     */
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 真兰收费系统-用户信息
+     */
+    @POST
+    @Path("/guiji_select_gas_Zenner_user_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_Zenner_user_infor(Guiji_gas1_Zenner_user_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_Zenner_user_infor(bean);
+        return r;
+    }
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 真兰收费系统-表具信息
+     */
+    @POST
+    @Path("/guiji_select_gas_Zenner_gas_meter_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_Zenner_gas_meter_infor(Guiji_gas2_Zenner_gas_meter_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_Zenner_gas_meter_infor(bean);
+        return r;
+    }
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 真兰收费系统-预付费购气信息
+     */
+    @POST
+    @Path("/guiji_select_gas_Zenner_gas_purchase_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_Zenner_gas_purchase_infor(Guiji_gas3_Zenner_gas_purchase_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_Zenner_gas_purchase_infor(bean);
+        return r;
+    }
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 真兰收费系统-抄表信息
+     */
+    @POST
+    @Path("/guiji_select_gas_Zenner_meter_reading_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_Zenner_meter_reading_infor(Guiji_gas4_Zenner_meter_reading_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_Zenner_meter_reading_infor(bean);
+        return r;
+    }
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 真兰收费系统-中心计费购气信息
+     */
+    @POST
+    @Path("/guiji_select_gas_Zenner_gas_purchase_center_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_Zenner_gas_purchase_center_infor(Guiji_gas3_Zenner_gas_purchase_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_Zenner_gas_purchase_center_infor(bean);
+        return r;
+    }
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 奥枫收费系统-用户信息
+     */
+    @POST
+    @Path("/guiji_select_gas_Aofe_user_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_Aofe_user_infor(Guiji_gas5_Aofe_user_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_Aofe_user_infor(bean);
+        return r;
+    }
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 奥枫收费系统-表具信息
+     */
+    @POST
+    @Path("/guiji_select_gas_Aofe_gas_meter_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_Aofe_gas_meter_infor(Guiji_gas6_Aofe_gas_meter_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_Aofe_gas_meter_infor(bean);
+        return r;
+    }
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 奥枫收费系统-购气信息
+     */
+    @POST
+    @Path("/guiji_select_gas_Aofe_gas_purchase_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_Aofe_gas_purchase_infor(Guiji_gas7_Aofe_gas_purchase_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_Aofe_gas_purchase_infor(bean);
+        return r;
+    }
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 奥枫收费系统-抄表信息
+     */
+    @POST
+    @Path("/guiji_select_gas_Aofe_meter_reading_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_Aofe_meter_reading_infor(Guiji_gas8_Aofe_meter_reading_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_Aofe_meter_reading_infor(bean);
+        return r;
+    }
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 秦川业务系统-用户信息
+     */
+    @POST
+    @Path("/guiji_select_gas_qinchuan_user_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_qinchuan_user_infor(Guiji_gas9_qinchuan_user_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_qinchuan_user_infor(bean);
+        return r;
+    }
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 思凯收费系统-用户信息
+     */
+    @POST
+    @Path("/guiji_select_gas_SC_user_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_SC_user_infor(Guiji_gas10_SC_user_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_SC_user_infor(bean);
+        return r;
+    }
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 思凯收费系统-表具信息
+     */
+    @POST
+    @Path("/guiji_select_gas_SC_gas_meter_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_SC_gas_meter_infor(Guiji_gas11_SC_gas_meter_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_SC_gas_meter_infor(bean);
+        return r;
+    }
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 思凯收费系统-购气信息
+     */
+    @POST
+    @Path("/guiji_select_gas_SC_gas_purchase_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_SC_gas_purchase_infor(Guiji_gas12_SC_gas_purchase_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_SC_gas_purchase_infor(bean);
+        return r;
+    }
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 思凯收费系统-抄表信息
+     */
+    @POST
+    @Path("/guiji_select_gas_SC_meter_reading_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_SC_meter_reading_infor(Guiji_gas13_SC_meter_reading_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_SC_meter_reading_infor(bean);
+        return r;
+    }
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 鑫科客户系统-客户信息
+     */
+    @POST
+    @Path("/guiji_select_gas_XinKer_user_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_XinKer_user_infor(Guiji_gas14_XinKer_user_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_XinKer_user_infor(bean);
+        return r;
+    }
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 鑫科客户系统-受理信息
+     */
+    @POST
+    @Path("/guiji_select_gas_XinKer_acceptance_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_XinKer_acceptance_infor(Guiji_gas15_XinKer_acceptance_infor_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_XinKer_acceptance_infor(bean);
+        return r;
+    }
+
+    /**
+     * 市燃气
+     * @param bean
+     * @return 鑫科客户系统-处理信息
+     */
+    @POST
+    @Path("/guiji_select_gas_XinKer_disposition_infor")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_gas_XinKer_disposition_infor(Guiji_gas16_XinKer_disposition_info_Bean bean) {
+        ResultModel r = guiji_gas_service.select_gas_XinKer_disposition_infor(bean);
+        return r;
+    }
 }

+ 17 - 1
test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java

@@ -33,8 +33,24 @@ public class Guiji_Housingconstruction extends BaseApi {
     @Autowired
     Guiji_Housingconstruction_Service guiji_housingconstruction_service;
 
-
+    /**
+     * 昨夜星辰昨夜风
+     * 画廊西畔桂堂东
+     * 身无彩凤双飞翼
+     * 心有灵犀一点通
+     *
+     * 寻找附件-有缘人@阿弥陀佛
+     */
     //-----------------------------住建自来水营收- 扎小辫(微信)--------------------------------------------------
+    /**
+     * 昨夜雨疏风骤,
+     * 浓睡不消残酒。
+     * 试问卷帘人,
+     * 却道海棠依旧。
+     * 知否,
+     * 知否?
+     * 应是绿肥红瘦。
+     */
     @POST
     @Path("/guiji_housingconstruction_yhjbxx")
     // 指定请求与返回的相应体为JSON

+ 61 - 0
test-api/src/main/java/com/sooka/api/Guiji_Medicine.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.sooka.base.BaseApi;
 import com.sooka.model.ResultModel;
+import com.sooka.model.bo.*;
 import com.sooka.service.Guiji_Medicine_Service;
 import com.sooka.utils.HttpUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -176,4 +177,64 @@ public class Guiji_Medicine extends BaseApi {
         return r;
     }
 
+
+    /**
+     * 查询接口
+     */
+
+    /**
+     * 市医药
+     * @param bean
+     * @return 种植采集数据信息
+     */
+    @POST
+    @Path("/guiji_select_medicine_plant")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_medicine_plant(Guiji_medicine_dept_data_Bean bean) {
+        ResultModel r = guiji_medicine_service.select_1(bean);
+        return r;
+    }
+
+    /**
+     * 市医药
+     * @param bean
+     * @return 平台采集
+     */
+    @POST
+    @Path("/guiji_select_medicine_platform")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_medicine_platform(Guiji_medicine_dept_data2_Bean bean) {
+        ResultModel r = guiji_medicine_service.select_2(bean);
+        return r;
+    }
+
+    /**
+     * 市医药
+     * @param bean
+     * @return 项目采集
+     */
+    @POST
+    @Path("/guiji_select_medicine_project")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_medicine_project(Guiji_medicine_dept_data3_Bean bean) {
+        ResultModel r = guiji_medicine_service.select_3(bean);
+        return r;
+    }
+
+    /**
+     * 市医药
+     * @param bean
+     * @return 规上工业经济数据
+     */
+    @POST
+    @Path("/guiji_select_medicine_industry")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_select_medicine_industry(Guiji_medicine_dept_data4_Bean bean) {
+        ResultModel r = guiji_medicine_service.select_4(bean);
+        return r;
+    }
 }

+ 35 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_10_MarryInfoDouble_Api.java

@@ -0,0 +1,35 @@
+package com.sooka.api_sp.province_1_labor_contract.controller;
+
+import com.sooka.api_sp.province_1_labor_contract.domain.SP_9_Api_1680488576658_VO;
+import com.sooka.api_sp.province_1_labor_contract.service.SP_LaborContract_Service;
+import com.sooka.base.BaseApi;
+import com.sooka.model.ResultModel;
+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;
+
+/**
+ * second phase 婚姻登记信息-婚姻双方-数据查询接口 参数
+ */
+@Path("/")
+public class SP_10_MarryInfoDouble_Api extends BaseApi {
+
+    @Autowired
+    SP_LaborContract_Service service;
+
+    @POST
+    @Path("/getMarryInfoDouble")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel getMarryInfoDouble(SP_9_Api_1680488576658_VO vo){
+        return service.getApi_1680488576658(vo);
+    }
+
+
+
+}

+ 36 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_11_DataNew_Api.java

@@ -0,0 +1,36 @@
+package com.sooka.api_sp.province_1_labor_contract.controller;
+
+import com.sooka.api_sp.province_1_labor_contract.domain.SP_11_DataNew_VO;
+import com.sooka.api_sp.province_1_labor_contract.service.SP_LaborContract_Service;
+import com.sooka.base.BaseApi;
+import com.sooka.model.ResultModel;
+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;
+
+/**
+ * second phase 吉林省不动产权证查询接口 参数
+ */
+@Path("/")
+public class SP_11_DataNew_Api extends BaseApi {
+
+    @Autowired
+    SP_LaborContract_Service service;
+
+    @POST
+    @Path("/getDataNew")
+    // getMarryInfoSingle
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel getDataNew(SP_11_DataNew_VO vo){
+        return service.getDataNew(vo);
+    }
+
+
+
+}

+ 44 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_1_LaborContractNewRecordInfoListQuery_Api.java

@@ -0,0 +1,44 @@
+package com.sooka.api_sp.province_1_labor_contract.controller;
+
+import com.sooka.api_sp.province_1_labor_contract.domain.SP_1_LaborContractNewRecordInfoListQuery_VO;
+import com.sooka.api_sp.province_1_labor_contract.service.SP_LaborContract_Service;
+import com.sooka.base.BaseApi;
+import com.sooka.model.ResultModel;
+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;
+
+/**
+ * second phase 劳动备案信息---劳动合同新订备案信息(新)参数
+ */
+@Path("/")
+public class SP_1_LaborContractNewRecordInfoListQuery_Api extends BaseApi {
+
+    @Autowired
+    SP_LaborContract_Service service;
+
+    @POST
+    @Path("/getLaborContractNewRecordInfoListQuery")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel getLaborContractNewRecordInfoListQuery(SP_1_LaborContractNewRecordInfoListQuery_VO vo){
+        return service.getLaborContractNewRecordInfoListQuery(vo);
+    }
+
+    @POST
+    @Path("/getLaborContractNewRecordInfoListQuery_test")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel getLaborContractNewRecordInfoListQuery_test(SP_1_LaborContractNewRecordInfoListQuery_VO vo){
+        return ResultModel.ok(vo);
+    }
+
+
+
+}

+ 35 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_2_LaborContractRenewRecordInfoListQuery_Api.java

@@ -0,0 +1,35 @@
+package com.sooka.api_sp.province_1_labor_contract.controller;
+
+import com.sooka.api_sp.province_1_labor_contract.domain.SP_2_LaborContractRenewRecordInfoListQuery_VO;
+import com.sooka.api_sp.province_1_labor_contract.service.SP_LaborContract_Service;
+import com.sooka.base.BaseApi;
+import com.sooka.model.ResultModel;
+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;
+
+/**
+ * second phase 劳动备案信息---劳动合同新订备案信息(新)参数
+ */
+@Path("/")
+public class SP_2_LaborContractRenewRecordInfoListQuery_Api extends BaseApi {
+
+    @Autowired
+    SP_LaborContract_Service service;
+
+    @POST
+    @Path("/getLaborContractRenewRecordInfoListQuery")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel getLaborContractRenewRecordInfoListQuery (SP_2_LaborContractRenewRecordInfoListQuery_VO vo){
+        return service.getLaborContractRenewRecordInfoListQuery (vo);
+    }
+
+
+
+}

+ 35 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_3_LaborContractCancelRecordBookListQuery_Api.java

@@ -0,0 +1,35 @@
+package com.sooka.api_sp.province_1_labor_contract.controller;
+
+import com.sooka.api_sp.province_1_labor_contract.domain.SP_3_LaborContractCancelRecordBookListQuery_VO;
+import com.sooka.api_sp.province_1_labor_contract.service.SP_LaborContract_Service;
+import com.sooka.base.BaseApi;
+import com.sooka.model.ResultModel;
+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;
+
+/**
+ * second phase 劳动备案信息---劳动合同新订备案信息(新)参数
+ */
+@Path("/")
+public class SP_3_LaborContractCancelRecordBookListQuery_Api extends BaseApi {
+
+    @Autowired
+    SP_LaborContract_Service service;
+
+    @POST
+    @Path("/getLaborContractCancelRecordBookListQuery")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel getLaborContractCancelRecordBookListQuery(SP_3_LaborContractCancelRecordBookListQuery_VO vo){
+        return service.getLaborContractCancelRecordBookListQuery(vo);
+    }
+
+
+
+}

+ 35 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_4_LaborContractNewRecordBookListQuery_Api.java

@@ -0,0 +1,35 @@
+package com.sooka.api_sp.province_1_labor_contract.controller;
+
+import com.sooka.api_sp.province_1_labor_contract.domain.SP_4_LaborLaborContractNewRecordBookListQuery_VO;
+import com.sooka.api_sp.province_1_labor_contract.service.SP_LaborContract_Service;
+import com.sooka.base.BaseApi;
+import com.sooka.model.ResultModel;
+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;
+
+/**
+ * second phase 劳动备案信息---劳动合同新订备案信息(新)参数
+ */
+@Path("/")
+public class SP_4_LaborContractNewRecordBookListQuery_Api extends BaseApi {
+
+    @Autowired
+    SP_LaborContract_Service service;
+
+    @POST
+    @Path("/getLaborContractNewRecordBookListQuery")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel getLaborContractNewRecordBookListQuery(SP_4_LaborLaborContractNewRecordBookListQuery_VO  vo){
+        return service.getLaborContractNewRecordBookListQuery(vo);
+    }
+
+
+
+}

+ 35 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_5_LaborContractRenewRecordBookListQuery_Api.java

@@ -0,0 +1,35 @@
+package com.sooka.api_sp.province_1_labor_contract.controller;
+
+import com.sooka.api_sp.province_1_labor_contract.domain.SP_5_LaborContractRenewRecordBookListQuery_VO;
+import com.sooka.api_sp.province_1_labor_contract.service.SP_LaborContract_Service;
+import com.sooka.base.BaseApi;
+import com.sooka.model.ResultModel;
+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;
+
+/**
+ * second phase 劳动备案信息---劳动合同新订备案信息(新)参数
+ */
+@Path("/")
+public class SP_5_LaborContractRenewRecordBookListQuery_Api extends BaseApi {
+
+    @Autowired
+    SP_LaborContract_Service service;
+
+    @POST
+    @Path("/getLaborContractRenewRecordBookListQuery")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel getLaborContractRenewRecordBookListQuery(SP_5_LaborContractRenewRecordBookListQuery_VO vo){
+        return service.getLaborContractRenewRecordBookListQuery(vo);
+    }
+
+
+
+}

+ 35 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_6_EBaseinfos_Api.java

@@ -0,0 +1,35 @@
+package com.sooka.api_sp.province_1_labor_contract.controller;
+
+import com.sooka.api_sp.province_1_labor_contract.domain.SP_6_EBaseinfos_VO;
+import com.sooka.api_sp.province_1_labor_contract.service.SP_LaborContract_Service;
+import com.sooka.base.BaseApi;
+import com.sooka.model.ResultModel;
+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;
+
+/**
+ * second phase 吉林省-企业登记基本信息 参数
+ */
+@Path("/")
+public class SP_6_EBaseinfos_Api extends BaseApi {
+
+    @Autowired
+    SP_LaborContract_Service service;
+
+    @POST
+    @Path("/getqueryEBaseinfos")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel getqueryEBaseinfos(SP_6_EBaseinfos_VO vo){
+        return service.getqueryEBaseinfos(vo);
+    }
+
+
+
+}

+ 35 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_7_QsWszInfo_Api.java

@@ -0,0 +1,35 @@
+package com.sooka.api_sp.province_1_labor_contract.controller;
+
+import com.sooka.api_sp.province_1_labor_contract.domain.SP_7_QsWszInfo_VO;
+import com.sooka.api_sp.province_1_labor_contract.service.SP_LaborContract_Service;
+import com.sooka.base.BaseApi;
+import com.sooka.model.ResultModel;
+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;
+
+/**
+ * second phase 契税完税证-数据查询接口 参数
+ */
+@Path("/")
+public class SP_7_QsWszInfo_Api extends BaseApi {
+
+    @Autowired
+    SP_LaborContract_Service service;
+
+    @POST
+    @Path("/getQsWszInfo")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel QsWszInfo(SP_7_QsWszInfo_VO vo){
+        return service.getQsWszInfo(vo);
+    }
+
+
+
+}

+ 35 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_8_Fpxxxx_Api.java

@@ -0,0 +1,35 @@
+package com.sooka.api_sp.province_1_labor_contract.controller;
+
+import com.sooka.api_sp.province_1_labor_contract.domain.SP_8_Fpxxxx_VO;
+import com.sooka.api_sp.province_1_labor_contract.service.SP_LaborContract_Service;
+import com.sooka.base.BaseApi;
+import com.sooka.model.ResultModel;
+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;
+
+/**
+ * second phase 发票信息验证查询-数据查询接口 参数
+ */
+@Path("/")
+public class SP_8_Fpxxxx_Api extends BaseApi {
+
+    @Autowired
+    SP_LaborContract_Service service;
+
+    @POST
+    @Path("/getFpxxxx")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel getFpxxxx(SP_8_Fpxxxx_VO vo){
+        return service.getFpxxxx(vo);
+    }
+
+
+
+}

+ 35 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/controller/SP_9_Api_1680488576658_Api.java

@@ -0,0 +1,35 @@
+package com.sooka.api_sp.province_1_labor_contract.controller;
+
+import com.sooka.api_sp.province_1_labor_contract.domain.SP_9_Api_1680488576658_VO;
+import com.sooka.api_sp.province_1_labor_contract.service.SP_LaborContract_Service;
+import com.sooka.base.BaseApi;
+import com.sooka.model.ResultModel;
+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;
+
+/**
+ * second phase 婚姻登记信息-数据查询接口 参数
+ */
+@Path("/")
+public class SP_9_Api_1680488576658_Api extends BaseApi {
+
+    @Autowired
+    SP_LaborContract_Service service;
+
+    @POST
+    @Path("/getApi_1680488576658")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel getApi_1680488576658(SP_9_Api_1680488576658_VO vo){
+        return service.getApi_1680488576658(vo);
+    }
+
+
+
+}

+ 22 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/ResultModel_SP_Bean.java

@@ -0,0 +1,22 @@
+package com.sooka.api_sp.province_1_labor_contract.domain;
+
+import com.google.gson.annotations.Expose;
+import com.sooka.model.bo.BaseBean_Share;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ResultModel_SP_Bean extends BaseBean_Share {
+
+    @Expose
+    private String code;
+    @Expose
+    private String message;
+
+    @Expose
+    private String result;
+
+
+
+}

+ 49 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_11_DataNew_VO.java

@@ -0,0 +1,49 @@
+package com.sooka.api_sp.province_1_labor_contract.domain;
+
+import com.google.gson.annotations.Expose;
+import com.sooka.model.vo.BaseVO;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 吉林省不动产权证查询接口 参数
+ */
+
+@Getter
+@Setter
+public class SP_11_DataNew_VO extends BaseVO {
+
+    //pageSize
+    @Expose
+    private String size;
+    //pageNum
+    @Expose
+    private String page;
+
+    //姓名
+    @Expose
+    private String obligeeName;
+
+    //身份证号码
+    @Expose
+    private String obligeeNameIdCardNo;
+
+//    入参参数
+//    obligeeName-姓名
+//    obligeeNameIdCardNo-证件号
+//----------------------------------
+//    响应体参数
+//    返回参数
+//    registrationInstitution-登记机构
+//    registrationTime-登记时间
+//    immovablesCertNum-不动产权证号
+//    obligee-权利人
+//    commonCondition-共有情况
+//    location-坐落
+//    immovablesUnitNum-不动产单元号
+//    rightType-权利类型
+//    rightNature-权利性质
+//    purpose-用途
+//    measureArea-面积
+//    serviceLife	-使用期限
+}

+ 29 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_1_LaborContractNewRecordInfoListQuery_VO.java

@@ -0,0 +1,29 @@
+package com.sooka.api_sp.province_1_labor_contract.domain;
+
+import com.google.gson.annotations.Expose;
+import com.sooka.model.vo.BaseVO;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 劳动备案信息---劳动合同新订备案信息(新)参数
+ */
+
+@Getter
+@Setter
+public class SP_1_LaborContractNewRecordInfoListQuery_VO extends BaseVO {
+
+    //pageSize
+    @Expose
+    private String size;
+    //pageNum
+    @Expose
+    private String page;
+
+    //身份证号码
+    @Expose
+    private String idcardNo;
+
+
+
+}

+ 29 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_2_LaborContractRenewRecordInfoListQuery_VO.java

@@ -0,0 +1,29 @@
+package com.sooka.api_sp.province_1_labor_contract.domain;
+
+import com.google.gson.annotations.Expose;
+import com.sooka.model.vo.BaseVO;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 劳动备案信息---劳动合同续订备案信息(新)参数
+ */
+
+@Getter
+@Setter
+public class SP_2_LaborContractRenewRecordInfoListQuery_VO extends BaseVO {
+
+    //pageSize
+    @Expose
+    private String size;
+    //pageNum
+    @Expose
+    private String page;
+
+    //身份证号码
+    @Expose
+    private String idcardNo;
+
+
+
+}

+ 29 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_3_LaborContractCancelRecordBookListQuery_VO.java

@@ -0,0 +1,29 @@
+package com.sooka.api_sp.province_1_labor_contract.domain;
+
+import com.google.gson.annotations.Expose;
+import com.sooka.model.vo.BaseVO;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 劳动合同备案名册----劳动合同解除备案名册信息查询(新)参数
+ */
+
+@Getter
+@Setter
+public class SP_3_LaborContractCancelRecordBookListQuery_VO extends BaseVO {
+
+    //pageSize
+    @Expose
+    private String size;
+    //pageNum
+    @Expose
+    private String page;
+
+    //部门名称
+    @Expose
+    private String unitName;
+
+
+
+}

+ 29 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_4_LaborLaborContractNewRecordBookListQuery_VO.java

@@ -0,0 +1,29 @@
+package com.sooka.api_sp.province_1_labor_contract.domain;
+
+import com.google.gson.annotations.Expose;
+import com.sooka.model.vo.BaseVO;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 劳动合同备案名册---劳动合同新订备案名册信息查询(新)参数
+ */
+
+@Getter
+@Setter
+public class SP_4_LaborLaborContractNewRecordBookListQuery_VO extends BaseVO {
+
+    //pageSize
+    @Expose
+    private String size;
+    //pageNum
+    @Expose
+    private String page;
+
+    //部门名称
+    @Expose
+    private String unitName;
+
+
+
+}

+ 29 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_5_LaborContractRenewRecordBookListQuery_VO.java

@@ -0,0 +1,29 @@
+package com.sooka.api_sp.province_1_labor_contract.domain;
+
+import com.google.gson.annotations.Expose;
+import com.sooka.model.vo.BaseVO;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 劳动合同备案名册---劳动合同续订备案名册信息查询接口(新)参数
+ */
+
+@Getter
+@Setter
+public class SP_5_LaborContractRenewRecordBookListQuery_VO extends BaseVO {
+
+    //pageSize
+    @Expose
+    private String size;
+    //pageNum
+    @Expose
+    private String page;
+
+    //部门名称
+    @Expose
+    private String unitName;
+
+
+
+}

+ 49 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_6_EBaseinfos_VO.java

@@ -0,0 +1,49 @@
+package com.sooka.api_sp.province_1_labor_contract.domain;
+
+import com.google.gson.annotations.Expose;
+import com.sooka.model.vo.BaseVO;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 吉林省-企业登记基本信息 参数
+ */
+
+@Getter
+@Setter
+public class SP_6_EBaseinfos_VO extends BaseVO {
+
+    //pageSize
+    @Expose
+    private String size;
+    //pageNum
+    @Expose
+    private String page;
+
+    //统一社会信用代码
+    @Expose
+    private String uniscid;
+
+    //企业名称
+    @Expose
+    private String entName;
+
+//    code String 返回码
+//    message String 返回信息
+//    data Array 详细信息
+//    uniscid String 统一社会信用代码
+//    entName String 名称
+//    entTypeCn String 类型
+//    name String 法人
+//    opScope String 经营范围
+//    regCap Integer 注册资本
+//    estDate Date 成立日期
+//    opFrom Date 经营(驻在)期限自
+//    opto Date 经营(驻在)期限至
+//    dom String 住所
+//    regOrgCn String 登记机关
+//    regStateCn String 登记状态
+
+
+
+}

+ 37 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_7_QsWszInfo_VO.java

@@ -0,0 +1,37 @@
+package com.sooka.api_sp.province_1_labor_contract.domain;
+
+import com.google.gson.annotations.Expose;
+import com.sooka.model.vo.BaseVO;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 契税完税证-数据查询接口 参数
+ */
+
+@Getter
+@Setter
+public class SP_7_QsWszInfo_VO extends BaseVO {
+
+    //pageSize
+    @Expose
+    private String size;
+    //pageNum
+    @Expose
+    private String page;
+
+    //纳税人名称
+    @Expose
+    private String nsrmc;
+
+    //社会信用代码
+    @Expose
+    private String shxydm;
+
+    //纳税人识别号
+    @Expose
+    private String nsrsbh;
+
+
+
+}

+ 57 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_8_Fpxxxx_VO.java

@@ -0,0 +1,57 @@
+package com.sooka.api_sp.province_1_labor_contract.domain;
+
+import com.google.gson.annotations.Expose;
+import com.sooka.model.vo.BaseVO;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 发票信息验证查询-数据查询接口 参数
+ */
+
+@Getter
+@Setter
+public class SP_8_Fpxxxx_VO extends BaseVO {
+
+    //pageSize
+    @Expose
+    private String size;
+    //pageNum
+    @Expose
+    private String page;
+
+    //发票代码
+    @Expose
+    private String fpdm;
+
+    //发票号码
+    @Expose
+    private String fphm;
+
+    //开票日期,格式为yyyymmdd
+    @Expose
+    private String kprq;
+
+    //金额不含税
+    @Expose
+    private String je;
+
+//    fpdm 发票代码
+//    fphm 发票号码
+//    kprq 开票日期
+//    jym 校验码
+//    gfmc 购方名称
+//    gfsbh 购方识别号
+//    je 金额不含税
+//    slv 税率
+//    se 税额
+//    jshj 价税合计
+//    xfmc 销方名称
+//    xfsbh 销方识别号
+//    bz 备注
+//    gmfdzdh 购买方地址电话
+//    gmfyhzh 购买方银行账户
+//    xsfdzdh 销售方地址电话
+//    xsfyhzh 销售方银行账户
+
+}

+ 54 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/domain/SP_9_Api_1680488576658_VO.java

@@ -0,0 +1,54 @@
+package com.sooka.api_sp.province_1_labor_contract.domain;
+
+import com.google.gson.annotations.Expose;
+import com.sooka.model.vo.BaseVO;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 婚姻登记信息-数据查询接口 参数
+ */
+
+@Getter
+@Setter
+public class SP_9_Api_1680488576658_VO extends BaseVO {
+
+    //pageSize
+    @Expose
+    private String size;
+    //pageNum
+    @Expose
+    private String page;
+
+    //男方姓名
+    @Expose
+    private String NAME_MAN;
+
+    //女方姓名
+    @Expose
+    private String NAME_WOMAN;
+
+    //男方身份证号码
+    @Expose
+    private String CERT_NUM_MAN;
+
+    //女方身份证号码
+    @Expose
+    private String CERT_NUM_WOMAN;
+
+
+
+//    NAME_MAN-男方姓名
+//    NAME_WOMAN-女方姓名
+//    CERT_NUM_MAN-男方身份证号码
+//    CERT_NUM_WOMAN-女方身份证号码
+//----------------------------------
+//    响应体参数
+//    OP_TYPE 婚姻状态
+//    DEPT_NAME 登记单位名称
+//    NAME_MAN 男方姓名
+//    NAME_WOMAN 女方姓名
+//    CERT_NUM_MAN 男方身份证号码
+//    CERT_NUM_WOMAN 女方身份证号码
+//    OP_DATE 登记日期
+}

+ 29 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/service/SP_LaborContract_Service.java

@@ -0,0 +1,29 @@
+package com.sooka.api_sp.province_1_labor_contract.service;
+
+import com.sooka.api_sp.province_1_labor_contract.domain.*;
+import com.sooka.model.ResultModel;
+
+public interface SP_LaborContract_Service {
+
+    // 劳动备案信息---劳动合同新订备案信息(新)参数
+    public ResultModel getLaborContractNewRecordInfoListQuery(SP_1_LaborContractNewRecordInfoListQuery_VO vo);
+    // 劳动备案信息---劳动合同新订备案信息(新)参数
+    public ResultModel getLaborContractRenewRecordInfoListQuery (SP_2_LaborContractRenewRecordInfoListQuery_VO vo);
+    // 劳动备案信息---劳动合同新订备案信息(新)参数
+    public ResultModel getLaborContractCancelRecordBookListQuery (SP_3_LaborContractCancelRecordBookListQuery_VO vo);
+    // 劳动备案信息---劳动合同新订备案信息(新)参数
+    public ResultModel getLaborContractNewRecordBookListQuery (SP_4_LaborLaborContractNewRecordBookListQuery_VO vo);
+    // 劳动备案信息---劳动合同新订备案信息(新)参数
+    public ResultModel getLaborContractRenewRecordBookListQuery (SP_5_LaborContractRenewRecordBookListQuery_VO vo);
+
+    // 6.吉林省-企业登记基本信息 参数
+    public ResultModel getqueryEBaseinfos (SP_6_EBaseinfos_VO vo);
+    // 7.契税完税证-数据查询接口 参数
+    public ResultModel getQsWszInfo (SP_7_QsWszInfo_VO vo);
+    // 8.发票信息验证查询-数据查询接口 参数
+    public ResultModel getFpxxxx (SP_8_Fpxxxx_VO vo);
+    // 9.婚姻登记信息-数据查询接口 参数
+    public ResultModel getApi_1680488576658 (SP_9_Api_1680488576658_VO vo);
+    // 11.吉林省不动产权证查询接口 参数
+    public ResultModel getDataNew (SP_11_DataNew_VO vo);
+}

Разница между файлами не показана из-за своего большого размера
+ 774 - 0
test-api/src/main/java/com/sooka/api_sp/province_1_labor_contract/service/impl/SP_LaborContract_ServiceImpl.java


+ 55 - 1
test-api/src/main/java/com/sooka/base/util/Generator.java

@@ -1,7 +1,7 @@
 package com.sooka.base.util;
 
 public class Generator {
-    public static void main(String[] args) {
+    public static void main2(String[] args) {
         String str = "userName, userPhone, userAddr, balance, userCode";
 
         String[] arr = str.split(", ");
@@ -17,4 +17,58 @@ public class Generator {
             System.out.println("bean.set" + arr[i].substring(0, 1).toUpperCase() + arr[i].substring(1, arr[i].length()) + "(Data.getString(\"" + arr[i] + "\"));");
         }
     }
+
+
+    static String str = "";
+    static String note = "";
+    static String[] arr = null;
+    static String[] notes = null;
+    static String[] properties = null;
+    public static void main(String[] args) {
+        String bean = "String HTH;//合同号\n" +
+                "    String YWZH;//业务宗号\n" +
+                "    String MSRXM;//买受人姓名\n" +
+                "    String SFZLX;//身份证类型\n" +
+                "    String SFZH;//身份证号\n" +
+                "    String LXDZ;//联系地址\n" +
+                "    String FWZL;//房屋坐落\n" +
+                "    String HTZJ;//合同总价\n" +
+                "    String JZMJ;//建筑面积\n" +
+                "    String TNMJ;//套内面积\n" +
+                "    String FTMJ;//分摊面积\n" +
+                "    String ZH;//幢号\n" +
+                "    String FH;//房号\n" +
+                "    String FWYT;//房屋用途\n" +
+                "    String FWXZ;//房屋性质\n" +
+                "    String ZL;//坐落\n" +
+                "    String HTRQ;//合同日期\n" +
+                "    String ZXYY;//注销原因\n" +
+                "    String ZXRQ;//注销日期";
+
+        properties = bean.split("\n");
+
+        for (int i = 0; i < properties.length; i++) {
+            String line = properties[i];
+            String property = line.split(";")[0].split("String ")[1];
+            str = str + property + ", ";
+        }
+        arr = str.split(", ");
+
+        for (int i = 0; i < properties.length; i++) {
+            String line = properties[i];
+            String annotation = line.split(";")[1].split("//")[1];//String f_username;//用户姓名/单位名称
+            note = note + annotation + ", ";
+        }
+        //debug
+        //System.out.println(note);
+        notes = note.split(", ");
+
+        for (int i = 0; i < arr.length; i++) {
+            System.out.println("      \""+arr[i]+"\":\""+notes[i]+"\",");
+//            System.out.println("/** " + notes[i] + " */");
+//            System.out.println("@Excel(name = \"" + notes[i] + "\" )");
+//            System.out.println("private String " + arr[i] + ";");
+//            System.out.println();
+        }
+    }
 }

+ 28 - 0
test-api/src/main/java/com/sooka/mapper/Guiji_City_Real_Estate_Mapper2.java

@@ -4,6 +4,8 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.sooka.model.bo.*;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 @DS("db5")
 public interface Guiji_City_Real_Estate_Mapper2 {
@@ -83,4 +85,30 @@ public interface Guiji_City_Real_Estate_Mapper2 {
     public void add_guiji_real_estate_contract_check_out(Guiji_City_Real_Estate25_contract_check_out_Bean bean);
     public void update_guiji_real_estate_contract_check_out(Guiji_City_Real_Estate25_contract_check_out_Bean bean);
 
+
+    public List<Guiji_City_Real_Estate1_housing_initial_Bean> select_real_estate_housing_initial(Guiji_City_Real_Estate1_housing_initial_Bean bean);
+    public List<Guiji_City_Real_Estate2_housing_stock_Bean> select_real_estate_housing_stock(Guiji_City_Real_Estate2_housing_stock_Bean bean);
+    public List<Guiji_City_Real_Estate3_housing_commercial_Bean> select_real_estate_housing_commercial(Guiji_City_Real_Estate3_housing_commercial_Bean bean);
+    public List<Guiji_City_Real_Estate4_housing_relocation_Bean> select_real_estate_housing_relocation(Guiji_City_Real_Estate4_housing_relocation_Bean bean);
+    public List<Guiji_City_Real_Estate5_mortgage_general_Bean> select_real_estate_mortgage_general(Guiji_City_Real_Estate5_mortgage_general_Bean bean);
+    public List<Guiji_City_Real_Estate6_mortgage_business_Bean> select_real_estate_mortgage_business(Guiji_City_Real_Estate6_mortgage_business_Bean bean);
+    public List<Guiji_City_Real_Estate7_mortgage_construction_Bean> select_real_estate_mortgage_construction(Guiji_City_Real_Estate7_mortgage_construction_Bean bean);
+    public List<Guiji_City_Real_Estate8_mortgage_change_Bean> select_real_estate_mortgage_change(Guiji_City_Real_Estate8_mortgage_change_Bean bean);
+    public List<Guiji_City_Real_Estate9_mortgage_cancel_Bean> select_real_estate_mortgage_cancel(Guiji_City_Real_Estate9_mortgage_cancel_Bean bean);
+    public List<Guiji_City_Real_Estate10_estate_unseal_Bean> select_real_estate_unseal(Guiji_City_Real_Estate10_estate_unseal_Bean bean);
+    public List<Guiji_City_Real_Estate11_pre_order_cancel_notice_Bean> select_real_estate_pre_order_cancel_notice(Guiji_City_Real_Estate11_pre_order_cancel_notice_Bean bean);
+    public List<Guiji_City_Real_Estate12_pre_order_cancel_mortgage_Bean> select_real_estate_pre_order_cancel_mortgage(Guiji_City_Real_Estate12_pre_order_cancel_mortgage_Bean bean);
+    public List<Guiji_City_Real_Estate13_file_additional_Bean> select_real_estate_file_additional(Guiji_City_Real_Estate13_file_additional_Bean bean);
+    public List<Guiji_City_Real_Estate14_pre_sale_Bean> select_real_estate_pre_sale(Guiji_City_Real_Estate14_pre_sale_Bean bean);
+    public List<Guiji_City_Real_Estate15_pre_sale_change_Bean> select_real_estate_pre_sale_change(Guiji_City_Real_Estate15_pre_sale_change_Bean bean);
+    public List<Guiji_City_Real_Estate16_on_sale_Bean> select_real_estate_on_sale(Guiji_City_Real_Estate16_on_sale_Bean bean);
+    public List<Guiji_City_Real_Estate17_on_sale_change_Bean> select_real_estate_on_sale_change(Guiji_City_Real_Estate17_on_sale_change_Bean bean);
+    public List<Guiji_City_Real_Estate18_pre_to_on_Bean> select_real_estate_pre_to_on(Guiji_City_Real_Estate18_pre_to_on_Bean bean);
+    public List<Guiji_City_Real_Estate19_pre_sale_record_Bean> select_real_estate_pre_sale_record(Guiji_City_Real_Estate19_pre_sale_record_Bean bean);
+    public List<Guiji_City_Real_Estate20_pre_sale_record_change_Bean> select_real_estate_pre_sale_record_change(Guiji_City_Real_Estate20_pre_sale_record_change_Bean bean);
+    public List<Guiji_City_Real_Estate21_on_sale_record_Bean> select_real_estate_on_sale_record(Guiji_City_Real_Estate21_on_sale_record_Bean bean);
+    public List<Guiji_City_Real_Estate22_on_sale_record_change_Bean> select_real_estate_on_sale_record_change(Guiji_City_Real_Estate22_on_sale_record_change_Bean bean);
+    public List<Guiji_City_Real_Estate23_pre_sale_additional_Bean> select_real_estate_pre_sale_additional(Guiji_City_Real_Estate23_pre_sale_additional_Bean bean);
+    public List<Guiji_City_Real_Estate24_record_additional_Bean> select_real_estate_record_additional(Guiji_City_Real_Estate24_record_additional_Bean bean);
+    public List<Guiji_City_Real_Estate25_contract_check_out_Bean> select_real_estate_contract_check_out(Guiji_City_Real_Estate25_contract_check_out_Bean bean);
 }

+ 9 - 0
test-api/src/main/java/com/sooka/mapper/Guiji_Funeral_Mapper2.java

@@ -4,6 +4,8 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.sooka.model.bo.*;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 @DS("db6")
 public interface Guiji_Funeral_Mapper2 {
@@ -25,4 +27,11 @@ public interface Guiji_Funeral_Mapper2 {
 
     public void add_guiji_funeral6(Guiji_funeral6_ashes_remove_Bean bean);
     public void update_guiji_funeral6(Guiji_funeral6_ashes_remove_Bean bean);
+
+    public List<Guiji_funeral1_the_dead_Bean> select_funeral_the_dead(Guiji_funeral1_the_dead_Bean bean);
+    public List<Guiji_funeral2_pay_Bean> select_funeral_pay(Guiji_funeral2_pay_Bean bean);
+    public List<Guiji_funeral3_freeze_Bean> select_funeral_freeze(Guiji_funeral3_freeze_Bean bean);
+    public List<Guiji_funeral4_ashes_storage_Bean> select_funeral_ashes_storage(Guiji_funeral4_ashes_storage_Bean bean);
+    public List<Guiji_funeral5_ashes_renew_Bean> select_funeral_ashes_renew(Guiji_funeral5_ashes_renew_Bean bean);
+    public List<Guiji_funeral6_ashes_remove_Bean> select_funeral_ashes_remove(Guiji_funeral6_ashes_remove_Bean bean);
 }

+ 19 - 0
test-api/src/main/java/com/sooka/mapper/Guiji_Gas_Mapper2.java

@@ -4,6 +4,8 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.sooka.model.bo.*;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 @DS("db5")
 public interface Guiji_Gas_Mapper2 {
@@ -47,4 +49,21 @@ public interface Guiji_Gas_Mapper2 {
     public void add_guiji_gas_XinKer_disposition_info(Guiji_gas16_XinKer_disposition_info_Bean bean);
     public void update_guiji_gas_XinKer_disposition_info(Guiji_gas16_XinKer_disposition_info_Bean bean);
 
+    public List<Guiji_gas1_Zenner_user_infor_Bean> select_gas_Zenner_user_infor(Guiji_gas1_Zenner_user_infor_Bean bean);
+    public List<Guiji_gas2_Zenner_gas_meter_infor_Bean> select_gas_Zenner_gas_meter_infor(Guiji_gas2_Zenner_gas_meter_infor_Bean bean);
+    public List<Guiji_gas3_Zenner_gas_purchase_infor_Bean> select_gas_Zenner_gas_purchase_infor(Guiji_gas3_Zenner_gas_purchase_infor_Bean bean);
+    public List<Guiji_gas4_Zenner_meter_reading_infor_Bean> select_gas_Zenner_meter_reading_infor(Guiji_gas4_Zenner_meter_reading_infor_Bean bean);
+    public List<Guiji_gas3_Zenner_gas_purchase_infor_Bean> select_gas_Zenner_gas_purchase_center_infor(Guiji_gas3_Zenner_gas_purchase_infor_Bean bean);
+    public List<Guiji_gas5_Aofe_user_infor_Bean> select_gas_Aofe_user_infor(Guiji_gas5_Aofe_user_infor_Bean bean);
+    public List<Guiji_gas6_Aofe_gas_meter_infor_Bean> select_gas_Aofe_gas_meter_infor(Guiji_gas6_Aofe_gas_meter_infor_Bean bean);
+    public List<Guiji_gas7_Aofe_gas_purchase_infor_Bean> select_gas_Aofe_gas_purchase_infor(Guiji_gas7_Aofe_gas_purchase_infor_Bean bean);
+    public List<Guiji_gas8_Aofe_meter_reading_infor_Bean> select_gas_Aofe_meter_reading_infor(Guiji_gas8_Aofe_meter_reading_infor_Bean bean);
+    public List<Guiji_gas9_qinchuan_user_infor_Bean> select_gas_qinchuan_user_infor(Guiji_gas9_qinchuan_user_infor_Bean bean);
+    public List<Guiji_gas10_SC_user_infor_Bean> select_gas_SC_user_infor(Guiji_gas10_SC_user_infor_Bean bean);
+    public List<Guiji_gas11_SC_gas_meter_infor_Bean> select_gas_SC_gas_meter_infor(Guiji_gas11_SC_gas_meter_infor_Bean bean);
+    public List<Guiji_gas12_SC_gas_purchase_infor_Bean> select_gas_SC_gas_purchase_infor(Guiji_gas12_SC_gas_purchase_infor_Bean bean);
+    public List<Guiji_gas13_SC_meter_reading_infor_Bean> select_gas_SC_meter_reading_infor(Guiji_gas13_SC_meter_reading_infor_Bean bean);
+    public List<Guiji_gas14_XinKer_user_infor_Bean> select_gas_XinKer_user_infor(Guiji_gas14_XinKer_user_infor_Bean bean);
+    public List<Guiji_gas15_XinKer_acceptance_infor_Bean> select_gas_XinKer_acceptance_infor(Guiji_gas15_XinKer_acceptance_infor_Bean bean);
+    public List<Guiji_gas16_XinKer_disposition_info_Bean> select_gas_XinKer_disposition_infor(Guiji_gas16_XinKer_disposition_info_Bean bean);
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.sooka.model.bo.*;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 @DS("db7")
 public interface Guiji_Medicine_Mapper2 {
@@ -20,5 +22,8 @@ public interface Guiji_Medicine_Mapper2 {
     public void add_guiji_medicine_dept_data4(Guiji_medicine_dept_data4_Bean bean);
     public void update_guiji_medicine_dept_data4(Guiji_medicine_dept_data4_Bean bean);
 
-
+    public List<Guiji_medicine_dept_data_Bean> select_1(Guiji_medicine_dept_data_Bean bean);
+    public List<Guiji_medicine_dept_data2_Bean> select_2(Guiji_medicine_dept_data2_Bean bean);
+    public List<Guiji_medicine_dept_data3_Bean> select_3(Guiji_medicine_dept_data3_Bean bean);
+    public List<Guiji_medicine_dept_data4_Bean> select_4(Guiji_medicine_dept_data4_Bean bean);
 }

+ 20 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate10_estate_unseal_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,23 +11,42 @@ public class Guiji_City_Real_Estate10_estate_unseal_Bean extends BaseBean_Guiji
 
     String str;
 
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String CFJG;//查封机关
+    @Expose
     String CFWH;//查封文号
+    @Expose
     String CFRQ;//查封日期
+    @Expose
     String CFQX;//查封期限
+    @Expose
     String CFQSRQ;//查封起始日期
+    @Expose
     String CFZZRQ;//查封终止日期
+    @Expose
     String JFJG;//解封机关
+    @Expose
     String JFWH;//解封文号
+    @Expose
     String JFRQ;//解封日期
+    @Expose
     String BXZR;//被限制人
+    @Expose
     String BXZRZJHM;//被限制人证件号码
+    @Expose
     String QZH;//权证号
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String FWYT;//房屋用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String JZMJ;//建筑面积
+    @Expose
     String ZL;//坐落
 }

+ 15 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate11_pre_order_cancel_notice_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,18 +11,32 @@ public class Guiji_City_Real_Estate11_pre_order_cancel_notice_Bean extends BaseB
 
     String str;
 
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String QLR;//权利人
+    @Expose
     String QLRZJHM;//权利人证件号码
+    @Expose
     String YWR;//义务人
+    @Expose
     String YWRZJHM;//义务人证件号码
+    @Expose
     String HTH;//合同号
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String FWYT;//房屋用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String JZMJ;//建筑面积
+    @Expose
     String ZL;//坐落
+    @Expose
     String ZXYY;//注销原因
+    @Expose
     String YYGDJZMH;//原预告登记证明号
 }

+ 23 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate12_pre_order_cancel_mortgage_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,26 +11,48 @@ public class Guiji_City_Real_Estate12_pre_order_cancel_mortgage_Bean extends Bas
 
     String str;
 
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String ZWLXQXQ;//债务履行期限起
+    @Expose
     String ZWLXXZ;//债务履行限止
+    @Expose
     String DYLX;//抵押类型
+    @Expose
     String ZZQE;//主债权额
+    @Expose
     String FWJZ;//房屋价值
+    @Expose
     String DBFW;//担保范围
+    @Expose
     String DYHTBH;//抵押合同编号
+    @Expose
     String DYQR;//抵押权人
+    @Expose
     String DYQRZJHM;//抵押权人证件号码
+    @Expose
     String DYR;//抵押人
+    @Expose
     String DYRZJHM;//抵押人证件号码
+    @Expose
     String ZWR;//债务人
+    @Expose
     String ZWRZJHM;//债务人证件号码
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String FWYT;//房屋用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String JZMJ;//建筑面积
+    @Expose
     String ZL;//坐落
+    @Expose
     String ZXYY;//注销原因
+    @Expose
     String YYGDJZMH;//原预告登记证明号
 }

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

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,13 +11,22 @@ public class Guiji_City_Real_Estate13_file_additional_Bean extends BaseBean_Guij
 
     String str;
 
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String LicenseID;//证号
+    @Expose
     String ZHLX;//证号类型
+    @Expose
     String SYQR;//所有权人
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String ZJMJ;//建筑面积
+    @Expose
     String GHYT;//规划用途
+    @Expose
     String FWXZ;//房屋性质
 }

+ 17 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate14_pre_sale_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,20 +11,36 @@ public class Guiji_City_Real_Estate14_pre_sale_Bean extends BaseBean_Guiji {
 
     String str;
 
+    @Expose
     String YSZH;//预售证号
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String QYMC;//企业名称
+    @Expose
     String XMMC;//项目名称
+    @Expose
     String XMBH;//项目编号
+    @Expose
     String JGYH;//监管银行
+    @Expose
     String JGZH;//监管账号
+    @Expose
     String YSMJ;//预售面积
+    @Expose
     String TS;//套数
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String MJ;//面积
+    @Expose
     String YSDJ;//预售单价
+    @Expose
     String GHYT;//规划用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String SPSJ;//审批时间
 }

+ 17 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate15_pre_sale_change_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,20 +11,36 @@ public class Guiji_City_Real_Estate15_pre_sale_change_Bean extends BaseBean_Guij
 
     String str;
 
+    @Expose
     String YSZH;//预售证号
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String QYMC;//企业名称
+    @Expose
     String XMMC;//项目名称
+    @Expose
     String XMBH;//项目编号
+    @Expose
     String JGYH;//监管银行
+    @Expose
     String JGZH;//监管账号
+    @Expose
     String YSMJ;//预售面积
+    @Expose
     String TS;//套数
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String MJ;//面积
+    @Expose
     String YSDJ;//预售单价
+    @Expose
     String GHYT;//规划用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String SPSJ;//审批时间
 }

+ 17 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate16_on_sale_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,20 +11,36 @@ public class Guiji_City_Real_Estate16_on_sale_Bean extends BaseBean_Guiji {
 
     String str;
 
+    @Expose
     String XSBAZMH;//现售备案证明号
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String QYMC;//企业名称
+    @Expose
     String XMMC;//项目名称
+    @Expose
     String XMBH;//项目编号
+    @Expose
     String JGYH;//监管银行
+    @Expose
     String JGZH;//监管账号
+    @Expose
     String YSMJ;//预售面积
+    @Expose
     String TS;//套数
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String MJ;//面积
+    @Expose
     String YSDJ;//预售单价
+    @Expose
     String GHYT;//规划用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String SPSJ;//审批时间
 }

+ 17 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate17_on_sale_change_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,20 +11,36 @@ public class Guiji_City_Real_Estate17_on_sale_change_Bean extends BaseBean_Guiji
 
     String str;
 
+    @Expose
     String XSBAZMH;//现售备案证明号
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String QYMC;//企业名称
+    @Expose
     String XMMC;//项目名称
+    @Expose
     String XMBH;//项目编号
+    @Expose
     String JGYH;//监管银行
+    @Expose
     String JGZH;//监管账号
+    @Expose
     String YSMJ;//预售面积
+    @Expose
     String TS;//套数
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String MJ;//面积
+    @Expose
     String YSDJ;//预售单价
+    @Expose
     String GHYT;//规划用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String SPSJ;//审批时间
 }

+ 17 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate18_pre_to_on_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,20 +11,36 @@ public class Guiji_City_Real_Estate18_pre_to_on_Bean extends BaseBean_Guiji {
 
     String str;
 
+    @Expose
     String XSBAZMH;//现售备案证明号
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String QYMC;//企业名称
+    @Expose
     String XMMC;//项目名称
+    @Expose
     String XMBH;//项目编号
+    @Expose
     String JGYH;//监管银行
+    @Expose
     String JGZH;//监管账号
+    @Expose
     String YSMJ;//预售面积
+    @Expose
     String TS;//套数
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String MJ;//面积
+    @Expose
     String YSDJ;//预售单价
+    @Expose
     String GHYT;//规划用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String SPSJ;//审批时间
 }

+ 20 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate19_pre_sale_record_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,23 +11,42 @@ public class Guiji_City_Real_Estate19_pre_sale_record_Bean extends BaseBean_Guij
 
     String str;
 
+    @Expose
     String HTH;//合同号
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String CMRXM;//出卖人姓名
+    @Expose
     String MSRXM;//买受人姓名
+    @Expose
     String SFZLX;//身份证类型
+    @Expose
     String SFZH;//身份证号
+    @Expose
     String LXDZ;//联系地址
+    @Expose
     String FWZL;//房屋坐落
+    @Expose
     String HTZJ;//合同总价
+    @Expose
     String JZMJ;//建筑面积
+    @Expose
     String TNMJ;//套内面积
+    @Expose
     String FTMJ;//分摊面积
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String FWYT;//房屋用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String ZL;//坐落
+    @Expose
     String QYSJ;//签约时间
+    @Expose
     String BASJ;//备案时间
 }

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

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,13 +11,22 @@ public class Guiji_City_Real_Estate1_housing_initial_Bean extends BaseBean_Guiji
 
     String str;
 
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String LicenseID;//证号
+    @Expose
     String ZHLX;//证号类型
+    @Expose
     String SYQR;//所有权人
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String ZJMJ;//建筑面积
+    @Expose
     String GHYT;//规划用途
+    @Expose
     String FWXZ;//房屋性质
 }

+ 21 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate20_pre_sale_record_change_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,24 +11,44 @@ public class Guiji_City_Real_Estate20_pre_sale_record_change_Bean extends BaseBe
 
     String str;
 
+    @Expose
     String HTH;//合同号
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String CMRXM;//出卖人姓名
+    @Expose
     String MSRXM;//买受人姓名
+    @Expose
     String SFZLX;//身份证类型
+    @Expose
     String SFZH;//身份证号
+    @Expose
     String LXDZ;//联系地址
+    @Expose
     String FWZL;//房屋坐落
+    @Expose
     String HTZJ;//合同总价
+    @Expose
     String JZMJ;//建筑面积
+    @Expose
     String TNMJ;//套内面积
+    @Expose
     String FTMJ;//分摊面积
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String FWYT;//房屋用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String ZL;//坐落
+    @Expose
     String HTRQ;//合同日期
+    @Expose
     String BGYY;//变更原因
+    @Expose
     String SPSJ;//审批时间
 }

+ 19 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate21_on_sale_record_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,22 +11,40 @@ public class Guiji_City_Real_Estate21_on_sale_record_Bean extends BaseBean_Guiji
 
     String str;
 
+    @Expose
     String HTH;//合同号
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String CMRXM;//出卖人姓名
+    @Expose
     String MSRXM;//买受人姓名
+    @Expose
     String SFZLX;//身份证类型
+    @Expose
     String SFZH;//身份证号
+    @Expose
     String LXDZ;//联系地址
+    @Expose
     String FWZL;//房屋坐落
+    @Expose
     String HTZJ;//合同总价
+    @Expose
     String JZMJ;//建筑面积
+    @Expose
     String TNMJ;//套内面积
+    @Expose
     String FTMJ;//分摊面积
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String FWYT;//房屋用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String QYSJ;//签约时间
+    @Expose
     String BASJ;//备案时间
 }

+ 20 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate22_on_sale_record_change_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,23 +11,42 @@ public class Guiji_City_Real_Estate22_on_sale_record_change_Bean extends BaseBea
 
     String str;
 
+    @Expose
     String HTH;//合同号
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String CMRXM;//出卖人姓名
+    @Expose
     String MSRXM;//买受人姓名
+    @Expose
     String SFZLX;//身份证类型
+    @Expose
     String SFZH;//身份证号
+    @Expose
     String LXDZ;//联系地址
+    @Expose
     String FWZL;//房屋坐落
+    @Expose
     String HTZJ;//合同总价
+    @Expose
     String JZMJ;//建筑面积
+    @Expose
     String TNMJ;//套内面积
+    @Expose
     String FTMJ;//分摊面积
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String FWYT;//房屋用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String HTRQ;//合同日期
+    @Expose
     String BGYY;//变更原因
+    @Expose
     String SPSJ;//审批时间
 }

+ 17 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate23_pre_sale_additional_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,20 +11,36 @@ public class Guiji_City_Real_Estate23_pre_sale_additional_Bean extends BaseBean_
 
     String str;
 
+    @Expose
     String YSZH;//预售证号
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String QYMC;//企业名称
+    @Expose
     String XMMC;//项目名称
+    @Expose
     String XMBH;//项目编号
+    @Expose
     String JGYH;//监管银行
+    @Expose
     String JGZH;//监管账号
+    @Expose
     String YSMJ;//预售面积
+    @Expose
     String TS;//套数
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String MJ;//面积
+    @Expose
     String YSDJ;//预售单价
+    @Expose
     String GHYT;//规划用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String SPSJ;//审批时间
 }

+ 19 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate24_record_additional_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,23 +11,41 @@ public class Guiji_City_Real_Estate24_record_additional_Bean extends BaseBean_Gu
 
     String str;
 
+    @Expose
     String HTH;//合同号
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String CMRXM;//出卖人姓名
+    @Expose
     String MSRXM;//买受人姓名
+    @Expose
     String SFZLX;//身份证类型
+    @Expose
     String SFZH;//身份证号
+    @Expose
     String LXDZ;//联系地址
+    @Expose
     String FWZL;//房屋坐落
+    @Expose
     String HTZJ;//合同总价
+    @Expose
     String JZMJ;//建筑面积
+    @Expose
     String TNMJ;//套内面积
+    @Expose
     String FTMJ;//分摊面积
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String FWYT;//房屋用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String ZL;//坐落
+    @Expose
     String HTSJ;//合同时间
+    @Expose
     String BASJ;//备案时间
 }

+ 20 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate25_contract_check_out_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,23 +11,42 @@ public class Guiji_City_Real_Estate25_contract_check_out_Bean extends BaseBean_G
 
     String str;
 
+    @Expose
     String HTH;//合同号
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String MSRXM;//买受人姓名
+    @Expose
     String SFZLX;//身份证类型
+    @Expose
     String SFZH;//身份证号
+    @Expose
     String LXDZ;//联系地址
+    @Expose
     String FWZL;//房屋坐落
+    @Expose
     String HTZJ;//合同总价
+    @Expose
     String JZMJ;//建筑面积
+    @Expose
     String TNMJ;//套内面积
+    @Expose
     String FTMJ;//分摊面积
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String FWYT;//房屋用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String ZL;//坐落
+    @Expose
     String HTRQ;//合同日期
+    @Expose
     String ZXYY;//注销原因
+    @Expose
     String ZXRQ;//注销日期
 }

+ 20 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate2_housing_stock_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,23 +11,42 @@ public class Guiji_City_Real_Estate2_housing_stock_Bean extends BaseBean_Guiji {
 
     String str;
 
+    @Expose
     String HTH;//合同号
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String CSRXM;//出售人姓名
+    @Expose
     String MSRXM;//买受人姓名
+    @Expose
     String SFZLX;//身份证类型
+    @Expose
     String SFZH;//身份证号
+    @Expose
     String LXDZ;//联系地址
+    @Expose
     String FWZL;//房屋坐落
+    @Expose
     String HTZJ;//合同总价
+    @Expose
     String ZJMJ;//建筑面积
+    @Expose
     String JYMJ;//交易面积
+    @Expose
     String CQZH;//产权证号
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String GHYT;//规划用途
+    @Expose
     String TNMJ;//套内面积
+    @Expose
     String GTMJ;//公摊面积
+    @Expose
     String QYSJ;//签约时间
+    @Expose
     String BASJ;//备案时间
 }

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

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,22 +11,44 @@ public class Guiji_City_Real_Estate3_housing_commercial_Bean extends BaseBean_Gu
 
     String str;
 
+    @Expose
     String HTH;//合同号
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String CSRXM;//出卖人姓名
+    @Expose
     String MSRXM;//买受人姓名
+    @Expose
     String SFZLX;//身份证类型
+    @Expose
     String SFZH;//身份证号
+    @Expose
     String LXDZ;//联系地址
+    @Expose
     String FWZL;//房屋坐落
+    @Expose
     String HTZJ;//合同总价
+    @Expose
     String ZJMJ;//建筑面积
+    @Expose
     String TNMJ;//套内面积
+    @Expose
     String FTMJ;//分摊面积
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
-    String FWYT;//房屋用途
+    @Expose
+    String FWYT;//房屋
+    @Expose// 用途
     String FWXZ;//房屋性质
+    @Expose
     String QYSJ;//签约时间
+    @Expose
     String BASJ;//备案时间
+    @Expose
+    String CMRSFZLX;//出卖人身份证类型
+    @Expose
+    String CMRSFZH;//出卖人身份证号
 }

+ 19 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate4_housing_relocation_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,22 +11,40 @@ public class Guiji_City_Real_Estate4_housing_relocation_Bean extends BaseBean_Gu
 
     String str;
 
+    @Expose
     String HTH;//合同号
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String CSRXM;//出卖人姓名
+    @Expose
     String MSRXM;//买受人姓名
+    @Expose
     String SFZLX;//身份证类型
+    @Expose
     String SFZH;//身份证号
+    @Expose
     String LXDZ;//联系地址
+    @Expose
     String FWZL;//房屋坐落
+    @Expose
     String HTZJ;//合同总价
+    @Expose
     String ZJMJ;//建筑面积
+    @Expose
     String TNMJ;//套内面积
+    @Expose
     String FTMJ;//分摊面积
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String FWYT;//房屋用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String QYSJ;//签约时间
+    @Expose
     String BASJ;//备案时间
 }

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

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,25 +11,46 @@ public class Guiji_City_Real_Estate5_mortgage_general_Bean extends BaseBean_Guij
 
     String str;
 
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String ZWLXQXQ;//债务履行期限起
+    @Expose
     String ZWLXQXZ;//债务履行期限止
+    @Expose
     String DYLX;//抵押类型
+    @Expose
     String ZZQE;//主债权额
+    @Expose
     String FWJZ;//房屋价值
+    @Expose
     String DBFW;//担保范围
+    @Expose
     String DYHTBH;//抵押合同编号
+    @Expose
     String DYQR;//抵押权人
+    @Expose
     String DYQRZJHM;//抵押权人证件号码
+    @Expose
     String DYR;//抵押人
+    @Expose
     String DYRZJHM;//抵押人证件号码
+    @Expose
     String ZWR;//债务人
+    @Expose
     String ZWRZJHM;//债务人证件号码
+    @Expose
     String TXQZH;//他项权证号(登记证明号)
+    @Expose
     String SYQZH;//所有权证号
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String FWYT;//房屋用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String JZMJ;//建筑面积
 }

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

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,25 +11,46 @@ public class Guiji_City_Real_Estate6_mortgage_business_Bean extends BaseBean_Gui
 
     String str;
 
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String ZWLXQXQ;//债务履行期限起
+    @Expose
     String ZWLXQXZ;//债务履行期限止
+    @Expose
     String DYLX;//抵押类型
+    @Expose
     String ZZQE;//主债权额
+    @Expose
     String FWJZ;//房屋价值
+    @Expose
     String DBFW;//担保范围
+    @Expose
     String DYHTBH;//抵押合同编号
+    @Expose
     String DYQR;//抵押权人
+    @Expose
     String DYQRZJHM;//抵押权人证件号码
+    @Expose
     String DYR;//抵押人
+    @Expose
     String DYRZJHM;//抵押人证件号码
+    @Expose
     String ZWR;//债务人
+    @Expose
     String ZWRZJHM;//债务人证件号码
+    @Expose
     String TXQZH;//他项权证号(登记证明号)
+    @Expose
     String SYQZH;//所有权证号
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String FWYT;//房屋用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String JZMJ;//建筑面积
 }

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

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,25 +11,46 @@ public class Guiji_City_Real_Estate7_mortgage_construction_Bean extends BaseBean
 
     String str;
 
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String ZWLXQXQ;//债务履行期限起
+    @Expose
     String ZWLXQXZ;//债务履行期限止
+    @Expose
     String DYLX;//抵押类型
+    @Expose
     String ZZQE;//主债权额
+    @Expose
     String FWJZ;//房屋价值
+    @Expose
     String DBFW;//担保范围
+    @Expose
     String DYHTBH;//抵押合同编号
+    @Expose
     String DYQR;//抵押权人
+    @Expose
     String DYQRZJHM;//抵押权人证件号码
+    @Expose
     String DYR;//抵押人
+    @Expose
     String DYRZJHM;//抵押人证件号码
+    @Expose
     String ZWR;//债务人
+    @Expose
     String ZWRZJHM;//债务人证件号码
+    @Expose
     String TXQZH;//他项权证号(登记证明号)
+    @Expose
     String LPBH;//楼盘编号
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String FWYT;//房屋用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String JZMJ;//建筑面积
 }

+ 24 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate8_mortgage_change_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,27 +11,50 @@ public class Guiji_City_Real_Estate8_mortgage_change_Bean extends BaseBean_Guiji
 
     String str;
 
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String ZWLXQXQ;//债务履行期限起
+    @Expose
     String ZWLXQXZ;//债务履行期限止
+    @Expose
     String DYLX;//抵押类型
+    @Expose
     String ZZQE;//主债权额
+    @Expose
     String FWJZ;//房屋价值
+    @Expose
     String DBFW;//担保范围
+    @Expose
     String DYHTBH;//抵押合同编号
+    @Expose
     String DYQR;//抵押权人
+    @Expose
     String DYQRZJHM;//抵押权人证件号码
+    @Expose
     String DYR;//抵押人
+    @Expose
     String DYRZJHM;//抵押人证件号码
+    @Expose
     String ZWR;//债务人
+    @Expose
     String ZWRZJHM;//债务人证件号码
+    @Expose
     String TXQZH;//他项权证号(登记证明号)
+    @Expose
     String SYQZH;//所有权证号
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String FWYT;//房屋用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String JZMJ;//建筑面积
+    @Expose
     String YTXQZH;//原他项权证号(登记证明号)
+    @Expose
     String BGYY;//变更原因
 }

+ 25 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_City_Real_Estate9_mortgage_cancel_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,28 +11,52 @@ public class Guiji_City_Real_Estate9_mortgage_cancel_Bean extends BaseBean_Guiji
 
     String str;
 
+    @Expose
     String YWZH;//业务宗号
+    @Expose
     String ZWLXQXQ;//债务履行期限起
+    @Expose
     String ZWLXQXZ;//债务履行期限止
+    @Expose
     String DYLX;//抵押类型
+    @Expose
     String ZZQE;//主债权额
+    @Expose
     String FWJZ;//房屋价值
+    @Expose
     String DBFW;//担保范围
+    @Expose
     String DYHTBH;//抵押合同编号
+    @Expose
     String DYQR;//抵押权人
+    @Expose
     String DYQRZJHM;//抵押权人证件号码
+    @Expose
     String DYR;//抵押人
+    @Expose
     String DYRZJHM;//抵押人证件号码
+    @Expose
     String ZWR;//债务人
+    @Expose
     String ZWRZJHM;//债务人证件号码
+    @Expose
     String TXQZH;//他项权证号(登记证明号)
+    @Expose
     String SYQZH;//所有权证号
+    @Expose
     String ZH;//幢号
+    @Expose
     String FH;//房号
+    @Expose
     String FWYT;//房屋用途
+    @Expose
     String FWXZ;//房屋性质
+    @Expose
     String ZL;//坐落
+    @Expose
     String JZMJ;//建筑面积
+    @Expose
     String ZXYY;//注销原因
+    @Expose
     String YTXQZH;//原他项权证号
 }

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

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,27 +10,47 @@ import lombok.Setter;
 public class Guiji_funeral1_the_dead_Bean extends BaseBean_Guiji {
 
     String str;
-
+    @Expose
     String BNO;//业务条码
+    @Expose
     String DNAME;//逝者姓名
+    @Expose
     String DSFZH;//身份证号
+    @Expose
     String DSEX;//性别
+    @Expose
     String DMZ;//民族
+    @Expose
     String DAGE;//年龄
+    @Expose
     String BIRTH;//出生日期
+    @Expose
     String DHJLY;//户籍来源
+    @Expose
     String DXZQH;//发证机关
+    @Expose
     String ADDRESS;//籍贯或家庭住址
+    @Expose
     String DTIME;//死亡时间
+    @Expose
     String DREASON;//死亡原因
+    @Expose
     String DADDRESS;//死亡地点
+    @Expose
     String HHSJ;//火化时间
+    @Expose
     String RELATIONSHIP;//与死者关系
+    @Expose
     String LINKMAN;//联系人
+    @Expose
     String LINKMANPHONE;//联系人电话
+    @Expose
     String LINKMANADDRESS;//联系人地址
+    @Expose
     String OPERTM;//登记时间
+    @Expose
     String OPERID;//登记人
+    @Expose
     String OPERDW;//登记单位
 
 

+ 21 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_funeral2_pay_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,25 +10,45 @@ import lombok.Setter;
 public class Guiji_funeral2_pay_Bean extends BaseBean_Guiji {
 
     String str;
+    @Expose
     String BNO;//业务条码
+    @Expose
     String DNAME;//逝者姓名
+    @Expose
     String DSEX;//性别
+    @Expose
     String DAGE;//年龄
+    @Expose
     String DMZ;//民族
+    @Expose
     String DSFZH;//身份证号
+    @Expose
     String ADDRESS;//户籍住址
+    @Expose
     String DTIME;//死亡时间
+    @Expose
     String LINKMAN;//联系人
+    @Expose
     String LINKMANPHONE;//联系电话
+    @Expose
     String JMTYPE;//减免项目(低保减免套餐、两区减免套餐、遗体接运、遗体火化、遗体停放、骨灰寄存)
+    @Expose
     String NO;//序号
+    @Expose
     String ITEMTYPE;//费用类型
+    @Expose
     String ITEMNAME;//项目名称
+    @Expose
     String PRICE;//单价(元)
+    @Expose
     String ITEMCOUNT;//数量
+    @Expose
     String SUMMONEY;//金额
+    @Expose
     String OPERTM;//登记时间(YYYY-MM-DD HH:MM)
+    @Expose
     String OPERID;//登记人
+    @Expose
     String OPERDW;//登记单位
 
 //    BNO, DNAME, DSEX, DAGE, DMZ, DSFZH, ADDRESS, DTIME, LINKMAN, LINKMANPHONE, JMTYPE, NO, ITEMTYPE, ITEMNAME, PRICE, ITEMCOUNT, SUMMONEY, OPERTM, OPERID, OPERDW

+ 20 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_funeral3_freeze_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,24 +10,43 @@ import lombok.Setter;
 public class Guiji_funeral3_freeze_Bean extends BaseBean_Guiji {
 
     String str;
+    @Expose
     String BNO;//业务条码
+    @Expose
     String DNAME;//逝者姓名
+    @Expose
     String DSEX;//性别
+    @Expose
     String DAGE;//年龄
+    @Expose
     String DMZ;//民族
+    @Expose
     String DSFZH;//身份证号
+    @Expose
     String ADDRESS;//户籍住址
+    @Expose
     String DTIME;//死亡时间
+    @Expose
     String LCJNAME;//冷冻间
+    @Expose
     String STARTTM;//开始时间
+    @Expose
     String ENDTM;//结束时间
+    @Expose
     String DAYS;//天数
+    @Expose
     String JSMONEY;//结算金额
+    @Expose
     String YJMONEY;//预存金额
+    @Expose
     String LINKMAN;//联系人
+    @Expose
     String LINKMANPHONE;//联系电话
+    @Expose
     String OPERTM;//登记时间(YYYY-MM-DD HH:MM)
+    @Expose
     String OPERID;//登记人
+    @Expose
     String OPERDW;//登记单位
 
 //    BNO, DNAME, DSEX, DAGE, DMZ, DSFZH, ADDRESS, DTIME, LCJNAME, STARTTM, ENDTM, DAYS, JSMONEY, YJMONEY, LINKMAN, LINKMANPHONE, OPERTM, OPERID, OPERDW

+ 19 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_funeral4_ashes_storage_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,23 +10,41 @@ import lombok.Setter;
 public class Guiji_funeral4_ashes_storage_Bean extends BaseBean_Guiji {
 
     String str;
+    @Expose
     String BNO;//业务条码
+    @Expose
     String DNAME;//逝者姓名
+    @Expose
     String DSEX;//性别
+    @Expose
     String DAGE;//年龄
+    @Expose
     String DMZ;//民族
+    @Expose
     String DSFZH;//身份证号
+    @Expose
     String ADDRESS;//户籍住址
+    @Expose
     String DTIME;//死亡时间
+    @Expose
     String JCGNAME;//寄存格号
+    @Expose
     String STARTTM;//寄存开始时间
+    @Expose
     String ENDTM;//寄存结束时间
+    @Expose
     String LINKMAN;//联系人
+    @Expose
     String LINKMANSFZH;//身份证
+    @Expose
     String RELATIONSHIP;//与逝者关系
+    @Expose
     String LINKMANPHONE;//联系电话
+    @Expose
     String OPERTM;//登记时间(YYYY-MM-DD HH:MM)
+    @Expose
     String OPERID;//登记人
+    @Expose
     String OPERDW;//登记单位
 
 //    BNO, DNAME, DSEX, DAGE, DMZ, DSFZH, ADDRESS, DTIME, JCGNAME, STARTTM, ENDTM, LINKMAN, LINKMANSFZH, RELATIONSHIP, LINKMANPHONE, OPERTM, OPERID, OPERDW

+ 19 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_funeral5_ashes_renew_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,23 +10,41 @@ import lombok.Setter;
 public class Guiji_funeral5_ashes_renew_Bean extends BaseBean_Guiji {
 
     String str;
+    @Expose
     String BNO;//业务条码
+    @Expose
     String DNAME;//逝者姓名
+    @Expose
     String DSEX;//性别
+    @Expose
     String DAGE;//年龄
+    @Expose
     String DMZ;//民族
+    @Expose
     String DSFZH;//身份证号
+    @Expose
     String ADDRESS;//户籍住址
+    @Expose
     String DTIME;//死亡时间
+    @Expose
     String JCGNAME;//寄存格号
+    @Expose
     String XCSTARTTM;//续存开始时间
+    @Expose
     String XCENDTM;//续存结束时间
+    @Expose
     String LINKMAN;//联系人
+    @Expose
     String LINKMANSFZH;//身份证
+    @Expose
     String RELATIONSHIP;//与逝者关系
+    @Expose
     String LINKMANPHONE;//联系电话
+    @Expose
     String OPERTM;//登记时间(YYYY-MM-DD HH:MM)
+    @Expose
     String OPERID;//登记人
+    @Expose
     String OPERDW;//登记单位
 
 //    BNO, DNAME, DSEX, DAGE, DMZ, DSFZH, ADDRESS, DTIME, JCGNAME, XCSTARTTM, XCENDTM, LINKMAN, LINKMANSFZH, RELATIONSHIP, LINKMANPHONE, OPERTM, OPERID, OPERDW

+ 21 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_funeral6_ashes_remove_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,25 +10,45 @@ import lombok.Setter;
 public class Guiji_funeral6_ashes_remove_Bean extends BaseBean_Guiji {
 
     String str;
+    @Expose
     String BNO;//业务条码
+    @Expose
     String DNAME;//逝者姓名
+    @Expose
     String DSEX;//性别
+    @Expose
     String DAGE;//年龄
+    @Expose
     String DMZ;//民族
+    @Expose
     String DSFZH;//身份证号
+    @Expose
     String ADDRESS;//户籍住址
+    @Expose
     String DTIME;//死亡时间
+    @Expose
     String JCGCODE;//寄存格号
+    @Expose
     String JCGNAME;//骨灰寄存格
+    @Expose
     String JCPRICE;//基本寄存价格
+    @Expose
     String STARTTM;//开始日期
+    @Expose
     String GETQZTM;//结束日期
+    @Expose
     String GETMAN;//取走人
+    @Expose
     String GETMANSFZH;//取走人身份证
+    @Expose
     String GETRLP;//与逝者关系
+    @Expose
     String GETMANPHONE;//取走人联系电话
+    @Expose
     String OPERTM;//登记时间(YYYY-MM-DD HH:MM)
+    @Expose
     String OPERID;//登记人
+    @Expose
     String OPERDW;//登记单位
 
 //    BNO, DNAME, DSEX, DAGE, DMZ, DSFZH, ADDRESS, DTIME, JCGCODE, JCGNAME, JCPRICE, STARTTM, GETQZTM, GETMAN, GETMANSFZH, GETRLP, GETMANPHONE, OPERTM, OPERID, OPERDW

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

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,10 +11,15 @@ public class Guiji_gas10_SC_user_infor_Bean extends BaseBean_Guiji {
 
     String str;
 
+    @Expose
     String userName;//姓名
+    @Expose
     String userPhone;//电话
+    @Expose
     String userAddr;//地址
+    @Expose
     String balance;//账号余额
+    @Expose
     String userCode;//编号
 
 //    userName, userPhone, userAddr, balance, userCode

+ 7 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_gas11_SC_gas_meter_infor_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,11 +11,17 @@ public class Guiji_gas11_SC_gas_meter_infor_Bean extends BaseBean_Guiji {
 
     String str;
 
+    @Expose
     String trademark;//品牌
+    @Expose
     String productType;//型号
+    @Expose
     String obsolescence;//报废年限
+    @Expose
     String baseRead;//表底数
+    @Expose
     String barcode;//表具条码号
+    @Expose
     String userCode;//用户编号
 
 //    trademark, productType, obsolescence, baseRead, barcode, userCode

+ 5 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_gas12_SC_gas_purchase_infor_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,9 +11,13 @@ public class Guiji_gas12_SC_gas_purchase_infor_Bean extends BaseBean_Guiji {
 
     String str;
 
+    @Expose
     String tradeTime;//购气时间
+    @Expose
     String tradeAmount;//购气量
+    @Expose
     String tradeMoney;//购气金额
+    @Expose
     String userCode;//用户编号
 
 //    tradeTime, tradeAmount, tradeMoney, userCode

+ 7 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_gas13_SC_meter_reading_infor_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,11 +11,17 @@ public class Guiji_gas13_SC_meter_reading_infor_Bean extends BaseBean_Guiji {
 
     String str;
 
+    @Expose
     String readNow;//本期表底数
+    @Expose
     String readLast;//上期表底数
+    @Expose
     String useAmount;//使用量
+    @Expose
     String useMoney;//使用金额
+    @Expose
     String barCode;//表具条码号
+    @Expose
     String recordTime;//抄表时间
 
 //    readNow, readLast, useAmount, useMoney, barCode, recordTime

+ 5 - 0
test-api/src/main/java/com/sooka/model/bo/Guiji_gas14_XinKer_user_infor_Bean.java

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,9 +11,13 @@ public class Guiji_gas14_XinKer_user_infor_Bean extends BaseBean_Guiji {
 
     String str;
 
+    @Expose
     String Name;//客户名称
+    @Expose
     String Sex;//客户性别
+    @Expose
     String Phone;//联系电话
+    @Expose
     String Address;//住址
 
 //    Name, Sex, Phone, Address

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

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,13 +11,21 @@ public class Guiji_gas15_XinKer_acceptance_infor_Bean extends BaseBean_Guiji {
 
     String str;
 
+    @Expose
     String Number;//受理编号
+    @Expose
     String Datetime;//受理时间
+    @Expose
     String Acceptor;//受理人
+    @Expose
     String Information;//信息来源
+    @Expose
     String TaskType;//任务类型
+    @Expose
     String BusinessType;//业务类型
+    @Expose
     String DetailedInformation;//详细信息
+    @Expose
     String Content;//受理内容
 
 //    Number, Datetime, Acceptor, Information, TaskType, BusinessType, DetailedInformation, Content

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

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,10 +11,15 @@ public class  Guiji_gas16_XinKer_disposition_info_Bean extends BaseBean_Guiji {
 
     String str;
 
+    @Expose
     String ClerkOrdering;//接单人员
+    @Expose
     String DateTime;//接单时间
+    @Expose
     String Worker;//工作人员
+    @Expose
     String ResultCode;//处理结果
+    @Expose
     String Content;//具体内容
 
 //    ClerkOrdering, DateTime, Worker, ResultCode, Content

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

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,14 +12,23 @@ public class Guiji_gas1_Zenner_user_infor_Bean extends BaseBean_Guiji {
     String str;
 
     String GUID;//用户GUID
+    @Expose
     String VC_UI_CODE;//用户编号
+    @Expose
     String VC_UI_NAME;//用户姓名
+    @Expose
     String VC_UI_STATE;//用户状态(0停用(退户)  1启用  2销户)
+    @Expose
     String VC_UI_ADDR;//用户地址
+    @Expose
     String VC_UI_TEL;//用户电话
+    @Expose
     String VC_UI_IDNO;//证件号码
+    @Expose
     String VC_UI_REMARK;//用户备注
+    @Expose
     String N_UI_BEFOREAMOUNT;//上次结余
+    @Expose
     String N_UI_LASTAMOUNT;//本次结余
 
 //    GUID, VC_UI_CODE, VC_UI_NAME, VC_UI_STATE, VC_UI_ADDR, VC_UI_TEL, VC_UI_IDNO, VC_UI_REMARK, N_UI_BEFOREAMOUNT, N_UI_LASTAMOUNT

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

@@ -1,5 +1,6 @@
 package com.sooka.model.bo;
 
+import com.google.gson.annotations.Expose;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,22 +10,37 @@ import lombok.Setter;
 public class Guiji_gas2_Zenner_gas_meter_infor_Bean extends BaseBean_Guiji {
 
     String str;
-
+    @Expose
     String GUID;//GUID
+    @Expose
     String VC_MI_USERGUID;//用户GUID
+    @Expose
     String VC_MI_NO;//气表编号
+    @Expose
     String VC_MI_CARDNO;//卡号
+    @Expose
     String VC_MI_DIRECTION;//左|右表
+    @Expose
     String VC_MI_TIMA;//表具条码
+    @Expose
     String VC_MI_CHAOBIAO;//抄表员
+    @Expose
     String N_MI_BASECOUNT;//气表基数
+    @Expose
     String N_MI_BASELEAVE;//初始气量
+    @Expose
     String VC_MI_STATE;//表状态(0停用1使用2换表3退表4销表)
+    @Expose
     String I_MI_SALECOUNT;//累计充值次数
+    @Expose
     String I_MI_WLSALECOUNT;//累计无线充值次数
+    @Expose
     String I_MI_FILLCARDCOUNT;//累计发卡次数
+    @Expose
     String VC_MI_REMARK;//气表备注
+    @Expose
     String I_MI_REPORTCOUNT;//上报次数
+    @Expose
     String D_MI_CREATETIME;//创建时间
 
 //    GUID, VC_MI_USERGUID, VC_MI_NO, VC_MI_CARDNO, VC_MI_DIRECTION, VC_MI_TIMA, VC_MI_CHAOBIAO, N_MI_BASECOUNT, N_MI_BASELEAVE, VC_MI_STATE, I_MI_SALECOUNT, I_MI_WLSALECOUNT, I_MI_FILLCARDCOUNT, VC_MI_REMARK, I_MI_REPORTCOUNT, D_MI_CREATETIME

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


Некоторые файлы не были показаны из-за большого количества измененных файлов