From dcf9a28a9b90ef7b4da6d1f85557fdff2dac7ca5 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 2 Sep 2022 15:38:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=BD=91=E6=A0=BC=E5=8C=96?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) 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 ab07e4fd6..54f3a444b 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 @@ -88,6 +88,7 @@ import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO; import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO; import com.elink.esua.epdc.user.dto.UserDTO; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -106,6 +107,7 @@ import java.util.*; * @author yujintao yujintao@elink-cn.com * @since v1.0.0 2019-09-04 */ +@Slf4j @Service public class ItemServiceImpl extends BaseServiceImpl implements ItemService { @@ -725,6 +727,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public Result modifyHandleResult(ItemHandleSubmitFormDTO dto) { try { Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getHandlerDeptId()); + log.info("处理项目-deptMessage："+deptMessage); String typeKey = ""; if( 0 == deptMessage.getCode()){ typeKey = deptMessage.getData().toString(); @@ -749,8 +752,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleProcessEntity.setItemId(dto.getId()); handleProcessEntity.setHandleAdvice(dto.getHandleAdvice()); handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice()); - + log.info("处理项目-进入判断"); if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { + log.info("处理项目-进入吹哨"); // 吹哨 Result result = adminFeignClient.getCompleteDept(entity.getGridId()); Long streetId = 0L; @@ -792,6 +796,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 发送菜单消息-待处理项目-吹哨部门 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); } else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) { + log.info("处理项目-进入上报网格化平台"); boolean reportFlag = this.checkReport(dto.getId()); if (reportFlag) { return new Result().error("当前项目已上报网格化平台"); @@ -812,6 +817,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessService.insert(handleProcessEntity); // 记录平台上报信息 this.saveItemGridPlatformInfo(sendResult, handleProcessEntity); + log.info("处理项目-上报网格化平台-if结束"); } else { handleProcessEntity.setState(dto.getHandleCategory()); // 更新项目状态 @@ -901,6 +907,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem } // 关闭和结案处理 } else { + log.info("处理项目-查询已吹哨部门"); // 查询已吹哨部门 List oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), dto.getHandlerDeptId()); // 遍历被吹哨部门插入项目消息表 @@ -913,12 +920,13 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemInformationService.insert(itemInfoEachDto); } } - + log.info("处理项目-发送消息"); // 发送消息 newsTask.insertUserInformation(informationFormDTO); // 发送菜单消息-待处理项目 if (entity.getGridId().equals(dto.getHandlerDeptId())) { + log.info("处理项目-网格长操作-发送菜单消息"); // 网格长操作-发送菜单消息 this.sendItemHandleMenuNotice(entity.getGridId(), null); } else { @@ -1163,7 +1171,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 组装上报信息 SendEventFormDto sendEventFormDto = packageSendEventEntity(entity); // 接口请求返回实体，getCode 1失败 0成功（非空） + log.info("处理项目-进入上报网格化平台-发送"); SendEventResultDto sendResult = shiBeiCityGridApi.sendEvent(sendEventFormDto); + log.info("处理项目-进入上报网格化平台-结束："+sendResult); // 保存接口调用日志 String successFlag = YesOrNoEnum.NO.value(); if (NumConstant.ZERO_STR.equals(sendResult.getCode())) { @@ -1172,6 +1182,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem this.saveInterfaceLog(dto.getId(), InterfaceLogBusinessTypeEnum.REPORT_ITEM.getValue(), ApiConstants.newSendInputInfo, successFlag, XstreamUtil.objectToXml(sendEventFormDto), XstreamUtil.objectToXml(sendResult)); + log.info("处理项目-上报网格化平台-存储日志结束"); return sendResult; } @@ -1282,6 +1293,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem }else{ sendDto.setSJLYU(itemEntity.getFirstCategoryCode()); } + log.info("处理项目-事件大类"); //事件大类 String secondCate = baseDao.selectSecondCateByItemId(itemEntity.getId()); if(StringUtils.isNotBlank(secondCate)){ @@ -1312,6 +1324,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem //诉求联系人及联系方式 Result userResult = userInfoFeignClient.getUserInfoById(itemEntity.getUserId()); UserDTO itemUser = userResult.getData(); + log.info("处理项目-诉求联系人："+itemUser); if(itemUser != null){ sendDto.setSQLXR(itemUser.getRealName()+itemUser.getMobile()); } @@ -1319,25 +1332,31 @@ public class ItemServiceImpl extends BaseServiceImpl implem sendDto.setSJDZ(itemEntity.getIssueAddress()); //事件描述 sendDto.setSJMS(itemEntity.getItemContent());// + log.info("处理项目-gps开始"); double[] gps = GPSUtils.gcj02_To_Gps84(itemEntity.getIssueLatitude(), itemEntity.getIssueLongitude()); + log.info("处理项目-gps结束"); //X坐标（经纬度） sendDto.setXZB(new BigDecimal(gps[1]).setScale(15, BigDecimal.ROUND_HALF_UP)); //Y坐标（经纬度） sendDto.setYZB(new BigDecimal(gps[0]).setScale(15, BigDecimal.ROUND_HALF_UP)); //事件处理进度 List handleImagesList = new ArrayList<>(); + log.info("处理项目-获取进度开始"); List handleList = getHandleList(itemEntity.getId(),handleImagesList); + log.info("处理项目-获取进度结束"); sendDto.setHandleList(handleList); //图片 - List images = getImageFileNew(itemEntity.getEventId(),handleImagesList);//事件图片+处理流程图片 + List images = getImageFileNew(itemEntity.getEventId() == null?itemEntity.getId():itemEntity.getEventId(),handleImagesList);//事件图片+处理流程图片 //时间处理进度图片 sendDto.setIMAGES(images); + log.info("处理项目-返回组装数据"); return sendDto; } private List getHandleList(String itemId, List handleImagesList) { //未组装的事件处理流程 List handleList = baseDao.selectListOfItemHandleProgressByMobile(itemId); + log.info("处理项目-未组装的事件处理流程结束"); //组装后的、所有的 处理事件流程 List resultList = new ArrayList<>(); //统计最后一个处理的下标 @@ -1396,12 +1415,13 @@ public class ItemServiceImpl extends BaseServiceImpl implem } else { handleProcess.setState(ipr.getState().toString()); } - + log.info("处理项目-handleIf结束"); if(i == handleList.size()){ handleProcess.setState("转项目"); } resultList.add(handleProcess); //迁移图片到事件图片中去 + log.info("处理项目-迁移图片"); if(null != ipr.getImages() && ipr.getImages().size() > 0){ for(String image : ipr.getImages()){ handleImagesList.add(image); @@ -1425,6 +1445,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(eventId), "REFERENCE_ID", eventId); List imageList = imgDao.selectList(wrapper); + log.info("处理项目-查询图片结束imageList"+imageList); if (null != imageList && !imageList.isEmpty()) { for(ImgEntity im : imageList){ handleImagesList.add(im.getImgUrl());