From 8358494e4cad5696ce23f757e2b37d7c6100ac13 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 11 Oct 2022 09:21:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8Ren=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8D=95=E8=8E=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ItemFusingDelayServiceImpl.java | 2 +- .../item/service/impl/ItemServiceImpl.java | 33 ++++++++++--------- .../service/impl/ItemTimeoutServiceImpl.java | 5 +-- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java index b8cc42811..108ecbedc 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java @@ -77,7 +77,7 @@ public class ItemFusingDelayServiceImpl extends BaseServiceImpl page(Map params) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { 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 a5c315822..2aff86c6c 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 @@ -228,7 +228,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public PageData listOfItemsForPCEnd(Map params) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { @@ -273,7 +273,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public List listEqPc(ItemWorkListFormDTO formDTO) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (formDTO.getStreetId() != null && !"".equals(formDTO.getStreetId())) { @@ -318,7 +318,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public PageData listOfItemsForPCReject(Map params) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { @@ -358,7 +358,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public List rejectListEqPc(ItemWorkListFormDTO formDTO) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (formDTO.getStreetId() != null && !"".equals(formDTO.getStreetId())) { @@ -488,11 +488,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem public Result submitLawItem(ItemLawSubmitDTO formDto) { UserDetail userDetail = SecurityUser.getUser(); if (null == userDetail) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (!(StringUtils.isNotBlank(userDetail.getTypeKey()) && OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(userDetail.getTypeKey()))) { - throw new RuntimeException("请用街道账号进行上报"); + throw new RenException("请用街道账号进行上报"); } ItemEntity itemEntity = new ItemEntity(); /** @@ -1916,7 +1916,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemWorkListFormDTO formDTO = new ItemWorkListFormDTO(); UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (formDTO.getStreetId() != null && !"".equals(formDTO.getStreetId())) { @@ -2170,7 +2170,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem //事件来源 sendDto.setSJLY(CommonConstants.PARTY_EVENT_SOURCE_ZF); //备注 - sendDto.setBZXX(getItemLawNote(itemEntity.getId())); + sendDto.setBZXX(getItemLawNote(itemEntity.getId(), itemEntity.getSerialNum())); } //执法诉求和发展诉求gridId存的是街道id,需要单独查 Result streetResult = adminFeignClient.getSysDeptInfo(itemEntity.getGridId()); @@ -2206,7 +2206,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem log.info("上报网格化平台dto：" + dto); sendDto.setBZXX(dto.getHandleAdvice()); if (StringUtils.isNotBlank(dto.getHandleAdviceRemark())) { - sendDto.setBZXX(sendDto.getBZXX() + "\n不予受理详细说明：" + dto.getHandleAdviceRemark()); + sendDto.setBZXX(sendDto.getBZXX() + "\n不予受理详细说明：" + dto.getHandleAdviceRemark()+ "\n诉求编码：" + itemEntity.getSerialNum()); } Result deptResult = adminFeignClient.getDeptInfoCode(itemEntity.getGridId()); @@ -2357,13 +2357,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem return result; } - private String getItemLawNote(String itemId) { + private String getItemLawNote(String itemId, String serialNum) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("item_id", itemId); wrapper.eq("del_flag", "0"); ItemLawEntity itemLaw = itemLawDao.selectOne(wrapper); String result = "主办单位：" + itemLaw.getHostUnit() + "\n\n" - + "协办单位：" + itemLaw.getAssistUnit(); + + "协办单位：" + itemLaw.getAssistUnit() + "\n\n" + + "诉求编码：" + serialNum; return result; } @@ -3368,7 +3369,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public List unExportList(Map params) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { @@ -3408,7 +3409,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public List rejectUnexport(Map params) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { @@ -3533,7 +3534,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public PageData getExaminePage(Map params) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } params.put("deptId", user.getDeptId()); IPage page = getPage(params); @@ -3548,7 +3549,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } formDTO.setDeptId(user.getDeptId()); List list = baseDao.getExaminePageEqPc(formDTO); @@ -3560,7 +3561,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public Result examineCase(ExamineCaseFormDTO formDto) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } ItemHandleProcessEntity process = new ItemHandleProcessEntity(); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemTimeoutServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemTimeoutServiceImpl.java index 1a1c9c36f..4880791cb 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemTimeoutServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemTimeoutServiceImpl.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; +import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; @@ -115,7 +116,7 @@ public class ItemTimeoutServiceImpl extends BaseServiceImpl listOfItemsForPCEnd(Map params) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { @@ -172,7 +173,7 @@ public class ItemTimeoutServiceImpl extends BaseServiceImpl itemOutExportList(Map params) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {