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/DeviceMaintenanceServiceImpl.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 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"); // 姝ｅ父
+ 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();
--
Gitblit v1.9.3