From 241ecdb5198a066bcc56f310605ce6942b44ac69 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 02 四月 2025 10:38:15 +0800
Subject: [PATCH] 逻辑修复
---
src/main/java/com/whyc/schedule/BattStationTempScheduleService.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/whyc/schedule/BattStationTempScheduleService.java b/src/main/java/com/whyc/schedule/BattStationTempScheduleService.java
index 1aff6a1..038a16d 100644
--- a/src/main/java/com/whyc/schedule/BattStationTempScheduleService.java
+++ b/src/main/java/com/whyc/schedule/BattStationTempScheduleService.java
@@ -116,21 +116,32 @@
if(alarmInDB != null){ // TODO 鏍￠獙娓╁害鐐逛綅鍜岄�昏緫,寰堥噸瑕�!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//濡傛灉瀛樺湪,鍚屾椂褰撳墠娓╁害澶т簬2绾�,鍒欐洿鏂版俯搴﹀拰鍛婅绛夌骇
if(battStationTemp.getMaxTemp()>=level2AlarmTemp){
- //娓╁害鐩稿悓,鏌ョ湅涓嬪憡璀︾瓑绾ф槸鍚︿竴鏍�
+ //娓╁害鐩稿悓,鏌ョ湅涓嬪憡璀︾瓑绾ф槸鍚﹂渶瑕佽皟鏁�
+ //鏌ョ湅鏁版嵁搴撳唴娓╁害鐨勫憡璀︾瓑绾у拰褰撳墠绾у埆鏄惁涓�鑷�
if(alarmInDB.getTemp().floatValue() == battStationTemp.getMaxTemp()){
- if((alarmInDB.getTemp().floatValue() == level2AlarmTemp
- && alarmInDB.getLevel() == 2)
- ||
- (alarmInDB.getTemp().floatValue() == level1AlarmTemp
- && alarmInDB.getLevel() == 1)
- ){
+ Float temp = alarmInDB.getTemp();
+ int levelInDB = alarmInDB.getLevel();
+ int levelNow;
+ if(temp>=level1AlarmTemp){
+ levelNow = 1;
+ }else{
+ levelNow = 2;
+ }
- }else{ //鍛婅绛夌骇涓嶅悓,璋冩暣鍛婅绛夌骇
+ if(levelInDB != levelNow){ //鍛婅绛夌骇涓嶅悓,璋冩暣鍛婅绛夌骇
BattStationTempAlarm alarm = new BattStationTempAlarm();
alarm.setLevel(alarmInDB.getLevel()==1?2:1);
alarm.setId(alarmInDB.getId());
+ if(!alarmInDB.getMaxTempPoint().equals(battStationTemp.getMaxTempPoint())){
+ alarm.setMaxTempPoint(battStationTemp.getMaxTempPoint());
+ }
alarmService.updateById(alarm);
- }
+ }else if(!alarmInDB.getMaxTempPoint().equals(battStationTemp.getMaxTempPoint())){ //鍛婅绛夌骇鐩稿悓,鏈�澶ф俯搴︾偣浣嶄笉鍚屽垯鏇存柊鐐逛綅
+ BattStationTempAlarm alarm = new BattStationTempAlarm();
+ alarm.setId(alarmInDB.getId());
+ alarm.setMaxTempPoint(battStationTemp.getMaxTempPoint());
+ alarmService.updateById(alarm);
+ }
}
//娓╁害涓嶅悓
@@ -143,6 +154,9 @@
} else {
alarm.setLevel(2);
}
+ if(!alarmInDB.getMaxTempPoint().equals(battStationTemp.getMaxTempPoint())){
+ alarm.setMaxTempPoint(battStationTemp.getMaxTempPoint());
+ }
alarmService.updateById(alarm);
}
}else {
--
Gitblit v1.9.1