From a43b3f62fa364c3f8c5e3a62ea37cef6faff4af8 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 25 七月 2024 17:41:37 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java | 10 +-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountYear.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountMonth.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com10Vo.java | 10 +++
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java | 36 +++++++++++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossMonth.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountMonth.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossYear.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83OpenVo.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountYear.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_10_Down.java | 80 +++++++++++++++-----------
13 files changed, 105 insertions(+), 49 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
index 3e347ff..929f503 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
@@ -99,7 +99,7 @@
public String parseRtuAddr(byte[] bs, int index)throws Exception{
String rtuAddrBCD = "" + ByteUtil.BCD2Long_BE(bs, index, index + 2) ;//鍦板潃鏄ぇ绔ā寮�
String rtuAddrStr = "" + ByteUtilUnsigned.bytes2Short_LE(bs, index + 3) ;
- while(rtuAddrStr.length() < 5){
+ while(rtuAddrStr.length() <= 5){
rtuAddrStr = "0" + rtuAddrStr ;
}
return rtuAddrBCD + rtuAddrStr ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com10Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com10Vo.java
new file mode 100644
index 0000000..ee265ff
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com10Vo.java
@@ -0,0 +1,10 @@
+package com.dy.common.mw.protocol.p206V1_0_0.downVos;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/7/25 15:27
+ * @Description
+ */
+public class Com10Vo {
+ public String rtuAddr ;
+}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_10_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_10_Down.java
index 356d492..f550915 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_10_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_10_Down.java
@@ -1,10 +1,14 @@
package com.dy.common.mw.protocol.p206V1_0_0.parse;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.ParseParamsForDownV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
+import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com10Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com3AVo;
import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlCreate;
import com.dy.common.util.ByteUtil;
@@ -51,48 +55,58 @@
* @throws Exception 寮傚父
*/
public byte[] doParse(ParseParamsForDownV1_0_1 para) throws Exception {
- CommonV1_0_1 commonV1_0_1 = new CommonV1_0_1() ;
- byte[] bytes ;
- byte[] bsHead = new byte[ProtocolConstantV206V1_0_0.lenHead2Code] ;
- byte index = 0 ;
- bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+ if(para.param == null) {
+ throw new Exception("鍛戒护鍙傛暟涓簄ull") ;
+ }else {
+ JSONObject obj = (JSONObject) para.param;
+ String json = obj.toJSONString();
+ Com10Vo cvo = JSON.parseObject(json, Com10Vo.class);
+ if (cvo == null) {
+ throw new Exception("json杞珻om10Vo涓簄ull");
+ }
+ if (cvo.rtuAddr == null) {
+ throw new Exception("娴嬭瘯鏂板湴鍧�涓嶈兘涓虹┖");
+ }
- index++ ;
- bsHead[index] = 0 ;//甯ч暱搴�
+ CommonV1_0_1 commonV1_0_1 = new CommonV1_0_1();
+ byte[] bytes;
+ byte[] bsHead = new byte[ProtocolConstantV206V1_0_0.lenHead2Code];
+ byte index = 0;
+ bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte;
- index++ ;
- bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+ index++;
+ bsHead[index] = 0;//甯ч暱搴�
- index++ ;
- bsHead[index] = commonV1_0_1.createCtrl((byte)0, (byte)0) ;
+ index++;
+ bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte;
- index++ ;
- GlCreate.createRtuAddr(para.rtuAddr, bsHead, index);
- index += 5 ;
+ index++;
+ bsHead[index] = commonV1_0_1.createCtrl((byte) 0, (byte) 0);
- ByteUtil.hex2Bytes(para.commandCode, bsHead, index) ;
+ index++;
+ GlCreate.createRtuAddr(para.rtuAddr, bsHead, index);
+ index += 5;
- if(para.param == null){
- throw new Exception("鏈彁渚涘懡浠ゅ弬鏁版暟鎹紝涓嶈兘鏋勯�犲姛鑳界爜涓�" + para.commandCode + "鐨勪笅琛屽懡浠�") ;
- }else{
- index = 0 ;
- byte[] bs = new byte[13] ;
- String newRtuAddr = (String)para.param ;
- GlCreate.createRtuAddr(newRtuAddr, bs, index);
- index += 5 ;
+ ByteUtil.hex2Bytes(para.commandCode, bsHead, index);
+
+ index = 0;
+ byte[] bs = new byte[13];
+
+ GlCreate.createRtuAddr(cvo.rtuAddr, bs, index);
+ index += 5;
GlCreate.createPw(bs, index);
- index += 2 ;
+ index += 2;
GlCreate.createTp(bs, index);
- bytes = ByteUtil.bytesMerge(bsHead, bs) ;
+ bytes = ByteUtil.bytesMerge(bsHead, bs);
+
+ GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
+
+ byte[] bsTail = GlCreate.createCrcTail(bytes);//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
+
+ bytes = ByteUtil.bytesMerge(bytes, bsTail);
+
+ return bytes;
}
-
- GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
-
- byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
-
- bytes = ByteUtil.bytesMerge(bytes, bsTail) ;
-
- return bytes ;
}
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
index 028f991..2484a8f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
@@ -48,12 +48,12 @@
* @throws Exception 寮傚父
*/
public static String parseIcCardNo(byte[] bs, int index)throws Exception{
- String rtuAddrStr = "" + ByteUtilUnsigned.bytes2Short_LE(bs, index) ;
- String rtuAddrBCD = "" + ByteUtil.BCD2Long_LE(bs, index + 2, index + 7) ;
- while(rtuAddrStr.length() < 5){
- rtuAddrStr = "0" + rtuAddrStr ;
+ String icNoStr = "" + ByteUtilUnsigned.bytes2Short_LE(bs, index) ;
+ String icNoBCD = "" + ByteUtil.BCD2Long_LE(bs, index + 2, index + 7) ;
+ while(icNoStr.length() < 5){
+ icNoStr = "0" + icNoStr ;
}
- return rtuAddrBCD + rtuAddrStr ;
+ return icNoBCD + icNoStr ;
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java
index a83db48..cccd35c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java
@@ -35,7 +35,7 @@
sb.append(" IC鍗＄紪鍙凤細");
sb.append(icCardNo);
sb.append("\n");
- sb.append(" ic鍗″湴鍧�锛�");
+ sb.append(" IC鍗″湴鍧�锛�");
sb.append(icCardAddr);
sb.append("\n");
sb.append(" 鍓╀綑閲戦锛堝厓锛夛細");
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83OpenVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83OpenVo.java
index 93e0114..f9b6d5f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83OpenVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83OpenVo.java
@@ -30,7 +30,7 @@
sb.append(" IC鍗＄紪鍙凤細");
sb.append(icCardNo);
sb.append("\n");
- sb.append(" ic鍗″湴鍧�锛�");
+ sb.append(" IC鍗″湴鍧�锛�");
sb.append(icCardAddr);
sb.append("\n");
sb.append(" 鍓╀綑閲戦锛堝厓锛夛細");
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountMonth.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountMonth.java
index 7a6b8db..5004c9d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountMonth.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountMonth.java
@@ -15,7 +15,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
-@TableName(value="rm_client_amount_month", autoResultMap = true)
+@TableName(value="st_client_amount_month", autoResultMap = true)
@Data
@Builder
@ToString
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountYear.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountYear.java
index ca94c39..d285096 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountYear.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountYear.java
@@ -15,7 +15,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
-@TableName(value="rm_client_amount_year", autoResultMap = true)
+@TableName(value="st_client_amount_year", autoResultMap = true)
@Data
@Builder
@ToString
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountMonth.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountMonth.java
index 69ab585..5dfff18 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountMonth.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountMonth.java
@@ -15,7 +15,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
-@TableName(value="rm_intake_amount_month", autoResultMap = true)
+@TableName(value="st_intake_amount_month", autoResultMap = true)
@Data
@Builder
@ToString
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountYear.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountYear.java
index 9b56873..f06bed8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountYear.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StIntakeAmountYear.java
@@ -15,7 +15,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
-@TableName(value="rm_intake_amount_year", autoResultMap = true)
+@TableName(value="st_intake_amount_year", autoResultMap = true)
@Data
@Builder
@ToString
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossMonth.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossMonth.java
index 4356bc1..8b9aefa 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossMonth.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossMonth.java
@@ -15,7 +15,7 @@
* @Description 鍙栨按鍙ｆ紡鎹熸湀缁熻
*/
-@TableName(value="rm_loss_month", autoResultMap = true)
+@TableName(value="st_loss_month", autoResultMap = true)
@Data
@Builder
@ToString
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossYear.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossYear.java
index 7ce65e3..fe35062 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossYear.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StLossYear.java
@@ -15,7 +15,7 @@
* @Description 鍙栨按鍙ｆ紡鎹熷勾缁熻
*/
-@TableName(value="rm_loss_year", autoResultMap = true)
+@TableName(value="st_loss_year", autoResultMap = true)
@Data
@Builder
@ToString
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
index f784196..8a475f0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
@@ -29,7 +29,9 @@
if(com == null){
rt = this.connect() ;//杩炴帴閫氫俊涓棿浠舵祴璇�
}else{
- if(com.equals("21")){
+ if(com.equals("10")){
+ rt = this.cd10() ;
+ }else if(com.equals("21")){
rt = this.cd21() ;
}else if(com.equals("37")){
rt = this.cd37() ;
@@ -65,6 +67,10 @@
rt = this.cd97() ;
}else if(com.equals("98")){
rt = this.cd98() ;
+ }else if(com.equals("99")){
+ rt = this.cd99() ;
+ }else if(com.equals("A0")){
+ rt = this.cdA0() ;
}else if(com.equals("B0")){
rt = this.cdB0() ;
}
@@ -79,6 +85,12 @@
*/
private BaseResponse connect(){
return this.sendTest() ;
+ }
+
+ private BaseResponse cd10(){
+ Com10Vo comVo = new Com10Vo() ;
+ comVo.rtuAddr = "532328059995" ;//鍓�6浣嶆槸琛屾斂鍖哄垝鐮侊紝鍚�6浣嶆槸搴忓垪鍙锋渶澶ф槸065535
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_10, comVo, null)) ;
}
private BaseResponse cd21(){
@@ -140,7 +152,7 @@
private BaseResponse cd3C(){
Com3CVo comVo = new Com3CVo() ;
- comVo.minute = 60 ;
+ comVo.minute = 5 ;
return this.sendCom2Mw(this.command(CodeV1_0_1.cd_3C, comVo, null)) ;
}
@@ -175,6 +187,26 @@
return this.sendCom2Mw(this.command(CodeV1_0_1.cd_98, comVo, null)) ;
}
+ //瀹氭椂鍏抽榾寮�闃�
+ private BaseResponse cd99(){
+ Com99Vo comVo = new Com99Vo() ;
+ comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo;
+ comVo.moneyRemain = 234.56 ;
+ comVo.waterPrice = 1.2 ;
+ comVo.minutes = 5 ;
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_99, comVo, null)) ;
+ }
+
+ //瀹氶噺鍏抽榾寮�闃�
+ private BaseResponse cdA0(){
+ ComA0Vo comVo = new ComA0Vo() ;
+ comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo;
+ comVo.moneyRemain = 234.56 ;
+ comVo.waterPrice = 1.2 ;
+ comVo.waterAmount = 10 ;
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_98, comVo, null)) ;
+ }
+
private BaseResponse cdB0(){
return this.sendCom2Mw(this.command(CodeV1_0_1.cd_B0, null, null)) ;
}
--
Gitblit v1.8.0