Skip to content

J
jyzb_platformV2
Commit 8480a83c by 赵剑炜
Options

拒绝消息推送

parent ae7f07f4
正在显示 包含 74 行增加 和 35 行删除
jyzb-biz/src/main/java/com/junmp/jyzb/listener/CounterSignListener.java
......@@ -301,11 +301,11 @@ public class CounterSignListener implements ExecutionListener {
MessageSendReq sendReq = new MessageSendReq();
sendReq.setReceiveUserIds(String.valueOf(userId));
sendReq.setMsgTitle("您有新的待办任务");
sendReq.setBizType(execution.getVariable(ORDER_TYPE).toString());
sendReq.setBizType("assign/"+execution.getVariable(ORDER_TYPE).toString());
sendReq.setBizId(Long.valueOf(execution.getProcessInstanceId()));
String StartUser=execution.getVariable(START_USER_INFO).toString();
UserInfo user= JSONObject.parseObject(StartUser, UserInfo.class);
sendReq.setMsgContent(user.getRealName()+" 提交的"+mainProcess.getName()+"需要您审批，请即时处理");
sendReq.setMsgContent(user.getRealName()+" 提交的【"+mainProcess.getName()+"】需要您审批，请及时处理");
sendReq.setPriority("0");
sendReq.setSendTime(DateTime.now());
messageApi.sendMessage(sendReq);
......
jyzb-biz/src/main/java/com/junmp/jyzb/listener/GlobalEndListener.java
package com.junmp.jyzb.listener;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
......@@ -33,10 +34,12 @@ import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection;
import com.rabbitmq.client.MessageProperties;
import lombok.SneakyThrows;
import org.flowable.bpmn.model.Process;
import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent;
import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType;
import org.flowable.common.engine.impl.event.FlowableEntityEventImpl;
import org.flowable.engine.HistoryService;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.delegate.event.AbstractFlowableEngineEventListener;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.task.service.impl.persistence.entity.TaskEntity;
......@@ -44,8 +47,10 @@ import org.flowable.variable.api.history.HistoricVariableInstance;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.beans.Transient;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
......@@ -53,8 +58,7 @@ import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
import static com.junmp.junmpProcess.common.CommonConstants.ORDER_TYPE;
import static com.junmp.junmpProcess.common.CommonConstants.START_USER_INFO;
import static com.junmp.junmpProcess.common.CommonConstants.*;
@Component
......@@ -85,18 +89,21 @@ import static com.junmp.junmpProcess.common.CommonConstants.START_USER_INFO;
private MessageApi messageApi;
@Resource
private InventoryService inventoryService;
@Resource
private RepositoryService repositoryService;
protected Logger logger = LoggerFactory.getLogger(this.getClass());
@Transactional(rollbackFor = Exception.class)
@SneakyThrows
@Override
protected void processCompleted(FlowableEngineEntityEvent event) {
public void processCompleted(FlowableEngineEntityEvent event) {
if (event.getType() == FlowableEngineEventType.PROCESS_COMPLETED) {
// 获取流程实例ID
String processInstanceId = event.getProcessInstanceId();
Process mainProcess = repositoryService.getBpmnModel(event.getProcessDefinitionId()).getMainProcess();
HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
.processInstanceId(processInstanceId)
.includeProcessVariables()
......@@ -157,25 +164,26 @@ import static com.junmp.junmpProcess.common.CommonConstants.START_USER_INFO;
}
//消息推送
// MessageSendReq sendReq = new MessageSendReq();
// historicProcessInstance.getProcessVariables()
// sendReq.setReceiveUserIds(String.valueOf(userId));
// sendReq.setMsgTitle("您有新的待办任务");
// sendReq.setBizType(execution.getVariable(ORDER_TYPE).toString());
// sendReq.setBizId(Long.valueOf(execution.getProcessInstanceId()));
// String StartUser=execution.getVariable(START_USER_INFO).toString();
// UserInfo user= JSONObject.parseObject(StartUser, UserInfo.class);
// sendReq.setMsgContent(user.getRealName()+" 提交的"+mainProcess.getName()+"需要您审批，请即时处理");
// sendReq.setPriority("0");
// sendReq.setSendTime(DateTime.now());
// messageApi.sendMessage(sendReq);
// messageApi.queryCount(new MessageReq());
// /*推送发送未读数量*/
// MessageReq req1 = new MessageReq();
// req1.setReadFlag(0);
// req1.setReceiveUserId(Long.valueOf(userId));
// Integer count1 = messageApi.queryCount(req1);
// messageApi.pushMsgToUser(userId,count1);
MessageSendReq sendReq = new MessageSendReq();
String startUser= MapUtil.getStr(historicProcessInstance.getProcessVariables(),START_USER_INFO);
UserInfo user= JSONObject.parseObject(startUser, UserInfo.class);
String Types= MapUtil.getStr(historicProcessInstance.getProcessVariables(),ORDER_TYPE);
sendReq.setReceiveUserIds(String.valueOf(user.getUserId()));
sendReq.setMsgTitle("您的审批已通过");
sendReq.setBizType("pass/"+Types);
sendReq.setMsgContent("您提交的审批【"+mainProcess.getName()+"】已经通过");
sendReq.setPriority("0");
sendReq.setSendTime(DateTime.now());
messageApi.sendMessage(sendReq);
messageApi.queryCount(new MessageReq());
/*推送发送未读数量*/
MessageReq req1 = new MessageReq();
req1.setReadFlag(0);
req1.setReceiveUserId(user.getUserId());
Integer count1 = messageApi.queryCount(req1);
messageApi.pushMsgToUser(startUser,count1);
}
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
......@@ -848,18 +848,10 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
}else if (req.getReassignmentType().equals(itemValue1) && itemValue1.equals("reassign")){
//将其组织机构号设为空
policeman.setOrgId(null);
//人脸信息删除
policeman.setFaceInfo(null);
//将角色关联表进行删除
//角色账号信息也进行删除
sysUserOrgService.remove(new LambdaQueryWrapper<SysUserOrg>().eq(SysUserOrg::getUserId,policeman.getUserId()));
//修改警员的个人信息(删除指纹信息)
List<PoliceFinger> fingerList = policeFingerService.list(new LambdaQueryWrapper<PoliceFinger>()
.eq(PoliceFinger::getPoliceId, policeman.getId()));
if (fingerList.size()!=0){
policeFingerService.removeBatchByIds(fingerList);
}
//箱门进行解绑删除
cabinetBoxPoliceService.remove(new LambdaQueryWrapper<CabinetBoxPolice>()
.eq(CabinetBoxPolice::getPoliceId,policeman.getId()));
......@@ -908,6 +900,8 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
policeEquipmentService.updateBatchById(updateList);
policeEquipmentService.removeBatchByIds(removeList);
if (searchItem.size()>0)
{
//修改库存数量
List<InventorySummary> inventorySummaryList = inventorySummaryMapper.selectSumByItems(searchItem);
List<InventorySummary> updateSummaryList=new ArrayList<>();
......@@ -925,7 +919,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
if (updateSummaryList.size()>0){
inventorySummaryService.updateBatchById(updateSummaryList);
}
}
}
//记录日志(如果警员携带装备,则进行记录 )
if (ObjectUtil.isNotNull(reqEquipments)){
......
jyzb-process/pom.xml
......@@ -252,6 +252,12 @@
<groupId>com.junmp.v2</groupId>
<artifactId>system-biz-user</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>message-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java
......@@ -2,6 +2,7 @@ package com.junmp.junmpProcess.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.PageUtil;
......@@ -32,6 +33,9 @@ import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.db.api.factory.PageResultFactory;
import com.junmp.v2.db.api.page.PageResult;
import com.junmp.v2.message.api.MessageApi;
import com.junmp.v2.message.api.bean.req.MessageReq;
import com.junmp.v2.message.api.bean.req.MessageSendReq;
import com.junmp.v2.sys.user.entity.SysUser;
import com.junmp.v2.sys.user.service.SysUserService;
import lombok.extern.slf4j.Slf4j;
......@@ -40,6 +44,7 @@ import org.apache.commons.lang3.StringUtils;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.bpmn.model.EndEvent;
import org.flowable.bpmn.model.FlowElement;
import org.flowable.bpmn.model.Process;
import org.flowable.bpmn.model.UserTask;
import org.flowable.common.engine.impl.identity.Authentication;
import org.flowable.engine.TaskService;
......@@ -78,7 +83,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
private SysUserService sysUserService;
@Resource
private OrgUserMapper orgUserMapper;
@Resource
private MessageApi messageApi;
@Autowired
private ProcessTemplateService processTemplateService;
@Autowired
......@@ -206,8 +212,33 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
if (StringUtils.isNotBlank(handleDataDTO.getSignInfo())) {
taskService.addComment(task.getId(), task.getProcessInstanceId(), "sign", handleDataDTO.getSignInfo());
}
//消息推送
MessageSendReq sendReq = new MessageSendReq();
Process mainProcess = repositoryService.getBpmnModel(task.getProcessDefinitionId()).getMainProcess();
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().includeProcessVariables().processInstanceId(task.getProcessInstanceId()).singleResult();
String startUser= MapUtil.getStr(processInstance.getProcessVariables(),START_USER_INFO);
UserInfo user= JSONObject.parseObject(startUser, UserInfo.class);
String Types= MapUtil.getStr(processInstance.getProcessVariables(),ORDER_TYPE);
sendReq.setReceiveUserIds(String.valueOf(user.getUserId()));
sendReq.setMsgTitle("您的审批被驳回");
sendReq.setBizType("refuse/"+Types);
sendReq.setMsgContent("您提交的审批【"+mainProcess.getName()+"】被驳回");
sendReq.setPriority("0");
sendReq.setSendTime(DateTime.now());
messageApi.sendMessage(sendReq);
messageApi.queryCount(new MessageReq());
/*推送发送未读数量*/
MessageReq req1 = new MessageReq();
req1.setReadFlag(0);
req1.setReceiveUserId(user.getUserId());
Integer count1 = messageApi.queryCount(req1);
messageApi.pushMsgToUser(startUser,count1);
runtimeService.deleteProcessInstance(task.getProcessInstanceId(), "拒绝");
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,ReturnMsg.PASS);
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论