From c0948102eda828d4eae62d18392adaca56e345e0 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期三, 09 七月 2025 09:19:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 165 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
index af99fcd..bb05add 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
@@ -36,10 +36,15 @@
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
+import org.jeecg.modules.flowable.domain.vo.WorkTaskDataVo;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
+import org.jeecg.modules.qywx.message.vo.TemplateCard;
+import org.jeecg.modules.qywx.message.vo.TemplateCardEntity;
+import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -86,6 +91,8 @@
private IEamEquipmentExtendService eamEquipmentExtendService;
@Autowired
private IMdcProductionService mdcProductionService;
+ @Autowired
+ private ThirdAppWechatEnterpriseServiceImpl wechatEnterpriseService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -141,6 +148,8 @@
eamWeekMaintenanceOrderMapper.updateById(order);
//鏇存柊璁惧淇濆吇鐘舵��
eamEquipmentExtendService.updateEquipmentMaintenanceStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
+ //鎺ㄩ�佷紒涓氬井淇℃秷鎭�
+ sendQywxTemplateCardMessage(order, null);
return result.isSuccess();
}
}
@@ -331,9 +340,161 @@
if (result != null) {
//鏇存柊璁惧淇濆吇鐘舵��
eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
+ //鎺ㄩ�佷紒涓氬井淇℃秷鎭�
+ sendQywxTemplateCardMessage(entity, null);
return result.isSuccess();
}
return true;
+ }
+
+ private void sendQywxTemplateCardMessage(EamWeekMaintenanceOrder order, EamWeekMaintenanceRequest request) {
+ TemplateCard templateCard = new TemplateCard();
+ EamEquipment equipment = eamEquipmentService.getById(order.getEquipmentId());
+ order.setEquipmentCode(equipment.getEquipmentCode());
+ String maintenanceStatus = order.getMaintenanceStatus();
+ if (WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name().equals(maintenanceStatus)) {
+ //宸ュ崟淇濆吇涓紝鎺ㄩ�佹秷鎭粰淇濆吇浜猴紙鏂板宸ュ崟鏃舵寚瀹氥�佷繚鍏讳汉棰嗗彇锛�
+ String operator = order.getOperator();
+ String touser = wechatEnterpriseService.getTouser(operator, false);
+ templateCard.setTouser(touser);
+ }
+ if (WeekMaintenanceStatusEnum.WAIT_CONFIRM.name().equals(maintenanceStatus)
+ || WeekMaintenanceStatusEnum.WAIT_INITIAL_ACCEPTANCE.name().equals(maintenanceStatus)
+ || WeekMaintenanceStatusEnum.WAIT_FINAL_ACCEPTANCE.name().equals(maintenanceStatus)) {
+ //宸ュ崟宸蹭繚鍏诲畬鎴愬緟纭锛屾帹閫佹秷鎭粰鐝粍闀�
+ //鐝粍闀垮凡纭锛屾帹閫佹秷鎭粰璁惧绠＄悊鍛樼‘璁�
+ //璁惧绠＄悊鍛樺凡纭锛屾帹閫佺粰璁捐兘閮ㄧ鐞嗗憳纭
+ List<String> nextAssignee = (List<String>) request.getValues().get("NextAssignee");
+ String nextAssigneeStr = nextAssignee.stream()
+ .filter(Objects::nonNull) // 鍙�夛細杩囨护 null 鍊�
+ .collect(Collectors.joining(","));
+ String touser = wechatEnterpriseService.getTouser(nextAssigneeStr, false);
+ templateCard.setTouser(touser);
+ }
+
+ TemplateCardEntity templateCardEntity = new TemplateCardEntity();
+ templateCard.setTemplate_card(templateCardEntity);
+ templateCardEntity.setTask_id(order.getId());
+ TemplateCardEntity.MainTitle mainTitle = new TemplateCardEntity.MainTitle();
+ mainTitle.setTitle("璁惧鍛ㄤ繚");
+ templateCardEntity.setMain_title(mainTitle);
+
+ if (WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name().equals(maintenanceStatus)) {
+ if (Objects.nonNull(request) && StrUtil.isNotBlank(request.getConfirmDealType())) {
+ templateCardEntity.setSub_title_text("宸ュ崟: " + order.getOrderNum() + " 琚┏鍥烇紝璇烽噸鏂版墽琛屼繚鍏诲悗鎻愪氦");
+ } else {
+ templateCardEntity.setSub_title_text("宸查鍙栧懆淇濆伐鍗�: " + order.getOrderNum() + "锛屽紑濮嬭繘琛屼繚鍏�");
+ }
+ }
+ if (WeekMaintenanceStatusEnum.WAIT_CONFIRM.name().equals(maintenanceStatus)) {
+ templateCardEntity.setSub_title_text("宸ュ崟: " + order.getOrderNum() + " 宸蹭繚鍏诲畬鎴愶紝璇疯繘鍏ョ郴缁熺‘璁�");
+ }
+ if (WeekMaintenanceStatusEnum.WAIT_INITIAL_ACCEPTANCE.name().equals(maintenanceStatus)) {
+ templateCardEntity.setSub_title_text("宸ュ崟: " + order.getOrderNum() + " 宸蹭繚鍏诲畬鎴愶紝璇疯繘鍏ョ郴缁熻繘琛屽垵楠屾敹");
+ }
+ if (WeekMaintenanceStatusEnum.WAIT_FINAL_ACCEPTANCE.name().equals(maintenanceStatus)) {
+ templateCardEntity.setSub_title_text("宸ュ崟: " + order.getOrderNum() + " 宸插畬鎴愬垵楠屾敹锛岃杩涘叆绯荤粺杩涜缁堥獙鏀�");
+ }
+
+ List<TemplateCardEntity.HorizontalContent> horizontalContentList = CollectionUtil.newArrayList();
+ TemplateCardEntity.HorizontalContent content1 = new TemplateCardEntity.HorizontalContent();
+ content1.setKeyname("宸ュ崟鍙�");
+ content1.setValue(order.getOrderNum());
+ horizontalContentList.add(content1);
+ TemplateCardEntity.HorizontalContent content2 = new TemplateCardEntity.HorizontalContent();
+ content2.setKeyname("璁惧缂栧彿");
+ content2.setValue(order.getEquipmentCode());
+ horizontalContentList.add(content2);
+
+ //濡傛灉宸ュ崟鐘舵�佷负寰呬繚鍏伙紙娌℃寚瀹氫繚鍏讳汉鐨勬湭棰嗗彇鐘舵�侊級锛屾祦绋嬫槸娌℃湁鍚姩鐨勶紝鏃犳硶鑾峰彇鑺傜偣淇℃伅
+ if (!WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(maintenanceStatus)) {
+ WorkTaskDataVo previousFlowInfo = flowTaskService.getPreviousFlowInfo(order.getId());
+ TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
+ content3.setKeyname("鍓嶉┍鑺傜偣");
+ content3.setValue(previousFlowInfo.getPreNode());
+ horizontalContentList.add(content3);
+ TemplateCardEntity.HorizontalContent content4 = new TemplateCardEntity.HorizontalContent();
+ content4.setKeyname("褰撳墠鑺傜偣");
+ if (WeekMaintenanceStatusEnum.COMPLETE.name().equals(maintenanceStatus)) {
+ content4.setValue("宸插畬鎴�");
+ } else {
+ content4.setValue(previousFlowInfo.getName());
+ }
+ horizontalContentList.add(content4);
+ }
+
+ if (WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name().equals(maintenanceStatus)) {
+ if (Objects.isNull(request)) {
+ //鏂板鐨勫伐鍗曪紙鎸囧畾浜嗕繚鍏讳汉锛夈�佹柊棰嗗彇鐨勫伐鍗�
+ TemplateCardEntity.HorizontalContent content = new TemplateCardEntity.HorizontalContent();
+ content.setKeyname("鍙戣捣浜�");
+ SysUser sysUser = sysUserService.getUserByName(order.getCreateBy());
+ content.setValue(sysUser.getRealname());
+ horizontalContentList.add(content);
+ } else {
+ //琚┏鍥炵殑宸ュ崟
+ TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
+ TemplateCardEntity.HorizontalContent content4 = new TemplateCardEntity.HorizontalContent();
+ String confirmAssign = request.getAssignee();
+ SysUser confirmUser = sysUserService.getUserByName(confirmAssign);
+ content3.setKeyname("纭浜�");
+ content3.setValue(confirmUser.getRealname());
+ horizontalContentList.add(content3);
+ content4.setKeyname("纭鎰忚");
+ content4.setValue("椹冲洖");
+ horizontalContentList.add(content4);
+ }
+ }
+ if (WeekMaintenanceStatusEnum.WAIT_CONFIRM.name().equals(maintenanceStatus)) {
+ TemplateCardEntity.HorizontalContent content = new TemplateCardEntity.HorizontalContent();
+ content.setKeyname("淇濆吇浜�");
+ SysUser sysUser = sysUserService.getUserByName(order.getOperator());
+ content.setValue(sysUser.getRealname());
+ horizontalContentList.add(content);
+ //TemplateCardEntity.HorizontalContent content = new TemplateCardEntity.HorizontalContent();
+ //List<String> nextAssignee = (List<String>) request.getValues().get("NextAssignee");
+ //String realNameStr = sysUserService.getRealNameStrByUserNameList(nextAssignee);
+ //content.setKeyname("纭浜�");
+ //content.setValue(realNameStr);
+ //horizontalContentList.add(content);
+ }
+ if (WeekMaintenanceStatusEnum.WAIT_INITIAL_ACCEPTANCE.name().equals(maintenanceStatus)) {
+ TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
+ //TemplateCardEntity.HorizontalContent content4 = new TemplateCardEntity.HorizontalContent();
+ String confirmAssignee = request.getAssignee();
+ SysUser confirmUser = sysUserService.getUserByName(confirmAssignee);
+ content3.setKeyname("纭浜�");
+ content3.setValue(confirmUser.getRealname());
+ horizontalContentList.add(content3);
+ //List<String> nextAssignee = (List<String>) request.getValues().get("NextAssignee");
+ //String realNameStr = sysUserService.getRealNameStrByUserNameList(nextAssignee);
+ //content4.setKeyname("鍒濋獙浜�");
+ //content4.setValue(realNameStr);
+ //horizontalContentList.add(content4);
+ }
+ if (WeekMaintenanceStatusEnum.WAIT_FINAL_ACCEPTANCE.name().equals(maintenanceStatus)) {
+ TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
+ //TemplateCardEntity.HorizontalContent content4 = new TemplateCardEntity.HorizontalContent();
+ String initialAssignee = request.getAssignee();
+ SysUser initialUser = sysUserService.getUserByName(initialAssignee);
+ content3.setKeyname("鍒濋獙浜�");
+ content3.setValue(initialUser.getRealname());
+ horizontalContentList.add(content3);
+ //List<String> nextAssignee = (List<String>) request.getValues().get("NextAssignee");
+ //String realNameStr = sysUserService.getRealNameStrByUserNameList(nextAssignee);
+ //content4.setKeyname("缁堥獙浜�");
+ //content4.setValue(realNameStr);
+ //horizontalContentList.add(content4);
+ }
+
+ templateCardEntity.setHorizontal_content_list(horizontalContentList);
+
+ TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
+ cardAction.setType(1);
+ cardAction.setUrl("http://houjie.xalxzn.com:8866/h5");
+ templateCardEntity.setCard_action(cardAction);
+
+ wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
}
@Override
@@ -506,6 +667,10 @@
}
//淇濆瓨宸ュ崟
eamWeekMaintenanceOrderMapper.updateById(entity);
+ //鎺ㄩ�佷紒涓氬井淇℃秷鎭紝宸ュ崟瀹岀粨涓嶅彂閫�
+ if (!WeekMaintenanceStatusEnum.COMPLETE.name().equals(entity.getMaintenanceStatus())) {
+ sendQywxTemplateCardMessage(entity, request);
+ }
return entity;
}
--
Gitblit v1.9.3