fix: 修复多处表单验证与数据流转的缺陷，优化系统消息推送逻辑

hsy

2026-08-31 1704e30de33833817a5fce4c4ab0b94ac8ce1cc6

 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;
    }