更新

whyczh

2022-03-21 273dbf11feb20fdd97c8d6e4577732956cae195a

更新

 src/main/java/testElectronJ/FboDataHeadStart.java

@@ -1,6 +1,8 @@
package testElectronJ;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.extern.slf4j.Slf4j;
import org.springframework.format.annotation.DateTimeFormat;

import java.nio.ByteBuffer;
import java.nio.ByteOrder;
@@ -33,6 +35,7 @@
    public int batt_mon_num;                       //单体数量                                1
    public float batt_mon_vol;                   //单体电压 0.1                            2        =100        
    public DateTime TestStartTime;                //放电开始的时间                        6
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    public Date testStartTime;
    public int Device;                             //仪表类型 未使用                        1
    public int DataVersion;                        //数据版本                                1

 src/main/java/testElectronJ/TestController.java

@@ -49,6 +49,9 @@
        String cap_echart = req.getParameter("cap_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("tempEnvi_echart");//环境湿度折线图


        String filePath = req.getParameter("filePath");
        FboDataInf  fboDataInf = new FboDataInf();
@@ -85,6 +88,14 @@
                String[] url = vol_echart.split(",");
                bytes.add(new BASE64Decoder().decodeBuffer(url[1]));
            }
            if (ServletUtils.isNotNull(tempEnvi_echart)) {
                String[] url = tempEnvi_echart.split(",");
                bytes.add(new BASE64Decoder().decodeBuffer(url[1]));
            }
            if (ServletUtils.isNotNull(HumiEnvi_echart)) {
                String[] url = HumiEnvi_echart.split(",");
                bytes.add(new BASE64Decoder().decodeBuffer(url[1]));
            }
        }catch (Exception e){
            e.printStackTrace();
        }
@@ -117,7 +128,7 @@
        sheet.getRow(rowNumSheet).createCell(1).setCellValue("单体数量："+start.batt_mon_num);
        rowNumSheet++;
        sheet.createRow(rowNumSheet);
        sheet.getRow(rowNumSheet).createCell(0).setCellValue("测试开始时间："+formartDate(start.testStartTime,"yyyy-MM-dd"));
        sheet.getRow(rowNumSheet).createCell(0).setCellValue("测试开始时间："+formartDate(start.testStartTime,"yyyy-MM-dd HH:mm:ss"));
        sheet.getRow(rowNumSheet).createCell(1).setCellValue("测试时长："+stop.TestTimeLong.hms());
        rowNumSheet++;
        sheet.createRow(rowNumSheet);
@@ -129,9 +140,7 @@
        rowNumSheet+=2;
        //插入图片
        int picNum = 0;
        String[] picName = new String[]{
                "电池电流折线图","组端电压折线图","测试容量折线图","实际容量折线图","单体电压折线图"
        };
        String[] picName = getPicName(start.DataType);
        if (picName.length==bytes.size()){
            for(int i=0;i<picName.length;i++){
                sheet.createRow(rowNumSheet-1);
@@ -217,6 +226,20 @@
        }
    }

    public String[] getPicName(int dateType){
        if (dateType==0xFB){
            String[] picName1 = new String[]{
                    "电池电流折线图","组端电压折线图","测试容量折线图","实际容量折线图","单体电压折线图","环境温度折线图","环境湿度折线图"
            };
            return picName1;
        }else{
            String[] picName = new String[]{
                    "电池电流折线图","组端电压折线图","测试容量折线图","实际容量折线图","单体电压折线图"
            };
            return picName;
        }
    }


    /**
     * 将日期格式转换成指定的字符串格式