预警分析修改

whyclxw

2 天以前 f998f917f90d86499bf8a24c8912e270655e4d43

 src/main/java/com/whyc/webSocket/RealTimeSocket.java

@@ -241,7 +241,7 @@
                    topDto.setCaptestTimelong(deviceState.getDevCaptestTimelong());
                    topDto.setCaptestCap(deviceState.getDevCaptestCap());
                    //剩余容量和剩余时间计算
                    Float restCap = batttestdataInfService.getLastTestDataRestCap(realDto.getBattgroupId());
                    Float restCap = batttestdataInfService.getLastTestDataRestCap(binf.getMoncapstd(),realDto.getBattgroupId());
                    topDto.setRestCap(restCap);
                    //实时组端电流，剩余容量，标称容量
                    if(battRtstate!=null){
@@ -261,14 +261,19 @@
                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));
                topDto.setSystemStateName((allALmNum > 0 ? "系统异常" : "系统正常"));
                topDto.setSystemStateName((allALmNum > 0 ? "异常" : "正常"));
            }
            return new Response().setII(1, true, topDto, "实时页面头部数据推送");
        } catch (Exception e) {
@@ -297,7 +302,7 @@
    private Response getManagePage(RealTimeDto realDto) {
        Map<String, Object> map=new HashMap<>();
        try {
            StationInf sinf=stationInfService.getStationInfById(realDto.getStaitonId());
            StationInf sinf=stationInfService.getStationInfById(realDto.getStationId());
            map.put("sinf",sinf);
            PowerInf pinf=powerInfService.getPowerInfById(realDto.getPowerId());
            map.put("pinf",pinf);
@@ -445,6 +450,9 @@
            //实时获取电源信息
            PwrdevAcdcdata pwrdevAcdcdata = pwrdevAcdcdataService.getPwrRealInfo(realDto.getPowerId());
            map.put("pwrdevAcdcdata",pwrdevAcdcdata!=null?pwrdevAcdcdata:"");
            //电源对象(整流器使用情况)
            PowerInf powerInf = powerInfService.getPowerInfById(realDto.getPowerId());
            map.put("powerInf",powerInf!=null?powerInf:"");
            map.put("pageType",realDto.getPageType());
            return new Response().setII(1,true,map,"电源界面信息推送");
        }catch (Exception e){