6186设备采用devAlarmstate来代表状态值

whycxzp

2025-03-07 3ef5d81da2dc09198c690eeb73c0fea6b7134f35

6186设备采用devAlarmstate来代表状态值

 src/main/java/com/whyc/service/Fbs9100StateService.java

@@ -265,7 +265,13 @@
            //上面的分组字段 只要能区分 不同的设备就行了. 因为如果是一拖二的情况,也可通过状态优先级来覆盖
            for (String deviceIp : deviceSet) {
                List<Fbs9100State> fbs9100States = deviceMap.get(deviceIp);
                List<Integer> workStateList = fbs9100States.stream().map(Fbs9100State::getDevWorkstate).collect(Collectors.toList());
                //存在6186设备,这个设备的设备状态值采用的是devAlarmState,所以需要单独处理
                List<Integer> workStateList;
                if(fbs9100States.get(0).getDevId().toString().startsWith("6186")){
                    workStateList = fbs9100States.stream().map(Fbs9100State::getDevAlarmstate).collect(Collectors.toList());
                }else {
                    workStateList = fbs9100States.stream().map(Fbs9100State::getDevWorkstate).collect(Collectors.toList());
                }
                Map<Integer, List<Integer>> workStateMap = workStateList.stream().collect(Collectors.groupingBy(Integer::intValue));
                Set<Integer> workStateSet = workStateMap.keySet();
                boolean commError = false;
@@ -349,7 +355,13 @@
            Date time = instance.getTime();
            for (String deviceIp : deviceSet) {
                List<Fbs9100State> fbs9100States = deviceMap.get(deviceIp);
                List<Integer> workStateList = fbs9100States.stream().map(Fbs9100State::getDevWorkstate).collect(Collectors.toList());
                //存在6186设备,这个设备的设备状态值采用的是devAlarmState,所以需要单独处理
                List<Integer> workStateList;
                if(fbs9100States.get(0).getDevId().toString().startsWith("6186")){
                    workStateList = fbs9100States.stream().map(Fbs9100State::getDevAlarmstate).collect(Collectors.toList());
                }else {
                    workStateList = fbs9100States.stream().map(Fbs9100State::getDevWorkstate).collect(Collectors.toList());
                }
                Map<Integer, List<Integer>> workStateMap = workStateList.stream().collect(Collectors.groupingBy(Integer::intValue));
                Set<Integer> workStateSet = workStateMap.keySet();
                boolean commError = false;