Browse Source

Merge branch 'master' into pingyin_master

master
wangxianzhang 3 years ago
parent
commit
3576b24a9b
  1. 2
      epmet-admin/epmet-admin-server/pom.xml
  2. 3
      epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml
  3. 31
      epmet-auth/src/main/resources/logback-spring.xml
  4. 5
      epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java
  5. 5
      epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java
  6. 60
      epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartymemberSyncMQMsg.java
  7. 17
      epmet-commons/epmet-commons-tools/src/main/resources/logback-base.xml
  8. 3
      epmet-gateway/src/main/resources/logback-spring.xml
  9. 3
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml
  10. 3
      epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
  11. 2
      epmet-module/data-statistical/data-statistical-server/pom.xml
  12. 3
      epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
  13. 3
      epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml
  14. 2
      epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java
  15. 3
      epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
  16. 3
      epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml
  17. 3
      epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml
  18. 2
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  19. 3
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
  20. 3
      epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
  21. 5
      epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java
  22. 10
      epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
  23. 2
      epmet-module/epmet-message/epmet-message-server/pom.xml
  24. 3
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
  25. 3
      epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml
  26. 3
      epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml
  27. 2
      epmet-module/epmet-point/epmet-point-server/pom.xml
  28. 3
      epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml
  29. 3
      epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml
  30. 3
      epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml
  31. 3
      epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml
  32. 2
      epmet-module/gov-issue/gov-issue-server/pom.xml
  33. 3
      epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml
  34. 3
      epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml
  35. 3
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
  36. 41
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityInfoResultDTO.java
  37. 34
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgListTreeResultDTO.java
  38. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  39. 24
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
  40. 24
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
  41. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
  42. 9
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
  43. 1
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java
  44. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java
  45. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java
  46. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java
  47. 20
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
  48. 19
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
  49. 17
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
  50. 14
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
  51. 56
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
  52. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java
  53. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java
  54. 6
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java
  55. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java
  56. BIN
      epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_export_for_easyexcel.xlsx
  57. 3
      epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
  58. 50
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
  59. 11
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml
  60. 10
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml
  61. 4
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
  62. 10
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml
  63. 10
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml
  64. 3
      epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
  65. 3
      epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml
  66. 8
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java
  67. 5
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java
  68. 5
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java
  69. 5
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRentalFormtDTO.java
  70. 5
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java
  71. 5
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java
  72. 35
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/NewWghSjxxFormDTO.java
  73. 13
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/WghSjxxDetailFormDto.java
  74. 37
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/WghSjxxFormDTO.java
  75. 16
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/WghSjxxbDetailFormDTO.java
  76. 48
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/NewWghSjxxResultDTO.java
  77. 52
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxResultDTO.java
  78. 46
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxbDetailResultDTO.java
  79. 330
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSjxxDTO.java
  80. 2
      epmet-module/open-data-worker/open-data-worker-server/pom.xml
  81. 130
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxController.java
  82. 38
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java
  83. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java
  84. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java
  85. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java
  86. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java
  87. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java
  88. 52
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxDao.java
  89. 27
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java
  90. 335
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxEntity.java
  91. 205
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSjxxExcel.java
  92. 30
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSjxxRedis.java
  93. 114
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxService.java
  94. 24
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java
  95. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
  96. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java
  97. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java
  98. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java
  99. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java
  100. 9
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java

2
epmet-admin/epmet-admin-server/pom.xml

@ -233,7 +233,7 @@
<!--rocketmq-->
<rocketmq.enable>true</rocketmq.enable>
<rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
<rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
<rocketmq.producer.group>epmet_message</rocketmq.producer.group>
<!--线程池-->

3
epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/admin"/>

31
epmet-auth/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/auth"/>
@ -138,12 +139,36 @@
</filter>
</appender>
<!-- rocketmq client 的日志appender -->
<appender name="RocketmqClientAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文档的路径及文档名 -->
<file>${log.path}/rocketmqclient.log</file>
<!--日志文档输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
</appender>
<!-- 开发、测试环境 -->
<springProfile name="local,dev,test">
<logger name="org.springframework.web" level="INFO"/>
<logger name="org.springboot.sample" level="INFO"/>
<logger name="com.epmet" level="INFO"/>
<logger name="com.epmet" level="DEBUG"/>
<!-- 只打印rocketmq client的日志 -->
<logger name="RocketmqClient" level="INFO" additivity="false">
<appender-ref ref="RocketmqClientAppender"/>
</logger>
<root level="INFO">
<appender-ref ref="DEBUG_FILE"/>
<appender-ref ref="INFO_FILE"/>
@ -157,6 +182,10 @@
<logger name="org.springframework.web" level="INFO"/>
<logger name="org.springboot.sample" level="INFO"/>
<logger name="com.epmet" level="INFO"/>
<!-- 只打印rocketmq client的日志 -->
<logger name="RocketmqClient" level="INFO" additivity="false">
<appender-ref ref="RocketmqClientAppender"/>
</logger>
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="DEBUG_FILE"/>

5
epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java

@ -93,4 +93,9 @@ public interface ConsomerGroupConstants {
* 志愿者变更
*/
String VOLUNTEER_CHANGE_EVENT_LISTENER_GROUP = "volunteer_change_event_listener_group";
/**
* 创建党员居民信息消费者组将user库的党员信息同步到partymember库的党员表
*/
String CREATE_RESI_PARTYMEMBER_SYNC_GROUP = "create_resi_sync_group";
}

5
epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java

@ -79,4 +79,9 @@ public interface TopicConstants {
* 志愿者
*/
String VOLUNTEER ="volunteer";
/**
* 居民的党员信息
*/
String PARTYMEMBER_RESI = "partymember_resi";
}

60
epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartymemberSyncMQMsg.java

@ -0,0 +1,60 @@
package com.epmet.commons.rocketmq.messages;
import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* user库党员信息同步到partymember库的mq消息
*/
@Data
public class PartymemberSyncMQMsg extends MqBaseFormDTO {
/**
* 党员列表允许一次传输多个党员信息
*/
private List<PartyMemberSyncForm> partymemberList = new ArrayList<>();
@Data
public static class PartyMemberSyncForm {
private String customerId;
private String agencyId;
private String agencyPids;
private String icResiUser;
private String name;
private String idCard;
private String mobile;
private String address;
private String rdsj;
private String sszb;
/**
* 是否流动党员
*/
private String isLd;
/**
* 流动党员活动证号
*/
private String ldzh;
/**
* 职务
*/
private String partyZw;
/**
* 是否退休
*/
private String isTx;
/**
* 是否党员中心户
*/
private String isDyzxh;
/**
* 志愿者类型,逗号隔开
*/
private String volunteerCategory;
}
}

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

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Base logback configuration provided for compatibility with Spring Boot 1.1
从spring/logging包复制过来的,主要是屏蔽了/tmp/spring.log文件的生成(与我们自定义的重复,且不会滚动更新)。其他服务都改用引用此文件。
-->
<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" />
<root level="INFO">
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
</root>
</included>

3
epmet-gateway/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/gateway"/>

3
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/data-aggregator"/>

3
epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/data-report"/>

2
epmet-module/data-statistical/data-statistical-server/pom.xml

@ -582,7 +582,7 @@
<!--rocketmq-->
<rocketmq.enable>true</rocketmq.enable>
<rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
<rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
</properties>
</profile>
<profile>

3
epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/data-statistical"/>

3
epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/activiti"/>

2
epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java

@ -21,6 +21,8 @@ public interface ImportTaskConstants {
String BIZ_TYPE_IC_PARTY_MEMBER = "ic_party_member";
String BIZ_TYPE_IC_DANGEROUS_CHEMICALS = "ic_dangerous_chemicals";
String BIZ_TYPE_IC_ENTERPRISE="ic_enterprise";
String IC_POINT_NUCLEIC_MONITORING = "ic_point_nucleic_monitoring";
String IC_POINT_VACCINES_INOCULATION = "ic_point_vaccines_inoculation";
/**
* 核酸检测
*/

3
epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/common-service"/>

3
epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/demo"/>

3
epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/ext"/>

2
epmet-module/epmet-heart/epmet-heart-server/pom.xml

@ -303,7 +303,7 @@
<!--rocketmq-->
<rocketmq.enable>true</rocketmq.enable>
<rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
<rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
<!--线程池-->
<thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>

3
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/heart"/>

3
epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/job"/>

5
epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java

@ -165,4 +165,9 @@ public interface SystemMessageType {
*/
String FINISH_USER_DEMAND="finish_user_demand";
/**
* 党员身份的居民信息导入
*/
String PARTYMEMBER_RESI_IMPORT = "partymember_resi_import";
}

10
epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java

@ -169,6 +169,16 @@ public interface UserMessageTypeConstant {
*/
String ANTIEPIDEMIC="antiepidemic";
/**
* 核酸检测点通知
*/
String NUCLEIC="nucleic";
/**
* 疫苗接种点通知
*/
String VACCINES="vaccines";
/**
* 发布党建声音

2
epmet-module/epmet-message/epmet-message-server/pom.xml

@ -312,7 +312,7 @@
</dingTalk.robot.secret>
<!--rocketmq-->
<rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
<rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
<rocketmq.producer.group>epmet_message</rocketmq.producer.group>
</properties>
</profile>

3
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java

@ -234,6 +234,9 @@ public class SystemMessageServiceImpl implements SystemMessageService {
case SystemMessageType.VOLUNTEER_CHANGED:
topic=TopicConstants.VOLUNTEER;
break;
case SystemMessageType.PARTYMEMBER_RESI_IMPORT:
topic=TopicConstants.PARTYMEMBER_RESI;
break;
default:
logger.error("getTopicByMsgType msgType:{} is not support for any topic", msgType);
}

3
epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/message"/>

3
epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/oss"/>

2
epmet-module/epmet-point/epmet-point-server/pom.xml

@ -276,7 +276,7 @@
<!--rocketmq-->
<rocketmq.enable>true</rocketmq.enable>
<rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
<rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
</properties>
</profile>
<profile>

3
epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/point"/>

3
epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/third"/>

3
epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/gov-access"/>

3
epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/gov-grid"/>

2
epmet-module/gov-issue/gov-issue-server/pom.xml

@ -290,7 +290,7 @@
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
<rocketmq.enable>true</rocketmq.enable>
<rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
<rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
</properties>
</profile>
<profile>

3
epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/gov-issue"/>

3
epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/gov-mine"/>

3
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java

@ -92,6 +92,9 @@ public class IcHouseListFormDTO extends PageFormDTO {
private String customerId;
/**
* 是按照Id还是agencyId查询
*/
private String selectType;
/**

41
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityInfoResultDTO.java

@ -0,0 +1,41 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Description 社区所属组织基本信息
* @Author wgf
* @Date 2020/4/26 22:35
*/
@Data
public class CommunityInfoResultDTO implements Serializable {
private static final long serialVersionUID = 4360690752084258055L;
/**
* 客户ID
*/
private String customerId;
/**
* 社区组织ID
*/
private String deptId;
/**
* 社区名称
*/
private String deptName;
/**
* 网格的上级组织
*/
private String pid;
/**
* 网格的所有上级组织
*/
private String pids;
}

34
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgListTreeResultDTO.java

@ -0,0 +1,34 @@
package com.epmet.dto.result;
import com.epmet.commons.tools.utils.NodeTree;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class OrgListTreeResultDTO extends NodeTree implements Serializable {
private static final long serialVersionUID = -1993037593855768962L;
/**
* 父id
*/
private String pid;
/**
* 名字
*/
private String label;
/**
*
*/
private String value;
}

2
epmet-module/gov-org/gov-org-server/pom.xml

@ -336,7 +336,7 @@
<!--rocketmq-->
<rocketmq.enable>true</rocketmq.enable>
<rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
<rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
<rocketmq.producer.group>epmet_message</rocketmq.producer.group>
</properties>
</profile>

24
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java

@ -467,6 +467,30 @@ public class AgencyController {
return new Result<List<CommunityListResultDTO>>().ok(agencyService.getCommunityList(tokenDto));
}
/**
* Desc: 查询客户下的所有社区
*
* @param tokenDto
* @author wgf
* @date 2022/6/23 09:13
*/
@PostMapping("communityListByCustomerId")
public Result<List<CommunityListResultDTO>> communityListByCustomerId(@LoginUser TokenDto tokenDto) {
return new Result<List<CommunityListResultDTO>>().ok(agencyService.communityListByCustomerId(tokenDto));
}
/**
* Desc: 查询客户下的所有街道社区
*
* @param tokenDto
* @author wgf
* @date 2022/6/23 09:13
*/
@PostMapping("getOrgTreeListByCustomerId")
public Result<List<OrgListTreeResultDTO>> getOrgTreeListByCustomerId(@LoginUser TokenDto tokenDto) {
return new Result<List<OrgListTreeResultDTO>>().ok(agencyService.getOrgTreeListByCustomerId(tokenDto));
}
/**
* 通讯录树状结构
*

24
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@ -463,5 +463,29 @@ public class CustomerAgencyController {
return new Result<DelAgencyGridIdResultDTO>().ok(customerAgencyService.getDelAgencyGridIdList(agencyId));
}
/**
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
* @Author wgf
* @Description 根据社区名称查询所属组织信息
* @Date 2022/6/21 22:41
**/
@PostMapping("getCommunityInfo")
public Result<CommunityInfoResultDTO> getCommunityInfo(@RequestBody OrgInfoPointFormDTO formDTO) {
return customerAgencyService.getCommunityInfo(formDTO);
}
/**
* @param userId
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
* @Author wgf
* @Description 根据用户ID查询所属组织信息
* @Date 2022/6/21 22:41
**/
@GetMapping("getCommunityInfoByUserId/{userId}")
public Result<CommunityInfoResultDTO> getCommunityInfoByUserId(@PathVariable("userId") String userId) {
return customerAgencyService.getCommunityInfoByUserId(userId);
}
}

8
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@ -138,6 +138,7 @@ public class HouseController implements ResultDataResolver {
*/
@PostMapping("search")
public Result<PageData<IcHouseListResultDTO>> searchHouse(@RequestBody IcHouseListFormDTO formDTO, @LoginUser TokenDto loginUser) {
log.debug("xxx");
String keyword = formDTO.getKeyword();
if (StringUtils.isBlank(keyword)) {
return new Result<PageData<IcHouseListResultDTO>>().ok(new PageData<>(new ArrayList<>(), NumConstant.ZERO));
@ -236,6 +237,11 @@ public class HouseController implements ResultDataResolver {
@RequestMapping("exporthouseinfo")
public void exporthouseinfo(@RequestBody IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception {
ValidatorUtils.validateEntity(formDTO);
if (StringUtils.isNotBlank(formDTO.getId())){
formDTO.setSelectType("id");
}else{
formDTO.setSelectType("agency");
}
formDTO.setIsPage(false);
houseService.exportBuildinginfo(formDTO, response);
@ -367,8 +373,8 @@ public class HouseController implements ResultDataResolver {
if (StringUtils.isBlank(formDTO.getAgencyId())) {
LoginUserDetailsResultDTO loginUserDetail = getLoginUserDetailsResultDTO(tokenDto, "【查询房屋】查询当前staff所在组织信息失败");
formDTO.setAgencyId(loginUserDetail.getAgencyId());
formDTO.setSelectType("agency");
}
formDTO.setSelectType("agency");
ValidatorUtils.validateEntity(formDTO);
ExcelWriter excelWriter = null;

9
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@ -19,6 +19,7 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.form.OrgInfoPointFormDTO;
import com.epmet.dto.form.OrgTreeByUserAndTypeFormDTO;
import com.epmet.dto.result.*;
import com.epmet.entity.CustomerAgencyEntity;
@ -320,6 +321,8 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
*/
List<CommunityListResultDTO> getCommunityList(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
List<CommunityListResultDTO> communityListByCustomerId(@Param("customerId") String customerId);
List<SubOrgResDTO> selectSubOrg(String agencyId);
/**
@ -331,6 +334,8 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
*/
List<PartyOrgTreeResultDTO> getOrgTreeByUserAndType(OrgTreeByUserAndTypeFormDTO formDto);
List<OrgListTreeResultDTO> getOrgTreeListByCustomerId(@Param("customerId") String customerId);
/**
* 通讯录树
*
@ -344,5 +349,9 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
@Param("customerId") String customerId);
List<String> getDelAgencyIdList(@Param("agencyId") String agencyId);
CommunityInfoResultDTO getCommunityInfo(OrgInfoPointFormDTO formDTO);
CommunityInfoResultDTO getCommunityInfoByUserId(@Param("userId") String userId);
}

1
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java

@ -24,4 +24,5 @@ public interface IcCityManagementDao extends BaseDao<IcCityManagementEntity> {
void importInsert(@Param("entityList") List<IcCityManagementEntity> entityList);
void delByAgencyAndName(IcCityManagementEntity entity);
}

5
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java

@ -5,6 +5,7 @@ import com.epmet.dto.form.IcDangerousChemicalsListFormDTO;
import com.epmet.dto.result.IcDangerousChemicalsListResultDTO;
import com.epmet.entity.IcDangerousChemicalsEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -21,5 +22,7 @@ public interface IcDangerousChemicalsDao extends BaseDao<IcDangerousChemicalsEnt
void del(IcDangerousChemicalsEntity entity);
void importInsert(List<IcDangerousChemicalsEntity> entityList);
void importInsert(@Param("entityList") List<IcDangerousChemicalsEntity> entityList);
void delByAgencyAndName(IcDangerousChemicalsEntity entity);
}

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java

@ -23,4 +23,6 @@ public interface IcPublicServiceDao extends BaseDao<IcPublicServiceEntity> {
void del(IcPublicServiceEntity entity);
void importInsert(@Param("entityList") List<IcPublicServiceEntity> entityList);
void delByAgencyAndName(IcPublicServiceEntity entity);
}

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java

@ -23,4 +23,6 @@ public interface IcSuperiorResourceDao extends BaseDao<IcSuperiorResourceEntity>
void del(IcSuperiorResourceEntity entity);
void importInsert(@Param("entityList") List<IcSuperiorResourceEntity> entityList);
void delByAgencyAndName(IcSuperiorResourceEntity entity);
}

20
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java

@ -150,6 +150,24 @@ public interface AgencyService {
*/
List<CommunityListResultDTO> getCommunityList(TokenDto tokenDto);
/**
* Desc: 查询客户下的所有社区
*
* @param tokenDto
* @author wgf
* @date 2022/6/23 09:13
*/
List<CommunityListResultDTO> communityListByCustomerId(TokenDto tokenDto);
/**
* Desc: 查询客户下的所有街道社区
*
* @param tokenDto
* @author wgf
* @date 2022/6/23 09:13
*/
List<OrgListTreeResultDTO> getOrgTreeListByCustomerId(TokenDto tokenDto);
/**
* 通讯录树状结构
*
@ -160,4 +178,4 @@ public interface AgencyService {
* @date 2022/5/16 10:43
*/
List<AgencyAddressBookTreeResultDTO> getAddressTree(String name, String customerId);
}
}

19
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java

@ -24,6 +24,7 @@ import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.entity.CustomerAgencyEntity;
import org.springframework.web.bind.annotation.PathVariable;
import java.util.List;
import java.util.Map;
@ -317,4 +318,22 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
* @Description 获取当前组织及下级无效组织网格Id列表
**/
DelAgencyGridIdResultDTO getDelAgencyGridIdList(String agencyId);
/**
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
* @Author wgf
* @Description 根据社区名称查询所属组织信息
* @Date 2022/6/21 22:41
**/
Result<CommunityInfoResultDTO> getCommunityInfo(OrgInfoPointFormDTO formDTO);
/**
* @param userId
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
* @Author wgf
* @Description 根据用户ID查询所属组织信息
* @Date 2022/6/21 22:41
**/
Result<CommunityInfoResultDTO> getCommunityInfoByUserId(String userId);
}

17
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@ -870,6 +870,23 @@ public class AgencyServiceImpl implements AgencyService {
return customerAgencyDao.getCommunityList(tokenDto.getCustomerId(), agencyId);
}
@Override
public List<CommunityListResultDTO> communityListByCustomerId(TokenDto tokenDto) {
if (null == tokenDto.getCustomerId()) {
throw new EpmetException("未查询到客户信息");
}
return customerAgencyDao.communityListByCustomerId(tokenDto.getCustomerId());
}
@Override
public List<OrgListTreeResultDTO> getOrgTreeListByCustomerId(TokenDto tokenDto) {
if (null == tokenDto.getCustomerId()) {
throw new EpmetException("未查询到客户信息");
}
List<OrgListTreeResultDTO> list = customerAgencyDao.getOrgTreeListByCustomerId(tokenDto.getCustomerId());
return NodeTreeUtils.build(list);
}
/**
* 通讯录树
*

14
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@ -1566,4 +1566,18 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
return resultDTO;
}
@Override
public Result<CommunityInfoResultDTO> getCommunityInfo(OrgInfoPointFormDTO formDTO) {
CommunityInfoResultDTO communityInfoResultDTO = baseDao.getCommunityInfo(formDTO);
return new Result<CommunityInfoResultDTO>().ok(communityInfoResultDTO);
}
@Override
public Result<CommunityInfoResultDTO> getCommunityInfoByUserId(String userId) {
CommunityInfoResultDTO communityInfoResultDTO = baseDao.getCommunityInfoByUserId(userId);
return new Result<CommunityInfoResultDTO>().ok(communityInfoResultDTO);
}
}

56
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@ -1,9 +1,10 @@
package com.epmet.service.impl;
import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelReader;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.read.metadata.ReadSheet;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.epmet.commons.tools.constant.NumConstant;
@ -24,10 +25,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.FileUtils;
import com.epmet.commons.tools.utils.HouseQRcodeUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.utils.*;
import com.epmet.constant.CustomerGridConstant;
import com.epmet.constant.NeighborhoodConstant;
import com.epmet.constants.ImportTaskConstants;
@ -48,7 +46,6 @@ import com.epmet.model.HouseInfoModel;
import com.epmet.model.ImportHouseInfoListener;
import com.epmet.redis.IcHouseRedis;
import com.epmet.service.*;
import com.epmet.util.ExcelPoiUtils;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.common.cache.Cache;
@ -377,22 +374,41 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
public void exportBuildinginfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception {
//如果类型是house 查房屋
//导出房屋
PageData<IcHouseListResultDTO> icHouseExcels = new PageData<>(new ArrayList<>(), NumConstant.ZERO);
List<IcHouseListResultDTO> list = new ArrayList<>();
PageData<IcHouseListResultDTO> icHouseExcels = null;
Integer pageNo = NumConstant.ONE;
do {
formDTO.setPageNo(pageNo);
icHouseExcels = getHouseList(formDTO);
if (CollectionUtils.isEmpty(icHouseExcels.getList())) {
break;
formDTO.setPageSize(NumConstant.TEN_THOUSAND);
ExcelWriter excelWriter = null;
long start = System.currentTimeMillis();
try {
String templatePath = "excel/house_export_for_easyexcel.xlsx";
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(templatePath);
excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("房屋信息.xlsx", response))
.withTemplate(inputStream).build();
WriteSheet writeSheet = EasyExcel.writerSheet().build();
do {
formDTO.setPageNo(pageNo);
icHouseExcels = getHouseList(formDTO);
if (CollectionUtils.isEmpty(icHouseExcels.getList())) {
break;
}
excelWriter.fill(icHouseExcels.getList(), writeSheet);
pageNo++;
} while (icHouseExcels.getList().size() == formDTO.getPageSize());
} catch (EpmetException e) {
response.reset();
response.setCharacterEncoding("UTF-8");
response.setHeader("content-type", "application/json; charset=UTF-8");
PrintWriter printWriter = response.getWriter();
Result<Object> result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg());
printWriter.write(JSON.toJSONString(result));
printWriter.close();
} finally {
if (excelWriter != null) {
excelWriter.finish();
}
list.addAll(icHouseExcels.getList());
pageNo++;
} while (icHouseExcels.getList().size() == formDTO.getPageSize());
TemplateExportParams templatePath = new TemplateExportParams("excel/house_export.xlsx");
Map<String, Object> map = new HashMap<>();
map.put("maplist", list);
ExcelPoiUtils.exportExcel(templatePath, map, "房屋信息录入表", response);
log.info("exportBuildinginfo cost:{}ms",System.currentTimeMillis()-start);
}
}
@Override

5
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java

@ -170,7 +170,10 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl<IcCityManagemen
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(IcCityManagementAddEditFormDTO formDTO) {
IcCityManagementEntity entity = new IcCityManagementEntity();
IcCityManagementEntity entity = baseDao.selectById(formDTO.getIcCityManagementId());
//先删除本组织先可能存在的名称相同的已经是无效的历史数据,为了表中的唯一索引不失效
baseDao.delByAgencyAndName(entity);
//再把当前数据置为无效数据
entity.setId(formDTO.getIcCityManagementId());
entity.setUpdatedBy(formDTO.getUserId());
baseDao.del(entity);

5
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java

@ -185,7 +185,10 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(IcDangerousChemicalsAddEditFormDTO formDTO) {
IcDangerousChemicalsEntity entity = new IcDangerousChemicalsEntity();
IcDangerousChemicalsEntity entity = baseDao.selectById(formDTO.getIcDangerousChemicalsId());
//先删除本组织先可能存在的名称相同的已经是无效的历史数据,为了表中的唯一索引不失效
baseDao.delByAgencyAndName(entity);
//再把当前数据置为无效数据
entity.setId(formDTO.getIcDangerousChemicalsId());
entity.setUpdatedBy(formDTO.getUserId());
baseDao.del(entity);

6
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java

@ -27,6 +27,7 @@ import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO;
import com.epmet.dto.result.IcPublicServiceListResultDTO;
import com.epmet.dto.result.UploadImgResultDTO;
import com.epmet.entity.IcPublicServiceEntity;
import com.epmet.entity.IcSuperiorResourceEntity;
import com.epmet.excel.IcPublicServiceExcel;
import com.epmet.excel.handler.IcPublicServiceExcelImportListener;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
@ -170,7 +171,10 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl<IcPublicServiceD
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(IcPublicServiceAddEditFormDTO formDTO) {
IcPublicServiceEntity entity = new IcPublicServiceEntity();
IcPublicServiceEntity entity = baseDao.selectById(formDTO.getIcPublicServiceId());
//先删除本组织先可能存在的名称相同的已经是无效的历史数据,为了表中的唯一索引不失效
baseDao.delByAgencyAndName(entity);
//再把当前数据置为无效数据
entity.setId(formDTO.getIcPublicServiceId());
entity.setUpdatedBy(formDTO.getUserId());
baseDao.del(entity);

5
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java

@ -170,7 +170,10 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl<IcSuperiorRes
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(IcSuperiorResourceAddEditFormDTO formDTO) {
IcSuperiorResourceEntity entity = new IcSuperiorResourceEntity();
IcSuperiorResourceEntity entity = baseDao.selectById(formDTO.getIcSuperiorResourceId());
//先删除本组织先可能存在的名称相同的已经是无效的历史数据,为了表中的唯一索引不失效
baseDao.delByAgencyAndName(entity);
//再把当前数据置为无效数据
entity.setId(formDTO.getIcSuperiorResourceId());
entity.setUpdatedBy(formDTO.getUserId());
baseDao.del(entity);

BIN
epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_export_for_easyexcel.xlsx

Binary file not shown.

3
epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/gov-org"/>

50
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@ -756,6 +756,27 @@
AND CUSTOMER_ID = #{customerId}
AND CONCAT(PIDS,':',ID) LIKE CONCAT('%',#{agencyId},'%')
</select>
<select id="communityListByCustomerId" resultType="com.epmet.dto.result.CommunityListResultDTO">
SELECT
ID AS orgId,
ORGANIZATION_NAME AS orgName
FROM customer_agency
WHERE DEL_FLAG = '0'
AND `LEVEL` = 'community'
AND CUSTOMER_ID = #{customerId}
</select>
<select id="getOrgTreeListByCustomerId" resultType="com.epmet.dto.result.OrgListTreeResultDTO">
select
ID,
PID,
ID as value,
ORGANIZATION_NAME as label
from customer_agency
where DEL_FLAG = '0'
AND CUSTOMER_ID = #{customerId}
</select>
<select id="getAddressTree" resultType="com.epmet.dto.result.AgencyAddressBookTreeResultDTO">
SELECT
a.id,
@ -880,4 +901,33 @@
AND pids LIKE CONCAT('%', #{agencyId}, '%')
</select>
<select id="getCommunityInfo" resultType="com.epmet.dto.result.CommunityInfoResultDTO" parameterType="com.epmet.dto.form.OrgInfoPointFormDTO">
select
ID as deptId,
CUSTOMER_ID,
PID,
PIDS,
ORGANIZATION_NAME as deptName
from customer_agency
where DEL_FLAG = '0'
and ORGANIZATION_NAME = #{orgName}
and CUSTOMER_ID = #{customerId}
limit 1
</select>
<select id="getCommunityInfoByUserId" resultType="com.epmet.dto.result.CommunityInfoResultDTO">
select
ca.ID as deptId,
ctf.CUSTOMER_ID,
ca.PID,
ca.PIDS,
ca.ORGANIZATION_NAME as deptName
from customer_staff_agency ctf
left join customer_agency ca on ca.ID = ctf.AGENCY_ID and ca.DEL_FLAG = 0
where ctf.DEL_FLAG = 0
and ca.LEVEL = 'community'
and ctf.USER_ID = #{userId}
limit 1
</select>
</mapper>

11
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml

@ -106,4 +106,15 @@
id = #{id}
AND del_flag = '0'
</delete>
<delete id="delByAgencyAndName">
DELETE
FROM
ic_city_management
WHERE
del_flag != '0'
AND agency_id = #{agencyId}
AND `name` = #{name}
</delete>
</mapper>

10
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml

@ -118,4 +118,14 @@
AND del_flag = '0'
</delete>
<delete id="delByAgencyAndName">
DELETE
FROM
ic_dangerous_chemicals
WHERE
del_flag != '0'
AND agency_id = #{agencyId}
AND `name` = #{name}
</delete>
</mapper>

4
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@ -122,8 +122,8 @@
LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'
LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID and d.DEL_FLAG = '0'
LEFT JOIN customer_grid gr on gr.ID = c.GRID_ID and d.DEL_FLAG = '0'
LEFT JOIN customer_agency ag on ag.ID = c.AGENCY_ID and d.DEL_FLAG = '0'
LEFT JOIN customer_grid gr on gr.ID = c.GRID_ID and gr.DEL_FLAG = '0'
LEFT JOIN customer_agency ag on ag.ID = c.AGENCY_ID and ag.DEL_FLAG = '0'
<where>
1 = 1
and a.del_flag = '0'

10
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml

@ -107,4 +107,14 @@
AND del_flag = '0'
</delete>
<delete id="delByAgencyAndName">
DELETE
FROM
ic_public_service
WHERE
del_flag != '0'
AND agency_id = #{agencyId}
AND `name` = #{name}
</delete>
</mapper>

10
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml

@ -107,5 +107,15 @@
AND del_flag = '0'
</delete>
<delete id="delByAgencyAndName">
DELETE
FROM
ic_superior_resource
WHERE
del_flag != '0'
AND agency_id = #{agencyId}
AND `name` = #{name}
</delete>
</mapper>

3
epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/gov-project"/>

3
epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/>
<property name="log.path" value="logs/gov-voice"/>

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

@ -13,6 +13,7 @@ public interface CaWghDataConstant {
String TABLESCHEMA_UNICOM = "unicom";
String TABLESCHEMA_SHARE = "share";
String TABLESCHEMA_WGH = "wgh";
String UNICOM_PINGFANG = "ca_pingfang";
@ -32,7 +33,7 @@ public interface CaWghDataConstant {
String SHARE_WGH_JQZ = "wgh_jqz";
String SHARE_WGH_JXCS = "wgh_jxcs";
String SHARE_WGH_JYZ = "wgh_jyz";
String SHARE_WGH_SJXX = "wgh_sjxxb";
String SHARE_WGH_SJXXB = "wgh_sjxxb";
String SHARE_WGH_SQXX = "wgh_sqxx";
String SHARE_WGH_SZCGWGH = "wgh_szcgwgh";
String SHARE_WGH_SZZRWG = "wgh_szzrwg";
@ -40,9 +41,14 @@ public interface CaWghDataConstant {
String SHARE_WGH_YJBMCS = "wgh_yjbmcs";
String SHARE_WGH_YQHJZ = "wgh_yqhjz";
String SHARE_WGH_SJXX = "wgh_sjxx";
String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page";
String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage";
String DATA_URL_WGH = "http://120.221.72.83:9090/bridge/wgh/wghPage";
String UNICOM_CONDITION = "unicomCondition";
String SHARE_CONDITION = "shareCondition";
String WGH_CONDITION = "wghCondition";
}

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

@ -35,6 +35,11 @@ public class CaLoudongFormDTO implements Serializable {
*/
private String gridId;
/**
* 所处位置
*/
private String buildingAddr;
private Integer page;
private Integer limit;

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

@ -29,6 +29,11 @@ public class CaPingfangFormDTO implements Serializable {
*/
private String communityName;
/**
* 所处位置
*/
private String buildingAddr;
/**
* 网格id
*/

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

@ -39,6 +39,11 @@ public class CaRentalFormtDTO implements Serializable {
*/
private String renterName;
/**
* 房屋地址
*/
private String houseAddress;
private Integer page;
private Integer limit;

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

@ -44,4 +44,9 @@ public class CaResidentFormDTO implements Serializable {
*/
private String gridId;
/**
* 现住详细地址
*/
private String curliveAddressDetail;
}

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

@ -40,6 +40,11 @@ public class CaRotatorsFormDTO implements Serializable {
*/
private String gridId;
/**
* 现住详细地址
*/
private String curliveAddressDetail;
private Integer page;
private Integer limit;
}

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

@ -0,0 +1,35 @@
package com.epmet.opendata.dto.form;
import lombok.Data;
import java.io.Serializable;
@Data
public class NewWghSjxxFormDTO implements Serializable {
private static final long serialVersionUID = -4846956644682609996L;
/**
* 网格员名称
*/
private String wgymc;
/**
* 街道标签
*/
private String ssjdbq;
/**
* 社区标签
*/
private String sssqbq;
/**
* 核查意见
*/
private String hcyj;
private Integer page;
private Integer limit;
}

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

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

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

@ -0,0 +1,37 @@
package com.epmet.opendata.dto.form;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
import java.io.Serializable;
import java.net.Inet4Address;
@Data
public class WghSjxxFormDTO implements Serializable {
private static final long serialVersionUID = 3208547934202974728L;
/**
* 事件来源
*/
private String infosourcename;
/**
* 事件类别
*/
private String infotypename;
/**
* 社区名称
*/
private String communityname;
/**
* 事件状态
*/
private String statusname;
private Integer page;
private Integer limit;
}

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

@ -0,0 +1,16 @@
package com.epmet.opendata.dto.form;
import lombok.Data;
import java.io.Serializable;
@Data
public class WghSjxxbDetailFormDTO implements Serializable {
private static final long serialVersionUID = -7558785082629887627L;
/**
* 唯一id
*/
private String taskid;
}

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

@ -0,0 +1,48 @@
package com.epmet.opendata.dto.result;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class NewWghSjxxResultDTO implements Serializable {
private static final long serialVersionUID = -4088593179578850358L;
/**
* 网格员标签
*/
private String wgymc;
/**
* 所属街道标签
*/
private String ssjdbq;
/**
* 所属社区标签
*/
private String sssqbq;
/**
* 核查意见
*/
private String hcyj;
/**
* 核查时间
*/
private Date hcsj;
/**
* 事件描述
*/
private String sjms;
/**
* 唯一标识
*/
private Integer recid;
}

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

@ -0,0 +1,52 @@
package com.epmet.opendata.dto.result;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
import java.io.Serializable;
@Data
public class WghSjxxResultDTO extends PageFormDTO implements Serializable {
private static final long serialVersionUID = -5318466282262952340L;
/**
* 事件来源
*/
private String infosourcename;
/**
* 事件类别
*/
private String infotypename;
/**
* 社区名称
*/
private String communityname;
/**
* 事见描述
*/
private String description;
/**
* 事见地址
*/
private String address;
/**
* 事见状态
*/
private String statusname;
/**
* 街道名称
*/
private String streetname;
/**
* 唯一id
*/
private String taskid;
}

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

@ -0,0 +1,46 @@
package com.epmet.opendata.dto.result;
import lombok.Data;
import java.io.Serializable;
@Data
public class WghSjxxbDetailResultDTO implements Serializable {
private static final long serialVersionUID = 8965818800454155651L;
/**
* 事件来源
*/
private String infosourcename;
/**
* 事件类别
*/
private String infotypename;
/**
* 社区名称
*/
private String communityname;
/**
* 事见描述
*/
private String description;
/**
* 事见地址
*/
private String address;
/**
* 事见状态
*/
private String statusname;
/**
* 街道名称
*/
private String streetname;
}

330
epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSjxxDTO.java

@ -0,0 +1,330 @@
package com.epmet.opendata.dto.wgh;
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-05
*/
@Data
public class WghSjxxDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 案卷标识
*/
private Integer recid;
/**
* 事件编号
*/
private String sjbh;
/**
* 事件领域
*/
private String sjlyu;
/**
* 事件大类
*/
private String sjdl;
/**
* 事件小类
*/
private String sjxl;
/**
* 事件细类
*/
private String sjxil;
/**
* 事件来源
*/
private String sjly;
/**
* 所属区/
*/
private String ssqs;
/**
* 所属街道
*/
private String ssjd;
/**
* 所属社区
*/
private String sssq;
/**
* 事件地址
*/
private String sjdz;
/**
* 事件描述
*/
private String sjms;
/**
* 网格员标识
*/
private String wgybs;
/**
* 网格员名称
*/
private String wgymc;
/**
* 所属部门
*/
private String ssbm;
/**
* X坐标
*/
private BigDecimal xzb;
/**
* Y坐标
*/
private BigDecimal yzb;
/**
* 核实意见
*/
private String hsyj;
/**
* 创建日期
*/
private Date createdate;
/**
* 事件领域标签
*/
private String sjlyubq;
/**
* 事件大类标签
*/
private String sjdlbq;
/**
* 事件小类标签
*/
private String sjxlbq;
/**
* 事件细类标签
*/
private String sjxilbq;
/**
* 所属区/市标签
*/
private String ssqsbq;
/**
* 所属街道标签
*/
private String ssjdbq;
/**
* 所属社区标签
*/
private String sssqbq;
/**
* 事件上报
*/
private String sjsbwj;
/**
* 事件核实
*/
private String sjhswj;
/**
* 事件处置
*/
private String sjczwj;
/**
* 事件核查
*/
private String sjhcwj;
/**
* 外系统唯一标识
*/
private String wxtwybs;
/**
* 缩略图
*/
private String slt;
/**
* 处置单位
*/
private Integer czdw;
/**
* 处置结果
*/
private String czjg;
/**
* 处置单位标签
*/
private String czdwbq;
/**
* 是否退单
*/
private Integer sftd;
/**
* 是否延期
*/
private Integer sfyq;
/**
* 核查意见
*/
private String hcyj;
/**
* 是否作废
*/
private Integer sfzf;
/**
* 是否已核实
*/
private Integer sfyhs;
/**
* 是否已核查
*/
private Integer sfyhc;
/**
* 是否已督办
*/
private Integer sfydb;
/**
* 专项任务标识
*/
private Integer zxrwbs;
/**
* 待确责
*/
private Integer dqz;
/**
* 熔断状态
*/
private Integer rdzt;
/**
* 事件来源标签
*/
private String sjlybq;
/**
* 应办结时间
*/
private Date ybjsj;
/**
* 接收部门标识
*/
private Integer jsbmbs;
/**
* 核实人员标识
*/
private Integer hsrybs;
/**
* 核查人员标识
*/
private Integer hcrybs;
/**
* 处置人员标识
*/
private Integer czrybs;
/**
* 是否已处置
*/
private Integer sfycz;
/**
* 核实时间
*/
private Date hssj;
/**
* 核查时间
*/
private Date hcsj;
/**
* 处置时间
*/
private Date czsj;
/**
* 是否自发自处
*/
private Integer sfzfzc;
/**
* 核查用时
*/
private BigDecimal hcys;
/**
* 诉求联系人
*/
private String sqlxr;
/**
* 僵尸车
*/
private Integer jsc;
/**
* 到期时间
*/
private Date dqsj;
/**
* 星级评定
*/
private Integer xjpd;
/**
* 所属网格
*/
private String sswg;
}

2
epmet-module/open-data-worker/open-data-worker-server/pom.xml

@ -262,7 +262,7 @@
<!--rocketmq-->
<rocketmq.enable>true</rocketmq.enable>
<rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
<rocketmq.nameserver>192.168.10.165:9876</rocketmq.nameserver>
</properties>
</profile>
<profile>

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

@ -0,0 +1,130 @@
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.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.WghSjxxResultDTO;
import com.epmet.opendata.dto.wgh.WghSjxxDTO;
import com.epmet.opendata.excel.WghSjxxExcel;
import com.epmet.opendata.service.WghSjxxService;
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-05
*/
@RestController
@RequestMapping("wghSjxx")
public class WghSjxxController {
@Autowired
private WghSjxxService wghSjxxService;
@RequestMapping("page")
public Result<PageData<WghSjxxDTO>> page(@RequestParam Map<String, Object> params) {
PageData<WghSjxxDTO> page = wghSjxxService.page(params);
return new Result<PageData<WghSjxxDTO>>().ok(page);
}
@RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
public Result<WghSjxxDTO> get(@PathVariable("id") String id) {
WghSjxxDTO data = wghSjxxService.get(id);
return new Result<WghSjxxDTO>().ok(data);
}
@NoRepeatSubmit
@PostMapping("save")
public Result save(@RequestBody WghSjxxDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
wghSjxxService.save(dto);
return new Result();
}
@NoRepeatSubmit
@PostMapping("update")
public Result update(@RequestBody WghSjxxDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
wghSjxxService.update(dto);
return new Result();
}
@PostMapping("delete")
public Result delete(@RequestBody String[] ids) {
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
wghSjxxService.delete(ids);
return new Result();
}
@GetMapping("export")
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<WghSjxxDTO> list = wghSjxxService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, WghSjxxExcel.class);
}
/**
* 调用ruoyi接口获取wgh_sjxxb数据
*
* @param dto
* @return com.epmet.commons.tools.utils.Result
* @author LZN
* @date 2022/7/5 14:17
*/
@PostMapping("/wgh/getWghSjxx")
public Result getWghSjxx(@RequestBody PreserVationFormDTO dto) {
wghSjxxService.getWghSjxx(dto);
return new Result();
}
/**
* 新的事件信息分页
*
* @param form
* @param tokenDto
* @return com.epmet.commons.tools.utils.Result
* @author LZN
* @date 2022/7/5 15:48
*/
@PostMapping("todo/wghSjxxPage")
public Result getWghSjxxPage(@RequestBody NewWghSjxxFormDTO form, @LoginUser TokenDto tokenDto) {
PageData<NewWghSjxxResultDTO> dto = wghSjxxService.getWghSjxxPage(form);
return new Result<PageData<NewWghSjxxResultDTO>>().ok(dto);
}
/**
* 查询事件信息详情
*
* @param dto
* @return com.epmet.commons.tools.utils.Result
* @author LZN
* @date 2022/7/5 16:14
*/
@PostMapping("getWghSjxxDetail")
public Result getWghSjxxDetail(@RequestBody WghSjxxDetailFormDto dto){
NewWghSjxxResultDTO result = wghSjxxService.getWghSjxxDetail(dto);
return new Result().ok(result);
}
}

38
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java

@ -1,7 +1,9 @@
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;
@ -10,6 +12,11 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.opendata.dto.form.PreserVationFormDTO;
import com.epmet.opendata.dto.form.WghSjxxFormDTO;
import com.epmet.opendata.dto.form.WghSjxxbDetailFormDTO;
import com.epmet.opendata.dto.result.CaLoudongResultDTO;
import com.epmet.opendata.dto.result.WghSjxxResultDTO;
import com.epmet.opendata.dto.result.WghSjxxbDetailResultDTO;
import com.epmet.opendata.dto.wgh.WghSjxxbDTO;
import com.epmet.opendata.excel.WghSjxxbExcel;
import com.epmet.opendata.service.WghSjxxbService;
@ -79,7 +86,7 @@ public class WghSjxxbController {
}
/**
* 调用ruoyi接口获取wgh_sjxx数据
* 调用ruoyi接口获取wgh_sjxxb数据
*
* @param dto
* @return com.epmet.commons.tools.utils.Result
@ -92,4 +99,33 @@ public class WghSjxxbController {
return new Result();
}
/**
* 事件信息分页
*
* @param form
* @param tokenDto
* @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.opendata.dto.result.WghSjxxResultDTO>>
* @author LZN
* @date 2022/6/29 10:42
*/
@PostMapping("todo/page")
public Result<PageData<WghSjxxResultDTO>> getSjxxPage(@RequestBody WghSjxxFormDTO form, @LoginUser TokenDto tokenDto) {
PageData<WghSjxxResultDTO> dto = wghSjxxbService.getSjxxPage(form);
return new Result<PageData<WghSjxxResultDTO>>().ok(dto);
}
/**
* 根据id查询详情
*
* @param dto
* @return com.epmet.commons.tools.utils.Result<com.epmet.opendata.dto.result.WghSjxxbDetailResultDTO>
* @author LZN
* @date 2022/6/30 14:12
*/
@PostMapping("sjxx/getDetailById")
public Result<WghSjxxbDetailResultDTO> getDetailById(@RequestBody WghSjxxbDetailFormDTO dto) {
WghSjxxbDetailResultDTO result = wghSjxxbService.getDetailById(dto);
return new Result<WghSjxxbDetailResultDTO>().ok(result);
}
}

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

@ -35,7 +35,8 @@ public interface CaLoudongDao extends BaseDao<CaLoudongEntity> {
List<CaLoudongResultDTO> getPage(@Param("communityName") String communityName,
@Param("buildingName") String buildingName,
@Param("gridId") String gridId,
@Param("gridList") List<String> gridList);
@Param("gridList") List<String> gridList,
@Param("buildingAddr") String buildingAddr);
/**
* 楼栋基本信息详情

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

@ -25,7 +25,8 @@ public interface CaPingfangDao extends BaseDao<CaPingfangEntity> {
List<CaPingfangResultDTO> getPage(@Param("buildingName") String buildingName,
@Param("communityName") String communityName,
@Param("gridId") String gridId,
@Param("gridList") List<String> gridList);
@Param("gridList") List<String> gridList,
@Param("buildingAddr") String buildingAddr);
int deleteAll();

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

@ -30,7 +30,8 @@ public interface CaRentalDao extends BaseDao<CaRentalEntity> {
@Param("houseName") String houseName,
@Param("renterName") String renterName,
@Param("gridId") String gridId,
@Param("gridList") List<String> gridList);
@Param("gridList") List<String> gridList,
@Param("houseAddress") String houseAddress);
int deleteAll();

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

@ -32,7 +32,8 @@ public interface CaResidentDao extends BaseDao<CaResidentEntity> {
@Param("idCard") String idCard,
@Param("telephone") String telephone,
@Param("gridId") String gridId,
@Param("gridList") List<String> gridList);
@Param("gridList") List<String> gridList,
@Param("curliveAddressDetail") String curliveAddressDetail);
int deleteAll();

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

@ -30,7 +30,8 @@ public interface CaRotatorsDao extends BaseDao<CaRotatorsEntity> {
@Param("idCard") String idCard,
@Param("telephone") String telephone,
@Param("gridId") String gridId,
@Param("gridList") List<String> gridList);
@Param("gridList") List<String> gridList,
@Param("curliveAddressDetail") String curliveAddressDetail);
int deleteAll();

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

@ -0,0 +1,52 @@
package com.epmet.opendata.dao;
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.entity.WghSjxxEntity;
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-05
*/
@Mapper
public interface WghSjxxDao extends BaseDao<WghSjxxEntity> {
/**
* 全量删除
*
* @param
* @return int
* @author LZN
* @date 2022/7/5 14:18
*/
int deleteAll();
/**
* 新的事件信息分页
*
* @param form
* @return java.util.List<com.epmet.opendata.dto.result.NewWghSjxxResultDTO>
* @author LZN
* @date 2022/7/5 15:49
*/
List<NewWghSjxxResultDTO> getWghSjxxPage(@Param("form") NewWghSjxxFormDTO form);
/**
* 查询事件信息详情
*
* @param dto
* @return com.epmet.opendata.dto.result.NewWghSjxxResultDTO
* @author LZN
* @date 2022/7/5 16:15
*/
NewWghSjxxResultDTO getWghSjxxDetail(@Param("dto") WghSjxxDetailFormDto dto);
}

27
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java

@ -1,8 +1,14 @@
package com.epmet.opendata.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.opendata.dto.form.WghSjxxFormDTO;
import com.epmet.opendata.dto.result.WghSjxxResultDTO;
import com.epmet.opendata.dto.result.WghSjxxbDetailResultDTO;
import com.epmet.opendata.entity.WghSjxxbEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 事件信息
@ -14,4 +20,25 @@ import org.apache.ibatis.annotations.Mapper;
public interface WghSjxxbDao extends BaseDao<WghSjxxbEntity> {
int deleteAll();
/**
* 事件信息分页
*
* @param form
* @return java.util.List<com.epmet.opendata.dto.result.WghSjxxResultDTO>
* @author LZN
* @date 2022/6/29 10:43
*/
List<WghSjxxResultDTO> getSjxxPage(@Param("form") WghSjxxFormDTO form);
/**
* 根据id查询详情
*
* @param taskid
* @return com.epmet.opendata.dto.result.WghSjxxbDetailResultDTO
* @author LZN
* @date 2022/6/30 14:13
*/
WghSjxxbDetailResultDTO getDetailById(@Param("taskid") String taskid);
}

335
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxEntity.java

@ -0,0 +1,335 @@
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-05
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("wgh_sjxx")
public class WghSjxxEntity {
private static final long serialVersionUID = 1L;
/**
* 案卷标识
*/
private Integer recid;
/**
* 事件编号
*/
private String sjbh;
/**
* 事件领域
*/
private String sjlyu;
/**
* 事件大类
*/
private String sjdl;
/**
* 事件小类
*/
private String sjxl;
/**
* 事件细类
*/
private String sjxil;
/**
* 事件来源
*/
private String sjly;
/**
* 所属区/
*/
private String ssqs;
/**
* 所属街道
*/
private String ssjd;
/**
* 所属社区
*/
private String sssq;
/**
* 事件地址
*/
private String sjdz;
/**
* 事件描述
*/
private String sjms;
/**
* 网格员标识
*/
private String wgybs;
/**
* 网格员名称
*/
private String wgymc;
/**
* 所属部门
*/
private String ssbm;
/**
* X坐标
*/
private BigDecimal xzb;
/**
* Y坐标
*/
private BigDecimal yzb;
/**
* 核实意见
*/
private String hsyj;
/**
* 创建日期
*/
private Date createdate;
/**
* 事件领域标签
*/
private String sjlyubq;
/**
* 事件大类标签
*/
private String sjdlbq;
/**
* 事件小类标签
*/
private String sjxlbq;
/**
* 事件细类标签
*/
private String sjxilbq;
/**
* 所属区/市标签
*/
private String ssqsbq;
/**
* 所属街道标签
*/
private String ssjdbq;
/**
* 所属社区标签
*/
private String sssqbq;
/**
* 事件上报
*/
private String sjsbwj;
/**
* 事件核实
*/
private String sjhswj;
/**
* 事件处置
*/
private String sjczwj;
/**
* 事件核查
*/
private String sjhcwj;
/**
* 外系统唯一标识
*/
private String wxtwybs;
/**
* 缩略图
*/
private String slt;
/**
* 处置单位
*/
private Integer czdw;
/**
* 处置结果
*/
private String czjg;
/**
* 处置单位标签
*/
private String czdwbq;
/**
* 是否退单
*/
private Integer sftd;
/**
* 是否延期
*/
private Integer sfyq;
/**
* 核查意见
*/
private String hcyj;
/**
* 是否作废
*/
private Integer sfzf;
/**
* 是否已核实
*/
private Integer sfyhs;
/**
* 是否已核查
*/
private Integer sfyhc;
/**
* 是否已督办
*/
private Integer sfydb;
/**
* 专项任务标识
*/
private Integer zxrwbs;
/**
* 待确责
*/
private Integer dqz;
/**
* 熔断状态
*/
private Integer rdzt;
/**
* 事件来源标签
*/
private String sjlybq;
/**
* 应办结时间
*/
private Date ybjsj;
/**
* 接收部门标识
*/
private Integer jsbmbs;
/**
* 核实人员标识
*/
private Integer hsrybs;
/**
* 核查人员标识
*/
private Integer hcrybs;
/**
* 处置人员标识
*/
private Integer czrybs;
/**
* 是否已处置
*/
private Integer sfycz;
/**
* 核实时间
*/
private Date hssj;
/**
* 核查时间
*/
private Date hcsj;
/**
* 处置时间
*/
private Date czsj;
/**
* 是否自发自处
*/
private Integer sfzfzc;
/**
* 核查用时
*/
private BigDecimal hcys;
/**
* 诉求联系人
*/
private String sqlxr;
/**
* 僵尸车
*/
private Integer jsc;
/**
* 到期时间
*/
private Date dqsj;
/**
* 星级评定
*/
private Integer xjpd;
/**
* 所属网格
*/
private String sswg;
}

205
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSjxxExcel.java

@ -0,0 +1,205 @@
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-05
*/
@Data
public class WghSjxxExcel {
@Excel(name = "案卷标识")
private Integer recid;
@Excel(name = "事件编号")
private String sjbh;
@Excel(name = "事件领域")
private String sjlyu;
@Excel(name = "事件大类")
private String sjdl;
@Excel(name = "事件小类")
private String sjxl;
@Excel(name = "事件细类")
private String sjxil;
@Excel(name = "事件来源")
private String sjly;
@Excel(name = "所属区/市")
private String ssqs;
@Excel(name = "所属街道")
private String ssjd;
@Excel(name = "所属社区")
private String sssq;
@Excel(name = "事件地址")
private String sjdz;
@Excel(name = "事件描述")
private String sjms;
@Excel(name = "网格员标识")
private String wgybs;
@Excel(name = "网格员名称")
private String wgymc;
@Excel(name = "所属部门")
private String ssbm;
@Excel(name = "X坐标")
private BigDecimal xzb;
@Excel(name = "Y坐标")
private BigDecimal yzb;
@Excel(name = "核实意见")
private String hsyj;
@Excel(name = "创建日期")
private Date createdate;
@Excel(name = "事件领域标签")
private String sjlyubq;
@Excel(name = "事件大类标签")
private String sjdlbq;
@Excel(name = "事件小类标签")
private String sjxlbq;
@Excel(name = "事件细类标签")
private String sjxilbq;
@Excel(name = "所属区/市标签")
private String ssqsbq;
@Excel(name = "所属街道标签")
private String ssjdbq;
@Excel(name = "所属社区标签")
private String sssqbq;
@Excel(name = "事件上报")
private String sjsbwj;
@Excel(name = "事件核实")
private String sjhswj;
@Excel(name = "事件处置")
private String sjczwj;
@Excel(name = "事件核查")
private String sjhcwj;
@Excel(name = "外系统唯一标识")
private String wxtwybs;
@Excel(name = "缩略图")
private String slt;
@Excel(name = "处置单位")
private Integer czdw;
@Excel(name = "处置结果")
private String czjg;
@Excel(name = "处置单位标签")
private String czdwbq;
@Excel(name = "是否退单")
private Integer sftd;
@Excel(name = "是否延期")
private Integer sfyq;
@Excel(name = "核查意见")
private String hcyj;
@Excel(name = "是否作废")
private Integer sfzf;
@Excel(name = "是否已核实")
private Integer sfyhs;
@Excel(name = "是否已核查")
private Integer sfyhc;
@Excel(name = "是否已督办")
private Integer sfydb;
@Excel(name = "专项任务标识")
private Integer zxrwbs;
@Excel(name = "待确责")
private Integer dqz;
@Excel(name = "熔断状态")
private Integer rdzt;
@Excel(name = "事件来源标签")
private String sjlybq;
@Excel(name = "应办结时间")
private Date ybjsj;
@Excel(name = "接收部门标识")
private Integer jsbmbs;
@Excel(name = "核实人员标识")
private Integer hsrybs;
@Excel(name = "核查人员标识")
private Integer hcrybs;
@Excel(name = "处置人员标识")
private Integer czrybs;
@Excel(name = "是否已处置")
private Integer sfycz;
@Excel(name = "核实时间")
private Date hssj;
@Excel(name = "核查时间")
private Date hcsj;
@Excel(name = "处置时间")
private Date czsj;
@Excel(name = "是否自发自处")
private Integer sfzfzc;
@Excel(name = "核查用时")
private BigDecimal hcys;
@Excel(name = "诉求联系人")
private String sqlxr;
@Excel(name = "僵尸车")
private Integer jsc;
@Excel(name = "到期时间")
private Date dqsj;
@Excel(name = "星级评定")
private Integer xjpd;
@Excel(name = "所属网格")
private String sswg;
}

30
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSjxxRedis.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-05
*/
@Component
public class WghSjxxRedis {
@Autowired
private RedisUtils redisUtils;
public void delete(Object[] ids) {
}
public void set(){
}
public String get(String id){
return null;
}
}

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

@ -0,0 +1,114 @@
package com.epmet.opendata.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
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.WghSjxxResultDTO;
import com.epmet.opendata.dto.wgh.WghSjxxDTO;
import com.epmet.opendata.entity.WghSjxxEntity;
import java.util.List;
import java.util.Map;
/**
* 事件信息
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-07-05
*/
public interface WghSjxxService extends BaseService<WghSjxxEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<WghSjxxDTO>
* @author generator
* @date 2022-07-05
*/
PageData<WghSjxxDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<WghSjxxDTO>
* @author generator
* @date 2022-07-05
*/
List<WghSjxxDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return WghSjxxDTO
* @author generator
* @date 2022-07-05
*/
WghSjxxDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2022-07-05
*/
void save(WghSjxxDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2022-07-05
*/
void update(WghSjxxDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2022-07-05
*/
void delete(String[] ids);
/**
* 调用ruoyi接口获取wgh_sjxxb数据
*
* @param dto
* @return void
* @author LZN
* @date 2022/7/5 14:18
*/
void getWghSjxx(PreserVationFormDTO dto);
/**
* 新的事件信息分页
*
* @param form
* @return com.epmet.commons.tools.page.PageData<com.epmet.opendata.dto.result.NewWghSjxxResultDTO>
* @author LZN
* @date 2022/7/5 15:49
*/
PageData<NewWghSjxxResultDTO> getWghSjxxPage(NewWghSjxxFormDTO form);
/**
* 查询事件信息详情
*
* @param dto
* @return com.epmet.opendata.dto.result.NewWghSjxxResultDTO
* @author LZN
* @date 2022/7/5 16:15
*/
NewWghSjxxResultDTO getWghSjxxDetail(WghSjxxDetailFormDto dto);
}

24
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java

@ -3,6 +3,10 @@ package com.epmet.opendata.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.opendata.dto.form.PreserVationFormDTO;
import com.epmet.opendata.dto.form.WghSjxxFormDTO;
import com.epmet.opendata.dto.form.WghSjxxbDetailFormDTO;
import com.epmet.opendata.dto.result.WghSjxxResultDTO;
import com.epmet.opendata.dto.result.WghSjxxbDetailResultDTO;
import com.epmet.opendata.dto.wgh.WghSjxxbDTO;
import com.epmet.opendata.entity.WghSjxxbEntity;
@ -86,4 +90,24 @@ public interface WghSjxxbService extends BaseService<WghSjxxbEntity> {
* @date 2022/6/14 16:02
*/
void getPreserSjxxVation(PreserVationFormDTO dto);
/**
* 事件信息分页
*
* @param form
* @return com.epmet.commons.tools.page.PageData<com.epmet.opendata.dto.result.WghSjxxResultDTO>
* @author LZN
* @date 2022/6/29 10:43
*/
PageData<WghSjxxResultDTO> getSjxxPage(WghSjxxFormDTO form);
/**
* 根据id查询详情
*
* @param dto
* @return com.epmet.opendata.dto.result.WghSjxxbDetailResultDTO
* @author LZN
* @date 2022/6/30 14:12
*/
WghSjxxbDetailResultDTO getDetailById(WghSjxxbDetailFormDTO dto);
}

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

@ -133,7 +133,8 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
List<CaLoudongResultDTO> result = baseDao.getPage(dto.getCommunityName(),
dto.getBuildingName(),
dto.getGridId(),
gridList);
gridList,
dto.getBuildingAddr());
PageInfo<CaLoudongResultDTO> info = new PageInfo<>(result);
return new PageData<>(result, info.getTotal());
}

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

@ -127,7 +127,8 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
List<CaPingfangResultDTO> result = baseDao.getPage(dto.getBuildingName(),
dto.getCommunityName(),
dto.getGridId(),
gridList);
gridList,
dto.getBuildingAddr());
PageInfo<CaPingfangResultDTO> info = new PageInfo<>(result);
return new PageData<>(result, info.getTotal());
}

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

@ -131,7 +131,8 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
dto.getHouseName(),
dto.getRenterName(),
dto.getGridId(),
gridList);
gridList,
dto.getHouseAddress());
PageInfo<CaRentalResultDTO> info = new PageInfo<>(result);
return new PageData<>(result, info.getTotal());
}

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

@ -139,7 +139,8 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
dto.getIdCard(),
dto.getTelephone(),
dto.getGridId(),
gridList);
gridList,
dto.getCurliveAddressDetail());
PageInfo<CaResidentResultDTO> info = new PageInfo<>(result);
return new PageData<>(result, info.getTotal());
}

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

@ -135,7 +135,8 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
dto.getIdCard(),
dto.getTelephone(),
dto.getGridId(),
gridList);
gridList,
dto.getCurliveAddressDetail());
PageInfo<CaRotatorsResultDTO> info = new PageInfo<>(result);
return new PageData<>(result, info.getTotal());
}

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

@ -4,7 +4,6 @@ import com.epmet.opendata.dto.constant.CaWghDataConstant;
import com.epmet.opendata.dto.form.PreserVationFormDTO;
import com.epmet.opendata.service.*;
import lombok.extern.slf4j.Slf4j;
import net.bytebuddy.asm.Advice;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -79,6 +78,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService {
@Autowired
private CaBmCategoryService caBmCategoryService;
@Autowired
private WghSjxxService wghSjxxService;
@Override
public void guardarDatosTask(PreserVationFormDTO dto) {
if (StringUtils.isNotBlank(dto.getTableName())) {
@ -122,7 +124,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService {
case CaWghDataConstant.SHARE_WGH_JYZ:
wghJyzService.getPreserWghJyzVation(dto);
break;
case CaWghDataConstant.SHARE_WGH_SJXX:
case CaWghDataConstant.SHARE_WGH_SJXXB:
wghSjxxbService.getPreserSjxxVation(dto);
break;
case CaWghDataConstant.SHARE_WGH_SQXX:
@ -149,6 +151,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService {
case CaWghDataConstant.UNICOM_SYS_DICT:
caSysDictService.preserSysdictVation(dto);
break;
case CaWghDataConstant.SHARE_WGH_SJXX:
wghSjxxService.getWghSjxx(dto);
break;
}
} else{
throw new Error("没传名字");

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

Loading…
Cancel
Save