From 42f5453644c41d3b6ac9e381f931efdfc9da8178 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 27 五月 2024 16:09:56 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandCtrl.java | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandCtrl.java
index ec70bf2..e121ea3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandCtrl.java
@@ -21,13 +21,21 @@
@GetMapping(path = "test")
public BaseResponse<String> test() {
//return this.connect() ;//杩炴帴閫氫俊涓棿浠舵祴璇�
- //return this.cdXY(CodeV202404.cd_30) ;//鍙戦�佸浐瀹氬弬鏁癤Y鐨勫懡浠�
+ //return this.cdXY(CodeV202404.cd_9C) ;//鍙戦�佸浐瀹氬弬鏁癤Y鐨勫懡浠�
//return this.cd55(1) ;
//return this.cd15() ;
//return this.cd16() ;
+ //return this.cd21() ;
//return this.cd22() ;
+ //return this.cd23() ;
+ //return this.cd24() ;
+ //return this.cd26() ;
//return this.cd31() ;
- return this.cd92() ;
+ //return this.cd86() ;
+ //return this.cd87() ;
+ //return this.cd92() ;
+ //return this.cd93() ;
+ return this.cd9C() ;
}
/**
@@ -80,8 +88,8 @@
comVo.controllerType = CommandCtrl.controllerType ;
comVo.projectNo = CommandCtrl.projectNo ;
comVo.channel = 1 ;//IP閫氶亾鍙�(鍙栧�艰寖鍥� 1銆�2).
- comVo.ip = "111.222.123.321" ;//IP锛堜緥濡� 125.235.35.89锛�
- comVo.port = 60000 ;///绔彛鍙凤紙0~65536锛�
+ comVo.ip = "8.140.180.59" ;//IP锛堜緥濡� 125.235.35.89锛�
+ comVo.port = 6001 ;///绔彛鍙凤紙0~65536锛�
return this.sendCom2Mw(this.command(CodeV202404.cd_21, comVo, null)) ;
}
@@ -90,8 +98,8 @@
ComCd22Vo comVo = new ComCd22Vo() ;
comVo.controllerType = CommandCtrl.controllerType ;
comVo.projectNo = CommandCtrl.projectNo ;
- comVo.maxAmountYear = 12345 ;//鏈轰簳骞存渶澶х敤姘撮噺鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999
- comVo.limitLevel = 123.4; //姘翠綅涓嬮檺 鍗曚綅锛歮 鍙栧�艰寖鍥�:0~9999.99
+ comVo.maxAmountYear = 99998888 ;//鏈轰簳骞存渶澶х敤姘撮噺鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999
+ comVo.limitLevel = 9978.60; //姘翠綅涓嬮檺 鍗曚綅锛歮 鍙栧�艰寖鍥�:0~9999.99
return this.sendCom2Mw(this.command(CodeV202404.cd_22, comVo, null)) ;
}
@@ -101,8 +109,8 @@
comVo.controllerType = CommandCtrl.controllerType ;
comVo.projectNo = CommandCtrl.projectNo ;
comVo.channel = 1 ;//IP閫氶亾鍙�(鍙栧�艰寖鍥� 1銆�2).
- comVo.domain = "www.baidu.com" ;//鍩熷悕锛堜緥濡� dayuyanjiuyuan.to锛夛紝鏈�澶ч暱搴�42瀛楃
- comVo.port = 60000 ;///绔彛鍙凤紙0~65536锛�
+ comVo.domain = "dayuyanjiuyuan.top" ;//鍩熷悕锛堜緥濡� dayuyanjiuyuan.top锛夛紝鏈�澶ч暱搴�42瀛楃
+ comVo.port = 6001 ;///绔彛鍙凤紙0~65536锛�
return this.sendCom2Mw(this.command(CodeV202404.cd_23, comVo, null)) ;
}
@@ -111,7 +119,7 @@
ComCd24Vo comVo = new ComCd24Vo() ;
comVo.controllerType = CommandCtrl.controllerType ;
comVo.projectNo = CommandCtrl.projectNo ;
- comVo.registerNo = "102030405060708090" ;//鍩熷悕锛堜緥濡� dayuyanjiuyuan.to锛夛紝鏈�澶ч暱搴�42瀛楃
+ comVo.registerNo = "10203040506070809000" ;//
return this.sendCom2Mw(this.command(CodeV202404.cd_24, comVo, null)) ;
}
@@ -120,8 +128,7 @@
ComCd26Vo comVo = new ComCd26Vo() ;
comVo.controllerType = CommandCtrl.controllerType ;
comVo.projectNo = CommandCtrl.projectNo ;
- comVo.ipChannel = 1 ;//IP閫氶亾鍙� 0x01:1閫氶亾 0x02:2閫氶亾.
- comVo.maxAmountYear = 123456 ;//璁惧缁堢骞寸敤姘撮噺 鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999
+ comVo.maxAmountYear = 200 ;//璁惧缁堢骞寸敤姘撮噺 鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999
return this.sendCom2Mw(this.command(CodeV202404.cd_26, comVo, null)) ;
}
@@ -208,6 +215,16 @@
return this.sendCom2Mw(this.command(CodeV202404.cd_93, comVo, null)) ;
}
+
+ //骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂�(AFN=0x93H/AFN=0xA3H)
+ private BaseResponse cd9C(){
+ ComCd9CVo comVo = new ComCd9CVo() ;
+ comVo.controllerType = CommandCtrl.controllerType ;
+ comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.icCardAddr = "04BEA5BB" ;//
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_9C, comVo, null)) ;
+ }
//骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂�(AFN=0x93H/AFN=0xA3H)
private BaseResponse cdA3(){
ComCd93_A3Vo comVo = new ComCd93_A3Vo() ;
--
Gitblit v1.8.0