From 13c70b027a3037ee4affd06ca7935cfe9554e298 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 27 二月 2026 17:36:46 +0800
Subject: [PATCH] 安全生产,巡检任务设定自定义拍照或相册

---
 src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java
index 2ff2e7e..1bd644a 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java
@@ -84,9 +84,13 @@
     /**
      * 鍒犻櫎浠诲姟
      */
-    public void unscheduleTimingTask(Long taskId) throws SchedulerException {
-        JobKey jobKey = new JobKey("timingTask_" + taskId);
-        scheduler.deleteJob(jobKey);
+    public void unscheduleTimingTask(Long taskId){
+        try {
+            JobKey jobKey = new JobKey("timingTask_" + taskId);
+            scheduler.deleteJob(jobKey);
+        }catch (SchedulerException e){
+            throw new RuntimeException(e);
+        }
     }
 
     private JobDetail buildJobDetail(TimingTask task) {
@@ -98,6 +102,9 @@
         jobDataMap.put("taskId", task.getId());           // 浠诲姟ID锛圠ong锛屽彲搴忓垪鍖栵級
         jobDataMap.put("taskName", task.getTaskName());   // 浠诲姟鍚嶇О锛圫tring锛屽彲搴忓垪鍖栵級
         jobDataMap.put("taskType", task.getFrequencyType()); // 浠诲姟绫诲瀷锛圫tring锛�
+        jobDataMap.put("takePhone", task.isTakePhone()); // 鏄惁蹇呴』鎵嬫満鎷嶇収
+        jobDataMap.put("takeAlbum", task.isTakeAlbum()); // 鏄惁鍙互涓婁紶鐩稿唽
+        jobDataMap.put("inspectionDeadline", task.getInspectionDeadline()); // 宸℃鏈熼檺
         // 鎸夐渶娣诲姞鍏朵粬蹇呰鐨勫熀鏈被鍨嬪弬鏁�
 
         // 3. 鏋勫缓JobDetail锛岃缃寔涔呭寲鐩稿叧灞炴��

--
Gitblit v1.9.3