From 1ff909849a2bde88e00ed8f21c33c2cd184d6448 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 02 四月 2025 09:33:10 +0800
Subject: [PATCH] 先去除实时温度的定时获取,便于调试
---
src/main/java/com/whyc/schedule/BattStationTempScheduleService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/schedule/BattStationTempScheduleService.java b/src/main/java/com/whyc/schedule/BattStationTempScheduleService.java
index 5dc83eb..1aff6a1 100644
--- a/src/main/java/com/whyc/schedule/BattStationTempScheduleService.java
+++ b/src/main/java/com/whyc/schedule/BattStationTempScheduleService.java
@@ -49,7 +49,7 @@
/**
* 娓╁害瀹炴椂
* */
- @Scheduled(fixedRate = 4000,initialDelay = 2000)
+ //@Scheduled(fixedRate = 4000,initialDelay = 2000)
public void startRecordAndCheck(){
List<BattCamera> ipInfoList = HikTempUtil.cameraInfoList;
List<PageParam> tempParmList = paramService.getTempParmList();
@@ -57,7 +57,7 @@
Integer level1AlarmTemp = tempParmList.get(1).getValue();
for (int i = 0; i < ipInfoList.size(); i++) {
BattCamera cameraInfo = ipInfoList.get(i);
- ThreadPoolExecutorFactory.getPoolExecutor().execute(()-> {
+ //ThreadPoolExecutorFactory.getPoolExecutor().execute(()-> {
String ip = cameraInfo.getCameraIp();
String cameraId = cameraInfo.getCameraId();
Integer battGroupId = cameraInfo.getBattGroupId();
@@ -113,7 +113,7 @@
//娓╁害鍛婅鍒ゆ柇
//鏌ヨ娓╁害鍛婅琛紝濡傛灉瀛樺湪
BattStationTempAlarm alarmInDB = alarmService.getByBattGroupId(battGroupId);
- if(alarmInDB != null){
+ if(alarmInDB != null){ // TODO 鏍￠獙娓╁害鐐逛綅鍜岄�昏緫,寰堥噸瑕�!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//濡傛灉瀛樺湪,鍚屾椂褰撳墠娓╁害澶т簬2绾�,鍒欐洿鏂版俯搴﹀拰鍛婅绛夌骇
if(battStationTemp.getMaxTemp()>=level2AlarmTemp){
//娓╁害鐩稿悓,鏌ョ湅涓嬪憡璀︾瓑绾ф槸鍚︿竴鏍�
@@ -166,6 +166,8 @@
}else{
alarm.setLevel(2);
}
+ //娣诲姞鏈�楂樻俯搴︾偣浣�
+ alarm.setMaxTempPoint(battStationTemp.getMaxTempPoint());
alarmService.add(alarm);
}
@@ -173,7 +175,7 @@
String msg = response.getMsg();
// TODO 鎶ラ敊鏃ュ織璁板綍
}
- });
+ //});
}
}
--
Gitblit v1.9.1