diff --git a/ruoyi-api/ruoyi-api-job/src/main/java/org/dromara/job/api/model/DmsJobEntity.java b/ruoyi-api/ruoyi-api-job/src/main/java/org/dromara/job/api/model/DmsJobEntity.java index cf5c1cd..8affc25 100644 --- a/ruoyi-api/ruoyi-api-job/src/main/java/org/dromara/job/api/model/DmsJobEntity.java +++ b/ruoyi-api/ruoyi-api-job/src/main/java/org/dromara/job/api/model/DmsJobEntity.java @@ -54,5 +54,8 @@ public class DmsJobEntity implements Serializable { private LocalDateTime createDt; private LocalDateTime updateDt; + //DUBBO穿不了token,手动传参 + private String tenantId; + private String userId; } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsInspectStanceExecutor.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsInspectStanceExecutor.java index feb0e06..38bc986 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsInspectStanceExecutor.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsInspectStanceExecutor.java @@ -33,8 +33,11 @@ public class DmsInspectStanceExecutor { // 将 JSON 字符串转为 Map Map paramMap = objectMapper.readValue(jsonStr, Map.class); String planCode = (String) paramMap.get("planInspectCode"); + String tenantId = (String) paramMap.get("tenant"); + String user = (String) paramMap.get("userId"); + Long userId = Long.parseLong(user); - R instance = remoteInspectInstanceService.insertInspectInstance(planCode); + R instance = remoteInspectInstanceService.insertInspectInstance(planCode, tenantId, userId); return ExecuteResult.success(instance); } catch (Exception e) { return ExecuteResult.failure(e.getMessage()); diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsLubeStanceExecutor.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsLubeStanceExecutor.java index 54a8975..dd0bff4 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsLubeStanceExecutor.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsLubeStanceExecutor.java @@ -33,8 +33,11 @@ public class DmsLubeStanceExecutor { // 将 JSON 字符串转为 Map Map paramMap = objectMapper.readValue(jsonStr, Map.class); String planCode = (String) paramMap.get("planLubeCode"); + String tenantId = (String) paramMap.get("tenant"); + String user = (String) paramMap.get("userId"); + Long userId = Long.parseLong(user); - R instance = dmsBillsLubeInstanceService.insertLubeInstance(planCode); + R instance = dmsBillsLubeInstanceService.insertLubeInstance(planCode, tenantId, userId); return ExecuteResult.success(instance); } catch (Exception e) { return ExecuteResult.failure(e.getMessage()); diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsMaintStanceExecutor.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsMaintStanceExecutor.java index 95f53ee..d7c8c8b 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsMaintStanceExecutor.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsMaintStanceExecutor.java @@ -8,6 +8,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.common.core.domain.R; import org.dromara.dms.api.RemoteMaintInstanceService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import java.util.Map; @@ -17,6 +19,7 @@ import java.util.Map; public class DmsMaintStanceExecutor { private static final ObjectMapper objectMapper = new ObjectMapper(); + private static final Logger log = LoggerFactory.getLogger(DmsMaintStanceExecutor.class); @DubboReference private final RemoteMaintInstanceService dmsBillsMaintInstanceService; @@ -32,11 +35,27 @@ public class DmsMaintStanceExecutor { // 将 JSON 字符串转为 Map Map paramMap = objectMapper.readValue(jsonStr, Map.class); String planCode = (String) paramMap.get("planMaintCode"); - - R instance = dmsBillsMaintInstanceService.insertDmsBillsMaintInstance(planCode); - return ExecuteResult.success(instance); + String tenantId = (String) paramMap.get("tenantId"); + String user = (String) paramMap.get("userId"); + Long userId = Long.parseLong(user); + + log.info("开始执行设备保养实例生成任务,计划编码:{},租户ID:{},用户ID:{}", planCode, tenantId, userId); + + R instance = dmsBillsMaintInstanceService.insertDmsBillsMaintInstance(planCode, tenantId, userId); + + // 检查业务调用结果 + if (instance.getCode() == 200) { + log.info("设备保养实例生成成功,计划编码:{},结果:{}", planCode, instance.getData()); + return ExecuteResult.success("设备保养实例生成成功,影响行数:" + instance.getData()); + } else { + String errorMsg = "设备保养实例生成失败,计划编码:" + planCode + ",错误信息:" + instance.getMsg(); + log.error(errorMsg); + return ExecuteResult.failure(errorMsg); + } } catch (Exception e) { - return ExecuteResult.failure(e.getMessage()); + String errorMsg = "设备保养实例生成异常:" + e.getMessage(); + log.error(errorMsg, e); + return ExecuteResult.failure(errorMsg); } }