From 1bf89a61287ce6765403c4fb9f55870391c8c12c Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 20 三月 2026 11:09:55 +0800
Subject: [PATCH] yys 设备批次保养和巡检
---
src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java | 3 +
src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java | 40 ++++++++++++-------
src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java | 47 ++++++++++++++---------
src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java | 3 +
4 files changed, 59 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
index d40352f..cbcefe2 100644
--- a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
+++ b/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;
diff --git a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
index 3367050..81c08ac 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
+++ b/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;
}
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
index 02dd676..bc9584f 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
@@ -41,6 +41,9 @@
@ApiModelProperty(value = "璁惧id")
private Integer taskId;
+ @ApiModelProperty(value = "鎵归噺璁惧id")
+ private String taskIds;
+
@ApiModelProperty(value = "宸℃浜�")
@Excel(name = "鎵ц宸℃浜�")
private String inspectorIds;
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
index 1cfc748..5b96b9c 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
+++ b/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("鑷姩鐢熸垚鑷畾鏃朵换鍔D: " + 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("鑷姩鐢熸垚鑷畾鏃朵换鍔D: " + timingTask.getId());
- inspectionTask.setRegistrantId(timingTask.getRegistrantId());
- inspectionTask.setFrequencyType(timingTask.getFrequencyType());
- inspectionTask.setFrequencyDetail(timingTask.getFrequencyDetail());
- inspectionTask.setTenantId(timingTask.getTenantId());
- return inspectionTask;
+ return inspectionTasks;
}
--
Gitblit v1.9.3