Преглед на файлове

fix: 上下限设置值为空的情况

jackzhou преди 5 месеца
родител
ревизия
cb8af4de11

+ 2 - 2
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/alarm/service/check/DefaultSensorAlarmChecker.java

@@ -67,11 +67,11 @@ public class DefaultSensorAlarmChecker implements SensorAlarmChecker {
         boolean alarmTriggered = false;
         String time = DATE_FORMAT.format(new Date()); // 获取当前时间
         String unit = getUnit(type);
-        if (value > upperThreshold) {
+        if (noNull(upperThreshold) && value > upperThreshold) {
             // 超过上限,触发超标报警
             publishAlarm(type + "超标", value, unit, time, upperThreshold, monitorTargetRegion);
             alarmTriggered = true;
-        } else if (value < lowerThreshold) {
+        } else if (noNull(lowerThreshold) && value < lowerThreshold) {
             // 低于下限,触发低于阈值报警
             publishAlarm(type + "过低", value, unit, time, lowerThreshold, monitorTargetRegion);
             alarmTriggered = true;

+ 1 - 2
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/service/dataprocess/handler/impl/RenKeColdChainDataHandler.java

@@ -65,8 +65,7 @@ public class RenKeColdChainDataHandler extends AbstractColdChainDataHandler<RenK
         }
         // 如果处理器存在,则处理数据,否则记录警告
         if (monitorDataProcessor != null) {
-            log.info("Using processor [{}] to process data for deviceId: {}",
-                    monitorDataProcessor.getModelName(), deviceIdStr);
+//            log.info("Using processor [{}] to process data for deviceId: {}",monitorDataProcessor.getModelName(), deviceIdStr);
             monitorDataProcessor.processData(renKeColdChainMessageData);
             return Boolean.TRUE;
         } else {

+ 1 - 1
snowy-web-app/src/main/resources/application.properties

@@ -27,7 +27,7 @@ spring.servlet.multipart.max-file-size=100MB
 
 # mysql
 spring.datasource.dynamic.datasource.master.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.dynamic.datasource.master.url=jdbc:mysql://jfcloud-k6-mysql:3306/coldchain?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true
+spring.datasource.dynamic.datasource.master.url=jdbc:mysql://jfcloud-k6-mysql-coldchain:3306/coldchain?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true
 spring.datasource.dynamic.datasource.master.username=root
 spring.datasource.dynamic.datasource.master.password=Root123...
 spring.datasource.dynamic.strict=true