Merge branch 'feature/hotfix_shangbao' into feature/bssb_screen

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -1479,6 +1479,9 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     @Override
     public SysDeptDTO getDept(CityCenterFromDTO formDTO) {
         SysDeptEntity entity = baseDao.selectById(formDTO.getDeptId());
+        if (entity == null) {
+            return null;
+        }
         if ("grid_party".equals(entity.getTypeKey())) {
             return ConvertUtils.sourceToTarget(baseDao.selectById(entity.getPid()), SysDeptDTO.class);
         }

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

@@ -2239,30 +2239,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             //事件描述
             sendDto.setSJMS(itemEntity.getItemContent());//
         }
-        //推送端记录唯一标识
+        //推送端记录唯一标识10.13从uid改成流水号
-        sendDto.setUID(UUID.randomUUID().toString().trim().replaceAll("-", ""));
+//        sendDto.setUID(UUID.randomUUID().toString().trim().replaceAll("-", ""));
-
+        sendDto.setUID(itemEntity.getSerialNum());
-        //事件领域
-//        Integer lingYu = Integer.valueOf(itemEntity.getFirstCategoryCode());
-//        if(lingYu < 10){
-//            sendDto.setSJLYU("0"+itemEntity.getFirstCategoryCode());
-//        }else{
-//            sendDto.setSJLYU(itemEntity.getFirstCategoryCode());
-//        }
-//        log.info("处理项目-事件大类");
-        //事件大类
-//        String secondCate = baseDao.selectSecondCateByItemId(itemEntity.getId());
-//        lbHandle(sendDto,secondCate);
-//        sendDto.setSJLYU("01");
-//        sendDto.setSJDL("0104");
 
         //组装事件领域和事件大类
         setItemCategoryInfo(sendDto, itemEntity);
 
         //诉求联系人及联系方式
-//        Result<UserDTO> userResult =  userInfoFeignClient.getUserInfoById(itemEntity.getUserId());
-//        UserDTO itemUser = userResult.getData();
-//        log.info("处理项目-诉求联系人："+itemUser);
         sendDto.setSQLXR(itemEntity.getNickName() + itemEntity.getMobile());
         //事件地址
         sendDto.setSJDZ(itemEntity.getIssueAddress());
@@ -3096,27 +3080,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 entity.setParentDeptNames(dto.getAllDeptNames());
 
             }
-//            if (StringUtils.isNotEmpty(item.getParentDeptIds()) && StringUtils.isNotEmpty(item.getParentDeptNames())) {
-//                List<String> parentDeptIds = Arrays.asList(item.getParentDeptIds().split(","));
-//                List<String> parentDeptNames = Arrays.asList(item.getParentDeptNames().split("-"));
-//                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
-//                if (index >= 0 && parentDeptNames.size() > index) {
-//                    parentDeptNames.set(index, dto.getNewDeptName());
-//                    entity.setId(item.getId());
-//                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
-//                }
-//            }
-//
-//            if (StringUtils.isNotEmpty(item.getAllDeptIds()) && StringUtils.isNotEmpty(item.getAllDeptNames())) {
-//                List<String> allDeptIds = Arrays.asList(item.getAllDeptIds().split(","));
-//                List<String> allDeptNames = Arrays.asList(item.getAllDeptNames().split("-"));
-//                int index = allDeptIds.indexOf(dto.getDeptId().toString());
-//                if (index >= 0 && allDeptNames.size() > index) {
-//                    allDeptNames.set(index, dto.getNewDeptName());
-//                    entity.setId(item.getId());
-//                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
-//                }
-//            }
 
             entities.add(entity);
         }
@@ -3948,7 +3911,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         formDTO.setDeptId(deptId);
         Result<SysDeptDTO> dept = adminFeignClient.getDept(formDTO);
         if (dept.success()) {
-            return dept.getData().getDisCenterZoningCode();
+            return dept.getData() == null ? "" : dept.getData().getDisCenterZoningCode();
         }
         return "";
     }

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

@@ -1236,7 +1236,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @Date 2022/9/23 16:58
      */
     private String getJgbm(Long deptId, String type) {
-        if (null == deptId) {
+        if (null == deptId || 0L == deptId) {
             return "";
         }
         CityCenterFromDTO formDTO = new CityCenterFromDTO();
@@ -1244,9 +1244,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         Result<SysDeptDTO> dept = adminFeignClient.getDept(formDTO);
         if (dept.success()) {
             if (NumConstant.ZERO_STR.equals(type)) {
-                return dept.getData().getDisCenterZoningCode();
+                return dept.getData() == null ? "" : dept.getData().getDisCenterZoningCode();
             } else {
-                return dept.getData().getName();
+                return dept.getData() == null ? "" : dept.getData().getName();
             }
         }
         return "";