Browse Source

Merge remote-tracking branch 'origin/master'

master
yinzuomei 3 years ago
parent
commit
77e6ec1e07
  1. 7
      epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
  2. 5
      epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml
  3. 5
      epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml
  4. 5
      epmet-auth/deploy/docker-compose-dev.yml
  5. 5
      epmet-auth/deploy/docker-compose-prod.yml
  6. 5
      epmet-auth/deploy/docker-compose-test.yml
  7. 8
      epmet-commons/epmet-commons-tools/src/main/resources/logback-base.xml
  8. 5
      epmet-gateway/deploy/docker-compose-dev.yml
  9. 5
      epmet-gateway/deploy/docker-compose-prod.yml
  10. 5
      epmet-gateway/deploy/docker-compose-test.yml
  11. 5
      epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml
  12. 5
      epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml
  13. 5
      epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-test.yml
  14. 5
      epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
  15. 5
      epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
  16. 5
      epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml
  17. 5
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
  18. 5
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
  19. 5
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
  20. 34
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
  21. 5
      epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml
  22. 5
      epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml
  23. 5
      epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-test.yml
  24. 5
      epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
  25. 5
      epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
  26. 5
      epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml
  27. 5
      epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml
  28. 5
      epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
  29. 5
      epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml
  30. 5
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
  31. 5
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
  32. 5
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml
  33. 5
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
  34. 5
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
  35. 5
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
  36. 5
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
  37. 5
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
  38. 5
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml
  39. 5
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
  40. 5
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
  41. 5
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml
  42. 5
      epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
  43. 5
      epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml
  44. 5
      epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml
  45. 5
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
  46. 5
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
  47. 5
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
  48. 5
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
  49. 5
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
  50. 5
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
  51. 5
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
  52. 5
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml
  53. 5
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
  54. 5
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
  55. 5
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
  56. 5
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
  57. 5
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
  58. 5
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
  59. 5
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
  60. 2
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingListResultDTO.java
  61. 5
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
  62. 5
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
  63. 5
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
  64. 40
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseInformationServiceImpl.java
  65. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
  66. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
  67. 26
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
  68. 5
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
  69. 5
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
  70. 5
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
  71. 7
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
  72. 5
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
  73. 5
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
  74. 5
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
  75. 235
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaKettleBaseDisputeProcessDTO.java
  76. 1
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java
  77. 13
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaKettleDetailsById.java
  78. 32
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/KettleNewsFormDto.java
  79. 4
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/NewWghSjxxFormDTO.java
  80. 62
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaKettleDetailsResultDTO.java
  81. 48
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java
  82. 7
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/NewWghSjxxResultDTO.java
  83. 2
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/ResidentByIdCardResultDTO.java
  84. 98
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxDetailResultDto.java
  85. 5
      epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-dev.yml
  86. 5
      epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml
  87. 5
      epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-test.yml
  88. 133
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java
  89. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxController.java
  90. 60
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java
  91. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxDao.java
  92. 240
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaKettleBaseDisputeProcessEntity.java
  93. 148
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaKettleBaseDisputeProcessExcel.java
  94. 30
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaKettleBaseDisputeProcessRedis.java
  95. 111
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java
  96. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxService.java
  97. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java
  98. 206
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java
  99. 8
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java
  100. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxServiceImpl.java

7
epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml

@ -9,8 +9,13 @@ services:
volumes:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-admin.jar"
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ../target/epmet-admin-server.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-admin.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-admin.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-auth/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-auth.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-auth/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-auth.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-auth/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./epmet-auth.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

8
epmet-commons/epmet-commons-tools/src/main/resources/logback-base.xml

@ -7,11 +7,13 @@ Base logback configuration provided for compatibility with Spring Boot 1.1
<included>
<include resource="org/springframework/boot/logging/logback/defaults.xml" />
<!--<property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/spring.log}"/>-->
<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
<!--该配置主要是配置了console控制台日志的输出级别以及appender,配置只输出到CONSOLE,而不输出到file即可避免产生spring.log-->
<!--<property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/spring.log}"/>-->
<!--<include resource="org/springframework/boot/logging/logback/file-appender.xml" />-->
<root level="INFO">
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
<!--<appender-ref ref="FILE" />-->
</root>
</included>

5
epmet-gateway/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-gateway.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-gateway/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-gateway.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-gateway/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-gateway.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./data-aggregator.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx760m -jar ./data-aggregator.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./data-aggregator.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./data-report.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx1524m -jar ./data-report.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./data-report.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx512m -jar ./data-stats.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx3000m -jar ./data-stats.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx512m -jar ./data-stats.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

34
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml

@ -240,28 +240,20 @@
FROM
screen_project_process spp
WHERE
( spp.CUSTOMER_ID = '2fe0065f70ca0e23ce4c26fca5f1d933' OR spp.CUSTOMER_ID = '44876154d10d7cb7affd92000f84f833' OR spp.CUSTOMER_ID = '46c55cb862d6d5e6d05d2ab61a1cc07e' )
AND OPERATION = 'closed_case' UNION ALL
SELECT
spp.CUSTOMER_ID,
PROJECT_ID,
HANDLER_ID,
HANDLER_TYPE,
ORG_ID_PATH
FROM
screen_project_process spp
WHERE
( spp.CUSTOMER_ID != '2fe0065f70ca0e23ce4c26fca5f1d933' AND spp.CUSTOMER_ID != '44876154d10d7cb7affd92000f84f833' AND spp.CUSTOMER_ID != '46c55cb862d6d5e6d05d2ab61a1cc07e' )
AND OPERATION = 'close'
(( spp.CUSTOMER_ID = '2fe0065f70ca0e23ce4c26fca5f1d933' OR spp.CUSTOMER_ID = '44876154d10d7cb7affd92000f84f833' OR spp.CUSTOMER_ID = '46c55cb862d6d5e6d05d2ab61a1cc07e' )
AND OPERATION = 'closed_case')
OR
(( spp.CUSTOMER_ID != '2fe0065f70ca0e23ce4c26fca5f1d933' AND spp.CUSTOMER_ID != '44876154d10d7cb7affd92000f84f833' AND spp.CUSTOMER_ID != '46c55cb862d6d5e6d05d2ab61a1cc07e' )
AND OPERATION = 'close')
<if test='null != customerId and "" != customerId'>
AND spp.CUSTOMER_ID = #{customerId}
</if>
<if test='null != projectIds and projectIds.size()>0'>
<foreach collection="projectIds" item="projectId" open="AND (" separator=" OR " close=" )">
spp.PROJECT_ID = #{projectId}
</foreach>
</if>
) b ON a.PROJECT_ID = b.PROJECT_ID
<if test='null != customerId and "" != customerId'>
AND b.CUSTOMER_ID = #{customerId}
</if>
<if test='null != projectIds and projectIds.size()>0'>
<foreach collection="projectIds" item="projectId" open="AND (" separator=" OR " close=" )">
b.PROJECT_ID = #{projectId}
</foreach>
</if>
LEFT JOIN screen_customer_agency c ON b.HANDLER_ID = c.AGENCY_ID
WHERE a.DEL_FLAG = '0'
AND a.CATEGORY_CODE IS NOT NULL

5
epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-activiti.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-activiti.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-activiti.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./common-service.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./common-service.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./common-service.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-ext.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-ext.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-ext.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-heart.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-heart.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-heart.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-job.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-job.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-job.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-message.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-message.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-message.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-oss.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-oss.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-oss.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-point.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-point.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-point.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-third.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-third.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-third.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-access.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-access.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./gov-access.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-grid.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-grid.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./gov-grid.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-issue.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-issue.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./gov-issue.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-mine.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-mine.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-mine.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

2
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingListResultDTO.java

@ -16,7 +16,7 @@ public class BuildingListResultDTO implements Serializable {
private static final long serialVersionUID = -1423424057500044373L;
private String id;
private String name;
private Integer unitCoun = 0;
private Integer unitCount = 0;
private Integer houseCount = 0;
private Integer personCount = 0;
private Integer differHouseCount = 0;

5
epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-org.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx1024m -jar ./gov-org.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./gov-org.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

40
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseInformationServiceImpl.java

@ -58,11 +58,9 @@ public class HouseInformationServiceImpl implements HouseInformationService {
*/
@Override
public CommunityCountResultDTO getCommunityCount(HouseInformationFormDTO formDTO) {
//获取工作人员所属组织
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
if (StringUtils.isEmpty(formDTO.getCommunityId())) {
//获取工作人员所属组织
// CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
if (null == staffInfo) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败");
}
@ -71,12 +69,7 @@ public class HouseInformationServiceImpl implements HouseInformationService {
String orgName;
CustomerAgencyEntity agency = customerAgencyDao.selectById(formDTO.getCommunityId());
if (null == agency) {
agency = customerAgencyDao.selectById(staffInfo.getAgencyId());
if (null == agency) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "社区不存在", "社区不存在");
} else {
formDTO.setCommunityId(staffInfo.getAgencyId());
}
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "社区不存在", "社区不存在");
}
CustomerAgencyEntity parentAgency = customerAgencyDao.selectById(agency.getPid());
if (null == parentAgency) {
@ -128,35 +121,6 @@ public class HouseInformationServiceImpl implements HouseInformationService {
}
item.setDifferPersonCount(item.getPersonRealCount() - item.getPersonCount());
});
} else {
return deleteAfetrEmergency(formDTO);
}
return new PageData<>(list, pageInfo.getTotal());
}
private PageData<GridCountListResultDTO> deleteAfetrEmergency(HouseInformationFormDTO formDTO) {
//获取工作人员所属组织
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
formDTO.setCommunityId(staffInfo.getAgencyId());
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
List<GridCountListResultDTO> list = icNeighborHoodDao.getGridList(formDTO);
PageInfo<GridCountListResultDTO> pageInfo = new PageInfo<>(list);
if (CollectionUtils.isNotEmpty(list)) {
//获取录入人口数
IcUserCountFormDTO countFormDTO = new IcUserCountFormDTO();
countFormDTO.setOrgType(NumConstant.ZERO_STR);
countFormDTO.setOrgId(formDTO.getCommunityId());
countFormDTO.setType(NumConstant.ONE_STR);
Map<String, Integer> map = getMapResult(countFormDTO);
list.forEach(item -> {
if (map.containsKey(item.getId())) {
item.setPersonCount(map.get(item.getId()));
}
item.setDifferPersonCount(item.getPersonRealCount() - item.getPersonCount());
});
}
return new PageData<>(list, pageInfo.getTotal());
}

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java

@ -123,7 +123,7 @@ public class IcBuildingServiceImpl extends BaseServiceImpl<IcBuildingDao, IcBuil
}
LambdaQueryWrapper<IcBuildingEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(IcBuildingEntity::getNeighborHoodId, neighborHoodId);
wrapper.last("ORDER BY CONVERT ( BUILDING_NAME USING gbk ) ASC");
wrapper.last("ORDER BY SORT ASC, BUILDING_NAME+0 ASC");
List<IcBuildingEntity> list = baseDao.selectList(wrapper);
if(CollectionUtils.isEmpty(list)) {
return Collections.emptyList();

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@ -120,7 +120,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
LambdaQueryWrapper<IcHouseEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(formDTO.getBuildingId()), IcHouseEntity::getBuildingId, formDTO.getBuildingId());
wrapper.eq(StringUtils.isNotBlank(formDTO.getUnitId()), IcHouseEntity::getBuildingUnitId, formDTO.getUnitId());
wrapper.last("ORDER BY CONVERT ( HOUSE_NAME USING gbk ) ASC");
wrapper.last("ORDER BY SORT ASC, DOOR_NAME+0 ASC");
List<IcHouseEntity> list = baseDao.selectList(wrapper);
if (CollectionUtils.isEmpty(list)) {
return Collections.emptyList();

26
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml

@ -529,8 +529,10 @@
FROM (
SELECT
a.ID,
a.SORT,
a.BUILDING_NAME AS name,
IFNULL( a.TOTAL_UNIT_NUM, 0 ) AS unitCount,
IFNULL( a.TOTAL_UNIT_NUM, 0 ) AS unitRealCount,
IFNULL(c.unitCount, 0) AS unitCount,
SUM( IFNULL( a.TOTAL_HOUSE_NUM, 0 ) ) AS houseRealCount,
SUM( IFNULL( a.REAL_PERSON, 0 ) ) AS personRealCount,
IFNULL(b.houseCount, 0) AS houseCount,
@ -541,6 +543,10 @@
FROM ic_house WHERE DEL_FLAG = '0'
AND NEIGHBOR_HOOD_ID = #{neighborHoodId}
GROUP BY BUILDING_ID ) b ON a.ID = b.BUILDING_ID
LEFT JOIN ( SELECT BUILDING_ID, COUNT( ID ) AS unitCount
FROM ic_building_unit
WHERE DEL_FLAG = '0'
GROUP BY BUILDING_ID ) c ON a.ID = c.BUILDING_ID
WHERE
a.DEL_FLAG = '0'
AND a.NEIGHBOR_HOOD_ID = #{neighborHoodId}
@ -555,16 +561,16 @@
ORDER BY
<choose>
<when test='sort == "1"'>
convert(name using gbk)
SORT ASC, name + 0 ASC
</when>
<when test='sort == "2"'>
houseRealCount desc, convert(name using gbk)
houseRealCount desc, name + 0 ASC
</when>
<when test='sort == "3"'>
personRealCount desc, convert(name using gbk)
personRealCount desc, name + 0 ASC
</when>
<when test='sort == "4"'>
differHouseCount desc, convert(name using gbk)
differHouseCount desc, name + 0 ASC
</when>
<when test='sort == "5"'>
convert(name using gbk)
@ -578,7 +584,8 @@
a.ID AS buildingId,
a.TYPE AS buildingType,
CONCAT(NEIGHBOR_HOOD_NAME,' ',BUILDING_NAME) AS buildingName,
IFNULL( a.TOTAL_UNIT_NUM, 0 ) AS unitCount,
IFNULL( a.TOTAL_UNIT_NUM, 0 ) AS unitRealCount,
IFNULL( d.unitCount, 0 ) AS unitCount,
SUM( IFNULL( a.TOTAL_HOUSE_NUM, 0 ) ) AS houseRealCount,
SUM( IFNULL( a.REAL_PERSON, 0 ) ) AS personRealCount,
IFNULL( b.houseCount, 0 ) AS houseCount,
@ -590,6 +597,11 @@
WHERE DEL_FLAG = '0'
AND BUILDING_ID = #{buildingId}
GROUP BY BUILDING_ID ) b ON a.ID = b.BUILDING_ID
LEFT JOIN ( SELECT BUILDING_ID, COUNT( ID ) AS unitCount
FROM ic_building_unit
WHERE DEL_FLAG = '0'
AND BUILDING_ID = #{buildingId}
GROUP BY BUILDING_ID ) d ON a.ID = d.BUILDING_ID
INNER JOIN ic_neighbor_hood c ON a.NEIGHBOR_HOOD_ID = c.ID
WHERE
a.DEL_FLAG = '0'
@ -648,7 +660,7 @@
AND DOOR_NAME LIKE CONCAT('%', #{name}, '%')
</if>
ORDER BY
DOOR_NAME
SORT, DOOR_NAME+0
</select>

5
epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-project.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-project.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./gov-project.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

7
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@ -631,15 +631,20 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
* @return
*/
private List<IcEventYpAnalysisResultDTO.Dependent> getDependents(String idCard) {
// 家属列表
ArrayList<IcEventYpAnalysisResultDTO.Dependent> dependents = new ArrayList<>();
IcResiUserBriefDTO familyInfo = getResultDataOrThrowsException(userOpenFeignClient.findFamilyMemByIdCard(idCard),
ServiceConstant.EPMET_USER_SERVER,
EpmetErrorCode.SERVER_ERROR.getCode(),
"【事件研判分析】查找家属失败",
"【事件研判分析】查找家属失败");
if (familyInfo == null) {
return dependents;
}
List<HouseUserDTO> houseUserList = familyInfo.getHouseUserList();
ArrayList<IcEventYpAnalysisResultDTO.Dependent> dependents = new ArrayList<>();
if (CollectionUtils.isEmpty(houseUserList)) {
return dependents;
}

5
epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-voice.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-voice.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./gov-voice.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

235
epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaKettleBaseDisputeProcessDTO.java

@ -0,0 +1,235 @@
package com.epmet.opendata.dto.ca;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import java.math.BigDecimal;
/**
*
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-07-06
*/
@Data
public class CaKettleBaseDisputeProcessDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 事件信息主键事件流转关联字段关联tbactinst表的recid字段
*/
private Integer baseKeyId;
/**
* 网格编码
*/
private String griddingid;
/**
* 网格名称
*/
private String griddingname;
/**
* 经度
*/
private BigDecimal longitude;
/**
* 纬度
*/
private BigDecimal latitude;
/**
* 事件名称
*/
private String eventtitle;
/**
* 发生日期
*/
private Date eventdate;
/**
* 发生地点
*/
private String eventaddrdetail;
/**
* 事件规模
*/
private String eventscale;
/**
* 事件类别
*/
private String eventcategoryid;
/**
* 涉及人数
*/
private String peoplenum;
/**
* 事件简述
*/
private String eventtext;
/**
* 涉及单位
*/
private String responsibilityUnit;
/**
* 主要当事人姓名
*/
private String mainpartyid;
/**
* 主要当事人民族
*/
private String mainnation;
/**
* 办结时限
*/
private BigDecimal timelimit;
/**
* 办结方式
*/
private String finishedmethod;
/**
* 办结层级
*/
private String completionleve;
/**
* 是否办结
*/
private String eventstatus;
/**
* 创建人
*/
private String createUser;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新人
*/
private String updateUser;
/**
* 更新时间
*/
private Date updateTime;
/**
*
*/
private Date eventtime;
/**
*
*/
private Date finisheddatetime;
/**
* 重点场所类别
*/
private String keyAreaType;
/**
* 宗教活动规模
*/
private String religionScale;
/**
* 宗教类别
*/
private String religionType;
/**
* 重点场所是否变动
*/
private String isKeyareaState;
/**
* 重点人员是否在当地
*/
private String isLocal;
/**
* 重点人员现状
*/
private String presentSituation;
/**
*
*/
private Integer qdDeleteflag;
/**
* 是否化解
*/
private String successfulDefuse;
/**
* 关注程度
*/
private String attentionlevel;
/**
* 事件编码
*/
private String eventnumber;
/**
* 事件来源网格员上报赋值05街道吹哨赋值03其他赋值99
*/
private String eventsource;
/**
* 事件状态 0待提交1提交2代派发3处理中4复核5办结6退回-1作废
*/
private Integer curstatus;
/**
* 上报人网格员姓名
*/
private String wgy;
/**
* 附件id
*/
private String fileid;
/**
* 网格员id
*/
private String wgyhumanid;
/**
* 是否已抽取 0 未抽取 1 已抽取 2 准备抽取(中间状态)
*/
private String isExtracted;
/**
* 1正常2临期3超期
*/
private Integer timelimitstatus;
/**
* 数据同步时间
*/
private Date importTime;
}

1
epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java

@ -23,6 +23,7 @@ public interface CaWghDataConstant {
String UNICOM_RENTAL = "ca_rental";
String UNICOM_BM_CATEGORY = "ca_bm_category";
String UNICOM_SYS_DICT = "ca_sys_dict";
String UNICOM_KETTLE = "ca_kettle_base_dispute_process";
String SHARE_BASE_GRID = "wgh_base_grid";
String SHARE_WGH_SUB = "wgh_subdistrict_office";

13
epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaKettleDetailsById.java

@ -0,0 +1,13 @@
package com.epmet.opendata.dto.form;
import lombok.Data;
import java.io.Serializable;
@Data
public class CaKettleDetailsById implements Serializable {
private static final long serialVersionUID = 8874110627694588503L;
private Integer baseKeyId;
}

32
epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/KettleNewsFormDto.java

@ -0,0 +1,32 @@
package com.epmet.opendata.dto.form;
import lombok.Data;
import java.io.Serializable;
@Data
public class KettleNewsFormDto implements Serializable {
private static final long serialVersionUID = -6633389149995248497L;
/**
* 上报人姓名
*/
private String wgy;
/**
* 网格名称
*/
private String griddingname;
/**
* 事件名称
*/
private String eventtitle;
private Integer page;
private Integer limit;
}

4
epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/NewWghSjxxFormDTO.java

@ -9,10 +9,6 @@ public class NewWghSjxxFormDTO implements Serializable {
private static final long serialVersionUID = -4846956644682609996L;
/**
* 网格员名称
*/
private String wgymc;
/**
* 街道标签

62
epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaKettleDetailsResultDTO.java

@ -0,0 +1,62 @@
package com.epmet.opendata.dto.result;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class CaKettleDetailsResultDTO implements Serializable {
private static final long serialVersionUID = 2712173770296330515L;
/**
* 网格名称
*/
private String griddingname;
/**
* 事件名称
*/
private String eventtitle;
/**
* 发生日期
*/
private Date eventdate;
/**
* 发生地点
*/
private String eventaddrdetail;
/**
* 事件简述
*/
private String eventtext;
/**
* 办结方式
*/
private String finishedmethod;
/**
* 上报人
*/
private String wgy;
/**
* 事件来源
*/
private String eventsource;
/**
* 事件状态
*/
private Integer curstatus;
/**
* 是否已抽取
*/
private Character isExtracted;
}

48
epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java

@ -0,0 +1,48 @@
package com.epmet.opendata.dto.result;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class KettleNewsResultDto implements Serializable {
private static final long serialVersionUID = -7150387899029264693L;
/**
* 网格名称
*/
private String griddingname;
/**
* 事件名称
*/
private String eventtitle;
/**
* 发生日期
*/
private Date eventdate;
/**
* 主键
*/
private Integer baseKeyId;
/**
* 发生地点
*/
private String eventaddrdetail;
/**
* 办结方式
*/
private String finishedmethod;
/**
* 上报人网格员名称
*/
private String wgy;
}

7
epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/NewWghSjxxResultDTO.java

@ -34,12 +34,13 @@ public class NewWghSjxxResultDTO implements Serializable {
/**
* 核查时间
*/
private Date hcsj;
private Date createdate;
/**
* 事件描述
* 所属市标签
*/
private String sjms;
private String ssqsbq;
/**
* 唯一标识

2
epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/ResidentByIdCardResultDTO.java

@ -10,6 +10,8 @@ public class ResidentByIdCardResultDTO implements Serializable {
private static final long serialVersionUID = 3809219691923066512L;
private Long residentId;
/**
* 人口性质
*/

98
epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxDetailResultDto.java

@ -0,0 +1,98 @@
package com.epmet.opendata.dto.result;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class WghSjxxDetailResultDto implements Serializable {
private static final long serialVersionUID = -1339322272385084037L;
/**
* 网格员标签
*/
private String wgymc;
/**
* 所属街道标签
*/
private String ssjdbq;
/**
* 所属社区标签
*/
private String sssqbq;
/**
* 核查意见
*/
private String hcyj;
/**
* 核查时间
*/
private Date createdate;
/**
* 事件地址
*/
private String sjdz;
/**
* 事件描述
*/
private String sjms;
/**
* 所属部门
*/
private String ssbm;
/**
* 事件领域标签
*/
private String sjlyubq;
/**
* 事件小类标签
*/
private String sjdlbq;
/**
* 事件细类标签
*/
private String sjxlbq;
/**
* 所属市标签
*/
private String ssqsbq;
/**
* 处置结果
*/
private String czjg;
/**
* 处置单位标签
*/
private String czdwbq;
/**
* 事件来源标签
*/
private String sjlybq;
/**
* 应结办时间
*/
private Date ybjsj;
/**
* 到期时间
*/
private Date dqsj;
}

5
epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-dev.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./open-data-worker.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./open-data-worker.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

5
epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-test.yml

@ -11,6 +11,11 @@ services:
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./open-data-worker.jar"
restart: "unless-stopped"
logging:
driver: local
options:
max-size: "10m"
max-file: "2"
deploy:
resources:
limits:

133
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java

@ -0,0 +1,133 @@
package com.epmet.opendata.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.opendata.dto.ca.CaKettleBaseDisputeProcessDTO;
import com.epmet.opendata.dto.form.CaKettleDetailsById;
import com.epmet.opendata.dto.form.KettleNewsFormDto;
import com.epmet.opendata.dto.form.NewWghSjxxFormDTO;
import com.epmet.opendata.dto.form.PreserVationFormDTO;
import com.epmet.opendata.dto.result.CaKettleDetailsResultDTO;
import com.epmet.opendata.dto.result.KettleNewsResultDto;
import com.epmet.opendata.dto.result.NewWghSjxxResultDTO;
import com.epmet.opendata.excel.CaKettleBaseDisputeProcessExcel;
import com.epmet.opendata.service.CaKettleBaseDisputeProcessService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
*
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-07-06
*/
@RestController
@RequestMapping("caKettleBaseDisputeProcess")
public class CaKettleBaseDisputeProcessController {
@Autowired
private CaKettleBaseDisputeProcessService caKettleBaseDisputeProcessService;
@RequestMapping("page")
public Result<PageData<CaKettleBaseDisputeProcessDTO>> page(@RequestParam Map<String, Object> params){
PageData<CaKettleBaseDisputeProcessDTO> page = caKettleBaseDisputeProcessService.page(params);
return new Result<PageData<CaKettleBaseDisputeProcessDTO>>().ok(page);
}
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
public Result<CaKettleBaseDisputeProcessDTO> get(@PathVariable("id") String id){
CaKettleBaseDisputeProcessDTO data = caKettleBaseDisputeProcessService.get(id);
return new Result<CaKettleBaseDisputeProcessDTO>().ok(data);
}
@NoRepeatSubmit
@PostMapping("save")
public Result save(@RequestBody CaKettleBaseDisputeProcessDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
caKettleBaseDisputeProcessService.save(dto);
return new Result();
}
@NoRepeatSubmit
@PostMapping("update")
public Result update(@RequestBody CaKettleBaseDisputeProcessDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
caKettleBaseDisputeProcessService.update(dto);
return new Result();
}
@PostMapping("delete")
public Result delete(@RequestBody String[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
caKettleBaseDisputeProcessService.delete(ids);
return new Result();
}
@GetMapping("export")
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<CaKettleBaseDisputeProcessDTO> list = caKettleBaseDisputeProcessService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, CaKettleBaseDisputeProcessExcel.class);
}
/**
* 调用ruoyi接口存储数据
*
* @param dto
* @return com.epmet.commons.tools.utils.Result
* @author LZN
* @date 2022/6/2 10:02
*/
@PostMapping("/preserKettleVation")
public Result getPreserKettleVation(@RequestBody PreserVationFormDTO dto) {
caKettleBaseDisputeProcessService.getPreserKettleVation(dto);
return new Result();
}
/**
* CaKettle分页
*
* @param form
* @param tokenDto
* @return com.epmet.commons.tools.utils.Result
* @author LZN
* @date 2022/7/5 15:48
*/
@PostMapping("todo/getCaKettlePage")
public Result getWghSjxxPage(@RequestBody KettleNewsFormDto form, @LoginUser TokenDto tokenDto) {
PageData<KettleNewsResultDto> dto = caKettleBaseDisputeProcessService.getCaKettlePage(form);
return new Result<PageData<KettleNewsResultDto>>().ok(dto);
}
/**
* 根据id查询详情
*
* @param form
* @return com.epmet.commons.tools.utils.Result
* @author LZN
* @date 2022/7/6 17:47
*/
@PostMapping("getCaKettleDetails")
public Result getCaKettleDetails(@RequestBody CaKettleDetailsById form){
CaKettleDetailsResultDTO result = caKettleBaseDisputeProcessService.getCaKettleDetails(form);
return new Result().ok(result);
}
}

3
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxController.java

@ -16,6 +16,7 @@ import com.epmet.opendata.dto.form.NewWghSjxxFormDTO;
import com.epmet.opendata.dto.form.PreserVationFormDTO;
import com.epmet.opendata.dto.form.WghSjxxDetailFormDto;
import com.epmet.opendata.dto.result.NewWghSjxxResultDTO;
import com.epmet.opendata.dto.result.WghSjxxDetailResultDto;
import com.epmet.opendata.dto.result.WghSjxxResultDTO;
import com.epmet.opendata.dto.wgh.WghSjxxDTO;
import com.epmet.opendata.excel.WghSjxxExcel;
@ -124,7 +125,7 @@ public class WghSjxxController {
*/
@PostMapping("getWghSjxxDetail")
public Result getWghSjxxDetail(@RequestBody WghSjxxDetailFormDto dto){
NewWghSjxxResultDTO result = wghSjxxService.getWghSjxxDetail(dto);
WghSjxxDetailResultDto result = wghSjxxService.getWghSjxxDetail(dto);
return new Result().ok(result);
}
}

60
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java

@ -0,0 +1,60 @@
package com.epmet.opendata.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.opendata.dto.form.CaKettleDetailsById;
import com.epmet.opendata.dto.form.KettleNewsFormDto;
import com.epmet.opendata.dto.result.CaKettleDetailsResultDTO;
import com.epmet.opendata.dto.result.KettleNewsResultDto;
import com.epmet.opendata.entity.CaKettleBaseDisputeProcessEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-07-06
*/
@Mapper
public interface CaKettleBaseDisputeProcessDao extends BaseDao<CaKettleBaseDisputeProcessEntity> {
/**
* 全量删除
*
* @param
* @return int
* @author LZN
* @date 2022/7/6 17:02
*/
int deleteAll();
/**
* CaKettle分页
*
* @param form
* @return java.util.List<com.epmet.opendata.dto.result.KettleNewsResultDto>
* @author LZN
* @date 2022/7/6 17:32
*/
List<KettleNewsResultDto> getCaKettlePage(@Param("form") KettleNewsFormDto form);
/**
* 根据id查询详情
*
* @param form
* @return com.epmet.opendata.dto.result.CaKettleDetailsResultDTO
* @author LZN
* @date 2022/7/6 17:47
*/
CaKettleDetailsResultDTO getCaKettleDetails(@Param("form") CaKettleDetailsById form);
/**
* 查询最后一个baseKeyId
*
* @param
* @return java.lang.String
* @author LZN
* @date 2022/7/7 16:47
*/
String selectBaseKeyId();
}

3
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxDao.java

@ -5,6 +5,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.opendata.dto.form.NewWghSjxxFormDTO;
import com.epmet.opendata.dto.form.WghSjxxDetailFormDto;
import com.epmet.opendata.dto.result.NewWghSjxxResultDTO;
import com.epmet.opendata.dto.result.WghSjxxDetailResultDto;
import com.epmet.opendata.entity.WghSjxxEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -48,5 +49,5 @@ public interface WghSjxxDao extends BaseDao<WghSjxxEntity> {
* @author LZN
* @date 2022/7/5 16:15
*/
NewWghSjxxResultDTO getWghSjxxDetail(@Param("dto") WghSjxxDetailFormDto dto);
WghSjxxDetailResultDto getWghSjxxDetail(@Param("dto") WghSjxxDetailFormDto dto);
}

240
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaKettleBaseDisputeProcessEntity.java

@ -0,0 +1,240 @@
package com.epmet.opendata.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
/**
*
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-07-06
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("ca_kettle_base_dispute_process")
public class CaKettleBaseDisputeProcessEntity {
private static final long serialVersionUID = 1L;
/**
* 事件信息主键事件流转关联字段关联tbactinst表的recid字段
*/
private Integer baseKeyId;
/**
* 网格编码
*/
private String griddingid;
/**
* 网格名称
*/
private String griddingname;
/**
* 经度
*/
private BigDecimal longitude;
/**
* 纬度
*/
private BigDecimal latitude;
/**
* 事件名称
*/
private String eventtitle;
/**
* 发生日期
*/
private Date eventdate;
/**
* 发生地点
*/
private String eventaddrdetail;
/**
* 事件规模
*/
private String eventscale;
/**
* 事件类别
*/
private String eventcategoryid;
/**
* 涉及人数
*/
private String peoplenum;
/**
* 事件简述
*/
private String eventtext;
/**
* 涉及单位
*/
private String responsibilityUnit;
/**
* 主要当事人姓名
*/
private String mainpartyid;
/**
* 主要当事人民族
*/
private String mainnation;
/**
* 办结时限
*/
private BigDecimal timelimit;
/**
* 办结方式
*/
private String finishedmethod;
/**
* 办结层级
*/
private String completionleve;
/**
* 是否办结
*/
private String eventstatus;
/**
* 创建人
*/
private String createUser;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新人
*/
private String updateUser;
/**
* 更新时间
*/
private Date updateTime;
/**
*
*/
private Date eventtime;
/**
*
*/
private Date finisheddatetime;
/**
* 重点场所类别
*/
private String keyAreaType;
/**
* 宗教活动规模
*/
private String religionScale;
/**
* 宗教类别
*/
private String religionType;
/**
* 重点场所是否变动
*/
private String isKeyareaState;
/**
* 重点人员是否在当地
*/
private String isLocal;
/**
* 重点人员现状
*/
private String presentSituation;
/**
*
*/
private Integer qdDeleteflag;
/**
* 是否化解
*/
private String successfulDefuse;
/**
* 关注程度
*/
private String attentionlevel;
/**
* 事件编码
*/
private String eventnumber;
/**
* 事件来源网格员上报赋值05街道吹哨赋值03其他赋值99
*/
private String eventsource;
/**
* 事件状态 0待提交1提交2代派发3处理中4复核5办结6退回-1作废
*/
private Integer curstatus;
/**
* 上报人网格员姓名
*/
private String wgy;
/**
* 附件id
*/
private String fileid;
/**
* 网格员id
*/
private String wgyhumanid;
/**
* 是否已抽取 0 未抽取 1 已抽取 2 准备抽取(中间状态)
*/
private String isExtracted;
/**
* 1正常2临期3超期
*/
private Integer timelimitstatus;
/**
* 数据同步时间
*/
private Date importTime;
}

148
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaKettleBaseDisputeProcessExcel.java

@ -0,0 +1,148 @@
package com.epmet.opendata.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
*
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-07-06
*/
@Data
public class CaKettleBaseDisputeProcessExcel {
@Excel(name = "事件信息主键,事件流转关联字段,关联tbactinst表的recid字段")
private Integer baseKeyId;
@Excel(name = "网格编码")
private String griddingid;
@Excel(name = "网格名称")
private String griddingname;
@Excel(name = "经度")
private BigDecimal longitude;
@Excel(name = "纬度")
private BigDecimal latitude;
@Excel(name = "事件名称")
private String eventtitle;
@Excel(name = "发生日期")
private Date eventdate;
@Excel(name = "发生地点")
private String eventaddrdetail;
@Excel(name = "事件规模")
private String eventscale;
@Excel(name = "事件类别")
private String eventcategoryid;
@Excel(name = "涉及人数")
private String peoplenum;
@Excel(name = "事件简述")
private String eventtext;
@Excel(name = "涉及单位")
private String responsibilityUnit;
@Excel(name = "主要当事人姓名")
private String mainpartyid;
@Excel(name = "主要当事人民族")
private String mainnation;
@Excel(name = "办结时限")
private BigDecimal timelimit;
@Excel(name = "办结方式")
private String finishedmethod;
@Excel(name = "办结层级")
private String completionleve;
@Excel(name = "是否办结")
private String eventstatus;
@Excel(name = "创建人")
private String createUser;
@Excel(name = "创建时间")
private Date createTime;
@Excel(name = "更新人")
private String updateUser;
@Excel(name = "更新时间")
private Date updateTime;
@Excel(name = "")
private Date eventtime;
@Excel(name = "")
private Date finisheddatetime;
@Excel(name = "重点场所类别")
private String keyAreaType;
@Excel(name = "宗教活动规模")
private String religionScale;
@Excel(name = "宗教类别")
private String religionType;
@Excel(name = "重点场所是否变动")
private String isKeyareaState;
@Excel(name = "重点人员是否在当地")
private String isLocal;
@Excel(name = "重点人员现状")
private String presentSituation;
@Excel(name = "")
private Integer qdDeleteflag;
@Excel(name = "是否化解")
private String successfulDefuse;
@Excel(name = "关注程度")
private String attentionlevel;
@Excel(name = "事件编码")
private String eventnumber;
@Excel(name = "事件来源,网格员上报赋值05;街道吹哨赋值03;其他赋值99")
private String eventsource;
@Excel(name = "事件状态 0待提交1提交2代派发3处理中4复核5办结6退回-1作废")
private Integer curstatus;
@Excel(name = "上报人(网格员姓名)")
private String wgy;
@Excel(name = "附件id")
private String fileid;
@Excel(name = "网格员id")
private String wgyhumanid;
@Excel(name = "是否已抽取 0 未抽取 1 已抽取 2 准备抽取(中间状态)")
private String isExtracted;
@Excel(name = "1正常2临期3超期")
private Integer timelimitstatus;
@Excel(name = "数据同步时间")
private Date importTime;
}

30
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaKettleBaseDisputeProcessRedis.java

@ -0,0 +1,30 @@
package com.epmet.opendata.redis;
import com.epmet.commons.tools.redis.RedisUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
*
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-07-06
*/
@Component
public class CaKettleBaseDisputeProcessRedis {
@Autowired
private RedisUtils redisUtils;
public void delete(Object[] ids) {
}
public void set(){
}
public String get(String id){
return null;
}
}

111
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java

@ -0,0 +1,111 @@
package com.epmet.opendata.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.opendata.dto.ca.CaKettleBaseDisputeProcessDTO;
import com.epmet.opendata.dto.form.CaKettleDetailsById;
import com.epmet.opendata.dto.form.KettleNewsFormDto;
import com.epmet.opendata.dto.form.PreserVationFormDTO;
import com.epmet.opendata.dto.result.CaKettleDetailsResultDTO;
import com.epmet.opendata.dto.result.KettleNewsResultDto;
import com.epmet.opendata.entity.CaKettleBaseDisputeProcessEntity;
import java.util.List;
import java.util.Map;
/**
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-07-06
*/
public interface CaKettleBaseDisputeProcessService extends BaseService<CaKettleBaseDisputeProcessEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<CaKettleBaseDisputeProcessDTO>
* @author generator
* @date 2022-07-06
*/
PageData<CaKettleBaseDisputeProcessDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<CaKettleBaseDisputeProcessDTO>
* @author generator
* @date 2022-07-06
*/
List<CaKettleBaseDisputeProcessDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return CaKettleBaseDisputeProcessDTO
* @author generator
* @date 2022-07-06
*/
CaKettleBaseDisputeProcessDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2022-07-06
*/
void save(CaKettleBaseDisputeProcessDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2022-07-06
*/
void update(CaKettleBaseDisputeProcessDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2022-07-06
*/
void delete(String[] ids);
/**
* 调用ruoyi接口存储数据
*
* @param dto
* @return void
* @author LZN
* @date 2022/7/6 17:02
*/
void getPreserKettleVation(PreserVationFormDTO dto);
/**
* CaKettle分页
*
* @param form
* @return com.epmet.commons.tools.page.PageData<com.epmet.opendata.dto.result.KettleNewsResultDto>
* @author LZN
* @date 2022/7/6 17:32
*/
PageData<KettleNewsResultDto> getCaKettlePage(KettleNewsFormDto form);
/**
* 根据id查询详情
*
* @param form
* @return com.epmet.opendata.dto.result.CaKettleDetailsResultDTO
* @author LZN
* @date 2022/7/6 17:47
*/
CaKettleDetailsResultDTO getCaKettleDetails(CaKettleDetailsById form);
}

3
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxService.java

@ -6,6 +6,7 @@ import com.epmet.opendata.dto.form.NewWghSjxxFormDTO;
import com.epmet.opendata.dto.form.PreserVationFormDTO;
import com.epmet.opendata.dto.form.WghSjxxDetailFormDto;
import com.epmet.opendata.dto.result.NewWghSjxxResultDTO;
import com.epmet.opendata.dto.result.WghSjxxDetailResultDto;
import com.epmet.opendata.dto.result.WghSjxxResultDTO;
import com.epmet.opendata.dto.wgh.WghSjxxDTO;
import com.epmet.opendata.entity.WghSjxxEntity;
@ -110,5 +111,5 @@ public interface WghSjxxService extends BaseService<WghSjxxEntity> {
* @author LZN
* @date 2022/7/5 16:15
*/
NewWghSjxxResultDTO getWghSjxxDetail(WghSjxxDetailFormDto dto);
WghSjxxDetailResultDto getWghSjxxDetail(WghSjxxDetailFormDto dto);
}

2
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java

@ -83,7 +83,7 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
List<EventInfoResultDTO> list = result.getData();
saveEvent(formDTO, deptMap, userMap, list);
//分批次循环
while (CollectionUtils.isNotEmpty(list)) {
while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()) {
formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
result = dataStatisticalOpenFeignClient.getEventInfo(formDTO);
list = result.getData();

206
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java

@ -0,0 +1,206 @@
package com.epmet.opendata.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.utils.HttpClientManager;
import com.epmet.commons.tools.utils.Result;
import com.epmet.opendata.dao.CaKettleBaseDisputeProcessDao;
import com.epmet.opendata.dto.ca.CaKettleBaseDisputeProcessDTO;
import com.epmet.opendata.dto.constant.CaWghDataConstant;
import com.epmet.opendata.dto.form.CaKettleDetailsById;
import com.epmet.opendata.dto.form.KettleNewsFormDto;
import com.epmet.opendata.dto.form.PreserVationFormDTO;
import com.epmet.opendata.dto.result.CaKettleDetailsResultDTO;
import com.epmet.opendata.dto.result.KettleNewsResultDto;
import com.epmet.opendata.dto.result.NewWghSjxxResultDTO;
import com.epmet.opendata.entity.CaKettleBaseDisputeProcessEntity;
import com.epmet.opendata.entity.CaLoudongEntity;
import com.epmet.opendata.redis.CaKettleBaseDisputeProcessRedis;
import com.epmet.opendata.service.CaKettleBaseDisputeProcessService;
import com.epmet.opendata.util.AesUtils;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-07-06
*/
@Service
public class CaKettleBaseDisputeProcessServiceImpl extends BaseServiceImpl<CaKettleBaseDisputeProcessDao, CaKettleBaseDisputeProcessEntity> implements CaKettleBaseDisputeProcessService {
@Autowired
private CaKettleBaseDisputeProcessRedis caKettleBaseDisputeProcessRedis;
@Override
public PageData<CaKettleBaseDisputeProcessDTO> page(Map<String, Object> params) {
IPage<CaKettleBaseDisputeProcessEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, CaKettleBaseDisputeProcessDTO.class);
}
@Override
public List<CaKettleBaseDisputeProcessDTO> list(Map<String, Object> params) {
List<CaKettleBaseDisputeProcessEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, CaKettleBaseDisputeProcessDTO.class);
}
private QueryWrapper<CaKettleBaseDisputeProcessEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<CaKettleBaseDisputeProcessEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public CaKettleBaseDisputeProcessDTO get(String id) {
CaKettleBaseDisputeProcessEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, CaKettleBaseDisputeProcessDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(CaKettleBaseDisputeProcessDTO dto) {
CaKettleBaseDisputeProcessEntity entity = ConvertUtils.sourceToTarget(dto, CaKettleBaseDisputeProcessEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(CaKettleBaseDisputeProcessDTO dto) {
CaKettleBaseDisputeProcessEntity entity = ConvertUtils.sourceToTarget(dto, CaKettleBaseDisputeProcessEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteBatchIds(Arrays.asList(ids));
}
/**
* 调用ruoyi接口存储数据
*
* @param dto
* @return void
* @author LZN
* @date 2022/7/6 17:02
*/
@Override
public void getPreserKettleVation(PreserVationFormDTO dto) {
dto.setPageNo(NumConstant.ONE);
dto.setPageSize(CaWghDataConstant.PAGE_LIMIT);
dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
dto.setTableName(CaWghDataConstant.UNICOM_KETTLE);
dto.setOrderBy("timelimit,create_time,update_time,import_time,eventdate desc");
int pageNo = 1;
int total = 0;
String id = baseDao.selectBaseKeyId();
dto.setWhereCase("base_key_id >" + id);
do {
try {
total = listKettle(dto);
pageNo++;
dto.setPageNo(pageNo);
} catch (Exception e) {
e.printStackTrace();
}
} while (total > (pageNo * NumConstant.FIFTY));
}
/**
* CaKettle分页
*
* @param form
* @return com.epmet.commons.tools.page.PageData<com.epmet.opendata.dto.result.KettleNewsResultDto>
* @author LZN
* @date 2022/7/6 17:32
*/
@Override
public PageData<KettleNewsResultDto> getCaKettlePage(KettleNewsFormDto form) {
PageHelper.startPage(form.getPage(), form.getLimit());
List<KettleNewsResultDto> result = baseDao.getCaKettlePage(form);
PageInfo<KettleNewsResultDto> info = new PageInfo<>(result);
return new PageData<>(result, info.getTotal());
}
/**
* 根据id查询详情
*
* @param form
* @return com.epmet.opendata.dto.result.CaKettleDetailsResultDTO
* @author LZN
* @date 2022/7/6 17:47
*/
@Override
public CaKettleDetailsResultDTO getCaKettleDetails(CaKettleDetailsById form) {
CaKettleDetailsResultDTO result = baseDao.getCaKettleDetails(form);
return result;
}
private int listKettle(PreserVationFormDTO dto) throws Exception {
String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);
JSONObject obj = new JSONObject();
obj.put(CaWghDataConstant.UNICOM_CONDITION, aes);
String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData();
JSONObject toResult = JSON.parseObject(data);
Result result = ConvertUtils.mapToEntity(toResult, Result.class);
if (!result.success()) {
return dto.getPageNo() + 1;
}
ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class);
this.insertBatch(returnDate.getList());
return returnDate.getTotal();
}
static class ReturnDate {
private int total;
private List<CaKettleBaseDisputeProcessEntity> list;
public int getTotal() {
return total;
}
public void setTotal(int total) {
this.total = total;
}
public List<CaKettleBaseDisputeProcessEntity> getList() {
return list;
}
public void setList(List<CaKettleBaseDisputeProcessEntity> list) {
this.list = list;
}
}
}

8
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java

@ -81,6 +81,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService {
@Autowired
private WghSjxxService wghSjxxService;
@Autowired
private CaKettleBaseDisputeProcessService caKettleBaseDisputeProcessService;
@Override
public void guardarDatosTask(PreserVationFormDTO dto) {
if (StringUtils.isNotBlank(dto.getTableName())) {
@ -154,9 +157,12 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService {
case CaWghDataConstant.SHARE_WGH_SJXX:
wghSjxxService.getWghSjxx(dto);
break;
case CaWghDataConstant.UNICOM_KETTLE:
caKettleBaseDisputeProcessService.getPreserKettleVation(dto);
break;
}
} else{
throw new Error("没传名字");
throw new Error("没传名");
}
}
}

3
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxServiceImpl.java

@ -17,6 +17,7 @@ import com.epmet.opendata.dto.form.NewWghSjxxFormDTO;
import com.epmet.opendata.dto.form.PreserVationFormDTO;
import com.epmet.opendata.dto.form.WghSjxxDetailFormDto;
import com.epmet.opendata.dto.result.NewWghSjxxResultDTO;
import com.epmet.opendata.dto.result.WghSjxxDetailResultDto;
import com.epmet.opendata.dto.result.WghSjxxResultDTO;
import com.epmet.opendata.dto.wgh.WghSjxxDTO;
import com.epmet.opendata.entity.WghSjxxEntity;
@ -161,7 +162,7 @@ public class WghSjxxServiceImpl extends BaseServiceImpl<WghSjxxDao, WghSjxxEntit
* @date 2022/7/5 16:15
*/
@Override
public NewWghSjxxResultDTO getWghSjxxDetail(WghSjxxDetailFormDto dto) {
public WghSjxxDetailResultDto getWghSjxxDetail(WghSjxxDetailFormDto dto) {
return baseDao.getWghSjxxDetail(dto);
}

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save