From 95d8d3df562c8f7fca74ba994cddbbf41564488e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 08 四月 2025 20:08:15 +0800
Subject: [PATCH] 优化未完成计划列表、已完成计划列表接口
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/CommandP206V202404Ctrl.java | 277 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 277 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/CommandP206V202404Ctrl.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/CommandP206V202404Ctrl.java
new file mode 100644
index 0000000..e6715af
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/CommandP206V202404Ctrl.java
@@ -0,0 +1,277 @@
+package com.dy.pipIrrMwTestWeb.p206V202404test;
+
+import com.dy.common.mw.protocol.p206V202404.CodeV202404;
+import com.dy.common.mw.protocol.p206V202404.downVos.*;
+import com.dy.common.webUtil.BaseResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/5/14 14:20
+ * @Description
+ */
+@Slf4j
+@RestController
+@RequestMapping(path="comP206V202404")
+@SuppressWarnings("unchecked")//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
+public class CommandP206V202404Ctrl extends ComSupportP206V202404 {
+
+ @GetMapping(path = "test")
+ public BaseResponse<String> test(String rtuAddr, String com) {
+ BaseResponse<String> rt = null ;
+ if(rtuAddr == null || rtuAddr.trim().equals("")){
+ rt = this.connect() ;//杩炴帴閫氫俊涓棿浠舵祴璇�
+ }else{
+ this.rtuAddr = rtuAddr ;
+ if(com == null || com.trim().equals("")){
+ rt = this.connect() ;//杩炴帴閫氫俊涓棿浠舵祴璇�
+ }else{
+ try{
+ if(com.equals("10")){
+ rt = this.cd10() ;
+ }else if(com.equals("15")){
+ rt = this.cd15() ;
+ }else if(com.equals("16")){
+ rt = this.cd16() ;
+ }else if(com.equals("21")){
+ rt = this.cd21() ;
+ }else if(com.equals("22")){
+ rt = this.cd22() ;
+ }else if(com.equals("23")){
+ rt = this.cd23() ;
+ }else if(com.equals("24")){
+ rt = this.cd24() ;
+ }else if(com.equals("26")){
+ rt = this.cd26() ;
+ }else if(com.equals("31")){
+ rt = this.cd31() ;
+ }else if(com.equals("55")){
+ rt = this.cd55(1) ;
+ }else if(com.equals("65")){
+ rt = this.cd65(1) ;
+ }else if(com.equals("86")){
+ rt = this.cd86() ;
+ }else if(com.equals("87")){
+ rt = this.cd87() ;
+ }else if(com.equals("92")){
+ rt = this.cd92() ;
+ }else if(com.equals("93")){
+ rt = this.cd93() ;
+ }else if(com.equals("9C")){
+ rt = this.cd9C() ;
+ }else if(com.equals("A2")){
+ rt = this.cdA2() ;
+ }else if(com.equals("A3")){
+ rt = this.cdA3() ;
+ }else{
+ rt = this.cdXY(com) ;//鍙戦�佸浐瀹氬弬鏁癤Y鐨勫懡浠�, 渚嬪懡浠odeV202404.cd_9C
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }
+ return rt ;
+ }
+
+ /**
+ * 娴嬭瘯杩為�氭��
+ * @return
+ */
+ private BaseResponse connect(){
+ return this.sendTest() ;
+ }
+
+ //鍙戦�佸浐瀹氬弬鏁扮殑鍛戒护
+ private BaseResponse cdXY(String code){
+ return this.sendCom2Mw(this.command(code, this.comCdXyVo(), null)) ;
+ }
+
+ //璁剧疆缁堢鍦板潃(AFN=0x10H)
+ private BaseResponse cd10(){
+ ComCd10Vo comVo = new ComCd10Vo() ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ comVo.rtuNewAddr = CommandP206V202404Ctrl.rtuAddr ;
+ return this.sendCom2Mw(this.command(CodeV202404.cd_10, comVo, null)) ;
+ }
+ //杩滅▼鐢ㄦ埛鍏呭�� (AFN=0x15H)
+ private BaseResponse cd15(){
+ ComCd15Vo comVo = new ComCd15Vo() ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ comVo.icCardAddr = CommandP206V202404Ctrl.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
+ comVo.icCardNo = CommandP206V202404Ctrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.chargeMoney = 20.0 ;//鍗曚綅:鍏� 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
+ comVo.chargeWater = 20.0 ;//鍗曚綅:m3 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
+ comVo.flowNo = "123456789012" ;//娴佹按鍙凤紙12浣嶆暟瀛楋級
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_15, comVo, null)) ;
+ }
+ //璁剧疆璁惧缁堢鍓╀綑姘撮噺鍜屽墿浣欓噾棰濇姤璀﹀�� (AFN=0x16H)
+ private BaseResponse cd16(){
+ ComCd16Vo comVo = new ComCd16Vo() ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ comVo.waterAlarm = 100 ;//鍓╀綑姘撮噺鎶ヨ鍊�,鍗曚綅:m3銆傛暣鏁帮紝鍙栧�艰寖鍥�0~9999
+ comVo.moneyAlarm = 3 ;//鍓╀綑閲戦鎶ヨ鍊�,鍗曚綅:鍏冦�傛暣鏁帮紝鍙栧�艰寖鍥�0~9999
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_16, comVo, null)) ;
+ }
+ //璁剧疆璁惧缁堢IP鍦板潃 (AFN=0x21H)
+ private BaseResponse cd21(){
+ ComCd21Vo comVo = new ComCd21Vo() ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ comVo.channel = 1 ;//IP閫氶亾鍙�(鍙栧�艰寖鍥� 1銆�2).
+ 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)) ;
+ }
+ //璁剧疆鏈轰簳骞存渶澶у紑閲囬噺鍜屾按浣嶄笅闄� (AFN=0x22H)
+ private BaseResponse cd22(){
+ ComCd22Vo comVo = new ComCd22Vo() ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ comVo.maxAmountYear = 99998888 ;//鏈轰簳骞存渶澶х敤姘撮噺鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999
+ comVo.limitLevel = 9978.60; //姘翠綅涓嬮檺 鍗曚綅锛歮 鍙栧�艰寖鍥�:0~9999.99
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_22, comVo, null)) ;
+ }
+ //璁剧疆璁惧缁堢鍩熷悕(AFN=0x23H)
+ private BaseResponse cd23(){
+ ComCd23Vo comVo = new ComCd23Vo() ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ comVo.channel = 1 ;//IP閫氶亾鍙�(鍙栧�艰寖鍥� 1銆�2).
+ comVo.domain = "dayuyanjiuyuan.top" ;//鍩熷悕锛堜緥濡� dayuyanjiuyuan.top锛夛紝鏈�澶ч暱搴�42瀛楃
+ comVo.port = 6001 ;///绔彛鍙凤紙0~65536锛�
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_23, comVo, null)) ;
+ }
+ //璁剧疆璁惧缁堢娉ㄥ唽鍙�(AFN=0x24H)
+ private BaseResponse cd24(){
+ ComCd24Vo comVo = new ComCd24Vo() ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ comVo.registerNo = "10203040506070809000" ;//
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_24, comVo, null)) ;
+ }
+ //璁剧疆璁惧缁堢骞寸敤姘撮噺(AFN=0x24H)
+ private BaseResponse cd26(){
+ ComCd26Vo comVo = new ComCd26Vo() ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ comVo.maxAmountYear = 200 ;//璁惧缁堢骞寸敤姘撮噺 鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_26, comVo, null)) ;
+ }
+ //璁剧疆璁惧缁堢鐢ㄦ按鏈夋晥(AFN=0x31H)
+ private BaseResponse cd31(){
+ ComCd31Vo comVo = new ComCd31Vo() ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ comVo.valid = false ;//鏈夋晥鎬�
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_31, comVo, null)) ;
+ }
+ //鏌ヨ閬ユ祴缁堢鍏呭�艰褰� (AFN=0x55H)
+ private BaseResponse cd55(int page){
+ ComCd55Vo comVo = new ComCd55Vo() ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ comVo.page = page ;//鍒嗛〉锛堝彇鍊艰寖鍥�1銆�2銆�3銆�4銆�5銆�6銆�7銆�8銆�9锛�
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_55, comVo, null)) ;
+ }
+ //鏌ヨ璁惧缁堢鐢ㄦ埛鐢ㄦ按璁板綍(AFN=0x65H)
+ private BaseResponse cd65(int page){
+ ComCd65Vo comVo = new ComCd65Vo() ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.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 = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.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 = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.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 = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ //comVo.icCardAddr = Test.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
+ comVo.icCardNo = CommandP206V202404Ctrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.waterRemain = 123.45 ;//鍗曚綅:m3 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
+ comVo.moneyRemain = 12345.67 ;//鍗曚綅:鍏� 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
+ comVo.waterPrice = 0.8 ;//姘撮噺鍗曚环 鍗曚綅:鍏�, 2涓皬鏁扮偣
+ comVo.elePrice = 1.2 ;//鐢甸噺鍗曚环 鍗曚綅:鍏�, 2涓皬鏁扮偣
+ comVo.orderNo = "1234567890123456" ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_92, comVo, null)) ;
+ }
+ //骞冲彴/APP杩滅▼寮�鍚按娉�/闃�闂�(AFN=0x92H/AFN=0xA2H)
+ private BaseResponse cdA2(){
+ ComCd92_A2Vo comVo = new ComCd92_A2Vo() ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ //comVo.icCardAddr = Test.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
+ comVo.icCardNo = CommandP206V202404Ctrl.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涓皬鏁扮偣
+ comVo.elePrice = 1.2 ;//鐢甸噺鍗曚环 鍗曚綅:鍏�, 2涓皬鏁扮偣
+ comVo.orderNo = "1234567890123456" ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_A2, comVo, null)) ;
+ }
+
+ //骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂�(AFN=0x93H/AFN=0xA3H)
+ private BaseResponse cd93(){
+ ComCd93_A3Vo comVo = new ComCd93_A3Vo() ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ comVo.icCardNo = CommandP206V202404Ctrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.orderNo = "1234567890123456" ;//璁㈠崟鍙凤紙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 = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.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() ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ comVo.icCardNo = CommandP206V202404Ctrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.orderNo = "1234567890123456" ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_A3, comVo, null)) ;
+ }
+
+
+}
--
Gitblit v1.8.0