From d67b1903f6cf36c36f27e0a3b1ffc602c5c2881a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 11 五月 2026 16:49:42 +0800
Subject: [PATCH] feat(device): 添加设备项目字段支持定时任务设备项目字段
---
doc/20260511_设备保养定时任务设备项目字段前端联调说明.md | 111 +++++++++++++++++++++++++++++++++++++
src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java | 10 ++-
src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java | 12 ++-
3 files changed, 124 insertions(+), 9 deletions(-)
diff --git "a/doc/20260511_\350\256\276\345\244\207\344\277\235\345\205\273\345\256\232\346\227\266\344\273\273\345\212\241\350\256\276\345\244\207\351\241\271\347\233\256\345\255\227\346\256\265\345\211\215\347\253\257\350\201\224\350\260\203\350\257\264\346\230\216.md" "b/doc/20260511_\350\256\276\345\244\207\344\277\235\345\205\273\345\256\232\346\227\266\344\273\273\345\212\241\350\256\276\345\244\207\351\241\271\347\233\256\345\255\227\346\256\265\345\211\215\347\253\257\350\201\224\350\260\203\350\257\264\346\230\216.md"
new file mode 100644
index 0000000..e35f0f9
--- /dev/null
+++ "b/doc/20260511_\350\256\276\345\244\207\344\277\235\345\205\273\345\256\232\346\227\266\344\273\273\345\212\241\350\256\276\345\244\207\351\241\271\347\233\256\345\255\227\346\256\265\345\211\215\347\253\257\350\201\224\350\260\203\350\257\264\346\230\216.md"
@@ -0,0 +1,111 @@
+# 璁惧淇濆吇瀹氭椂浠诲姟璁惧椤圭洰瀛楁鍓嶇鑱旇皟璇存槑
+
+> 鏇存柊鏃堕棿锛�2026-05-11
+> 閫傜敤鑼冨洿锛氳澶囦繚鍏诲畾鏃朵换鍔★紙`maintenance_task`锛変笌璁惧淇濆吇璁板綍锛坄device_maintenance`锛�
+
+## 1. 鍙樻洿姒傝堪
+
+鏈鍚庣鍙樻洿锛�
+
+1. `MaintenanceTask` 鏂板瀛楁 `machineryCategory`锛堣澶囬」鐩級銆�
+2. 瀹氭椂浠诲姟鎵ц鐢熸垚璁惧淇濆吇璁板綍鏃讹紝浼氭妸 `MaintenanceTask.machineryCategory` 鍚屾鍐欏叆 `DeviceMaintenance.machineryCategory`銆�
+
+瀵瑰簲浠ｇ爜浣嶇疆锛�
+
+- `src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java`
+- `src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java`
+
+## 2. 鏁版嵁搴撳彉鏇�
+
+闇�瑕佸厛鎵ц鏁版嵁搴撳彉鏇达紙鍚﹀垯鏂板/鏌ヨ璇ュ瓧娈典細寮傚父锛夛細
+
+```sql
+ALTER TABLE `maintenance_task`
+ ADD COLUMN `machinery_category` VARCHAR(100) NULL COMMENT '璁惧椤圭洰' AFTER `device_model`;
+```
+
+## 3. 瀛楁绾﹀畾
+
+| 瀛楁 | 鍚箟 | 绫诲瀷 | 寤鸿 |
+| --- | --- | --- | --- |
+| machineryCategory | 璁惧椤圭洰 | string | 鍓嶇鏂板/缂栬緫瀹氭椂浠诲姟鏃朵紶鍊� |
+
+璇存槑锛�
+
+- 鍚庣褰撳墠鏈璇ュ瓧娈靛仛寮哄埗闈炵┖鏍￠獙锛屼絾涓氬姟涓婂缓璁墠绔綔涓哄繀濉鐞嗐��
+- 鍘嗗彶 `maintenance_task` 鏃ф暟鎹嫢璇ュ瓧娈典负绌猴紝鍒欏熀浜庢棫浠诲姟鐢熸垚鐨勪繚鍏昏褰曚篃浼氫负绌恒��
+
+## 4. 鎺ュ彛鑱旇皟
+
+### 4.1 鏂板瀹氭椂浠诲姟
+
+```http
+POST /deviceMaintenanceTask/add
+Content-Type: application/json
+```
+
+璇锋眰绀轰緥锛�
+
+```json
+{
+ "taskName": "绌哄帇鏈篈-鍛ㄤ繚鍏�",
+ "taskId": 1001,
+ "deviceModel": "GA75",
+ "machineryCategory": "鍔ㄥ姏璁惧",
+ "frequencyType": "WEEKLY",
+ "frequencyDetail": "MON,09:00",
+ "registrantId": 1,
+ "registrationDate": "2026-05-11",
+ "remarks": "鑱旇皟鏍蜂緥"
+}
+```
+
+### 4.2 淇敼瀹氭椂浠诲姟
+
+```http
+POST /deviceMaintenanceTask/update
+Content-Type: application/json
+```
+
+璇锋眰绀轰緥锛堝惈 `id`锛夛細
+
+```json
+{
+ "id": 12,
+ "machineryCategory": "鍔ㄥ姏璁惧"
+}
+```
+
+### 4.3 瀹氭椂浠诲姟鍒楄〃
+
+```http
+GET /deviceMaintenanceTask/listPage?pageNum=1&pageSize=10
+```
+
+杩斿洖璁板綍涓細鍖呭惈 `machineryCategory` 瀛楁銆�
+
+### 4.4 璁惧淇濆吇璁板綍鍒楄〃/璇︽儏
+
+```http
+GET /device/maintenance/page?pageNum=1&pageSize=10
+GET /device/maintenance/{id}
+```
+
+杩斿洖涓� `machineryCategory` 鏉ユ簮浜� `device_maintenance.machinery_category`銆�
+瀵逛簬鈥滅敱瀹氭椂浠诲姟鑷姩鐢熸垚鈥濈殑璁板綍锛岃鍊间細缁ф壙鐢熸垚鏃跺搴斾换鍔＄殑 `machineryCategory`銆�
+
+## 5. 鍓嶇鏀归�犵偣
+
+1. 瀹氭椂浠诲姟鏂板/缂栬緫琛ㄥ崟澧炲姞鈥滆澶囬」鐩紙machineryCategory锛夆�濊緭鍏ラ」銆�
+2. 鎻愪氦 `/deviceMaintenanceTask/add`銆乣/deviceMaintenanceTask/update` 鏃舵惡甯� `machineryCategory`銆�
+3. 瀹氭椂浠诲姟鍒楄〃澧炲姞鈥滆澶囬」鐩�濆垪锛堝椤甸潰鏈夎鍒楄〃锛夈��
+4. 璁惧淇濆吇璁板綍鍒楄〃/璇︽儏澧炲姞鈥滆澶囬」鐩�濆睍绀猴紝绌哄�兼樉绀� `--`銆�
+
+## 6. 鑱旇皟楠屾敹娓呭崟
+
+1. 鏂板涓�涓甫 `machineryCategory` 鐨勫畾鏃朵换鍔★紝淇濆瓨鎴愬姛銆�
+2. 鏌ヨ `/deviceMaintenanceTask/listPage`锛岀‘璁よ浠诲姟杩斿洖 `machineryCategory`銆�
+3. 绛夊緟涓�娆″畾鏃惰Е鍙戯紙鎴栧皢棰戠巼璋冨埌涓磋繎鏃堕棿锛夛紝鐢熸垚淇濆吇璁板綍銆�
+4. 鏌ヨ `/device/maintenance/page` 鎴栬鎯呮帴鍙ｏ紝纭鏂拌褰曠殑 `machineryCategory` 涓庝换鍔′竴鑷淬��
+5. 淇敼浠诲姟 `machineryCategory` 鍚庡啀娆¤Е鍙戯紝纭鈥滄柊鐢熸垚璁板綍鈥濅娇鐢ㄦ柊鍊硷紙鍘嗗彶璁板綍涓嶅洖鍐欙級銆�
+
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 b5e67a3..09d5d77 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
@@ -4,6 +4,7 @@
import com.ruoyi.device.pojo.MaintenanceTask;
import lombok.RequiredArgsConstructor;
import org.quartz.*;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
@@ -18,14 +19,15 @@
import java.util.Set;
@Component
-@DisallowConcurrentExecution // 绂佹骞跺彂鎵ц鍚屼竴涓狫ob
-@RequiredArgsConstructor
+@DisallowConcurrentExecution
public class MaintenanceTaskJob implements Job, Serializable {
- private static final long serialVersionUID = 1L; // 蹇呴』瀹氫箟搴忓垪鍖朓D
+ private static final long serialVersionUID = 1L;
- private final DeviceMaintenanceServiceImpl deviceMaintenanceService;
+ @Autowired
+ private DeviceMaintenanceServiceImpl deviceMaintenanceService;
- private final JdbcTemplate jdbcTemplate;
+ @Autowired
+ private JdbcTemplate jdbcTemplate;
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
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 389eda9..d9c5f69 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
@@ -5,6 +5,7 @@
import com.ruoyi.inspectiontask.pojo.TimingTask;
import lombok.RequiredArgsConstructor;
import org.quartz.*;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
@@ -20,12 +21,13 @@
@Component
@DisallowConcurrentExecution // 绂佹骞跺彂鎵ц鍚屼竴涓狫ob
-@RequiredArgsConstructor
public class TimingTaskJob implements Job, Serializable {
private static final long serialVersionUID = 1L; // 蹇呴』瀹氫箟搴忓垪鍖朓D
- private final InspectionTaskMapper inspectionTaskMapper;
- private final JdbcTemplate jdbcTemplate;
+ @Autowired
+ private InspectionTaskMapper inspectionTaskMapper;
+ @Autowired
+ private JdbcTemplate jdbcTemplate;
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
@@ -46,7 +48,7 @@
if (timingTask == null) {
throw new JobExecutionException("鎵句笉鍒板畾鏃朵换鍔�: " + taskId);
}
-
+
// if (!timingTask.isActive()) {
// throw new JobExecutionException("瀹氭椂浠诲姟宸茬鐢�: " + taskId);
// }
--
Gitblit v1.9.3