From b609239eb3c722500ae4e942f66784ec95e846be Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 19 九月 2024 11:07:32 +0800
Subject: [PATCH] 2024-09-19 朱宝民 修改监测控制模块及微信小程序模块tag获取方式，开阀代码优化
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 85 ++++++++++++++++++++++++------------------
1 files changed, 49 insertions(+), 36 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 f774726..17081dc 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
@@ -19,6 +19,7 @@
import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -48,13 +49,20 @@
//@Value("${mw.comSendUrl}")
protected String comSendUrl;
- protected static String controllerType = null;
- protected static Integer projectNo = null;
+ //protected static String controllerType = null;
+ //protected static Integer projectNo = null;
+
+ @Value("${project.projectNo}")
+ protected Integer projectNo;
+
+ @Value("${project.controllerType}")
+ protected String controllerType;
+
protected String commandTypeOuter = CommandType.outerCommand;
// 瀛樺偍瀹炰緥鍖栫殑 CompletableFuture<Data> 瀵硅薄
protected static Map<Long, Object> features = new HashMap<>();
- protected static Boolean setuped = false;
+ //protected static Boolean setuped = false;
@Autowired
private RestTemplate restTemplate;
@@ -89,11 +97,11 @@
/**
* 鑾峰彇绯荤粺閰嶇疆鍙傛暟
*/
- public void setUp() {
- controllerType = comSupport.baSettingsMapper.getItemValue("controllerType");
- projectNo = Integer.parseInt(comSupport.baSettingsMapper.getItemValue("projectNo"));
- setuped = true;
- }
+ //public void setUp() {
+ // controllerType = comSupport.baSettingsMapper.getItemValue("controllerType");
+ // projectNo = Integer.parseInt(comSupport.baSettingsMapper.getItemValue("projectNo"));
+ // setuped = true;
+ //}
/**
* 鐢熸垚璁㈠崟鍙�
@@ -178,8 +186,9 @@
com.type = commandTypeOuter;
com.rtuResultSendWebUrl = rtuResultSendWebUrl;
- com.param = param;
-
+ if(param != null) {
+ com.param = param;
+ }
return com;
}
@@ -190,7 +199,7 @@
* @return
*/
protected BaseResponse<Data> dealWithCallBack(Long comId, Command com) {
- CompletableFuture<Data> feature = new CompletableFuture<>();
+ CompletableFuture<JSONObject> feature = new CompletableFuture<>();
features.put(comId, feature);
try {
// 鍙戦�佸懡浠�
@@ -202,9 +211,10 @@
return BaseResponseUtils.buildErrorMsg(job_param.getString("message"));
}
- Data resultData = feature.get(180, TimeUnit.SECONDS);
+ JSONObject resultData = feature.get(180, TimeUnit.SECONDS);
features.remove(comId);
- Long commandId = Long.parseLong(resultData.getCommandId());
+
+ Long commandId = resultData.getLong("commandId");
if (commandId.equals(comId)) {
return BaseResponseUtils.buildSuccess(resultData);
} else {
@@ -283,7 +293,8 @@
rmCommandHistory.setComId(comId);
rmCommandHistory.setResult((byte) 0);
rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
- return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
+ //return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
+ return BaseResponseUtils.buildErrorMsg(response_CallBack.getMsg());
}
// 鍥炶皟瓒呮椂
@@ -301,27 +312,7 @@
return BaseResponseUtils.buildErrorMsg(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
}
- // 鍥炶皟鎴愬姛锛屽啀鍒ゆ柇鎵ц鏄惁鎴愬姛
- JSONObject job_content = (JSONObject) JSON.toJSON(response_CallBack.getContent());
- JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData");
- Boolean dealResult = job_subData.getBoolean("success");
- if (!dealResult) {
- /**
- * 鎵ц澶辫触
- * 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
- */
- rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setComId(comId);
- rmCommandHistory.setResult((byte) 0);
- rmCommandHistory.setResultTime(new Date());
- //rmCommandHistory.setResultText((JSONObject)JSON.toJSON(response_CallBack.getContent()));
- rmCommandHistory.setResultText(response_CallBack.getContent().toString());
- rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
- return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
- }
-
/**
- * 鎵ц鎴愬姛
* 濡傛灉鏄紑鍏抽榾锛氭洿鏀硅櫄鎷熷崱鐘舵�侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
* 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
* 杩斿洖鍥炶皟鍐呭
@@ -339,9 +330,31 @@
seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
}
+ // 濡傛灉鏄紑鍙戝懡浠わ紙92-骞冲彴寮�闃�锛�91-灏忕▼搴忓紑闃�锛夛紝杩斿洖缁撴灉涓坊鍔犻榾鎺у櫒鍦板潃銆佽櫄鎷熷崱缂栧彿銆佽鍗曞彿
+ 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");
+ 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);
+ if(job_param != null) {
+ 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);
+ }
+ }
+
// 鍥炶皟杩斿洖鐨勫唴瀹癸紝鍥炶皟缁撴灉鍐欏叆鍛戒护鏃ュ織琛ㄧ殑浠诲姟鐢变腑闂翠欢瀹屾垚
- Data myData = (Data) response_CallBack.getContent();
- return BaseResponseUtils.buildSuccess(myData);
+ return response_CallBack;
}
}
--
Gitblit v1.8.0