From d5dab07dc674de7edbbc1bd6ade0486f54fbdb26 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 19:19:35 +0800
Subject: [PATCH] 1、实现万用token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/rtuMw/Web2RtuMw.java | 75 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 31 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/rtuMw/Web2RtuMw.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/rtuMw/Web2RtuMw.java
index 8029774..42d074e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/rtuMw/Web2RtuMw.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/rtuMw/Web2RtuMw.java
@@ -31,20 +31,20 @@
private static final String pro_mw = "mw";
private static final String pro_url = "url";
- protected static final String ContextComSend = "/rtuMw/com/send";
+ public static final String ContextComSend = "/rtuMw/com/send";
- protected static final String ContextRtuLogFile = "/rtuMw/com/rtuLogFile";
- protected static final String ContextRtuLogText = "/rtuMw/com/rtuLogText";
+ public static final String ContextRtuLogFile = "/rtuMw/com/rtuLogFile";
+ public static final String ContextRtuLogText = "/rtuMw/com/rtuLogText";
- protected static final String ContextRegisterMsReceiverWebUrl = "/rtuMw/com/registerMsReceiverWebUrl";
- protected static final String ContextUgTaskSend = "/rtuMw/com/upgradeRtu";
- protected static final String ContextUgForceOver = "/rtuMw/com/ugForceOver";
+ public static final String ContextRegisterMsReceiverWebUrl = "/rtuMw/com/registerMsReceiverWebUrl";
+ public static final String ContextUgTaskSend = "/rtuMw/com/upgradeRtu";
+ public static final String ContextUgForceOver = "/rtuMw/com/ugForceOver";
/**
* 寰楀埌鍚戦�氫俊涓棿浠跺彂閫佹暟鎹殑URL
* @param env
* @return
*/
- protected String get2MwUrl(Environment env) {
+ public String get2MwUrl(Environment env) {
return env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + pro_url);
}
/**
@@ -53,76 +53,76 @@
* @param orgTag
* @return
*/
- protected String get2MwUrl(Environment env, String orgTag) {
+ public String get2MwUrl(Environment env, String orgTag) {
return env.getProperty(pro_mw + "." + orgTag + "." + pro_url);
}
/**
- * 寰楀埌鍚戦�氫俊涓棿浠跺彂閫佸己鍒跺仠姝㈠崌绾х殑鍛戒护URL
+ * 寰楀埌鍚戦�氫俊涓棿浠跺彂閫佹暟鎹殑URL
* @param env
* @param context
* @return
*/
- protected String get2MwRequestUrl(Environment env, String context) {
+ public String get2MwRequestUrl(Environment env, String context) {
return get2MwUrl(env) + context;
}
/**
- * 寰楀埌鍚戦�氫俊涓棿浠跺彂閫佸己鍒跺仠姝㈠崌绾х殑鍛戒护URL
+ * 寰楀埌鍚戦�氫俊涓棿浠跺彂閫佹暟鎹殑URL
* @param env
* @param orgTag
* @param context
* @return
*/
- protected String get2MwRequestUrl(Environment env, String orgTag, String context) {
+ public String get2MwRequestUrl(Environment env, String orgTag, String context) {
return get2MwUrl(env, orgTag) + context;
}
/**
- * 鍚戦�氫俊涓棿浠跺彂閫乺tu杩滅▼鍗囩骇浠诲姟
+ * 鍚戦�氫俊涓棿浠跺彂閫丳ost璇锋眰
* @param restTemplate SpringBoot鐨凴estTemplate
* @param toMwUrl 鍒伴�氫俊涓棿浠剁殑web璇锋眰Url
- * @param body 璇锋眰鏁版嵁
+ * @param body 鏁版嵁
* @return
*/
- protected BaseResponse sendPostRequest2Mw(RestTemplate restTemplate, String toMwUrl, Object body) {
+ public BaseResponse sendPostRequest2Mw(RestTemplate restTemplate, String toMwUrl, Object body) {
String url = UriComponentsBuilder.fromUriString(toMwUrl)
.build()
.toUriString();
HttpHeaders headers = new HttpHeaders();
HttpEntity<?> httpEntity = new HttpEntity<>(body, headers);
- ResponseEntity<BaseResponse> response = null;
+ ResponseEntity<BaseResponse> resEntity = null;
try {
// 閫氳繃Post鏂瑰紡璋冪敤鎺ュ彛
- response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, BaseResponse.class);
+ resEntity = restTemplate.exchange(url, HttpMethod.POST, httpEntity, BaseResponse.class);
} catch (Exception e) {
e.printStackTrace();
return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛屼腑闂翠欢璋冪敤寮傚父");
}
- if(response == null){
+ if(resEntity == null){
return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛屼腑闂翠欢璋冪敤寮傚父");
}else{
- return response.getBody();
+ return resEntity.getBody();
}
}
/**
- * 鍚戦�氫俊涓棿浠跺彂閫乺tu杩滅▼鍗囩骇浠诲姟
+ * 鍚戦�氫俊涓棿浠跺彂閫丟et璇锋眰
* @param restTemplate SpringBoot鐨凴estTemplate
* @param toMwUrl 鍒伴�氫俊涓棿浠剁殑web璇锋眰Url
* @return
*/
- protected BaseResponse sendGetRequest2Mw(RestTemplate restTemplate, String toMwUrl) {
+ public BaseResponse sendGetRequest2Mw(RestTemplate restTemplate, String toMwUrl) {
return sendGetRequest2Mw(restTemplate, toMwUrl, null);
}
/**
- * 鍚戦�氫俊涓棿浠跺彂閫乺tu杩滅▼鍗囩骇浠诲姟
+ * 鍚戦�氫俊涓棿浠跺彂閫丟et璇锋眰
* @param restTemplate SpringBoot鐨凴estTemplate
* @param toMwUrl 鍒伴�氫俊涓棿浠剁殑web璇锋眰Url
* @param paramName 鍙傛暟鍚嶇О
* @param paramValue 鍙傛暟
* @return
*/
- protected BaseResponse sendGetRequest2Mw(RestTemplate restTemplate, String toMwUrl, String paramName, String paramValue) {
+ public BaseResponse sendGetRequest2Mw(RestTemplate restTemplate, String toMwUrl, String paramName, String paramValue) {
String url = UriComponentsBuilder.fromUriString(toMwUrl)
.build()
.toUriString();
@@ -135,13 +135,13 @@
}
/**
- * 鍚戦�氫俊涓棿浠跺彂閫乺tu杩滅▼鍗囩骇浠诲姟
+ * 鍚戦�氫俊涓棿浠跺彂閫丟et璇锋眰
* @param restTemplate SpringBoot鐨凴estTemplate
* @param toMwUrl 鍒伴�氫俊涓棿浠剁殑web璇锋眰Url
* @param params 鍙傛暟闆嗗悎锛屽弬鏁板悕绉版槸key锛屽弬鏁版槸value
* @return
*/
- protected BaseResponse sendGetRequest2Mw(RestTemplate restTemplate, String toMwUrl, Map<String, String> params) {
+ public BaseResponse sendGetRequest2Mw(RestTemplate restTemplate, String toMwUrl, Map<String, String> params) {
String url = UriComponentsBuilder.fromUriString(toMwUrl)
.build()
.toUriString();
@@ -159,12 +159,12 @@
}
/**
- * 鍚戦�氫俊涓棿浠跺彂閫乺tu杩滅▼鍗囩骇浠诲姟
+ * 鍚戦�氫俊涓棿浠跺彂閫丟et璇锋眰
* @param restTemplate SpringBoot鐨凴estTemplate
* @param builder
* @return
*/
- protected BaseResponse sendGetRequest2Mw(RestTemplate restTemplate, UriComponentsBuilder builder) {
+ public BaseResponse sendGetRequest2Mw(RestTemplate restTemplate, UriComponentsBuilder builder) {
ResponseEntity<BaseResponse> response;
try {
// 閫氳繃Get鏂瑰紡璋冪敤鎺ュ彛
@@ -173,7 +173,7 @@
new HttpEntity<>(new HttpHeaders()),
BaseResponse.class);
} catch (Exception e) {
- e.printStackTrace();
+ //e.printStackTrace();
return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛屼腑闂翠欢璋冪敤寮傚父");
}
if(response == null){
@@ -188,7 +188,7 @@
* @param code 鍛戒护code
* @return
*/
- protected Command createOuterCommand(String comId, String code) {
+ public Command createOuterCommand(String comId, String code) {
Command com = new Command();
com.id = comId;
com.code = code ;
@@ -197,11 +197,24 @@
}
/**
- * 鍒涘缓鍐呴儴
+ * 鍒涘缓澶栭儴閫忎紶鍛戒护锛堝彂缁欐帶鍒跺櫒锛�
* @param code 鍛戒护code
* @return
*/
- protected Command createInnerCommand(String code) {
+ public Command createOuterTransparentCommand(String comId, String code) {
+ Command com = new Command();
+ com.id = comId;
+ com.code = code ;
+ com.type = CommandType.outerTransCommand;
+ return com ;
+ }
+
+ /**
+ * 鍒涘缓鍐呴儴鍛戒护
+ * @param code 鍛戒护code
+ * @return
+ */
+ public Command createInnerCommand(String code) {
Command com = new Command();
com.id = Command.defaultId;
com.code = code ;
--
Gitblit v1.8.0