whyclxw
2025-02-13 d62fa80f3d12a56ae60eeef45f07cea6477c2507
6186
1个文件已修改
13 ■■■■■ 已修改文件
src/main/java/com/whyc/webSocket/RealTimeWebsocket.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
@@ -672,11 +672,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 +682,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);
    }