From 5e7eb54d4f6e763f9d89f18f0639c5accb683a3f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 27 Oct 2022 15:19:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8F=91=E8=AF=84=E4=BB=B7=E6=8E=A8?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 41 ++++++++++++++++--- 1 file changed, 36 insertions(+), 5 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 f3da70209..211fb5b35 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 @@ -59,6 +59,7 @@ import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO; import com.elink.esua.epdc.dto.item.*; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; +import com.elink.esua.epdc.dto.note.result.DeptRankResultDTO; import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO; import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO; import com.elink.esua.epdc.dto.result.KpiItemTimeLimitByDeptResultDTO; @@ -86,10 +87,7 @@ import com.elink.esua.epdc.modules.events.dao.ImgDao; import com.elink.esua.epdc.modules.events.entity.ImgEntity; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; import com.elink.esua.epdc.modules.events.service.ImgService; -import com.elink.esua.epdc.modules.feign.AdminFeignClient; -import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; -import com.elink.esua.epdc.modules.feign.OssFeignClient; -import com.elink.esua.epdc.modules.feign.UserFeignClient; +import com.elink.esua.epdc.modules.feign.*; import com.elink.esua.epdc.modules.interfacelog.entity.InterfaceLogEntity; import com.elink.esua.epdc.modules.interfacelog.service.InterfaceLogService; import com.elink.esua.epdc.modules.issue.service.IssueService; @@ -110,6 +108,7 @@ import org.apache.logging.log4j.Logger; import org.joda.time.DateTime; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestParam; @@ -224,6 +223,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem private ItemCommentFeedbackDao itemCommentFeedbackDao; @Autowired private ItemAutoProcessRedis itemAutoProcessRedis; + @Autowired + private MessageFeignClient messageFeignClient; @Override public PageData page(Map params) { @@ -3828,6 +3829,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem } } //原状态0代表结案，现在代表下发评价 + ItemEntity item = new ItemEntity(); if ("0".equals(formDto.getState())) { //1.handle表字段赋值 itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_XFPJ.getValue()); @@ -3837,7 +3839,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessDto.setGridUnitid(formDto.getGridUnitid()); itemHandleProcessDto.setGridTaskcnname("下发评价"); //2.更新主表数据允许评价 - ItemEntity item = baseDao.selectById(itemPlat.getReferenceId()); + item = baseDao.selectById(itemPlat.getReferenceId()); if (null == item) { return new Result().error("未查到相关项目信息"); } @@ -3911,9 +3913,38 @@ public class ItemServiceImpl extends BaseServiceImpl implem message = message + ":" + formDto; this.saveInterfaceLog(itemPlat.getReferenceId(), InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(), ApiConstants.acceptItemProcess, successFlag, message, returnMsgBody); + //如果是网格化区中心调用的下发评价，则给项目评价人推送可以评价的短信 + if ("0".equals(formDto.getState())) { + List districtMobiles = new ArrayList<>(); + Map> districtContentNote = new HashMap<>(); + LinkedHashMap noteParams = new LinkedHashMap<>(); + districtMobiles.add(item.getMobile()); + /*noteParams.put("deptName","市北区部门"); + noteParams.put("month","2022-09"); + districtContentNote.put(item.getMobile(),noteParams);*/ + sendShortMessage(districtMobiles, districtContentNote); + } return new Result().ok("操作成功"); } + /** + * 区中心下发评价时推送短信提醒用户评价 + * @param mobiles + * @param contentNoteList + */ + @Async + public void sendShortMessage(List mobiles, Map> contentNoteList) { + SmsNoticeFormDTO smsNoticeFormDTO = new SmsNoticeFormDTO(); + smsNoticeFormDTO.setMobiles(mobiles); + /*smsNoticeFormDTO.setNoteContent(contentNoteList); + smsNoticeFormDTO.setSmsTemplateType("GOVERN_RANK_LIST"); + messageFeignClient.sendSmsNotice(smsNoticeFormDTO);*/ + + smsNoticeFormDTO.setMobiles(mobiles); + smsNoticeFormDTO.setSmsTemplateType(SysSmsTemplateConstant.SMS_TEMPLATE_RESIDENTS_ITEM_SETTLE); + //issueOverseeResultsTask.sendSmsNotice(smsNoticeFormDTO); + } + /** * 原有网格化平台调用的结案驳回方法逻辑，暂时保留不做修改，复制新的方法调整代码 */