From c08ae659b3ec00b33d7a9716848322af01f25063 Mon Sep 17 00:00:00 2001 From: HAHA <1824278510@qq.com> Date: Wed, 21 Sep 2022 15:21:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=89=E6=B1=82=E4=B8=8A=E6=8A=A5,=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E9=A9=B3=E5=9B=9E=E6=8F=92=E5=85=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ItemHandleProcessCaseClosedToCityDTO.java | 2 + .../ItemGridPlatformHandleStatusEnum.java | 2 +- .../controller/PushToCityGridController.java | 6 +-- .../item/dao/ItemHandleProcessDao.java | 4 +- .../item/service/PushToCityGridService.java | 4 +- .../item/service/impl/ItemServiceImpl.java | 23 +++++++++-- .../impl/PushToCityGridServiceImpl.java | 38 ++++++++++++------- .../mapper/item/ItemHandleProcessDao.xml | 28 +++++++------- 8 files changed, 68 insertions(+), 39 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 ce1ecd1df..3dfaf4d23 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 @@ -7,6 +7,8 @@ import java.util.Date; @Data public class ItemHandleProcessCaseClosedToCityDTO { + private String id; + /** * 网格化平台-操作人标识 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java index 088ed1863..9d01bbb7e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java @@ -37,7 +37,7 @@ public enum ItemGridPlatformHandleStatusEnum { HANDLE_HT(1060, "回退"), HANDLE_ZF(1061, "作废"), HANDLE_XFHC(1062, "下发核查"), - HANDLE_CZWC(1063, "处置完成"), +// HANDLE_CZWC(1063, "处置完成"), HANDLE_DB(1064, "督办"), HANDLE_BH(1065, "驳回"), HANDLE_CX(1066, "撤消办理"), diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java index 3d58f4d62..359121bd3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java @@ -50,8 +50,8 @@ public class PushToCityGridController { * @date 2022/9/20 10:48 */ @PostMapping("AppealReporting") - public Result AppealReporting(){ - return pushToCityGridService.AppealReporting(); + public Result AppealReporting(String itemId,Integer state){ + return pushToCityGridService.AppealReporting(itemId,state); } /** @@ -64,7 +64,7 @@ public class PushToCityGridController { */ @PostMapping("ReportRejection") public Result ReportRejection(ItemHandleProcessDTO dto){ - return pushToCityGridService.ReportRejection(dto); + return pushToCityGridService.ReportRejection(dto.getItemId(),dto.getState()); } /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java index 95972afb6..d41358244 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java @@ -114,7 +114,8 @@ public interface ItemHandleProcessDao extends BaseDao { * @author LZN * @date 2022/9/19 10:25 */ - List getAppealReporting(@Param("state") int state); + ItemHandleProcessToCityResultDTO getAppealReporting(@Param("state") int state, + @Param("itemId") String itemId); /** * 上报驳回 @@ -130,7 +131,6 @@ public interface ItemHandleProcessDao extends BaseDao { * @return */ AppealHandlingToCityResultDTO getAppealHandling(@Param("state") int state, - @Param("id") String id, @Param("itemId") String itemId); List getURL(String itemId); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java index 19f6f2159..6675e038f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java @@ -107,7 +107,7 @@ public interface PushToCityGridService { * @author LZN * @date 2022/9/19 10:22 */ - Result AppealReporting(); + Result AppealReporting(String itemId,Integer state); /** * 事件感知 @@ -127,7 +127,7 @@ public interface PushToCityGridService { * @author LZN * @date 2022/9/19 10:43 */ - Result ReportRejection(ItemHandleProcessDTO dto); + Result ReportRejection(String itemId,Integer state); /** * 诉求处理 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 5d2b5a2ca..a0785be63 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 @@ -1149,6 +1149,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem List deptIds = new ArrayList<>(longTreeSet); // 发送菜单消息-待处理项目-吹哨部门 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); + // 网格吹哨,上报市平台 + pushToCityGridService.AppealReporting(handleProcessEntity.getItemId(),handleProcessEntity.getState()); // 上报网格化平台（社区吹哨） } else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) { log.info("处理项目-进入上报网格化平台（社区吹哨）"); @@ -1157,6 +1159,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 记录处理记录 itemHandleProcessService.insert(handleProcessEntity); log.info("处理项目-上报网格化平台-if结束"); + + //社区吹哨，上报市平台 + pushToCityGridService.AppealReporting(handleProcessEntity.getItemId(),handleProcessEntity.getState()); // 结案申请 } else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) { log.info("处理项目-进入结案申请"); @@ -1212,6 +1217,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem longTreeSet.addAll(oldDeptIds); longTreeSet.addAll(newDeptIds); List deptIds = new ArrayList<>(longTreeSet); + + // 网格结案，社区结案，上报市平台 + pushToCityGridService.AppealReporting(handleProcessEntity.getItemId(),handleProcessEntity.getState()); // 发送菜单消息-待处理项目-吹哨部门 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); log.info("处理项目-结案申请-if结束"); @@ -2389,8 +2397,15 @@ public class ItemServiceImpl extends BaseServiceImpl implem pushToCityGridService.delayApply();//2.10 延期申请 } else if (ItemGridPlatformHandleStatusEnum.HANDLE_YQSH.getValue() == dto.getState()) { pushToCityGridService.delayAudit();//2.11 延期审核 - }else if(ItemGridPlatformHandleStatusEnum.HANDLE_BL.getValue() == dto.getState()){ // 2.7诉求处理 - pushToCityGridService.AppealHandling(dto); + }else if(ItemGridPlatformHandleStatusEnum.HANDLE_BL.getValue() == dto.getState()){ + pushToCityGridService.AppealHandling(dto); // 2.7诉求处理 + } + // 网格化平台，处置完成、延期申请、申请办结、向上申请 + if (ItemGridPlatformHandleStatusEnum.HANDLE_CL.getValue() == dto.getState() || + ItemGridPlatformHandleStatusEnum.HANDLE_YQSQ.getValue() == dto.getState() || + ItemGridPlatformHandleStatusEnum.HANDLE_SQBJ.getValue() == dto.getState() || + ItemGridPlatformHandleStatusEnum.HANDLE_XSSQ.getValue() == dto.getState()) { + pushToCityGridService.AppealReporting(dto.getItemId(),dto.getState()); } else if(ItemGridPlatformHandleStatusEnum.HANDLE_DB.getValue() == dto.getState()){ // 2.7诉求处理 pushToCityGridService.appealSupervise(dto); } @@ -3021,6 +3036,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem if("0".equals(formDto.getCheckFlag())){ //同意 process.setState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); + // 社区审批，上报市平台 + pushToCityGridService.AppealReporting(process.getItemId(),process.getState()); process.setOutHandleAdvice("街道网格化平台正在处理。"); }else if("1".equals(formDto.getCheckFlag())){ //不同意，返回网格待处理列表 @@ -3185,7 +3202,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (formDto.getImages() != null && formDto.getImages().size() > 0) { imgService.saveImages(formDto.getImages(), itemHandleProcessDto.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE); } - pushToCityGridService.ReportRejection(itemHandleProcessDto); + pushToCityGridService.ReportRejection(itemHandleProcessDto.getItemId(),itemHandleProcessDto.getState()); successFlag = YesOrNoEnum.YES.value(); // 保存接口调用日志 this.saveInterfaceLog(itemPlat.getReferenceId(), InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(), 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 87b333027..74c2f629a 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 @@ -39,6 +39,7 @@ import com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity; import com.elink.esua.epdc.modules.item.entity.ItemReportInterfaceLogEntity; import com.elink.esua.epdc.modules.item.service.ItemService; import com.elink.esua.epdc.modules.item.service.PushToCityGridService; +import com.google.gson.JsonObject; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; @@ -195,7 +196,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 传数据 data.setCzr(czr); - cityGridApi.sendItemToCity(data,PushToCityGridConstant.CASE_CLOSED,"诉求结案"); + String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.CASE_CLOSED, "诉求结案"); + saveLog(item.getItemId(), item.getId(), "诉求结案", PushToCityGridConstant.CASE_CLOSED, JSONObject.toJSONString(data), result); } return new Result(); } @@ -309,7 +311,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 组装完成，推送 data.setCzr(dto); - cityGridApi.sendItemToCity(data,PushToCityGridConstant.DISP_ATCH_AUDIT,"派遣审核"); + String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.DISP_ATCH_AUDIT, "派遣审核"); + + saveLog(item.getItemId(),item.getId(),"派遣审核",PushToCityGridConstant.DISP_ATCH_AUDIT,JSONObject.toJSONString(data),result); } return new Result(); } @@ -367,12 +371,12 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { * @date 2022/9/19 10:22 */ @Override - public Result AppealReporting() { - int state = ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue(); - List list = itemHandleProcessDao.getAppealReporting(state); + public Result AppealReporting(String itemId,Integer states) { + int state = states; // ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue(); + ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getAppealReporting(state,itemId); // 处理数据 - for(ItemHandleProcessToCityResultDTO item : list) { +// for(ItemHandleProcessToCityResultDTO item : list) { AppealReportResultDTO data = new AppealReportResultDTO(); @@ -404,8 +408,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 组装完成，推送 data.setCzr(dto); - cityGridApi.sendItemToCity(data,PushToCityGridConstant.APPEAL_REPORT,"诉求上报"); - } + String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.APPEAL_REPORT, "诉求上报"); + + saveLog(item.getItemId(),item.getId(),"诉求上报",PushToCityGridConstant.APPEAL_REPORT, JSONObject.toJSONString(data),result); +// } return new Result(); } @@ -418,9 +424,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { * @date 2022/9/19 10:44 */ @Override - public Result ReportRejection(ItemHandleProcessDTO itemHandleProcessDto) { - int state = itemHandleProcessDto.getState(); // ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue(); - ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getReportRejection(state,itemHandleProcessDto.getItemId()); + public Result ReportRejection(String itemId,Integer states) { + int state = states; // ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue(); + ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getReportRejection(state,itemId); // 处理数据 // for(ItemHandleProcessToCityResultDTO item : list) { @@ -455,7 +461,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 组装完成，推送 data.setCzr(dto); - cityGridApi.sendItemToCity(data,PushToCityGridConstant.REPORT_REBUT,"上报驳回"); + String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.REPORT_REBUT, "上报驳回"); + + saveLog(item.getItemId(),item.getId(),"上报驳回",PushToCityGridConstant.REPORT_REBUT,JSONObject.toJSONString(data),result); // } return new Result(); } @@ -471,7 +479,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { @Override public Result AppealHandling(ItemHandleProcessDTO Prodto) { int state = Prodto.getState(); // ItemGridPlatformHandleStatusEnum.HANDLE_BL.getValue(); - AppealHandlingToCityResultDTO item = itemHandleProcessDao.getAppealHandling(state,Prodto.getId(),Prodto.getItemId()); + AppealHandlingToCityResultDTO item = itemHandleProcessDao.getAppealHandling(state,Prodto.getItemId()); // 处理数据 // for(AppealHandlingToCityResultDTO item : list) { @@ -531,7 +539,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 组装完成，推送 data.setCzr(dto); - cityGridApi.sendItemToCity(data,PushToCityGridConstant.HANDLE,"诉求处理"); + String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.HANDLE, "诉求处理"); + + saveLog(item.getItemId(),item.getId(),"诉求处理",PushToCityGridConstant.HANDLE,JSONObject.toJSONString(data),result); // } return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml index 7906b9069..c015f724d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml @@ -75,18 +75,7 @@ p.state = #{state} and p.item_id in (select id from epdc_item where del_flag = '0' and sqid is not null) - + @@ -144,5 +131,18 @@ p.state = #{state} and p.item_id in (select id from epdc_item where del_flag = '0' and sqid is not null) +