lxw
2023-05-24 1f6e899e7c3683ebcaa28c77f4c84d9185942483
导出中英文切换放电类型
5个文件已修改
222 ■■■■ 已修改文件
src/main/java/com/whyc/dto/BattTestData.java 195 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BadBattMonService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/EchartPictureDowloadService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/i18n/message_en_US.properties 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/i18n/message_zh_CN.properties 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/dto/BattTestData.java
@@ -159,62 +159,167 @@
    //落后单体参数(组端电压>标称*test_stop)
    public static final float test_stop = 0.9f;
    //判断电池组的当前状态
    public static String battState(int num){
    /*public static String battState(int num){
        String state="";
        switch (num) {
        case 0:state= BattTestData.test_type0;break;
        case 1:state= BattTestData.test_type1;break;
        case 2:state= BattTestData.test_type2;break;
        case 3:state= BattTestData.test_type3;break;
        case 4:state= BattTestData.test_type4;break;
        case 5:state= BattTestData.test_type5;break;
        case 6:state= BattTestData.test_type6;break;
        case 7:state= BattTestData.test_type7;break;
        case 8:state= BattTestData.test_type8;break;
        case 9:state= BattTestData.test_type9;break;
            case 3:
                state = BattTestData.test_type3;
                break;
            case 4:
                state = BattTestData.test_type4;
                break;
            case 5:
                state = BattTestData.test_type5;
                break;
            case 6:
                state = BattTestData.test_type6;
                break;
            case 7:
                state = BattTestData.test_type7;
                break;
            case 8:
                state = BattTestData.test_type8;
                break;
            case 9:
                state = BattTestData.test_type9;
                break;
        }
        return state;
    }*/
    //判断电池组的当前状态
    public static String battState(int num) {
        String state = "";
        switch (num) {
            case 0:
                state = "test_type0";
                break;
            case 1:
                state = "test_type1";
                break;
            case 2:
                state = "test_type2";
                break;
            case 3:
                state = "test_type3";
                break;
            case 4:
                state = "test_type4";
                break;
            case 5:
                state = "test_type5";
                break;
            case 6:
                state = "test_type6";
                break;
            case 7:
                state = "test_type7";
                break;
            case 8:
                state = "test_type8";
                break;
            case 9:
                state = "test_type9";
                break;
        }
        return state;
    }
    //bts放电终止原因
    public static String getStopType(int dev_type, int stop_type_t)
    {
    public static String getStopType(int dev_type, int stop_type_t) {
        String stop_type = "未知";
        if(BattTestData.TEST_LOADER_FBI_IDCE == dev_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;
                }
        } else if(BattTestData.TEST_LOADER_FBS9100S == dev_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 16 : stop_type = "负载模块中断"; break;
                     case 17 : stop_type = "在线模块中断"; break;
                     case 18 : stop_type = "负载模块过功率"; break;
                     case 19 : stop_type = "内部程序异常"; break;
        if (BattTestData.TEST_LOADER_FBI_IDCE == dev_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;
            }
        } else if (BattTestData.TEST_LOADER_FBS9100S == dev_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 16:
                    stop_type = "负载模块中断";
                    break;
                case 17:
                    stop_type = "在线模块中断";
                    break;
                case 18:
                    stop_type = "负载模块过功率";
                    break;
                case 19:
                    stop_type = "内部程序异常";
                    break;
                }
        } else {
            stop_type = "手动停止";
src/main/java/com/whyc/service/BadBattMonService.java
@@ -211,7 +211,7 @@
            responseMap.put("threeYear", producerMap3);
            return new Response().set(1, responseMap, "不同品牌同一时间品质和同品牌同时间品质");
        } catch (Exception e) {
            return new Response().set(1, responseMap, e.toString());
            return new Response().set(1, responseMap, e.getCause().toString());
        }
    }
src/main/java/com/whyc/service/EchartPictureDowloadService.java
@@ -7,6 +7,7 @@
import com.whyc.pojo.*;
import com.whyc.util.ActionUtil;
import com.whyc.util.ExcelUtil;
import com.whyc.util.MessageUtils;
import com.whyc.util.ServletUtils;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
@@ -1669,7 +1670,7 @@
                rownum++;
                sheet1.createRow(rownum);
                sheet1.getRow(rownum).createCell(1).setCellValue("Test Type:" + BattTestData.battState(bmd.getSdata().getTestType()));
                sheet1.getRow(rownum).createCell(1).setCellValue("Test Type:" + MessageUtils.getMessageSocket(BattTestData.battState(bmd.getSdata().getTestType()), lang));
                sheet1.getRow(rownum).createCell(2).setCellValue("Test Time:" + formartDate(bmd.getSdata().getTestStarttime(), "yyyy-MM-dd HH:mm:ss"));
                sheet1.getRow(rownum).createCell(3).setCellValue("Test Curr:" + testCurr + "A");
                sheet1.getRow(rownum).createCell(4).setCellValue("Test TimeLong:" + formatTestLong(bmd.getSdata().getTestTimelong()));
src/main/resources/i18n/message_en_US.properties
@@ -89,4 +89,14 @@
LoginSucceeded=Login succeeded
AuthenticationFailed=authentication failed
AccountNotExist=Account does not exist
userNoPermitGroup=The current user does not have a corresponding permission group, login failed
userNoPermitGroup=The current user does not have a corresponding permission group, login failed
test_type0=NONE
test_type1=Floating charge
test_type2=charge
test_type3=discharge
test_type4=equalizing charge
test_type5=Conductivity/Internal Resistance
test_type6=Conductivity
test_type7=temperature
test_type8=connecting strip
test_type9=on-line monitoring
src/main/resources/i18n/message_zh_CN.properties
@@ -90,4 +90,14 @@
AuthenticationFailed=\u8BA4\u8BC1\u672A\u901A\u8FC7
AccountNotExist=\u8D26\u53F7\u4E0D\u5B58\u5728
userNoPermitGroup=\u5F53\u524D\u7528\u6237\u6CA1\u6709\u5BF9\u5E94\u7684\u6743\u9650\u7EC4,\u767B\u5F55\u5931\u8D25
test_type0=\u65E0
test_type1=\u6D6E\u5145
test_type2=\u5145\u7535
test_type3=\u653E\u7535
test_type4=\u5747\u5145
test_type5=\u7535\u5BFC/\u5185\u963B
test_type6=\u7535\u5BFC
test_type7=\u6E29\u5EA6
test_type8=\u8FDE\u63A5\u6761
test_type9=\u5728\u7EBF\u76D1\u6D4B