From 6a4d7da842c4a8bdd84e2291be438abdb40c4f42 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:33:10 +0800
Subject: [PATCH] 调整配置文件

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
index 7cc909c..e3a25ec 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
@@ -5,6 +5,7 @@
 import com.dy.common.mw.protocol.Command;
 import com.dy.common.mw.protocol.CommandType;
 import com.dy.common.mw.protocol.Data;
+import com.dy.common.mw.protocol.p206V1.CodeV1;
 import com.dy.common.webUtil.BaseResponse;
 import com.dy.common.webUtil.BaseResponseUtils;
 import com.dy.pipIrrGlobal.command.dto.Param;
@@ -254,6 +255,10 @@
         } catch (Exception e) {
             e.printStackTrace();
         }
+
+        if(response == null) {
+            return BaseResponseUtils.buildErrorMsg("涓棿浠惰皟鐢ㄥけ璐�");
+        }
         return response.getBody();
     }
 
@@ -339,7 +344,10 @@
         }
 
         // 濡傛灉鏄紑鍙戝懡浠わ紙92-骞冲彴寮�闃�锛�91-灏忕▼搴忓紑闃�锛夛紝杩斿洖缁撴灉涓坊鍔犻榾鎺у櫒鍦板潃銆佽櫄鎷熷崱缂栧彿銆佽鍗曞彿
-        if(commandCode.equals("92") || commandCode.equals("97")) {
+        //if(commandCode.equals("92") || commandCode.equals("97")) {
+        if(commandCode.equals(CodeV1.cd_92) || commandCode.equals(CodeV1.cd_97)
+                || commandCode.equals(CodeV1.cd_99) || commandCode.equals(CodeV1.cd_A0)
+                || commandCode.equals(CodeV1.cd_A1) || commandCode.equals(CodeV1.cd_A2)) {
             JSONObject job_response = (JSONObject) JSON.toJSON(response_CallBack);
             JSONObject job_param = (JSONObject) JSON.toJSON(param);
             JSONObject job_data = job_response.getJSONObject("content").getJSONObject("data");

--
Gitblit v1.8.0