From 8d76e801e612abb38123acc7edaccd24887a685b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 15 八月 2025 09:07:42 +0800
Subject: [PATCH] 根据韩月设计，去除参数实体类(Param)及相关逻辑代码，作物实体类的开始日期与结束日期属性改为月日型。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java
index a6dbe37..c03f7a0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java
@@ -1,6 +1,7 @@
package com.dy.pipIrrRemote.common;
import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.mw.protocol.Data;
import com.dy.pipIrrGlobal.command.ComResultWait;
@@ -27,20 +28,27 @@
public class CommandResultCtrl extends ComSupport {
@PostMapping(path = "receive", consumes = MediaType.APPLICATION_JSON_VALUE)
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");
-
+ JSONObject protocolData = data == null ? null : (JSONObject)data.subData ; //鍗忚鏁版嵁
+ Object codeDataObj = protocolData == null ? null : protocolData.get("subData") ;
+ JSONObject codeData = null ;
+ JSONArray codeArrayData = null ;
+ if(codeDataObj != null){
+ if(codeDataObj instanceof JSONObject){
+ codeData = protocolData == null ? null : (protocolData.getJSONObject("subData")) ; //鍗忚鍔熻兘鐮佹暟鎹�
+ }else if(codeDataObj instanceof JSONArray){
+ codeArrayData = protocolData == null ? null : (protocolData.getJSONArray("subData")) ; //鍗忚鍔熻兘鐮佹暟鎹�
+ }
+ }
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"));
+ job_response.put("data", codeData!=null?codeData:(codeArrayData!=null?codeArrayData:null));
+ job_response.put("commandCode", data.code);
+ job_response.put("commandId", data.commandId);
- CompletableFuture<JSONObject> feature = (CompletableFuture<JSONObject>) ComResultWait.get(job_data.getLong("commandId"));
+ CompletableFuture<JSONObject> feature = (CompletableFuture<JSONObject>) ComResultWait.get(Long.parseLong(data.commandId));
if(feature != null) {
feature.complete(job_response);
- }//else{
- // feature.complete(new JSONObject());
- //}
+ }else{
+ //瓒呮椂锛宖eature琚竻闄や簡
+ }
}
}
--
Gitblit v1.8.0