whyclxw
2020-11-11 606fc15134acf077cdb048f1351553c3901b57fa
修改蓄电池组
2个文件已修改
46 ■■■■ 已修改文件
DyEnvir_system/src/com/fgkj/partinsystem/dto/Battery_monitor.java 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/impl/Battery_monitorImpl.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/dto/Battery_monitor.java
@@ -26,19 +26,19 @@
    private int curr_hall_state;    // '电流霍尔状态:0:正常;1故障',
    private int chager_state;        // '充电装置工作状态:0:正常;1:故障',
    private int chager_type;        // '充电方式:1:补充电;2:全充电;4浮接',
    private float[] mon_vols;        //单体电压
    private float[] mon_tmps;        //单体温度
    private float[] mon_vol;        //单体电压
    private float[] mon_tmp;        //单体温度
    private String note;
    
    public Battery_monitor() {
        mon_vols = new float[MAX_MON_COUNT];
        mon_tmps = new float[MAX_MON_COUNT];
        mon_vol = new float[MAX_MON_COUNT];
        mon_tmp = new float[MAX_MON_COUNT];
    }
    
    public Battery_monitor(int dev_id) {
        this.dev_id = dev_id;
        mon_vols = new float[MAX_MON_COUNT];
        mon_tmps = new float[MAX_MON_COUNT];
        mon_vol = new float[MAX_MON_COUNT];
        mon_tmp = new float[MAX_MON_COUNT];
    }
    public static int getMaxMonCount() {
@@ -121,12 +121,12 @@
        return chager_type;
    }
    public float[] getMon_vols() {
        return mon_vols;
    public float[] getMon_vol() {
        return mon_vol;
    }
    public float[] getMon_tmps() {
        return mon_tmps;
    public float[] getMon_tmp() {
        return mon_tmp;
    }
    public void setDev_id(int dev_id) {
@@ -205,12 +205,12 @@
        this.chager_type = chager_type;
    }
    public void setMon_vols(float[] mon_vols) {
        this.mon_vols = mon_vols;
    public void setMon_vol(float[] mon_vol) {
        this.mon_vol = mon_vol;
    }
    public void setMon_tmps(float[] mon_tmps) {
        this.mon_tmps = mon_tmps;
    public void setMon_tmp(float[] mon_tmp) {
        this.mon_tmp = mon_tmp;
    }
    
    public Date getRecord_time1() {
@@ -242,9 +242,9 @@
                + switch_state + ", lighting_state=" + lighting_state
                + ", vol_hall_state=" + vol_hall_state + ", curr_hall_state="
                + curr_hall_state + ", chager_state=" + chager_state
                + ", chager_type=" + chager_type + ", mon_vols="
                + Arrays.toString(mon_vols) + ", mon_tmps="
                + Arrays.toString(mon_tmps) + ", note=" + note + "]";
                + ", chager_type=" + chager_type + ", mon_vol="
                + Arrays.toString(mon_vol) + ", mon_tmp="
                + Arrays.toString(mon_tmp) + ", note=" + note + "]";
    }
    
DyEnvir_system/src/com/fgkj/partinsystem/impl/Battery_monitorImpl.java
@@ -84,8 +84,8 @@
                            mon_vols[i]=rs.getFloat("mon_vol"+String.valueOf(i+1));
                            mon_tmps[i]=rs.getFloat("mon_tmp"+String.valueOf(i+1));
                        }
                        b.setMon_vols(mon_vols);
                        b.setMon_tmps(mon_tmps);
                        b.setMon_vol(mon_vols);
                        b.setMon_tmp(mon_tmps);
                        
                        list.add(b);
                    }
@@ -140,8 +140,8 @@
                            mon_vols[i]=rs.getFloat("mon_vol"+String.valueOf(i+1));
                            mon_tmps[i]=rs.getFloat("mon_tmp"+String.valueOf(i+1));
                        }
                        b.setMon_vols(mon_vols);
                        b.setMon_tmps(mon_tmps);
                        b.setMon_vol(mon_vols);
                        b.setMon_tmp(mon_tmps);
                        
                        list.add(b);
                    }
@@ -195,8 +195,8 @@
                            mon_vols[i]=rs.getFloat("mon_vol"+String.valueOf(i+1));
                            mon_tmps[i]=rs.getFloat("mon_tmp"+String.valueOf(i+1));
                        }
                        b.setMon_vols(mon_vols);
                        b.setMon_tmps(mon_tmps);
                        b.setMon_vol(mon_vols);
                        b.setMon_tmp(mon_tmps);
                        
                        list.add(b);
                    }