From 71b9ac1d2459239d2c5340b384f1536b156fc003 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 20 六月 2025 08:39:50 +0800
Subject: [PATCH] 表阀一体机协议，根据王江海测试问题，进行修改完善
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cd65/CdCtrl.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cd65/CdCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cd65/CdCtrl.java
index 3b5460e..1b1a66f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cd65/CdCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cd65/CdCtrl.java
@@ -1,11 +1,12 @@
package com.dy.pipIrrRemote.monitor.p202404V201.cd65;
import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.aop.SsoAop;
import com.dy.common.mw.protocol.Command;
-import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.mw.protocol.p206V202404.upVos.DataCd65Vo;
+import com.dy.common.util.Callback;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pipIrrRemote.common.dto.DtoBase;
@@ -22,7 +23,6 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
import java.util.List;
/**
@@ -32,7 +32,7 @@
*/
@Slf4j
@Tag(name = "杩滅▼鍛戒护", description = "鏌ヨ璁惧缁堢鐢ㄦ埛鐢ㄦ按璁板綍")
-@RestController("cd65Ctrl")
+@RestController("p202404V201Cd65Ctrl")
@RequestMapping(path = "p202404V201/cd65")
@RequiredArgsConstructor
@Scope("prototype") //鍥犱负鏈夊璞＄被灞炴�э紝鎵�浠ラ噰鐢ㄥ師鍨嬫ā寮忥紝姣忔璇锋眰鏂板缓涓�涓疄渚嬪璞�
@@ -76,7 +76,7 @@
res = super.doSend(sv, com);
if (res == null) {
//鍙戦�佸懡浠ゅ悗
- res = super.after(ComCode);
+ res = super.after(ComCode, null);
}
} catch (Exception e) {
res = BaseResponseUtils.buildFail("鏈嶅姟绔瀯閫犲苟鍚戦�氫俊涓棿浠跺彂閫佽姹傛椂寮傚父" + (e.getMessage() == null ? "" : e.getMessage()));
@@ -96,19 +96,29 @@
}
@Override
- protected String createRtnMsg(String code, JSONObject resultData){
+ protected String dealComResult(String code, JSONObject resultData, Callback callback){
String msg;
if(resultData != null){
JSONObject codeData = resultData.getJSONObject("data") ;
+ JSONArray codeDataArray = null ;
if(codeData == null){
+ codeDataArray = resultData.getJSONArray("data") ;
+ }
+ if(codeData == null && codeDataArray == null){
msg = RtuSuccessMsg ;
}else {
- String json = codeData.toJSONString();
+ String json = null ;
+ if(codeData != null){
+ json = codeData.toJSONString() ;
+ }else if(codeDataArray != null){
+ json = codeDataArray.toJSONString() ;
+ }
List<DataCd65Vo> list = JSON.parseArray(json, DataCd65Vo.class) ;
if(list != null && list.size() > 0){
- msg = "" ;
+ msg = "\n" ;
for(DataCd65Vo cvo : list){
msg += cvo.toStr(false) ;
+ msg += "\n" ;
}
}else{
msg = RtuSuccessMsg ;
--
Gitblit v1.8.0