whyclxw
2020-11-12 02b77656d12b352999a7a3af510f0f3fce90c4d9
修改DC25V,DC230V电源
4个文件已修改
330 ■■■■ 已修改文件
DyEnvir_system/src/com/fgkj/partinsystem/dto/Dc230v_batt.java 136 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/dto/Dc25v_batt.java 115 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/impl/Dc230v_battImpl.java 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/impl/Dc25v_battImpl.java 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/dto/Dc230v_batt.java
@@ -4,22 +4,31 @@
import java.util.Date;
public class Dc230v_batt implements Serializable{
      private int num ;//,
      private int dev_id;//'设备id',
      private Date record_time  ;// '2000-01-01 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
      private Date record_time1  ;// '2000-01-01 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
      private float output_vol ;//'输出电压',
      private float output_curr ;//'输出电流',
      private float input_vol ;//'输入电压',
      private float input_curr ;//'输入电流',
      private int bconn_CAN_comstate ;//'并联CAN通讯状态',
      private int work_state ;//'工作状态',
      private int Under_vol_alarm ;//'欠压报警',
      private int Over_vol_alarm ;//'过压报警',
      private int Over_load_alarm ;//'过载报警',
      private int Over_tmp_alarm ;//'过温报警',
      private int short_out_alarm ;//'短路报警',
      private String note ;//'',
    private int num ;//,
    private int dev_id ;// '设备id',
    private Date record_time  ;//'2000-01-01 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
    private Date record_time1  ;//'2000-01-01 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
    private float output_vol ;//'输出电压',
    private float output_curr ;//'输出电流',
    private float input_vol ;//'输入电压',
    private float input_curr ;//'输入电流',
    private int reserve_bc;    //预留
    private int work_state ;// '工作状态',
    private int Under_vol_alarm ;// '欠压报警',
    private int Over_vol_alarm ;// '过压报警',
    private int Over_load_alarm ;// '过载报警',
    private int Over_fault;//过载故障
    private int short_out_alarm ;// '短路故障',
    private int Over_curr_alarm;//输入过流
    private int Igbt_falut;//igbt故障
    private int Igbt_tmp_alarm;//igbt散热器过温
    private int Rectifier_tmp_alarm;//整流桥散热器过温
    private int High_trans_tmp;//高频变压器过温
    private int Over_inductor_tmp;//谐振电感过温
    private int Fan_falut;//风机故障
    private int Over_tmp_load;//输出假负载散热器过温
    private int fault;//故障
    private String note ;//'',
    public int getNum() {
        return num;
    }
@@ -37,6 +46,12 @@
    }
    public void setRecord_time(Date record_time) {
        this.record_time = record_time;
    }
    public Date getRecord_time1() {
        return record_time1;
    }
    public void setRecord_time1(Date record_time1) {
        this.record_time1 = record_time1;
    }
    public float getOutput_vol() {
        return output_vol;
@@ -62,11 +77,11 @@
    public void setInput_curr(float input_curr) {
        this.input_curr = input_curr;
    }
    public int getBconn_CAN_comstate() {
        return bconn_CAN_comstate;
    public int getReserve_bc() {
        return reserve_bc;
    }
    public void setBconn_CAN_comstate(int bconn_CAN_comstate) {
        this.bconn_CAN_comstate = bconn_CAN_comstate;
    public void setReserve_bc(int reserve_bc) {
        this.reserve_bc = reserve_bc;
    }
    public int getWork_state() {
        return work_state;
@@ -92,11 +107,11 @@
    public void setOver_load_alarm(int over_load_alarm) {
        Over_load_alarm = over_load_alarm;
    }
    public int getOver_tmp_alarm() {
        return Over_tmp_alarm;
    public int getOver_fault() {
        return Over_fault;
    }
    public void setOver_tmp_alarm(int over_tmp_alarm) {
        Over_tmp_alarm = over_tmp_alarm;
    public void setOver_fault(int over_fault) {
        Over_fault = over_fault;
    }
    public int getShort_out_alarm() {
        return short_out_alarm;
@@ -104,30 +119,65 @@
    public void setShort_out_alarm(int short_out_alarm) {
        this.short_out_alarm = short_out_alarm;
    }
    public int getOver_curr_alarm() {
        return Over_curr_alarm;
    }
    public void setOver_curr_alarm(int over_curr_alarm) {
        Over_curr_alarm = over_curr_alarm;
    }
    public int getIgbt_falut() {
        return Igbt_falut;
    }
    public void setIgbt_falut(int igbt_falut) {
        Igbt_falut = igbt_falut;
    }
    public int getIgbt_tmp_alarm() {
        return Igbt_tmp_alarm;
    }
    public void setIgbt_tmp_alarm(int igbt_tmp_alarm) {
        Igbt_tmp_alarm = igbt_tmp_alarm;
    }
    public int getRectifier_tmp_alarm() {
        return Rectifier_tmp_alarm;
    }
    public void setRectifier_tmp_alarm(int rectifier_tmp_alarm) {
        Rectifier_tmp_alarm = rectifier_tmp_alarm;
    }
    public int getHigh_trans_tmp() {
        return High_trans_tmp;
    }
    public void setHigh_trans_tmp(int high_trans_tmp) {
        High_trans_tmp = high_trans_tmp;
    }
    public int getOver_inductor_tmp() {
        return Over_inductor_tmp;
    }
    public void setOver_inductor_tmp(int over_inductor_tmp) {
        Over_inductor_tmp = over_inductor_tmp;
    }
    public int getFan_falut() {
        return Fan_falut;
    }
    public void setFan_falut(int fan_falut) {
        Fan_falut = fan_falut;
    }
    public int getOver_tmp_load() {
        return Over_tmp_load;
    }
    public void setOver_tmp_load(int over_tmp_load) {
        Over_tmp_load = over_tmp_load;
    }
    public int getFault() {
        return fault;
    }
    public void setFault(int fault) {
        this.fault = fault;
    }
    public String getNote() {
        return note;
    }
    public void setNote(String note) {
        this.note = note;
    }
    public Date getRecord_time1() {
        return record_time1;
    }
    public void setRecord_time1(Date record_time1) {
        this.record_time1 = record_time1;
    }
    @Override
    public String toString() {
        return "Dc230v_batt [num=" + num + ", dev_id=" + dev_id
                + ", record_time=" + record_time + ", record_time1="
                + record_time1 + ", output_vol=" + output_vol
                + ", output_curr=" + output_curr + ", input_vol=" + input_vol
                + ", input_curr=" + input_curr + ", bconn_CAN_comstate="
                + bconn_CAN_comstate + ", work_state=" + work_state
                + ", Under_vol_alarm=" + Under_vol_alarm + ", Over_vol_alarm="
                + Over_vol_alarm + ", Over_load_alarm=" + Over_load_alarm
                + ", Over_tmp_alarm=" + Over_tmp_alarm + ", short_out_alarm="
                + short_out_alarm + ", note=" + note + "]";
    }
    
DyEnvir_system/src/com/fgkj/partinsystem/dto/Dc25v_batt.java
@@ -12,12 +12,22 @@
      private float output_curr ;//'输出电流',
      private float input_vol ;//'输入电压',
      private float input_curr ;//'输入电流',
      private int work_state ;// '工作状态',
      private int Under_vol_alarm ;// '欠压报警',
      private int Over_vol_alarm ;// '过压报警',
      private int Over_load_alarm ;// '过载报警',
      private int Over_tmp_alarm ;// '过温报警',
      private int short_out_alarm ;// '短路报警',
      private int work_state ;//'工作状态',
      private int Under_vol_alarm ;//'欠压报警',
      private int Over_vol_alarm ;//'过压报警',
      private int Over_load_alarm ;//'过载报警',
      private int Over_fault;//过载故障
      private int reserve_bc;    //预留
      private int short_out_alarm ;//'短路报警',
      private int Over_curr_alarm;//输入过流
      private int Igbt_falut;//igbt故障
      private int Igbt_tmp_alarm;//igbt散热器过温
      private int Rectifier_tmp_alarm;//整流桥散热器过温
      private int High_trans_tmp;//高频变压器过温
      private int Over_inductor_tmp;//谐振电感过温
      private int Fan_falut;//风机故障
      private int Over_tmp_load;//输出假负载散热器过温
      private int fault;//故障
      private String note ;//'',
    public int getNum() {
        return num;
@@ -36,6 +46,12 @@
    }
    public void setRecord_time(Date record_time) {
        this.record_time = record_time;
    }
    public Date getRecord_time1() {
        return record_time1;
    }
    public void setRecord_time1(Date record_time1) {
        this.record_time1 = record_time1;
    }
    public float getOutput_vol() {
        return output_vol;
@@ -85,11 +101,17 @@
    public void setOver_load_alarm(int over_load_alarm) {
        Over_load_alarm = over_load_alarm;
    }
    public int getOver_tmp_alarm() {
        return Over_tmp_alarm;
    public int getOver_fault() {
        return Over_fault;
    }
    public void setOver_tmp_alarm(int over_tmp_alarm) {
        Over_tmp_alarm = over_tmp_alarm;
    public void setOver_fault(int over_fault) {
        Over_fault = over_fault;
    }
    public int getReserve_bc() {
        return reserve_bc;
    }
    public void setReserve_bc(int reserve_bc) {
        this.reserve_bc = reserve_bc;
    }
    public int getShort_out_alarm() {
        return short_out_alarm;
@@ -97,18 +119,65 @@
    public void setShort_out_alarm(int short_out_alarm) {
        this.short_out_alarm = short_out_alarm;
    }
    public int getOver_curr_alarm() {
        return Over_curr_alarm;
    }
    public void setOver_curr_alarm(int over_curr_alarm) {
        Over_curr_alarm = over_curr_alarm;
    }
    public int getIgbt_falut() {
        return Igbt_falut;
    }
    public void setIgbt_falut(int igbt_falut) {
        Igbt_falut = igbt_falut;
    }
    public int getIgbt_tmp_alarm() {
        return Igbt_tmp_alarm;
    }
    public void setIgbt_tmp_alarm(int igbt_tmp_alarm) {
        Igbt_tmp_alarm = igbt_tmp_alarm;
    }
    public int getRectifier_tmp_alarm() {
        return Rectifier_tmp_alarm;
    }
    public void setRectifier_tmp_alarm(int rectifier_tmp_alarm) {
        Rectifier_tmp_alarm = rectifier_tmp_alarm;
    }
    public int getHigh_trans_tmp() {
        return High_trans_tmp;
    }
    public void setHigh_trans_tmp(int high_trans_tmp) {
        High_trans_tmp = high_trans_tmp;
    }
    public int getOver_inductor_tmp() {
        return Over_inductor_tmp;
    }
    public void setOver_inductor_tmp(int over_inductor_tmp) {
        Over_inductor_tmp = over_inductor_tmp;
    }
    public int getFan_falut() {
        return Fan_falut;
    }
    public void setFan_falut(int fan_falut) {
        Fan_falut = fan_falut;
    }
    public int getOver_tmp_load() {
        return Over_tmp_load;
    }
    public void setOver_tmp_load(int over_tmp_load) {
        Over_tmp_load = over_tmp_load;
    }
    public int getFault() {
        return fault;
    }
    public void setFault(int fault) {
        this.fault = fault;
    }
    public String getNote() {
        return note;
    }
    public void setNote(String note) {
        this.note = note;
    }
    public Date getRecord_time1() {
        return record_time1;
    }
    public void setRecord_time1(Date record_time1) {
        this.record_time1 = record_time1;
    }
    @Override
    public String toString() {
@@ -119,8 +188,16 @@
                + ", input_curr=" + input_curr + ", work_state=" + work_state
                + ", Under_vol_alarm=" + Under_vol_alarm + ", Over_vol_alarm="
                + Over_vol_alarm + ", Over_load_alarm=" + Over_load_alarm
                + ", Over_tmp_alarm=" + Over_tmp_alarm + ", short_out_alarm="
                + short_out_alarm + ", note=" + note + "]";
                + ", Over_fault=" + Over_fault + ", reserve_bc=" + reserve_bc
                + ", short_out_alarm=" + short_out_alarm + ", Over_curr_alarm="
                + Over_curr_alarm + ", Igbt_falut=" + Igbt_falut
                + ", Igbt_tmp_alarm=" + Igbt_tmp_alarm
                + ", Rectifier_tmp_alarm=" + Rectifier_tmp_alarm
                + ", High_trans_tmp=" + High_trans_tmp + ", Over_inductor_tmp="
                + Over_inductor_tmp + ", Fan_falut=" + Fan_falut
                + ", Over_tmp_load=" + Over_tmp_load + ", fault=" + fault
                + ", note=" + note + "]";
    }
    
}
DyEnvir_system/src/com/fgkj/partinsystem/impl/Dc230v_battImpl.java
@@ -63,14 +63,22 @@
                        d.setOutput_curr(rs.getFloat("output_curr"));
                        d.setInput_vol(rs.getFloat("input_vol"));
                        d.setInput_curr(rs.getFloat("input_curr"));
                        d.setBconn_CAN_comstate(rs.getInt("bconn_CAN_comstate"));
                        d.setReserve_bc(rs.getInt("reserve_bc"));
                        d.setWork_state(rs.getInt("work_state"));
                        d.setUnder_vol_alarm(rs.getInt("under_vol_alarm"));
                        d.setOver_vol_alarm(rs.getInt("over_vol_alarm"));
                        d.setOver_load_alarm(rs.getInt("over_load_alarm"));
                        d.setOver_tmp_alarm(rs.getInt("over_tmp_alarm"));
                        d.setOver_fault(rs.getInt("over_fault"));
                        d.setShort_out_alarm(rs.getInt("short_out_alarm"));
                        d.setOver_curr_alarm(rs.getInt("over_curr_alarm"));
                        d.setIgbt_falut(rs.getInt("igbt_falut"));
                        d.setIgbt_tmp_alarm(rs.getInt("igbt_tmp_alarm"));
                        d.setRectifier_tmp_alarm(rs.getInt("rectifier_tmp_alarm"));
                        d.setHigh_trans_tmp(rs.getInt("high_trans_tmp"));
                        d.setOver_inductor_tmp(rs.getInt("over_inductor_tmp"));
                        d.setFan_falut(rs.getInt("fan_falut"));
                        d.setOver_tmp_load(rs.getInt("over_tmp_load"));
                        d.setFault(rs.getInt("fault"));
                        
                        list.add(d);
                    }
@@ -104,13 +112,22 @@
                        d.setOutput_curr(rs.getFloat("output_curr"));
                        d.setInput_vol(rs.getFloat("input_vol"));
                        d.setInput_curr(rs.getFloat("input_curr"));
                        d.setBconn_CAN_comstate(rs.getInt("bconn_CAN_comstate"));
                        d.setReserve_bc(rs.getInt("reserve_bc"));
                        d.setWork_state(rs.getInt("work_state"));
                        d.setUnder_vol_alarm(rs.getInt("under_vol_alarm"));
                        d.setOver_vol_alarm(rs.getInt("over_vol_alarm"));
                        d.setOver_load_alarm(rs.getInt("over_load_alarm"));
                        d.setOver_tmp_alarm(rs.getInt("over_tmp_alarm"));
                        d.setOver_fault(rs.getInt("over_fault"));
                        d.setShort_out_alarm(rs.getInt("short_out_alarm"));
                        d.setOver_curr_alarm(rs.getInt("over_curr_alarm"));
                        d.setIgbt_falut(rs.getInt("igbt_falut"));
                        d.setIgbt_tmp_alarm(rs.getInt("igbt_tmp_alarm"));
                        d.setRectifier_tmp_alarm(rs.getInt("rectifier_tmp_alarm"));
                        d.setHigh_trans_tmp(rs.getInt("high_trans_tmp"));
                        d.setOver_inductor_tmp(rs.getInt("over_inductor_tmp"));
                        d.setFan_falut(rs.getInt("fan_falut"));
                        d.setOver_tmp_load(rs.getInt("over_tmp_load"));
                        d.setFault(rs.getInt("fault"));
                        
                        
                        list.add(d);
@@ -144,14 +161,22 @@
                        d.setOutput_curr(rs.getFloat("output_curr"));
                        d.setInput_vol(rs.getFloat("input_vol"));
                        d.setInput_curr(rs.getFloat("input_curr"));
                        d.setBconn_CAN_comstate(rs.getInt("bconn_CAN_comstate"));
                        d.setReserve_bc(rs.getInt("reserve_bc"));
                        d.setWork_state(rs.getInt("work_state"));
                        d.setUnder_vol_alarm(rs.getInt("under_vol_alarm"));
                        d.setOver_vol_alarm(rs.getInt("over_vol_alarm"));
                        d.setOver_load_alarm(rs.getInt("over_load_alarm"));
                        d.setOver_tmp_alarm(rs.getInt("over_tmp_alarm"));
                        d.setOver_fault(rs.getInt("over_fault"));
                        d.setShort_out_alarm(rs.getInt("short_out_alarm"));
                        d.setOver_curr_alarm(rs.getInt("over_curr_alarm"));
                        d.setIgbt_falut(rs.getInt("igbt_falut"));
                        d.setIgbt_tmp_alarm(rs.getInt("igbt_tmp_alarm"));
                        d.setRectifier_tmp_alarm(rs.getInt("rectifier_tmp_alarm"));
                        d.setHigh_trans_tmp(rs.getInt("high_trans_tmp"));
                        d.setOver_inductor_tmp(rs.getInt("over_inductor_tmp"));
                        d.setFan_falut(rs.getInt("fan_falut"));
                        d.setOver_tmp_load(rs.getInt("over_tmp_load"));
                        d.setFault(rs.getInt("fault"));
                        
                        list.add(d);
                    }
DyEnvir_system/src/com/fgkj/partinsystem/impl/Dc25v_battImpl.java
@@ -64,13 +64,22 @@
                        d.setOutput_curr(rs.getFloat("output_curr"));
                        d.setInput_vol(rs.getFloat("input_vol"));
                        d.setInput_curr(rs.getFloat("input_curr"));
                        d.setReserve_bc(rs.getInt("reserve_bc"));
                        d.setWork_state(rs.getInt("work_state"));
                        d.setUnder_vol_alarm(rs.getInt("under_vol_alarm"));
                        d.setOver_vol_alarm(rs.getInt("over_vol_alarm"));
                        d.setOver_load_alarm(rs.getInt("over_load_alarm"));
                        d.setOver_tmp_alarm(rs.getInt("over_tmp_alarm"));
                        d.setOver_fault(rs.getInt("over_fault"));
                        d.setShort_out_alarm(rs.getInt("short_out_alarm"));
                        d.setOver_curr_alarm(rs.getInt("over_curr_alarm"));
                        d.setIgbt_falut(rs.getInt("igbt_falut"));
                        d.setIgbt_tmp_alarm(rs.getInt("igbt_tmp_alarm"));
                        d.setRectifier_tmp_alarm(rs.getInt("rectifier_tmp_alarm"));
                        d.setHigh_trans_tmp(rs.getInt("high_trans_tmp"));
                        d.setOver_inductor_tmp(rs.getInt("over_inductor_tmp"));
                        d.setFan_falut(rs.getInt("fan_falut"));
                        d.setOver_tmp_load(rs.getInt("over_tmp_load"));
                        d.setFault(rs.getInt("fault"));
                        
                        list.add(d);
                    }
@@ -105,12 +114,22 @@
                        d.setOutput_curr(rs.getFloat("output_curr"));
                        d.setInput_vol(rs.getFloat("input_vol"));
                        d.setInput_curr(rs.getFloat("input_curr"));
                        d.setReserve_bc(rs.getInt("reserve_bc"));
                        d.setWork_state(rs.getInt("work_state"));
                        d.setUnder_vol_alarm(rs.getInt("under_vol_alarm"));
                        d.setOver_vol_alarm(rs.getInt("over_vol_alarm"));
                        d.setOver_load_alarm(rs.getInt("over_load_alarm"));
                        d.setOver_tmp_alarm(rs.getInt("over_tmp_alarm"));
                        d.setOver_fault(rs.getInt("over_fault"));
                        d.setShort_out_alarm(rs.getInt("short_out_alarm"));
                        d.setOver_curr_alarm(rs.getInt("over_curr_alarm"));
                        d.setIgbt_falut(rs.getInt("igbt_falut"));
                        d.setIgbt_tmp_alarm(rs.getInt("igbt_tmp_alarm"));
                        d.setRectifier_tmp_alarm(rs.getInt("rectifier_tmp_alarm"));
                        d.setHigh_trans_tmp(rs.getInt("high_trans_tmp"));
                        d.setOver_inductor_tmp(rs.getInt("over_inductor_tmp"));
                        d.setFan_falut(rs.getInt("fan_falut"));
                        d.setOver_tmp_load(rs.getInt("over_tmp_load"));
                        d.setFault(rs.getInt("fault"));
                        
                        
                        list.add(d);
@@ -144,13 +163,22 @@
                        d.setOutput_curr(rs.getFloat("output_curr"));
                        d.setInput_vol(rs.getFloat("input_vol"));
                        d.setInput_curr(rs.getFloat("input_curr"));
                        d.setReserve_bc(rs.getInt("reserve_bc"));
                        d.setWork_state(rs.getInt("work_state"));
                        d.setUnder_vol_alarm(rs.getInt("under_vol_alarm"));
                        d.setOver_vol_alarm(rs.getInt("over_vol_alarm"));
                        d.setOver_load_alarm(rs.getInt("over_load_alarm"));
                        d.setOver_tmp_alarm(rs.getInt("over_tmp_alarm"));
                        d.setOver_fault(rs.getInt("over_fault"));
                        d.setShort_out_alarm(rs.getInt("short_out_alarm"));
                        d.setOver_curr_alarm(rs.getInt("over_curr_alarm"));
                        d.setIgbt_falut(rs.getInt("igbt_falut"));
                        d.setIgbt_tmp_alarm(rs.getInt("igbt_tmp_alarm"));
                        d.setRectifier_tmp_alarm(rs.getInt("rectifier_tmp_alarm"));
                        d.setHigh_trans_tmp(rs.getInt("high_trans_tmp"));
                        d.setOver_inductor_tmp(rs.getInt("over_inductor_tmp"));
                        d.setFan_falut(rs.getInt("fan_falut"));
                        d.setOver_tmp_load(rs.getInt("over_tmp_load"));
                        d.setFault(rs.getInt("fault"));
                        
                        list.add(d);
                    }