From 9cd4074a456fd5c422506279191b6015836347e5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 十月 2026 10:08:35 +0800
Subject: [PATCH] feat: 设备台账启用状态、审批签核展示与导入健壮性
---
src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
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 adc2416..910ef4b 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
@@ -56,9 +56,11 @@
// throw new JobExecutionException("瀹氭椂浠诲姟宸茬鐢�: " + taskId);
// }
- // 2. 鍒涘缓骞朵繚瀛樺贰妫�浠诲姟璁板綍 - 杩欏氨鏄偍鎻愪緵鐨勪唬鐮佸簲璇ユ斁鐨勪綅缃�
- InspectionTask inspectionTask = createInspectionTask(timingTask);
- inspectionTaskMapper.insert(inspectionTask);
+ // 2. 鍒涘缓骞朵繚瀛樺贰妫�浠诲姟璁板綍锛涜澶囧凡鍋滅敤鏃惰烦杩囷紝涓嶇敓鎴愬贰妫�浠诲姟
+ if (!isDeviceDisabled(timingTask.getTaskId())) {
+ InspectionTask inspectionTask = createInspectionTask(timingTask);
+ inspectionTaskMapper.insert(inspectionTask);
+ }
// 3. 鏇存柊瀹氭椂浠诲姟鐨勬墽琛屾椂闂�
if (!tasks.isEmpty()) {
@@ -97,6 +99,21 @@
}
}
+ /**
+ * 璁惧鏄惁宸插仠鐢紙鍋滅敤璁惧涓嶅弬涓庡贰妫�锛�
+ */
+ private boolean isDeviceDisabled(Integer deviceId) {
+ if (deviceId == null || deviceId <= 0) {
+ return false;
+ }
+ List<Integer> enabledList = jdbcTemplate.queryForList(
+ "SELECT is_enabled FROM device_ledger WHERE id = ?", Integer.class, deviceId);
+ if (enabledList.isEmpty() || enabledList.get(0) == null) {
+ return false;
+ }
+ return enabledList.get(0) == 0;
+ }
+
// 杩欏氨鏄偍鎻愪緵鐨勪唬鐮佸皝瑁呮垚鐨勬柟娉�
private InspectionTask createInspectionTask(TimingTask timingTask) {
InspectionTask inspectionTask = new InspectionTask();
--
Gitblit v1.9.3