From ea8f86f817469e16304cb2098f98b711d9e40489 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 5 Sep 2022 19:33:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B5=81=E6=B0=B4=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-cloud-commons-shibei | 2 +- .../com/elink/esua/epdc/dto/item/ItemDTO.java | 5 + .../epdc/modules/item/entity/ItemEntity.java | 5 + .../item/service/impl/ItemServiceImpl.java | 510 +++++++++--------- 4 files changed, 270 insertions(+), 252 deletions(-) diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 4341e4f12..37affad83 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 4341e4f121499ecdf86612dbd4b085f95f07ec13 +Subproject commit 37affad8391aab6f2e07237cfd03ce4f6278c65d diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java index ebe00bdc5..9d0dc9334 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java @@ -222,4 +222,9 @@ public class ItemDTO implements Serializable { */ private String categoryFullName; + /** + * 流水号 + */ + private String serialNum; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java index 0ac7bf7eb..9de893576 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java @@ -235,4 +235,9 @@ public class ItemEntity extends BaseEpdcEntity { */ private String contactName; + /** + * 流水号 + */ + private String serialNum; + } 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 3d95fa8fa..b81a231d5 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 @@ -185,6 +185,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Autowired private ItemHandleProcessDao itemHandleProcessDao; + @Autowired + private RedisUtils redisUtils; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -213,15 +216,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem } //部门ID列表 List deptIdList = new ArrayList<>(); - // 判断是否为社区网格，不为社区网格只能查看本部门下的项目数据 - if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey()) || OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey())) { + // 判断是否为网格，不为网格只能查看本部门下的项目数据 + if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())) { deptIdList = user.getDeptIdList(); } else { deptIdList.add(user.getDeptId()); } - if(OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey())){ - params.put("isRemind", "isRemind"); - } params.put("deptIdList", null); if (null != deptIdList && deptIdList.size() > 0) { params.put("deptIdList", deptIdList); @@ -310,8 +310,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (null == userDetail) { throw new RuntimeException("获取用户信息失败"); } - if(!(StringUtils.isNotBlank(userDetail.getTypeKey()) - && OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(userDetail.getTypeKey()))){ + if (!(StringUtils.isNotBlank(userDetail.getTypeKey()) + && OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(userDetail.getTypeKey()))) { throw new RuntimeException("请用街道账号进行上报"); } ItemEntity itemEntity = new ItemEntity(); @@ -321,12 +321,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem * grid："执法诉求"+街道名称 * grid_ID:街道ID */ - itemEntity.setUserId("zfsq"+userDetail.getId()); + itemEntity.setUserId("zfsq" + userDetail.getId()); itemEntity.setNickName(userDetail.getUsername()); itemEntity.setIsPartyMember(YesOrNoEnum.NO.value()); itemEntity.setMobile(userDetail.getMobile()); itemEntity.setDistributeTime(new Date()); - itemEntity.setGrid("执法诉求"+userDetail.getDeptName()); + itemEntity.setGrid("执法诉求" + userDetail.getDeptName()); itemEntity.setGridId(userDetail.getDeptId()); itemEntity.setItemContent(formDto.getLawContent()); itemEntity.setItemVoice(formDto.getItemVoice()); @@ -342,6 +342,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemEntity.setItemCode("PT" + System.currentTimeMillis());//项目编号 itemEntity.setIsPeople("1");//诉求上报 itemEntity.setPeopleFlag("2");//执法诉求 + // 流水号 + itemEntity.setSerialNum(getSerialNum("ZF")); baseDao.insert(itemEntity); //插入项目部门关联表 itemDeptService.savePeopleSubmitInfo(itemEntity); @@ -350,22 +352,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem //保存到执法诉求详情表 formDto.setItemId(itemEntity.getId()); itemLawService.saveLawDetail(formDto); - // 插入项目处理流程表 - ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity(); - itemHandleProcessEntity.setItemId(itemEntity.getId()); - itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue()); - itemHandleProcessEntity.setHandleAdvice("执法诉求上报"); - itemHandleProcessEntity.setOutHandleAdvice("执法诉求上报"); - itemHandleProcessEntity.setHandlerDeptId(itemEntity.getGridId()); - itemHandleProcessEntity.setHandlerDept(itemEntity.getGrid()); - itemHandleProcessService.insert(itemHandleProcessEntity); //todo bssb上报网格化平台 - //发送事件至区中心 - ItemHandleSubmitFormDTO dto = new ItemHandleSubmitFormDTO(); - dto.setId(formDto.getItemId()); - dto.setOutHandleAdvice(itemHandleProcessEntity.getOutHandleAdvice()); - dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); - sendItemToDsf(dto,itemHandleProcessEntity); return new Result(); } @@ -381,14 +368,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public Result addQuestionInfo(AddQuestionCollectionFormDTO formDto) { - logger.info("进入关联项目添加："+formDto); - UserDetail user = formDto.getUserInfo(); + logger.info("进入关联项目添加：" + formDto); + UserDetail user = formDto.getUserInfo(); Result deptDTO = adminFeignClient.getParentAndAllDept(user.getDeptId()); - if(null == deptDTO.getData()){ + if (null == deptDTO.getData()) { throw new RenException("未查到用户相关部门信息。"); } ParentAndAllDeptDTO deptMsg = deptDTO.getData(); - logger.info("获取完部门数据："+deptMsg); + logger.info("获取完部门数据：" + deptMsg); ItemEntity entity = new ItemEntity(); entity.setUserId(user.getId().toString()); entity.setNickName(user.getUsername()); @@ -411,7 +398,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem entity.setIssueLongitude(formDto.getLongitude()); entity.setIssueLatitude(formDto.getLatitude()); baseDao.insert(entity); - logger.info("成功插入关联项目："+entity); + logger.info("成功插入关联项目：" + entity); return new Result().ok(entity.getId()); } @@ -456,8 +443,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem //内容审核 Boolean isConReview = evaluationFormDTO.getIsConReview(); String mobile = null; - Result user = userInfoFeignClient.getUserInfoById(evaluationFormDTO.getUserId()); - if(null != user.getData()){ + Result user = userInfoFeignClient.getUserInfoById(evaluationFormDTO.getUserId()); + if (null != user.getData()) { mobile = user.getData().getMobile(); } // 获取所有上级机构名称和ID拼接 @@ -468,11 +455,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (!isConReview && (contentResult != null && !contentResult.getAllPass())) { //组装要保存的信息 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), - evaluationFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one, - ModuleName.ITEM_SATISFACTION.getCode(), textList,null, null,contentResult, - null,null,mobile,"0",deptDto); - contentSecurityFeign.insertViolationsRecord(record); - return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message); + evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, + ModuleName.ITEM_SATISFACTION.getCode(), textList, null, null, contentResult, + null, null, mobile, "0", deptDto); + contentSecurityFeign.insertViolationsRecord(record); + return new Result().error(CheckDataUtils.violations_code, CheckDataUtils.violations_message); } ItemEntity itemEntity = new ItemEntity(); @@ -483,27 +470,27 @@ public class ItemServiceImpl extends BaseServiceImpl implem baseDao.updateById(itemEntity); //接口异常，保存至待审核信息 - if(contentResult == null && !isConReview) { + if (contentResult == null && !isConReview) { SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), - evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList, - null, itemEntity.getId(),null,null, null,mobile,"1",deptDto); - contentSecurityFeign.insertRecords(record); + evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, + null, itemEntity.getId(), null, null, null, mobile, "1", deptDto); + contentSecurityFeign.insertRecords(record); } //判断是否为待审核 - if(contentResult != null) { + if (contentResult != null) { CheckResultMessageDTO twoTypes = null; - if(isConReview){ + if (isConReview) { twoTypes = CheckDataUtils.saveTwoTypes(contentResult, null); - }else{ + } else { twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null); } if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { //组装要保存的信息 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, - null,itemEntity.getId(), null,null,twoTypes,mobile,"0",deptDto); - contentSecurityFeign.insertRecords(record); + null, itemEntity.getId(), null, null, twoTypes, mobile, "0", deptDto); + contentSecurityFeign.insertRecords(record); } } return new Result(); @@ -543,9 +530,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem List itemDeptDTOS = itemDeptService.listOfItemDept(dto.getItemId(), dto.getDeptId()); Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getDeptId()); String typeKey = ""; - if( 0 == deptMessage.getCode()){ + if (0 == deptMessage.getCode()) { typeKey = deptMessage.getData().toString(); - }else{ + } else { throw new RenException(deptMessage.getMsg()); } // 获取可操作处理和可流转部门 @@ -572,7 +559,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @Author: liuchuang * @Date: 2019/9/16 13:40 */ - private ItemDetailForPCEndResultDTO getHandleCategoryAndCirculationDeptOfGrid(ItemDetailForPCEndResultDTO resultDTO, List itemDeptDTOS,Long deptId) { + private ItemDetailForPCEndResultDTO getHandleCategoryAndCirculationDeptOfGrid(ItemDetailForPCEndResultDTO resultDTO, List itemDeptDTOS, Long deptId) { // 可流转部门 Result completeDept = adminFeignClient.getCompleteDept(deptId); if (!completeDept.success()) { @@ -697,9 +684,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem public Result> whistlingDept(EventDeptFormDTO formDto) { Result deptMessage = adminFeignClient.getDeptTypeKey(formDto.getDeptId()); String typeKey = ""; - if( 0 == deptMessage.getCode()){ + if (0 == deptMessage.getCode()) { typeKey = deptMessage.getData().toString(); - }else{ + } else { throw new RenException(deptMessage.getMsg()); } List deptResultDTOS = new ArrayList<>(); @@ -755,7 +742,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @Date: 2019/9/16 16:17 */ private ItemDetailForPCEndResultDTO getHandleCategoryAndCirculationDeptOfStreet(ItemDetailForPCEndResultDTO resultDTO, - List itemDeptDTOS,Long deptId) { + List itemDeptDTOS, Long deptId) { // 可流转部门 Result> listResult = adminFeignClient.listOfItemCirculationDept(deptId); if (!listResult.success()) { @@ -835,11 +822,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem public Result modifyHandleResult(ItemHandleSubmitFormDTO dto) { try { Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getHandlerDeptId()); - log.info("处理项目-deptMessage："+deptMessage); + log.info("处理项目-deptMessage：" + deptMessage); String typeKey = ""; - if( 0 == deptMessage.getCode()){ + if (0 == deptMessage.getCode()) { typeKey = deptMessage.getData().toString(); - }else{ + } else { throw new RenException(deptMessage.getMsg()); } dto.setTypeKey(typeKey); @@ -867,10 +854,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 吹哨 Result result = adminFeignClient.getCompleteDept(entity.getGridId()); Long streetId = 0L; - if( result.getCode() == 0){ - CompleteDeptDTO completeDeptDTO = (CompleteDeptDTO)result.getData(); + if (result.getCode() == 0) { + CompleteDeptDTO completeDeptDTO = (CompleteDeptDTO) result.getData(); streetId = completeDeptDTO.getStreetId(); - }else{ + } else { throw new RenException(result.getMsg()); } if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue() && dto.getHandlerDeptId().longValue() != streetId.longValue()) { @@ -903,48 +890,59 @@ public class ItemServiceImpl extends BaseServiceImpl implem List deptIds = new ArrayList<>(longTreeSet); // 发送菜单消息-待处理项目-吹哨部门 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); - // 上报网格化平台（社区吹哨） + // 上报网格化平台（社区吹哨） } else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) { log.info("处理项目-进入上报网格化平台（社区吹哨）"); + boolean reportFlag = this.checkReport(dto.getId()); + if (reportFlag) { + return new Result().error("当前项目已上报网格化平台"); + } handleProcessEntity.setState(dto.getHandleCategory()); informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_REPORT); + SendEventResultDto sendResult = null; + try { + sendResult = this.reportCaseNew(dto); + } catch (Exception e) { + return new Result().error("上报网格化平台接口失败" + e.getMessage()); + } + if (null == sendResult || !("0").equals(sendResult.getCode())) { + // 接口没有返回信息，也没有异常信息 + return new Result().error("上报网格化平台接口失败" + sendResult.getMessage()); + } // 记录处理记录 itemHandleProcessService.insert(handleProcessEntity); - //上报到网格化平台 - sendItemToDsf(dto,handleProcessEntity); + // 记录平台上报信息 + this.saveItemGridPlatformInfo(sendResult, handleProcessEntity); log.info("处理项目-上报网格化平台-if结束"); - // 结案申请 + // 结案申请 } else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) { log.info("处理项目-进入结案申请"); // 结案申请 Result result = adminFeignClient.getCompleteDept(entity.getGridId()); Long streetId = 0L; - if( result.getCode() == 0){ - CompleteDeptDTO completeDeptDTO = (CompleteDeptDTO)result.getData(); + if (result.getCode() == 0) { + CompleteDeptDTO completeDeptDTO = (CompleteDeptDTO) result.getData(); streetId = completeDeptDTO.getStreetId(); - }else{ + } else { throw new RenException(result.getMsg()); } if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue() && dto.getHandlerDeptId().longValue() != streetId.longValue()) { return new Result().error("请选择正确的处理部门"); } - // 根据操作人部门，获取上一级部门ID - Result sysDeptInfo = adminFeignClient.getSysDeptInfo(dto.getHandlerDeptId()); - SysDeptDTO sysDeptDTO = sysDeptInfo.getData(); + // 项目流转校验 + Result checkResult = this.checkItemCirculation(dto); + if (!checkResult.success()) { + return checkResult; + } - // 手动拼接流转协助部门 - ItemCirculationDeptResultDTO itemCirculationDeptResultDTO = new ItemCirculationDeptResultDTO(); - itemCirculationDeptResultDTO.setDeptId(sysDeptDTO.getPid()); - itemCirculationDeptResultDTO.setDeptName(sysDeptDTO.getParentName()); - itemCirculationDeptResultDTO.setSelected(false); - itemCirculationDeptResultDTO.setTypeKey(sysDeptDTO.getTypeKey()); - List deptList = new ArrayList(); - deptList.add(itemCirculationDeptResultDTO); - dto.setDeptResultDTOS(deptList); + // 根据当前登录人部门，获取上一级部门ID + Long currentDeptId = SecurityUser.getDeptId(); + Result sysDeptInfo = adminFeignClient.getSysDeptInfo(currentDeptId); + SysDeptDTO sysDeptDTO = sysDeptInfo.getData(); handleProcessEntity.setState(dto.getHandleCategory()); - handleProcessEntity.setCloseCheckId(sysDeptDTO.getPid()); // todo 待确认 + handleProcessEntity.setCloseCheckId(sysDeptDTO.getPid()); // 获取已流转部门信息 List oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), dto.getHandlerDeptId()); @@ -952,8 +950,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemDeptService.modifyItemDepts(dto.getHandlerDeptId(), dto.getId()); // 记录处理记录 itemHandleProcessService.insert(handleProcessEntity); - //上报到网格化平台 - sendItemToDsf(dto,handleProcessEntity); // 新增流转协助部门 itemDeptService.saveItemDepts(dto.getHandlerDeptId(), dto, handleProcessEntity.getId()); List newDeptIds = new ArrayList<>(); @@ -973,13 +969,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); log.info("处理项目-结案申请-if结束"); } else { - handleProcessEntity.setState(dto.getHandleCategory()); -// if(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue() == dto.getHandleCategory()){ -// // 如果操作是【响应拟办】【直接办理】相当于之前逻辑的【回应】 -// handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue()); -// }else{ -// handleProcessEntity.setState(dto.getHandleCategory()); -// } + if (ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue() == dto.getHandleCategory()) { + // 如果操作是【响应拟办】【直接办理】相当于之前逻辑的【回应】 + handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue()); + } else { + handleProcessEntity.setState(dto.getHandleCategory()); + } // 更新项目状态 if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { @@ -1044,7 +1039,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemInfoStreetDto.setDeptId(comDeptDto.getStreetId().toString()); itemInformationService.insert(itemInfoStreetDto); } - // 吹哨处理 + // 吹哨处理 } else if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { List deptList = dto.getDeptResultDTOS(); // 拼接被吹哨部门 @@ -1067,10 +1062,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemInfoEachDto.setDeptId(itemDto.getDeptId().toString()); itemInformationService.insert(itemInfoEachDto); } - // 结案申请 - }else if(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()){ - // 根据操作人人部门，获取上一级部门ID - Result sysDeptInfo = adminFeignClient.getSysDeptInfo(dto.getHandlerDeptId()); + // 结案申请 + } else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) { + Long currentDeptId = SecurityUser.getDeptId(); + // 根据当前登录人部门，获取上一级部门ID + Result sysDeptInfo = adminFeignClient.getSysDeptInfo(currentDeptId); SysDeptDTO sysDeptDTO = sysDeptInfo.getData(); ItemCirculationDeptResultDTO itemCirculationDeptResultDTO = new ItemCirculationDeptResultDTO(); itemCirculationDeptResultDTO.setDeptId(sysDeptDTO.getPid()); @@ -1102,7 +1098,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem } - // 关闭和结案处理 + // 关闭和结案处理 } else { log.info("处理项目-查询已吹哨部门"); // 查询已吹哨部门 @@ -1140,10 +1136,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem } //居民端项目关闭、结案-短信通知 if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || - ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()){ + ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { List list = new ArrayList<>(); list.add(entity.getMobile()); - this.projectSmsNotification(dto,list); + this.projectSmsNotification(dto, list); } //工作端 根据不同的处理方式，进行短信通知 this.workProjectHandle(dto); @@ -1357,20 +1353,20 @@ public class ItemServiceImpl extends BaseServiceImpl implem } /** - * @describe: 新版事件上报 - * @author wangtong - * @date 2020/12/16 10:45 - * @params [dto] - * @return com.elink.esua.epdc.gird.shibei.dto.GridDto - */ + * @return com.elink.esua.epdc.gird.shibei.dto.GridDto + * @describe: 新版事件上报 + * @author wangtong + * @date 2020/12/16 10:45 + * @params [dto] + */ private SendEventResultDto reportCaseNew(ItemHandleSubmitFormDTO dto) throws Exception { ItemEntity entity = baseDao.selectById(dto.getId()); // 组装上报信息 - SendEventFormDto sendEventFormDto = packageSendEventEntity(entity,dto); + SendEventFormDto sendEventFormDto = packageSendEventEntity(entity, dto); // 接口请求返回实体，getCode 1失败 0成功（非空） log.info("处理项目-进入上报网格化平台-发送"); SendEventResultDto sendResult = shiBeiCityGridApi.sendEvent(sendEventFormDto); - log.info("处理项目-进入上报网格化平台-结束："+sendResult); + log.info("处理项目-进入上报网格化平台-结束：" + sendResult); // 保存接口调用日志 String successFlag = YesOrNoEnum.NO.value(); if (NumConstant.ZERO_STR.equals(sendResult.getCode())) { @@ -1403,14 +1399,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem interfaceLogService.insert(interfaceLogEntity); } - /** - * @param itemEntity - * @return com.elink.esua.gird.shibei.dto.form.SendInputInfoFormDto - * @Author yinzuomei - * @Description 组装案件信息上报接口入参 - * @Date 2019/12/25 13:14 - **/ - private SendInputInfoFormDto packageReportEntity(ItemEntity itemEntity) throws Exception { + /** + * @param itemEntity + * @return com.elink.esua.gird.shibei.dto.form.SendInputInfoFormDto + * @Author yinzuomei + * @Description 组装案件信息上报接口入参 + * @Date 2019/12/25 13:14 + **/ + private SendInputInfoFormDto packageReportEntity(ItemEntity itemEntity) throws Exception { UserDetail user = SecurityUser.getUser(); SendInputInfoFormDto formDto = new SendInputInfoFormDto(); // 案件来源 @@ -1467,30 +1463,30 @@ public class ItemServiceImpl extends BaseServiceImpl implem } /** - * @describe: 组装时间上报参数 - * @author wangtong - * @date 2020/12/16 10:51 - * @params [itemEntity] - * @return com.elink.esua.epdc.gird.shibei.dto.form.SendInputInfoFormDto - */ - private SendEventFormDto packageSendEventEntity(ItemEntity itemEntity,ItemHandleSubmitFormDTO dto) throws Exception { + * @return com.elink.esua.epdc.gird.shibei.dto.form.SendInputInfoFormDto + * @describe: 组装时间上报参数 + * @author wangtong + * @date 2020/12/16 10:51 + * @params [itemEntity] + */ + private SendEventFormDto packageSendEventEntity(ItemEntity itemEntity, ItemHandleSubmitFormDTO dto) throws Exception { SendEventFormDto sendDto = new SendEventFormDto(); SendInputInfoFormDto formDto = new SendInputInfoFormDto(); //推送类别（事件上报） sendDto.setSENDTYPE(CommonConstants.SEND_TYPE); //上报 - if("1".equals(itemEntity.getIsPeople()) && - ("1".equals(itemEntity.getPeopleFlag()) || "2".equals(itemEntity.getPeopleFlag()))){ + 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); - }else{ + } else { //民生、正常议题转项目来的到街道平台 sendDto.setSENDACTDEFID(CommonConstants.PARTY_SEND_STREET); - if(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()){ + if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) { //结案申请 sendDto.setSJZT(CommonConstants.PARTY_ITEM_ZT_ZERO); - }else { + } else { //吹哨 sendDto.setSJZT(CommonConstants.PARTY_ITEM_ZT_ONE); } @@ -1500,18 +1496,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem sendDto.setUID(UUID.randomUUID().toString().trim().replaceAll("-", "")); //事件领域 Integer lingYu = Integer.valueOf(itemEntity.getFirstCategoryCode()); - if(lingYu < 10){ - sendDto.setSJLYU("0"+itemEntity.getFirstCategoryCode()); - }else{ + if (lingYu < 10) { + sendDto.setSJLYU("0" + itemEntity.getFirstCategoryCode()); + } else { sendDto.setSJLYU(itemEntity.getFirstCategoryCode()); } log.info("处理项目-事件大类"); //事件大类 String secondCate = baseDao.selectSecondCateByItemId(itemEntity.getId()); - if(StringUtils.isNotBlank(secondCate)){ - if(secondCate.length()==3){ - sendDto.setSJDL("0"+secondCate); - }else{ + if (StringUtils.isNotBlank(secondCate)) { + if (secondCate.length() == 3) { + sendDto.setSJDL("0" + secondCate); + } else { sendDto.setSJDL(secondCate); } } @@ -1524,36 +1520,36 @@ public class ItemServiceImpl extends BaseServiceImpl implem //所属区市:只有市北区 sendDto.setSSQS(CommonConstants.CITY_INFO_CODE); //查询网格所对应的社区编码、街道编码 - if(StringUtils.isNotBlank(itemEntity.getPeopleFlag()) && "2".equals(itemEntity.getPeopleFlag())){ + if (StringUtils.isNotBlank(itemEntity.getPeopleFlag()) && "2".equals(itemEntity.getPeopleFlag())) { //执法诉求gridId存的是街道id,需要单独查 - Result streetResult = adminFeignClient.getSysDeptInfo(itemEntity.getGridId()); + Result streetResult = adminFeignClient.getSysDeptInfo(itemEntity.getGridId()); SysDeptDTO deptInfo = streetResult.getData(); - if(deptInfo == null){ + if (deptInfo == null) { throw new RenException("根据街道ID获取对应的街道编码失败" + streetResult.getMsg()); } //所属街道 sendDto.setSSJD(deptInfo.getInfoCode()); //事件描述 - sendDto.setSJMS("测试事件，请勿处理"+getItemLawContent(itemEntity.getId())); - }else{ + sendDto.setSJMS("测试事件，请勿处理" + getItemLawContent(itemEntity.getId())); + } else { Result deptResult = adminFeignClient.getDeptInfoCode(itemEntity.getGridId()); DeptInfoCodeDTO deptInfo = deptResult.getData(); - if(deptInfo == null){ + if (deptInfo == null) { throw new RenException("根据网格ID获取对应的社区编码、街道编码失败" + deptResult.getMsg()); } //所属街道 sendDto.setSSJD(deptInfo.getStreetInfoCode()); //事件描述 - sendDto.setSJMS("测试事件，请勿处理"+itemEntity.getItemContent());// + sendDto.setSJMS("测试事件，请勿处理" + itemEntity.getItemContent());// } //所属社区 sendDto.setSSSQ("");//deptInfo.getCommunityInfoCode() //诉求联系人及联系方式 - Result userResult = userInfoFeignClient.getUserInfoById(itemEntity.getUserId()); + Result userResult = userInfoFeignClient.getUserInfoById(itemEntity.getUserId()); UserDTO itemUser = userResult.getData(); - log.info("处理项目-诉求联系人："+itemUser); - if(itemUser != null){ - sendDto.setSQLXR(itemUser.getRealName()+itemUser.getMobile()); + log.info("处理项目-诉求联系人：" + itemUser); + if (itemUser != null) { + sendDto.setSQLXR(itemUser.getRealName() + itemUser.getMobile()); } //事件地址 sendDto.setSJDZ(itemEntity.getIssueAddress()); @@ -1567,40 +1563,40 @@ public class ItemServiceImpl extends BaseServiceImpl implem //事件处理进度 List handleImagesList = new ArrayList<>(); log.info("处理项目-获取进度开始"); - List handleList = getHandleList(itemEntity.getId(),handleImagesList); + 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);//事件图片+处理流程图片 + List images = getImageFileNew(itemEntity.getEventId() == null ? itemEntity.getId() : itemEntity.getEventId(), handleImagesList);//事件图片+处理流程图片 //时间处理进度图片 sendDto.setIMAGES(images); log.info("处理项目-返回组装数据"); return sendDto; } - private String getItemLawContent(String itemId){ + 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()+"。"; + + ";诉求详情-" + 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() + "。"; return result; } @@ -1612,7 +1608,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem List resultList = new ArrayList<>(); //统计最后一个处理的下标 int i = 1; - for(ItemHandleProgressResultDTO ipr : handleList){ + for (ItemHandleProgressResultDTO ipr : handleList) { //处理事件流程 EventHandleListFormDto handleProcess = new EventHandleListFormDto(); handleProcess.setAdvice(ipr.getAdvice()); @@ -1620,7 +1616,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleProcess.setHandlerDept(ipr.getHandlerDept()); //被吹哨部门 List itemDepts = new ArrayList<>(); - for(ItemDeptDTO id : ipr.getItemDeptDTOS()){ + for (ItemDeptDTO id : ipr.getItemDeptDTOS()) { itemDepts.add(id.getDeptName()); } handleProcess.setItemDeptDTOS(itemDepts); @@ -1668,15 +1664,15 @@ public class ItemServiceImpl extends BaseServiceImpl implem // } if (ipr.getState() == 0) { handleProcess.setState("处理中"); - }else if (ipr.getState() == 5) { + } else if (ipr.getState() == 5) { handleProcess.setState("不予受理"); } else if (ipr.getState() == 10) { handleProcess.setState("已结案"); - } else if ( ipr.getState() == 11) { + } else if (ipr.getState() == 11) { handleProcess.setState("结案申请"); - } else if ( ipr.getState() == 12) { + } else if (ipr.getState() == 12) { handleProcess.setState("响应拟办"); - } else if ( ipr.getState() == 13) { + } else if (ipr.getState() == 13) { handleProcess.setState("直接办理"); } else if (ipr.getState() == 15) { handleProcess.setState("上报网格化平台"); @@ -1698,26 +1694,26 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleProcess.setState("网格化平台-催办"); } else if (ipr.getState() == 60) { handleProcess.setState("网格化平台-结案"); - } else if (ipr.getState() == 65) { + } else if (ipr.getState() == 65) { handleProcess.setState("网格化平台-办理"); - } else if (ipr.getState() == 70) { + } else if (ipr.getState() == 70) { handleProcess.setState("网格化平台-批转"); - } else if (ipr.getState() == 75) { + } else if (ipr.getState() == 75) { handleProcess.setState("网格化平台-退单"); - } else if (ipr.getState() == 80) { + } else if (ipr.getState() == 80) { handleProcess.setState("网格化平台-办结"); } else { handleProcess.setState(ipr.getState().toString()); } log.info("处理项目-handleIf结束"); - if(i == handleList.size()){ + if (i == handleList.size()) { handleProcess.setState("转项目"); } resultList.add(handleProcess); //迁移图片到事件图片中去 log.info("处理项目-迁移图片"); - if(null != ipr.getImages() && ipr.getImages().size() > 0){ - for(String image : ipr.getImages()){ + if (null != ipr.getImages() && ipr.getImages().size() > 0) { + for (String image : ipr.getImages()) { handleImagesList.add(image); } ipr.setImages(null); @@ -1728,20 +1724,20 @@ public class ItemServiceImpl extends BaseServiceImpl implem } /** - * @describe: 重新组装图片 - * @author wangtong - * @date 2020/12/16 15:56 - * @params [] - * @return java.util.List - */ - private List getImageFileNew(String eventId,List handleImagesList){ + * @return java.util.List + * @describe: 重新组装图片 + * @author wangtong + * @date 2020/12/16 15:56 + * @params [] + */ + private List getImageFileNew(String eventId, List handleImagesList) { //查询图片列表 QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(eventId), "REFERENCE_ID", eventId); List imageList = imgDao.selectList(wrapper); - log.info("处理项目-查询图片结束imageList"+imageList); + log.info("处理项目-查询图片结束imageList" + imageList); if (null != imageList && !imageList.isEmpty()) { - for(ImgEntity im : imageList){ + for (ImgEntity im : imageList) { handleImagesList.add(im.getImgUrl()); } List imgUrlList = this.getUploadDTOListNew(handleImagesList); @@ -1988,29 +1984,29 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @Author: zy * @Date: 2020-01-09 */ - private void workProjectHandle(ItemHandleSubmitFormDTO dto){ + private void workProjectHandle(ItemHandleSubmitFormDTO dto) { List deptId = new ArrayList<>(); - if(ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()){ - List deptList = dto.getDeptResultDTOS(); - for (int i =0; i < deptList.size(); i++) { - ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO)deptList.get(i); + if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { + List deptList = dto.getDeptResultDTOS(); + for (int i = 0; i < deptList.size(); i++) { + ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO) deptList.get(i); deptId.add(indexDto.getDeptId()); } - issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,dto.getTypeKey());//吹哨处理 a吹b 向b部门下的，所有人员发送短信 - if (dto.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY)){ //如果是街道做吹哨处理, 做回应处理 + issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId, dto.getTypeKey());//吹哨处理 a吹b 向b部门下的，所有人员发送短信 + if (dto.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY)) { //如果是街道做吹哨处理, 做回应处理 this.superiorDeptSmsHandle(dto); } - } else if(ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || - ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()){ - deptId = baseDao.queryDeptIdList(dto.getId(),dto.getHandlerDeptId()); - if (deptId != null && deptId.size() > 0){ - issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,dto.getTypeKey());//关闭/结案 当前项目的所有部门ID，下的人员发送短信，且不等于当前部门ID + } else if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || + ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { + deptId = baseDao.queryDeptIdList(dto.getId(), dto.getHandlerDeptId()); + if (deptId != null && deptId.size() > 0) { + issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId, dto.getTypeKey());//关闭/结案 当前项目的所有部门ID，下的人员发送短信，且不等于当前部门ID } - } else if(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue() == dto.getHandleCategory()){ - if (!dto.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)){//回应 + } else if (ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue() == dto.getHandleCategory()) { + if (!dto.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {//回应 this.superiorDeptSmsHandle(dto); } - }else if(ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()){ //上报网格化平台 + } else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) { //上报网格化平台 this.superiorDeptSmsHandle(dto); } } @@ -2023,24 +2019,25 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @Author: zy * @Date: 2020-01-14 */ - private void superiorDeptSmsHandle(ItemHandleSubmitFormDTO dto){ + private void superiorDeptSmsHandle(ItemHandleSubmitFormDTO dto) { List deptId = new ArrayList<>(); Long queryDePtId = dto.getHandlerDeptId(); - while (true){ - List createdDeptId = baseDao.queryParentDeptId(dto.getId(),queryDePtId); - if (createdDeptId != null && createdDeptId.size() > 0){ - for(Long ll : createdDeptId){ + while (true) { + List createdDeptId = baseDao.queryParentDeptId(dto.getId(), queryDePtId); + if (createdDeptId != null && createdDeptId.size() > 0) { + for (Long ll : createdDeptId) { deptId.add(ll); queryDePtId = ll; } - }else{ + } else { break; } } if (deptId != null && deptId.size() > 0) { - issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,dto.getTypeKey());//做回应处理，向部门下的所有人员发送短信 + issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId, dto.getTypeKey());//做回应处理，向部门下的所有人员发送短信 } } + /** * @Description: 居民端：项目处理，发送短信 * @Param: [dto] @@ -2049,17 +2046,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @Author: zy * @Date: 2020-01-08 */ - public void projectSmsNotification(ItemHandleSubmitFormDTO dto, List userMobiles){ + public void projectSmsNotification(ItemHandleSubmitFormDTO dto, List userMobiles) { // 审核操作发送短信 SmsNoticeFormDTO sms = new SmsNoticeFormDTO(); sms.setMobiles(userMobiles); if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory()) { // 关闭 sms.setSmsTemplateType(SysSmsTemplateConstant.SMS_TEMPLATE_RESIDENTS_ITEM_CLOSED); - }else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()){ //结案 + } else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { //结案 sms.setSmsTemplateType(SysSmsTemplateConstant.SMS_TEMPLATE_RESIDENTS_ITEM_SETTLE); } issueOverseeResultsTask.sendSmsNotice(sms); } + /** * @param * @return com.elink.esua.epdc.commons.tools.utils.Result> @@ -2072,9 +2070,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem List itemHandleResultDTOList = new ArrayList<>(); Result deptMessage = adminFeignClient.getDeptTypeKey(formDto.getDeptId()); String typeKey = ""; - if( 0 == deptMessage.getCode()){ + if (0 == deptMessage.getCode()) { typeKey = deptMessage.getData().toString(); - }else{ + } else { throw new RenException(deptMessage.getMsg()); } // 获取可操作处理和可流转部门 @@ -2144,26 +2142,25 @@ public class ItemServiceImpl extends BaseServiceImpl implem } /** - * * 组织机构信息处理 * - * @params [dto, eventsList] * @return java.util.List + * @params [dto, eventsList] * @author liuchuang * @since 2020/3/7 1:17 */ private List handleOrganizationInfo(OrganizationModifyDTO dto, List itemList) { List entities = new ArrayList<>(); - for (ItemDTO item: itemList) { + for (ItemDTO item : itemList) { ItemEntity entity = new ItemEntity(); - if("grid_party".equals(dto.getTypeKey())) { + if ("grid_party".equals(dto.getTypeKey())) { entity.setId(item.getId()); entity.setAllDeptIds(dto.getAllDeptIds()); entity.setAllDeptNames(dto.getAllDeptNames()); entity.setParentDeptIds(dto.getParentDeptIds()); entity.setParentDeptNames(dto.getParentDeptNames()); } - if("community_party".equals(dto.getTypeKey())) { + if ("community_party".equals(dto.getTypeKey())) { List allDeptIds = Arrays.asList(item.getAllDeptIds().split(",")); List allDeptNames = Arrays.asList(item.getAllDeptNames().split("-")); int index = allDeptIds.indexOf(dto.getDeptId().toString()); @@ -2235,7 +2232,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public void itemTimeOut() { List entities = baseDao.itemTimeOut(); - for(ItemEntity item : entities){ + for (ItemEntity item : entities) { ItemInformationEntity itemInfoDto = new ItemInformationEntity(); itemInfoDto.setType(ItemInformationConstant.INFORMATION_TYPE_ITEM); itemInfoDto.setBusinessType(2); @@ -2262,39 +2259,22 @@ public class ItemServiceImpl extends BaseServiceImpl implem entity.setFirstCategoryCode("13"); entity.setItemCode("PT" + System.currentTimeMillis());//项目编号 entity.setIsPeople("1");//诉求上报 + if (NumConstant.ZERO_STR.equals(formDto.getPeopleFlag())) { + entity.setSerialNum(getSerialNum("MS")); + } else if (NumConstant.ONE_STR.equals(formDto.getPeopleFlag())) { + entity.setSerialNum(getSerialNum("FZ")); + } baseDao.insert(entity); //插入项目部门关联表 itemDeptService.savePeopleSubmitInfo(entity); + // 保存图片 imgService.saveImages(formDto.getImages(), entity.getId(), ImageConstant.TYPE_IMAGE_BIZ_ITEMS); - // 插入项目处理流程表 - ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity(); - itemHandleProcessEntity.setItemId(entity.getId()); - itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue()); - if("0".equals(formDto.getPeopleFlag())){ - itemHandleProcessEntity.setHandleAdvice("民生诉求上报"); - itemHandleProcessEntity.setOutHandleAdvice("民生诉求上报"); - }else{ - itemHandleProcessEntity.setHandleAdvice("发展诉求上报"); - itemHandleProcessEntity.setOutHandleAdvice("发展诉求上报"); - } - itemHandleProcessEntity.setHandlerDeptId(entity.getGridId()); - itemHandleProcessEntity.setHandlerDept(entity.getGrid()); - itemHandleProcessService.insert(itemHandleProcessEntity); - //发送事件至区中心 - if("1".equals(formDto.getPeopleFlag())){ - ItemHandleSubmitFormDTO dto = new ItemHandleSubmitFormDTO(); - dto.setId(entity.getId()); - dto.setOutHandleAdvice(itemHandleProcessEntity.getOutHandleAdvice()); - dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); - sendItemToDsf(dto,itemHandleProcessEntity); - } return new Result(); } /** - * * @param params * @return */ @@ -2335,17 +2315,16 @@ public class ItemServiceImpl extends BaseServiceImpl implem } /** - * * 分类信息处理 * - * @params [dto, eventsList] * @return java.util.List + * @params [dto, eventsList] * @author liuchuang * @since 2020/3/7 17:00 */ private List handleCategoryInfo(CategoryModifyDTO dto, List itemList) { List entities = new ArrayList<>(); - for (ItemDTO item: itemList) { + for (ItemDTO item : itemList) { if (StringUtils.isNotEmpty(item.getCategoryFullName())) { List categoryFullName = Arrays.asList(item.getCategoryFullName().split("-")); int index = categoryFullName.indexOf(dto.getOldCategoryName()); @@ -2377,7 +2356,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem List dtoList = baseDao.selectListOfItemHandleProgressByWork(id); result.setHandleProgressResultDTOS(dtoList); //获取执法诉求详情 - if(StringUtils.isNotBlank(result.getPeopleFlag()) && "2".equals(result.getPeopleFlag())){ + if (StringUtils.isNotBlank(result.getPeopleFlag()) && "2".equals(result.getPeopleFlag())) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("item_id", result.getId()); wrapper.eq("del_flag", "0"); @@ -2420,37 +2399,37 @@ public class ItemServiceImpl extends BaseServiceImpl implem process.setOutHandleAdvice(formDto.getOutHandleAdvice()); process.setHandlerDept(user.getDeptName()); process.setHandlerDeptId(user.getDeptId()); - if("0".equals(formDto.getCheckFlag())){ + if ("0".equals(formDto.getCheckFlag())) { //同意 process.setState(11);//结案申请 - }else if("1".equals(formDto.getCheckFlag())){ + } else if ("1".equals(formDto.getCheckFlag())) { //不同意，返回网格待处理列表 process.setState(0);//待处理 - }else{ + } else { throw new RenException("审批标识有误"); } itemHandleProcessDao.insert(process); - if("0".equals(formDto.getCheckFlag())){ + if ("0".equals(formDto.getCheckFlag())) { //发送结案申请至街道网格化平台 ItemHandleSubmitFormDTO dto = new ItemHandleSubmitFormDTO(); dto.setId(formDto.getItemId()); dto.setOutHandleAdvice(process.getOutHandleAdvice()); dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); - sendItemToDsf(dto,process); + sendItemToDsf(dto, process); } return new Result(); } /** - * @describe: 上报项目至网格化平台并保存记录 - * @author wangtong - * @date 2022/9/5 14:37 - * @params [dto] - * @return void - */ + * @return void + * @describe: 上报项目至网格化平台并保存记录 + * @author wangtong + * @date 2022/9/5 14:37 + * @params [dto] + */ @Transactional(rollbackFor = Exception.class) - public void sendItemToDsf(ItemHandleSubmitFormDTO dto,ItemHandleProcessEntity process){ + public void sendItemToDsf(ItemHandleSubmitFormDTO dto, ItemHandleProcessEntity process) { boolean reportFlag = this.checkReport(dto.getId()); if (reportFlag) { throw new RenException("当前项目已上报网格化平台"); @@ -2469,4 +2448,33 @@ public class ItemServiceImpl extends BaseServiceImpl implem this.saveItemGridPlatformInfo(sendResult, process); } + /** + * 流水号 + * + * @param + * @return java.lang.String + * @author zhy + * @date 2022/9/5 18:17 + */ + private String getSerialNum(String prefix) { + String serialNum = prefix; + String dateStr = DateUtils.format(new Date(), DateUtils.DATE_TIME_HOUR); + serialNum = serialNum + dateStr; + + String key = RedisKeys.getSerialNumKey(serialNum); + Object obj = redisUtils.get(key); + if (null != obj) { + int number = (int) obj; + number = number + 1; + String numStr = String.format("%03d", number); + redisUtils.set(key, number, RedisUtils.DEFAULT_EXPIRE); + return serialNum + numStr; + } + int number = 1; + String numStr = "001"; + + redisUtils.set(key, number, RedisUtils.DEFAULT_EXPIRE); + return serialNum + numStr; + } + } From 8dde695d2b3247a6fc51781556fd467c127e0b8f Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 5 Sep 2022 19:36:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=AE=A1=E6=89=B9=E7=BB=93=E6=A1=88=E7=94=B3?= =?UTF-8?q?=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/modules/item/controller/ItemController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 593a127eb..42a25cf5e 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -343,6 +343,7 @@ public class ItemController { */ @PostMapping("examineCase") public Result examineCase(@RequestBody ExamineCaseFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); return itemService.examineCase(formDto); } } From e82e3a486bd807d7f243fabf7800f6629dd68773 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 5 Sep 2022 19:36:31 +0800 Subject: [PATCH 3/4] bug --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 2 -- 1 file changed, 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 b81a231d5..0c76d851e 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 @@ -185,8 +185,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Autowired private ItemHandleProcessDao itemHandleProcessDao; - @Autowired - private RedisUtils redisUtils; @Override public PageData page(Map params) { From 54f03d5328a4ae1d8a993ba4bd05a4ab5c8b6a59 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 5 Sep 2022 19:43:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=AE=A1=E6=89=B9=E7=BB=93=E6=A1=88=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 0c76d851e..63725a41a 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 @@ -2395,6 +2395,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemHandleProcessEntity process = new ItemHandleProcessEntity(); process.setItemId(formDto.getItemId()); process.setOutHandleAdvice(formDto.getOutHandleAdvice()); + process.setHandleAdvice(formDto.getOutHandleAdvice()); process.setHandlerDept(user.getDeptName()); process.setHandlerDeptId(user.getDeptId()); if ("0".equals(formDto.getCheckFlag())) {