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 | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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 b9deb2d..5bcd13c 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
@@ -4,9 +4,12 @@
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;
+import com.ruoyi.project.system.service.ISysNoticeService;
+import com.ruoyi.project.system.domain.SysNotice;
import java.io.Serializable;
import java.time.DayOfWeek;
@@ -18,14 +21,18 @@
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;
+
+ @Autowired
+ private ISysNoticeService sysNoticeService;
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
@@ -50,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"); // 姝ｅ父
+ notice.setConsigneeId(timingTask.getExecutorId());
+ notice.setSenderId(0L); // 0浠ｈ〃绯荤粺鍙戦��
+ notice.setTenantId(timingTask.getTenantId());
+ sysNoticeService.insertNotice(notice);
+ }
// 3. 鏇存柊瀹氭椂浠诲姟鐨勬墽琛屾椂闂�
if (!tasks.isEmpty()) {
@@ -91,11 +111,15 @@
inspectionTask.setMaintenanceTaskId(timingTask.getId());
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());
inspectionTask.setStatus(0);
inspectionTask.setDeviceModel(timingTask.getDeviceModel());
+ inspectionTask.setMachineryCategory(timingTask.getMachineryCategory());
inspectionTask.setCreateUser(Integer.parseInt(timingTask.getRegistrantId().toString()));
inspectionTask.setUpdateTime(LocalDateTime.now());
inspectionTask.setCreateTime(LocalDateTime.now());
--
Gitblit v1.9.3