From b54d209c93b3b44f6389a61e4bdb18ad2c469501 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期六, 15 六月 2024 10:54:50 +0800
Subject: [PATCH] 新增告警以及告警参数
---
Device_Simulator_DTS_Tester/src/com/dev/simpower/power_page_base.java | 81 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 80 insertions(+), 1 deletions(-)
diff --git a/Device_Simulator_DTS_Tester/src/com/dev/simpower/power_page_base.java b/Device_Simulator_DTS_Tester/src/com/dev/simpower/power_page_base.java
index 031d633..5845025 100644
--- a/Device_Simulator_DTS_Tester/src/com/dev/simpower/power_page_base.java
+++ b/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>();
--
Gitblit v1.9.1