diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 9e256b898..f7b0609f3 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 9e256b898e3cb3287fe2894b6ee706dac8eb2e2b +Subproject commit f7b0609f3afdc9fd59dfd2564bf1a6af227bac57 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 732fd293a..8cf78da0b 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 @@ -102,8 +102,6 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.joda.time.DateTime; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -128,8 +126,6 @@ import java.util.stream.Collectors; @Service public class ItemServiceImpl extends BaseServiceImpl implements ItemService { - private final Logger logger = LogManager.getLogger(ItemServiceImpl.class); - @Autowired private EpdcEventsService epdcEventsService; @@ -720,7 +716,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem try { sendCaseLaw(itemEntity); } catch (Exception e) { - logger.error("执法诉求上报，发送事件数据到市中心错误，诉求项目Id->" + itemEntity.getId()); + log.error("执法诉求上报，发送事件数据到市中心错误，诉求项目Id->" + itemEntity.getId()); e.printStackTrace(); } return new Result().ok(itemEntity.getSerialNum()); @@ -798,13 +794,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem data.setSqdjr(sqdjr); data.setSqbm(entity.getSerialNum()); List imageList = imgDao.selectListByRefeId(entity.getEventId() == null ? entity.getId() : entity.getEventId()); - log.info("执法照片imageList：" + imageList); //诉求照片 StringBuffer sqzp = new StringBuffer(); imageList.forEach(img -> { sqzp.append(img.getImgUrl().replace(ApiConstants.eventOssUrlBefore, ApiConstants.eventOssUrlAfter)).append(","); }); - log.info("执法照片sqzp：" + sqzp); if (StringUtils.isNotBlank(sqzp)) { data.setSqzp(sqzp.substring(0, sqzp.length() - 1)); } @@ -832,7 +826,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public Result addQuestionInfo(AddQuestionCollectionFormDTO formDto) { - logger.info("进入关联项目添加：" + formDto); UserDetail user = formDto.getUserInfo(); Result deptDTO = adminFeignClient.getParentAndAllDept(user.getDeptId()); if (null == deptDTO.getData()) { @@ -1490,7 +1483,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem public Result submitItem(ItemHandleSubmitFormDTO dto) { Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getHandlerDeptId()); - log.info("处理项目-deptMessage：" + deptMessage); String typeKey; if (0 == deptMessage.getCode()) { typeKey = deptMessage.getData().toString(); @@ -1585,8 +1577,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_REPORT); // 记录处理记录 itemHandleProcessDao.insert(handleProcessEntity); - log.info("处理项目-上报网格化平台-if结束"); - //社区吹哨，上报市平台 pushToCityGridService.appealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR); // 删除已流转协助部门 @@ -2231,7 +2221,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 接口请求返回实体，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())) { @@ -2390,7 +2379,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem sendDto.setSJZT(CommonConstants.PARTY_ITEM_ZT_ONE); } //备注 - log.info("上报网格化平台dto：" + dto); sendDto.setBZXX(dto.getHandleAdvice() + " 诉求编码：" + itemEntity.getSerialNum()); if (StringUtils.isNotBlank(dto.getHandleAdviceRemark())) { sendDto.setBZXX(sendDto.getBZXX() + "\n不予受理详细说明：" + dto.getHandleAdviceRemark() + "\n诉求编码：" + itemEntity.getSerialNum()); @@ -2419,23 +2407,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem sendDto.setSQLXR(itemEntity.getNickName() + itemEntity.getMobile()); //事件地址 sendDto.setSJDZ(itemEntity.getIssueAddress()); - log.info("处理项目-gps开始"); double[] gps = GPSUtils.gcj02_To_Gps84(itemEntity.getIssueLatitude(), itemEntity.getIssueLongitude()); - log.info("处理项目-gps结束"); //X坐标（经纬度） sendDto.setXZB(BigDecimal.valueOf(gps[1]).setScale(15, RoundingMode.HALF_UP)); //Y坐标（经纬度） sendDto.setYZB(BigDecimal.valueOf(gps[0]).setScale(15, RoundingMode.HALF_UP)); //事件处理进度 List handleImagesList = new ArrayList<>(); - log.info("处理项目-获取进度开始"); List handleList = getHandleList(itemEntity.getId(), handleImagesList); - log.info("事件进度图片：" + handleImagesList); - log.info("处理项目-获取进度结束"); sendDto.setHandleList(handleList); //图片 List images = getImageFileNew(itemEntity.getEventId() == null ? itemEntity.getId() : itemEntity.getEventId(), handleImagesList);//事件图片+处理流程图片 - log.info("图片组装结束：" + images); //时间处理进度图片 sendDto.setIMAGES(images); log.info("处理项目-返回组装数据"); @@ -2521,7 +2503,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem //事件处理进度 List handleImagesList = new ArrayList<>(); List handleList = getHandleList(itemEntity.getId(), handleImagesList); - log.info("事件进度图片：" + handleImagesList); result.setHandleList(handleList); //图片 //诉求照片 @@ -2635,13 +2616,8 @@ 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) { handleImagesList.addAll(ipr.getImages()); ipr.setImages(null); @@ -2663,13 +2639,10 @@ 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()); } - //替换了诉求上传接口，现在无需压缩 -// List imgUrlList = this.getUploadDTOListNew(handleImagesList); } return handleImagesList; } @@ -3443,7 +3416,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem break; } str.append("诉求上报，发送事件数据到市中心错误，诉求项目Id->").append(entity.getId()); - logger.error(str); + log.error(str.toString()); e.printStackTrace(); } return new Result().ok(entity.getSerialNum()); @@ -3571,13 +3544,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem sqdjr.setSsjgbm(code); data.setSqdjr(sqdjr); List imageList = imgDao.selectListByRefeId(entity.getEventId() == null ? entity.getId() : entity.getEventId()); - log.info("发展照片imageList：" + imageList); //诉求照片 StringBuffer sqzp = new StringBuffer(); imageList.forEach(img -> { sqzp.append(img.getImgUrl().replace(ApiConstants.eventOssUrlBefore, ApiConstants.eventOssUrlAfter)).append(","); }); - log.info("发展照片sqzp：" + sqzp); if (StringUtils.isNotBlank(sqzp)) { data.setSqzp(sqzp.substring(0, sqzp.length() - 1)); } @@ -3918,7 +3889,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 接口请求返回实体，getCode 1失败 0成功（非空） log.info("处理项目-进入上报驳回重办-发送"); EventRejectDoResultDto sendResult = shiBeiCityGridApi.sendReDoEvent(rejectReDoDTO); - log.info("处理项目-进入上报驳回重办-结束：" + sendResult); // 保存接口调用日志 String successFlag = YesOrNoEnum.NO.value(); if (NumConstant.ZERO_STR.equals(sendResult.getCode())) { @@ -4103,7 +4073,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem //诉求审核不同意，上报市平台 //pushToCityGridService.appealAudit(itemHandleProcessDto.getId(), NumConstant.ZERO_STR); // 上报驳回，上报市平台 - //log.info("上报驳回，上报市平台" + itemHandleProcessDto.getId()); //pushToCityGridService.reportRejection(itemHandleProcessDto.getId()); } else { //诉求审核同意，上报市平台 @@ -4236,7 +4205,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem //网格化平台结案/驳回操作增加的推送数据到市平台逻辑报错不能影响原有程序流程 if ("1".equals(formDto.getState())) { // 上报驳回，上报市平台 - log.info("上报驳回，上报市平台" + itemHandleProcessDto.getId()); pushToCityGridService.reportRejection(itemHandleProcessDto.getId()); } else if ("0".equals(formDto.getState())) { // 诉求审核，上报市平台 @@ -4246,7 +4214,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem log.info("诉求结案，上报市平台"); } } catch (Exception e) { - logger.error("网格化平台结案/驳回操作，发送事件数据到市中心错误，诉求项目Id->" + itemHandleProcessDto.getItemId()); + log.error("网格化平台结案/驳回操作，发送事件数据到市中心错误，诉求项目Id->" + itemHandleProcessDto.getItemId()); e.printStackTrace(); } //项目处理意见图片保存 @@ -4504,7 +4472,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem try { baseDao.updateBatchBySerialNum(updateList); } catch (Exception e) { - logger.info(e); + log.error(e.getMessage()); // 保存接口调用日志 this.saveInterfaceLog("", InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(), ApiConstants.acceptItemDifficulty, YesOrNoEnum.NO.value(), formDto.toString(), returnMsgBody); @@ -4608,8 +4576,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem */ @Override public void itemClosed(String id, String type) { - log.info("开始执行结案操作,Id->" + id + ",type->" + type); - //根据type判断要走的流程 if (StringUtils.isBlank(type) || NumConstant.ONE_STR.equals(type)) { //诉求评价 @@ -4765,7 +4731,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem //3-2.只有首次评价的判断是发展、执法诉求的(这两个诉求项目必须走诉求初验终验逻辑)或者是评价了不满意的民生诉求的需要走市里的初验申请 if ((CollUtil.isEmpty(feedbackEntityList) && (!"0".equals(entity.getPeopleFlag())) || (null != entity.getEvaluationScore() && entity.getEvaluationScore() == 0))) { - //logger.info("当前诉求不做结案处理，原因：诉求分类PeopleFlag->" + entity.getPeopleFlag() + ",诉求状态itemState->" + entity.getItemState()); // 2022/11/11，业务挪到初验前 // ItemHandleProcessEntity processEntity = new ItemHandleProcessEntity(); // processEntity.setId(UUID.randomUUID().toString().replace("-", "")); @@ -4967,6 +4932,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result().error(NumConstant.ONE, "根据REC_ID" + formDTO.getP_recId() + "未查到相应诉求"); } String itemId = dto.getReferenceId(); + log.info("process:rec_id:" + formDTO.getP_recId() + "|item_id:" + itemId); queryItemHandle(itemId); } catch (Exception e) { return new Result().error(NumConstant.ONE, "流程拉取失败REC_ID" + formDTO.getP_recId()); @@ -4985,7 +4951,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem private void reReport(ItemHandleSubmitFormDTO dto, ItemHandleProcessDTO process) { Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getHandlerDeptId()); - log.info("处理项目-deptMessage：" + deptMessage); String typeKey; if (0 == deptMessage.getCode()) { typeKey = deptMessage.getData().toString(); @@ -5064,7 +5029,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem // itemInfoEachDto.setDeptId(itemDeptId.toString()); // itemInformationService.insert(itemInfoEachDto); //} - //log.info("处理项目-发送消息"); //// 发送消息 //newsTask.insertUserInformation(informationFormDTO); @@ -5118,7 +5082,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem } if ("0".equals(formDto.getState())) { ItemEntity item = baseDao.selectById(formDto.getItemId()); - log.info("根据id查询数据"); itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue()); //判断最后一条处理进展是吹哨还是结案，结案：取第一条处置意见；吹哨：取平台处置意见 if ("1".equals(item.getPeopleFlag()) || "2".equals(item.getPeopleFlag())) { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/logback-spring.xml index 28a6be303..f222b0c11 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/logback-spring.xml @@ -150,8 +150,8 @@ - - + +