From be8a10ee4d9bfe54dee45057145e7fc197f16e32 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 27 Oct 2022 19:11:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=20=E7=BB=93=E6=A1=88?= =?UTF-8?q?=E5=8F=96=E6=89=80=E5=B1=9E=E7=BB=84=E7=BB=87=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ItemHandleProcessCaseClosedToCityDTO.java | 5 +++++ .../item/result/ItemHandleProcessToCityResultDTO.java | 4 ++++ .../modules/item/service/impl/ItemServiceImpl.java | 11 +++++++++++ .../item/service/impl/PushToCityGridServiceImpl.java | 4 ++-- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessCaseClosedToCityDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessCaseClosedToCityDTO.java index 3dfaf4d23..c037959a4 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessCaseClosedToCityDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessCaseClosedToCityDTO.java @@ -124,5 +124,10 @@ public class ItemHandleProcessCaseClosedToCityDTO { */ private String delFlag; + /** + * 市中心区划编码，操作人 + */ + private String disCenterZoningCode; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessToCityResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessToCityResultDTO.java index 6274e09ca..d170040eb 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessToCityResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessToCityResultDTO.java @@ -134,5 +134,9 @@ public class ItemHandleProcessToCityResultDTO implements Serializable { */ private String delFlag; + /** + * 市中心区划编码，操作人 + */ + private String disCenterZoningCode; } 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 a05471ecb..bbc896904 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 @@ -3905,6 +3905,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem //3.将数据放入redis，供24小时候定时任务自动结案使用 itemAutoProcessRedis.produce(itemPlat.getReferenceId(), itemHandleProcessDto.getCreatedTime().getTime()); } + try { + //网格化平台结案/驳回操作增加的推送数据到市平台逻辑报错不能影响原有程序流程 + if ("1".equals(formDto.getState())) { + // 上报驳回，上报市平台 + log.info("上报驳回，上报市平台" + itemHandleProcessDto.getId()); + pushToCityGridService.reportRejection(itemHandleProcessDto.getId()); + } + } catch (Exception e) { + logger.error("网格化平台驳回操作，发送事件数据到市中心错误，诉求项目Id->" + itemHandleProcessDto.getItemId()); + e.printStackTrace(); + } //项目处理意见图片保存 if (formDto.getImages() != null && formDto.getImages().size() > 0) { imgService.saveImages(formDto.getImages(), itemHandleProcessDto.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index 11f200fca..8248cf776 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java @@ -250,7 +250,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 操作人员唯一标识 czr.setId(item.getGridPartyid()); // 所属机构Id - czr.setSsjgbm(getJgbm(item.getHandlerDeptId(), NumConstant.ZERO_STR)); + czr.setSsjgbm(item.getDisCenterZoningCode()); // 所属机构 czr.setSsjg(getJgbm(item.getHandlerDeptId(), NumConstant.ONE_STR)); //所属部门id @@ -589,7 +589,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 操作人员唯一标识 dto.setId(item.getGridPartyid()); // 所属机构id - dto.setSsjgbm(getJgbm(item.getHandlerDeptId(), NumConstant.ZERO_STR)); + dto.setSsjgbm(item.getDisCenterZoningCode()); // 所属机构名称 dto.setSsjg(item.getGridUnitname()); // 所属部门id