From c4d56f4a2c7687739f3bf0f43bcc1f35c9bbeb8b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 14 五月 2025 15:18:44 +0800
Subject: [PATCH] 1、表阀一体协议解析同步新版本；2、默认设备是表阀一体（0x02）
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComCtrl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComCtrl.java
index 27657cc..45b05fe 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComCtrl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.mw.protocol.Command;
+import com.dy.common.util.Callback;
import com.dy.common.util.IDLongGenerator;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
@@ -9,9 +10,7 @@
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
import com.dy.pipIrrRemote.common.dto.DtoBase;
-import com.dy.pipIrrRemote.monitor.p202404V201.Cd50Param;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment;
import org.springframework.validation.BindingResult;
@@ -39,6 +38,12 @@
@Value("${mw.rtuCallbackUrl_rm}")
protected String rtuResultSendWebUrl;
+
+ @Value("${project.projectNo}")
+ protected Integer projectNo;
+
+ @Value("${project.controllerType}")
+ protected String controllerType;
//鎺у埗鍣ㄥ璞�
protected PrController ctrlPo ;
@@ -103,7 +108,7 @@
* @param param 鍛戒护鍙傛暟
* @return
*/
- public BaseResponse<Object> pre3(ComSv comSv, Long intakeId, Long operator, String comCode, CdParam param) {
+ public BaseResponse<Object> pre3(ComSv comSv, Long intakeId, Long operator, String comCode, CdParameter param) {
comId = new IDLongGenerator().generate();
//鐢熸垚骞朵繚瀛樺懡浠ゆ棩蹇�
RmCommandHistory po = comSv.saveComHistoryPo(comId,
@@ -151,11 +156,11 @@
* 鍙戦�佸懡浠ゅ悗
* @return
*/
- public BaseResponse<Object> after(String comCode) {
+ public BaseResponse<Object> after(String comCode, Callback callback) {
try{
//绛夊緟閫氫俊涓棿浠堕�氱煡鎺у埗鍣ㄦ墽琛屽懡浠や笂琛屾暟鎹紙鍛戒护缁撴灉锛�
JSONObject resultData = feature.get(waitMwRtnResultTimeout, TimeUnit.SECONDS);
- return BaseResponseUtils.buildSuccess(this.createRtnMsg(comCode, resultData));
+ return BaseResponseUtils.buildSuccess(this.dealComResult(comCode, resultData, callback));
}catch (Exception e){
return BaseResponseUtils.buildFail("绛夊緟閫氫俊涓棿浠堕�氱煡鍛戒护缁撴灉瓒呮椂");
}
@@ -185,5 +190,5 @@
/**
* 鐢熸垚鍛戒护杩斿洖淇℃伅
*/
- protected abstract String createRtnMsg(String code, JSONObject resultData);
+ protected abstract String dealComResult(String code, JSONObject resultData, Callback callback);
}
--
Gitblit v1.8.0