From a3e7000962f60cdb96eb00b34a85c151b080770a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 13 Oct 2022 17:23:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8D=A3=E8=AA=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 39 +------------------ 1 file changed, 1 insertion(+), 38 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 41a8eab7b..640cf21f9 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 @@ -2232,30 +2232,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem //事件描述 sendDto.setSJMS(itemEntity.getItemContent());// } - //推送端记录唯一标识 + //推送端记录唯一标识10.13从uid改成流水号 // 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 userResult = userInfoFeignClient.getUserInfoById(itemEntity.getUserId()); -// UserDTO itemUser = userResult.getData(); -// log.info("处理项目-诉求联系人："+itemUser); sendDto.setSQLXR(itemEntity.getNickName() + itemEntity.getMobile()); //事件地址 sendDto.setSJDZ(itemEntity.getIssueAddress()); @@ -3089,27 +3073,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem entity.setParentDeptNames(dto.getAllDeptNames()); } -// if (StringUtils.isNotEmpty(item.getParentDeptIds()) && StringUtils.isNotEmpty(item.getParentDeptNames())) { -// List parentDeptIds = Arrays.asList(item.getParentDeptIds().split(",")); -// List 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 allDeptIds = Arrays.asList(item.getAllDeptIds().split(",")); -// List 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); }