From efc79f88a383ccecc9438201dc73a6aca464455b Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 30 Jun 2022 11:21:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?= =?UTF-8?q?=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9=20pc=20?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerAgencyController.java | 8 ++--- .../java/com/epmet/dao/CustomerAgencyDao.java | 3 +- .../epmet/service/CustomerAgencyService.java | 4 +-- .../impl/CustomerAgencyServiceImpl.java | 4 +-- .../resources/mapper/CustomerAgencyDao.xml | 3 +- .../epmet/dto/form/OrgInfoPointFormDTO.java | 32 +++++++++++++++++++ .../com/epmet/feign/GovOrgFeignClient.java | 7 ++-- .../fallback/GovOrgFeignClientFallBack.java | 5 +-- .../IcPointNucleicMonitoringServiceImpl.java | 9 ++++-- 9 files changed, 58 insertions(+), 17 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OrgInfoPointFormDTO.java diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 153ffb26fe..b06cd60d22 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -464,15 +464,15 @@ public class CustomerAgencyController { } /** - * @param orgName + * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author wgf * @Description 根据社区名称查询所属组织信息 * @Date 2022/6/21 22:41 **/ - @GetMapping("getCommunityInfo/{orgName}") - public Result getCommunityInfo(@PathVariable("orgName") String orgName) { - return customerAgencyService.getCommunityInfo(orgName); + @PostMapping("getCommunityInfo/{orgName}") + public Result getCommunityInfo(@RequestBody OrgInfoPointFormDTO formDTO) { + return customerAgencyService.getCommunityInfo(formDTO); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index bd271cd2f0..1c4aa9394c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.CustomerAgencyDTO; +import com.epmet.dto.form.OrgInfoPointFormDTO; import com.epmet.dto.form.OrgTreeByUserAndTypeFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.CustomerAgencyEntity; @@ -349,7 +350,7 @@ public interface CustomerAgencyDao extends BaseDao { List getDelAgencyIdList(@Param("agencyId") String agencyId); - CommunityInfoResultDTO getCommunityInfo(@Param("orgName") String orgName); + CommunityInfoResultDTO getCommunityInfo(OrgInfoPointFormDTO formDTO); CommunityInfoResultDTO getCommunityInfoByUserId(@Param("userId") String userId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index bc950586a9..21e6f17320 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -320,13 +320,13 @@ public interface CustomerAgencyService extends BaseService DelAgencyGridIdResultDTO getDelAgencyGridIdList(String agencyId); /** - * @param orgName + * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author wgf * @Description 根据社区名称查询所属组织信息 * @Date 2022/6/21 22:41 **/ - Result getCommunityInfo(String orgName); + Result getCommunityInfo(OrgInfoPointFormDTO formDTO); /** * @param userId diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 3b6317e4f4..6d46ba3b3a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1567,8 +1567,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl getCommunityInfo(String orgName) { - CommunityInfoResultDTO communityInfoResultDTO = baseDao.getCommunityInfo(orgName); + public Result getCommunityInfo(OrgInfoPointFormDTO formDTO) { + CommunityInfoResultDTO communityInfoResultDTO = baseDao.getCommunityInfo(formDTO); return new Result().ok(communityInfoResultDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 45b5b066a7..136341dc18 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -901,7 +901,7 @@ AND pids LIKE CONCAT('%', #{agencyId}, '%') - select ID as deptId, CUSTOMER_ID, @@ -911,6 +911,7 @@ from customer_agency where DEL_FLAG = '0' and ORGANIZATION_NAME = #{orgName} + and CUSTOMER_ID = #{customerId} limit 1 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OrgInfoPointFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OrgInfoPointFormDTO.java new file mode 100644 index 0000000000..6c306b5429 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OrgInfoPointFormDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 所属部门 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +@Data +public class OrgInfoPointFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 所属组织名称 + */ + private String orgName; + + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index 4d97431514..8f3c43251c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.CommonGridIdFormDTO; import com.epmet.dto.form.CustomerGridFormDTO; +import com.epmet.dto.form.OrgInfoPointFormDTO; import com.epmet.dto.result.CommunityInfoResultDTO; import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.feign.fallback.GovOrgFeignClientFallBack; @@ -65,14 +66,14 @@ public interface GovOrgFeignClient { //Result getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO); /** - * @param orgName + * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author wgf * @Description 根据社区名称查询所属组织信息 * @Date 2020/4/26 23:16 **/ - @GetMapping("/gov/org/customeragency/getCommunityInfo/{orgName}") - Result getCommunityInfo(@PathVariable("orgName") String orgName); + @PostMapping("/gov/org/customeragency/getCommunityInfo") + Result getCommunityInfo(OrgInfoPointFormDTO formDTO); /** * @param userId diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java index b2968f313f..0c1f3a6342 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.CommonGridIdFormDTO; import com.epmet.dto.form.CustomerGridFormDTO; +import com.epmet.dto.form.OrgInfoPointFormDTO; import com.epmet.dto.result.CommunityInfoResultDTO; import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.feign.GovOrgFeignClient; @@ -42,8 +43,8 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient { //} @Override - public Result getCommunityInfo(String orgName) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCommunityInfo",orgName); + public Result getCommunityInfo(OrgInfoPointFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCommunityInfo",formDTO); } @Override diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java index 69929d807d..4987d470f2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.dao.IcPointNucleicMonitoringDao; import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.MapInfoFormDTO; +import com.epmet.dto.form.OrgInfoPointFormDTO; import com.epmet.dto.result.CommunityInfoResultDTO; import com.epmet.dto.result.MapInfoResultDTO; import com.epmet.dto.result.UploadImgResultDTO; @@ -133,7 +134,8 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.getCommunityInfo(dto.getOrgName()); + OrgInfoPointFormDTO formDTO = ConvertUtils.sourceToTarget(dto, OrgInfoPointFormDTO.class); + Result resultDTOResult = govOrgFeignClient.getCommunityInfo(formDTO); CommunityInfoResultDTO communityInfoResultDTO = resultDTOResult.getData(); dto.setPid(communityInfoResultDTO.getPid()); dto.setPids(communityInfoResultDTO.getPids()); @@ -220,7 +222,10 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.getCommunityInfo(list.get(i).getOrgName()); + OrgInfoPointFormDTO formDTO = new OrgInfoPointFormDTO(); + formDTO.setOrgName(list.get(i).getOrgName()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + Result resultDTOResult = govOrgFeignClient.getCommunityInfo(formDTO); CommunityInfoResultDTO communityInfoResultDTO = resultDTOResult.getData(); if(communityInfoResultDTO == null && !list.get(i).getAddStatus()){ errorInfo.add(getErrorInfo(list.get(i), "所属组织匹配失败",i+1));