From f2e8f0ae62eea8a81f035b67bc6c965a959b8e73 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 14 六月 2024 10:49:59 +0800
Subject: [PATCH] 修改 充值接口 返回充值ID作为订单号
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 86 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 81 insertions(+), 5 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 89ba085..7673734 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,21 +5,22 @@
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.p206V202404.CodeV202404;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.pipIrrGlobal.command.dto.Param;
import com.dy.pipIrrGlobal.command.result.CommandResultCode;
import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
+import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.DependsOn;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
@@ -41,8 +42,8 @@
* @Description 鍛戒护鏀拺绫�
*/
-@Component
-@DependsOn({"baSettingsMapper", "prControllerMapper"})
+//@Component
+//@DependsOn({"baSettingsMapper", "prControllerMapper"})
public class ComSupport {
protected static String mwUrlSendCom = "http://127.0.0.1:8070/rtuMw/com/send" ;
@@ -59,8 +60,16 @@
@Autowired
private BaSettingsMapper baSettingsMapper;
+
@Autowired
private PrControllerMapper prControllerMapper;
+
+ //@Autowired
+ //private CommandSv commandSv;
+
+ @Autowired
+ private RmCommandHistoryMapper rmCommandHistoryMapper;
+
public static ComSupport comSupport;
/**
@@ -191,7 +200,7 @@
e.printStackTrace();
return BaseResponseUtils.buildFail(CommandResultCode.GET_RESULT_ERROR.getMessage());
} catch (TimeoutException e) {
- return BaseResponseUtils.buildFail(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
+ return BaseResponseUtils.buildSuccess(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
}
}
@@ -214,4 +223,71 @@
}
return response.getBody();
}
+
+ /**
+ * 鍙戦�佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * @param po
+ * @return
+ */
+ protected BaseResponse dealWithCommandResult(Param po) {
+ Long comId = po.getComId();
+ String commandCode = po.getCommandCode();
+ Long intakeId = po.getIntakeId();
+ String rtuAddr = po.getRtuAddr();
+ String protocol = po.getProtocol();
+ Object param = po.getParam();
+ String rtuResultSendWebUrl = po.getRtuResultSendWebUrl();
+ Long operator = po.getOperator();
+
+ // 鏋勯�犲懡浠�
+ Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param);
+
+ // 鍙戦�佸懡浠�
+ JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com));
+ if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) {
+ //if(1 > 0) {
+ // 璇锋眰鎴愬姛
+
+ // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
+ String commandName = CodeV202404.getCodeName(commandCode);
+ RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
+ //commandSv.insert(rmCommandHistory);
+ rmCommandHistoryMapper.insert(rmCommandHistory);
+
+ // 澶勭悊鍥炶皟
+ BaseResponse response_CallBack = dealWithCallBack(comId);
+
+ // 鍥炶皟澶辫触
+ if(!response_CallBack.getCode().equals("0001")) {
+ // 鍛戒护鏃ュ織鎵ц缁撴灉鏀逛负澶辫触
+ rmCommandHistory = new RmCommandHistory();
+ rmCommandHistory.setId(comId);
+ rmCommandHistory.setResult((byte)0);
+ //commandSv.updateCommandResult(rmCommandHistory);
+ rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
+ return BaseResponseUtils.buildFail(response_CallBack.getMsg());
+ //return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
+ }
+
+ // 鍥炶皟鎴愬姛锛屽啀鍒ゆ柇鎵ц鏄惁鎴愬姛
+ JSONObject job_content = (JSONObject)JSON.toJSON(response_CallBack.getContent());
+ System.out.println(job_content);
+ JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData");
+ System.out.println(job_subData);
+ Boolean dealResult = job_subData.getBoolean("success");
+ if(!dealResult) {
+ return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
+ }
+
+ /**
+ * 鎵ц鎴愬姛锛岃繑鍥炲洖璋冨唴瀹�
+ */
+ Data myData = (Data)response_CallBack.getContent();
+ return BaseResponseUtils.buildSuccess(myData) ;
+ } else {
+ // 璇锋眰澶辫触
+ JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
+ return BaseResponseUtils.buildFail(job_param.getString("message"));
+ }
+ }
}
--
Gitblit v1.8.0