From 8304a32c3f0bd51c377058829e5073cdac6cb506 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 24 Jun 2022 13:50:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E5=B1=82=E5=AD=97=E5=85=B8=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=9D=E5=A7=8B=E5=8C=96=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=B9=B3=E5=8F=B0=E5=AE=A2=E6=88=B7=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/GovOrgOpenFeignClient.java | 7 ++++ .../GovOrgOpenFeignClientFallback.java | 5 +++ .../epmet/controller/CoverageController.java | 6 ++++ .../epmet/dao/IcCoverageCategoryDictDao.java | 2 ++ .../com/epmet/service/CoverageService.java | 2 ++ .../service/impl/CoverageServiceImpl.java | 9 +++++ .../mapper/IcCoverageCategoryDictDao.xml | 35 +++++++++++++++++++ .../epmet/service/impl/IcFormServiceImpl.java | 7 ++++ 8 files changed, 73 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 129ad33c57..b7c17a255d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -688,4 +688,11 @@ public interface GovOrgOpenFeignClient { */ @PostMapping("/gov/org/ichouse/updateIcHouseResiNumber") Result updateIcHouseResiNumber(List> paramList); + + /** + * 五大图层类别字典表客户初始化 + * @Author sun + */ + @PostMapping("/gov/org/coverage/dictinit/{customerId}") + Result dictInit(@PathVariable(value = "customerId") String customerId); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index 649c984f55..0a8e690f38 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -440,4 +440,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "updateIcHouseResiNumber", paramList); } + @Override + public Result dictInit(String customerId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "dictInit", customerId); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java index 1f10aeec14..6289049eae 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java @@ -40,4 +40,10 @@ public class CoverageController { return new Result>().ok(coverageService.dictMap(tokenDto.getCustomerId(), placeType)); } + @PostMapping("dictinit/{customerId}") + public Result dictInit(@PathVariable("customerId") String customerId) { + coverageService.dictInit(customerId); + return new Result(); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java index 44339e4e9b..58534b44bb 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java @@ -20,4 +20,6 @@ public interface IcCoverageCategoryDictDao extends BaseDao dictMap(@Param("customerId") String customerId, @Param("placeType") String placeType); String selectCategoryName(@Param("customerId") String customerId, @Param("placeType") String placeType, @Param("categoryKey") String categoryKey); + + void dictInit(String customerId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java index 4375ebd85b..a3e18d8d6c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java @@ -15,4 +15,6 @@ public interface CoverageService { List categoryList(List coverageTypeList); List dictMap(String customerId, String placeType); + + void dictInit(String customerId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java index b188a91dfd..632d9537fb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java @@ -69,4 +69,13 @@ public class CoverageServiceImpl implements CoverageService { List resultList = coverageCategoryDictDao.dictMap(customerId, placeType); return resultList; } + + @Override + public void dictInit(String customerId) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcCoverageCategoryDictEntity::getCustomerId, customerId); + coverageCategoryDictDao.delete(query); + coverageCategoryDictDao.dictInit(customerId); + + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml index 8d20859b11..dce1591d30 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml @@ -3,6 +3,41 @@ + + INSERT INTO ic_coverage_category_dict ( + id, + customer_id, + category_key, + category_name, + place_type, + coverage_type, + sort, + del_flag, + revision, + created_by, + created_time, + updated_by, + updated_time + ) SELECT + MD5(UUID()), + #{customerId}, + category_key, + category_name, + place_type, + coverage_type, + sort, + del_flag, + revision, + 'APP_USER', + NOW(), + 'APP_USER', + NOW() + FROM + ic_coverage_category_dict + WHERE + del_flag = '0' + AND customer_id = 'default' +