From d50b97408847b6b0f8532a7b6bbf3d2dbb228df8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 18 五月 2024 11:16:04 +0800
Subject: [PATCH] 1、完善协议实现代码; 2、增加命令结果接收Controller。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml | 2
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandResultCtrl.java | 29 +++++++++
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java | 4
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java | 4
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/Command.java | 93 +++++++++++++++---------------
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupport.java | 4
7 files changed, 84 insertions(+), 54 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java
index 3321daf..116bdf5 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java
@@ -29,7 +29,7 @@
}
public void deal(Data data) {
- if (data.rtuResultSendWebUrl != null && data.rtuResultSendWebUrl.trim().equals("")) {
+ if (data.rtuResultSendWebUrl != null && !data.rtuResultSendWebUrl.trim().equals("")) {
String url = UriComponentsBuilder.fromUriString(data.rtuResultSendWebUrl)
.build()
.toUriString();
@@ -42,7 +42,7 @@
} catch (Exception e) {
e.printStackTrace();
}
- assert response != null;
+ //assert response != null;
} else {
log.error("涓ラ噸閿欒锛屽湪com.dy.aceMw.web.comResult.CommandResultDeal閲岋紝澶勭悊鐨勬槸RTU鍛戒护缁撴灉Node锛屼絾鏁版嵁涓璻tuResultSendWebUrl涓虹┖");
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
index b4b2330..ba27e78 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
@@ -20,7 +20,7 @@
<base
isLowPower="false"
onlyOneProtocol="true"
- downComandMaxResendTimes="3"
+ downComandMaxResendTimes="1"
commandSendInterval="3"
cachWaitResultTimeout="60"
offLineCachTimeout="86400"
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java
index e5d60fd..699ac63 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java
@@ -1,7 +1,7 @@
package com.dy.pipIrrMwTestWeb;
import com.dy.common.webUtil.BaseResponse;
-import com.dy.pipIrrMwTestWeb.test.Test;
+import com.dy.pipIrrMwTestWeb.test.Command;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
@@ -31,7 +31,7 @@
public class PipIrrMwTestWebApplication implements CommandLineRunner {
@Autowired
- private Test test ;
+ private Command test ;
public static void main(String[] args) {
SpringApplication.run(PipIrrMwTestWebApplication.class, args);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/TestSupport.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupport.java
similarity index 98%
rename from pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/TestSupport.java
rename to pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupport.java
index b94f6a5..e470013 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/TestSupport.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupport.java
@@ -19,12 +19,12 @@
* @Date: 2024/5/14 17:32
* @Description
*/
-public class TestSupport {
+public class ComSupport {
protected static String mwUrlTest = "http://127.0.0.1:8070/rtuMw/com/test" ;
protected static String mwUrlSendCom = "http://127.0.0.1:8070/rtuMw/com/send" ;
protected static String rtuAddr = "37142501020100215" ;
- protected static String rtuResultSendWebUrl = "http://127.0.0.1:8080/test" ;
+ protected static String rtuResultSendWebUrl = "http://127.0.0.1:65535/test/comRes/receive" ;
protected static String controllerType = "57" ;//鎺у埗鍣ㄧ被鍨�
protected static Integer projectNo = 10 ;//椤圭洰缂栫爜
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/Test.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/Command.java
similarity index 71%
rename from pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/Test.java
rename to pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/Command.java
index b780784..1584ce0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/Test.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/Command.java
@@ -11,7 +11,7 @@
* @Description
*/
@Component
-public class Test extends TestSupport{
+public class Command extends ComSupport {
/**
* 杩炴帴閫氫俊涓棿浠舵祴璇�
@@ -19,8 +19,9 @@
*/
public BaseResponse test(){
//return this.connect() ;//杩炴帴閫氫俊涓棿浠舵祴璇�
- //return this.cdXY(CodeV202404.cd_50) ;//鍙戦�佸浐瀹氬弬鏁扮殑鍛戒护
- return this.cd65(2) ;
+ //return this.cdXY(CodeV202404.cd_97) ;//鍙戦�佸浐瀹氬弬鏁扮殑鍛戒护
+ //return this.cd65(1) ;
+ return this.cd15() ;
}
/**
@@ -39,20 +40,20 @@
//璁剧疆缁堢鍦板潃(AFN=0x10H)
private BaseResponse cd10(){
ComCd10Vo comVo = new ComCd10Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
- comVo.rtuNewAddr = Test.rtuAddr ;
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
+ comVo.rtuNewAddr = Command.rtuAddr ;
return this.sendCom2Mw(this.command(CodeV202404.cd_10, comVo, null)) ;
}
//杩滅▼鐢ㄦ埛鍏呭�� (AFN=0x15H)
private BaseResponse cd15(){
ComCd15Vo comVo = new ComCd15Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
- comVo.icCardAddr = Test.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
- comVo.icCardNo = Test.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
- comVo.chargeMoney = 123.45 ;//鍗曚綅:鍏� 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
- comVo.chargeWater = 234.56 ;//鍗曚綅:m3 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
+ comVo.icCardAddr = Command.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
+ comVo.icCardNo = Command.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.chargeMoney = 12.34 ;//鍗曚綅:鍏� 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
+ comVo.chargeWater = 43.21 ;//鍗曚綅:m3 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
comVo.flowNo = "123456789012" ;//娴佹按鍙凤紙12浣嶆暟瀛楋級
return this.sendCom2Mw(this.command(CodeV202404.cd_15, comVo, null)) ;
@@ -60,8 +61,8 @@
//璁剧疆璁惧缁堢鍓╀綑姘撮噺鍜屽墿浣欓噾棰濇姤璀﹀�� (AFN=0x16H)
private BaseResponse cd16(){
ComCd16Vo comVo = new ComCd16Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
comVo.waterAlarm = 10 ;//鍓╀綑姘撮噺鎶ヨ鍊�,鍗曚綅:m3銆傛暣鏁帮紝鍙栧�艰寖鍥�0~9999
comVo.moneyAlarm = 11 ;//鍓╀綑閲戦鎶ヨ鍊�,鍗曚綅:鍏冦�傛暣鏁帮紝鍙栧�艰寖鍥�0~9999
@@ -70,8 +71,8 @@
//璁剧疆璁惧缁堢IP鍦板潃 (AFN=0x21H)
private BaseResponse cd21(){
ComCd21Vo comVo = new ComCd21Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
comVo.channel = 1 ;//IP閫氶亾鍙�(鍙栧�艰寖鍥� 1銆�2).
comVo.ip = "111.222.123.321" ;//IP锛堜緥濡� 125.235.35.89锛�
comVo.port = 60000 ;///绔彛鍙凤紙0~65536锛�
@@ -81,8 +82,8 @@
//璁剧疆鏈轰簳骞存渶澶у紑閲囬噺鍜屾按浣嶄笅闄� (AFN=0x22H)
private BaseResponse cd22(){
ComCd22Vo comVo = new ComCd22Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
comVo.maxAmountYear = 12345 ;//鏈轰簳骞存渶澶х敤姘撮噺鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999
comVo.limitLevel = 123.4; //姘翠綅涓嬮檺 鍗曚綅锛歮 鍙栧�艰寖鍥�:0~9999.99
@@ -91,8 +92,8 @@
//璁剧疆璁惧缁堢鍩熷悕(AFN=0x23H)
private BaseResponse cd23(){
ComCd23Vo comVo = new ComCd23Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
comVo.channel = 1 ;//IP閫氶亾鍙�(鍙栧�艰寖鍥� 1銆�2).
comVo.domain = "www.baidu.com" ;//鍩熷悕锛堜緥濡� dayuyanjiuyuan.to锛夛紝鏈�澶ч暱搴�42瀛楃
comVo.port = 60000 ;///绔彛鍙凤紙0~65536锛�
@@ -102,8 +103,8 @@
//璁剧疆璁惧缁堢娉ㄥ唽鍙�(AFN=0x24H)
private BaseResponse cd24(){
ComCd24Vo comVo = new ComCd24Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
comVo.registerNo = "102030405060708090" ;//鍩熷悕锛堜緥濡� dayuyanjiuyuan.to锛夛紝鏈�澶ч暱搴�42瀛楃
return this.sendCom2Mw(this.command(CodeV202404.cd_24, comVo, null)) ;
@@ -111,8 +112,8 @@
//璁剧疆璁惧缁堢骞寸敤姘撮噺(AFN=0x24H)
private BaseResponse cd26(){
ComCd26Vo comVo = new ComCd26Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
comVo.ipChannel = 1 ;//IP閫氶亾鍙� 0x01:1閫氶亾 0x02:2閫氶亾.
comVo.maxAmountYear = 123456 ;//璁惧缁堢骞寸敤姘撮噺 鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999
@@ -121,8 +122,8 @@
//璁剧疆璁惧缁堢鐢ㄦ按鏈夋晥(AFN=0x31H)
private BaseResponse cd31(){
ComCd31Vo comVo = new ComCd31Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
comVo.valid = false ;//鏈夋晥鎬�
return this.sendCom2Mw(this.command(CodeV202404.cd_31, comVo, null)) ;
@@ -130,8 +131,8 @@
//鏌ヨ閬ユ祴缁堢鍏呭�艰褰� (AFN=0x55H)
private BaseResponse cd55(int page){
ComCd55Vo comVo = new ComCd55Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
comVo.page = page ;//鍒嗛〉锛堝彇鍊艰寖鍥�1銆�2銆�3銆�4銆�5銆�6銆�7銆�8銆�9锛�
return this.sendCom2Mw(this.command(CodeV202404.cd_55, comVo, null)) ;
@@ -139,34 +140,34 @@
//鏌ヨ璁惧缁堢鐢ㄦ埛鐢ㄦ按璁板綍(AFN=0x65H)
private BaseResponse cd65(int page){
ComCd65Vo comVo = new ComCd65Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
comVo.page = page ;
return this.sendCom2Mw(this.command(CodeV202404.cd_65, comVo, null)) ;
}
//鏌ヨ鎺у埗鍣↖P鍦板潃(AFN=0x86H)
private BaseResponse cd86(){
ComCd86Vo comVo = new ComCd86Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
comVo.channel = 1 ;//IP閫氶亾鍙�(鍙栧�艰寖鍥� 1銆�2).
return this.sendCom2Mw(this.command(CodeV202404.cd_86, comVo, null)) ;
}
//鏌ヨ鎺у埗鍣ㄥ煙鍚�(AFN=0x87H)
private BaseResponse cd87(){
ComCd87Vo comVo = new ComCd87Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
comVo.channel = 1 ;//IP閫氶亾鍙�(鍙栧�艰寖鍥� 1銆�2).
return this.sendCom2Mw(this.command(CodeV202404.cd_87, comVo, null)) ;
}
//骞冲彴/APP杩滅▼寮�鍚按娉�/闃�闂�(AFN=0x92H/AFN=0xA2H)
private BaseResponse cd92(){
ComCd92_A2Vo comVo = new ComCd92_A2Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
//comVo.icCardAddr = Test.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
- comVo.icCardNo = Test.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.icCardNo = Command.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
comVo.waterRemain = 123.45 ;//鍗曚綅:鍏� 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
comVo.moneyRemain = 234.56 ;//鍗曚綅:m3 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
comVo.waterPrice = 0.8 ;//姘撮噺鍗曚环 鍗曚綅:鍏�, 2涓皬鏁扮偣
@@ -178,10 +179,10 @@
//骞冲彴/APP杩滅▼寮�鍚按娉�/闃�闂�(AFN=0x92H/AFN=0xA2H)
private BaseResponse cdA2(){
ComCd92_A2Vo comVo = new ComCd92_A2Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
//comVo.icCardAddr = Test.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
- comVo.icCardNo = Test.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.icCardNo = Command.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
comVo.waterRemain = 123.45 ;//鍗曚綅:鍏� 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
comVo.moneyRemain = 234.56 ;//鍗曚綅:m3 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
comVo.waterPrice = 0.8 ;//姘撮噺鍗曚环 鍗曚綅:鍏�, 2涓皬鏁扮偣
@@ -194,9 +195,9 @@
//骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂�(AFN=0x93H/AFN=0xA3H)
private BaseResponse cd93(){
ComCd93_A3Vo comVo = new ComCd93_A3Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
- comVo.icCardNo = Test.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
+ comVo.icCardNo = Command.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
comVo.orderNo = "1234567890123456" ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
return this.sendCom2Mw(this.command(CodeV202404.cd_93, comVo, null)) ;
@@ -204,9 +205,9 @@
//骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂�(AFN=0x93H/AFN=0xA3H)
private BaseResponse cdA3(){
ComCd93_A3Vo comVo = new ComCd93_A3Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
- comVo.icCardNo = Test.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.controllerType = Command.controllerType ;
+ comVo.projectNo = Command.projectNo ;
+ comVo.icCardNo = Command.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
comVo.orderNo = "1234567890123456" ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
return this.sendCom2Mw(this.command(CodeV202404.cd_A3, comVo, null)) ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandResultCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandResultCtrl.java
new file mode 100644
index 0000000..11047f9
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandResultCtrl.java
@@ -0,0 +1,29 @@
+package com.dy.pipIrrMwTestWeb.test;
+
+import com.dy.common.mw.protocol.Data;
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/5/18 11:04
+ * @Description
+ */
+@Slf4j
+@RestController
+@RequestMapping(path="comRes")
+@SuppressWarnings("unchecked")//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
+public class CommandResultCtrl {
+
+ @PostMapping(path = "receive", consumes = MediaType.APPLICATION_JSON_VALUE)
+ public BaseResponse<String> receive(@RequestBody Data data) {
+ log.info(data.toString()) ;
+ return BaseResponseUtils.buildSuccess("ok");
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/resources/application.yml
index 3ffe08f..b0aee39 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/resources/application.yml
@@ -11,7 +11,7 @@
enabled: false
port: 65535
servlet:
- context-path: /test/web #web璁块棶涓婁笅鏂囪矾寰�
+ context-path: /test #web璁块棶涓婁笅鏂囪矾寰�
encoding:
#鍙栨秷榛樿鐨勫瓧绗﹂泦缂栫爜
enabled: true
--
Gitblit v1.8.0