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/resources/mapper/system/SysNoticeMapper.xml | 1 -
src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java | 37 +++++++++++++++++++++++++++++++++++++
src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java | 22 ++++++++++++++++++----
3 files changed, 55 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
index 4ee147b..3f0db85 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
@@ -13,6 +13,12 @@
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceMaintenanceService;
+import com.ruoyi.project.system.service.ISysNoticeService;
+import com.ruoyi.project.system.service.impl.UnipushService;
+import com.ruoyi.project.system.domain.SysNotice;
+import java.util.Collections;
+import com.ruoyi.common.utils.SecurityUtils;
+import lombok.extern.slf4j.Slf4j;
import com.ruoyi.device.vo.DeviceMaintenanceVo;
import com.ruoyi.device.vo.DeviceRepairVo;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -37,6 +43,7 @@
@Service
@RequiredArgsConstructor
+@Slf4j
public class DeviceMaintenanceServiceImpl extends ServiceImpl<DeviceMaintenanceMapper, DeviceMaintenance> implements IDeviceMaintenanceService {
private final DeviceMaintenanceMapper deviceMaintenanceMapper;
@@ -44,6 +51,8 @@
private final SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
private final IDeviceRepairSparePartService deviceRepairSparePartService;
private final FileUtil fileUtil;
+ private final ISysNoticeService sysNoticeService;
+ private final UnipushService unipushService;
@Override
public IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto) {
@@ -58,6 +67,34 @@
if (save){
// 澶勭悊鍥剧墖涓婁紶
fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_MAINTENANCE, deviceMaintenance.getId(), deviceMaintenance.getStorageBlobDTOs());
+
+ // 鎺ㄩ�佺郴缁熸秷鎭粰鎵ц浜�
+ if (deviceMaintenance.getExecutorId() != null) {
+ SysNotice notice = new SysNotice();
+ notice.setNoticeTitle("鏂颁繚鍏昏鍒掓彁閱�");
+ notice.setNoticeType("1"); // 1 閫氱煡
+ String dateStr = deviceMaintenance.getMaintenancePlanTime() != null ?
+ deviceMaintenance.getMaintenancePlanTime().toLocalDate().toString() :
+ java.time.LocalDate.now().toString();
+ notice.setNoticeContent("浣犳湁涓�涓柊鐨勮澶囦繚鍏昏鍒� 锛�" + dateStr + " " + deviceMaintenance.getDeviceName());
+ notice.setStatus("0"); // 姝e父
+ notice.setConsigneeId(deviceMaintenance.getExecutorId());
+ try {
+ Long currentUserId = SecurityUtils.getLoginUser().getUserId();
+ notice.setSenderId(currentUserId);
+ } catch (Exception e) {
+ notice.setSenderId(0L); // 鍏滃簳
+ }
+ notice.setTenantId(deviceMaintenance.getTenantId());
+ sysNoticeService.insertNotice(notice);
+
+ try {
+ unipushService.sendClientMessage(Collections.singletonList(notice));
+ } catch (Exception e) {
+ log.error("鎺ㄩ�佹柊淇濆吇璁″垝绯荤粺娑堟伅澶辫触", e);
+ }
+ }
+
return AjaxResult.success();
}
return AjaxResult.error();
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"); // 姝e父
notice.setConsigneeId(timingTask.getExecutorId());
notice.setSenderId(0L); // 0浠h〃绯荤粺鍙戦��
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;
}
diff --git a/src/main/resources/mapper/system/SysNoticeMapper.xml b/src/main/resources/mapper/system/SysNoticeMapper.xml
index 14372d8..d325c50 100644
--- a/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -95,7 +95,6 @@
<if test="consigneeId != null and consigneeId != ''">#{consigneeId},</if>
<if test="jumpPath != null and jumpPath != ''">#{jumpPath},</if>
<if test="appJumpPath != null and appJumpPath != ''">#{appJumpPath},</if>
- <if test="pathParms != null and pathParms != ''">#{queryParms},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="tenantId != null and tenantId != ''">#{tenantId},</if>
sysdate()
--
Gitblit v1.9.3