diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java index 6baf3de04..10bfbfc6e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.service.impl; import cn.hutool.core.collection.CollUtil; import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.enums.UserTagEnum; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; @@ -20,6 +21,7 @@ import com.elink.esua.epdc.feign.UserFeignClient; import com.elink.esua.epdc.service.ItemService; import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserMatchTagFormDTO; import com.elink.esua.epdc.utils.UserTagUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -155,18 +157,22 @@ public class ItemServiceImpl implements ItemService { // // 验证手机号 // customEnterpriseServiceImpl.checkSmsCode(formDto.getMobile(), formDto.getSmsCode()); // } - // 获取所有上级机构名称和ID拼接 - Result dtoResult = adminFeignClient.getParentAndAllDept(formDto.getGridId()); - ParentAndAllDeptDTO deptDTO = dtoResult.getData(); - // 父所有部门 - formDto.setParentDeptIds(deptDTO.getParentDeptIds()); - formDto.setParentDeptNames(deptDTO.getParentDeptNames()); - // 所有部门 - formDto.setAllDeptIds(deptDTO.getAllDeptIds()); - formDto.setAllDeptNames(deptDTO.getAllDeptNames()); - // 网格 - formDto.setGrid(deptDTO.getGrid()); - formDto.setGridId(deptDTO.getGridId()); + if(StringUtils.isNotBlank(formDto.getPeopleFlag()) && NumConstant.ONE_STR.equals(formDto.getPeopleFlag())){ + //发展诉求只有街道 前端已赋值gridId为街道id + }else{ + // 获取所有上级机构名称和ID拼接 + Result dtoResult = adminFeignClient.getParentAndAllDept(formDto.getGridId()); + ParentAndAllDeptDTO deptDTO = dtoResult.getData(); + // 父所有部门 + formDto.setParentDeptIds(deptDTO.getParentDeptIds()); + formDto.setParentDeptNames(deptDTO.getParentDeptNames()); + // 所有部门 + formDto.setAllDeptIds(deptDTO.getAllDeptIds()); + formDto.setAllDeptNames(deptDTO.getAllDeptNames()); + // 网格 + formDto.setGrid(deptDTO.getGrid()); + formDto.setGridId(deptDTO.getGridId()); + } // 用户信息 formDto.setUserId(userDetail.getUserId()); formDto.setNickName(userDetail.getNickname()); 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 a8d536c50..7f23c6bbf 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 @@ -356,7 +356,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 插入项目处理流程表 ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity(); itemHandleProcessEntity.setItemId(itemEntity.getId()); - itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue()); + itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID_TOP.getValue()); itemHandleProcessEntity.setHandleAdvice("您的诉求已收到"); itemHandleProcessEntity.setOutHandleAdvice("执法诉求上报"); itemHandleProcessEntity.setHandlerDeptId(itemEntity.getGridId()); @@ -1495,14 +1495,39 @@ public class ItemServiceImpl extends BaseServiceImpl implem //推送类别（事件上报） sendDto.setSENDTYPE(CommonConstants.SEND_TYPE); //上报 + //所属区市:只有市北区 + sendDto.setSSQS(CommonConstants.CITY_INFO_CODE); if("1".equals(itemEntity.getIsPeople()) && ("1".equals(itemEntity.getPeopleFlag()) || "2".equals(itemEntity.getPeopleFlag()))){ //发展、执法上报到区中心平台 sendDto.setSENDACTDEFID(CommonConstants.PARTY_SEND_TO); sendDto.setSJZT(CommonConstants.PARTY_ITEM_ZT_ONE); + if("1".equals(itemEntity.getPeopleFlag())){ + //事件来源 + sendDto.setSJLY(CommonConstants.PARTY_EVENT_SOURCE_FZ); + }else{ + //事件描述 + sendDto.setSJMS("测试事件，请勿处理"+getItemLawContent(itemEntity.getId())); + //事件来源 + sendDto.setSJLY(CommonConstants.PARTY_EVENT_SOURCE_ZF); + //备注 + sendDto.setBZXX(getItemLawNote(itemEntity.getId())); + } + //执法诉求和发展诉求gridId存的是街道id,需要单独查 + Result streetResult = adminFeignClient.getSysDeptInfo(itemEntity.getGridId()); + SysDeptDTO deptInfo = streetResult.getData(); + if(deptInfo == null){ + throw new RenException("根据街道ID获取对应的街道编码失败" + streetResult.getMsg()); + } + //所属街道 + sendDto.setSSJD(deptInfo.getInfoCode()); + //所属社区 + sendDto.setSSSQ("");//deptInfo.getCommunityInfoCode() }else{ //民生、正常议题转项目来的到街道平台 sendDto.setSENDACTDEFID(CommonConstants.PARTY_SEND_STREET); + //事件来源 + sendDto.setSJLY(CommonConstants.PARTY_EVENT_SOURCE_MS); if(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()){ //结案申请 sendDto.setSJZT(CommonConstants.PARTY_ITEM_ZT_ZERO); @@ -1510,6 +1535,19 @@ public class ItemServiceImpl extends BaseServiceImpl implem //吹哨 sendDto.setSJZT(CommonConstants.PARTY_ITEM_ZT_ONE); } + //备注 + sendDto.setBZXX(dto.getOutHandleAdvice()); + Result deptResult = adminFeignClient.getDeptInfoCode(itemEntity.getGridId()); + DeptInfoCodeDTO deptInfo = deptResult.getData(); + if(deptInfo == null){ + throw new RenException("根据网格ID获取对应的社区编码、街道编码失败" + deptResult.getMsg()); + } + //所属街道 + sendDto.setSSJD(deptInfo.getStreetInfoCode()); + //所属社区 + sendDto.setSSSQ(deptInfo.getCommunityInfoCode()); + //事件描述 + sendDto.setSJMS("测试事件，请勿处理"+itemEntity.getItemContent());// } //推送端记录唯一标识 sendDto.setUID(UUID.randomUUID().toString().trim().replaceAll("-", "")); @@ -1534,35 +1572,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem sendDto.setSJXL(""); //事件细类 sendDto.setSJXIL(""); - //事件来源 04代表 党群e家上报 06代表在市北App上报 - sendDto.setSJLY(CommonConstants.PARTY_EVENT_SOURCE); - //所属区市:只有市北区 - sendDto.setSSQS(CommonConstants.CITY_INFO_CODE); - //查询网格所对应的社区编码、街道编码 - if(StringUtils.isNotBlank(itemEntity.getPeopleFlag()) && "2".equals(itemEntity.getPeopleFlag())){ - //执法诉求gridId存的是街道id,需要单独查 - Result streetResult = adminFeignClient.getSysDeptInfo(itemEntity.getGridId()); - SysDeptDTO deptInfo = streetResult.getData(); - if(deptInfo == null){ - throw new RenException("根据街道ID获取对应的街道编码失败" + streetResult.getMsg()); - } - //所属街道 - sendDto.setSSJD(deptInfo.getInfoCode()); - //事件描述 - sendDto.setSJMS("测试事件，请勿处理"+getItemLawContent(itemEntity.getId())); - }else{ - Result deptResult = adminFeignClient.getDeptInfoCode(itemEntity.getGridId()); - DeptInfoCodeDTO deptInfo = deptResult.getData(); - if(deptInfo == null){ - throw new RenException("根据网格ID获取对应的社区编码、街道编码失败" + deptResult.getMsg()); - } - //所属街道 - sendDto.setSSJD(deptInfo.getStreetInfoCode()); - //事件描述 - sendDto.setSJMS("测试事件，请勿处理"+itemEntity.getItemContent());// - } - //所属社区 - sendDto.setSSSQ("");//deptInfo.getCommunityInfoCode() + //诉求联系人及联系方式 Result userResult = userInfoFeignClient.getUserInfoById(itemEntity.getUserId()); UserDTO itemUser = userResult.getData(); @@ -1585,8 +1595,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem List handleList = getHandleList(itemEntity.getId(),handleImagesList); log.info("处理项目-获取进度结束"); sendDto.setHandleList(handleList); - //备注 - sendDto.setBZXX(dto.getOutHandleAdvice()); //图片 List images = getImageFileNew(itemEntity.getEventId() == null?itemEntity.getId():itemEntity.getEventId(),handleImagesList);//事件图片+处理流程图片 //时间处理进度图片 @@ -1595,27 +1603,35 @@ public class ItemServiceImpl extends BaseServiceImpl implem return sendDto; } + private String getItemLawNote(String itemId) { + 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(); + return result; + } + private String getItemLawContent(String itemId){ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("item_id", itemId); wrapper.eq("del_flag", "0"); ItemLawEntity itemLaw = itemLawDao.selectOne(wrapper); - String result = "事项名称-" + itemLaw.getLawName() - + ";诉求详情-"+itemLaw.getLawContent() - + ";主办单位-"+itemLaw.getHostUnit() - + ";协办单位-"+itemLaw.getAssistUnit() - + ";有关需求-"+itemLaw.getDemand() - + ";事项类型-"+("0".equals(itemLaw.getLawType())?"计划事项":"临时事项") - + ";与部门是否沟通-"+("0".equals(itemLaw.getIsExchange())?"已经沟通":"尚未沟通") - + ";召集人姓名-"+itemLaw.getConvenerName() - + ";召集人职务-"+itemLaw.getConvenerJob() - + ";召集人电话-"+itemLaw.getConvenerMobile() - + ";联系人姓名-"+itemLaw.getContactName() - + ";联系人职务-"+itemLaw.getContactJob() - + ";联系人电话-"+itemLaw.getContactMobile() - + ";报到时间-"+DateUtils.format(itemLaw.getReportTime(),DateUtils.DATE_TIME_PATTERN) - + ";报到地点-"+itemLaw.getReportAddress() - + ";会议名称-"+itemLaw.getMeetingName()+"。"; + String result = "事项名称：" + itemLaw.getLawName() +"\n" + + "诉求详情："+itemLaw.getLawContent() +"\n" + + "有关需求："+itemLaw.getDemand() +"\n" + + "事项类型："+("0".equals(itemLaw.getLawType())?"计划事项":"临时事项") +"\n" + + "与部门是否沟通："+("0".equals(itemLaw.getIsExchange())?"已经沟通":"尚未沟通") +"\n" + + "召集人姓名："+itemLaw.getConvenerName() +"\n" + + "召集人职务："+itemLaw.getConvenerJob() +"\n" + + "召集人电话："+itemLaw.getConvenerMobile() +"\n" + + "联系人姓名："+itemLaw.getContactName() +"\n" + + "联系人职务："+itemLaw.getContactJob() +"\n" + + "联系人电话："+itemLaw.getContactMobile() +"\n" + + "报到时间："+DateUtils.format(itemLaw.getReportTime(),DateUtils.DATE_TIME_PATTERN) +"\n" + + "报到地点："+itemLaw.getReportAddress() +"\n" + + "会议名称："+itemLaw.getMeetingName(); return result; } @@ -2293,7 +2309,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 插入项目处理流程表 ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity(); itemHandleProcessEntity.setItemId(entity.getId()); - itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue()); + itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID_TOP.getValue()); if("0".equals(formDto.getPeopleFlag())){ itemHandleProcessEntity.setHandleAdvice("您的诉求已收到"); itemHandleProcessEntity.setOutHandleAdvice("民生诉求上报");