From dfadab4fecc90bd2ad720dc67eba44c4b69b155a Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 05 三月 2025 10:05:40 +0800
Subject: [PATCH] art: 所有设备 台账 维修工单 根据设备id查询维修工单,并过滤掉已完成的维修工单
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java
index 793eb81..8ea5606 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java
@@ -1,6 +1,5 @@
package org.jeecg.modules.mdc.job;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.constant.CommonConstant;
@@ -39,8 +38,6 @@
* @Description: 鍒╃敤鐜囨甯稿�硷紝璁惧鐘舵�侀暱鏈熸棤鍙樺寲鎶ヨ
* @date 2024/1/17 14:10
*/
-@PersistJobDataAfterExecution
-@DisallowConcurrentExecution
@Slf4j
public class RunningEquipmentStatusJob implements Job {
@@ -85,7 +82,7 @@
log.info("璁惧鐘舵�侀暱鏈熸棤鍙樺寲鎶ヨ浠诲姟 RunningEquipmentStatusJob start! 鏃堕棿:" + DateUtils.getNow());
long startTime = System.currentTimeMillis();
try {
- List<MdcEquipment> equipmentList = mdcEquipmentService.list(new LambdaQueryWrapper<>());
+ List<MdcEquipment> equipmentList = mdcEquipmentService.list();
// List<MdcEquipment> equipmentList = mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, "3140045"));
// 鑾峰彇鍒╃敤鐜囧垽瀹氬ぉ鏁�
List<DictModel> dictModelList1 = sysDictService.queryEnableDictItemsByCode(CommonConstant.DICT_EQUIPMENT_RATE_JUDGE);
@@ -134,7 +131,7 @@
// 涓婃姤
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("璁惧鍒╃敤鐜囨姤璀︼紒");
- messageDTO.setCategory("棰勮娑堟伅");
+ messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囧埄鐢ㄧ巼浣庝簬姝ｅ父鍊兼姤璀︼紒");
@@ -174,7 +171,7 @@
for (SysUser sysUser : adminList) {
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("璁惧鐘舵�侀暱鏈熸棤鍙樺寲鎶ヨ锛�");
- messageDTO.setCategory("棰勮娑堟伅");
+ messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
messageDTO.setFromUser("admin");
messageDTO.setToUser(sysUser.getUsername());
messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲鎶ヨ锛�");
@@ -183,7 +180,7 @@
} else {
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("璁惧鐘舵�侀暱鏈熸棤鍙樺寲鎶ヨ锛�");
- messageDTO.setCategory("棰勮娑堟伅");
+ messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲鎶ヨ锛�");
--
Gitblit v1.9.3