修改历史数据double改成float

DELL

2024-12-23 626c7181ec3ce98bd0a1440688677987ca391cb1

修改历史数据double改成float

 src/main/java/com/whyc/bts/BTS_BattData.java

@@ -9,22 +9,22 @@
    public BTS_TestTime testTime = new BTS_TestTime();      //测试时长
    public int monCount = 1;        //单体数量

    public double onlineVol;        //在线电压
    public double groupVol;            //组端电压
    public float onlineVol;        //在线电压
    public float groupVol;            //组端电压
    public int battState;            //充放电状态     3   5   9
    public double battCurr;            //电池组电流
    public double battCap;            //电池组容量
    public double battTemp;         //电池组温度
    public float battCurr;            //电池组电流
    public float battCap;            //电池组容量
    public float battTemp;         //电池组温度
    public int monMAX_num;            //最大单体编号
    public int monMIN_num;            //最低按单体编号
    public double monvolMAX;        //最大单体电压
    public double monvolMIN;        //最低单体电压
    public float monvolMAX;        //最大单体电压
    public float monvolMIN;        //最低单体电压

    public double[] monVol;         //单体电压
    public float[] monVol;         //单体电压


    public BTS_BattData(int monCount){
        monVol = new double[monCount];
        monVol = new float[monCount];
        this.monCount = monCount;
    }
}

 src/main/java/com/whyc/bts/BTS_FbsData.java

@@ -23,29 +23,29 @@
    public int stationPowerOffTLong = 0;
    public int stationPowerOffCNT = 0;
    
    public double conresist  = 0;                //组1接触器导通阻抗 (0.001mR)
    public double conresist1 = 0;                //组2接触器导通阻抗 (0.001mR)
    public double condvoldp  = 0;                //组1二极管压降(0.01V)	
    public double condvoldp1 = 0;                //组2二极管压降(0.01V)	
    public float conresist  = 0;                //组1接触器导通阻抗 (0.001mR)
    public float conresist1 = 0;                //组2接触器导通阻抗 (0.001mR)
    public float condvoldp  = 0;                //组1二极管压降(0.01V)
    public float condvoldp1 = 0;                //组2二极管压降(0.01V)
    
    
    public double onlinevol[] = new double[BTS_ComBase.BattGroupCountMax_Mutl];    //在线电压
    public double groupvol[] = new double[BTS_ComBase.BattGroupCountMax_Mutl];    //组端电压
    public float onlinevol[] = new float[BTS_ComBase.BattGroupCountMax_Mutl];    //在线电压
    public float groupvol[] = new float[BTS_ComBase.BattGroupCountMax_Mutl];    //组端电压
    public int battstate[] = new int[BTS_ComBase.BattGroupCountMax];            //充放电状态     3   5   9 
    public double battcurr[] = new double[BTS_ComBase.BattGroupCountMax_Mutl];    //电池组电流
    public double battcap[] = new double[BTS_ComBase.BattGroupCountMax];        //电池组容量
    public double batttemp[] = new double[BTS_ComBase.BattGroupCountMax_Mutl];  //电池组温度
    public float battcurr[] = new float[BTS_ComBase.BattGroupCountMax_Mutl];    //电池组电流
    public float battcap[] = new float[BTS_ComBase.BattGroupCountMax];        //电池组容量
    public float batttemp[] = new float[BTS_ComBase.BattGroupCountMax_Mutl];  //电池组温度
    public int monMAX_num[] = new int[BTS_ComBase.BattGroupCountMax];            //最大单体编号            
    public int monMIN_num[] = new int[BTS_ComBase.BattGroupCountMax];            //最低按单体编号
    public double monvolMAX[] = new double[BTS_ComBase.BattGroupCountMax];        //最大单体电压
    public double monvolMIN[] = new double[BTS_ComBase.BattGroupCountMax];        //最低单体电压
    public float monvolMAX[] = new float[BTS_ComBase.BattGroupCountMax];        //最大单体电压
    public float monvolMIN[] = new float[BTS_ComBase.BattGroupCountMax];        //最低单体电压
    
    /**
     * @2022-06-15 lijun 并联BTS新增结构体
     */
    public double onlinecurr[] = new double[BTS_ComBase.BattGroupCountMax];        //并联BTS时读取的电流
    public float onlinecurr[] = new float[BTS_ComBase.BattGroupCountMax];        //并联BTS时读取的电流
    
    public double vol[] = new double[BTS_ComBase.MonomerCountMax];                //单体电压
    public float vol[] = new float[BTS_ComBase.MonomerCountMax];                //单体电压
    
    public BTS_FbsData clone()
    {
@@ -149,14 +149,14 @@
        battSum = BTS_ComBase.changeShortToInt(tmpbuf.getShort());
        /***  2020-12-04 lijun 逆变版本的设备在线电压和组端电压不用/10  ****/
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            double o_v = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/10;
            float o_v = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/10;
            if(((0x08 == dev_type) || (soft_ver >= 35)) && (0x06 != dev_type)) {
                o_v /= 10;
            }
            onlinevol[n] = o_v;
        }
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            double g_v = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/10;
            float g_v = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/10;
            if(((0x08 == dev_type) || (soft_ver >= 35)) && (0x06 != dev_type)) {
                g_v /= 10;
            }
@@ -165,21 +165,21 @@
        for(int n=0; n<BATTGROUP_COUNT; n++)
            battstate[n] = BTS_ComBase.changeShortToInt(tmpbuf.getShort());
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            double b_curr = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/10;
            float b_curr = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/10;
            if(BTS_ComBase.BattState_Discharge == battstate[n]) {
                b_curr *= -1;
            }
            battcurr[n] = b_curr;
        }
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            double b_cap = BTS_ComBase.changeShortToDouble(tmpbuf.getShort());
            float b_cap = BTS_ComBase.changeShortToFloat(tmpbuf.getShort());
            if(BTS_ComBase.BattState_Discharge == battstate[n]) {
                b_cap *= -1;
            }
            battcap[n] = b_cap;
        }
        for(int n=0; n<BATTGROUP_COUNT; n++)
            batttemp[n] = BTS_ComBase.changeShortToDouble((short)(tmpbuf.getShort()-(short)100))/10;
            batttemp[n] = BTS_ComBase.changeShortToFloat((short)(tmpbuf.getShort()-(short)100))/10;
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            monMAX_num[n] = BTS_ComBase.changeShortToInt(tmpbuf.getShort());
        }
@@ -192,17 +192,17 @@
        stationPowerOffCNT = monMIN_num[0];
        
        for(int n=0; n<BATTGROUP_COUNT; n++)
            monvolMAX[n] = ((double)BTS_ComBase.changeShortToDouble(tmpbuf.getShort()))/100;
            monvolMAX[n] = ((float)BTS_ComBase.changeShortToFloat(tmpbuf.getShort()))/100;
        conresist = monvolMAX[0]/10;
        conresist1 = monvolMAX[1]/10;
        condvoldp = monvolMAX[2];
        condvoldp1 = monvolMAX[3];
        ////System.out.println(conresist+"=="+conresist1+"=="+condvoldp+"=="+condvoldp1);
        for(int n=0; n<BATTGROUP_COUNT; n++)
            monvolMIN[n] = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/1000;
            monvolMIN[n] = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/1000;
        
        for(int n=0; n<battSum; n++) {
            vol[n] = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/1000;
            vol[n] = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/1000;
        }
        //System.out.println(this);
        tmpbuf.compact();
@@ -245,14 +245,14 @@
        battSum = BTS_ComBase.changeShortToInt(tmpbuf.getShort());
        /***  2020-12-04 lijun 逆变版本的设备在线电压和组端电压不用/10  ****/
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            double o_v = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/10;
            float o_v = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/10;
//            if(((0x08 == dev_type) || (soft_ver >= 35)) && (0x06 != dev_type)) {
                o_v /= 10;
//            }
            onlinevol[n] = o_v;
        }
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            double g_v = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/10;
            float g_v = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/10;
//            if(((0x08 == dev_type) || (soft_ver >= 35)) && (0x06 != dev_type)) {
                g_v /= 10;
//            }
@@ -261,21 +261,21 @@
        for(int n=0; n<BATTGROUP_COUNT; n++)
            battstate[n] = BTS_ComBase.changeShortToInt(tmpbuf.getShort());
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            double b_curr = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/10;
            float b_curr = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/10;
            if(BTS_ComBase.BattState_Discharge == battstate[n]) {
                b_curr *= -1;
            }
            battcurr[n] = b_curr;
        }
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            double b_cap = BTS_ComBase.changeShortToDouble(tmpbuf.getShort());
            float b_cap = BTS_ComBase.changeShortToFloat(tmpbuf.getShort());
            if(BTS_ComBase.BattState_Discharge == battstate[n]) {
                b_cap *= -1;
            }
            battcap[n] = b_cap;
        }
        for(int n=0; n<BATTGROUP_COUNT; n++)
            batttemp[n] = BTS_ComBase.changeShortToDouble((short)(tmpbuf.getShort()-(short)100))/10;
            batttemp[n] = BTS_ComBase.changeShortToFloat((short)(tmpbuf.getShort()-(short)100))/10;
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            monMAX_num[n] = BTS_ComBase.changeShortToInt(tmpbuf.getShort());
        }
@@ -288,17 +288,17 @@
        stationPowerOffCNT = monMIN_num[0];
        
        for(int n=0; n<BATTGROUP_COUNT; n++)
            monvolMAX[n] = ((double)BTS_ComBase.changeShortToDouble(tmpbuf.getShort()))/100;
            monvolMAX[n] = ((float)BTS_ComBase.changeShortToFloat(tmpbuf.getShort()))/100;
        conresist = monvolMAX[0]/10;
        conresist1 = monvolMAX[1]/10;
        condvoldp = monvolMAX[2];
        condvoldp1 = monvolMAX[3];
        ////System.out.println(conresist+"=="+conresist1+"=="+condvoldp+"=="+condvoldp1);
        for(int n=0; n<BATTGROUP_COUNT; n++)
            monvolMIN[n] = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/1000;
            monvolMIN[n] = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/1000;
        
        for(int n=0; n<battSum; n++) {
            vol[n] = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/1000;
            vol[n] = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/1000;
        }
        
        //System.out.println(this);
@@ -351,14 +351,14 @@
        battSum = BTS_ComBase.changeShortToInt(tmpbuf.getShort());
        /***  2020-12-04 lijun 逆变版本的设备在线电压和组端电压不用/10  ****/
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            double o_v = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/10;
            float o_v = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/10;
            if(((0x08 == dev_type) ||(0x05 == dev_type)||(0x07 == dev_type) || (soft_ver >= 35)) && ((0x06 != dev_type) || (0x06 == dev_type && hard_ver >70 && hard_ver < 80))) {
                o_v /= 10;
            }
            onlinevol[n] = o_v;
        }
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            double g_v = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/10;
            float g_v = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/10;
            if(((0x08 == dev_type) ||(0x05 == dev_type)||(0x07 == dev_type) || (soft_ver >= 35)) && ((0x06 != dev_type) || (0x06 == dev_type && hard_ver >70 && hard_ver < 80))) {
                g_v /= 10;
            }
@@ -367,14 +367,14 @@
        for(int n=0; n<BATTGROUP_COUNT; n++)
            battstate[n] = BTS_ComBase.changeShortToInt(tmpbuf.getShort());
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            double b_curr = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/10;
            float b_curr = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/10;
            if(BTS_ComBase.BattState_Discharge == battstate[n]) {
                b_curr *= -1;
            }
            battcurr[n] = b_curr;
        }
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            double b_cap = BTS_ComBase.changeShortToDouble(tmpbuf.getShort());
            float b_cap = BTS_ComBase.changeShortToFloat(tmpbuf.getShort());
            if(BTS_ComBase.BattState_Discharge == battstate[n]) {
                b_cap *= -1;
            }
@@ -386,7 +386,7 @@
             * 2021-10-27 @lijun 修复温度<10度时，温度显示bug
             */
            //batttemp[n] = BTS_ComBase.changeShortToDouble((short)(tmpbuf.getShort()-(short)100))/10;
            batttemp[n] = BTS_ComBase.changeShortToDouble((short)(tmpbuf.getShort()))/10 -10;
            batttemp[n] = BTS_ComBase.changeShortToFloat((short)(tmpbuf.getShort()))/10 -10;
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            monMAX_num[n] = BTS_ComBase.changeShortToInt(tmpbuf.getShort());
        }
@@ -399,19 +399,19 @@
        stationPowerOffCNT = monMIN_num[0];
        
        for(int n=0; n<BATTGROUP_COUNT; n++)
            monvolMAX[n] = ((double)BTS_ComBase.changeShortToDouble(tmpbuf.getShort()))/100;
            monvolMAX[n] = ((float)BTS_ComBase.changeShortToFloat(tmpbuf.getShort()))/100;
        conresist = monvolMAX[0]/10;
        conresist1 = monvolMAX[1]/10;
        condvoldp = monvolMAX[2];
        condvoldp1 = monvolMAX[3];
        ////System.out.println(conresist+"=="+conresist1+"=="+condvoldp+"=="+condvoldp1);
        for(int n=0; n<BATTGROUP_COUNT; n++)
            monvolMIN[n] = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/1000;
            monvolMIN[n] = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/1000;
        
        //battSum = 48;
        ////System.out.println("电池组单体数目："+battSum);
        for(int n=0; n<battSum; n++) {
            vol[n] = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/1000;
            vol[n] = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/1000;
        }
        
        tmpbuf.compact();
@@ -464,14 +464,14 @@
        battSum = BTS_ComBase.changeShortToInt(tmpbuf.getShort());
        /***  2020-12-04 lijun 逆变版本的设备在线电压和组端电压不用/10  ****/
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            double o_v = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/10;
            float o_v = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/10;
            if(((0x08 == dev_type) ||(0x05 == dev_type)||(0x04 == dev_type) || (soft_ver >= 35)) && ((0x06 != dev_type) || (0x06 == dev_type && hard_ver >70 && hard_ver < 80))) {
                o_v /= 10;
            }
            onlinevol[n] = o_v;
        }
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            double g_v = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/10;
            float g_v = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/10;
            if(((0x08 == dev_type) ||(0x05 == dev_type)||(0x04 == dev_type) || (soft_ver >= 35)) && ((0x06 != dev_type) || (0x06 == dev_type && hard_ver >70 && hard_ver < 80))) {
                g_v /= 10;
            }
@@ -480,14 +480,14 @@
        for(int n=0; n<BATTGROUP_COUNT; n++)
            battstate[n] = BTS_ComBase.changeShortToInt(tmpbuf.getShort());
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            double b_curr = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/10;
            float b_curr = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/10;
            if(BTS_ComBase.BattState_Discharge == battstate[n]) {
                b_curr *= -1;
            }
            battcurr[n] = b_curr;
        }
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            double b_cap = BTS_ComBase.changeShortToDouble(tmpbuf.getShort());
            float b_cap = BTS_ComBase.changeShortToFloat(tmpbuf.getShort());
            if(BTS_ComBase.BattState_Discharge == battstate[n]) {
                b_cap *= -1;
            }
@@ -498,7 +498,7 @@
             * 2021-10-27 @lijun 修复温度<10度时，温度显示bug
             */
            //batttemp[n] = BTS_ComBase.changeShortToDouble((short)(tmpbuf.getShort()-(short)100))/10;
            batttemp[n] = BTS_ComBase.changeShortToDouble((short)(tmpbuf.getShort()))/10 -10;
            batttemp[n] = BTS_ComBase.changeShortToFloat((short)(tmpbuf.getShort()))/10 -10;
        for(int n=0; n<BATTGROUP_COUNT; n++) {
            monMAX_num[n] = BTS_ComBase.changeShortToInt(tmpbuf.getShort());
        }
@@ -511,21 +511,21 @@
        stationPowerOffCNT = monMIN_num[0];
        
        for(int n=0; n<BATTGROUP_COUNT; n++)
            monvolMAX[n] = ((double)BTS_ComBase.changeShortToDouble(tmpbuf.getShort()))/100;
            monvolMAX[n] = ((float)BTS_ComBase.changeShortToFloat(tmpbuf.getShort()))/100;
        conresist = monvolMAX[0]/10;
        conresist1 = monvolMAX[1]/10;
        condvoldp = monvolMAX[2];
        condvoldp1 = monvolMAX[3];
        ////System.out.println(conresist+"=="+conresist1+"=="+condvoldp+"=="+condvoldp1);
        for(int n=0; n<BATTGROUP_COUNT; n++)
            monvolMIN[n] = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/1000;
            monvolMIN[n] = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/1000;
        
        for(int n=0; n<BATTGROUP_COUNT; n++)
            onlinecurr[n] = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/1000;
            onlinecurr[n] = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/1000;
        //battSum = 48;
        ////System.out.println("电池组单体数目："+battSum);
        for(int n=0; n<battSum; n++) {
            vol[n] = BTS_ComBase.changeShortToDouble(tmpbuf.getShort())/1000;
            vol[n] = BTS_ComBase.changeShortToFloat(tmpbuf.getShort())/1000;
        }
        
        tmpbuf.compact();

 src/main/java/com/whyc/service/ExcelExportService.java

@@ -634,7 +634,7 @@
            sheet1.getRow(rowNum).createCell(3).setCellValue(fbsData.battCurr);
            sheet1.getRow(rowNum).createCell(4).setCellValue(fbsData.battCap);
            sheet1.getRow(rowNum).createCell(5).setCellValue(fbsData.battTemp);
            double[]  datas=fbsData.monVol;
            float[]  datas=fbsData.monVol;
            for (int k = 0;k<battNum;k++){
                sheet1.getRow(rowNum).createCell(k+6).setCellValue(datas[k]);
            }
@@ -781,7 +781,7 @@
            sheet1.getRow(rowNum).createCell(3).setCellValue(fbsData.battCurr);
            sheet1.getRow(rowNum).createCell(4).setCellValue(fbsData.battCap);
            sheet1.getRow(rowNum).createCell(5).setCellValue(fbsData.battTemp);
            double[]  datas=fbsData.monVol;
            float[]  datas=fbsData.monVol;
            for (int k = 0;k<battNum;k++){
                sheet1.getRow(rowNum).createCell(k+6).setCellValue(datas[k]);
            }