diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java new file mode 100644 index 0000000000..dd5aa27458 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/8/4 5:48 下午 + * @DESC + */ +@Data +public class OrgNameByTypeResultDTO implements Serializable { + + private static final long serialVersionUID = -6544341694748437312L; + + private String orgId; + + private String orgType; + + private String orgName; +} 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 3564d39a61..2ac3978628 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 @@ -389,4 +389,13 @@ public interface GovOrgOpenFeignClient { @PostMapping("/gov/org/customergrid/selectgridname") Result gridName(@RequestParam("gridId")String gridId); + /** + * @Description 根据类型查询组织名称 + * @Param formList + * @author zxc + * @date 2021/8/4 6:14 下午 + */ + @PostMapping("/gov/org/customergrid/selectorgnamebytype") + Result> selectOrgNameByType(@RequestBody List formList); + } 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 97bc8402b7..84b3cb74c2 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 @@ -225,6 +225,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridName", gridId); } + @Override + public Result> selectOrgNameByType(List formList) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectOrgNameByType", formList); + } + @Override public Result selectPidsByGridId(String gridId) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 7fe5c72cbe..7dc0f3f385 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -263,4 +263,15 @@ public class CustomerGridController { Result gridName(@RequestParam("gridId")String gridId){ return new Result().ok(customerGridService.gridName(gridId)); } + + /** + * @Description 根据类型查询组织名称 + * @Param formList + * @author zxc + * @date 2021/8/4 6:14 下午 + */ + @PostMapping("selectorgnamebytype") + public Result> selectOrgNameByType(@RequestBody List formList){ + return new Result>().ok(customerGridService.selectOrgNameByType(formList)); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index 314c483a0f..956405698b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -284,4 +284,12 @@ public interface CustomerGridDao extends BaseDao { * @date 2021/8/4 4:30 下午 */ String gridName(String gridId); + + /** + * @Description 查询组织名字 + * @Param orgIds + * @author zxc + * @date 2021/8/4 6:25 下午 + */ + List selectOrgNameByType(@Param("orgIds") List orgIds); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index e1cc5f79a7..773ebd45e7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -303,4 +303,12 @@ public interface CustomerGridService extends BaseService { * @date 2021/8/4 4:26 下午 */ String gridName(String gridId); + + /** + * @Description 根据类型查询组织名称 + * @Param formList + * @author zxc + * @date 2021/8/4 6:14 下午 + */ + List selectOrgNameByType(List formList); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index ec5c673374..875f2c04dd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -732,4 +732,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl selectOrgNameByType(List formList) { + return baseDao.selectOrgNameByType(formList); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 49025a9b9a..5c5fae63b3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -594,4 +594,21 @@ WHERE cg.DEL_FLAG = 0 AND cg.ID = #{gridId} + + +