疫苗接种点，核酸检测点 pc 管理

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<com.epmet.dto.result.CommunityInfoResultDTO>
      * @Author wgf
      * @Description 根据社区名称查询所属组织信息
      * @Date 2022/6/21 22:41
      **/
-    @GetMapping("getCommunityInfo/{orgName}")
+    @PostMapping("getCommunityInfo/{orgName}")
-    public Result<CommunityInfoResultDTO> getCommunityInfo(@PathVariable("orgName") String orgName) {
+    public Result<CommunityInfoResultDTO> getCommunityInfo(@RequestBody OrgInfoPointFormDTO formDTO) {
-        return customerAgencyService.getCommunityInfo(orgName);
+        return customerAgencyService.getCommunityInfo(formDTO);
     }
 
     /**

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<CustomerAgencyEntity> {
 
     List<String> getDelAgencyIdList(@Param("agencyId") String agencyId);
 
-    CommunityInfoResultDTO getCommunityInfo(@Param("orgName") String orgName);
+    CommunityInfoResultDTO getCommunityInfo(OrgInfoPointFormDTO formDTO);
 
     CommunityInfoResultDTO getCommunityInfoByUserId(@Param("userId") String userId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java

@@ -320,13 +320,13 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
     DelAgencyGridIdResultDTO getDelAgencyGridIdList(String agencyId);
 
     /**
-     * @param orgName
+     * @param formDTO
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
      * @Author wgf
      * @Description 根据社区名称查询所属组织信息
      * @Date 2022/6/21 22:41
      **/
-    Result<CommunityInfoResultDTO> getCommunityInfo(String orgName);
+    Result<CommunityInfoResultDTO> getCommunityInfo(OrgInfoPointFormDTO formDTO);
 
     /**
      * @param userId

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<CustomerAgencyDao
     }
 
     @Override
-    public Result<CommunityInfoResultDTO> getCommunityInfo(String orgName) {
+    public Result<CommunityInfoResultDTO> getCommunityInfo(OrgInfoPointFormDTO formDTO) {
-        CommunityInfoResultDTO communityInfoResultDTO = baseDao.getCommunityInfo(orgName);
+        CommunityInfoResultDTO communityInfoResultDTO = baseDao.getCommunityInfo(formDTO);
 
         return new Result<CommunityInfoResultDTO>().ok(communityInfoResultDTO);
     }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -901,7 +901,7 @@
         AND pids LIKE CONCAT('%', #{agencyId}, '%')
     </select>
 
-    <select id="getCommunityInfo" resultType="com.epmet.dto.result.CommunityInfoResultDTO">
+    <select id="getCommunityInfo" resultType="com.epmet.dto.result.CommunityInfoResultDTO" parameterType="com.epmet.dto.form.OrgInfoPointFormDTO">
         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
     </select>
 

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;
+
+
+
+}

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<CustomerGridDTO> getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO);
 
     /**
-     * @param orgName
+     * @param formDTO
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
      * @Author wgf
      * @Description 根据社区名称查询所属组织信息
      * @Date 2020/4/26 23:16
      **/
-    @GetMapping("/gov/org/customeragency/getCommunityInfo/{orgName}")
+    @PostMapping("/gov/org/customeragency/getCommunityInfo")
-    Result<CommunityInfoResultDTO> getCommunityInfo(@PathVariable("orgName") String orgName);
+    Result<CommunityInfoResultDTO> getCommunityInfo(OrgInfoPointFormDTO formDTO);
 
     /**
      * @param userId

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<CommunityInfoResultDTO> getCommunityInfo(String orgName) {
+    public Result<CommunityInfoResultDTO> getCommunityInfo(OrgInfoPointFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCommunityInfo",orgName);
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCommunityInfo",formDTO);
     }
 
     @Override

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<IcPoint
         }
         if(StringUtils.isNotBlank(dto.getOrgName())){
             // 赋值pid  pids
-            Result<CommunityInfoResultDTO> resultDTOResult = govOrgFeignClient.getCommunityInfo(dto.getOrgName());
+            OrgInfoPointFormDTO formDTO = ConvertUtils.sourceToTarget(dto, OrgInfoPointFormDTO.class);
+            Result<CommunityInfoResultDTO> 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<IcPoint
                 }
 
                 // 校验所属组织通过名称能否匹配到ID
-                Result<CommunityInfoResultDTO> resultDTOResult = govOrgFeignClient.getCommunityInfo(list.get(i).getOrgName());
+                OrgInfoPointFormDTO formDTO = new OrgInfoPointFormDTO();
+                formDTO.setOrgName(list.get(i).getOrgName());
+                formDTO.setCustomerId(tokenDto.getCustomerId());
+                Result<CommunityInfoResultDTO> resultDTOResult = govOrgFeignClient.getCommunityInfo(formDTO);
                 CommunityInfoResultDTO communityInfoResultDTO = resultDTOResult.getData();
                 if(communityInfoResultDTO == null && !list.get(i).getAddStatus()){
                     errorInfo.add(getErrorInfo(list.get(i), "所属组织匹配失败",i+1));