消息通知，流程表达式，巡检路线查询

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageServiceImpl.java

@@ -90,7 +90,15 @@ public class BpmMessageServiceImpl implements BpmMessageService {
             templateParams.put("processcode", reqDTO.getProcessInstanceId());
             notifyMessageSendApi.sendSingleMessageToAdmin(new NotifySendSingleToUserReqDTO()
                     .setUserId(reqDTO.getAssigneeUserId()).setTemplateCode(templateCode).setTemplateParams(templateParams));
-            msg = "【PMS】故障上报流程 - 有新的故障上报需要审核"+"，请前往 http://1.94.244.160:70/ 进行处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
+            msg = "【PMS】故障上报流程 - 有新的故障上报需要审核"+"，请前往 https://iot.deepoil.cc 进行处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
+        } else if ("委外维修工单流程".equals(reqDTO.getProcessInstanceName())){
+            String templateCode = "maintain-out";
+            templateParams.put("businessType", "maintainOut");
+            templateParams.put("businessId", reqDTO.getProcessInstanceId());
+            templateParams.put("processcode", reqDTO.getProcessInstanceId());
+            notifyMessageSendApi.sendSingleMessageToAdmin(new NotifySendSingleToUserReqDTO()
+                    .setUserId(reqDTO.getAssigneeUserId()).setTemplateCode(templateCode).setTemplateParams(templateParams));
+            msg = "【系统消息】有新的委外维修流程"+"，请前往 https://iot.deepoil.cc 进行处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
         }
         dingtalkSendApi.send(user.getMobile(), msg);
     }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/constant/PmsConstants.java

@@ -9,4 +9,8 @@ public interface PmsConstants {
     String GENERATE_INSPECT_TEMPLATE = "genrate-inspect";
     String GENERATE_OPERATE = "generateOperate";
     String GENERATE_OPERATE_TEMPLATE = "generate-operate";
+
+    String MAINTAIN_OUT = "maintainOut";
+    String MAINTAIN_OUT_TEMPLATE = "maintain-out";
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/maintain/IotMaintainServiceImpl.java

@@ -172,10 +172,10 @@ public class IotMaintainServiceImpl implements IotMaintainService {
 
         //本地库存减少且记录出库
         localStockAndOut(createReqVO);
-        if ("in".equals(createReqVO.getMaintain().getType())) {
-            String msg = "【PMS】维修工单 - "+createReqVO.getMaintain().getFailureName()+"已处理。"+"["+new Date()+"]";
-            sendMessage(BeanUtils.toBean(iotMaintain, IotMaintainDO.class), "maintain-report", msg);
-        }
+//        if ("in".equals(createReqVO.getMaintain().getType())) {
+//            String msg = "【PMS】维修工单 - "+createReqVO.getMaintain().getFailureName()+"已处理。"+"["+new Date()+"]";
+//            sendMessage(BeanUtils.toBean(iotMaintain, IotMaintainDO.class), "maintain-report", msg);
+//        }
         //如果委外发起流程
         if ("out".equals(createReqVO.getMaintain().getType())){
             String processInstanceId = processInstanceApi.createProcessInstance(SecurityFrameworkUtils.getLoginUserId(),
@@ -183,7 +183,7 @@ public class IotMaintainServiceImpl implements IotMaintainService {
             // 将流程实例id 更新到维修工单主数据表
             iotMaintainMapper.updateById(new IotMaintainDO().setId(iotMaintain.getId()).setProcessInstanceId(processInstanceId).setAuditStatus(FailureAuditStatusEnum.PROCESS.getStatus()));
             String msg = "【PMS】有新的委外维修流程， 请前往系统审批";
-            sendMessage(BeanUtils.toBean(iotMaintain, IotMaintainDO.class), "maintain-out", msg);
+//            sendMessage(BeanUtils.toBean(iotMaintain, IotMaintainDO.class), "maintain-out", msg);
         }
         //异步写入故障知识库
         CompletableFuture.runAsync(()->{