From 218ab860ed4708f6f70a519775c56c9554000fe7 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 13:42:41 +0800
Subject: [PATCH] 去除多余引用

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenaceAlart.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenaceAlart.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenaceAlart.java
index a0ccf5d..92bec85 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenaceAlart.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenaceAlart.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.hibernate.annotations.Source;
 import org.jeecg.common.api.dto.message.MessageDTO;
+import org.jeecg.common.constant.enums.MessageSplitTypeEnum;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.modules.eam.entity.Equipment;
@@ -42,12 +43,20 @@
         LocalDateTime currentDateTime = LocalDateTime.now();
         LocalDateTime dateBefore2Months = currentDateTime.plusMonths(2);
         Date result = Date.from(dateBefore2Months.atZone(ZoneId.systemDefault()).toInstant());
-        List<Equipment> needAlerts = equipmentService.list(new QueryWrapper<Equipment>().lt("next_third_maintenance_time",result).eq("property_status","normal").eq("del_flag",0));
+        List<Equipment> needAlerts = equipmentService.list(
+                new QueryWrapper<Equipment>()
+                .lt("next_third_maintenance_time",result)
+                .eq("property_status","normal")
+                .eq("del_flag",0));
         SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false);
-        SysDictItem sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>().eq("item_text","涓変繚娑堟伅").eq("dict_id",sysDict.getId()),false);
+        SysDictItem sysDictItem = sysDictItemService.getOne(
+                new QueryWrapper<SysDictItem>()
+                .eq("item_text","涓変繚娑堟伅")
+                .eq("dict_id",sysDict.getId()),false);
         String roleCode = sysDictItem.getItemValue();
         SysRole sysRole = sysRoleService.getOne(new QueryWrapper<SysRole>().eq("role_code",roleCode),false);
-        List<SysUserRole> sysUserRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("role_id",sysRole.getId()));
+        List<SysUserRole> sysUserRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>()
+                .eq("role_id",sysRole.getId()));
         for(SysUserRole sysUserRole:sysUserRoles){
             SysUser sysUser = sysUserService.getById(sysUserRole.getUserId());
             String title = "璁惧涓嬫涓変繚鍒版湡鎻愰啋!";
@@ -58,8 +67,9 @@
             msg = msg+"鐨勮澶囩涓嬫涓変繚鐨勬棩鏈熶笉瓒充袱涓湀锛岃鍙婃椂澶勭悊";
             MessageDTO messageDTO = new MessageDTO();
             messageDTO.setTitle(title);
+            messageDTO.setMessageType(MessageSplitTypeEnum.untilMaintenancePeriod.getType());
             messageDTO.setContent(msg);
-            messageDTO.setCategory("涓変繚娑堟伅");
+            messageDTO.setCategory(MessageSplitTypeEnum.untilMaintenancePeriod.getNote());
             messageDTO.setFromUser("admin");
             messageDTO.setToUser(sysUser.getUsername());
             if(needAlerts.size()!=0){

--
Gitblit v1.9.3