elink-star
/
esua-epdc-cloud
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

使用Ren异常捕获

feature/dangjian
zhangyuan 3 years ago
parent
a6be82f238
commit
8358494e4c
3 changed files with 21 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java
  2. 33
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  3. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemTimeoutServiceImpl.java

2
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java
View File

@ -77,7 +77,7 @@ public class ItemFusingDelayServiceImpl extends BaseServiceImpl<ItemFusingDelayD
public PageData<ItemHandleListDTO> page(Map<String, Object> 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"))) {

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

@ -228,7 +228,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
public PageData<ItemPendingHandleDTO> listOfItemsForPCEnd(Map<String, Object> 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<ItemDao, ItemEntity> implem
public List<ItemPendingHandleDTO> 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<ItemDao, ItemEntity> implem
public PageData<ItemPendingHandleDTO> listOfItemsForPCReject(Map<String, Object> 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<ItemDao, ItemEntity> implem
public List<ItemPendingHandleDTO> 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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> implem
//事件来源
sendDto.setSJLY(CommonConstants.PARTY_EVENT_SOURCE_ZF);
//备注
sendDto.setBZXX(getItemLawNote(itemEntity.getId()));
sendDto.setBZXX(getItemLawNote(itemEntity.getId(), itemEntity.getSerialNum()));
}
//执法诉求和发展诉求gridId存的是街道id,需要单独查
Result<SysDeptDTO> streetResult = adminFeignClient.getSysDeptInfo(itemEntity.getGridId());
@ -2206,7 +2206,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> 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<DeptInfoCodeDTO> deptResult = adminFeignClient.getDeptInfoCode(itemEntity.getGridId());
@ -2357,13 +2357,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
return result;
}
private String getItemLawNote(String itemId) {
private String getItemLawNote(String itemId, String serialNum) {
QueryWrapper<ItemLawEntity> 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<ItemDao, ItemEntity> implem
public List<ItemPendingHandleDTO> unExportList(Map<String, Object> 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<ItemDao, ItemEntity> implem
public List<ItemPendingHandleDTO> rejectUnexport(Map<String, Object> 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<ItemDao, ItemEntity> implem
public PageData<ItemExaminePageResultDTO> getExaminePage(Map<String, Object> params) {
UserDetail user = SecurityUser.getUser();
if (null == user) {
throw new RuntimeException("获取用户信息失败");
throw new RenException("获取用户信息失败");
}
params.put("deptId", user.getDeptId());
IPage<ItemExaminePageResultDTO> page = getPage(params);
@ -3548,7 +3549,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
UserDetail user = SecurityUser.getUser();
if (null == user) {
throw new RuntimeException("获取用户信息失败");
throw new RenException("获取用户信息失败");
}
formDTO.setDeptId(user.getDeptId());
List<ItemExaminePageResultDTO> list = baseDao.getExaminePageEqPc(formDTO);
@ -3560,7 +3561,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
public Result examineCase(ExamineCaseFormDTO formDto) {
UserDetail user = SecurityUser.getUser();
if (null == user) {
throw new RuntimeException("获取用户信息失败");
throw new RenException("获取用户信息失败");
}
ItemHandleProcessEntity process = new ItemHandleProcessEntity();

5
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemTimeoutServiceImpl.java
View File

@ -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<ItemTimeoutDao, Item
public PageData<ItemTimeOutDTO> listOfItemsForPCEnd(Map<String, Object> 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<ItemTimeoutDao, Item
public List<ItemTimeOutDTO> itemOutExportList(Map<String, Object> 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"))) {

Write Preview
Loading…
Cancel
Save