diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java index 11f16d9b3..5b77c31ad 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java @@ -140,6 +140,20 @@ public class ApiItemController { return itemService.pushItemProcess(formDto); } + /** + * 网格化流程数据通知 + * + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2022/11/29 10:17 + */ + @PostMapping("process/notice") + public Result processNotice(@RequestBody AcceptProcessNoticeDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return itemService.processNotice(formDTO); + } + /** * 获取企业信息 * diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java index 1806bb2e6..893145551 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java @@ -146,5 +146,10 @@ public interface ItemFeignClient { */ @PostMapping(value = "events/shareenterprise/company", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getCompany(ShareEnterpriseFormDTO formDTO); + + @PostMapping(value = "events/item/process/notice", consumes = MediaType.APPLICATION_JSON_VALUE) + Result processNotice(AcceptProcessNoticeDTO formDTO); + + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java index d5f8cae20..d31d7da2a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java @@ -84,4 +84,9 @@ public class ItemFeignClientFallback implements ItemFeignClient { public Result> getCompany(ShareEnterpriseFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getCompany", formDTO); } + + @Override + public Result processNotice(AcceptProcessNoticeDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "processNotice", formDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java index dc1f6b233..e7ef4851b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java @@ -118,6 +118,16 @@ public interface ItemService { */ Result pushItemProcess(AcceptPlantformProcessDTO formDto); + /** + * 网格化流程数据通知 + * + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2022/11/29 10:17 + */ + Result processNotice(AcceptProcessNoticeDTO formDTO); + /** * 获取企业信息 * diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java index 9ed658bc5..d49140f89 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java @@ -161,9 +161,9 @@ public class ItemServiceImpl implements ItemService { // // 验证手机号 // customEnterpriseServiceImpl.checkSmsCode(formDto.getMobile(), formDto.getSmsCode()); // } - if(StringUtils.isNotBlank(formDto.getPeopleFlag()) && NumConstant.ONE_STR.equals(formDto.getPeopleFlag())){ + if (StringUtils.isNotBlank(formDto.getPeopleFlag()) && NumConstant.ONE_STR.equals(formDto.getPeopleFlag())) { //发展诉求只有街道 前端已赋值gridId为街道id - }else{ + } else { // 获取所有上级机构名称和ID拼接 Result dtoResult = adminFeignClient.getParentAndAllDept(formDto.getGridId()); ParentAndAllDeptDTO deptDTO = dtoResult.getData(); @@ -222,8 +222,14 @@ public class ItemServiceImpl implements ItemService { return itemFeignClient.pushItemProcess(formDto); } + + @Override + public Result processNotice(AcceptProcessNoticeDTO formDTO) { + return itemFeignClient.processNotice(formDTO); + } + @Override - public Result> getCompany(ShareEnterpriseFormDTO formDTO){ + public Result> getCompany(ShareEnterpriseFormDTO formDTO) { return itemFeignClient.getCompany(formDTO); } }