whyclxw
5 天以前 35030ce30b625cec394adee29b89d0b07352763a
src/main/java/com/whyc/webSocket/RealTimeSocket.java
@@ -261,10 +261,15 @@
                topDto.setPwrALmNum(pwrALmNum);
                //实时获取电源信息(是否存在电源告警信息)
                //PwrdevAcdcdata pwrdevAcdcdata = pwrdevAcdcdataService.getPwrRealInfo(realDto.getPowerId());
                topDto.setPwrState((pwrALmNum > 0 ? 1 : 0));
                topDto.setPwrStateName((pwrALmNum > 0 ? "电源异常" : "电源正常"));
                PwrdevAcdcdata pwrdevAcdcdata = pwrdevAcdcdataService.getPwrRealInfo(realDto.getPowerId());
                topDto.setPwrState(pwrdevAcdcdata.getIsJunCharge());
                //查看当前是否存在交流停电告警(is_jun_charge   电源是否均充[1-均充 0-浮充],若当前电源存在交流停电告警则显示停电其他按照状态展示。)
                int stopFalg=pwrdevAlarmService.judge3100014(realDto.getPowerId());
                if(stopFalg==1){
                    topDto.setPwrStateName("停电");
                }else{
                    topDto.setPwrStateName((pwrdevAcdcdata.getIsJunCharge()==1 ? "均充" : "浮充"));
                }
                Integer allALmNum = battALmNum + devALmNum + pwrALmNum;
                topDto.setAllALmNum(allALmNum);
                topDto.setSystemState((allALmNum > 0 ? 1 : 0));