| src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
@@ -41,6 +41,9 @@ @ApiModelProperty(value = "设备id") private Long taskId; @ApiModelProperty(value = "批量设备id") private String taskIds; @ApiModelProperty(value = "频次") @Excel(name = "频次") private String frequencyType; src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
@@ -49,8 +49,8 @@ } // 2. 创建并保存巡检任务记录 - 这就是您提供的代码应该放的位置 DeviceMaintenance deviceMaintenance = createInspectionTask(timingTask); deviceMaintenanceService.save(deviceMaintenance); List<DeviceMaintenance> deviceMaintenance = createInspectionTask(timingTask); deviceMaintenanceService.saveBatch(deviceMaintenance); // 3. 更新定时任务的执行时间 if (!tasks.isEmpty()) { @@ -84,24 +84,33 @@ } // 这就是您提供的代码封装成的方法 private DeviceMaintenance createInspectionTask(MaintenanceTask timingTask) { DeviceMaintenance inspectionTask = new DeviceMaintenance(); private List<DeviceMaintenance> createInspectionTask(MaintenanceTask timingTask) { List<DeviceMaintenance> inspectionTasks = new java.util.ArrayList<>(); String[] split = timingTask.getTaskIds().split(","); String[] split1 = timingTask.getTaskName().split(","); String[] split2 = timingTask.getDeviceModel().split(","); int i = 0; for (String s : split) { DeviceMaintenance inspectionTask = new DeviceMaintenance(); // 复制基本属性 inspectionTask.setDeviceName(split1[i]); inspectionTask.setMaintenanceTaskId(timingTask.getId()); inspectionTask.setDeviceLedgerId(Long.parseLong(s)); inspectionTask.setMaintenancePlanTime(LocalDateTime.now()); inspectionTask.setFrequencyType(timingTask.getFrequencyType()); inspectionTask.setFrequencyDetail(timingTask.getFrequencyDetail()); inspectionTask.setTenantId(timingTask.getTenantId()); inspectionTask.setStatus(0); inspectionTask.setDeviceModel(split2[i]); inspectionTask.setCreateUser(Integer.parseInt(timingTask.getRegistrantId().toString())); inspectionTask.setUpdateTime(LocalDateTime.now()); inspectionTask.setCreateTime(LocalDateTime.now()); inspectionTask.setUpdateUser(Integer.parseInt(timingTask.getRegistrantId().toString())); i++; inspectionTasks.add(inspectionTask); } // 复制基本属性 inspectionTask.setDeviceName(timingTask.getTaskName()); inspectionTask.setMaintenanceTaskId(timingTask.getId()); inspectionTask.setDeviceLedgerId(timingTask.getTaskId()); inspectionTask.setMaintenancePlanTime(LocalDateTime.now()); inspectionTask.setFrequencyType(timingTask.getFrequencyType()); inspectionTask.setFrequencyDetail(timingTask.getFrequencyDetail()); inspectionTask.setTenantId(timingTask.getTenantId()); inspectionTask.setStatus(0); inspectionTask.setDeviceModel(timingTask.getDeviceModel()); inspectionTask.setCreateUser(Integer.parseInt(timingTask.getRegistrantId().toString())); inspectionTask.setUpdateTime(LocalDateTime.now()); inspectionTask.setCreateTime(LocalDateTime.now()); inspectionTask.setUpdateUser(Integer.parseInt(timingTask.getRegistrantId().toString())); return inspectionTask; return inspectionTasks; }
@@ -41,6 +41,9 @@ @ApiModelProperty(value = "设备id") private Integer taskId; @ApiModelProperty(value = "批量设备id") private String taskIds; @ApiModelProperty(value = "巡检人") @Excel(name = "执行巡检人") private String inspectorIds; src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
@@ -62,8 +62,11 @@ // } // 2. 创建并保存巡检任务记录 - 这就是您提供的代码应该放的位置 InspectionTask inspectionTask = createInspectionTask(timingTask); inspectionTaskMapper.insert(inspectionTask); List<InspectionTask> inspectionTask = createInspectionTask(timingTask); for (InspectionTask task : inspectionTask) { inspectionTaskMapper.insert(task); } // 3. 更新定时任务的执行时间 if (!tasks.isEmpty()) { @@ -103,21 +106,28 @@ } // 这就是您提供的代码封装成的方法 private InspectionTask createInspectionTask(TimingTask timingTask) { InspectionTask inspectionTask = new InspectionTask(); private List<InspectionTask> createInspectionTask(TimingTask timingTask) { List<InspectionTask> inspectionTasks = new java.util.ArrayList<>(); String[] split = timingTask.getTaskIds().split(","); String[] split1 = timingTask.getTaskName().split(","); int i = 0; for (String s : split) { InspectionTask inspectionTask = new InspectionTask(); // 复制基本属性 inspectionTask.setTaskName(split1[i]); inspectionTask.setTaskId(Integer.parseInt(s)); inspectionTask.setInspectorId(timingTask.getInspectorIds()); inspectionTask.setInspectionLocation(timingTask.getInspectionLocation()); inspectionTask.setRemarks("自动生成自定时任务ID: " + timingTask.getId()); inspectionTask.setRegistrantId(timingTask.getRegistrantId()); inspectionTask.setFrequencyType(timingTask.getFrequencyType()); inspectionTask.setFrequencyDetail(timingTask.getFrequencyDetail()); inspectionTask.setTenantId(timingTask.getTenantId()); inspectionTasks.add(inspectionTask); } // 复制基本属性 inspectionTask.setTaskName(timingTask.getTaskName()); inspectionTask.setTaskId(timingTask.getTaskId()); inspectionTask.setInspectorId(timingTask.getInspectorIds()); inspectionTask.setInspectionLocation(timingTask.getInspectionLocation()); inspectionTask.setRemarks("自动生成自定时任务ID: " + timingTask.getId()); inspectionTask.setRegistrantId(timingTask.getRegistrantId()); inspectionTask.setFrequencyType(timingTask.getFrequencyType()); inspectionTask.setFrequencyDetail(timingTask.getFrequencyDetail()); inspectionTask.setTenantId(timingTask.getTenantId()); return inspectionTask; return inspectionTasks; }
