From 4f55d3cb4bc644e4534106336f2047af1a4db5df Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 29 五月 2026 18:09:46 +0800
Subject: [PATCH] feat(config): 添加新环境配置并扩展设备台账功能

---
 src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java |   62 +++++++++++++++++++++++++++++-
 1 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java
index ebe615d..4508625 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java
@@ -6,6 +6,8 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.device.mapper.DeviceAreaMapper;
+import com.ruoyi.device.pojo.DeviceArea;
 import com.ruoyi.inspectiontask.dto.TimingTaskDto;
 import com.ruoyi.inspectiontask.mapper.TimingTaskMapper;
 import com.ruoyi.inspectiontask.pojo.TimingTask;
@@ -35,6 +37,7 @@
     private final TimingTaskMapper timingTaskMapper;
     private final TimingTaskScheduler timingTaskScheduler;
     private final SysUserMapper sysUserMapper;
+    private final DeviceAreaMapper deviceAreaMapper;
     private static final int ENABLED = 1;
     private static final int DISABLED = 0;
 
@@ -52,6 +55,12 @@
         }
         if (timingTask.getIsEnabled() != null) {
             queryWrapper.eq(TimingTask::getIsEnabled, timingTask.getIsEnabled());
+        }
+        if (timingTask.getAreaId() != null) {
+            queryWrapper.eq(TimingTask::getAreaId, timingTask.getAreaId());
+        }
+        if (StringUtils.isNotBlank(timingTask.getTaskIdsStr())) {
+            queryWrapper.like(TimingTask::getTaskIdsStr, timingTask.getTaskIdsStr());
         }
         queryWrapper.orderByDesc(TimingTask::getCreateTime);
         IPage<TimingTask> taskPage = timingTaskMapper.selectPage(page, queryWrapper);
@@ -89,6 +98,17 @@
             users.forEach(user -> userNickNameMap.put(user.getUserId(), user.getNickName()));
         }
 
+        // 4.1 鎵归噺鏌ヨ鍖哄煙鍚嶇О
+        Set<Long> areaIds = taskPage.getRecords().stream()
+                .map(TimingTask::getAreaId)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+        Map<Long, String> areaNameMap = new HashMap<>();
+        if (!areaIds.isEmpty()) {
+            List<DeviceArea> areas = deviceAreaMapper.selectBatchIds(new ArrayList<>(areaIds));
+            areas.forEach(area -> areaNameMap.put(area.getId(), area.getAreaName()));
+        }
+
         // 5. 杞崲涓篋TO
         List<TimingTaskDto> dtoList = taskPage.getRecords().stream().map(task -> {
             TimingTaskDto dto = new TimingTaskDto();
@@ -112,6 +132,11 @@
                 dto.setInspector(inspectorNickNames);
             }
 
+            // 璁剧疆鍖哄煙鍚嶇О
+            if (task.getAreaId() != null) {
+                dto.setAreaName(areaNameMap.getOrDefault(task.getAreaId(), ""));
+            }
+
             return dto;
         }).collect(Collectors.toList());
 
@@ -122,7 +147,7 @@
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int addOrEditTimingTask(TimingTaskDto timingTaskDto) throws SchedulerException {
         TimingTask oldTimingTask = null;
         if (Objects.nonNull(timingTaskDto.getId())) {
@@ -179,6 +204,34 @@
             }
             return result;
         }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int changeEnable(Long id, Integer isEnabled) throws SchedulerException {
+        TimingTask oldTimingTask = timingTaskMapper.selectById(id);
+        if (oldTimingTask == null) {
+            throw new IllegalArgumentException("瀹氭椂浠诲姟涓嶅瓨鍦�");
+        }
+        TimingTask update = new TimingTask();
+        update.setId(id);
+        update.setIsEnabled(resolveEnabledValue(isEnabled, oldTimingTask));
+        update.setActive(ENABLED == update.getIsEnabled());
+
+        int result = timingTaskMapper.updateById(update);
+        if (result <= 0) {
+            return result;
+        }
+
+        boolean enabled = isEnabled(update.getIsEnabled(), update.isActive());
+        if (!enabled) {
+            timingTaskScheduler.unscheduleTimingTask(id);
+        } else if (oldTimingTask.getIsEnabled() != null && oldTimingTask.getIsEnabled() == DISABLED) {
+            timingTaskScheduler.scheduleTimingTask(oldTimingTask);
+        } else {
+            timingTaskScheduler.resumeTimingTask(id);
+        }
+        return result;
     }
 
     public LocalDateTime calculateFirstExecutionTime(TimingTask task) {
@@ -315,7 +368,7 @@
     }
 
     private LocalDateTime calculateCustomFirstExecution(String frequencyDetail) {
-        return null;
+        return TimingTaskScheduleUtils.calculateFirstExecutionTime("QUARTERLY", frequencyDetail);
     }
 
     @Override
@@ -421,7 +474,7 @@
     /**
      * 璁＄畻姣忓搴︿换鍔＄殑涓嬫鎵ц鏃堕棿
      */
-    private LocalDateTime calculateQuarterlyNextTime(String detail, LocalDateTime current) {
+    private LocalDateTime calculateQuarterlyNextTimeLegacy(String detail, LocalDateTime current) {
         String[] parts = detail.split(",");
         int quarterMonth = Integer.parseInt(parts[0]); // 1=绗�1涓湀锛�2=绗�2涓湀锛�3=绗�3涓湀
         int dayOfMonth = Integer.parseInt(parts[1]);
@@ -457,6 +510,9 @@
     /**
      * 瑙ｆ瀽鏄熸湡鍑犲瓧绗︿覆
      */
+    private LocalDateTime calculateQuarterlyNextTime(String detail, LocalDateTime current) {
+        return TimingTaskScheduleUtils.calculateNextExecutionTime("QUARTERLY", detail, current);
+    }
     private Set<DayOfWeek> parseDayOfWeeks(String dayOfWeekStr) {
         Set<DayOfWeek> days = new HashSet<>();
         String[] dayStrs = dayOfWeekStr.split("\\|");

--
Gitblit v1.9.3