新增告警以及告警参数

DELL

2024-06-15 b54d209c93b3b44f6389a61e4bdb18ad2c469501

新增告警以及告警参数

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/SPCommPower.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/dev/Power_AlmParam.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/dev/Power_AlmState.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/dev/Power_ComBase.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$1$1.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$1.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$10.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$11.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$12.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$13.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$14.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$15.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$16.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$17.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$18.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$19.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$2.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$20.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$21.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$22.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$23.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$24.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$25.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$26.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$27.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$28.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$29.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$3.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$30.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$31.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$32.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$33.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$34.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$35.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$36.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$37.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$38.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$39.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$4.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$40.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$41.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$42.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$43.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$44.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$45.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$46.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$47.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$48.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$49.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$5.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$50.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$51.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$52.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$53.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$54.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$55.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$56.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$57.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$58.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$59.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$6.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$60.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$61.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$62.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$63.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$64.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$65.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$66.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$67.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$68.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$69.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$7.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$70.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$71.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$72.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$73.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$74.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$75.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$76.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$77.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$78.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$79.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$8.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$80$1.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$80.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$81.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$82.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$83.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$84.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base$9.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_base.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_page_mudata.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/simpower/power_util.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/main/main_window_simulator$3.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/main/main_window_simulator$4.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/main/main_window_simulator$5.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/main/main_window_simulator$6.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/main/main_window_simulator$7.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/main/main_window_simulator$8.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/main/main_window_simulator$9.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/main/main_window_simulator.class

Binary files differ

 Device_Simulator_DTS_Tester/src/com/dev/simpower/dev/Power_AlmParam.java

@@ -11,7 +11,7 @@
 *

 */

public class Power_AlmParam {

    public static final int REG_Count         = 11;            //系统参数寄存器数量

    public static final int REG_Count         = 17;            //系统参数寄存器数量

    

    public float acin_vol_high;            //2400    交流输入高阈值        0.1V

    public float acin_vol_low;            //2401    交流输入低阈值        0.1V

@@ -24,6 +24,13 @@
    public float dcoutputcurr_high;        //2408    直流输出电流大阈值    A

    public float dev_temp_high;            //2409    设备内部温度高阈值    0.1℃

    public float dev_temp_low;            //2410    设备内部温度低阈值    0.1℃

	
    public float mon_temp_high;            //42411    单体温度上限    0.1℃

    public float mon_temp_low;            //42412    单体温度下限    0.1℃，有符号数

    public float envir_temp_high;        //42413    环境温度上限    0.1℃

    public float envir_temp_low;        //42414    环境温度下限    0.1℃，有符号数

    public float envir_humid_high;        //42415    环境湿度上限    0.1%RH

    public float envir_humid_low;        //42416    环境湿度下限    0.1%RH

    

    

    public boolean putByteBuffer(ByteBuffer bbf_rx) {

@@ -41,8 +48,15 @@
        this.discurr_high = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort());                //2406    放电电流大阈值        A

        this.chrcurr_high = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort());                //2407    充电电流大阈值        A

        this.dcoutputcurr_high = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort());            //2408    直流输出电流大阈值    A

        this.dev_temp_high = FBS9100_ComBase.changeSigleShortToFloat(bbf_rx.getShort())/10;            //2409    设备内部温度高阈值    0.1℃

        this.dev_temp_low = FBS9100_ComBase.changeSigleShortToFloat(bbf_rx.getShort())/10;            //2410    设备内部温度低阈值    0.1℃

        this.dev_temp_high = FBS9100_ComBase.changeSigleShortToFloat(bbf_rx.getShort())/10;        //2409    设备内部温度高阈值    0.1℃

        this.dev_temp_low = FBS9100_ComBase.changeSigleShortToFloat(bbf_rx.getShort())/10;        //2410    设备内部温度低阈值    0.1℃

	
        this.mon_temp_high = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/10;            //42411    单体温度上限    0.1℃

        this.mon_temp_low = FBS9100_ComBase.changeSigleShortToFloat(bbf_rx.getShort())/10;        //42412    单体温度下限    0.1℃，有符号数

        this.envir_temp_high = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/10;        //42413    环境温度上限    0.1℃

        this.envir_temp_low = FBS9100_ComBase.changeSigleShortToFloat(bbf_rx.getShort())/10;    //42414    环境温度下限    0.1℃，有符号数

        this.envir_humid_high = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/10;        //42415    环境湿度上限    0.1%RH

        this.envir_humid_low = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/10;        //42416    环境湿度下限    0.1%RH

        //System.out.println(this);

        return true;

    }

@@ -61,19 +75,20 @@
        buffer.putShort(FBS9100_ComBase.changeFloatToShort(this.discurr_high));

        buffer.putShort(FBS9100_ComBase.changeFloatToShort(this.chrcurr_high));

        buffer.putShort(FBS9100_ComBase.changeFloatToShort(this.dcoutputcurr_high));

        buffer.putShort(FBS9100_ComBase.changeFloatToSigleShort(this.dev_temp_high*10));

        buffer.putShort(FBS9100_ComBase.changeFloatToSigleShort(this.dev_temp_low*10));

        buffer.putShort(FBS9100_ComBase.changeFloatToShort(this.dev_temp_high*10));

        buffer.putShort(FBS9100_ComBase.changeFloatToShort(this.dev_temp_low*10));



        buffer.putShort(FBS9100_ComBase.changeFloatToShort(this.mon_temp_high*10));

        buffer.putShort(FBS9100_ComBase.changeFloatToShort(this.mon_temp_low*10));

        buffer.putShort(FBS9100_ComBase.changeFloatToShort(this.envir_temp_high*10));

        buffer.putShort(FBS9100_ComBase.changeFloatToShort(this.envir_temp_low*10));

        buffer.putShort(FBS9100_ComBase.changeFloatToShort(this.envir_humid_high*10));

        buffer.putShort(FBS9100_ComBase.changeFloatToShort(this.envir_humid_low*10));

		
		
        

        buffer.flip();

        return buffer;

    }

	
	
    public static void main(String[] args) {

        int ff = 65516;

        short ss = -6;

        System.out.println((short)(ff));

        System.out.println((int)(ss&0xFFFF));

    }

    

}


 Device_Simulator_DTS_Tester/src/com/dev/simpower/dev/Power_AlmState.java

@@ -14,7 +14,7 @@
 */

public class Power_AlmState {

    

    public static final int REG_Count   = 76;        //寄存器数量

    public static final int REG_Count   = 95;        //寄存器数量

    

    public int ac_powerdown;                //1500    交流停电告警    0-无告警，1-停电告警

    public int access_open;                    //1501    门禁开启告警    0-无告警，1-门禁开启

@@ -30,6 +30,10 @@
    public int dcoutputcurr_high;            //1574    直流输出电流大告警    0-无告警，1-直流输出电流大

    public int devtemp_high;                //1575    设备温度高告警    0-无告警，1-设备温度高



    public int acligh_alm;                    //1576    交流防雷器告警    0-无告警，1-防雷器异常

    public int mon_temp_alm[] = new int[16]; //41577~415921~4节(最多4*4)告警，0-无告警，1-超过上限告警，2-低于下限告警

    public int envir_temp_alm;                //41593     环境温度

    public int envir_humid_alm;                //41594    环境湿度

    public boolean putByteBuffer(ByteBuffer bbf_rx) {

        

        if(bbf_rx.limit() < REG_Count*2) {

@@ -56,6 +60,12 @@
        this.dcoutputcurr_high = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());            //1574    直流输出电流大告警    0-无告警，1-直流输出电流大

        this.devtemp_high = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());                //1575    设备温度高告警    0-无告警，1-设备温度高

        

        this.acligh_alm = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());                    //1576    交流防雷器告警    0-无告警，1-防雷器异常

        for (int i = 0; i < mon_temp_alm.length; i++) {

            this.mon_temp_alm[i] = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());         //41577~415921~4节(最多4*4)告警，0-无告警，1-超过上限告警，2-低于下限告警

        }		
        this.envir_temp_alm = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());                //41593     环境温度

        this.envir_humid_alm = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());                //41594    环境湿度

        //System.out.println(this);

        return true;

    }

@@ -82,6 +92,13 @@
        alm_state.add(dcoutputcurr_high==0?"无告警":"直流输出电流大");

        alm_state.add(devtemp_high==0?"无告警":"设备温度高");

        

        alm_state.add(acligh_alm==0?"无告警":"防雷器异常");

        for(int k = 0;k<mon_temp_alm.length;k++) {

            int temp_alm = mon_temp_alm[k];

            alm_state.add(temp_alm==0?"无告警":temp_alm==1?"上限告警":temp_alm==2?"下限告警":"其他-"+temp_alm);

        }

        alm_state.add(envir_temp_alm==0?"无告警":envir_temp_alm==1?"上限告警":envir_temp_alm==2?"下限告警":"其他-" + envir_temp_alm);

        alm_state.add(envir_humid_alm==0?"无告警":envir_humid_alm==1?"上限告警":envir_humid_alm==2?"下限告警":"其他-" + envir_humid_alm);

        return alm_state;

    }




 Device_Simulator_DTS_Tester/src/com/dev/simpower/dev/Power_ComBase.java

@@ -7,6 +7,7 @@
    public static final int Control_RegCount                                = 1;            //控制寄存器个数

    

    public static final int LIBMSDATA_MAX_COUNT                             = 4;            //锂电池包最大数量

    public static final int LIBMSTEMP_MAX_COUNT                             = 4;            //锂电池包电芯温度最大数量

    public static final int LIMODEL_MAX_COUNT                                 = 4;            //电源模块最大数量

    public static final int MON_MAX_COUNT                                     = 16;            //电源模块最大数量

    


 Device_Simulator_DTS_Tester/src/com/dev/simpower/power_page_base.java

@@ -217,6 +217,13 @@
    private JTextField tf_devtemp_low_limit;    //设备内部温度低阈值

    private JTextField tf_dcoutcurr_high_limit;    //直流输出电流大阈值

    

    private JTextField tf_montemp_high_limit;    //单体温度上限阈值

    private JTextField tf_montemp_low_limit;    //单体温度下限阈值

    private JTextField tf_envirtemp_high_limit;    //环境温度上限阈值

    private JTextField tf_envirtemp_low_limit;    //环境温度下限阈值

    private JTextField tf_envirhumid_high_limit;//环境湿度上限阈值

    private JTextField tf_envirhumid_low_limit;    //环境湿度下限阈值

	
    private JButton btn_almparam_read;                //读取

    private JButton btn_almparam_write;            //设置

    

@@ -2921,7 +2928,65 @@
        panel_411.add(tf_dcoutcurr_high_limit);

        tf_dcoutcurr_high_limit.setColumns(10);

        

        //单体温度上限

        JPanel panel_420 = new JPanel();

        panel_420.setBorder(new TitledBorder(null, "单体温度上限(℃)", TitledBorder.LEADING, TitledBorder.TOP, null, null));

        panel_400.add(panel_420);

        panel_420.setLayout(new BorderLayout(0, 0));

        

        tf_montemp_high_limit = new JTextField();

        panel_420.add(tf_montemp_high_limit);

        tf_montemp_high_limit.setColumns(12);

		
        //单体温度下限

        JPanel panel_421 = new JPanel();

        panel_421.setBorder(new TitledBorder(null, "单体温度下限(℃)", TitledBorder.LEADING, TitledBorder.TOP, null, null));

        panel_400.add(panel_421);

        panel_421.setLayout(new BorderLayout(0, 0));

		
        tf_montemp_low_limit = new JTextField();

        panel_421.add(tf_montemp_low_limit);

        tf_montemp_low_limit.setColumns(12);

		
        //环境温度上限

        JPanel panel_422 = new JPanel();

        panel_422.setBorder(new TitledBorder(null, "环境温度上限(℃)", TitledBorder.LEADING, TitledBorder.TOP, null, null));

        panel_400.add(panel_422);

        panel_422.setLayout(new BorderLayout(0, 0));

		
        tf_envirtemp_high_limit = new JTextField();

        panel_422.add(tf_envirtemp_high_limit);

        tf_envirtemp_high_limit.setColumns(12);

		
        //环境温度下限

        JPanel panel_423 = new JPanel();

        panel_423.setBorder(new TitledBorder(null, "环境温度下限(℃)", TitledBorder.LEADING, TitledBorder.TOP, null, null));

        panel_400.add(panel_423);

        panel_423.setLayout(new BorderLayout(0, 0));

		
        tf_envirtemp_low_limit = new JTextField();

        panel_423.add(tf_envirtemp_low_limit);

        tf_envirtemp_low_limit.setColumns(12);

		
        //环境湿度上限

        JPanel panel_424 = new JPanel();

        panel_424.setBorder(new TitledBorder(null, "环境湿度上限(℃)", TitledBorder.LEADING, TitledBorder.TOP, null, null));

        panel_400.add(panel_424);

        panel_424.setLayout(new BorderLayout(0, 0));

		
        tf_envirhumid_high_limit = new JTextField();

        panel_424.add(tf_envirhumid_high_limit);

        tf_envirhumid_high_limit.setColumns(12);

		
        //环境湿度下限

        JPanel panel_425 = new JPanel();

        panel_425.setBorder(new TitledBorder(null, "环境湿度下限(℃)", TitledBorder.LEADING, TitledBorder.TOP, null, null));

        panel_400.add(panel_425);

        panel_425.setLayout(new BorderLayout(0, 0));

		
        tf_envirhumid_low_limit = new JTextField();

        panel_425.add(tf_envirhumid_low_limit);

        tf_envirhumid_low_limit.setColumns(12);

        

        //控制参数

        JPanel panel_412 = new JPanel();

@@ -2964,6 +3029,13 @@
                    tmp_param.dcoutputcurr_high = Float.parseFloat(tf_dcoutcurr_high_limit.getText());        //2408    直流输出电流大阈值    A

                    tmp_param.dev_temp_high = Float.parseFloat(tf_devtemp_high_limit.getText());            //2409    设备内部温度高阈值    0.1℃

                    tmp_param.dev_temp_low = Float.parseFloat(tf_devtemp_low_limit.getText());                //2410    设备内部温度低阈值    0.1℃

				
                    tmp_param.mon_temp_high = Float.parseFloat(tf_montemp_high_limit.getText());            //42411    单体温度上限    0.1℃

                    tmp_param.mon_temp_low = Float.parseFloat(tf_montemp_low_limit.getText());            //42412    单体温度下限    0.1℃，有符号数

                    tmp_param.envir_temp_high = Float.parseFloat(tf_envirtemp_high_limit.getText());        //42413    环境温度上限    0.1℃

                    tmp_param.envir_temp_low = Float.parseFloat(tf_envirtemp_low_limit.getText());        //42414    环境温度下限    0.1℃，有符号数

                    tmp_param.envir_humid_high = Float.parseFloat(tf_envirhumid_high_limit.getText());        //42415    环境湿度上限    0.1%RH

                    tmp_param.envir_humid_low = Float.parseFloat(tf_envirhumid_low_limit.getText());        //42416    环境湿度下限    0.1%RH

                    

                    Comm_POWER.setCommCmd(MyModBusRtu.CMD_TYPE_WRITE_MULTY, Power_ComBase.PWD_AlmParam_RegAddr_Start, tmp_param.getByteBuffer());

                } catch (NumberFormatException e1) {

@@ -6458,6 +6530,13 @@
                    tf_devtemp_low_limit.setText(String.format("%1.1f", Comm_POWER.m_AlmParamFromDev.dev_temp_low));            //设备内部温度低阈值

                    tf_dcoutcurr_high_limit.setText(String.format("%1.1f", Comm_POWER.m_AlmParamFromDev.dcoutputcurr_high));    //直流输出电流大阈值

                    

                    tf_montemp_high_limit.setText(String.format("%1.1f", Comm_POWER.m_AlmParamFromDev.mon_temp_high));    //单体温度上限阈值

                    tf_montemp_low_limit.setText(String.format("%1.1f", Comm_POWER.m_AlmParamFromDev.mon_temp_low));    //单体温度下限阈值

                    tf_envirtemp_high_limit.setText(String.format("%1.1f", Comm_POWER.m_AlmParamFromDev.envir_temp_high));    //环境温度上限阈值

                    tf_envirtemp_low_limit.setText(String.format("%1.1f", Comm_POWER.m_AlmParamFromDev.envir_temp_low));    //环境温度下限阈值

                    tf_envirhumid_high_limit.setText(String.format("%1.1f", Comm_POWER.m_AlmParamFromDev.envir_humid_high));//环境湿度上限阈值

                    tf_envirhumid_low_limit.setText(String.format("%1.1f", Comm_POWER.m_AlmParamFromDev.envir_humid_low));    //环境湿度下限阈值

					
                    Comm_POWER.dt_user_cmd_ack = Power_ComBase.CMD_NULL;

                }

            }else if(Power_ComBase.PWD_SchoolTime_Read_ACK == Comm_POWER.dt_user_cmd_ack) {

@@ -6917,7 +6996,7 @@
            {

                List<String> alm_name = power_util.createPowerAlmName();

                List<String> alm_state = Comm_POWER.m_AlmState.getPowerAlarmState();

				
                System.err.println("alm_name.size():"+alm_name.size());

                dataRow_alm.clear();

                for(int n=0; n<row_num; n++) {

                    Vector<String> row = new Vector<String>();


 Device_Simulator_DTS_Tester/src/com/dev/simpower/power_page_mudata.java

@@ -402,7 +402,7 @@
        panel_116.add(panel_117);

        

        jc_ac_thunder_st = new JComboBox<>();

        jc_ac_thunder_st.setModel(new DefaultComboBoxModel(new String[] {"正常                    ", "停电"}));

        jc_ac_thunder_st.setModel(new DefaultComboBoxModel(new String[] {"正常                    ", "告警"}));

        panel_117.add(jc_ac_thunder_st,BorderLayout.CENTER);

        

        JPanel panel_118 = new JPanel();

@@ -2423,7 +2423,7 @@
        panel_518.add(tf_dev_fault,BorderLayout.CENTER);

        

        JPanel panel_519 = new JPanel();

        panel_519.setBorder(new TitledBorder(null, "故障状态", TitledBorder.LEADING, TitledBorder.TOP, null, null));

        panel_519.setBorder(new TitledBorder(null, "通信状态", TitledBorder.LEADING, TitledBorder.TOP, null, null));

        panel_500.add(panel_519);

        panel_519.setLayout(new BorderLayout());

        


 Device_Simulator_DTS_Tester/src/com/dev/simpower/power_util.java

@@ -22,7 +22,7 @@
        power_almname.add("交流停电告警");

        power_almname.add("门禁开启告警");

        power_almname.add("水浸告警");

        power_almname.add("防雷器告警");

        power_almname.add("直流防雷器告警");

        power_almname.add("锂电池BMS通信异常告警");

        power_almname.add("电源模块通信异常告警");

        power_almname.add("交流输入告警");

@@ -37,6 +37,15 @@
        power_almname.add("电池充电电流大告警");

        power_almname.add("直流输出电流大告警");

        power_almname.add("设备温度高告警");    

		
        power_almname.add("交流防雷器告警");	
        for(int n = 0;n<Power_ComBase.LIBMSDATA_MAX_COUNT;n++) {

            for(int k = 0;k<Power_ComBase.LIBMSTEMP_MAX_COUNT;k++) {

                power_almname.add("锂电池包"+(n+1)+"=>#"+(k+1)+"单体电芯温度告警");

            }

        }

        power_almname.add("环境温度告警");

        power_almname.add("环境湿度告警");

        return power_almname;

    }

    


 Device_Simulator_DTS_Tester/src/main/main_window_simulator.java

@@ -306,9 +306,6 @@
        cb_tcp_udp.setModel(new DefaultComboBoxModel(new String[] {"TCP客户端", "TCP服务器"}));
        panel_3.add(cb_tcp_udp);
    
		
		
		
        tf_ip_addr = new JTextField();
        tf_ip_addr.setDocument(new LimitedDocument(16, "0123456789."));
        //tf_ip_addr.setText("192.168.10.102");