From 4b5fd908d86303738df19ab2d35b552071d13af0 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 22 八月 2024 08:36:24 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 8413b02..db9713f 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
@@ -334,15 +334,22 @@
if(commandCode.equals("92") || commandCode.equals("97")) {
JSONObject job_response = (JSONObject) JSON.toJSON(response_CallBack);
JSONObject job_param = (JSONObject) JSON.toJSON(param);
-
JSONObject job_data = job_response.getJSONObject("content").getJSONObject("data");
- job_data.remove("success");
- job_data.put("intakeId", intakeId);
- job_data.put("rtuAddr", rtuAddr);
- job_data.put("vcNum", job_param.getString("icCardNo"));
- job_data.put("orderNo", job_param.getString("orderNo"));
+ if(!job_data.getBoolean("success")) {
+ // 寮�鍏抽榾澶辫触
+ response_CallBack.setCode("10003");
+ response_CallBack.setMsg(CommandResultCode.OPEN_CLOSE_FAIL.getMessage());
+ response_CallBack.setSuccess(false);
+ }else {
+ // 寮�鍏抽榾鎴愬姛
+ job_data.remove("success");
+ job_data.put("intakeId", intakeId);
+ job_data.put("rtuAddr", rtuAddr);
+ job_data.put("vcNum", job_param.getString("icCardNo"));
+ job_data.put("orderNo", job_param.getString("orderNo"));
- response_CallBack = JSON.parseObject(job_response.toJSONString(), BaseResponse.class);
+ response_CallBack = JSON.parseObject(job_response.toJSONString(), BaseResponse.class);
+ }
}
// 鍥炶皟杩斿洖鐨勫唴瀹癸紝鍥炶皟缁撴灉鍐欏叆鍛戒护鏃ュ織琛ㄧ殑浠诲姟鐢变腑闂翠欢瀹屾垚
--
Gitblit v1.8.0