From de6b52db851876c313853c1ffbdf7646cbdb54f0 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 1 Mar 2023 11:43:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/message/MessageFeign.java | 2 +- .../biz/message/MessageService.java | 102 +++++++++++------- 2 files changed, 66 insertions(+), 38 deletions(-) diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeign.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeign.java index 6c04004..0b08aaa 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeign.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeign.java @@ -84,7 +84,7 @@ public interface MessageFeign { @PostMapping("/sendAppVersionMessage") ResultBean sendAppVersionMessage(@RequestBody AppVersionMessageDto dto); - @ApiOperation("订单推送消息") + @ApiOperation("简易订单解锁提醒") @PostMapping("/sendOrderMessage") ResultBean sendOrderMessage(@RequestBody OrderMesageDto dto); diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java index c016846..e631691 100644 --- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java +++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java @@ -10,6 +10,7 @@ import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign; import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.JPushServer; import com.yxt.common.base.utils.PagerUtil; @@ -212,6 +213,11 @@ public class MessageService extends MybatisBaseService { } } + /** + * 流程审批推送消息 + * @param dto + * @return + */ public ResultBean getMessage(MessageFlowableDto dto) { ResultBean rb = ResultBean.fireFail(); String msgTitle = dto.getMsgTitle(); @@ -262,6 +268,11 @@ public class MessageService extends MybatisBaseService { messageList.setRDelStatus(0); messageList.setSDelStatus(0); messageList.setReceiverSid(list.get(finalI)); + //根据接收人sid查询接收人名称 + ResultBean sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(list.get(finalI)); + if(sysUserInfoVoResultBean.getData() != null){ + messageList.setReceiverName(sysUserInfoVoResultBean.getData().getStaffName()); + } if (orgPathList.size() > 0) { messageList.setReceiverDeptSid(orgPathList.get(finalI)); } @@ -281,18 +292,10 @@ public class MessageService extends MybatisBaseService { Properties properties = factoryBean.getObject(); if ("pro".equals(properties.get("spring.profiles.active"))) { for (int i = 0; i < receiveIdList.size(); i++) { - /** - * msgTitle:排产申请 - * content:xxx的排产申请 - */ JPushServer.sendPushAlias(msgTitle, msgContent, msgTypeSid, "审批中心", receiveIdList.get(i)); } } else { for (int i = 0; i < receiveIdList.size(); i++) { - /** - * msgTitle:排产申请 - * content:xxx的排产申请 - */ JPushServer.sendPushAlias(msgTitle, msgContent, msgTypeSid, "审批中心", "T" + receiveIdList.get(i)); } } @@ -300,6 +303,11 @@ public class MessageService extends MybatisBaseService { return rb.success().setData(msgSid); } + /** + * 抄送消息 + * @param dto + * @return + */ public ResultBean getMessageRead(MessageFlowableDto dto) { ResultBean rb = ResultBean.fireFail(); String msgTitle = dto.getMsgTitle(); @@ -353,6 +361,11 @@ public class MessageService extends MybatisBaseService { messageList.setRDelStatus(0); messageList.setSDelStatus(0); messageList.setReceiverSid(list.get(finalI)); + //根据接收人sid查询接收人名称 + ResultBean sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(list.get(finalI)); + if(sysUserInfoVoResultBean.getData() != null){ + messageList.setReceiverName(sysUserInfoVoResultBean.getData().getStaffName()); + } if (orgPathList.size() > 0) { messageList.setReceiverDeptSid(orgPathList.get(finalI)); } @@ -373,18 +386,23 @@ public class MessageService extends MybatisBaseService { if ("pro".equals(properties.get("spring.profiles.active"))) { for (int i = 0; i < receiveIdList.size(); i++) { //正式 - JPushServer.sendPushAliass(msgTitle, msgContent, msgTypeSid, "阅读", receiveIdList.get(i)); + JPushServer.sendPushAliass(msgTitle, msgContent, msgTypeSid, "抄送", receiveIdList.get(i)); } } else { for (int i = 0; i < receiveIdList.size(); i++) { //测试或者本地 - JPushServer.sendPushAliass(msgTitle, msgContent, msgTypeSid, "阅读", "T" + receiveIdList.get(i)); + JPushServer.sendPushAliass(msgTitle, msgContent, msgTypeSid, "抄送", "T" + receiveIdList.get(i)); } } return rb.success().setData(msgSid); } + /** + * 流程审批组装消息信息 + * @param query + * @return + */ public ResultBean pushMessage(MessageFlowableQuery query) { ResultBean rb = ResultBean.fireFail(); MessageFlowVo ufVo = query.getUfVo(); @@ -397,8 +415,6 @@ public class MessageService extends MybatisBaseService { String applicationName = query.getApplicationName(); ResultBean> resultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_(); -// String nextNodeOrgPathSids = resultBean.getData().get(0).getId_(); -// List receiveOrgPathList = Arrays.asList(nextNodeOrgPathSids.split(",")); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); //根据用户的sid查询用户的id ResultBean stringList1 = sysUserFeign.selectIdBySid(receiveSidList); @@ -428,7 +444,6 @@ public class MessageService extends MybatisBaseService { messageFlowableDto.setJson(messageJsonDto); messageFlowableDto.setList(receiveSidList); messageFlowableDto.setReceiveIdList(reveiveIdList); -// messageFlowableDto.setOrgPathList(receiveOrgPathList); messageFlowableDto.setModuleName(moduleName); messageFlowableDto.setMsgContent(msgContent); messageFlowableDto.setMsgTitle(msgTitle); @@ -439,7 +454,11 @@ public class MessageService extends MybatisBaseService { return rb.success().setMsg(msgSid); } - + /** + * 抄送组装消息信息 + * @param query + * @return + */ public ResultBean pushMessageForCC(MessageFlowableQueryForCC query) { ResultBean rb = ResultBean.fireFail(); MessageFlowVo ufVo = query.getUfVo(); @@ -460,6 +479,7 @@ public class MessageService extends MybatisBaseService { BeanUtil.copyProperties(ufVo, messageJsonDto); //查询流程审批的页面操作地址组装json的参数 //根据taskDef和移动端标识 + /**-----------------移动端相关参数开始----------------*/ ResultBean selectUrlByKey = sysProUrlFeign.selectUrlByKey(procDefId, ufVo.getTaskDefKey(), "1", "2"); SysProUrlVo sysProUrlVo = selectUrlByKey.getData(); messageFlowableDto.setBusinessSid(query.getBusinessSid()); @@ -469,6 +489,7 @@ public class MessageService extends MybatisBaseService { } else { messageFlowableDto.setModuleAction(sysProUrlVo.getUrl()); } + /**-----------------移动端相关参数结束----------------*/ //PC取前端页面 ResultBean selectUrlByPCKey = sysProUrlFeign.selectUrlByKey(procDefId, ufVo.getTaskDefKey(), "2", "1"); SysProUrlVo sysProUrlPCVo = selectUrlByPCKey.getData(); @@ -557,6 +578,11 @@ public class MessageService extends MybatisBaseService { messageList.setRDelStatus(0); messageList.setSDelStatus(0); messageList.setReceiverSid(sid); + //根据接收人sid查询接收人名称 + ResultBean sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(sid); + if(sysUserInfoVoResultBean.getData() != null){ + messageList.setReceiverName(sysUserInfoVoResultBean.getData().getStaffName()); + } messageListService.save(messageList); // Thread.sleep(5 * 1000); System.out.println("run end-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName()); @@ -573,24 +599,13 @@ public class MessageService extends MybatisBaseService { Properties properties = factoryBean.getObject(); if ("pro".equals(properties.get("spring.profiles.active"))) { for (int i = 0; i < reveiveIdList.size(); i++) { - /** - * msgTitle:排产申请 - * content:xxx的排产申请 - */ JPushServer.sendPushAlias(msgTitle, msgContent, msgTypeSid, "供应链", reveiveIdList.get(i)); } } else { for (int i = 0; i < reveiveIdList.size(); i++) { - /** - * msgTitle:排产申请 - * content:xxx的排产申请 - */ JPushServer.sendPushAlias(msgTitle, msgContent, msgTypeSid, "供应链", "T" + reveiveIdList.get(i)); } } - // 3、推送 -// JPushServer.sendPushAll(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgTypeSid, messageDto.getMsgType()); -// JPushServer.sendPushAlias(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgSid, messageDto.getMsgType(), "23","26","66"); // 别名 System.out.println("process end"); return rb.success().setMsg(msgSid); } @@ -644,8 +659,12 @@ public class MessageService extends MybatisBaseService { messageList.setRDelStatus(0); messageList.setSDelStatus(0); messageList.setReceiverSid(sid); + //根据接收人sid查询接收人名称 + ResultBean sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(sid); + if(sysUserInfoVoResultBean.getData() != null){ + messageList.setReceiverName(sysUserInfoVoResultBean.getData().getStaffName()); + } messageListService.save(messageList); -// Thread.sleep(5 * 1000); System.out.println("run end-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName()); } catch (Exception e) { e.printStackTrace(); @@ -660,28 +679,22 @@ public class MessageService extends MybatisBaseService { Properties properties = factoryBean.getObject(); if ("pro".equals(properties.get("spring.profiles.active"))) { for (int i = 0; i < reveiveIdList.size(); i++) { - /** - * msgTitle:排产申请 - * content:xxx的排产申请 - */ JPushServer.sendPushAlias(msgTitle, msgContent, msgTypeSid, "业务", reveiveIdList.get(i)); } } else { for (int i = 0; i < reveiveIdList.size(); i++) { - /** - * msgTitle:排产申请 - * content:xxx的排产申请 - */ JPushServer.sendPushAlias(msgTitle, msgContent, msgTypeSid, "业务", "T" + reveiveIdList.get(i)); } } - // 3、推送 -// JPushServer.sendPushAll(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgTypeSid, messageDto.getMsgType()); -// JPushServer.sendPushAlias(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgSid, messageDto.getMsgType(), "23","26","66"); // 别名 System.out.println("process end"); return rb.success().setMsg(msgSid); } + /** + * 移动端框架发布推送消息 + * @param dto + * @return + */ public ResultBean sendAppVersionMessage(AppVersionMessageDto dto) { ResultBean rb = ResultBean.fireFail(); // 1、保存消息体 @@ -724,6 +737,11 @@ public class MessageService extends MybatisBaseService { messageList.setRDelStatus(0); messageList.setSDelStatus(0); messageList.setReceiverSid(receverSid); + //根据接收人sid查询接收人名称 + ResultBean sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(receverSid); + if(sysUserInfoVoResultBean.getData() != null){ + messageList.setReceiverName(sysUserInfoVoResultBean.getData().getStaffName()); + } messageListService.save(messageList); System.out.println("run end-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName()); } catch (Exception e) { @@ -780,6 +798,11 @@ public class MessageService extends MybatisBaseService { return rb.success(); } + /** + * 简易订单解锁提醒 + * @param dto + * @return + */ public ResultBean sendOrderMessage(OrderMesageDto dto) { ResultBean rb = ResultBean.fireFail(); //保存消息体 @@ -827,6 +850,11 @@ public class MessageService extends MybatisBaseService { messageList.setRDelStatus(0); messageList.setSDelStatus(0); messageList.setReceiverSid(createBySidList.get(finalI)); + //根据接收人sid查询接收人名称 + ResultBean sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(createBySidList.get(finalI)); + if(sysUserInfoVoResultBean.getData() != null){ + messageList.setReceiverName(sysUserInfoVoResultBean.getData().getStaffName()); + } messageListService.saveOrUpdateDto(messageList); System.out.println("run end-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName()); } catch (Exception e) {