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/EamInspectionOrderServiceImpl.java | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 169 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index 568f263..c7cc465 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -12,8 +12,12 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.flowable.engine.HistoryService;
import org.flowable.engine.TaskService;
+import org.flowable.engine.impl.el.DateUtil;
import org.flowable.task.api.Task;
+import org.flowable.task.api.history.HistoricTaskInstance;
+import org.flowable.variable.api.persistence.entity.VariableInstance;
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
@@ -34,16 +38,22 @@
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.vo.EquipmentInspectionStatistics;
-import org.jeecg.modules.eam.vo.EquipmentRepairStatistics;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.impl.FlowMyBusinessServiceImpl;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
+import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
+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.IMdcUserProductionService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.service.IThirdAppService;
+import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -89,6 +99,12 @@
private IEamEquipmentExtendService eamEquipmentExtendService;
@Autowired
private IMdcProductionService mdcProductionService;
+ @Autowired
+ private ThirdAppWechatEnterpriseServiceImpl wechatEnterpriseService;
+ @Autowired
+ private ISysUserService sysUserService;
+ @Autowired
+ private HistoryService historyService;
@Override
public IPage<EamInspectionOrder> queryPageList(Page<EamInspectionOrder> page, EamInspectionOrderQuery query) {
@@ -210,7 +226,154 @@
//鏇存柊璁惧淇濆吇鐘舵��
eamEquipmentExtendService.updateEquipmentInspectionStatus(eamInspectionOrder.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_INSPECTION.name());
}
+ //鎺ㄩ�佷紒涓氬井淇℃秷鎭�
+ sendQywxTemplateCardMessage(eamInspectionOrder, null);
return true;
+ }
+
+ private void sendQywxTemplateCardMessage(EamInspectionOrder eamInspectionOrder, EamInspectionOrderRequest request) {
+ TemplateCard templateCard = new TemplateCard();
+ String inspectionStatus = eamInspectionOrder.getInspectionStatus();
+ EamEquipment equipment = eamEquipmentService.getById(eamInspectionOrder.getEquipmentId());
+ eamInspectionOrder.setEquipmentCode(equipment.getEquipmentCode());
+ if (InspectionStatus.WAIT_INSPECTION.name().equals(inspectionStatus)) {
+ //宸ュ崟寰呴鍙栵紝鎺ㄩ�佹秷鎭粰鎵�鏈夋搷浣滃伐
+ String orgId = Optional.ofNullable(eamEquipmentService.getById(eamInspectionOrder.getEquipmentId()))
+ .map(EamEquipment::getOrgId)
+ .orElse(null);
+ if (orgId == null) {
+ throw new IllegalArgumentException("鏈壘鍒拌澶囩殑缁勭粐 ID");
+ }
+ //鏌ヨ璇ヨ澶囨墍灞炰骇绾跨殑鎵�鏈夋搷浣滃伐
+ List<SysUser> sysUserList = mdcUserProductionService.queryByPostAndProId("PCR0001", orgId);
+ List<String> usernameList = sysUserList.stream().map(SysUser::getUsername).collect(Collectors.toList());
+ if (usernameList.isEmpty()) {
+ throw new IllegalArgumentException("鏈壘鍒拌璁惧鎵�灞炰骇绾跨殑鎿嶄綔宸ワ紝璇疯仈绯荤鐞嗗憳澶勭悊");
+ }
+ String nextAssigneeStr = usernameList.stream()
+ .filter(Objects::nonNull) // 鍙�夛細杩囨护 null 鍊�
+ .collect(Collectors.joining(","));
+ String touser = wechatEnterpriseService.getTouser(nextAssigneeStr, false);
+ templateCard.setTouser(touser);
+ }
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(inspectionStatus)) {
+ //宸ュ崟宸插紑濮嬬偣妫�锛屾帹閫佹秷鎭粰鍏蜂綋鎿嶄綔宸ワ紙鏂板宸ュ崟鏃舵寚瀹氥�侀鍙栧伐鍗曠殑鎿嶄綔宸ワ級
+ String operator = eamInspectionOrder.getOperator();
+ if (StrUtil.isNotBlank(operator)) {
+ //鏂板宸ュ崟鏃躲�佸伐鍗曢鍙栨椂宸叉寚瀹氱偣妫�浜�
+ String touser = wechatEnterpriseService.getTouser(operator, false);
+ templateCard.setTouser(touser);
+ }
+ }
+ if (InspectionStatus.WAIT_CONFIRM.name().equals(inspectionStatus)) {
+ //宸ュ崟宸茬偣妫�瀹屾垚锛屾帹閫佹秷鎭粰鐝粍闀跨‘璁�
+ 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);
+ }
+ if (InspectionStatus.COMPLETE.name().equals(inspectionStatus)) {
+ //宸ュ崟宸茬‘璁ゅ畬鎴愶紝鎺ㄩ�佹秷鎭粰鐐规浜�
+ String touser = wechatEnterpriseService.getTouser(eamInspectionOrder.getOperator(), false);
+ templateCard.setTouser(touser);
+ }
+
+ TemplateCardEntity templateCardEntity = new TemplateCardEntity();
+ templateCard.setTemplate_card(templateCardEntity);
+ templateCardEntity.setTask_id(eamInspectionOrder.getId());
+ TemplateCardEntity.MainTitle mainTitle = new TemplateCardEntity.MainTitle();
+ mainTitle.setTitle("璁惧鐐规");
+ templateCardEntity.setMain_title(mainTitle);
+
+ if (InspectionStatus.WAIT_INSPECTION.name().equals(inspectionStatus)) {
+ templateCardEntity.setSub_title_text("鏂板璁惧鐐规宸ュ崟: " + eamInspectionOrder.getOrderNum() + " ,璇疯繘鍏ョ郴缁熼鍙�");
+ }
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(inspectionStatus)) {
+ if (Objects.nonNull(request) && StrUtil.isNotBlank(request.getConfirmDealType())) {
+ //鏄┏鍥炵殑鍗曞瓙
+ templateCardEntity.setSub_title_text("宸ュ崟: " + eamInspectionOrder.getOrderNum() + " 琚┏鍥烇紝璇烽噸鏂拌繘琛岃澶囩偣妫�");
+ } else {
+ templateCardEntity.setSub_title_text("宸ュ崟: " + eamInspectionOrder.getOrderNum() + " 宸茶棰嗗彇锛屽紑濮嬭繘琛岃澶囩偣妫�");
+ }
+ }
+ if (InspectionStatus.WAIT_CONFIRM.name().equals(inspectionStatus)) {
+ templateCardEntity.setSub_title_text("宸ュ崟: " + eamInspectionOrder.getOrderNum() + " 宸插畬鎴愯澶囩偣妫�,璇疯繘鍏ョ郴缁熺‘璁�");
+ }
+ if (InspectionStatus.COMPLETE.name().equals(inspectionStatus)) {
+ templateCardEntity.setSub_title_text("宸ュ崟: " + eamInspectionOrder.getOrderNum() + " 宸插畬鎴愮偣妫�鍚庣‘璁�");
+ }
+
+ List<TemplateCardEntity.HorizontalContent> horizontalContentList = CollectionUtil.newArrayList();
+ TemplateCardEntity.HorizontalContent content1 = new TemplateCardEntity.HorizontalContent();
+ content1.setKeyname("宸ュ崟鍙�");
+ content1.setValue(eamInspectionOrder.getOrderNum());
+ horizontalContentList.add(content1);
+ TemplateCardEntity.HorizontalContent content2 = new TemplateCardEntity.HorizontalContent();
+ content2.setKeyname("璁惧缂栧彿");
+ content2.setValue(eamInspectionOrder.getEquipmentCode());
+ horizontalContentList.add(content2);
+
+ //濡傛灉宸ュ崟鐘舵�佷负寰呯偣妫�锛堟病鎸囧畾鐐规浜虹殑鏈鍙栫姸鎬侊級锛屾祦绋嬫槸娌℃湁鍚姩鐨勶紝鏃犳硶鑾峰彇鑺傜偣淇℃伅
+ if (!InspectionStatus.WAIT_INSPECTION.name().equals(inspectionStatus)) {
+ WorkTaskDataVo previousFlowInfo = flowTaskService.getPreviousFlowInfo(eamInspectionOrder.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 (InspectionStatus.COMPLETE.name().equals(inspectionStatus)) {
+ content4.setValue("宸插畬鎴�");
+ } else {
+ content4.setValue(previousFlowInfo.getName());
+ }
+ horizontalContentList.add(content4);
+ }
+
+ TemplateCardEntity.HorizontalContent content5 = new TemplateCardEntity.HorizontalContent();
+ TemplateCardEntity.HorizontalContent content6 = new TemplateCardEntity.HorizontalContent();
+ TemplateCardEntity.HorizontalContent content7 = new TemplateCardEntity.HorizontalContent();
+
+ if (InspectionStatus.WAIT_INSPECTION.name().equals(inspectionStatus)) {
+ content5.setKeyname("鍙戣捣浜�");
+ SysUser sysUser = sysUserService.getUserByName(eamInspectionOrder.getCreateBy());
+ content5.setValue(sysUser.getRealname());
+ horizontalContentList.add(content5);
+ }
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(inspectionStatus) && (Objects.isNull(request) || StrUtil.isBlank(request.getConfirmDealType()))) {
+ content6.setKeyname("棰嗗彇浜�");
+ SysUser sysUser = sysUserService.getUserByName(eamInspectionOrder.getOperator());
+ content6.setValue(sysUser.getRealname());
+ horizontalContentList.add(content6);
+ }
+ if (InspectionStatus.WAIT_CONFIRM.name().equals(inspectionStatus)) {
+ content5.setKeyname("鐐规浜�");
+ SysUser sysUser = sysUserService.getUserByName(eamInspectionOrder.getOperator());
+ content5.setValue(sysUser.getRealname());
+ horizontalContentList.add(content5);
+ }
+ if ((InspectionStatus.COMPLETE.name().equals(inspectionStatus) || InspectionStatus.UNDER_INSPECTION.name().equals(inspectionStatus)) && (Objects.nonNull(request) && StrUtil.isNotBlank(request.getConfirmDealType()))) {
+ content5.setKeyname("纭浜�");
+ SysUser sysUser = sysUserService.getUserByName(eamInspectionOrder.getCreateBy());
+ content5.setValue(sysUser.getRealname());
+ horizontalContentList.add(content5);
+ }
+ if ((InspectionStatus.COMPLETE.name().equals(inspectionStatus) || InspectionStatus.UNDER_INSPECTION.name().equals(inspectionStatus)) && (Objects.nonNull(request) && StrUtil.isNotBlank(request.getConfirmDealType()))) {
+ content7.setKeyname("纭鎰忚");
+ content7.setValue("1".equals(request.getConfirmDealType()) ? "閫氳繃" : "椹冲洖");
+ horizontalContentList.add(content7);
+ }
+
+ 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);
}
/**
@@ -296,6 +459,8 @@
this.updateById(eamInspectionOrder);
//鏇存柊璁惧淇濆吇鐘舵��
eamEquipmentExtendService.updateEquipmentInspectionStatus(eamInspectionOrder.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_INSPECTION.name());
+ //鎺ㄩ�佷紒涓氬井淇℃秷鎭�
+ sendQywxTemplateCardMessage(eamInspectionOrder, null);
return true;
}
}
@@ -374,6 +539,9 @@
// 鏇存柊宸ュ崟淇℃伅
updateEamInspectionOrder(eamInspectionOrder);
+ //寰俊娑堟伅鎺ㄩ��
+ sendQywxTemplateCardMessage(eamInspectionOrder, eamInspectionOrderRequest);
+
//鏌ヨ鏁版嵁,杩涜璁惧缁翠慨澶勭悊
if (eamInspectionOrder.getInspectionStatus().equals(InspectionStatus.WAIT_CONFIRM.name())) {
updateEamInspectionOrderDetail(eamInspectionOrder);
--
Gitblit v1.9.3