diff --git a/WebRoot/index.jsp b/WebRoot/index.jsp index af52bf9..9016588 100644 --- a/WebRoot/index.jsp +++ b/WebRoot/index.jsp @@ -14,6 +14,6 @@ - This is my JSP page.
+ 后台服务启动正常
diff --git a/WebRoot/index.jsp b/WebRoot/index.jsp index af52bf9..9016588 100644 --- a/WebRoot/index.jsp +++ b/WebRoot/index.jsp @@ -14,6 +14,6 @@ - This is my JSP page.
+ 后台服务启动正常
diff --git a/src/ACUBL.properties b/src/ACUBL.properties index 2a8ee6f..9c4b0ab 100644 --- a/src/ACUBL.properties +++ b/src/ACUBL.properties @@ -2062,6 +2062,11 @@ #\u7167\u660E\u7F16\u7801\u5217\u8868 THXC.ACU301.ZM.ZC.LIST = THXC.ACU301.Z.ZZM01;THXC.ACU301.Z.DZM01 +#\u4E95\u76D6\u6570\u91CF +THXC.ACU0301.JG.COUNT = 2 +#\u4E95\u76D6\u7F16\u7801\u5217\u8868 +THXC.ACU301.JG.ZC.LIST = THXC.ACU301.J.QJG01;THXC.ACU301.J.QJG02 + diff --git a/WebRoot/index.jsp b/WebRoot/index.jsp index af52bf9..9016588 100644 --- a/WebRoot/index.jsp +++ b/WebRoot/index.jsp @@ -14,6 +14,6 @@ - This is my JSP page.
+ 后台服务启动正常
diff --git a/src/ACUBL.properties b/src/ACUBL.properties index 2a8ee6f..9c4b0ab 100644 --- a/src/ACUBL.properties +++ b/src/ACUBL.properties @@ -2062,6 +2062,11 @@ #\u7167\u660E\u7F16\u7801\u5217\u8868 THXC.ACU301.ZM.ZC.LIST = THXC.ACU301.Z.ZZM01;THXC.ACU301.Z.DZM01 +#\u4E95\u76D6\u6570\u91CF +THXC.ACU0301.JG.COUNT = 2 +#\u4E95\u76D6\u7F16\u7801\u5217\u8868 +THXC.ACU301.JG.ZC.LIST = THXC.ACU301.J.QJG01;THXC.ACU301.J.QJG02 + diff --git a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java index f65a34c..fbaaaae 100644 --- a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java @@ -21,7 +21,7 @@ public List findAllACU() { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU ORDER BY ID"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' ORDER BY ID"; try { conn = ConnectionManager.getConnectionFromC3P0(); conn.setAutoCommit(false); @@ -52,7 +52,7 @@ public PgAcu findACUById(Integer id) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ID = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ID = ?"; Object[] param = new Object[1]; param[0] = id; @@ -86,7 +86,7 @@ public PgAcu findACUByDest(String dest) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_DEST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_DEST = ?"; Object[] param = new Object[1]; param[0] = dest; @@ -120,7 +120,7 @@ public PgAcu findACUByHost(String host) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_HOST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_HOST = ?"; Object[] param = new Object[1]; param[0] = host; @@ -154,7 +154,7 @@ public PgAcu findACUByCode(String acucode) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_CODE = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_CODE = ?"; Object[] param = new Object[1]; param[0] = acucode; diff --git a/WebRoot/index.jsp b/WebRoot/index.jsp index af52bf9..9016588 100644 --- a/WebRoot/index.jsp +++ b/WebRoot/index.jsp @@ -14,6 +14,6 @@ - This is my JSP page.
+ 后台服务启动正常
diff --git a/src/ACUBL.properties b/src/ACUBL.properties index 2a8ee6f..9c4b0ab 100644 --- a/src/ACUBL.properties +++ b/src/ACUBL.properties @@ -2062,6 +2062,11 @@ #\u7167\u660E\u7F16\u7801\u5217\u8868 THXC.ACU301.ZM.ZC.LIST = THXC.ACU301.Z.ZZM01;THXC.ACU301.Z.DZM01 +#\u4E95\u76D6\u6570\u91CF +THXC.ACU0301.JG.COUNT = 2 +#\u4E95\u76D6\u7F16\u7801\u5217\u8868 +THXC.ACU301.JG.ZC.LIST = THXC.ACU301.J.QJG01;THXC.ACU301.J.QJG02 + diff --git a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java index f65a34c..fbaaaae 100644 --- a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java @@ -21,7 +21,7 @@ public List findAllACU() { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU ORDER BY ID"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' ORDER BY ID"; try { conn = ConnectionManager.getConnectionFromC3P0(); conn.setAutoCommit(false); @@ -52,7 +52,7 @@ public PgAcu findACUById(Integer id) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ID = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ID = ?"; Object[] param = new Object[1]; param[0] = id; @@ -86,7 +86,7 @@ public PgAcu findACUByDest(String dest) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_DEST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_DEST = ?"; Object[] param = new Object[1]; param[0] = dest; @@ -120,7 +120,7 @@ public PgAcu findACUByHost(String host) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_HOST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_HOST = ?"; Object[] param = new Object[1]; param[0] = host; @@ -154,7 +154,7 @@ public PgAcu findACUByCode(String acucode) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_CODE = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_CODE = ?"; Object[] param = new Object[1]; param[0] = acucode; diff --git a/src/com/szpg/db/data/PgAcu.java b/src/com/szpg/db/data/PgAcu.java index 50068af..9b486fe 100644 --- a/src/com/szpg/db/data/PgAcu.java +++ b/src/com/szpg/db/data/PgAcu.java @@ -16,6 +16,7 @@ private String acu_node; // ACU节点号 private String acu_unit; // ACU单元号 private String acu_flag; // ACU建设标段标志 + private String active; // ACU可用标志位 public Integer getId() { return id; @@ -89,6 +90,14 @@ this.acu_flag = acu_flag; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + @Override public String toString() { return "PgAcu[" + acu_host + ":" + acu_port + "," + acu_net + acu_node + acu_unit + "]"; diff --git a/WebRoot/index.jsp b/WebRoot/index.jsp index af52bf9..9016588 100644 --- a/WebRoot/index.jsp +++ b/WebRoot/index.jsp @@ -14,6 +14,6 @@ - This is my JSP page.
+ 后台服务启动正常
diff --git a/src/ACUBL.properties b/src/ACUBL.properties index 2a8ee6f..9c4b0ab 100644 --- a/src/ACUBL.properties +++ b/src/ACUBL.properties @@ -2062,6 +2062,11 @@ #\u7167\u660E\u7F16\u7801\u5217\u8868 THXC.ACU301.ZM.ZC.LIST = THXC.ACU301.Z.ZZM01;THXC.ACU301.Z.DZM01 +#\u4E95\u76D6\u6570\u91CF +THXC.ACU0301.JG.COUNT = 2 +#\u4E95\u76D6\u7F16\u7801\u5217\u8868 +THXC.ACU301.JG.ZC.LIST = THXC.ACU301.J.QJG01;THXC.ACU301.J.QJG02 + diff --git a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java index f65a34c..fbaaaae 100644 --- a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java @@ -21,7 +21,7 @@ public List findAllACU() { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU ORDER BY ID"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' ORDER BY ID"; try { conn = ConnectionManager.getConnectionFromC3P0(); conn.setAutoCommit(false); @@ -52,7 +52,7 @@ public PgAcu findACUById(Integer id) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ID = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ID = ?"; Object[] param = new Object[1]; param[0] = id; @@ -86,7 +86,7 @@ public PgAcu findACUByDest(String dest) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_DEST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_DEST = ?"; Object[] param = new Object[1]; param[0] = dest; @@ -120,7 +120,7 @@ public PgAcu findACUByHost(String host) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_HOST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_HOST = ?"; Object[] param = new Object[1]; param[0] = host; @@ -154,7 +154,7 @@ public PgAcu findACUByCode(String acucode) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_CODE = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_CODE = ?"; Object[] param = new Object[1]; param[0] = acucode; diff --git a/src/com/szpg/db/data/PgAcu.java b/src/com/szpg/db/data/PgAcu.java index 50068af..9b486fe 100644 --- a/src/com/szpg/db/data/PgAcu.java +++ b/src/com/szpg/db/data/PgAcu.java @@ -16,6 +16,7 @@ private String acu_node; // ACU节点号 private String acu_unit; // ACU单元号 private String acu_flag; // ACU建设标段标志 + private String active; // ACU可用标志位 public Integer getId() { return id; @@ -89,6 +90,14 @@ this.acu_flag = acu_flag; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + @Override public String toString() { return "PgAcu[" + acu_host + ":" + acu_port + "," + acu_net + acu_node + acu_unit + "]"; diff --git a/src/com/szpg/plc/PGDSCServlet.java b/src/com/szpg/plc/PGDSCServlet.java index 14d20d1..5653eb6 100644 --- a/src/com/szpg/plc/PGDSCServlet.java +++ b/src/com/szpg/plc/PGDSCServlet.java @@ -46,11 +46,10 @@ public void init() throws ServletException { // 1获取数据库中所有ACU PgAcuDao acuDao = new PgAcuDaoImpl(); -// List acuList = acuDao.findAllACU(); + List acuList = acuDao.findAllACU(); // 2遍历ACU列表，获取其IP地址与端口号 -// for (PgAcu acu : acuList) { - PgAcu acu = acuDao.findACUById(16); + for (PgAcu acu : acuList) { ACUClient client = new ACUClient(acu.getAcu_host(), Integer.parseInt(acu.getAcu_port())); client.setAcucode(acu.getAcu_code()); @@ -64,60 +63,59 @@ // 4新建线程启动client new ScheduledThreadPoolExecutor(1).scheduleAtFixedRate(new ACUSocketCheckTask(client), 0, 30, TimeUnit.SECONDS); -// } + } // 3启动查询温湿度的定时任务 -// sendQueryWSValueCommand(); -// sendSetWSThresholdCommand(); + sendQueryWSValueCommand(); + sendSetWSThresholdCommand(); // 4启动查询甲烷的定时任务 -// sendQueryCH4ValueCommand(); -// sendSetCH4ThresholdCommand(); + sendQueryCH4ValueCommand(); + sendSetCH4ThresholdCommand(); // 5启动查询一氧化碳的定时任务 -// sendQueryCOValueCommand(); -// sendSetCOThresholdCommand(); + sendQueryCOValueCommand(); + sendSetCOThresholdCommand(); // 6氧气 -// sendQueryO2ValueCommand(); -// sendSetO2ThresholdCommand(); + sendQueryO2ValueCommand(); + sendSetO2ThresholdCommand(); // 7硫化氢 -// sendQueryHSValueCommand(); -// sendSetHSThresholdCommand(); + sendQueryHSValueCommand(); + sendSetHSThresholdCommand(); // 8对射报警 -// sendQueryDSStatusCommand(); + sendQueryDSStatusCommand(); // 9液位报警 -// sendQueryYWStatusCommand(); + sendQueryYWStatusCommand(); // 10风机状态 -// sendQueryFJStatusCommand(); + sendQueryFJStatusCommand(); // 11照明状态 -// sendQueryZMStatusCommand(); + sendQueryZMStatusCommand(); // 12水泵状态 -// sendQuerySBStatusCommand(); + sendQuerySBStatusCommand(); // 13井盖状态 -// sendQueryJGStatusCommand(); + sendQueryJGStatusCommand(); //10巡检数据同步 -// synchAssetInSpection(); + synchAssetInSpection(); //运维数据同步 - //synchMaintanceRecord(); + synchMaintanceRecord(); // 查询二期温湿度氧气实时数据 -// sendQueryWSYQValueCommand(); + sendQueryWSYQValueCommand(); } /** * 发送查询温湿度监测值命令 * - * @param client */ private void sendQueryWSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WS_VALUE_INTERVAL", "60")); @@ -127,8 +125,7 @@ /** * 发送查询氧气监测值命令 - * - * @param client + * */ private void sendQueryO2ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_O2_VALUE_INTERVAL", "60")); @@ -138,8 +135,7 @@ /** * 发送查询硫化氢监测值命令 - * - * @param client + * */ private void sendQueryHSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_HS_VALUE_INTERVAL", "60")); @@ -149,8 +145,7 @@ /** * 发送查询甲烷监测值命令 - * - * @param client + * */ private void sendQueryCH4ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CH4_VALUE_INTERVAL", "60")); @@ -160,8 +155,7 @@ /** * 发送查询一氧化碳监测值命令 - * - * @param client + * */ private void sendQueryCOValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CO_VALUE_INTERVAL", "60")); @@ -171,7 +165,7 @@ /** * 发送查询温湿度报警状态命令 - * @param client + * */ private void sendSetWSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -180,7 +174,7 @@ /** * 发送查询甲烷报警状态命令 - * @param client + * */ private void sendSetCH4ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -189,7 +183,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetCOThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -198,7 +192,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetO2ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -207,7 +201,7 @@ /** * 发送查询硫化氢报警状态命令 - * @param client + * */ private void sendSetHSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -216,7 +210,7 @@ /** * 发送查询对射报警状态命令 - * @param client + * */ private void sendQueryDSStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -225,7 +219,7 @@ /** * 发送查询爆管液位报警状态命令 - * @param client + * */ private void sendQueryYWStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -235,7 +229,7 @@ /** * 发送查询风机状态命令 - * @param client + * */ private void sendQueryFJStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -244,7 +238,7 @@ /** * 发送查询照明状态命令 - * @param client + * */ private void sendQueryZMStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -253,7 +247,7 @@ /** * 发送查询水泵状态命令 - * @param client + * */ private void sendQuerySBStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -262,7 +256,7 @@ /** * 发送查询井盖状态命令 - * @param client + * */ private void sendQueryJGStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -271,7 +265,7 @@ /** * 调用巡检接口同步数据 - * @param + * */ private void synchAssetInSpection() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -280,7 +274,7 @@ /** * 调用维护接口同步数据 - * @param + * */ private void synchMaintanceRecord() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -289,6 +283,7 @@ /** * 查询二期温湿度及氧气实时值定时任务 + * */ private void sendQueryWSYQValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WSYQ_VALUE_INTERVAL", "60")); diff --git a/WebRoot/index.jsp b/WebRoot/index.jsp index af52bf9..9016588 100644 --- a/WebRoot/index.jsp +++ b/WebRoot/index.jsp @@ -14,6 +14,6 @@ - This is my JSP page.
+ 后台服务启动正常
diff --git a/src/ACUBL.properties b/src/ACUBL.properties index 2a8ee6f..9c4b0ab 100644 --- a/src/ACUBL.properties +++ b/src/ACUBL.properties @@ -2062,6 +2062,11 @@ #\u7167\u660E\u7F16\u7801\u5217\u8868 THXC.ACU301.ZM.ZC.LIST = THXC.ACU301.Z.ZZM01;THXC.ACU301.Z.DZM01 +#\u4E95\u76D6\u6570\u91CF +THXC.ACU0301.JG.COUNT = 2 +#\u4E95\u76D6\u7F16\u7801\u5217\u8868 +THXC.ACU301.JG.ZC.LIST = THXC.ACU301.J.QJG01;THXC.ACU301.J.QJG02 + diff --git a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java index f65a34c..fbaaaae 100644 --- a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java @@ -21,7 +21,7 @@ public List findAllACU() { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU ORDER BY ID"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' ORDER BY ID"; try { conn = ConnectionManager.getConnectionFromC3P0(); conn.setAutoCommit(false); @@ -52,7 +52,7 @@ public PgAcu findACUById(Integer id) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ID = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ID = ?"; Object[] param = new Object[1]; param[0] = id; @@ -86,7 +86,7 @@ public PgAcu findACUByDest(String dest) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_DEST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_DEST = ?"; Object[] param = new Object[1]; param[0] = dest; @@ -120,7 +120,7 @@ public PgAcu findACUByHost(String host) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_HOST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_HOST = ?"; Object[] param = new Object[1]; param[0] = host; @@ -154,7 +154,7 @@ public PgAcu findACUByCode(String acucode) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_CODE = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_CODE = ?"; Object[] param = new Object[1]; param[0] = acucode; diff --git a/src/com/szpg/db/data/PgAcu.java b/src/com/szpg/db/data/PgAcu.java index 50068af..9b486fe 100644 --- a/src/com/szpg/db/data/PgAcu.java +++ b/src/com/szpg/db/data/PgAcu.java @@ -16,6 +16,7 @@ private String acu_node; // ACU节点号 private String acu_unit; // ACU单元号 private String acu_flag; // ACU建设标段标志 + private String active; // ACU可用标志位 public Integer getId() { return id; @@ -89,6 +90,14 @@ this.acu_flag = acu_flag; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + @Override public String toString() { return "PgAcu[" + acu_host + ":" + acu_port + "," + acu_net + acu_node + acu_unit + "]"; diff --git a/src/com/szpg/plc/PGDSCServlet.java b/src/com/szpg/plc/PGDSCServlet.java index 14d20d1..5653eb6 100644 --- a/src/com/szpg/plc/PGDSCServlet.java +++ b/src/com/szpg/plc/PGDSCServlet.java @@ -46,11 +46,10 @@ public void init() throws ServletException { // 1获取数据库中所有ACU PgAcuDao acuDao = new PgAcuDaoImpl(); -// List acuList = acuDao.findAllACU(); + List acuList = acuDao.findAllACU(); // 2遍历ACU列表，获取其IP地址与端口号 -// for (PgAcu acu : acuList) { - PgAcu acu = acuDao.findACUById(16); + for (PgAcu acu : acuList) { ACUClient client = new ACUClient(acu.getAcu_host(), Integer.parseInt(acu.getAcu_port())); client.setAcucode(acu.getAcu_code()); @@ -64,60 +63,59 @@ // 4新建线程启动client new ScheduledThreadPoolExecutor(1).scheduleAtFixedRate(new ACUSocketCheckTask(client), 0, 30, TimeUnit.SECONDS); -// } + } // 3启动查询温湿度的定时任务 -// sendQueryWSValueCommand(); -// sendSetWSThresholdCommand(); + sendQueryWSValueCommand(); + sendSetWSThresholdCommand(); // 4启动查询甲烷的定时任务 -// sendQueryCH4ValueCommand(); -// sendSetCH4ThresholdCommand(); + sendQueryCH4ValueCommand(); + sendSetCH4ThresholdCommand(); // 5启动查询一氧化碳的定时任务 -// sendQueryCOValueCommand(); -// sendSetCOThresholdCommand(); + sendQueryCOValueCommand(); + sendSetCOThresholdCommand(); // 6氧气 -// sendQueryO2ValueCommand(); -// sendSetO2ThresholdCommand(); + sendQueryO2ValueCommand(); + sendSetO2ThresholdCommand(); // 7硫化氢 -// sendQueryHSValueCommand(); -// sendSetHSThresholdCommand(); + sendQueryHSValueCommand(); + sendSetHSThresholdCommand(); // 8对射报警 -// sendQueryDSStatusCommand(); + sendQueryDSStatusCommand(); // 9液位报警 -// sendQueryYWStatusCommand(); + sendQueryYWStatusCommand(); // 10风机状态 -// sendQueryFJStatusCommand(); + sendQueryFJStatusCommand(); // 11照明状态 -// sendQueryZMStatusCommand(); + sendQueryZMStatusCommand(); // 12水泵状态 -// sendQuerySBStatusCommand(); + sendQuerySBStatusCommand(); // 13井盖状态 -// sendQueryJGStatusCommand(); + sendQueryJGStatusCommand(); //10巡检数据同步 -// synchAssetInSpection(); + synchAssetInSpection(); //运维数据同步 - //synchMaintanceRecord(); + synchMaintanceRecord(); // 查询二期温湿度氧气实时数据 -// sendQueryWSYQValueCommand(); + sendQueryWSYQValueCommand(); } /** * 发送查询温湿度监测值命令 * - * @param client */ private void sendQueryWSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WS_VALUE_INTERVAL", "60")); @@ -127,8 +125,7 @@ /** * 发送查询氧气监测值命令 - * - * @param client + * */ private void sendQueryO2ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_O2_VALUE_INTERVAL", "60")); @@ -138,8 +135,7 @@ /** * 发送查询硫化氢监测值命令 - * - * @param client + * */ private void sendQueryHSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_HS_VALUE_INTERVAL", "60")); @@ -149,8 +145,7 @@ /** * 发送查询甲烷监测值命令 - * - * @param client + * */ private void sendQueryCH4ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CH4_VALUE_INTERVAL", "60")); @@ -160,8 +155,7 @@ /** * 发送查询一氧化碳监测值命令 - * - * @param client + * */ private void sendQueryCOValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CO_VALUE_INTERVAL", "60")); @@ -171,7 +165,7 @@ /** * 发送查询温湿度报警状态命令 - * @param client + * */ private void sendSetWSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -180,7 +174,7 @@ /** * 发送查询甲烷报警状态命令 - * @param client + * */ private void sendSetCH4ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -189,7 +183,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetCOThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -198,7 +192,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetO2ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -207,7 +201,7 @@ /** * 发送查询硫化氢报警状态命令 - * @param client + * */ private void sendSetHSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -216,7 +210,7 @@ /** * 发送查询对射报警状态命令 - * @param client + * */ private void sendQueryDSStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -225,7 +219,7 @@ /** * 发送查询爆管液位报警状态命令 - * @param client + * */ private void sendQueryYWStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -235,7 +229,7 @@ /** * 发送查询风机状态命令 - * @param client + * */ private void sendQueryFJStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -244,7 +238,7 @@ /** * 发送查询照明状态命令 - * @param client + * */ private void sendQueryZMStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -253,7 +247,7 @@ /** * 发送查询水泵状态命令 - * @param client + * */ private void sendQuerySBStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -262,7 +256,7 @@ /** * 发送查询井盖状态命令 - * @param client + * */ private void sendQueryJGStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -271,7 +265,7 @@ /** * 调用巡检接口同步数据 - * @param + * */ private void synchAssetInSpection() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -280,7 +274,7 @@ /** * 调用维护接口同步数据 - * @param + * */ private void synchMaintanceRecord() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -289,6 +283,7 @@ /** * 查询二期温湿度及氧气实时值定时任务 + * */ private void sendQueryWSYQValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WSYQ_VALUE_INTERVAL", "60")); diff --git a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java index 55a15d3..0f7e11e 100644 --- a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "CH4_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/WebRoot/index.jsp b/WebRoot/index.jsp index af52bf9..9016588 100644 --- a/WebRoot/index.jsp +++ b/WebRoot/index.jsp @@ -14,6 +14,6 @@ - This is my JSP page.
+ 后台服务启动正常
diff --git a/src/ACUBL.properties b/src/ACUBL.properties index 2a8ee6f..9c4b0ab 100644 --- a/src/ACUBL.properties +++ b/src/ACUBL.properties @@ -2062,6 +2062,11 @@ #\u7167\u660E\u7F16\u7801\u5217\u8868 THXC.ACU301.ZM.ZC.LIST = THXC.ACU301.Z.ZZM01;THXC.ACU301.Z.DZM01 +#\u4E95\u76D6\u6570\u91CF +THXC.ACU0301.JG.COUNT = 2 +#\u4E95\u76D6\u7F16\u7801\u5217\u8868 +THXC.ACU301.JG.ZC.LIST = THXC.ACU301.J.QJG01;THXC.ACU301.J.QJG02 + diff --git a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java index f65a34c..fbaaaae 100644 --- a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java @@ -21,7 +21,7 @@ public List findAllACU() { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU ORDER BY ID"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' ORDER BY ID"; try { conn = ConnectionManager.getConnectionFromC3P0(); conn.setAutoCommit(false); @@ -52,7 +52,7 @@ public PgAcu findACUById(Integer id) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ID = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ID = ?"; Object[] param = new Object[1]; param[0] = id; @@ -86,7 +86,7 @@ public PgAcu findACUByDest(String dest) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_DEST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_DEST = ?"; Object[] param = new Object[1]; param[0] = dest; @@ -120,7 +120,7 @@ public PgAcu findACUByHost(String host) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_HOST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_HOST = ?"; Object[] param = new Object[1]; param[0] = host; @@ -154,7 +154,7 @@ public PgAcu findACUByCode(String acucode) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_CODE = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_CODE = ?"; Object[] param = new Object[1]; param[0] = acucode; diff --git a/src/com/szpg/db/data/PgAcu.java b/src/com/szpg/db/data/PgAcu.java index 50068af..9b486fe 100644 --- a/src/com/szpg/db/data/PgAcu.java +++ b/src/com/szpg/db/data/PgAcu.java @@ -16,6 +16,7 @@ private String acu_node; // ACU节点号 private String acu_unit; // ACU单元号 private String acu_flag; // ACU建设标段标志 + private String active; // ACU可用标志位 public Integer getId() { return id; @@ -89,6 +90,14 @@ this.acu_flag = acu_flag; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + @Override public String toString() { return "PgAcu[" + acu_host + ":" + acu_port + "," + acu_net + acu_node + acu_unit + "]"; diff --git a/src/com/szpg/plc/PGDSCServlet.java b/src/com/szpg/plc/PGDSCServlet.java index 14d20d1..5653eb6 100644 --- a/src/com/szpg/plc/PGDSCServlet.java +++ b/src/com/szpg/plc/PGDSCServlet.java @@ -46,11 +46,10 @@ public void init() throws ServletException { // 1获取数据库中所有ACU PgAcuDao acuDao = new PgAcuDaoImpl(); -// List acuList = acuDao.findAllACU(); + List acuList = acuDao.findAllACU(); // 2遍历ACU列表，获取其IP地址与端口号 -// for (PgAcu acu : acuList) { - PgAcu acu = acuDao.findACUById(16); + for (PgAcu acu : acuList) { ACUClient client = new ACUClient(acu.getAcu_host(), Integer.parseInt(acu.getAcu_port())); client.setAcucode(acu.getAcu_code()); @@ -64,60 +63,59 @@ // 4新建线程启动client new ScheduledThreadPoolExecutor(1).scheduleAtFixedRate(new ACUSocketCheckTask(client), 0, 30, TimeUnit.SECONDS); -// } + } // 3启动查询温湿度的定时任务 -// sendQueryWSValueCommand(); -// sendSetWSThresholdCommand(); + sendQueryWSValueCommand(); + sendSetWSThresholdCommand(); // 4启动查询甲烷的定时任务 -// sendQueryCH4ValueCommand(); -// sendSetCH4ThresholdCommand(); + sendQueryCH4ValueCommand(); + sendSetCH4ThresholdCommand(); // 5启动查询一氧化碳的定时任务 -// sendQueryCOValueCommand(); -// sendSetCOThresholdCommand(); + sendQueryCOValueCommand(); + sendSetCOThresholdCommand(); // 6氧气 -// sendQueryO2ValueCommand(); -// sendSetO2ThresholdCommand(); + sendQueryO2ValueCommand(); + sendSetO2ThresholdCommand(); // 7硫化氢 -// sendQueryHSValueCommand(); -// sendSetHSThresholdCommand(); + sendQueryHSValueCommand(); + sendSetHSThresholdCommand(); // 8对射报警 -// sendQueryDSStatusCommand(); + sendQueryDSStatusCommand(); // 9液位报警 -// sendQueryYWStatusCommand(); + sendQueryYWStatusCommand(); // 10风机状态 -// sendQueryFJStatusCommand(); + sendQueryFJStatusCommand(); // 11照明状态 -// sendQueryZMStatusCommand(); + sendQueryZMStatusCommand(); // 12水泵状态 -// sendQuerySBStatusCommand(); + sendQuerySBStatusCommand(); // 13井盖状态 -// sendQueryJGStatusCommand(); + sendQueryJGStatusCommand(); //10巡检数据同步 -// synchAssetInSpection(); + synchAssetInSpection(); //运维数据同步 - //synchMaintanceRecord(); + synchMaintanceRecord(); // 查询二期温湿度氧气实时数据 -// sendQueryWSYQValueCommand(); + sendQueryWSYQValueCommand(); } /** * 发送查询温湿度监测值命令 * - * @param client */ private void sendQueryWSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WS_VALUE_INTERVAL", "60")); @@ -127,8 +125,7 @@ /** * 发送查询氧气监测值命令 - * - * @param client + * */ private void sendQueryO2ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_O2_VALUE_INTERVAL", "60")); @@ -138,8 +135,7 @@ /** * 发送查询硫化氢监测值命令 - * - * @param client + * */ private void sendQueryHSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_HS_VALUE_INTERVAL", "60")); @@ -149,8 +145,7 @@ /** * 发送查询甲烷监测值命令 - * - * @param client + * */ private void sendQueryCH4ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CH4_VALUE_INTERVAL", "60")); @@ -160,8 +155,7 @@ /** * 发送查询一氧化碳监测值命令 - * - * @param client + * */ private void sendQueryCOValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CO_VALUE_INTERVAL", "60")); @@ -171,7 +165,7 @@ /** * 发送查询温湿度报警状态命令 - * @param client + * */ private void sendSetWSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -180,7 +174,7 @@ /** * 发送查询甲烷报警状态命令 - * @param client + * */ private void sendSetCH4ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -189,7 +183,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetCOThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -198,7 +192,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetO2ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -207,7 +201,7 @@ /** * 发送查询硫化氢报警状态命令 - * @param client + * */ private void sendSetHSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -216,7 +210,7 @@ /** * 发送查询对射报警状态命令 - * @param client + * */ private void sendQueryDSStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -225,7 +219,7 @@ /** * 发送查询爆管液位报警状态命令 - * @param client + * */ private void sendQueryYWStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -235,7 +229,7 @@ /** * 发送查询风机状态命令 - * @param client + * */ private void sendQueryFJStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -244,7 +238,7 @@ /** * 发送查询照明状态命令 - * @param client + * */ private void sendQueryZMStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -253,7 +247,7 @@ /** * 发送查询水泵状态命令 - * @param client + * */ private void sendQuerySBStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -262,7 +256,7 @@ /** * 发送查询井盖状态命令 - * @param client + * */ private void sendQueryJGStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -271,7 +265,7 @@ /** * 调用巡检接口同步数据 - * @param + * */ private void synchAssetInSpection() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -280,7 +274,7 @@ /** * 调用维护接口同步数据 - * @param + * */ private void synchMaintanceRecord() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -289,6 +283,7 @@ /** * 查询二期温湿度及氧气实时值定时任务 + * */ private void sendQueryWSYQValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WSYQ_VALUE_INTERVAL", "60")); diff --git a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java index 55a15d3..0f7e11e 100644 --- a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "CH4_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java index 0384132..079c421 100644 --- a/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java @@ -128,16 +128,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); + if (Boolean.valueOf(Configure.getProperty("sys", "HS_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } @@ -212,16 +214,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); + if (Boolean.valueOf(Configure.getProperty("sys", "CH4_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/WebRoot/index.jsp b/WebRoot/index.jsp index af52bf9..9016588 100644 --- a/WebRoot/index.jsp +++ b/WebRoot/index.jsp @@ -14,6 +14,6 @@ - This is my JSP page.
+ 后台服务启动正常
diff --git a/src/ACUBL.properties b/src/ACUBL.properties index 2a8ee6f..9c4b0ab 100644 --- a/src/ACUBL.properties +++ b/src/ACUBL.properties @@ -2062,6 +2062,11 @@ #\u7167\u660E\u7F16\u7801\u5217\u8868 THXC.ACU301.ZM.ZC.LIST = THXC.ACU301.Z.ZZM01;THXC.ACU301.Z.DZM01 +#\u4E95\u76D6\u6570\u91CF +THXC.ACU0301.JG.COUNT = 2 +#\u4E95\u76D6\u7F16\u7801\u5217\u8868 +THXC.ACU301.JG.ZC.LIST = THXC.ACU301.J.QJG01;THXC.ACU301.J.QJG02 + diff --git a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java index f65a34c..fbaaaae 100644 --- a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java @@ -21,7 +21,7 @@ public List findAllACU() { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU ORDER BY ID"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' ORDER BY ID"; try { conn = ConnectionManager.getConnectionFromC3P0(); conn.setAutoCommit(false); @@ -52,7 +52,7 @@ public PgAcu findACUById(Integer id) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ID = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ID = ?"; Object[] param = new Object[1]; param[0] = id; @@ -86,7 +86,7 @@ public PgAcu findACUByDest(String dest) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_DEST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_DEST = ?"; Object[] param = new Object[1]; param[0] = dest; @@ -120,7 +120,7 @@ public PgAcu findACUByHost(String host) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_HOST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_HOST = ?"; Object[] param = new Object[1]; param[0] = host; @@ -154,7 +154,7 @@ public PgAcu findACUByCode(String acucode) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_CODE = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_CODE = ?"; Object[] param = new Object[1]; param[0] = acucode; diff --git a/src/com/szpg/db/data/PgAcu.java b/src/com/szpg/db/data/PgAcu.java index 50068af..9b486fe 100644 --- a/src/com/szpg/db/data/PgAcu.java +++ b/src/com/szpg/db/data/PgAcu.java @@ -16,6 +16,7 @@ private String acu_node; // ACU节点号 private String acu_unit; // ACU单元号 private String acu_flag; // ACU建设标段标志 + private String active; // ACU可用标志位 public Integer getId() { return id; @@ -89,6 +90,14 @@ this.acu_flag = acu_flag; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + @Override public String toString() { return "PgAcu[" + acu_host + ":" + acu_port + "," + acu_net + acu_node + acu_unit + "]"; diff --git a/src/com/szpg/plc/PGDSCServlet.java b/src/com/szpg/plc/PGDSCServlet.java index 14d20d1..5653eb6 100644 --- a/src/com/szpg/plc/PGDSCServlet.java +++ b/src/com/szpg/plc/PGDSCServlet.java @@ -46,11 +46,10 @@ public void init() throws ServletException { // 1获取数据库中所有ACU PgAcuDao acuDao = new PgAcuDaoImpl(); -// List acuList = acuDao.findAllACU(); + List acuList = acuDao.findAllACU(); // 2遍历ACU列表，获取其IP地址与端口号 -// for (PgAcu acu : acuList) { - PgAcu acu = acuDao.findACUById(16); + for (PgAcu acu : acuList) { ACUClient client = new ACUClient(acu.getAcu_host(), Integer.parseInt(acu.getAcu_port())); client.setAcucode(acu.getAcu_code()); @@ -64,60 +63,59 @@ // 4新建线程启动client new ScheduledThreadPoolExecutor(1).scheduleAtFixedRate(new ACUSocketCheckTask(client), 0, 30, TimeUnit.SECONDS); -// } + } // 3启动查询温湿度的定时任务 -// sendQueryWSValueCommand(); -// sendSetWSThresholdCommand(); + sendQueryWSValueCommand(); + sendSetWSThresholdCommand(); // 4启动查询甲烷的定时任务 -// sendQueryCH4ValueCommand(); -// sendSetCH4ThresholdCommand(); + sendQueryCH4ValueCommand(); + sendSetCH4ThresholdCommand(); // 5启动查询一氧化碳的定时任务 -// sendQueryCOValueCommand(); -// sendSetCOThresholdCommand(); + sendQueryCOValueCommand(); + sendSetCOThresholdCommand(); // 6氧气 -// sendQueryO2ValueCommand(); -// sendSetO2ThresholdCommand(); + sendQueryO2ValueCommand(); + sendSetO2ThresholdCommand(); // 7硫化氢 -// sendQueryHSValueCommand(); -// sendSetHSThresholdCommand(); + sendQueryHSValueCommand(); + sendSetHSThresholdCommand(); // 8对射报警 -// sendQueryDSStatusCommand(); + sendQueryDSStatusCommand(); // 9液位报警 -// sendQueryYWStatusCommand(); + sendQueryYWStatusCommand(); // 10风机状态 -// sendQueryFJStatusCommand(); + sendQueryFJStatusCommand(); // 11照明状态 -// sendQueryZMStatusCommand(); + sendQueryZMStatusCommand(); // 12水泵状态 -// sendQuerySBStatusCommand(); + sendQuerySBStatusCommand(); // 13井盖状态 -// sendQueryJGStatusCommand(); + sendQueryJGStatusCommand(); //10巡检数据同步 -// synchAssetInSpection(); + synchAssetInSpection(); //运维数据同步 - //synchMaintanceRecord(); + synchMaintanceRecord(); // 查询二期温湿度氧气实时数据 -// sendQueryWSYQValueCommand(); + sendQueryWSYQValueCommand(); } /** * 发送查询温湿度监测值命令 * - * @param client */ private void sendQueryWSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WS_VALUE_INTERVAL", "60")); @@ -127,8 +125,7 @@ /** * 发送查询氧气监测值命令 - * - * @param client + * */ private void sendQueryO2ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_O2_VALUE_INTERVAL", "60")); @@ -138,8 +135,7 @@ /** * 发送查询硫化氢监测值命令 - * - * @param client + * */ private void sendQueryHSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_HS_VALUE_INTERVAL", "60")); @@ -149,8 +145,7 @@ /** * 发送查询甲烷监测值命令 - * - * @param client + * */ private void sendQueryCH4ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CH4_VALUE_INTERVAL", "60")); @@ -160,8 +155,7 @@ /** * 发送查询一氧化碳监测值命令 - * - * @param client + * */ private void sendQueryCOValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CO_VALUE_INTERVAL", "60")); @@ -171,7 +165,7 @@ /** * 发送查询温湿度报警状态命令 - * @param client + * */ private void sendSetWSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -180,7 +174,7 @@ /** * 发送查询甲烷报警状态命令 - * @param client + * */ private void sendSetCH4ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -189,7 +183,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetCOThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -198,7 +192,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetO2ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -207,7 +201,7 @@ /** * 发送查询硫化氢报警状态命令 - * @param client + * */ private void sendSetHSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -216,7 +210,7 @@ /** * 发送查询对射报警状态命令 - * @param client + * */ private void sendQueryDSStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -225,7 +219,7 @@ /** * 发送查询爆管液位报警状态命令 - * @param client + * */ private void sendQueryYWStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -235,7 +229,7 @@ /** * 发送查询风机状态命令 - * @param client + * */ private void sendQueryFJStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -244,7 +238,7 @@ /** * 发送查询照明状态命令 - * @param client + * */ private void sendQueryZMStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -253,7 +247,7 @@ /** * 发送查询水泵状态命令 - * @param client + * */ private void sendQuerySBStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -262,7 +256,7 @@ /** * 发送查询井盖状态命令 - * @param client + * */ private void sendQueryJGStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -271,7 +265,7 @@ /** * 调用巡检接口同步数据 - * @param + * */ private void synchAssetInSpection() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -280,7 +274,7 @@ /** * 调用维护接口同步数据 - * @param + * */ private void synchMaintanceRecord() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -289,6 +283,7 @@ /** * 查询二期温湿度及氧气实时值定时任务 + * */ private void sendQueryWSYQValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WSYQ_VALUE_INTERVAL", "60")); diff --git a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java index 55a15d3..0f7e11e 100644 --- a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "CH4_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java index 0384132..079c421 100644 --- a/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java @@ -128,16 +128,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); + if (Boolean.valueOf(Configure.getProperty("sys", "HS_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } @@ -212,16 +214,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); + if (Boolean.valueOf(Configure.getProperty("sys", "CH4_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java index f578c90..b673f81 100644 --- a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "HS_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/WebRoot/index.jsp b/WebRoot/index.jsp index af52bf9..9016588 100644 --- a/WebRoot/index.jsp +++ b/WebRoot/index.jsp @@ -14,6 +14,6 @@ - This is my JSP page.
+ 后台服务启动正常
diff --git a/src/ACUBL.properties b/src/ACUBL.properties index 2a8ee6f..9c4b0ab 100644 --- a/src/ACUBL.properties +++ b/src/ACUBL.properties @@ -2062,6 +2062,11 @@ #\u7167\u660E\u7F16\u7801\u5217\u8868 THXC.ACU301.ZM.ZC.LIST = THXC.ACU301.Z.ZZM01;THXC.ACU301.Z.DZM01 +#\u4E95\u76D6\u6570\u91CF +THXC.ACU0301.JG.COUNT = 2 +#\u4E95\u76D6\u7F16\u7801\u5217\u8868 +THXC.ACU301.JG.ZC.LIST = THXC.ACU301.J.QJG01;THXC.ACU301.J.QJG02 + diff --git a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java index f65a34c..fbaaaae 100644 --- a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java @@ -21,7 +21,7 @@ public List findAllACU() { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU ORDER BY ID"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' ORDER BY ID"; try { conn = ConnectionManager.getConnectionFromC3P0(); conn.setAutoCommit(false); @@ -52,7 +52,7 @@ public PgAcu findACUById(Integer id) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ID = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ID = ?"; Object[] param = new Object[1]; param[0] = id; @@ -86,7 +86,7 @@ public PgAcu findACUByDest(String dest) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_DEST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_DEST = ?"; Object[] param = new Object[1]; param[0] = dest; @@ -120,7 +120,7 @@ public PgAcu findACUByHost(String host) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_HOST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_HOST = ?"; Object[] param = new Object[1]; param[0] = host; @@ -154,7 +154,7 @@ public PgAcu findACUByCode(String acucode) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_CODE = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_CODE = ?"; Object[] param = new Object[1]; param[0] = acucode; diff --git a/src/com/szpg/db/data/PgAcu.java b/src/com/szpg/db/data/PgAcu.java index 50068af..9b486fe 100644 --- a/src/com/szpg/db/data/PgAcu.java +++ b/src/com/szpg/db/data/PgAcu.java @@ -16,6 +16,7 @@ private String acu_node; // ACU节点号 private String acu_unit; // ACU单元号 private String acu_flag; // ACU建设标段标志 + private String active; // ACU可用标志位 public Integer getId() { return id; @@ -89,6 +90,14 @@ this.acu_flag = acu_flag; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + @Override public String toString() { return "PgAcu[" + acu_host + ":" + acu_port + "," + acu_net + acu_node + acu_unit + "]"; diff --git a/src/com/szpg/plc/PGDSCServlet.java b/src/com/szpg/plc/PGDSCServlet.java index 14d20d1..5653eb6 100644 --- a/src/com/szpg/plc/PGDSCServlet.java +++ b/src/com/szpg/plc/PGDSCServlet.java @@ -46,11 +46,10 @@ public void init() throws ServletException { // 1获取数据库中所有ACU PgAcuDao acuDao = new PgAcuDaoImpl(); -// List acuList = acuDao.findAllACU(); + List acuList = acuDao.findAllACU(); // 2遍历ACU列表，获取其IP地址与端口号 -// for (PgAcu acu : acuList) { - PgAcu acu = acuDao.findACUById(16); + for (PgAcu acu : acuList) { ACUClient client = new ACUClient(acu.getAcu_host(), Integer.parseInt(acu.getAcu_port())); client.setAcucode(acu.getAcu_code()); @@ -64,60 +63,59 @@ // 4新建线程启动client new ScheduledThreadPoolExecutor(1).scheduleAtFixedRate(new ACUSocketCheckTask(client), 0, 30, TimeUnit.SECONDS); -// } + } // 3启动查询温湿度的定时任务 -// sendQueryWSValueCommand(); -// sendSetWSThresholdCommand(); + sendQueryWSValueCommand(); + sendSetWSThresholdCommand(); // 4启动查询甲烷的定时任务 -// sendQueryCH4ValueCommand(); -// sendSetCH4ThresholdCommand(); + sendQueryCH4ValueCommand(); + sendSetCH4ThresholdCommand(); // 5启动查询一氧化碳的定时任务 -// sendQueryCOValueCommand(); -// sendSetCOThresholdCommand(); + sendQueryCOValueCommand(); + sendSetCOThresholdCommand(); // 6氧气 -// sendQueryO2ValueCommand(); -// sendSetO2ThresholdCommand(); + sendQueryO2ValueCommand(); + sendSetO2ThresholdCommand(); // 7硫化氢 -// sendQueryHSValueCommand(); -// sendSetHSThresholdCommand(); + sendQueryHSValueCommand(); + sendSetHSThresholdCommand(); // 8对射报警 -// sendQueryDSStatusCommand(); + sendQueryDSStatusCommand(); // 9液位报警 -// sendQueryYWStatusCommand(); + sendQueryYWStatusCommand(); // 10风机状态 -// sendQueryFJStatusCommand(); + sendQueryFJStatusCommand(); // 11照明状态 -// sendQueryZMStatusCommand(); + sendQueryZMStatusCommand(); // 12水泵状态 -// sendQuerySBStatusCommand(); + sendQuerySBStatusCommand(); // 13井盖状态 -// sendQueryJGStatusCommand(); + sendQueryJGStatusCommand(); //10巡检数据同步 -// synchAssetInSpection(); + synchAssetInSpection(); //运维数据同步 - //synchMaintanceRecord(); + synchMaintanceRecord(); // 查询二期温湿度氧气实时数据 -// sendQueryWSYQValueCommand(); + sendQueryWSYQValueCommand(); } /** * 发送查询温湿度监测值命令 * - * @param client */ private void sendQueryWSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WS_VALUE_INTERVAL", "60")); @@ -127,8 +125,7 @@ /** * 发送查询氧气监测值命令 - * - * @param client + * */ private void sendQueryO2ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_O2_VALUE_INTERVAL", "60")); @@ -138,8 +135,7 @@ /** * 发送查询硫化氢监测值命令 - * - * @param client + * */ private void sendQueryHSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_HS_VALUE_INTERVAL", "60")); @@ -149,8 +145,7 @@ /** * 发送查询甲烷监测值命令 - * - * @param client + * */ private void sendQueryCH4ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CH4_VALUE_INTERVAL", "60")); @@ -160,8 +155,7 @@ /** * 发送查询一氧化碳监测值命令 - * - * @param client + * */ private void sendQueryCOValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CO_VALUE_INTERVAL", "60")); @@ -171,7 +165,7 @@ /** * 发送查询温湿度报警状态命令 - * @param client + * */ private void sendSetWSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -180,7 +174,7 @@ /** * 发送查询甲烷报警状态命令 - * @param client + * */ private void sendSetCH4ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -189,7 +183,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetCOThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -198,7 +192,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetO2ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -207,7 +201,7 @@ /** * 发送查询硫化氢报警状态命令 - * @param client + * */ private void sendSetHSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -216,7 +210,7 @@ /** * 发送查询对射报警状态命令 - * @param client + * */ private void sendQueryDSStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -225,7 +219,7 @@ /** * 发送查询爆管液位报警状态命令 - * @param client + * */ private void sendQueryYWStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -235,7 +229,7 @@ /** * 发送查询风机状态命令 - * @param client + * */ private void sendQueryFJStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -244,7 +238,7 @@ /** * 发送查询照明状态命令 - * @param client + * */ private void sendQueryZMStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -253,7 +247,7 @@ /** * 发送查询水泵状态命令 - * @param client + * */ private void sendQuerySBStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -262,7 +256,7 @@ /** * 发送查询井盖状态命令 - * @param client + * */ private void sendQueryJGStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -271,7 +265,7 @@ /** * 调用巡检接口同步数据 - * @param + * */ private void synchAssetInSpection() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -280,7 +274,7 @@ /** * 调用维护接口同步数据 - * @param + * */ private void synchMaintanceRecord() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -289,6 +283,7 @@ /** * 查询二期温湿度及氧气实时值定时任务 + * */ private void sendQueryWSYQValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WSYQ_VALUE_INTERVAL", "60")); diff --git a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java index 55a15d3..0f7e11e 100644 --- a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "CH4_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java index 0384132..079c421 100644 --- a/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java @@ -128,16 +128,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); + if (Boolean.valueOf(Configure.getProperty("sys", "HS_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } @@ -212,16 +214,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); + if (Boolean.valueOf(Configure.getProperty("sys", "CH4_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java index f578c90..b673f81 100644 --- a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "HS_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java index 2c1a6fc..db777cd 100644 --- a/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/WebRoot/index.jsp b/WebRoot/index.jsp index af52bf9..9016588 100644 --- a/WebRoot/index.jsp +++ b/WebRoot/index.jsp @@ -14,6 +14,6 @@ - This is my JSP page.
+ 后台服务启动正常
diff --git a/src/ACUBL.properties b/src/ACUBL.properties index 2a8ee6f..9c4b0ab 100644 --- a/src/ACUBL.properties +++ b/src/ACUBL.properties @@ -2062,6 +2062,11 @@ #\u7167\u660E\u7F16\u7801\u5217\u8868 THXC.ACU301.ZM.ZC.LIST = THXC.ACU301.Z.ZZM01;THXC.ACU301.Z.DZM01 +#\u4E95\u76D6\u6570\u91CF +THXC.ACU0301.JG.COUNT = 2 +#\u4E95\u76D6\u7F16\u7801\u5217\u8868 +THXC.ACU301.JG.ZC.LIST = THXC.ACU301.J.QJG01;THXC.ACU301.J.QJG02 + diff --git a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java index f65a34c..fbaaaae 100644 --- a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java @@ -21,7 +21,7 @@ public List findAllACU() { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU ORDER BY ID"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' ORDER BY ID"; try { conn = ConnectionManager.getConnectionFromC3P0(); conn.setAutoCommit(false); @@ -52,7 +52,7 @@ public PgAcu findACUById(Integer id) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ID = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ID = ?"; Object[] param = new Object[1]; param[0] = id; @@ -86,7 +86,7 @@ public PgAcu findACUByDest(String dest) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_DEST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_DEST = ?"; Object[] param = new Object[1]; param[0] = dest; @@ -120,7 +120,7 @@ public PgAcu findACUByHost(String host) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_HOST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_HOST = ?"; Object[] param = new Object[1]; param[0] = host; @@ -154,7 +154,7 @@ public PgAcu findACUByCode(String acucode) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_CODE = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_CODE = ?"; Object[] param = new Object[1]; param[0] = acucode; diff --git a/src/com/szpg/db/data/PgAcu.java b/src/com/szpg/db/data/PgAcu.java index 50068af..9b486fe 100644 --- a/src/com/szpg/db/data/PgAcu.java +++ b/src/com/szpg/db/data/PgAcu.java @@ -16,6 +16,7 @@ private String acu_node; // ACU节点号 private String acu_unit; // ACU单元号 private String acu_flag; // ACU建设标段标志 + private String active; // ACU可用标志位 public Integer getId() { return id; @@ -89,6 +90,14 @@ this.acu_flag = acu_flag; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + @Override public String toString() { return "PgAcu[" + acu_host + ":" + acu_port + "," + acu_net + acu_node + acu_unit + "]"; diff --git a/src/com/szpg/plc/PGDSCServlet.java b/src/com/szpg/plc/PGDSCServlet.java index 14d20d1..5653eb6 100644 --- a/src/com/szpg/plc/PGDSCServlet.java +++ b/src/com/szpg/plc/PGDSCServlet.java @@ -46,11 +46,10 @@ public void init() throws ServletException { // 1获取数据库中所有ACU PgAcuDao acuDao = new PgAcuDaoImpl(); -// List acuList = acuDao.findAllACU(); + List acuList = acuDao.findAllACU(); // 2遍历ACU列表，获取其IP地址与端口号 -// for (PgAcu acu : acuList) { - PgAcu acu = acuDao.findACUById(16); + for (PgAcu acu : acuList) { ACUClient client = new ACUClient(acu.getAcu_host(), Integer.parseInt(acu.getAcu_port())); client.setAcucode(acu.getAcu_code()); @@ -64,60 +63,59 @@ // 4新建线程启动client new ScheduledThreadPoolExecutor(1).scheduleAtFixedRate(new ACUSocketCheckTask(client), 0, 30, TimeUnit.SECONDS); -// } + } // 3启动查询温湿度的定时任务 -// sendQueryWSValueCommand(); -// sendSetWSThresholdCommand(); + sendQueryWSValueCommand(); + sendSetWSThresholdCommand(); // 4启动查询甲烷的定时任务 -// sendQueryCH4ValueCommand(); -// sendSetCH4ThresholdCommand(); + sendQueryCH4ValueCommand(); + sendSetCH4ThresholdCommand(); // 5启动查询一氧化碳的定时任务 -// sendQueryCOValueCommand(); -// sendSetCOThresholdCommand(); + sendQueryCOValueCommand(); + sendSetCOThresholdCommand(); // 6氧气 -// sendQueryO2ValueCommand(); -// sendSetO2ThresholdCommand(); + sendQueryO2ValueCommand(); + sendSetO2ThresholdCommand(); // 7硫化氢 -// sendQueryHSValueCommand(); -// sendSetHSThresholdCommand(); + sendQueryHSValueCommand(); + sendSetHSThresholdCommand(); // 8对射报警 -// sendQueryDSStatusCommand(); + sendQueryDSStatusCommand(); // 9液位报警 -// sendQueryYWStatusCommand(); + sendQueryYWStatusCommand(); // 10风机状态 -// sendQueryFJStatusCommand(); + sendQueryFJStatusCommand(); // 11照明状态 -// sendQueryZMStatusCommand(); + sendQueryZMStatusCommand(); // 12水泵状态 -// sendQuerySBStatusCommand(); + sendQuerySBStatusCommand(); // 13井盖状态 -// sendQueryJGStatusCommand(); + sendQueryJGStatusCommand(); //10巡检数据同步 -// synchAssetInSpection(); + synchAssetInSpection(); //运维数据同步 - //synchMaintanceRecord(); + synchMaintanceRecord(); // 查询二期温湿度氧气实时数据 -// sendQueryWSYQValueCommand(); + sendQueryWSYQValueCommand(); } /** * 发送查询温湿度监测值命令 * - * @param client */ private void sendQueryWSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WS_VALUE_INTERVAL", "60")); @@ -127,8 +125,7 @@ /** * 发送查询氧气监测值命令 - * - * @param client + * */ private void sendQueryO2ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_O2_VALUE_INTERVAL", "60")); @@ -138,8 +135,7 @@ /** * 发送查询硫化氢监测值命令 - * - * @param client + * */ private void sendQueryHSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_HS_VALUE_INTERVAL", "60")); @@ -149,8 +145,7 @@ /** * 发送查询甲烷监测值命令 - * - * @param client + * */ private void sendQueryCH4ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CH4_VALUE_INTERVAL", "60")); @@ -160,8 +155,7 @@ /** * 发送查询一氧化碳监测值命令 - * - * @param client + * */ private void sendQueryCOValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CO_VALUE_INTERVAL", "60")); @@ -171,7 +165,7 @@ /** * 发送查询温湿度报警状态命令 - * @param client + * */ private void sendSetWSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -180,7 +174,7 @@ /** * 发送查询甲烷报警状态命令 - * @param client + * */ private void sendSetCH4ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -189,7 +183,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetCOThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -198,7 +192,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetO2ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -207,7 +201,7 @@ /** * 发送查询硫化氢报警状态命令 - * @param client + * */ private void sendSetHSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -216,7 +210,7 @@ /** * 发送查询对射报警状态命令 - * @param client + * */ private void sendQueryDSStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -225,7 +219,7 @@ /** * 发送查询爆管液位报警状态命令 - * @param client + * */ private void sendQueryYWStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -235,7 +229,7 @@ /** * 发送查询风机状态命令 - * @param client + * */ private void sendQueryFJStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -244,7 +238,7 @@ /** * 发送查询照明状态命令 - * @param client + * */ private void sendQueryZMStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -253,7 +247,7 @@ /** * 发送查询水泵状态命令 - * @param client + * */ private void sendQuerySBStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -262,7 +256,7 @@ /** * 发送查询井盖状态命令 - * @param client + * */ private void sendQueryJGStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -271,7 +265,7 @@ /** * 调用巡检接口同步数据 - * @param + * */ private void synchAssetInSpection() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -280,7 +274,7 @@ /** * 调用维护接口同步数据 - * @param + * */ private void synchMaintanceRecord() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -289,6 +283,7 @@ /** * 查询二期温湿度及氧气实时值定时任务 + * */ private void sendQueryWSYQValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WSYQ_VALUE_INTERVAL", "60")); diff --git a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java index 55a15d3..0f7e11e 100644 --- a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "CH4_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java index 0384132..079c421 100644 --- a/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java @@ -128,16 +128,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); + if (Boolean.valueOf(Configure.getProperty("sys", "HS_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } @@ -212,16 +214,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); + if (Boolean.valueOf(Configure.getProperty("sys", "CH4_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java index f578c90..b673f81 100644 --- a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "HS_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java index 2c1a6fc..db777cd 100644 --- a/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java index f480ca1..49aabb9 100644 --- a/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java @@ -158,16 +158,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "WD_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/WebRoot/index.jsp b/WebRoot/index.jsp index af52bf9..9016588 100644 --- a/WebRoot/index.jsp +++ b/WebRoot/index.jsp @@ -14,6 +14,6 @@ - This is my JSP page.
+ 后台服务启动正常
diff --git a/src/ACUBL.properties b/src/ACUBL.properties index 2a8ee6f..9c4b0ab 100644 --- a/src/ACUBL.properties +++ b/src/ACUBL.properties @@ -2062,6 +2062,11 @@ #\u7167\u660E\u7F16\u7801\u5217\u8868 THXC.ACU301.ZM.ZC.LIST = THXC.ACU301.Z.ZZM01;THXC.ACU301.Z.DZM01 +#\u4E95\u76D6\u6570\u91CF +THXC.ACU0301.JG.COUNT = 2 +#\u4E95\u76D6\u7F16\u7801\u5217\u8868 +THXC.ACU301.JG.ZC.LIST = THXC.ACU301.J.QJG01;THXC.ACU301.J.QJG02 + diff --git a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java index f65a34c..fbaaaae 100644 --- a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java @@ -21,7 +21,7 @@ public List findAllACU() { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU ORDER BY ID"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' ORDER BY ID"; try { conn = ConnectionManager.getConnectionFromC3P0(); conn.setAutoCommit(false); @@ -52,7 +52,7 @@ public PgAcu findACUById(Integer id) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ID = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ID = ?"; Object[] param = new Object[1]; param[0] = id; @@ -86,7 +86,7 @@ public PgAcu findACUByDest(String dest) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_DEST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_DEST = ?"; Object[] param = new Object[1]; param[0] = dest; @@ -120,7 +120,7 @@ public PgAcu findACUByHost(String host) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_HOST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_HOST = ?"; Object[] param = new Object[1]; param[0] = host; @@ -154,7 +154,7 @@ public PgAcu findACUByCode(String acucode) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_CODE = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_CODE = ?"; Object[] param = new Object[1]; param[0] = acucode; diff --git a/src/com/szpg/db/data/PgAcu.java b/src/com/szpg/db/data/PgAcu.java index 50068af..9b486fe 100644 --- a/src/com/szpg/db/data/PgAcu.java +++ b/src/com/szpg/db/data/PgAcu.java @@ -16,6 +16,7 @@ private String acu_node; // ACU节点号 private String acu_unit; // ACU单元号 private String acu_flag; // ACU建设标段标志 + private String active; // ACU可用标志位 public Integer getId() { return id; @@ -89,6 +90,14 @@ this.acu_flag = acu_flag; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + @Override public String toString() { return "PgAcu[" + acu_host + ":" + acu_port + "," + acu_net + acu_node + acu_unit + "]"; diff --git a/src/com/szpg/plc/PGDSCServlet.java b/src/com/szpg/plc/PGDSCServlet.java index 14d20d1..5653eb6 100644 --- a/src/com/szpg/plc/PGDSCServlet.java +++ b/src/com/szpg/plc/PGDSCServlet.java @@ -46,11 +46,10 @@ public void init() throws ServletException { // 1获取数据库中所有ACU PgAcuDao acuDao = new PgAcuDaoImpl(); -// List acuList = acuDao.findAllACU(); + List acuList = acuDao.findAllACU(); // 2遍历ACU列表，获取其IP地址与端口号 -// for (PgAcu acu : acuList) { - PgAcu acu = acuDao.findACUById(16); + for (PgAcu acu : acuList) { ACUClient client = new ACUClient(acu.getAcu_host(), Integer.parseInt(acu.getAcu_port())); client.setAcucode(acu.getAcu_code()); @@ -64,60 +63,59 @@ // 4新建线程启动client new ScheduledThreadPoolExecutor(1).scheduleAtFixedRate(new ACUSocketCheckTask(client), 0, 30, TimeUnit.SECONDS); -// } + } // 3启动查询温湿度的定时任务 -// sendQueryWSValueCommand(); -// sendSetWSThresholdCommand(); + sendQueryWSValueCommand(); + sendSetWSThresholdCommand(); // 4启动查询甲烷的定时任务 -// sendQueryCH4ValueCommand(); -// sendSetCH4ThresholdCommand(); + sendQueryCH4ValueCommand(); + sendSetCH4ThresholdCommand(); // 5启动查询一氧化碳的定时任务 -// sendQueryCOValueCommand(); -// sendSetCOThresholdCommand(); + sendQueryCOValueCommand(); + sendSetCOThresholdCommand(); // 6氧气 -// sendQueryO2ValueCommand(); -// sendSetO2ThresholdCommand(); + sendQueryO2ValueCommand(); + sendSetO2ThresholdCommand(); // 7硫化氢 -// sendQueryHSValueCommand(); -// sendSetHSThresholdCommand(); + sendQueryHSValueCommand(); + sendSetHSThresholdCommand(); // 8对射报警 -// sendQueryDSStatusCommand(); + sendQueryDSStatusCommand(); // 9液位报警 -// sendQueryYWStatusCommand(); + sendQueryYWStatusCommand(); // 10风机状态 -// sendQueryFJStatusCommand(); + sendQueryFJStatusCommand(); // 11照明状态 -// sendQueryZMStatusCommand(); + sendQueryZMStatusCommand(); // 12水泵状态 -// sendQuerySBStatusCommand(); + sendQuerySBStatusCommand(); // 13井盖状态 -// sendQueryJGStatusCommand(); + sendQueryJGStatusCommand(); //10巡检数据同步 -// synchAssetInSpection(); + synchAssetInSpection(); //运维数据同步 - //synchMaintanceRecord(); + synchMaintanceRecord(); // 查询二期温湿度氧气实时数据 -// sendQueryWSYQValueCommand(); + sendQueryWSYQValueCommand(); } /** * 发送查询温湿度监测值命令 * - * @param client */ private void sendQueryWSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WS_VALUE_INTERVAL", "60")); @@ -127,8 +125,7 @@ /** * 发送查询氧气监测值命令 - * - * @param client + * */ private void sendQueryO2ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_O2_VALUE_INTERVAL", "60")); @@ -138,8 +135,7 @@ /** * 发送查询硫化氢监测值命令 - * - * @param client + * */ private void sendQueryHSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_HS_VALUE_INTERVAL", "60")); @@ -149,8 +145,7 @@ /** * 发送查询甲烷监测值命令 - * - * @param client + * */ private void sendQueryCH4ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CH4_VALUE_INTERVAL", "60")); @@ -160,8 +155,7 @@ /** * 发送查询一氧化碳监测值命令 - * - * @param client + * */ private void sendQueryCOValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CO_VALUE_INTERVAL", "60")); @@ -171,7 +165,7 @@ /** * 发送查询温湿度报警状态命令 - * @param client + * */ private void sendSetWSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -180,7 +174,7 @@ /** * 发送查询甲烷报警状态命令 - * @param client + * */ private void sendSetCH4ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -189,7 +183,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetCOThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -198,7 +192,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetO2ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -207,7 +201,7 @@ /** * 发送查询硫化氢报警状态命令 - * @param client + * */ private void sendSetHSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -216,7 +210,7 @@ /** * 发送查询对射报警状态命令 - * @param client + * */ private void sendQueryDSStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -225,7 +219,7 @@ /** * 发送查询爆管液位报警状态命令 - * @param client + * */ private void sendQueryYWStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -235,7 +229,7 @@ /** * 发送查询风机状态命令 - * @param client + * */ private void sendQueryFJStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -244,7 +238,7 @@ /** * 发送查询照明状态命令 - * @param client + * */ private void sendQueryZMStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -253,7 +247,7 @@ /** * 发送查询水泵状态命令 - * @param client + * */ private void sendQuerySBStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -262,7 +256,7 @@ /** * 发送查询井盖状态命令 - * @param client + * */ private void sendQueryJGStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -271,7 +265,7 @@ /** * 调用巡检接口同步数据 - * @param + * */ private void synchAssetInSpection() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -280,7 +274,7 @@ /** * 调用维护接口同步数据 - * @param + * */ private void synchMaintanceRecord() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -289,6 +283,7 @@ /** * 查询二期温湿度及氧气实时值定时任务 + * */ private void sendQueryWSYQValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WSYQ_VALUE_INTERVAL", "60")); diff --git a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java index 55a15d3..0f7e11e 100644 --- a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "CH4_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java index 0384132..079c421 100644 --- a/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java @@ -128,16 +128,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); + if (Boolean.valueOf(Configure.getProperty("sys", "HS_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } @@ -212,16 +214,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); + if (Boolean.valueOf(Configure.getProperty("sys", "CH4_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java index f578c90..b673f81 100644 --- a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "HS_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java index 2c1a6fc..db777cd 100644 --- a/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java index f480ca1..49aabb9 100644 --- a/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java @@ -158,16 +158,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "WD_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadWSYQValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadWSYQValueCommandResponse.java index 19f970c..6d7a542 100644 --- a/src/com/szpg/plc/message/response/read/ReadWSYQValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadWSYQValueCommandResponse.java @@ -159,16 +159,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "WD_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } @@ -285,16 +287,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/WebRoot/index.jsp b/WebRoot/index.jsp index af52bf9..9016588 100644 --- a/WebRoot/index.jsp +++ b/WebRoot/index.jsp @@ -14,6 +14,6 @@ - This is my JSP page.
+ 后台服务启动正常
diff --git a/src/ACUBL.properties b/src/ACUBL.properties index 2a8ee6f..9c4b0ab 100644 --- a/src/ACUBL.properties +++ b/src/ACUBL.properties @@ -2062,6 +2062,11 @@ #\u7167\u660E\u7F16\u7801\u5217\u8868 THXC.ACU301.ZM.ZC.LIST = THXC.ACU301.Z.ZZM01;THXC.ACU301.Z.DZM01 +#\u4E95\u76D6\u6570\u91CF +THXC.ACU0301.JG.COUNT = 2 +#\u4E95\u76D6\u7F16\u7801\u5217\u8868 +THXC.ACU301.JG.ZC.LIST = THXC.ACU301.J.QJG01;THXC.ACU301.J.QJG02 + diff --git a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java index f65a34c..fbaaaae 100644 --- a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java @@ -21,7 +21,7 @@ public List findAllACU() { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU ORDER BY ID"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' ORDER BY ID"; try { conn = ConnectionManager.getConnectionFromC3P0(); conn.setAutoCommit(false); @@ -52,7 +52,7 @@ public PgAcu findACUById(Integer id) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ID = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ID = ?"; Object[] param = new Object[1]; param[0] = id; @@ -86,7 +86,7 @@ public PgAcu findACUByDest(String dest) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_DEST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_DEST = ?"; Object[] param = new Object[1]; param[0] = dest; @@ -120,7 +120,7 @@ public PgAcu findACUByHost(String host) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_HOST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_HOST = ?"; Object[] param = new Object[1]; param[0] = host; @@ -154,7 +154,7 @@ public PgAcu findACUByCode(String acucode) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_CODE = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_CODE = ?"; Object[] param = new Object[1]; param[0] = acucode; diff --git a/src/com/szpg/db/data/PgAcu.java b/src/com/szpg/db/data/PgAcu.java index 50068af..9b486fe 100644 --- a/src/com/szpg/db/data/PgAcu.java +++ b/src/com/szpg/db/data/PgAcu.java @@ -16,6 +16,7 @@ private String acu_node; // ACU节点号 private String acu_unit; // ACU单元号 private String acu_flag; // ACU建设标段标志 + private String active; // ACU可用标志位 public Integer getId() { return id; @@ -89,6 +90,14 @@ this.acu_flag = acu_flag; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + @Override public String toString() { return "PgAcu[" + acu_host + ":" + acu_port + "," + acu_net + acu_node + acu_unit + "]"; diff --git a/src/com/szpg/plc/PGDSCServlet.java b/src/com/szpg/plc/PGDSCServlet.java index 14d20d1..5653eb6 100644 --- a/src/com/szpg/plc/PGDSCServlet.java +++ b/src/com/szpg/plc/PGDSCServlet.java @@ -46,11 +46,10 @@ public void init() throws ServletException { // 1获取数据库中所有ACU PgAcuDao acuDao = new PgAcuDaoImpl(); -// List acuList = acuDao.findAllACU(); + List acuList = acuDao.findAllACU(); // 2遍历ACU列表，获取其IP地址与端口号 -// for (PgAcu acu : acuList) { - PgAcu acu = acuDao.findACUById(16); + for (PgAcu acu : acuList) { ACUClient client = new ACUClient(acu.getAcu_host(), Integer.parseInt(acu.getAcu_port())); client.setAcucode(acu.getAcu_code()); @@ -64,60 +63,59 @@ // 4新建线程启动client new ScheduledThreadPoolExecutor(1).scheduleAtFixedRate(new ACUSocketCheckTask(client), 0, 30, TimeUnit.SECONDS); -// } + } // 3启动查询温湿度的定时任务 -// sendQueryWSValueCommand(); -// sendSetWSThresholdCommand(); + sendQueryWSValueCommand(); + sendSetWSThresholdCommand(); // 4启动查询甲烷的定时任务 -// sendQueryCH4ValueCommand(); -// sendSetCH4ThresholdCommand(); + sendQueryCH4ValueCommand(); + sendSetCH4ThresholdCommand(); // 5启动查询一氧化碳的定时任务 -// sendQueryCOValueCommand(); -// sendSetCOThresholdCommand(); + sendQueryCOValueCommand(); + sendSetCOThresholdCommand(); // 6氧气 -// sendQueryO2ValueCommand(); -// sendSetO2ThresholdCommand(); + sendQueryO2ValueCommand(); + sendSetO2ThresholdCommand(); // 7硫化氢 -// sendQueryHSValueCommand(); -// sendSetHSThresholdCommand(); + sendQueryHSValueCommand(); + sendSetHSThresholdCommand(); // 8对射报警 -// sendQueryDSStatusCommand(); + sendQueryDSStatusCommand(); // 9液位报警 -// sendQueryYWStatusCommand(); + sendQueryYWStatusCommand(); // 10风机状态 -// sendQueryFJStatusCommand(); + sendQueryFJStatusCommand(); // 11照明状态 -// sendQueryZMStatusCommand(); + sendQueryZMStatusCommand(); // 12水泵状态 -// sendQuerySBStatusCommand(); + sendQuerySBStatusCommand(); // 13井盖状态 -// sendQueryJGStatusCommand(); + sendQueryJGStatusCommand(); //10巡检数据同步 -// synchAssetInSpection(); + synchAssetInSpection(); //运维数据同步 - //synchMaintanceRecord(); + synchMaintanceRecord(); // 查询二期温湿度氧气实时数据 -// sendQueryWSYQValueCommand(); + sendQueryWSYQValueCommand(); } /** * 发送查询温湿度监测值命令 * - * @param client */ private void sendQueryWSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WS_VALUE_INTERVAL", "60")); @@ -127,8 +125,7 @@ /** * 发送查询氧气监测值命令 - * - * @param client + * */ private void sendQueryO2ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_O2_VALUE_INTERVAL", "60")); @@ -138,8 +135,7 @@ /** * 发送查询硫化氢监测值命令 - * - * @param client + * */ private void sendQueryHSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_HS_VALUE_INTERVAL", "60")); @@ -149,8 +145,7 @@ /** * 发送查询甲烷监测值命令 - * - * @param client + * */ private void sendQueryCH4ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CH4_VALUE_INTERVAL", "60")); @@ -160,8 +155,7 @@ /** * 发送查询一氧化碳监测值命令 - * - * @param client + * */ private void sendQueryCOValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CO_VALUE_INTERVAL", "60")); @@ -171,7 +165,7 @@ /** * 发送查询温湿度报警状态命令 - * @param client + * */ private void sendSetWSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -180,7 +174,7 @@ /** * 发送查询甲烷报警状态命令 - * @param client + * */ private void sendSetCH4ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -189,7 +183,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetCOThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -198,7 +192,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetO2ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -207,7 +201,7 @@ /** * 发送查询硫化氢报警状态命令 - * @param client + * */ private void sendSetHSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -216,7 +210,7 @@ /** * 发送查询对射报警状态命令 - * @param client + * */ private void sendQueryDSStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -225,7 +219,7 @@ /** * 发送查询爆管液位报警状态命令 - * @param client + * */ private void sendQueryYWStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -235,7 +229,7 @@ /** * 发送查询风机状态命令 - * @param client + * */ private void sendQueryFJStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -244,7 +238,7 @@ /** * 发送查询照明状态命令 - * @param client + * */ private void sendQueryZMStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -253,7 +247,7 @@ /** * 发送查询水泵状态命令 - * @param client + * */ private void sendQuerySBStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -262,7 +256,7 @@ /** * 发送查询井盖状态命令 - * @param client + * */ private void sendQueryJGStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -271,7 +265,7 @@ /** * 调用巡检接口同步数据 - * @param + * */ private void synchAssetInSpection() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -280,7 +274,7 @@ /** * 调用维护接口同步数据 - * @param + * */ private void synchMaintanceRecord() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -289,6 +283,7 @@ /** * 查询二期温湿度及氧气实时值定时任务 + * */ private void sendQueryWSYQValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WSYQ_VALUE_INTERVAL", "60")); diff --git a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java index 55a15d3..0f7e11e 100644 --- a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "CH4_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java index 0384132..079c421 100644 --- a/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java @@ -128,16 +128,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); + if (Boolean.valueOf(Configure.getProperty("sys", "HS_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } @@ -212,16 +214,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); + if (Boolean.valueOf(Configure.getProperty("sys", "CH4_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java index f578c90..b673f81 100644 --- a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "HS_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java index 2c1a6fc..db777cd 100644 --- a/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java index f480ca1..49aabb9 100644 --- a/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java @@ -158,16 +158,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "WD_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadWSYQValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadWSYQValueCommandResponse.java index 19f970c..6d7a542 100644 --- a/src/com/szpg/plc/message/response/read/ReadWSYQValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadWSYQValueCommandResponse.java @@ -159,16 +159,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "WD_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } @@ -285,16 +287,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/struts.xml b/src/struts.xml index 2da47a8..eb988c8 100644 --- a/src/struts.xml +++ b/src/struts.xml @@ -42,6 +42,8 @@ + + diff --git a/WebRoot/index.jsp b/WebRoot/index.jsp index af52bf9..9016588 100644 --- a/WebRoot/index.jsp +++ b/WebRoot/index.jsp @@ -14,6 +14,6 @@ - This is my JSP page.
+ 后台服务启动正常
diff --git a/src/ACUBL.properties b/src/ACUBL.properties index 2a8ee6f..9c4b0ab 100644 --- a/src/ACUBL.properties +++ b/src/ACUBL.properties @@ -2062,6 +2062,11 @@ #\u7167\u660E\u7F16\u7801\u5217\u8868 THXC.ACU301.ZM.ZC.LIST = THXC.ACU301.Z.ZZM01;THXC.ACU301.Z.DZM01 +#\u4E95\u76D6\u6570\u91CF +THXC.ACU0301.JG.COUNT = 2 +#\u4E95\u76D6\u7F16\u7801\u5217\u8868 +THXC.ACU301.JG.ZC.LIST = THXC.ACU301.J.QJG01;THXC.ACU301.J.QJG02 + diff --git a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java index f65a34c..fbaaaae 100644 --- a/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java +++ b/src/com/szpg/db/dao/impl/PgAcuDaoImpl.java @@ -21,7 +21,7 @@ public List findAllACU() { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU ORDER BY ID"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' ORDER BY ID"; try { conn = ConnectionManager.getConnectionFromC3P0(); conn.setAutoCommit(false); @@ -52,7 +52,7 @@ public PgAcu findACUById(Integer id) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ID = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ID = ?"; Object[] param = new Object[1]; param[0] = id; @@ -86,7 +86,7 @@ public PgAcu findACUByDest(String dest) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_DEST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_DEST = ?"; Object[] param = new Object[1]; param[0] = dest; @@ -120,7 +120,7 @@ public PgAcu findACUByHost(String host) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_HOST = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_HOST = ?"; Object[] param = new Object[1]; param[0] = host; @@ -154,7 +154,7 @@ public PgAcu findACUByCode(String acucode) { Connection conn = null; - String queryStr = "SELECT * FROM PG_ACU WHERE ACU_CODE = ?"; + String queryStr = "SELECT * FROM PG_ACU WHERE ACTIVE = '1' AND ACU_CODE = ?"; Object[] param = new Object[1]; param[0] = acucode; diff --git a/src/com/szpg/db/data/PgAcu.java b/src/com/szpg/db/data/PgAcu.java index 50068af..9b486fe 100644 --- a/src/com/szpg/db/data/PgAcu.java +++ b/src/com/szpg/db/data/PgAcu.java @@ -16,6 +16,7 @@ private String acu_node; // ACU节点号 private String acu_unit; // ACU单元号 private String acu_flag; // ACU建设标段标志 + private String active; // ACU可用标志位 public Integer getId() { return id; @@ -89,6 +90,14 @@ this.acu_flag = acu_flag; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + @Override public String toString() { return "PgAcu[" + acu_host + ":" + acu_port + "," + acu_net + acu_node + acu_unit + "]"; diff --git a/src/com/szpg/plc/PGDSCServlet.java b/src/com/szpg/plc/PGDSCServlet.java index 14d20d1..5653eb6 100644 --- a/src/com/szpg/plc/PGDSCServlet.java +++ b/src/com/szpg/plc/PGDSCServlet.java @@ -46,11 +46,10 @@ public void init() throws ServletException { // 1获取数据库中所有ACU PgAcuDao acuDao = new PgAcuDaoImpl(); -// List acuList = acuDao.findAllACU(); + List acuList = acuDao.findAllACU(); // 2遍历ACU列表，获取其IP地址与端口号 -// for (PgAcu acu : acuList) { - PgAcu acu = acuDao.findACUById(16); + for (PgAcu acu : acuList) { ACUClient client = new ACUClient(acu.getAcu_host(), Integer.parseInt(acu.getAcu_port())); client.setAcucode(acu.getAcu_code()); @@ -64,60 +63,59 @@ // 4新建线程启动client new ScheduledThreadPoolExecutor(1).scheduleAtFixedRate(new ACUSocketCheckTask(client), 0, 30, TimeUnit.SECONDS); -// } + } // 3启动查询温湿度的定时任务 -// sendQueryWSValueCommand(); -// sendSetWSThresholdCommand(); + sendQueryWSValueCommand(); + sendSetWSThresholdCommand(); // 4启动查询甲烷的定时任务 -// sendQueryCH4ValueCommand(); -// sendSetCH4ThresholdCommand(); + sendQueryCH4ValueCommand(); + sendSetCH4ThresholdCommand(); // 5启动查询一氧化碳的定时任务 -// sendQueryCOValueCommand(); -// sendSetCOThresholdCommand(); + sendQueryCOValueCommand(); + sendSetCOThresholdCommand(); // 6氧气 -// sendQueryO2ValueCommand(); -// sendSetO2ThresholdCommand(); + sendQueryO2ValueCommand(); + sendSetO2ThresholdCommand(); // 7硫化氢 -// sendQueryHSValueCommand(); -// sendSetHSThresholdCommand(); + sendQueryHSValueCommand(); + sendSetHSThresholdCommand(); // 8对射报警 -// sendQueryDSStatusCommand(); + sendQueryDSStatusCommand(); // 9液位报警 -// sendQueryYWStatusCommand(); + sendQueryYWStatusCommand(); // 10风机状态 -// sendQueryFJStatusCommand(); + sendQueryFJStatusCommand(); // 11照明状态 -// sendQueryZMStatusCommand(); + sendQueryZMStatusCommand(); // 12水泵状态 -// sendQuerySBStatusCommand(); + sendQuerySBStatusCommand(); // 13井盖状态 -// sendQueryJGStatusCommand(); + sendQueryJGStatusCommand(); //10巡检数据同步 -// synchAssetInSpection(); + synchAssetInSpection(); //运维数据同步 - //synchMaintanceRecord(); + synchMaintanceRecord(); // 查询二期温湿度氧气实时数据 -// sendQueryWSYQValueCommand(); + sendQueryWSYQValueCommand(); } /** * 发送查询温湿度监测值命令 * - * @param client */ private void sendQueryWSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WS_VALUE_INTERVAL", "60")); @@ -127,8 +125,7 @@ /** * 发送查询氧气监测值命令 - * - * @param client + * */ private void sendQueryO2ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_O2_VALUE_INTERVAL", "60")); @@ -138,8 +135,7 @@ /** * 发送查询硫化氢监测值命令 - * - * @param client + * */ private void sendQueryHSValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_HS_VALUE_INTERVAL", "60")); @@ -149,8 +145,7 @@ /** * 发送查询甲烷监测值命令 - * - * @param client + * */ private void sendQueryCH4ValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CH4_VALUE_INTERVAL", "60")); @@ -160,8 +155,7 @@ /** * 发送查询一氧化碳监测值命令 - * - * @param client + * */ private void sendQueryCOValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_CO_VALUE_INTERVAL", "60")); @@ -171,7 +165,7 @@ /** * 发送查询温湿度报警状态命令 - * @param client + * */ private void sendSetWSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -180,7 +174,7 @@ /** * 发送查询甲烷报警状态命令 - * @param client + * */ private void sendSetCH4ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -189,7 +183,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetCOThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -198,7 +192,7 @@ /** * 发送查询一氧化碳报警状态命令 - * @param client + * */ private void sendSetO2ThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -207,7 +201,7 @@ /** * 发送查询硫化氢报警状态命令 - * @param client + * */ private void sendSetHSThresholdCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -216,7 +210,7 @@ /** * 发送查询对射报警状态命令 - * @param client + * */ private void sendQueryDSStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -225,7 +219,7 @@ /** * 发送查询爆管液位报警状态命令 - * @param client + * */ private void sendQueryYWStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -235,7 +229,7 @@ /** * 发送查询风机状态命令 - * @param client + * */ private void sendQueryFJStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -244,7 +238,7 @@ /** * 发送查询照明状态命令 - * @param client + * */ private void sendQueryZMStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -253,7 +247,7 @@ /** * 发送查询水泵状态命令 - * @param client + * */ private void sendQuerySBStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -262,7 +256,7 @@ /** * 发送查询井盖状态命令 - * @param client + * */ private void sendQueryJGStatusCommand() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -271,7 +265,7 @@ /** * 调用巡检接口同步数据 - * @param + * */ private void synchAssetInSpection() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -280,7 +274,7 @@ /** * 调用维护接口同步数据 - * @param + * */ private void synchMaintanceRecord() { ScheduledExecutorService sche = new ScheduledThreadPoolExecutor(1); @@ -289,6 +283,7 @@ /** * 查询二期温湿度及氧气实时值定时任务 + * */ private void sendQueryWSYQValueCommand() { int interval = Integer.parseInt(Configure.getProperty("sys", "READ_WSYQ_VALUE_INTERVAL", "60")); diff --git a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java index 55a15d3..0f7e11e 100644 --- a/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadCH4ValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "CH4_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java index 0384132..079c421 100644 --- a/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadHSCH4ValueCommandResponse.java @@ -128,16 +128,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); + if (Boolean.valueOf(Configure.getProperty("sys", "HS_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } @@ -212,16 +214,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); + if (Boolean.valueOf(Configure.getProperty("sys", "CH4_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java index f578c90..b673f81 100644 --- a/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadHSValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "HS_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java index 2c1a6fc..db777cd 100644 --- a/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadO2ValueCommandResponse.java @@ -126,16 +126,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java index f480ca1..49aabb9 100644 --- a/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadWSValueCommandResponse.java @@ -158,16 +158,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "WD_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/com/szpg/plc/message/response/read/ReadWSYQValueCommandResponse.java b/src/com/szpg/plc/message/response/read/ReadWSYQValueCommandResponse.java index 19f970c..6d7a542 100644 --- a/src/com/szpg/plc/message/response/read/ReadWSYQValueCommandResponse.java +++ b/src/com/szpg/plc/message/response/read/ReadWSYQValueCommandResponse.java @@ -159,16 +159,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "WD_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } @@ -285,16 +287,18 @@ // 自动打开当前舱段的排风机，手动关闭风机 // 首先找到当前舱段的排风机资产编号 - String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); - String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); - List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); - if (null != fjs && fjs.isEmpty() == false) { - String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); - for (PgDevice fj : fjs) { - String fjzcbh = fj.getAssetcode(); - - // 调用远程接口启动风机 - HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + if (Boolean.valueOf(Configure.getProperty("sys", "O2_ON_FJ", "false")) == true) { + String acucode = zcbh.substring(0, zcbh.indexOf(".", 6)); + String cabin = zcbh.substring(zcbh.lastIndexOf(".") + 1, zcbh.lastIndexOf(".") + 2); + List fjs = deviceDao.findDeviceByPositionAndType(acucode, "F", cabin); + if (null != fjs && fjs.isEmpty() == false) { + String baseURL = Configure.getProperty("sys", "PGDSC_API_URL"); + for (PgDevice fj : fjs) { + String fjzcbh = fj.getAssetcode(); + + // 调用远程接口启动风机 + HttpRequest.sendGet(baseURL + "remote/turnOnFj.action", "zcbh=" + fjzcbh); + } } } } diff --git a/src/struts.xml b/src/struts.xml index 2da47a8..eb988c8 100644 --- a/src/struts.xml +++ b/src/struts.xml @@ -42,6 +42,8 @@ + + diff --git a/src/sys.properties b/src/sys.properties index 8eac618..4f0b5c3 100644 --- a/src/sys.properties +++ b/src/sys.properties @@ -25,4 +25,11 @@ READ_CH4_VALUE_INTERVAL = 2 READ_CO_VALUE_INTERVAL = 2 -READ_WSYQ_VALUE_INTERVAL = 2 \ No newline at end of file +READ_WSYQ_VALUE_INTERVAL = 2 + + +CH4_ON_FJ = false +O2_ON_FJ = false +WD_ON_FJ = false +SD_ON_FJ = false +HS_ON_FJ = false \ No newline at end of file