From 9cc00de219965372f23708fa08d04347745668f9 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 31 一月 2024 17:51:48 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 6c79675..8acc779 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
@@ -81,13 +81,13 @@
equipmentRateJudge = Integer.valueOf(dictModelList1.get(0).getValue());
}
// 鑾峰彇鍒╃敤鐜囨甯稿��
- List<DictModel> dictModelList2 = sysDictService.queryEnableDictItemsByCode(CommonConstant.DICT_EQUIPMENT_SPEED_JUDGE);
+ List<DictModel> dictModelList2 = sysDictService.queryEnableDictItemsByCode(CommonConstant.DICT_EQUIPMENT_RATE_NORMAL);
Integer equipmentRateNormal = 20;
if (dictModelList2 != null && !dictModelList2.isEmpty()) {
equipmentRateNormal = Integer.valueOf(dictModelList2.get(0).getValue());
}
// 鑾峰彇璁惧鐘舵�佸ぉ鏁�
- List<DictModel> dictModelList3 = sysDictService.queryEnableDictItemsByCode(CommonConstant.DICT_EQUIPMENT_RATE_NORMAL);
+ List<DictModel> dictModelList3 = sysDictService.queryEnableDictItemsByCode(CommonConstant.DICT_EQUIPMENT_SPEED_JUDGE);
Integer equipmentStatusJudge = 5;
if (dictModelList3 != null && !dictModelList3.isEmpty()) {
equipmentStatusJudge = Integer.valueOf(dictModelList3.get(0).getValue());
@@ -107,6 +107,7 @@
if (flag) {
// 涓婃姤
MessageDTO messageDTO = new MessageDTO();
+ messageDTO.setTitle("璁惧鍒╃敤鐜囨姤璀︼紒");
messageDTO.setCategory("棰勮娑堟伅");
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
@@ -128,6 +129,7 @@
if (flag) {
// 涓婃姤
MessageDTO messageDTO = new MessageDTO();
+ messageDTO.setTitle("璁惧鐘舵�侀暱鏈熸棤鍙樺寲鎶ヨ锛�");
messageDTO.setCategory("棰勮娑堟伅");
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
--
Gitblit v1.9.3