diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index c2d7338..78021cf 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -68,6 +68,7 @@ casic-service-bms + diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index c2d7338..78021cf 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -68,6 +68,7 @@ casic-service-bms + diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java index 5564b36..08d54a6 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.cwscase.service.impl; import com.baomidou.mybatisplus.mapper.SqlRunner; +import com.baomidou.mybatisplus.toolkit.IdWorker; import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.modular.cwscase.dto.CasePushDTO; import com.casic.missiles.modular.cwscase.model.CwsCase; import com.casic.missiles.modular.cwscase.model.ProcessDetail; import com.casic.missiles.modular.cwscase.model.Status; @@ -281,4 +283,5 @@ public void cancelCaseState(String bizId) { cwsCaseService.cancelCaseState(bizId); } + } diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index c2d7338..78021cf 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -68,6 +68,7 @@ casic-service-bms + diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java index 5564b36..08d54a6 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.cwscase.service.impl; import com.baomidou.mybatisplus.mapper.SqlRunner; +import com.baomidou.mybatisplus.toolkit.IdWorker; import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.modular.cwscase.dto.CasePushDTO; import com.casic.missiles.modular.cwscase.model.CwsCase; import com.casic.missiles.modular.cwscase.model.ProcessDetail; import com.casic.missiles.modular.cwscase.model.Status; @@ -281,4 +283,5 @@ public void cancelCaseState(String bizId) { cwsCaseService.cancelCaseState(bizId); } + } diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java index 0a45adc..71c38ca 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java @@ -91,7 +91,7 @@ //如果指定到人则进行人员案卷推送信息 List users = new ArrayList<>(); users.add(new Long(dto.getTaskUserId())); - pushService.pushMsgByUsers(users, messageBody); + pushService.pushMsgByUsers(users, messageBody, PushMessageType.NORMAL); } } } @@ -102,7 +102,7 @@ * @param cwsCase * @return */ - private MessageBody covertMessageBody(CwsCase cwsCase) { + public MessageBody covertMessageBody(CwsCase cwsCase) { CasePushDTO pushDTO = new CasePushDTO(); pushDTO.setId(String.valueOf(cwsCase.getId())); diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index c2d7338..78021cf 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -68,6 +68,7 @@ casic-service-bms + diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java index 5564b36..08d54a6 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.cwscase.service.impl; import com.baomidou.mybatisplus.mapper.SqlRunner; +import com.baomidou.mybatisplus.toolkit.IdWorker; import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.modular.cwscase.dto.CasePushDTO; import com.casic.missiles.modular.cwscase.model.CwsCase; import com.casic.missiles.modular.cwscase.model.ProcessDetail; import com.casic.missiles.modular.cwscase.model.Status; @@ -281,4 +283,5 @@ public void cancelCaseState(String bizId) { cwsCaseService.cancelCaseState(bizId); } + } diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java index 0a45adc..71c38ca 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/handler/BizCaseFlowHandler.java @@ -91,7 +91,7 @@ //如果指定到人则进行人员案卷推送信息 List users = new ArrayList<>(); users.add(new Long(dto.getTaskUserId())); - pushService.pushMsgByUsers(users, messageBody); + pushService.pushMsgByUsers(users, messageBody, PushMessageType.NORMAL); } } } @@ -102,7 +102,7 @@ * @param cwsCase * @return */ - private MessageBody covertMessageBody(CwsCase cwsCase) { + public MessageBody covertMessageBody(CwsCase cwsCase) { CasePushDTO pushDTO = new CasePushDTO(); pushDTO.setId(String.valueOf(cwsCase.getId())); diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/CaseFlowServiceImpl.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/CaseFlowServiceImpl.java index 1504ede..3821e34 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/CaseFlowServiceImpl.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/service/impl/CaseFlowServiceImpl.java @@ -3,11 +3,16 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.SqlRunner; +import com.baomidou.mybatisplus.toolkit.IdWorker; +import com.casic.missiles.core.MessageBody; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.exception.BizExceptionEnum; import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.core.enums.PushMessageType; import com.casic.missiles.core.exception.GunsException; +import com.casic.missiles.core.service.ICommonPushService; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.cwscase.dto.CasePushDTO; import com.casic.missiles.modular.cwscase.model.CwsCase; import com.casic.missiles.modular.dictexpand.model.DictExpand; import com.casic.missiles.modular.flowable.dto.FlowUserDto; @@ -32,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.List; @@ -62,10 +68,12 @@ */ @Value("${casic.case.defaultLimitTime:120}") private Integer defaultLimitTime; - + @Value("${casic.push.title}") + private String title; @Autowired private ProcessEngine processEngine; - + @Autowired(required = false) + private ICommonPushService pushService; /** * 启动案卷流程 * @@ -100,7 +108,15 @@ calendar.add(Calendar.MINUTE, limitTime); Timestamp time = new Timestamp(calendar.getTimeInMillis()); SqlRunner.db().update("UPDATE DCM_CWS_STATUS SET NODE_LIMITTIME = '{0}' WHERE ID = {1} ", new Object[]{time, dto.getBizId()}); - + if (caseState == 0 && pushService != null){ + //如果指定到人则进行人员案卷推送信息 + List users = new ArrayList<>(); + //派发核实推送消息 + CwsCase cwsCase = cwsSuportService.selectCaseById(dto.getBizId()); + MessageBody messageBody = this.covertMessageBody(cwsCase); + users.add(new Long(dto.getTaskUserId())); + pushService.pushMsgByUsers(users, messageBody, PushMessageType.NORMAL); + } return processId; } @@ -184,5 +200,22 @@ BizFlowUtil.moveSingleActivityId(processId, task.getId(), currEntity.getActivityId(), preActivityId, dto.getDeptId(), dto.getRoleTip(), dto.getUserId()); } + /** + * 转换案卷类型为推送消息 + * + * @param cwsCase + * @return + */ + public MessageBody covertMessageBody(CwsCase cwsCase) { + CasePushDTO pushDTO = new CasePushDTO(); + pushDTO.setId(String.valueOf(cwsCase.getId())); + MessageBody body = new MessageBody(); + body.setData(pushDTO); + body.setId(IdWorker.getId()); + body.setTitle(String.format(title, cwsCase.getCaseid())); + body.setContent(cwsCase.getDescription()); + body.setType(PushMessageType.NORMAL.getType()); + return body; + } }