From 0f973b472d69bb29d01bb55d95b0d452b30b64c0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 22 Dec 2021 10:15:33 +0800 Subject: [PATCH 001/391] =?UTF-8?q?=E5=A4=9A=E4=B8=80=E4=B8=AA=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=20=E6=80=95=E5=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/EpmetAdminOpenFeignClient.java | 11 +++++++++++ .../fallback/EpmetAdminOpenFeignClientFallback.java | 6 ++++++ .../commons/tools/dto/result/DictTreeResultDTO.java | 2 -- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java index 6d7e1124dd..9068180318 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java @@ -3,6 +3,7 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.form.DictListFormDTO; import com.epmet.commons.tools.dto.result.DictListResultDTO; +import com.epmet.commons.tools.dto.result.DictTreeResultDTO; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.result.CorsConfigResultDTO; @@ -88,6 +89,16 @@ public interface EpmetAdminOpenFeignClient { @PostMapping("/sys/dict/data/dictmap/{dictType}") Result> dictMap(@PathVariable("dictType") String dictType); + /** + * 字典数据查询通用接口 + * @Param dictType + * @Return {@link Result< Map < String, String>>} + * @Author zhaoqifeng + * @Date 2021/11/19 17:36 + */ + @PostMapping("/sys/dict/data/dictTree/{dictType}") + Result> dictTree(@PathVariable("dictType") String dictType); + @PostMapping("/sys/dict/data/dictlist") Result> dictList(@RequestBody DictListFormDTO formDTO); } diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java index 6c16e8f3ae..110ba490e3 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java @@ -3,6 +3,7 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.form.DictListFormDTO; import com.epmet.commons.tools.dto.result.DictListResultDTO; +import com.epmet.commons.tools.dto.result.DictTreeResultDTO; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; @@ -49,6 +50,11 @@ public class EpmetAdminOpenFeignClientFallback implements EpmetAdminOpenFeignCli return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "dictMap", dictType); } + @Override + public Result> dictTree(String dictType) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "dictTree", dictType); + } + @Override public Result> dictList(DictListFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "dictList", formDTO); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/DictTreeResultDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/DictTreeResultDTO.java index 7314d941a8..c8aef8f93f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/DictTreeResultDTO.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/DictTreeResultDTO.java @@ -1,7 +1,6 @@ package com.epmet.commons.tools.dto.result; import com.epmet.commons.tools.utils.TreeStringNode; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -16,7 +15,6 @@ public class DictTreeResultDTO extends TreeStringNode impleme /** * 上级ID */ - @JsonIgnore private String pid; private String name; } From 17232934fa700781f9e4259c53d78e58c939d14c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Dec 2021 17:54:21 +0800 Subject: [PATCH 002/391] bugfix --- .../src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 54a8c7f674..4d6b728387 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 @@ -688,5 +688,5 @@ public interface EpmetUserOpenFeignClient { * @return */ @GetMapping("/epmetuser/icresiuser/geticresiuser/{icResiUserId}") - Result getIcResiUserDTO(String icResiUserId); + Result getIcResiUserDTO(@PathVariable("icResiUserId") String icResiUserId); } From 78ebf8872cf649983c242fc2044752e261e8c7b7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Dec 2021 18:36:55 +0800 Subject: [PATCH 003/391] 404 --- .../java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 2 +- .../src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java | 2 +- .../main/java/com/epmet/controller/IcResiUserController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index bc9346fdd0..2273a80aa0 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -230,7 +230,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl demandUserRes=epmetUserOpenFeignClient.getIcResiUserDTO(fromDTO.getDemandUserId()); if(!demandUserRes.success()||null==demandUserRes.getData()){ - throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询需求人信息异常"); + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询需求人信息异常"+ JSON.toJSONString(demandUserRes)); } insertEntity.setDemandUserHouseId(demandUserRes.getData().getVillageId()); // 查询需求人的居住地址 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 4d6b728387..2c4989f718 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 @@ -687,6 +687,6 @@ public interface EpmetUserOpenFeignClient { * @param icResiUserId * @return */ - @GetMapping("/epmetuser/icresiuser/geticresiuser/{icResiUserId}") + @PostMapping(value = "/epmetuser/icresiuser/geticresiuser/{icResiUserId}") Result getIcResiUserDTO(@PathVariable("icResiUserId") String icResiUserId); } 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 fd7f325a01..395a5d40b9 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 @@ -633,7 +633,7 @@ public class IcResiUserController { * @param icResiUserId * @return */ - @GetMapping("geticresiuser/{icResiUserId}") + @PostMapping("geticresiuser/{icResiUserId}") public Result getIcResiUserDTO(@PathVariable("icResiUserId") String icResiUserId){ if(StringUtils.isNotBlank(icResiUserId)){ return new Result().ok(icResiUserService.get(icResiUserId)); From ea46728d8e7456d76a6af57f69d7ca10458232eb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 24 Dec 2021 13:08:08 +0800 Subject: [PATCH 004/391] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E9=9C=80=E6=B1=82=E5=86=85=E5=AE=B9+=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E8=AF=84=E4=BB=B7=E8=BE=93=E5=85=A5=E7=9A=84=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=83=85=E5=86=B5=E8=B5=B0=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/demand/EvaluateDemandFormDTO.java | 3 ++ .../controller/ResiDemandController.java | 1 + .../impl/IcUserDemandRecServiceImpl.java | 51 ++++++++++++++++--- 3 files changed, 49 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/EvaluateDemandFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/EvaluateDemandFormDTO.java index 1a0a5d28f2..ffd035954f 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/EvaluateDemandFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/EvaluateDemandFormDTO.java @@ -41,4 +41,7 @@ public class EvaluateDemandFormDTO implements Serializable { private String userId; @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) private String customerId; + // 政府端:gov、居民端:resi、运营端:oper + @NotBlank(message = "app不能为空", groups = AddUserInternalGroup.class) + private String app; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java index be5daf5e3e..48ff8d7585 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java @@ -117,6 +117,7 @@ public class ResiDemandController { public Result evaluate(@LoginUser TokenDto tokenDto, @RequestBody EvaluateDemandFormDTO formDTO) { formDTO.setUserId(tokenDto.getUserId()); formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setApp(tokenDto.getApp()); ValidatorUtils.validateEntity(formDTO, EvaluateDemandFormDTO.ShowGroup.class, EvaluateDemandFormDTO.AddUserInternalGroup.class); FinishResultDTO finishResultDTO = icUserDemandRecService.evaluate(formDTO); //如果服务方是区域化党建单位，需要实时去计算他的群众满意度=服务过的需求的评价分数相加➗ 需求的总个数。 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 8c3ade3df5..ac6f6ccf9f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -27,10 +27,15 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.scan.param.TextScanParamDTO; +import com.epmet.commons.tools.scan.param.TextTaskDTO; +import com.epmet.commons.tools.scan.result.SyncScanResult; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.ScanContentUtils; import com.epmet.constant.ReadFlagConstant; import com.epmet.constant.UserDemandConstant; import com.epmet.constant.UserMessageTypeConstant; @@ -56,6 +61,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -96,6 +102,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + if (!textSyncScanResult.success()) { + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!textSyncScanResult.getData().isAllPass()) { + throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg()); + } + } + } + /** * 居民端，我有需求，最近预约，显示最近预约过的五个需求，按照预约时间倒 * 查询最近预约的5个编码 @@ -1255,7 +1294,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl Date: Wed, 29 Dec 2021 14:27:58 +0800 Subject: [PATCH 005/391] =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/feign/EpmetUserOpenFeignClient.java | 8 -------- .../feign/fallback/EpmetUserOpenFeignClientFallback.java | 4 ---- 2 files changed, 12 deletions(-) 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 12ff017b6e..47520244f8 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 @@ -698,12 +698,4 @@ public interface EpmetUserOpenFeignClient { */ @PostMapping(value = "/epmetuser/icresiuser/geticresiuser/{icResiUserId}") Result getIcResiUserDTO(@PathVariable("icResiUserId") String icResiUserId); - - /** - * desc:获取例行工作 数据 分页 - * @param patrolQueryFormDTO - * @return - */ - @PostMapping(value = "//epmetuser/patrolroutinework/selectList") - Result> getPatrolRoutineWorkList(@RequestBody PatrolQueryFormDTO patrolQueryFormDTO); } 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 c41d75f137..91b647c878 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 @@ -518,8 +518,4 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getIcResiUserDTO", icResiUserId); } - @Override - public Result> getPatrolRoutineWorkList(PatrolQueryFormDTO patrolQueryFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getPatrolRoutineWorkList", patrolQueryFormDTO); - } } From 0343073e12a23850bef7c2718950b995d1bd758e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 31 Dec 2021 15:49:30 +0800 Subject: [PATCH 006/391] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BF=97=E6=84=BF=E8=80=85=E5=88=97=E8=A1=A8?= =?UTF-8?q?agencyId=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/resi/VolunteerCommonFormDTO.java | 4 +- .../controller/ResiVolunteerController.java | 8 +-- .../epmet/service/VolunteerInfoService.java | 12 ++++- .../impl/VolunteerInfoServiceImpl.java | 51 ++++++++++++------- .../service/impl/VolunteerServiceImpl.java | 4 +- 5 files changed, 50 insertions(+), 29 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/VolunteerCommonFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/VolunteerCommonFormDTO.java index 9a5e2fdc7f..4a9973d735 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/VolunteerCommonFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/VolunteerCommonFormDTO.java @@ -20,9 +20,9 @@ public class VolunteerCommonFormDTO { private String customerId; /** - * 上级组织ID，使用PIDS like，查询该组织下所有志愿者，注意，是like 'agencyId:%' + * 组织ID */ - private String superiorAgencyId; + private String agencyId; private Integer pageNo = 0; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java index ed5609eed3..39da0690af 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java @@ -141,8 +141,8 @@ public class ResiVolunteerController { Integer pageNo = input.getPageNo(); Integer pageSize = input.getPageSize(); String customerId = input.getCustomerId(); - String superiorAgencyId = input.getSuperiorAgencyId(); - List l = volunteerInfoService.queryVolunteerPage(customerId, pageNo, pageSize, superiorAgencyId); + String agencyId = input.getAgencyId(); + List l = volunteerInfoService.queryVolunteerPage(customerId, pageNo, pageSize, agencyId); return new Result>().ok(l); } @@ -154,9 +154,9 @@ public class ResiVolunteerController { @PostMapping("count") public Result getVolunteerCount(@RequestBody VolunteerCommonFormDTO input) { String customerId = input.getCustomerId(); - String pidsPrefix = input.getSuperiorAgencyId(); + String agencyId = input.getAgencyId(); - Integer volunteerCount = volunteerInfoService.getVolunteerCount(customerId, pidsPrefix); + Integer volunteerCount = volunteerInfoService.getVolunteerCount(customerId, agencyId); return new Result().ok(volunteerCount); } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java index adf45e6437..f9db916bbe 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java @@ -95,12 +95,20 @@ public interface VolunteerInfoService extends BaseService { */ List queryListVolunteer(String customerId,String staffId,String userRealName); - List queryVolunteerPage(String customerId, Integer pageNo, Integer pageSize, String superiorAgencyId); + /** + * @param customerId + * @param pageNo + * @param pageSize + * @param agencyId 组织ID，使用PIDS like，查询该组织"及下级"所有志愿者 + * @return + */ + List queryVolunteerPage(String customerId, Integer pageNo, Integer pageSize, String agencyId); /** * 查询志愿者数量 * @param customerId + * @param agencyId 组织ID，查询该组织"及下级"下所有的志愿者 * @return */ - Integer getVolunteerCount(String customerId, String pidsPrefix); + Integer getVolunteerCount(String customerId, String agencyId); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java index de63c1f712..ee7f66bc8a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java @@ -359,24 +359,11 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl queryVolunteerPage(String customerId, Integer pageNo, Integer pageSize, String superiorAgencyId) { + public List queryVolunteerPage(String customerId, Integer pageNo, Integer pageSize, String agencyId) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); Optional.ofNullable(customerId).ifPresent(cid -> query.eq(VolunteerInfoEntity::getCustomerId, cid)); - Optional.ofNullable(superiorAgencyId).ifPresent(cid -> { - - // 需要查询agency的pids:id，通过这个字符串去匹配志愿者的Pids字段来查询 - String errorMsg = "【分页查询志愿者列表】失败"; - CustomerAgencyDTO agencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(superiorAgencyId), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); - if (agencyInfo == null) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); - } - - String pidsAndAgencyIdPath = agencyInfo.getPids().concat(":").concat(superiorAgencyId); - if (pidsAndAgencyIdPath.startsWith(":")) { - pidsAndAgencyIdPath = pidsAndAgencyIdPath.replaceFirst(":", ""); - } - - query.likeRight(VolunteerInfoEntity::getPids, pidsAndAgencyIdPath); + Optional.ofNullable(agencyId).ifPresent(aid -> { + query.likeRight(VolunteerInfoEntity::getPids, getPidsByAgencyId(aid)); }); PageHelper.startPage(pageNo, pageSize); @@ -392,17 +379,43 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl query = new LambdaQueryWrapper<>(); Optional.ofNullable(customerId).ifPresent((cId) -> { query.eq(VolunteerInfoEntity::getCustomerId, cId); }); - Optional.ofNullable(pidsPrefix).ifPresent((pidsPrefixt) -> { - query.likeRight(VolunteerInfoEntity::getPids, pidsPrefixt); + Optional.ofNullable(agencyId).ifPresent((aid) -> { + query.likeRight(VolunteerInfoEntity::getPids, getPidsByAgencyId(aid)); }); return baseDao.selectCount(query); } + + /** + * 使用agencyId,获取pids（agencyPids:agencyId） + * @param agencyId + * @return + */ + private String getPidsByAgencyId(String agencyId) { + // 需要查询agency的pids:id，通过这个字符串去匹配志愿者的Pids字段来查询 + String errorMsg = "【分页查询志愿者列表】失败"; + CustomerAgencyDTO agencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(agencyId), + ServiceConstant.GOV_ORG_SERVER, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + errorMsg, + errorMsg); + + if (agencyInfo == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } + + String pidsAndAgencyIdPath = agencyInfo.getPids().concat(":").concat(agencyId); + if (pidsAndAgencyIdPath.startsWith(":")) { + pidsAndAgencyIdPath = pidsAndAgencyIdPath.replaceFirst(":", ""); + } + + return pidsAndAgencyIdPath; + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java index 9aa05b6b27..a25f7d2ad7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java @@ -103,7 +103,7 @@ public class VolunteerServiceImpl implements VolunteerService, ResultDataResolve String vcErrorMsg = "【志愿者分布】查询志愿者总数出错"; VolunteerCommonFormDTO volunteerCountForm = new VolunteerCommonFormDTO(); volunteerCountForm.setCustomerId(customerId); - volunteerCountForm.setSuperiorAgencyId(agencyId); + volunteerCountForm.setAgencyId(agencyId); Integer volunteerCount = getResultDataOrThrowsException(epmetHeartOpenFeignClient.getVolunteerCount(volunteerCountForm), ServiceConstant.EPMET_HEART_SERVER, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), @@ -237,7 +237,7 @@ public class VolunteerServiceImpl implements VolunteerService, ResultDataResolve private List listVolunteersByPage(String customerId, String agencyId, Integer pageNo, Integer pageSize) { VolunteerCommonFormDTO volunteerForm = new VolunteerCommonFormDTO(); volunteerForm.setCustomerId(customerId); - volunteerForm.setSuperiorAgencyId(agencyId); + volunteerForm.setAgencyId(agencyId); volunteerForm.setPageNo(pageNo); volunteerForm.setPageSize(pageSize); From 63252fedcfd5e82d4eabffc32a9d26ea35124ecb Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 6 Jan 2022 15:06:35 +0800 Subject: [PATCH 007/391] =?UTF-8?q?=E3=80=90=E7=BD=91=E6=A0=BC=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=9F=E8=AE=A1=E3=80=91=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/excel/ApprovaledListExcel.java | 2 ++ .../service/impl/ProjectTraceServiceImpl.java | 24 +++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ApprovaledListExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ApprovaledListExcel.java index ef08b3cc39..3e4022712a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ApprovaledListExcel.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ApprovaledListExcel.java @@ -1,6 +1,7 @@ package com.epmet.excel; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; @@ -13,6 +14,7 @@ import lombok.Setter; @Getter @Setter @EqualsAndHashCode +@ColumnWidth(20) public class ApprovaledListExcel { @ExcelProperty("项目事件标题") private String title; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java index 33f0e8ec45..1c1a61949c 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java @@ -47,7 +47,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -954,9 +953,16 @@ public class ProjectTraceServiceImpl implements ProjectTraceS formDTO.setPageNo(NumConstant.ONE); formDTO.setPageSize(NumConstant.ONE_THOUSAND); ExcelWriter excelWriter = null; + + CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staff) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "获取工作人员信息失败"); + } + + String sheetName = getSheetName(staff.getRealName(), formDTO.getStartTime(), formDTO.getEndTime()); try { excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("直接立项记录.xlsx", response)).build(); - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + WriteSheet writeSheet = EasyExcel.writerSheet(sheetName).build(); writeSheet.setClazz(ApprovaledListExcel.class); Integer num; //一千条一循环分批写入 @@ -976,6 +982,20 @@ public class ProjectTraceServiceImpl implements ProjectTraceS } } + private String getSheetName(String staffName, String startTime, String endTime) { + StringBuilder sb = new StringBuilder(staffName); + String s = staffName; + if (startTime == null && endTime != null) { + sb.append("截止").append(endTime); + } else if (startTime != null && endTime != null) { + sb.append(startTime) + .append("至") + .append(endTime); + } + sb.append("的上报事件（直接立项）记录"); + return sb.toString(); + } + private List queryStaffListRes(List staffList,String currentUserId) { List staffIdList = staffList.stream().map(TickStaffFormDTO::getStaffId).collect(Collectors.toList()); staffIdList.add(currentUserId); From 1f227d482e6b344b8d84c64dbc892c1dd59da92e Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 12 Jan 2022 17:39:25 +0800 Subject: [PATCH 008/391] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=E5=AF=BC=E5=87=BA=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 9d22fdfb8c..665b24b55b 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.92 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.93 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index c66ced640a..15ba2b48d7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.92 + 0.3.93 data-aggregator com.epmet From 2d21b4e8e74bc4c62f8f433d3fd4075420a78db1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 13 Jan 2022 10:29:56 +0800 Subject: [PATCH 009/391] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=8D=E7=A7=B0up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../oper-crm/oper-crm-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) 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 c20b81b36d..aff0ebcf84 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.210 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.211 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 170d4f0d63..2d38928a9c 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.210 + 0.3.211 data-report-server 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 d1ccbc081a..1647784a83 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.72 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.73 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index ba92a6d321..96bcc5717b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.72 + 0.0.73 com.epmet epmet-heart 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 25ea20b467..ca80c4949a 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.156 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.157 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 9bd6cedb44..91849509fd 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.156 + 0.3.157 com.epmet gov-org 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 9cc48783a1..c670fb8d23 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 @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.87 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.88 ports: - "8090:8090" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index f972dcffbf..eaa54edf09 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.87 + 0.3.88 com.epmet oper-crm From 8c90fe0692fb143715d4aecc17ad6ff15173278c Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 13 Jan 2022 20:57:24 +0800 Subject: [PATCH 010/391] =?UTF-8?q?=E5=90=84=E7=A7=8D=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=90=A7=20=E5=85=B7=E4=BD=93=E4=B8=8D=E7=9F=A5=E9=81=93?= =?UTF-8?q?=E6=94=B9=E4=BA=86=E5=95=A5=20=E5=85=88=E4=B8=8A=20=E8=B5=9E?= =?UTF-8?q?=E5=A4=9A=E4=BA=86=20=E9=BA=BB=E7=83=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 665b24b55b..5fe15bfab7 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.93 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.94 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 15ba2b48d7..cc040c21b8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.93 + 0.3.94 data-aggregator com.epmet 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 a54a0348a6..e8b40ee85e 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.345 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.346 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 6c21774ece..17dc8bb155 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.345 + 0.3.346 data-statistical com.epmet 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 fb855657d2..25c2bda0b7 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.96 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.97 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 69e7500932..b72d47f705 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.96 + 0.3.97 gov-project com.epmet From 1694aa7a62f0ad36e84ff6ab999ee1bff6da0c50 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 13 Jan 2022 21:15:16 +0800 Subject: [PATCH 011/391] =?UTF-8?q?=E5=8E=BB=E6=8E=89mock=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 5fe15bfab7..d7f0d70ab6 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.94 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.95 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index cc040c21b8..595e69c30d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.94 + 0.3.95 data-aggregator com.epmet From 8efa3fb9a7a4aaebd823b2a46dd786c8b08d965e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 14 Jan 2022 09:43:41 +0800 Subject: [PATCH 012/391] again --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 d7f0d70ab6..adf49f2e63 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.95 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.96 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 595e69c30d..f8beb27bb3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.95 + 0.3.96 data-aggregator com.epmet 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 e8b40ee85e..cd7553753b 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.346 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.347 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 17dc8bb155..0e36e12198 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.346 + 0.3.347 data-statistical com.epmet From 9e8b632935c5e4112870ecf8c607630f5176caec Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 14 Jan 2022 10:30:38 +0800 Subject: [PATCH 013/391] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=EF=BC=8C=E8=AE=AE?= =?UTF-8?q?=E9=A2=98=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 cd7553753b..d166199440 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.347 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.348 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 0e36e12198..c2faf4ece3 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.347 + 0.3.348 data-statistical com.epmet 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 8105b3917f..51f95a51df 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.100 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.101 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index c09284177c..787de175dd 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.100 + 0.3.101 gov-issue com.epmet From 791fee77e2fe8fa591091763762d53e97dc5ad98 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 14 Jan 2022 16:13:15 +0800 Subject: [PATCH 014/391] =?UTF-8?q?job=20=E5=92=8C=20commonservice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 97adff5e39..d60a3f7959 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 @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.42 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.43 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 2e22c32c01..38a3ccbbbd 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.42 + 0.3.43 com.epmet epmet-common-service 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 b1813f2660..853ade925b 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.47 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.48 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index f772b6134b..50c2cc0141 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.47 + 0.3.48 com.epmet epmet-job From c222f76c7065a799cc18c81469fce9df07fd254c Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 14 Jan 2022 16:18:15 +0800 Subject: [PATCH 015/391] =?UTF-8?q?issue=20=E5=92=8Cstats?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 d166199440..6ca4d743b8 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.348 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.349 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index c2faf4ece3..ab80148d07 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.348 + 0.3.349 data-statistical com.epmet 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 51f95a51df..140f59027d 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.101 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.102 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 787de175dd..5e9a3f5657 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.101 + 0.3.102 gov-issue com.epmet From 1a352123492bbce7933abdd6f5d756c37cf12c2f Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 14 Jan 2022 18:16:32 +0800 Subject: [PATCH 016/391] =?UTF-8?q?=E5=8A=A8=E5=8A=9B=E7=BD=91=E6=A0=BC=20?= =?UTF-8?q?=E5=B8=82=E5=8C=97=E4=B8=93=E5=B1=9E=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 aff0ebcf84..c926bc451b 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.211 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.212 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 2d38928a9c..cc8fb18e5a 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.211 + 0.3.212 data-report-server From 986867b477d9738648843f23722320a960ca7fd5 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 17 Jan 2022 09:57:26 +0800 Subject: [PATCH 017/391] =?UTF-8?q?agg=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 adf49f2e63..e40480bf35 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.96 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.97 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index f8beb27bb3..9edb302a91 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.96 + 0.3.97 data-aggregator com.epmet From 468ff87bb511eda5553d72a3880ea4d8659e0ccd Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 18 Jan 2022 09:36:52 +0800 Subject: [PATCH 018/391] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=201.?= =?UTF-8?q?=E3=80=90=E5=8C=BA=E5=9D=97=E9=93=BE=E3=80=91=E5=8C=BA=E5=9D=97?= =?UTF-8?q?=E9=93=BEweb=E7=95=8C=E9=9D=A2=E7=94=A8=E6=88=B7=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/GovLoginController.java | 22 ++++++++++++++ .../form/BcStaffAuthenticationFormDTO.java | 24 +++++++++++++++ .../com/epmet/service/GovLoginService.java | 8 +++++ .../service/impl/GovLoginServiceImpl.java | 29 ++++++++++++++++++- 4 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 epmet-auth/src/main/java/com/epmet/dto/form/BcStaffAuthenticationFormDTO.java diff --git a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java index 386e162c02..deaa719859 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.HashMap; import java.util.List; /** @@ -121,5 +122,26 @@ public class GovLoginController { List staffOrgs = govLoginService.getMyOrgByPassword(formDTO); return new Result>().ok(staffOrgs); } + + /** + * 区块链web 系统身份认证 + * @param input + * @return + */ + @PostMapping("/blockchain/authentication") + public Result blockChainGetStaffInfoByPwd(@RequestBody BcStaffAuthenticationFormDTO input) { + ValidatorUtils.validateEntity(input); + + String customerId = input.getCustomerId(); + String mobile = input.getMobile(); + String password = input.getPassword(); + + String userId = govLoginService.blockChainStaffAuthenticationByPwd(customerId, mobile, password); + + HashMap m = new HashMap<>(); + m.put("userId", userId); + return new Result().ok(m); + } + } diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/BcStaffAuthenticationFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/BcStaffAuthenticationFormDTO.java new file mode 100644 index 0000000000..202f8073c9 --- /dev/null +++ b/epmet-auth/src/main/java/com/epmet/dto/form/BcStaffAuthenticationFormDTO.java @@ -0,0 +1,24 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @ClassName BcAdminLoginFormDTO + * @Description 区块链管理系统staff身份认证 + * @Author wangxianzhang + * @Date 2022/1/17 10:11 下午 + */ +@Data +public class BcStaffAuthenticationFormDTO { + + @NotBlank(message = "客户ID必填") + private String customerId; + + @NotBlank(message = "手机号必填") + private String mobile; + + @NotBlank(message = "密码必填") + private String password; +} diff --git a/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java b/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java index ea6329ceda..2a493fd54c 100644 --- a/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java +++ b/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java @@ -76,4 +76,12 @@ public interface GovLoginService { * @Date 2020/6/30 22:43 **/ List getMyOrgByPassword(StaffOrgsFormDTO formDTO); + + /** + * 区块链系统通过用户密码认证身份 + * @param mobile + * @param password + * @return + */ + String blockChainStaffAuthenticationByPwd(String customerId, String mobile, String password); } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java index 86569434c2..8a36124e4d 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java @@ -5,8 +5,10 @@ import com.epmet.common.token.constant.LoginConstant; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.ServiceConstant; 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.security.dto.GovTokenDto; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.password.PasswordUtils; @@ -46,7 +48,7 @@ import java.util.stream.Collectors; * @Date 2020/4/20 10:56 */ @Service -public class GovLoginServiceImpl implements GovLoginService { +public class GovLoginServiceImpl implements GovLoginService, ResultDataResolver { private static final Logger logger = LoggerFactory.getLogger(GovLoginServiceImpl.class); private static final String SEND_SMS_CODE_ERROR = "发送短信验证码异常,手机号[%s],code[%s],msg[%s]"; @Autowired @@ -490,5 +492,30 @@ public class GovLoginServiceImpl implements GovLoginService { } return result.getData(); } + + @Override + public String blockChainStaffAuthenticationByPwd(String customerId, String mobile, String password) { + + GovWebOperLoginFormDTO form = new GovWebOperLoginFormDTO(); + form.setCustomerId(customerId); + form.setMobile(mobile); + + GovWebOperLoginResultDTO staff = getResultDataOrThrowsException(epmetUserFeignClient.getStaffIdAndPwd(form), ServiceConstant.EPMET_USER_SERVER, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + String.format("【区块链获取用户信息】根据手机号%s和指定客户ID:%s查找用户信息失败", mobile, customerId), + "查询用户失败"); + + if (staff == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + String.format("【区块链获取用户信息】根据手机号%s和指定客户ID:%s查找用户信息失败", mobile, customerId)); + } + + if (!PasswordUtils.matches(password, staff.getPassWord())) { + // 密码不匹配 + throw new EpmetException(EpmetErrorCode.ERR10004.getCode(), String.format("【区块链获取用户信息】密码不匹配，手机号：%s", mobile)); + } + + return staff.getUserId(); + } } From a18b6f3cce2b6614d636172029eaff556cd476e8 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 18 Jan 2022 15:55:24 +0800 Subject: [PATCH 019/391] =?UTF-8?q?user=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 9eae5a851f..1f04ea52bd 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.218 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.219 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 8d021ca7a8..6ec6805309 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.218 + 0.3.219 com.epmet epmet-user From 3db1e9df5f4b299f5289639f3d5c1685db077c8a Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 19 Jan 2022 08:57:18 +0800 Subject: [PATCH 020/391] =?UTF-8?q?=E5=B8=82=E5=8C=97=E7=A7=81=E6=9C=89?= =?UTF-8?q?=E5=8C=96=E9=83=A8=E7=BD=B2=E9=9C=80=E8=A6=81=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 6ca4d743b8..4676b2d468 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.349 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.350 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index ab80148d07..b83fe8e763 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.349 + 0.3.350 data-statistical com.epmet 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 853ade925b..726ab533b7 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.48 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.49 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 50c2cc0141..07087d4e5f 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.48 + 0.3.49 com.epmet epmet-job From aff5b03545307eccea730e949f9500c5f8fa0d46 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 19 Jan 2022 10:29:14 +0800 Subject: [PATCH 021/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-hall/resi-hall-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-hall/resi-hall-server/pom.xml | 2 +- .../resi-home/resi-home-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-home/resi-home-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 6ae227458d..cd89501ed2 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.36 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.37 ports: - "8100:8100" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index e1d8cb9996..bc016caf58 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.36 + 0.3.37 resi-hall com.epmet 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 9a31b60a8d..c0fa5fdde2 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-home-server: container_name: resi-home-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.23 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.24 ports: - "8104:8104" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index d5972d3f1e..81b0b3612c 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.23 + 0.3.24 resi-home From dcbef4a326e83703ca032e775205fe410b7b2686 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 19 Jan 2022 13:46:52 +0800 Subject: [PATCH 022/391] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E6=89=B9=E6=9F=A5=E8=AF=A21w=20?= =?UTF-8?q?=E8=AF=95=E4=B8=8B=20+=20=E6=95=B0=E5=AD=97=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 e40480bf35..f48ed97dfc 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.97 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.98 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 9edb302a91..ddd5049641 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.97 + 0.3.98 data-aggregator com.epmet 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 4676b2d468..927cda91a9 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.350 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.351 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index b83fe8e763..a9947527c7 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.350 + 0.3.351 data-statistical com.epmet From 19c98c06f631e51a21497187108d14ab16056a8f Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 19 Jan 2022 18:32:39 +0800 Subject: [PATCH 023/391] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=92=E5=85=A5=20?= =?UTF-8?q?=E5=88=86=E6=89=B9=E4=B8=80=E6=AC=A11000=20=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E5=86=85=E5=AD=98=E6=BA=A2=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 927cda91a9..2bceb0112e 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.351 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.352 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index a9947527c7..3f0ace66c1 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.351 + 0.3.352 data-statistical com.epmet From a286d4030f09887a9189a8514afaa5c26ee169ab Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 20 Jan 2022 10:55:32 +0800 Subject: [PATCH 024/391] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.?= =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E7=94=A8=E6=88=B7=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=B0=83=E6=95=B4=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8Curl=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth-client/pom.xml | 7 ++++ .../result/BlockChainStaffAuthResultDTO.java | 25 +++++++++++ .../epmet/controller/GovLoginController.java | 21 ---------- .../epmet/controller/GovWebController.java | 20 +++++++++ .../com/epmet/service/GovLoginService.java | 8 ---- .../java/com/epmet/service/GovWebService.java | 9 ++++ .../service/impl/GovLoginServiceImpl.java | 25 ----------- .../epmet/service/impl/GovWebServiceImpl.java | 41 ++++++++++++++++++- 8 files changed, 101 insertions(+), 55 deletions(-) create mode 100644 epmet-auth-client/src/main/java/com/epmet/auth/dto/result/BlockChainStaffAuthResultDTO.java diff --git a/epmet-auth-client/pom.xml b/epmet-auth-client/pom.xml index 1aee53c24e..d84ead3ff5 100644 --- a/epmet-auth-client/pom.xml +++ b/epmet-auth-client/pom.xml @@ -11,4 +11,11 @@ epmet-auth-client + + + com.epmet + epmet-commons-tools + 2.0.0 + + \ No newline at end of file diff --git a/epmet-auth-client/src/main/java/com/epmet/auth/dto/result/BlockChainStaffAuthResultDTO.java b/epmet-auth-client/src/main/java/com/epmet/auth/dto/result/BlockChainStaffAuthResultDTO.java new file mode 100644 index 0000000000..2a1ca0dfcc --- /dev/null +++ b/epmet-auth-client/src/main/java/com/epmet/auth/dto/result/BlockChainStaffAuthResultDTO.java @@ -0,0 +1,25 @@ +package com.epmet.auth.dto.result; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @ClassName BlockChainStaffAuthResultDTO + * @Description 区块链用户认证结果 + * @Author wangxianzhang + * @Date 2022/1/20 10:41 上午 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class BlockChainStaffAuthResultDTO { + + private String userId; + private String realName; + private String phone; + private String headUrl; + private String agencyId; + private String agencyName; + +} diff --git a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java index deaa719859..8745418f90 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java @@ -122,26 +122,5 @@ public class GovLoginController { List staffOrgs = govLoginService.getMyOrgByPassword(formDTO); return new Result>().ok(staffOrgs); } - - /** - * 区块链web 系统身份认证 - * @param input - * @return - */ - @PostMapping("/blockchain/authentication") - public Result blockChainGetStaffInfoByPwd(@RequestBody BcStaffAuthenticationFormDTO input) { - ValidatorUtils.validateEntity(input); - - String customerId = input.getCustomerId(); - String mobile = input.getMobile(); - String password = input.getPassword(); - - String userId = govLoginService.blockChainStaffAuthenticationByPwd(customerId, mobile, password); - - HashMap m = new HashMap<>(); - m.put("userId", userId); - return new Result().ok(m); - } - } diff --git a/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java b/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java index 8a85cb9da4..9320b5f140 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java @@ -1,8 +1,10 @@ package com.epmet.controller; +import com.epmet.auth.dto.result.BlockChainStaffAuthResultDTO; import com.epmet.commons.tools.utils.RSASignature; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.BcStaffAuthenticationFormDTO; import com.epmet.dto.form.GovWebLoginFormDTO; import com.epmet.dto.result.UserTokenResultDTO; import com.epmet.service.GovWebService; @@ -13,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.HashMap; + /** * @author sun @@ -63,5 +67,21 @@ public class GovWebController { return new Result().ok(publicKey); } + /** + * 区块链web 系统身份认证 + * @param input + * @return + */ + @PostMapping("/blockchain/authentication") + public Result blockChainGetStaffInfoByPwd(@RequestBody BcStaffAuthenticationFormDTO input) { + ValidatorUtils.validateEntity(input); + String customerId = input.getCustomerId(); + String mobile = input.getMobile(); + String password = input.getPassword(); + + BlockChainStaffAuthResultDTO r = govWebService.blockChainStaffAuthenticationByPwd(customerId, mobile, password); + + return new Result().ok(r); + } } diff --git a/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java b/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java index 2a493fd54c..ea6329ceda 100644 --- a/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java +++ b/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java @@ -76,12 +76,4 @@ public interface GovLoginService { * @Date 2020/6/30 22:43 **/ List getMyOrgByPassword(StaffOrgsFormDTO formDTO); - - /** - * 区块链系统通过用户密码认证身份 - * @param mobile - * @param password - * @return - */ - String blockChainStaffAuthenticationByPwd(String customerId, String mobile, String password); } diff --git a/epmet-auth/src/main/java/com/epmet/service/GovWebService.java b/epmet-auth/src/main/java/com/epmet/service/GovWebService.java index 30f8d8ae4c..10d86c20b4 100644 --- a/epmet-auth/src/main/java/com/epmet/service/GovWebService.java +++ b/epmet-auth/src/main/java/com/epmet/service/GovWebService.java @@ -1,5 +1,6 @@ package com.epmet.service; +import com.epmet.auth.dto.result.BlockChainStaffAuthResultDTO; import com.epmet.dto.form.GovWebLoginFormDTO; import com.epmet.dto.result.UserTokenResultDTO; @@ -16,4 +17,12 @@ public interface GovWebService { * @Description PC工作端-工作人员登录 **/ UserTokenResultDTO login(GovWebLoginFormDTO formDTO); + + /** + * 区块链系统通过用户密码认证身份 + * @param mobile + * @param password + * @return + */ + BlockChainStaffAuthResultDTO blockChainStaffAuthenticationByPwd(String customerId, String mobile, String password); } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java index 8a36124e4d..8d78665550 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java @@ -492,30 +492,5 @@ public class GovLoginServiceImpl implements GovLoginService, ResultDataResolver } return result.getData(); } - - @Override - public String blockChainStaffAuthenticationByPwd(String customerId, String mobile, String password) { - - GovWebOperLoginFormDTO form = new GovWebOperLoginFormDTO(); - form.setCustomerId(customerId); - form.setMobile(mobile); - - GovWebOperLoginResultDTO staff = getResultDataOrThrowsException(epmetUserFeignClient.getStaffIdAndPwd(form), ServiceConstant.EPMET_USER_SERVER, - EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), - String.format("【区块链获取用户信息】根据手机号%s和指定客户ID:%s查找用户信息失败", mobile, customerId), - "查询用户失败"); - - if (staff == null) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), - String.format("【区块链获取用户信息】根据手机号%s和指定客户ID:%s查找用户信息失败", mobile, customerId)); - } - - if (!PasswordUtils.matches(password, staff.getPassWord())) { - // 密码不匹配 - throw new EpmetException(EpmetErrorCode.ERR10004.getCode(), String.format("【区块链获取用户信息】密码不匹配，手机号：%s", mobile)); - } - - return staff.getUserId(); - } } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java index 9d455af694..d6edfb8657 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java @@ -1,13 +1,21 @@ package com.epmet.service.impl; +import com.epmet.auth.dto.result.BlockChainStaffAuthResultDTO; import com.epmet.common.token.constant.LoginConstant; +import com.epmet.commons.tools.constant.ServiceConstant; +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.RenException; +import com.epmet.commons.tools.feign.ResultDataResolver; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.GovTokenDto; import com.epmet.commons.tools.security.password.PasswordUtils; import com.epmet.commons.tools.utils.CpUserDetailRedis; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerStaffDTO; +import com.epmet.dto.form.CustomerStaffFormDTO; import com.epmet.dto.form.GovWebLoginFormDTO; import com.epmet.dto.form.GovWebOperLoginFormDTO; import com.epmet.dto.result.GovWebOperLoginResultDTO; @@ -32,7 +40,7 @@ import java.util.Map; */ @Slf4j @Service -public class GovWebServiceImpl implements GovWebService { +public class GovWebServiceImpl implements GovWebService, ResultDataResolver { private static final Logger logger = LoggerFactory.getLogger(GovWebServiceImpl.class); @Autowired @@ -131,5 +139,36 @@ public class GovWebServiceImpl implements GovWebService { return token; } + @Override + public BlockChainStaffAuthResultDTO blockChainStaffAuthenticationByPwd(String customerId, String mobile, String password) { + + GovWebOperLoginFormDTO form = new GovWebOperLoginFormDTO(); + form.setCustomerId(customerId); + form.setMobile(mobile); + + // 用户认证 + GovWebOperLoginResultDTO staff = getResultDataOrThrowsException(epmetUserFeignClient.getStaffIdAndPwd(form), ServiceConstant.EPMET_USER_SERVER, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + String.format("【区块链用户认证】根据手机号%s和指定客户ID:%s认证用户失败", mobile, customerId), + "认证失败"); + + if (staff == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + String.format("【区块链用户认证】根据手机号%s和指定客户ID:%s认证用户失败", mobile, customerId)); + } + + if (!PasswordUtils.matches(password, staff.getPassWord())) { + // 密码不匹配 + throw new EpmetException(EpmetErrorCode.ERR10004.getCode(), String.format("【区块链用户认证】密码不匹配，手机号：%s", mobile)); + } + + // 用户基础信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, staff.getUserId()); + + BlockChainStaffAuthResultDTO r = new BlockChainStaffAuthResultDTO(staff.getUserId(), staffInfo.getRealName(), + staffInfo.getMobile(), staffInfo.getHeadPhoto(), staffInfo.getAgencyId(), staffInfo.getAgencyName()); + + return r; + } } From 309173b6eac145196c00481c652174fa414f0b48 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 20 Jan 2022 14:12:50 +0800 Subject: [PATCH 025/391] again --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 f48ed97dfc..ed6b1639a5 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.98 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.99 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index ddd5049641..001913e2ad 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.98 + 0.3.99 data-aggregator com.epmet From a7e466c84208b0d46c24f691316bf3d228eb3f93 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Jan 2022 17:30:48 +0800 Subject: [PATCH 026/391] heart up --- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 1647784a83..95a1377a26 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.73 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.74 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 96bcc5717b..ede1c7c70e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.73 + 0.0.74 com.epmet epmet-heart From 936c13bbf998ca1f272287e8357ea8ae15784eeb Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 20 Jan 2022 17:43:02 +0800 Subject: [PATCH 027/391] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcResiUserController.java | 6 +++--- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 4abb7124ac..ddc1eed9c6 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 @@ -649,7 +649,7 @@ public class IcResiUserController { @PostMapping("search") public Result>> searchResi(@RequestBody IcResiUserPageFormDTO input, @LoginUser TokenDto loginUser) { if (StringUtils.isBlank(input.getKeyword())) { - PageData> r = new PageData>(new ArrayList<>(), 0); + PageData> r = new PageData>(new ArrayList<>(), NumConstant.ZERO_L); return new Result>>().ok(r); } @@ -658,11 +658,11 @@ public class IcResiUserController { input.setStaffId(loginUser.getUserId()); input.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode()); if (input.getPageNo() == null) { - input.setPageNo(1); + input.setPageNo(NumConstant.ONE); } if (input.getPageSize() == null) { - input.setPageSize(20); + input.setPageSize(NumConstant.TWENTY); } PageData> r = icResiUserService.pageResiMap(input); 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 62c9bc2cff..8ccf84a9bb 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 @@ -476,7 +476,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> pageResiMap(IcResiUserPageFormDTO formDTO) { CustomerStaffInfoCacheResult staffInfoCacheResult=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getStaffId()); - String staffOrgPath=StrConstant.EPMETY_STR; + String staffOrgPath; if(StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds())&& !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())){ staffOrgPath=staffInfoCacheResult.getAgencyPIds().concat(":").concat(staffInfoCacheResult.getAgencyId()); }else{ @@ -542,14 +542,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl resultMap : list) { String gridIdValue = null != resultMap.get(UserConstant.GRID_ID) ? resultMap.get(UserConstant.GRID_ID).toString() : StrConstant.EPMETY_STR; resultMap.put("GRID_ID_VALUE", gridIdValue); - if (null != gridInfoMap && gridInfoMap.containsKey(gridIdValue) && null != gridInfoMap.get(gridIdValue)) { + if (gridInfoMap.containsKey(gridIdValue) && null != gridInfoMap.get(gridIdValue)) { //GRID_NAME resultMap.put(UserConstant.GRID_ID, gridInfoMap.get(gridIdValue).getGridName()); } String homeId = null != resultMap.get(UserConstant.HOME_ID) ? resultMap.get(UserConstant.HOME_ID).toString() : StrConstant.EPMETY_STR; resultMap.put("HOME_ID_VALUE", homeId); - if (null != houseInfoMap && houseInfoMap.containsKey(homeId) && null != houseInfoMap.get(homeId)) { + if (houseInfoMap.containsKey(homeId) && null != houseInfoMap.get(homeId)) { HouseInfoDTO houseInfoDTO = houseInfoMap.get(homeId); String buildName = StringUtils.isNotBlank(houseInfoDTO.getBuildingName()) ? houseInfoDTO.getBuildingName() : StrConstant.EPMETY_STR; resultMap.put("BUILD_NAME", buildName); From 96c01db13850c8960cb2d29f02db6f599b1606d3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Jan 2022 17:51:24 +0800 Subject: [PATCH 028/391] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=A1=A3=E6=A1=88-?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=97=B6=E9=97=B4=EF=BC=8C=E6=8C=89=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E6=97=B6=E9=97=B4=E9=99=8D=E5=BA=8F=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 25c2bda0b7..d0d0303716 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.97 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.98 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index b72d47f705..358ea6165f 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.97 + 0.3.98 gov-project com.epmet From c1e9857d5e923d5a28b59b548a6d54875eece8a9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 21 Jan 2022 10:13:17 +0800 Subject: [PATCH 029/391] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20-=E3=80=8B=E7=9B=AE=E5=89=8D=E6=98=AF=E7=BB=99?= =?UTF-8?q?=E5=B9=B3=E9=98=B4=E9=9B=86=E6=88=90=E5=B9=B3=E5=8F=B0=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-prod.yml | 2 +- epmet-gateway/pom.xml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml index 4edd602d7a..4d2ee16d95 100644 --- a/epmet-gateway/deploy/docker-compose-prod.yml +++ b/epmet-gateway/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.71 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.72 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index abf223c749..edb81cc1f5 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.71 + 0.3.72 com.epmet epmet-cloud 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 ca80c4949a..976a0a32ef 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.157 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.158 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 91849509fd..da0d5adfff 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.157 + 0.3.158 com.epmet gov-org 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 1f04ea52bd..a5f17fd4c5 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.219 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.220 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 6ec6805309..4cba571802 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.219 + 0.3.220 com.epmet epmet-user From 8b26c896996ddc0e21f1ace3e1852f227a0bd224 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 21 Jan 2022 11:12:49 +0800 Subject: [PATCH 030/391] again --- .../resi-hall/resi-hall-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-hall/resi-hall-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 cd89501ed2..49ae802a5e 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.37 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.38 ports: - "8100:8100" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index bc016caf58..0be1658ea4 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.37 + 0.3.38 resi-hall com.epmet From cf7593dd7576b0b889d89e79a54edbacddd042a3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 21 Jan 2022 14:04:00 +0800 Subject: [PATCH 031/391] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=8E=89=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e881de18f0..89dd3d511b 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 @@ -596,7 +596,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Fri, 21 Jan 2022 14:09:10 +0800 Subject: [PATCH 032/391] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20-=E3=80=8B=E7=9B=AE=E5=89=8D=E6=98=AF=E7=BB=99?= =?UTF-8?q?=E5=B9=B3=E9=98=B4=E9=9B=86=E6=88=90=E5=B9=B3=E5=8F=B0=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=20=E6=80=BB=E6=95=B0=E4=B8=8D=E5=AF=B9=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 a5f17fd4c5..93d707c564 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.220 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.221 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 4cba571802..76323e2fb7 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.220 + 0.3.221 com.epmet epmet-user From 3a48ddfbf74edb90d34e17aca80e00771536970f Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 21 Jan 2022 14:14:28 +0800 Subject: [PATCH 033/391] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20-=E3=80=8B=E7=9B=AE=E5=89=8D=E6=98=AF=E7=BB=99?= =?UTF-8?q?=E5=B9=B3=E9=98=B4=E9=9B=86=E6=88=90=E5=B9=B3=E5=8F=B0=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=20=E6=80=BB=E6=95=B0=E4=B8=8D=E5=AF=B9=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 93d707c564..fa80e6c6ec 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.221 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.222 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 76323e2fb7..cec3f39b34 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.221 + 0.3.222 com.epmet epmet-user From ad0648b8033cc31a8d40998e6fcdde61f28f6407 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 21 Jan 2022 14:16:50 +0800 Subject: [PATCH 034/391] =?UTF-8?q?=E6=B3=A8=E9=87=8Aurl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/feign/EpmetUserOpenFeignClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 14377b7fe9..d929df7e4f 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 @@ -25,8 +25,8 @@ import java.util.Set; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:09 */ - @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087") -//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class) + // @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087") +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class) public interface EpmetUserOpenFeignClient { /** From ef4883c76b2d0858e42c9d2aa76ebb41001c1681 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 21 Jan 2022 14:18:13 +0800 Subject: [PATCH 035/391] =?UTF-8?q?=E6=B3=A8=E9=87=8Aurl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/feign/EpmetUserOpenFeignClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1b9ac976c6..42d99245f7 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 @@ -25,8 +25,8 @@ import java.util.Set; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:09 */ - @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087") -//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class) + // @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087") +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class) public interface EpmetUserOpenFeignClient { /** From 56b05896e2d79034bb523e42ef09c388378f28d8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 21 Jan 2022 14:18:53 +0800 Subject: [PATCH 036/391] =?UTF-8?q?=E6=B3=A8=E9=87=8Aurl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java | 1 - 1 file changed, 1 deletion(-) 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 42d99245f7..37bd14dd1f 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 @@ -1,7 +1,6 @@ package com.epmet.feign; -import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.security.dto.TokenDto; From 5dca59bdfe7bb20c9b899230e8303ebadbf1c316 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 21 Jan 2022 14:28:40 +0800 Subject: [PATCH 037/391] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E5=8A=A0=E4=B8=8A=E5=AE=A2=E6=88=B7Id=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 fa80e6c6ec..94f2d013c6 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.222 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.223 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index cec3f39b34..39e239fd40 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.222 + 0.3.223 com.epmet epmet-user From 439ce2f763ef1a49c54003b1ae289167a8f70b32 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 21 Jan 2022 14:34:49 +0800 Subject: [PATCH 038/391] icuser --- .../oper-customize-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 88f8deb3ed..5a90abcd2d 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 @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.66 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.67 ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index d1e566e165..aaeb562808 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.66 + 0.3.67 com.epmet oper-customize From b816a90c1cbb8a37ca3756ed781e68f7ff90ceb1 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 21 Jan 2022 15:24:18 +0800 Subject: [PATCH 039/391] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=93=E6=A1=88=E7=9A=84=E6=97=B6=E5=80=99=E5=B0=86?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9C=80=E6=96=B0=E4=BF=A1=E6=81=AF=E5=8F=91?= =?UTF-8?q?=E9=80=81=E5=88=B0=E5=8C=BA=E5=9D=97=E9=93=BE=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/BlockChainProcessProjectFormDTO.java | 6 ++++++ .../epmet/service/impl/BlockChainProjectServiceImpl.java | 9 +++++++-- .../epmet/service/impl/BlockChainUploadServiceImpl.java | 5 +++-- .../java/com/epmet/service/impl/ProjectServiceImpl.java | 4 ++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java index 4d6dfb09d0..0b2e2749cb 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java @@ -13,6 +13,12 @@ import java.util.List; public class BlockChainProcessProjectFormDTO implements Serializable { private static final long serialVersionUID = -7316616101790749793L; + + /** + * 项目基础信息 + */ + private BlockChainProjectFormDTO project; + @NotNull(message = "处理进展信息不能为空") private BlockChainProjectProcessFormDTO process; diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java index 36db95499d..c648097ab2 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java @@ -182,15 +182,20 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R @Override public void blockChainProcessProject(BlockChainProcessProjectFormDTO input) { + BlockChainProjectFormDTO project = input.getProject(); BlockChainProjectProcessFormDTO process = input.getProcess(); List assignedStaffs = input.getAssignedStaffs(); BlockChainProjectProcessAssignedStaffFormDTO handledStaff = input.getHandledStaff(); - fill(null, process, assignedStaffs, handledStaff); + fill(project, process, assignedStaffs, handledStaff); String processString = JSON.toJSONString(process); blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROCESS, processString); - + + if (project != null) { + blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROJECT, JSON.toJSONString(project)); + } + if (assignedStaffs != null && assignedStaffs.size() > 0) { String assignedStaffsString = JSON.toJSONString(assignedStaffs); blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_ASSIGNED_STAFFS, assignedStaffsString); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java index 18f4d39d4a..d28f2c11a1 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java @@ -134,9 +134,10 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService { } Result result; - if (project == null) { - // 处理 + if (!"created".equals(processEntity.getOperation())) { + // 处理。如果是结案，则会有project对象，因为要传递结案状态给区块链，其他状态则project==null BlockChainProcessProjectFormDTO processForm = new BlockChainProcessProjectFormDTO(); + processForm.setProject(project); processForm.setProcess(process); processForm.setAssignedStaffs(assignedStaffs); processForm.setHandledStaff(handledStaff); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index e6e70e2c73..5e2112ba9a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -597,7 +597,7 @@ public class ProjectServiceImpl extends BaseServiceImpl Date: Fri, 21 Jan 2022 16:31:29 +0800 Subject: [PATCH 040/391] again --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 94f2d013c6..6d8ad8cc98 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.223 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.224 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 39e239fd40..5eb6cab2b6 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.223 + 0.3.224 com.epmet epmet-user From 594c5b699512e8756cd8a9b9513ca4aefe974d47 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 21 Jan 2022 18:47:59 +0800 Subject: [PATCH 041/391] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=87=8C=E5=88=97=E8=A1=A8=E5=88=86=E7=B1=BB=E8=B5=8B=E5=80=BC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 95a1377a26..8e3c7a72ee 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.74 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.75 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index ede1c7c70e..3d0c91ba97 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.74 + 0.0.75 com.epmet epmet-heart 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 6d8ad8cc98..9587a6eafd 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.224 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.225 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 5eb6cab2b6..621793b831 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.224 + 0.3.225 com.epmet epmet-user From 515fe692a7ca253e4e9c5c1c6f782c7e4972dc6f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 25 Jan 2022 21:57:37 +0800 Subject: [PATCH 042/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 9587a6eafd..93e97bb33c 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.225 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.226 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 621793b831..f57fea90ad 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.225 + 0.3.226 com.epmet epmet-user From 9e0ee9ac13f38651b792a5db192a5602c713e87c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 26 Jan 2022 10:03:40 +0800 Subject: [PATCH 043/391] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=20=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5-?= =?UTF-8?q?=E5=8A=9E=E7=BB=93=E5=85=B3=E7=B3=BB=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=8A=9E=E7=BB=93=E5=B1=82=E7=BA=A7=E6=98=AF=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E7=9A=84=E4=B8=BA=E8=87=AA=E5=8A=9E=EF=BC=8C=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=9A=84=E4=B8=BA=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 2bceb0112e..7151bb4798 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.352 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.353 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 3f0ace66c1..086e213b86 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.352 + 0.3.353 data-statistical com.epmet From 28f4918158547b45f92400c680cdb5b2c792cc8e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 26 Jan 2022 10:35:59 +0800 Subject: [PATCH 044/391] =?UTF-8?q?=E5=B8=82=E5=8C=97=E7=A0=94=E5=88=A4?= =?UTF-8?q?=E5=88=86=E6=9E=90=E5=88=86=E7=B1=BB=E5=A4=84=E7=90=86=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E7=94=9F=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ed6b1639a5..7d3dd386a9 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.99 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.100 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 001913e2ad..5c473d2361 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.99 + 0.3.100 data-aggregator com.epmet From 13e8c33c15e2d01aee429eacd1b29207f9be7620 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 26 Jan 2022 15:23:08 +0800 Subject: [PATCH 045/391] =?UTF-8?q?=E4=BF=AE=E6=94=B9user=E5=86=85?= =?UTF-8?q?=E5=AD=98=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 18564bd00a..ea727249bb 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.226 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.227 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index f57fea90ad..6908c95720 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.226 + 0.3.227 com.epmet epmet-user From 5033bcb0050de2ce7bec3088d2a94d8635f6654d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 26 Jan 2022 17:21:25 +0800 Subject: [PATCH 046/391] again --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 7d3dd386a9..9b828a5abf 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.100 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.101 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 5c473d2361..4e4630ed10 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.100 + 0.3.101 data-aggregator com.epmet From bfaaf12738f0be855eec8e436a21b425634dee02 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Jan 2022 09:11:50 +0800 Subject: [PATCH 047/391] =?UTF-8?q?diaodong=E5=88=86=E6=94=AF=E4=B8=8A?= =?UTF-8?q?=E7=BA=BF=E3=80=829=E4=B8=AA=E6=9C=8D=E5=8A=A1=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml | 2 +- epmet-admin/epmet-admin-server/pom.xml | 2 +- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- .../gov-access/gov-access-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-access/gov-access-server/pom.xml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../oper-customize-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) 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 550b4369e3..5c3519899e 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.32 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.33 ports: - "8082:8082" network_mode: host # 使用现有网络 diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index c3b038a367..1e797e0078 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.32 + 0.3.33 com.epmet epmet-admin 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 9b828a5abf..43bb8bed8c 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.101 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.102 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 4e4630ed10..5bf6db166b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.101 + 0.3.102 data-aggregator com.epmet 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 7151bb4798..9bd6300edb 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.353 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.354 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 3e0b3c197f..9569157657 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.353 + 0.3.354 data-statistical com.epmet 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 8e3c7a72ee..f165ad8a40 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.75 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.76 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 3d0c91ba97..1309074311 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.75 + 0.0.76 com.epmet epmet-heart 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 726ab533b7..086b9d667a 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.49 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.50 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 07087d4e5f..db2669bc48 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.49 + 0.3.50 com.epmet epmet-job 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 9d6e4d7ae6..22cced04c1 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.61 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.62 ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 35f2a95c85..70905c59df 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.61 + 0.3.62 gov-access com.epmet 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 976a0a32ef..149508d211 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.158 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.159 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index da0d5adfff..9ae2ae6299 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.158 + 0.3.159 com.epmet gov-org 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 5a90abcd2d..e353e33131 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 @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.67 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.68 ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index aaeb562808..57cb722b2e 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.67 + 0.3.68 com.epmet oper-customize 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 ea727249bb..43ef5c3db2 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.227 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.228 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 6908c95720..10417e2010 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.227 + 0.3.228 com.epmet epmet-user From 23cc36549924d0c4eb494e32c65c5f7cca030dec Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 27 Jan 2022 09:31:44 +0800 Subject: [PATCH 048/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-access/gov-access-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-access/gov-access-server/pom.xml | 2 +- .../oper-customize-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 22cced04c1..3a06905284 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.62 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.63 ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 70905c59df..b30b339746 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.62 + 0.3.63 gov-access com.epmet 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 e353e33131..81a54b0d15 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 @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.68 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.69 ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 57cb722b2e..e28bf701fb 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.68 + 0.3.69 com.epmet oper-customize From 3eca679ef611f224f5b0a761452c5aeed9329ceb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Jan 2022 10:04:46 +0800 Subject: [PATCH 049/391] =?UTF-8?q?foric=20=E5=B0=8F=E5=8C=BA=E7=AE=A1?= =?UTF-8?q?=E7=90=86showName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 149508d211..b751248e34 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.159 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.160 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 9ae2ae6299..9f5bf0c5f8 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.159 + 0.3.160 com.epmet gov-org From cd4d4b435a4d1fc53a8305bfe273bf3d2dd97095 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 27 Jan 2022 10:12:42 +0800 Subject: [PATCH 050/391] again --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 43ef5c3db2..694efc16c5 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.228 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.229 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 10417e2010..2b59e060c9 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.228 + 0.3.229 com.epmet epmet-user From 08fccf32dbbbba73fe4aead7be2a66083ad8207d Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 27 Jan 2022 11:24:56 +0800 Subject: [PATCH 051/391] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=B8=82=E5=8C=97-?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=88=86=E7=B1=BB=E5=88=86=E6=9E=90=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 9bd6300edb..e5bd82ae32 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.354 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.355 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 9569157657..8fc065e9f6 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.354 + 0.3.355 data-statistical com.epmet From 804eedf36d11f350504437a681e76dcaca97178b Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 27 Jan 2022 11:26:08 +0800 Subject: [PATCH 052/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 b751248e34..3d123ee878 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.160 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.161 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 9f5bf0c5f8..1132cc145b 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.160 + 0.3.161 com.epmet gov-org From 5cbcb25fee8b56093fd6f0d2cc709a4a3b83e328 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Jan 2022 11:46:00 +0800 Subject: [PATCH 053/391] =?UTF-8?q?=E5=85=9A=E5=91=987?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 43bb8bed8c..cfd5a73a95 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.102 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.103 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 5bf6db166b..e4bd0ee836 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.102 + 0.3.103 data-aggregator com.epmet From 7d772fb2c230642ed4641e28605b6d0492764d9d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Jan 2022 12:40:04 +0800 Subject: [PATCH 054/391] temp --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 cfd5a73a95..8b138c681b 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.103 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.104 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index e4bd0ee836..a4cf079a05 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.103 + 0.3.104 data-aggregator com.epmet From 4c88beac923f04fd0a688b5c003be61071a19050 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 3 Feb 2022 23:45:57 +0800 Subject: [PATCH 055/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 694efc16c5..ca6c1f6304 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.229 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.230 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 2b59e060c9..ceedbf54e9 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.229 + 0.3.230 com.epmet epmet-user From 1714908110dbfd3cb730cf46822bf932dad92dcc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 11 Feb 2022 17:27:41 +0800 Subject: [PATCH 056/391] gov-org up --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 3d123ee878..c8733aec5f 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.161 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.162 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 1132cc145b..0f5ba6290d 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.161 + 0.3.162 com.epmet gov-org From bb95fa463534f9674e26001cc796b76b5a2d7ae5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Sat, 12 Feb 2022 15:18:17 +0800 Subject: [PATCH 057/391] again --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 b380998021..daf0a3b776 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.104 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.105 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index a4cf079a05..5c402ba69f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.104 + 0.3.105 data-aggregator com.epmet From 54895defc3585b2cda65e807aa88fffa4b8355a7 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Sat, 12 Feb 2022 15:49:17 +0800 Subject: [PATCH 058/391] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A8=8B=E5=BA=8F=20?= =?UTF-8?q?again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 daf0a3b776..b3cf53c00c 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.105 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.106 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 5c402ba69f..fb49ca8777 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.105 + 0.3.106 data-aggregator com.epmet From cad0721e75ad02a153eab8d7f0967d40df3b1c33 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Sat, 12 Feb 2022 17:04:47 +0800 Subject: [PATCH 059/391] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7-=E8=8E=B7=E5=8F=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E8=80=97=E6=97=B6=E4=BF=A1=E6=81=AFSQL?= =?UTF-8?q?=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 e5bd82ae32..b71eb43971 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.355 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.356 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 8fc065e9f6..5b95783ea6 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.355 + 0.3.356 data-statistical com.epmet From f5dee363e1e0b85dbf49e76207cc28e2e707d66f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sun, 13 Feb 2022 09:46:49 +0800 Subject: [PATCH 060/391] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6?= =?UTF-8?q?=EF=BC=8C=E6=B5=8B=E8=AF=95=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-user-server/src/main/resources/bootstrap.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index ac5d97de01..cce9a52831 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -79,6 +79,11 @@ spring: namespace: @nacos.config.namespace@ group: @nacos.config.group@ file-extension: yaml + servlet: + multipart: + max-file-size: 100MB + max-request-size: 100MB + management: endpoints: web: From ebe86ea47adbaed61cf519ffd6c9f266920cde14 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Sun, 13 Feb 2022 14:14:03 +0800 Subject: [PATCH 061/391] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 b3cf53c00c..08fe0be39f 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.106 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.107 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index fb49ca8777..a222f7963f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.106 + 0.3.107 data-aggregator com.epmet 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 ca6c1f6304..0c5766091c 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.230 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.231 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index ceedbf54e9..c087582b18 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.230 + 0.3.231 com.epmet epmet-user From 34ad1bb2653a3ff17b235333ca6cd5c14d2bacbe Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Sun, 13 Feb 2022 15:49:41 +0800 Subject: [PATCH 062/391] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7-=E8=8E=B7=E5=8F=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E8=80=97=E6=97=B6=E4=BF=A1=E6=81=AFSQL?= =?UTF-8?q?=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 b71eb43971..d455bc747a 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.356 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.357 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 5b95783ea6..a53b3c800b 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.356 + 0.3.357 data-statistical com.epmet From 05e0c1b1b9c351be8ba60e4d4a9b8ddae671490b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 14 Feb 2022 10:47:19 +0800 Subject: [PATCH 063/391] dynamicQuery up --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 0c5766091c..c9664ab61a 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.231 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.232 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index c087582b18..35e3e458dc 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.231 + 0.3.232 com.epmet epmet-user From c428e8ea8890b53883069519b1972ca05f63e748 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 14 Feb 2022 16:14:48 +0800 Subject: [PATCH 064/391] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8A=E6=8A=A5=E6=8E=A5=E5=8F=A3=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AEpids=E6=98=AF=E4=BB=8E=E4=B8=89?= =?UTF-8?q?=E4=B8=AA=E8=A1=97=E9=81=93=E5=BC=80=E5=A7=8B=E7=9A=84=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=9C=A8=E5=89=8D=E8=BE=B9=E6=8B=BC=E4=B8=8A?= =?UTF-8?q?=E5=B9=B3=E9=98=B4=E5=8E=BF=E7=9A=84=E7=BB=84=E7=BB=87id?= =?UTF-8?q?=E6=89=8D=E5=8F=AF=E4=BB=A5=20=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 d455bc747a..7d4c1b045e 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.357 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.358 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index a53b3c800b..b4096512ac 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.357 + 0.3.358 data-statistical com.epmet From 018c49264f614cd28c37e0b4e4e4d2fc7173c05f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 14 Feb 2022 17:15:50 +0800 Subject: [PATCH 065/391] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=8E=AF=E5=A2=83jvm=E5=86=85=E5=AD=98=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b5421e4e4e..5b75e0463c 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -9,7 +9,7 @@ services: volumes: - "/opt/epmet-cloud-logs/dev:/logs" environment: - RUN_INSTRUCT: "java -Xms32m -Xmx512m -jar ./epmet-user.jar" + RUN_INSTRUCT: "java -Xms32m -Xmx1024m -jar ./epmet-user.jar" restart: "unless-stopped" deploy: resources: From f1ca1029e8be5b90adcd757f1c3d27f52801f4cb Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 15 Feb 2022 10:29:42 +0800 Subject: [PATCH 066/391] =?UTF-8?q?dto=E6=94=B9=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...eGeneralDTO.java => ImportGeneralDTO.java} | 2 +- .../java/com/epmet/dao/IcBuildingDao.java | 14 ++--- .../com/epmet/model/BuildingInfoModel.java | 38 +++++++++++++ .../com/epmet/model/HouseInfoModelDTO.java | 41 -------------- .../model/ImportBuildingInfoListener.java | 56 +++++++++++++++++++ .../epmet/model/ImportHouseInfoListener.java | 48 ++++++++-------- .../java/com/epmet/redis/IcHouseRedis.java | 7 --- .../epmet/service/IcNeighborHoodService.java | 6 +- .../service/impl/BuildingServiceImpl.java | 43 +++++++++++++- .../impl/IcNeighborHoodServiceImpl.java | 10 ++-- .../main/resources/mapper/IcBuildingDao.xml | 12 ++-- 11 files changed, 180 insertions(+), 97 deletions(-) rename epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/{ImportHouseGeneralDTO.java => ImportGeneralDTO.java} (96%) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java delete mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModelDTO.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportHouseGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java similarity index 96% rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportHouseGeneralDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index 6f9d3aba4e..c9d9c6d76b 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportHouseGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -11,7 +11,7 @@ import java.io.Serializable; * @DESC */ @Data -public class ImportHouseGeneralDTO implements Serializable { +public class ImportGeneralDTO implements Serializable { private static final long serialVersionUID = -345610717773879687L; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java index 4e3c885065..c5ed882ca1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java @@ -19,7 +19,7 @@ package com.epmet.dao; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.ImportHouseGeneralDTO; +import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.result.BaseInfoFamilyBuildingResultDTO; import com.epmet.dto.result.BuildingResultDTO; import com.epmet.entity.CustomerAgencyEntity; @@ -112,7 +112,7 @@ public interface IcBuildingDao extends BaseDao { * @author zxc * @date 2022/2/14 9:48 上午 */ - List selectAllGridByOrgId(@Param("orgId")String orgId); + List selectAllGridByOrgId(@Param("orgId")String orgId); /** * @Description 查询网格下所有的小区 @@ -120,7 +120,7 @@ public interface IcBuildingDao extends BaseDao { * @author zxc * @date 2022/2/14 10:21 上午 */ - List selectAllNeighborHoodByGridIds(@Param("orgIds")List orgId); + List selectAllNeighborHoodByGridIds(@Param("orgIds")List orgId); /** * @Description 根据小区ID查询楼栋 @@ -128,7 +128,7 @@ public interface IcBuildingDao extends BaseDao { * @author zxc * @date 2022/2/14 1:25 下午 */ - List selectAllBuildingByNeighborHoodId(@Param("neighborHoodId")String neighborHoodId); + List selectAllBuildingByNeighborHoodId(@Param("neighborHoodId")String neighborHoodId); /** * @Description 根据楼栋ID查询楼栋单元 @@ -136,7 +136,7 @@ public interface IcBuildingDao extends BaseDao { * @author zxc * @date 2022/2/14 1:58 下午 */ - List selectAllBuildingUnitByBuildingId(@Param("building")String building); + List selectAllBuildingUnitByBuildingId(@Param("building")String building); /** * @Description 根据ID查询小区 @@ -144,7 +144,7 @@ public interface IcBuildingDao extends BaseDao { * @author zxc * @date 2022/2/14 3:16 下午 */ - ImportHouseGeneralDTO selectNeighborHoodById(@Param("id")String id); + ImportGeneralDTO selectNeighborHoodById(@Param("id")String id); /** * @Description 根据ID查询楼栋 @@ -152,7 +152,7 @@ public interface IcBuildingDao extends BaseDao { * @author zxc * @date 2022/2/14 4:26 下午 */ - ImportHouseGeneralDTO selectBuildingById(@Param("id")String id); + ImportGeneralDTO selectBuildingById(@Param("id")String id); /** * @Description 查询已存在的房屋 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java new file mode 100644 index 0000000000..e76c391324 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java @@ -0,0 +1,38 @@ +package com.epmet.model; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +/** + * @Author zxc + * @DateTime 2022/2/15 10:07 上午 + * @DESC + */ +@Data +public class BuildingInfoModel { + + @ExcelProperty(value = "所属组织") + private String agencyName; + + @ExcelProperty(value = "所属网格") + private String gridName; + + @ExcelProperty(value = "小区名称") + private String neighborHoodName; + + @ExcelProperty(value = "楼栋名称") + private String buildingName; + + @ExcelProperty(value = "楼栋类型") + private String type; + + @ExcelProperty(value = "单元数") + private Integer totalUnitNum; + + @ExcelProperty(value = "层数") + private Integer totalFloorNum; + + @ExcelProperty(value = "户数") + private Integer totalHouseNum; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModelDTO.java deleted file mode 100644 index 2193e9cf2d..0000000000 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModelDTO.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.epmet.model; - -import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; -import org.hibernate.validator.constraints.Length; - -/** - * @Author zxc - * @DateTime 2022/2/13 1:26 下午 - * @DESC - */ -@Data -public class HouseInfoModelDTO { - - private String agencyName; - - private String gridName; - - private String neighborHoodName; - - private String buildingName; - - private Integer buildingUnit; - - private String doorName; - - private String houseType; - - private String purpose; - - private String rentFlag; - - private String ownerName; - - private String ownerPhone; - - private String ownerIdCard; - - private Integer num; - -} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java new file mode 100644 index 0000000000..0866793cf6 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java @@ -0,0 +1,56 @@ +package com.epmet.model; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.dto.ImportGeneralDTO; +import com.epmet.dto.form.ImportInfoFormDTO; +import com.epmet.redis.IcHouseRedis; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Author zxc + * @DateTime 2022/2/15 10:06 上午 + * @DESC + */ +public class ImportBuildingInfoListener extends AnalysisEventListener { + + List nums = new ArrayList<>(); + Integer num = NumConstant.ZERO; + + List needDisposeList = new ArrayList<>(); + List needInsertList = new ArrayList<>(); + + String gridName = null; + String agencyName = null; + + Map gridInfos = null; + List gridInfoDTOs = null; + Map neighborHoodInfos = null; + List neighborHoodInfoDTOs = null; + ImportGeneralDTO neighborHoodGeneralDTO = null; + Map buildingInfos = null; + List buildingInfoDTOs = null; + ImportGeneralDTO buildingGeneralDTO = null; + + private ImportInfoFormDTO formDTO; + private IcHouseRedis icHouseRedis; + + public ImportBuildingInfoListener(ImportInfoFormDTO formDTO, IcHouseRedis icHouseRedis){ + this.formDTO = formDTO; + this.icHouseRedis = icHouseRedis; + } + + @Override + public void invoke(BuildingInfoModel data, AnalysisContext context) { + + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index baa2900486..39d8820783 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -2,26 +2,22 @@ package com.epmet.model; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; -import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.constant.CustomerAgencyConstant; import com.epmet.constant.CustomerGridConstant; import com.epmet.dao.IcBuildingDao; -import com.epmet.dto.ImportHouseGeneralDTO; +import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.ImportInfoFormDTO; import com.epmet.dto.result.ImportResultDTO; import com.epmet.entity.IcHouseEntity; import com.epmet.enums.HousePurposeEnums; import com.epmet.enums.HouseRentFlagEnums; import com.epmet.enums.HouseTypeEnums; -import com.epmet.excel.IcNeighborHoodExcel; import com.epmet.redis.IcHouseRedis; -import com.epmet.service.HouseService; import com.epmet.service.IcHouseService; import com.epmet.service.IcNeighborHoodService; import org.apache.commons.lang3.StringUtils; @@ -41,22 +37,22 @@ public class ImportHouseInfoListener extends AnalysisEventListener nums = new ArrayList<>(); Integer num = NumConstant.ZERO; - List needDisposeList = new ArrayList<>(); - List needInsertList = new ArrayList<>(); + List needDisposeList = new ArrayList<>(); + List needInsertList = new ArrayList<>(); String gridName = null; String agencyName = null; Map gridInfos = null; - List gridInfoDTOs = null; + List gridInfoDTOs = null; Map neighborHoodInfos = null; - List neighborHoodInfoDTOs = null; - ImportHouseGeneralDTO neighborHoodGeneralDTO = null; + List neighborHoodInfoDTOs = null; + ImportGeneralDTO neighborHoodGeneralDTO = null; Map buildingInfos = null; - List buildingInfoDTOs = null; - ImportHouseGeneralDTO buildingGeneralDTO = null; + List buildingInfoDTOs = null; + ImportGeneralDTO buildingGeneralDTO = null; Map buildingUnitInfos = null; - List buildingUnitInfoDTOs = null; + List buildingUnitInfoDTOs = null; private ImportInfoFormDTO formDTO; private IcBuildingDao icBuildingDao; @@ -78,7 +74,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener importInfo = neighborHoodService.getImportInfo(formDTO, needDisposeList); + List importInfo = neighborHoodService.getImportInfo(formDTO, needDisposeList); needInsertList.addAll(importInfo); Map collect = needInsertList.stream().collect(Collectors.groupingBy(n -> n.getBuildingUnitId() + "_" + n.getDoorName(), Collectors.counting())); collect.forEach((k,v) -> { if (Integer.valueOf(v.toString()).compareTo(1) > 0){ - for (ImportHouseGeneralDTO r : needInsertList) { + for (ImportGeneralDTO r : needInsertList) { if (k.equals(r.getBuildingUnitId()+"_"+r.getDoorName())){ // 集合里重复的 r.setExistStatus(true); @@ -119,7 +115,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener ids = needInsertList.stream().map(m -> m.getBuildingUnitId() + "_" + m.getDoorName()).distinct().collect(Collectors.toList()); List existHouses = icBuildingDao.selectExistHouse(ids); existHouses.forEach(e -> { - for (ImportHouseGeneralDTO n : needInsertList) { + for (ImportGeneralDTO n : needInsertList) { if ((n.getBuildingUnitId()+"_"+n.getDoorName()).equals(e)){ // 库里存在的 n.setExistStatus(true); @@ -128,9 +124,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener> groupByExistStatus = needInsertList.stream().collect(Collectors.groupingBy(ImportHouseGeneralDTO::getExistStatus)); - List importHouseGeneralDTOS = groupByExistStatus.get(false); - houseInsert(importHouseGeneralDTOS); + Map> groupByExistStatus = needInsertList.stream().collect(Collectors.groupingBy(ImportGeneralDTO::getExistStatus)); + List importGeneralDTOS = groupByExistStatus.get(false); + houseInsert(importGeneralDTOS); // 清除 needDisposeList = new ArrayList<>(); needInsertList = new ArrayList<>(); @@ -154,7 +150,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener gridIds = new ArrayList<>(); if (orgType.equals(CustomerGridConstant.GRID)){ @@ -412,7 +408,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener houses){ + public void houseInsert(List houses){ if (!CollectionUtils.isEmpty(houses)){ icHouseService.insertBatch(ConvertUtils.sourceToTarget(houses, IcHouseEntity.class)); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java index 6407a7a948..dd02bcfad5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java @@ -18,24 +18,17 @@ package com.epmet.redis; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IcHouseDao; -import com.epmet.dto.ImportHouseGeneralDTO; import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.ImportResultDTO; -import com.epmet.model.HouseInfoModel; -import com.epmet.model.HouseInfoModelDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java index afadcdd449..f990efb864 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java @@ -22,7 +22,7 @@ import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcNeighborHoodDTO; -import com.epmet.dto.ImportHouseGeneralDTO; +import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.ImportInfoFormDTO; import com.epmet.entity.IcNeighborHoodEntity; import org.springframework.web.multipart.MultipartFile; @@ -132,9 +132,9 @@ public interface IcNeighborHoodService extends BaseService * * @Param formDTO * @Param list - * @Return {@link List< ImportHouseGeneralDTO>} + * @Return {@link List< ImportGeneralDTO >} * @Author zhaoqifeng * @Date 2022/2/14 9:40 */ - List getImportInfo(ImportInfoFormDTO formDTO, List list); + List getImportInfo(ImportInfoFormDTO formDTO, List list); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 34b6723f34..ada9613c63 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -1,6 +1,9 @@ package com.epmet.service.impl; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelReader; +import com.alibaba.excel.read.metadata.ReadSheet; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -24,9 +27,13 @@ import com.epmet.dto.form.ListIcNeighborHoodFormDTO; import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.BuildingResultPagedDTO; import com.epmet.dto.result.IcNeighborHoodResultDTO; +import com.epmet.dto.result.ImportResultDTO; import com.epmet.entity.*; import com.epmet.enums.BuildingTypeEnums; import com.epmet.excel.IcBuildingExcel; +import com.epmet.model.HouseInfoModel; +import com.epmet.model.ImportBuildingInfoListener; +import com.epmet.redis.IcHouseRedis; import com.epmet.service.BuildingService; import com.epmet.service.IcBuildingService; import com.epmet.service.IcBuildingUnitService; @@ -43,6 +50,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.io.InputStream; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -75,6 +83,8 @@ public class BuildingServiceImpl implements BuildingService { private CustomerStaffAgencyDao customerStaffAgencyDao; @Resource private IcBuildingUnitDao icBuildingUnitDao; + @Autowired + private IcHouseRedis icHouseRedis; @Override @Transactional(rollbackFor = Exception.class) @@ -384,7 +394,38 @@ public class BuildingServiceImpl implements BuildingService { */ @Override public Result buildingImportExcel(ImportInfoFormDTO formDTO, MultipartFile file) throws IOException { - return null; + ExcelReader excelReader = null; + try { + InputStream inputStream = null; + try { + inputStream = file.getInputStream(); + } catch (IOException e) { + return new Result().error("读取文件失败"); + } + excelReader = EasyExcel.read(inputStream).build(); + // 这里为了简单 所以注册了 同样的head 和Listener 自己使用功能必须不同的Listener + ReadSheet readSheet = EasyExcel.readSheet(0).head(HouseInfoModel.class) + .registerReadListener(new ImportBuildingInfoListener(formDTO,icHouseRedis)) + .build(); + excelReader.read(readSheet); + } finally { + if (excelReader != null) { + excelReader.finish(); + } + } + ImportResultDTO dto = icHouseRedis.getImportResultDTO(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == dto){ + return new Result<>(); + } + List nums = dto.getNums(); + Integer num = dto.getNum(); + String s = "共%s条数据，导入成功%s条。"; + if (nums.size() > NumConstant.ZERO){ + Collections.sort(nums); + s = s + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"条导入失败"; + return new Result<>().error(9999,String.format(s,num,num - nums.size())); + } + return new Result<>().ok(String.format(s,num,num)); } private List searchAllBuilding(ListIcNeighborHoodFormDTO formDTO) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index c1d2cc3e9e..fdfe602d19 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -413,12 +413,12 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl} + * @Return {@link List< ImportGeneralDTO >} * @Author zhaoqifeng * @Date 2022/2/14 9:40 */ @Override - public List getImportInfo(ImportInfoFormDTO formDTO, List list) { + public List getImportInfo(ImportInfoFormDTO formDTO, List list) { list.forEach(item -> { if (StringUtils.isEmpty(item.getNeighborHoodId())) { //1.获取小区ID，判断小区是否存在，不存在则添加小区，存在则直接获取小区ID @@ -457,7 +457,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcNeighborHoodEntity::getGridId, info.getGridId()); @@ -485,7 +485,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl - SELECT ID AS gridId,GRID_NAME FROM customer_grid WHERE DEL_FLAG = '0' AND PID = #{orgId} - SELECT ID AS neighborHoodId, NEIGHBOR_HOOD_NAME, @@ -262,7 +262,7 @@ - SELECT ID AS buildingId, NEIGHBOR_HOOD_ID, @@ -273,7 +273,7 @@ - SELECT ID AS buildingUnitId, UNIT_NUM AS buildingUnit, @@ -284,7 +284,7 @@ - SELECT AGENCY_ID, GRID_ID, @@ -296,7 +296,7 @@ - SELECT b.ID AS buildingId, b.BUILDING_NAME, From 8c5a856d2b914dc3a396d3b5cf9182a517c0d7c9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 15 Feb 2022 13:40:10 +0800 Subject: [PATCH 067/391] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/ImportGeneralDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index c9d9c6d76b..9ec463096d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -122,4 +122,9 @@ public class ImportGeneralDTO implements Serializable { private String customerId; private Boolean existStatus = false; + + /** + * 楼栋重复状态 + */ + private Boolean buildingExistStatus = false; } From 634c5d59273b49ff75459c6079bd451776c7a89a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 15 Feb 2022 13:45:12 +0800 Subject: [PATCH 068/391] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/ImportGeneralDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index 9ec463096d..2c2b3d8379 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -127,4 +127,9 @@ public class ImportGeneralDTO implements Serializable { * 楼栋重复状态 */ private Boolean buildingExistStatus = false; + + /** + * 小区重复状态 + */ + private Boolean neighborHoodExistStatus = false; } From 969ef28f613d97ccecc6fe2b3b70811ff6c87d45 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 15 Feb 2022 14:10:55 +0800 Subject: [PATCH 069/391] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/BuildingController.java | 2 +- .../model/ImportBuildingInfoListener.java | 263 +++++++++++++++++- .../service/impl/BuildingServiceImpl.java | 12 +- 3 files changed, 268 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java index 628a3d5c62..2ac1605193 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java @@ -219,7 +219,7 @@ public class BuildingController { formDTO.setOrgType(orgType); formDTO.setOrgId(orgId); formDTO.setUserId(tokenDTO.getUserId()); - return new Result().ok(buildingService.buildingImportExcel(formDTO,file)); + return buildingService.buildingImportExcel(formDTO,file); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java index 0866793cf6..b894c7fba2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java @@ -3,13 +3,27 @@ package com.epmet.model; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.constant.CustomerGridConstant; +import com.epmet.dao.IcBuildingDao; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.ImportInfoFormDTO; +import com.epmet.dto.result.ImportResultDTO; +import com.epmet.enums.BuildingTypeEnums; import com.epmet.redis.IcHouseRedis; +import com.epmet.service.IcNeighborHoodService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.util.CollectionUtils; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @Author zxc @@ -38,19 +52,264 @@ public class ImportBuildingInfoListener extends AnalysisEventListener groupByAllName = needDisposeList.stream().collect(Collectors.groupingBy( + n -> n.getAgencyName() + "_" + n.getGridName() + "_" + + n.getNeighborHoodName() + "_" + n.getBuildingName(), Collectors.counting())); + groupByAllName.forEach((k,v) -> { + if (Integer.valueOf(v.toString()).compareTo(1) > 0){ + for (ImportGeneralDTO r : needDisposeList) { + if (k.equals(r.getAgencyName() + "_" + r.getGridName() + "_" + + r.getNeighborHoodName() + "_" + r.getBuildingName())){ + // 集合里重复的 + r.setExistStatus(true); + nums.add(r.getNum()); + } + } + } + }); + Map> groupByStatus = needDisposeList.stream().collect(Collectors.groupingBy(ImportGeneralDTO::getExistStatus)); + List importGeneralDTOS = groupByStatus.get(false); + if (!CollectionUtils.isEmpty(importGeneralDTOS)){ + List importInfo = neighborHoodService.getImportInfo(formDTO, importGeneralDTOS); + Map> groupByBuildingExistStatus = importInfo.stream().collect(Collectors.groupingBy(ImportGeneralDTO::getBuildingExistStatus)); + List existList = groupByBuildingExistStatus.get(true); + if (!CollectionUtils.isEmpty(existList)){ + existList.forEach(e -> { + nums.add(e.getNum()); + }); + } + } + // 清除 + needDisposeList = new ArrayList<>(); + needInsertList = new ArrayList<>(); + gridName = null; + agencyName = null; + gridInfos = null; + gridInfoDTOs = null; + neighborHoodInfos = null; + neighborHoodInfoDTOs = null; + neighborHoodGeneralDTO = null; + buildingInfos = null; + buildingInfoDTOs = null; + buildingGeneralDTO = null; + } + + public void fillData(ImportGeneralDTO dto, String orgType){ + if (orgType.equals(CustomerGridConstant.GRID) || orgType.equals(CustomerGridConstant.AGENCY)){ + List gridIds = new ArrayList<>(); + if (orgType.equals(CustomerGridConstant.GRID)){ + gridIds = Arrays.asList(formDTO.getOrgId()); + }else if (orgType.equals(CustomerGridConstant.AGENCY)){ + gridIds = gridInfoDTOs.stream().map(m -> m.getGridId()).collect(Collectors.toList()); + } + neighborHoodInfos = null == neighborHoodInfos ? getNeighborHoodInfos(gridIds) : neighborHoodInfos; + Object cacheNeighBorHood = icHouseRedis.getTemporaryCacheNeighBorHood(formDTO.getCustomerId(), formDTO.getUserId(), formDTO.getOrgId() + "_" + dto.getNeighborHoodName()); + // 赋值小区ID + dto.setNeighborHoodId(null == cacheNeighBorHood ? "" : cacheNeighBorHood.toString()); + } + if (StringUtils.isNotBlank(dto.getNeighborHoodId())){ + //小区ID不为空赋值楼栋ID + buildingInfos = null == buildingInfos ? getBuildingInfos(dto.getNeighborHoodId()) : buildingInfos; + Object cacheBuilding = icHouseRedis.getTemporaryCacheBuilding(formDTO.getCustomerId(), formDTO.getUserId(), dto.getNeighborHoodId() + "_" + dto.getBuildingName()); + dto.setBuildingId(null == cacheBuilding ? "" : cacheBuilding.toString()); + if (StringUtils.isNotBlank(dto.getBuildingId())){ + // 说明数据库已存在此楼栋，不需添加 + nums.add(num); + }else { + needDisposeList.add(dto); + } + }else { + needDisposeList.add(dto); + } + } + + /** + * @Description 左侧树点击小区时调用 + * @param dto + * @author zxc + * @date 2022/2/15 10:41 上午 + */ + public void disposeNeighborHoodBuilding(ImportGeneralDTO dto){ + neighborHoodGeneralDTO = null == neighborHoodGeneralDTO ? icBuildingDao.selectNeighborHoodById(formDTO.getOrgId()) : neighborHoodGeneralDTO; + //排除不是本小区的 + if (!dto.getNeighborHoodName().equals(neighborHoodGeneralDTO.getNeighborHoodName())){ + nums.add(num); + }else { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(neighborHoodGeneralDTO.getGridId()); + if (null == gridInfo){ + throw new EpmetException("查询网格失败..."); + } + // 1.排除网格名不一样但小区名一样 2.排除组织不一样，网格一样，小区一样 + if ((!gridInfo.getGridName().equals(dto.getGridName()) && neighborHoodGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName())) || + (!gridInfo.getAgencyName().equals(dto.getAgencyName()) && gridInfo.getGridName().equals(dto.getGridName()) && neighborHoodGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName()))){ + nums.add(num); + return; + } + dto.setNeighborHoodId(formDTO.getOrgId()); + dto.setGridId(neighborHoodGeneralDTO.getGridId()); + dto.setAgencyId(neighborHoodGeneralDTO.getAgencyId()); + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId()); + if (null == agencyInfo){ + throw new EpmetException("查询组织信息失败..."); + } + dto.setPid(agencyInfo.getPid()); + dto.setPids(agencyInfo.getPids()); + // 填充各种ID + fillData(dto,CustomerGridConstant.NEIGHBORHOOD); + } + } + + /** + * @Description 左侧树点击网格时调用 + * @param dto + * @author zxc + * @date 2022/2/15 10:41 上午 + */ + public void disposeGridBuilding(ImportGeneralDTO dto){ + gridName = null == gridName ? icBuildingDao.selectGridNameById(formDTO.getOrgId()) : gridName; + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getOrgId()); + if (null == gridInfo){ + throw new EpmetException("查询网格失败..."); + } + //排除不是本网格的 gridName不一样排除，gridName一样但是agencyName不一样也得排除 + if (!dto.getGridName().equals(gridName) || (!dto.getAgencyName().equals(gridInfo.getAgencyName()) && dto.getGridName().equals(gridName))){ + nums.add(num); + }else { + // + dto.setGridId(formDTO.getOrgId()); + dto.setAgencyId(gridInfo.getPid()); + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId()); + if (null == agencyInfo){ + throw new EpmetException("查询组织信息失败..."); + } + dto.setPid(agencyInfo.getPid()); + dto.setPids(agencyInfo.getPids()); + // 填充各种ID + fillData(dto, CustomerGridConstant.GRID); + } + } + + /** + * @Description 左侧树点击组织时调用 + * @param dto + * @author zxc + * @date 2022/2/15 10:41 上午 + */ + public void disposeAgencyBuilding(ImportGeneralDTO dto){ + agencyName = null == agencyName ? icBuildingDao.selectAgencyNameById(formDTO.getOrgId()) : agencyName; + //排除不是本组织的 + if (!dto.getAgencyName().equals(agencyName)){ + nums.add(num); + }else { + // 根据组织查询出所有网格，甩出不是本组织下的网格 + gridInfos = null == gridInfos ? getGridInfos(formDTO.getOrgId()) : gridInfos; + if (null == gridInfos){ + // 组织下确实不存在网格 + nums.add(num); + return; + } + // 根据网格名对比，没有找到的就把行号加入到未执行成功队列中 + Object cacheGridName = icHouseRedis.getTemporaryCacheGrid(formDTO.getCustomerId(), formDTO.getUserId(), dto.getGridName()); + if (null == cacheGridName){ + nums.add(num); + return; + } + dto.setGridId(cacheGridName.toString()); + dto.setAgencyId(formDTO.getOrgId()); + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId()); + if (null == agencyInfo){ + throw new EpmetException("查询组织信息失败..."); + } + dto.setPid(agencyInfo.getPid()); + dto.setPids(agencyInfo.getPids()); + // 填充各种ID + fillData(dto,CustomerGridConstant.AGENCY); + } + } + + /** + * @Description 获取网格信息 + * @param orgId + * @author zxc + * @date 2022/2/14 9:57 上午 + */ + public Map getGridInfos(String orgId){ + gridInfoDTOs = icBuildingDao.selectAllGridByOrgId(orgId); + gridInfos = gridInfoDTOs.stream().collect(Collectors.toMap(n -> n.getGridName(), n -> n.getGridId())); + icHouseRedis.setTemporaryCacheGrid(formDTO.getCustomerId(), gridInfos, formDTO.getUserId()); + return gridInfos; + } + + /** + * @Description 获取网格下的小区 + * @param gridIds + * @author zxc + * @date 2022/2/14 10:16 上午 + */ + public Map getNeighborHoodInfos(List gridIds){ + neighborHoodInfoDTOs = icBuildingDao.selectAllNeighborHoodByGridIds(gridIds); + neighborHoodInfos = neighborHoodInfoDTOs.stream().collect(Collectors.toMap(n -> n.getGridId() + "_" + n.getNeighborHoodName(), n -> n.getNeighborHoodId())); + icHouseRedis.setTemporaryCacheNeighBorHood(formDTO.getCustomerId(), neighborHoodInfos, formDTO.getUserId()); + return neighborHoodInfos; + } + /** + * @Description 获取小区下的楼栋 + * @param neighborHoodId + * @author zxc + * @date 2022/2/14 1:32 下午 + */ + public Map getBuildingInfos(String neighborHoodId){ + buildingInfoDTOs = icBuildingDao.selectAllBuildingByNeighborHoodId(neighborHoodId); + buildingInfos = buildingInfoDTOs.stream().collect(Collectors.toMap(n -> n.getNeighborHoodId() + "_" + n.getBuildingName(), n -> n.getBuildingId())); + icHouseRedis.setTemporaryCacheBuilding(formDTO.getCustomerId(), buildingInfos, formDTO.getUserId()); + return buildingInfos; } @Override public void doAfterAllAnalysed(AnalysisContext context) { - + finalDispose(); + // 删除缓存 + icHouseRedis.delTemporaryCacheGrids(formDTO.getCustomerId(), formDTO.getUserId()); + icHouseRedis.delTemporaryCacheNeighBorHood(formDTO.getCustomerId(), formDTO.getUserId()); + icHouseRedis.delTemporaryCacheBuilding(formDTO.getCustomerId(), formDTO.getUserId()); + icHouseRedis.delTemporaryCacheBuildingUnit(formDTO.getCustomerId(), formDTO.getUserId()); + icHouseRedis.delTemporaryCacheHouses(formDTO.getCustomerId(), formDTO.getUserId()); + // 放结果 + icHouseRedis.setImportResultDTO(formDTO.getCustomerId(), formDTO.getUserId(), new ImportResultDTO(nums,num)); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index ada9613c63..17909fa625 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -31,13 +31,11 @@ import com.epmet.dto.result.ImportResultDTO; import com.epmet.entity.*; import com.epmet.enums.BuildingTypeEnums; import com.epmet.excel.IcBuildingExcel; +import com.epmet.model.BuildingInfoModel; import com.epmet.model.HouseInfoModel; import com.epmet.model.ImportBuildingInfoListener; import com.epmet.redis.IcHouseRedis; -import com.epmet.service.BuildingService; -import com.epmet.service.IcBuildingService; -import com.epmet.service.IcBuildingUnitService; -import com.epmet.service.IcHouseService; +import com.epmet.service.*; import com.epmet.util.ExcelPoiUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -85,6 +83,8 @@ public class BuildingServiceImpl implements BuildingService { private IcBuildingUnitDao icBuildingUnitDao; @Autowired private IcHouseRedis icHouseRedis; + @Autowired + private IcNeighborHoodService neighborHoodService; @Override @Transactional(rollbackFor = Exception.class) @@ -404,8 +404,8 @@ public class BuildingServiceImpl implements BuildingService { } excelReader = EasyExcel.read(inputStream).build(); // 这里为了简单 所以注册了 同样的head 和Listener 自己使用功能必须不同的Listener - ReadSheet readSheet = EasyExcel.readSheet(0).head(HouseInfoModel.class) - .registerReadListener(new ImportBuildingInfoListener(formDTO,icHouseRedis)) + ReadSheet readSheet = EasyExcel.readSheet(0).head(BuildingInfoModel.class) + .registerReadListener(new ImportBuildingInfoListener(formDTO,icHouseRedis,icBuildingDao,neighborHoodService)) .build(); excelReader.read(readSheet); } finally { From 5061020e4ca7c00c8ae388561c640cddaca355db Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 15 Feb 2022 14:38:10 +0800 Subject: [PATCH 070/391] =?UTF-8?q?=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/ImportGeneralDTO.java | 15 +++ .../model/ImportNeighborHoodInfoListener.java | 93 +++++++++++++++++++ .../epmet/model/NeighborHoodInfoModel.java | 32 +++++++ .../impl/IcNeighborHoodServiceImpl.java | 50 ++++++++++ 4 files changed, 190 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index 2c2b3d8379..9039cda6ef 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -112,6 +112,21 @@ public class ImportGeneralDTO implements Serializable { */ private Integer num; + /** + * 关联物业 + */ + private String propertyName; + + /** + * 详细地址 + */ + private String address; + + /** + * 备注 + */ + private String remark; + /** * 房屋ID */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java new file mode 100644 index 0000000000..7d5a29af04 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java @@ -0,0 +1,93 @@ +package com.epmet.model; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.constant.CustomerGridConstant; +import com.epmet.dao.IcBuildingDao; +import com.epmet.dto.ImportGeneralDTO; +import com.epmet.dto.form.ImportInfoFormDTO; +import com.epmet.redis.IcHouseRedis; +import com.epmet.service.IcNeighborHoodService; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Author zxc + * @DateTime 2022/2/15 2:16 下午 + * @DESC + */ +public class ImportNeighborHoodInfoListener extends AnalysisEventListener { + + List nums = new ArrayList<>(); + Integer num = NumConstant.ZERO; + + List needDisposeList = new ArrayList<>(); + List needInsertList = new ArrayList<>(); + + String gridName = null; + String agencyName = null; + + Map gridInfos = null; + List gridInfoDTOs = null; + Map neighborHoodInfos = null; + List neighborHoodInfoDTOs = null; + ImportGeneralDTO neighborHoodGeneralDTO = null; + + private ImportInfoFormDTO formDTO; + private IcHouseRedis icHouseRedis; + private IcBuildingDao icBuildingDao; + private IcNeighborHoodService neighborHoodService; + + public ImportNeighborHoodInfoListener(ImportInfoFormDTO formDTO, IcHouseRedis icHouseRedis,IcBuildingDao icBuildingDao,IcNeighborHoodService neighborHoodService){ + this.formDTO = formDTO; + this.icHouseRedis = icHouseRedis; + this.icBuildingDao = icBuildingDao; + this.neighborHoodService = neighborHoodService; + } + + + @Override + public void invoke(NeighborHoodInfoModel data, AnalysisContext context) { + if (null == data){ + return; + } + num = num + NumConstant.ONE; + ImportGeneralDTO dto = ConvertUtils.sourceToTarget(data, ImportGeneralDTO.class); + dto.setNum(num); + dto.setCustomerId(formDTO.getCustomerId()); + if (formDTO.getOrgType().equals(CustomerGridConstant.GRID)){ + disposeGridNeighborHood(dto); + }else if (formDTO.getOrgType().equals(CustomerGridConstant.AGENCY)){ + disposeAgencyNeighborHood(dto); + } + } + + /** + * @Description 左侧树点击网格时调用 + * @param dto + * @author zxc + * @date 2022/2/15 2:37 下午 + */ + public void disposeGridNeighborHood(ImportGeneralDTO dto){ + + } + + /** + * @Description 左侧树点击组织时调用 + * @param dto + * @author zxc + * @date 2022/2/15 2:37 下午 + */ + public void disposeAgencyNeighborHood(ImportGeneralDTO dto){ + + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java new file mode 100644 index 0000000000..8dbdbafccd --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java @@ -0,0 +1,32 @@ +package com.epmet.model; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +/** + * @Author zxc + * @DateTime 2022/2/15 2:15 下午 + * @DESC + */ +@Data +public class NeighborHoodInfoModel { + + @ExcelProperty(value = "所属组织") + private String agencyName; + + @ExcelProperty(value = "所属网格") + private String gridName; + + @ExcelProperty(value = "小区名称") + private String neighborHoodName; + + @ExcelProperty(value = "关联物业") + private String propertyName; + + @ExcelProperty(value = "详细地址") + private String address; + + @ExcelProperty(value = "备注") + private String remark; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index fdfe602d19..189ac0e825 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -18,6 +18,9 @@ package com.epmet.service.impl; import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelReader; +import com.alibaba.excel.read.metadata.ReadSheet; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -37,13 +40,20 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.CustomerGridConstant; import com.epmet.dao.CustomerGridDao; +import com.epmet.dao.IcBuildingDao; import com.epmet.dao.IcNeighborHoodDao; import com.epmet.dao.IcPropertyManagementDao; import com.epmet.dto.*; import com.epmet.dto.form.ImportInfoFormDTO; +import com.epmet.dto.result.ImportResultDTO; import com.epmet.dto.result.InfoByNamesResultDTO; import com.epmet.entity.*; import com.epmet.excel.IcNeighborHoodExcel; +import com.epmet.model.BuildingInfoModel; +import com.epmet.model.ImportBuildingInfoListener; +import com.epmet.model.ImportNeighborHoodInfoListener; +import com.epmet.model.NeighborHoodInfoModel; +import com.epmet.redis.IcHouseRedis; import com.epmet.service.*; import com.epmet.util.ExcelPoiUtils; import lombok.extern.slf4j.Slf4j; @@ -57,6 +67,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.IOException; +import java.io.InputStream; import java.util.*; import java.util.stream.Collectors; @@ -82,6 +93,10 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl page(Map params) { @@ -373,6 +388,41 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl().error("读取文件失败"); + } + excelReader = EasyExcel.read(inputStream).build(); + // 这里为了简单 所以注册了 同样的head 和Listener 自己使用功能必须不同的Listener + ReadSheet readSheet = EasyExcel.readSheet(0).head(NeighborHoodInfoModel.class) + .registerReadListener(new ImportNeighborHoodInfoListener(formDTO,icHouseRedis,icBuildingDao,this)) + .build(); + excelReader.read(readSheet); + } finally { + if (excelReader != null) { + excelReader.finish(); + } + } + ImportResultDTO dto = icHouseRedis.getImportResultDTO(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == dto){ + return new Result<>(); + } + List nums = dto.getNums(); + Integer num = dto.getNum(); + String s = "共%s条数据，导入成功%s条。"; + if (nums.size() > NumConstant.ZERO){ + Collections.sort(nums); + s = s + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"条导入失败"; + return new Result<>().error(9999,String.format(s,num,num - nums.size())); + } + return new Result<>().ok(String.format(s,num,num)); + } + /** * @Description 小区插入，物业插入 * @param entities From 4c13d363003a7fded74a18d7f3cb5f7856916825 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 17 Feb 2022 09:14:46 +0800 Subject: [PATCH 071/391] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20-=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4user=E7=9A=84=E5=86=85=E5=AD=98=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5b75e0463c..e1e35559ff 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -9,7 +9,7 @@ services: volumes: - "/opt/epmet-cloud-logs/dev:/logs" environment: - RUN_INSTRUCT: "java -Xms32m -Xmx1024m -jar ./epmet-user.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-user.jar" restart: "unless-stopped" deploy: resources: From 3361cd5a9004c98b660eb04cf51fc25d6ed91518 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 17 Feb 2022 10:16:45 +0800 Subject: [PATCH 072/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 c9664ab61a..584da9f576 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.232 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.233 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 35e3e458dc..792f1abcf3 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.232 + 0.3.233 com.epmet epmet-user From 808d305a7c8c4eef711a024029af8c97c8313188 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 17 Feb 2022 10:35:50 +0800 Subject: [PATCH 073/391] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=88=97=E5=A4=B4=E6=97=A5=E6=9C=9F=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 08fe0be39f..f1cd5ee919 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.107 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.108 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index a222f7963f..656bb1639f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.107 + 0.3.108 data-aggregator com.epmet From 80888c09389704939e9b8df1c9971ece82b7cc22 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 17 Feb 2022 10:53:33 +0800 Subject: [PATCH 074/391] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/PatrolRoutineWorkServiceImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java index ab25b3ddd1..a93068de5b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java @@ -25,8 +25,8 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.rocketmq.messages.BaseMQMsgDTO; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; -import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.form.UpdateUserPointsFormDTO; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.DictTreeResultDTO; import com.epmet.commons.tools.enums.BehaviorTypeYuShanEnum; import com.epmet.commons.tools.enums.DictTypeEnum; @@ -74,10 +74,7 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -168,7 +165,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl Date: Thu, 17 Feb 2022 13:28:18 +0800 Subject: [PATCH 075/391] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 7d4c1b045e..7db330a5e8 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.358 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.359 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index b4096512ac..165d48d8c8 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.358 + 0.3.359 data-statistical com.epmet From 691fa1cf1a68b9834317404b4b4cd14b2a197409 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 17 Feb 2022 16:45:20 +0800 Subject: [PATCH 076/391] =?UTF-8?q?org=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 c8733aec5f..489d65b65b 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.162 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.163 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 0f5ba6290d..58473b5b36 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.162 + 0.3.163 com.epmet gov-org From d2545c4814d91db86dd0a92ea44bc1a50a2e8da1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 17 Feb 2022 18:20:04 +0800 Subject: [PATCH 077/391] =?UTF-8?q?org,resi-partymember=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../resi-partymember-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 489d65b65b..82a4896603 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.163 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.164 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 82ce41aad3..70db15e059 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.163 + 0.3.164 com.epmet gov-org 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 253215b123..6f9e5aabb2 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.83 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.84 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 4c7c11b2fd..5639637b73 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.83 + 0.3.84 com.epmet resi-partymember From 6385e81b7177e79448a3b08aec0524886c494880 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 17 Feb 2022 19:39:29 +0800 Subject: [PATCH 078/391] =?UTF-8?q?=E5=BC=84=E4=B8=AA=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E4=B8=8A=E5=8E=BB=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 7db330a5e8..69a9808e4d 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.359 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.360 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 165d48d8c8..b85f43128a 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.359 + 0.3.360 data-statistical com.epmet From 2654cd4607cdf7051c5d4afc9a988d1260675d3c Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 17 Feb 2022 20:20:31 +0800 Subject: [PATCH 079/391] =?UTF-8?q?=E5=BC=84=E4=B8=AA=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E4=B8=8A=E5=8E=BB=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 69a9808e4d..d14113562d 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.360 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.361 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index b85f43128a..4393976d3d 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.360 + 0.3.361 data-statistical com.epmet From 8672efdf2adb78dd91a97a6e7c88a5c6ecfcb874 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 17 Feb 2022 20:57:59 +0800 Subject: [PATCH 080/391] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=A7=20=E5=B0=91?= =?UTF-8?q?=E5=B9=B4=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 d14113562d..b62febb2e1 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.361 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.362 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 4393976d3d..9d7b29692b 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.361 + 0.3.362 data-statistical com.epmet From 544d53593d6b68451626bbbde326acb2c086f646 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 17 Feb 2022 21:18:19 +0800 Subject: [PATCH 081/391] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8B=E6=97=A5?= =?UTF-8?q?=E5=BF=97=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 b62febb2e1..c93c536bbf 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.362 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.363 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 9d7b29692b..df3f461c61 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.362 + 0.3.363 data-statistical com.epmet From e16d73381d232fa5608010565027ea3c3484b218 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 17 Feb 2022 21:33:54 +0800 Subject: [PATCH 082/391] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=20?= =?UTF-8?q?up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 c93c536bbf..50ad0a8ac8 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.363 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.364 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index df3f461c61..f834d7a872 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.363 + 0.3.364 data-statistical com.epmet From 2b7ae00e10c713ccb9210fedcb21d925d98e1a27 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 18 Feb 2022 14:05:06 +0800 Subject: [PATCH 083/391] =?UTF-8?q?org=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 82a4896603..268e9026ea 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.164 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.165 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 70db15e059..771af14f5a 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.164 + 0.3.165 com.epmet gov-org From 18f78db2d79d2482470dd0950f9c7532029e4254 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 18 Feb 2022 15:11:33 +0800 Subject: [PATCH 084/391] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E4=BE=8B?= =?UTF-8?q?=E8=A1=8C=E5=B7=A5=E4=BD=9C=E5=8F=91=E5=B8=83=E7=94=9F=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 584da9f576..5d281e3a19 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.233 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.234 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 792f1abcf3..41c8e5752f 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.233 + 0.3.234 com.epmet epmet-user From 002fd53fed1e58a7f79fd68a03a2c29616bfe836 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Feb 2022 15:56:19 +0800 Subject: [PATCH 085/391] yushan up:user+project --- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 d0d0303716..04164bd8f7 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.98 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.99 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 358ea6165f..78a4a58cb4 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.98 + 0.3.99 gov-project com.epmet 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 5d281e3a19..fe3e7427ec 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.234 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.235 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 41c8e5752f..31da163425 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.234 + 0.3.235 com.epmet epmet-user From d12732f0ede3faff809ca18d475e1d4aeb9cc2d5 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 18 Feb 2022 17:11:45 +0800 Subject: [PATCH 086/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 fe3e7427ec..2485a95faf 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.235 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.236 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 31da163425..c3fb0cc67b 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.235 + 0.3.236 com.epmet epmet-user From 652bb543623f5053fa4b9a7662be817147f40f8e Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 18 Feb 2022 17:27:05 +0800 Subject: [PATCH 087/391] agg stats up --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 f1cd5ee919..e7bff3b2f4 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.108 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.109 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 656bb1639f..756e03bef0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.108 + 0.3.109 data-aggregator com.epmet 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 50ad0a8ac8..93f2ef74bd 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.364 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.365 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index f834d7a872..eba0ac7893 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.364 + 0.3.365 data-statistical com.epmet From 97026501e6d017de0eed59b3e841ed2efa90c9a2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 18 Feb 2022 17:44:05 +0800 Subject: [PATCH 088/391] =?UTF-8?q?bug=E6=94=B9=E4=B8=80=E4=B8=8B=20?= =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C=E6=AC=A1=E6=95=B0=20?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E4=B8=8D=E5=88=B0=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 e7bff3b2f4..ff03283eeb 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.109 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.110 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 756e03bef0..ea77a588f0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.109 + 0.3.110 data-aggregator com.epmet From 3b0ee39d9075f0980746c5bd1dc4758189decf2c Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 18 Feb 2022 18:00:48 +0800 Subject: [PATCH 089/391] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=20=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ff03283eeb..74f7fb6cda 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.110 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.111 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index ea77a588f0..6cb7acc618 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.110 + 0.3.111 data-aggregator com.epmet From 874bf9d6a2e9fbe30fa824e5462a7ad12f16162d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Feb 2022 19:47:43 +0800 Subject: [PATCH 090/391] =?UTF-8?q?/epmetuser/patrolroutinework/add?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 2485a95faf..f16ea7d7eb 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.236 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.237 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index c3fb0cc67b..4155393e48 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.236 + 0.3.237 com.epmet epmet-user From 680783967dc5173bf72ff2ef94ab3c9193c94238 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 21 Feb 2022 09:57:58 +0800 Subject: [PATCH 091/391] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/redis/RedisKeys.java | 33 ------------------- 1 file changed, 33 deletions(-) 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 9df4f46881..fe03008b81 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 @@ -729,39 +729,6 @@ public class RedisKeys { return rootPrefix.concat("temporary:").concat("temporaryBuildingUnit:").concat(customerId).concat(":").concat(userId); } - /** - * 居民导入-缓存目录key - * @param importTag - * @return - */ - public static String icResiImportBaseKey(String importTag) { - return rootPrefix.concat("resi:").concat("import:").concat(importTag); - } - - /** - * 居民导入-数据分类的key - * add：新增居民 - * category：类别变更 - * transfer：调动 - * @param importTag - * @param type - * @return - */ - public static String icResiImportTypeKey(String importTag, String type) { - return icResiImportBaseKey(importTag).concat(":").concat(type); - } - - /** - * 居民导入-详细信息key - * @param importTag - * @param type - * @param resiId - * @return - */ - public static String icResiImportResiCategoryKey(String importTag, String type, String resiId) { - return icResiImportTypeKey(importTag, type).concat(":").concat(resiId); - } - public static String getTemporaryImportResultCacheKey(String customerId,String userId){ return rootPrefix.concat("temporary:").concat("temporaryResult:").concat(customerId).concat(":").concat(userId); } From 89907988a9b6f47a72371514313eca50c1339ff1 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 21 Feb 2022 13:50:42 +0800 Subject: [PATCH 092/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 f16ea7d7eb..c2bd533427 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.237 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.238 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 4155393e48..56ecb32c99 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.237 + 0.3.238 com.epmet epmet-user From 9e64a22033eac5d41d5c50642fda25b70546c1ee Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 22 Feb 2022 16:06:38 +0800 Subject: [PATCH 093/391] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E9=97=B4=E9=9A=9420s?= =?UTF-8?q?=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 c2bd533427..edc0738ae7 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.238 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.239 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 56ecb32c99..80b4abc732 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.238 + 0.3.239 com.epmet epmet-user From 743cac2c6affb84f2c20d3cc56a85d7af31d8f9c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 23 Feb 2022 10:25:53 +0800 Subject: [PATCH 094/391] =?UTF-8?q?user=EF=BC=8Corg=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 268e9026ea..1b7dd19c2d 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.165 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.166 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 771af14f5a..7b357a30a5 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.165 + 0.3.166 com.epmet gov-org 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 edc0738ae7..b08564b869 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.239 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.240 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 80b4abc732..fd46865ccd 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.239 + 0.3.240 com.epmet epmet-user From 3cb56cc01134310e7734ca00160279403592b984 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 23 Feb 2022 15:22:04 +0800 Subject: [PATCH 095/391] user up 241 --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 b08564b869..87817d2bc1 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.240 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.241 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index fd46865ccd..c854052bba 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.240 + 0.3.241 com.epmet epmet-user From 162df0d2147b41c37cc52e545f580124c397b087 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 23 Feb 2022 16:51:19 +0800 Subject: [PATCH 096/391] =?UTF-8?q?user=EF=BC=8Corg=20=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 1b7dd19c2d..efc1f1c497 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.166 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.167 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 7b357a30a5..d7cf255437 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.166 + 0.3.167 com.epmet gov-org 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 87817d2bc1..41a7a3e44b 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.241 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.242 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index c854052bba..51312e5798 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.241 + 0.3.242 com.epmet epmet-user From eca662333ffc8c9ab2ea21c9ce6f9cc6da1c377f Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 24 Feb 2022 12:10:18 +0800 Subject: [PATCH 097/391] =?UTF-8?q?user=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 41a7a3e44b..dd5ffe68ca 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.242 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.243 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 51312e5798..c9fdbfdfb2 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.242 + 0.3.243 com.epmet epmet-user From c115a2171276e04f10fd5b9c9c6e705e4e5ce312 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 24 Feb 2022 14:53:55 +0800 Subject: [PATCH 098/391] =?UTF-8?q?heart=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 f165ad8a40..19463205a3 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.76 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.77 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 1309074311..2bba4b3306 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.76 + 0.0.77 com.epmet epmet-heart From a5c43691f38e55723d2e063bd1257e1e6ff28911 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 25 Feb 2022 10:39:22 +0800 Subject: [PATCH 099/391] =?UTF-8?q?=E9=85=8D=E7=BD=AEpc=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=97=B6=20=E5=88=A0=E9=99=A4=E7=BC=93?= =?UTF-8?q?=E5=AD=98=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-access/gov-access-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-access/gov-access-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 3a06905284..f277e420a2 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.63 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.64 ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index b30b339746..0347a586e4 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.63 + 0.3.64 gov-access com.epmet From d54b7bcaae105ad75aeeeb360e2118137e97a86b Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 25 Feb 2022 15:24:59 +0800 Subject: [PATCH 100/391] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB=20?= =?UTF-8?q?up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml | 2 +- epmet-openapi/epmet-openapi-scan/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 3254a018e6..65332ec821 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-openapi-scan: container_name: epmet-openapi-scan-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.32 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.33 ports: - "8107:8107" network_mode: host # 不会创建新的网络 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index 289dd8a2f9..3d39cfe8c6 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.32 + 0.3.33 epmet-openapi-scan jar From 62c41d4c8d661a4bae3c9f2b2670a2bc4726dcca Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 25 Feb 2022 17:42:54 +0800 Subject: [PATCH 101/391] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=98=E5=8A=A8=20?= =?UTF-8?q?up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 93f2ef74bd..f507703f91 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.365 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.366 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index eba0ac7893..76340756c4 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.365 + 0.3.366 data-statistical com.epmet 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 04164bd8f7..649cddfa98 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.99 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.100 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 78a4a58cb4..61bd25e78e 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.99 + 0.3.100 gov-project com.epmet From 9e4165c093ae9004a5279405b0c63fdd812355a5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 28 Feb 2022 15:39:30 +0800 Subject: [PATCH 102/391] =?UTF-8?q?=E6=8C=87=E6=A0=87=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E6=9A=82=E6=9C=AA=E5=8F=91=E7=8E=B0?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=AE=A1=E7=AE=97=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=8F=8A=E8=AE=AE=E9=A2=98=E8=BD=AC=E9=A1=B9=E7=9B=AE=E5=88=86?= =?UTF-8?q?=E5=B8=83=E5=BC=8F=E9=94=81=20=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../common-service-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 f507703f91..d85a56dcd3 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.366 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.367 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 76340756c4..c0033cf3d2 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.366 + 0.3.367 data-statistical com.epmet 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 d60a3f7959..cf98ebb64e 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 @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.43 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.44 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 38a3ccbbbd..318c1405e8 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.43 + 0.3.44 com.epmet epmet-common-service 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 140f59027d..d6863c04aa 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.102 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.103 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 5e9a3f5657..9d4f945462 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.102 + 0.3.103 gov-issue com.epmet From 1df5589e83ab60aeebf08ff93825395af8c74d11 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 28 Feb 2022 17:29:10 +0800 Subject: [PATCH 103/391] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AF=B9=E5=BA=94=E7=9A=84=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=A7=92=E8=89=B2=E8=A1=A8=E7=9A=84orgId?= =?UTF-8?q?=E6=B0=B8=E8=BF=9C=E9=83=BD=E6=98=AF=E7=BB=84=E7=BB=87Id=20agai?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 efc1f1c497..2f8c37cde4 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.167 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.168 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index d7cf255437..a4c3a762aa 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.167 + 0.3.168 com.epmet gov-org From e3149cef84fa61b0ab9532db37c258b7a9e0620f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 1 Mar 2022 10:03:02 +0800 Subject: [PATCH 104/391] =?UTF-8?q?project=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 649cddfa98..0121d75eb5 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.100 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.101 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 61bd25e78e..2b6a296561 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.100 + 0.3.101 gov-project com.epmet From 6ae7158eb115df18b967f74b412ea5d876aefd92 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 1 Mar 2022 13:32:42 +0800 Subject: [PATCH 105/391] =?UTF-8?q?=E6=8C=87=E6=A0=87=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E8=B0=83=E7=94=A8=20=E6=8C=AA=E5=88=B0?= =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E6=95=B0=E6=8D=AE=E6=8A=BD=E5=8F=96=E5=AE=8C?= =?UTF-8?q?=E5=90=8E=E8=AE=A1=E7=AE=97=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 d85a56dcd3..8379b44db7 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.367 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.368 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index c0033cf3d2..75eed5cadf 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.367 + 0.3.368 data-statistical com.epmet From bb0088d5425bc4d2d0a0a476fc4cb3412f7d818e Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 1 Mar 2022 14:06:59 +0800 Subject: [PATCH 106/391] =?UTF-8?q?=E6=8C=87=E6=A0=87=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E8=B0=83=E7=94=A8=20=E6=8C=AA=E5=88=B0?= =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E6=95=B0=E6=8D=AE=E6=8A=BD=E5=8F=96=E5=AE=8C?= =?UTF-8?q?=E5=90=8E=E8=AE=A1=E7=AE=97=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 8379b44db7..3de49c33b4 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.368 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.369 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 75eed5cadf..016afae6bd 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.368 + 0.3.369 data-statistical com.epmet From c0a5842638c3930fed1415dbf6c0bb2d0be4c899 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 1 Mar 2022 17:51:10 +0800 Subject: [PATCH 107/391] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=BA=AF=E5=B0=8F=E5=86=99=E5=AD=97=E6=AF=8Dup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-prod.yml | 2 +- epmet-auth/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-prod.yml b/epmet-auth/deploy/docker-compose-prod.yml index 6b9592dfa9..45c901edbc 100644 --- a/epmet-auth/deploy/docker-compose-prod.yml +++ b/epmet-auth/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.98 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.99 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 41b8b92296..35191104b2 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.98 + 0.3.99 com.epmet epmet-cloud From 7d19daa35d0641757f6933d37dc43cd1a95ac27b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 2 Mar 2022 10:11:47 +0800 Subject: [PATCH 108/391] stats 370 --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 3de49c33b4..2967b4db22 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.369 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.370 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 37d097a236..57bd9327d9 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.369 + 0.3.370 data-statistical com.epmet From 4d2826f419a359383d42d8c14cfab23137eb5947 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 2 Mar 2022 14:00:33 +0800 Subject: [PATCH 109/391] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=87=AA=E5=BB=BA?= =?UTF-8?q?=E7=BE=A4=E6=B4=BB=E8=B7=83=E7=BE=A4=E4=BC=97=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=20371=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 2967b4db22..090e7bac9e 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.370 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.371 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 57bd9327d9..350fdaec49 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.370 + 0.3.371 data-statistical com.epmet From cd01c348427ad3868e5c47e4576a67d3d5e81ca5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 2 Mar 2022 15:42:48 +0800 Subject: [PATCH 110/391] 372 up --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 090e7bac9e..c6f63ee198 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.371 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.372 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 350fdaec49..d45c8098cb 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.371 + 0.3.372 data-statistical com.epmet From 654ebeafe901391a01c0fab5278a9d3a5c5961da Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Mar 2022 10:02:13 +0800 Subject: [PATCH 111/391] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98=20=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 db4202e72b..ee50f1da47 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.212 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.213 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index bc3fe1b533..105d9253b4 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.212 + 0.3.213 data-report-server From a5ebada76dd696a91d0c1022415fe94f5d774b64 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Mar 2022 10:35:39 +0800 Subject: [PATCH 112/391] NullPointerException 244 --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 dd5ffe68ca..689fcdb419 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.243 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.244 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 827ec5d413..0aafe34632 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.243 + 0.3.244 com.epmet epmet-user From cdd33de82ca570154067ae747dadbadda67e9021 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Mar 2022 15:01:54 +0800 Subject: [PATCH 113/391] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=89=88=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=B9=B3=E9=98=B4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=97=B6=E5=8F=AA=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BA=86=E4=BA=94=E4=B8=AA=E8=A1=97=E9=81=93=E7=9A=84=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E4=B8=89=E4=B8=AA=E6=98=AF=E4=B8=8A=E6=8A=A5=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=9C=A8=E8=BF=99=E4=B8=89=E4=B8=AA=E8=A1=97?= =?UTF-8?q?=E9=81=93=E5=9C=A8=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B9=9F=E4=BA=A7?= =?UTF-8?q?=E7=94=9F=E4=BA=86=E6=95=B0=E6=8D=AE=E9=9C=80=E8=A6=81=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=B8=8A=EF=BC=8C=E5=9B=A0=E6=AD=A4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC=E7=BB=B4?= =?UTF-8?q?=E5=BA=A6=E7=9A=84=E9=80=BB=E8=BE=91=20=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 c6f63ee198..00bf4c9096 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.372 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.373 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index d45c8098cb..4941f625ba 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.372 + 0.3.373 data-statistical com.epmet From 9b1c47f235772328229056961c8e30d833a97b66 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 3 Mar 2022 15:24:58 +0800 Subject: [PATCH 114/391] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.13__ImportTaskCommentModify.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.13__ImportTaskCommentModify.sql diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.13__ImportTaskCommentModify.sql b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.13__ImportTaskCommentModify.sql new file mode 100644 index 0000000000..de7c4f70a0 --- /dev/null +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.13__ImportTaskCommentModify.sql @@ -0,0 +1 @@ +alter table import_task modify column PROCESS_STATUS varchar(32) comment '处理状态。processing:处理中；finished_success:成功；finished_fail:未完全成功' \ No newline at end of file From ed3e3f3bc087ea4a9880384b8ec96235dfa98f08 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Mar 2022 15:57:44 +0800 Subject: [PATCH 115/391] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=89=88=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=B9=B3=E9=98=B4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=97=B6=E5=8F=AA=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BA=86=E4=BA=94=E4=B8=AA=E8=A1=97=E9=81=93=E7=9A=84=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E4=B8=89=E4=B8=AA=E6=98=AF=E4=B8=8A=E6=8A=A5=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=9C=A8=E8=BF=99=E4=B8=89=E4=B8=AA=E8=A1=97?= =?UTF-8?q?=E9=81=93=E5=9C=A8=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B9=9F=E4=BA=A7?= =?UTF-8?q?=E7=94=9F=E4=BA=86=E6=95=B0=E6=8D=AE=E9=9C=80=E8=A6=81=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=B8=8A=EF=BC=8C=E5=9B=A0=E6=AD=A4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC=E7=BB=B4?= =?UTF-8?q?=E5=BA=A6=E7=9A=84=E9=80=BB=E8=BE=91=20=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=B9=B3=E9=98=B4=E7=9A=84=E5=90=8C?= =?UTF-8?q?=E4=B8=80=E5=A4=A9=E7=BB=9F=E4=B8=80=E7=BB=84=E7=BB=87=E5=B0=B1?= =?UTF-8?q?=E4=BC=9A=E5=AD=98=E5=9C=A8=E4=B8=A4=E6=9D=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BA=86=20=E5=B0=B1=E9=9C=80=E8=A6=81sum=E5=92=8C=E4=BA=86=20?= =?UTF-8?q?again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 00bf4c9096..e11c22a410 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.373 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.374 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 4941f625ba..dc8febf08b 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.373 + 0.3.374 data-statistical com.epmet From faccc8c718f9d4c86c46a4dc9a2b06f905fff3f0 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Mar 2022 16:06:06 +0800 Subject: [PATCH 116/391] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=89=88=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=B9=B3=E9=98=B4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=97=B6=E5=8F=AA=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BA=86=E4=BA=94=E4=B8=AA=E8=A1=97=E9=81=93=E7=9A=84=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E4=B8=89=E4=B8=AA=E6=98=AF=E4=B8=8A=E6=8A=A5=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=9C=A8=E8=BF=99=E4=B8=89=E4=B8=AA=E8=A1=97?= =?UTF-8?q?=E9=81=93=E5=9C=A8=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B9=9F=E4=BA=A7?= =?UTF-8?q?=E7=94=9F=E4=BA=86=E6=95=B0=E6=8D=AE=E9=9C=80=E8=A6=81=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=B8=8A=EF=BC=8C=E5=9B=A0=E6=AD=A4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC=E7=BB=B4?= =?UTF-8?q?=E5=BA=A6=E7=9A=84=E9=80=BB=E8=BE=91=20=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=B9=B3=E9=98=B4=E7=9A=84=E5=90=8C?= =?UTF-8?q?=E4=B8=80=E5=A4=A9=E7=BB=9F=E4=B8=80=E7=BB=84=E7=BB=87=E5=B0=B1?= =?UTF-8?q?=E4=BC=9A=E5=AD=98=E5=9C=A8=E4=B8=A4=E6=9D=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BA=86=20=E5=B0=B1=E9=9C=80=E8=A6=81sum=E5=92=8C=E4=BA=86=20?= =?UTF-8?q?again=20=E3=80=90=E5=8F=91=E9=94=99=E6=9C=8D=E5=8A=A1=E4=BA=86?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 74f7fb6cda..3585767240 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.111 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.112 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 5a8173a414..276af19ad5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.111 + 0.3.112 data-aggregator com.epmet From 91af25995174e8cbf695db2873e4e9a9369acd10 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Mar 2022 17:02:47 +0800 Subject: [PATCH 117/391] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=BC=95=E8=B5=B7=E7=9A=84=E6=9F=A5=E8=AF=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E4=B8=89=E4=B8=AA=E8=A1=97=E9=81=93=E7=9A=84?= =?UTF-8?q?=E5=90=8C=E4=B8=80=E7=BB=84=E7=BB=87=E6=88=96=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E4=B8=80=E5=A4=A9=E4=BC=9A=E5=AD=98=E5=9C=A8=E4=B8=A4=E6=9D=A1?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=20=E5=8F=AA=E6=98=AF?= =?UTF-8?q?=E5=AE=A2=E6=88=B7Id=E4=B8=8D=E5=90=8C=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 3585767240..59c0a94070 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.112 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.113 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 276af19ad5..ff072d7624 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.112 + 0.3.113 data-aggregator com.epmet From 1cb6ffd92e0a285d9b232ae96447e9458b569edd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 4 Mar 2022 10:15:54 +0800 Subject: [PATCH 118/391] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E5=8F=91=E7=A7=AF?= =?UTF-8?q?=E5=88=86=20bugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 0121d75eb5..1037018826 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.101 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.102 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 9a96cd3b65..0baef6a59a 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.101 + 0.3.102 gov-project com.epmet 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 689fcdb419..03171ae348 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.244 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.245 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 0aafe34632..4c40d75cd8 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.244 + 0.3.245 com.epmet epmet-user From d8f3040daff3fb60d79f3781b9f0ebfb02f29a76 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 4 Mar 2022 16:46:56 +0800 Subject: [PATCH 119/391] up --- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 1037018826..7cd9d8a1bb 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.102 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.103 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 0baef6a59a..ea8599e06c 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.102 + 0.3.103 gov-project com.epmet 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 03171ae348..6e8d5d8525 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.245 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.246 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 4c40d75cd8..6e1a4ae13d 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.245 + 0.3.246 com.epmet epmet-user From c644a2d5af9d7a2b6dddbfd4c32908fca1371cd5 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 4 Mar 2022 17:13:49 +0800 Subject: [PATCH 120/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml | 2 +- epmet-admin/epmet-admin-server/pom.xml | 2 +- epmet-gateway/deploy/docker-compose-prod.yml | 2 +- epmet-gateway/pom.xml | 2 +- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- .../common-service-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- .../epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-oss/epmet-oss-server/pom.xml | 2 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- .../resi-partymember-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) 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 5c3519899e..7ae3ebc214 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.33 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.34 ports: - "8082:8082" network_mode: host # 使用现有网络 diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 5f9e8ab342..d0a9efa468 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.33 + 0.3.34 com.epmet epmet-admin diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml index 4d2ee16d95..bdc3765ddf 100644 --- a/epmet-gateway/deploy/docker-compose-prod.yml +++ b/epmet-gateway/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.72 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.73 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index edb81cc1f5..9a589e8444 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.72 + 0.3.73 com.epmet epmet-cloud 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 59c0a94070..aea7c803a4 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.113 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.114 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 0c2a67f75a..edb68c6c86 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.113 + 0.3.114 data-aggregator com.epmet 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 cf98ebb64e..f7aafbcbed 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 @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.44 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.45 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index d8e02bcacb..6790cb783d 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.44 + 0.3.45 com.epmet epmet-common-service 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 19463205a3..1398be9da1 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.77 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.78 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 7f1f461e0e..7ed9e09749 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.77 + 0.0.78 com.epmet epmet-heart 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 086b9d667a..677ee4aed5 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.50 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.51 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 4b6620ada0..16bfddb5ca 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.50 + 0.3.51 com.epmet epmet-job 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 2ae17d5c59..2e56ee2b21 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 @@ -3,7 +3,7 @@ services: epmet-oss-server: container_name: epmet-oss-server-prod # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2 - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.40 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.41 ports: - "8083:8083" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index e1aa4893b4..e29b4f1d98 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.40 + 0.3.41 com.epmet epmet-oss 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 7cd9d8a1bb..6ef1316542 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.103 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.104 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index ea8599e06c..917f96f890 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.103 + 0.3.104 gov-project com.epmet 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 354d8b1daa..7a1858d0df 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.130 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.131 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index bd232b3aac..bb072eaac2 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.130 + 0.3.131 com.epmet resi-group 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 6f9e5aabb2..1559964abb 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.84 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.85 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 500fc4408e..46981eb5d0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.84 + 0.3.85 com.epmet resi-partymember 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 6e8d5d8525..412b602616 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.246 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.247 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index d8bd604283..7554d418e3 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.246 + 0.3.247 com.epmet epmet-user From 308e79d0275167b7fdcd88170fa7769eb0d55a22 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 4 Mar 2022 17:23:57 +0800 Subject: [PATCH 121/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 2f8c37cde4..12ea8b0e5f 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.168 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.169 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index beacf36eb9..01df692d85 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.168 + 0.3.169 com.epmet gov-org From 9963b79bbb9a6c445288e42c530668a9a969affe Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 4 Mar 2022 21:09:07 +0800 Subject: [PATCH 122/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 412b602616..56c49154e3 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.247 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.248 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 7554d418e3..0e2f418ac1 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.247 + 0.3.248 com.epmet epmet-user From 60bcb328bf82e9ea79a331c7347f379f63e8d174 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 4 Mar 2022 22:38:56 +0800 Subject: [PATCH 123/391] =?UTF-8?q?=E8=B0=83=E8=AF=95=EF=BC=9A=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 56c49154e3..4892dd464c 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.248 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.249 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 0e2f418ac1..50c2700f9b 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.248 + 0.3.249 com.epmet epmet-user From b2e1cebff545cf93c63b62bd56b62f266582aae7 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 4 Mar 2022 22:59:46 +0800 Subject: [PATCH 124/391] =?UTF-8?q?=E8=B0=83=E8=AF=95=EF=BC=9A=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 4892dd464c..5deac1ee1e 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.249 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.250 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 50c2700f9b..ed5b04dc08 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.249 + 0.3.250 com.epmet epmet-user From c918c666ccf61ddb93be831eaacdc4c834e200b1 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 4 Mar 2022 23:22:42 +0800 Subject: [PATCH 125/391] =?UTF-8?q?=E8=B0=83=E8=AF=95=EF=BC=9A=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 5deac1ee1e..8173989747 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.250 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.251 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index ed5b04dc08..91da467058 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.250 + 0.3.251 com.epmet epmet-user From 8b4a873dfb529d5bf3c206e7b2db637868ee2956 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 5 Mar 2022 00:04:55 +0800 Subject: [PATCH 126/391] =?UTF-8?q?=E8=B0=83=E8=AF=95=EF=BC=9A=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 8173989747..15ff85d3b7 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.251 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.252 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 91da467058..d08248c929 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.251 + 0.3.252 com.epmet epmet-user From 599eaaed006113bac0788130c56c6c66fc5b29f8 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 5 Mar 2022 00:35:55 +0800 Subject: [PATCH 127/391] =?UTF-8?q?=E8=B0=83=E8=AF=95=EF=BC=9A=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 15ff85d3b7..8817904723 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.252 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.253 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index d08248c929..4edf078bc9 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.252 + 0.3.253 com.epmet epmet-user From 99b0f9e2ff7c2cdea45d8d8ce3610f71c8785163 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 5 Mar 2022 02:07:03 +0800 Subject: [PATCH 128/391] =?UTF-8?q?=E8=B0=83=E8=AF=95=EF=BC=9A=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- .../main/java/com/epmet/controller/IcResiUserController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 8817904723..9b5922dce9 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.253 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.254 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 4edf078bc9..b82f3b21fe 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.253 + 0.3.254 com.epmet epmet-user 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 9fd05b7f72..ba0ebba823 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 @@ -474,7 +474,7 @@ public class IcResiUserController implements ResultDataResolver { try { // 睡眠2秒钟，等待主线程先结束，主线程会清空request对象的headers，等他执行了清空之后，我们这边再手动setHeader进去 - Thread.sleep(3000l); + Thread.sleep(5000l); log.info("【上传居民信息】子线程请求头:" + headers); } catch (InterruptedException e) { String errorMsg = ExceptionUtils.getErrorStackTrace(e); From 1b72dcff998852b11836bf73468723907733648e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 5 Mar 2022 17:42:30 +0800 Subject: [PATCH 129/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 9b5922dce9..c96324908f 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.254 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.255 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index b82f3b21fe..b68a6e0596 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.254 + 0.3.255 com.epmet epmet-user From ebd8beaf55cc4d6204115cb6982c1994318ae9a7 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sun, 6 Mar 2022 00:24:43 +0800 Subject: [PATCH 130/391] =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 c96324908f..714d9bde2f 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.255 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.256 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index b68a6e0596..72cfa886fb 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.255 + 0.3.256 com.epmet epmet-user From d29558d7d1ed6798bb836fe8f8f748f66fb74a9b Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sun, 6 Mar 2022 00:48:04 +0800 Subject: [PATCH 131/391] =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 714d9bde2f..54df32f313 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.256 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.257 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 72cfa886fb..c29d01724d 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.256 + 0.3.257 com.epmet epmet-user From 1011cff022134f09f0514d1396cd7614005ead03 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sun, 6 Mar 2022 01:21:28 +0800 Subject: [PATCH 132/391] =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 12ea8b0e5f..e7e70b28d7 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.169 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.170 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 01df692d85..89854b943d 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.169 + 0.3.170 com.epmet gov-org From 85591a3e3f59f2d1ba1b26b524043327aaf37fb5 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sun, 6 Mar 2022 01:33:46 +0800 Subject: [PATCH 133/391] =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 e7e70b28d7..8ec21ca45f 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.170 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.171 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 89854b943d..a8db247771 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.170 + 0.3.171 com.epmet gov-org From 92275fc1e0392f2bea35f49fc0e3c36bbbe51f49 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sun, 6 Mar 2022 22:38:49 +0800 Subject: [PATCH 134/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 54df32f313..2a4415e182 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.257 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.258 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index c29d01724d..bad5893f6e 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.257 + 0.3.258 com.epmet epmet-user From cf24e1cd7929960eab496b7f0760cc8379a41726 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 7 Mar 2022 15:11:08 +0800 Subject: [PATCH 135/391] =?UTF-8?q?=E6=B5=8B=E8=AF=95async?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcNeighborHoodServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index 3064679e2c..6093297b5f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -71,6 +71,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -231,8 +232,9 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl importTask) { - executorService.submit(() -> { +// executorService.submit(() -> { // importNeighbor(formDTO,file,importTask); log.info("neighborhoodImport thread start====="); ExcelReader excelReader = null; @@ -264,7 +266,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl(); } From f5459c41d74e4e2da07d016c9b8abea7e47df84f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 7 Mar 2022 15:43:41 +0800 Subject: [PATCH 136/391] =?UTF-8?q?=E6=B5=8B=E8=AF=95async?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcNeighborHoodController.java | 3 +++ .../java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java | 1 + 2 files changed, 4 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java index 107b6c612e..04cb5f66aa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java @@ -40,6 +40,7 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcNeighborHoodService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -132,9 +133,11 @@ public class IcNeighborHoodController { * @date 2022/2/12 10:47 上午 */ @PostMapping("neighborhoodimport") + @Transactional(rollbackFor = Exception.class) public Result neighborhoodImport(@LoginUser TokenDto tokenDTO, @RequestParam("file") MultipartFile file, @RequestParam("orgId")String orgId, @RequestParam("orgType")String orgType) throws IOException { + log.info("地址:" + file.getResource().getURI().getPath().toString()); ImportInfoFormDTO formDTO = new ImportInfoFormDTO(); formDTO.setCustomerId(tokenDTO.getCustomerId()); formDTO.setOrgType(orgType); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index 6093297b5f..fd7651a7b5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -243,6 +243,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl Date: Mon, 7 Mar 2022 15:50:52 +0800 Subject: [PATCH 137/391] =?UTF-8?q?=E6=B5=8B=E8=AF=95async?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcNeighborHoodController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java index 04cb5f66aa..ab912450f5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java @@ -137,7 +137,6 @@ public class IcNeighborHoodController { public Result neighborhoodImport(@LoginUser TokenDto tokenDTO, @RequestParam("file") MultipartFile file, @RequestParam("orgId")String orgId, @RequestParam("orgType")String orgType) throws IOException { - log.info("地址:" + file.getResource().getURI().getPath().toString()); ImportInfoFormDTO formDTO = new ImportInfoFormDTO(); formDTO.setCustomerId(tokenDTO.getCustomerId()); formDTO.setOrgType(orgType); From 531047ad0f0b872cbd3eb2e9d7f1d59a62c66e3c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 7 Mar 2022 15:56:17 +0800 Subject: [PATCH 138/391] =?UTF-8?q?=E6=B5=8B=E8=AF=95async?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcNeighborHoodController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java index 04cb5f66aa..ab912450f5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java @@ -137,7 +137,6 @@ public class IcNeighborHoodController { public Result neighborhoodImport(@LoginUser TokenDto tokenDTO, @RequestParam("file") MultipartFile file, @RequestParam("orgId")String orgId, @RequestParam("orgType")String orgType) throws IOException { - log.info("地址:" + file.getResource().getURI().getPath().toString()); ImportInfoFormDTO formDTO = new ImportInfoFormDTO(); formDTO.setCustomerId(tokenDTO.getCustomerId()); formDTO.setOrgType(orgType); From 31cd47027aa509c8bc58ceb22bd3c01a15636b74 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 7 Mar 2022 16:41:58 +0800 Subject: [PATCH 139/391] =?UTF-8?q?=E6=B5=8B=E8=AF=95async?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcNeighborHoodController.java | 15 ++++++++++++++- .../com/epmet/service/IcNeighborHoodService.java | 3 ++- .../service/impl/IcNeighborHoodServiceImpl.java | 10 +--------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java index ab912450f5..85797b6e4a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java @@ -45,6 +45,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; +import java.io.InputStream; import java.util.List; import java.util.Map; @@ -151,7 +152,19 @@ public class IcNeighborHoodController { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"","存在进行中的导入"); } log.info("插入任务结果"+ JSON.toJSONString(importTask.getData())); - icNeighborHoodService.neighborhoodImport(formDTO,file,importTask); + InputStream inputStream = null; + try { + inputStream = file.getInputStream(); + }catch (Exception e){ + log.error("读取文件失败"); + }finally { + ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO(); + input.setOperatorId(formDTO.getUserId()); + input.setTaskId(importTask.getData().getTaskId()); + input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); + epmetCommonServiceOpenFeignClient.finishImportTask(input); + } + icNeighborHoodService.neighborhoodImport(formDTO,inputStream,importTask); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java index 1d6193834f..1f32607a65 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java @@ -31,6 +31,7 @@ import com.epmet.entity.IcPropertyManagementEntity; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; +import java.io.InputStream; import java.util.Collection; import java.util.List; import java.util.Map; @@ -129,7 +130,7 @@ public interface IcNeighborHoodService extends BaseService * @author zxc * @date 2022/2/12 11:11 上午 */ - Result neighborhoodImport(ImportInfoFormDTO formDTO, MultipartFile file,Result importTask) throws IOException; + Result neighborhoodImport(ImportInfoFormDTO formDTO, InputStream inputStream, Result importTask) throws IOException; /** * 获取导入小区，楼栋，单元ID diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index fd7651a7b5..fa0ab9072e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -233,20 +233,12 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl importTask) { + public Result neighborhoodImport(ImportInfoFormDTO formDTO, InputStream inputStream,Result importTask) { // executorService.submit(() -> { // importNeighbor(formDTO,file,importTask); log.info("neighborhoodImport thread start====="); ExcelReader excelReader = null; try { - InputStream inputStream = null; - try { - inputStream = file.getInputStream(); - } catch (IOException e) { - log.error(e.getMessage()); - throw new EpmetException("读取文件失败"); - } - excelReader = EasyExcel.read(inputStream).build(); // 这里为了简单 所以注册了 同样的head 和Listener 自己使用功能必须不同的Listener ReadSheet readSheet = EasyExcel.readSheet(0).head(NeighborHoodInfoModel.class) From e5ed3985254ae05f04dfdbe8c7d006b194bc2c2d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 7 Mar 2022 16:49:03 +0800 Subject: [PATCH 140/391] =?UTF-8?q?=E6=B5=8B=E8=AF=95async?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcNeighborHoodController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java index 85797b6e4a..df0120d0a3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java @@ -156,13 +156,12 @@ public class IcNeighborHoodController { try { inputStream = file.getInputStream(); }catch (Exception e){ - log.error("读取文件失败"); - }finally { ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO(); input.setOperatorId(formDTO.getUserId()); input.setTaskId(importTask.getData().getTaskId()); input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); epmetCommonServiceOpenFeignClient.finishImportTask(input); + log.error("读取文件失败"); } icNeighborHoodService.neighborhoodImport(formDTO,inputStream,importTask); return new Result(); From 4adc1970ccbc514c385c7ce9bbe48822be761113 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 8 Mar 2022 09:37:21 +0800 Subject: [PATCH 141/391] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8Corg=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 8ec21ca45f..fc82ce754e 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.171 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.172 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index a8db247771..d9bfd52161 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.171 + 0.3.172 com.epmet gov-org From f1cc362a5612b0522092948b32ae9fd0a7fac86a Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 8 Mar 2022 10:11:25 +0800 Subject: [PATCH 142/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 677ee4aed5..1e3f90c546 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.51 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.52 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 16bfddb5ca..d305a37285 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.51 + 0.3.52 com.epmet epmet-job From afc10b27716a394841a5f2654739e7a3e59bf44b Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 8 Mar 2022 10:58:51 +0800 Subject: [PATCH 143/391] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=92=8Cjob=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 e11c22a410..d26591fb9c 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.374 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.375 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 9b4e15fc0b..8120a3af09 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.374 + 0.3.375 data-statistical com.epmet 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 1e3f90c546..7874eef9a8 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.52 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.53 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index d305a37285..145edb4965 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.52 + 0.3.53 com.epmet epmet-job From 71f57f041738f78fb950a54191398d16d9cf1280 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 8 Mar 2022 11:08:29 +0800 Subject: [PATCH 144/391] =?UTF-8?q?heart=EF=BC=8Corg=EF=BC=8Cresi-partyMem?= =?UTF-8?q?ber=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../resi-partymember-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 1398be9da1..b0c0810154 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.78 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.79 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 7ed9e09749..3d5585e16d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.78 + 0.0.79 com.epmet epmet-heart 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 fc82ce754e..a77c6eb278 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.172 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.173 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index d9bfd52161..ea0e218353 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.172 + 0.3.173 com.epmet gov-org 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 1559964abb..c67089622b 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.85 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.86 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 46981eb5d0..dc05716f44 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.85 + 0.3.86 com.epmet resi-partymember From 1dc24ddd6a36acabed7eb6edabf931f101240242 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 8 Mar 2022 15:34:33 +0800 Subject: [PATCH 145/391] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=B4=BB=E8=B7=83?= =?UTF-8?q?=E5=BA=A6=E7=BB=9F=E8=AE=A1=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91=20=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 aea7c803a4..9f4aae1a75 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.114 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.115 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index edb68c6c86..c76a4edf78 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.114 + 0.3.115 data-aggregator com.epmet From f906496059fe72b9cfd326dfc848ea2d54a27661 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 8 Mar 2022 17:43:21 +0800 Subject: [PATCH 146/391] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 d26591fb9c..9653233c3b 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.375 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.376 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 8120a3af09..81339e8d33 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.375 + 0.3.376 data-statistical com.epmet From ec52c95ad49431e818d0242fafff0d8871593f8f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 9 Mar 2022 13:00:35 +0800 Subject: [PATCH 147/391] data-agg 116 --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 9f4aae1a75..214dea8f1e 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.115 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.116 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index c76a4edf78..23a0ccd109 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.115 + 0.3.116 data-aggregator com.epmet From b2db940e7188f201440c816304932b6820f995cc Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 9 Mar 2022 15:00:47 +0800 Subject: [PATCH 148/391] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E7=9A=84=E4=B8=89?= =?UTF-8?q?=E4=B8=AA=E8=A1=97=E9=81=93=E7=9A=84=E6=95=B0=E6=8D=AE=E5=9C=A8?= =?UTF-8?q?=E8=A1=A8=E9=87=8C=E5=90=8C=E4=B8=80=E5=A4=A9=E4=BC=9A=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E4=B8=A4=E6=9D=A1=EF=BC=8C=E4=B8=80=E6=9D=A1=E6=98=AF?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E7=9A=84=E4=B8=80=E6=9D=A1=E6=98=AF=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=BB=9F=E8=AE=A1=E7=9A=84=EF=BC=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=95=B0=E6=8D=AE=E6=97=B6=E5=88=86=E5=88=AB=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 214dea8f1e..74310cc869 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.116 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.117 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 23a0ccd109..d18c15bb0c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.116 + 0.3.117 data-aggregator com.epmet From 758e51fc65102c07c75dd7110d86ea6e05c54e13 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 9 Mar 2022 15:56:59 +0800 Subject: [PATCH 149/391] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 a77c6eb278..7cc19a1f57 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.173 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.174 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index ea0e218353..1b6069c3cd 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.173 + 0.3.174 com.epmet gov-org 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 2a4415e182..c174642b25 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.258 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.259 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index bad5893f6e..2f96d1fd4e 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.258 + 0.3.259 com.epmet epmet-user From bf80572b4603917b37e27eb30df4ceb09b040529 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 10 Mar 2022 09:43:36 +0800 Subject: [PATCH 150/391] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=9B=A0=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 c174642b25..8fbceaafd4 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.259 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.260 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 2f96d1fd4e..b5a58214b4 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.259 + 0.3.260 com.epmet epmet-user From 60450464004cc2ec650f45092313566cf93ee990 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 10 Mar 2022 09:57:37 +0800 Subject: [PATCH 151/391] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=9B=A0=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 8fbceaafd4..ad3deacfab 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.260 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.261 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index b5a58214b4..80d09c9bec 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.260 + 0.3.261 com.epmet epmet-user From 5db422cf4bc37bbbe9d8b3658904ad705f81b6e5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 10 Mar 2022 16:36:00 +0800 Subject: [PATCH 152/391] =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=B7=A1=E6=9F=A5=20?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E3=80=81=E7=BB=8F=E7=BA=AC=E5=BA=A6=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=20=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ad3deacfab..9559e5eec4 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.261 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.262 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 80d09c9bec..b2f0f6bdce 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.261 + 0.3.262 com.epmet epmet-user From c3aa7027725bcb8222404289707acf07d42f915e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 11 Mar 2022 12:15:39 +0800 Subject: [PATCH 153/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 9559e5eec4..dcf7c135b0 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.262 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.263 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index b2f0f6bdce..c5d65a6601 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.262 + 0.3.263 com.epmet epmet-user From 80d8d4ef47201a5fa9405bd0f1d25cd6770e37c3 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 11 Mar 2022 15:15:28 +0800 Subject: [PATCH 154/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 dcf7c135b0..15d827b51f 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.263 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.264 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index c5d65a6601..f4e6296397 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.263 + 0.3.264 com.epmet epmet-user From f3cf1dbe0cf1848ade8cbfdfea3a027dd2f3bf52 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 11 Mar 2022 15:19:03 +0800 Subject: [PATCH 155/391] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=B4=BB=E8=B7=83?= =?UTF-8?q?=E5=BA=A6=E4=B8=8A=E6=8A=A5=E4=BA=8B=E4=BB=B6=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E9=A1=B9=E7=9B=AE=E6=95=B0=20=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 74310cc869..dbdfa6831c 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.117 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.118 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index d18c15bb0c..c0439d48c0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.117 + 0.3.118 data-aggregator com.epmet From edd9bd3850c5d5db69d088583eb3eab66d4d8cdc Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 11 Mar 2022 16:19:35 +0800 Subject: [PATCH 156/391] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=B4=BB=E8=B7=83?= =?UTF-8?q?=E5=BA=A6=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=BA=90?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=94=B9=E6=9F=A5screen=5Fproject=5Fdata?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E8=BF=99=E4=B8=AA=E8=A1=A8=E5=B9=B3=E9=98=B4?= =?UTF-8?q?=E7=9A=84=E6=98=AF=E4=B8=89=E4=B8=AA=E8=A1=97=E9=81=93=E5=92=8C?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=95=B0=E6=8D=AE=E9=83=BD=E6=9C=89?= =?UTF-8?q?=20=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 dbdfa6831c..c983c304cb 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.118 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.119 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index c0439d48c0..9d8de4ab9d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.118 + 0.3.119 data-aggregator com.epmet From 9a8528004becbcd1395fa9568f29083a194e1524 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 14 Mar 2022 13:56:05 +0800 Subject: [PATCH 157/391] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=BD=91=E6=A0=BC=E9=A1=B9=E7=9B=AE=E7=9A=84?= =?UTF-8?q?(=E8=AE=AE=E9=A2=98=E8=BD=AC=E7=9A=84=E3=80=81=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E6=8A=A5=E7=9A=84=E3=80=81=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=91=98=E4=B8=8A=E6=8A=A5=E4=BA=8B=E4=BB=B6=E7=9A=84)?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=B8=8D=E5=9C=A8?= =?UTF-8?q?=E5=8F=AA=E6=98=AF=E7=BB=9F=E8=AE=A1=E8=AE=AE=E9=A2=98=E8=BD=AC?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=20=20=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 9653233c3b..a54ad01d75 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.376 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.377 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 81339e8d33..effd3dd671 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.376 + 0.3.377 data-statistical com.epmet From 58f1aa810e24b532715c8ede75eaff436b1eddf1 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 14 Mar 2022 14:20:55 +0800 Subject: [PATCH 158/391] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=BD=91=E6=A0=BC=E9=A1=B9=E7=9B=AE=E7=9A=84?= =?UTF-8?q?(=E8=AE=AE=E9=A2=98=E8=BD=AC=E7=9A=84=E3=80=81=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E6=8A=A5=E7=9A=84=E3=80=81=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=91=98=E4=B8=8A=E6=8A=A5=E4=BA=8B=E4=BB=B6=E7=9A=84)?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=B8=8D=E5=9C=A8?= =?UTF-8?q?=E5=8F=AA=E6=98=AF=E7=BB=9F=E8=AE=A1=E8=AE=AE=E9=A2=98=E8=BD=AC?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=20=20=20=E7=A8=8B=E5=BA=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 a54ad01d75..3c0216c9df 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.377 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.378 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index effd3dd671..35880e461c 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.377 + 0.3.378 data-statistical com.epmet From 3bb1c31723217eb49122db274e3453ca90bf0d3a Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 14 Mar 2022 14:47:12 +0800 Subject: [PATCH 159/391] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A1=E6=9F=A5?= =?UTF-8?q?=E9=94=81=E6=9C=BA=E5=88=B6=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 bc90323bc3..200e156ad8 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.22 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.23 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index f5e8264f49..fa334df6f0 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.22 + 0.3.23 open-data-worker com.epmet From d84a512c55136b6efaa004facd6a29787f148b47 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 15 Mar 2022 09:54:05 +0800 Subject: [PATCH 160/391] =?UTF-8?q?=E4=B8=B4=E6=97=B6=20=E5=8A=A0=E5=A4=A7?= =?UTF-8?q?feign=E6=A0=B8=E5=BF=83=E7=BA=BF=E7=A8=8B=E6=95=B0=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 200e156ad8..7ab501cb12 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.23 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.24 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index fa334df6f0..9c58bf926b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.23 + 0.3.24 open-data-worker com.epmet From 515c1ed230ef44a4734663855b10a03b5684d299 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 15 Mar 2022 10:54:11 +0800 Subject: [PATCH 161/391] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8B=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 7ab501cb12..dc5ec600b0 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.24 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.25 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index 9c58bf926b..d24e406d41 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.24 + 0.3.25 open-data-worker com.epmet From 6d7ae178b47eb6e8ba9c86bd86e1bad47f6f7985 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 15 Mar 2022 11:06:12 +0800 Subject: [PATCH 162/391] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8B=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 3c0216c9df..06a476d26c 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.378 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.379 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 35880e461c..84f95041b6 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.378 + 0.3.379 data-statistical com.epmet 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 dc5ec600b0..510a0d8b4b 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.25 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.26 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index d24e406d41..0c72226ccf 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.25 + 0.3.26 open-data-worker com.epmet From 6f79b119f9bf3670b017e3bc43180f651a97ca23 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 15 Mar 2022 14:42:25 +0800 Subject: [PATCH 163/391] =?UTF-8?q?=E4=BF=AE=E6=94=B9hystrix=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E6=B1=A0=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 510a0d8b4b..24d098199f 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.26 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.27 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index 0c72226ccf..70d2091e2a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.26 + 0.3.27 open-data-worker com.epmet From 37ee5a95c9cdd4aea5c57b1fea015ec0d5526e9b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 16 Mar 2022 10:48:51 +0800 Subject: [PATCH 164/391] =?UTF-8?q?mq=E5=8F=82=E6=95=B0bug=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 24d098199f..de9f7d5ddd 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.27 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.28 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index 70d2091e2a..d765e5b67f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.27 + 0.3.28 open-data-worker com.epmet From dc53cac5df4d313ed46b7b091ad6615825dc62bb Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 16 Mar 2022 14:42:46 +0800 Subject: [PATCH 165/391] =?UTF-8?q?=E7=BB=84=E7=BB=87=E3=80=81=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E4=B8=AD=E4=BB=8B?= =?UTF-8?q?=E5=BA=93=E8=A1=A8=E5=AD=97=E6=AE=B5=E5=8F=98=E5=8A=A8=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 de9f7d5ddd..37ab4799a4 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.28 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.29 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index d765e5b67f..19a82db40e 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.28 + 0.3.29 open-data-worker com.epmet From f37a687a03cd753c9d95215460e06a156072517c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 16 Mar 2022 15:32:34 +0800 Subject: [PATCH 166/391] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20agg=20project=20?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 c983c304cb..a0aaecc7ff 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.119 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.120 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 9d8de4ab9d..5690684478 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.119 + 0.3.120 data-aggregator com.epmet 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 06a476d26c..e88de73821 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.379 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.380 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 84f95041b6..be32ee76fb 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.379 + 0.3.380 data-statistical com.epmet 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 6ef1316542..b1db913ff6 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.104 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.105 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 917f96f890..ec853dd834 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.104 + 0.3.105 gov-project com.epmet From b53272d6c96e322fe12e27959aee4f60d9ed0bc3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 16 Mar 2022 17:51:56 +0800 Subject: [PATCH 167/391] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=BF=85=E9=A1=BB=E5=85=A8=E5=B9=B2=E6=8E=89=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-access/gov-access-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-access/gov-access-server/pom.xml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 f277e420a2..3dbf1c2715 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.64 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.65 ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index a14775da5d..44f6b89329 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.64 + 0.3.65 gov-access com.epmet 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 7cc19a1f57..d684031980 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.174 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.175 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 1b6069c3cd..f5696e5076 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.174 + 0.3.175 com.epmet gov-org From 66c76d242c51bc9b8ffb902310b7d6aa0b1afdbe Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 17 Mar 2022 10:11:07 +0800 Subject: [PATCH 168/391] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E5=85=88=E6=B5=8B?= =?UTF-8?q?=E6=B5=8B=E7=A8=8B=E5=BA=8F=20=E7=A8=B3=E5=AE=9A=E5=90=8E=20?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=81=9C=E7=94=A8=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 37ab4799a4..f0254a5fac 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.29 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.30 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index 19a82db40e..ffda46337d 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.29 + 0.3.30 open-data-worker com.epmet From 4fa4a78c688b62ca09e46c693c66f01529ac5150 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 17 Mar 2022 16:45:52 +0800 Subject: [PATCH 169/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- .../oper-customize-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- .../resi-partymember-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) 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 a0aaecc7ff..bde2076706 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.120 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.121 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 5690684478..2b8d740b6d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.120 + 0.3.121 data-aggregator com.epmet 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 b0c0810154..fbb03f7447 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.79 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.80 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 5796b5ae67..e2532bb2eb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.79 + 0.0.80 com.epmet epmet-heart 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 81a54b0d15..b202536171 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 @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.69 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.70 ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 2b802b20f2..a7b019b77a 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.69 + 0.3.70 com.epmet oper-customize 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 c67089622b..2f8ef3a589 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.86 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.87 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index fb9de18a33..264c113346 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.86 + 0.3.87 com.epmet resi-partymember 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 15d827b51f..7c4173122c 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.264 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.265 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index f4e6296397..3bc09014a2 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.264 + 0.3.265 com.epmet epmet-user From 9b0d2eb78cdf253ecb1e9fd23186ef1449efc316 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 17 Mar 2022 19:09:21 +0800 Subject: [PATCH 170/391] user_reg_grid_change_rec --- .../commons/tools/feign/CommonAggFeignClient.java | 10 ---------- .../feign/fallback/CommonAggFeignClientFallback.java | 6 ------ 2 files changed, 16 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java index cb7146138d..abcc6fc90b 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java @@ -5,7 +5,6 @@ import com.epmet.commons.tools.feign.fallback.CommonAggFeignClientFallBackFactor import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache; -import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.Result; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PathVariable; @@ -39,15 +38,6 @@ public interface CommonAggFeignClient { @PostMapping("/data/aggregator/org/agency") Result getAgencyInfo(@RequestParam("agencyId")String agencyId); - /** - * @Description 查询网格信息 - * @param gridId - * @author zxc - * @date 2021/11/5 2:54 下午 - */ - @PostMapping("/data/aggregator/org/grid") - Result getGridInfo(@RequestParam("gridId")String gridId); - /** * 查询楼栋信息 * @param buildingId diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java index 8d6f5f1260..4aff62f235 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java @@ -5,7 +5,6 @@ import com.epmet.commons.tools.feign.CommonAggFeignClient; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache; -import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import org.springframework.stereotype.Component; @@ -29,11 +28,6 @@ public class CommonAggFeignClientFallback implements CommonAggFeignClient { return ModuleUtils.feignConError(ServiceConstant.DATA_AGGREGATOR_SERVER, "getAgencyInfo", agencyId); } - @Override - public Result getGridInfo(String gridId) { - return ModuleUtils.feignConError(ServiceConstant.DATA_AGGREGATOR_SERVER, "getGridInfo", gridId); - } - /** * 查询楼栋信息 * From 23a6a270c0b13e17dd852f9e1328d2566c80f4f6 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 17 Mar 2022 21:20:04 +0800 Subject: [PATCH 171/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-customize-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 b202536171..7cbba06ddb 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 @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.70 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.71 ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index a7b019b77a..1350acea7a 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.70 + 0.3.71 com.epmet oper-customize 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 7c4173122c..b1b5b625cc 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.265 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.266 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 3bc09014a2..dd43749d86 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.265 + 0.3.266 com.epmet epmet-user From 884886345c9122f0476ba31558e43e2952296844 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 17 Mar 2022 21:20:57 +0800 Subject: [PATCH 172/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 d684031980..d5578ca509 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.175 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.176 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index f5696e5076..3ad065da50 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.175 + 0.3.176 com.epmet gov-org From 2be021e1a411fe41620c450f0b8e358b2313476b Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 17 Mar 2022 22:23:29 +0800 Subject: [PATCH 173/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml | 2 +- epmet-admin/epmet-admin-server/pom.xml | 2 +- epmet-auth/deploy/docker-compose-prod.yml | 2 +- epmet-auth/pom.xml | 2 +- epmet-gateway/deploy/docker-compose-prod.yml | 2 +- epmet-gateway/pom.xml | 2 +- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../common-service-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +- .../epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-ext/epmet-ext-server/pom.xml | 2 +- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- .../epmet-message-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-message/epmet-message-server/pom.xml | 2 +- .../epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-oss/epmet-oss-server/pom.xml | 2 +- .../epmet-point-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- .../epmet-third-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- .../gov-access/gov-access-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-access/gov-access-server/pom.xml | 2 +- .../gov-grid/gov-grid-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- .../gov-mine/gov-mine-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-mine/gov-mine-server/pom.xml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- .../gov-voice/gov-voice-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-voice/gov-voice-server/pom.xml | 2 +- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- .../oper-access-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/oper-access/oper-access-server/pom.xml | 2 +- .../oper-crm/oper-crm-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +- .../oper-customize-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- .../resi-guide/resi-guide-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-guide/resi-guide-server/pom.xml | 2 +- .../resi-hall/resi-hall-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-hall/resi-hall-server/pom.xml | 2 +- .../resi-home/resi-home-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-home/resi-home-server/pom.xml | 2 +- .../resi-mine/resi-mine-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-mine/resi-mine-server/pom.xml | 2 +- .../resi-partymember-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- .../resi-voice/resi-voice-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-voice/resi-voice-server/pom.xml | 2 +- epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml | 2 +- epmet-openapi/epmet-openapi-scan/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 68 files changed, 68 insertions(+), 68 deletions(-) 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 7ae3ebc214..2bfca948d7 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.34 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.35 ports: - "8082:8082" network_mode: host # 使用现有网络 diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index d0a9efa468..164c8818ee 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.34 + 0.3.35 com.epmet epmet-admin diff --git a/epmet-auth/deploy/docker-compose-prod.yml b/epmet-auth/deploy/docker-compose-prod.yml index 45c901edbc..c8042aa3d6 100644 --- a/epmet-auth/deploy/docker-compose-prod.yml +++ b/epmet-auth/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.99 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.100 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 0096ef714b..ecbc653143 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.99 + 0.3.100 com.epmet epmet-cloud diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml index bdc3765ddf..1721be2076 100644 --- a/epmet-gateway/deploy/docker-compose-prod.yml +++ b/epmet-gateway/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.73 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.74 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 9a589e8444..e030ee59db 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.73 + 0.3.74 com.epmet epmet-cloud 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 bde2076706..bf9a65c258 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.121 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.122 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 2b8d740b6d..fcda33f71b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.121 + 0.3.122 data-aggregator com.epmet 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 ee50f1da47..0dabcb7780 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.213 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.214 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 105d9253b4..02ad0b512b 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.213 + 0.3.214 data-report-server 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 e88de73821..36720e49ad 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.380 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.381 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index be32ee76fb..428d6caff9 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.380 + 0.3.381 data-statistical com.epmet 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 f7aafbcbed..f19959e448 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 @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.45 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.46 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 6790cb783d..400a0e8bd2 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.45 + 0.3.46 com.epmet epmet-common-service 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 caa3059dad..c49297d330 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-ext-server: container_name: epmet-ext-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.20 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.21 ports: - "8113:8113" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index c7c3165af0..2e8fd3eb4d 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.20 + 0.0.21 com.epmet 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 fbb03f7447..e50ad20a74 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.80 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.81 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index e2532bb2eb..6c28a40408 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.80 + 0.0.81 com.epmet epmet-heart 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 7874eef9a8..4c14a38013 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.53 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.54 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 145edb4965..fc5373ffa4 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.53 + 0.3.54 com.epmet epmet-job 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 01efd03422..fcaf50a13b 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.57 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.58 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 2bef421caa..d0612f54c3 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.57 + 0.3.58 com.epmet epmet-message 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 2e56ee2b21..ae654f9f6c 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 @@ -3,7 +3,7 @@ services: epmet-oss-server: container_name: epmet-oss-server-prod # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2 - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.41 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.42 ports: - "8083:8083" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index e29b4f1d98..52fe8232f5 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.41 + 0.3.42 com.epmet epmet-oss 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 d4ea51ca74..62494e585f 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.63 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.64 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 2dcda97101..c4ba5c5eec 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.0.63 + 0.0.64 epmet-point com.epmet 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 7a2eb84297..33a0eab70b 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.183 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.184 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index a319b011d2..3489234f42 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.183 + 0.0.184 com.epmet 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 3dbf1c2715..3c70edba36 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.65 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.66 ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 44f6b89329..f2c316e2b2 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.65 + 0.3.66 gov-access com.epmet 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 8401604cf7..43ed770522 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:0.3.49 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:0.3.50 ports: - "8097:8097" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 5a7686b00c..2bf2f0c36a 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.49 + 0.3.50 com.epmet gov-grid 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 d6863c04aa..eee0279887 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.103 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.104 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 6e567dad14..22379d5ff8 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.103 + 0.3.104 gov-issue com.epmet 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 9e3c87d67b..efe627aa32 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-mine-server: container_name: gov-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.47 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.48 ports: - "8098:8098" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index 22c67633ee..5824180535 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.47 + 0.3.48 com.epmet gov-mine 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 d5578ca509..454a0a87f9 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.176 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.177 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 3ad065da50..907abd848a 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.176 + 0.3.177 com.epmet gov-org 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 b1db913ff6..bea9c18c2a 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.105 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.106 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index ec853dd834..0a5c60fbd2 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.105 + 0.3.106 gov-project com.epmet 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 d5a6908cd6..14af493b77 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.78 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.79 ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index acee6a8306..efbfd5972f 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.78 + 0.3.79 gov-voice com.epmet 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 f0254a5fac..72bd6309e0 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.30 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.31 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index ffda46337d..ffdb4111be 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.30 + 0.3.31 open-data-worker com.epmet 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 2d0c1631c4..6946402d7a 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 @@ -2,7 +2,7 @@ version: "3.7" services: oper-access-server: container_name: oper-access-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:0.3.24 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:0.3.25 ports: - "8093:8093" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 0089943bf7..f9a1dae768 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.24 + 0.3.25 oper-access com.epmet 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 c670fb8d23..d32f2a132f 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 @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.88 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.89 ports: - "8090:8090" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 493dc1c3c6..cf05318c5c 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.88 + 0.3.89 com.epmet oper-crm 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 7cbba06ddb..ccbb6506f4 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 @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.71 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.72 ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 1350acea7a..5e6fd306d9 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.71 + 0.3.72 com.epmet oper-customize 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 7a1858d0df..8db2210515 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.131 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.132 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index bb072eaac2..996f76418e 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.131 + 0.3.132 com.epmet resi-group 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 0405bc5164..ac405a2ed5 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.34 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.35 ports: - "8091:8091" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index f1ca66e4fe..d91ec026ef 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.34 + 0.3.35 com.epmet resi-guide 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 49ae802a5e..e2be8c346b 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.38 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.39 ports: - "8100:8100" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index daacaf5bcd..81f5589cb1 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.38 + 0.3.39 resi-hall com.epmet 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 c0fa5fdde2..2854c1ff95 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-home-server: container_name: resi-home-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.24 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.25 ports: - "8104:8104" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 0f2f928d86..fffd8bcedf 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.24 + 0.3.25 resi-home 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 98ef0ddad1..83e1e72813 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.54 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.55 ports: - "8094:8094" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index b2ebcfe1b7..5f1ad1d554 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.54 + 0.3.55 com.epmet resi-mine 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 2f8ef3a589..9b9a683885 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.87 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.88 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 264c113346..ad6ff19910 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.87 + 0.3.88 com.epmet resi-partymember 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 ed0013dad4..0617256e21 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-voice-server: container_name: resi-voice-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-voice-server:0.3.12 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-voice-server:0.3.13 ports: - "8106:8106" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index ae4858bceb..c3a22b9347 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.12 + 0.3.13 resi-voice com.epmet 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 65332ec821..c7db6ac382 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-openapi-scan: container_name: epmet-openapi-scan-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.33 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.34 ports: - "8107:8107" network_mode: host # 不会创建新的网络 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index 3eae37a4e1..b6fab98b41 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.33 + 0.3.34 epmet-openapi-scan jar 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 b1b5b625cc..cd13de26c6 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.266 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.267 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index dd43749d86..7362e1038a 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.266 + 0.3.267 com.epmet epmet-user From 3f4e8a95b0d24d0bee657eecf715cb96003a6645 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Mar 2022 14:19:06 +0800 Subject: [PATCH 174/391] =?UTF-8?q?=E5=A4=9A=E4=BA=86=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/src/main/resources/bootstrap.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 493796923f..17168a52b0 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -526,10 +526,7 @@ epmet: - /data/stats/plugins/ofs/** - /data/stats/plugins/workrecord/** - /epmetuser/staffrole/getGridStaffList #py获取网格员 网格长 - #查询楼栋，单元，房屋 - - /gov/org/icbuilding/buildingoption - - /gov/org/icbuildingunit/unitoption - - /gov/org/ichouse/houseoption + # 对外开放接口认证白名单 externalAuthUrlsWhiteList: From 80efeaadf34766e55acd71865cb9ba11d7a4db0e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Mar 2022 14:21:38 +0800 Subject: [PATCH 175/391] =?UTF-8?q?=E5=86=85=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/src/main/resources/bootstrap.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 17168a52b0..a5a7127cdd 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -499,7 +499,10 @@ epmet: - /oper/customize/customerstartpage/homestartpage - /epmet/point/mqCallback/** - /tduck-api/** - + #查询楼栋，单元，房屋 + - /gov/org/icbuilding/buildingoption + - /gov/org/icbuildingunit/unitoption + - /gov/org/ichouse/houseoption # 外部应用认证，使用AccessToken等头进行认证 externalOpenUrls: - /data/report/** @@ -531,10 +534,6 @@ epmet: # 对外开放接口认证白名单 externalAuthUrlsWhiteList: - /epmet/ext/open-api/get-access-token - #查询楼栋，单元，房屋 - - /gov/org/icbuilding/buildingoption - - /gov/org/icbuildingunit/unitoption - - /gov/org/ichouse/houseoption swaggerUrls: jwt: From 82a51dea33b208848d00b2bcd85e397bae129c19 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 18 Mar 2022 19:02:56 +0800 Subject: [PATCH 176/391] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=B8=AD=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/StatsResiWarnServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 26da3f073d..e19cedb81c 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 @@ -376,7 +376,7 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService { continue; } String categoryName = StringUtils.isBlank(configMap.get(dto.getConfigId())) ? StrConstant.EPMETY_STR : configMap.get(dto.getConfigId()); - dto.setNoticeContent(String.format("%s%s%s%s超出预警!", infoCache.getGridName(), infoCache.getNeighborHoodName(), infoCache.getBuildingName(), categoryName)); + dto.setNoticeContent(String.format("%s%s%s【%s】超出预警！", infoCache.getGridName(), infoCache.getNeighborHoodName(), infoCache.getBuildingName(), categoryName)); resList.add(dto); } return resList; From a63dca3bf8fede9f88d8b52df4b18fb0798cde9c Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 18 Mar 2022 19:08:02 +0800 Subject: [PATCH 177/391] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=B8=AD=E6=96=87up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 cd13de26c6..a9a91bf5fd 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.267 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.268 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 7362e1038a..fca7487177 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.267 + 0.3.268 com.epmet epmet-user From 5c763bd064cd68bba8a383b386bdb666995b67cf Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 18 Mar 2022 21:56:12 +0800 Subject: [PATCH 178/391] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=8F=8F=E8=BF=B0up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 a9a91bf5fd..9855f3ec6a 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.268 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.269 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index fca7487177..512c9c89de 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.268 + 0.3.269 com.epmet epmet-user From 9b13c33f6f4290f4ed264f40b2e048b65cc73e88 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 19 Mar 2022 16:19:26 +0800 Subject: [PATCH 179/391] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=8A=E7=BA=BF=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-prod.yml | 2 +- epmet-gateway/pom.xml | 2 +- .../deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- .../db/migration/V0.0.25__caiji_resi.sql | 42 +++++++++++++++++++ 7 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.25__caiji_resi.sql diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml index 1721be2076..b205c7fd84 100644 --- a/epmet-gateway/deploy/docker-compose-prod.yml +++ b/epmet-gateway/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.74 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.75 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index e030ee59db..eba1f2ebee 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.74 + 0.3.75 com.epmet epmet-cloud 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 454a0a87f9..205a4f1a76 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.177 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.178 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 907abd848a..95a9e55250 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.177 + 0.3.178 com.epmet gov-org 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 9855f3ec6a..9e7579de67 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.269 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.270 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 512c9c89de..c0f4f6af97 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.269 + 0.3.270 com.epmet epmet-user diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.25__caiji_resi.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.25__caiji_resi.sql new file mode 100644 index 0000000000..e015975efa --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.25__caiji_resi.sql @@ -0,0 +1,42 @@ +CREATE TABLE `ic_resi_collect` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id', + `ORIGIN` varchar(32) NOT NULL COMMENT '内部：internal；外部：external。', + `GRID_ID` varchar(64) DEFAULT NULL COMMENT '网格ID', + `AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '组织Id', + `PIDS` varchar(255) DEFAULT NULL COMMENT '组织的pids', + `VILLAGE_ID` varchar(64) DEFAULT NULL COMMENT '所属小区ID；', + `BUILD_ID` varchar(64) DEFAULT NULL COMMENT '所属楼宇Id', + `UNIT_ID` varchar(64) DEFAULT NULL COMMENT '单元id', + `HOME_ID` varchar(64) DEFAULT NULL COMMENT '所属家庭Id', + `ADDRESS` varchar(255) NOT NULL COMMENT '详细地址', + `HOUSE_TYPE` varchar(1) NOT NULL COMMENT '1自由0租住', + `HOUSE_HOLDER_NAME` varchar(32) NOT NULL COMMENT '户主姓名', + `TOTAL_RESI` int(11) NOT NULL COMMENT '居住成员人数', + `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='居民信息采集表'; + + +CREATE TABLE `ic_resi_member` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id', + `IC_RESI_COLLECT_ID` varchar(64) NOT NULL COMMENT 'ic_resi_colllect.id', + `NAME` varchar(32) NOT NULL COMMENT '居住成员1姓名', + `ID_NUM` varchar(32) NOT NULL COMMENT '居住成员1身份证号', + `MOBILE` varchar(32) NOT NULL COMMENT '居住成员1手机号', + `HE_SUAN_COUNT` varchar(32) NOT NULL COMMENT '居住成员1是否参加几轮全员核算检测，数字1-10', + `YMJZ` int(11) NOT NULL COMMENT '居住成员1新冠疫苗接种情况;1:已全程接种；2：未全程接种；0未接种；', + `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='居民信息成员表'; \ No newline at end of file From 8905299ebd5d79f5009b8b89fdce8d17c1eb2a42 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 19 Mar 2022 17:27:22 +0800 Subject: [PATCH 180/391] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=8A=E7=BA=BF=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-prod.yml | 2 +- epmet-gateway/pom.xml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml index b205c7fd84..834efaf9d7 100644 --- a/epmet-gateway/deploy/docker-compose-prod.yml +++ b/epmet-gateway/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.75 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.76 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index eba1f2ebee..988a4c4708 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.75 + 0.3.76 com.epmet epmet-cloud 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 205a4f1a76..cef2fa7c98 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.178 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.179 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 95a9e55250..0c4574dfd7 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.178 + 0.3.179 com.epmet gov-org 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 9e7579de67..a4f61d5f49 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.270 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.271 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index c0f4f6af97..56bfe97a52 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.270 + 0.3.271 com.epmet epmet-user From f8a8e2b09d75d1964665e95bc3b459ebfff3a2a4 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 19 Mar 2022 17:36:46 +0800 Subject: [PATCH 181/391] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=8A=E7=BA=BF=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- .../db/migration/V0.0.26__caiji_resi.sql | 42 ------------------- 3 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.26__caiji_resi.sql 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 a4f61d5f49..2e68ba8b1e 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.271 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.272 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 56bfe97a52..3197b68e07 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.271 + 0.3.272 com.epmet epmet-user diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.26__caiji_resi.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.26__caiji_resi.sql deleted file mode 100644 index e015975efa..0000000000 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.26__caiji_resi.sql +++ /dev/null @@ -1,42 +0,0 @@ -CREATE TABLE `ic_resi_collect` ( - `ID` varchar(64) NOT NULL COMMENT '主键', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id', - `ORIGIN` varchar(32) NOT NULL COMMENT '内部：internal；外部：external。', - `GRID_ID` varchar(64) DEFAULT NULL COMMENT '网格ID', - `AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '组织Id', - `PIDS` varchar(255) DEFAULT NULL COMMENT '组织的pids', - `VILLAGE_ID` varchar(64) DEFAULT NULL COMMENT '所属小区ID；', - `BUILD_ID` varchar(64) DEFAULT NULL COMMENT '所属楼宇Id', - `UNIT_ID` varchar(64) DEFAULT NULL COMMENT '单元id', - `HOME_ID` varchar(64) DEFAULT NULL COMMENT '所属家庭Id', - `ADDRESS` varchar(255) NOT NULL COMMENT '详细地址', - `HOUSE_TYPE` varchar(1) NOT NULL COMMENT '1自由0租住', - `HOUSE_HOLDER_NAME` varchar(32) NOT NULL COMMENT '户主姓名', - `TOTAL_RESI` int(11) NOT NULL COMMENT '居住成员人数', - `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', - `REVISION` int(11) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='居民信息采集表'; - - -CREATE TABLE `ic_resi_member` ( - `ID` varchar(64) NOT NULL COMMENT '主键', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id', - `IC_RESI_COLLECT_ID` varchar(64) NOT NULL COMMENT 'ic_resi_colllect.id', - `NAME` varchar(32) NOT NULL COMMENT '居住成员1姓名', - `ID_NUM` varchar(32) NOT NULL COMMENT '居住成员1身份证号', - `MOBILE` varchar(32) NOT NULL COMMENT '居住成员1手机号', - `HE_SUAN_COUNT` varchar(32) NOT NULL COMMENT '居住成员1是否参加几轮全员核算检测，数字1-10', - `YMJZ` int(11) NOT NULL COMMENT '居住成员1新冠疫苗接种情况;1:已全程接种；2：未全程接种；0未接种；', - `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', - `REVISION` int(11) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='居民信息成员表'; \ No newline at end of file From 1d910323c2bbc31d4783fb5b6c1915275c29bd34 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 19 Mar 2022 17:45:15 +0800 Subject: [PATCH 182/391] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E4=B8=BAopen=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 cef2fa7c98..bb6f35835d 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.179 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.180 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 0c4574dfd7..7db911cc20 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.179 + 0.3.180 com.epmet gov-org From 30601f5d8a0a5c8d0d5bf8b06de79035b1c31b76 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 19 Mar 2022 19:27:09 +0800 Subject: [PATCH 183/391] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E5=B9=B6=E8=AE=BE=E7=BD=AE=E6=96=87=E5=AD=97=E9=97=B4?= =?UTF-8?q?=E8=B7=9D=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 bb6f35835d..55284ead04 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.180 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.181 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 7db911cc20..bec4c7f974 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.180 + 0.3.181 com.epmet gov-org From 0a7cc6ef5b5c26a4ab3e16a78f5af6996ba20983 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 21 Mar 2022 10:31:07 +0800 Subject: [PATCH 184/391] =?UTF-8?q?user=20273=E6=88=90=E5=91=98=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 2e68ba8b1e..fc1d58fe70 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.272 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.273 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 3197b68e07..673a3270b4 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.272 + 0.3.273 com.epmet epmet-user From 4415b21d59cb0cec673e57a289c1c66f8a963c84 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 21 Mar 2022 17:43:10 +0800 Subject: [PATCH 185/391] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 36720e49ad..a10e904e16 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.381 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.382 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 428d6caff9..9c8296ac5d 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.381 + 0.3.382 data-statistical com.epmet From 53337ebea668ce42146b880939d58c3d31caa535 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 22 Mar 2022 11:26:28 +0800 Subject: [PATCH 186/391] =?UTF-8?q?govorg,user=EF=BC=9A=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E9=87=87=E9=9B=86=E5=B1=85=E6=B0=91=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 55284ead04..5cdf678238 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.181 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.182 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index bec4c7f974..a29e31d739 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.181 + 0.3.182 com.epmet gov-org 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 fc1d58fe70..579623d55a 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.273 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.274 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 673a3270b4..cfd57334af 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.273 + 0.3.274 com.epmet epmet-user From 361a39582940f6895fe918d1d26b07bfc439271a Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 22 Mar 2022 15:32:22 +0800 Subject: [PATCH 187/391] =?UTF-8?q?=E4=B9=A6=E8=AE=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 bea9c18c2a..f737b25d0e 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.106 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.107 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index edd928396d..d1ef8e9a71 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.106 + 0.3.107 gov-project com.epmet From cb79fefb5fea46c38ecefd85d782ed365aaa809d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 22 Mar 2022 16:56:18 +0800 Subject: [PATCH 188/391] =?UTF-8?q?=E5=BF=98=E4=BA=86=E6=94=B9=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 5cdf678238..179306c5b3 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.182 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.183 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index a29e31d739..08982e67df 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.182 + 0.3.183 com.epmet gov-org 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 579623d55a..697ebbb424 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.274 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.275 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index cfd57334af..d1908b105e 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.274 + 0.3.275 com.epmet epmet-user From ff94332af370d3a5c88ad62c6a1b5eb6a965685e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 22 Mar 2022 17:43:22 +0800 Subject: [PATCH 189/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 33a0eab70b..923d7acada 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.184 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.185 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 3489234f42..e5d38357ba 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.184 + 0.0.185 com.epmet From 1153a0e568071f8dd9f393420f55ff7ed0aa263d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 23 Mar 2022 15:02:57 +0800 Subject: [PATCH 190/391] =?UTF-8?q?/gov/org/agency/editagency=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AFbugfix=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 179306c5b3..8c3b50b9bb 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.183 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.184 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 08982e67df..2849cfd7c3 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.183 + 0.3.184 com.epmet gov-org From 8c841f1a3412191a17bd07d21edda83f92653bea Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 23 Mar 2022 15:24:41 +0800 Subject: [PATCH 191/391] =?UTF-8?q?/gov/org/agency/editagency=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AFbugfix2=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 8c3b50b9bb..caa885a919 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.184 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.185 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 2849cfd7c3..e7ede41a8c 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.184 + 0.3.185 com.epmet gov-org From 6841aa32b281bc1a2c514c04bbc19c9af5213f98 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 23 Mar 2022 18:01:01 +0800 Subject: [PATCH 192/391] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=88=BF=E9=97=B4?= =?UTF-8?q?=E6=8A=A5=E9=94=99=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 55284ead04..5cdf678238 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.181 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.182 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index bec4c7f974..a29e31d739 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.181 + 0.3.182 com.epmet gov-org From 65956b71c22e29e8748474ebf3bf7ebccbbaf8db Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 24 Mar 2022 12:30:55 +0800 Subject: [PATCH 193/391] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E4=BA=BA=E5=A4=A7?= =?UTF-8?q?=E4=BB=A3=E8=A1=A8=E5=92=8C=E6=8A=A5=E7=BB=99=E7=BB=84=E7=BB=87?= =?UTF-8?q?=EF=BC=8Cpids=E8=B0=83=E6=95=B4=20resi-home=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-home/resi-home-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-home/resi-home-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 2854c1ff95..16202a6ba4 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-home-server: container_name: resi-home-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.25 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.26 ports: - "8104:8104" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index fffd8bcedf..d43d8cae62 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.25 + 0.3.26 resi-home From 67318a02efd6d045141b1bfbb61d80c6e48c7d90 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 24 Mar 2022 16:05:25 +0800 Subject: [PATCH 194/391] =?UTF-8?q?feign=20trix=E9=85=8D=E7=BD=AE=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E6=B1=A0=E5=8F=82=E6=95=B0=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 697ebbb424..07bc4422f9 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.275 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.276 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index d1908b105e..2a820d978b 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.275 + 0.3.276 com.epmet epmet-user From 37e392bc2c3adad03243dd7e8bf99e8dc802de6f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 24 Mar 2022 21:41:57 +0800 Subject: [PATCH 195/391] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99fly?= =?UTF-8?q?way?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql deleted file mode 100644 index 28ae0153da..0000000000 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql +++ /dev/null @@ -1,2 +0,0 @@ --- 修改所属家庭项label为户号 -update ic_form_item set LABEL='户号' where LABEL='所属家庭'; \ No newline at end of file From edbf11a78f96a944de6d28800b960a43b85f0ba1 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 25 Mar 2022 12:23:04 +0800 Subject: [PATCH 196/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7=20?= =?UTF-8?q?=E6=B5=8B=E8=AF=95compose=E6=96=87=E4=BB=B6=E5=8F=96=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c839bb22b4..37bbb7c4d2 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-oss-server: container_name: epmet-oss-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.40 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.41 ports: - "8083:8083" network_mode: host # 使用现有网络 From 185c19bf235043f5b1a727260c53895f4bcb5560 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 25 Mar 2022 12:26:00 +0800 Subject: [PATCH 197/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7=20?= =?UTF-8?q?=E6=B5=8B=E8=AF=95compose=E6=96=87=E4=BB=B6=E5=8F=96=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 37bbb7c4d2..f9f9466e4c 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-oss-server: container_name: epmet-oss-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.41 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.43 ports: - "8083:8083" network_mode: host # 使用现有网络 From a8a0154bd547e5c6649d8dcb39f7cf39ecda06fc Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 25 Mar 2022 14:08:39 +0800 Subject: [PATCH 198/391] emm --- .../src/main/java/com/epmet/dto/ImportGeneralDTO.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index ac3316379f..1d4419e661 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -138,8 +138,6 @@ public class ImportGeneralDTO implements Serializable { private Boolean existStatus = false; - private Boolean addStatus = false; - /** * 错误信息添加状态 */ From 670ebd4913ebe1d9d38f8f946b74776ae7a875d3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 25 Mar 2022 15:40:34 +0800 Subject: [PATCH 199/391] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ser_reg_grid_rec.sql => V0.0.26__create_user_reg_grid_rec.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.25__create_user_reg_grid_rec.sql => V0.0.26__create_user_reg_grid_rec.sql} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.25__create_user_reg_grid_rec.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.26__create_user_reg_grid_rec.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.25__create_user_reg_grid_rec.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.26__create_user_reg_grid_rec.sql From a0eb799770f68b9a246e6be1f1e047b48c182c58 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 25 Mar 2022 15:50:36 +0800 Subject: [PATCH 200/391] =?UTF-8?q?=E5=BA=9F=E5=BC=83=E7=BD=91=E6=A0=BC+?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=AF=BC=E5=85=A5+=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=B0=83=E6=95=B4=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- .../oper-customize-server/deploy/docker-compose-prod.yml | 2 +- .../resi-guide/resi-guide-server/deploy/docker-compose-prod.yml | 2 +- .../resi-mine/resi-mine-server/deploy/docker-compose-prod.yml | 2 +- .../resi-partymember-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) 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 bf9a65c258..d959a2bb91 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.122 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.123 ports: - "8114:8114" network_mode: host # 使用现有网络 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 a10e904e16..d1d35c0610 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.382 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.383 ports: - "8108:8108" network_mode: host # 使用现有网络 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 eee0279887..e50b3e4e6d 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.104 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.105 ports: - "8101:8101" network_mode: host # 使用现有网络 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 0334f71436..c54015caa5 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.186 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.187 ports: - "8092:8092" network_mode: host # 使用现有网络 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 f737b25d0e..9a3e35ef8b 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.107 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.108 ports: - "8102:8102" network_mode: host # 使用现有网络 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 ccbb6506f4..baa1724035 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 @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.72 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.73 ports: - "8089:8089" network_mode: host # 使用现有网络 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 ac405a2ed5..bf7f649cad 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.35 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.36 ports: - "8091:8091" network_mode: host # 使用现有网络 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 83e1e72813..f81f8ac2ce 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.55 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.56 ports: - "8094:8094" network_mode: host # 使用现有网络 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 9b9a683885..c9e5458cfb 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.88 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.89 ports: - "8096:8096" network_mode: host # 使用现有网络 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 07bc4422f9..0386387143 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.276 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.277 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From e75b110ac7561d0a15e46bad3b1c772a5bce828b Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 25 Mar 2022 18:31:57 +0800 Subject: [PATCH 201/391] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E6=97=B6=20=E6=9B=B4=E6=96=B0=E6=A5=BC=E5=AE=87=E7=9A=84?= =?UTF-8?q?=E6=88=BF=E9=97=B4=E6=95=B0=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c54015caa5..46eae5b2d0 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.187 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.188 ports: - "8092:8092" network_mode: host # 使用现有网络 From 082af117a43330ed3c29f066fd8e3511a2fccdb7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 29 Mar 2022 09:32:41 +0800 Subject: [PATCH 202/391] =?UTF-8?q?user-bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0386387143..441099e7cf 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.277 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.278 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 7926c55fbdd2e8d9c54610f5cd8d325544d14a8a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 29 Mar 2022 14:25:58 +0800 Subject: [PATCH 203/391] =?UTF-8?q?org=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 46eae5b2d0..5d4b3b4968 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.188 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.189 ports: - "8092:8092" network_mode: host # 使用现有网络 From cbdf6c428e67bd31c278a0aaac70384d77b69c3e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 29 Mar 2022 14:26:48 +0800 Subject: [PATCH 204/391] =?UTF-8?q?org=EF=BC=8Cuser=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 441099e7cf..843f0d9ff9 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.278 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.279 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 35ddaeefa250bc7170740c7271f6f8a3354fadff Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 29 Mar 2022 15:20:53 +0800 Subject: [PATCH 205/391] =?UTF-8?q?org=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5d4b3b4968..e5fe01a754 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.189 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.190 ports: - "8092:8092" network_mode: host # 使用现有网络 From 8fd4188364b0bbef728442cc8d2124a2d33d1c84 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 31 Mar 2022 11:05:06 +0800 Subject: [PATCH 206/391] =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 843f0d9ff9..68e8de2065 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.279 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.280 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From f0e59414a354c870588e585b3689e4c4e72a50b8 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 31 Mar 2022 11:54:39 +0800 Subject: [PATCH 207/391] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E8=80=97=E6=97=B6log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d1d35c0610..a2e9dbc01a 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.383 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.384 ports: - "8108:8108" network_mode: host # 使用现有网络 From 99699efa8a5832fb518327a914d76c5ffa16ead6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 1 Apr 2022 10:39:10 +0800 Subject: [PATCH 208/391] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E8=80=97=E6=97=B6log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a2e9dbc01a..f35abef413 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.384 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.385 ports: - "8108:8108" network_mode: host # 使用现有网络 From becaa8b5503e9b7d59b6e4b902e770d2eec3dd32 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 2 Apr 2022 10:48:36 +0800 Subject: [PATCH 209/391] gov-org up --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e5fe01a754..34b489cc64 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.190 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.191 ports: - "8092:8092" network_mode: host # 使用现有网络 From a368be32dbb276d4046cd1c7e35eb5cdec02ce1b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Sat, 2 Apr 2022 16:59:50 +0800 Subject: [PATCH 210/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-prod.yml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- .../resi-guide/resi-guide-server/deploy/docker-compose-prod.yml | 2 +- .../resi-mine/resi-mine-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 f19959e448..6ad5b79a99 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 @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.46 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.47 ports: - "8103:8103" network_mode: host # 使用现有网络 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 34b489cc64..4169ff78ef 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.191 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.192 ports: - "8092:8092" network_mode: host # 使用现有网络 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 bf7f649cad..b5047cbc63 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.36 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.37 ports: - "8091:8091" network_mode: host # 使用现有网络 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 f81f8ac2ce..35b56946b5 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.56 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.57 ports: - "8094:8094" network_mode: host # 使用现有网络 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 bb56259fcf..f1ee61247f 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.280 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.281 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 5639b476bccc09f4f4000ec36fdc80c608c56ac4 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 2 Apr 2022 18:11:53 +0800 Subject: [PATCH 211/391] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f1ee61247f..a8886ff121 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.281 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.282 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 24e5a0fcc9aaf8fc8e2799a05a298a3629f3fadd Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 6 Apr 2022 10:36:47 +0800 Subject: [PATCH 212/391] =?UTF-8?q?=E8=84=9A=E6=9C=AC=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.14__add_areacode_flag.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.14__add_areacode_flag.sql b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.14__add_areacode_flag.sql index 59b930701d..6e0bc91b75 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.14__add_areacode_flag.sql +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.14__add_areacode_flag.sql @@ -13,7 +13,7 @@ SELECT ID, `CODE`, `NAME`, `P_CODE`, `LEVEL`, `CATAGORY`, `DEL_FLAG`, `REVISION` SELECT * FROM area_code_new WHERE county_code = '441900'; #清空数据 -DELETE FROM area_code where 1=1; +DELETE FROM area_code; #插入数据 INSERT INTO `epmet_common_service`.`area_code` SELECT * FROM area_code_new; From aed1bc28381620a446e858ae50244c380b4e6afb Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 6 Apr 2022 11:17:47 +0800 Subject: [PATCH 213/391] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=B0=83=E6=95=B4=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 6ad5b79a99..acc8b229cc 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 @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.47 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.48 ports: - "8103:8103" network_mode: host # 使用现有网络 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 4c14a38013..8d58a81926 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.54 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.55 ports: - "8084:8084" network_mode: host # 使用现有网络 From 0180484d22a5eb97416081be6f8be7112b3d8f4a Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 6 Apr 2022 12:04:59 +0800 Subject: [PATCH 214/391] =?UTF-8?q?=E4=BF=AE=E6=94=B9compose=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=89=88=E6=9C=AC=E4=B8=BA=E7=89=88=E6=9C=AC=E5=8D=A0?= =?UTF-8?q?=E4=BD=8D=E7=AC=A6=EF=BC=8C=E6=B5=8B=E8=AF=95=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 acc8b229cc..ab8df1446d 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 @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.48 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:version_placeholder ports: - "8103:8103" network_mode: host # 使用现有网络 From 7b8eb0a229881c2fa709ac22aab784cf1d890c08 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 6 Apr 2022 13:30:15 +0800 Subject: [PATCH 215/391] resi-group --- .../resi-group/resi-group-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8db2210515..5a55880c81 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.132 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.133 ports: - "8095:8095" network_mode: host # 使用现有网络 From 5f283343302f5e37a88085908ed26dbdf91060ea Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 6 Apr 2022 13:34:01 +0800 Subject: [PATCH 216/391] =?UTF-8?q?Revert=20"Revert=20"=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=B8=AA=E6=9D=A1=E4=BB=B6""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 65b05bd5 --- .../main/resources/db/migration/V0.0.14__add_areacode_flag.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.14__add_areacode_flag.sql b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.14__add_areacode_flag.sql index 6e0bc91b75..59b930701d 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.14__add_areacode_flag.sql +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.14__add_areacode_flag.sql @@ -13,7 +13,7 @@ SELECT ID, `CODE`, `NAME`, `P_CODE`, `LEVEL`, `CATAGORY`, `DEL_FLAG`, `REVISION` SELECT * FROM area_code_new WHERE county_code = '441900'; #清空数据 -DELETE FROM area_code; +DELETE FROM area_code where 1=1; #插入数据 INSERT INTO `epmet_common_service`.`area_code` SELECT * FROM area_code_new; From 8f1e4721eaddc7d7fd9f4809ea20ec2ca1a230c2 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 6 Apr 2022 13:47:14 +0800 Subject: [PATCH 217/391] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83com?= =?UTF-8?q?pose=E6=96=87=E4=BB=B6=EF=BC=8C=E6=9B=BF=E6=8D=A2=E4=B8=BAversi?= =?UTF-8?q?on=5Fplaceholder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml | 2 +- epmet-auth/deploy/docker-compose-prod.yml | 2 +- epmet-gateway/deploy/docker-compose-prod.yml | 2 +- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-activiti-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-message-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-point-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-third-server/deploy/docker-compose-prod.yml | 2 +- .../gov-access/gov-access-server/deploy/docker-compose-prod.yml | 2 +- .../gov-grid/gov-grid-server/deploy/docker-compose-prod.yml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- .../gov-mine/gov-mine-server/deploy/docker-compose-prod.yml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- .../gov-voice/gov-voice-server/deploy/docker-compose-prod.yml | 2 +- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- .../oper-access-server/deploy/docker-compose-prod.yml | 2 +- .../oper-crm/oper-crm-server/deploy/docker-compose-prod.yml | 2 +- .../oper-customize-server/deploy/docker-compose-prod.yml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-prod.yml | 2 +- .../resi-guide/resi-guide-server/deploy/docker-compose-prod.yml | 2 +- .../resi-hall/resi-hall-server/deploy/docker-compose-prod.yml | 2 +- .../resi-home/resi-home-server/deploy/docker-compose-prod.yml | 2 +- .../resi-mine/resi-mine-server/deploy/docker-compose-prod.yml | 2 +- .../resi-partymember-server/deploy/docker-compose-prod.yml | 2 +- .../resi-voice/resi-voice-server/deploy/docker-compose-prod.yml | 2 +- epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) 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 2bfca948d7..62a9e89b35 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.35 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:version_placeholder ports: - "8082:8082" network_mode: host # 使用现有网络 diff --git a/epmet-auth/deploy/docker-compose-prod.yml b/epmet-auth/deploy/docker-compose-prod.yml index c8042aa3d6..b7776bbaaf 100644 --- a/epmet-auth/deploy/docker-compose-prod.yml +++ b/epmet-auth/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.100 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:version_placeholder ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml index 834efaf9d7..49094f4521 100644 --- a/epmet-gateway/deploy/docker-compose-prod.yml +++ b/epmet-gateway/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.76 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:version_placeholder ports: - "8080:8080" network_mode: host # 使用现有网络 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 d959a2bb91..3576fadb73 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.123 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:version_placeholder ports: - "8114:8114" network_mode: host # 使用现有网络 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 0dabcb7780..42714f4238 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.214 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:version_placeholder ports: - "8108:8108" network_mode: host # 使用现有网络 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 f35abef413..78a46c8117 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 @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.385 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:version_placeholder ports: - "8108:8108" network_mode: host # 使用现有网络 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 c6d7c0d65c..12ab635118 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-activiti-server: container_name: epmet-activiti-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-activiti-server:0.3.1 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-activiti-server:version_placeholder ports: - "8086:8086" network_mode: host # 使用现有网络 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 c49297d330..9c95c05818 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-ext-server: container_name: epmet-ext-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.21 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:version_placeholder ports: - "8113:8113" network_mode: host # 使用现有网络 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 e50ad20a74..40df63bc4c 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.81 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:version_placeholder ports: - "8111:8111" network_mode: host # 使用现有网络 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 8d58a81926..6bffd4ae87 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.55 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:version_placeholder ports: - "8084:8084" network_mode: host # 使用现有网络 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 fcaf50a13b..121ed15355 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.58 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:version_placeholder ports: - "8085:8085" network_mode: host # 使用现有网络 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 f9f9466e4c..4f1e024566 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-oss-server: container_name: epmet-oss-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.43 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:version_placeholder ports: - "8083:8083" network_mode: host # 使用现有网络 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 62494e585f..de8dc52452 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.64 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:version_placeholder ports: - "8112:8112" network_mode: host # 使用现有网络 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 923d7acada..04d9efb87a 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.185 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:version_placeholder ports: - "8110:8110" network_mode: host # 使用现有网络 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 3c70edba36..208783e787 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.66 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:version_placeholder ports: - "8099:8099" network_mode: host # 使用现有网络 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 43ed770522..b47e7b1ed2 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:0.3.50 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:version_placeholder ports: - "8097:8097" network_mode: host # 使用现有网络 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 e50b3e4e6d..b11be53989 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.105 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:version_placeholder ports: - "8101:8101" network_mode: host # 使用现有网络 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 efe627aa32..c1883ae965 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-mine-server: container_name: gov-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.48 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:version_placeholder ports: - "8098:8098" network_mode: host # 使用现有网络 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 4169ff78ef..c0ee252ff0 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.192 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:version_placeholder ports: - "8092:8092" network_mode: host # 使用现有网络 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 9a3e35ef8b..75a8f44f2e 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.108 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:version_placeholder ports: - "8102:8102" network_mode: host # 使用现有网络 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 14af493b77..dc5e5818f0 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.79 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:version_placeholder ports: - "8105:8105" network_mode: host # 使用现有网络 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 72bd6309e0..ab0a79aa2e 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 @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.31 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:version_placeholder ports: - "8117:8117" network_mode: host # 使用现有网络 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 6946402d7a..eb87408016 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 @@ -2,7 +2,7 @@ version: "3.7" services: oper-access-server: container_name: oper-access-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:0.3.25 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:version_placeholder ports: - "8093:8093" network_mode: host # 使用现有网络 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 d32f2a132f..cb05ebd8f2 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 @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.89 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:version_placeholder ports: - "8090:8090" network_mode: host # 使用现有网络 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 baa1724035..11022f5b5b 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 @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.73 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:version_placeholder ports: - "8089:8089" network_mode: host # 使用现有网络 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 5a55880c81..c2d1f70171 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.133 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:version_placeholder ports: - "8095:8095" network_mode: host # 使用现有网络 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 b5047cbc63..5cad88228d 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.37 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:version_placeholder ports: - "8091:8091" network_mode: host # 使用现有网络 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 e2be8c346b..11b8c09a2f 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.39 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:version_placeholder ports: - "8100:8100" network_mode: host # 使用现有网络 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 16202a6ba4..d93cc35e88 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-home-server: container_name: resi-home-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.26 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:version_placeholder ports: - "8104:8104" network_mode: host # 使用现有网络 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 35b56946b5..fb4fb7fd26 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.57 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:version_placeholder ports: - "8094:8094" network_mode: host # 使用现有网络 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 c9e5458cfb..593f8d4709 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.89 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:version_placeholder ports: - "8096:8096" network_mode: host # 使用现有网络 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 0617256e21..3375e0d198 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 @@ -2,7 +2,7 @@ version: "3.7" services: resi-voice-server: container_name: resi-voice-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-voice-server:0.3.13 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-voice-server:version_placeholder ports: - "8106:8106" network_mode: host # 使用现有网络 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 c7db6ac382..2be1100292 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-openapi-scan: container_name: epmet-openapi-scan-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.34 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:version_placeholder ports: - "8107:8107" network_mode: host # 不会创建新的网络 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 a8886ff121..3e494ca6df 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.282 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:version_placeholder ports: - "8087:8087" network_mode: host # 不会创建新的网络 From dd5a5323a24b6f6cca0f2c85c491b46d4f06dfaa Mon Sep 17 00:00:00 2001 From: YUJT Date: Mon, 18 Apr 2022 13:49:59 +0800 Subject: [PATCH 218/391] =?UTF-8?q?gateway=E6=96=B0=E5=A2=9E=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E5=BA=95=E5=BA=A7=E5=8A=A8=E5=8A=9B=E4=B8=BB=E8=BD=B4?= =?UTF-8?q?=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 8 ++++++++ epmet-gateway/src/main/resources/bootstrap.yml | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 1283594191..506dea4834 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -233,6 +233,8 @@ lb://tduck-api + + lb://pli-power-base-server https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4 SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd @@ -371,6 +373,8 @@ lb://epmet-openapi-adv-server + + lb://pli-power-base-server lb://tduck-api @@ -481,6 +485,8 @@ lb://epmet-openapi-adv-server + + lb://pli-power-base-server https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4 SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd @@ -584,6 +590,8 @@ lb://epmet-openapi-adv-server + + lb://pli-power-base-server lb://tduck-api diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 83be8dc38a..691c441552 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -360,6 +360,15 @@ spring: filters: - StripPrefix=1 - CpAuth=true + #数字底座动力主轴 + - id: pli-power-base-server + uri: @gateway.routes.plugin.power-base-server.url@ + order: 39 + predicates: + - Path=${server.servlet.context-path}/pli/power/** + filters: + - StripPrefix=1 + - CpAuth=true nacos: discovery: From 67efe2f55c5b1a5338e3d7008e66068856c19507 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 20 Apr 2022 14:29:52 +0800 Subject: [PATCH 219/391] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/IcBuildingListResultDTO.java | 9 +++++++++ .../src/main/resources/mapper/IcBuildingDao.xml | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java index ebaf6ca58e..c33d50956a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java @@ -17,7 +17,16 @@ public class IcBuildingListResultDTO extends PageFormDTO { private static final long serialVersionUID = -8277921228438123299L; private String gridName; + + /** + * 设计的房屋总数，就是这个楼上实际有几个 + */ private Integer totalHouseNum; + + /** + * 实际录入房屋总数 + */ + private Integer realTotalHouseNum; private String latitude; private String agencyId; private Integer sort; diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index d4561898a7..14a71d2e13 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -81,9 +81,9 @@ a.SORT as sort, a.LONGITUDE as longitude, a.LATITUDE as latitude, - a.TYPE as buildingTypeKey + a.TYPE as buildingTypeKey, + (SELECT COUNT(1) FROM ic_house WHERE DEL_FLAG = '0' AND BUILDING_ID = a.ID) AS realTotalHouseNum from ic_building a - LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID and b.DEL_FLAG='0' left join customer_agency c on b.AGENCY_ID = c.ID and c.DEL_FLAG='0' left join customer_grid d on b.GRID_ID = d.ID and d.DEL_FLAG='0' From 1ccfbc0f7e377d99c75e7229b8af9afa4f5b18ce Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 20 Apr 2022 16:02:13 +0800 Subject: [PATCH 220/391] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A(1)=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=B9=B4=E9=BE=84=E3=80=81=E7=94=9F=E6=97=A5=E3=80=81=E6=80=A7?= =?UTF-8?q?=E5=88=AB=EF=BC=8C=E4=B8=94=E6=A8=A1=E6=9D=BF=E4=B8=AD=E5=88=A0?= =?UTF-8?q?=E9=99=A4"=E6=80=A7=E5=88=AB","=E5=87=BA=E7=94=9F=E6=97=A5?= =?UTF-8?q?=E6=9C=9F"2=E5=88=97=E3=80=82(2)=E6=A0=B9=E6=8D=AE=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E5=87=BA=E7=9A=84=E5=B9=B4=E9=BE=84=E5=88=A4=E6=96=AD?= =?UTF-8?q?=20=E6=98=AF=E5=90=A6=E4=B8=BA=E8=80=81=E5=B9=B4=E4=BA=BA?= =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85=E8=AF=A5=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=E4=B8=BAtrue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiUserImportServiceImpl.java | 74 ++++++++++++++++--- 1 file changed, 63 insertions(+), 11 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 07e97ea7b8..4f49d6b2eb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -62,7 +62,11 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.nio.file.Path; +import java.time.LocalDate; +import java.time.Period; import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; /** @@ -79,6 +83,10 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res public static final List controlGroup1 = Arrays.asList("input", "textarea", "datepicker", "daterange"); public static final List controlGroup2 = Arrays.asList("select", "radio"); + // 身份证号的正则表达式 + private final Pattern PATTERN_15_ID = Pattern.compile("^\\d{6}(?\\d{2})(?0[1-9]|1[0-2])(?[0-2][0-9]|3[0-1])\\d{2}(?\\d)$"); + private final Pattern PATTERN_18_ID = Pattern.compile("^\\d{6}(?\\d{4})(?0[1-9]|1[0-2])(?[0-2][0-9]|3[0-1])\\d{2}(?\\d)[0-9a-xA-X]$"); + /** * 身份证号列序号 */ @@ -433,16 +441,17 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res try { convertColumnWrappers2Map4Persist(itemIdAndColumnWrapper, row, currUserAgencyId, checkBoxOptionColumnIdxAndLabel, columnAndValues, true); - // 执行指定的检查 - specifiedCheck(columnAndValues); + // 执行指定的检查以及数据补充 + execSpecifiedCheckAndFill(columnAndValues); String idCard = columnAndValues.get("ID_CARD"); Map existingResiMap = icResiUserDao.selectResiInfoMap(idCard, null); if (existingResiMap == null) { // 新导入的居民，因为还没有读取子sheet，所以这些居民类别没有办法获取，先默认设置成0，后面读取子sheet的时候再更新 + // 注释掉的代码：根据已存在的必填信息，能解析出来该字段，所以不再赋值 columnAndValues.put("IS_ENSURE_HOUSE", "0"); - columnAndValues.put("IS_OLD_PEOPLE", "0"); + //columnAndValues.put("IS_OLD_PEOPLE", "0"); columnAndValues.put("IS_PARTY", "0"); columnAndValues.put("IS_SPECIAL", "0"); columnAndValues.put("IS_UNEMPLOYED", "0"); @@ -464,7 +473,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } else { // 该居民已存在，要做更新操作，因为还没有读取子sheet，所以这些居民最新类别没有办法获取，先设置上旧的数据 columnAndValues.put("IS_ENSURE_HOUSE", existingResiMap.get("IS_ENSURE_HOUSE")); - columnAndValues.put("IS_OLD_PEOPLE", existingResiMap.get("IS_OLD_PEOPLE")); + //columnAndValues.put("IS_OLD_PEOPLE", existingResiMap.get("IS_OLD_PEOPLE")); columnAndValues.put("IS_PARTY", existingResiMap.get("IS_PARTY")); columnAndValues.put("IS_SPECIAL", existingResiMap.get("IS_SPECIAL")); columnAndValues.put("IS_UNEMPLOYED", existingResiMap.get("IS_UNEMPLOYED")); @@ -544,16 +553,17 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } /** - * 执行指定的检查 + * 执行指定的检查以及数据的补充 * @param columnAndValues */ - private void specifiedCheck(LinkedHashMap columnAndValues) { + private void execSpecifiedCheckAndFill(LinkedHashMap columnAndValues) { String idCard = columnAndValues.get("ID_CARD"); String mobile = columnAndValues.get("MOBILE"); String name = columnAndValues.get("NAME"); List errors = new ArrayList<>(); + // 执行检查 if (StringUtils.isBlank(idCard)) { log.debug("【居民信息导入】specifiedCheck身份证号为空的：{},{}", mobile, name); @@ -561,14 +571,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); } - if (idCard.length() > 18) { - // 身份证号超长了哦，不可以的 - errors.add("身份证号过长"); + if (idCard.length() != 18 && idCard.length() != 15) { + errors.add("身份证号长度错误"); } if (StringUtils.isNotBlank(mobile) && mobile.length() > 15) { - // 手机号超长也是不可以的 - errors.add("手机号过长"); + errors.add("手机号长度错误"); } if (errors.size() > 0) { @@ -576,6 +584,50 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res String errorMsg = String.join(";", errors); throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); } + + // ================== 数据补充 =================== + String year; + String month; + String day; + String sex; + + if (idCard.length() == 15) { + Matcher matcher = PATTERN_15_ID.matcher(idCard); + if (matcher.matches()) { + year = "19".concat(matcher.group("year")); + month = matcher.group("month"); + day = matcher.group("day"); + sex = matcher.group("sex"); + } else { + String s = "身份证号解析错误"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); + } + } else if (idCard.length() == 18) { + Matcher matcher = PATTERN_18_ID.matcher(idCard); + if (matcher.matches()) { + year = matcher.group("year"); + month = matcher.group("month"); + day = matcher.group("day"); + sex = matcher.group("sex"); + } else { + String s = "身份证号解析错误"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); + } + } else { + String s = "身份证号位数错误"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); + } + + // 出生日期 & 年龄 + LocalDate birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)); + int age = Period.between(birthday, LocalDate.now()).getYears(); + + // 性别 & 生日 & 老年人 + Boolean isMale = (Integer.parseInt(sex) % 2) == 1; + columnAndValues.put("BIRTHDAY", String.join("-", Arrays.asList(year, month,day))); + columnAndValues.put("GENDER", isMale ? "1" : "2"); + columnAndValues.put("IS_OLD_PEOPLE", age > 60 ? "1" : "0"); + System.out.println(6); } /** From 267d06099839c570349c45782e636a69174d6cec Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 20 Apr 2022 16:07:17 +0800 Subject: [PATCH 221/391] =?UTF-8?q?=E6=BC=8F=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 82432 -> 81920 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index f8169a18bb9e07bfe13160eed93663c776269143..c2f556620eb25346967828a0fe429625aa26f325 100644 GIT binary patch literal 81920 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

kmxkGn5K?#k?RFqen7rC7m$bARp+Sx5gC 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

(QvY}xOA4(?pfEXjRE&-C*S&)$pvY2_1sU-GCY zjHj8+cV#J04E89B=I$fZ3ZJEsHYe1AAqzbnBJ5+OAiQ)?_ZJ z<2@gv$+4Oor^%d+?7hCGCfCyB1WiuVnECw8bC z6@Y_!^o@^u&zdW~K3Fh2>E_LGR=YNLzm*N_7KB&?o*#;UtztC3`0ky6z<2I!1U}cr z2z=jGAn+Z#9>Ljo$2)Kl-@DPchdV1*3-l?<+JLH z6m-LP2RQ3;;3#Csw)Z)3w{^!kc}AJoX9MX5Cs!|gy1}r_&=a96&Kzx{-ErIvrsU2D z-NEdNA1_@X5g&*cj(n?u`z%0imss Date: Wed, 20 Apr 2022 16:58:47 +0800 Subject: [PATCH 222/391] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E6=A6=82=E8=A7=88?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=96=B9=E6=B3=95=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/HouseChartFormDTO.java | 29 ++++++++ .../epmet/dto/result/HouseChartResultDTO.java | 50 +++++++++++++ .../dto/result/SubUserHouseListResultDTO.java | 74 +++++++++++++++++++ .../com/epmet/controller/HouseController.java | 35 +++++++-- .../java/com/epmet/service/HouseService.java | 21 ++++-- .../epmet/service/impl/HouseServiceImpl.java | 24 +++++- .../com/epmet/dto/form/UserChartFormDTO.java | 29 ++++++++ .../epmet/dto/result/UserChartResultDTO.java | 42 +++++++++++ .../controller/IcResiUserController.java | 13 ++++ .../com/epmet/service/IcResiUserService.java | 6 ++ .../service/impl/IcResiUserServiceImpl.java | 10 +++ 11 files changed, 317 insertions(+), 16 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseChartFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseChartFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseChartFormDTO.java new file mode 100644 index 0000000000..6d3d8f433a --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseChartFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author sun + * @dscription 【人房】房屋总数饼图-接口入参 + */ +@Data +public class HouseChartFormDTO implements Serializable { + + private static final long serialVersionUID = 405799151478155056L; + + /** + * 组织、网格、小区Id + */ + private String orgId; + /** + * 组织、网格、小区类型 agency grid village + */ + private String orgType; + + //token这信息 + private String customerId; + private String userId; + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java new file mode 100644 index 0000000000..b412f00b07 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java @@ -0,0 +1,50 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author sun + * @dscription 【人房】房屋总数饼图-接口返参 + */ +@Data +public class HouseChartResultDTO implements Serializable { + /** + * 组织、网格、小区Id + */ + private String orgId; + /** + * 组织、网格、小区类型 agency grid village + */ + private String orgType; + /** + * 房屋总数 + */ + private Integer houseTotal; + /** + * 房屋自住总数 + */ + private Integer zzHouseTotal; + /** + * 房屋自住总数占比（保留两位小数，带百分号的） + */ + private String zzHouseRatio; + /** + * 房屋常住总数 + */ + private Integer czHouseTotal; + /** + * 房屋常住总数占比（保留两位小数，带百分号的） + */ + private String czHouseRatio; + /** + * 房屋闲置总数 + */ + private Integer xzHouseTotal; + /** + * 房屋闲置总数占比（保留两位小数，带百分号的） + */ + private String xzHouseRatio; + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java new file mode 100644 index 0000000000..c2771bb8f9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java @@ -0,0 +1,74 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author sun + * @dscription 【人房】下级人房概览列表-接口返参 + */ +@Data +public class SubUserHouseListResultDTO implements Serializable { + /** + * 组织、网格、小区Id + */ + private String orgId; + /** + * 组织、网格、小区名称 + */ + private String orgName; + /** + * 组织、网格、小区类型 agency grid village + */ + private String orgType; + /** + * 房屋总数 + */ + private Integer houseTotal; + /** + * 房屋自住总数 + */ + private Integer zzHouseTotal; + /** + * 房屋自住总数占比（保留两位小数，带百分号的） + */ + private String zzHouseRatio; + /** + * 房屋常住总数 + */ + private Integer czHouseTotal; + /** + * 房屋常住总数占比（保留两位小数，带百分号的） + */ + private String czHouseRatio; + /** + * 房屋闲置总数 + */ + private Integer xzHouseTotal; + /** + * 房屋闲置总数占比（保留两位小数，带百分号的） + */ + private String xzHouseRatio; + /** + * 居民总数 + */ + private Integer userTotal; + /** + * 常住人口总数 + */ + private Integer czUserTotal; + /** + * 常住人口占比（保留两位小数，带百分号的） + */ + private String czUserRatio; + /** + * 流动人口总数 + */ + private Integer ldUserTotal; + /** + * 流动人口占比（保留两位小数，带百分号的） + */ + private String ldUserRatio; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 5ef535aa11..322d580490 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -31,10 +31,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.form.*; -import com.epmet.dto.result.HouseInfoDTO; -import com.epmet.dto.result.IcHouseListResultDTO; -import com.epmet.dto.result.ImportTaskCommonResultDTO; -import com.epmet.dto.result.LoginUserDetailsResultDTO; +import com.epmet.dto.result.*; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.HouseService; @@ -47,7 +44,10 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.InputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Set; /** @@ -248,4 +248,29 @@ public class HouseController implements ResultDataResolver { } return new Result().ok(houseService.getHouseInfoDTO(tokenDto.getCustomerId(), houseId)); } + + /** + * @Author sun + * @Description 【人房】房屋总数饼图 + **/ + @NoRepeatSubmit + @PostMapping("housechart") + public Result houseChart(@LoginUser TokenDto tokenDto, @RequestBody HouseChartFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result().ok(houseService.houseChart(formDTO)); + } + + /** + * @Author sun + * @Description 【人房】下级人房概览列表 + **/ + @NoRepeatSubmit + @PostMapping("subuserhouselist") + public Result> subUserHouseList(@LoginUser TokenDto tokenDto, @RequestBody HouseChartFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result>().ok(houseService.subUserHouseList(formDTO)); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index bc9af52b79..759c95c5fe 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -19,13 +19,8 @@ package com.epmet.service; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.IcHouseAddFormDTO; -import com.epmet.dto.form.IcHouseListFormDTO; -import com.epmet.dto.form.ImportInfoFormDTO; -import com.epmet.dto.form.NeighborHoodManageDelFormDTO; -import com.epmet.dto.result.HouseInfoDTO; -import com.epmet.dto.result.IcHouseListResultDTO; -import com.epmet.dto.result.ImportTaskCommonResultDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.*; import javax.servlet.http.HttpServletResponse; import java.io.InputStream; @@ -68,4 +63,16 @@ public interface HouseService { void allDelete(NeighborHoodManageDelFormDTO formDTO); HouseInfoDTO getHouseInfoDTO(String customerId,String houseId); + + /** + * @Author sun + * @Description 【人房】房屋总数饼图 + **/ + HouseChartResultDTO houseChart(HouseChartFormDTO formDTO); + + /** + * @Author sun + * @Description 【人房】下级人房概览列表 + **/ + List subUserHouseList(HouseChartFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index bac35ce64c..2d54a6d4c7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -27,10 +27,7 @@ import com.epmet.dto.IcBuildingDTO; import com.epmet.dto.IcBuildingUnitDTO; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.form.*; -import com.epmet.dto.result.HouseInfoDTO; -import com.epmet.dto.result.IcHouseListResultDTO; -import com.epmet.dto.result.ImportTaskCommonResultDTO; -import com.epmet.dto.result.NeighborHoodManageDelResultDTO; +import com.epmet.dto.result.*; import com.epmet.enums.HousePurposeEnums; import com.epmet.enums.HouseTypeEnums; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; @@ -344,4 +341,23 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } return houseInfo; } + + /** + * @Author sun + * @Description 【人房】房屋总数饼图 + **/ + @Override + public HouseChartResultDTO houseChart(HouseChartFormDTO formDTO) { + return null; + } + + /** + * @Author sun + * @Description 【人房】下级人房概览列表 + **/ + @Override + public List subUserHouseList(HouseChartFormDTO formDTO) { + return null; + } + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java new file mode 100644 index 0000000000..36ae55e8f7 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author sun + * @dscription 【人房】居民总数饼图-接口入参 + */ +@Data +public class UserChartFormDTO implements Serializable { + + private static final long serialVersionUID = 405799151478155056L; + + /** + * 组织、网格、小区Id + */ + private String orgId; + /** + * 组织、网格、小区类型 agency grid village + */ + private String orgType; + + //token这信息 + private String customerId; + private String userId; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java new file mode 100644 index 0000000000..dd8560b16f --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java @@ -0,0 +1,42 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author sun + * @dscription 【人房】居民总数饼图-接口返参 + */ +@Data +public class UserChartResultDTO implements Serializable { + /** + * 组织、网格、小区Id + */ + private String orgId; + /** + * 组织、网格、小区类型 agency grid village + */ + private String orgType; + /** + * 居民总数 + */ + private Integer userTotal; + /** + * 常住人口总数 + */ + private Integer czUserTotal; + /** + * 常住人口占比（保留两位小数，带百分号的） + */ + private String czUserRatio; + /** + * 流动人口总数 + */ + private Integer ldUserTotal; + /** + * 流动人口占比（保留两位小数，带百分号的） + */ + private String ldUserRatio; + +} 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 5a44547fc8..ab051346d9 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 @@ -888,4 +888,17 @@ public class IcResiUserController implements ResultDataResolver { }); return new Result(); } + + /** + * @Author sun + * @Description 【人房】居民总数饼图 + **/ + @NoRepeatSubmit + @PostMapping("userchart") + public Result userChart(@LoginUser TokenDto tokenDto, @RequestBody UserChartFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result().ok(icResiUserService.userChart(formDTO)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 8bcebefd92..1e8e704811 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -244,4 +244,10 @@ public interface IcResiUserService extends BaseService { * @Date 2022/3/29 16:25 */ EpidemicPreventionInfoDTO getEpidemicPreventionInfo(EpidemicPreventionFormDTO formDTO); + + /** + * @Author sun + * @Description 【人房】居民总数饼图 + **/ + HouseChartResultDTO userChart(UserChartFormDTO formDTO); } 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 bf4e68bd1d..3feebd6529 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 @@ -1594,4 +1594,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl(list, null == list?NumConstant.ZERO:list.size()); } + + /** + * @Author sun + * @Description 【人房】居民总数饼图 + **/ + @Override + public HouseChartResultDTO userChart(UserChartFormDTO formDTO) { + return null; + } + } From 21dd439cfdac103566045fea4f0398148595f4ff Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 20 Apr 2022 17:51:10 +0800 Subject: [PATCH 223/391] =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/StatsResiWarnFormDTO.java | 10 +-- .../result/IcStatsResiWarnUserResultDTO.java | 1 + .../dto/result/UserWarnNameListResultDTO.java | 9 +++ .../controller/StatsResiWarnController.java | 9 +++ .../epmet/service/StatsResiWarnService.java | 5 ++ .../impl/StatsResiWarnServiceImpl.java | 65 +++++++++++++++---- .../resources/mapper/IcStatsResiWarnDao.xml | 4 ++ 7 files changed, 84 insertions(+), 19 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiWarnFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiWarnFormDTO.java index 174fc429b2..58acc41b0f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiWarnFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiWarnFormDTO.java @@ -22,7 +22,6 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -40,7 +39,7 @@ public class StatsResiWarnFormDTO implements Serializable { public interface ListSelectedBuilding {} public interface ListSelectedUser {} - + public interface AllUser {} /** * 当前页 @@ -57,10 +56,11 @@ public class StatsResiWarnFormDTO implements Serializable { @NotBlank(message = "组织id不能为空",groups = {ListSelectedBuilding.class}) private String agencyId; - @NotBlank(message = "配置id不能为空",groups = {ListSelectedUser.class}) + @NotBlank(message = "配置id不能为空",groups = {ListSelectedUser.class, AllUser.class}) private String configId; @NotNull(message = "楼栋不能为空",groups = {ListSelectedUser.class}) private List buildingIdList; - - + @NotBlank(message = "楼栋不能为空",groups = {AllUser.class}) + private String buildingId; + private String customerId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcStatsResiWarnUserResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcStatsResiWarnUserResultDTO.java index 63d55d69c0..9e87b11df7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcStatsResiWarnUserResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcStatsResiWarnUserResultDTO.java @@ -43,6 +43,7 @@ public class IcStatsResiWarnUserResultDTO implements Serializable { private String neighborhoodName; private String buildingName; private String residentNames; + private Integer count; private List userList; } \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserWarnNameListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserWarnNameListResultDTO.java index f1d6690b46..b4b1e6547e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserWarnNameListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserWarnNameListResultDTO.java @@ -21,4 +21,13 @@ public class UserWarnNameListResultDTO implements Serializable { private String residentName; private String userId; + + @JsonIgnore + private String unitId; + private String unitName; + @JsonIgnore + private String homeId; + private String doorName; + private String mobile; + private String idCard; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java index 5f7ea56e4a..866e4a9d46 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java @@ -18,6 +18,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +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.ValidatorUtils; @@ -29,6 +30,7 @@ import com.epmet.dto.form.StatsResiWarnFormDTO; import com.epmet.dto.result.IcStatsResiResultDTO; import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO; import com.epmet.dto.result.IcUserWarnNoticeResultDTO; +import com.epmet.dto.result.UserWarnNameListResultDTO; import com.epmet.service.IcStatsResiWarnService; import com.epmet.service.StatsResiWarnService; import org.springframework.beans.factory.annotation.Autowired; @@ -115,6 +117,13 @@ public class StatsResiWarnController { return new Result().ok(statsResiWarnService.userWarnList(customerId,formDTO.getConfigId(), formDTO.getBuildingIdList(),formDTO.getPageNo(),formDTO.getPageSize())); } + @PostMapping("alluserwarnlist") + public Result> allUserWarnList(@LoginUser TokenDto tokenDto, @RequestBody StatsResiWarnFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, StatsResiWarnFormDTO.AllUser.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(statsResiWarnService.allUserWarnList(formDTO)); + } + /** * 统计所有 * @return diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java index babce11f37..33a41f51a5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java @@ -17,11 +17,14 @@ package com.epmet.service; +import com.epmet.commons.tools.page.PageData; import com.epmet.dto.form.IcUserWarnNoticeFormDTO; import com.epmet.dto.form.StatsResiListFormDTO; +import com.epmet.dto.form.StatsResiWarnFormDTO; import com.epmet.dto.result.IcStatsResiResultDTO; import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO; import com.epmet.dto.result.IcUserWarnNoticeResultDTO; +import com.epmet.dto.result.UserWarnNameListResultDTO; import java.util.List; import java.util.Map; @@ -53,6 +56,8 @@ public interface StatsResiWarnService{ */ Map userWarnList(String customerId, String configId, List buildingIdList, Integer pageNo, Integer pageSize); + PageData allUserWarnList(StatsResiWarnFormDTO formDTO); + List list(String customerId,String id, String level); List list2(StatsResiListFormDTO formDTO); 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 08685568dc..13645f9047 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 @@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; @@ -16,6 +18,7 @@ import com.epmet.dto.IcResiCategoryWarnConfigDTO; import com.epmet.dto.form.IcResiCategoryStatsConfigFormDTO; import com.epmet.dto.form.IcUserWarnNoticeFormDTO; import com.epmet.dto.form.StatsResiListFormDTO; +import com.epmet.dto.form.StatsResiWarnFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IcResiUserEntity; import com.epmet.entity.IcStatsResiWarnEntity; @@ -24,12 +27,13 @@ import com.epmet.feign.OperCustomizeOpenFeignClient; import com.epmet.service.IcStatsResiWarnService; import com.epmet.service.StatsResiWarnService; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; 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 org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.math.BigDecimal; @@ -173,20 +177,18 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService { //根据buildingID，tableName he columnName获取名字 //限制条数 一栋楼内最多显示1000 即可 for (String s : buildingIdList) { - PageHelper.startPage(NumConstant.ONE,NumConstant.ONE_HUNDRED,false).doSelectPage(()->{ - List dtos = icStatsResiWarnDao.userWarnListDTO(customerId, Arrays.asList(s), icResiCategoryWarnConfigDTO.getTableName(), icResiCategoryWarnConfigDTO.getColumnName()); - if (!CollectionUtils.isEmpty(dtos)){ - Map> groupByBuild = dtos.stream().collect(Collectors.groupingBy(UserWarnNameListResultDTO::getBuildingId)); - result.forEach(item->{ - item.setConfigId(configId); - groupByBuild.forEach((k,v) -> { - if (item.getBuildingId().equals(k)){ - item.setUserList(v); - } - }); + List dtos = icStatsResiWarnDao.userWarnListDTO(customerId, Arrays.asList(s), icResiCategoryWarnConfigDTO.getTableName(), icResiCategoryWarnConfigDTO.getColumnName()); + if (!CollectionUtils.isEmpty(dtos)){ + Map> groupByBuild = dtos.stream().collect(Collectors.groupingBy(UserWarnNameListResultDTO::getBuildingId)); + result.forEach(item->{ + item.setConfigId(configId); + groupByBuild.forEach((k,v) -> { + if (item.getBuildingId().equals(k)){ + item.setCount(v.size()); + } }); - } - }); + }); + } } /*PageHelper.startPage(NumConstant.ONE,NumConstant.ONE_THOUSAND,false).doSelectPage(()->{ List dtos = icStatsResiWarnDao.userWarnListDTO(customerId, buildingIdList, icResiCategoryWarnConfigDTO.getTableName(), icResiCategoryWarnConfigDTO.getColumnName()); @@ -205,6 +207,41 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService { return mapResult; } + @Override + public PageData allUserWarnList(StatsResiWarnFormDTO formDTO) { + //获取configId预警配置信息 + IcResiCategoryWarnConfigDTO formDto = new IcResiCategoryWarnConfigDTO(); + formDto.setId(formDTO.getConfigId()); + Result warnResult = operCustomizeOpenFeignClient.resiCategoryWarnInfoById(formDto); + if (!warnResult.success() || null == warnResult.getData()) { + throw new RenException("获取预警配置信息失败,configId="+ formDTO.getConfigId()); + } + IcResiCategoryWarnConfigDTO icResiCategoryWarnConfigDTO = warnResult.getData(); + + PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize()); + List list = icStatsResiWarnDao.userWarnListDTO(formDTO.getCustomerId(), + Collections.singletonList(formDTO.getBuildingId()), + icResiCategoryWarnConfigDTO.getTableName(), + icResiCategoryWarnConfigDTO.getColumnName()); + PageInfo pageInfo = new PageInfo<>(list); + if (CollectionUtils.isNotEmpty(list)) { + Set homeIds = list.stream().map(UserWarnNameListResultDTO::getHomeId).collect(Collectors.toSet()); + Result> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(homeIds, formDTO.getCustomerId()); + if (!houseInfoRes.success() || CollectionUtils.isEmpty(houseInfoRes.getData())){ + throw new EpmetException("查询居民所属房屋失败..."); + } + Map houseMap = houseInfoRes.getData().stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity())); + list.forEach(item -> { + HouseInfoDTO houseInfo = houseMap.get(item.getHomeId()); + if (null != houseInfo) { + item.setUnitName(houseInfo.getUnitName()); + item.setDoorName(houseInfo.getDoorName()); + } + }); + } + return new PageData<>(list, pageInfo.getTotal()); + } + @Override public List list(String customerId,String id, String level) { //获取所有配置类项 getshow diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml index 4e2dae8afa..1c1355a8a7 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml @@ -153,6 +153,10 @@ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemOptionsDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemOptionsDao.xml index 36daa2158d..df920c1b33 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemOptionsDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemOptionsDao.xml @@ -16,4 +16,11 @@ ) + + + delete from ic_form_item_options + where DEL_FLAG = 0 + and ITEM_ID = #{itemId} + AND CUSTOMER_ID = #{customerId} + \ No newline at end of file From a372b0bd6768ac5a473d1ee0316a93f273f0066a Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 22 Apr 2022 09:30:59 +0800 Subject: [PATCH 238/391] =?UTF-8?q?map=E4=B8=AD=E7=9A=84mobile=E5=92=8Cidc?= =?UTF-8?q?ard=E6=89=93=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/processor/MaskProcessor.java | 34 ++++++++++++++++++- .../controller/IcResiUserController.java | 1 + 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java index 266acfdcbc..a6b13019a6 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java @@ -7,6 +7,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.util.CollectionUtils; import java.lang.reflect.Field; import java.util.Arrays; @@ -49,11 +50,42 @@ public class MaskProcessor { ((List)object).forEach(e -> mask(e)); return; } else if (object instanceof Map) { - ((Map) object).values().forEach(v -> mask(v)); + maskMap((Map) object); return; } else if (object.getClass().getName().startsWith(EPMET_PACKAGE_PREFIX)) { // 自定义bean，走反射 maskEpmetBean(object); + return; + } + } + + /** + * 为map打码，只打value中的码 + * - 如果value是epmet的dto，那么去反射它 + * - 如果value是字符串，那么直接给他打码 + * - 如果value是其他类型，跳过 + * @param map + */ + private void maskMap(Map map) { + if (CollectionUtils.isEmpty(map)) { + return; + } + + for (Map.Entry entry : map.entrySet()) { + Object value = entry.getValue(); + Object key = entry.getKey(); + if (value != null && value.getClass().getName().startsWith(EPMET_PACKAGE_PREFIX)) { + // 是epmet的对象 + maskEpmetBean(value); + continue; + } else if (value instanceof String) { + int index = fieldNames.indexOf(key); + if (index != -1) { + String maskResult = maskString((String) value, fieldsMaskType.get(index)); + entry.setValue(maskResult); + } + continue; + } } } 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 cf06ccd432..f171340392 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 @@ -268,6 +268,7 @@ public class IcResiUserController implements ResultDataResolver { } @PostMapping("listresi") + @MaskResponse(fieldNames = { "MOBILE", "ID_CARD" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) public Result>> queryListResi1(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO) { //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); pageFormDTO.setCustomerId(tokenDto.getCustomerId()); From 6fac3b8057aae21f7f408b52ebea72be6673d55f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Apr 2022 09:59:42 +0800 Subject: [PATCH 239/391] =?UTF-8?q?/icresiuser/detail=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcFormItemDao.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index e4c82f8b15..4c3fc899c4 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -140,8 +140,7 @@ ic_form_item_group m WHERE m.DEL_FLAG = '0' - AND m.TABLE_NAME IS NOT NULL - AND m.TABLE_NAME != '' + AND m.TABLE_NAME != 'ic_resi_user' AND m.CUSTOMER_ID = #{customerId} AND m.FORM_CODE = #{formCode} From 904f9a92b43b920183ef37d494a7ff4ac31acb39 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 22 Apr 2022 10:18:26 +0800 Subject: [PATCH 240/391] =?UTF-8?q?=E5=B0=86=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E6=89=93=E7=A0=81=E6=96=B9=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=AD=A3=E5=88=99=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/processor/MaskProcessor.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java index a6b13019a6..353fb06a47 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java @@ -152,7 +152,9 @@ public class MaskProcessor { return originString; } - return originString.replace(originString.substring(6), StrUtil.repeatByLength("*", length - 6)); + String maskStr = StrUtil.repeatByLength("*", length - 6); + + return originString.replaceAll("^(\\d{6})[a-zA-Z0-9]*$", new StringBuilder("$1").append(maskStr).toString()); } /** @@ -171,4 +173,11 @@ public class MaskProcessor { return originString.replaceAll("^(1\\d{2})\\d*(\\d{4})$", new StringBuilder("$1").append(maskStr).append("$2").toString()); } + + public static void main(String[] args) { + String[] idc = {"idCard"}; + String[] idct = {MaskResponse.MASK_TYPE_ID_CARD}; + String r = new MaskProcessor(idc, idct).maskString("333333333333333333", MaskResponse.MASK_TYPE_ID_CARD); + System.out.println(r); + } } From 7682f410aed62761fd7331ed472750946f249af7 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 22 Apr 2022 10:30:43 +0800 Subject: [PATCH 241/391] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E6=A6=82=E8=A7=88=5F?= =?UTF-8?q?=E6=88=BF=E5=B1=8B=E9=A5=BC=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/HouseChartResultDTO.java | 22 ++++++---- .../main/java/com/epmet/dao/IcHouseDao.java | 10 +++-- .../epmet/service/impl/HouseServiceImpl.java | 40 ++++++++++++++++++- .../src/main/resources/mapper/IcHouseDao.xml | 34 ++++++++++++++++ 4 files changed, 94 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java index b412f00b07..676fe730f3 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java @@ -1,5 +1,7 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -21,30 +23,36 @@ public class HouseChartResultDTO implements Serializable { /** * 房屋总数 */ - private Integer houseTotal; + private Integer houseTotal = 0; /** * 房屋自住总数 */ - private Integer zzHouseTotal; + private Integer zzHouseTotal = 0; /** * 房屋自住总数占比（保留两位小数，带百分号的） */ - private String zzHouseRatio; + private String zzHouseRatio = "0%"; /** * 房屋常住总数 */ - private Integer czHouseTotal; + private Integer czHouseTotal = 0; /** * 房屋常住总数占比（保留两位小数，带百分号的） */ - private String czHouseRatio; + private String czHouseRatio = "0%"; /** * 房屋闲置总数 */ - private Integer xzHouseTotal; + private Integer xzHouseTotal = 0; /** * 房屋闲置总数占比（保留两位小数，带百分号的） */ - private String xzHouseRatio; + private String xzHouseRatio = "0%"; + + @JsonIgnore + private Integer num; + //1：出租 0：自住 2：闲置 + @JsonIgnore + private Integer rentFlag; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 3b7428dd8b..50ecb715b2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -3,10 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.IcHouseListFormDTO; -import com.epmet.dto.result.HouseInfoDTO; -import com.epmet.dto.result.HousesNameResultDTO; -import com.epmet.dto.result.IcHouseListResultDTO; -import com.epmet.dto.result.NeighborHoodManageDelResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.IcHouseEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -83,4 +80,9 @@ public interface IcHouseDao extends BaseDao { */ List getHousesNameByIdCards(@Param("idCards") List idCards); + /** + * @Author sun + * @Description 【人房】房屋总数饼图 + **/ + List houseChart(@Param("orgId") String orgId, @Param("orgType") String orgType); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 2d54a6d4c7..6072a5f15c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -6,6 +6,7 @@ import com.alibaba.excel.ExcelReader; import com.alibaba.excel.read.metadata.ReadSheet; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -13,6 +14,7 @@ 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.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -50,8 +52,10 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.InputStream; +import java.text.NumberFormat; import java.util.*; import java.util.concurrent.ExecutorService; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @Slf4j @@ -348,7 +352,41 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { **/ @Override public HouseChartResultDTO houseChart(HouseChartFormDTO formDTO) { - return null; + HouseChartResultDTO resultDTO = new HouseChartResultDTO(); + //计算百分比使用，保留小数点后两位 + NumberFormat numberFormat = NumberFormat.getInstance(); + numberFormat.setMaximumFractionDigits(NumConstant.TWO); + //1.判断入参是否有值，没有值则赋值当前工作人员缓存中所属组织信息 + if (StringUtils.isEmpty(formDTO.getOrgId())) { + //2.获取工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + formDTO.setOrgId(staffInfo.getAgencyId()); + formDTO.setOrgType("agency"); + } + //2.根据入参值查询对应的房屋统计数据 + List list = icHouseDao.houseChart(formDTO.getOrgId(), formDTO.getOrgType()); + //3.汇总数据 + AtomicInteger houseTotal = new AtomicInteger(); + list.forEach(l -> { + houseTotal.addAndGet(l.getNum()); + if (l.getRentFlag() == 0) { + resultDTO.setZzHouseTotal(l.getNum()); + } else if (l.getRentFlag() == 0) { + resultDTO.setCzHouseTotal(l.getNum()); + } else { + resultDTO.setXzHouseTotal(l.getNum()); + } + }); + resultDTO.setHouseTotal(houseTotal.get()); + resultDTO.setZzHouseRatio((resultDTO.getHouseTotal() == 0 || resultDTO.getZzHouseTotal() > resultDTO.getHouseTotal()) ? "0%" : numberFormat.format(((float) resultDTO.getZzHouseTotal() / (float) resultDTO.getHouseTotal()) * 100) + "%"); + resultDTO.setCzHouseRatio((resultDTO.getHouseTotal() == 0 || resultDTO.getCzHouseTotal() > resultDTO.getHouseTotal()) ? "0%" : numberFormat.format(((float) resultDTO.getCzHouseTotal() / (float) resultDTO.getHouseTotal()) * 100) + "%"); + resultDTO.setXzHouseRatio((resultDTO.getHouseTotal() == 0 || resultDTO.getXzHouseTotal() > resultDTO.getHouseTotal()) ? "0%" : numberFormat.format(((float) resultDTO.getXzHouseTotal() / (float) resultDTO.getHouseTotal()) * 100) + "%"); + resultDTO.setOrgId(formDTO.getOrgId()); + resultDTO.setOrgType(formDTO.getOrgType()); + return resultDTO; } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 4712160069..818e89ba99 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -289,4 +289,38 @@ ) GROUP BY h.OWNER_ID_CARD + + + From 906bb577d6ec0535c637a496edcf6bd1f13fcc7f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Apr 2022 10:31:59 +0800 Subject: [PATCH 242/391] =?UTF-8?q?=E9=80=80=E5=BD=B9=E5=86=9B=E4=BA=BAic?= =?UTF-8?q?=5Fveterans=E8=A1=A8=E6=96=B0=E5=A2=9EIS=5FHANDLE=5FJOB?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8A=9E=E7=90=86=E5=85=AC=E7=9B=8A=E6=80=A7?= =?UTF-8?q?=E5=B2=97=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcVeteransDTO.java | 5 +++++ .../src/main/java/com/epmet/entity/IcVeteransEntity.java | 5 +++++ .../src/main/java/com/epmet/excel/IcVeteransExcel.java | 6 ++++++ .../resources/db/migration/V0.0.41__add_is_handle_job.sql | 3 +++ 4 files changed, 19 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.41__add_is_handle_job.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java index 351b60a933..363dd18934 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java @@ -89,6 +89,11 @@ public class IcVeteransDTO implements Serializable { */ private String xjyqk; + /** + * 是否办理公益性岗位,0422新增 + */ + private String isHandleJob; + /** * 删除标识 0.未删除 1.已删除 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java index 076d6f33fe..0aa295885b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java @@ -85,6 +85,11 @@ public class IcVeteransEntity extends BaseEpmetEntity { */ private String xjyqk; + /** + * 是否办理公益性岗位,0422新增 + */ + private String isHandleJob; + /** * 预留字段1 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java index 3109a7fa4d..daa0d616bd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java @@ -64,6 +64,12 @@ public class IcVeteransExcel { @Excel(name = "现就业情况") private String xjyqk; + /** + * 是否办理公益性岗位,0422新增 + */ + @Excel(name = "是否办理公益性岗位") + private String isHandleJob; + @Excel(name = "删除标识 0.未删除 1.已删除") private Integer delFlag; diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.41__add_is_handle_job.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.41__add_is_handle_job.sql new file mode 100644 index 0000000000..b1a71547c7 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.41__add_is_handle_job.sql @@ -0,0 +1,3 @@ +-- 退役军人表增加此列 +ALTER TABLE ic_veterans ADD COLUMN IS_HANDLE_JOB CHAR(1) COMMENT '是否办理公益性岗位,0422新增' AFTER XJYQK; +update ic_veterans set ic_veterans.IS_HANDLE_JOB='0' where ic_veterans.IS_HANDLE_JOB is null or ic_veterans.IS_HANDLE_JOB=''; \ No newline at end of file From 7e01bd6a771ebcb12e8d7635b2680fb1ce25ded5 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 22 Apr 2022 10:55:54 +0800 Subject: [PATCH 243/391] =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcStatsResiWarnDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml index 1c1355a8a7..24e607f3c7 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml @@ -162,6 +162,7 @@ from ic_resi_user where DEL_FLAG = '0' and CUSTOMER_ID = #{customerId} + AND `STATUS` = '0' and ${columnName} = '1' From 9573d11b2cd89f900aef97b626836dff764c788f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Apr 2022 11:10:37 +0800 Subject: [PATCH 244/391] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E3=80=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9ic=5Fform=5Fitem.search=5Fdisplay=3D'1'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.22__update_search_col.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.22__update_search_col.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.22__update_search_col.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.22__update_search_col.sql new file mode 100644 index 0000000000..396cf2f803 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.22__update_search_col.sql @@ -0,0 +1,8 @@ +update ic_form_item set SEARCH_DISPLAY='1',UPDATED_BY='YZM',UPDATED_TIME=NOW() +WHERE DEL_FLAG='0' +AND SEARCH_DISPLAY='0' +AND LABEL IN( +'文化程度','兴趣特长','残疾类别','残疾等级','所患大病','所患慢性病', +'是否参保','救助金额','人户状况','户籍所在地','居住情况','该居民有无赡养人', +'需求类别','参战时间','是否办理公益性岗位','志愿者类别','特殊人群类别' +); From 7ac39714a03751730c46b09f5c5cbc0b2ac025a2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 22 Apr 2022 12:11:12 +0800 Subject: [PATCH 245/391] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=AF=BC=E5=87=BA=E4=BB=A3=E7=A0=81=20=E6=9A=82?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcFormItemGroupDTO.java | 33 +------- .../dto/form/IcFormItemGroupLisFormDTO.java | 84 +++++++++++++++++++ .../controller/IcFormItemGroupController.java | 28 +++---- .../entity/IcExportTemplateConfigEntity.java | 10 +-- .../epmet/service/IcFormItemGroupService.java | 17 +--- .../impl/IcFormItemGroupServiceImpl.java | 34 ++------ 6 files changed, 112 insertions(+), 94 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormItemGroupLisFormDTO.java diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java index 5fe8d5de36..e9d4a34b8c 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java @@ -20,7 +20,6 @@ package com.epmet.dto; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** @@ -79,34 +78,4 @@ public class IcFormItemGroupDTO implements Serializable { */ private Boolean display; - /** - * 0未删除，1已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormItemGroupLisFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormItemGroupLisFormDTO.java new file mode 100644 index 0000000000..49624a71d1 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormItemGroupLisFormDTO.java @@ -0,0 +1,84 @@ +/** + * 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 com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.validator.group.QueryGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + + +/** + * 表单项分组查询条件 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-26 + */ +@Data +public class IcFormItemGroupLisFormDTO extends PageFormDTO { + + private static final long serialVersionUID = 1L; + + /** + * 分组id + */ + private String id; + + /** + * 客户ID + */ + @NotBlank(message = "客户Id不能为空", groups = QueryGroup.class) + private String customerId; + + /** + * 表单ID + */ + private String formId; + + /** + * 表单编码 + */ + @NotBlank(message = "表单编码不能为空", groups = QueryGroup.class) + private String formCode; + + /** + * 对应的子表名称 + */ + private String tableName; + + /** + * 是否支持添加一行，1支持，默认0不支持 + */ + private Boolean supportAdd; + + /** + * 名称 + */ + private String label; + + /** + * 排序 + */ + private Integer sort; + + /** + * 1展示，0不展示，默认1 + */ + private Boolean display; +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemGroupController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemGroupController.java index b4d0079637..94fdaecbd9 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemGroupController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemGroupController.java @@ -17,23 +17,20 @@ package com.epmet.controller; -import com.epmet.commons.tools.page.PageData; -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.commons.tools.validator.group.QueryGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcFormItemGroupDTO; -import com.epmet.excel.IcFormItemGroupExcel; +import com.epmet.dto.form.IcFormItemGroupLisFormDTO; import com.epmet.service.IcFormItemGroupService; 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; /** @@ -45,14 +42,16 @@ import java.util.Map; @RestController @RequestMapping("icformitemgroup") public class IcFormItemGroupController { - + @Autowired private IcFormItemGroupService icFormItemGroupService; - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icFormItemGroupService.page(params); - return new Result>().ok(page); + @PostMapping("list") + public Result> page(@RequestHeader String customerId, @RequestBody IcFormItemGroupLisFormDTO param){ + param.setCustomerId(customerId); + ValidatorUtils.validateEntity(param, QueryGroup.class); + List page = icFormItemGroupService.list(param); + return new Result>().ok(page); } @GetMapping("{id}") @@ -85,10 +84,5 @@ public class IcFormItemGroupController { return new Result(); } - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = icFormItemGroupService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, IcFormItemGroupExcel.class); - } -} \ No newline at end of file +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java index d2f4dffe32..338164da26 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java @@ -28,6 +28,11 @@ public class IcExportTemplateConfigEntity extends BaseEpmetEntity { */ private String tempId; + /** + * 项标签 + */ + private String label; + /** * 父id */ @@ -43,11 +48,6 @@ public class IcExportTemplateConfigEntity extends BaseEpmetEntity { */ private Integer width; - /** - * 项标签 - */ - private String label; - /** * 排序 */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemGroupService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemGroupService.java index 79402d6273..ac28a4e8d2 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemGroupService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemGroupService.java @@ -18,12 +18,11 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcFormItemGroupDTO; +import com.epmet.dto.form.IcFormItemGroupLisFormDTO; import com.epmet.entity.IcFormItemGroupEntity; import java.util.List; -import java.util.Map; /** * 表单项分组 @@ -33,16 +32,6 @@ import java.util.Map; */ public interface IcFormItemGroupService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2021-10-26 - */ - PageData page(Map params); - /** * 默认查询 * @@ -51,7 +40,7 @@ public interface IcFormItemGroupService extends BaseService list(Map params); + List list(IcFormItemGroupLisFormDTO params); /** * 单条查询 @@ -92,4 +81,4 @@ public interface IcFormItemGroupService extends BaseService page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcFormItemGroupDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(IcFormItemGroupLisFormDTO params) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcFormItemGroupEntity::getCustomerId, params.getCustomerId()) + .orderByAsc(IcFormItemGroupEntity::getSort); + List entityList = baseDao.selectList(wrapper); return ConvertUtils.sourceToTarget(entityList, IcFormItemGroupDTO.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 IcFormItemGroupDTO get(String id) { @@ -97,4 +79,4 @@ public class IcFormItemGroupServiceImpl extends BaseServiceImpl Date: Fri, 22 Apr 2022 13:59:51 +0800 Subject: [PATCH 246/391] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E6=A6=82=E8=A7=88=5F?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=A5=BC=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcHouseDao.xml | 4 +- .../epmet/dto/result/UserChartResultDTO.java | 7 +++ .../controller/IcResiUserController.java | 8 +--- .../java/com/epmet/dao/IcResiUserDao.java | 2 + .../com/epmet/service/IcResiUserService.java | 2 +- .../service/impl/IcResiUserServiceImpl.java | 43 +++++++++++++++---- .../main/resources/mapper/IcResiUserDao.xml | 23 ++++++++++ 7 files changed, 72 insertions(+), 17 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 818e89ba99..efdce0c1ad 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -292,7 +292,8 @@ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java index dd8560b16f..aeda2e9605 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -39,4 +40,10 @@ public class UserChartResultDTO implements Serializable { */ private String ldUserRatio; + @JsonIgnore + private Integer num; + //是否是流动人口【是:1 否:0】 + @JsonIgnore + private String isFloating; + } 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 f171340392..3daa255a05 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 @@ -61,7 +61,6 @@ import com.epmet.feign.OssFeignClient; import com.epmet.service.IcResiUserImportService; import com.epmet.service.IcResiUserService; import feign.RequestInterceptor; -import jodd.io.FileUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; @@ -71,9 +70,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.poifs.filesystem.OfficeXmlFileException; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -900,10 +896,10 @@ public class IcResiUserController implements ResultDataResolver { **/ @NoRepeatSubmit @PostMapping("userchart") - public Result userChart(@LoginUser TokenDto tokenDto, @RequestBody UserChartFormDTO formDTO) { + public Result userChart(@LoginUser TokenDto tokenDto, @RequestBody UserChartFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - return new Result().ok(icResiUserService.userChart(formDTO)); + return new Result().ok(icResiUserService.userChart(formDTO)); } } 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 d3fe22ee44..e5c726447b 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 @@ -288,4 +288,6 @@ public interface IcResiUserDao extends BaseDao { List vaccineList(EpidemicPreventionFormDTO formDTO); IcResiUserEntity selectResiNoDelFlag(@Param("icResiUserId") String icResiUserId); + + List userChart(@Param("orgId") String orgId, @Param("orgType") String orgType); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 1e8e704811..7f438c4401 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -249,5 +249,5 @@ public interface IcResiUserService extends BaseService { * @Author sun * @Description 【人房】居民总数饼图 **/ - HouseChartResultDTO userChart(UserChartFormDTO formDTO); + UserChartResultDTO userChart(UserChartFormDTO formDTO); } 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 51dcd903e9..65b5d29498 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 @@ -67,22 +67,17 @@ import com.google.common.cache.CacheBuilder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; import java.sql.Date; import java.sql.Timestamp; +import java.text.NumberFormat; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; @@ -1606,8 +1601,40 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.userChart(formDTO.getOrgId(), formDTO.getOrgType()); + //3.汇总数据 + AtomicInteger userTotal = new AtomicInteger(); + list.forEach(l -> { + userTotal.addAndGet(l.getNum()); + if ("0".equals(l.getIsFloating())) { + resultDTO.setCzUserTotal(l.getNum()); + } else { + resultDTO.setLdUserTotal(l.getNum()); + } + }); + resultDTO.setUserTotal(userTotal.get()); + resultDTO.setCzUserRatio((resultDTO.getUserTotal() == 0 || resultDTO.getCzUserTotal() > resultDTO.getUserTotal()) ? "0%" : numberFormat.format(((float) resultDTO.getCzUserTotal() / (float) resultDTO.getUserTotal()) * 100) + "%"); + resultDTO.setLdUserRatio((resultDTO.getUserTotal() == 0 || resultDTO.getLdUserTotal() > resultDTO.getUserTotal()) ? "0%" : numberFormat.format(((float) resultDTO.getLdUserTotal() / (float) resultDTO.getUserTotal()) * 100) + "%"); + resultDTO.setOrgId(formDTO.getOrgId()); + resultDTO.setOrgType(formDTO.getOrgType()); + + return resultDTO; } } 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 df62d9b6dc..88cf85dc61 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 @@ -820,4 +820,27 @@ + + + From 4cb9f71725d9da00dcbc37fc02be99d698e29a0b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Apr 2022 14:41:11 +0800 Subject: [PATCH 247/391] =?UTF-8?q?=E8=B0=83=E6=95=B4ic=5Fform=5Fitem=5Fgr?= =?UTF-8?q?oup.sort?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V0.0.23__update_group_sort.sql | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.23__update_group_sort.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.23__update_group_sort.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.23__update_group_sort.sql new file mode 100644 index 0000000000..0d6a04eb2d --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.23__update_group_sort.sql @@ -0,0 +1,18 @@ +update ic_form_item_group set SORT='0' where DEL_FLAG='0' and LABEL='基础信息'; +update ic_form_item_group set SORT='1' where DEL_FLAG='0' and LABEL='教育信息'; +update ic_form_item_group set SORT='2' where DEL_FLAG='0' and LABEL='兴趣爱好'; +update ic_form_item_group set SORT='3' where DEL_FLAG='0' and LABEL='宗教信仰'; +update ic_form_item_group set SORT='4' where DEL_FLAG='0' and LABEL='健康信息'; +update ic_form_item_group set SORT='5' where DEL_FLAG='0' and LABEL='工作信息'; +update ic_form_item_group set SORT='6' where DEL_FLAG='0' and LABEL='经济状况'; +update ic_form_item_group set SORT='7' where DEL_FLAG='0' and LABEL='居住信息'; +update ic_form_item_group set SORT='8' where DEL_FLAG='0' and LABEL='家庭信息'; +update ic_form_item_group set SORT='9' where DEL_FLAG='0' and LABEL='党员信息'; +update ic_form_item_group set SORT='10' where DEL_FLAG='0' and LABEL='保障房信息'; +update ic_form_item_group set SORT='11' where DEL_FLAG='0' and LABEL='失业信息'; +update ic_form_item_group set SORT='12' where DEL_FLAG='0' and LABEL='退役军人信息'; +update ic_form_item_group set SORT='13' where DEL_FLAG='0' and LABEL='志愿者信息'; +update ic_form_item_group set SORT='14' where DEL_FLAG='0' and LABEL='特殊人群信息'; +update ic_form_item_group set SORT='15' where DEL_FLAG='0' and LABEL='统战人员'; +update ic_form_item_group set SORT='16' where DEL_FLAG='0' and LABEL='老年人信息'; +update ic_form_item_group set SORT='17' where DEL_FLAG='0' and LABEL='居民需求信息'; \ No newline at end of file From 5dfe33e9f7d689a43d90620690efad4122d3f735 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Apr 2022 15:23:09 +0800 Subject: [PATCH 248/391] /icform/conditionlist-bygroup --- .../com/epmet/dto/result/ConditionResDTO.java | 23 +++++ .../epmet/controller/IcFormController.java | 13 +++ .../controller/IcFormItemController.java | 10 +++ .../java/com/epmet/dao/IcFormItemDao.java | 9 ++ .../com/epmet/dao/IcFormQueryBuilderDao.java | 8 +- .../entity/IcFormQueryBuilderEntity.java | 15 ++++ .../com/epmet/service/IcFormItemService.java | 8 ++ .../service/impl/IcFormItemServiceImpl.java | 86 ++++++++++++++++++- .../main/resources/mapper/IcFormItemDao.xml | 59 +++++++++++++ .../mapper/IcFormQueryBuilderDao.xml | 21 +++++ 10 files changed, 250 insertions(+), 2 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResDTO.java diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResDTO.java new file mode 100644 index 0000000000..db50d133ba --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.result; + + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class ConditionResDTO implements Serializable { + /** + * 分组ID,'默认，NONE' + */ + private String itemGroupId; + + /** + * 分组名称 + * 基础信息、教育信息.... + */ + private String groupName; + + private List queryItemList; +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java index b247addf24..ef443587d2 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java @@ -102,6 +102,19 @@ public class IcFormController { return new Result>().ok(icFormItemService.queryConditionList(formDto)); } + /** + * 查询条件， 分组显示 + * @param tokenDto + * @param formDto + * @return + */ + @PostMapping("conditionlist-bygroup") + public Result> queryConditionListByGroup(@LoginUser TokenDto tokenDto, @RequestBody CustomerFormQueryDTO formDto){ + formDto.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDto,CustomerFormQueryDTO.AddUserInternalGroup.class); + return new Result>().ok(icFormItemService.queryConditionListByGroup(formDto)); + } + /** * 居民信息列表_表头 * @param tokenDto diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java index 8eb1a4e549..49c54f3d21 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java @@ -78,4 +78,14 @@ public class IcFormItemController { icFormItemService.editItemType(formDTO); return new Result(); } + + /** + * 初始化默认的查询组件：ic_form_item.SEARCH_DISPLAY='1'的 + * @return + */ + @PostMapping("init-query-builder") + public Result initQueryBuilder(@RequestParam("customerId")String customerId){ + icFormItemService.initQueryBuilder(customerId); + return new Result(); + } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java index d20a49202a..89054811ec 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java @@ -37,6 +37,15 @@ public interface IcFormItemDao extends BaseDao { List selectConditionList(@Param("customerId") String customerId, @Param("formCode") String formCode); + List selectConditionListByGroupId(String groupId); + /** + * 查询组件列表 + * @param customerId + * @param formCode + * @return + */ + List selectConditionListGroup(@Param("customerId") String customerId, @Param("formCode") String formCode, @Param("itemIdList") List itemIdList); + List queryTableHeaderList(@Param("customerId") String customerId, @Param("formCode") String formCode); /** diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormQueryBuilderDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormQueryBuilderDao.java index a142d8d637..67a3f319cb 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormQueryBuilderDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormQueryBuilderDao.java @@ -20,6 +20,9 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.IcFormQueryBuilderEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 表单查询项 @@ -29,5 +32,8 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcFormQueryBuilderDao extends BaseDao { - + + IcFormQueryBuilderEntity selectDefaultQueryItem(@Param("itemId") String itemId,@Param("itemType") String itemType, @Param("queryType")String queryType); + + List selectItemId(@Param("customerId") String customerId, @Param("formCode") String formCode); } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java index 4713b01dd3..9534fc12d2 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java @@ -45,6 +45,11 @@ public class IcFormQueryBuilderEntity extends BaseEpmetEntity { */ private String formItemId; + /** + * 项标签 + */ + private String label; + /** * ic_form.form_code，举例：resi_base_info * @see com.epmet.commons.tools.enums.IcFormCodeEnum @@ -52,11 +57,21 @@ public class IcFormQueryBuilderEntity extends BaseEpmetEntity { */ private String formCode; + /** + * 组件类型 + */ + private String itemType; + /** * 查询类型: equal, like,daterange.... */ private String queryType; + /** + * 值转换类型 + */ + private String funType; + /** * 排序 */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java index 0912092f94..3caf6a64c0 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java @@ -43,6 +43,8 @@ public interface IcFormItemService extends BaseService { */ List queryConditionList(CustomerFormQueryDTO formDto); + List queryConditionListByGroup(CustomerFormQueryDTO formDto); + List queryTableHeaderList(CustomerFormQueryDTO formDto); List queryConditions(String customerId,String formCode); @@ -75,4 +77,10 @@ public interface IcFormItemService extends BaseService { * @return */ void editItemType(EditIFormItemFormDTO formDTO); + + /** + * 初始化默认的查询组件：ic_form_item.SEARCH_DISPLAY='1'的 + * @param customerId + */ + void initQueryBuilder(String customerId); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java index 15f0f70dfb..0fee230ef5 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java @@ -20,14 +20,17 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.dao.IcFormItemDao; import com.epmet.dao.IcFormItemOptionsDao; +import com.epmet.dao.IcFormQueryBuilderDao; import com.epmet.dto.form.CustomerFormQueryDTO; import com.epmet.dto.form.EditIFormItemFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IcFormItemEntity; import com.epmet.entity.IcFormItemOptionsEntity; +import com.epmet.entity.IcFormQueryBuilderEntity; import com.epmet.service.IcFormItemService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -51,7 +54,8 @@ import java.util.stream.Collectors; public class IcFormItemServiceImpl extends BaseServiceImpl implements IcFormItemService { @Autowired private IcFormItemOptionsDao icFormItemOptionsDao; - + @Autowired + private IcFormQueryBuilderDao icFormQueryBuilderDao; /** * 获取居民信息的查询条件，组件列表 * @@ -66,6 +70,16 @@ public class IcFormItemServiceImpl extends BaseServiceImpl queryConditionListByGroup(CustomerFormQueryDTO formDto) { + List itemIdList=icFormQueryBuilderDao.selectItemId(formDto.getCustomerId(),formDto.getFormCode()); + if(CollectionUtils.isEmpty(itemIdList)){ + return new ArrayList<>(); + } + List list=baseDao.selectConditionListGroup(formDto.getCustomerId(),formDto.getFormCode(),itemIdList); + return list; + } + /** * 居民信息列表_表头 * @param formDto @@ -206,6 +220,76 @@ public class IcFormItemServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper().lambda() + .eq(StringUtils.isNotBlank(customerId), IcFormItemEntity::getCustomerId, customerId) + .isNotNull(IcFormItemEntity::getColumnName) + .eq(IcFormItemEntity::getSearchDisplay, NumConstant.ONE); + List itemList = baseDao.selectList(queryWrapper); + if (CollectionUtils.isEmpty(itemList)) { + return; + } + for (IcFormItemEntity item : itemList) { + IcFormQueryBuilderEntity builderEntity = new IcFormQueryBuilderEntity(); + builderEntity.setCustomerId(item.getCustomerId()); + builderEntity.setFormItemId(item.getId()); + builderEntity.setLabel(item.getLabel()); + builderEntity.setFormCode(item.getFormCode()); + builderEntity.setItemType(item.getItemType()); + builderEntity.setQueryType(queryType(item.getItemType())); + builderEntity.setFunType(StrConstant.EPMETY_STR); + builderEntity.setSort(item.getSort()); + builderEntity.setCreatedBy("init"); + builderEntity.setUpdatedBy("init"); + //item默认的查询组件已经有了，就不插入了 + IcFormQueryBuilderEntity entity = icFormQueryBuilderDao.selectDefaultQueryItem(item.getId(), item.getItemType(), builderEntity.getQueryType()); + if (null == entity) { + icFormQueryBuilderDao.insert(builderEntity); + } + } + } + + + private String queryType(String itemType) { + String queryType; + switch (itemType) { + case "select": + queryType = "equal"; + break; + case "input": + queryType = "like"; + break; + case "datepicker": + queryType = "daterange"; + break; + case "textarea": + queryType = "like"; + break; + case "radio": + queryType = "equal"; + break; + //多选的，查询时应该是 and (columnname='' or columnname='') + case "checkbox": + queryType = "list_equal"; + break; + case "daterange": + queryType = "daterange"; + break; + case "cascader": + queryType = "equal"; + break; + default: + queryType = "like"; + } + return queryType; + } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index 4c3fc899c4..b52940c589 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -59,6 +59,37 @@ ORDER BY b.SORT asc + @@ -161,4 +192,32 @@ AND a.customer_id = #{customerId} + + + + + + + + diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormQueryBuilderDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormQueryBuilderDao.xml index 62281279fa..6ec0f6dae9 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormQueryBuilderDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormQueryBuilderDao.xml @@ -18,5 +18,26 @@ + + \ No newline at end of file From a95eafbbe823abf1d20ee7cfc7ce3b5805fb2d8b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Apr 2022 16:00:37 +0800 Subject: [PATCH 249/391] =?UTF-8?q?/icform/conditionlist-bygroup=20label+q?= =?UTF-8?q?ueryType+funType=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/ConditionResultDTO.java | 2 ++ .../src/main/resources/mapper/IcFormItemDao.xml | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java index 07953ef95c..730d8fa0e5 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java @@ -88,6 +88,8 @@ public class ConditionResultDTO implements Serializable { */ private String queryType; + private String funType; + private List options; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index b52940c589..fb85fcd58b 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -19,6 +19,8 @@ + + @@ -48,7 +50,8 @@ b.SORT, IFNULL(i.PLACEHOLDER,'') as PLACEHOLDER, IFNULL(i.COLUMN_NAME,'')as COLUMN_NAME, - b.QUERY_TYPE + b.QUERY_TYPE, + b.FUN_TYPE FROM ic_form_query_builder b inner join ic_form_item i on(i.id=b.FORM_ITEM_ID and i.DEL_FLAG='0') LEFT JOIN ic_form_item_group g ON ( i.ITEM_GROUP_ID = g.id ) @@ -70,8 +73,8 @@ )AS TABLE_NAME, i.PARENT_ITEM_ID, - i.LABEL, - i.ITEM_TYPE, + b.LABEL, + b.ITEM_TYPE, i.ITEM_GROUP_ID, i.REQUIRED, IFNULL(i.VALID_TYPE,'')as VALID_TYPE, @@ -81,7 +84,8 @@ b.SORT, IFNULL(i.PLACEHOLDER,'') as PLACEHOLDER, IFNULL(i.COLUMN_NAME,'')as COLUMN_NAME, - b.QUERY_TYPE + b.QUERY_TYPE, + b.FUN_TYPE FROM ic_form_query_builder b inner join ic_form_item i on(i.id=b.FORM_ITEM_ID and i.DEL_FLAG='0') LEFT JOIN ic_form_item_group g ON ( i.ITEM_GROUP_ID = g.id ) From fe518f72e14934f2f5edf0a018b3391bb02b4994 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 22 Apr 2022 16:14:39 +0800 Subject: [PATCH 250/391] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E6=A6=82=E8=A7=88=5F?= =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E6=A6=82=E8=A7=88=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/HouseController.java | 2 - .../java/com/epmet/dao/IcNeighborHoodDao.java | 2 + .../epmet/service/impl/HouseServiceImpl.java | 122 ++++++++++++++++-- .../resources/mapper/IcNeighborHoodDao.xml | 18 +++ .../com/epmet/dto/form/UserChartFormDTO.java | 4 + .../epmet/dto/result/UserChartResultDTO.java | 10 +- .../epmet/feign/EpmetUserOpenFeignClient.java | 7 +- .../EpmetUserOpenFeignClientFallback.java | 5 + .../controller/IcResiUserController.java | 10 +- .../com/epmet/service/IcResiUserService.java | 6 + .../service/impl/IcResiUserServiceImpl.java | 16 +++ 11 files changed, 180 insertions(+), 22 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 6694c56ebd..bba66d0a4e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -255,7 +255,6 @@ public class HouseController implements ResultDataResolver { * @Author sun * @Description 【人房】房屋总数饼图 **/ - @NoRepeatSubmit @PostMapping("housechart") public Result houseChart(@LoginUser TokenDto tokenDto, @RequestBody HouseChartFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -267,7 +266,6 @@ public class HouseController implements ResultDataResolver { * @Author sun * @Description 【人房】下级人房概览列表 **/ - @NoRepeatSubmit @PostMapping("subuserhouselist") public Result> subUserHouseList(@LoginUser TokenDto tokenDto, @RequestBody HouseChartFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java index d2adb6c87f..95c9ae5d9b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.form.IcNeighborHoodListFormDTO; import com.epmet.dto.result.IcNeighborHoodResultDTO; import com.epmet.entity.IcHouseEntity; @@ -59,4 +60,5 @@ public interface IcNeighborHoodDao extends BaseDao { */ List selectNeighborhoodNameByNames(@Param("names")List names,@Param("customerId") String customerId); + List selectNeighborList(@Param("gridId")String gridId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 6072a5f15c..747c1b7ba3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -20,14 +20,8 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.CustomerGridConstant; import com.epmet.constants.ImportTaskConstants; -import com.epmet.dao.IcBuildingDao; -import com.epmet.dao.IcBuildingUnitDao; -import com.epmet.dao.IcHouseDao; -import com.epmet.dao.IcNeighborHoodDao; -import com.epmet.dto.CustomerAgencyDTO; -import com.epmet.dto.IcBuildingDTO; -import com.epmet.dto.IcBuildingUnitDTO; -import com.epmet.dto.IcHouseDTO; +import com.epmet.dao.*; +import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.enums.HousePurposeEnums; @@ -56,6 +50,7 @@ import java.text.NumberFormat; import java.util.*; import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @Slf4j @@ -90,9 +85,12 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient; @Autowired private ExecutorService executorService; - @Autowired private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + @Autowired + private CustomerAgencyDao customerAgencyDao; + @Autowired + private CustomerGridDao customerGridDao; @Override @@ -374,7 +372,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { houseTotal.addAndGet(l.getNum()); if (l.getRentFlag() == 0) { resultDTO.setZzHouseTotal(l.getNum()); - } else if (l.getRentFlag() == 0) { + } else if (l.getRentFlag() == 1) { resultDTO.setCzHouseTotal(l.getNum()); } else { resultDTO.setXzHouseTotal(l.getNum()); @@ -395,7 +393,109 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { **/ @Override public List subUserHouseList(HouseChartFormDTO formDTO) { - return null; + List resultList = new ArrayList<>(); + //1.判断入参没值的赋值当前工作人员缓存所属组织信息 + if (StringUtils.isEmpty(formDTO.getOrgId())) { + //获取工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + formDTO.setOrgId(staffInfo.getAgencyId()); + formDTO.setOrgType("agency"); + } + if ("village".equals(formDTO.getOrgType())) { + return new ArrayList<>(); + } + //2.根据入参值查询直属下级列表(组织、网格、小区列表) + List idList = new ArrayList<>(); + Map map = new HashMap<>(); + String orgType = ""; + if ("agency".equals(formDTO.getOrgType())) { + //获取组织缓存，判断组织级别 + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getOrgId()); + if (null == agencyInfo) { + throw new RenException(String.format("查询组织信息失败%s", formDTO.getOrgId())); + } + //直属下级网格列表 + if ("community".equals(agencyInfo.getLevel())) { + orgType = "grid"; + List list = customerGridDao.selectGridList(formDTO.getOrgId()); + idList = list.stream().map(GridListResultDTO::getGridId).collect(Collectors.toList()); + map = list.stream().collect(Collectors.toMap(GridListResultDTO::getGridId, GridListResultDTO::getGridName, (k1, k2) -> k1)); + } else { + //直属下级组织列表 + orgType = "agency"; + List list = customerAgencyDao.selectAgencyList(formDTO.getOrgId()); + idList = list.stream().map(AgencyListResultDTO::getAgencyId).collect(Collectors.toList()); + map = list.stream().collect(Collectors.toMap(AgencyListResultDTO::getAgencyId, AgencyListResultDTO::getAgencyName, (k1, k2) -> k1)); + } + } else if ("grid".equals(formDTO.getOrgType())) { + //网格直属小区列表 + orgType = "village"; + List list = icNeighborHoodDao.selectNeighborList(formDTO.getOrgId()); + idList = list.stream().map(IcNeighborHoodDTO::getId).collect(Collectors.toList()); + map = list.stream().collect(Collectors.toMap(IcNeighborHoodDTO::getId, IcNeighborHoodDTO::getNeighborHoodName, (k1, k2) -> k1)); + } + + //3.分别查询直属下级列表的房屋、居民统计数据 + resultList = houseUserChartList(idList, map, orgType); + + return resultList; + } + + /** + * @Author sun + * @Description 【人房】房屋、居民统计列表数据 + **/ + private List houseUserChartList(List idList, Map map, String orgType) { + List list = new ArrayList<>(); + //1.直属下级列表的房屋数据 + List houseList = new ArrayList<>(); + HouseChartFormDTO houseDTO = new HouseChartFormDTO(); + houseDTO.setOrgType(orgType); + for (String id : idList) { + houseDTO.setOrgId(id); + houseList.add(houseChart(houseDTO)); + } + //2.直属下级列表的居民数据 + UserChartFormDTO userDTO = new UserChartFormDTO(); + userDTO.setOrgType(orgType); + userDTO.setIdList(idList); + Result> userResult = epmetUserOpenFeignClient.userChartList(userDTO); + if (!userResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民人房统计数据失败" + userResult.getInternalMsg(), userResult.getMsg()); + } + //3.汇总封装数据 + SubUserHouseListResultDTO dto = null; + for (String id : idList) { + dto = new SubUserHouseListResultDTO(); + dto.setOrgId(id); + dto.setOrgName(map.get(id)); + dto.setOrgType(orgType); + for (HouseChartResultDTO h : houseList) { + if (h.getOrgId().equals(id)) { + dto.setHouseTotal(h.getHouseTotal()); + dto.setZzHouseTotal(h.getZzHouseTotal()); + dto.setZzHouseRatio(h.getZzHouseRatio()); + dto.setCzHouseTotal(h.getCzHouseTotal()); + dto.setCzHouseRatio(h.getCzHouseRatio()); + dto.setXzHouseTotal(h.getXzHouseTotal()); + dto.setXzHouseRatio(h.getXzHouseRatio()); + } + } + for (UserChartResultDTO u : userResult.getData()) { + if (u.getOrgId().equals(id)) { + dto.setUserTotal(u.getUserTotal()); + dto.setCzUserTotal(u.getCzUserTotal()); + dto.setCzUserRatio(u.getCzUserRatio()); + dto.setLdUserTotal(u.getLdUserTotal()); + dto.setLdUserRatio(u.getLdUserRatio()); + } + } + list.add(dto); + } + return list; } } 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 911fae23fd..7efa9105e5 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 @@ -222,4 +222,22 @@ ) + + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java index 36ae55e8f7..14675f3046 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.form; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @author sun @@ -22,6 +23,9 @@ public class UserChartFormDTO implements Serializable { */ private String orgType; + //id集合 + private List idList; + //token这信息 private String customerId; private String userId; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java index aeda2e9605..de27fb4e2f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java @@ -22,23 +22,23 @@ public class UserChartResultDTO implements Serializable { /** * 居民总数 */ - private Integer userTotal; + private Integer userTotal = 0; /** * 常住人口总数 */ - private Integer czUserTotal; + private Integer czUserTotal = 0; /** * 常住人口占比（保留两位小数，带百分号的） */ - private String czUserRatio; + private String czUserRatio = "0%"; /** * 流动人口总数 */ - private Integer ldUserTotal; + private Integer ldUserTotal = 0; /** * 流动人口占比（保留两位小数，带百分号的） */ - private String ldUserRatio; + private String ldUserRatio = "0%"; @JsonIgnore private Integer num; 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 415f818abe..787feb2cf1 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 @@ -1,7 +1,6 @@ package com.epmet.feign; -import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.security.dto.TokenDto; @@ -25,8 +24,8 @@ import java.util.Set; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:09 */ -// @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087") -@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class) + @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087") +//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class) public interface EpmetUserOpenFeignClient { /** @@ -721,4 +720,6 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/icresiuser/getexistuserbyhouseids") Result> getExistUserByHouseIds(@RequestBody List ids); + @PostMapping("/epmetuser/icresiuser/userchartlist") + Result> userChartList(@RequestBody UserChartFormDTO userDTO); } 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 0f9f38ea5c..7fc46de0d5 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 @@ -532,4 +532,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result> getExistUserByHouseIds(List ids) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getExistUserByHouseIds", ids); } + + @Override + public Result> userChartList(UserChartFormDTO userDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "userChartList", userDTO); + } } 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 3daa255a05..490767dff7 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 @@ -894,7 +894,6 @@ public class IcResiUserController implements ResultDataResolver { * @Author sun * @Description 【人房】居民总数饼图 **/ - @NoRepeatSubmit @PostMapping("userchart") public Result userChart(@LoginUser TokenDto tokenDto, @RequestBody UserChartFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -902,4 +901,13 @@ public class IcResiUserController implements ResultDataResolver { return new Result().ok(icResiUserService.userChart(formDTO)); } + /** + * @Author sun + * @Description 【人房】居民总数列表数据 + **/ + @PostMapping("userchartlist") + public Result> userChartList(@RequestBody UserChartFormDTO formDTO) { + return new Result>().ok(icResiUserService.userChartList(formDTO)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 7f438c4401..11c9397558 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -250,4 +250,10 @@ public interface IcResiUserService extends BaseService { * @Description 【人房】居民总数饼图 **/ UserChartResultDTO userChart(UserChartFormDTO formDTO); + + /** + * @Author sun + * @Description 【人房】居民总数列表数据 + **/ + List userChartList(UserChartFormDTO formDTO); } 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 65b5d29498..28f3b96d60 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 @@ -1637,4 +1637,20 @@ public class IcResiUserServiceImpl extends BaseServiceImpl userChartList(UserChartFormDTO formDTO) { + List userList = new ArrayList<>(); + UserChartFormDTO userDTO = new UserChartFormDTO(); + userDTO.setOrgType(formDTO.getOrgType()); + for (String id : formDTO.getIdList()) { + userDTO.setOrgId(id); + userList.add(userChart(userDTO)); + } + return userList; + } + } From e00aa5d2d2833344d678bfa73026a93a7fd58f2d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Apr 2022 16:35:52 +0800 Subject: [PATCH 251/391] =?UTF-8?q?=E8=AF=95=E8=AF=95notnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 88cf85dc61..48b60b59b6 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 @@ -73,6 +73,17 @@ and ${subCondition.tableName}.${subCondition.columnName} between #{subCondition.columnValue[0]} and #{subCondition.columnValue[1]} + + + + and ${subCondition.tableName}.${subCondition.columnName} is not null + and ${subCondition.tableName}.${subCondition.columnName} !='' + + + and (${subCondition.tableName}.${subCondition.columnName} is null + or ${subCondition.tableName}.${subCondition.columnName} ='') + + From 9d0cc9c37d79f2ba875222de8785c3cbe85542e8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Apr 2022 16:47:23 +0800 Subject: [PATCH 252/391] =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 48b60b59b6..e59c1e9862 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 @@ -75,11 +75,11 @@ - + and ${subCondition.tableName}.${subCondition.columnName} is not null and ${subCondition.tableName}.${subCondition.columnName} !='' - + and (${subCondition.tableName}.${subCondition.columnName} is null or ${subCondition.tableName}.${subCondition.columnName} ='') From 8ec479a29370afb11f258ae35da0d71af80529a8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Apr 2022 16:54:31 +0800 Subject: [PATCH 253/391] == --- .../src/main/resources/mapper/IcResiUserDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 e59c1e9862..d4e385abc1 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 @@ -75,11 +75,11 @@ - + and ${subCondition.tableName}.${subCondition.columnName} is not null and ${subCondition.tableName}.${subCondition.columnName} !='' - + and (${subCondition.tableName}.${subCondition.columnName} is null or ${subCondition.tableName}.${subCondition.columnName} ='') From 1efd3cd6634dde15af6a981de5dbaa9927f110a8 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 22 Apr 2022 17:20:09 +0800 Subject: [PATCH 254/391] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=E6=9A=82?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/AuthCodeUtil.java | 389 ++++++++++++++++++ 1 file changed, 389 insertions(+) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/AuthCodeUtil.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/AuthCodeUtil.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/AuthCodeUtil.java new file mode 100644 index 0000000000..0ca2ab6412 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/AuthCodeUtil.java @@ -0,0 +1,389 @@ +package com.epmet.commons.tools.utils; + +import lombok.extern.slf4j.Slf4j; + +import java.io.*; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.*; + +/** + * desc: 市北大数据局的工具 + * + * @return + * @author LiuJanJun + * @date 2022/4/22 5:19 下午 + */ +@Slf4j +public class AuthCodeUtil { + + public enum DiscuzAuthcodeMode { + Encode, Decode + } + + /** + *

+ * 从字符串的指定位置截取指定长度的子字符串 + * + * 原字符串 + * 子字符串的起始位置 + * 子字符串的长度 + * 子字符串 + */ + public static String CutString(String str, int startIndex, int length) { + if (startIndex >= 0) { + if (length < 0) { + length = length * -1; + if (startIndex - length < 0) { + length = startIndex; + startIndex = 0; + } else { + startIndex = startIndex - length; + } + } + + if (startIndex > str.length()) { + return ""; + } + + } else { + if (length < 0) { + return ""; + } else { + if (length + startIndex > 0) { + length = length + startIndex; + startIndex = 0; + } else { + return ""; + } + } + } + + if (str.length() - startIndex < length) { + + length = str.length() - startIndex; + } + + return str.substring(startIndex, startIndex + length); + } + + /** + * + * 从字符串的指定位置开始截取到字符串结尾的了符串 + * + * 原字符串 + * 子字符串的起始位置 + * 子字符串 + */ + public static String CutString(String str, int startIndex) { + return CutString(str, startIndex, str.length()); + } + + /** + * + * 返回文件是否存在 + * + * 文件名 + * 是否存在 + */ + public static boolean FileExists(String filename) { + File f = new File(filename); + return f.exists(); + } + + /** + * + * MD5函数 + * + * 原始字符串 + * MD5结果 + */ + public static String MD5(String str) { + StringBuffer sb = new StringBuffer(); + String part = null; + try { + MessageDigest md = MessageDigest.getInstance("MD5"); + byte[] md5 = md.digest(str.getBytes()); + + for (int i = 0; i < md5.length; i++) { + part = Integer.toHexString(md5[i] & 0xFF); + if (part.length() == 1) { + part = "0" + part; + } + sb.append(part); + } + + } catch (NoSuchAlgorithmException ex) { + } + return sb.toString(); + } + + /** + * + * 字段串是否为Null或为""(空) + * + * + * + */ + public static boolean StrIsNullOrEmpty(String str) { + // if NET1 + if (str == null || str.trim().equals("")) { + return true; + } + + return false; + } + + /** + * + * 用于 RC4 处理密码 + * + * 密码字串 + * 密钥长度，一般为 256 + * + */ + static private byte[] GetKey(byte[] pass, int kLen) { + byte[] mBox = new byte[kLen]; + + for (int i = 0; i < kLen; i++) { + mBox[i] = (byte) i; + } + + int j = 0; + for (int i = 0; i < kLen; i++) { + + j = (j + (int) ((mBox[i] + 256) % 256) + pass[i % pass.length]) + % kLen; + + byte temp = mBox[i]; + mBox[i] = mBox[j]; + mBox[j] = temp; + } + + return mBox; + } + + /** + * + * 生成随机字符 + * + * 随机字符长度 + * 随机字符 + */ + public static String RandomString(int lens) { + char[] CharArray = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'k', + 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', + 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; + int clens = CharArray.length; + String sCode = ""; + Random random = new Random(); + for (int i = 0; i < lens; i++) { + sCode += CharArray[Math.abs(random.nextInt(clens))]; + } + return sCode; + } + + /** + * + * 使用 Discuz authcode 方法对字符串加密 + * + * 原始字符串 + * 密钥 + * 加密字串有效时间，单位是秒 + * 加密结果 + */ + public static String authcodeEncode(String source, String key, int expiry) { + return authcode(source, key, DiscuzAuthcodeMode.Encode, expiry); + + } + + /** + * + * 使用 Discuz authcode 方法对字符串加密 + * + * 原始字符串 + * 密钥 + * 加密结果 + */ + public static String authcodeEncode(String source, String key) { + return authcode(source, key, DiscuzAuthcodeMode.Encode, 0); + + } + + /** + * + * 使用 Discuz authcode 方法对字符串解密 + * + * 原始字符串 + * 密钥 + * 解密结果 + */ + public static String authcodeDecode(String source, String key) { + return authcode(source, key, DiscuzAuthcodeMode.Decode, 0); + + } + + /** + * + * 使用 变形的 rc4 编码方法对字符串进行加密或者解密 + * + * 原始字符串 + * 密钥 + * 操作 加密还是解密 + * 加密字串过期时间 + * 加密或者解密后的字符串 + */ + private static String authcode(String source, String key, + DiscuzAuthcodeMode operation, int expiry) { + try { + if (source == null || key == null) { + return ""; + } + + int ckey_length = 4; + String keya, keyb, keyc, cryptkey, result; + + key = MD5(key); + + keya = MD5(CutString(key, 0, 16)); + + keyb = MD5(CutString(key, 16, 16)); + + keyc = ckey_length > 0 ? (operation == DiscuzAuthcodeMode.Decode ? CutString( + source, 0, ckey_length) : RandomString(ckey_length)) + : ""; + + cryptkey = keya + MD5(keya + keyc); + + if (operation == DiscuzAuthcodeMode.Decode) { + byte[] temp; + + temp = Base64.getDecoder().decode(CutString(source, ckey_length)); + result = new String(RC4(temp, cryptkey)); + if (CutString(result, 10, 16).equals( + CutString(MD5(CutString(result, 26) + keyb), 0, 16))) { + return CutString(result, 26); + } else { + temp = Base64.getDecoder().decode(CutString(source + "=", ckey_length)); + result = new String(RC4(temp, cryptkey)); + if (CutString(result, 10, 16) + .equals(CutString( + MD5(CutString(result, 26) + keyb), 0, 16))) { + return CutString(result, 26); + } else { + temp = Base64.getDecoder().decode(CutString(source + "==", + ckey_length)); + result = new String(RC4(temp, cryptkey)); + if (CutString(result, 10, 16).equals( + CutString(MD5(CutString(result, 26) + keyb), 0, + 16))) { + return CutString(result, 26); + } else { + return "2"; + } + } + } + } else { + source = "0000000000" + CutString(MD5(source + keyb), 0, 16) + + source; + + byte[] temp = RC4(source.getBytes("GBK"), cryptkey); + + return keyc + Base64.getEncoder().encode(temp); + + } + } catch (Exception e) { + return ""; + } + + } + + /** + * + * RC4 原始算法 + * + * 原始字串数组 + * 密钥 + * 处理后的字串数组 + */ + private static byte[] RC4(byte[] input, String pass) { + if (input == null || pass == null) + return null; + + byte[] output = new byte[input.length]; + byte[] mBox = GetKey(pass.getBytes(), 256); + + // 加密 + int i = 0; + int j = 0; + + for (int offset = 0; offset < input.length; offset++) { + i = (i + 1) % mBox.length; + j = (j + (int) ((mBox[i] + 256) % 256)) % mBox.length; + + byte temp = mBox[i]; + mBox[i] = mBox[j]; + mBox[j] = temp; + byte a = input[offset]; + + // byte b = mBox[(mBox[i] + mBox[j] % mBox.Length) % mBox.Length]; + // mBox[j] 一定比 mBox.Length 小，不需要在取模 + byte b = mBox[(toInt(mBox[i]) + toInt(mBox[j])) % mBox.length]; + + output[offset] = (byte) ((int) a ^ (int) toInt(b)); + } + + return output; + } + + public static int toInt(byte b) { + return (int) ((b + 256) % 256); + } + + public long getUnixTimestamp() { + Calendar cal = Calendar.getInstance(); + return cal.getTimeInMillis() / 1000; + } + + public static void main(String[] args) throws IOException { + getStr(); + //readFile02("/Users/liujianjun/Downloads/abc.txt"); + } + + + /** + * 读取一个文本 一行一行读取 + * + * @param path + * @return + * @throws IOException + */ + private static void readFile02(String path) throws IOException { + // 使用一个字符串集合来存储文本中的路径 ，也可用String []数组 + List list = new ArrayList(); + FileInputStream fis = new FileInputStream(path); + // 防止路径乱码 如果utf-8 乱码 改GBK eclipse里创建的txt 用UTF-8，在电脑上自己创建的txt 用GBK + InputStreamReader isr = new InputStreamReader(fis, StandardCharsets.UTF_8); + BufferedReader br = new BufferedReader(isr); + String line = ""; + String result = null; + while ((line = br.readLine()) != null) { + String key = "TvFwHe6tGA"; + result = AuthCodeUtil.authcodeDecode(line, key); + System.out.println(result); + } + br.close(); + isr.close(); + fis.close(); + System.out.println("==========end"); + } + + private static void getStr(){ + String tel = "4fb1lYySlVqMUaf/LnlBEM1nDZgCKnX+Q52azUGgSLCV0hioBvLFFZoJS1Vu"; + tel = "a1孙1增勤"; + String result = AuthCodeUtil.authcodeDecode(tel, "TvFwHe6tGA"); + System.out.println(result); + } + +} From d0351bb71907fcc1e2470c755557d7bed6e3d62c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Apr 2022 18:08:07 +0800 Subject: [PATCH 255/391] test --- .../src/main/resources/mapper/IcResiUserDao.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 d4e385abc1..fcd73a88ea 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 @@ -75,11 +75,12 @@ - + and ic_resi_user.customer_id='45687aa479955f9d06204d415238f7cc' + and ${subCondition.tableName}.${subCondition.columnName} is not null and ${subCondition.tableName}.${subCondition.columnName} !='' - + and (${subCondition.tableName}.${subCondition.columnName} is null or ${subCondition.tableName}.${subCondition.columnName} ='') From 1903169f629c10e6c4346509e8b08c00870dd52c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Apr 2022 18:17:43 +0800 Subject: [PATCH 256/391] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 1 - 1 file changed, 1 deletion(-) 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 fcd73a88ea..2e07d92f30 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 @@ -75,7 +75,6 @@ - and ic_resi_user.customer_id='45687aa479955f9d06204d415238f7cc' and ${subCondition.tableName}.${subCondition.columnName} is not null and ${subCondition.tableName}.${subCondition.columnName} !='' From 3f45eb906b4559f6888c6a160c487eb7c477cecd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Apr 2022 18:20:52 +0800 Subject: [PATCH 257/391] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 2e07d92f30..7df73ad0ba 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 @@ -112,6 +112,17 @@ and ${subCondition.tableName}.${subCondition.columnName} between #{subCondition.columnValue[0]} and #{subCondition.columnValue[1]} + + + + and ${subCondition.tableName}.${subCondition.columnName} is not null + and ${subCondition.tableName}.${subCondition.columnName} !='' + + + and (${subCondition.tableName}.${subCondition.columnName} is null + or ${subCondition.tableName}.${subCondition.columnName} ='') + + From f3ff791ec3bf7612e52aa10d68b5fedffb794a67 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 23 Apr 2022 22:00:32 +0800 Subject: [PATCH 258/391] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E9=85=8D=E7=BD=AEde=E5=AF=BC=E5=87=BA=E7=9A=84?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=92=8C=E5=AD=97=E6=AE=B5=20=E6=8C=89?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=BF=94=E5=9B=9E=E5=B9=B6=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/AuthCodeUtil.java | 2 +- .../tools/validator/group/ExportGroup.java | 19 ++++++ .../dto/form/IcExportTemplateFormDTO.java | 39 +++++++++++ .../dto/result/IcCustomExportResultDTO.java | 40 ++++++++++++ .../IcExportTemplateForExportResultDTO.java | 64 +++++++++++++++++++ .../feign/OperCustomizeOpenFeignClient.java | 8 +++ .../OperCustomizeOpenFeignClientFallback.java | 5 ++ .../IcExportTemplateController.java | 25 ++++++-- .../com/epmet/dao/IcExportTemplateDao.java | 9 ++- .../epmet/entity/IcExportTemplateEntity.java | 3 - .../service/IcExportTemplateService.java | 14 +++- .../impl/IcExportTemplateServiceImpl.java | 39 +++++++++-- .../resources/mapper/IcExportTemplateDao.xml | 11 +++- .../epmet/dto/form/IcResiUserPageFormDTO.java | 4 ++ .../controller/IcResiUserController.java | 43 +++++++------ .../service/IcResiUserExportService.java | 24 +++++++ .../impl/IcResiUserExportServiceImpl.java | 48 ++++++++++++++ 17 files changed, 361 insertions(+), 36 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/group/ExportGroup.java create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserExportService.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/AuthCodeUtil.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/AuthCodeUtil.java index 0ca2ab6412..53dfcd5411 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/AuthCodeUtil.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/AuthCodeUtil.java @@ -24,7 +24,7 @@ public class AuthCodeUtil { /** * - * 从字符串的指定位置截取指定长度的子字符串 + * 从字符串的指定位置截取指定长度的子字符串￿ * * 原字符串 * 子字符串的起始位置 diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/group/ExportGroup.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/group/ExportGroup.java new file mode 100644 index 0000000000..4b6f21b833 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/group/ExportGroup.java @@ -0,0 +1,19 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.commons.tools.validator.group; + +/** + * 导出 Group + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +public interface ExportGroup { + +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java new file mode 100644 index 0000000000..e55e1e020e --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java @@ -0,0 +1,39 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 自定义表单导出模板 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-04-21 + */ +@Data +public class IcExportTemplateFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 模板主键 + */ + private String tempId; + + /** + * 客户id + */ + private String customerId; + + /** + * 表单CODE，从字典获取 + */ + private String formCode; + + /** + * 模板名称 + */ + private String name; + +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java new file mode 100644 index 0000000000..19b1dc1974 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java @@ -0,0 +1,40 @@ +package com.epmet.dto.result; + +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + + +/** + * 自定义表单导出模板配置项 for 导出时使用 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-04-21 + */ +@Data +public class IcCustomExportResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 表头 + */ + private List> headers = new ArrayList<>(); + + + /** + * sql中要返回的 列名 顺序跟表头顺序一致 + */ + private List sqlColumns; + + @AllArgsConstructor + @Data + public static class SqlColumn { + private String tableName; + private String columnName; + } + +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java new file mode 100644 index 0000000000..7dc27c898a --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java @@ -0,0 +1,64 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +/** + * 自定义表单导出模板配置项 for 导出时使用 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-04-21 + */ +@Data +public class IcExportTemplateForExportResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 模板主键id + */ + private String tempId; + + /** + * 父id + */ + private String pid; + + /** + * 表头宽度 + */ + private Integer width; + + /** + * 项标签 + */ + private String label; + + /** + * 排序 + */ + private Integer sort; + + /** + * 表名 + */ + private String tableName; + /** + * 列名 + */ + private String columnName; + + /** + * 子节点 + */ + private List children; + +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index c714bd77e1..65b1d43609 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -161,4 +161,12 @@ public interface OperCustomizeOpenFeignClient { */ @PostMapping("/oper/customize/icformitem/resi-category-items/list") Result> listResiCategoryItems(@RequestParam("customer-id") String customerId); + + /** + * 查询要导出的表头和sql返回结果的列的 用于导出 + * @param param + * @return + */ + @PostMapping("/oper/customize/icExportTemplate/getExcelHeaderAndSqlColumnForExport") + Result getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateFormDTO param); } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java index a8fdcbff41..19a01082cc 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java @@ -124,4 +124,9 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe public Result> listResiCategoryItems(String customerId) { return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "listResiCategoryItems", customerId); } + + @Override + public Result getExcelHeaderAndSqlColumnForExport(IcExportTemplateFormDTO param) { + return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getExcelHeaderAndSqlColumnForExport", param); + } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java index 64ea75254e..7804e07bb8 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java @@ -7,7 +7,10 @@ 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.ExportGroup; import com.epmet.dto.IcExportTemplateDTO; +import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.service.IcExportTemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,20 +32,20 @@ public class IcExportTemplateController { private IcExportTemplateService icExportTemplateService; @RequestMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = icExportTemplateService.page(params); return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { IcExportTemplateDTO data = icExportTemplateService.get(id); return new Result().ok(data); } @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody IcExportTemplateDTO dto){ + public Result save(@RequestBody IcExportTemplateDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); icExportTemplateService.save(dto); @@ -51,12 +54,24 @@ public class IcExportTemplateController { @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); icExportTemplateService.delete(ids); return new Result(); } + /** + * desc:查询要导出的表头和sql返回结果的列的 用于导出 + * + * @param param + * @return + */ + @PostMapping("getExcelHeaderAndSqlColumnForExport") + public Result getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateFormDTO param) { + ValidatorUtils.validateEntity(param, ExportGroup.class); + return new Result().ok(icExportTemplateService.getTemplateConfigForExport(param)); + } + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java index cfcad2875c..8cf3df7aa5 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.result.IcExportTemplateForExportResultDTO; import com.epmet.entity.IcExportTemplateEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 自定义表单导出模板 * @@ -12,5 +16,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcExportTemplateDao extends BaseDao { - -} \ No newline at end of file + + List getTemplateConfigForExport(IcExportTemplateFormDTO param); +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateEntity.java index 433f78b4aa..0fbf031dc8 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateEntity.java @@ -1,13 +1,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 自定义表单导出模板 * diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java index 8aeeaea6d2..cc6e7fdd1c 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.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.IcExportTemplateDTO; +import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.entity.IcExportTemplateEntity; import java.util.List; @@ -75,4 +77,14 @@ public interface IcExportTemplateService extends BaseService + * @author LiuJanJun + * @date 2022/4/22 3:55 下午 + */ + IcCustomExportResultDTO getTemplateConfigForExport(IcExportTemplateFormDTO param); +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index 9e88bda150..d965df9f47 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -8,15 +8,19 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IcExportTemplateDao; import com.epmet.dto.IcExportTemplateDTO; +import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.result.IcCustomExportResultDTO; +import com.epmet.dto.result.IcExportTemplateForExportResultDTO; import com.epmet.entity.IcExportTemplateEntity; import com.epmet.service.IcExportTemplateService; 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 org.springframework.util.CollectionUtils; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** * 自定义表单导出模板 @@ -27,6 +31,8 @@ import java.util.Map; @Service public class IcExportTemplateServiceImpl extends BaseServiceImpl implements IcExportTemplateService { + @Autowired + private IcExportTemplateDao icExportTemplateDao; @Override public PageData page(Map params) { @@ -44,8 +50,8 @@ public class IcExportTemplateServiceImpl 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); @@ -80,4 +86,27 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl list = icExportTemplateDao.getTemplateConfigForExport(param); + if (CollectionUtils.isEmpty(list)) { + return null; + } + Map> resultTemp = list.stream().collect(Collectors.groupingBy(IcExportTemplateForExportResultDTO::getPid, LinkedHashMap::new, Collectors.toList())); + List> headerMap = new ArrayList<>(); + List sqlColumns = new ArrayList<>(); + resultTemp.forEach((pid, groupList) -> { + List headerGroupList = new ArrayList<>(); + for (IcExportTemplateForExportResultDTO item : groupList) { + headerGroupList.add(item.getLabel()); + sqlColumns.add(new IcCustomExportResultDTO.SqlColumn(item.getTableName(), item.getColumnName())); + } + headerMap.add(headerGroupList); + }); + IcCustomExportResultDTO result = new IcCustomExportResultDTO(); + result.setHeaders(headerMap); + result.setSqlColumns(sqlColumns); + return result; + } + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml index f94f6a62bf..34257f84bc 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml @@ -18,6 +18,15 @@ + - \ No newline at end of file + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java index 462353b404..cf3839437a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.validator.group.ExportGroup; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -43,5 +44,8 @@ public class IcResiUserPageFormDTO implements Serializable { */ private String keyword; + @NotBlank(message = "模板id不能为空", groups = ExportGroup.class) + private String templateId; + } 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 490767dff7..01763bf43b 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 @@ -58,6 +58,7 @@ import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.OperCustomizeOpenFeignClient; import com.epmet.feign.OssFeignClient; +import com.epmet.service.IcResiUserExportService; import com.epmet.service.IcResiUserImportService; import com.epmet.service.IcResiUserService; import feign.RequestInterceptor; @@ -124,6 +125,8 @@ public class IcResiUserController implements ResultDataResolver { @Autowired private IcResiUserImportService icResiUserImportService; @Autowired + private IcResiUserExportService icResiUserExportService; + @Autowired private RedisUtils redisUtils; @Autowired private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; @@ -396,6 +399,28 @@ public class IcResiUserController implements ResultDataResolver { } } + /** + * desc: 自定义导出居民信息 + * + * @param tokenDto + * @param pageFormDTO + * @param response + * @return void + * @author LiuJanJun + * @date 2021/11/19 4:24 下午 + * @remark:分页批量导出 oss目录在 各个环境对应的前缀文件夹/file-template/resi-template/客户ID.xlsx, + * 如果某个客户需要更新模版 则替换掉上面的模版文件；然后 更新缓存里的值或者删除也行 再导出就会下载新的模版了 + */ + @NoRepeatSubmit + @RequestMapping(value = "/exportExcelCustom") + public void exportExcelCustom(/*@LoginUser*/ TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws Exception { + //tokenDto.setUserId("9e37adcce6472152e6508a19d3683e02"); + //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc"); + ValidatorUtils.validateEntity(pageFormDTO, IcResiUserPageFormDTO.AddUserInternalGroup.class,ExportGroup.class); + //获取导出配置 + icResiUserExportService.exportIcResiUser(pageFormDTO,response); + + } /** * desc:根据客户id 先从oss下载模版,如果有没有则使用系统默认模板 如果不存在则返回null * @@ -872,24 +897,6 @@ public class IcResiUserController implements ResultDataResolver { return new Result>().ok(icResiUserService.getExistUserByHouseIds(ids)); } -// public static ThreadLocal tl = new ThreadLocal(); - - @PostMapping("test-async") - public Result testAsync(HttpServletRequest request){ -// tl.set("wxz"); - executorService.submit(() -> { - try { - Thread.sleep(500l); - log.info("[我是子线程]:" + EpmetRequestHolder.getHeader("app")); - System.out.println("---"); - } catch (InterruptedException e) { - log.error("method exception", e); - } - icResiUserImportService.testAsync(); - }); - return new Result(); - } - /** * @Author sun * @Description 【人房】居民总数饼图 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserExportService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserExportService.java new file mode 100644 index 0000000000..2ec2d51fbf --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserExportService.java @@ -0,0 +1,24 @@ +package com.epmet.service; + +import com.epmet.dto.form.IcResiUserPageFormDTO; + +import javax.servlet.http.HttpServletResponse; + +/** + *@Description 居民信息导出service + *@Author wangxianzhang + *@Date 2021/11/4 + */ +public interface IcResiUserExportService { + + /** + * desc: 根据条件查询居民信息并根据配置模板导出 + * + * @param pageFormDTO + * @param response + * @return void + * @author LiuJanJun + * @date 2022/4/22 1:35 下午 + */ + void exportIcResiUser(IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response); +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java new file mode 100644 index 0000000000..f06f1b35e5 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -0,0 +1,48 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.security.user.LoginUserUtil; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.form.IcResiUserPageFormDTO; +import com.epmet.dto.result.IcCustomExportResultDTO; +import com.epmet.feign.OperCustomizeOpenFeignClient; +import com.epmet.service.IcResiUserExportService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; + +/** + * desc: + * + * @author: LiuJanJun + * @date: 2022/4/22 1:36 下午 + * @version: 1.0 + */ +@Slf4j +@Service +public class IcResiUserExportServiceImpl implements IcResiUserExportService { + @Autowired + private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient; + @Autowired + private LoginUserUtil loginUserUtil; + /** + * desc: 根据条件查询居民信息并根据配置模板导出 + * + * @param pageFormDTO + * @param response + * @return void + * @author LiuJanJun + * @date 2022/4/22 1:35 下午 + */ + @Override + public void exportIcResiUser(IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) { + //获取模板条件 + IcExportTemplateFormDTO param = new IcExportTemplateFormDTO(); + param.setCustomerId(loginUserUtil.getLoginUserCustomerId()); + param.setTempId(pageFormDTO.getTemplateId()); + Result exportConfigResult = operCustomizeOpenFeignClient.getExcelHeaderAndSqlColumnForExport(param); + + } +} From 47ca3ec7d2b6bd5e6d4eac2706f6e49a3f519321 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 24 Apr 2022 09:23:49 +0800 Subject: [PATCH 259/391] ic_form_query_builder.validType --- .../java/com/epmet/entity/IcFormQueryBuilderEntity.java | 5 +++++ .../db/migration/V0.0.24__add_validtype_forbuild.sql | 6 ++++++ .../src/main/resources/mapper/IcFormItemDao.xml | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.24__add_validtype_forbuild.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java index 9534fc12d2..22f83887ba 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java @@ -72,6 +72,11 @@ public class IcFormQueryBuilderEntity extends BaseEpmetEntity { */ private String funType; + /** + * 手机号：mobile; 身份证：id_card；只能输入数字:num + */ + private String validType; + /** * 排序 */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.24__add_validtype_forbuild.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.24__add_validtype_forbuild.sql new file mode 100644 index 0000000000..0565333344 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.24__add_validtype_forbuild.sql @@ -0,0 +1,6 @@ +alter table ic_form_query_builder add COLUMN VALID_TYPE VARCHAR(32) COMMENT '手机号：mobile; 身份证：id_card；只能输入数字:num' after FUN_TYPE; + +update ic_form_query_builder set VALID_TYPE=( +select i.VALID_TYPE from ic_form_item i where i.id=FORM_ITEM_ID +and i.CUSTOMER_ID=CUSTOMER_ID +)where DEL_FLAG='0'; \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index fb85fcd58b..e23407e93f 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -77,7 +77,7 @@ b.ITEM_TYPE, i.ITEM_GROUP_ID, i.REQUIRED, - IFNULL(i.VALID_TYPE,'')as VALID_TYPE, + IFNULL(b.VALID_TYPE,'')as VALID_TYPE, IFNULL(i.DEFAULT_VALUE,'') as DEFAULT_VALUE, IFNULL(i.OPTION_SOURCE_TYPE,'') as OPTION_SOURCE_TYPE, IFNULL(i.OPTION_SOURCE_VALUE,'') as OPTION_SOURCE_VALUE, From ca16ad29f0f9ceb73044b82264fd63f88a7e2b45 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sun, 24 Apr 2022 10:05:29 +0800 Subject: [PATCH 260/391] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E7=9A=84=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E6=8B=86?= =?UTF-8?q?=E5=88=86=E4=B8=BA2=E7=BA=A7=E8=A1=A8=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcResiUserController.java | 3 ++- .../impl/IcResiUserImportServiceImpl.java | 2 +- .../excel/ic_resi_import_template.xls | Bin 81920 -> 73728 bytes 3 files changed, 3 insertions(+), 2 deletions(-) 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 01763bf43b..8d8365eec8 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 @@ -46,6 +46,7 @@ import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.ExportGroup; import com.epmet.constant.SystemMessageType; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcResiUserDTO; @@ -416,7 +417,7 @@ public class IcResiUserController implements ResultDataResolver { public void exportExcelCustom(/*@LoginUser*/ TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws Exception { //tokenDto.setUserId("9e37adcce6472152e6508a19d3683e02"); //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc"); - ValidatorUtils.validateEntity(pageFormDTO, IcResiUserPageFormDTO.AddUserInternalGroup.class,ExportGroup.class); + ValidatorUtils.validateEntity(pageFormDTO, IcResiUserPageFormDTO.AddUserInternalGroup.class, ExportGroup.class); //获取导出配置 icResiUserExportService.exportIcResiUser(pageFormDTO,response); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 4f49d6b2eb..882c6dcf42 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -90,7 +90,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res /** * 身份证号列序号 */ - public static final Integer ID_CARD_COLUMN_NO = 9; + public static final Integer ID_CARD_COLUMN_NO = 8; /** * 姓名列序号 */ diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index c2f556620eb25346967828a0fe429625aa26f325..b93a66e9afffe9a42b0f93c9bc4e62b45f114b23 100644 GIT binary patch literal 73728 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̼ba#&6|k+H)%T*SBxV7UU0hKWwdnopb$ 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 literal 81920 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 Date: Sun, 24 Apr 2022 10:41:47 +0800 Subject: [PATCH 261/391] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 8 ++++- .../epmet/dto/form/PageTripReportFormDTO.java | 5 +++ .../IcTripReportRecordController.java | 14 ++++++++ .../service/IcTripReportRecordService.java | 2 ++ .../impl/IcTripReportRecordServiceImpl.java | 36 +++++++++++++++++++ .../mapper/IcTripReportRecordDao.xml | 3 ++ 6 files changed, 67 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 19c09dc284..85f0e83a89 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -5,9 +5,11 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; @@ -24,11 +26,15 @@ public class IcTripReportRecordDTO implements Serializable { private static final long serialVersionUID = 1L; + public interface DetailViewGroup { + } + /** * 主键ID */ + @NotBlank(message = "id不能为空", groups = DetailViewGroup.class) @ExcelIgnore - private String id; + private String id; /** * 居民端用户所在网格id,数字社区居民所属网格id diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java index 80ecb83186..da2e899d96 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java @@ -52,4 +52,9 @@ public class PageTripReportFormDTO extends PageFormDTO implements Serializable { * 工作人员所属组织id */ private String agencyId; + + /** + * 查看详情时此列有值 + */ + private String id; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index a023634f5e..3f7dce489d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -82,6 +82,20 @@ public class IcTripReportRecordController implements ResultDataResolver { return new Result>().ok(page); } + /** + * 查看详情 + * @param formDTO + * @return + */ + @PostMapping("detail") + public Result detail(@LoginUser TokenDto tokenDto,@RequestBody IcTripReportRecordDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,IcTripReportRecordDTO.DetailViewGroup.class); + PageTripReportFormDTO pageTripReportFormDTO=new PageTripReportFormDTO(); + pageTripReportFormDTO.setCustomerId(tokenDto.getCustomerId()); + pageTripReportFormDTO.setUserId(tokenDto.getUserId()); + return new Result().ok(icTripReportRecordService.detail(pageTripReportFormDTO)); + } + /** * pc: 行程上报-新增 * @param formDTO diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java index ffd9f3db8d..32447f2d74 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java @@ -31,6 +31,8 @@ public interface IcTripReportRecordService extends BaseService page(PageTripReportFormDTO formDTO); + IcTripReportRecordDTO detail(PageTripReportFormDTO formDTO); + /** * 默认查询 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index af4c3c0357..97f5ed43e0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -426,4 +426,40 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl list = baseDao.pageList(formDTO); + if (CollectionUtils.isEmpty(list)) { + return null; + } + //3.查询最近一次通知时间、核算检测关注名单 + Map latestNotice = new HashMap<>(); + List gzIdCardList = new ArrayList<>(); + List idCardList = list.stream().map(m -> m.getIdCard()).distinct().collect(Collectors.toList()); + //如果不分页可能会有很多个身份证号 + List> partionList = ListUtils.partition(idCardList, NumConstant.ONE_HUNDRED); + partionList.forEach(l -> { + Map map = icNoticeService.getUserLatestNoticeTime(formDTO.getCustomerId(), l); + List gzIdCards = epidemicSpecialAttentionService.getHeSuanIdCardList(formDTO.getCustomerId(), l); + latestNotice.putAll(map); + gzIdCardList.addAll(gzIdCards); + }); + for (IcTripReportRecordDTO dto : list) { + //默认未加入 + dto.setHeSuanCheck(false); + dto.setHeSuanCheckDesc("未加入"); + if (CollectionUtils.isNotEmpty(gzIdCardList) && gzIdCardList.contains(dto.getIdCard())) { + dto.setHeSuanCheck(true); + dto.setHeSuanCheckDesc("已加入"); + } + if (MapUtils.isNotEmpty(latestNotice) && latestNotice.containsKey(dto.getIdCard())) { + dto.setLatestNoticeTime(latestNotice.get(dto.getIdCard())); + } + } + return list.get(NumConstant.ZERO); + } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 0ccd2c31d8..15a413748b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -56,6 +56,9 @@ AND ARRIVE_DATE #{endDate} + + AND r.id=#{id} + ORDER BY r.ARRIVE_DATE DESC From 55b6b9062cfae9a514a54c417bb0f360f23c3b9b Mon Sep 17 00:00:00 2001 From: jianjun Date: Sun, 24 Apr 2022 14:30:50 +0800 Subject: [PATCH 262/391] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84=E9=85=8D=E7=BD=AE=20=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E7=94=9F=E6=88=90excel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/IcExportTemplateFormDTO.java | 3 + .../epmet/dto/result/ConditionResultDTO.java | 2 +- .../dto/result/IcCustomExportResultDTO.java | 7 ++- .../IcExportTemplateForExportResultDTO.java | 11 ++-- .../java/com/epmet/dao/IcFormItemDao.java | 32 +++++++--- .../impl/IcExportTemplateServiceImpl.java | 62 ++++++++++++++++--- .../resources/mapper/IcExportTemplateDao.xml | 4 +- .../main/resources/mapper/IcFormItemDao.xml | 28 +++++++++ 8 files changed, 128 insertions(+), 21 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java index e55e1e020e..a7d52bf75b 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java @@ -1,7 +1,9 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.validator.group.ExportGroup; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; @@ -24,6 +26,7 @@ public class IcExportTemplateFormDTO implements Serializable { /** * 客户id */ + @NotBlank(message = "客户Id不能为空",groups = ExportGroup.class) private String customerId; /** diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java index 730d8fa0e5..fe2e7b03cb 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java @@ -14,7 +14,7 @@ import java.util.List; public class ConditionResultDTO implements Serializable { private static final long serialVersionUID = -2021200288758478252L; /** - * 父项ID + * ID */ private String itemId; diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java index 19b1dc1974..363714ab18 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java @@ -28,7 +28,12 @@ public class IcCustomExportResultDTO implements Serializable { /** * sql中要返回的 列名 顺序跟表头顺序一致 */ - private List sqlColumns; + private List showSqlColumns; + + /** + * sql中要返回的关联的列 (与显示的要去重) + */ + private List hiddenSqlColumns; @AllArgsConstructor @Data diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java index 7dc27c898a..a40407d03b 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java @@ -3,7 +3,6 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; -import java.util.List; /** @@ -47,6 +46,11 @@ public class IcExportTemplateForExportResultDTO implements Serializable { */ private Integer sort; + /** + * itemId + */ + private String itemId; + /** * 表名 */ @@ -55,10 +59,9 @@ public class IcExportTemplateForExportResultDTO implements Serializable { * 列名 */ private String columnName; - /** - * 子节点 + * 只有远程获取的才有值 */ - private List children; + private String optionSourceValue; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java index 89054811ec..bb02a5425c 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java @@ -38,8 +38,10 @@ public interface IcFormItemDao extends BaseDao { List selectConditionList(@Param("customerId") String customerId, @Param("formCode") String formCode); List selectConditionListByGroupId(String groupId); + /** * 查询组件列表 + * * @param customerId * @param formCode * @return @@ -53,28 +55,44 @@ public interface IcFormItemDao extends BaseDao { * * @param customerId * @param formCode - * @return java.util.List + * @return java.util.List * @author yinzuomei * @date 2021/11/1 12:58 下午 */ - List queryConditions(@Param("customerId") String customerId, @Param("formCode")String formCode); + List queryConditions(@Param("customerId") String customerId, @Param("formCode") String formCode); /** * 构造出所有子表关联语句 * * @param customerId * @param formCode - * @return java.util.List + * @return java.util.List * @author yinzuomei * @date 2021/11/1 1:25 下午 */ - List querySubTables(@Param("customerId") String customerId, @Param("formCode")String formCode); + List querySubTables(@Param("customerId") String customerId, @Param("formCode") String formCode); - Set queryIcResiSubTables(@Param("customerId") String customerId, @Param("formCode")String formCode); + Set queryIcResiSubTables(@Param("customerId") String customerId, @Param("formCode") String formCode); /** * @Author sun * @Description 居民信息新增查询各表必填字段 **/ - List getMustColumn(@Param("customerId")String customerId); -} \ No newline at end of file + List getMustColumn(@Param("customerId") String customerId); + + /** + * desc:获取需要远程获取并带有关联item的参数的 item项 + * + * @param customerId + * @param formCode + * @return + */ + List getConditionRemoteItems(@Param("customerId") String customerId, @Param("formCode") String formCode); + + /** + * desc:根据Id获取item对应的表名和item属性 + * @param itemId + * @return + */ + ConditionResultDTO getConditionItem(@Param("itemId") String itemId); +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index d965df9f47..9e72beb002 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -4,15 +4,20 @@ 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.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.utils.ConvertUtils; import com.epmet.dao.IcExportTemplateDao; +import com.epmet.dao.IcFormItemDao; import com.epmet.dto.IcExportTemplateDTO; import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.result.ConditionResultDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.dto.result.IcExportTemplateForExportResultDTO; import com.epmet.entity.IcExportTemplateEntity; import com.epmet.service.IcExportTemplateService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,11 +33,14 @@ import java.util.stream.Collectors; * @author generator generator@elink-cn.com * @since v1.0.0 2022-04-21 */ +@Slf4j @Service public class IcExportTemplateServiceImpl extends BaseServiceImpl implements IcExportTemplateService { @Autowired private IcExportTemplateDao icExportTemplateDao; + @Autowired + private IcFormItemDao icFormItemDao; @Override public PageData page(Map params) { @@ -92,21 +100,61 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl remoteItemList = icFormItemDao.getConditionRemoteItems(param.getCustomerId(), param.getFormCode()); Map> resultTemp = list.stream().collect(Collectors.groupingBy(IcExportTemplateForExportResultDTO::getPid, LinkedHashMap::new, Collectors.toList())); List> headerMap = new ArrayList<>(); - List sqlColumns = new ArrayList<>(); - resultTemp.forEach((pid, groupList) -> { + List showSqlColumns = new ArrayList<>(); + List hiddenSqlColumns = new ArrayList<>(); + Set hasExistColumnSet = new HashSet<>(); + resultTemp.get(NumConstant.ZERO_STR).forEach(root -> { List headerGroupList = new ArrayList<>(); - for (IcExportTemplateForExportResultDTO item : groupList) { - headerGroupList.add(item.getLabel()); - sqlColumns.add(new IcCustomExportResultDTO.SqlColumn(item.getTableName(), item.getColumnName())); - } + digui(resultTemp, root, headerGroupList, showSqlColumns, hiddenSqlColumns, hasExistColumnSet); headerMap.add(headerGroupList); }); + //组织 关联item项的 + if (hasExistColumnSet.size() > NumConstant.ZERO) { + Set configItemIdSet = list.stream().map(IcExportTemplateForExportResultDTO::getItemId).collect(Collectors.toSet()); + System.out.println("参数的ItemId:" + hasExistColumnSet); + System.out.println("需要显示的itemId:" + configItemIdSet); + Set conditionItemIdSet = new HashSet<>(hasExistColumnSet); + conditionItemIdSet.removeAll(configItemIdSet); + System.out.println("额外需要查询的列:" + conditionItemIdSet); + conditionItemIdSet.forEach(itemId -> { + ConditionResultDTO item = icFormItemDao.getConditionItem(itemId); + if (item == null || StringUtils.isBlank(item.getColumnName())) { + log.error("getTemplateConfigForExport item 不存在 id:{}", itemId); + return; + } + hiddenSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(item.getTableName(), item.getColumnName())); + }); + } + IcCustomExportResultDTO result = new IcCustomExportResultDTO(); result.setHeaders(headerMap); - result.setSqlColumns(sqlColumns); + result.setShowSqlColumns(showSqlColumns); + result.setHiddenSqlColumns(hiddenSqlColumns); return result; } + private void digui(Map> resultTemp, IcExportTemplateForExportResultDTO root, List headerList, List showSqlColumns, List hiddenSqlColumns, Set hasExistColumnSet) { + headerList.add(root.getLabel()); + if (StringUtils.isNotBlank(root.getColumnName())) { + showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getTableName(), root.getColumnName())); + if (StringUtils.isNotBlank(root.getOptionSourceValue())) { + String[] paramArr = root.getOptionSourceValue().split(StrConstant.QUESTION_MARK_TRANSFER)[NumConstant.ONE].split(StrConstant.AND_MARK); + System.out.println("========" + root.getOptionSourceValue()); + //先remote中再添加 然后移除item中有的 + hasExistColumnSet.addAll(Arrays.asList(paramArr)); + } + } + List children = resultTemp.get(root.getId()); + if (CollectionUtils.isEmpty(children)) { + return; + } + children.forEach(o -> { + digui(resultTemp, o, headerList, showSqlColumns, hiddenSqlColumns, hasExistColumnSet); + }); + } + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml index 34257f84bc..325b844347 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml @@ -20,9 +20,11 @@ + + From 061b725fa9e7dd4d22b6ed8e1d1c3f25f06b41e0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sun, 24 Apr 2022 14:34:11 +0800 Subject: [PATCH 263/391] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84=E9=85=8D=E7=BD=AE=20=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E7=94=9F=E6=88=90excel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcExportTemplateServiceImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index 9e72beb002..fda8e0fecd 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -115,11 +115,9 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl NumConstant.ZERO) { Set configItemIdSet = list.stream().map(IcExportTemplateForExportResultDTO::getItemId).collect(Collectors.toSet()); - System.out.println("参数的ItemId:" + hasExistColumnSet); - System.out.println("需要显示的itemId:" + configItemIdSet); + Set conditionItemIdSet = new HashSet<>(hasExistColumnSet); conditionItemIdSet.removeAll(configItemIdSet); - System.out.println("额外需要查询的列:" + conditionItemIdSet); conditionItemIdSet.forEach(itemId -> { ConditionResultDTO item = icFormItemDao.getConditionItem(itemId); if (item == null || StringUtils.isBlank(item.getColumnName())) { @@ -143,7 +141,6 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl Date: Sun, 24 Apr 2022 16:05:22 +0800 Subject: [PATCH 264/391] list_equal --- .../src/main/resources/mapper/IcResiUserDao.xml | 6 ++++++ 1 file changed, 6 insertions(+) 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 7df73ad0ba..55dc3aa815 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 @@ -84,6 +84,12 @@ or ${subCondition.tableName}.${subCondition.columnName} ='') + + + + ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{colValue},'%') + + From b2f8d5b86290c0751d26e9698417b652ec3cebe1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sun, 24 Apr 2022 16:22:05 +0800 Subject: [PATCH 265/391] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84=E9=85=8D=E7=BD=AE=20=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E7=94=9F=E6=88=90excel=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/IcCustomExportResultDTO.java | 2 ++ .../feign/OperCustomizeOpenFeignClient.java | 4 ++-- .../impl/IcExportTemplateServiceImpl.java | 18 +++++++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java index 363714ab18..d3ff2b2e22 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java @@ -2,6 +2,7 @@ package com.epmet.dto.result; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.ArrayList; @@ -35,6 +36,7 @@ public class IcCustomExportResultDTO implements Serializable { */ private List hiddenSqlColumns; + @NoArgsConstructor @AllArgsConstructor @Data public static class SqlColumn { diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index 65b1d43609..f461c4cf9e 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -25,8 +25,8 @@ import java.util.Set; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:16 */ -// @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089") -@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class) + @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089") +//@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class) public interface OperCustomizeOpenFeignClient { @PostMapping(value = "/oper/customize/customerfootbar/customerfootbars", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index fda8e0fecd..d5bdca582f 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -103,14 +103,12 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl remoteItemList = icFormItemDao.getConditionRemoteItems(param.getCustomerId(), param.getFormCode()); Map> resultTemp = list.stream().collect(Collectors.groupingBy(IcExportTemplateForExportResultDTO::getPid, LinkedHashMap::new, Collectors.toList())); - List> headerMap = new ArrayList<>(); + List> headerList = new ArrayList<>(); List showSqlColumns = new ArrayList<>(); List hiddenSqlColumns = new ArrayList<>(); Set hasExistColumnSet = new HashSet<>(); resultTemp.get(NumConstant.ZERO_STR).forEach(root -> { - List headerGroupList = new ArrayList<>(); - digui(resultTemp, root, headerGroupList, showSqlColumns, hiddenSqlColumns, hasExistColumnSet); - headerMap.add(headerGroupList); + digui(resultTemp, root, headerList, showSqlColumns, hiddenSqlColumns, hasExistColumnSet); }); //组织 关联item项的 if (hasExistColumnSet.size() > NumConstant.ZERO) { @@ -129,14 +127,16 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl> resultTemp, IcExportTemplateForExportResultDTO root, List headerList, List showSqlColumns, List hiddenSqlColumns, Set hasExistColumnSet) { - headerList.add(root.getLabel()); + private void digui(Map> resultTemp, IcExportTemplateForExportResultDTO root, List> headerList, List showSqlColumns, List hiddenSqlColumns, Set hasExistColumnSet) { + + + if (StringUtils.isNotBlank(root.getColumnName())) { showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getTableName(), root.getColumnName())); if (StringUtils.isNotBlank(root.getOptionSourceValue())) { @@ -150,6 +150,10 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl { + List headerGroupList = new ArrayList<>(); + headerGroupList.add(root.getLabel()); + headerGroupList.add(o.getLabel()); + headerList.add(headerGroupList); digui(resultTemp, o, headerList, showSqlColumns, hiddenSqlColumns, hasExistColumnSet); }); } From acad99746ddb8765a68d0ef21f564d0183fb2818 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Sun, 24 Apr 2022 16:52:56 +0800 Subject: [PATCH 266/391] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E6=A6=82=E8=A7=88=5F?= =?UTF-8?q?=E5=BA=94=E5=89=8D=E7=AB=AF=E8=A6=81=E6=B1=82=E4=B8=8D=E8=BF=94?= =?UTF-8?q?=E5=B8=A6%=E7=9A=84=E6=94=B9=E8=BF=94double?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/HouseChartResultDTO.java | 7 +++--- .../dto/result/SubUserHouseListResultDTO.java | 24 +++++++++---------- .../epmet/service/impl/HouseServiceImpl.java | 6 ++--- .../epmet/dto/result/UserChartResultDTO.java | 4 ++-- .../service/impl/IcResiUserServiceImpl.java | 4 ++-- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java index 676fe730f3..7a4e974162 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java @@ -1,6 +1,5 @@ package com.epmet.dto.result; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; @@ -31,7 +30,7 @@ public class HouseChartResultDTO implements Serializable { /** * 房屋自住总数占比（保留两位小数，带百分号的） */ - private String zzHouseRatio = "0%"; + private Double zzHouseRatio = 0.0; /** * 房屋常住总数 */ @@ -39,7 +38,7 @@ public class HouseChartResultDTO implements Serializable { /** * 房屋常住总数占比（保留两位小数，带百分号的） */ - private String czHouseRatio = "0%"; + private Double czHouseRatio = 0.0; /** * 房屋闲置总数 */ @@ -47,7 +46,7 @@ public class HouseChartResultDTO implements Serializable { /** * 房屋闲置总数占比（保留两位小数，带百分号的） */ - private String xzHouseRatio = "0%"; + private Double xzHouseRatio = 0.0; @JsonIgnore private Integer num; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java index c2771bb8f9..905dca051f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java @@ -25,50 +25,50 @@ public class SubUserHouseListResultDTO implements Serializable { /** * 房屋总数 */ - private Integer houseTotal; + private Integer houseTotal = 0; /** * 房屋自住总数 */ - private Integer zzHouseTotal; + private Integer zzHouseTotal = 0; /** * 房屋自住总数占比（保留两位小数，带百分号的） */ - private String zzHouseRatio; + private Double zzHouseRatio = 0.0; /** * 房屋常住总数 */ - private Integer czHouseTotal; + private Integer czHouseTotal = 0; /** * 房屋常住总数占比（保留两位小数，带百分号的） */ - private String czHouseRatio; + private Double czHouseRatio = 0.0; /** * 房屋闲置总数 */ - private Integer xzHouseTotal; + private Integer xzHouseTotal = 0; /** * 房屋闲置总数占比（保留两位小数，带百分号的） */ - private String xzHouseRatio; + private Double xzHouseRatio = 0.0; /** * 居民总数 */ - private Integer userTotal; + private Integer userTotal = 0; /** * 常住人口总数 */ - private Integer czUserTotal; + private Integer czUserTotal = 0; /** * 常住人口占比（保留两位小数，带百分号的） */ - private String czUserRatio; + private Double czUserRatio = 0.0; /** * 流动人口总数 */ - private Integer ldUserTotal; + private Integer ldUserTotal = 0; /** * 流动人口占比（保留两位小数，带百分号的） */ - private String ldUserRatio; + private Double ldUserRatio = 0.0; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 747c1b7ba3..b60c6f3fa5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -379,9 +379,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } }); resultDTO.setHouseTotal(houseTotal.get()); - resultDTO.setZzHouseRatio((resultDTO.getHouseTotal() == 0 || resultDTO.getZzHouseTotal() > resultDTO.getHouseTotal()) ? "0%" : numberFormat.format(((float) resultDTO.getZzHouseTotal() / (float) resultDTO.getHouseTotal()) * 100) + "%"); - resultDTO.setCzHouseRatio((resultDTO.getHouseTotal() == 0 || resultDTO.getCzHouseTotal() > resultDTO.getHouseTotal()) ? "0%" : numberFormat.format(((float) resultDTO.getCzHouseTotal() / (float) resultDTO.getHouseTotal()) * 100) + "%"); - resultDTO.setXzHouseRatio((resultDTO.getHouseTotal() == 0 || resultDTO.getXzHouseTotal() > resultDTO.getHouseTotal()) ? "0%" : numberFormat.format(((float) resultDTO.getXzHouseTotal() / (float) resultDTO.getHouseTotal()) * 100) + "%"); + resultDTO.setZzHouseRatio(Double.valueOf((resultDTO.getHouseTotal() == 0 || resultDTO.getZzHouseTotal() > resultDTO.getHouseTotal()) ? "0" : numberFormat.format(((float) resultDTO.getZzHouseTotal() / (float) resultDTO.getHouseTotal()) * 100))); + resultDTO.setCzHouseRatio(Double.valueOf((resultDTO.getHouseTotal() == 0 || resultDTO.getCzHouseTotal() > resultDTO.getHouseTotal()) ? "0" : numberFormat.format(((float) resultDTO.getCzHouseTotal() / (float) resultDTO.getHouseTotal()) * 100))); + resultDTO.setXzHouseRatio(Double.valueOf((resultDTO.getHouseTotal() == 0 || resultDTO.getXzHouseTotal() > resultDTO.getHouseTotal()) ? "0" : numberFormat.format(((float) resultDTO.getXzHouseTotal() / (float) resultDTO.getHouseTotal()) * 100))); resultDTO.setOrgId(formDTO.getOrgId()); resultDTO.setOrgType(formDTO.getOrgType()); return resultDTO; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java index de27fb4e2f..12f87fd20d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java @@ -30,7 +30,7 @@ public class UserChartResultDTO implements Serializable { /** * 常住人口占比（保留两位小数，带百分号的） */ - private String czUserRatio = "0%"; + private Double czUserRatio = 0.0; /** * 流动人口总数 */ @@ -38,7 +38,7 @@ public class UserChartResultDTO implements Serializable { /** * 流动人口占比（保留两位小数，带百分号的） */ - private String ldUserRatio = "0%"; + private Double ldUserRatio = 0.0; @JsonIgnore private Integer num; 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 28f3b96d60..3ee51fa718 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 @@ -1629,8 +1629,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl resultDTO.getUserTotal()) ? "0%" : numberFormat.format(((float) resultDTO.getCzUserTotal() / (float) resultDTO.getUserTotal()) * 100) + "%"); - resultDTO.setLdUserRatio((resultDTO.getUserTotal() == 0 || resultDTO.getLdUserTotal() > resultDTO.getUserTotal()) ? "0%" : numberFormat.format(((float) resultDTO.getLdUserTotal() / (float) resultDTO.getUserTotal()) * 100) + "%"); + resultDTO.setCzUserRatio(Double.valueOf((resultDTO.getUserTotal() == 0 || resultDTO.getCzUserTotal() > resultDTO.getUserTotal()) ? "0" : numberFormat.format(((float) resultDTO.getCzUserTotal() / (float) resultDTO.getUserTotal()) * 100))); + resultDTO.setLdUserRatio(Double.valueOf((resultDTO.getUserTotal() == 0 || resultDTO.getLdUserTotal() > resultDTO.getUserTotal()) ? "0" : numberFormat.format(((float) resultDTO.getLdUserTotal() / (float) resultDTO.getUserTotal()) * 100))); resultDTO.setOrgId(formDTO.getOrgId()); resultDTO.setOrgType(formDTO.getOrgType()); From 02abdd0d4928d31747d1d4798a07687ced20e5f9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sun, 24 Apr 2022 17:10:42 +0800 Subject: [PATCH 267/391] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84=E9=85=8D=E7=BD=AE=20=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E7=94=9F=E6=88=90excel=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/IcResiUserPageFormDTO.java | 11 +-- .../controller/IcResiUserController.java | 5 +- .../java/com/epmet/dao/IcResiUserDao.java | 3 +- .../com/epmet/service/IcResiUserService.java | 2 + .../impl/IcResiUserExportServiceImpl.java | 87 +++++++++++++++++-- .../service/impl/IcResiUserServiceImpl.java | 29 ++++--- .../main/resources/mapper/IcResiUserDao.xml | 11 ++- 7 files changed, 119 insertions(+), 29 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java index cf3839437a..7c9ac813c7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java @@ -1,10 +1,10 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.validator.group.ExportGroup; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; @@ -14,16 +14,10 @@ import java.util.List; * @Date 2021/10/27 2:06 下午 */ @Data -public class IcResiUserPageFormDTO implements Serializable { +public class IcResiUserPageFormDTO extends PageFormDTO implements Serializable { public interface AddUserInternalGroup { } - @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class) - private Integer pageNo; - - @NotNull(message = "pageSize不能为空", groups = AddUserInternalGroup.class) - private Integer pageSize; - @NotBlank(message = "formCode不能为空", groups = AddUserInternalGroup.class) private String formCode; @@ -34,7 +28,6 @@ public class IcResiUserPageFormDTO implements Serializable { * 表对应的字段及值 */ private List conditions; - private Boolean pageFlag; @NotBlank(message = "当前用户id不能为空", groups = AddUserInternalGroup.class) private String staffId; 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 8d8365eec8..c47c09eb8a 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 @@ -322,7 +322,7 @@ public class IcResiUserController implements ResultDataResolver { staffOrgPath = staffInfoCacheResult.getAgencyId(); } pageFormDTO.setCustomerId(customerId); - pageFormDTO.setPageFlag(false); + pageFormDTO.setIsPage(false); //获取模版文件 File file = getIcResiTemplateFile(customerId, IcUserTemplateEnums.IC_RESI_EXPORT_TEMPLATE); @@ -417,7 +417,8 @@ public class IcResiUserController implements ResultDataResolver { public void exportExcelCustom(/*@LoginUser*/ TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws Exception { //tokenDto.setUserId("9e37adcce6472152e6508a19d3683e02"); //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc"); - ValidatorUtils.validateEntity(pageFormDTO, IcResiUserPageFormDTO.AddUserInternalGroup.class, ExportGroup.class); + ValidatorUtils.validateEntity(pageFormDTO, ExportGroup.class); + pageFormDTO.setIsPage(false); //获取导出配置 icResiUserExportService.exportIcResiUser(pageFormDTO,response); 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 e5c726447b..5867161158 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 @@ -98,6 +98,7 @@ public interface IcResiUserDao extends BaseDao { * @param customerId 客户id * @param resultTableName 获取哪个表的数据？？？ * @param conditions 前端传入的查询入参 + * @param showSqlColumns * @return java.util.List> * @author yinzuomei * @date 2021/11/2 10:35 上午 @@ -106,7 +107,7 @@ public interface IcResiUserDao extends BaseDao { @Param("resultTableName") String resultTableName, @Param("conditions") List conditions, @Param("subTables") List subTables, - @Param("currentStaffAgencyId") String currentStaffAgencyId, + @Param("showSqlColumns") List showSqlColumns, @Param("currentStaffAgencyId") String currentStaffAgencyId, @Param("staffOrgPath") String staffOrgPath); /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 11c9397558..7e1bd31a0f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -256,4 +256,6 @@ public interface IcResiUserService extends BaseService { * @Description 【人房】居民总数列表数据 **/ List userChartList(UserChartFormDTO formDTO); + + List> dynamicQuery(String loginUserCustomerId, String formCode, String icResiUser, List showSqlColumns, List conditions, String agencyId, String finalStaffOrgPath); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index f06f1b35e5..561f654358 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -1,17 +1,35 @@ package com.epmet.service.impl; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.user.LoginUserUtil; +import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.FreezeAndFilter; +import com.epmet.constant.IcResiUserConstant; import com.epmet.dto.form.IcExportTemplateFormDTO; import com.epmet.dto.form.IcResiUserPageFormDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.feign.OperCustomizeOpenFeignClient; import com.epmet.service.IcResiUserExportService; +import com.epmet.service.IcResiUserService; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** * desc: @@ -27,6 +45,9 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient; @Autowired private LoginUserUtil loginUserUtil; + @Autowired + private IcResiUserService icResiUserService; + /** * desc: 根据条件查询居民信息并根据配置模板导出 * @@ -38,11 +59,67 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { */ @Override public void exportIcResiUser(IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) { - //获取模板条件 - IcExportTemplateFormDTO param = new IcExportTemplateFormDTO(); - param.setCustomerId(loginUserUtil.getLoginUserCustomerId()); - param.setTempId(pageFormDTO.getTemplateId()); - Result exportConfigResult = operCustomizeOpenFeignClient.getExcelHeaderAndSqlColumnForExport(param); + ExcelWriter excelWriter = null; + try { + //获取模板条件 + IcExportTemplateFormDTO param = new IcExportTemplateFormDTO(); + param.setCustomerId(loginUserUtil.getLoginUserCustomerId()); + param.setCustomerId("default"); + param.setTempId(pageFormDTO.getTemplateId()); + Result exportConfigResult = operCustomizeOpenFeignClient.getExcelHeaderAndSqlColumnForExport(param); + if (!exportConfigResult.success() || exportConfigResult.getData() == null) { + log.error("获取模板失败"); + return; + } + IcCustomExportResultDTO resultDTO = exportConfigResult.getData(); + FreezeAndFilter writeHandler = new FreezeAndFilter(); + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("居民基本信息.xlsx", response)).registerWriteHandler(writeHandler).build(); + WriteSheet writeSheet = EasyExcel.writerSheet().head(resultDTO.getHeaders()).build(); + + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(loginUserUtil.getLoginUserCustomerId(), loginUserUtil.getLoginUserId()); + String staffOrgPath = null; + if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) { + staffOrgPath = staffInfoCacheResult.getAgencyPIds().concat(StrConstant.COLON).concat(staffInfoCacheResult.getAgencyId()); + } else { + staffOrgPath = staffInfoCacheResult.getAgencyId(); + } + Page> mapListPage = null; + List allShowColumns = new ArrayList<>(resultDTO.getShowSqlColumns()); + allShowColumns.addAll(resultDTO.getHiddenSqlColumns()); + do { + String finalStaffOrgPath = staffOrgPath; + mapListPage = PageHelper.startPage(pageFormDTO.getPageNo(), pageFormDTO.getPageSize(), pageFormDTO.getIsPage()).doSelectPage(() -> { + icResiUserService.dynamicQuery(loginUserUtil.getLoginUserCustomerId(), pageFormDTO.getFormCode(), IcResiUserConstant.IC_RESI_USER, allShowColumns, pageFormDTO.getConditions(), staffInfoCacheResult.getAgencyId(), finalStaffOrgPath); + }); + pageFormDTO.setPageNo(pageFormDTO.getPageNo() + NumConstant.ONE); + + //todo + if (pageFormDTO.getPageNo() == 4) { + break; + } + } while (mapListPage != null && mapListPage.getResult().size() == pageFormDTO.getPageSize()); + List> result = mapListPage.getResult(); + + List> resultData = new ArrayList<>(); + result.forEach(o -> { + List singleResult = new ArrayList<>(); + o.values().forEach(value -> { + if (singleResult.size() < resultDTO.getShowSqlColumns().size()) { + singleResult.add(value); + } + }); + resultData.add(singleResult); + }); + log.debug("需要写入的data长度:{}", resultData.size()); + excelWriter.write(resultData, writeSheet); + } catch (IOException e) { + log.error("exportIcResiUser exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } } + } 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 3ee51fa718..7aa2b83751 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 @@ -67,6 +67,7 @@ import com.google.common.cache.CacheBuilder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -562,7 +563,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> pageInfo=new PageInfo<>(); - if (null == formDTO.getPageFlag()||formDTO.getPageFlag()) { + if (null == formDTO.getIsPage()||formDTO.getIsPage()) { //分页 String finalStaffOrgPath = staffOrgPath; pageInfo= PageHelper.startPage(formDTO.getPageNo(), @@ -746,21 +747,24 @@ public class IcResiUserServiceImpl extends BaseServiceImpl conditions, String currentStaffAgencyId, String staffOrgPath){ + List finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions); + + return baseDao.dynamicQuery(customerId,resultTableName,conditions,finalSubTables, null, currentStaffAgencyId,staffOrgPath); + } + + @NotNull + public List getFinalSubables(String customerId, String formCode, String resultTableName, List conditions) { CustomerFormQueryDTO queryDTO=new CustomerFormQueryDTO(); queryDTO.setCustomerId(customerId); queryDTO.setFormCode(formCode); //所有的子表 Result> subTablesRes=operCustomizeOpenFeignClient.querySubTables(queryDTO); - /*List subTablesBak=new ArrayList<>(); - if(subTablesRes.success()&&CollectionUtils.isNotEmpty(subTablesRes.getData())){ - subTablesBak =subTablesRes.getData().stream().map(SubTableJoinDTO::getJoinTableSql).collect(Collectors.toList()); - }*/ + List subTables =subTablesRes.getData(); // log.info("1、所有的子表subTables:"+JSON.toJSONString(subTables,true)); //关联哪些子表：查询条件用到的表名+查询的列对应的表 并集去重 Set whereConditionTables=conditions.stream().map(ResiUserQueryValueDTO::getTableName).collect(Collectors.toSet()); - Set tables=new HashSet<>(); - tables.addAll(whereConditionTables); + Set tables = new HashSet<>(whereConditionTables); tables.add(resultTableName); // log.info("2、查询条件+查询列对应的tables并集去重:"+ JSON.toJSONString(tables,true)); //最终关联的子表对应的sql： @@ -770,8 +774,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> getDataForExport(ExportResiUserItemDTO formItemMap, String baseTableName, IcResiUserPageFormDTO pageFormDTO, String currentStaffAgencyId, String staffOrgPath) { - Page> mapListPage = PageHelper.startPage(pageFormDTO.getPageNo(), pageFormDTO.getPageSize(), pageFormDTO.getPageFlag()).doSelectPage(() -> { + Page> mapListPage = PageHelper.startPage(pageFormDTO.getPageNo(), pageFormDTO.getPageSize(), pageFormDTO.getIsPage()).doSelectPage(() -> { this.dynamicQuery(pageFormDTO.getCustomerId(), pageFormDTO.getFormCode(), baseTableName, pageFormDTO.getConditions(), currentStaffAgencyId, staffOrgPath); }); mapListPage.getResult().parallelStream().filter(Objects::nonNull).forEach(resiUser -> { @@ -1653,4 +1656,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> dynamicQuery(String customerId, String formCode, String resultTableName, List showSqlColumns, List conditions, String currentStaffAgencyId, String staffOrgPath) { + List finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions); + return baseDao.dynamicQuery(customerId,resultTableName,conditions,finalSubTables,showSqlColumns,currentStaffAgencyId,staffOrgPath); + } + } 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 55dc3aa815..66c8c51bd5 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 @@ -171,9 +171,16 @@ update ${subTalbeName} set del_flag='1' where IC_RESI_USER=#{icResiUserId} - select - ${resultTableName}.* + + + + ${column.tableName}.${column.columnName} + + + ${resultTableName}.* + FROM ic_resi_user From 80ed19959512355bb893f26de942e43caabc8adc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 24 Apr 2022 17:15:17 +0800 Subject: [PATCH 268/391] feignurl --- .../java/com/epmet/feign/OperCustomizeOpenFeignClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index f461c4cf9e..7c6922e69c 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -25,8 +25,8 @@ import java.util.Set; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:16 */ - @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089") -//@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class) + // @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089") +@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class) public interface OperCustomizeOpenFeignClient { @PostMapping(value = "/oper/customize/customerfootbar/customerfootbars", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) From 4a501622b3caba40b06cffdb398273854bb47036 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 25 Apr 2022 09:36:01 +0800 Subject: [PATCH 269/391] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8F=B3=E4=BE=A7ite?= =?UTF-8?q?m=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcExportTemplateDTO.java | 31 --------- ...java => IcExportTemplateQueryFormDTO.java} | 2 +- .../dto/form/IcExportTemplateSaveFormDTO.java | 65 +++++++++++++++++++ .../com/epmet/dto/result/FormItemResult.java | 2 +- .../feign/OperCustomizeOpenFeignClient.java | 2 +- .../OperCustomizeOpenFeignClientFallback.java | 2 +- .../IcExportTemplateController.java | 10 +-- .../controller/IcFormItemController.java | 11 ++++ .../com/epmet/dao/IcExportTemplateDao.java | 4 +- .../java/com/epmet/dao/IcFormItemDao.java | 10 +++ .../entity/IcExportTemplateConfigEntity.java | 2 +- .../service/IcExportTemplateService.java | 17 ++--- .../com/epmet/service/IcFormItemService.java | 8 +++ .../impl/IcExportTemplateServiceImpl.java | 17 ++--- .../service/impl/IcFormItemServiceImpl.java | 5 ++ .../mapper/IcExportTemplateConfigDao.xml | 4 +- .../main/resources/mapper/IcFormItemDao.xml | 11 ++++ .../impl/IcResiUserExportServiceImpl.java | 4 +- 18 files changed, 136 insertions(+), 71 deletions(-) rename epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/{IcExportTemplateFormDTO.java => IcExportTemplateQueryFormDTO.java} (91%) create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java index 95805207fd..b17950a528 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java @@ -3,7 +3,6 @@ package com.epmet.dto; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** @@ -52,34 +51,4 @@ public class IcExportTemplateDTO implements Serializable { */ private Integer sort; - /** - * 0未删除，1已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateQueryFormDTO.java similarity index 91% rename from epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java rename to epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateQueryFormDTO.java index a7d52bf75b..9c97e6a75b 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateQueryFormDTO.java @@ -14,7 +14,7 @@ import java.io.Serializable; * @since v1.0.0 2022-04-21 */ @Data -public class IcExportTemplateFormDTO implements Serializable { +public class IcExportTemplateQueryFormDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java new file mode 100644 index 0000000000..9f872327d9 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java @@ -0,0 +1,65 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +/** + * 自定义表单导出模板 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-04-21 + */ +@Data +public class IcExportTemplateSaveFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 表单CODE，从字典获取 + */ + private String formCode; + + /** + * 模板名称 + */ + @NotBlank(message = "模板名称不能为空",groups = AddGroup.class) + private String name; + + /** + * 0:动态；1:文件 + */ + private Integer type; + + /** + * 父id + */ + private String pid; + + /** + * ic_form_item.id + */ + @NotBlank(message = "itemId不能为空",groups = AddGroup.class) + private String itemId; + + /** + * 表头宽度 + */ + private Integer width; + + /** + * 项标签 + */ + @NotBlank(message = "名称不能为空",groups = AddGroup.class) + private String label; + + /** + * 排序 + */ + private Integer sort; + + +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemResult.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemResult.java index dfe0b85ffa..2aad76f805 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemResult.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemResult.java @@ -16,7 +16,7 @@ public class FormItemResult implements Serializable { private static final long serialVersionUID = 7443085469505238040L; /** - * 父项ID + * ID */ private String itemId; diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index 7c6922e69c..fbf479ac9a 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -168,5 +168,5 @@ public interface OperCustomizeOpenFeignClient { * @return */ @PostMapping("/oper/customize/icExportTemplate/getExcelHeaderAndSqlColumnForExport") - Result getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateFormDTO param); + Result getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateQueryFormDTO param); } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java index 19a01082cc..e55eb3bb92 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java @@ -126,7 +126,7 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe } @Override - public Result getExcelHeaderAndSqlColumnForExport(IcExportTemplateFormDTO param) { + public Result getExcelHeaderAndSqlColumnForExport(IcExportTemplateQueryFormDTO param) { return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getExcelHeaderAndSqlColumnForExport", param); } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java index 7804e07bb8..e9343b87af 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java @@ -6,10 +6,10 @@ 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.ExportGroup; import com.epmet.dto.IcExportTemplateDTO; -import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.form.IcExportTemplateQueryFormDTO; +import com.epmet.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.service.IcExportTemplateService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,9 +45,9 @@ public class IcExportTemplateController { @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody IcExportTemplateDTO dto) { + public Result save(@RequestBody IcExportTemplateSaveFormDTO dto) { //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + ValidatorUtils.validateEntity(dto, AddGroup.class); icExportTemplateService.save(dto); return new Result(); } @@ -68,7 +68,7 @@ public class IcExportTemplateController { * @return */ @PostMapping("getExcelHeaderAndSqlColumnForExport") - public Result getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateFormDTO param) { + public Result getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateQueryFormDTO param) { ValidatorUtils.validateEntity(param, ExportGroup.class); return new Result().ok(icExportTemplateService.getTemplateConfigForExport(param)); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java index 49c54f3d21..80d6f47037 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java @@ -21,6 +21,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.EditIFormItemFormDTO; import com.epmet.dto.result.ColumnTableNameResultDTO; +import com.epmet.dto.result.FormItemResult; import com.epmet.dto.result.ResiCategoryItemResultDTO; import com.epmet.service.IcFormItemService; import org.springframework.beans.factory.annotation.Autowired; @@ -88,4 +89,14 @@ public class IcFormItemController { icFormItemService.initQueryBuilder(customerId); return new Result(); } + + /** + * 根据分组id 获取分组下的item + * @return + */ + @PostMapping("getItemList/{groupId}") + public Result> getItemListByGroupId(@RequestHeader String customerId, @PathVariable("groupId") String groupId){ + List list = icFormItemService.getItemListByGroupId(customerId,groupId); + return new Result().ok(list); + } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java index 8cf3df7aa5..32eaa6d723 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java @@ -1,7 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.form.IcExportTemplateQueryFormDTO; import com.epmet.dto.result.IcExportTemplateForExportResultDTO; import com.epmet.entity.IcExportTemplateEntity; import org.apache.ibatis.annotations.Mapper; @@ -17,5 +17,5 @@ import java.util.List; @Mapper public interface IcExportTemplateDao extends BaseDao { - List getTemplateConfigForExport(IcExportTemplateFormDTO param); + List getTemplateConfigForExport(IcExportTemplateQueryFormDTO param); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java index bb02a5425c..2647805d6f 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java @@ -91,8 +91,18 @@ public interface IcFormItemDao extends BaseDao { /** * desc:根据Id获取item对应的表名和item属性 + * * @param itemId * @return */ ConditionResultDTO getConditionItem(@Param("itemId") String itemId); + + /** + * desc:根据客户Id 和groupId 获取item配置项 + * + * @param customerId + * @param groupId + * @return + */ + List getItemListByGroupId(@Param("customerId") String customerId, @Param("groupId") String groupId); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java index 338164da26..60a8094221 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java @@ -41,7 +41,7 @@ public class IcExportTemplateConfigEntity extends BaseEpmetEntity { /** * ic_form_item.id */ - private String formItemId; + private String itemId; /** * 表头宽度 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java index cc6e7fdd1c..1d2f22c0de 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java @@ -3,7 +3,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcExportTemplateDTO; -import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.form.IcExportTemplateQueryFormDTO; +import com.epmet.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.entity.IcExportTemplateEntity; @@ -56,17 +57,7 @@ public interface IcExportTemplateService extends BaseService { * @param customerId */ void initQueryBuilder(String customerId); + + /** + * desc:根据groupId 获取itemlist + * @param customerId + * @param groupId + * @return + */ + List getItemListByGroupId(String customerId, String groupId); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index d5bdca582f..df4303fe3e 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -11,7 +11,8 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IcExportTemplateDao; import com.epmet.dao.IcFormItemDao; import com.epmet.dto.IcExportTemplateDTO; -import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.form.IcExportTemplateQueryFormDTO; +import com.epmet.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.dto.result.ConditionResultDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.dto.result.IcExportTemplateForExportResultDTO; @@ -75,18 +76,12 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl list = icExportTemplateDao.getTemplateConfigForExport(param); if (CollectionUtils.isEmpty(list)) { return null; diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java index 0fee230ef5..c8f91539e2 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java @@ -256,6 +256,11 @@ public class IcFormItemServiceImpl extends BaseServiceImpl getItemListByGroupId(String customerId, String groupId) { + return baseDao.getItemListByGroupId(customerId,groupId); + } + private String queryType(String itemType) { String queryType; diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateConfigDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateConfigDao.xml index 7d3e620e9d..0c92cd18e0 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateConfigDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateConfigDao.xml @@ -8,7 +8,7 @@ - + @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index f8d80c96ac..876f98f972 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -252,4 +252,15 @@ and ifi.DEL_FLAG = '0' AND ifig.DEL_FLAG = '0' + + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index 561f654358..2e0383ccd4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -12,7 +12,7 @@ import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.poi.excel.FreezeAndFilter; import com.epmet.constant.IcResiUserConstant; -import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.form.IcExportTemplateQueryFormDTO; import com.epmet.dto.form.IcResiUserPageFormDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.feign.OperCustomizeOpenFeignClient; @@ -62,7 +62,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { ExcelWriter excelWriter = null; try { //获取模板条件 - IcExportTemplateFormDTO param = new IcExportTemplateFormDTO(); + IcExportTemplateQueryFormDTO param = new IcExportTemplateQueryFormDTO(); param.setCustomerId(loginUserUtil.getLoginUserCustomerId()); param.setCustomerId("default"); param.setTempId(pageFormDTO.getTemplateId()); From 92869c8d5f481a3661f9d6fae5d4386468e0e9be Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 25 Apr 2022 10:11:31 +0800 Subject: [PATCH 270/391] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8F=B3=E4=BE=A7ite?= =?UTF-8?q?m=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java index 9f872327d9..91d2a31918 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java @@ -21,6 +21,7 @@ public class IcExportTemplateSaveFormDTO implements Serializable { /** * 表单CODE，从字典获取 */ + @NotBlank(message = "表单CODE不能为空",groups = AddGroup.class) private String formCode; /** @@ -62,4 +63,5 @@ public class IcExportTemplateSaveFormDTO implements Serializable { private Integer sort; + } From 8871d547dffae8b52046ceed4205edaefef9d2dc Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 25 Apr 2022 10:30:32 +0800 Subject: [PATCH 271/391] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BAdto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/IcExportItemListFormDTO.java | 54 +++++++++++++++++++ .../dto/form/IcExportTemplateSaveFormDTO.java | 34 +++++------- 2 files changed, 66 insertions(+), 22 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java new file mode 100644 index 0000000000..b1b340a34a --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java @@ -0,0 +1,54 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + + +/** + * 自定义表单导出模板 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-04-21 + */ +@Data +public class IcExportItemListFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotEmpty(message = "请至少添加一个导出项") + private List subItemList; + + /** + * 父id + */ + private String pid; + + /** + * ic_form_item.id + */ + @NotBlank(message = "itemId不能为空",groups = AddGroup.class) + private String itemId; + + /** + * 表头宽度 + */ + private Integer width; + + /** + * 项标签 + */ + @NotBlank(message = "名称不能为空",groups = AddGroup.class) + private String label; + + /** + * 排序 + */ + private Integer sort; + + +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java index 91d2a31918..b32ce0435f 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java @@ -4,7 +4,9 @@ import com.epmet.commons.tools.validator.group.AddGroup; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; +import java.util.List; /** @@ -18,6 +20,11 @@ public class IcExportTemplateSaveFormDTO implements Serializable { private static final long serialVersionUID = 1L; + /** + * 是否保存为模板 是:true 否:false + */ + private Boolean isTemp = false; + /** * 表单CODE，从字典获取 */ @@ -35,33 +42,16 @@ public class IcExportTemplateSaveFormDTO implements Serializable { */ private Integer type; - /** - * 父id - */ - private String pid; - - /** - * ic_form_item.id - */ - @NotBlank(message = "itemId不能为空",groups = AddGroup.class) - private String itemId; - - /** - * 表头宽度 - */ - private Integer width; - - /** - * 项标签 - */ - @NotBlank(message = "名称不能为空",groups = AddGroup.class) - private String label; - /** * 排序 */ private Integer sort; + /** + * 父id + */ + @NotEmpty(message = "请至少添加一个导出项") + private List itemList; } From 340000eac1ae91d75a01d373b8cea5c900cb6c2a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 25 Apr 2022 10:32:20 +0800 Subject: [PATCH 272/391] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BAdto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java index b32ce0435f..0f34fc2141 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java @@ -2,6 +2,7 @@ package com.epmet.dto.form; import com.epmet.commons.tools.validator.group.AddGroup; import lombok.Data; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; @@ -34,7 +35,8 @@ public class IcExportTemplateSaveFormDTO implements Serializable { /** * 模板名称 */ - @NotBlank(message = "模板名称不能为空",groups = AddGroup.class) + //@NotBlank(message = "模板名称不能为空",groups = AddGroup.class) + @Length(max = 20, message = "模板名称最多为20个字", groups = { AddGroup.class }) private String name; /** From 015809342a8bb0ec8e53f2edd1b37a66306fb5b8 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 25 Apr 2022 10:43:22 +0800 Subject: [PATCH 273/391] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E3=80=90?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=AF=BC=E5=85=A5=E3=80=91=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=B8=AD=E5=B0=86=E5=A4=A7=E7=97=85=EF=BC=8C=E6=85=A2=E7=97=85?= =?UTF-8?q?=EF=BC=8C=E5=B1=85=E4=BD=8F=E6=83=85=E5=86=B5=E7=AD=89=E7=94=B1?= =?UTF-8?q?input=E6=94=B9=E4=B8=BAselect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 73728 -> 73728 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index b93a66e9afffe9a42b0f93c9bc4e62b45f114b23..99f2034351177d40c553dab992e44674f7f7da71 100644 GIT binary patch delta 4905 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

dO%VF(F^nT?C=-ew~I zQlb+p!ckUg$C|DytcmY$u8D?O{E##$!dxUtgb5R2cOp!2ff&w3n2WVNElce7hR2Ei z@g&i>&2aOLmipLo75^=4UR@t`5kwTdDzQwGaIsvHaIr#?aIsR7sKmpPL?s@PBr4G= zDGBr_NE|o?ucj5mv_Gyn=uryWwYK(AicukV4i-ji+#Ec1JFmYwEm53{z80cQ&k=3^ z34}k>GurcPgUTM`mYuyb`jPY}indCU$Y`}Bk#ciXoBi5LL|^T}@8~NC_bV;_#nXywU09v4^=kQrp0Uxzh{sy> zT8yW(;*KJw{p}Y|TbW0z-&+zXP?rAM%5YTCOF)5U+p}ILYC1}E;4Qr{8(-^I*m~Y{ zKosWf1M}GiKJehQ85_g)75J{9O_E%o&63=przORMwn$00!G4{=dyD0L(l}KP5)Ri zPTXbX^NU*Gl2qt>ML&{1-}^~KUh!E}zLr;CUF4|vlIYa8L{Bir*R}sk``xwE3fs=N z-w=mWlye8K_+m`)v$7CQnoK{Iw$3NeS_6JjIu%dVl-)A@**)vAx1MO0rOI&NV@kwfRdt?YC4Rhuz* z#m>qxcqre=&aln|7whS8vlL5*nmPTc6Dtp8x>=FhneAcL&MFTp?p) From aaf8ca493b22ae2eae49c60b2f8cdc538bb6a901 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 25 Apr 2022 10:44:01 +0800 Subject: [PATCH 274/391] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BAdto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/IcExportItemListFormDTO.java | 15 +++++++++++++++ .../IcExportTemplateForExportResultDTO.java | 9 +++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java index b1b340a34a..e004da0b48 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java @@ -50,5 +50,20 @@ public class IcExportItemListFormDTO implements Serializable { */ private Integer sort; + /** + * 表名 + */ + private String tableName; + + /** + * 列名 + */ + private String columnName; + + /** + * 只有远程获取的才有值 + */ + private String optionSourceValue; + } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java index a40407d03b..d58189084b 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java @@ -17,14 +17,15 @@ public class IcExportTemplateForExportResultDTO implements Serializable { private static final long serialVersionUID = 1L; /** - * 主键 + * 模板主键id */ - private String id; + private String tempId; /** - * 模板主键id + * 主键 */ - private String tempId; + private String id; + /** * 父id From 0fe93f21ff9bb773bc43234cefa4d81de546bfc8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 25 Apr 2022 10:45:00 +0800 Subject: [PATCH 275/391] item_type_query --- .../commons/tools/enums/DictTypeEnum.java | 1 + epmet-gateway/pom.xml | 1 + .../oper-customize-server/pom.xml | 6 +++++ .../service/impl/IcFormItemServiceImpl.java | 23 +++++++++++++++---- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java index 7afc85aab1..6375462f14 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java @@ -22,6 +22,7 @@ public enum DictTypeEnum { AGE_GROUP("age_group", "年龄范围", 11), PATROL_WORK_TYPE("patrol_work_type", "例行工作分类", 13), GRID_TYPE("grid_type", "网格类型", 12), + ITEM_TYPE_QUERY("item_type_query","居民信息组件查询方式",14), ; private final String code; diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 1283594191..5f1005a628 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -287,6 +287,7 @@ lb://epmet-demo-server lb://oper-customize-server + lb://oper-crm-server diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 71b33b7510..f98d34991c 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -89,6 +89,12 @@ 2.0.0 compile + + com.epmet + epmet-admin-client + 2.0.0 + compile + diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java index 0fee230ef5..98da5c4225 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java @@ -22,6 +22,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.enums.DictTypeEnum; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcFormItemDao; import com.epmet.dao.IcFormItemOptionsDao; import com.epmet.dao.IcFormQueryBuilderDao; @@ -31,8 +33,10 @@ import com.epmet.dto.result.*; import com.epmet.entity.IcFormItemEntity; import com.epmet.entity.IcFormItemOptionsEntity; import com.epmet.entity.IcFormQueryBuilderEntity; +import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.service.IcFormItemService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,6 +44,7 @@ import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.stream.Collectors; @@ -56,6 +61,9 @@ public class IcFormItemServiceImpl extends BaseServiceImpl> queryTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ITEM_TYPE_QUERY.getCode()); + if (queryTypeMap.success() && MapUtils.isNotEmpty(queryTypeMap.getData())) { + queryType = queryTypeMap.getData().get(itemType); } + log.warn("itemType="+itemType+";queryType="+queryType); return queryType; } From 96149f62eec954aa5756d5ac46f03b55d8bd26ae Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 25 Apr 2022 10:46:42 +0800 Subject: [PATCH 276/391] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=9B=B4=E5=A4=9A?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/IcExportItemListFormDTO.java | 2 +- .../service/impl/IcExportTemplateServiceImpl.java | 3 --- .../main/resources/mapper/IcExportTemplateDao.xml | 8 +++++++- .../src/main/resources/mapper/IcFormItemDao.xml | 13 ++++++++++--- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java index e004da0b48..eaf2c0d8d4 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java @@ -21,7 +21,7 @@ public class IcExportItemListFormDTO implements Serializable { private static final long serialVersionUID = 1L; @NotEmpty(message = "请至少添加一个导出项") - private List subItemList; + private List children; /** * 父id diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index df4303fe3e..3b33dcba79 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -129,9 +129,6 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl> resultTemp, IcExportTemplateForExportResultDTO root, List> headerList, List showSqlColumns, List hiddenSqlColumns, Set hasExistColumnSet) { - - - if (StringUtils.isNotBlank(root.getColumnName())) { showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getTableName(), root.getColumnName())); if (StringUtils.isNotBlank(root.getOptionSourceValue())) { diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml index 325b844347..2b1c6c0b1c 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml @@ -20,7 +20,13 @@ From 86a2ad279a668b66a5b9fd0b149952cba6226bc8 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 25 Apr 2022 10:48:55 +0800 Subject: [PATCH 277/391] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/IcExportTemplateDTO.java | 10 ++++++++++ .../java/com/epmet/entity/IcExportTemplateEntity.java | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java index b17950a528..f8b99ea367 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java @@ -26,6 +26,16 @@ public class IcExportTemplateDTO implements Serializable { */ private String customerId; + /** + * 所属机关ID（customer_agency.id） + */ + private String agencyId; + + /** + * 所有上级组织机构ID(以英文:隔开)包含本身id + */ + private String pids; + /** * 表单CODE，从字典获取 */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateEntity.java index 0fbf031dc8..a301bfe85a 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateEntity.java @@ -23,6 +23,16 @@ public class IcExportTemplateEntity extends BaseEpmetEntity { */ private String customerId; + /** + * 所属机关ID（customer_agency.id） + */ + private String agencyId; + + /** + * 所有上级组织机构ID(以英文:隔开)包含本身id + */ + private String pids; + /** * 表单CODE，从字典获取 */ From ab44e5afc1c86d847bce017b8b3ab431c8ed1732 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 25 Apr 2022 11:02:09 +0800 Subject: [PATCH 278/391] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=9B=B4=E5=A4=9A?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/IcCustomExportResultDTO.java | 3 + .../IcExportTemplateForExportResultDTO.java | 5 +- .../impl/IcExportTemplateServiceImpl.java | 4 +- .../resources/mapper/IcExportTemplateDao.xml | 12 +- .../main/resources/mapper/IcFormItemDao.xml | 4 +- .../impl/IcResiUserExportServiceImpl.java | 117 ++++++++++++++---- .../service/impl/IcResiUserServiceImpl.java | 7 -- 7 files changed, 108 insertions(+), 44 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java index d3ff2b2e22..3b5ad1cdf2 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java @@ -40,8 +40,11 @@ public class IcCustomExportResultDTO implements Serializable { @AllArgsConstructor @Data public static class SqlColumn { + private String itemId; private String tableName; private String columnName; + private String optionSourceType; + private String optionSourceValue; } } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java index d58189084b..fc88788ac3 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java @@ -60,9 +60,8 @@ public class IcExportTemplateForExportResultDTO implements Serializable { * 列名 */ private String columnName; - /** - * 只有远程获取的才有值 - */ + private String optionSourceValue; + private String optionSourceType; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index 3b33dcba79..8cd200b59e 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -117,7 +117,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl> resultTemp, IcExportTemplateForExportResultDTO root, List> headerList, List showSqlColumns, List hiddenSqlColumns, Set hasExistColumnSet) { if (StringUtils.isNotBlank(root.getColumnName())) { - showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getTableName(), root.getColumnName())); + showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getItemId(),root.getTableName(), root.getColumnName(),root.getOptionSourceType(),root.getOptionSourceValue())); if (StringUtils.isNotBlank(root.getOptionSourceValue())) { String[] paramArr = root.getOptionSourceValue().split(StrConstant.QUESTION_MARK_TRANSFER)[NumConstant.ONE].split(StrConstant.AND_MARK); //先remote中再添加 然后移除item中有的 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml index 2b1c6c0b1c..d2970a6d02 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml @@ -20,17 +20,11 @@ + + From 72d36b6bb8599b4936d73059dc3eb11e5c683898 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 25 Apr 2022 15:22:07 +0800 Subject: [PATCH 283/391] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/IcExportTemplateQueryFormDTO.java | 10 -- .../impl/IcExportTemplateServiceImpl.java | 2 +- .../epmet/dto/form/IcResiUserPageFormDTO.java | 10 +- .../controller/IcResiUserController.java | 9 +- .../service/IcResiUserImportService.java | 19 ++- .../impl/IcResiUserExportServiceImpl.java | 151 +++++++++++++----- .../impl/IcResiUserImportServiceImpl.java | 26 +-- 7 files changed, 159 insertions(+), 68 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateQueryFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateQueryFormDTO.java index 9c97e6a75b..0b5f472f72 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateQueryFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateQueryFormDTO.java @@ -29,14 +29,4 @@ public class IcExportTemplateQueryFormDTO implements Serializable { @NotBlank(message = "客户Id不能为空",groups = ExportGroup.class) private String customerId; - /** - * 表单CODE，从字典获取 - */ - private String formCode; - - /** - * 模板名称 - */ - private String name; - } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index 8cd200b59e..38f4aeb2cb 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -131,7 +131,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl> resultTemp, IcExportTemplateForExportResultDTO root, List> headerList, List showSqlColumns, List hiddenSqlColumns, Set hasExistColumnSet) { if (StringUtils.isNotBlank(root.getColumnName())) { showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getItemId(),root.getTableName(), root.getColumnName(),root.getOptionSourceType(),root.getOptionSourceValue())); - if (StringUtils.isNotBlank(root.getOptionSourceValue())) { + if (StringUtils.isNotBlank(root.getOptionSourceValue())&&root.getOptionSourceValue().contains(StrConstant.QUESTION_MARK)) { String[] paramArr = root.getOptionSourceValue().split(StrConstant.QUESTION_MARK_TRANSFER)[NumConstant.ONE].split(StrConstant.AND_MARK); //先remote中再添加 然后移除item中有的 hasExistColumnSet.addAll(Arrays.asList(paramArr)); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java index 7c9ac813c7..272a3c6fdc 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java @@ -18,10 +18,10 @@ public class IcResiUserPageFormDTO extends PageFormDTO implements Serializable { public interface AddUserInternalGroup { } - @NotBlank(message = "formCode不能为空", groups = AddUserInternalGroup.class) + @NotBlank(message = "formCode不能为空", groups = {AddUserInternalGroup.class,ExportGroup.class}) private String formCode; - @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) + @NotBlank(message = "customerId不能为空", groups = {AddUserInternalGroup.class,ExportGroup.class}) private String customerId; /** @@ -29,7 +29,7 @@ public class IcResiUserPageFormDTO extends PageFormDTO implements Serializable { */ private List conditions; - @NotBlank(message = "当前用户id不能为空", groups = AddUserInternalGroup.class) + @NotBlank(message = "当前用户id不能为空", groups = {AddUserInternalGroup.class,ExportGroup.class}) private String staffId; /** @@ -37,7 +37,9 @@ public class IcResiUserPageFormDTO extends PageFormDTO implements Serializable { */ private String keyword; - @NotBlank(message = "模板id不能为空", groups = ExportGroup.class) + /** + * 模板id + */ private String templateId; } 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 c47c09eb8a..d8b61f1937 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 @@ -415,9 +415,12 @@ public class IcResiUserController implements ResultDataResolver { @NoRepeatSubmit @RequestMapping(value = "/exportExcelCustom") public void exportExcelCustom(/*@LoginUser*/ TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws Exception { - //tokenDto.setUserId("9e37adcce6472152e6508a19d3683e02"); - //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc"); - ValidatorUtils.validateEntity(pageFormDTO, ExportGroup.class); + //TODO 去掉 + tokenDto.setUserId("73ae6280e46a6653a5605d51d5462725"); + tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc"); + pageFormDTO.setCustomerId(tokenDto.getCustomerId()); + pageFormDTO.setStaffId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(pageFormDTO, IcResiUserPageFormDTO.AddUserInternalGroup.class,ExportGroup.class); pageFormDTO.setIsPage(false); //获取导出配置 icResiUserExportService.exportIcResiUser(pageFormDTO,response); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserImportService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserImportService.java index f3451f3e13..e35eabdace 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserImportService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserImportService.java @@ -1,10 +1,12 @@ package com.epmet.service; import com.epmet.dto.result.FormItemResult; +import com.epmet.service.impl.IcResiUserImportServiceImpl; import javax.servlet.http.HttpServletResponse; import java.nio.file.Path; import java.util.List; +import java.util.Map; /** *@Description 居民信息导入service @@ -33,5 +35,20 @@ public interface IcResiUserImportService { */ void finishImportTask(String importTaskId, String operatorId, String processStatus, String resultDesc, String resultDescPath); - Object testAsync(); + /** + * 分割sourceUrl为纯url和父itemId + * @param fullUri + * @return [ pureUri, cascadeItemId(父itemId) ] + */ + String[] splitOptionSourceUrl(String fullUri); + /** + * desc:获取远程 选项 + * @param pureUri + * @param cascadeItemId + * @param columnWrappers + * @param currUserAgencyId + * @param purpose + * @return + */ + Map listRemoteOptions(String pureUri, String cascadeItemId, Map columnWrappers, String currUserAgencyId, String purpose); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index 8df9a74770..e7051a7710 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -4,35 +4,44 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; +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.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.FormItemTypeEnum; +import com.epmet.commons.tools.enums.IcFormCodeEnum; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; -import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.commons.tools.utils.poi.excel.FreezeAndFilter; import com.epmet.constant.IcResiUserConstant; import com.epmet.dto.form.IcExportTemplateQueryFormDTO; import com.epmet.dto.form.IcResiUserPageFormDTO; +import com.epmet.dto.result.FormItemResult; import com.epmet.dto.result.IcCustomExportResultDTO; +import com.epmet.dto.result.OptionDTO; +import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.OperCustomizeOpenFeignClient; import com.epmet.service.IcResiUserExportService; +import com.epmet.service.IcResiUserImportService; import com.epmet.service.IcResiUserService; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.Nullable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; /** @@ -48,9 +57,9 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { @Autowired private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient; @Autowired - private LoginUserUtil loginUserUtil; - @Autowired private IcResiUserService icResiUserService; + @Autowired + private IcResiUserImportService icResiUserImportService; /** * desc: 根据条件查询居民信息并根据配置模板导出 @@ -65,22 +74,20 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { public void exportIcResiUser(IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) { ExcelWriter excelWriter = null; try { - //获取模板条件 - IcExportTemplateQueryFormDTO param = new IcExportTemplateQueryFormDTO(); - param.setCustomerId(loginUserUtil.getLoginUserCustomerId()); - param.setTempId(pageFormDTO.getTemplateId()); - Result exportConfigResult = operCustomizeOpenFeignClient.getExcelHeaderAndSqlColumnForExport(param); - if (!exportConfigResult.success() || exportConfigResult.getData() == null) { - log.error("获取模板失败"); - return; - } + //获取用户配置的导出条件 + Result exportConfigResult = getIcCustomExportConfig(pageFormDTO); + + Map itemOriginMap = getItemMap(pageFormDTO.getCustomerId()); IcCustomExportResultDTO exportConfigData = exportConfigResult.getData(); log.info("查询到的模板配置信息:{}", JSON.toJSONString(exportConfigData)); FreezeAndFilter writeHandler = new FreezeAndFilter(); excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("居民基本信息.xlsx", response)).registerWriteHandler(writeHandler).build(); WriteSheet writeSheet = EasyExcel.writerSheet().head(exportConfigData.getHeaders()).build(); - CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(loginUserUtil.getLoginUserCustomerId(), loginUserUtil.getLoginUserId()); + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(pageFormDTO.getCustomerId(), pageFormDTO.getStaffId()); + if (staffInfoCacheResult == null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取工作人员信息失败"); + } String staffOrgPath = null; if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) { staffOrgPath = staffInfoCacheResult.getAgencyPIds().concat(StrConstant.COLON).concat(staffInfoCacheResult.getAgencyId()); @@ -93,34 +100,54 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { do { String finalStaffOrgPath = staffOrgPath; mapListPage = PageHelper.startPage(pageFormDTO.getPageNo(), pageFormDTO.getPageSize(), pageFormDTO.getIsPage()).doSelectPage(() -> { - icResiUserService.dynamicQuery(loginUserUtil.getLoginUserCustomerId(), pageFormDTO.getFormCode(), IcResiUserConstant.IC_RESI_USER, allShowColumns, pageFormDTO.getConditions(), staffInfoCacheResult.getAgencyId(), finalStaffOrgPath); + icResiUserService.dynamicQuery(pageFormDTO.getCustomerId(), pageFormDTO.getFormCode(), IcResiUserConstant.IC_RESI_USER, allShowColumns, pageFormDTO.getConditions(), staffInfoCacheResult.getAgencyId(), finalStaffOrgPath); }); pageFormDTO.setPageNo(pageFormDTO.getPageNo() + NumConstant.ONE); List> result = mapListPage.getResult(); List> resultData = new ArrayList<>(); + result.forEach(o -> { List singleResult = new ArrayList<>(); + Map originalConditionMap = new ConcurrentHashMap<>(); o.forEach((key,value) -> { List showSqlColumns = exportConfigData.getShowSqlColumns(); Map itemMap = showSqlColumns.stream().collect(Collectors.toMap(IcCustomExportResultDTO.SqlColumn::getColumnName, item -> item)); + + IcCustomExportResultDTO.SqlColumn columnDTO = itemMap.get(key); if (singleResult.size() < showSqlColumns.size()) { - singleResult.add(value); + IcCustomExportResultDTO.SqlColumn sqlColumn = itemMap.get(key); + String tableName = sqlColumn.getTableName(); + String itemId = sqlColumn.getItemId(); + String columnName = columnDTO.getColumnName(); + String vauleStr = value == null ? StrConstant.EPMETY_STR : value.toString(); - /* if (Constant.OPITON_SOURCE_REMOTE.equals(sqlColumn.getOptionSourceType()) && StringUtils.isNotBlank(vauleStr)) { - putRemoteValue(formItemMap.getRemoteItemConditionMap().get(e.getItemId()), currentStaffAgencyId, resiUser,originalConditionMap, e, columnName, vauleStr); - } else { - putOptionValue(resiUser, e, columnName, vauleStr); - }*/ + //保留原始值 便于remote条件获取 + originalConditionMap.putIfAbsent(columnName,vauleStr); + ExportResiUserItemDTO exportResiUserItemDTO = itemOriginMap.get(tableName); + FormItemResult formItemResult = exportResiUserItemDTO.getItemMap().get(columnName); + + if (StringUtils.isBlank(vauleStr)){ + return; + } + String newValue = vauleStr; + if (Constant.OPITON_SOURCE_REMOTE.equals(sqlColumn.getOptionSourceType())) { + putRemoteValue(exportResiUserItemDTO.getRemoteItemConditionMap().get(itemId), staffInfoCacheResult.getAgencyId(), o,originalConditionMap, formItemResult, columnName, vauleStr); + } else if (Constant.OPITON_SOURCE_LOCAL.equals(sqlColumn.getOptionSourceType())){ + newValue = putOptionValue(formItemResult, vauleStr); + } + singleResult.add(newValue); } }); resultData.add(singleResult); }); log.info("需要写入的data长度:{}", resultData.size()); excelWriter.write(resultData, writeSheet); + //todo + break; } while (mapListPage.getResult().size() == pageFormDTO.getPageSize()); } catch (IOException e) { log.error("exportIcResiUser exception", e); @@ -131,20 +158,31 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { } } + @Nullable + public Result getIcCustomExportConfig(IcResiUserPageFormDTO pageFormDTO) { + IcExportTemplateQueryFormDTO param = new IcExportTemplateQueryFormDTO(); + param.setCustomerId(pageFormDTO.getCustomerId()); + param.setTempId(pageFormDTO.getTemplateId()); + Result exportConfigResult = operCustomizeOpenFeignClient.getExcelHeaderAndSqlColumnForExport(param); + if (!exportConfigResult.success() || exportConfigResult.getData() == null) { + log.error("获取模板失败"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取模板失败"); + } + return exportConfigResult; + } /** * key:itemId,value: key:columnName,中文 */ private static Map> remoteOptionCacheMap = new HashMap<>(); - /*private void putRemoteValue(Set conditionItemSet, String currentStaffAgencyId, Map map, Map originalConditionMap, FormItemResult e, String columnName, String vauleStr) { + private void putRemoteValue(Set conditionItemSet, String currentStaffAgencyId, Map map, Map originalConditionMap, FormItemResult e, String columnName, String vauleStr) { try { Map columnWrappers = new HashMap<>(); if (e.getOptionSourceValue().contains(StrConstant.QUESTION_MARK)){ for (FormItemResult o : conditionItemSet) { - String column = getColumnName(o); - Object conditionValue = originalConditionMap.getOrDefault(column, map.get(column)); - originalConditionMap.putIfAbsent(column,conditionValue.toString()); + Object conditionValue = originalConditionMap.getOrDefault(columnName, map.get(columnName)); + originalConditionMap.putIfAbsent(columnName,conditionValue.toString()); IcResiUserImportServiceImpl.ColumnWrapper value = new IcResiUserImportServiceImpl.ColumnWrapper(); value.setColValue(conditionValue.toString()); columnWrappers.put(o.getItemId(), value); @@ -171,28 +209,67 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { } } } catch (Exception ex) { - log.error("listRemoteOptions url:{}", e.getOptionSourceValue()); + log.error("listRemoteOptions url", ex); } } - private void putOptionValue(Map map, FormItemResult e, String columnName, String vauleStr) { + private String putOptionValue(FormItemResult e, String vauleStr) { FormItemTypeEnum itemTypeEnum = FormItemTypeEnum.getEnum(e.getItemType()); switch (itemTypeEnum) { case CHECKBOX: - e.getOptions().forEach(optionDTO -> { - map.put(optionDTO.getValue(), vauleStr.contains(optionDTO.getValue()) ? StrConstant.YES : StrConstant.NO); - }); + for (OptionDTO dto : e.getOptions()) { + return vauleStr.contains(dto.getValue()) ? StrConstant.YES : StrConstant.NO; + } break; case SELECT: case RADIO: - e.getOptions().forEach(optionDTO -> { + for (OptionDTO optionDTO : e.getOptions()) { if (optionDTO.getValue().equals(vauleStr)) { - map.put(columnName, optionDTO.getLabel()); + return optionDTO.getLabel(); } - }); + } break; default: } - }*/ + return vauleStr; + } + + /** + * desc:获取表单配置 + * @param customerId + * @return map key:tableName ,value:ExportResiUserItemDTO + */ + private Map getItemMap(String customerId){ + //获取表单项 + IcResiUserService icResiUserService = SpringContextUtils.getBean(IcResiUserService.class); + if (icResiUserService == null){ + log.error("获取bean IcResiUserService 失败"); + return null; + } + List resiFormAllItems = icResiUserService.listFormItems(customerId, IcFormCodeEnum.RESI_BASE_INFO.getCode()); + Map allItemMap = resiFormAllItems.stream().collect(Collectors.toMap(FormItemResult::getItemId, o -> o)); + Map map = new HashMap<>(); + allItemMap.values().forEach(item->{ + String tableName = item.getTableName(); + ExportResiUserItemDTO exportItem = map.getOrDefault(tableName, new ExportResiUserItemDTO()); + map.putIfAbsent(tableName,exportItem); + String columnName = item.getColumnName().concat(item.getColumnNum() == NumConstant.ZERO ? StrConstant.EPMETY_STR : item.getColumnNum().toString()); + exportItem.getItemMap().put(columnName,item); + if (Constant.OPITON_SOURCE_REMOTE.equals(item.getOptionSourceType())&&item.getOptionSourceValue().contains(StrConstant.QUESTION_MARK)){ + //多个参数 + String[] paramArr = item.getOptionSourceValue().split(StrConstant.QUESTION_MARK_TRANSFER)[NumConstant.ONE].split(StrConstant.AND_MARK); + Arrays.stream(paramArr).forEach(o->{ + FormItemResult value = allItemMap.get(o); + if (value == null){ + return; + } + Set conditionSet = exportItem.getRemoteItemConditionMap().getOrDefault(item.getItemId(),new HashSet<>()); + conditionSet.add(value); + exportItem.getRemoteItemConditionMap().putIfAbsent(item.getItemId(),conditionSet); + }); + } + }); + return map; + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 882c6dcf42..824c8329eb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -8,8 +8,8 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcelFactory; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.bean.ResiImportCategoryData; -import com.epmet.bean.ResiImportResiCategoryChangedCache; import com.epmet.bean.ResiImportChangedData; +import com.epmet.bean.ResiImportResiCategoryChangedCache; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.constant.StrConstant; @@ -33,7 +33,10 @@ import com.epmet.dao.IcUserChangeDetailedDao; import com.epmet.dao.IcUserChangeRecordDao; import com.epmet.dao.IcUserTransferRecordDao; import com.epmet.dto.*; -import com.epmet.dto.form.*; +import com.epmet.dto.form.GridOptionFormDTO; +import com.epmet.dto.form.HouseFormDTO; +import com.epmet.dto.form.IcResiUserOrgMsgFormDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IcResiUserEntity; import com.epmet.entity.IcUserChangeDetailedEntity; @@ -43,14 +46,14 @@ import com.epmet.enums.IcResiUserTableEnum; import com.epmet.excel.handler.IcResiImportDynamicExcelListener; import com.epmet.excel.handler.IcResiVirtualSheetImportListener; import com.epmet.feign.*; -import com.epmet.service.*; +import com.epmet.service.IcResiUserImportService; +import com.epmet.service.UserService; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; @@ -60,7 +63,9 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; import java.nio.file.Path; import java.time.LocalDate; import java.time.Period; @@ -1151,6 +1156,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res * @param fullUri * @return [ pureUri, cascadeItemId(父itemId) ] */ + @Override public String[] splitOptionSourceUrl(String fullUri) { String pureUri = null; String cascadeItemId = null; @@ -1170,6 +1176,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res * 远程获取options * @return */ + @Override public Map listRemoteOptions(String pureUri, String cascadeItemId, Map columnWrappers, String currUserAgencyId, String purpose) { ColumnWrapper cascadeItemColumnWrapper = null; @@ -1971,6 +1978,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res * @param bizType * @return */ + @Override public String createImportTaskRecord(String operatorId, String bizType, String originFilename) { ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); importTaskForm.setOperatorId(operatorId); @@ -1992,6 +2000,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res * @param resultDesc 结果描述，非必填 * @param resultDescPath 结果描述文件，excel等文件，有错误的话需要传入，成功则不需要 */ + @Override public void finishImportTask(String importTaskId, String operatorId, String processStatus, String resultDesc, String resultDescPath) { ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); importFinishTaskForm.setTaskId(importTaskId); @@ -2006,11 +2015,4 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res importTaskId, processStatus, operatorId, resultDesc, resultDescPath); } } - - @Override - public Object testAsync() { - IcNeighborHoodDTO nform = new IcNeighborHoodDTO(); - govOrgOpenFeignClient.getNeighborHoodOptions(nform); - return null; - } } From 5928e6abc41c8a731be514e57acc4ad04bc964d3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 25 Apr 2022 15:25:41 +0800 Subject: [PATCH 284/391] =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/IcResiUserController.java | 18 ------------------ 1 file changed, 18 deletions(-) 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 03f9d3b842..503227c820 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 @@ -913,24 +913,6 @@ public class IcResiUserController implements ResultDataResolver { return new Result>().ok(icResiUserService.getExistUserByHouseIds(ids)); } -// public static ThreadLocal tl = new ThreadLocal(); - - @PostMapping("test-async") - public Result testAsync(HttpServletRequest request) { -// tl.set("wxz"); - executorService.submit(() -> { - try { - Thread.sleep(500l); - log.info("[我是子线程]:" + EpmetRequestHolder.getHeader("app")); - System.out.println("---"); - } catch (InterruptedException e) { - log.error("method exception", e); - } - icResiUserImportService.testAsync(); - }); - return new Result(); - } - /** * @Author sun * @Description 【人房】居民总数饼图 From 7278a2e4642059e26d859ef069a8f172e7e2fd6e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 25 Apr 2022 15:58:17 +0800 Subject: [PATCH 285/391] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E2=80=94=E2=80=94=E4=BF=9D=E5=AD=98=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcExportTemplateServiceImpl.java | 50 +++++++++---------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index 52872f5c66..a358a47698 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -125,12 +125,30 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl dataList, String pid, String customerId, String tempId, + List resultList, List itemList) { int num = 0; - for (IcExportItemListFormDTO dto : formDTO.getItemList()) { + //1.遍历一级表单项 + for (IcExportItemListFormDTO dto : dataList) { IcExportTemplateConfigEntity itemEntity = ConvertUtils.sourceToTarget(dto, IcExportTemplateConfigEntity.class); itemEntity.setId(UUID.randomUUID().toString().replace("-", "")); - itemEntity.setPid("0"); + itemEntity.setPid(pid); itemEntity.setCustomerId(customerId); itemEntity.setTempId(tempId); num += 1; @@ -141,31 +159,11 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl Date: Mon, 25 Apr 2022 17:13:52 +0800 Subject: [PATCH 286/391] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=A8=A1=E6=9D=BF=E5=88=97=E8=A1=A8=E5=8F=8A=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/TemplateDetailResultDTO.java | 19 +++++++++ .../IcExportTemplateController.java | 21 ++++++++++ .../com/epmet/dao/IcExportTemplateDao.java | 13 ++++++ .../service/IcExportTemplateService.java | 22 ++++++++++ .../impl/IcExportTemplateServiceImpl.java | 40 +++++++++++++++++++ .../resources/mapper/IcExportTemplateDao.xml | 31 ++++++++++++++ 6 files changed, 146 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/TemplateDetailResultDTO.java diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/TemplateDetailResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/TemplateDetailResultDTO.java new file mode 100644 index 0000000000..6f5fb03c8d --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/TemplateDetailResultDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/4/25 16:25 + */ +@Data +public class TemplateDetailResultDTO implements Serializable { + private static final long serialVersionUID = 8954669603105326916L; + private String id; + private String label; + private List children; +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java index 739f3f4a08..94a6981a05 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java @@ -1,7 +1,9 @@ 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; @@ -12,6 +14,7 @@ import com.epmet.dto.form.IcExportTemplateQueryFormDTO; import com.epmet.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.dto.result.IcExportTemplateForExportResultDTO; +import com.epmet.dto.result.TemplateDetailResultDTO; import com.epmet.service.IcExportTemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -74,5 +77,23 @@ public class IcExportTemplateController { return new Result().ok(icExportTemplateService.getTemplateConfigForExport(param)); } + /** + * 获取模板列表 + * + * @Param tokenDto + * @Return {@link Result< List< IcExportTemplateDTO>>} + * @Author zhaoqifeng + * @Date 2022/4/25 14:28 + */ + @PostMapping("templateList") + public Result> getTemplateList(@LoginUser TokenDto tokenDto, @RequestBody IcExportTemplateDTO formDTO) { + return new Result>().ok(icExportTemplateService.getTemplateList(tokenDto, formDTO)); + } + + @PostMapping("templateDetail") + public Result> getTemplateDetail(@RequestBody IcExportTemplateDTO formDTO) { + return new Result>().ok(icExportTemplateService.getTemplateDetail(formDTO)); + } + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java index 710faced60..fdf33b6754 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java @@ -4,6 +4,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcExportTemplateDTO; import com.epmet.dto.form.IcExportTemplateQueryFormDTO; import com.epmet.dto.result.IcExportTemplateForExportResultDTO; +import com.epmet.dto.result.TemplateDetailResultDTO; import com.epmet.entity.IcExportTemplateEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -22,4 +23,16 @@ public interface IcExportTemplateDao extends BaseDao { List getTemplateConfigForExport(IcExportTemplateQueryFormDTO param); List selectByAgencyId(@Param("agencyId") String agencyId); + + /** + * 获取模板详情 + * + * @Param tempId + * @Return {@link List< TemplateDetailResultDTO>} + * @Author zhaoqifeng + * @Date 2022/4/25 16:33 + */ + List getTemplateDetail(@Param("tempId") String tempId); + + List getChildrenTemplateDetail(@Param("pid") String pid); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java index 0a9c6cc258..38e79c1ce7 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java @@ -2,11 +2,13 @@ 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.IcExportTemplateDTO; import com.epmet.dto.form.IcExportTemplateQueryFormDTO; import com.epmet.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.dto.result.IcExportTemplateForExportResultDTO; +import com.epmet.dto.result.TemplateDetailResultDTO; import com.epmet.entity.IcExportTemplateEntity; import java.util.List; @@ -79,4 +81,24 @@ public interface IcExportTemplateService extends BaseService} + * @Author zhaoqifeng + * @Date 2022/4/25 14:29 + */ + List getTemplateList(TokenDto tokenDto, IcExportTemplateDTO formDTO); + + /** + * 获取模板详情 + * + * @Param formDTO + * @Return {@link List< TemplateDetailResultDTO>} + * @Author zhaoqifeng + * @Date 2022/4/25 16:29 + */ + List getTemplateDetail(IcExportTemplateDTO formDTO); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index 4fea6e27c4..a66db7ffa1 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -14,6 +15,7 @@ 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.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dao.IcExportTemplateDao; @@ -25,6 +27,7 @@ import com.epmet.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.dto.result.ConditionResultDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.dto.result.IcExportTemplateForExportResultDTO; +import com.epmet.dto.result.TemplateDetailResultDTO; import com.epmet.entity.IcExportTemplateConfigEntity; import com.epmet.entity.IcExportTemplateEntity; import com.epmet.service.IcExportTemplateConfigService; @@ -213,6 +216,43 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl} + * @Author zhaoqifeng + * @Date 2022/4/25 14:29 + */ + @Override + public List getTemplateList(TokenDto tokenDto, IcExportTemplateDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcExportTemplateEntity::getAgencyId, staffInfo.getAgencyId()); + wrapper.eq(IcExportTemplateEntity::getFormCode, formDTO.getFormCode()); + wrapper.orderByAsc(IcExportTemplateEntity::getSort); + List list = baseDao.selectList(wrapper); + return ConvertUtils.sourceToTarget(list, IcExportTemplateDTO.class); + } + + /** + * 获取模板详情 + * + * @param formDTO + * @Param formDTO + * @Return {@link List< TemplateDetailResultDTO >} + * @Author zhaoqifeng + * @Date 2022/4/25 16:29 + */ + @Override + public List getTemplateDetail(IcExportTemplateDTO formDTO) { + return baseDao.getTemplateDetail(formDTO.getId()); + } + private void digui(Map> resultTemp, IcExportTemplateForExportResultDTO root, List> headerList, List showSqlColumns, List hiddenSqlColumns, Set hasExistColumnSet) { if (StringUtils.isNotBlank(root.getColumnName())) { showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getItemId(),root.getTableName(), root.getColumnName(),root.getOptionSourceType(),root.getOptionSourceValue())); diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml index 6504800ca6..29b847ff64 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml @@ -28,6 +28,37 @@ WHERE TEMP_ID = #{tempId} and c.CUSTOMER_ID = #{customerId} and c.DEL_FLAG = '0' ORDER BY c.PID,c.SORT + + + + + + + + + + + + --> - select - concat(b.BUILDING_NAME,'-',d.UNIT_NUM,'-',a.DOOR_NAME) as houseName, - c.NEIGHBOR_HOOD_NAME as neighborHoodName, UPDATE ic_house h,ic_building b,ic_building_unit u From f4a002d0f3392a865e81dc95c184f1f58da4461b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 26 Apr 2022 15:52:26 +0800 Subject: [PATCH 295/391] groupByTables --- .../com/epmet/dto/result/SubTableJoinDTO.java | 4 +++ .../feign/OperCustomizeOpenFeignClient.java | 4 +-- .../main/resources/mapper/IcFormItemDao.xml | 6 ++-- .../java/com/epmet/dao/IcResiUserDao.java | 6 ++-- .../service/impl/IcResiUserServiceImpl.java | 35 +++++++++++++------ .../main/resources/mapper/IcResiUserDao.xml | 10 ++++++ 6 files changed, 49 insertions(+), 16 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/SubTableJoinDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/SubTableJoinDTO.java index a7b950d891..e0ccb7c850 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/SubTableJoinDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/SubTableJoinDTO.java @@ -10,4 +10,8 @@ public class SubTableJoinDTO implements Serializable { private static final long serialVersionUID = 8243764437194993736L; private String tableName; private String joinTableSql; + /** + * 是否支持添加一行，1支持，默认0不支持 + */ + private Boolean supportAdd; } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index 9ad09ea7b0..d8aed532c0 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -26,8 +26,8 @@ import java.util.Set; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:16 */ - // @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089") -@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class) + @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089") +// @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class) public interface OperCustomizeOpenFeignClient { @PostMapping(value = "/oper/customize/customerfootbar/customerfootbars", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index e98c46f61f..da32693cc7 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -154,10 +154,12 @@ @@ -193,6 +198,11 @@ group by IC_RESI_USER.id + + + ${groupTableName}.ID + + order by ic_resi_user.CREATED_TIME desc From 0fbddc0bd58e5894518b5018c7c5a359e6233118 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 26 Apr 2022 15:53:04 +0800 Subject: [PATCH 296/391] groupByTables url --- .../java/com/epmet/feign/OperCustomizeOpenFeignClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index d8aed532c0..9ad09ea7b0 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -26,8 +26,8 @@ import java.util.Set; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:16 */ - @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089") -// @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class) + // @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089") +@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class) public interface OperCustomizeOpenFeignClient { @PostMapping(value = "/oper/customize/customerfootbar/customerfootbars", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) From f39cfecb6d967b6fe18edbfb578f08fac32d46a2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 26 Apr 2022 16:05:36 +0800 Subject: [PATCH 297/391] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=20=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/ExcelFillCellMergeStrategy.java | 114 ++++++++++ .../poi/excel/handler/ExcelMergeStrategy.java | 213 ++++++++++++++++++ .../epmet/dto/result/ConditionResultDTO.java | 5 + .../dto/result/IcCustomExportResultDTO.java | 21 +- .../IcExportTemplateForExportResultDTO.java | 5 +- .../impl/IcExportTemplateServiceImpl.java | 4 +- .../resources/mapper/IcExportTemplateDao.xml | 13 +- .../impl/IcResiUserExportServiceImpl.java | 60 +++-- .../service/impl/IcResiUserServiceImpl.java | 10 +- 9 files changed, 421 insertions(+), 24 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelMergeStrategy.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java new file mode 100644 index 0000000000..6b08ca5e74 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java @@ -0,0 +1,114 @@ +package com.epmet.commons.tools.utils.poi.excel.handler; + +import com.alibaba.excel.metadata.Head; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.write.handler.CellWriteHandler; +import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; +import com.alibaba.excel.write.metadata.holder.WriteTableHolder; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.util.CellRangeAddress; + +import java.util.List; + +/** + * desc:单元格合并策略 + * @author liujianjun + */ +public class ExcelFillCellMergeStrategy implements CellWriteHandler { + + private int[] mergeColumnIndex; + private int mergeRowIndex; + + public ExcelFillCellMergeStrategy() { + } + + public ExcelFillCellMergeStrategy(int mergeRowIndex, int[] mergeColumnIndex) { + this.mergeRowIndex = mergeRowIndex; + this.mergeColumnIndex = mergeColumnIndex; + } + + @Override + public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead) { + + } + + @Override + public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) { + // 隐藏id列 + writeSheetHolder.getSheet().setColumnHidden(0, true); + } + + @Override + public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, List> list, Cell cell, Head head, Integer integer, Boolean aBoolean) { + int curRowIndex = cell.getRowIndex(); + int curColIndex = cell.getColumnIndex(); + int size = list.size(); + System.out.println(size); + if (mergeColumnIndex == null) { + if (curRowIndex > 2) { + mergeWithPrevRow(writeSheetHolder, cell, curRowIndex, curColIndex); + } + }else{ + if (curRowIndex > mergeRowIndex) { + for (int i = 0; i < mergeColumnIndex.length; i++) { + if (curColIndex == mergeColumnIndex[i]) { + mergeWithPrevRow(writeSheetHolder, cell, curRowIndex, curColIndex); + break; + } + } + } + } + } + + /** + * 当前单元格向上合并 + * + * @param writeSheetHolder + * @param cell 当前单元格 + * @param curRowIndex 当前行 + * @param curColIndex 当前列 + */ + private void mergeWithPrevRow(WriteSheetHolder writeSheetHolder, Cell cell, int curRowIndex, int curColIndex) { + //writeSheetHolder.getExcelWriteHeadProperty(). + // 当前行的第一个Cell + Cell curFirstCell = cell.getSheet().getRow(curRowIndex).getCell(0); + Object curFirstData = curFirstCell.getCellType() == CellType.STRING ? curFirstCell.getStringCellValue() : curFirstCell.getNumericCellValue(); + // 上一行的第一个Cell + Cell preFirstCell = cell.getSheet().getRow(curRowIndex - 1).getCell(0); + Object preFirstData = preFirstCell.getCellType() == CellType.STRING ? preFirstCell.getStringCellValue() : preFirstCell.getNumericCellValue(); + + if (curFirstData.equals(preFirstData)) { + Object curData = cell.getCellType() == CellType.STRING ? cell.getStringCellValue() : cell.getNumericCellValue(); + Cell preCell = cell.getSheet().getRow(curRowIndex - 1).getCell(curColIndex); + Object preData = preCell.getCellType() == CellType.STRING ? preCell.getStringCellValue() : preCell.getNumericCellValue(); + // 将当前单元格数据与上一个单元格数据比较 + Boolean dataBool = preData.equals(curData); + //此处需要注意：因为我是按照序号确定是否需要合并的，所以获取每一行第一列数据和上一行第一列数据进行比较，如果相等合并 + Boolean bool = cell.getRow().getCell(0).getStringCellValue().equals(cell.getSheet().getRow(curRowIndex - 1).getCell(0).getStringCellValue()); + if (dataBool && bool) { + Sheet sheet = writeSheetHolder.getSheet(); + List mergeRegions = sheet.getMergedRegions(); + boolean isMerged = false; + for (int i = 0; i < mergeRegions.size() && !isMerged; i++) { + CellRangeAddress cellRangeAddr = mergeRegions.get(i); + // 若上一个单元格已经被合并，则先移出原有的合并单元，再重新添加合并单元 + if (cellRangeAddr.isInRange(curRowIndex - 1, curColIndex)) { + sheet.removeMergedRegion(i); + cellRangeAddr.setLastRow(curRowIndex); + sheet.addMergedRegion(cellRangeAddr); + isMerged = true; + } + } + // 若上一个单元格未被合并，则新增合并单元 + if (!isMerged) { + CellRangeAddress cellRangeAddress = new CellRangeAddress(curRowIndex - 1, curRowIndex, curColIndex, curColIndex); + sheet.addMergedRegion(cellRangeAddress); + } + } + } + } + +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelMergeStrategy.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelMergeStrategy.java new file mode 100644 index 0000000000..141c7de5d7 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelMergeStrategy.java @@ -0,0 +1,213 @@ +package com.epmet.commons.tools.utils.poi.excel.handler; + +/** + * desc: + * + * @author: LiuJanJun + * @date: 2022/4/26 1:36 下午 + * @version: 1.0 + */ + +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.Head; +import com.alibaba.excel.metadata.data.CellData; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.write.handler.CellWriteHandler; +import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; +import com.alibaba.excel.write.metadata.holder.WriteTableHolder; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.util.CellRangeAddress; + +import java.util.List; +import java.util.Objects; +import java.util.stream.IntStream; + +/** + * 相同值合并策略 + */ + +public class ExcelMergeStrategy implements CellWriteHandler { + + /** + * 合并起始行 + */ + + private int mergeRowIndex; + /** + * 多少行合并一次 + */ + + private int eachRow; + + /** + * 合并字段的下标 + */ + + private int[] mergeColumnIndex; + + public ExcelMergeStrategy(int mergeRowIndex, int[] mergeColumnIndex, int eachRow) { + + if (mergeRowIndex < 0) { + + throw new IllegalArgumentException("mergeRowIndex must be greater than 0"); + + } + + if (eachRow < 0) { + + throw new IllegalArgumentException("eachRow must be greater than 0"); + + } + + this.mergeRowIndex = mergeRowIndex; + + this.mergeColumnIndex = mergeColumnIndex; + + this.eachRow = eachRow; + + } + + @Override + + public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead) { + } + + @Override + + public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) { + } + + // @Override + public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) { + + int curRowIndex = cell.getRowIndex(); + +//当前列 + + int curColIndex = cell.getColumnIndex(); + +//合并条件： + +//1.当前行>合并起始行，默认标题行（0）不参加合并 + +//2.间隔行（eachRow）的上下两条不参加合并 + +//2.1间隔行（eachRow）==0时，不设置间隔 + + if (isMerge(curRowIndex)) { + + IntStream.range(0, mergeColumnIndex.length).anyMatch(i -> { + + if (curColIndex == mergeColumnIndex[i]) { + + mergeWithPrevRow(writeSheetHolder, cellData, cell, curRowIndex, curColIndex); + + return true; + + } + + return false; + + }); + + } + + } + + @Override + public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, List> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) { + } + + /** + * 判断是否合并 + *

+ * 1.当前位置必须大于开始位置：curRowIndex > mergeRowIndex + *

+ * 2.根据eachRow 判断数据分割的间隔 + *

+ * 2.1如果根据eachRow=0，默认不合并 + *

+ * 2.2如果1如果根据eachRow>0,分割后的第一条数据不会与之前的合并：（curRowIndex-mergeRowIndex）%eachRow==0 + * + * @return + */ + + private boolean isMerge(Integer curRowIndex) { + if ((curRowIndex > mergeRowIndex) && eachRow > 0) { + + if ((curRowIndex - mergeRowIndex) % eachRow == 0) { + + return false; + + } + + return true; + + } + return false; + + } + + private void mergeWithPrevRow(WriteSheetHolder writeSheetHolder, CellData cellData, Cell cell, int curRowIndex, int curColIndex) { + +//获取当前行的当前列的数据和上一行的当前列列数据，通过上一行数据是否相同进行合并 + + Object curData = cellData.getType() == CellDataTypeEnum.STRING ? cellData.getStringValue() : cellData.getNumberValue(); + + Cell preCell = cell.getSheet().getRow(curRowIndex - 1).getCell(curColIndex); + + Object preData = preCell.getCellTypeEnum() == CellType.STRING ? preCell.getStringCellValue() : + + preCell.getNumericCellValue(); + +// 比较当前行的第一列的单元格与上一行是否相同，相同合并当前单元格与上一行 + + if (Objects.equals(curData, preData)) { + + Sheet sheet = writeSheetHolder.getSheet(); + + List mergeRegions = sheet.getMergedRegions(); + + boolean isMerged = false; + + for (int i = 0; i < mergeRegions.size() && !isMerged; i++) { + + CellRangeAddress cellRangeAddr = mergeRegions.get(i); + +// 若上一个单元格已经被合并，则先移出原有的合并单元，再重新添加合并单元 + + if (cellRangeAddr.isInRange(curRowIndex - 1, curColIndex)) { + + sheet.removeMergedRegion(i); + + cellRangeAddr.setLastRow(curRowIndex); + + sheet.addMergedRegion(cellRangeAddr); + + isMerged = true; + + } + + } + +// 若上一个单元格未被合并，则新增合并单元 + + if (!isMerged) { + + CellRangeAddress cellRangeAddress = new CellRangeAddress(curRowIndex - 1, curRowIndex, curColIndex, + + curColIndex); + + sheet.addMergedRegion(cellRangeAddress); + + } + + } + + } + +} + diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java index fe2e7b03cb..4d0a000b8a 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java @@ -91,5 +91,10 @@ public class ConditionResultDTO implements Serializable { private String funType; private List options; + + /** + * 这个表 是否支持添加 即是否是多对一 eg:居民需求是多个对一个 + */ + private boolean supportAdd; } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java index 3b5ad1cdf2..31f09c2be0 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.dto.result; +import com.epmet.commons.tools.constant.NumConstant; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.util.CollectionUtils; import java.io.Serializable; import java.util.ArrayList; @@ -26,6 +28,10 @@ public class IcCustomExportResultDTO implements Serializable { private List> headers = new ArrayList<>(); + + private Integer headerRow; + + /** * sql中要返回的 列名 顺序跟表头顺序一致 */ @@ -42,9 +48,22 @@ public class IcCustomExportResultDTO implements Serializable { public static class SqlColumn { private String itemId; private String tableName; + private Boolean manyToOne; private String columnName; private String optionSourceType; - private String optionSourceValue; } + /** + * desc:获取有几行头 + * @return + */ + public Integer getHeaderRow() { + if (CollectionUtils.isEmpty(headers)){ + return NumConstant.ZERO; + } + return headers.stream().mapToInt(List::size).max().orElse(0); + } + + + } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java index 3e00f6e072..d8ad9b8e5a 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java @@ -57,6 +57,9 @@ public class IcExportTemplateForExportResultDTO implements Serializable { private String columnName; private String optionSourceValue; - private String optionSourceType; + /** + * 是否支持添加 即是否是多对一 eg:居民需求是多个对一个 + */ + private boolean supportAdd; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index 50fb337bcd..5bb93a162a 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -229,7 +229,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl> resultTemp, IcExportTemplateForExportResultDTO root, List> headerList, List showSqlColumns, List hiddenSqlColumns, Set hasExistColumnSet) { if (StringUtils.isNotBlank(root.getColumnName())) { - showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getItemId(),root.getTableName(), root.getColumnName(),root.getOptionSourceType(),root.getOptionSourceValue())); + showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getItemId(),root.getTableName(),root.isSupportAdd(), root.getColumnName(),root.getOptionSourceValue())); if (StringUtils.isNotBlank(root.getOptionSourceValue())&&root.getOptionSourceValue().contains(StrConstant.QUESTION_MARK)) { String[] paramArr = root.getOptionSourceValue().split(StrConstant.QUESTION_MARK_TRANSFER)[NumConstant.ONE].split(StrConstant.AND_MARK); //先remote中再添加 然后移除item中有的 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml index 29b847ff64..fb453591f5 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml @@ -20,8 +20,17 @@ + SELECT COUNT(ID) FROM ic_building_unit WHERE BUILDING_ID = #{buildingId} AND DEL_FLAG = '0' + + From c7672f0f6dd4b3e033dba38fddcf3444c5105374 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 27 Apr 2022 15:14:53 +0800 Subject: [PATCH 334/391] =?UTF-8?q?=E6=8F=90=E9=AB=98=E5=8F=AF=E8=AF=BB?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiUserExportServiceImpl.java | 68 ++++++++++--------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index ed792de92a..8547061def 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -174,7 +174,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { String tableName = sqlColumn.getTableName(); String itemId = sqlColumn.getItemId(); String columnName = columnDTO.getColumnName(); - if (hiddenColumnSet.contains(columnName)){ + if (hiddenColumnSet.contains(columnName)) { return; } String vauleStr = value == null ? StrConstant.EPMETY_STR : value.toString(); @@ -268,39 +268,41 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { String cacheValue = cache.getIfPresent(vauleStr); if (StringUtils.isNotBlank(cacheValue)) { map.put(columnName, cacheValue); - } else { - String[] parts = icResiUserImportService.splitOptionSourceUrl(e.getOptionSourceValue()); - - if (FormItemTypeEnum.CASCADER.getCode().equals(e.getItemType())) { - Map remoteOptionMap = icResiUserImportService.listRemoteCascadeOptions(parts[0], parts[1], columnWrappers, currentStaffAgencyId, "query"); - List listOptions = new ArrayList<>(); - String[] split = vauleStr.split(StrConstant.COMMA); - Arrays.stream(split).forEach((value) -> { - //todo 看看怎么更好的利用本地缓存 - OptionResultDTO optionResultDTO = remoteOptionMap.get(value); - if (optionResultDTO != null) { - listOptions.add(optionResultDTO.getLabel()); - } - }); - String join = Joiner.on("-").join(listOptions); - cache.put(vauleStr, join); - map.put(columnName, join); - } else { - //todo 不支持多个itemId - Map remoteOptions = icResiUserImportService.listRemoteOptions(parts[0], parts[1], columnWrappers, currentStaffAgencyId, "query"); - if (FormItemTypeEnum.CHECKBOX.getCode().equals(e.getItemType())) { - remoteOptions.forEach((label, value) -> map.put(value, vauleStr.contains(value) ? StrConstant.YES : StrConstant.NO)); - } else if (FormItemTypeEnum.SELECT.getCode().equals(e.getItemType())) { - remoteOptions.forEach((label, value) -> { - if (vauleStr.equals(value)) { - map.put(columnName, label); - } - //放if外面是为了下次取得时候 可以有值 - cache.put(value, label); - }); - } - } + return; + } + String[] parts = icResiUserImportService.splitOptionSourceUrl(e.getOptionSourceValue()); + //如果是级联的 则调用级联获取接口 根据原始值逗号隔开的 赋值 + if (FormItemTypeEnum.CASCADER.getCode().equals(e.getItemType())) { + Map remoteOptionMap = icResiUserImportService.listRemoteCascadeOptions(parts[0], parts[1], columnWrappers, currentStaffAgencyId, "query"); + List listOptions = new ArrayList<>(); + String[] split = vauleStr.split(StrConstant.COMMA); + Arrays.stream(split).forEach((value) -> { + //todo 看看怎么更好的利用本地缓存 + OptionResultDTO optionResultDTO = remoteOptionMap.get(value); + if (optionResultDTO != null) { + listOptions.add(optionResultDTO.getLabel()); + } + }); + String join = Joiner.on("-").join(listOptions); + cache.put(vauleStr, join); + map.put(columnName, join); + return; + } + //todo 不支持多个itemId + Map remoteOptions = icResiUserImportService.listRemoteOptions(parts[0], parts[1], columnWrappers, currentStaffAgencyId, "query"); + if (FormItemTypeEnum.CHECKBOX.getCode().equals(e.getItemType())) { + remoteOptions.forEach((label, value) -> map.put(value, vauleStr.contains(value) ? StrConstant.YES : StrConstant.NO)); + return; + } + if (FormItemTypeEnum.SELECT.getCode().equals(e.getItemType())) { + remoteOptions.forEach((label, value) -> { + if (vauleStr.equals(value)) { + map.put(columnName, label); + } + //放if外面是为了下次取得时候 可以有值 + cache.put(value, label); + }); } } catch (Exception ex) { log.warn("listRemoteOptions url", ex); From eca5abdb211c33673441a9f17b6c7e009414c440 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 27 Apr 2022 15:18:44 +0800 Subject: [PATCH 335/391] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=A4=9A=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/feign/EpmetUserOpenFeignClient.java | 3 --- .../epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java | 1 + .../main/java/com/epmet/controller/IcResiUserController.java | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) 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 2eddf2191e..db4031fcdd 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 @@ -716,9 +716,6 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/icresiuser/getexistuserbyhouseids") Result> getExistUserByHouseIds(@RequestBody List ids); - @PostMapping("/epmetuser/icresiuser/userchartlist") - Result> userChartList(@RequestBody UserChartFormDTO userDTO); - /** * 租客房东根据身份证更新头像 * 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 98df627942..850080bed1 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 @@ -9,6 +9,7 @@ import com.epmet.dto.form.*; import com.epmet.dto.form.patrol.PatrolQueryFormDTO; import com.epmet.dto.result.*; import com.epmet.feign.EpmetUserOpenFeignClient; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; 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 ab10c6ccc0..f9ab5f2ab3 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 @@ -928,8 +928,6 @@ public class IcResiUserController implements ResultDataResolver { * @date 2022/1/17 4:25 下午 */ @PostMapping("personwarn/rightlist") - @MaskResponse(fieldNames = "mobile", fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) - public Result personWarnRightList(@RequestBody PersonWarnRightListFormDTO formDTO, @LoginUser TokenDto tokenDto) { @MaskResponse(fieldNames = "mobile", fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE }) public Result personWarnRightList(@RequestBody PersonWarnRightListFormDTO formDTO,@LoginUser TokenDto tokenDto){ ValidatorUtils.validateEntity(formDTO, PersonWarnRightListFormDTO.PersonWarnRightListForm.class); From 61315feeb436a0599f121d506daf8d2917f73d8f Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 27 Apr 2022 15:19:45 +0800 Subject: [PATCH 336/391] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/OperCustomizeOpenFeignClient.java | 7 ------- .../OperCustomizeOpenFeignClientFallback.java | 5 ----- .../main/java/com/epmet/dao/IcFormItemDao.java | 9 --------- .../service/impl/IcExportTemplateServiceImpl.java | 13 +++++-------- .../src/main/resources/mapper/IcFormItemDao.xml | 15 --------------- 5 files changed, 5 insertions(+), 44 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index 9ad09ea7b0..ce708be3b2 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -1,7 +1,6 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerFootBarDTO; import com.epmet.dto.IcFormItemOptionsDTO; @@ -171,10 +170,4 @@ public interface OperCustomizeOpenFeignClient { @PostMapping("/oper/customize/icExportTemplate/getExcelHeaderAndSqlColumnForExport") Result getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateQueryFormDTO param); - /** - * @author sun - * @Description 居民信息自定义模板导出--保存模板 - */ - @PostMapping("/oper/customize/icExportTemplate/save") - Result> save(@RequestBody IcExportTemplateSaveFormDTO formDTO); } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java index 91e4772d8a..555dac052c 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java @@ -1,7 +1,6 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerFootBarDTO; @@ -131,8 +130,4 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getExcelHeaderAndSqlColumnForExport", param); } - @Override - public Result> save(IcExportTemplateSaveFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "save", formDTO); - } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java index cece95984e..fda1c91afc 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java @@ -80,15 +80,6 @@ public interface IcFormItemDao extends BaseDao { **/ List getMustColumn(@Param("customerId") String customerId); - /** - * desc:获取需要远程获取并带有关联item的参数的 item项 - * - * @param customerId - * @param formCode - * @return - */ - List getConditionRemoteItems(@Param("customerId") String customerId, @Param("formCode") String formCode); - /** * desc:根据Id获取item对应的表名和item属性 * diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index 3186d60146..482d3af99d 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -203,20 +203,17 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl remoteItemList = icFormItemDao.getConditionRemoteItems(param.getCustomerId(), param.getFormCode()); + Map> resultTemp = list.stream().collect(Collectors.groupingBy(IcExportTemplateForExportResultDTO::getPid, LinkedHashMap::new, Collectors.toList())); List> headerList = new ArrayList<>(); List showSqlColumns = new ArrayList<>(); List hiddenSqlColumns = new ArrayList<>(); Set hasExistColumnSet = new HashSet<>(); - resultTemp.get(NumConstant.ZERO_STR).forEach(root -> { - digui(resultTemp, root, headerList, showSqlColumns, hiddenSqlColumns, hasExistColumnSet); - }); + resultTemp.get(NumConstant.ZERO_STR) + .forEach(root -> recursionData(resultTemp, root, headerList, showSqlColumns, hiddenSqlColumns, hasExistColumnSet)); //组织 关联item项的 if (hasExistColumnSet.size() > NumConstant.ZERO) { Set configItemIdSet = list.stream().map(IcExportTemplateForExportResultDTO::getItemId).collect(Collectors.toSet()); @@ -297,7 +294,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl> resultTemp, IcExportTemplateForExportResultDTO root, List> headerList, List showSqlColumns, List hiddenSqlColumns, Set hasExistColumnSet) { + private void recursionData(Map> resultTemp, IcExportTemplateForExportResultDTO root, List> headerList, List showSqlColumns, List hiddenSqlColumns, Set hasExistColumnSet) { if (StringUtils.isNotBlank(root.getColumnName())) { showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getItemId(),root.getTableName(),root.isSupportAdd(), root.getColumnName(),root.getOptionSourceType())); if (StringUtils.isNotBlank(root.getOptionSourceValue())&&root.getOptionSourceValue().contains(StrConstant.QUESTION_MARK)) { @@ -315,7 +312,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl - - SELECT + SELECT a.id, a.`NAME`, a.MOBILE, a.ID_CARD, @@ -67,7 +67,7 @@ + + + From 94c816662ea36a58637750029cf5021ececf697f Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 27 Apr 2022 16:23:05 +0800 Subject: [PATCH 341/391] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AD=90=E8=8A=82?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/dto/result/OptionResultDTO.java | 20 +++++++++++++++++++ .../impl/IcResiUserImportServiceImpl.java | 19 ++---------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java index 4226c2acac..739d44fc00 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java @@ -1,9 +1,11 @@ package com.epmet.commons.tools.dto.result; import lombok.Data; +import org.apache.commons.collections4.CollectionUtils; import java.io.Serializable; import java.util.List; +import java.util.Map; /** * @Description @@ -21,4 +23,22 @@ public class OptionResultDTO implements Serializable { private List children; private Boolean usableFlag; private String type; + + + /** + * desc:递归获取当前节点的 所有子节点 + * + * @param option + * @param resultMap + */ + public void getCurrenNodeAllChild(OptionResultDTO option, Map resultMap) { + resultMap.put(option.getValue(), option); + if (CollectionUtils.isNotEmpty(option.getChildren())) { + return; + } + option.getChildren().forEach(o -> { + resultMap.put(o.getValue(), o); + getCurrenNodeAllChild(o, resultMap); + }); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 5596554999..51074aac3e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -1289,27 +1289,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res if (options == null) { return null; } + //结果平铺展开 Map resultMap = new HashMap<>(); - options.forEach(option-> getChildren(option,resultMap)); + options.forEach(option-> option.getCurrenNodeAllChild(option,resultMap)); return resultMap; } - /** - * desc:递归获取children - * @param option - * @param resultMap - * todo 利用泛型 提取到公共类中 - */ - public void getChildren(OptionResultDTO option, Map resultMap) { - resultMap.put(option.getValue(),option); - if (CollectionUtils.isNotEmpty(option.getChildren())){ - option.getChildren().forEach(o->{ - resultMap.put(o.getValue(),o); - getChildren(o,resultMap); - }); - } - } - /** * 更新主表中人员类别标记 * @param icResiUserTableEnum From c8fc5881b496eb613448dcd0ad92e0be010112c8 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 27 Apr 2022 16:41:46 +0800 Subject: [PATCH 342/391] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=9F=A5=E8=AF=A2=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/RentTenantFormDTO.java | 11 ++++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 10 +++--- .../EpmetUserOpenFeignClientFallback.java | 8 ++--- .../controller/IcResiUserController.java | 25 +++++++++---- .../com/epmet/service/IcResiUserService.java | 14 ++++++-- .../service/impl/IcResiUserServiceImpl.java | 35 +++++++++++++------ .../main/resources/mapper/IcResiUserDao.xml | 1 - 7 files changed, 76 insertions(+), 28 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java index c184f7958d..039b433416 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java @@ -1,6 +1,7 @@ package com.epmet.dto.form; import com.epmet.dto.IcResiUserAttachmentDTO; +import com.epmet.dto.IcResiUserDTO; import lombok.Data; import java.io.Serializable; @@ -31,4 +32,14 @@ public class RentTenantFormDTO implements Serializable { */ private String idCard; + /** + * 人员类型 0：房东 1：租客 + */ + private String type; + + /** + * 人员信息 + */ + private IcResiUserDTO user; + } 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 db4031fcdd..aa3c47996e 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 @@ -724,19 +724,19 @@ public interface EpmetUserOpenFeignClient { * @author zhy * @date 2022/4/26 10:48 */ - @PostMapping("/epmetuser/icresiuser/rent/rentUpdate") - Result rentUpdate(@RequestBody RentTenantFormDTO formDTO); + @PostMapping("/epmetuser/icresiuser/rent/updateimage") + Result updateImage(@RequestBody RentTenantFormDTO formDTO); /** - * 租客房东根据身份证更新头像 + * 查询居民信息 * * @param formDTO * @return com.epmet.commons.tools.utils.Result * @author zhy * @date 2022/4/26 10:48 */ - @PostMapping("/epmetuser/icresiuser/rent/tenantData") - Result tenantData(@RequestBody RentTenantDataFormDTO formDTO); + @PostMapping("/epmetuser/icresiuser/rent/getrentresiuserinfo") + Result getRentResiUserInfo(@RequestBody RentTenantDataFormDTO formDTO); @PostMapping("/epmetuser/icresiuser/userchartlist") Result> userChartList(@RequestBody UserChartFormDTO userDTO); 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 850080bed1..e41a16e280 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 @@ -529,13 +529,13 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien } @Override - public Result rentUpdate(@RequestBody RentTenantFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "rentUpdate", formDTO); + public Result updateImage(@RequestBody RentTenantFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "updateImage", formDTO); } @Override - public Result tenantData(RentTenantDataFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "tenantData", formDTO); + public Result getRentResiUserInfo(RentTenantDataFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getRentResiUserInfo", formDTO); } @Override 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 f9ab5f2ab3..5b7b580c93 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 @@ -243,9 +243,9 @@ public class IcResiUserController implements ResultDataResolver { * @author zhy * @date 2022/4/26 10:48 */ - @PostMapping("rent/rentUpdate") - public Result rentUpdate(@RequestBody RentTenantFormDTO formDTO) { - String resiUserId = icResiUserService.rentUpdate(formDTO); + @PostMapping("rent/updateimage") + public Result updateImage(@RequestBody RentTenantFormDTO formDTO) { + String resiUserId = icResiUserService.updateImage(formDTO); //推送MQ事件 editResiMq(formDTO.getCustomerId(), resiUserId); return new Result(); @@ -271,10 +271,23 @@ public class IcResiUserController implements ResultDataResolver { * @author zhy * @date 2022/4/26 15:51 */ - @PostMapping("rent/tenantData") - public Result tenantData(@RequestBody RentTenantDataFormDTO formDTO) { + @PostMapping("rent/getrentresiuserinfo") + public Result getRentResiUserInfo(@RequestBody RentTenantDataFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); - return new Result().ok(icResiUserService.tenantData(formDTO)); + return new Result().ok(icResiUserService.getRentResiUserInfo(formDTO)); + } + + /** + * 租客房东黑名单查询个人数据 + * + * @param idCard + * @return com.epmet.commons.tools.utils.Result + * @author zhy + * @date 2022/4/26 15:51 + */ + @PostMapping("rent/getresiuserinfo/{idCard}") + public Result> getRentResiUserInfoByIdCard(@PathVariable("idCard") String idCard) { + return new Result>().ok(icResiUserService.getRentResiUserInfoByIdCard(idCard)); } /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 2b823fdc10..6b8923baf9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -288,7 +288,17 @@ public interface IcResiUserService extends BaseService { * @author zhy * @date 2022/4/26 16:03 */ - RentTenantDataResultDTO tenantData(RentTenantDataFormDTO formDTO); + RentTenantDataResultDTO getRentResiUserInfo(RentTenantDataFormDTO formDTO); + + /** + * 租客房东黑名单查询个人数据 + * + * @param idCard + * @return com.epmet.dto.result.RentTenantDataResultDTO + * @author zhy + * @date 2022/4/26 16:03 + */ + List getRentResiUserInfoByIdCard(String idCard); /** * 租客房东根据身份证更新头像 @@ -298,5 +308,5 @@ public interface IcResiUserService extends BaseService { * @author zhy * @date 2022/4/26 10:48 */ - String rentUpdate(RentTenantFormDTO formDTO); + String updateImage(RentTenantFormDTO formDTO); } 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 62cff961bd..437a364d4a 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 @@ -136,9 +136,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getWrapper(Map params) { String id = (String) params.get(FieldConstant.ID_HUMP); + String idCard = (String) params.get("idCard"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.eq(StringUtils.isNotBlank(idCard), "ID_CARD", idCard); return wrapper; } @@ -1708,30 +1710,43 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> dynamicQuery(String customerId, String formCode, String resultTableName, List showSqlColumns, List conditions, String currentStaffAgencyId, String staffOrgPath) { // List finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions); List exportNeedTableList = showSqlColumns.stream().map(IcCustomExportResultDTO.SqlColumn::getTableName).collect(Collectors.toList()); - Map> map=getFinalSubables(customerId, formCode, resultTableName, conditions, exportNeedTableList); - return baseDao.dynamicQuery(customerId,resultTableName,conditions,map.get("finalSubTables"),showSqlColumns,currentStaffAgencyId,staffOrgPath,map.get("groupByTables")); + Map> map = getFinalSubables(customerId, formCode, resultTableName, conditions, exportNeedTableList); + return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), showSqlColumns, currentStaffAgencyId, staffOrgPath, map.get("groupByTables")); } @Override - public RentTenantDataResultDTO tenantData(RentTenantDataFormDTO formDTO) { + public RentTenantDataResultDTO getRentResiUserInfo(RentTenantDataFormDTO formDTO) { IcResiUserEntity entity = baseDao.selectById(formDTO.getUserId()); return ConvertUtils.sourceToTarget(entity, RentTenantDataResultDTO.class); } + @Override + public List getRentResiUserInfoByIdCard(String idCard) { + Map params = new HashMap<>(8); + params.put("idCard", idCard); + List entityList = baseDao.selectList(getWrapper(params)); + return ConvertUtils.sourceToTarget(entityList, RentTenantDataResultDTO.class); + } + @Override @Transactional(rollbackFor = Exception.class) - public String rentUpdate(RentTenantFormDTO formDTO) { + public String updateImage(RentTenantFormDTO formDTO) { String resiUserId = ""; IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(formDTO.getIdCard(), formDTO.getCustomerId()); if (null != userDTO) { resiUserId = userDTO.getId(); // 插入附件头像(只有一张) - formDTO.getImages().forEach(item -> { - item.setUserId(userDTO.getId()); - }); - formDTO.getImages().forEach(item -> { - icResiUserAttachmentService.save(item); - }); + formDTO.getImages().forEach(item -> item.setUserId(userDTO.getId())); + formDTO.getImages().forEach(item -> icResiUserAttachmentService.save(item)); + } else if (NumConstant.ONE_STR.equals(formDTO.getType())) { + // 如果是新增的租客，需要新增一条信息，不存在的房东就不管了 + IcResiUserEntity entity = ConvertUtils.sourceToTarget(formDTO.getUser(), IcResiUserEntity.class); + insert(entity); + resiUserId = entity.getId(); + + // 新增用户后保存头像信息 + formDTO.getImages().forEach(item -> item.setUserId(entity.getId())); + formDTO.getImages().forEach(item -> icResiUserAttachmentService.save(item)); } return resiUserId; 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 bdbab0392f..34974ddfef 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 @@ -375,7 +375,6 @@ ic_resi_user WHERE del_flag = '0' - AND customer_id = #{customerId} AND id_card = #{idCard} From 0ff35b0a2a6da51ea383940185f7f545274798b3 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 27 Apr 2022 16:51:15 +0800 Subject: [PATCH 343/391] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=A8=A1=E6=9D=BF=E5=88=97=E8=A1=A8=E5=8F=8A=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcExportTemplateDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml index a299cd8865..5abc391d2a 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml @@ -53,6 +53,7 @@ ic_export_template_config where DEL_FLAG = 0 and TEMP_ID = #{tempId} + and PID = '0' order by SORT From a84822f7453dd26f2049907ef907301224ece5cf Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 27 Apr 2022 16:51:42 +0800 Subject: [PATCH 344/391] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcResiUserImportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 51074aac3e..5432d7cb44 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -73,7 +73,7 @@ import java.util.stream.Collectors; /** * @ClassName IcResiUserImportServiceImpl - * @Description TODO + * @Description 居民信息导入 服务实现类 * @Author wangxianzhang * @Date 2021/11/4 8:53 下午 * @Version 1.0 From ce76dd0bb55b475674d05c590a72ec5480cc6875 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 27 Apr 2022 17:11:20 +0800 Subject: [PATCH 345/391] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcBuildingDao.xml | 5 ++++- .../src/main/resources/mapper/IcNeighborHoodDao.xml | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 59ac9f2b24..1f4c188744 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -108,7 +108,10 @@ AND a.DEL_FLAG = '0' - order by a.CREATED_TIME, a.BUILDING_NAME +# order by a.CREATED_TIME, a.BUILDING_NAME + #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序 + ORDER BY CONVERT(b.NEIGHBOR_HOOD_NAME using gbk), + CONVERT(a.BUILDING_NAME USING gbk) 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 660770fe2a..6fedffbbe1 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 @@ -100,7 +100,6 @@ AND a.DEL_FLAG = '0' -# ORDER BY a.CREATED_TIME ORDER BY CONVERT(a.NEIGHBOR_HOOD_NAME using gbk) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index d4662df72d..514b0629ac 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -158,7 +158,9 @@ and a.del_flag = '0' #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序 - ORDER BY a.sort, + ORDER BY + a.sort, + a.sort DESC, CONVERT(c.NEIGHBOR_HOOD_NAME using gbk), CONVERT(b.BUILDING_NAME USING gbk), CONVERT(d.UNIT_NAME USING gbk), From c6b32326fd2b35e5a784f7134d8738221d685eaf Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 6 May 2022 10:12:27 +0800 Subject: [PATCH 373/391] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=EF=BC=8C=E6=88=BF?= =?UTF-8?q?=E5=B1=8B=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=80=92=E5=BA=8F?= =?UTF-8?q?=E6=AD=A3=E5=BA=8F=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcBuildingDao.xml | 5 +++-- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 482deeccea..2cc2fcd73f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -122,8 +122,9 @@ AND a.DEL_FLAG = '0' ORDER BY - a.sort, - a.sort DESC, + a.sort, + a.sort, + a.sort DESC, CAST(b.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(b.NEIGHBOR_HOOD_NAME using gbk), CAST(a.BUILDING_NAME AS SIGNED),CONVERT(a.BUILDING_NAME USING gbk) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 514b0629ac..49472d0dc7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -159,8 +159,9 @@ #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序 ORDER BY - a.sort, - a.sort DESC, + a.sort, + a.sort, + a.sort DESC, CONVERT(c.NEIGHBOR_HOOD_NAME using gbk), CONVERT(b.BUILDING_NAME USING gbk), CONVERT(d.UNIT_NAME USING gbk), From 49d92147ade64adf2719895ad9f5046d1d0da9ca Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 May 2022 10:37:59 +0800 Subject: [PATCH 374/391] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=88=97=E5=AE=BD=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/EasyPoiExcelExportStylerImpl.java | 2 +- .../handler/ColumnWidthStyleStrategy.java | 96 +++++++++++++++++++ .../impl/IcResiUserExportServiceImpl.java | 1 - 3 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ColumnWidthStyleStrategy.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/EasyPoiExcelExportStylerImpl.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/EasyPoiExcelExportStylerImpl.java index b1a5606c2e..5ddff4ba71 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/EasyPoiExcelExportStylerImpl.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/EasyPoiExcelExportStylerImpl.java @@ -50,7 +50,7 @@ public class EasyPoiExcelExportStylerImpl extends AbstractExcelExportStyler titleStyle.setFont(font); titleStyle.setAlignment(HorizontalAlignment.CENTER); titleStyle.setVerticalAlignment(VerticalAlignment.CENTER); - return null; + return titleStyle; } /** diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ColumnWidthStyleStrategy.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ColumnWidthStyleStrategy.java new file mode 100644 index 0000000000..7e577e7c22 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ColumnWidthStyleStrategy.java @@ -0,0 +1,96 @@ +package com.epmet.commons.tools.utils.poi.excel.handler; + +/** + * desc:设置columnWith宽度 + * + * @author: LiuJanJun + * @date: 2022/4/28 5:05 下午 + * @version: 1.0 + */ + +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.Head; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.util.MapUtils; +import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; +import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.poi.ss.usermodel.Cell; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +/** + * Take the width of the longest column as the width. + *

+ * This is not very useful at the moment, for example if you have Numbers it will cause a newline.And the length is not + * exactly the same as the actual length. + * + * @author Jiaju Zhuang + */ +public class ColumnWidthStyleStrategy extends AbstractColumnWidthStyleStrategy { + + private static final int MAX_COLUMN_WIDTH = 255; + /** + * 是否 根据内容设置宽度 + */ + private boolean isSetContentWidth = false; + + private final Map> cache = MapUtils.newHashMapWithExpectedSize(8); + + + + @Override + protected void setColumnWidth(WriteSheetHolder writeSheetHolder, List> cellDataList, Cell cell, + Head head, + Integer relativeRowIndex, Boolean isHead) { + boolean needSetWidth = (isHead || isSetContentWidth) && CollectionUtils.isNotEmpty(cellDataList); + if (!needSetWidth) { + return; + } + Map maxColumnWidthMap = cache.computeIfAbsent(writeSheetHolder.getSheetNo(), k -> new HashMap<>(16)); + Integer columnWidth = dataLength(cellDataList, cell, isHead); + if (columnWidth < 0) { + return; + } + if (columnWidth > MAX_COLUMN_WIDTH) { + columnWidth = MAX_COLUMN_WIDTH; + } + Integer maxColumnWidth = maxColumnWidthMap.get(cell.getColumnIndex()); + if (maxColumnWidth == null || columnWidth > maxColumnWidth) { + maxColumnWidthMap.put(cell.getColumnIndex(), columnWidth); + writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(), columnWidth * 256); + } + } + + private Integer dataLength(List> cellDataList, Cell cell, Boolean isHead) { + if (isHead) { + return cell.getStringCellValue().getBytes().length+3; + } + WriteCellData cellData = cellDataList.get(0); + CellDataTypeEnum type = cellData.getType(); + if (type == null) { + return -1; + } + switch (type) { + case STRING: + return cellData.getStringValue().getBytes().length; + case BOOLEAN: + return cellData.getBooleanValue().toString().getBytes().length; + case NUMBER: + return cellData.getNumberValue().toString().getBytes().length; + default: + return -1; + } + } + + public ColumnWidthStyleStrategy() { + + } + + public ColumnWidthStyleStrategy(boolean isSetContentWidth) { + this.isSetContentWidth = isSetContentWidth; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index 70c2dbb55a..c684def65b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -278,7 +278,6 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { List listOptions = new ArrayList<>(); String[] split = vauleStr.split(StrConstant.COMMA); Arrays.stream(split).forEach((value) -> { - //todo 看看怎么更好的利用本地缓存 OptionResultDTO optionResultDTO = remoteOptionMap.get(value); if (optionResultDTO != null) { listOptions.add(optionResultDTO.getLabel()); From 4303f3cc646b60a9bb85d1f7851ddc09d316cda3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 May 2022 10:43:11 +0800 Subject: [PATCH 375/391] =?UTF-8?q?do=E8=AF=AD=E5=8F=A5=E8=A2=AB=E7=9F=AD?= =?UTF-8?q?=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserExportServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index c684def65b..996e675ff0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -201,7 +201,6 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { resultData.add(singleRowData); }); excelWriter.write(resultData, writeSheet); - break; } while (mapListPage.getResult().size() == searchForm.getPageSize()); } catch (IOException e) { log.error("exportIcResiUser exception", e); From 95ace290f7b92d8750cfe3617878ddefd1a80877 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 May 2022 11:07:32 +0800 Subject: [PATCH 376/391] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=88=97=E5=8E=9F?= =?UTF-8?q?=E5=A7=8B=E5=80=BC=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserExportServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index 996e675ff0..0edf48b55f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.constant.Constant; +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.dto.form.IcExportTemplateSaveFormDTO; @@ -20,6 +21,7 @@ import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Md5Util; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; @@ -190,12 +192,16 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { FormItemResult formItemResult = exportResiUserItemDTO.getItemMap().get(columnName); String newValue = vauleStr; + if (Constant.OPITON_SOURCE_REMOTE.equals(sqlColumn.getOptionSourceType()) && StringUtils.isNotBlank(vauleStr)) { putRemoteValue(exportResiUserItemDTO.getRemoteItemConditionMap().get(itemId), staffInfoCacheResult.getAgencyId(), o, originalConditionMap, formItemResult, columnName, vauleStr); newValue = String.valueOf(o.get(columnName)); } else if (Constant.OPITON_SOURCE_LOCAL.equals(sqlColumn.getOptionSourceType())) { newValue = putOptionValue(formItemResult, vauleStr); } + if (FieldConstant.ID.equals(key)) { + newValue = Md5Util.md5(vauleStr); + } singleRowData.add(newValue); }); resultData.add(singleRowData); @@ -241,10 +247,10 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { } IcCustomExportResultDTO data = exportConfigResult.getData(); - //添加一个虚拟列Id 用于分组 - data.getShowSqlColumns().add(0, new IcCustomExportResultDTO.SqlColumn(null, "ic_resi_user", false, "ID", "local")); + //添加一个虚拟列Id 用于分组 合并单元格 + data.getShowSqlColumns().add(0, new IcCustomExportResultDTO.SqlColumn(null, "ic_resi_user", false, FieldConstant.ID, "local")); List id = new ArrayList<>(); - id.add("ID"); + id.add(FieldConstant.ID); data.getHeaders().add(0, id); return exportConfigResult; } @@ -336,6 +342,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { } break; default: + return valueStr; } return valueStr; } From 7b9300be4c957459aaf6c56126da916291bcba0f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 6 May 2022 14:02:15 +0800 Subject: [PATCH 377/391] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=AF=B9?= =?UTF-8?q?datapicker=E5=92=8Cdatarange=E7=A9=BA=E9=97=B4=E7=9A=84?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=BF=9B=E8=A1=8C=E6=AD=A3=E5=88=99=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E5=88=A4=E6=96=AD=EF=BC=8C=E5=92=8C=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiUserImportServiceImpl.java | 82 ++++++++++++++++++- 1 file changed, 78 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index d530aa9f34..c3ec181ef2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -85,10 +85,24 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res public static final List controlGroup1 = Arrays.asList("input", "textarea", "datepicker", "daterange"); public static final List controlGroup2 = Arrays.asList("select", "radio"); - // 身份证号的正则表达式 + /** + * 15位身份证号的正则表达式 + */ private final Pattern PATTERN_15_ID = Pattern.compile("^\\d{6}(?\\d{2})(?0[1-9]|1[0-2])(?[0-2][0-9]|3[0-1])\\d{2}(?\\d)$"); + /** + * 18位身份证号的正则表达式 + */ private final Pattern PATTERN_18_ID = Pattern.compile("^\\d{6}(?\\d{4})(?0[1-9]|1[0-2])(?[0-2][0-9]|3[0-1])\\d{2}(?\\d)[0-9a-xA-X]$"); + /** + * 日期解析，不含时间 + */ + private final Pattern PATTERN_DATE_PICKER = Pattern.compile("^(\\d{4})[-/](0?[1-9]|1[0-2])[-/](3[0-1]|[0-2]?\\d).*$"); + /** + * daterange的解析：1992-01-20,1992-01-30 + */ + private final Pattern PATTERN_DATE_RANGE = Pattern.compile("^(\\d{4})[-/](0?[1-9]|1[0-2])[-/](3[0-1]|[0-2]?\\d).*,(\\d{4})[-/](0?[1-9]|1[0-2])[-/](3[0-1]|[0-2]?\\d).*$"); + /** * 身份证号列序号 */ @@ -149,7 +163,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res private OssFeignClient ossFeignClient; /** - * 字表中不需要的列 + * 子表中不需要的列。因为主表中需要身份证号，网格等信息，但子表中不需要这些列必填，只要有身份证号即可，因此字表判断的时候需要排除这些列 */ private List subTableNeedlessColumns = Arrays.asList("GRID_ID", "VILLAGE_ID", "BUILD_ID", "UNIT_ID", "HOME_ID", "IS_BDHJ", "NAME", "MOBILE", "GENDER", "ID_CARD", @@ -621,7 +635,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res columnAndValues.put("BIRTHDAY", String.join("-", Arrays.asList(year, month,day))); columnAndValues.put("GENDER", isMale ? "1" : "2"); columnAndValues.put("IS_OLD_PEOPLE", age >= 60 ? "1" : "0"); - System.out.println(6); } /** @@ -695,7 +708,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } catch (Exception e) { String errorMsg; - if (e instanceof RenException) { + if (e instanceof RenException || e instanceof EpmetException) { errorMsg = e.getMessage(); } else { errorMsg = "未知系统错误"; @@ -792,6 +805,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res String notFoundColumnName = null; List emptyColumnNames = new ArrayList<>(); + List patternErrorColumnNames = new ArrayList<>(); // 这两列要提前放进去，因为有的列未填写的话，会抛异常出去，需要用这两列来做描述 target2Insert.put("ID_CARD", row.get(ID_CARD_COLUMN_NO)); @@ -823,6 +837,13 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res continue; } + // 日期控件的数据校验和清晰 + boolean dateError = dateTypeCheckAndWash(columnWrapper, patternErrorColumnNames); + if (dateError) { + hasError = dateError; + continue; + } + // "select", "radio" } else if (controlGroup2.contains(columnWrapper.getItemType())){ @@ -916,10 +937,63 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res sb.append(notFoundColumnName).append("填写的值在系统中未找到"); } + if (CollectionUtils.isNotEmpty(patternErrorColumnNames)) { + sb.append(String.join(",", patternErrorColumnNames)).append("的值格式错误"); + } + throw new EpmetException(sb.toString()); } } + /** + * 处理一下日期类型的数据 + * @param columnWrapper + * @param patternErrorColumnNames + * @return true:有错误，false，没错误 + */ + private boolean dateTypeCheckAndWash(ColumnWrapper columnWrapper, List patternErrorColumnNames) { + // 日期格式不对的检查 + String cellContent = columnWrapper.getCellContent(); + if (StringUtils.isBlank(cellContent)) { + return false; + } + + if ("datepicker".equals(columnWrapper.getItemType())) { + Matcher matcher = PATTERN_DATE_PICKER.matcher(cellContent); + if (matcher.matches()) { + String year = matcher.group(1); + String month = matcher.group(2); + String day = matcher.group(3); + + cellContent = String.format("%s-%02d-%02d", year, Integer.parseInt(month), Integer.parseInt(day)); + columnWrapper.setCellContent(cellContent); + columnWrapper.setColValue(cellContent); + } else { + patternErrorColumnNames.add(columnWrapper.getCombinedLabel()); + return true; + } + } else if ("daterange".equals(columnWrapper.getItemType())) { + Matcher matcher = PATTERN_DATE_RANGE.matcher(cellContent); + if (matcher.matches()) { + String year = matcher.group(1); + String month = matcher.group(2); + String day = matcher.group(3); + String yearEnd = matcher.group(4); + String monthEnd = matcher.group(5); + String dayEnd = matcher.group(6); + + cellContent = String.format("%s-%02d-%02d,%s-%02d-%02d", year, Integer.parseInt(month), Integer.parseInt(day), yearEnd, Integer.parseInt(monthEnd), Integer.parseInt(dayEnd)); + columnWrapper.setCellContent(cellContent); + columnWrapper.setColValue(cellContent); + } else { + patternErrorColumnNames.add(columnWrapper.getCombinedLabel()); + return true; + } + } + + return false; + } + /** * 必填，但是用户没填的，放到list中 * @param isPrimaryTable 是否是主表。true：是主表，false：从表 From cd81ac7b6aa2878c116d37d72d9a7d362402a5ce Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 6 May 2022 14:15:01 +0800 Subject: [PATCH 378/391] url --- .../main/java/com/epmet/feign/EpmetUserOpenFeignClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0029c42100..07bf76bfa5 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 @@ -23,8 +23,8 @@ import java.util.Set; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:09 */ - @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087") -//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class) +// @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087") +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class) public interface EpmetUserOpenFeignClient { /** From 59770de0cb6d4ffa3fb871a4d538cd89318f0428 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 May 2022 14:29:16 +0800 Subject: [PATCH 379/391] =?UTF-8?q?=E5=8F=AA=E5=90=88=E5=B9=B6=E6=94=B9?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../poi/excel/handler/ExcelFillCellMergeStrategy.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java index bff1f1a999..54f395bbc9 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java @@ -23,7 +23,7 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler { /** * 需要合并的列 下标 */ - private int[] mergeColumnIndex; + private int[] mergeColumnIndexArr; /** * 从下标n行开始合并 */ @@ -32,9 +32,9 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler { public ExcelFillCellMergeStrategy() { } - public ExcelFillCellMergeStrategy(int mergeRowIndex, int[] mergeColumnIndex) { + public ExcelFillCellMergeStrategy(int mergeRowIndex, int[] mergeColumnIndexArr) { this.mergeRowIndex = mergeRowIndex; - this.mergeColumnIndex = mergeColumnIndex; + this.mergeColumnIndexArr = mergeColumnIndexArr; } @Override @@ -56,14 +56,13 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler { return; } //如果不指定 合并的列则全部列进行 合并判断 - if (mergeColumnIndex == null) { + if (mergeColumnIndexArr == null) { mergeWithPrevRow(writeSheetHolder, cell, curRowIndex, curColIndex); } else { //合并指定的列号 - for (int columnIndex : mergeColumnIndex) { + for (int columnIndex : mergeColumnIndexArr) { if (curColIndex == columnIndex) { mergeWithPrevRow(writeSheetHolder, cell, curRowIndex, curColIndex); - break; } } } From 51cb74e77f73b9dbdab1200f410a7afd51f4c70e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 6 May 2022 15:03:49 +0800 Subject: [PATCH 380/391] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/CollectListFormDTO.java | 4 ++++ .../epmet/dto/result/CollectListResultDTO.java | 3 +-- .../controller/IcResiCollectController.java | 18 ++++++++++++++---- .../epmet/service/IcResiCollectService.java | 7 +++++++ .../service/impl/IcResiCollectServiceImpl.java | 14 ++++++++++++++ .../main/resources/mapper/IcResiCollectDao.xml | 3 +++ 6 files changed, 43 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java index 368db969c4..decce16f25 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java @@ -28,4 +28,8 @@ public class CollectListFormDTO extends PageFormDTO { private String userId; private String customerId; + /** + * 查看详情入参 + */ + private String id; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java index 2b95eb5e04..f4bd2a1886 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java @@ -1,6 +1,5 @@ package com.epmet.dto.result; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -21,7 +20,7 @@ public class CollectListResultDTO implements Serializable { */ private String houseHolderName; - @JsonIgnore + // @JsonIgnore private String id; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java index 54314229cf..9c96f77ace 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java @@ -20,10 +20,7 @@ import com.epmet.dto.result.CollectListResultDTO; import com.epmet.dto.result.LatestCollectResDTO; import com.epmet.service.IcResiCollectService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -81,6 +78,19 @@ public class IcResiCollectController { return new Result>().ok(icResiCollectService.getCollectList(formDTO)); } + /** + * 信息采集-详情 + * @param formDTO + * @param tokenDto + * @return + */ + @PostMapping("detail") + public Result detail(@RequestBody CollectListFormDTO formDTO, @LoginUser TokenDto tokenDto) { + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result().ok(icResiCollectService.detail(formDTO)); + } + /** * Desc: 查询采集居民信息 * @param formDTO diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java index 9129b34675..17b6031472 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java @@ -49,4 +49,11 @@ public interface IcResiCollectService extends BaseService { * @return */ LatestCollectResDTO latestSubmit(LatestSubmitCollectFormDTO formDTO); + + /** + * 信息采集详情 + * @param formDTO + * @return + */ + CollectListResultDTO detail(CollectListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index fe75c7acbb..5caeb3a008 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -115,6 +115,20 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl list = baseDao.getCollectList(formDTO); + if (CollectionUtils.isNotEmpty(list)) { + return list.get(NumConstant.ZERO); + } + return null; + } private IcNeighborHoodDTO queryIcNeighborHood(String villageId) { Result res = govOrgOpenFeignClient.getIcNeighbordhoodById(villageId); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml index 28e1e8370a..ebfe3767fd 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -39,6 +39,9 @@ AND DATE_FORMAT(c.CREATED_TIME,'%Y-%m-%d') #{endDate} + + AND c.id=#{id} + ORDER BY c.CREATED_TIME DESC @@ -203,7 +208,11 @@ ${groupTableName}.ID - order by ic_resi_user.CREATED_TIME desc,ic_resi_user.id desc + order by IC_RESI_USER.GRID_ID ASC, + IC_RESI_USER.VILLAGE_ID ASC, + IC_RESI_USER.BUILD_ID ASC, + IC_RESI_USER.UNIT_ID ASC, + IC_RESI_USER.HOME_ID ASC From ac71a67c310cbb3ed5199afe304d82e88070efaf Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 6 May 2022 17:01:17 +0800 Subject: [PATCH 383/391] =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 1bff30a5ca..2f3b12f380 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 @@ -810,6 +810,7 @@ AND a.ID_CARD LIKE concat( '%', #{idCard}, '%' ) + ORDER BY GRID_ID,VILLAGE_ID,BUILD_ID,UNIT_ID,HOME_ID, convert(NAME using gbk) ) t WHERE 1=1 @@ -819,7 +820,7 @@ AND natCount = #{natCount} - ORDER BY `NAME` + @@ -212,7 +213,8 @@ IC_RESI_USER.VILLAGE_ID ASC, IC_RESI_USER.BUILD_ID ASC, IC_RESI_USER.UNIT_ID ASC, - IC_RESI_USER.HOME_ID ASC + IC_RESI_USER.HOME_ID ASC, + IC_RESI_USER.ID ASC From f9d4b2c406a03bbdca45922764d93fec2e9b84c6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Sat, 7 May 2022 10:41:12 +0800 Subject: [PATCH 386/391] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/BuildingServiceImpl.java | 9 ++++++--- .../src/main/resources/mapper/IcBuildingDao.xml | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 4e8ccd0e93..3476d797d1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -157,7 +157,10 @@ public class BuildingServiceImpl implements BuildingService { //2.获取组织所在网格 List agencyIdList = customerAgencyList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); // agencyIdList.add(customerAgency.getId()); - List customerGridList = customerGridDao.selectList(new QueryWrapper().lambda().in(CustomerGridEntity::getPid, agencyIdList)); + LambdaQueryWrapper gridWrapper = new LambdaQueryWrapper<>(); + gridWrapper.in(CustomerGridEntity::getPid, agencyIdList); + gridWrapper.last("ORDER BY CAST(gridName AS SIGNED),CONVERT(gridName using gbk)"); + List customerGridList = customerGridDao.selectList(gridWrapper); if (CollectionUtils.isEmpty(customerGridList)) { return covertToTree(customerAgency, agencyList); @@ -182,7 +185,7 @@ public class BuildingServiceImpl implements BuildingService { List gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() .in(IcNeighborHoodEntity::getGridId, gridIdList) - .orderByAsc(IcNeighborHoodEntity::getCreatedTime); + .last("ORDER BY CAST(NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(NEIGHBOR_HOOD_NAME using gbk)"); List icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper); if (CollectionUtils.isEmpty(icNeighborHoodList)) { agencyList.addAll(gridList); @@ -206,7 +209,7 @@ public class BuildingServiceImpl implements BuildingService { List neighborHoodIdList = icNeighborHoodList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); LambdaQueryWrapper buildingQueryWrapper = new QueryWrapper().lambda() .in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList) - .orderByAsc(IcBuildingEntity::getCreatedTime, IcBuildingEntity::getBuildingName); + .last("ORDER BY SORT, CAST(BUILDING_NAME AS SIGNED),CONVERT(BUILDING_NAME USING gbk)"); List icBuildingList = icBuildingDao.selectList(buildingQueryWrapper); if (CollectionUtils.isEmpty(neighborHoodIdList)) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 2cc2fcd73f..7387a73354 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -186,6 +186,7 @@ ca.del_flag = '0' and CONCAT(':',ca.pids, ':') like CONCAT('%:',#{agencyId},':%') + ORDER BY CAST(organization_name AS SIGNED),CONVERT(organization_name using gbk)