From a8e4132c3e2e9c3b3fcb0360901b35571b6464ea Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 10:13:01 +0800
Subject: [PATCH] feat: 综合业务模块功能补充与实体拓展

---
 src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 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 204667b..5bcd13c 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
@@ -8,6 +8,8 @@
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
+import com.ruoyi.project.system.service.ISysNoticeService;
+import com.ruoyi.project.system.domain.SysNotice;
 
 import java.io.Serializable;
 import java.time.DayOfWeek;
@@ -28,6 +30,9 @@
 
     @Autowired
     private JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    private ISysNoticeService sysNoticeService;
 
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
@@ -52,6 +57,19 @@
             // 2. 鍒涘缓骞朵繚瀛樺贰妫�浠诲姟璁板綍 - 杩欏氨鏄偍鎻愪緵鐨勪唬鐮佸簲璇ユ斁鐨勪綅缃�
             DeviceMaintenance deviceMaintenance = createInspectionTask(timingTask);
             deviceMaintenanceService.save(deviceMaintenance);
+
+            // 缁欐墽琛屼汉鍙戦�佺郴缁熼�氱煡
+            if (timingTask.getExecutorId() != null) {
+                SysNotice notice = new SysNotice();
+                notice.setNoticeTitle("鏂颁繚鍏讳换鍔℃彁閱�");
+                notice.setNoticeType("1"); // 1 閫氱煡
+                notice.setNoticeContent("鎮ㄦ湁涓�涓柊鐨勮澶囦繚鍏讳换鍔¢渶瑕佹墽琛岋紝璁惧鍚嶇О锛�" + timingTask.getTaskName());
+                notice.setStatus("0"); // 姝e父
+                notice.setConsigneeId(timingTask.getExecutorId());
+                notice.setSenderId(0L); // 0浠h〃绯荤粺鍙戦��
+                notice.setTenantId(timingTask.getTenantId());
+                sysNoticeService.insertNotice(notice);
+            }
 
             // 3. 鏇存柊瀹氭椂浠诲姟鐨勬墽琛屾椂闂�
             if (!tasks.isEmpty()) {
@@ -94,6 +112,8 @@
         inspectionTask.setDeviceLedgerId(timingTask.getTaskId());
         inspectionTask.setMaintenancePlanTime(LocalDateTime.now());
         inspectionTask.setMaintenanceActuallyName(timingTask.getMaintenancePerson());
+        inspectionTask.setExecutorId(timingTask.getExecutorId());
+        inspectionTask.setMaintenanceType(timingTask.getMaintenanceType());
         inspectionTask.setFrequencyType(timingTask.getFrequencyType());
         inspectionTask.setFrequencyDetail(timingTask.getFrequencyDetail());
         inspectionTask.setTenantId(timingTask.getTenantId());

--
Gitblit v1.9.3