whyclxw
2024-11-04 f34db1213a5c287bbc9e5444e0fdb9108cc613ac
actm实时添加停止原因和放电记录inf加停止原因stopTypeReason,导出也修改
5个文件已修改
19 ■■■■■ 已修改文件
src/main/java/com/whyc/dto/A200stopReason.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/dto/ActmstopReason.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_lithium_ram_db/ActmRealstate.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/ExcelExportService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/dto/A200stopReason.java
@@ -2,7 +2,7 @@
public class A200stopReason {
    //a200停止原因
   /* //a200停止原因
    public  static String getStopReason(int stopType){
        String stopReason="未知";
        switch (stopType){
@@ -31,6 +31,6 @@
            case 23:stopReason="单体温度采集模块未连接";break;
        }
        return stopReason;
    }
    }*/
}
src/main/java/com/whyc/dto/ActmstopReason.java
@@ -1,7 +1,7 @@
package com.whyc.dto;
public class ActmstopReason {
    //actm停止原因
    /*//actm停止原因
    public  static String getStopReason(int stopType){
        String stopReason="未知";
        switch (stopType){
@@ -30,7 +30,7 @@
            case 23:stopReason="单体温度采集模块未连接";break;
        }
        return stopReason;
    }
    }*/
    //电池类型
    public  static String getBattType(int battType){
        String typeName="未知";
src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
@@ -128,4 +128,6 @@
    @TableField(exist = false)
    private String weekDay;
    @ApiModelProperty(value = "停止原因")
    private String stopTypeReason;
}
src/main/java/com/whyc/pojo/db_lithium_ram_db/ActmRealstate.java
@@ -121,4 +121,7 @@
    @ApiModelProperty(value = "电池数量")
    private int batteryMoncount;
    @ApiModelProperty(value = "停止原因")
    private String stopTypeReason;
}
src/main/java/com/whyc/service/ExcelExportService.java
@@ -183,13 +183,13 @@
        BatttestdataInf tinf=infService.getTinfExport(devId,testRecordCount);
        String[] titiles33=new String[]{"PACK/模组号:","测试开始时间:","测试结束时间:","数据类型:","停止原因:","预放容量(AH):"
                ,"放电电流(A):","测试时长(h:m:s):","单串下限(V):","组端下限(V):","电芯串数:","最高温度(°C):","最低温度(°C):","采集频率(秒):"};
        String[] titiles34=new String[]{tinf.getBatteryName(),ActionUtil.sdf.format(tinf.getTestStarttime()),ActionUtil.sdf.format(tinf.getRecordTime()), "放电数据",A200stopReason.getStopReason(tinf.getTestStoptype()),String.format("%.1f",tinf.getTestCap())
        String[] titiles34=new String[]{tinf.getBatteryName(),ActionUtil.sdf.format(tinf.getTestStarttime()),ActionUtil.sdf.format(tinf.getRecordTime()), "放电数据",tinf.getStopTypeReason(),String.format("%.1f",tinf.getTestCap())
                ,String.format("%.1f",tinf.getTestCurr()),ActionUtil.secToTime(tinf.getTestTimelong()),String.format("%.1f",tinf.getMonVolLow()),String.format("%.1f",tinf.getGroupVolLow()),String.valueOf(tinf.getBatteryNumber())
                ,String.format("%.1f",tinf.getMaxTemp()),String.format("%.1f",tinf.getMinTemp()),String.valueOf(tinf.getSaveInverter())};
        String[] titiles23=new String[]{"PACK/模组号:","测试开始时间:","测试结束时间:","数据类型:","停止原因:","充电限流(A):"
               ,"测试时长(h:m:s):","单串上限(V):","电流阀值(A):","电芯串数:","充电限压(V)","最高温度(°C):","最低温度(°C):","采集频率(秒):"};
        String[] titiles24=new String[]{tinf.getBatteryName(),ActionUtil.sdf.format(tinf.getTestStarttime()),ActionUtil.sdf.format(tinf.getRecordTime()), "充电数据",A200stopReason.getStopReason(tinf.getTestStoptype()),String.format("%.1f",tinf.getTestCurr())
        String[] titiles24=new String[]{tinf.getBatteryName(),ActionUtil.sdf.format(tinf.getTestStarttime()),ActionUtil.sdf.format(tinf.getRecordTime()), "充电数据",tinf.getStopTypeReason(),String.format("%.1f",tinf.getTestCurr())
                ,ActionUtil.secToTime(tinf.getTestTimelong()),String.format("%.1f",tinf.getMonVolHigh()),String.format("%.1f",tinf.getTestcurrLimit()),String.valueOf(tinf.getBatteryNumber())
                ,String.format("%.1f",tinf.getCharVoltage()),String.format("%.1f",tinf.getMaxTemp()),String.format("%.1f",tinf.getMinTemp()),String.valueOf(tinf.getSaveInverter())};
@@ -310,7 +310,7 @@
        String[] titiles3=new String[]{"电池包序号:","模组编号:","工作模式:","电池类型:","电池串数:","电压阀值(v):"
                ,"工作电流(A):","开始测试时间:","结束测试时间:","停止原因:"};
        String[] titiles4=new String[]{String.valueOf(tinf.getBattIdx()+1),tinf.getBatteryName(),ActmstopReason.getTestType(tinf.getTestType()),ActmstopReason.getBattType(tinf.getBattType()),String.valueOf(tinf.getBatteryNumber()),String.format("%.1f",tinf.getVolThreshold())
                ,String.format("%.1f",tinf.getTestCurr()), ActionUtil.sdf.format(tinf.getTestStarttime()),ActionUtil.sdf.format(tinf.getRecordTime()), ActmstopReason.getStopReason(tinf.getTestStoptype())};
                ,String.format("%.1f",tinf.getTestCurr()), ActionUtil.sdf.format(tinf.getTestStarttime()),ActionUtil.sdf.format(tinf.getRecordTime()), tinf.getStopTypeReason()};
        int rowNum=5;
        for (int i=0;i<titiles3.length;i++){