diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index ede47b0d7..9e256b898 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit ede47b0d7ff48024cb935f964e55f235daed82bb +Subproject commit 9e256b898e3cb3287fe2894b6ee706dac8eb2e2b diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptProcessNoticeDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptProcessNoticeDTO.java new file mode 100644 index 000000000..5aae25da6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptProcessNoticeDTO.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 流程数据通知 + * + * @author zhy + * @date 2022/11/29 10:18 + */ +@Data +public class AcceptProcessNoticeDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 记录唯一标识 + */ + @NotBlank(message = "唯一标识不可为空") + private String p_recId; + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 2d98419cf..5b201faca 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -608,5 +608,19 @@ public class ItemController { return new Result(); } + /** + * 网格化流程数据通知 + * + * @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-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 3ae5e2715..d6dfcced0 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -761,4 +761,14 @@ public interface ItemService extends BaseService { */ void endInspection(ItemInspectionFormDTO 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-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 70e24e336..732fd293a 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -4959,6 +4959,21 @@ public class ItemServiceImpl extends BaseServiceImpl implem } } + @Override + public Result processNotice(AcceptProcessNoticeDTO formDTO) { + try { + ItemGridPlatformDTO dto = itemGridPlatformService.getInfoByTaskId(formDTO.getP_recId()); + if (dto == null) { + return new Result().error(NumConstant.ONE, "根据REC_ID" + formDTO.getP_recId() + "未查到相应诉求"); + } + String itemId = dto.getReferenceId(); + queryItemHandle(itemId); + } catch (Exception e) { + return new Result().error(NumConstant.ONE, "流程拉取失败REC_ID" + formDTO.getP_recId()); + } + return new Result(); + } + /** * 重新上报 *