From e901f7054122a642910c72f34e9744e854039038 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Sat, 2 Apr 2022 16:12:48 +0800 Subject: [PATCH 01/10] emm bug --- .../java/com/epmet/model/ImportBuildingInfoListener.java | 6 +++--- .../java/com/epmet/model/ImportHouseInfoListener.java | 8 ++++---- .../com/epmet/model/ImportNeighborHoodInfoListener.java | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) 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 1de117ca35..e07f99f914 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 @@ -344,7 +344,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener getGridInfos(String orgId){ gridInfoDTOs = icBuildingDao.selectAllGridByOrgId(orgId); - gridInfos = gridInfoDTOs.stream().collect(Collectors.toMap(n -> n.getGridName(), n -> n.getGridId())); + gridInfos = gridInfoDTOs.stream().collect(Collectors.toMap(n -> n.getGridName(), n -> n.getGridId(),(o1,o2) -> o1)); icHouseRedis.setTemporaryCacheGrid(formDTO.getCustomerId(), gridInfos, formDTO.getUserId()); return gridInfos; } @@ -357,7 +357,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener getNeighborHoodInfos(List gridIds){ neighborHoodInfoDTOs = icBuildingDao.selectAllNeighborHoodByGridIds(gridIds); - neighborHoodInfos = neighborHoodInfoDTOs.stream().collect(Collectors.toMap(n -> n.getGridId() + "_" + n.getNeighborHoodName(), n -> n.getNeighborHoodId())); + neighborHoodInfos = neighborHoodInfoDTOs.stream().collect(Collectors.toMap(n -> n.getGridId() + "_" + n.getNeighborHoodName(), n -> n.getNeighborHoodId(),(o1,o2) -> o1)); icHouseRedis.setTemporaryCacheNeighBorHood(formDTO.getCustomerId(), neighborHoodInfos, formDTO.getUserId()); return neighborHoodInfos; } @@ -370,7 +370,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener getBuildingInfos(String orgId){ buildingInfoDTOs = icBuildingDao.selectAllBuildingByNeighborHoodId(orgId); - buildingInfos = buildingInfoDTOs.stream().collect(Collectors.toMap(n -> n.getNeighborHoodId() + "_" + n.getBuildingName(), n -> n.getBuildingId())); + buildingInfos = buildingInfoDTOs.stream().collect(Collectors.toMap(n -> n.getNeighborHoodId() + "_" + n.getBuildingName(), n -> n.getBuildingId(),(o1,o2) -> o1)); icHouseRedis.setTemporaryCacheBuilding(formDTO.getCustomerId(), buildingInfos, formDTO.getUserId()); return buildingInfos; } 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 4cd6ae33d6..58388cbd87 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 @@ -490,7 +490,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener getGridInfos(String orgId){ gridInfoDTOs = icBuildingDao.selectAllGridByOrgId(orgId); - gridInfos = gridInfoDTOs.stream().collect(Collectors.toMap(n -> n.getGridName(), n -> n.getGridId())); + gridInfos = gridInfoDTOs.stream().collect(Collectors.toMap(n -> n.getGridName(), n -> n.getGridId(),(o1,o2) -> o1)); icHouseRedis.setTemporaryCacheGrid(formDTO.getCustomerId(), gridInfos, formDTO.getUserId()); return gridInfos; } @@ -503,7 +503,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener getNeighborHoodInfos(List gridIds){ neighborHoodInfoDTOs = icBuildingDao.selectAllNeighborHoodByGridIds(gridIds); - neighborHoodInfos = neighborHoodInfoDTOs.stream().collect(Collectors.toMap(n -> n.getGridId() + "_" + n.getNeighborHoodName(), n -> n.getNeighborHoodId())); + neighborHoodInfos = neighborHoodInfoDTOs.stream().collect(Collectors.toMap(n -> n.getGridId() + "_" + n.getNeighborHoodName(), n -> n.getNeighborHoodId(),(o1,o2) -> o1)); icHouseRedis.setTemporaryCacheNeighBorHood(formDTO.getCustomerId(), neighborHoodInfos, formDTO.getUserId()); return neighborHoodInfos; } @@ -516,7 +516,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener getBuildingInfos(String orgId){ buildingInfoDTOs = icBuildingDao.selectAllBuildingByNeighborHoodId(orgId); - buildingInfos = buildingInfoDTOs.stream().collect(Collectors.toMap(n -> n.getNeighborHoodId() + "_" + n.getBuildingName(), n -> n.getBuildingId())); + buildingInfos = buildingInfoDTOs.stream().collect(Collectors.toMap(n -> n.getNeighborHoodId() + "_" + n.getBuildingName(), n -> n.getBuildingId(),(o1,o2) -> o1)); icHouseRedis.setTemporaryCacheBuilding(formDTO.getCustomerId(), buildingInfos, formDTO.getUserId()); return buildingInfos; } @@ -530,7 +530,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener getBuildingUnitInfos(String orgId){ buildingUnitInfoDTOs = icBuildingDao.selectAllBuildingUnitByBuildingId(orgId); if (!CollectionUtils.isEmpty(buildingUnitInfoDTOs)){ - buildingUnitInfos = buildingUnitInfoDTOs.stream().collect(Collectors.toMap(n -> n.getBuildingId() + "_" + n.getBuildingUnit(), n -> n.getBuildingUnitId())); + buildingUnitInfos = buildingUnitInfoDTOs.stream().collect(Collectors.toMap(n -> n.getBuildingId() + "_" + n.getBuildingUnit(), n -> n.getBuildingUnitId(),(o1,o2) -> o1)); icHouseRedis.setTemporaryCacheBuildingUnit(formDTO.getCustomerId(), buildingUnitInfos, formDTO.getUserId()); } return buildingInfos; 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 index d50de038dd..d3b999687f 100644 --- 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 @@ -312,7 +312,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener getGridInfos(String orgId){ gridInfoDTOs = icBuildingDao.selectAllGridByOrgId(orgId); - gridInfos = gridInfoDTOs.stream().collect(Collectors.toMap(n -> n.getGridName(), n -> n.getGridId())); + gridInfos = gridInfoDTOs.stream().collect(Collectors.toMap(n -> n.getGridName(), n -> n.getGridId(),(o1,o2) -> o1)); icHouseRedis.setTemporaryCacheGrid(formDTO.getCustomerId(), gridInfos, formDTO.getUserId()); return gridInfos; } @@ -325,7 +325,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener getNeighborHoodInfos(List gridIds){ neighborHoodInfoDTOs = icBuildingDao.selectAllNeighborHoodByGridIds(gridIds); - neighborHoodInfos = neighborHoodInfoDTOs.stream().collect(Collectors.toMap(n -> n.getGridId() + "_" + n.getNeighborHoodName(), n -> n.getNeighborHoodId())); + neighborHoodInfos = neighborHoodInfoDTOs.stream().collect(Collectors.toMap(n -> n.getGridId() + "_" + n.getNeighborHoodName(), n -> n.getNeighborHoodId(),(o1,o2) -> o1)); icHouseRedis.setTemporaryCacheNeighBorHood(formDTO.getCustomerId(), neighborHoodInfos, formDTO.getUserId()); return neighborHoodInfos; } From 4178c2559881e50a887482cef6bfc04693b8695f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 2 Apr 2022 18:08:22 +0800 Subject: [PATCH 02/10] - --- .../epmet/service/impl/IcNatServiceImpl.java | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index abb8f6184c..1b359b5624 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -478,6 +478,8 @@ public class IcNatServiceImpl extends BaseServiceImpl imp @Transactional(rollbackFor = Exception.class) public void persisNat(IcNatEntity e, String customerId, String currentUserId, IcNatExcelImportListener listener) { List otherRows = listener.getOtherRows(); + String agencyPids = listener.getCurrentAgencyPids(); + String agencyId = listener.getCurrentAgencyId(); Date natTime = e.getNatTime(); String idCard = e.getIdCard(); @@ -545,43 +547,50 @@ public class IcNatServiceImpl extends BaseServiceImpl imp resiNat.setUpdatedBy(currentUserId); resiNat.setUpdatedTime(new Date()); - IcResiUserEntity resi = getResi(customerId, idCard); + IcResiUserEntity resi = getResi(customerId, idCard, null); resiNat.setIsResiUser(resi != null ? "1" : "0"); resiNat.setUserId(resi != null ? resi.getId() : ""); baseDao.updateById(resiNat); } - // 还要创建关系 - createNatRelation(resiNat.getId(), listener.getCurrentAgencyId(), listener.getCurrentAgencyPids()); + // 还要创建关系。只有本辖区及下级居民，才建立关系 + if (getResi(customerId, idCard, String.join(":", Arrays.asList(agencyPids, agencyId))) != null) { + createNatRelation(resiNat.getId(), listener.getCurrentAgencyId(), listener.getCurrentAgencyPids()); + } return; } // 执行新增操作 - IcResiUserEntity resi = getResi(customerId, idCard); + IcResiUserEntity resi = getResi(customerId, idCard, null); e.setIsResiUser(resi != null ? "1" : "0"); e.setUserId(resi != null ? resi.getId() : ""); e.setUserType("import"); baseDao.insert(e); - // 还要创建关系 - createNatRelation(e.getId(), listener.getCurrentAgencyId(), listener.getCurrentAgencyPids()); + // 还要创建关系。只有本辖区及下级居民，才建立关系 + if (getResi(customerId, idCard, String.join(":", Arrays.asList(agencyPids, agencyId))) != null) { + createNatRelation(e.getId(), listener.getCurrentAgencyId(), listener.getCurrentAgencyPids()); + } } /** - * 是否是客户下的居民； + * 是否是指定条件下的居民； * 0：否 * 1：是 * @param customerId * @param idCard * @return */ - public IcResiUserEntity getResi(String customerId, String idCard) { + public IcResiUserEntity getResi(String customerId, String idCard, String pids) { LambdaQueryWrapper query = new LambdaQueryWrapper(); query.eq(IcResiUserEntity::getCustomerId, customerId); query.eq(IcResiUserEntity::getIdCard, idCard); + if (StringUtils.isNotBlank(pids)) { + query.likeRight(IcResiUserEntity::getPids, pids); + } return icResiUserDao.selectOne(query); } From 7b8e3907c9dc9c3db5063ea8fb9b56b955a72846 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 4 Apr 2022 13:59:38 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=B8=BB=E9=94=AE=E5=86=B2=E7=AA=81=20?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-prod.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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-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 # 使用现有网络 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/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/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 # 使用现有网络 From cd15a10e723513660503f1a863d0abdc8809f44c Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 4 Apr 2022 14:03:14 +0800 Subject: [PATCH 04/10] =?UTF-8?q?Revert=20"=E4=B8=BB=E9=94=AE=E5=86=B2?= =?UTF-8?q?=E7=AA=81=20=E6=9C=8D=E5=8A=A1=E5=8F=91=E5=B8=83"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7b8e3907 --- .../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 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-prod.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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..01efd03422 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:0.3.57 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 37bbb7c4d2..c839bb22b4 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.40 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..d4ea51ca74 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:0.0.63 ports: - "8112:8112" 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 25c2bda0b7..fb855657d2 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.96 ports: - "8102:8102" 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 7a1858d0df..354d8b1daa 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.130 ports: - "8095:8095" network_mode: host # 使用现有网络 From 99919895be4ad7106f186c9b377f0cf75e9ce160 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 6 Apr 2022 09:07:19 +0800 Subject: [PATCH 05/10] bug --- .../com/epmet/commons/tools/utils/EpmetRequestHolder.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java index 94304fab98..f0dad5d9ab 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java @@ -46,7 +46,11 @@ public class EpmetRequestHolder { * @return */ public static String getHeader(String headerName) { - return requestHeaderTtl.get().get(headerName.toLowerCase()); + Map stringStringMap = requestHeaderTtl.get(); + if (stringStringMap == null){ + return null; + } + return stringStringMap.get(headerName.toLowerCase()); } /** From e7f3872c7dd63efa78a50ec19b8fc5b2f5e671cb Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 6 Apr 2022 10:09:33 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=97=A5->=E5=BA=9F=E5=BC=83=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=86=85=E9=83=A8=E8=B0=83=E7=94=A8=E7=9A=84=E5=AE=9A=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EpmetCommonServiceOpenFeignClient.java | 9 +++++ ...tCommonServiceOpenFeignClientFallback.java | 16 +++----- .../com/epmet/task/WorkDayScheduleTask.java | 10 +++-- .../java/com/epmet/utils/ShowApiUtil.java | 5 ++- .../epmet-job/epmet-job-server/pom.xml | 6 +++ .../com/epmet/service/WorkDayInitService.java | 17 ++++++++ .../service/impl/WorkDayInitServiceImpl.java | 24 ++++++++++++ .../java/com/epmet/task/WorkDayInitTask.java | 39 +++++++++++++++++++ 8 files changed, 109 insertions(+), 17 deletions(-) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/WorkDayInitService.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/WorkDayInitServiceImpl.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java index 9ddd2d710d..f5ef9b507c 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java @@ -7,6 +7,7 @@ import com.epmet.dto.result.*; import com.epmet.feign.fallback.EpmetCommonServiceOpenFeignClientFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -140,4 +141,12 @@ public interface EpmetCommonServiceOpenFeignClient { */ @RequestMapping("/commonservice/import-task/finish") Result finishImportTask(@RequestBody ImportTaskCommonFormDTO input); + + /** + * desc:初始化工作日 + * @param dimDateId + * @return + */ + @RequestMapping("/commonservice/holiday/initWorkDay/{day}") + Result workDayInit(@PathVariable("day") String dimDateId); } diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java index c3c62d64da..21f7fe531a 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java @@ -3,20 +3,9 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.CostDayFormDTO; -import com.epmet.dto.form.ExternalAppAuthFormDTO; -import com.epmet.dto.form.GetJwtAccessTokenFormDTO; -import com.epmet.dto.form.WorkDayFormDTO; -import com.epmet.dto.result.AppIdInfoResultDTO; -import com.epmet.dto.form.WorkMinuteFormDTO; -import com.epmet.dto.result.CostDayResultDTO; -import com.epmet.dto.result.AppIdInfoResultDTO; -import com.epmet.dto.result.ExternalAppAuthResultDTO; -import com.epmet.dto.result.WorkDayResultDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; -import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; @@ -121,4 +110,9 @@ public class EpmetCommonServiceOpenFeignClientFallback implements EpmetCommonSer public Result finishImportTask(ImportTaskCommonFormDTO input) { return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "finishImportTask", input); } + + @Override + public Result workDayInit(String dimDateId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "workDayInit", dimDateId); + } } diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/WorkDayScheduleTask.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/WorkDayScheduleTask.java index b26ab24cb7..053128ef6e 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/WorkDayScheduleTask.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/WorkDayScheduleTask.java @@ -1,10 +1,10 @@ package com.epmet.task; import com.epmet.service.ShowApiService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import java.text.SimpleDateFormat; import java.time.LocalDateTime; @@ -15,19 +15,21 @@ import java.util.Date; * @Author yinzuomei * @Date 2020/5/12 0:01 */ +@Slf4j @Configuration //1.主要用于标记配置类，兼备Component的效果。 -@EnableScheduling // 2.开启定时任务 +@EnableScheduling// 2.开启定时任务 +@Deprecated //由job统一调度 public class WorkDayScheduleTask { @Autowired private ShowApiService showApiService; //每天晚上00:00:01执行{秒数} {分钟} {小时} {日期} {月份} {星期} {年份(可为空)} - @Scheduled(cron = "1 0 0 * * ?") + //@Scheduled(cron = "1 0 0 * * ?") private void configureTasks() { Date nowDate = new Date(); SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); showApiService.initWorkDay(format.format(nowDate)); - System.err.println("执行静态定时任务时间: " + LocalDateTime.now()); + log.info("执行静态定时任务时间: " + LocalDateTime.now()); } } diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java index 8afe9cf590..f836b31ceb 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java @@ -97,8 +97,9 @@ public class ShowApiUtil { } public static void main(String[] args) { try { -// queryHolidayV2020("20200503"); - holidayList("2020"); + DayDetailResultDTO dayDetailResultDTO = queryHolidayV2020("20220407"); + System.out.println(dayDetailResultDTO); + //holidayList("2020"); } catch (Exception e) { e.printStackTrace(); } diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 80377c1fba..a44e5f1a46 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -108,6 +108,12 @@ 2.0.0 compile + + com.epmet + common-service-client + 2.0.0 + compile + diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/WorkDayInitService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/WorkDayInitService.java new file mode 100644 index 0000000000..4e1f8c3ad7 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/WorkDayInitService.java @@ -0,0 +1,17 @@ +package com.epmet.service; + +import com.epmet.commons.tools.utils.Result; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/12/29 17:45 + */ +public interface WorkDayInitService { + /** + * desc:初始化工作日 日历 + * @param dimDateId + * @return + */ + Result workDayInit(String dimDateId); +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/WorkDayInitServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/WorkDayInitServiceImpl.java new file mode 100644 index 0000000000..dd5846d680 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/WorkDayInitServiceImpl.java @@ -0,0 +1,24 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.service.WorkDayInitService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/12/29 17:46 + */ +@Service +public class WorkDayInitServiceImpl implements WorkDayInitService { + + @Autowired + private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient; + + @Override + public Result workDayInit(String dimDateId) { + return epmetCommonServiceOpenFeignClient.workDayInit(dimDateId); + } +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java new file mode 100644 index 0000000000..45f2a8de7f --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java @@ -0,0 +1,39 @@ +package com.epmet.task; + +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.service.WorkDayInitService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Date; + +/** + * desc:工作日日历定时任务 + * @author zhaoqifeng + * @dscription + * @date 2020/12/29 17:43 + */ +@Slf4j +@Component("workDayInitTask") +public class WorkDayInitTask implements ITask { + + @Autowired + private WorkDayInitService workDayInitService; + + @Override + public void run(String params) { + log.info("WorkDayInitTask定时任务正在执行，参数为：{}", params); + if (StringUtils.isBlank(params)){ + params = DateUtils.format(new Date(),DateUtils.DATE_PATTERN_YYYYMMDD); + } + Result result = workDayInitService.workDayInit(params); + if (result.success()) { + log.info("{}定时任务执行成功,{}", getClass().getSimpleName(),params); + } else { + log.error("{}定时任务执行失败:{},param:{}" ,getClass().getSimpleName(), result.getMsg(), params); + } + } +} From f74805ea21d5e6e2121cb82fb8f3640bec143385 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 6 Apr 2022 10:18:47 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=97=A5->=E5=BA=9F=E5=BC=83=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=86=85=E9=83=A8=E8=B0=83=E7=94=A8=E7=9A=84=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=20=E6=96=B9=E6=B3=95=E6=94=B9=E4=B8=BApost?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java index f5ef9b507c..7dc71f336e 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java @@ -147,6 +147,6 @@ public interface EpmetCommonServiceOpenFeignClient { * @param dimDateId * @return */ - @RequestMapping("/commonservice/holiday/initWorkDay/{day}") + @PostMapping("/commonservice/holiday/initWorkDay/{day}") Result workDayInit(@PathVariable("day") String dimDateId); } From d1d8a9f3b82e6bbd0cc9ce31cae55c4ed0edf5f5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 6 Apr 2022 10:28:41 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=97=A5->=E5=BA=9F=E5=BC=83=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=86=85=E9=83=A8=E8=B0=83=E7=94=A8=E7=9A=84=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.2__add_workdayinit_job.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/resources/db/migration/V0.0.2__add_workdayinit_job.sql diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/db/migration/V0.0.2__add_workdayinit_job.sql b/epmet-module/epmet-job/epmet-job-server/src/main/resources/db/migration/V0.0.2__add_workdayinit_job.sql new file mode 100644 index 0000000000..e06095639b --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/db/migration/V0.0.2__add_workdayinit_job.sql @@ -0,0 +1 @@ +INSERT INTO `epmet_job`.`schedule_job` (`id`, `bean_name`, `params`, `cron_expression`, `status`, `remark`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1511526737639378945, 'workDayInitTask', '', '3 0 0 * * ?', 1, '调用第三方api初始化工作日（有调用限制）参数：20220406', NULL, '2022-04-06 10:10:32', 0, '2022-04-06 10:11:04'); From 65b05bd5697ba51acd1f07dd1e08d0e1e028b8fe Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 6 Apr 2022 10:37:21 +0800 Subject: [PATCH 09/10] =?UTF-8?q?Revert=20"=E6=B7=BB=E5=8A=A0=E4=B8=AA?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 58fc9808 --- .../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 cc0155d91349cb062b47351d8604a8a319df290b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 6 Apr 2022 13:28:16 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=94=BE=E9=87=8D=E5=A4=8D=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=B3=A8=E8=A7=A3=E6=B7=BB=E5=8A=A0=EF=BC=8C=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=8E=A5=E5=8F=A3=E5=92=8C=E5=AE=A1=E6=A0=B8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/member/controller/ResiGroupMemberController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java index e1943d8920..7232c1e3aa 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java @@ -18,6 +18,7 @@ package com.epmet.modules.member.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -57,6 +58,7 @@ public class ResiGroupMemberController { * @Date 2020/3/29 20:01 **/ @PostMapping("applyjoingroup") + @NoRepeatSubmit public Result applyJoinGroup(@LoginUser TokenDto tokenDto, @RequestBody ApplyJoinGroupFormDTO applyJoinGroupFormDTO) { applyJoinGroupFormDTO.setUserId(tokenDto.getUserId()); @@ -109,6 +111,7 @@ public class ResiGroupMemberController { * @Date 2020/3/30 22:07 **/ @PostMapping("agreeapply") + @NoRepeatSubmit public Result agreeApply(@LoginUser TokenDto tokenDto, @RequestBody AgreeApplyFormDTO agreeApplyFormDTO) { agreeApplyFormDTO.setUserId(tokenDto.getUserId());