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/cd55/CdCtrl.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cd55/CdCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cd55/CdCtrl.java
index 08d4a2a..cf37ff5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cd55/CdCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cd55/CdCtrl.java
@@ -6,6 +6,7 @@
import com.dy.common.aop.SsoAop;
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.p206V202404.upVos.DataCd55Vo;
+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;
@@ -33,7 +34,7 @@
*/
@Slf4j
@Tag(name = "杩滅▼鍛戒护", description = "鏌ヨ璁惧缁堢鍏呭�艰褰�")
-@RestController("cd55Ctrl")
+@RestController("p202404V201Cd55Ctrl")
@RequestMapping(path = "p202404V201/cd55")
@RequiredArgsConstructor
@Scope("prototype") //鍥犱负鏈夊璞＄被灞炴�э紝鎵�浠ラ噰鐢ㄥ師鍨嬫ā寮忥紝姣忔璇锋眰鏂板缓涓�涓疄渚嬪璞�
@@ -100,16 +101,26 @@
protected String dealComResult(String code, JSONObject resultData, Callback callback){
String msg;
if(resultData != null){
- JSONArray codeData = resultData.getJSONArray("data") ;
+ 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<DataCd55Vo> list = JSON.parseArray(json, DataCd55Vo.class) ;
if(list != null && list.size() > 0){
- msg = "" ;
+ msg = "\n" ;
for(DataCd55Vo cvo : list){
- msg += cvo.toStr(false) + "\n";
+ msg += cvo.toStr(false) ;
+ msg += "\n" ;
}
}else{
msg = RtuSuccessMsg ;
@@ -120,4 +131,5 @@
}
return msg;
}
+
}
--
Gitblit v1.8.0