From c1c83baa9b5081c09167f29bc6a9214be396c513 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 20 十月 2026 15:31:40 +0800
Subject: [PATCH] Revert "feat: 设备保养优化,保养项目拆分"
---
src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java | 61 ++++--------------------------
1 files changed, 9 insertions(+), 52 deletions(-)
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 58693ca..204667b 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
@@ -1,11 +1,6 @@
package com.ruoyi.device.service.impl;
import com.ruoyi.device.pojo.DeviceMaintenance;
-import com.ruoyi.device.mapper.MaintenanceTaskItemMapper;
-import com.ruoyi.device.mapper.DeviceMaintenanceItemMapper;
-import com.ruoyi.device.pojo.MaintenanceTaskItem;
-import com.ruoyi.device.pojo.DeviceMaintenanceItem;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.device.pojo.MaintenanceTask;
import lombok.RequiredArgsConstructor;
import org.quartz.*;
@@ -34,12 +29,6 @@
@Autowired
private JdbcTemplate jdbcTemplate;
- @Autowired
- private MaintenanceTaskItemMapper maintenanceTaskItemMapper;
-
- @Autowired
- private DeviceMaintenanceItemMapper deviceMaintenanceItemMapper;
-
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
@@ -60,26 +49,9 @@
throw new JobExecutionException("MaintenanceTaskJob鎵句笉鍒板畾鏃朵换鍔�: " + taskId);
}
- List<MaintenanceTaskItem> taskItems = maintenanceTaskItemMapper.selectByTaskId(timingTask.getId());
- if (taskItems.isEmpty()) {
- throw new JobExecutionException("淇濆吇浠诲姟鏈厤缃繚鍏婚」鐩�: " + taskId);
- }
- // 鎸変换鍔￠」鐩揩鐓х敓鎴愭湰娆′繚鍏昏褰曞強椤圭洰娓呭崟銆�
+ // 2. 鍒涘缓骞朵繚瀛樺贰妫�浠诲姟璁板綍 - 杩欏氨鏄偍鎻愪緵鐨勪唬鐮佸簲璇ユ斁鐨勪綅缃�
DeviceMaintenance deviceMaintenance = createInspectionTask(timingTask);
deviceMaintenanceService.save(deviceMaintenance);
- for (MaintenanceTaskItem taskItem : taskItems) {
- DeviceMaintenanceItem recordItem = new DeviceMaintenanceItem();
- recordItem.setDeviceMaintenanceId(deviceMaintenance.getId());
- recordItem.setMaintenanceTaskItemId(taskItem.getId());
- recordItem.setMaintenanceItemId(taskItem.getMaintenanceItemId());
- recordItem.setItemProject(taskItem.getItemProject());
- recordItem.setItemName(taskItem.getItemName());
- recordItem.setItemStatus(0);
- recordItem.setSortNum(taskItem.getSortNum());
- recordItem.setTenantId(deviceMaintenance.getTenantId());
- recordItem.setDeptId(timingTask.getDeptId());
- deviceMaintenanceItemMapper.insert(recordItem);
- }
// 3. 鏇存柊瀹氭椂浠诲姟鐨勬墽琛屾椂闂�
if (!tasks.isEmpty()) {
@@ -258,29 +230,14 @@
for (String dayStr : dayStrs) {
switch (dayStr) {
- case "MON":
- days.add(DayOfWeek.MONDAY);
- break;
- case "TUE":
- days.add(DayOfWeek.TUESDAY);
- break;
- case "WED":
- days.add(DayOfWeek.WEDNESDAY);
- break;
- case "THU":
- days.add(DayOfWeek.THURSDAY);
- break;
- case "FRI":
- days.add(DayOfWeek.FRIDAY);
- break;
- case "SAT":
- days.add(DayOfWeek.SATURDAY);
- break;
- case "SUN":
- days.add(DayOfWeek.SUNDAY);
- break;
- default:
- throw new IllegalArgumentException("鏃犳晥鐨勬槦鏈熷嚑: " + dayStr);
+ case "MON": days.add(DayOfWeek.MONDAY); break;
+ case "TUE": days.add(DayOfWeek.TUESDAY); break;
+ case "WED": days.add(DayOfWeek.WEDNESDAY); break;
+ case "THU": days.add(DayOfWeek.THURSDAY); break;
+ case "FRI": days.add(DayOfWeek.FRIDAY); break;
+ case "SAT": days.add(DayOfWeek.SATURDAY); break;
+ case "SUN": days.add(DayOfWeek.SUNDAY); break;
+ default: throw new IllegalArgumentException("鏃犳晥鐨勬槦鏈熷嚑: " + dayStr);
}
}
--
Gitblit v1.9.3