lipenghui há 2 meses atrás
pai
commit
7495a28110

+ 9 - 2
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/failure/IotFailureReportServiceImpl.java

@@ -19,6 +19,7 @@ import cn.iocoder.yudao.module.pms.dal.mysql.IotDeviceMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.failure.IotFailureReportMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.maintain.IotMaintainMapper;
 import cn.iocoder.yudao.module.pms.enums.common.FailureAuditStatusEnum;
+import cn.iocoder.yudao.module.pms.message.PmsMessage;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.api.dingtalk.DingtalkSendApi;
@@ -74,6 +75,8 @@ public class IotFailureReportServiceImpl implements IotFailureReportService {
     private DeptApi deptApi;
     @Autowired
     private RoleApi roleApi;
+    @Autowired
+    private PmsMessage pmsMessage;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -100,8 +103,12 @@ public class IotFailureReportServiceImpl implements IotFailureReportService {
             templateParams.put("name", iotMaintainDO.getDeviceName());
             templateParams.put("businessType", PmsConstants.GENERATE_MAINTAIN);
             templateParams.put("businessId", iotMaintainDO.getId());
-            notifyMessageSendApi.sendSingleMessageToAdmin(new NotifySendSingleToUserReqDTO()
-                    .setUserId(failureReportDO.getAssigneeUserId()).setTemplateCode(PmsConstants.GENERATE_MAINTAIN_TEMPLATE).setTemplateParams(templateParams));
+            AdminUserRespDTO user = adminUserApi.getUser(Objects.isNull(failureReportDO.getAssigneeUserId()) ? Long.valueOf(failureReportDO.getCreator()) : failureReportDO.getAssigneeUserId());
+//            notifyMessageSendApi.sendSingleMessageToAdmin(new NotifySendSingleToUserReqDTO()
+//                    .setUserId(failureReportDO.getAssigneeUserId()).setTemplateCode(PmsConstants.GENERATE_MAINTAIN).setTemplateParams(templateParams));
+            if (Objects.nonNull(user)) {
+                pmsMessage.sendMessage(iotMaintainDO.getId(), iotMaintainDO.getDeviceName(), PmsConstants.GENERATE_MAINTAIN, failureReportDO.getAssigneeUserId(), user.getMobile());
+            }
         } else if (bpmResult ==3 ) {
             //更新故障上报状态及审核状态
             IotFailureReportDO failureReportDO = iotFailureReportMapper.selectById(id);