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/command/CommandResultCtrl.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandResultCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandResultCtrl.java
index e5e2113..493625f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandResultCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandResultCtrl.java
@@ -1,8 +1,8 @@
package com.dy.pipIrrWechat.command;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.dy.common.mw.protocol.Data;
-import com.dy.common.webUtil.BaseResponse;
-import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pipIrrGlobal.command.ComSupport;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType;
@@ -25,16 +25,21 @@
@RequestMapping(path="comRes")
public class CommandResultCtrl extends ComSupport {
@PostMapping(path = "receive", consumes = MediaType.APPLICATION_JSON_VALUE)
- public BaseResponse<String> receive(@RequestBody Data data) {
- Long comId = 0L;
- if(data.getCommandId() != null) {
- comId = Long.parseLong(data.getCommandId());
- }
+ public void receive(@RequestBody Data data) {
+ JSONObject job_data = (JSONObject) JSON.toJSON(data);
+ String job_dataS = job_data.toJSONString();
+ JSONObject job_subData = job_data.getJSONObject("subData").getJSONObject("subData");
- CompletableFuture<Data> feature = (CompletableFuture<Data>) features.get(comId);
+ JSONObject job_response = new JSONObject();
+ job_response.put("data", job_subData);
+ job_response.put("commandCode", job_data.getString("code"));
+ job_response.put("commandId", job_data.getString("commandId"));
+
+ CompletableFuture<JSONObject> feature = (CompletableFuture<JSONObject>) features.get(job_data.getLong("commandId"));
if(feature != null) {
- feature.complete(data);
+ feature.complete(job_response);
+ }else{
+ feature.complete(new JSONObject());
}
- return BaseResponseUtils.buildSuccess("ok");
}
}
--
Gitblit v1.8.0