lxw
2023-03-29 819fb83ae325ae7495f0c1c9b58968f77ed99cdb
4831
4个文件已修改
557 ■■■■ 已修改文件
src/main/java/com/whyc/controller/Fbs9100SetparamController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/dto/BattTestData.java 530 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BatttestdataInfService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/Fbs9100SetparamService.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/Fbs9100SetparamController.java
@@ -145,10 +145,10 @@
    @ApiOperation(tags = "在线监测-实时监控", value = "在线监测-实时监控-读取FBO_4831放电参数")
    @GetMapping("searchFBO4831Param")
    public Response searchFBO4831Param(@RequestParam int opCmd, @RequestParam int devId) {
        return service.searchFBO4830Param(opCmd, devId);
        return service.searchFBO4831Param(opCmd, devId);
    }
    @ApiOperation(tags = "在线监测-实时监控", value = "在线监测-实时监控-设置FBO_4831放电参数")
/*    @ApiOperation(tags = "在线监测-实时监控", value = "在线监测-实时监控-设置FBO_4831放电参数")
    @PostMapping("updateFBO4831Param")
    public Response updateFBO4831Param(@RequestBody Fbs9100Setparam a059setParam) {
        return service.updateFBO4830Param(a059setParam);
@@ -158,7 +158,7 @@
    @GetMapping("controllerFBO4831")
    public Response controllerFBO4831(@RequestParam int opCmd, @RequestParam int devId) {
        return service.controllerFBO4830(opCmd, devId);
    }
    }*/
    @ApiOperation(tags = "在线监测-实时监控", value = "在线监测-实时监控-读取kgdy放电参数")
src/main/java/com/whyc/dto/BattTestData.java
@@ -520,129 +520,433 @@
        switch(stop_type_t)
        {
            // 放电停止原因
            case 0x00: stop_type = "手动停止"; break;
            case 0x01: stop_type = "放电时间到"; break;
            case 0x02: stop_type = "放电容量到"; break;
            case 0x03: stop_type =    "单体下限到"; break;
            case 0x04: stop_type = "组端下限到"; break;
            case 0x05: stop_type = "市电中断"; break;
            case 0x06: stop_type = "内存不足"; break;
            case 0x07: stop_type =    "温度异常高"; break;
            case 0x08: stop_type =    "正在放电"; break;
            case 0x09: stop_type =    "手动暂停"; break;
            case 0x0A: stop_type = "暂停放电"; break;
            case 0x0B: stop_type = "通信故障"; break;
            case 0x0C: stop_type = "电流故障"; break;
            case 0x0D: stop_type = "压差上限到"; break;
            case 0x0E: stop_type = "组端电压异常"; break;
            case 0x0F: stop_type = "风扇异常"; break;
            case 0x10: stop_type = "整流器电压异常"; break;
            case 0x11: stop_type = "IGBT异常"; break;
            case 0x12: stop_type = "辅助电源异常"; break;
            case 0x13: stop_type = "单体温度异常高"; break;
            case 0x14: stop_type = "BMS通信异常"; break;
            case 0x15: stop_type = "存储异常"; break;
            case 0x16: stop_type = "从机断开或通讯异常"; break;
            case 0x17: stop_type = "从机状态异常"; break;
            case 0x18: stop_type = "紧急停止"; break;
            case 0x19: stop_type = "SOC下限到"; break;
            case 0x00:
                stop_type = "手动停止";
                break;
            case 0x01:
                stop_type = "放电时间到";
                break;
            case 0x02:
                stop_type = "放电容量到";
                break;
            case 0x03:
                stop_type = "单体下限到";
                break;
            case 0x04:
                stop_type = "组端下限到";
                break;
            case 0x05:
                stop_type = "市电中断";
                break;
            case 0x06:
                stop_type = "内存不足";
                break;
            case 0x07:
                stop_type = "温度异常高";
                break;
            case 0x08:
                stop_type = "正在放电";
                break;
            case 0x09:
                stop_type = "手动暂停";
                break;
            case 0x0A:
                stop_type = "暂停放电";
                break;
            case 0x0B:
                stop_type = "通信故障";
                break;
            case 0x0C:
                stop_type = "电流故障";
                break;
            case 0x0D:
                stop_type = "压差上限到";
                break;
            case 0x0E:
                stop_type = "组端电压异常";
                break;
            case 0x0F:
                stop_type = "风扇异常";
                break;
            case 0x10:
                stop_type = "整流器电压异常";
                break;
            case 0x11:
                stop_type = "IGBT异常";
                break;
            case 0x12:
                stop_type = "辅助电源异常";
                break;
            case 0x13:
                stop_type = "单体温度异常高";
                break;
            case 0x14:
                stop_type = "BMS通信异常";
                break;
            case 0x15:
                stop_type = "存储异常";
                break;
            case 0x16:
                stop_type = "从机断开或通讯异常";
                break;
            case 0x17:
                stop_type = "从机状态异常";
                break;
            case 0x18:
                stop_type = "紧急停止";
                break;
            case 0x19:
                stop_type = "SOC下限到";
                break;
            // 充电停止原因
            case 0x40: stop_type = "停止充电"; break;
            case 0x41: stop_type = "暂停充电"; break;
            case 0x42: stop_type = "正在充电"; break;
            case 0x43: stop_type = "充电时间到"; break;
            case 0x44: stop_type = "充电容量到"; break;
            case 0x45: stop_type = "单体上限到"; break;
            case 0x46: stop_type = "充电已完成"; break;
            case 0x47: stop_type = "市电中断"; break;
            case 0x48: stop_type = "温度异常高"; break;
            case 0x49: stop_type = "通信故障"; break;
            case 0x4A: stop_type = "充电模块异常"; break;
            case 0x4B: stop_type = "组端上限到"; break;
            case 0x4C: stop_type = "压差上限到"; break;
            case 0x4D: stop_type = "电流异常"; break;
            case 0x4E: stop_type = "组端电压异常"; break;
            case 0x4F: stop_type = "风扇异常"; break;
            case 0x50: stop_type = "整流器电压异常"; break;
            case 0x51: stop_type = "IGBT异常"; break;
            case 0x52: stop_type = "辅助电源异常"; break;
            case 0x53: stop_type = "单体温度异常高"; break;
            case 0x54: stop_type = "BMS通信异常"; break;
            case 0x55: stop_type = "存储异常"; break;
            case 0x56: stop_type = "从机断开或通讯异常"; break;
            case 0x57: stop_type = "从机状态异常"; break;
            case 0x58: stop_type = "紧急停止"; break;
            case 0x59: stop_type = "SOC上限到"; break;
            case 0x5A: stop_type = "直充充电"; break;
            case 0x5B: stop_type = "正在充电监测"; break;
            case 0x40:
                stop_type = "停止充电";
                break;
            case 0x41:
                stop_type = "暂停充电";
                break;
            case 0x42:
                stop_type = "正在充电";
                break;
            case 0x43:
                stop_type = "充电时间到";
                break;
            case 0x44:
                stop_type = "充电容量到";
                break;
            case 0x45:
                stop_type = "单体上限到";
                break;
            case 0x46:
                stop_type = "充电已完成";
                break;
            case 0x47:
                stop_type = "市电中断";
                break;
            case 0x48:
                stop_type = "温度异常高";
                break;
            case 0x49:
                stop_type = "通信故障";
                break;
            case 0x4A:
                stop_type = "充电模块异常";
                break;
            case 0x4B:
                stop_type = "组端上限到";
                break;
            case 0x4C:
                stop_type = "压差上限到";
                break;
            case 0x4D:
                stop_type = "电流异常";
                break;
            case 0x4E:
                stop_type = "组端电压异常";
                break;
            case 0x4F:
                stop_type = "风扇异常";
                break;
            case 0x50:
                stop_type = "整流器电压异常";
                break;
            case 0x51:
                stop_type = "IGBT异常";
                break;
            case 0x52:
                stop_type = "辅助电源异常";
                break;
            case 0x53:
                stop_type = "单体温度异常高";
                break;
            case 0x54:
                stop_type = "BMS通信异常";
                break;
            case 0x55:
                stop_type = "存储异常";
                break;
            case 0x56:
                stop_type = "从机断开或通讯异常";
                break;
            case 0x57:
                stop_type = "从机状态异常";
                break;
            case 0x58:
                stop_type = "紧急停止";
                break;
            case 0x59:
                stop_type = "SOC上限到";
                break;
            case 0x5A:
                stop_type = "直充充电";
                break;
            case 0x5B:
                stop_type = "正在充电监测";
                break;
        }
        return stop_type;
    }
    // FBO4830放电终止原因
    public static String getStopType_4815(int stop_type_t)
    {
    // FBO4831放电终止原因
    public static String getStopType_4831(int stop_type_t) {
        String stop_type = "其他";
        switch(stop_type_t)
        {
        switch (stop_type_t) {
            // 放电停止原因
            case 0x00: stop_type = "手动停止"; break;
            case 0x01: stop_type = "放电时间到"; break;
            case 0x02: stop_type = "放电容量到"; break;
            case 0x03: stop_type =    "单体下限到"; break;
            case 0x04: stop_type = "组端下限到"; break;
            case 0x05: stop_type = "市电中断"; break;
            case 0x06: stop_type = "内存不足"; break;
            case 0x07: stop_type =    "温度异常高"; break;
            case 0x08: stop_type =    "正在放电"; break;
            case 0x09: stop_type =    "手动暂停"; break;
            case 0x0A: stop_type = "暂停放电"; break;
            case 0x0B: stop_type = "通信故障"; break;
            case 0x0C: stop_type = "电流故障"; break;
            case 0x0D: stop_type = "压差上限到"; break;
            case 0x0E: stop_type = "组端电压异常"; break;
            case 0x0F: stop_type = "风扇异常"; break;
            case 0x10: stop_type = "整流器电压异常"; break;
            case 0x11: stop_type = "IGBT异常"; break;
            case 0x12: stop_type = "辅助电源异常"; break;
            case 0x13: stop_type = "单体温度异常高"; break;
            case 0x14: stop_type = "BMS通信异常"; break;
            case 0x15: stop_type = "存储异常"; break;
            case 0x16: stop_type = "从机断开或通讯异常"; break;
            case 0x17: stop_type = "从机状态异常"; break;
            case 0x18: stop_type = "紧急停止"; break;
            case 0x19: stop_type = "SOC下限到"; break;
            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 16:
                stop_type = "整流器电压异常";
                break;
            case 17:
                stop_type = "IGBT异常";
                break;
            case 18:
                stop_type = "辅助电源异常";
                break;
            case 19:
                stop_type = "CSV文件太大,请删除";
                break;
            case 20:
                stop_type = "从机通信异常";
                break;
            case 21:
                stop_type = "从机状态异常";
                break;
            case 22:
                stop_type = "主机通信异常";
                break;
            case 23:
                stop_type = "紧急停止";
                break;
            case 24:
                stop_type = "硬件并机失败";
                break;
            case 25:
                stop_type = "操作频繁";
                break;
            case 26:
                stop_type = "未知";
                break;
        }
        return stop_type;
    }
    // FBO4815放电终止原因
    public static String getStopType_4815(int stop_type_t) {
        String stop_type = "其他";
        switch (stop_type_t) {
            // 放电停止原因
            case 0x00:
                stop_type = "手动停止";
                break;
            case 0x01:
                stop_type = "放电时间到";
                break;
            case 0x02:
                stop_type = "放电容量到";
                break;
            case 0x03:
                stop_type = "单体下限到";
                break;
            case 0x04:
                stop_type = "组端下限到";
                break;
            case 0x05:
                stop_type = "市电中断";
                break;
            case 0x06:
                stop_type = "内存不足";
                break;
            case 0x07:
                stop_type = "温度异常高";
                break;
            case 0x08:
                stop_type = "正在放电";
                break;
            case 0x09:
                stop_type = "手动暂停";
                break;
            case 0x0A:
                stop_type = "暂停放电";
                break;
            case 0x0B:
                stop_type = "通信故障";
                break;
            case 0x0C:
                stop_type = "电流故障";
                break;
            case 0x0D:
                stop_type = "压差上限到";
                break;
            case 0x0E:
                stop_type = "组端电压异常";
                break;
            case 0x0F:
                stop_type = "风扇异常";
                break;
            case 0x10:
                stop_type = "整流器电压异常";
                break;
            case 0x11:
                stop_type = "IGBT异常";
                break;
            case 0x12:
                stop_type = "辅助电源异常";
                break;
            case 0x13:
                stop_type = "单体温度异常高";
                break;
            case 0x14:
                stop_type = "BMS通信异常";
                break;
            case 0x15:
                stop_type = "存储异常";
                break;
            case 0x16:
                stop_type = "从机断开或通讯异常";
                break;
            case 0x17:
                stop_type = "从机状态异常";
                break;
            case 0x18:
                stop_type = "紧急停止";
                break;
            case 0x19:
                stop_type = "SOC下限到";
                break;
            // 充电停止原因
            case 0x40: stop_type = "停止充电"; break;
            case 0x41: stop_type = "暂停充电"; break;
            case 0x42: stop_type = "正在充电"; break;
            case 0x43: stop_type = "充电时间到"; break;
            case 0x44: stop_type = "充电容量到"; break;
            case 0x45: stop_type = "单体上限到"; break;
            case 0x46: stop_type = "充电已完成"; break;
            case 0x47: stop_type = "市电中断"; break;
            case 0x48: stop_type = "温度异常高"; break;
            case 0x49: stop_type = "通信故障"; break;
            case 0x4A: stop_type = "充电模块异常"; break;
            case 0x4B: stop_type = "组端上限到"; break;
            case 0x4C: stop_type = "压差上限到"; break;
            case 0x4D: stop_type = "电流异常"; break;
            case 0x4E: stop_type = "组端电压异常"; break;
            case 0x4F: stop_type = "风扇异常"; break;
            case 0x50: stop_type = "整流器电压异常"; break;
            case 0x51: stop_type = "IGBT异常"; break;
            case 0x52: stop_type = "辅助电源异常"; break;
            case 0x53: stop_type = "单体温度异常高"; break;
            case 0x54: stop_type = "BMS通信异常"; break;
            case 0x55: stop_type = "存储异常"; break;
            case 0x56: stop_type = "从机断开或通讯异常"; break;
            case 0x57: stop_type = "从机状态异常"; break;
            case 0x58: stop_type = "紧急停止"; break;
            case 0x59: stop_type = "SOC上限到"; break;
            case 0x5A: stop_type = "直充充电"; break;
            case 0x5B: stop_type = "正在充电监测"; break;
            case 0x40:
                stop_type = "停止充电";
                break;
            case 0x41:
                stop_type = "暂停充电";
                break;
            case 0x42:
                stop_type = "正在充电";
                break;
            case 0x43:
                stop_type = "充电时间到";
                break;
            case 0x44:
                stop_type = "充电容量到";
                break;
            case 0x45:
                stop_type = "单体上限到";
                break;
            case 0x46:
                stop_type = "充电已完成";
                break;
            case 0x47:
                stop_type = "市电中断";
                break;
            case 0x48:
                stop_type = "温度异常高";
                break;
            case 0x49:
                stop_type = "通信故障";
                break;
            case 0x4A:
                stop_type = "充电模块异常";
                break;
            case 0x4B:
                stop_type = "组端上限到";
                break;
            case 0x4C:
                stop_type = "压差上限到";
                break;
            case 0x4D:
                stop_type = "电流异常";
                break;
            case 0x4E:
                stop_type = "组端电压异常";
                break;
            case 0x4F:
                stop_type = "风扇异常";
                break;
            case 0x50:
                stop_type = "整流器电压异常";
                break;
            case 0x51:
                stop_type = "IGBT异常";
                break;
            case 0x52:
                stop_type = "辅助电源异常";
                break;
            case 0x53:
                stop_type = "单体温度异常高";
                break;
            case 0x54:
                stop_type = "BMS通信异常";
                break;
            case 0x55:
                stop_type = "存储异常";
                break;
            case 0x56:
                stop_type = "从机断开或通讯异常";
                break;
            case 0x57:
                stop_type = "从机状态异常";
                break;
            case 0x58:
                stop_type = "紧急停止";
                break;
            case 0x59:
                stop_type = "SOC上限到";
                break;
            case 0x5A:
                stop_type = "直充充电";
                break;
            case 0x5B:
                stop_type = "正在充电监测";
                break;
        }
        return stop_type;
    }
src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -59,13 +59,16 @@
                } else if (fbsDeviceId / 100000 == 8059) {
                    //一体机设备放电停止原因
                    tinf.setTestStoptypeReason(BattTestData.getStopType_8059(tinf.getTestStoptype()));
                } else if(fbsDeviceId / 100000 == 6087) {
                } else if (fbsDeviceId / 100000 == 6087) {
                    //电操核容设备放电停止原因
                    tinf.setTestStoptypeReason(BattTestData.getStopType_6087(tinf.getTestStoptype()));
                }else if(fbsDeviceId / 100000 == 4830) {
                } else if (fbsDeviceId / 100000 == 4830) {
                    //FBO4830设备放电停止原因
                    tinf.setTestStoptypeReason(BattTestData.getStopType_4830(tinf.getTestStoptype()));
                }else if(fbsDeviceId / 100000 == 4815) {
                } else if (fbsDeviceId / 100000 == 4831) {
                    //FBO4831设备放电停止原因
                    tinf.setTestStoptypeReason(BattTestData.getStopType_4831(tinf.getTestStoptype()));
                } else if (fbsDeviceId / 100000 == 4815) {
                    //FBO4815设备放电停止原因
                    tinf.setTestStoptypeReason(BattTestData.getStopType_4815(tinf.getTestStoptype()));
                } else {
src/main/java/com/whyc/service/Fbs9100SetparamService.java
@@ -455,7 +455,17 @@
        wrapper.eq("dev_id", devId);
        boolean bl = sendCmdToFBS9100Dev(opCmd, 0, devId);
        Fbs9100Setparam a059param = mapper.selectOne(wrapper);
        return new Response().setII(1, bl, a059param, bl == true ? "读取参数成功!" : "读取A059参数失败,请检查网络!");
        return new Response().setII(1, bl, a059param, bl == true ? "读取参数成功!" : "读取FBO_4830参数失败,请检查网络!");
    }
    //在线监测-实时监控-读取FBO_4831放电参数
    public Response searchFBO4831Param(int opCmd, int devId) {
        PageHelper.startPage(1, 1);
        QueryWrapper wrapper = new QueryWrapper();
        wrapper.eq("dev_id", devId);
        boolean bl = sendCmdToFBS9100Dev(opCmd, 0, devId);
        Fbs9100Setparam a059param = mapper.selectOne(wrapper);
        return new Response().setII(1, bl, a059param, bl == true ? "读取参数成功!" : "读取FBO_4831参数失败,请检查网络!");
    }
    //在线监测-实时监控-设置FBO_4830放电参数