diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml index ee8461e06f..fbb645ddbc 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.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: diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml index 62a9e89b35..ba0dd38f67 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml index 29673cca9c..7e83d1cd35 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index f721a6164f..8c250df1ac 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-auth/deploy/docker-compose-prod.yml b/epmet-auth/deploy/docker-compose-prod.yml index b7776bbaaf..56c4a0a17b 100644 --- a/epmet-auth/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-auth/deploy/docker-compose-test.yml b/epmet-auth/deploy/docker-compose-test.yml index 521eea2a30..4766c36db6 100644 --- a/epmet-auth/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java index 5dfb1fd6c0..211fce084e 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java @@ -304,7 +304,7 @@ public class LoginServiceImpl implements LoginService { passwordLoginUserInfoFormDTO.setPhone(formDTO.getPhone()); Result userInfoResult = epmetUserFeignClient.selectLoginUserInfoByPassword(passwordLoginUserInfoFormDTO); if (!userInfoResult.success() || null == userInfoResult.getData()) { - logger.error("根据手机号查询运营人员信息失败,返回10003账号不存在"); + // logger.error("根据手机号查询运营人员信息失败,返回10003账号不存在"); throw new RenException(EpmetErrorCode.ERR10003.getCode()); } //3、密码是否正确 diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java index 2fe5b49d9a..0d18e6f706 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java @@ -27,7 +27,9 @@ public interface NumConstant { int ELEVEN = 11; int TWELVE = 12; int THIRTEEN = 13; + int SIXTEEN = 16; int SEVENTEEN = 17; + int EIGHTEEN = 18; int FIFTEEN = 15; int FOURTEEN=14; int TWENTY = 20; diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 4995291154..a13d6cf1db 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -258,6 +258,7 @@ public enum EpmetErrorCode { IC_MOVE_IN(8926,"居民信息中房屋信息与当前选择房屋不一致，是否更新？"), NOT_REGEIST_RESI(8927,"未注册居民"), UNIT_EXIST_HOUSES_ERROR(8928,"单元下存在房屋，不可修改单元数"), + IC_VACCINE(8929,"已存在相同记录，请去修改原有记录"), MISMATCH(10086,"人员与房屋信息不匹配，请与工作人员联系。"), diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index b9795ef8dc..579f8ee9cf 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -778,6 +778,18 @@ public class RedisKeys { return rootPrefix.concat("lock:").concat(methodName); } + /** + * desc:获取分布式锁key + * @param customerId + * @return + */ + public static String getXiaoquEditLock(String customerId) { + if (StringUtils.isBlank(customerId)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误"); + } + return rootPrefix.concat("lock:xiaoquedit").concat(customerId); + } + /** * desc:获取更新 房屋内有居民数量的key * @param customerId @@ -791,4 +803,18 @@ public class RedisKeys { } + /** + * desc: 数据同步业务key 根据方法名区分 + * + * @param bizType [resi] + * @return java.lang.String + * @author LiuJanJun + * @date 2022/7/16 7:12 下午 + */ + public static String getDataSyncKey(String bizType) { + if (StringUtils.isBlank(bizType)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误"); + } + return rootPrefix.concat("datasync:").concat(bizType); + } } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java index 27636e435a..a324a5970a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java @@ -357,6 +357,24 @@ public class RedisUtils { return redisTemplate.opsForSet().members(key); } + /** + * @Description 获取一个（set） + * @param key + * @author zxc + */ + public Object sPop(String key){ + return redisTemplate.opsForSet().pop(key); + } + + /** + * @Description 添加一个元素（set） + * @param key + * @author zxc + */ + public Long sAdd(String key,Object value){ + return redisTemplate.opsForSet().add(key,value); + } + /** * @Description 获取 zset 中带score的集合 * @param key diff --git a/epmet-commons/epmet-commons-tools/src/main/resources/logback-base.xml b/epmet-commons/epmet-commons-tools/src/main/resources/logback-base.xml index 4d40231ff9..8b34bed209 100644 --- a/epmet-commons/epmet-commons-tools/src/main/resources/logback-base.xml +++ b/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 - - + + + + - + \ No newline at end of file diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index 625089b478..04b3e481b0 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml index 49094f4521..1f12405890 100644 --- a/epmet-gateway/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-gateway/deploy/docker-compose-test.yml b/epmet-gateway/deploy/docker-compose-test.yml index 5a88a1e499..6570906ee1 100644 --- a/epmet-gateway/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml index 0973856c00..7df772d03e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index 3576fadb73..8f887c8b2e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-test.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-test.yml index e066047e36..cba29365f5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml index 9f0dfb863a..d5527e0e0c 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index 42714f4238..3d4bcd6279 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml index 2b55a26867..f51e362211 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml index 09d626e7c5..7e20e6dec6 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 78a46c8117..a590e95d75 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml index 5beb53c90f..f9143a1f8f 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml index f132877210..6cf57e3109 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml +++ b/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') + + AND spp.CUSTOMER_ID = #{customerId} + + + + spp.PROJECT_ID = #{projectId} + + ) b ON a.PROJECT_ID = b.PROJECT_ID - - AND b.CUSTOMER_ID = #{customerId} - - - - b.PROJECT_ID = #{projectId} - - 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 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml index 1cd58359a9..5daf0434be 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml index 12ab635118..01ed6a408b 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-test.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-test.yml index 74e66105f0..c5d96d9b91 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/AreaCodeDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/AreaCodeDTO.java index 920d48f56b..6726f0547a 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/AreaCodeDTO.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/AreaCodeDTO.java @@ -37,7 +37,7 @@ public class AreaCodeDTO implements Serializable { /** * 主键 */ - private Integer id; + private String id; /** * 省份code diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeDetailFormDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeDetailFormDTO.java new file mode 100644 index 0000000000..f4ca97d775 --- /dev/null +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeDetailFormDTO.java @@ -0,0 +1,13 @@ +package com.epmet.dto.form; + +import lombok.Data; + +@Data +public class AreaCodeDetailFormDTO { + + private String areaCode; + /** + * 省级:province; 市级: city; 区县级: district ;乡（镇、街道）级:street ;社区级：community + */ + private String level; +} diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/CustomerTreeDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/CustomerTreeDTO.java new file mode 100644 index 0000000000..80bf551608 --- /dev/null +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/CustomerTreeDTO.java @@ -0,0 +1,76 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +/** + * 客户关系表(01.14 add) + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-02-03 + */ +@Data +public class CustomerTreeDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + + /** + * 当前客户级别（社区级：community， +乡（镇、街道）级:street, +区县级: district, +市级: city +省级:province） + */ + private String level; + + /** + * 当前客户的地区编码，实际就是根组织的area_code + */ + private String areaCode; + + /** + * 当前客户的地区名称 + */ + private String areaName; + + /** + * 当前客户的父节点地区名称 + */ + private String parentCode; + + /** + * 客户名称 + */ + private String customerName; + + /** + * 下一级 + */ + private List children; +} \ No newline at end of file diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java index 4214e77cf8..43766990ba 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java @@ -98,6 +98,28 @@ public interface EpmetCommonServiceOpenFeignClient { @PostMapping("commonservice/workday/workminutes") Result> workMinutes(@RequestBody WorkMinuteFormDTO param); + /** + * 行政地区编码查询 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/7/6 15:07 + */ + @PostMapping("commonservice/areacode/areacodedetail") + Result areaCodeDetail(@RequestBody AreaCodeDetailFormDTO formDTO); + + /** + * 行政地区编码树查询 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/7/6 15:07 + */ + @PostMapping("commonservice/areacode/areacodetree") + Result> areaCodeTree(@RequestBody CustomerTreeDTO formDTO); + /** * @Description 行政地区编码查询 * @Param formDTO diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java index 21f7fe531a..05b73bba65 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java @@ -79,6 +79,16 @@ public class EpmetCommonServiceOpenFeignClientFallback implements EpmetCommonSer return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "workMinutes", param); } + @Override + public Result areaCodeDetail(AreaCodeDetailFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "areaCodeDetail", formDTO); + } + + @Override + public Result> areaCodeTree(CustomerTreeDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "areaCodeTree", formDTO); + } + @Override public Result> areaCodeDictTree(AreaCodeDictFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "areaCodeDictTree", formDTO); diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index 7a83d38429..b341b3cd9f 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml index ab8df1446d..6e869da5e4 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml index 058b976195..24fb821162 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java index 7bf4e537f8..ca212e908f 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java @@ -25,12 +25,10 @@ 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.dto.AreaCodeDTO; -import com.epmet.dto.form.AddAreaCodeDictFormDTO; -import com.epmet.dto.form.AddAreaCodeFormDTO; -import com.epmet.dto.form.AreaCodeDictFormDTO; -import com.epmet.dto.form.AreaCodeFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.AreaCodeResultDTO; +import com.epmet.dto.result.CustomerTreeDTO; import com.epmet.service.AreaCodeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -133,4 +131,26 @@ public class AreaCodeController { public Result> nextArea(@RequestBody AreaCodeFormDTO formDTO){ return new Result>().ok(areaCodeService.nextArea(formDTO)); } + + /** + * @Description 行政地区编码查询 + * @Param formDTO + * @author zxc + * @date 2021/1/7 下午1:41 + */ + @PostMapping("areacodedetail") + public Result areaCodeDetail(@RequestBody AreaCodeDetailFormDTO formDTO){ + return new Result().ok(areaCodeService.getAreaCodeDetail(formDTO)); + } + + /** + * @Description 行政地区编码查询 + * @Param formDTO + * @author zxc + * @date 2021/1/7 下午1:41 + */ + @PostMapping("areacodetree") + public Result> areaCodeTree(@RequestBody CustomerTreeDTO formDTO){ + return new Result>().ok(areaCodeService.getAreaCodeTree(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java index bfe5c8139e..ab101aba89 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java @@ -37,19 +37,25 @@ public interface AreaCodeDao extends BaseDao { List selectAllArea(); - AreaCodeDTO selectByCountyCode(String countyCode); + AreaCodeDTO selectByCountyCode(@Param("countyCode") String countyCode); - AreaCodeDTO selectByCityCode(String cityCode); + AreaCodeDTO selectByCityCode(@Param("cityCode") String cityCode); + + AreaCodeDTO selectByProvinceCode(@Param("provinceCode") String provinceCode); + + AreaCodeResultDTO selectByStreetCode(@Param("streetCode") String streetCode); + + AreaCodeResultDTO selectByCommunityCode(@Param("communityCode") String communityCode); AreaCodeDTO selectMaxCounty(String cityCode); List selectProvince(); - List selectCity(@Param("pCode")String pCode); + List selectCity(@Param("pCode") String pCode); - List selectDistrict(@Param("pCode")String pCode); + List selectDistrict(@Param("pCode") String pCode); - List selectStreet(@Param("pCode")String pCode); + List selectStreet(@Param("pCode") String pCode); - List selectCommunity(@Param("pCode")String pCode); + List selectCommunity(@Param("pCode") String pCode); } \ No newline at end of file diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java index e452332fea..6467bb82f0 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java @@ -20,12 +20,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.AreaCodeDTO; -import com.epmet.dto.form.AddAreaCodeDictFormDTO; -import com.epmet.dto.form.AddAreaCodeFormDTO; -import com.epmet.dto.form.AreaCodeDictFormDTO; -import com.epmet.dto.form.AreaCodeFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.AreaCodeResultDTO; +import com.epmet.dto.result.CustomerTreeDTO; import com.epmet.entity.AreaCodeEntity; import java.util.List; @@ -127,4 +125,8 @@ public interface AreaCodeService extends BaseService { String addAreaCode(AddAreaCodeFormDTO formDTO); List nextArea(AreaCodeFormDTO formDTO); + + AreaCodeResultDTO getAreaCodeDetail(AreaCodeDetailFormDTO formDTO); + + List getAreaCodeTree(CustomerTreeDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java index 4d873b333e..b0f519a3ac 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java @@ -36,12 +36,10 @@ import com.epmet.dao.AreaCodeChildDao; import com.epmet.dao.AreaCodeDao; import com.epmet.dto.AreaCodeChildDTO; import com.epmet.dto.AreaCodeDTO; -import com.epmet.dto.form.AddAreaCodeDictFormDTO; -import com.epmet.dto.form.AddAreaCodeFormDTO; -import com.epmet.dto.form.AreaCodeDictFormDTO; -import com.epmet.dto.form.AreaCodeFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.AreaCodeResultDTO; +import com.epmet.dto.result.CustomerTreeDTO; import com.epmet.entity.AreaCodeEntity; import com.epmet.redis.AreaCodeRedis; import com.epmet.service.AreaCodeChildService; @@ -72,6 +70,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -88,8 +87,8 @@ public class AreaCodeServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -125,7 +124,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl areaCodeDictTree(AreaCodeDictFormDTO formDTO) { List tree = new ArrayList<>(); String s = areaCodeRedis.get(AreaCodeConstant.SCREEN_TREE); - if (StringUtils.isNotBlank(s)){ - tree = JSON.parseArray(s,AreaCodeDictResultDTO.class); - }else { + if (StringUtils.isNotBlank(s)) { + tree = JSON.parseArray(s, AreaCodeDictResultDTO.class); + } else { List areaCodeDictResultDTOS = disposeTree(formDTO); - areaCodeRedis.set(AreaCodeConstant.SCREEN_TREE,areaCodeDictResultDTOS); + areaCodeRedis.set(AreaCodeConstant.SCREEN_TREE, areaCodeDictResultDTOS); tree = areaCodeDictResultDTOS; } - if (StringUtils.isBlank(formDTO.getRootAreaCode())){ + if (StringUtils.isBlank(formDTO.getRootAreaCode())) { return tree; } List treeByRootAreaCode = getTreeByRootAreaCode(tree, formDTO.getRootAreaCode()); @@ -149,12 +148,12 @@ public class AreaCodeServiceImpl extends BaseServiceImpl disposeTree(AreaCodeDictFormDTO formDTO){ + public List disposeTree(AreaCodeDictFormDTO formDTO) { // 查询所有省市区 List areaCodeDTOS = baseDao.selectAllArea(); // 查询所有街道、社区 @@ -173,8 +172,8 @@ public class AreaCodeServiceImpl extends BaseServiceImpl { - if (dto.getCode().equals(pCode)){ + groupByPCode.forEach((pCode, v) -> { + if (dto.getCode().equals(pCode)) { List fiveResult = new ArrayList<>(); v.forEach(five -> { AreaCodeDictResultDTO fiveDto = new AreaCodeDictResultDTO(); @@ -189,7 +188,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl fourSort = new ArrayList<>(); - if (!CollectionUtils.isEmpty(fourResult)){ + if (!CollectionUtils.isEmpty(fourResult)) { fourSort = fourResult.stream().sorted(Comparator.comparing(AreaCodeDictResultDTO::getCode)).collect(Collectors.toList()); } @@ -209,7 +208,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl fourOnceResult = new ArrayList<>(); finalFourSort.forEach(four -> { - if (dto.getCode().equals(four.getParentCode())){ + if (dto.getCode().equals(four.getParentCode())) { fourOnceResult.add(four); } }); @@ -220,13 +219,13 @@ public class AreaCodeServiceImpl extends BaseServiceImpl { + groupByProvince.forEach((p, v) -> { AreaCodeDictResultDTO dto = new AreaCodeDictResultDTO(); dto.setCode(p); dto.setName(v.get(NumConstant.ZERO).getProvinceName()); List cityOnceResult = new ArrayList<>(); cityResult.forEach(c -> { - if (dto.getCode().equals(c.getParentCode())){ + if (dto.getCode().equals(c.getParentCode())) { cityOnceResult.add(c); } }); @@ -239,54 +238,51 @@ public class AreaCodeServiceImpl extends BaseServiceImpl + *

* 暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样 - * ==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样== - * 暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样 - * - * - * + * ==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样== + * 暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样 * @Param tree * @Param rootAreaCode * @author zxc * @date 2021/1/8 上午10:02 */ - public List getTreeByRootAreaCode(List tree , String rootAreaCode){ + public List getTreeByRootAreaCode(List tree, String rootAreaCode) { List result = new ArrayList<>(); - if (!CollectionUtils.isEmpty(tree)){ + if (!CollectionUtils.isEmpty(tree)) { // 省级获取 for (AreaCodeDictResultDTO dto : tree) { - if (rootAreaCode.equals(dto.getCode())){ + if (rootAreaCode.equals(dto.getCode())) { result.add(dto); return result; } // 市级获取 - if (!CollectionUtils.isEmpty(dto.getChildren())){ + if (!CollectionUtils.isEmpty(dto.getChildren())) { for (AreaCodeDictResultDTO child : dto.getChildren()) { - if (rootAreaCode.equals(child.getCode())){ + if (rootAreaCode.equals(child.getCode())) { result.add(child); return result; } // 区级获取 - if (!CollectionUtils.isEmpty(child.getChildren())){ + if (!CollectionUtils.isEmpty(child.getChildren())) { for (AreaCodeDictResultDTO threeChild : child.getChildren()) { - if (rootAreaCode.equals(threeChild.getCode())){ + if (rootAreaCode.equals(threeChild.getCode())) { result.add(threeChild); return result; } // 街道获取 - if (!CollectionUtils.isEmpty(threeChild.getChildren())){ + if (!CollectionUtils.isEmpty(threeChild.getChildren())) { for (AreaCodeDictResultDTO fourChild : threeChild.getChildren()) { - if (rootAreaCode.equals(fourChild.getCode())){ + if (rootAreaCode.equals(fourChild.getCode())) { result.add(fourChild); return result; } // 社区获取 - if (!CollectionUtils.isEmpty(fourChild.getChildren())){ + if (!CollectionUtils.isEmpty(fourChild.getChildren())) { for (AreaCodeDictResultDTO fiveChild : fourChild.getChildren()) { - if (rootAreaCode.equals(fiveChild.getCode())){ + if (rootAreaCode.equals(fiveChild.getCode())) { result.add(fiveChild); return result; } @@ -304,40 +300,40 @@ public class AreaCodeServiceImpl extends BaseServiceImpl areaCodeDictTreePlus(AreaCodeDictFormDTO formDTO){ + public List areaCodeDictTreePlus(AreaCodeDictFormDTO formDTO) { List tree = new ArrayList<>(); String s = areaCodeRedis.get(AreaCodeConstant.THREE_SCREEN_TREE); - if (StringUtils.isNotBlank(s)){ - tree = JSON.parseArray(s,AreaCodeDictResultDTO.class); - }else { + if (StringUtils.isNotBlank(s)) { + tree = JSON.parseArray(s, AreaCodeDictResultDTO.class); + } else { List threeTree = beforeThreeTree(); - areaCodeRedis.set(AreaCodeConstant.THREE_SCREEN_TREE,threeTree); + areaCodeRedis.set(AreaCodeConstant.THREE_SCREEN_TREE, threeTree); tree = threeTree; } - if (StringUtils.isBlank(formDTO.getRootAreaCode())){ + if (StringUtils.isBlank(formDTO.getRootAreaCode())) { return tree; } - if (StringUtils.isBlank(formDTO.getRootAreaLevel())){ + if (StringUtils.isBlank(formDTO.getRootAreaLevel())) { throw new RenException(AreaCodeConstant.ROOT_AGENCY_LEVEL_IS_LEVEL); } // 传参为街道-社区级 - if (formDTO.getRootAreaLevel().equals(AreaCodeConstant.STREET) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.COMMUNITY)){ + if (formDTO.getRootAreaLevel().equals(AreaCodeConstant.STREET) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.COMMUNITY)) { tree = disposeAfterTwoLevel(formDTO); - }else if (formDTO.getRootAreaLevel().equals(AreaCodeConstant.PROVINCE) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.CITY) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.DISTRICT)){ - tree = disposeBeforeThreeLevelFinal(formDTO,tree); - }else { - throw new RenException(String.format(AreaCodeConstant.LEVEL_ERROR,formDTO.getRootAreaLevel())); + } else if (formDTO.getRootAreaLevel().equals(AreaCodeConstant.PROVINCE) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.CITY) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.DISTRICT)) { + tree = disposeBeforeThreeLevelFinal(formDTO, tree); + } else { + throw new RenException(String.format(AreaCodeConstant.LEVEL_ERROR, formDTO.getRootAreaLevel())); } return tree; } /** - * @Description 省市区三级联动查询 + * @Description 省市区三级联动查询 * @Param * @author zxc * @date 2021/1/11 上午9:35 */ - public List beforeThreeTree(){ + public List beforeThreeTree() { // 查询所有省市区 List areaCodeDTOS = baseDao.selectAllArea(); Map> groupByCity = areaCodeDTOS.stream().collect(Collectors.groupingBy(AreaCodeDTO::getCityCode)); @@ -362,13 +358,13 @@ public class AreaCodeServiceImpl extends BaseServiceImpl { + groupByProvince.forEach((p, v) -> { AreaCodeDictResultDTO dto = new AreaCodeDictResultDTO(); dto.setCode(p); dto.setName(v.get(NumConstant.ZERO).getProvinceName()); List cityOnceResult = new ArrayList<>(); cityResult.forEach(c -> { - if (dto.getCode().equals(c.getParentCode())){ + if (dto.getCode().equals(c.getParentCode())) { cityOnceResult.add(c); } }); @@ -383,12 +379,12 @@ public class AreaCodeServiceImpl extends BaseServiceImpl afterTwoTree(AreaCodeDictFormDTO form){ + public List afterTwoTree(AreaCodeDictFormDTO form) { // 查询所有街道、社区 List areaCodeChildDTOS = childDao.selectAllChild(form.getRootAreaCode()); List fourResult = new ArrayList<>(); @@ -399,7 +395,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl levelFive = org.apache.commons.collections4.CollectionUtils.isNotEmpty(groupByLevel.get(NumConstant.FIVE)) ? groupByLevel.get(NumConstant.FIVE) : new ArrayList<>(); Map> groupByPCode = CollectionUtils.isEmpty(levelFive) ? new HashMap<>() : levelFive.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode)); //街道 - List levelFour = org.apache.commons.collections4.CollectionUtils.isNotEmpty(groupByLevel.get(NumConstant.FOUR)) ?groupByLevel.get(NumConstant.FOUR):new ArrayList<>(); + List levelFour = org.apache.commons.collections4.CollectionUtils.isNotEmpty(groupByLevel.get(NumConstant.FOUR)) ? groupByLevel.get(NumConstant.FOUR) : new ArrayList<>(); // 6级 List levelSix = groupByLevel.get(NumConstant.SIX); Map> groupBySixPCode = CollectionUtils.isEmpty(levelSix) ? new HashMap<>() : levelSix.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode)); @@ -409,8 +405,8 @@ public class AreaCodeServiceImpl extends BaseServiceImpl { - if (dto.getCode().equals(k)){ + groupBySixPCode.forEach((k, v) -> { + if (dto.getCode().equals(k)) { List six = new ArrayList<>(); v.forEach(s -> { AreaCodeDictResultDTO sixDto = new AreaCodeDictResultDTO(); @@ -431,8 +427,8 @@ public class AreaCodeServiceImpl extends BaseServiceImpl { - if (dto.getCode().equals(pCode)){ + groupByFivePCode.forEach((pCode, v) -> { + if (dto.getCode().equals(pCode)) { dto.setChildren(v); } }); @@ -443,28 +439,28 @@ public class AreaCodeServiceImpl extends BaseServiceImpl disposeAfterTwoLevel(AreaCodeDictFormDTO form){ + public List disposeAfterTwoLevel(AreaCodeDictFormDTO form) { List result = new ArrayList<>(); List areaCodeDictResultDTOS = afterTwoTree(form); - if (CollectionUtils.isEmpty(areaCodeDictResultDTOS)){ + if (CollectionUtils.isEmpty(areaCodeDictResultDTOS)) { return new ArrayList<>(); } - if (form.getRootAreaLevel().equals(AreaCodeConstant.STREET)){ + if (form.getRootAreaLevel().equals(AreaCodeConstant.STREET)) { for (AreaCodeDictResultDTO dto : areaCodeDictResultDTOS) { - if (dto.getCode().equals(form.getRootAreaCode())){ + if (dto.getCode().equals(form.getRootAreaCode())) { result.add(dto); } } - }else { + } else { for (AreaCodeDictResultDTO dto : areaCodeDictResultDTOS) { - if (!CollectionUtils.isEmpty(dto.getChildren())){ + if (!CollectionUtils.isEmpty(dto.getChildren())) { for (AreaCodeDictResultDTO child : dto.getChildren()) { - if (child.getCode().equals(form.getRootAreaCode())){ + if (child.getCode().equals(form.getRootAreaCode())) { result.add(child); } } @@ -475,42 +471,42 @@ public class AreaCodeServiceImpl extends BaseServiceImpl disposeBeforeThreeLevel(AreaCodeDictFormDTO form,List tree){ + public List disposeBeforeThreeLevel(AreaCodeDictFormDTO form, List tree) { List result = new ArrayList<>(); - if (CollectionUtils.isEmpty(tree)){ + if (CollectionUtils.isEmpty(tree)) { return new ArrayList<>(); } - if (form.getRootAreaLevel().equals(AreaCodeConstant.PROVINCE)){ + if (form.getRootAreaLevel().equals(AreaCodeConstant.PROVINCE)) { for (AreaCodeDictResultDTO dto : tree) { - if (dto.getCode().equals(form.getRootAreaCode())){ + if (dto.getCode().equals(form.getRootAreaCode())) { result.add(dto); return result; } } - }else if (form.getRootAreaLevel().equals(AreaCodeConstant.CITY)){ + } else if (form.getRootAreaLevel().equals(AreaCodeConstant.CITY)) { for (AreaCodeDictResultDTO dto : tree) { - if (!CollectionUtils.isEmpty(dto.getChildren())){ + if (!CollectionUtils.isEmpty(dto.getChildren())) { for (AreaCodeDictResultDTO city : dto.getChildren()) { - if (city.getCode().equals(form.getRootAreaCode())){ + if (city.getCode().equals(form.getRootAreaCode())) { result.add(city); return result; } } } } - }else if (form.getRootAreaLevel().equals(AreaCodeConstant.DISTRICT)){ + } else if (form.getRootAreaLevel().equals(AreaCodeConstant.DISTRICT)) { for (AreaCodeDictResultDTO dto : tree) { - if (!CollectionUtils.isEmpty(dto.getChildren())){ + if (!CollectionUtils.isEmpty(dto.getChildren())) { for (AreaCodeDictResultDTO city : dto.getChildren()) { - if (!CollectionUtils.isEmpty(city.getChildren())){ + if (!CollectionUtils.isEmpty(city.getChildren())) { for (AreaCodeDictResultDTO child : city.getChildren()) { - if (child.getCode().equals(form.getRootAreaCode())){ + if (child.getCode().equals(form.getRootAreaCode())) { result.add(child); return result; } @@ -524,29 +520,29 @@ public class AreaCodeServiceImpl extends BaseServiceImpl disposeBeforeThreeLevelFinal(AreaCodeDictFormDTO form,List tree){ + public List disposeBeforeThreeLevelFinal(AreaCodeDictFormDTO form, List tree) { List threeDto = disposeBeforeThreeLevel(form, tree); List twoDto = afterTwoTree(form); - if (CollectionUtils.isEmpty(threeDto)){ + if (CollectionUtils.isEmpty(threeDto)) { return new ArrayList<>(); } - if (!CollectionUtils.isEmpty(twoDto)){ - if (form.getRootAreaLevel().equals(AreaCodeConstant.PROVINCE)){ + if (!CollectionUtils.isEmpty(twoDto)) { + if (form.getRootAreaLevel().equals(AreaCodeConstant.PROVINCE)) { for (AreaCodeDictResultDTO dto : tree) { - if (dto.getCode().equals(form.getRootAreaCode())){ - if (!CollectionUtils.isEmpty(dto.getChildren())){ + if (dto.getCode().equals(form.getRootAreaCode())) { + if (!CollectionUtils.isEmpty(dto.getChildren())) { for (AreaCodeDictResultDTO city : dto.getChildren()) { - if (!CollectionUtils.isEmpty(city.getChildren())){ + if (!CollectionUtils.isEmpty(city.getChildren())) { for (AreaCodeDictResultDTO child : city.getChildren()) { List areaList = new ArrayList<>(); for (AreaCodeDictResultDTO area : twoDto) { - if (child.getCode().equals(area.getParentCode())){ + if (child.getCode().equals(area.getParentCode())) { areaList.add(area); } } @@ -557,13 +553,13 @@ public class AreaCodeServiceImpl extends BaseServiceImpl areaList = new ArrayList<>(); for (AreaCodeDictResultDTO area : twoDto) { - if (child.getCode().equals(area.getParentCode())){ + if (child.getCode().equals(area.getParentCode())) { areaList.add(area); } } @@ -571,11 +567,11 @@ public class AreaCodeServiceImpl extends BaseServiceImpl areaList = new ArrayList<>(); for (AreaCodeDictResultDTO area : twoDto) { - if (dto.getCode().equals(area.getParentCode())){ + if (dto.getCode().equals(area.getParentCode())) { areaList.add(area); } } @@ -677,35 +673,35 @@ public class AreaCodeServiceImpl extends BaseServiceImpl nextArea(AreaCodeFormDTO formDTO) { - if(StringUtils.isBlank(formDTO.getParentAreaCode())&&StringUtils.isBlank(formDTO.getParentLevel())){ - String pKey=RedisKeys.getNextAreaCodeKey(NumConstant.ZERO_STR); - List list=areaCodeRedis.getNextAreaCodeKey(pKey); - if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(list)){ + if (StringUtils.isBlank(formDTO.getParentAreaCode()) && StringUtils.isBlank(formDTO.getParentLevel())) { + String pKey = RedisKeys.getNextAreaCodeKey(NumConstant.ZERO_STR); + List list = areaCodeRedis.getNextAreaCodeKey(pKey); + if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(list)) { return list; } - List pList=baseDao.selectProvince(); - areaCodeRedis.setNextAreaCodeKey(pKey,pList); + List pList = baseDao.selectProvince(); + areaCodeRedis.setNextAreaCodeKey(pKey, pList); return pList; } - String key=RedisKeys.getNextAreaCodeKey(formDTO.getParentAreaCode()); - List list=areaCodeRedis.getNextAreaCodeKey(key); - if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(list)){ + String key = RedisKeys.getNextAreaCodeKey(formDTO.getParentAreaCode()); + List list = areaCodeRedis.getNextAreaCodeKey(key); + if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(list)) { return list; } switch (formDTO.getParentLevel()) { @@ -723,17 +719,116 @@ public class AreaCodeServiceImpl extends BaseServiceImpl getAreaCodeTree(CustomerTreeDTO formDTO) { + List tree = new ArrayList<>(); + areaCodeHandle(formDTO.getLevel(), formDTO.getAreaCode(), tree); + return ConvertUtils.sourceToTarget(tree, CustomerTreeDTO.class); + } + + private void areaCodeHandle(String level, String areaCode, List tree) { + AreaCodeResultDTO result = new AreaCodeResultDTO(); + switch (level) { + case AreaCodeConstant.PROVINCE: + AreaCodeDTO province = baseDao.selectByProvinceCode(areaCode); + if (province != null) { + result.setAreaName(province.getProvinceName()); + result.setAreaCode(province.getProvinceCode()); + result.setParentCode(NumConstant.ZERO_STR); + result.setLevel(AreaCodeConstant.PROVINCE); + tree.add(result); + } + break; + case AreaCodeConstant.CITY: + AreaCodeDTO city = baseDao.selectByCityCode(areaCode); + if (city != null) { + result.setAreaName(city.getCityName()); + result.setAreaCode(city.getCityCode()); + result.setParentCode(city.getProvinceCode()); + result.setLevel(AreaCodeConstant.CITY); + tree.add(result); + areaCodeHandle(AreaCodeConstant.PROVINCE, city.getProvinceCode(), tree); + } + break; + case AreaCodeConstant.DISTRICT: + AreaCodeDTO county = baseDao.selectByCountyCode(areaCode); + if (county != null) { + result.setAreaName(county.getCountyName()); + result.setAreaCode(county.getCountyCode()); + result.setParentCode(county.getCityCode()); + result.setLevel(AreaCodeConstant.DISTRICT); + tree.add(result); + areaCodeHandle(AreaCodeConstant.CITY, county.getCityCode(), tree); + } + break; + case AreaCodeConstant.STREET: + result = baseDao.selectByStreetCode(areaCode); + tree.add(result); + areaCodeHandle(AreaCodeConstant.DISTRICT, result.getParentCode(), tree); + break; + case AreaCodeConstant.COMMUNITY: + result = baseDao.selectByCommunityCode(areaCode); + tree.add(result); + areaCodeHandle(AreaCodeConstant.STREET, result.getParentCode(), tree); + break; + default: + log.warn("Level错误：" + level); + } + } private String addDistrictAreaCode(String cityCode, String countyName) { AreaCodeDTO city = baseDao.selectByCityCode(cityCode); diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml index 34877f6c08..052b4369f7 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml @@ -20,6 +20,16 @@ and m.`CODE`=#{code} + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml index d9a9fdea13..54410607f7 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml index 9c95c05818..403ca1a43d 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml index 922073b042..6d887c033b 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index 8602660d10..18c420a523 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml index 40df63bc4c..201f47dbf1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml index 98e9560135..654721814d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceProjectServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceProjectServiceImpl.java index ecc399cfb3..88075ff9cd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceProjectServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceProjectServiceImpl.java @@ -150,6 +150,7 @@ public class IcServiceProjectServiceImpl extends BaseServiceImpl pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.getServiceProjectList(formDTO)); if (CollectionUtils.isNotEmpty(pageInfo.getList())){ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceProjectDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceProjectDao.xml index 17f4de965a..c042978f80 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceProjectDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceProjectDao.xml @@ -43,7 +43,7 @@ AND ID = #{serviceProjectId} - AND AGENCY_ID = #{agencyId} + AND AGENCY_ID_PATH like concat( '%',#{agencyId},'%') AND SERVICE_CATEGORY_KEY = #{serviceCategoryKey} diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index 1f21893994..259d1dc325 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml index 6bffd4ae87..202b2bea2e 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml index b0ef2bf2f9..8a92703f60 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcDataSyncTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcDataSyncTask.java new file mode 100644 index 0000000000..c92144ca26 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcDataSyncTask.java @@ -0,0 +1,36 @@ +package com.epmet.task.ic; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.task.ITask; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * desc:定时弥补数据 保证数据的一致性 + */ +@Slf4j +@Component("icDataSyncTask") +public class IcDataSyncTask implements ITask { + + @Resource + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + + /** + * 执行定时任务接口 + * + * @param params 参数，多参数使用JSON数据 + */ + @Override + public void run(String customerId) { + log.info("icDataSyncTask定时任务正在执行，参数为customerId：{}", customerId); + Result result = epmetUserOpenFeignClient.icDataSyncTask(customerId); + if (result.success()) { + log.info("icDataSyncTask定时任务正在执行定时任务执行成功"); + } else { + log.warn("icDataSyncTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + } + } +} diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml index 4c672bbdc6..3ab6727834 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml index 121ed15355..0b9082697a 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml index ad84863301..b256ee9150 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml index 7e1ef5224e..aa8f8011c2 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml index 4f1e024566..8bb390b032 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml index 3a849e0e50..8beffda74d 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index 8a4c242e3b..4bb1218f57 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml index de8dc52452..bc9be077b5 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml index c8224eba1a..8655bcee58 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 58694a45a2..2d1ab19dc5 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml index 04d9efb87a..247aef82a4 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml index 2127189ea7..fafa023c22 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java index f8c75e5a64..2898dae070 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java @@ -370,7 +370,6 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe * @Description 获取/刷新接口调用令牌 * @author zxc */ - @Transactional(rollbackFor = Exception.class) @Override public void refreshToken() { //查询 即将过期的 authorizer_access_token @@ -407,9 +406,8 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe AuthorizationInfoFormDTO authorizationInfo = new AuthorizationInfoFormDTO(); BeanUtils.copyProperties(formDTO, authorizationInfo); authorizationInfo.setAuthorizerAppid(authAppId); - //先逻辑删除，在插入 - authorizationInfoDao.deleteOldAuthorizerAccessToken(customerId, clientType); - authorizationInfoDao.insertAuthorizerAccessToken(formDTO); + // 先逻辑删除，在插入 + deleteOldAuthorizerAccessTokenAndInsert(customerId,clientType,formDTO); //缓存 refreshAuthorizerAccessToken redisThird.setAuthorizerRefreshToken(authorizationInfo); AuthorizationInfoResultDTO resultDTO = new AuthorizationInfoResultDTO(); @@ -425,6 +423,21 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe } + /** + * Desc: 删除旧的AuthorizerAccessToken，并新增AuthorizerAccessToken + * @param customerId + * @param clientType + * @param formDTO + * @author zxc + * @date 2022/7/12 09:15 + */ + @Transactional(rollbackFor = Exception.class) + public void deleteOldAuthorizerAccessTokenAndInsert(String customerId,String clientType,AuthorizerAccessTokenFormDTO formDTO){ + //先逻辑删除，在插入 + authorizationInfoDao.deleteOldAuthorizerAccessToken(customerId, clientType); + authorizationInfoDao.insertAuthorizerAccessToken(formDTO); + } + /** * @param * @Description 授权回调URL, 回调时并获取授权信息 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java index 52d258308a..70b6bdb9ae 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java @@ -141,6 +141,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { WxResult result = new WxResult<>(); String url = WxMaCodeConstant.SUBMIT_AUDIT_URL + "?" + "access_token=" + accessToken; Result submitResult = HttpClientManager.getInstance().sendPostByJSON(url, toJson(auditRequest)); + log.info("submitAudit result:{}",JSON.toJSONString(submitResult)); if (!submitResult.success()) { result.setErrorCode(submitResult.getCode()); result.setErrorMsg(submitResult.getMsg()); diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml index df08fa34bc..c8f27010a6 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml index 208783e787..6bbd6556a3 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml index e28e5d30f0..328e7f9d21 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml index 6082d0021f..f35c4ab3da 100644 --- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml index b47e7b1ed2..65c6a604aa 100644 --- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml index 29ad279725..48bb5e315b 100644 --- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index ccf13bda1a..7ccc76bc08 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml index b11be53989..ff8718a4fc 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml index aa986c7fa8..ea57ede817 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml index fb69e6294e..4a4966909e 100644 --- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml index c1883ae965..6acd8cf4d1 100644 --- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml index 3f5da9911a..1b7b464185 100644 --- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAreaResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAreaResultDTO.java new file mode 100644 index 0000000000..3eaaf991df --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAreaResultDTO.java @@ -0,0 +1,128 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 组织信息 + * + * @author sun + */ +@Data +public class AgencyAreaResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 客户名称 + */ + private String customerName; + + /** + * 上级组织机构ID + */ + private String pid; + + /** + * 所有上级组织机构ID(以英文:隔开) + */ + private String pids; + + /** + * 所有上级名称,以-连接 + */ + private String allParentName; + + /** + * 组织名称 + */ + private String organizationName; + + /** + * 机关级别（社区级：community， + 乡（镇、街道）级:street, + 区县级: district, + 市级: city + 省级:province） 机关级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province） + */ + private String level; + + /** + * 地区编码 + */ + private String areaCode; + + /** + * 总人数 + */ + private Integer totalUser; + + /** + * 省 + */ + private String province; + + /** + * 【城市】名称 + */ + private String city; + + /** + * 【区县】名称 + */ + private String district; + + /** + * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701 + */ + private String parentAreaCode; + + /** + * 街道 + */ + private String street; + + /** + * 【社区】名称0409 + */ + private String community; + + /** + * 组织编码 + */ + private String code; + + /** + * 负责人姓名 + */ + private String contacts; + + /** + * 联系电话 + */ + private String mobile; + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingListResultDTO.java index 67b4642640..084d69cdc2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingListResultDTO.java +++ b/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; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizationCodeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizationCodeResultDTO.java index c370f5bbe3..d74033d924 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizationCodeResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizationCodeResultDTO.java @@ -6,7 +6,7 @@ import java.io.Serializable; /** * @program: epmet-cloud - * @description:小区-楼栋-房屋编码 + * @description:小区-楼栋-单元-房屋编码 * @author: wangtong * @create: 2022-06-29 09:51 **/ @@ -14,13 +14,17 @@ import java.io.Serializable; public class OrganizationCodeResultDTO implements Serializable { /** - * 可编辑的楼栋编码 + * 可编辑的编码 */ private String coding; - /** - * 不可编辑的楼栋编码 + * 不可编辑的编码 */ private String sysCoding; + + /** + * 不可编辑的前缀编码 + */ + private String preCoding; } diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index 0297930754..f919e6ce8d 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index d93a6203ca..d8b4065a32 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml index 8e81106bf9..1a88398802 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java index 1ff1bc303c..ae07816fa2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java @@ -505,4 +505,33 @@ public class AgencyController { List dto = agencyService.getAddressTree(name, customerId); return new Result>().ok(dto); } + + /** + * 获取区域编码下级的所有客户信息 + * + * @param areaCode + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/7/7 10:12 + */ + @GetMapping("/areasubagency/{areaCode}") + public Result> getAreaSubAgency(@LoginUser TokenDto tokenDto, @PathVariable String areaCode) { + List dto = agencyService.getAreaSubAgency(tokenDto, areaCode); + return new Result>().ok(dto); + } + + /** + * 客户树 + * + * @param + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/7/6 13:24 + */ + @RequestMapping("customertree") + public Result> customerTree(@LoginUser TokenDto tokenDto) { + return new Result>().ok(agencyService.getCustomerTree(tokenDto)); + } + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java index 743254c2d4..ece90f219d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java @@ -21,6 +21,8 @@ import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.distributedlock.DistributedLock; +import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -33,6 +35,7 @@ import com.epmet.entity.IcBuildingEntity; import com.epmet.service.NeighborHoodService; import com.epmet.util.ExcelPoiUtils; import lombok.extern.slf4j.Slf4j; +import org.redisson.api.RLock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.PostMapping; @@ -44,6 +47,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.List; +import java.util.concurrent.TimeUnit; /** @@ -61,6 +65,8 @@ public class NeighborHoodController { private NeighborHoodService neighborHoodService; @Resource private IcBuildingDao icBuildingDao; + @Autowired + private DistributedLock distributedLock; @PostMapping("neighborhoodlist") @@ -88,7 +94,13 @@ public class NeighborHoodController { ValidatorUtils.validateEntity(formDTO, IcNeighborHoodAddFormDTO.UpdateShowGroup.class); String customerId = tokenDTO.getCustomerId(); // String customerId = "123123"; - neighborHoodService.updateNeighborhood(customerId,formDTO); + RLock lock = null; + try { + lock = distributedLock.getLock(RedisKeys.getXiaoquEditLock(tokenDTO.getCustomerId()), 120L, 3L, TimeUnit.SECONDS); + neighborHoodService.updateNeighborhood(customerId,formDTO); + } finally { + distributedLock.unLock(lock); + } return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 1c4aa9394c..3059b5a1cf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -353,5 +353,28 @@ public interface CustomerAgencyDao extends BaseDao { CommunityInfoResultDTO getCommunityInfo(OrgInfoPointFormDTO formDTO); CommunityInfoResultDTO getCommunityInfoByUserId(@Param("userId") String userId); + + /** + * 获取区域编码下级的所有客户信息 + * + * @param areaCode + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/7/7 10:12 + */ + List getAreaSubAgency(@Param("areaCode") String areaCode); + + /** + * 客户树根节点 + * + * @param + * @return java.util.List + * @author zhy + * @date 2022/7/6 13:32 + */ + List selectRootCustomer(@Param("areaCode") String areaCode, @Param("level") String level); + + CustomerAgencyEntity getAreaRootAgency(@Param("customerId") String customerId); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java index 4ae4672647..04c73a7756 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java @@ -178,4 +178,25 @@ public interface AgencyService { * @date 2022/5/16 10:43 */ List getAddressTree(String name, String customerId); + + /** + * 获取区域编码下级的所有客户信息 + * + * @param areaCode + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/7/7 10:12 + */ + List getAreaSubAgency(TokenDto tokenDto, String areaCode); + + /** + * 客户树 + * + * @param tokenDto + * @return java.util.List + * @author zhy + * @date 2022/7/6 13:32 + */ + List getCustomerTree(TokenDto tokenDto); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index cf2016de58..1505018fa9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -43,6 +43,7 @@ import com.epmet.dao.CustomerDepartmentDao; import com.epmet.dao.CustomerGridDao; import com.epmet.dao.IcBuildingDao; import com.epmet.dto.CustomerAgencyDTO; +import com.epmet.dto.CustomerDTO; import com.epmet.dto.GovStaffRoleDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; @@ -50,12 +51,14 @@ import com.epmet.entity.CustomerAgencyEntity; import com.epmet.entity.CustomerDepartmentEntity; import com.epmet.entity.CustomerGridEntity; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; -import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.feign.OperCrmFeignClient; import com.epmet.redis.CustomerAgencyRedis; import com.epmet.service.AgencyService; import com.epmet.service.CustomerAgencyService; import com.epmet.service.CustomerOrgParameterService; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.base.Joiner; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -66,10 +69,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 机关单位信息 @@ -99,7 +101,7 @@ public class AgencyServiceImpl implements AgencyService { @Autowired private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient; @Autowired - private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; + private OperCrmFeignClient operCrmFeignClient; @Autowired private IcBuildingDao icBuildingDao; @Autowired @@ -902,6 +904,46 @@ public class AgencyServiceImpl implements AgencyService { return NodeTreeUtils.build(list); } + @Override + public List getAreaSubAgency(TokenDto tokenDto, String areaCode) { + if (NumConstant.ZERO_STR.equals(areaCode)) { + CustomerAgencyEntity root = customerAgencyDao.getAreaRootAgency(tokenDto.getCustomerId()); + areaCode = root.getAreaCode(); + } + + List list = customerAgencyDao.getAreaSubAgency(areaCode); + list.forEach(item -> { + CustomerDTO customerDTO = new CustomerDTO(); + customerDTO.setId(item.getCustomerId()); + Result customerResult = operCrmFeignClient.getCustomerInfo(customerDTO); + if (customerResult.success() && null != customerResult.getData()) { + item.setCustomerName(item.getOrganizationName().concat(StrConstant.HYPHEN).concat(customerResult.getData().getCustomerName())); + } + }); + + return list; + } + + @Override + public List getCustomerTree(TokenDto tokenDto) { + List resultList = new ArrayList<>(); + List rootList = customerAgencyDao.selectRootCustomer(null, null); + List treeList = new ArrayList<>(); + Map treeMap = new HashMap<>(); + if (!rootList.isEmpty()) { + // 获取已有客户的所有组织架构，并转换成map，保证唯一 + rootList.forEach(item -> { + customerHandle(item, treeList); + }); +// treeMap = treeList.stream().collect(Collectors.toMap(CustomerTreeDTO::getAreaCode, Function.identity(), (val1, val2) -> val2)); + // 组合成组织树 + resultList = getCustomerTree(treeList); + + } + + return resultList; + } + private CustomerAgencyEntity constructInsertEntity(AddAgencyV2FormDTO formDTO, CustomerAgencyDTO parent) { CustomerAgencyEntity insertEntity = ConvertUtils.sourceToTarget(formDTO, CustomerAgencyEntity.class); insertEntity.setOrganizationName(formDTO.getAgencyName()); @@ -951,4 +993,109 @@ public class AgencyServiceImpl implements AgencyService { return insertEntity; } + /** + * 处理子客户 + * + * @param customer + * @return com.epmet.dto.result.CustomerTreeDTO + * @author zhy + * @date 2022/7/6 13:54 + */ + private void customerHandle(CustomerTreeDTO customer, List treeList) { + Result> area = epmetCommonServiceOpenFeignClient.areaCodeTree(customer); + if (area.success()) { + if (area.getData() != null) { + treeList.addAll(area.getData()); + } + } + } + + /** + * 生成客户树 + * + * @param + * @return com.epmet.dto.result.CustomerTreeDTO + * @author wgf + * @date 2022/7/6 13:54 + */ + private List getCustomerTree(List treeList) { + treeList = treeList.stream().distinct().collect(Collectors.toList()); + + // 回显客户名称 + treeList.forEach(item -> { + List customerNames = new ArrayList<>(); + List subList = customerAgencyDao.selectRootCustomer(item.getAreaCode(), item.getLevel()); + subList.forEach(customer -> { + CustomerDTO customerDTO = new CustomerDTO(); + customerDTO.setId(customer.getCustomerId()); + Result customerResult = operCrmFeignClient.getCustomerInfo(customerDTO); + if (customerResult.success() && null != customerResult.getData()) { + customerNames.add(customerResult.getData().getCustomerName()); + } + }); + item.setCustomerName(Joiner.on(",").join(customerNames)); + }); + + // 省 + List province = new ArrayList(); + // 市 + List city = new ArrayList(); + // 区 + List district = new ArrayList(); + // 街道 + List street = new ArrayList(); + // 社区 + List community = new ArrayList(); + for (int i = 0; i < treeList.size(); i++) { + if ("province".equals(treeList.get(i).getLevel())) { + province.add(treeList.get(i)); + } else if ("city".equals(treeList.get(i).getLevel())) { + city.add(treeList.get(i)); + } else if ("district".equals(treeList.get(i).getLevel())) { + district.add(treeList.get(i)); + } else if ("street".equals(treeList.get(i).getLevel())) { + street.add(treeList.get(i)); + } else if ("community".equals(treeList.get(i).getLevel())) { + community.add(treeList.get(i)); + } + } + + // 组装街道树 + for (CustomerTreeDTO streetDto : street) { + this.addChild(streetDto, community); + } + // 组装区树 + for (CustomerTreeDTO districtDto : district) { + this.addChild(districtDto, street); + } + // 组装市树 + for (CustomerTreeDTO cityDto : city) { + this.addChild(cityDto, district); + } + // 组装省树 + for (CustomerTreeDTO provinceDto : province) { + this.addChild(provinceDto, city); + } + + return province; + } + + + /** + * 组装子项 + * + * @param parentDto + * @param childList + */ + private void addChild(CustomerTreeDTO parentDto, List childList) { + List children = new ArrayList(); + for (CustomerTreeDTO childDto : childList) { + if (parentDto.getAreaCode().equals(childDto.getParentCode())) { + children.add(childDto); + } + } + parentDto.setChildren(children); + + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 5839114b8b..d7f4e95ac1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -813,7 +813,9 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } @@ -254,7 +253,7 @@ public class HouseInformationServiceImpl implements HouseInformationService { //排序 list = list.stream().sorted(Comparator.comparing(BuildingListResultDTO::getDifferPersonCount).reversed()).collect(Collectors.toList()); //分页 - list = list.stream().skip((long)(formDTO.getPageNo() - 1) * formDTO.getPageSize()).limit(formDTO.getPageSize()).collect(Collectors.toList()); + list = list.stream().skip((long) (formDTO.getPageNo() - 1) * formDTO.getPageSize()).limit(formDTO.getPageSize()).collect(Collectors.toList()); } } @@ -387,7 +386,7 @@ public class HouseInformationServiceImpl implements HouseInformationService { //排序 list = list.stream().sorted(Comparator.comparing(HomeListResultDTO::getPersonCount).reversed()).collect(Collectors.toList()); //分页 - list = list.stream().skip((long)(formDTO.getPageNo() - 1) * formDTO.getPageSize()).limit(formDTO.getPageSize()).collect(Collectors.toList()); + list = list.stream().skip((long) (formDTO.getPageNo() - 1) * formDTO.getPageSize()).limit(formDTO.getPageSize()).collect(Collectors.toList()); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index 9059a84eda..577e77c787 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/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 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 list = baseDao.selectList(wrapper); if(CollectionUtils.isEmpty(list)) { return Collections.emptyList(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 5e20a7adf8..98e340221c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/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 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 list = baseDao.selectList(wrapper); if (CollectionUtils.isEmpty(list)) { return Collections.emptyList(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java index 65eb7c90e2..0f5079181b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java @@ -207,6 +207,7 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl updateResult = epmetUserOpenFeignClient.changeIcResiUserBelongTo(userForm); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 136341dc18..d0e2d2e34c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -930,4 +930,55 @@ limit 1 + + + + + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index ba47187e06..2f76bc1b7a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/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 - convert(name using gbk) + SORT ASC, name + 0 ASC - houseRealCount desc, convert(name using gbk) + houseRealCount desc, name + 0 ASC - personRealCount desc, convert(name using gbk) + personRealCount desc, name + 0 ASC - differHouseCount desc, convert(name using gbk) + differHouseCount desc, name + 0 ASC 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}, '%') ORDER BY - DOOR_NAME + SORT, DOOR_NAME+0 diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcDemandFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcDemandFormDTO.java index 0e2bc16a97..2140591842 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcDemandFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcDemandFormDTO.java @@ -115,7 +115,7 @@ public class IcDemandFormDTO implements Serializable { /** * 需求人联系电话 */ - @NotNull(message = "需求人不能为空",groups = AddUserShowGroup.class) + @NotNull(message = "需求人联系电话不能为空",groups = AddUserShowGroup.class) private String demandUserMobile; /** @@ -168,7 +168,7 @@ public class IcDemandFormDTO implements Serializable { /** * 二级分类Id */ - @NotBlank(message = "分类id不能为空",groups = AddUserInternalGroup.class) + //@NotBlank(message = "分类id不能为空",groups = AddUserInternalGroup.class) private String categoryId; } diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 1ce320b4cd..0417f56177 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index 75a8f44f2e..be55388ad7 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml index d6c9360982..0f1c390988 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 7dfdc190be..bc2534911c 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -173,7 +173,7 @@ public class IcEventServiceImpl extends BaseServiceImpl getDependents(String idCard) { + // 家属列表 + ArrayList dependents = new ArrayList<>(); IcResiUserBriefDTO familyInfo = getResultDataOrThrowsException(userOpenFeignClient.findFamilyMemByIdCard(idCard), ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【事件研判分析】查找家属失败", "【事件研判分析】查找家属失败"); + if (familyInfo == null) { + return dependents; + } + List houseUserList = familyInfo.getHouseUserList(); - ArrayList dependents = new ArrayList<>(); if (CollectionUtils.isEmpty(houseUserList)) { return dependents; } diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml index e55caf1b80..57015601a5 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml index dc5e5818f0..c986d36542 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml index 7ab0900635..1ec54e3755 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaKettleBaseDisputeProcessDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaKettleBaseDisputeProcessDTO.java new file mode 100644 index 0000000000..1e4a92d86e --- /dev/null +++ b/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; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index 949522d31d..773c37c0d7 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/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"; diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaKettleDetailsById.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaKettleDetailsById.java new file mode 100644 index 0000000000..a236f70511 --- /dev/null +++ b/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; +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/KettleNewsFormDto.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/KettleNewsFormDto.java new file mode 100644 index 0000000000..eb8253cd65 --- /dev/null +++ b/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; +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/NewWghSjxxFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/NewWghSjxxFormDTO.java index 9c3d70e155..73333402cc 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/NewWghSjxxFormDTO.java +++ b/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; /** * 街道标签 diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaKettleDetailsResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaKettleDetailsResultDTO.java new file mode 100644 index 0000000000..eef8ae3030 --- /dev/null +++ b/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; +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java new file mode 100644 index 0000000000..fb826342fb --- /dev/null +++ b/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; +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/NewWghSjxxResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/NewWghSjxxResultDTO.java index db3203bb3d..56d1eaf291 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/NewWghSjxxResultDTO.java +++ b/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; + /** * 唯一标识 diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/ResidentByIdCardResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/ResidentByIdCardResultDTO.java index 195d499f25..ca45456541 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/ResidentByIdCardResultDTO.java +++ b/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; + /** * 人口性质 */ diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxDetailResultDto.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxDetailResultDto.java new file mode 100644 index 0000000000..babd867659 --- /dev/null +++ b/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; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-dev.yml b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-dev.yml index 5df8669717..33f46186b7 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-dev.yml +++ b/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: diff --git a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml index ab0a79aa2e..f3a948cd4e 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml +++ b/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: diff --git a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-test.yml b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-test.yml index faa41dfeed..19eecea63d 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-test.yml +++ b/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: diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java new file mode 100644 index 0000000000..8d7df346e0 --- /dev/null +++ b/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> page(@RequestParam Map params){ + PageData page = caKettleBaseDisputeProcessService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + CaKettleBaseDisputeProcessDTO data = caKettleBaseDisputeProcessService.get(id); + return new Result().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 params, HttpServletResponse response) throws Exception { + List 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 dto = caKettleBaseDisputeProcessService.getCaKettlePage(form); + return new Result>().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); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxController.java index fdeb46888f..15b767f22c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxController.java +++ b/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); } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java new file mode 100644 index 0000000000..499338ca6d --- /dev/null +++ b/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 { + + /** + * 全量删除 + * + * @param + * @return int + * @author LZN + * @date 2022/7/6 17:02 + */ + int deleteAll(); + + /** + * CaKettle分页 + * + * @param form + * @return java.util.List + * @author LZN + * @date 2022/7/6 17:32 + */ + List 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(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxDao.java index d7a49811c6..8db8ed93b6 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxDao.java +++ b/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 { * @author LZN * @date 2022/7/5 16:15 */ - NewWghSjxxResultDTO getWghSjxxDetail(@Param("dto") WghSjxxDetailFormDto dto); + WghSjxxDetailResultDto getWghSjxxDetail(@Param("dto") WghSjxxDetailFormDto dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaKettleBaseDisputeProcessEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaKettleBaseDisputeProcessEntity.java new file mode 100644 index 0000000000..66e04b0e91 --- /dev/null +++ b/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; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaKettleBaseDisputeProcessExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaKettleBaseDisputeProcessExcel.java new file mode 100644 index 0000000000..d97655f6a5 --- /dev/null +++ b/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; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaKettleBaseDisputeProcessRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaKettleBaseDisputeProcessRedis.java new file mode 100644 index 0000000000..4232a87f9c --- /dev/null +++ b/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; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java new file mode 100644 index 0000000000..a785024c52 --- /dev/null +++ b/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 { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-07-06 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-07-06 + */ + List list(Map 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 + * @author LZN + * @date 2022/7/6 17:32 + */ + PageData 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); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxService.java index 809b33ea05..090f0a75fc 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxService.java +++ b/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 { * @author LZN * @date 2022/7/5 16:15 */ - NewWghSjxxResultDTO getWghSjxxDetail(WghSjxxDetailFormDto dto); + WghSjxxDetailResultDto getWghSjxxDetail(WghSjxxDetailFormDto dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java index 81ca02745e..2d80688ddc 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java +++ b/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 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(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java new file mode 100644 index 0000000000..76de183169 --- /dev/null +++ b/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 implements CaKettleBaseDisputeProcessService { + + @Autowired + private CaKettleBaseDisputeProcessRedis caKettleBaseDisputeProcessRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, CaKettleBaseDisputeProcessDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, CaKettleBaseDisputeProcessDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + + QueryWrapper 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 + * @author LZN + * @date 2022/7/6 17:32 + */ + @Override + public PageData getCaKettlePage(KettleNewsFormDto form) { + PageHelper.startPage(form.getPage(), form.getLimit()); + List result = baseDao.getCaKettlePage(form); + PageInfo 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 list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index 76d82e71b7..7e3794041e 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/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("没传表名"); } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxServiceImpl.java index 72c94f7492..8262490101 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxServiceImpl.java +++ b/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 + + + + + + + delete from ca_kettle_base_dispute_process + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml index b720dacb29..fbbc2b92c5 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml @@ -159,6 +159,7 @@ - select - wgymc, + wgymc, ssjdbq, sssqbq, hcyj, hcsj, - sjms + sjms, + ssbm, + sjlyubq, + sjdlbq, + ssqsbq, + czjg, + czdwbq, + sjlybq, + ybjsj, + dqsj, + sjdz, + createdate, + sjxlbq FROM wgh_sjxx where recid = #{dto.recid} diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml index 97bcee075e..0358e5f042 100644 --- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./oper-access.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml index eb87408016..c077d9bce0 100644 --- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml +++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./oper-access.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml index 286203506d..03ed20594c 100644 --- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml +++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./oper-access.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerRelationDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerRelationDTO.java index 463ac3abc5..540e1c3b2f 100644 --- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerRelationDTO.java +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerRelationDTO.java @@ -83,6 +83,11 @@ public class CustomerRelationDTO implements Serializable { */ private String areaCode; + /** + * 当前客户的地区编码，实际就是根组织的area_code + */ + private String parentAreaCode; + /** * 删除标识0未删除1已删除 */ diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerRelationFormDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerRelationFormDTO.java new file mode 100644 index 0000000000..817670541f --- /dev/null +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerRelationFormDTO.java @@ -0,0 +1,41 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 客户关系表(01.14 add) + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-02-03 + */ +@Data +public class CustomerRelationFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + +} \ No newline at end of file diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerRelationTreeDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerRelationTreeDTO.java new file mode 100644 index 0000000000..895e46051b --- /dev/null +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerRelationTreeDTO.java @@ -0,0 +1,111 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * 客户关系表(01.14 add) + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-02-03 + */ +@Data +public class CustomerRelationTreeDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * 父级客户id;如果是顶级客户，此列=0 + */ + private String parentCustomerId; + + /** + * 当前客户的所有父级客户id,以英文冒号隔开，如果是顶级客户，此列=0 + */ + private String pids; + + /** + * 当前客户类型取值： external:外部客户，internal:内部客户 + */ + private String customerType; + + /** + * 父级客户类型取值： external:外部客户，internal:内部客户;如果是顶级客户，此列=0 + */ + private String parentCustomerType; + + /** + * open,closed是否启用 + */ + private String status; + + /** + * 当前客户级别（社区级：community， +乡（镇、街道）级:street, +区县级: district, +市级: city +省级:province） + */ + private String level; + + /** + * 当前客户的地区编码，实际就是根组织的area_code + */ + private String areaCode; + + /** + * 当前客户的地区名称 + */ + private String areaName; + + /** + * 客户名称 + */ + private String customerName; + + /** + * 有效期 + */ + private Date validityTime; + + /** + * 客户logo + */ + private String logo; + + /** + * 下一级 + */ + private List children; +} \ No newline at end of file diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java index c6fc44b140..cda0889b35 100644 --- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java @@ -133,4 +133,16 @@ public interface OperCrmOpenFeignClient { **/ @GetMapping("/oper/crm/customer/getexternalandparentcustomerid/{customerId}") Result getExternalAndParentCustomerId(@PathVariable("customerId") String customerId); + + /** + * 获取子客户 + * + * @param customerId + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/7/8 13:41 + */ + @GetMapping("/oper/crm/customerRelation/subcustomer/{customerId}") + Result> getSubCustomer(@PathVariable("customerId") String customerId); + } diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java index 8366657fa8..380ed077fa 100644 --- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java @@ -99,4 +99,9 @@ public class OperCrmOpenFeignClientFallback implements OperCrmOpenFeignClient { public Result getExternalAndParentCustomerId(String customerId) { return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "getExternalAndParentCustomerId", customerId); } + + @Override + public Result> getSubCustomer(String customerId) { + return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "getSubCustomer", customerId); + } } diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml index 0a12a58e1e..e21b270d89 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./oper-crm.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml index cb05ebd8f2..c3f68d4cfd 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./oper-crm.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml index 80a237aefb..453b56307c 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./oper-crm.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index b85e21d911..0df193618f 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -111,6 +111,12 @@ 2.0.0 compile + + com.epmet + common-service-client + 2.0.0 + compile + diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerRelationController.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerRelationController.java new file mode 100644 index 0000000000..e6a4bc2f25 --- /dev/null +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerRelationController.java @@ -0,0 +1,104 @@ +package com.epmet.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.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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.CustomerRelationDTO; +import com.epmet.dto.result.CustomerRelationTreeDTO; +import com.epmet.service.CustomerRelationService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + + +/** + * 客户关系表(01.14 add) + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-07-06 + */ +@RestController +@RequestMapping("customerRelation") +public class CustomerRelationController { + + @Autowired + private CustomerRelationService customerRelationService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params) { + PageData page = customerRelationService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { + CustomerRelationDTO data = customerRelationService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody CustomerRelationDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + customerRelationService.saveV2(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody CustomerRelationDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + customerRelationService.update(dto); + return new Result(); + } + + @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE}) + public Result delete(@RequestBody String[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + customerRelationService.delete(ids); + return new Result(); + } + + /** + * 客户树 + * + * @param + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/7/6 13:24 + */ + @RequestMapping("customertree") + public Result> customerTree(@LoginUser TokenDto tokenDto) { + return new Result>().ok(customerRelationService.getCustomerTree(tokenDto)); + } + + /** + * 获取子客户 + * + * @param customerId + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/7/8 13:41 + */ + @GetMapping("subcustomer/{customerId}") + public Result> getSubCustomer(@PathVariable("customerId") String customerId) { + if(StringUtils.isNotBlank(customerId)){ + List result = customerRelationService.getSubCustomer(customerId); + return new Result>().ok(result); + } + return new Result<>(); + } +} diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerRelationDao.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerRelationDao.java index 948937062c..ee8e6255ce 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerRelationDao.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerRelationDao.java @@ -19,8 +19,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.CustomerRelationDTO; +import com.epmet.dto.result.CustomerRelationTreeDTO; import com.epmet.entity.CustomerRelationEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -48,4 +50,35 @@ public interface CustomerRelationDao extends BaseDao { * @return java.util.List */ List selectAllSubCustomerIds(String customerId); + + /** + * 客户树根节点 + * + * @param customerId + * @return java.util.List + * @author zhy + * @date 2022/7/6 13:32 + */ + List selectRootCustomerByCustomerId(@Param("customerId") String customerId); + + /** + * 客户树子节点 + * + * @param customerPid + * @return java.util.List + * @author zhy + * @date 2022/7/6 13:32 + */ + List selectSubCustomerByPid(@Param("customerPid") String customerPid); + + /** + * 获取子客户 + * + * @param customerId + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/7/8 13:41 + */ + List getSubCustomer(@Param("customerId") String customerId); + } \ No newline at end of file diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerRelationEntity.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerRelationEntity.java index 9c33664b50..1c0a077b14 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerRelationEntity.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerRelationEntity.java @@ -79,4 +79,9 @@ public class CustomerRelationEntity extends BaseEpmetEntity { */ private String areaCode; + /** + * 当前客户的地区编码，实际就是根组织的area_code + */ + private String parentAreaCode; + } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerRelationService.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerRelationService.java index 2776c8b0cf..05ee703d22 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerRelationService.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerRelationService.java @@ -19,7 +19,9 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.CustomerRelationDTO; +import com.epmet.dto.result.CustomerRelationTreeDTO; import com.epmet.entity.CustomerRelationEntity; import java.util.List; @@ -73,6 +75,16 @@ public interface CustomerRelationService extends BaseService getAllSubCustomerIds(String customerId); + + /** + * 客户树 + * + * @param tokenDto + * @return java.util.List + * @author zhy + * @date 2022/7/6 13:32 + */ + List getCustomerTree(TokenDto tokenDto); + + List getSubCustomer(String customerId); + } \ No newline at end of file diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java index 6a68df0455..415a6c831a 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java @@ -25,11 +25,17 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.CustomerRelationDao; import com.epmet.dto.CustomerDTO; import com.epmet.dto.CustomerRelationDTO; +import com.epmet.dto.form.AreaCodeDetailFormDTO; +import com.epmet.dto.result.AreaCodeResultDTO; +import com.epmet.dto.result.CustomerRelationTreeDTO; import com.epmet.entity.CustomerRelationEntity; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.redis.CustomerRedis; import com.epmet.service.CustomerRelationService; import com.epmet.service.CustomerService; @@ -58,6 +64,8 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl page(Map params) { @@ -75,8 +83,8 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -97,6 +105,15 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl(); } + @Override + public List getCustomerTree(TokenDto tokenDto) { +// String customerId = tokenDto.getCustomerId(); + String customerId = "78e2b2227c07de1fe54da14e2b2d9eb6"; + List rootList = baseDao.selectRootCustomerByCustomerId(customerId); + if (!rootList.isEmpty()) { + rootList.forEach(this::getSubCustomer); + } + return rootList; + } + + @Override + public List getSubCustomer(String customerId) { + return baseDao.getSubCustomer(customerId); + } + + /** + * 处理子客户 + * + * @param customer + * @return com.epmet.dto.result.CustomerRelationTreeDTO + * @author zhy + * @date 2022/7/6 13:54 + */ + private CustomerRelationTreeDTO getSubCustomer(CustomerRelationTreeDTO customer) { + AreaCodeDetailFormDTO formDTO = new AreaCodeDetailFormDTO(); + formDTO.setAreaCode(customer.getAreaCode()); + formDTO.setLevel(customer.getLevel()); + Result area = epmetCommonServiceOpenFeignClient.areaCodeDetail(formDTO); + if (area.success()) { + if (area.getData() != null) { + customer.setAreaName(area.getData().getAreaName()); + } + } + List children = baseDao.selectSubCustomerByPid(customer.getCustomerId()); + customer.setChildren(children); + if (!children.isEmpty()) { + children.forEach(this::getSubCustomer); + } + return customer; + } + } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerRelationDao.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerRelationDao.xml index f757a48b51..525e388cf4 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerRelationDao.xml +++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerRelationDao.xml @@ -23,4 +23,46 @@ cr.DEL_FLAG = '0' AND cr.PIDS like CONCAT(#{customerId},'%') + + + + + + + \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml index 56861b1710..cfaf3a1772 100644 --- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./oper-customize.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml index 11022f5b5b..5cb566ad8d 100644 --- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml +++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./oper-customize.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml index bff06f7016..c6cab92c56 100644 --- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml +++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./oper-customize.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index bfe0391be1..a7652f55e2 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-group.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml index c2d1f70171..e235fed405 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./resi-group.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml index c53fed3810..d11febf433 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./resi-group.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml index 46c73ee371..612ef0affb 100644 --- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-guide.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml index 5cad88228d..b2564ab858 100644 --- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./resi-guide.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml index c37a42bcfe..d5fba5d963 100644 --- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-guide.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml index d5d83fb58b..3c73f07ea5 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-hall.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml index 11b8c09a2f..92713ea878 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./resi-hall.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml index 8da80caf78..1c81abeaf6 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-hall.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml index d576ed8a28..2050db96df 100644 --- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-home.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml index d93cc35e88..5c5adfb604 100644 --- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./resi-home.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml index a2da44bf77..7c3d090fae 100644 --- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-home.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java index 56e8dfae95..3f3cbe0f25 100644 --- a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java +++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java @@ -66,4 +66,9 @@ public class MyResiUserInfoResultDTO implements Serializable { * 类别【字典表】 */ private String volunteerCategory; + + /** + * 是否显示我的家庭 + */ + private Boolean homeFlag; } diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml index cef4c0f867..b9f715e989 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-mine.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml index fb4fb7fd26..b8599de420 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./resi-mine.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml index 9545a3feb3..0c46506f4a 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-mine.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index d549dfa605..b6ac317a28 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-partymember.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml index 593f8d4709..0d3e65ba3b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./resi-partymember.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml index 30f7977dae..47a213ed08 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-partymember.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index a1fdca4c49..2059c84f4b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -4,6 +4,7 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; 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.annotation.LoginUser; import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; @@ -32,6 +33,8 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; +import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; +import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.modules.partymember.excel.IcPartyMemberExcel; import com.epmet.modules.partymember.service.IcPartyMemberService; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; @@ -55,6 +58,8 @@ import java.io.InputStream; import java.io.PrintWriter; import java.net.URLEncoder; import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; @@ -73,6 +78,8 @@ public class IcPartyMemberController implements ResultDataResolver { @Autowired private IcPartyMemberService icPartyMemberService; + @Autowired + private IcPartyOrgDao icPartyOrgDao; @RequestMapping("page") @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @@ -226,12 +233,12 @@ public class IcPartyMemberController implements ResultDataResolver { */ @PostMapping("partymembereducationstatistics") public Result> partyMemberEducationStatistics(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberFormDTO formDTO) { - if(StringUtils.isBlank(formDTO.getOrgId()) && StringUtils.isBlank(formDTO.getAgencyId())){ - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(),tokenDto.getUserId()); - if (null == staffInfo) { - throw new EpmetException("获取工作人员信息失败"); + if(StringUtils.isBlank(formDTO.getOrgId())){ + IcPartyOrgEntity org = setOrgId(tokenDto); + if (null == org) { + return new Result>().ok(new ArrayList<>()); } - formDTO.setAgencyId(staffInfo.getAgencyId()); + formDTO.setOrgId(org.getId()); } return new Result>().ok(icPartyMemberService.partyMemberEducationStatistics(formDTO)); } @@ -246,12 +253,12 @@ public class IcPartyMemberController implements ResultDataResolver { @PostMapping("partymemberagelist") @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberAgelist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { - if(StringUtils.isBlank(formDTO.getOrgId()) && StringUtils.isBlank(formDTO.getAgencyId())){ - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(),tokenDto.getUserId()); - if (null == staffInfo) { - throw new EpmetException("获取工作人员信息失败"); + if(StringUtils.isBlank(formDTO.getOrgId())){ + IcPartyOrgEntity org = setOrgId(tokenDto); + if (null == org) { + return new Result>().ok(new PageData<>(Collections.emptyList(), 0)); } - formDTO.setAgencyId(staffInfo.getAgencyId()); + formDTO.setOrgId(org.getId()); } return new Result>().ok(icPartyMemberService.getPartyMemberAgeList(formDTO)); } @@ -266,12 +273,12 @@ public class IcPartyMemberController implements ResultDataResolver { @PostMapping("partymembereducationlist") @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberEducationlist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { - if(StringUtils.isBlank(formDTO.getOrgId()) && StringUtils.isBlank(formDTO.getAgencyId())){ - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(),tokenDto.getUserId()); - if (null == staffInfo) { - throw new EpmetException("获取工作人员信息失败"); + if(StringUtils.isBlank(formDTO.getOrgId())){ + IcPartyOrgEntity org = setOrgId(tokenDto); + if (null == org) { + return new Result>().ok(new PageData<>(Collections.emptyList(), 0)); } - formDTO.setAgencyId(staffInfo.getAgencyId()); + formDTO.setOrgId(org.getId()); } return new Result>().ok(icPartyMemberService.getPartyMemberEducationList(formDTO)); } @@ -285,16 +292,36 @@ public class IcPartyMemberController implements ResultDataResolver { */ @PostMapping("partymemberagestatistics") public Result> partyMemberAgeStatistics(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberFormDTO formDTO) { - if(StringUtils.isBlank(formDTO.getOrgId()) && StringUtils.isBlank(formDTO.getAgencyId())){ - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(),tokenDto.getUserId()); - if (null == staffInfo) { - throw new EpmetException("获取工作人员信息失败"); + if(StringUtils.isBlank(formDTO.getOrgId())){ + IcPartyOrgEntity org = setOrgId(tokenDto); + if (null == org) { + return new Result>().ok(new ArrayList<>()); } - formDTO.setAgencyId(staffInfo.getAgencyId()); + formDTO.setOrgId(org.getId()); } return new Result>().ok(icPartyMemberService.partyMemberAgeStatistics(formDTO)); } + /** + * @describe: 组装党组织信息 + * @author wangtong + * @date 2022/7/8 16:46 + * @params [tokenDto, formDTO] + * @return com.epmet.modules.partyOrg.entity.IcPartyOrgEntity + */ + public IcPartyOrgEntity setOrgId(TokenDto tokenDto){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(),tokenDto.getUserId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + //获取工作人员所属组织同级的党组织 + LambdaQueryWrapper orgWrapper = new LambdaQueryWrapper<>(); + orgWrapper.eq(IcPartyOrgEntity::getCustomerId, tokenDto.getCustomerId()); + orgWrapper.eq(IcPartyOrgEntity::getAgencyId, staffInfo.getAgencyId()); + orgWrapper.ne(IcPartyOrgEntity::getPartyOrgType, NumConstant.FIVE_STR); + return icPartyOrgDao.selectOne(orgWrapper); + } + @RequestMapping(value = "downloadTemplate", method = {RequestMethod.GET, RequestMethod.POST}) public void downloadTemplate(HttpServletResponse response) throws IOException { diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml index 63cb2415e8..9d3e187b38 100644 --- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-voice.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml index 3375e0d198..eea50949fe 100644 --- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./resi-voice.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml index 6baa2c7be4..1d82683f68 100644 --- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./resi-voice.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml index e0ebfada9a..53cbacfb6e 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-openapi-scan.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml index 2be1100292..68d784d052 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-openapi-scan.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml index 49ce30a8c1..c17412537b 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml @@ -11,6 +11,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-openapi-scan.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java index ef59cb992b..9b2a5274b6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java @@ -70,7 +70,7 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable { /** * 手机号 */ - @NotBlank(message = "mobile不能为空",groups = IcEpidemicSpecialAttentionAdd.class) +// @NotBlank(message = "mobile不能为空",groups = IcEpidemicSpecialAttentionAdd.class) private String mobile; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java index 585b4ef550..115eeb2154 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java @@ -47,6 +47,11 @@ public class IcVaccineDTO implements Serializable { */ private String isResiUser; + /** + * 数字社区的icResiUserId、其他情况无值 + */ + private String userId; + /** * 数据来源【导入的：import;】 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java new file mode 100644 index 0000000000..482ef97839 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java @@ -0,0 +1,96 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @Description 核酸检测-上报核酸记录 + * @Author sun + */ +@Data +public class AddIcVaccineFormDTO implements Serializable { + private static final long serialVersionUID = 9156247659994638103L; + + public interface Vaccine extends CustomerClientShowGroup { + } + public interface Edit extends CustomerClientShowGroup { + } + + /** + * 核酸记录Id,修改时使用 + */ + @NotBlank(message = "核酸记录Id不能为空", groups = Edit.class) + private String vaccineId; + /** + * 当前网格所属组织Id + */ + @NotBlank(message = "组织Id不能为空", groups = Vaccine.class) + private String agencyId; + /** + * 居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 + */ + private String userId; + /** + * 数据来源【居民端小程序的人：resi; 数字社区的居民：icresi; 导入的：import;】 + */ + @NotBlank(message = "居民来源不能为空", groups = Vaccine.class) + private String userType; + /** + * 姓名 + */ + @NotBlank(message = "姓名不能为空", groups = Vaccine.class) + private String name; + /** + * 手机号 + */ + @NotBlank(message = "手机号不能为空", groups = Vaccine.class) + private String mobile; + /** + * 身份证号 + */ + @NotBlank(message = "身份证号不能为空", groups = Vaccine.class) + private String idCard; + /** + * 接种时间 + */ + @NotNull(message = "接种时间不能为空", groups = Vaccine.class) + @JsonFormat(pattern="yyyy-MM-dd HH:mm") + private Date inoculateTime; + /** + * 接种地点 + */ + //@NotBlank(message = "接种地点不能为空", groups = Vaccine.class) + private String inoculateAddress; + /** + * 疫苗厂家 + */ + //@NotBlank(message = "疫苗厂家不能为空", groups = Vaccine.class) + private String manufacturer; + /** + * 是否客户下居民(0:否 1:是) + */ + private String isResiUser = "0"; + /** + * 通知渠道 0小程序通知，1短信通知，多选是数组 + */ + private List channel = new ArrayList<>(); + /** + * 通知内容 + */ + private String content = ""; + + //token中信息 + private String customerId; + private String staffId; + private String client; + + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java index 767dcf1231..04aafe1f0c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java @@ -25,5 +25,9 @@ public class BindHomeFormDTO implements Serializable { /** * 用户id */ + @NotBlank(message = "客户id不能为空") private String customerId; + + @NotBlank(message = "人id不能为空") + private String userId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java index 345d7496b0..4cd9156ea1 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java @@ -80,4 +80,14 @@ public class EpidemicPreventionFormDTO extends PageFormDTO implements Serializab * 关注类型，核酸检测：2，疫苗接种：1 */ private Integer attentionType; + + /** + * 年龄段查询，起始生日 + */ + private String startBirthDay; + + /** + * 年龄段查询，截止生日 + */ + private String endBirthDay; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserBelongToChangedFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserBelongToChangedFormDTO.java index da773e7266..102bbd9c9b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserBelongToChangedFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserBelongToChangedFormDTO.java @@ -19,6 +19,11 @@ public class IcUserBelongToChangedFormDTO implements Serializable { * 客户Id */ private String customerId; + + /** + * 小区ID + */ + private String neighborhoodId; /** * 原网格Id */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java index 6d365c9955..c50649b4a9 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java @@ -82,4 +82,14 @@ public class VaccinationListFormDTO extends PageFormDTO implements Serializable * user所属组织ID */ private String orgId; + + /** + * 开始时间 eg：20220706 + */ + private String startDate; + + /** + * 结束时间 eg：20220706 + */ + private String endDate; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java index 0639371186..4946982090 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java @@ -37,6 +37,9 @@ public class EpidemicPreventionResultDTO implements Serializable { * 身份证 */ private String idCard; + + private String birthDay; + /** * 疫苗接种次数 */ @@ -45,4 +48,6 @@ public class EpidemicPreventionResultDTO implements Serializable { * 核酸检测次数 */ private Integer natCount; + + private String createdTime; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java index 7c8b9bcd3f..9ab4663b62 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java @@ -66,4 +66,9 @@ public class MyResiUserInfoResultDTO implements Serializable { * 类别【字典表】 */ private String volunteerCategory; + + /** + * 是否显示我的家庭 + */ + private Boolean homeFlag; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java index 01c7374dff..29ebb13231 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java @@ -2,8 +2,10 @@ package com.epmet.dto.result; import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; +import org.apache.commons.lang3.StringUtils; import java.io.Serializable; +import java.util.regex.Pattern; /** * @Author zxc @@ -39,6 +41,7 @@ public class VaccinationListResultDTO implements Serializable { * 身份证 */ private String idCard; + private String sex; /** * 备注 @@ -110,4 +113,42 @@ public class VaccinationListResultDTO implements Serializable { this.lastInformTime = ""; this.reason = ""; } + + public void setSex(){ + if (StringUtils.isBlank(getIdCard())){ + this.sex = "未知"; + }else { + if (this.idCard.length() == NumConstant.FIFTEEN){ + String substring = this.idCard.substring(NumConstant.FOURTEEN, NumConstant.FIFTEEN); + if (!isNumeric2(substring)){ + this.sex = "未知"; + }else { + if (Integer.parseInt(substring) % NumConstant.TWO == NumConstant.ZERO) { + sex = "女"; + } else { + sex = "男"; + } + } + }else if (this.idCard.length() == NumConstant.EIGHTEEN){ + String substring = this.idCard.substring(NumConstant.SIXTEEN).substring(NumConstant.ZERO, NumConstant.ONE); + if (!isNumeric2(substring)){ + this.sex = "未知"; + }else { + if (Integer.parseInt(substring) % NumConstant.TWO == NumConstant.ZERO) { + sex = "女"; + } else { + sex = "男"; + } + } + }else { + this.sex = "未知"; + } + } + } + + private static final Pattern NUMBER_PATTERN = Pattern.compile("-?\\d+(\\.\\d+)?"); + public static boolean isNumeric2(String str) { + return str != null && NUMBER_PATTERN.matcher(str).matches(); + } + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 65e7b7b850..d52625b704 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -835,4 +835,15 @@ public interface EpmetUserOpenFeignClient { */ @PostMapping("/epmetuser/icresiuser/getIcUserCount") Result> getIcUserCount(@RequestBody IcUserCountFormDTO formDTO); + + /** + * desc: 同步数据，房内居民数量 类别统计数据量等只用客户id当条件 + * + * @param customerId + * @return com.epmet.commons.tools.utils.Result + * @author LiuJanJun + * @date 2022/7/16 6:53 下午 + */ + @PostMapping("/epmetuser/icResiUserDataSync/icDataSyncTask") + Result icDataSyncTask(String customerId); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 8c47cdb204..56b203743a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -636,4 +636,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getIcUserCount", formDTO); } + @Override + public Result icDataSyncTask(String customerId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "icDataSyncTask", customerId); + } + } diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 7d9ac90396..9c2564656b 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -12,6 +12,11 @@ services: environment: RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-user.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index 665f7108cd..fdc9c6405f 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -12,6 +12,11 @@ services: environment: RUN_INSTRUCT: "java -Xms256m -Xmx1524m -jar ./epmet-user.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml index c880913294..b867614c20 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml @@ -12,6 +12,11 @@ services: environment: RUN_INSTRUCT: "java -Xms32m -Xmx512m -jar ./epmet-user.jar" restart: "unless-stopped" + logging: + driver: local + options: + max-size: "10m" + max-file: "2" deploy: resources: limits: diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java index 8f95f22f45..c1cac171ec 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java @@ -77,7 +77,7 @@ public class ChangeWelfareController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = changeWelfareService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ChangeWelfareExcel.class); + ExcelUtils.exportEpmetExcel(response, null, list, ChangeWelfareExcel.class); } /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 9becc91a97..8ed931e7ed 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -30,6 +30,7 @@ import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; @@ -48,7 +49,6 @@ import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.constant.OrgInfoConstant; import com.epmet.constant.SystemMessageType; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcResiUserDTO; @@ -76,6 +76,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.poifs.filesystem.OfficeXmlFileException; import org.jetbrains.annotations.NotNull; +import org.redisson.api.RLock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -90,6 +91,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.*; import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -139,6 +141,8 @@ public class IcResiUserController implements ResultDataResolver { private RequestInterceptor requestInterceptor; @Autowired private ExecutorService executorService; + @Autowired + private DistributedLock distributedLock; /** * 模板枚举 @@ -247,11 +251,17 @@ public class IcResiUserController implements ResultDataResolver { @NoRepeatSubmit @PostMapping("edit") public Result edit(@LoginUser TokenDto tokenDto, @RequestBody List formDTO) { - String resiUserId = icResiUserService.edit(tokenDto, formDTO); - //推送MQ事件 - editResiMq(tokenDto.getCustomerId(), resiUserId); + RLock lock = null; + try { + lock = distributedLock.getLock(RedisKeys.getXiaoquEditLock(tokenDto.getCustomerId()), 120L, 3L, TimeUnit.SECONDS); + String resiUserId = icResiUserService.edit(tokenDto, formDTO); + //推送MQ事件 + editResiMq(tokenDto.getCustomerId(), resiUserId); - this.sendVolunteerMsg(tokenDto.getCustomerId(), resiUserId); + this.sendVolunteerMsg(tokenDto.getCustomerId(), resiUserId); + } finally { + distributedLock.unLock(lock); + } return new Result(); } @@ -599,7 +609,9 @@ public class IcResiUserController implements ResultDataResolver { // 三.异步执行导入 executorService.execute(() -> { boolean isAllSuccess = false; + RLock lock = null; try { + lock = distributedLock.getLock(RedisKeys.getXiaoquEditLock(customerId), 120L, 3L, TimeUnit.SECONDS); List formItemList = icResiUserService.listFormItems(customerId, IcFormCodeEnum.RESI_BASE_INFO.getCode()); isAllSuccess = icResiUserImportService.importIcResiInfoFromExcel(importTaskId, formItemList, importTempFileSavePath.toString(), response, IC_RESI_UPLOAD_DIR); } catch (Throwable e) { @@ -619,11 +631,12 @@ public class IcResiUserController implements ResultDataResolver { try { // 都导入成功了没问题，才删除 if (importTempFileSavePath != null) { - if (isAllSuccess) { - Files.delete(importTempFileSavePath); - } else { - log.error("【导入居民信息】未完全成功，上传文件：{}", importTempFileSavePath); - } + Files.delete(importTempFileSavePath); + //if (isAllSuccess) { + // Files.delete(importTempFileSavePath); + //} else { + // log.error("【导入居民信息】未完全成功，上传文件：{}", importTempFileSavePath); + //} } } catch (IOException e) { log.error("【导入居民信息失败】清理上传的文件失败：{}", ExceptionUtils.getErrorStackTrace(e)); @@ -637,6 +650,11 @@ public class IcResiUserController implements ResultDataResolver { form.setMessageType(SystemMessageType.IC_RESI_USER_ADD); form.setContent(mqMsg); epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); + + //解锁 + if (lock != null) { + lock.unlock(); + } } }); @@ -1180,8 +1198,9 @@ public class IcResiUserController implements ResultDataResolver { */ @PostMapping("/bindHome") public Result bindHome(@RequestBody BindHomeFormDTO form, @LoginUser TokenDto tokenDto) { - ValidatorUtils.validateEntity(form); form.setCustomerId(tokenDto.getCustomerId()); + form.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(form); icResiUserService.bindHome(form); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserDataSyncController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserDataSyncController.java new file mode 100644 index 0000000000..ae875c7acf --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserDataSyncController.java @@ -0,0 +1,101 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.commons.tools.distributedlock.DistributedLock; +import com.epmet.commons.tools.feign.ResultDataResolver; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.service.IcResiUserDataSyncService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.redisson.api.RLock; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; +import java.util.concurrent.TimeUnit; + + +/** + * 用户基础信息同步计算入口 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-26 + */ +@Slf4j +@RestController +@RequestMapping("icResiUserDataSync") +public class IcResiUserDataSyncController implements ResultDataResolver { + + @Autowired + private IcResiUserDataSyncService icResiUserDataSyncService; + @Autowired + private RedisUtils redisUtils; + @Autowired + private DistributedLock distributedLock; + + + /** + * 获取录入居民的数量 + * + * @Param formDTO + * @Return {@link Result>} + * @Author zhaoqifeng + * @Date 2022/6/30 9:35 + */ + @PostMapping("icDataSyncTask") + public Result icDataSyncTask(@RequestParam(value = "customerId",required = false) String customerId) { + RLock lock = null; + String key = RedisKeys.getDataSyncKey("resi"); + try { + lock = distributedLock.getLock(RedisKeys.getLockByMethodName("icDataSyncTask"), + 30L, 30L, TimeUnit.SECONDS); + if (StringUtils.isBlank(customerId)) { + Object customerIdObj = redisUtils.sPop(key); + while (customerIdObj != null) { + try { + icResiUserDataSyncService.icDataSyncTask(customerIdObj.toString()); + log.debug("icDataSyncTask customerId:{} execute success", customerIdObj); + + customerIdObj = redisUtils.sPop(key); + } catch (Exception e) { + log.error("icDataSyncTask exception msg:{},customerId:{}", e.getMessage(), customerIdObj); + redisUtils.sAdd(key, customerIdObj); + } + log.debug("icDataSyncTask finish customerId:{} execute success", customerIdObj); + } + } else { + icResiUserDataSyncService.icDataSyncTask(customerId); + log.debug("icDataSyncTask customerId:{} execute success", customerId); + } + } catch (Exception e) { + if (StringUtils.isNotBlank(customerId)) { + redisUtils.sAdd(key, customerId); + } + log.error("icDataSyncTask exception msg:{},customerId:{}", e.getMessage(), customerId); + } finally { + distributedLock.unLock(lock); + } + return new Result().ok(true); + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java index ce9f895a60..bb34afd612 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java @@ -20,6 +20,7 @@ import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcVaccineDTO; +import com.epmet.dto.form.AddIcVaccineFormDTO; import com.epmet.dto.form.IcVaccineFormDTO; import com.epmet.dto.form.VaccineListFormDTO; import com.epmet.dto.result.IcVaccineListCommonExcelResultDTO; @@ -237,5 +238,43 @@ public class IcVaccineController implements ResultDataResolver { return new Result().ok(icVaccineService.detail(formDTO.getVaccineId())); } + /** + * @Author sun + * @Description 【疫苗】疫苗接种信息新增 + **/ + @PostMapping("add") + public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddIcVaccineFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, AddIcVaccineFormDTO.Vaccine.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setClient(tokenDto.getClient()); + icVaccineService.add(formDTO); + return new Result(); + } + + /** + * @Author sun + * @Description 【疫苗】疫苗接种信息修改 + **/ + @PostMapping("edit") + public Result edit(@LoginUser TokenDto tokenDto, @RequestBody AddIcVaccineFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, AddIcVaccineFormDTO.Edit.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + icVaccineService.edit(formDTO); + return new Result(); + } + + /** + * @Author sun + * @Description 【疫苗】疫苗接种信息删除 + **/ + @PostMapping("del") + public Result del(@RequestBody IcVaccineFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, IcVaccineFormDTO.Detail.class); + icVaccineService.del(formDTO); + return new Result<>(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 73e5247785..4dcf2a8537 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -322,9 +322,10 @@ public interface IcResiUserDao extends BaseDao { * * @param customerId * @param gridId + * @param neighborhoodId * @return */ - List listUserIds(@Param("customerId") String customerId, @Param("gridId") String gridId); + List listUserIds(@Param("customerId") String customerId, @Param("gridId") String gridId, @Param("neighborhoodId") String neighborhoodId); List getAllUserIds(@Param("idCard") String idCard, @Param("customerId") String customerId); @@ -412,6 +413,7 @@ public interface IcResiUserDao extends BaseDao { /** * 通过社区ID获取所属人员 + * * @param communityId * @return */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcStatsResiWarnDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcStatsResiWarnDao.java index 3e261b041f..e3c7d35318 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcStatsResiWarnDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcStatsResiWarnDao.java @@ -87,4 +87,6 @@ public interface IcStatsResiWarnDao extends BaseDao { List queryUserWarnNotice(@Param("customerId") String customerId, @Param("agencyId") String agencyId, @Param("configIds") List configIds); + + int deleteByCustomerIdAndConfigId(@Param("configId") String configId, @Param("customerId")String customerId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java index 15cd0fe88e..d4db61ad5b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java @@ -2,6 +2,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcNatDTO; +import com.epmet.dto.IcVaccineDTO; import com.epmet.dto.form.MyNatListFormDTO; import com.epmet.dto.form.VaccineListFormDTO; import com.epmet.dto.result.IcVaccineListResultDTO; @@ -44,7 +45,7 @@ public interface IcVaccineDao extends BaseDao { * @Author sun * @Description 删除操作--物理删除业务数据 **/ - int delById(@Param("icNatId") String icNatId); + int delById(@Param("icVaccineId") String icVaccineId); /** * @Author sun @@ -60,4 +61,7 @@ public interface IcVaccineDao extends BaseDao { * @return */ int updateIsResiFlag(@Param("customerId") String customerId, @Param("icResiUserId") String icResiUserId); + + IcVaccineDTO getVaccineDTO(@Param("customerId") String customerId, @Param("icVaccineId") String icVaccineId, @Param("idCard") String idCard, @Param("inoculateTime") String inoculateTime); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java index 215fd77173..b17256f3a0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java @@ -48,6 +48,11 @@ public class IcVaccineEntity extends BaseEpmetEntity { */ private String isResiUser; + /** + * 数字社区的icResiUserId、其他情况无值 + */ + private String userId; + /** * 数据来源【导入的：import;】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java index 909294dfa9..99437aa726 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java @@ -3,8 +3,6 @@ package com.epmet.excel; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; -import java.util.Date; - /** * 福利表 * @@ -14,14 +12,14 @@ import java.util.Date; @Data public class ChangeWelfareExcel { - @Excel(name = "主键") - private String id; - - @Excel(name = "epmet用户主键") - private String userId; - - @Excel(name = "epmet网格ID") - private String gridId; +// @Excel(name = "主键") +// private String id; +// +// @Excel(name = "epmet用户主键") +// private String userId; +// +// @Excel(name = "epmet网格ID") +// private String gridId; @Excel(name = "姓名") private String name; @@ -32,44 +30,44 @@ public class ChangeWelfareExcel { @Excel(name = "手机号") private String mobile; - @Excel(name = "性别 0女 1男") + @Excel(name = "性别",replace = { "男_1", "女_0", "女_2", " _null"} ) private String gender; - @Excel(name = "类型") - private String type; - +// @Excel(name = "类型") +// private String type; +// @Excel(name = "加入时间") private String joinDate; - - @Excel(name = "加入原因") - private String joinReason; - - @Excel(name = "移除时间") - private String removeDate; - - @Excel(name = "移除原因") - private String removeReason; - - @Excel(name = "删除标记 0：未删除，1：已删除") - private String delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - @Excel(name = "客户ID") - private String customerId; +// +// @Excel(name = "加入原因") +// private String joinReason; + +// @Excel(name = "移除时间") +// private String removeDate; +// +// @Excel(name = "移除原因") +// private String removeReason; +// +// @Excel(name = "删除标记 0：未删除，1：已删除") +// private String delFlag; + +// @Excel(name = "乐观锁") +// private Integer revision; +// +// @Excel(name = "创建人") +// private String createdBy; +// +// @Excel(name = "创建时间") +// private Date createdTime; +// +// @Excel(name = "更新人") +// private String updatedBy; +// +// @Excel(name = "更新时间") +// private Date updatedTime; +// +// @Excel(name = "客户ID") +// private String customerId; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java index 8fe217466f..34c11ea835 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java @@ -23,6 +23,12 @@ public class VaccinationExportExcel { @Excel(name = "身份证",width = 30) private String idCard; + @Excel(name = "性别",width = 30) + private String sex; + + @Excel(name = "关注原因",width = 40) + private String reason; + @Excel(name = "备注",width = 40) private String remark; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java index 60a83b2582..83625be4d8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java @@ -35,11 +35,11 @@ public class IcVaccineImportExcelData implements Serializable { @ExcelProperty("接种时间") private Date inoculateTime; - @NotBlank(message = "接种地点为必填项") + //@NotBlank(message = "接种地点为必填项") @ExcelProperty("接种地点") private String inoculateAddress; - @NotBlank(message = "疫苗厂家为必填项") + //@NotBlank(message = "疫苗厂家为必填项") @ExcelProperty("疫苗厂家") private String manufacturer; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java index e74c011246..c1328f548a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java @@ -70,7 +70,11 @@ public class ICWarnStatsEventListener implements MessageListenerConcurrently { IcResiUserAddMQMsg obj = JSON.parseObject(msg, IcResiUserAddMQMsg.class); log.info("obj is {}", JSON.toJSONString(obj)); try { - if (!resiWarnStats(obj)||!updateIcNatResiFlag(tags, obj)||!updateIcHouseResiNumber(obj)){ + String key = RedisKeys.getDataSyncKey("resi"); + redisUtils.sAdd(key, obj.getCustomerId()); + //todo 统计预警人数和 更新屋内居民数 用定时任务跑吧 这样太费劲 + //||!updateIcHouseResiNumber(obj) !resiWarnStats(obj)|| installed of IcDataSyncTask + if (!updateIcNatResiFlag(tags, obj)){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"消费失败,等待重新消费"); } } catch (RenException e) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserDataSyncService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserDataSyncService.java new file mode 100644 index 0000000000..7e1ccc9a24 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserDataSyncService.java @@ -0,0 +1,36 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +/** + * 用户基础信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-26 + */ +public interface IcResiUserDataSyncService { + /** + * desc: 同步与居民相关的数据 + * + * @param customerId + * @return java.lang.String + * @author LiuJanJun + * @date 2022/7/16 8:06 下午 + */ + Boolean icDataSyncTask(String customerId); +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java index 154b6f9558..c89b5f2db4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java @@ -3,6 +3,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcVaccineDTO; +import com.epmet.dto.form.AddIcVaccineFormDTO; +import com.epmet.dto.form.IcVaccineFormDTO; import com.epmet.dto.form.VaccineListFormDTO; import com.epmet.dto.result.IcVaccineListResultDTO; import com.epmet.dto.result.VaccineListDTO; @@ -60,4 +62,10 @@ public interface IcVaccineService extends BaseService { * @Description 疫苗接种情况-列表点击查询详情 **/ IcVaccineDTO detail(String vaccineId); + + void add(AddIcVaccineFormDTO formDTO); + + void edit(AddIcVaccineFormDTO formDTO); + + void del(IcVaccineFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 5c36cb1eb2..0258f583ad 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -165,7 +165,11 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl { + v.setSex(); + }); + } //需求调整 列表和导出增加所属房屋(小区+楼栋+单元+房间)一列值 sun Map houseInfoMap = new HashMap<>(); //查询房屋信息 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index d44c421e5a..40d9818db8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -591,6 +591,7 @@ public class IcNatServiceImpl extends BaseServiceImpl imp LambdaQueryWrapper query = new LambdaQueryWrapper(); query.eq(IcResiUserEntity::getCustomerId, customerId); query.eq(IcResiUserEntity::getIdCard, idCard); + query.eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); if (StringUtils.isNotBlank(pids)) { query.likeRight(IcResiUserEntity::getPids, pids); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserDataSyncServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserDataSyncServiceImpl.java new file mode 100644 index 0000000000..95c5f97e34 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserDataSyncServiceImpl.java @@ -0,0 +1,55 @@ +package com.epmet.service.impl; + +import com.epmet.service.IcResiUserDataSyncService; +import com.epmet.service.IcResiUserService; +import com.epmet.service.StatsResiWarnService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.concurrent.ExecutorService; + +/** + * desc: + * + * @author: LiuJanJun + * @date: 2022/7/16 8:07 下午 + * @version: 1.0 + */ +@Slf4j +@Service +public class IcResiUserDataSyncServiceImpl implements IcResiUserDataSyncService { + + @Autowired + private IcResiUserService icResiUserService; + @Autowired + private StatsResiWarnService statsResiWarnService; + @Autowired + private ExecutorService executorService; + + /** + * desc: 同步与居民相关的数据 + * + * @param customerId + * @return java.lang.String + * @author LiuJanJun + * @date 2022/7/16 8:06 下午 + */ + @Override + public Boolean icDataSyncTask(String customerId) { + Boolean flag = true; + try { + statsResiWarnService.resiWarn(customerId); + } catch (Exception e) { + flag = false; + log.error("icDataSyncTask resiWarn exception:{}", e.getMessage(), customerId); + } + try { + icResiUserService.updateIcHouseResiNumber(customerId); + } catch (Exception e) { + flag = false; + log.error("icDataSyncTask updateIcHouseResiNumber exception:{}", e.getMessage(), customerId); + } + return flag; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 87350a7172..810015eab3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.bean.ResiExportBaseInfoData; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.*; +import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.dto.form.DictListFormDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.DictListResultDTO; @@ -153,6 +154,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcResiUserEntity::getHomeId, homeId); + wrapper.eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); wrapper.orderByAsc(IcResiUserEntity::getYhzgx); List list = baseDao.selectList(wrapper); @@ -1370,6 +1374,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId()); + wrapper.eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); wrapper.orderByAsc(IcResiUserEntity::getYhzgx); List resiUserList = baseDao.selectList(wrapper); if (CollectionUtils.isNotEmpty(resiUserList)) { @@ -2211,7 +2216,20 @@ public class IcResiUserServiceImpl extends BaseServiceImpl changeIcResiUserBelongTo(TokenDto tokenDto, IcUserBelongToChangedFormDTO formDTO) { - List resiUserIdList = baseDao.listUserIds(formDTO.getCustomerId(), formDTO.getSourceGridId()); + List resiUserIdList = baseDao.listUserIds(formDTO.getCustomerId(), formDTO.getSourceGridId(), formDTO.getNeighborhoodId()); + if (StringUtils.isBlank(formDTO.getCustomerId()) || StringUtils.isBlank(formDTO.getSourceGridId()) + ||StringUtils.isBlank(formDTO.getTargetGridId())){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误","参数错误"); + } + IcResiUserEntity entity = new IcResiUserEntity(); + entity.setGridId(formDTO.getTargetGridId()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getGridId,formDTO.getSourceGridId()) + .eq(IcResiUserEntity::getVillageId,formDTO.getNeighborhoodId()) + .eq(IcResiUserEntity::getCustomerId,formDTO.getCustomerId()); + baseDao.update(entity,wrapper); + //不调用原来的更新居民了 太慢 + /*List resiUserIdList = baseDao.listUserIds(formDTO.getCustomerId(), formDTO.getSourceGridId()); if (CollectionUtils.isEmpty(resiUserIdList)) { return null; } @@ -2229,8 +2247,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl { map.put(FieldConstant.ID, userId); this.edit(tokenDto, icResiUserFormDTOS); - }); - + });*/ return resiUserIdList; } @@ -2826,9 +2843,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl 0) { String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard()); + // 变更记录 + formDTO.setIcUserId(id); + icUserTransferRecordService.add(formDTO); + baseDao.updateIcResiUserByIdCard(entity); saveForm.setIcResiUserId(id); } else { baseDao.insert(entity); + String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard()); saveForm.setIcResiUserId(id); + formDTO.setIcUserId(id); + + // 变更记录 + icUserTransferRecordService.add(formDTO); } guardarDatosFeignClient.saveCaResidentUser(saveForm); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java index 1f33bbb603..09da4b8ee2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java @@ -10,21 +10,25 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.utils.*; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcResiUserDao; import com.epmet.dao.IcVaccineDao; import com.epmet.dao.IcVaccineRelationDao; +import com.epmet.dto.IcNatDTO; import com.epmet.dto.IcVaccineDTO; -import com.epmet.dto.form.ImportTaskCommonFormDTO; -import com.epmet.dto.form.VaccineListFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.IcVaccineListResultDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.dto.result.VaccineListDTO; +import com.epmet.entity.IcNatEntity; import com.epmet.entity.IcResiUserEntity; import com.epmet.entity.IcVaccineEntity; import com.epmet.entity.IcVaccineRelationEntity; @@ -33,6 +37,7 @@ import com.epmet.excel.data.IcVaccineImportExcelData; import com.epmet.excel.handler.IcVaccineExcelImportListener; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.OssFeignClient; +import com.epmet.service.IcNoticeService; import com.epmet.service.IcVaccineService; import com.epmet.service.UserService; import com.epmet.utils.ImportTaskUtils; @@ -77,6 +82,8 @@ public class IcVaccineServiceImpl extends BaseServiceImpl query = new LambdaQueryWrapper(); query.eq(IcResiUserEntity::getCustomerId, customerId); query.eq(IcResiUserEntity::getIdCard, idCard); + query.eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); if (StringUtils.isNotBlank(pids)) { query.likeRight(IcResiUserEntity::getPids, pids); } @@ -475,4 +483,85 @@ public class IcVaccineServiceImpl extends BaseServiceImpl NumConstant.ZERO) { + SendNoticeFormDTO dto = new SendNoticeFormDTO(); + List userList = new ArrayList<>(); + userList.add(ConvertUtils.sourceToTarget(formDTO, SendNoticeFormDTO.UserListBean.class)); + dto.setCustomerId(formDTO.getCustomerId()); + dto.setUserList(userList); + dto.setChannel(formDTO.getChannel()); + dto.setOrigin("1"); + dto.setContent(formDTO.getContent()); + dto.setStaffId(formDTO.getStaffId()); + icNoticeService.sendNotice(dto); + } + } + + @Override + public void edit(AddIcVaccineFormDTO formDTO) { + //0.先根据身份证号和接种时间校验除当前数据是否还存在相同数据 + IcVaccineDTO icVaccineDTO = baseDao.getVaccineDTO(formDTO.getCustomerId(), formDTO.getVaccineId(), formDTO.getIdCard(), DateUtils.format(formDTO.getInoculateTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)); + if (null != icVaccineDTO) { + throw new RenException(EpmetErrorCode.IC_VACCINE.getCode(), EpmetErrorCode.IC_VACCINE.getMsg()); + } + //1.更新核酸记录基础信息表数据 + IcVaccineEntity entity = ConvertUtils.sourceToTarget(formDTO, IcVaccineEntity.class); + entity.setId(formDTO.getVaccineId()); + if (!updateById(entity)) { + log.error(String.format("数据修改失败,核酸记录Id->%s", formDTO.getVaccineId())); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "疫苗接种记录信息修改失败"); + } + //修改只涉及到基础信息的修改 不会修改关系数据 关系表不涉及更新 + + //3.新增通知表信息 + if (CollectionUtils.isNotEmpty(formDTO.getChannel())) { + SendNoticeFormDTO dto = new SendNoticeFormDTO(); + List userList = new ArrayList<>(); + userList.add(ConvertUtils.sourceToTarget(formDTO, SendNoticeFormDTO.UserListBean.class)); + dto.setCustomerId(formDTO.getCustomerId()); + dto.setUserList(userList); + dto.setChannel(formDTO.getChannel()); + dto.setOrigin("1"); + dto.setContent(formDTO.getContent()); + dto.setStaffId(formDTO.getStaffId()); + icNoticeService.sendNotice(dto); + } + } + + @Override + public void del(IcVaccineFormDTO formDTO) { + //1.确定删除则需要删除基础数据以及所有可能存在的关系数据，物理删除业务数据 + if (baseDao.delById(formDTO.getVaccineId()) < NumConstant.ONE) { + log.error(String.format("数据删除失败,疫苗接种记录Id->%s", formDTO.getVaccineId())); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "数据删除失败"); + } + //关系数据删除 + icVaccineRelationDao.delRelation(formDTO.getVaccineId(), null); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java index 13645f9047..cced7c95b1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java @@ -306,7 +306,12 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService { //保存数据 List icStatsResiWarnEntities = new ArrayList<>(); for (IcResiCategoryWarnConfigDTO item : icResiCategoryWarnConfigDTOList) { - icStatsResiWarnDao.delete(new QueryWrapper().lambda().eq(IcStatsResiWarnEntity::getConfigId,item.getId()).eq(IcStatsResiWarnEntity::getCustomerId,customerId)); + int deleteNum; + do { + // deleteNum = icStatsResiWarnDao.delete(new QueryWrapper().lambda().eq(IcStatsResiWarnEntity::getConfigId,item.getId()) + // .eq(IcStatsResiWarnEntity::getCustomerId,customerId)); + deleteNum = icStatsResiWarnDao.deleteByCustomerIdAndConfigId(item.getId(),customerId); + } while (deleteNum > NumConstant.ZERO); List maps = icStatsResiWarnDao.resiWarn(customerId,item.getTableName(), item.getColumnName()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index 017e6e53b0..72887bcb63 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -213,6 +213,17 @@ public class UserServiceImpl extends BaseServiceImpl implem MyResiUserInfoResultDTO result = ConvertUtils.sourceToTarget(myselfMsg, MyResiUserInfoResultDTO.class); //registerFlag 是否已注册居民，true ,false result.setRegisterFlag(StringUtils.isNotBlank(myselfMsg.getResiId())); + if(StringUtils.isNotBlank(myselfMsg.getIdNum()) && StringUtils.isNotBlank(myselfMsg.getResiId())){ + //找到该身份证号的居民 + IcResiUserDTO icResiUserDTO = icResiUserService.getByIdCard(myResiUserInfoFormDTO.getCustomerId(), myselfMsg.getIdNum(), null); + if(null != icResiUserDTO && "0".equals(icResiUserDTO.getStatus())){ + result.setHomeFlag(true); + }else{ + result.setHomeFlag(false); + } + }else{ + result.setHomeFlag(false); + } // 已录入身份证号：true;未完善：false. result.setCompleteIdNum(StringUtils.isNotBlank(myselfMsg.getIdNum())); result.setRegisterGridName(ModuleConstant.EMPTY_STR); diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.59__alter_ic_vaccine.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.59__alter_ic_vaccine.sql new file mode 100644 index 0000000000..0c96934859 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.59__alter_ic_vaccine.sql @@ -0,0 +1,6 @@ + +ALTER TABLE `ic_vaccine` +ADD COLUMN `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数字社区的icResiUserId、其他情况无值' AFTER `USER_TYPE`; + + + diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.60__alter_ic_epidemic_special_attention.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.60__alter_ic_epidemic_special_attention.sql new file mode 100644 index 0000000000..6a34b24ec5 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.60__alter_ic_epidemic_special_attention.sql @@ -0,0 +1,3 @@ + +ALTER TABLE `ic_epidemic_special_attention` + MODIFY COLUMN `MOBILE` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号'; diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.61__alter_ic_vaccine.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.61__alter_ic_vaccine.sql new file mode 100644 index 0000000000..ab40652c5f --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.61__alter_ic_vaccine.sql @@ -0,0 +1,4 @@ +ALTER TABLE `ic_vaccine` +MODIFY COLUMN `INOCULATE_ADDRESS` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '接种地点' AFTER `INOCULATE_TIME`, +MODIFY COLUMN `MANUFACTURER` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '疫苗厂家' AFTER `INOCULATE_ADDRESS`; + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 29a68a7529..fe16fb2908 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -24,7 +24,7 @@ a.`NAME`, a.MOBILE, a.ID_CARD, - a.reason, + IFNULL(a.reason,'') AS reason, a.REMARK, b.VILLAGE_ID, b.BUILD_ID, @@ -34,9 +34,9 @@ IFNULL(v.vaccinationCount,0) AS vaccinationCount FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and b.CUSTOMER_ID=a.CUSTOMER_ID - LEFT JOIN (SELECT id_card , CUSTOMER_ID, count(1) AS vaccinationCount FROM ic_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD, CUSTOMER_ID) v ON (v.ID_CARD = a.ID_CARD and v.CUSTOMER_ID=a.CUSTOMER_ID) + LEFT JOIN (SELECT id_card , CUSTOMER_ID, count(1) AS vaccinationCount, CREATED_TIME FROM ic_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD, CUSTOMER_ID) v ON (v.ID_CARD = a.ID_CARD and v.CUSTOMER_ID=a.CUSTOMER_ID) WHERE a.DEL_FLAG = 0 - AND a.ORG_ID = #{orgId} + AND concat(a.pids,':',ORG_ID) like concat('%',#{orgId},'%') AND a.ATTENTION_TYPE = #{attentionType} AND a.`NAME` LIKE CONCAT('%',#{name},'%') @@ -59,6 +59,12 @@ AND b.home_id = #{homeId} + + AND DATE_FORMAT(v.CREATED_TIME,'%Y%m%d') >= #{startDate} + + + AND DATE_FORMAT(v.CREATED_TIME,'%Y%m%d') #{endDate} + HAVING vaccinationCount = #{vaccinationCount} @@ -81,7 +87,7 @@ FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and a.CUSTOMER_ID = b.CUSTOMER_ID WHERE a.DEL_FLAG = 0 - AND a.ORG_ID = #{orgId} + AND concat(a.pids,':',ORG_ID) like concat('%',#{orgId},'%') AND a.ATTENTION_TYPE = #{attentionType} AND a.`NAME` LIKE CONCAT('%',#{name},'%') diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml index 1bbaeeaa3b..4459802f6d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml @@ -142,7 +142,7 @@ UPDATE ic_nat m, ( - SELECT if(DEL_FLAG,0,1) resiFlag, ID_CARD FROM ic_resi_user + SELECT if(STATUS ='0', 1, 0) resiFlag, ID_CARD FROM ic_resi_user WHERE 1=1 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 0dbdacb01b..c71227da0d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -206,8 +206,8 @@ ) - group by IC_RESI_USER.id + group by IC_RESI_USER.id ${groupTableName}.ID @@ -824,6 +824,7 @@ HOME_ID, MOBILE, a.ID_CARD, + a.BIRTHDAY, IFNULL( b.count, 0 ) AS vaccineCount, IFNULL( c.count, 0 ) AS natCount FROM @@ -886,6 +887,12 @@ AND a.ID_CARD LIKE concat( '%', #{idCard}, '%' ) + + AND a.BIRTHDAY = ]]> #{startBirthDay} + + + AND a.BIRTHDAY #{endBirthDay} + ORDER BY GRID_ID,VILLAGE_ID,BUILD_ID,UNIT_ID,HOME_ID, convert(NAME using gbk) ) t WHERE @@ -1038,8 +1045,9 @@ SELECT ID from ic_resi_user WHERE GRID_ID = #{gridId} - AND DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} + and VILLAGE_ID = #{neighborhoodId} + AND DEL_FLAG = '0' + + + DELETE FROM ic_stats_resi_warn + WHERE config_id = #{configId} + and customer_id = #{customerId} + limit 1000 + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml index 8bf4afa201..0ed766fb77 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml @@ -40,7 +40,8 @@ b.id_card, b.INOCULATE_TIME, b.INOCULATE_ADDRESS, - b.MANUFACTURER + b.MANUFACTURER, + b.user_id FROM ic_vaccine_relation a INNER JOIN ic_vaccine b ON a.IC_VACCINE_ID = b.ID AND b.DEL_FLAG = '0' WHERE a.DEL_FLAG = '0' @@ -71,6 +72,7 @@ SELECT id vaccineId, is_resi_user isResiUser, + user_id userId, user_type userType, `name` `name`, mobile mobile, @@ -126,8 +128,33 @@ LIMIT 1 + + - DELETE FROM ic_nat WHERE id = #{icNatId} + DELETE FROM ic_vaccine WHERE id = #{icVaccineId}