日志记录

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<ItemDao, ItemEntity> implem
         wrapper.eq(StringUtils.isNotBlank(eventId), "REFERENCE_ID", eventId);
         List<ImgEntity> imageList = imgDao.selectList(wrapper);
         if (null != imageList && !imageList.isEmpty()) {
-            String url = null;
+            String url;
-            String filename = null;
+            String filename;
-            ReportFile reportFile = null;
+            ReportFile reportFile;
             List<ReportFile> reportFiles = new ArrayList<>();
             List<String> imgUrlList = this.getUploadDTOList(imageList);
             for (String imgUrl : imgUrlList) {
@@ -2638,34 +2637,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return imageFile;
     }
 
-//    //压缩图片并上传到服务器，得到新的地址
-//    private List<String> getUploadDTOListNew(List<String> imageList) {
-//        List<String> imgUrlList = new ArrayList<>();
-//        List<String> notNeedCompressImgUrlList = new ArrayList<>();
-//        List<String> 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<List<String>> 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<String> getUploadDTOList(List<ImgEntity> imageList) {
         List<String> imgUrlList = new ArrayList<>();
@@ -4149,7 +4120,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     @Override
     public List<CategoryAnalysisPieResultDTO> categoryAnalysis(ScreenTotalFormDTO formDTO) {
         // 返回值
-        List<CategoryAnalysisPieResultDTO> resultList = new ArrayList<CategoryAnalysisPieResultDTO>();
+        List<CategoryAnalysisPieResultDTO> resultList = new ArrayList<>();
 
         if ("0".equals(formDTO.getIsElse())) {
             // 城市综合
@@ -4279,7 +4250,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result pushItemDifficulty(AcceptItemDifficultyOutFormDTO formDto) {
-        List<String> updateList = new ArrayList<String>();
+        List<String> updateList = new ArrayList<>();
         String returnMsgBody = "";
         List<AcceptItemDifficultyFormDTO> itemList = formDto.getItemList();
         for (int i = 0; i < itemList.size(); i++) {
@@ -4346,15 +4317,17 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> 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();
     }
 }