9141

lxw

2023-04-01 654c12117972ecf15e83864f860225ad71aeb88a

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

@@ -228,6 +228,9 @@
                            case "kgdy":
                                res = getKgdy(realTimePar);
                                break;
                            case "paralle":
                                res = getParalle(realTimePar);
                                break;
                        }
                        //实时显示调整,增加电池数量,标称单体电压,铅酸还是锂电，放置于返回结果的data2
                        Battinf battinf = battInfService.getBattGroupInfoByBattGroupId(realTimePar.getBattGroupId());
@@ -372,6 +375,58 @@
        return new Response().set(1, res);
    }

    //并联电源的实时页面信息
    public Response getParalle(RealTimePar realTimePar) {
        Map<String, Response> res = new HashMap<>();
        if (realTimePar.getDevType() == DeviceTypeDTO.DEVICELD94019) {//ld-9
            //ld-9数据
            Response ld9Res = ld9Service.searchByDevId(realTimePar.getDevId());
            res.put("ld9", ld9Res);
        } else if (realTimePar.getDevType() == DeviceTypeDTO.DEVICEBTS9120 || realTimePar.getDevType() == DeviceTypeDTO.DEVICEBTS9110) {
            //获取逆变的其他信息
            Response fbs9100sBuscoupleState = fbs9100sBuscoupleStateService.serchByDevId(realTimePar.getDevId());
            res.put("fbs9100sBuscoupleState", fbs9100sBuscoupleState);
            //查询fbs9100信息
            Response f9100stateRes = f9100service.serchContactorState(realTimePar.getDevId());
            res.put("f9100state", f9100stateRes);
        } else {
            //查询fbs9100信息
            Response f9100stateRes = f9100service.serchContactorState(realTimePar.getDevId());
            res.put("f9100state", f9100stateRes);
        }
        //查询电池组端信息
        Response rtstateRes = rtstateservice.serchByCondition(realTimePar.getBattGroupId());
        res.put("rtstate", rtstateRes);
        if (realTimePar.getDevType() == DeviceTypeDTO.DEVICE9140 || realTimePar.getDevType() == DeviceTypeDTO.DEVICE9141) {
            //9140设备要将2组电池的组端信息都给他
            Response rtstate9140Res = rtstateservice.serch9140Info(realTimePar.getDevId());
            res.put("rtstate9140Res", rtstate9140Res);
        }

        //查询电池组单体信息
        Response rtdataRes = rtdataservice.serchByCondition(realTimePar.getBattGroupId());
        res.put("rtdata", rtdataRes);
        //查询fod信息
        Response fodRes = fodservice.serchByCondition(realTimePar.getBattGroupId());
        res.put("fod", fodRes);
        //电池告警
        Response rtalarmRes = rtalarmService.getInfo(realTimePar.getBattGroupId());
        res.put("rtalarm", rtalarmRes);
        //组端告警
        Response rsalarmRes = rsalarmService.getInfo(realTimePar.getBattGroupId());
        res.put("rsalarm", rsalarmRes);

        if (realTimePar.getDevType() == DeviceTypeDTO.DEVICE9130 || realTimePar.getDevType() == DeviceTypeDTO.DEVICE9131) {//正常锂电池
            //锂电池数据
            Response li9130Res = li9130Service.searchParam(realTimePar.getDevId(), realTimePar.getGroupNum());
            res.put("li9130", li9130Res);
        }
        //最后一次核容放电数据
        Response tinfRes = batttestDataInfService.searchBattLastHrDataById(realTimePar.getBattGroupId(), realTimePar.getDevId());
        res.put("tinfdata", tinfRes);
        return new Response().set(1, res);
    }

    //标准的实时页面信息
    public Response getStandard(RealTimePar realTimePar) {
        Map<String, Response> res = new HashMap<>();