不在组装成xml,减少存储空间

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -566,11 +566,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     /**
+     * @return void
      * @describe: 执法诉求 组装数据到市平台
      * @author wangtong
      * @date 2022/9/19 14:11
      * @params [entity]
-    * @return void
      */
     private void sendCaseLaw(ItemEntity entity) {
         CityCaseLawenforcementDTO data = new CityCaseLawenforcementDTO();
@@ -896,6 +896,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
         return resultDTO;
     }
+
     /**
      * 项目处理详情 by HAHA
      *
@@ -1108,7 +1109,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         itemHandleResultDTOS.add(itemHandleResultDTO6);
 
 
-
         // 结案申请
 //        ItemHandleResultDTO itemHandleResultDTO4 = new ItemHandleResultDTO();
 //        itemHandleResultDTO4.setProcessResult(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue());
@@ -1882,6 +1882,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
     /**
      * 获取工作端待处理数量
+     *
      * @return
      */
     public Integer getDealIteamNum() {
@@ -1995,17 +1996,17 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             successFlag = YesOrNoEnum.YES.value();
         }
         this.saveInterfaceLog(dto.getId(), InterfaceLogBusinessTypeEnum.REPORT_ITEM.getValue(),
-                ApiConstants.newSendInputInfo, successFlag, XstreamUtil.objectToXml(sendInputInfoFormDto),
+                ApiConstants.newSendInputInfo, successFlag, sendInputInfoFormDto.toString(),
-                XstreamUtil.objectToXml(gridDto));
+                gridDto == null ? "" : gridDto.toString());
         return gridDto;
     }
 
     /**
+     * @return com.elink.esua.epdc.gird.shibei.dto.GridDto
      * @describe: 新版事件上报
      * @author wangtong
      * @date 2020/12/16 10:45
      * @params [dto]
-    * @return com.elink.esua.epdc.gird.shibei.dto.GridDto
      */
     private SendEventResultDto reportCaseNew(ItemHandleSubmitFormDTO dto) throws Exception {
         ItemEntity entity = baseDao.selectById(dto.getId());
@@ -2021,8 +2022,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             successFlag = YesOrNoEnum.YES.value();
         }
         this.saveInterfaceLog(dto.getId(), InterfaceLogBusinessTypeEnum.REPORT_ITEM.getValue(),
-                ApiConstants.sendEventUrl, successFlag, XstreamUtil.objectToXml(sendEventFormDto),
+                ApiConstants.sendEventUrl, successFlag, sendEventFormDto.toString(),
-                XstreamUtil.objectToXml(sendResult));
+                sendResult == null ? "" : sendResult.toString());
         log.info("处理项目-上报网格化平台-存储日志结束");
         return sendResult;
     }
@@ -2112,11 +2113,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     /**
+     * @return com.elink.esua.epdc.gird.shibei.dto.form.SendInputInfoFormDto
      * @describe: 组装时间上报参数
      * @author wangtong
      * @date 2020/12/16 10:51
      * @params [itemEntity]
-    * @return com.elink.esua.epdc.gird.shibei.dto.form.SendInputInfoFormDto
      */
     private SendEventFormDto packageSendEventEntity(ItemEntity itemEntity, ItemHandleSubmitFormDTO dto) throws Exception {
         SendEventFormDto sendDto = new SendEventFormDto();
@@ -2235,11 +2236,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     /**
+     * @return void
      * @describe: 组装事件领域和事件大类
      * @author wangtong
      * @date 2022/9/23 17:03
      * @params [sendDto, itemEntity]
-     * @return void
      */
     private void setItemCategoryInfo(SendEventFormDto sendDto, ItemEntity itemEntity) {
         CategoryEntity cate = categoryDao.selectById(itemEntity.getCategoryCode());
@@ -2293,11 +2294,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     /**
+     * @return com.elink.esua.epdc.gird.shibei.dto.form.EventRejectReDoFormDto
      * @describe: 组装驳回重办数据
      * @author wangtong
      * @date 2022/9/13 13:47
      * @params [itemEntity]
-    * @return com.elink.esua.epdc.gird.shibei.dto.form.EventRejectReDoFormDto
      */
     private EventRejectReDoFormDto packeageSendRejectReInfo(ItemHandleSubmitFormDTO dto, ItemEntity itemEntity) throws Exception {
         EventRejectReDoFormDto result = new EventRejectReDoFormDto();
@@ -2438,11 +2439,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     /**
+     * @return java.util.List<java.lang.String>
      * @describe: 重新组装图片
      * @author wangtong
      * @date 2020/12/16 15:56
      * @params []
-    * @return java.util.List<java.lang.String>
      */
     private List<String> getImageFileNew(String eventId, List<String> handleImagesList) {
         //查询图片列表
@@ -2574,11 +2575,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     /**
+     * @return void
      * @describe: 保存项目驳回上报信息
      * @author wangtong
      * @date 2022/9/13 10:52
      * @params [gridEntity, handleProcessEntity]
-    * @return void
      */
     private void saveItemRejectReDoInfo(ItemGridPlatformEntity gridEntity, ItemHandleProcessEntity handleProcessEntity) {
         UserDetail user = SecurityUser.getUser();
@@ -2616,7 +2617,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             String returnMsgBody = "";
             if (null != processHistory) {
                 successFlag = YesOrNoEnum.YES.value();
-                returnMsgBody = XstreamUtil.objectToXml(processHistory);
+                returnMsgBody = processHistory.toString();
                 List<EventProcessResultDto> progressList = processHistory.getHISTORY();
                 if (null != progressList && progressList.size() > 0) {
                     // 删除已有的<网格化平台处理记录>
@@ -2765,11 +2766,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     /**
+     * @return void
      * @describe: 根据相应的操作推送数据到市中心
      * @author wangtong
      * @date 2022/9/21 9:41
      * @params [dto]
-    * @return void
      */
     private void sendInfoToCity(ItemHandleProcessDTO dto) {
         if (null == dto) {
@@ -2887,6 +2888,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId, dto.getTypeKey());//做回应处理，向部门下的所有人员发送短信
         }
     }
+
     /**
      * @Description: 居民端：项目处理，发送短信
      * @Param: [dto]
@@ -2906,6 +2908,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
         issueOverseeResultsTask.sendSmsNotice(sms);
     }
+
     /**
      * @param
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
@@ -2990,12 +2993,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     /**
-     *
      * 组织机构信息处理
      *
      * @return java.util.List<com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity>
-     * @params [dto, eventsList]
      * @return java.util.List<com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity>
+     * @params [dto, eventsList]
      * @author liuchuang
      * @since 2020/3/7 1:17
      */
@@ -3176,11 +3178,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     /**
+     * @return void
      * @describe: 民生诉求 组装数据到市平台
      * @author wangtong
      * @date 2022/9/15 10:48
      * @params [entity]
-    * @return void
      */
     private void sendCaseLivelihood(ItemEntity entity) {
         CityCaseLivelihoodDTO data = new CityCaseLivelihoodDTO();
@@ -3245,11 +3247,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     /**
+     * @return void
      * @describe: 发展诉求 组装数据到市平台
      * @author wangtong
      * @date 2022/9/15 10:48
      * @params [entity]
-     * @return void
      */
     private void sendCaseDevelop(ItemEntity entity) {
         CityCaseDevelopDTO data = new CityCaseDevelopDTO();
@@ -3322,9 +3324,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
 
-
     /**
-     *
      * @param params
      * @return
      */
@@ -3365,7 +3365,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     /**
-     *
      * @param params
      * @return
      */
@@ -3565,7 +3564,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             } catch (Exception e) {
                 throw new RenException("上报驳回重办失败" + reDoResult.getMessage());
             }
-            if (null == reDoResult || !("0").equals(reDoResult.getCode())) {
+            if (!"0".equals(reDoResult.getCode())) {
                 // 接口没有返回信息，也没有异常信息
                 throw new RenException("上报驳回重办失败" + reDoResult.getMessage());
             }
@@ -3579,7 +3578,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             } catch (Exception e) {
                 throw new RenException("上报网格化平台接口失败" + sendResult.getMessage());
             }
-            if (null == sendResult || !("0").equals(sendResult.getCode())) {
+            if (!"0".equals(sendResult.getCode())) {
                 // 接口没有返回信息，也没有异常信息
                 throw new RenException("上报网格化平台接口失败" + sendResult.getMessage());
             }
@@ -3603,8 +3602,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             successFlag = YesOrNoEnum.YES.value();
         }
         this.saveInterfaceLog(dto.getId(), InterfaceLogBusinessTypeEnum.REJECT_RE_DO.getValue(),
-                ApiConstants.sendEventUrl, successFlag, XstreamUtil.objectToXml(rejectReDoDTO),
+                ApiConstants.sendEventUrl, successFlag, rejectReDoDTO.toString(),
-                XstreamUtil.objectToXml(sendResult));
+                sendResult == null ? "" : sendResult.toString());
         log.info("处理项目-进入上报驳回重办-存储日志结束");
         return sendResult;
     }
@@ -3764,15 +3763,15 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     /**
+     * @return boolean
      * @describe: 判断项目最后的提交网格化是不是吹哨
      * @author wangtong
      * @date 2022/9/9 2:08
      * @params [itemId]
-    * @return boolean
      */
     private boolean getItemIsCs(String itemId) {
         ItemHandleProcessEntity process = itemHandleProcessDao.selectByItemIdBestNew(itemId);
-        return 0 == process.getState()?true:15 == process.getState();
+        return 0 == process.getState() || 15 == process.getState();
     }
 
     /**
@@ -3837,6 +3836,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
     /**
      * 获取机构编码
+     *
      * @Param peopleFlag
      * @Param deptId
      * @Return {@link String}