jackzhou 6 сар өмнө
parent
commit
b1c5dece97

+ 4 - 2
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/alarm/service/messagepush/RedisSensorAlarmMessagePushService.java

@@ -35,12 +35,14 @@ public class RedisSensorAlarmMessagePushService {
         String deviceID = alarm.getDeviceId();
         String alarmType = alarm.getAlarmType();
         List<String> openids = Optional.ofNullable(alarm.getAlarmUsers()).orElse(Collections.emptyList()).stream().filter(Objects::nonNull).map(SensorAlarmUser::getOpenId).filter(Objects::nonNull).toList();
-
-        for (String openid : openids) {
+        for (SensorAlarmUser user : alarm.getAlarmUsers()) {
+            String openid=user.getUserId();
             if (hasExceededPushLimit(openid, deviceID, alarmType)) {
 //                log.info("用户 {} 对设备 {} 的告警类型 {} \n在过去{}分钟内推送次数超过限制,跳过推送", openid, deviceID, alarmType, JfcloudColdChainConstants.MESS_PUSH_TIME_WINDOW / 60 / 1000);
                 continue;
             }
+            // 只对当前人发送预警消息
+            alarm.setAlarmUsers(List.of(user));
             for (NotificationChannel channel : alarm.getNotificationChannel()) {
                 MessagePushService pushService = pushServices.get(channel.name());
                 if (pushService != null) {

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

@@ -34,7 +34,10 @@ spring.datasource.dynamic.strict=true
 
 # influxdb
 spring.data.influxdb.url=${INFLUXDB_URL:http://jfcloud-k6-mysql:8086}
-spring.data.influxdb.token=${INFLUXDB_TOKEN:1NdDyN3LCKIEBFkQ1AqAmRSitZGfdCs0nuF11nLQbTcnN_5mp_asnfFnmAXTvDDQXGr83llxuXJu5wNTPtrsIw==}
+## 10.0.1.200
+#spring.data.influxdb.token=${INFLUXDB_TOKEN:1NdDyN3LCKIEBFkQ1AqAmRSitZGfdCs0nuF11nLQbTcnN_5mp_asnfFnmAXTvDDQXGr83llxuXJu5wNTPtrsIw==}
+# 公网的
+spring.data.influxdb.token=${INFLUXDB_TOKEN:g2gXWbSJar3fmUKFkv4SVtTzPE-rX0-6aW5bDwgNOZXsD3tWL2PgAcCneH5WYcE9OmrMvLbvR-TMZrtX2d8ihQ==}
 spring.data.influxdb.org=${INFLUXDB_ORG:coldchain}
 spring.data.influxdb.bucket=${INFLUXDB_BUCKET:coldchain}