From 1c213b18d0e0b50dc23e9ff48954cec06d6ff092 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 02 七月 2024 08:58:55 +0800
Subject: [PATCH] project模块控制台日志打印SQL
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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 858ccf8..c4931dc 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;
@@ -44,10 +45,9 @@
* @Description 鍛戒护鏀拺绫�
*/
-//@Component
-//@DependsOn({"baSettingsMapper", "prControllerMapper"})
public class ComSupport {
- protected static String mwUrlSendCom = "http://127.0.0.1:8070/rtuMw/com/send" ;
+ @Value("${mw.comSendUrl}")
+ private String comSendUrl;
protected static String controllerType = null;
protected static Integer projectNo = null;
@@ -211,7 +211,7 @@
* @return
*/
protected BaseResponse sendCom2Mw(Command com){
- String url = UriComponentsBuilder.fromUriString(mwUrlSendCom)
+ String url = UriComponentsBuilder.fromUriString(comSendUrl)
.build()
.toUriString();
HttpHeaders headers = new HttpHeaders();
@@ -250,14 +250,12 @@
// 鍙戦�佸懡浠�
JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com));
if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) {
- // 璇锋眰鎴愬姛
+ // 璇锋眰鎴愬姛, 澶勭悊鍥炶皟
+ BaseResponse response_CallBack = dealWithCallBack(comId);
// 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
rmCommandHistoryMapper.insert(rmCommandHistory);
-
- // 澶勭悊鍥炶皟
- BaseResponse response_CallBack = dealWithCallBack(comId);
// 鍥炶皟寮傚父
if(!response_CallBack.getCode().equals("0001")) {
@@ -291,7 +289,7 @@
System.out.println(job_subData);
Boolean dealResult = job_subData.getBoolean("success");
if(!dealResult) {
- return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
+ return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
}
/**
@@ -311,14 +309,13 @@
seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
}
-
// 鍥炶皟杩斿洖鐨勫唴瀹�
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"));
+ return BaseResponseUtils.buildErrorMsg(job_param.getString("message"));
}
}
}
--
Gitblit v1.8.0