更新

whyczh

2022-03-21 79f5048aeb1f0f4ac3e3300bcd3f23d3296cc8e5

更新

 src/main/java/testElectronJ/TestController.java

@@ -48,7 +48,7 @@
        String curr_echart = req.getParameter("curr_echart");        //电池电流折线图
        String groupVol_echart = req.getParameter("groupVol_echart");        //组端电压折线图
        String cap_echart = req.getParameter("cap_echart");            //测试容量折线图
        String actualCap_echart = req.getParameter("actualCap_echart");            //实际容量折线图
        //String actualCap_echart = req.getParameter("actualCap_echart");            //实际容量折线图
        String vol_echart = req.getParameter("vol_echart");            //单体电压折线图
        String tempEnvi_echart = req.getParameter("tempEnvi_echart");//环境温度折线图
        String humiEnvi_echart = req.getParameter("humiEnvi_echart");//环境湿度折线图
@@ -81,10 +81,10 @@
                String[] url = cap_echart.split(",");
                bytes.add(new BASE64Decoder().decodeBuffer(url[1]));
            }
            if (ServletUtils.isNotNull(actualCap_echart)) {
                String[] url = actualCap_echart.split(",");
                bytes.add(new BASE64Decoder().decodeBuffer(url[1]));
            }
            //if (ServletUtils.isNotNull(actualCap_echart)) {
            //    String[] url = actualCap_echart.split(",");
            //    bytes.add(new BASE64Decoder().decodeBuffer(url[1]));
            //}
            if (ServletUtils.isNotNull(vol_echart)) {
                String[] url = vol_echart.split(",");
                bytes.add(new BASE64Decoder().decodeBuffer(url[1]));
@@ -127,18 +127,23 @@

        sheet.getRow(rowNumSheet).createCell(0).setCellValue("安装日期："+start.batt_date_str);
        sheet.getRow(rowNumSheet).createCell(1).setCellValue("单体数量："+start.batt_mon_num);
        sheet.getRow(rowNumSheet).createCell(2).setCellValue("标称容量："+start.batt_std_cap+"AH");
        rowNumSheet++;
        sheet.createRow(rowNumSheet);
        sheet.getRow(rowNumSheet).createCell(0).setCellValue("测试开始时间："+formartDate(start.testStartTime,"yyyy-MM-dd HH:mm:ss"));
        sheet.getRow(rowNumSheet).createCell(1).setCellValue("测试时长："+stop.TestTimeLong.hms());
        sheet.getRow(rowNumSheet).createCell(2).setCellValue("标称电导："+start.batt_std_cte);
        rowNumSheet++;
        sheet.createRow(rowNumSheet);
        sheet.getRow(rowNumSheet).createCell(0).setCellValue("正极绝缘电阻："+list.get(list.size()-1).PosInsRes+"kΩ");
        sheet.getRow(rowNumSheet).createCell(1).setCellValue("负极绝缘电阻："+list.get(list.size()-1).NegInsRes+"kΩ");
        sheet.getRow(rowNumSheet).createCell(2).setCellValue("标称内阻："+start.batt_std_res+"kΩ");
        if(start.DataType==0xFD){
            sheet.getRow(rowNumSheet).createCell(2).setCellValue("预估实际容量："+list.get(list.size()-1).actualCap+"AH");
            rowNumSheet++;
            sheet.createRow(rowNumSheet);
            sheet.getRow(rowNumSheet).createCell(0).setCellValue("预估实际容量："+list.get(list.size()-1).actualCap+"AH");
        }
        rowNumSheet+=2;
        rowNumSheet+=4;
        //插入图片
        int picNum = 0;
        String[] picName = getPicName(start.DataType);
@@ -218,10 +223,10 @@

    public String[] getRowName(int dateType){
        if (dateType==0xFB){
            String[] rowName = {"测试时间","总电压","总电流","环境温度","环境湿度"};
            String[] rowName = {"测试时间","总电压(V)","总电流(A)","环境温度","环境湿度"};
            return rowName;
        }else{
            String[] rowName1 = {"测试时间","总电压","总电流","环境温度","环境湿度","测试容量"};
            String[] rowName1 = {"测试时间","总电压(V)","总电流(A)","环境温度","环境湿度","测试容量(AH)"};
            return rowName1;
        }
    }