From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java | 89 +++++++++++++++++++++-----------------------
1 files changed, 42 insertions(+), 47 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java
index f8ce89c..d48c4fd 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java
@@ -68,30 +68,28 @@
* @return
*/
public VoOnLineIntake selectOneIntake(OnLineIntakesQO qo) {
- Command com = new Command() ;
- com.id = Command.defaultId;
- com.code = "LCD0001";
- com.type = "innerCommand";
- comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
+ //Command com = new Command() ;
+ //com.id = Command.defaultId;
+ //com.code = "LCD0001";
+ //com.type = "innerCommand";
+ //comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
+ //
+ //JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
+ //
+ //JSONArray jsonArray = new JSONArray();
+ //if(response != null && response.getString("code").equals("0001")) {
+ // JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
+ // if(attachment != null) {
+ // attachment.forEach((key, value) -> {
+ // JSONObject jsonObject = new JSONObject();
+ // jsonObject.put("rtuAddr", key);
+ // jsonObject.put("isOnLine", value);
+ // jsonArray.add(jsonObject);
+ // });
+ // }
+ //}
+ //qo.setOnLineMap(jsonArray.toJSONString());
- JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
-
- JSONArray jsonArray = new JSONArray();
- if(response != null && response.getString("code").equals("0001")) {
- JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
- if(attachment != null) {
- attachment.forEach((key, value) -> {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("rtuAddr", key);
- jsonObject.put("isOnLine", value);
- jsonArray.add(jsonObject);
- });
- }
- //} else {
- // return new VoOnLineIntake();
- }
-
- qo.setOnLineMap(jsonArray.toJSONString());
// 濡傛灉 intakeNum 涓嶄负绌猴紝鍒欒浆涓哄皬鍐欏啀鍐欏叆qo瀵硅薄
String intakeNum = qo.getIntakeNum();
if(intakeNum != null) {
@@ -107,31 +105,28 @@
* @return
*/
public QueryResultVo<List<VoOnLineIntake>> selectAllIntakes(OnLineIntakesQO qo) {
- Command com = new Command() ;
- com.id = Command.defaultId;
- com.code = "LCD0001";
- com.type = "innerCommand";
- comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
+ //Command com = new Command() ;
+ //com.id = Command.defaultId;
+ //com.code = "LCD0001";
+ //com.type = "innerCommand";
+ //comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
+ //
+ //JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
+ //
+ //JSONArray jsonArray = new JSONArray();
+ //if(response != null && response.getString("code").equals("0001")) {
+ // JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
+ // if(attachment != null) {
+ // attachment.forEach((key, value) -> {
+ // JSONObject jsonObject = new JSONObject();
+ // jsonObject.put("rtuAddr", key);
+ // jsonObject.put("isOnLine", value);
+ // jsonArray.add(jsonObject);
+ // });
+ // }
+ //}
+ //qo.setOnLineMap(jsonArray.toJSONString());
- JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
-
- JSONArray jsonArray = new JSONArray();
- if(response != null && response.getString("code").equals("0001")) {
- JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
- if(attachment != null) {
- attachment.forEach((key, value) -> {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("rtuAddr", key);
- jsonObject.put("isOnLine", value);
- jsonArray.add(jsonObject);
- });
- }
- //} else {
- // QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>();
- // return rsVo;
- }
-
- qo.setOnLineMap(jsonArray.toJSONString());
// 濡傛灉 intakeNum 涓嶄负绌猴紝鍒欒浆涓哄皬鍐欏啀鍐欏叆qo瀵硅薄
String intakeNum = qo.getIntakeNum();
if(intakeNum != null) {
--
Gitblit v1.8.0