diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectProjectDevice.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectProjectDevice.java index e99eac5..a590274 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectProjectDevice.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectProjectDevice.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; +import java.io.Serializable; /** * 点巡检项目关联设备信息对象 dms_inspect_project_device @@ -14,9 +15,9 @@ import java.io.Serial; * @date 2025-03-24 */ @Data -@EqualsAndHashCode(callSuper = true) +@EqualsAndHashCode() @TableName("dms_inspect_project_device") -public class DmsInspectProjectDevice extends TenantEntity { +public class DmsInspectProjectDevice implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -37,4 +38,9 @@ public class DmsInspectProjectDevice extends TenantEntity { private Long targetId; + /** + * 租户编号 + */ + private String tenantId; + } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanInspect.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanInspect.java index 87a0377..6b56d41 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanInspect.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanInspect.java @@ -1,6 +1,8 @@ package org.dromara.dms.domain; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -26,6 +28,7 @@ public class DmsPlanInspect extends TenantEntity { /** * 主键标识 */ + @TableId(value = "plan_inspect_id", type = IdType.AUTO) private Long planInspectId; /** diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteInspectInstanceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteInspectInstanceServiceImpl.java index 61cd8fa..5b0607a 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteInspectInstanceServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteInspectInstanceServiceImpl.java @@ -39,8 +39,6 @@ public class RemoteInspectInstanceServiceImpl implements RemoteInspectInstanceSe @Override @Transactional( rollbackFor = Exception.class ) public R insertInspectInstance(String planInspectCode, String tenantId, Long userId){ - - // 使用 replaceAll 方法将双引号替换为空字符串 String result = planInspectCode.replaceAll("\"", ""); @@ -55,12 +53,8 @@ public class RemoteInspectInstanceServiceImpl implements RemoteInspectInstanceSe dmsPlanInspect.setTimeLimitHours(hours / (60 * 60l)); } - DmsBillsInspectInstance dmsBillsInspectInstance = new DmsBillsInspectInstance(); - - // DmsRepairInstance dmsRepairInstance = dmsRepairInstanceService.selectDmsRepairInstanceByRepairInstanceId(2l); - dmsBillsInspectInstance.setPlanInspectId(dmsPlanInspect.getPlanInspectId()); // dmsBillsInspectInstance.setWfProcessId(105l); dmsBillsInspectInstance.setInspectType(dmsPlanInspect.getInspectType());//检查类型(1巡检 2点检) @@ -70,7 +64,6 @@ public class RemoteInspectInstanceServiceImpl implements RemoteInspectInstanceSe // dmsBillsInspectInstance.setDeviceAmount(dmsPlanInspect.getDeviceAmount());//设备数量 // dmsBillsInspectInstance.setPerformer(dmsPlanInspect.getPerformer());//执行人 - //写死105，也可根据传入对象的wfprocessid作为传参。 /* Long aLong = dmsRepairInstanceMapper.selectWfProcessActivityId(105l); @@ -83,7 +76,6 @@ public class RemoteInspectInstanceServiceImpl implements RemoteInspectInstanceSe // dmsBillsInspectInstance.setIsFlag("1"); dmsBillsInspectInstance.setInspectStatus(DmsConstants.DMS_BILLS_INSPECT_INSTANCE_INSPECT_STATUS_TO_INSPECT);//待巡检 - dmsBillsInspectInstance.setCreateBy(userId); // dmsBillsInspectInstance.setCreateTime(new Date()); dmsBillsInspectInstance.setTenantId(tenantId); @@ -108,7 +100,6 @@ public class RemoteInspectInstanceServiceImpl implements RemoteInspectInstanceSe MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsInspectRouteDetail.class) .eq(DmsInspectRouteDetail::getInspectRouteId, dmsBillsInspectInstance.getInspectRouteId()); List dmsInspectRouteDetails = dmsInspectRouteDetailMapper.selectList(lqw); - for(DmsInspectRouteDetail dmsInspectRouteDetail:dmsInspectRouteDetails){ DmsInspectInstanceDetail dmsInspectInstanceDetail = new DmsInspectInstanceDetail(); Long deviceId = dmsInspectRouteDetail.getMachineId(); @@ -117,7 +108,7 @@ public class RemoteInspectInstanceServiceImpl implements RemoteInspectInstanceSe dmsInspectInstanceDetail.setMachineId(deviceId); dmsInspectInstanceDetail.setInstanceDetailStatus("1");//（1待巡检 2巡检中 3已完成） dmsInspectInstanceDetail.setInspectStandard(dmsInspectRouteDetail.getInspectStandard()); - dmsInspectInstanceDetail.setInspectStatus("0");//TODO:为什么设置为异常？ + dmsInspectInstanceDetail.setInspectStatus("0");//FIXME:为什么设置为异常？设备状态（1正常 0异常） // dmsInspectInstanceDetailMapper.insertDmsInspectInstanceDetail(dmsInspectInstanceDetail); @@ -125,16 +116,13 @@ public class RemoteInspectInstanceServiceImpl implements RemoteInspectInstanceSe dmsInspectInstanceDetail.setCreateBy(userId); // dmsInspectInstanceDetail.setCreateTime(new Date()); dmsInspectInstanceDetailMapper.insert(dmsInspectInstanceDetail); - Long projectId = dmsInspectInstanceDetailMapper.selectProjectId(dmsInspectRouteDetail.getInspectStandard()); - DmsInspectProjectDevice queryInspectProjectDevice = new DmsInspectProjectDevice(); - queryInspectProjectDevice.setTargetType("2"); - queryInspectProjectDevice.setTargetId(deviceId); - - +// DmsInspectProjectDevice queryInspectProjectDevice = new DmsInspectProjectDevice(); +// queryInspectProjectDevice.setTargetType("2");//FIXME:关联类型(1设备类型) +// queryInspectProjectDevice.setTargetId(deviceId); MPJLambdaWrapper DmsInspectProjectDeviceLQW = JoinWrappers.lambda(DmsInspectProjectDevice.class) - .eq(DmsInspectProjectDevice::getTargetType, "2")//关联类型(1设备类型) + .eq(DmsInspectProjectDevice::getTargetType, "2")//FIXME:关联类型(1设备类型) .eq(DmsInspectProjectDevice::getTargetId, deviceId); List dmsInspectProjectDevices = dmsInspectProjectDeviceMapper.selectList(DmsInspectProjectDeviceLQW); @@ -148,7 +136,6 @@ public class RemoteInspectInstanceServiceImpl implements RemoteInspectInstanceSe dmsInspectInstanceDetailProject.setTenantId(tenantId); dmsInspectInstanceDetailProject.setCreateBy(userId); // dmsInspectInstanceDetailProject.setCreateTime(new Date()); - dmsInspectInstanceDetailProjectMapper.insert(dmsInspectInstanceDetailProject); // } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteMaintInstanceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteMaintInstanceServiceImpl.java index 2d25377..3f78042 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteMaintInstanceServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteMaintInstanceServiceImpl.java @@ -70,8 +70,8 @@ public class RemoteMaintInstanceServiceImpl implements RemoteMaintInstanceServic dmsBillsMaintInstance.setPlanEndTime(new Date(lubeTime.getTime() + timeLimit * 1000l)); //字段没有自动填充，只能代码手动填充 - dmsBillsMaintInstance.setCreateBy(userId);//暂时默认系统用户 - dmsBillsMaintInstance.setTenantId(tenantId);//暂时默认系统用户 + dmsBillsMaintInstance.setCreateBy(userId); + dmsBillsMaintInstance.setTenantId(tenantId); int i = dmsBillsMaintInstanceMapper.insert(dmsBillsMaintInstance); @@ -79,17 +79,13 @@ public class RemoteMaintInstanceServiceImpl implements RemoteMaintInstanceServic // dmsMaintInstanceActivity.setMaintInstanceId(dmsBillsMaintInstance.getMaintInstanceId()); // dmsMaintInstanceActivity.setProcessStepOrder(1L); // int i1 = dmsMaintInstanceActivityMapper.insertDmsMaintInstanceActivity(dmsMaintInstanceActivity); - batchInsertDmsBillsMaintDetail(dmsPlanMaint, dmsBillsMaintInstance.getMaintInstanceId(), tenantId, userId); - return R.ok(i); } @Transactional( rollbackFor = Exception.class ) public void batchInsertDmsBillsMaintDetail(DmsPlanMaint dmsPlanMaint, Long maintInstanceId, String tenantId, Long userId) { - - List planMaintDetails = dmsPlanMaint.getDmsPlanMaintDetailList(); List billsMaintDetails = new ArrayList<>(); planMaintDetails.forEach(planMaintDetail -> { @@ -119,8 +115,7 @@ public class RemoteMaintInstanceServiceImpl implements RemoteMaintInstanceServic billsMaintDetailProject.setMaintProjectId(project.getMaintProjectId()); billsMaintDetailProject.setMaintProjectName(project.getMaintProjectName()); billsMaintDetailProject.setMaintProjectDesc(project.getMaintProjectDesc()); - - billsMaintDetailProject.setMaintProjectStatus("2");//保养项目状态（0待保养 1保养完成）TODO:为什么是2？？ + billsMaintDetailProject.setMaintProjectStatus("2");//保养项目状态（0待保养 1保养完成）FIXME:为什么是2？？ //字段没有自动填充，只能代码手动填充 billsMaintDetailProject.setCreateBy(userId); diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteRepairStanceServicempl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteRepairStanceServicempl.java index 8a1dc8b..334c5a0 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteRepairStanceServicempl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteRepairStanceServicempl.java @@ -33,8 +33,6 @@ public class RemoteRepairStanceServicempl implements RemoteRepairStanceService { private final IDmsPlanRepairService dmsPlanRepairService; - - public static String lastDate="2000-01-01"; //流水号 public static int serialNumber = 0; @@ -64,7 +62,7 @@ public class RemoteRepairStanceServicempl implements RemoteRepairStanceService { // dmsRepairInstance.setWfProcessId(101l); dmsRepairInstance.setPlanRepairId(dmsPlanRepair.getPlanRepairId()); dmsRepairInstance.setPlanBeginTime(dmsPlanRepair.getRepairTime()); - dmsRepairInstance.setInstanceType("2"); + dmsRepairInstance.setInstanceType("2");//工单类型（1手工创建 2自动创建） // dmsRepairInstance.setRepairType(dmsPlanRepair.getRepairType()); // dmsRepairInstance.setRepairGroup(dmsPlanRepair.getRepairGroup()); // dmsRepairInstance.setRepairSupervisor(dmsPlanRepair.getRepairSupervisor()); @@ -105,23 +103,23 @@ public class RemoteRepairStanceServicempl implements RemoteRepairStanceService { dmsRepairInstance.setPlanEndTime(new Date(planBeginTime.getTime() + limit*1000l)); } // dmsRepairInstance.setIsFlag("1"); - dmsRepairInstance.setBillsStatus("1"); + dmsRepairInstance.setBillsStatus("1");//工单状态（0待检修 1检修中 2检修完成） if (dmsRepairInstance.getInstanceType()==null) { - dmsRepairInstance.setInstanceType("1"); + dmsRepairInstance.setInstanceType("1");//工单类型（1手工创建 2自动创建） } // dmsRepairInstance.setApplyBy(user.getUsername()); // dmsRepairInstance.setApplyTime(DateUtils.getNowDate()); // dmsRepairInstance.setWfProcessId(101l); int flag = dmsRepairInstanceMapper.insert(dmsRepairInstance); - //创建工单时新建工单实例节点 + //创建工单时新建工单实例节点 DmsRepairInstanceActivity dmsRepairInstanceActivity = new DmsRepairInstanceActivity(); dmsRepairInstanceActivity.setRepairInstanceId(dmsRepairInstance.getRepairInstanceId()); - dmsRepairInstanceActivity.setProcessHandleStatus("1"); + dmsRepairInstanceActivity.setProcessHandleStatus("1");//状态(0已结束 1执行中 2待接取 3已转发） //先写死第一步所对应的步骤，后续通过wfProcessId来查询步骤对应的id // dmsRepairInstanceActivity.setProcessActivityId(aLong); - dmsRepairInstanceActivity.setProcessStepOrder(1l); - dmsRepairInstanceActivity.setCreateBy(user.getUserId()); + dmsRepairInstanceActivity.setProcessStepOrder(1l);//工单流程步骤顺序 +// dmsRepairInstanceActivity.setCreateBy(); dmsRepairInstanceActivity.setCreateTime(DateUtils.getNowDate()); dmsRepairInstanceActivity.setStartTime(DateUtils.getNowDate()); // dmsRepairInstanceActivity.setRepairType(dmsRepairInstance.getRepairType()); diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectProjectDeviceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectProjectDeviceServiceImpl.java index 85dbb2a..e90ba52 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectProjectDeviceServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectProjectDeviceServiceImpl.java @@ -75,8 +75,7 @@ public class DmsInspectProjectDeviceServiceImpl implements IDmsInspectProjectDev .selectAll(DmsInspectProjectDevice.class) .eq(bo.getInspectProjectId() != null, DmsInspectProjectDevice::getInspectProjectId, bo.getInspectProjectId()) .eq(StringUtils.isNotBlank(bo.getTargetType()), DmsInspectProjectDevice::getTargetType, bo.getTargetType()) - .eq(bo.getTargetId() != null, DmsInspectProjectDevice::getTargetId, bo.getTargetId()) - .orderByDesc(DmsInspectProjectDevice::getCreateTime); + .eq(bo.getTargetId() != null, DmsInspectProjectDevice::getTargetId, bo.getTargetId()); return lqw; } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsPlanInspectServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsPlanInspectServiceImpl.java index 3ddf8f0..c04d485 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsPlanInspectServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsPlanInspectServiceImpl.java @@ -192,6 +192,8 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService { if (add.getInspectLevel().equals(3l)){ cron = "0 0 "+add.getHour()+" "+day+" "+ month+" ? "+year; } + bo.setCronExpression(cron);//cron表达式 + String planInspectCode = Seq.getId(Seq.planInspectSeqType, Seq.planInspectCode); if(bo.getActiveFlag().equals("1")) {//激活标识（1是 0否） @@ -209,6 +211,7 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService { .setExtAttrs(planInspectCode) .setUserId(LoginHelper.getUserId().toString()) .setTenantId(LoginHelper.getTenantId()); + System.out.println(LoginHelper.getTenantId()); R longR = remoteJobService.addClusterJob(dmsJobEntity); Long newJobId = longR.getData(); //通过cron表达式获取下一次执行时间 @@ -273,6 +276,7 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService { if (update.getInspectLevel().equals(3l)){ cron = "0 0 "+update.getHour()+" "+day+" "+ month+" ? "+year; } + bo.setCronExpression(cron);//cron表达式 String time = cron; //通过cron表达式获取下一次执行时间 Date nextExecution = CronUtils.getNextExecution(time); diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/service/RemoteJobServiceImpl.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/service/RemoteJobServiceImpl.java index a182e1a..26672ca 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/service/RemoteJobServiceImpl.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/service/RemoteJobServiceImpl.java @@ -24,8 +24,8 @@ public class RemoteJobServiceImpl implements RemoteJobService { // private final JobMapper jobMapper; //常量 - private static final String tenant = "tenantId"; - private static final String user = "userId"; + private static final String tenantId = "tenantId"; + private static final String userId = "userId"; /** * 新增集群模式的任务 @@ -47,8 +47,8 @@ public class RemoteJobServiceImpl implements RemoteJobService { .setTriggerType(dmsJobEntity.getTriggerType())//触发类型:2. 固定时间 3.CRON 表达式 99.工作流 .setTriggerInterval(dmsJobEntity.getTriggerInterval())//触发间隔 .addArgsStr(dmsJobEntity.getArgsStr(), dmsJobEntity.getExtAttrs())//执行任务参数 - .addArgsStr(tenant, dmsJobEntity.getTenantId())//租户ID，执行任务参数手动传参 - .addArgsStr(user, dmsJobEntity.getUserId())//用户ID，执行任务参数手动传参 + .addArgsStr(tenantId, dmsJobEntity.getTenantId())//租户ID，执行任务参数手动传参 + .addArgsStr(userId, dmsJobEntity.getUserId())//用户ID，执行任务参数手动传参 .setRetryInterval(dmsJobEntity.getRetryInterval())//重试间隔时长(秒) .execute(); if (jobId != null) { @@ -81,8 +81,8 @@ public class RemoteJobServiceImpl implements RemoteJobService { .setTriggerType(dmsJobEntity.getTriggerType())//触发类型:2. 固定时间 3.CRON 表达式 99.工作流 .setTriggerInterval(dmsJobEntity.getTriggerInterval())//触发间隔 .addArgsStr(dmsJobEntity.getArgsStr(), dmsJobEntity.getExtAttrs())//执行任务参数 - .addArgsStr(tenant, dmsJobEntity.getTenantId())//租户ID，执行任务参数手动传参 - .addArgsStr(user, dmsJobEntity.getUserId())//用户ID，执行任务参数手动传参 + .addArgsStr(tenantId, dmsJobEntity.getTenantId())//租户ID，执行任务参数手动传参 + .addArgsStr(userId, dmsJobEntity.getUserId())//用户ID，执行任务参数手动传参 .setRetryInterval(dmsJobEntity.getRetryInterval())//重试间隔时长(秒) .execute(); return success ? R.ok() : R.fail("修改集群任务失败"); 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 38bc986..4af18dc 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,7 +33,7 @@ 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 tenantId = (String) paramMap.get("tenantId"); String user = (String) paramMap.get("userId"); Long userId = Long.parseLong(user); 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 dd0bff4..a2dee6d 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,7 +33,7 @@ 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 tenantId = (String) paramMap.get("tenantId"); String user = (String) paramMap.get("userId"); Long userId = Long.parseLong(user);