From 1704e30de33833817a5fce4c4ab0b94ac8ce1cc6 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 31 八月 2026 17:32:31 +0800
Subject: [PATCH] fix: 修复多处表单验证与数据流转的缺陷，优化系统消息推送逻辑
---
src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 5bcd13c..049fe6f 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
@@ -11,6 +11,8 @@
import com.ruoyi.project.system.service.ISysNoticeService;
import com.ruoyi.project.system.domain.SysNotice;
+import com.ruoyi.project.system.service.impl.UnipushService;
+import java.util.Collections;
import java.io.Serializable;
import java.time.DayOfWeek;
import java.time.LocalDateTime;
@@ -33,6 +35,9 @@
@Autowired
private ISysNoticeService sysNoticeService;
+
+ @Autowired
+ private UnipushService unipushService;
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
@@ -61,14 +66,21 @@
// 缁欐墽琛屼汉鍙戦�佺郴缁熼�氱煡
if (timingTask.getExecutorId() != null) {
SysNotice notice = new SysNotice();
- notice.setNoticeTitle("鏂颁繚鍏讳换鍔℃彁閱�");
+ notice.setNoticeTitle("鏂颁繚鍏昏鍒掓彁閱�");
notice.setNoticeType("1"); // 1 閫氱煡
- notice.setNoticeContent("鎮ㄦ湁涓�涓柊鐨勮澶囦繚鍏讳换鍔￠渶瑕佹墽琛岋紝璁惧鍚嶇О锛�" + timingTask.getTaskName());
+ String dateStr = java.time.LocalDate.now().toString();
+ notice.setNoticeContent("浣犳湁涓�涓柊鐨勮澶囦繚鍏昏鍒� 锛�" + dateStr + " " + timingTask.getTaskName());
notice.setStatus("0"); // 姝ｅ父
notice.setConsigneeId(timingTask.getExecutorId());
notice.setSenderId(0L); // 0浠ｈ〃绯荤粺鍙戦��
notice.setTenantId(timingTask.getTenantId());
sysNoticeService.insertNotice(notice);
+
+ try {
+ unipushService.sendClientMessage(Collections.singletonList(notice));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
// 3. 鏇存柊瀹氭椂浠诲姟鐨勬墽琛屾椂闂�
@@ -120,10 +132,12 @@
inspectionTask.setStatus(0);
inspectionTask.setDeviceModel(timingTask.getDeviceModel());
inspectionTask.setMachineryCategory(timingTask.getMachineryCategory());
- inspectionTask.setCreateUser(Integer.parseInt(timingTask.getRegistrantId().toString()));
+ if (timingTask.getRegistrantId() != null) {
+ inspectionTask.setCreateUser(Integer.parseInt(timingTask.getRegistrantId().toString()));
+ inspectionTask.setUpdateUser(Integer.parseInt(timingTask.getRegistrantId().toString()));
+ }
inspectionTask.setUpdateTime(LocalDateTime.now());
inspectionTask.setCreateTime(LocalDateTime.now());
- inspectionTask.setUpdateUser(Integer.parseInt(timingTask.getRegistrantId().toString()));
return inspectionTask;
}
--
Gitblit v1.9.3