From 4ae7ba74e495d831d07cc4b6a263a66bfe92a779 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 13 Oct 2022 16:37:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AF=89=E6=B1=82=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E4=BB=8E=E9=9A=8F=E6=9C=BA=E7=94=9F=E6=88=90=E5=88=B0=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 4923183cd..fa67116dd 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 @@ -2233,8 +2233,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem sendDto.setSJMS(itemEntity.getItemContent());// } //推送端记录唯一标识 - 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){ From fef83045f717d25fe2803b18dc277d3939049a16 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 13 Oct 2022 16:58:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9getdept=E4=B8=8D=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/service/impl/SysDeptServiceImpl.java | 3 +++ .../epdc/modules/item/service/impl/ItemServiceImpl.java | 2 +- .../item/service/impl/PushToCityGridServiceImpl.java | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index f18e3ee6f..07caf3241 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/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 implem formDTO.setDeptId(deptId); Result dept = adminFeignClient.getDept(formDTO); if (dept.success()) { - return dept.getData().getDisCenterZoningCode(); + return dept.getData() == null ? "" : dept.getData().getDisCenterZoningCode(); } return ""; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index 69f2b8db8..a2032d1e6 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/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 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 ""; From a3e7000962f60cdb96eb00b34a85c151b080770a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 13 Oct 2022 17:23:13 +0800 Subject: [PATCH 3/3] =?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); }