fix 低电量报警改为电量耗尽

nb-admin/src/main/java/com/nb/admin/AdminApplication.java

@@ -10,7 +10,6 @@ import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.tio.websocket.starter.EnableTioWebSocketServer;

nb-common/config-common/src/main/java/com/nb/common/config/redis/RedissonClientAutoConfiguration.java

@@ -19,6 +19,7 @@ import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.data.redis.core.RedisOperations;
 import java.time.Duration;
 import java.util.*;
@@ -38,8 +39,8 @@ public class RedissonClientAutoConfiguration {
     @Bean(
         destroyMethod = "shutdown"
     )
-    @ConditionalOnMissingBean({RedissonClient.class})
-    public RedissonClient redisson() {
+    @Primary
+    public RedissonClient redissonClient() {
         Config config = new Config();
         SingleServerConfig singleServerConfig= config.useSingleServer();
         singleServerConfig.setDatabase(redisProperties.getDatabase());

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/constant/LocalBusConMixService.java

@@ -30,10 +30,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
-public class LocalBusConMixService extends AbstractConstantService<BusConMixMapper, BusConMixEntity,String> implements CommandLineRunner {
-    private Map<String, RMap<String,String>> wardMap=new HashMap<>();
-    @Autowired
-    private RedissonUtil redissonUtil;
+public class LocalBusConMixService extends AbstractConstantService<BusConMixMapper, BusConMixEntity,String> {
 
     @Override
     public void validateBeforeSave(BusConMixEntity entity) {
@@ -140,15 +137,4 @@ public class LocalBusConMixService extends AbstractConstantService<BusConMixMapp
 
         }
     }
-
-    @Override
-    public void run(String... args) {
-        List<BusConMixEntity> conList = list(new QueryWrapper<BusConMixEntity>().lambda().eq(BusConMixEntity::getType, ConstantMixEnum.ward));
-        Map<String, List<BusConMixEntity>> conByHospital = conList.stream().collect(Collectors.groupingBy(BusConMixEntity::getTenantId));
-        conByHospital.forEach((tenantId,cons)->{
-            RMap<String, String> rmap = wardMap.computeIfAbsent(tenantId, k -> redissonUtil.getRedissonClient().getMap(tenantId));
-            cons.stream().filter(con->StrUtil.isNotBlank(con.getCode())).forEach(con->rmap.putAsync(con.getCode(),con.getName()));
-        });
-
-    }
 }

nb-service/web-service/src/main/java/com/nb/web/service/bus/stats/entity/AlarmScatter.java

@@ -55,6 +55,15 @@ public class AlarmScatter extends LinkedHashMap<String, Map<String, AlarmScatter
 //        incrementValue(this.getOutOfControl(time));
 //    }
 
+    public AlarmScatter.AlarmStatsByTime getBatteryFinished(String time) {
+        return this.computeIfAbsent(DeviceAlarmEnum.LowBattery.getText(),k->new LinkedHashMap<>())
+                .computeIfAbsent(time,t->AlarmStatsByTime.of(time,0));
+    }
+    //
+    public void incrementBatteryFinished(String time) {
+        incrementValue(this.getBatteryFinished(time));
+    }
+
 
     public AlarmScatter.AlarmStatsByTime getAnalgesicPoor(String time) {
         return this.computeIfAbsent("镇痛不足",k->new LinkedHashMap<>())
@@ -184,11 +193,8 @@ public class AlarmScatter extends LinkedHashMap<String, Map<String, AlarmScatter
                 case Machine:
                     incrementMachine(time);
                     break;
-//                case OutOfControl:
-//                    incrementOutOfControl(time);
-//                    break;
                 case LowBattery:
-                    incrementLowBattery(time);
+                    incrementBatteryFinished(time);
                     break;
                 case Bubble:
                     incrementBubble(time);
@@ -207,6 +213,9 @@ public class AlarmScatter extends LinkedHashMap<String, Map<String, AlarmScatter
             if (DeviceStatusEnum.NoSignal.equals(runState)) {
                 incrementNoSignal(time);
             }
+            if(Boolean.TRUE.equals(alarmResult.getWarnLowBattery())){
+                incrementLowBattery(time);
+            }
             if(intelligent){
                 FlowStatusEnum warnFlow = alarmResult.getWarnFlow();
                 if(warnFlow!=null){
@@ -245,12 +254,12 @@ public class AlarmScatter extends LinkedHashMap<String, Map<String, AlarmScatter
         getLimit(time);
         getNoBox(time);
         getMachine(time);
-//        getOutOfControl(time);
         getLowBattery(time);
         getBubble(time);
         getInfusionMax(time);
         getAnalgesicPoor(time);
         getNoSignal(time);
+        getBatteryFinished(time);
         if(intelligent){
             getFlowUp(time);
             getFlowDown(time);