密码验证加-

whyclxw

2025-05-28 e16302f9d475c7cc4dd18c5abf1a23cb5502e362

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

@@ -324,7 +324,7 @@
                                res = getNibian6184(realTimePar,lang);
                                break;
                            case "nibian6186":
                                res = getNibian6186(realTimePar);
                                res = getNibian6186(realTimePar,lang);
                                break;
                        }
                        //实时显示调整,增加电池数量,标称单体电压,铅酸还是锂电，放置于返回结果的data2
@@ -635,9 +635,11 @@
        if(realTimePar.getStationId()!=null){
            //根据机房id获取机房下电源信息
            PowerInf pinf=pinfService.getPwrDevIdByStationId(realTimePar.getStationId());
            //查询电源的ACDC信息
            Response pwrdevAcdcRes=pwrdevAcdcservice.getDataByDevId(pinf.getPowerDeviceId());
            res.put("pwrdevAcdc",pwrdevAcdcRes);
            if(pinf!=null){
                //查询电源的ACDC信息（重庆bts4810(61850)需要用tb_pwrdev_acdcdata的实时负载电流和三相交流电压）
                Response pwrdevAcdcRes=pwrdevAcdcservice.getDataByDevId(pinf.getPowerDeviceId());
                res.put("pwrdevAcdc",pwrdevAcdcRes);
            }
        }

        return new Response().set(1, res);
@@ -672,11 +674,8 @@
    }

    //6186
    public Response getNibian6186(RealTimePar realTimePar) {
    public Response getNibian6186(RealTimePar realTimePar, String lang) {
        Map<String, Object> res = new HashMap<>();
        //获取逆变的其他信息
        Response fbs9100sBuscoupleState = fbs9100sBuscoupleStateService.serchByDevId(realTimePar.getDevId());
        res.put("fbs9100sBuscoupleState", fbs9100sBuscoupleState);
        //查询fbs9100信息
        Response f9100stateRes = f9100service.serchContactorState(realTimePar.getDevId());
        res.put("f9100state", f9100stateRes);
@@ -685,9 +684,9 @@
        //查询电池组单体信息
        Response rtdataRes = rtdataservice.serchByCondition(realTimePar.getBattGroupId());
        res.put("rtdata", rtdataRes);
        //获取615全功能逆变假负载开关以及逆变模块实时
        Response  qgnRes= qgnService.serchByDevId(realTimePar.getDevId());
        res.put("qgnRes", qgnRes);
        //最后一次核容放电数据
        Response tinfRes = batttestDataInfService.searchBattLastHrDataByIdDbs(realTimePar.getBattGroupId(), realTimePar.getDevId(), lang);
        res.put("tinfdata", tinfRes);
        return new Response().set(1, res);
    }