From 76bd3698107ded99b7183b4ce0b80b05eeb696c4 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 04 十二月 2024 16:09:09 +0800
Subject: [PATCH] 修改
---
src/main/java/com/whyc/service/BattTestInfService.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattTestInfService.java b/src/main/java/com/whyc/service/BattTestInfService.java
index 05e0c31..811f037 100644
--- a/src/main/java/com/whyc/service/BattTestInfService.java
+++ b/src/main/java/com/whyc/service/BattTestInfService.java
@@ -1,3 +1,4 @@
+/*
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -199,11 +200,13 @@
map.put("flag",1);
}
- /*鍔ｅ寲锛氭湰骞村害鏈斁鐢碉紝鍐呴樆鍛婅锛堥鍛婅锛堥噸瑕侊級锛屽憡璀︼紙绱ф�ワ級锛�
+ */
+/*鍔ｅ寲锛氭湰骞村害鏈斁鐢碉紝鍐呴樆鍛婅锛堥鍛婅锛堥噸瑕侊級锛屽憡璀︼紙绱ф�ワ級锛�
*瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝澶т簬鎹熷潖闃堝�硷紝鍐呴樆鍛婅(棰勫憡璀︼紝鍛婅)
* 瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝鍐呴樆姝ｅ父
* 瀹归噺姝ｅ父锛屽唴闃诲憡璀�(棰勫憡璀︼紝鍛婅)
- */
+ *//*
+
if (((disNum==0)&&(listALmRes.size()>0))
||((disNum>0)&&(realCap <= capAlarm * monCapStd && realCap >= capChange * monCapStd)&&(listALmRes.size()>0))
||((disNum>0)&&(realCap <= capAlarm * monCapStd)&&(listALmRes.size()<=0))
@@ -221,14 +224,16 @@
return map;
}
//鏌ヨ鐢垫睜鍛婅(2024銆�4.15淇敼)
- /*鏈斁鐢碉細鏈勾搴︽湭鏀剧數
+ */
+/*鏈斁鐢碉細鏈勾搴︽湭鏀剧數
*浼樼锛氭湰骞村害宸叉斁鐢碉紝涓斿閲忓仴搴凤紝鏃犲唴闃诲憡璀︼紙棰勫憡璀︼紙閲嶈锛夛紝鍛婅锛堢揣鎬ワ級锛�
*鍔ｅ寲锛氭湰骞村害鏈斁鐢碉紝鍐呴樆鍛婅锛堥鍛婅锛堥噸瑕侊級锛屽憡璀︼紙绱ф�ワ級锛�
* 瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝澶т簬鎹熷潖闃堝�硷紝鍐呴樆鍛婅(棰勫憡璀︼紝鍛婅)
* 瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝鍐呴樆姝ｅ父
* 瀹归噺姝ｅ父锛屽唴闃诲憡璀�(棰勫憡璀︼紝鍛婅)
* 鎹熷潖锛氬閲忎綆锛屽唴闃诲憡璀�
- * */
+ * *//*
+
private List getAlm2(Integer battGroupId) {
List list = alarmMapper.getAlm2(battGroupId);
return list;
@@ -268,9 +273,11 @@
if ((disNum > 0) && (realCap > capAlarm * monCapStd)) {
map.put("flag", 1);
}
- /*鍔ｅ寲锛�
+ */
+/*鍔ｅ寲锛�
*瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝澶т簬鎹熷潖闃堝��
- */
+ *//*
+
if (((disNum > 0) && (realCap <= capAlarm * monCapStd && realCap >= capChange * monCapStd))) {
map.put("flag", 2);
}
@@ -308,4 +315,4 @@
return new Response().set(1, map, "鏌ヨ鎴愬姛");
}
-}
\ No newline at end of file
+}*/
--
Gitblit v1.9.1