whyclxw
2024-12-27 9185e696678d15eb711fae5a792e9402af07c6a2
6183,6184停止原因
3个文件已修改
130 ■■■■■ 已修改文件
src/main/java/com/whyc/dto/BattTestData.java 113 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/Fbs9100StateService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/webSocket/RealTimeWebsocket.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/dto/BattTestData.java
@@ -1686,6 +1686,119 @@
        return stop_type;
    }
    // 6183_4放电终止原因:全功能假负载核容停止原因
    public static String getStopType_6183_4(int stop_type_t)
    {
        String stop_type = "无";
        switch(stop_type_t)
        {
            // 放电停止原因
            case 0:
                stop_type = "设备掉电终止";
                break;
            case 1:
                stop_type = "手动终止";
                break;
            case 2:
                stop_type = "放电时间到终止";
                break;
            case 3:
                stop_type = "放电容量到终止";
                break;
            case 4:
                stop_type = "单体电压下限到终止";
                break;
            case 5:
                stop_type = "单体温度上限到终止";
                break;
            case 6:
                stop_type = "组端电压下限到终止";
                break;
            case 7:
                stop_type = "市电中断终止";
                break;
            case 8:
                stop_type = "单体通信异常终止";
                break;
            case 9:
                stop_type = "存储数据满终止";
                break;
            case 10:
                stop_type = "机内温度异常终止";
                break;
            case 11:
                stop_type = "放电电流异常终止";
                break;
            case 12:
                stop_type = "后台通信中断终止";
                break;
            case 13:
                stop_type = "内部程序异常终止";
                break;
            case 14:
                stop_type = "电源电压高终止";
                break;
            case 15:
                stop_type = "协转通信异常";
                break;
            case 28:
                stop_type = "切换装置通信故障";
                break;
            case 29:
                stop_type = "切换装置故障";
                break;
            case 30:
                stop_type = "逆变器模块故障";
                break;
            case 31:
                stop_type = "负载功率小";
                break;
            case 33:
                stop_type = "母联通信异常";
                break;
            case 34:
                stop_type = "母联手动关闭或信号异常";
                break;
            case 35:
                stop_type = "逆变器通信故障";
                break;
            case 36:
                stop_type = "防雷器故障";
                break;
            case 37:
                stop_type = "机柜表头通信故障";
                break;
            case 38:
                stop_type = "限流充电模块故障";
                break;
            case 39:
                stop_type = "紧急停止";
                break;
            case 40:
                stop_type = "远程闭锁";
                break;
            case 41:
                stop_type = "切换装置开关异常";
                break;
            case 42:
                stop_type = "交流空开异常";
                break;
            case 43:
                stop_type = "交流接触器异常";
                break;
            case 44:
                stop_type = "直流空开异常";
                break;
            case 45:
                stop_type = "假负载异常停止";
                break;
            case 46:
                stop_type = "DCDC异常停止";
                break;
        }
        return stop_type;
    }
    // FBO_60010CT_ZX放电终止原因
    public static String getStopType_6001(int stop_type_t) {
        String stop_type = "其他";
src/main/java/com/whyc/service/Fbs9100StateService.java
@@ -54,7 +54,11 @@
        Fbs9100State fbs9100State = mapper.selectOne(wrapper);
        if (fbs9100State != null) {
            fbs9100State.setNote(new SimpleDateFormat(ActionUtil.time_yyyyMMddHHmmss).format(new Date()));
            fbs9100State.setDevLastCaptestStopTypeReason(BattTestData.getStopType_9612(fbs9100State.getDevLastCaptestStopType()));
            if((devId / 10000 == 6183)||(devId / 10000 == 6184)){
                fbs9100State.setDevLastCaptestStopTypeReason(BattTestData.getStopType_6183_4(fbs9100State.getDevLastCaptestStopType()));
            }else{
                fbs9100State.setDevLastCaptestStopTypeReason(BattTestData.getStopType_9612(fbs9100State.getDevLastCaptestStopType()));
            }
        }
        return new Response().setII(1, fbs9100State == null ? false : true, fbs9100State, "");
    }
src/main/java/com/whyc/webSocket/RealTimeWebsocket.java
@@ -649,14 +649,6 @@
        //查询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);*/
       //查询电池组端信息2组数据同时获取分开放
        List<Battinf> binfList=battInfService.getBattGroupInfoByFBSDeviceId(realTimePar.getDevId());
        if(binfList!=null){
@@ -669,9 +661,6 @@
                res.put("binf", binf);
            }
        }
        //最后一次核容放电数据
        Response tinfRes = batttestDataInfService.searchBattLastHrDataById(realTimePar.getBattGroupId(), realTimePar.getDevId(), lang);
        res.put("tinfdata", tinfRes);
        //获取615全功能逆变假负载开关以及逆变模块实时
        Response  qgnRes= qgnService.serchByDevId(realTimePar.getDevId());
        res.put("qgnRes", qgnRes);