fbo4831

lxw

2023-03-28 c42eb48cdd8b606bddb53f3166fa5f4604b7242c

fbo4831

 src/main/java/com/whyc/pojo/A059StationInf.java

@@ -47,6 +47,6 @@
    @ApiModelProperty("上一次更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date lastUpdateTime;
    @ApiModelProperty("机房类型[0:充放电一体机；1:FBO4830]；-1:全部")
    @ApiModelProperty("机房类型[0:充放电一体机；1:FBO4830,2:FBO4831]；-1:全部")
    private int stationType;
}

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

@@ -219,6 +219,9 @@
                            case "fbo4830":
                                res = getFbo4830(realTimePar);
                                break;
                            case "fbo4831":
                                res = getFbo4831(realTimePar);
                                break;
                            case "fbo4815":
                                res = getFbo4815(realTimePar);
                                break;
@@ -333,6 +336,27 @@
        return new Response().set(1, res);
    }

    //FBO4831的实时页面信息
    public Response getFbo4831(RealTimePar realTimePar) {
        Map<String, Response> res = new HashMap<>();
        //查询fbs9100信息
        Response f9100stateRes = f9100service.serchContactorState(realTimePar.getDevId());
        res.put("f9100state", f9100stateRes);
        //查询电池组端信息
        Response rtstateRes = rtstateservice.serchByCondition(realTimePar.getBattGroupId());
        res.put("rtstate", rtstateRes);
        //查询电池组单体信息
        Response rtdataRes = rtdataservice.serchByCondition(realTimePar.getBattGroupId());
        res.put("rtdata", rtdataRes);
        //锂电池数据
        /*Response li9130StateRes = li9130Service.search4830State(realTimePar.getDevId());
        res.put("li9130State", li9130StateRes);*/
        //最后一次核容放电数据
        /*Response tinfRes = batttestDataInfService.searchBattLastHrDataById(realTimePar.getBattGroupId(), realTimePar.getDevId());
        res.put("tinfdata", tinfRes);*/
        return new Response().set(1, res);
    }

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