From 18b69bbf0639218bc2978d14fef0673b1a401ab2 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 27 Oct 2022 10:28:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 75 +++++++++---------- 1 file changed, 34 insertions(+), 41 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 e02c79716..505e2306d 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 @@ -100,7 +100,6 @@ import com.elink.esua.epdc.modules.item.service.*; 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.modules.screen.entity.MetaSysDeptEntity; import com.elink.esua.epdc.user.dto.UserDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -2617,9 +2616,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem wrapper.eq(StringUtils.isNotBlank(eventId), "REFERENCE_ID", eventId); List imageList = imgDao.selectList(wrapper); if (null != imageList && !imageList.isEmpty()) { - String url = null; - String filename = null; - ReportFile reportFile = null; + String url; + String filename; + ReportFile reportFile; List reportFiles = new ArrayList<>(); List imgUrlList = this.getUploadDTOList(imageList); for (String imgUrl : imgUrlList) { @@ -2638,34 +2637,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem return imageFile; } -// //压缩图片并上传到服务器，得到新的地址 -// private List getUploadDTOListNew(List imageList) { -// List imgUrlList = new ArrayList<>(); -// List notNeedCompressImgUrlList = new ArrayList<>(); -// List needCompressImgUrlList = new ArrayList<>(); -// for (String image : imageList) { -// long imgLength = CompressImgUtils.getFileLength(image); -// if (imgLength > 1024 * 1024) { -// needCompressImgUrlList.add(image); -// } else { -// notNeedCompressImgUrlList.add(image); -// } -// } -// if (null != needCompressImgUrlList && needCompressImgUrlList.size() > 0) { -// //如果图片大于1M则需要压缩 -// Result> result = ossFeignClient.compressImg(needCompressImgUrlList); -// if (!result.success()) { -// throw new RenException("图片压缩异常" + result.getMsg()); -// } -// if (null == result.getData() || result.getData().size() == 0) { -// throw new RenException("图片压缩失败" + result.getMsg()); -// } -// imgUrlList.addAll(result.getData()); -// } -// imgUrlList.addAll(notNeedCompressImgUrlList); -// return imgUrlList; -// } - //压缩图片并上传到服务器，得到新的地址 private List getUploadDTOList(List imageList) { List imgUrlList = new ArrayList<>(); @@ -4149,7 +4120,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public List categoryAnalysis(ScreenTotalFormDTO formDTO) { // 返回值 - List resultList = new ArrayList(); + List resultList = new ArrayList<>(); if ("0".equals(formDTO.getIsElse())) { // 城市综合 @@ -4279,7 +4250,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override @Transactional(rollbackFor = Exception.class) public Result pushItemDifficulty(AcceptItemDifficultyOutFormDTO formDto) { - List updateList = new ArrayList(); + List updateList = new ArrayList<>(); String returnMsgBody = ""; List itemList = formDto.getItemList(); for (int i = 0; i < itemList.size(); i++) { @@ -4346,15 +4317,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public Result supervise(AppealSuperviseResultDTO formDTO) { + String successFlag = YesOrNoEnum.NO.value(); ItemHandleProcessEntity process = new ItemHandleProcessEntity(); ItemEntity item = baseDao.getItemBySqid(formDTO.getSqid()); - // 变更为市平台吹哨项目 - item.setIsWhistle(NumConstant.ONE_STR); - updateById(item); if (item == null) { return new Result().error("未查到相关项目，诉求ID：" + formDTO.getSqid()); } + // 变更为市平台吹哨项目 + item.setIsWhistle(NumConstant.ONE_STR); + updateById(item); + process.setItemId(item.getId()); process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_DB.getValue()); process.setHandleAdvice(formDTO.getDbnr()); @@ -4362,11 +4335,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem process.setHandlerDept("青诉即办平台"); process.setHandlerDeptId(1L); process.setGridPartyname(formDTO.getDbr()); - itemHandleProcessDao.insert(process); + int result = itemHandleProcessDao.insert(process); + if (result == 1) { + successFlag = YesOrNoEnum.YES.value(); + } // 更新创建时间 process.setCreatedTime(DateUtils.parse(formDTO.getDbsj(), DateUtils.DATE_TIME_PATTERN)); itemHandleProcessDao.updateById(process); + + this.saveInterfaceLog(StringUtils.EMPTY, InterfaceLogBusinessTypeEnum.ACCEPT_GOV_ITEM_PROCESS.getValue(), + PushToCityGridConstant.APPEAL_SUPERVISE, successFlag, formDTO.toString(), String.valueOf(result)); return new Result(); } /** @@ -4756,7 +4735,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Transactional(rollbackFor = Exception.class) public ItemHandleProcessDTO closedItem(AcceptPlantformProcessDTO formDto) { - String successFlag = YesOrNoEnum.NO.value(); + String successFlag; String returnMsgBody = ""; // 插入项目处理进度表 String firstHandleId = ""; @@ -4852,6 +4831,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public Result reportReject(AppealWhistleReportRejectResultDTO formDTO) { + String successFlag = YesOrNoEnum.NO.value(); ItemHandleProcessEntity process = new ItemHandleProcessEntity(); ItemEntity item = baseDao.getItemBySqid(formDTO.getSqid()); if (item == null) { @@ -4865,16 +4845,23 @@ public class ItemServiceImpl extends BaseServiceImpl implem process.setHandlerDeptId(1L); process.setGridPartyid(formDTO.getBhrId()); process.setGridPartyname(formDTO.getBhr()); - itemHandleProcessDao.insert(process); + int result = itemHandleProcessDao.insert(process); + if (result == 1) { + successFlag = YesOrNoEnum.YES.value(); + } // 更新创建时间 process.setCreatedTime(DateUtils.parse(formDTO.getBhsj(), DateUtils.DATE_TIME_PATTERN)); itemHandleProcessDao.updateById(process); + + this.saveInterfaceLog(StringUtils.EMPTY, InterfaceLogBusinessTypeEnum.ACCEPT_GOV_ITEM_PROCESS.getValue(), + PushToCityGridConstant.APPEAL_WHISTLE_REPORT_REJECT, successFlag, formDTO.toString(), String.valueOf(result)); return new Result(); } @Override public Result feedback(AppealWhistleFeedbackResultDTO formDTO) { + String successFlag = YesOrNoEnum.NO.value(); ItemHandleProcessEntity process = new ItemHandleProcessEntity(); ItemEntity item = baseDao.getItemBySqid(formDTO.getSqid()); if (item == null) { @@ -4890,11 +4877,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem process.setGridPartyname(formDTO.getClr()); process.setGridUnitid(formDTO.getCldwId()); process.setGridUnitname(formDTO.getCldw()); - itemHandleProcessDao.insert(process); + int result = itemHandleProcessDao.insert(process); + if (result == 1) { + successFlag = YesOrNoEnum.YES.value(); + } // 更新创建时间 process.setCreatedTime(DateUtils.parse(formDTO.getFksj(), DateUtils.DATE_TIME_PATTERN)); itemHandleProcessDao.updateById(process); + + this.saveInterfaceLog(StringUtils.EMPTY, InterfaceLogBusinessTypeEnum.ACCEPT_GOV_ITEM_PROCESS.getValue(), + PushToCityGridConstant.APPEAL_WHISTLE_FEEDBACK, successFlag, formDTO.toString(), String.valueOf(result)); return new Result(); } }