From c929083f415ef98765afec91d5a8c88be4450f5b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 30 五月 2024 09:16:11 +0800
Subject: [PATCH] 为甘肃嘉峪关项目基于靳总制定协议实现一款产品
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83CloseVo.java | 12 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd97Vo.java | 1
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandP206V202404Ctrl.java | 91 +++---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd98Vo.java | 3
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java | 57 ++++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java | 55 +++-
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd84Vo.java | 24 ++
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DriverV1_0_1.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java | 16 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java | 14
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandP206V100Ctrl.java | 55 ++++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/PrefixedDataAvailableV1_0_1.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com98Vo.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com97Vo.java | 7
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupportP206V202404.java | 2
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupportP206V100.java | 22 -
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Down.java | 10
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/说明.txt | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java | 8
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultToRtu.java | 4
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Down.java | 18
/dev/null | 179 --------------
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_C0_Up.java | 28 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java | 29 ++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java | 44 +++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/ProtocolConstantV206V1_0_0.java | 2
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java | 4
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/OnLineV1_0_1.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java | 2
31 files changed, 397 insertions(+), 308 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java
index 51289ac..f5c44b7 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java
@@ -1,5 +1,7 @@
package com.dy.common.mw.protocol;
+import com.dy.common.mw.protocol.p206V1_0_0.*;
+
/**
* 浠嶳TU鏀跺埌鏁版嵁
*/
@@ -26,11 +28,36 @@
ProtocolUnit.getInstance().adapter.getSingleActionFromRtu(this.protocolName).doAction(this);
}
- public void matchedCommand(String commandId, String rtuResultSendWebUrl){
+ public void matchedCommand(String commandId, Object toRtuMidResultParam, String rtuResultSendWebUrl){
this.commandId = commandId ;
if(this.data != null){
this.data.setCommandId(commandId);
}
+ if(toRtuMidResultParam != null){
+ if(protocolName != null && protocolName.equals(ProtocolConstantV206V1_0_0.protocolName)){
+ if(upCode != null && upCode.equals(CodeV1_0_1.cd_97)){
+ if(data.subData != null && data.subData instanceof DataV1_0_1){
+ DataV1_0_1 dataV1_0_1 = (DataV1_0_1)data.subData ;
+ if(dataV1_0_1 != null && dataV1_0_1.subData != null && dataV1_0_1.subData instanceof DataCd97Vo){
+ DataCd97Vo dataCd97Vo = (DataCd97Vo)dataV1_0_1.subData ;
+ if(dataCd97Vo != null && dataCd97Vo.cardNo != null){
+ dataCd97Vo.cardNo = (String)toRtuMidResultParam + dataCd97Vo.cardNo ;
+ }
+ }
+ }
+ }else if(upCode != null && upCode.equals(CodeV1_0_1.cd_98)){
+ if(data.subData != null && data.subData instanceof DataV1_0_1){
+ DataV1_0_1 dataV1_0_1 = (DataV1_0_1)data.subData ;
+ if(dataV1_0_1 != null && dataV1_0_1.subData != null && dataV1_0_1.subData instanceof DataCd98Vo){
+ DataCd98Vo dataCd98Vo = (DataCd98Vo)dataV1_0_1.subData ;
+ if(dataCd98Vo != null && dataCd98Vo.cardNo != null){
+ dataCd98Vo.cardNo = (String)toRtuMidResultParam + dataCd98Vo.cardNo ;
+ }
+ }
+ }
+ }
+ }
+ }
this.rtuResultSendWebUrl = rtuResultSendWebUrl ;
if(this.data != null){
this.data.setRtuResultSendWebUrl(rtuResultSendWebUrl);
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultToRtu.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultToRtu.java
index c607c43..45864bb 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultToRtu.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultToRtu.java
@@ -23,7 +23,9 @@
public boolean isSendFirst;//浼樺厛鍏朵粬鍙戦�侊紝渚嬪鍚勫懡浠ょ殑搴旂瓟
public boolean isQuickSend;//閫熷彂鍛戒护锛屽嵆涓嶅彈涓嬪彂鏁版嵁鏃堕棿闂撮殧闄愬埗
-
+
+ public Object param ;//缂撳瓨涓�浜涙暟鎹紝渚嬪涓哄吋瀹圭帇宸ワ紙姹熸捣锛夊崗璁笌闈虫�诲崗璁紙铏氭嫙IC鍗＄紪鍙烽暱搴︿笉涓�鑷达級锛屾妸涓嶅吋瀹圭殑铏氭嫙IC鍗＄紪鍙风殑鍓嶅崐閮ㄥ垎鏀惧叆姝ゅ
+
public MidResultToRtu(){
hasResponse = true ;
isCachForOffLine = false ;
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 30df01f..c2964d5 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
@@ -82,7 +82,7 @@
public String parseRtuAddr(byte[] bs)throws Exception{
String rtuAddrBCD = "" + ByteUtil.BCD2Long_BE(bs, ProtocolConstantV206V1_0_0.rtuAddr1Index_start, ProtocolConstantV206V1_0_0.rtuAddr1Index_end) ;
String rtuAddrStr = "" + ByteUtilUnsigned.bytes2Short_LE(bs, ProtocolConstantV206V1_0_0.rtuAddr2Index_start) ;
- while(rtuAddrStr.length() < 5){
+ while(rtuAddrStr.length() <= 5){
rtuAddrStr = "0" + rtuAddrStr ;
}
return rtuAddrBCD + rtuAddrStr ;
@@ -146,9 +146,25 @@
//DIR = 0
return b ;
}
+ /**
+ * 寰楀埌IC鍗＄被鍨嬪悕绉� 锛� 鍗＄被鍨�(1:鐢ㄦ埛鍗★紱2锛氱鐞嗗憳鍗★紱3锛氳皟璇曞崱锛�4锛氬紑鍏抽榾鍗★紱5锛氭竻绌哄崱)锛�
+ * @param type 瀛楄妭
+ * @return 鍚嶇О
+ */
+ public static String icCardType(byte type){
+ return switch (type) {
+ case 1 -> "鐢ㄦ埛鍗�";
+ case 2 -> "绠＄悊鍛樺崱";
+ case 3 -> "璋冭瘯鍗�";
+ case 4 -> "寮�鍏抽榾鍗�";
+ case 5 -> "娓呯┖鍗�";
+ default -> "鏈煡";
+ };
+ }
/**
* 寰楀埌鍏冲紑闃�绫诲瀷鍚嶇О
+ * 寮�鍏抽榾绫诲瀷(1:鍒峰崱寮�闃�锛�2:鍒峰崱鍏抽榾锛�3:涓績绔欏紑闃�锛�4:涓績绔欏叧闃�锛�5:娆犺垂鍏抽榾锛�6:娴侀噺璁℃晠闅滃叧闃�锛�7:绱ф�ュ叧闂紱8:鐢ㄦ埛杩滅▼寮�闃�锛�9:鐢ㄦ埛杩滅▼鍏抽榾锛�10:寮�鍏抽榾鍗″叧闃�锛�11:寮�鍏抽榾鍗″埛鍗″崱寮�闃�锛�)
* @param type 瀛楄妭
* @return 鍚嶇О
*/
@@ -163,10 +179,47 @@
case 7 -> "绱ф�ュ叧闃�";
case 8 -> "鐢ㄦ埛杩滅▼寮�闃�";
case 9 -> "鐢ㄦ埛杩滅▼鍏抽榾";
- case 16 -> "绠￠亾鏃犳按鑷姩鍏抽榾";
+ case 10 -> "寮�鍏抽榾鍗″叧闃�";
+ case 11 -> "寮�鍏抽榾鍗″紑闃�";
default -> "鏈煡";
};
}
+ public static Boolean isCloseValveType(byte type){
+ return switch (type) {
+ case 1 -> false ;
+ case 2 -> true ;
+ case 3 -> false ;
+ case 4 -> true ;
+ case 5 -> true ;
+ case 6 -> true ;
+ case 7 -> true ;
+ case 8 -> false ;
+ case 9 -> true ;
+ case 10 -> true ;
+ case 11 -> false ;
+ default -> null ;
+ };
+ }
+
+ /**
+ * 澶勭悊IC鍗＄紪鍙凤紝闈虫�诲埗瀹氱殑鍗忚瑕佹眰10浣岻C鍗＄紪鍙�
+ * @param icCardNo
+ * @return
+ */
+ public static String[] dealIcCardNo(String icCardNo){
+ if(icCardNo.length() > 10){
+ String tail = icCardNo.substring(icCardNo.length() - 10) ;
+ String head = icCardNo.substring(0, icCardNo.length() - 10) ;
+ return new String[]{head , tail} ;
+ }else if(icCardNo.length() < 10){
+ while(icCardNo.length() != 10){
+ icCardNo = "0" + icCardNo ;
+ }
+ return new String[]{null , icCardNo} ;
+ }else{
+ return new String[]{null , icCardNo} ;
+ }
+ }
/*
* 鍒嗘瀽鐗堟湰鍙�
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83CloseVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83CloseVo.java
index f9e22d0..89c4ac0 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83CloseVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83CloseVo.java
@@ -17,6 +17,9 @@
public Double thisAmount ;//鐢ㄦ按鎴锋湰娆＄敤姘撮噺锛氱疮璁℃祦閲�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
public Double thisMoney ;//鐢ㄦ按鎴锋湰娆℃秷璐归噾棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
public Integer thisTime ;//鐢ㄦ按鎴锋湰娆＄敤姘存椂闀匡細鐢ㄦ按鏃堕暱2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999锛屽崟浣嶄负鍒嗛挓銆�
+ public Byte priceType ;//姘翠环绫诲瀷锛�1锛氭按鍗℃按浠凤紝2锛氭帶鍒跺櫒姘翠环锛�
+ public Double price ;//姘翠环
+ public Byte cardType ;//鍗＄被鍨�
public String rtuDt ;//鎺у埗鍣ㄦ椂閽�
public String toString(){
@@ -52,6 +55,15 @@
sb.append(" 鏈鐢ㄦ按鏃堕暱锛堝垎閽燂級锛�");
sb.append(thisTime==null?"":thisTime);
sb.append("\n");
+ sb.append(" 姘翠环绫诲瀷锛�");
+ sb.append(priceType ==null?"": (priceType==1?"IC鍗℃按浠�":(priceType==2?"鎺у埗鍣ㄦ按浠�":"鏈煡")));
+ sb.append("\n");
+ sb.append(" 姘翠环锛�");
+ sb.append(price ==null?"": price);
+ sb.append("\n");
+ sb.append(" 鍗＄被鍨嬶細");
+ sb.append(cardType==null?"鏈煡":CommonV1_0_1.icCardType(cardType)) ;
+ sb.append("\n");
sb.append(" 鎺у埗鍣ㄦ椂閽燂細");
sb.append(rtuDt==null?"":rtuDt);
sb.append("\n");
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd84Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd84Vo.java
index cc5913f..49d0b67 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd84Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd84Vo.java
@@ -7,15 +7,31 @@
*/
@Data
public class DataCd84Vo {
+
+ public Byte opType;//寮�鍏抽榾绫诲瀷(1:鍒峰崱寮�闃�锛�2:鍒峰崱鍏抽榾锛�3:涓績绔欏紑闃�锛�4:涓績绔欏叧闃�锛�5:娆犺垂鍏抽榾锛�6:娴侀噺璁℃晠闅滃叧闃�锛�7:绱ф�ュ叧闂紱8:鐢ㄦ埛杩滅▼寮�闃�锛�9:鐢ㄦ埛杩滅▼鍏抽榾锛�10:寮�鍏抽榾鍗″叧闃�锛�11:寮�鍏抽榾鍗″埛鍗″崱寮�闃�锛�)
+ public Byte cardType ;//鍗＄被鍨�(1:鐢ㄦ埛鍗★紱2锛氱鐞嗗憳鍗★紱3锛氳皟璇曞崱锛�4锛氬紑鍏抽榾鍗★紱5锛氭竻绌哄崱)
+ public String cardAddr ;//IC鍗″湴鍧�锛�8浣嶅瓧绗︼級
public String cardNo ;//IC鍗＄紪鍙�
public Double remainMoney ;//鍓╀綑閲戦锛氱敤鎴蜂綑棰�4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏�
public Double totalAmount; //绱娴侀噺锛堟湰娆″紑闃�浠ユ潵鐨勭疮璁℃祦閲忥級锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
public Double instantAmount; //鐬椂娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999.999锛屽崟浣嶄负m3/h銆�
public String rtuDt ;//鎺у埗鍣ㄦ椂閽�
+ public DataAlarmVo alarmVo ;//鎶ヨ
+ public DataStateVo stateVo ;//鐘舵��
+
public String toString(){
StringBuilder sb = new StringBuilder() ;
sb.append(" 缁堢寮�闃�宸ヤ綔鎶�:\n");
+ sb.append(" 寮�闃�绫诲瀷锛�");
+ sb.append(opType==null?"鏈煡":CommonV1_0_1.openCloseValveType(opType));
+ sb.append("\n");
+ sb.append(" IC鍗＄被鍨嬶細");
+ sb.append(cardType==null?"鏈煡":CommonV1_0_1.icCardType(cardType)) ;
+ sb.append("\n");
+ sb.append(" IC鍗″湴鍧�锛�");
+ sb.append(cardAddr);
+ sb.append("\n");
sb.append(" IC鍗＄紪鍙凤細");
sb.append(cardNo);
sb.append("\n");
@@ -31,6 +47,14 @@
sb.append(" 鎺у埗鍣ㄦ椂閽燂細");
sb.append(rtuDt==null?"":rtuDt);
sb.append("\n");
+ if(alarmVo != null){
+ sb.append(alarmVo.toString());
+ sb.append("\n");
+ }
+ if(stateVo != null){
+ sb.append(stateVo.toString());
+ sb.append("\n");
+ }
return sb.toString() ;
}
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd97Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd97Vo.java
index 73bd0e6..68d36a0 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd97Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd97Vo.java
@@ -18,6 +18,7 @@
sb.append(" APP杩滅▼寮�闃�搴旂瓟:\n");
sb.append(" 铏氭嫙鍗″彿锛�");
sb.append(cardNo);
+ sb.append("\n");
sb.append(" 缁撴灉锛�");
sb.append(success?"鎵ц":"澶辫触");
sb.append("\n");
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd98Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd98Vo.java
index f50967d..2898819 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd98Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd98Vo.java
@@ -15,9 +15,10 @@
public String toString(){
StringBuilder sb = new StringBuilder() ;
- sb.append(" APP杩滅▼寮�闃�搴旂瓟:\n");
+ sb.append(" APP杩滅▼鍏抽榾搴旂瓟:\n");
sb.append(" 铏氭嫙鍗″彿锛�");
sb.append(cardNo);
+ sb.append("\n");
sb.append(" 缁撴灉锛�");
sb.append(success?"鎵ц":"澶辫触");
sb.append("\n");
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java
index b6c5695..7baa02b 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java
@@ -11,9 +11,10 @@
public Double totalAmount; //绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
public Double lossAmount; //鎹熷け娴侀噺(浠�0鏃跺埌褰撳墠鐨勬紡鎹熺疮璁℃祦閲忥紝24鏃朵竴涓懆鏈燂紝0鏃跺綊0)锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
public Double waterPress; //姘村帇锛�4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~999999.99锛屽崟浣嶄负KPa銆�
- public Double batteryVolt;//钃勭數姹犵數鍘�:4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V銆�
- public Double sunVolt ;//澶槼鑳界數鍘�:4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V銆�
+ public Double batteryVolt;//钃勭數姹犵數鍘�:2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V銆�
+ public Double sunVolt ;//澶槼鑳界數鍘�:2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V銆�
public Integer signalValue; //淇″彿寮哄害锛�1瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99銆�
+ public Double waterPrice ;//姘翠环:2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V銆�
public String rtuDt ;//鎺у埗鍣ㄦ椂閽�
public DataAlarmVo alarmVo ;//鎶ヨ
public DataStateVo stateVo ;//鐘舵��
@@ -41,6 +42,9 @@
sb.append(" 淇″彿寮哄害锛�");
sb.append(signalValue ==null?"": signalValue);
sb.append("\n");
+ sb.append(" 姘翠环锛�");
+ sb.append(waterPrice ==null?"": waterPrice);
+ sb.append("\n");
sb.append(" 鎺у埗鍣ㄦ椂閽燂細");
sb.append(rtuDt==null?"":rtuDt);
sb.append("\n");
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DriverV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DriverV1_0_1.java
index 488f85a..9061179 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DriverV1_0_1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DriverV1_0_1.java
@@ -6,7 +6,7 @@
import java.net.URI;
import java.net.URL;
-@AnnotationDriver(enable = false, name= ProtocolConstantV206V1_0_0.protocolName)
+@AnnotationDriver(enable = true, name= ProtocolConstantV206V1_0_0.protocolName)
public class DriverV1_0_1 extends Driver {
private static String scanRootPackage = "com.dy.common.mw.protocol.p206V1_0_0." ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/OnLineV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/OnLineV1_0_1.java
index 922a1ba..354879b 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/OnLineV1_0_1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/OnLineV1_0_1.java
@@ -4,7 +4,7 @@
import com.dy.common.mw.protocol.OnLine;
@AnnotationOnLine(
- enable = false,
+ enable = true,
protocolName = ProtocolConstantV206V1_0_0.protocolName,
priority = ProtocolConstantV206V1_0_0.priority)
@SuppressWarnings("unused")
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/PrefixedDataAvailableV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/PrefixedDataAvailableV1_0_1.java
index daf9862..625a92e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/PrefixedDataAvailableV1_0_1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/PrefixedDataAvailableV1_0_1.java
@@ -11,7 +11,7 @@
@AnnotationPrefixedDataAvailable(
- enable = false,
+ enable = true,
protocolName = ProtocolConstantV206V1_0_0.protocolName,
priority = ProtocolConstantV206V1_0_0.priority,
onLineDataMinLength = ProtocolConstantV206V1_0_0.onLineDataMinLength,
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/ProtocolConstantV206V1_0_0.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/ProtocolConstantV206V1_0_0.java
index d08a4de..114bf6f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/ProtocolConstantV206V1_0_0.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/ProtocolConstantV206V1_0_0.java
@@ -9,7 +9,7 @@
* 娉ㄨВ鐩稿叧
*/
public static final String protocolName = "p206V1_0_1" ;
- public static final int priority = 1 ;//浼樺厛绾�
+ public static final int priority = 2 ;//浼樺厛绾�
/**
* RTU涓婄嚎鏁版嵁锛堜笂绾垮悗绗竴鍖呮暟鎹級鏈�灏忛暱搴︼紝璁剧疆璇ュ睘鎬т互澶囪繘琛屽畬鏁存�ф鏌ワ紝
* 鍗虫柇鍖呮鏌ワ紝浣垮敖鍙兘鏀跺叏涓婄嚎鏁版嵁锛堝彇鍊艰寖鍥�1-100锛�
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com97Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com97Vo.java
index 722f3b8..41dd7dd 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com97Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com97Vo.java
@@ -10,7 +10,8 @@
@Data
public class Com97Vo {
- public String icCardNo ;//10浣嶈櫄鎷烮C鍗＄紪鍙�
- public Double money ;//鍓╀綑閲戦
- public Double price ;//姘翠环
+ public String icCardNo ;//17浣嶈櫄鎷烮C鍗＄紪鍙�(鍗忚鏄�10浣嶆暟瀛�)
+ public Double moneyRemain;//鍓╀綑閲戦(鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏�)
+ public Double waterPrice;//姘翠环(鍙栧�艰寖鍥�0.00~99.99鍏�/m3)
+ public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com98Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com98Vo.java
index e922bce..6d24186 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com98Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/downVos/Com98Vo.java
@@ -11,4 +11,5 @@
@Data
public class Com98Vo {
public String icCardNo ;//10浣嶈櫄鎷烮C鍗＄紪鍙�
+ public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Down.java
index f10fdef..1813dc5 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Down.java
@@ -65,7 +65,15 @@
ByteUtil.hex2Bytes(para.commandCode, bsHead, index) ;
byte[] bs = new byte[7] ;
- bs[0] = (byte)0xF2 ;//鏁版嵁鍩燂細 1 涓瓧鑺傦紝F0 鐧诲綍锛� F1 閫�鍑虹櫥褰曪紝F2 鍦ㄧ嚎淇濇寔銆�
+
+ Integer loginFlag = 0xF2 ;
+ if(para.param != null && para.param instanceof DataCd02Vo){
+ DataCd02Vo vo = (DataCd02Vo)para.param ;
+ if(vo != null && vo.status != null){
+ loginFlag = Integer.parseInt(vo.status, 16);
+ }
+ }
+ bs[0] = loginFlag.byteValue() ;//鏁版嵁鍩燂細 1 涓瓧鑺傦紝F0 鐧诲綍锛� F1 閫�鍑虹櫥褰曪紝F2 鍦ㄧ嚎淇濇寔銆�
GlCreate.createTp(bs, 1);
bytes = ByteUtil.bytesMerge(bsHead, bs) ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java
index c8395db..973fa1f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java
@@ -49,7 +49,7 @@
para.rtuAddr,
Command.defaultId,
confirmComCode,
- null,
+ para.data!=null?(para.data.subData!=null?(((DataV1_0_1)(para.data.subData)).subData):null):null,
null);
//鏋勯�犲簲绛�
byte[] data = new Cd_02_Down().doParse(downCpParams) ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
index fd50a67..cf23f06 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
@@ -83,10 +83,11 @@
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
byte opType = bs[ProtocolConstantV206V1_0_0.dataIndex];
- if(opType == 1 || opType == 3 || opType == 8){
- this.doParseOpen(opType, bs, bsLen, dataCode, data);
- }else{
+ Boolean isCloseType = CommonV1_0_1.isCloseValveType(opType) ;
+ if(isCloseType != null && isCloseType.booleanValue()){
this.doParseClose(opType, bs, bsLen, dataCode, data);
+ }else if(isCloseType != null && !isCloseType.booleanValue()){
+ this.doParseOpen(opType, bs, bsLen, dataCode, data);
}
}
private void doParseOpen(byte opType, byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
@@ -120,7 +121,7 @@
index += 5 ;
//IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
- cdData.icCardNo = ByteUtil.bytesToHex(bs, index, index + 3) ;
+ cdData.icCardAddr = ByteUtil.bytesToHex(bs, index, index + 3) ;
index += 4 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
@@ -140,8 +141,24 @@
//鐢ㄦ按鎴风敤姘村紑濮嬫椂闂达細6瀛楄妭BCD鐮侊紝椤哄簭鏄勾鏈堟棩鏃跺垎绉掞紝鍏朵腑鍏厓骞�=2000+骞淬��
cdData.openDt = GlParse.parseTp(bs, index) ;
- index += 6 ;
+ index += 6 ;
+ /* 寮�闃�鏃讹紝姝ら儴鍒嗘病鏈�
+ cdData.priceType = bs[index] ;
+
+ index++ ;
+ cdData.price = 0.0D ;
+ tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
+ index++ ;
+ cdData.price += tpInt/100.0 ;
+ tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
+ index++ ;
+ cdData.price += tpInt;
+
+ cdData.cardType = bs[index] ;
+
+ index++ ;
+ */
//鎺у埗鍣ㄦ椂閽�
cdData.rtuDt = GlParse.parseTp(bs, index) ;
//index += 6 ;
@@ -178,7 +195,7 @@
index += 5 ;
//IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
- cdData.icCardNo = ByteUtil.bytesToHex(bs, index, index + 3) ;
+ cdData.closeDt = ByteUtil.bytesToHex(bs, index, index + 3) ;
index += 4 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
@@ -246,6 +263,21 @@
index++ ;
cdData.thisTime += tpInt * 100 ;
+
+ cdData.priceType = bs[index] ;
+
+ index++ ;
+ cdData.price = 0.0D ;
+ tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
+ index++ ;
+ cdData.price += tpInt/100.0 ;
+ tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
+ index++ ;
+ cdData.price += tpInt;
+
+ cdData.cardType = bs[index] ;
+
+ index++ ;
//鎺у埗鍣ㄦ椂閽�
cdData.rtuDt = GlParse.parseTp(bs, index) ;
//index += 6 ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
index 2b7f0b1..293a0fa 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
@@ -87,10 +87,19 @@
dV1.subData = cdData ;
short index = ProtocolConstantV206V1_0_0.dataIndex ;
+ cdData.opType = bs[index] ;
+
+ index++ ;
+ cdData.cardType = bs[index] ;
+
+ index++ ;
+ cdData.cardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
+
+ index += 4 ;
//鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�5瀛楄妭BCD鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
cdData.cardNo = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
- index += 5 ;
+ index += 5 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
cdData.remainMoney = 0.0D ;
int tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
@@ -142,6 +151,11 @@
index++ ;
cdData.instantAmount += tpInt * 100000.0 ;
+ cdData.alarmVo = GlParse.parseAlarm(bs, index) ;
+ index += 2 ;
+ cdData.stateVo = GlParse.parseState(bs, index) ;
+ index += 2 ;
+
//鎺у埗鍣ㄦ椂閽�
cdData.rtuDt = GlParse.parseTp(bs, index) ;
//index += 6 ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java
index 8bf0468..61c9ef9 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java
@@ -9,7 +9,6 @@
import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com97Vo;
import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlCreate;
-import com.dy.common.mw.protocol.p206V202404.downVos.ComCd87Vo;
import com.dy.common.util.ByteUtil;
import com.dy.common.util.ByteUtilUnsigned;
@@ -27,9 +26,9 @@
@Override
public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback) throws Exception {
ParseParamsForDownV1_0_1 para = (ParseParamsForDownV1_0_1) params ;
- byte[] bs = this.doParse(para) ;
-
MidResultToRtu midRs = new MidResultToRtu() ;
+ byte[] bs = this.doParse(midRs, para) ;
+
midRs.rtuResultSendWebUrl = para.rtuResultSendWebUrl ;//rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
@@ -51,11 +50,12 @@
/**
* 鏋勯�犱笅琛屾暟鎹�
+ * @param midRs 鍙傛暟
* @param para 鍙傛暟
* @return 瀛楄妭鏁扮粍
* @throws Exception 寮傚父
*/
- public byte[] doParse(ParseParamsForDownV1_0_1 para) throws Exception {
+ public byte[] doParse(MidResultToRtu midRs, 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] ;
@@ -86,25 +86,52 @@
if(cvo.icCardNo == null){
throw new Exception("铏氭嫙IC鍗＄紪鍙蜂笉鑳戒负绌�") ;
}
- if(cvo.money == null){
+ if(cvo.moneyRemain == null){
throw new Exception("鍓╀綑閲戦涓嶈兘涓虹┖") ;
}
- if(cvo.price == null){
+ if(cvo.waterPrice == null){
throw new Exception("姘翠环涓嶈兘涓虹┖") ;
}
- String icCardNo = null ;
- if(cvo.icCardNo.length() > 10){
- icCardNo = cvo.icCardNo.substring(cvo.icCardNo.length() - 10) ;
+
+ String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
+ if(icCardNoGrp[0] != null){
+ midRs.param = icCardNoGrp[0] ;
}
byte[] bs = new byte[11] ;
- ByteUtil.string2BCD_LE(bs, icCardNo, 0) ;
+ index = 0 ;
+ ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
- Integer money = Double.valueOf(cvo.money * 100.0D).intValue() ;
- ByteUtilUnsigned.int2Bytes_LE(bs, money, 4);
+ index += 5 ;
+ Integer money = Double.valueOf(cvo.moneyRemain * 100.0D).intValue() ;
+ byte[] bTemp = ByteUtil.int2BCD_LE(money) ;
+ int bTempLen = bTemp.length ;
+ int count = 0 ;
+ for(int i = 0 ; i < bTempLen; i++){
+ bs[index++] = bTemp[i] ;
+ count ++ ;
+ if(count >= 4){
+ break ;
+ }
+ }
+ for(; count < 4; count++){
+ bs[index++] = 0 ;
+ }
- Short price = Double.valueOf(cvo.price * 100.0D).shortValue() ;
- ByteUtilUnsigned.short2Bytes_LE(bs, price, 8);
+ Integer price = Double.valueOf(cvo.waterPrice * 100.0D).intValue() ;
+ bTemp = ByteUtil.int2BCD_LE(price) ;
+ bTempLen = bTemp.length ;
+ count = 0 ;
+ for(int i = 0 ; i < bTempLen; i++){
+ bs[index++] = bTemp[i] ;
+ count ++ ;
+ if(count >= 2){
+ break ;
+ }
+ }
+ for(; count < 2; count++){
+ bs[index++] = 0 ;
+ }
bytes = ByteUtil.bytesMerge(bsHead, bs) ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Down.java
index d4457d6..5a1aaf2 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Down.java
@@ -27,9 +27,9 @@
@Override
public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback) throws Exception {
ParseParamsForDownV1_0_1 para = (ParseParamsForDownV1_0_1) params ;
- byte[] bs = this.doParse(para) ;
-
MidResultToRtu midRs = new MidResultToRtu() ;
+ byte[] bs = this.doParse(midRs, para) ;
+
midRs.rtuResultSendWebUrl = para.rtuResultSendWebUrl ;//rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
@@ -51,11 +51,12 @@
/**
* 鏋勯�犱笅琛屾暟鎹�
+ * @param midRs 鍙傛暟
* @param para 鍙傛暟
* @return 瀛楄妭鏁扮粍
* @throws Exception 寮傚父
*/
- public byte[] doParse(ParseParamsForDownV1_0_1 para) throws Exception {
+ public byte[] doParse(MidResultToRtu midRs, 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] ;
@@ -86,13 +87,14 @@
if(cvo.icCardNo == null){
throw new Exception("铏氭嫙IC鍗＄紪鍙蜂笉鑳戒负绌�") ;
}
- String icCardNo = null ;
- if(cvo.icCardNo.length() > 10){
- icCardNo = cvo.icCardNo.substring(cvo.icCardNo.length() - 10) ;
- }
+ String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
+ if(icCardNoGrp[0] != null){
+ midRs.param = icCardNoGrp[0] ;
+ }
byte[] bs = new byte[5] ;
- ByteUtil.string2BCD_LE(bs, icCardNo, 0) ;
+ ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], 0) ;
+
bytes = ByteUtil.bytesMerge(bsHead, bs) ;
GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_C0_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_C0_Up.java
index 8143d3c..5ef3642 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_C0_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_C0_Up.java
@@ -86,22 +86,24 @@
DataCdC0Vo cdData = new DataCdC0Vo() ;
dV1.subData = cdData ;
- boolean hasWaterAmount = false ;//鏄惁鏈夋祦閲忔暟鎹�
- boolean hasWaterPress = false ;//鏄惁鏈夋按鍘嬫暟鎹�
- boolean hasEleVolt = false ;//鏄惁鏈夌數鍘嬫暟鎹�
- boolean hasSignal = false ;//鏄惁鏈変俊鍙峰己搴︽暟鎹�
- boolean hasAlarmStatus = false ;//鏄惁鏈夋暟鎹�
+ boolean hasWaterAmount = true ;//鏄惁鏈夋祦閲忔暟鎹�
+ boolean hasWaterPress = true ;//鏄惁鏈夋按鍘嬫暟鎹�
+ boolean hasEleVolt = true ;//鏄惁鏈夌數鍘嬫暟鎹�
+ boolean hasSignal = true ;//鏄惁鏈変俊鍙峰己搴︽暟鎹�
+ boolean hasAlarmStatus = true ;//鏄惁鏈夋暟鎹�
short index = ProtocolConstantV206V1_0_0.dataIndex ;
byte tmpBt1 = bs[index] ;
index++ ;
+ /* RTU瀹炵幇涓�瀹氭湁娴侀噺鏁版嵁
if(((tmpBt1 & 4) >> 2) == 1){
hasWaterAmount = true ;
}
-
+ */
byte tmpBt2 = bs[index] ;
index++ ;
+ /*RTU瀹炵幇涓�瀹氭湁涓嬮潰鍚勯」鏁版嵁
if(((tmpBt2 & 0x10) >> 4) == 1){
hasAlarmStatus = true ;
}
@@ -114,7 +116,7 @@
if(((tmpBt2 & 0x80) >> 7) == 1){
hasSignal = true ;
}
-
+ */
if(hasWaterAmount){
//鐬椂娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999.999锛屽崟浣嶄负m3/h銆�
cdData.instantAmount = 0.0D ;
@@ -187,7 +189,7 @@
cdData.waterPress += tpInt * 10000.0 ;
}
if(hasEleVolt){
- //鐢垫睜鐢靛帇锛�4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V銆�
+ //鐢垫睜鐢靛帇锛�2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V銆�
cdData.batteryVolt = 0.0D ;//钃勭數姹犵數鍘�
cdData.sunVolt = 0.0D ;//澶槼鑳界數鍘�
int tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
@@ -219,6 +221,16 @@
cdData.stateVo = GlParse.parseState(bs, index) ;
index += 2 ;
}
+
+ //姘翠环锛�2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负鍏冦��
+ cdData.waterPrice = 0.0D ;//姘翠环
+ int tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
+ index++ ;
+ cdData.waterPrice += tpInt/100.0 ;
+ tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
+ index++ ;
+ cdData.waterPrice += tpInt;
+
cdData.rtuDt = GlParse.parseTp(bs, index) ;
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java
index b830c19..7b0e72a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java
@@ -16,7 +16,7 @@
index += 3 ;
Integer rtuAddr2Int = Integer.parseInt(rtuAddr2) ;
- ByteUtilUnsigned.short2Bytes_BE(bs, rtuAddr2Int.shortValue(), index);
+ ByteUtilUnsigned.short2Bytes_LE(bs, rtuAddr2Int.shortValue(), index);
}
public static void createPw(byte[] bs, int index) throws Exception {
diff --git "a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/\350\257\264\346\230\216.txt" "b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/\350\257\264\346\230\216.txt"
index bcc9c0e..da9fb59 100644
--- "a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/\350\257\264\346\230\216.txt"
+++ "b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/\350\257\264\346\230\216.txt"
@@ -7,11 +7,10 @@
杩橀渶瑕佸疄鐜颁笂琛屾暟鎹鐞嗕换鍔℃爲閮ㄥ垎銆�
-闈虫�荤増娴嬫帶涓�浣撻榾涓庣帇姹熸捣鐗堟祴鎺т竴浣撻榾涓嶈兘鍦ㄥ悓涓�涓腑闂翠欢杩愯锛�
-鍥犱负涓や釜鐗堟湰鐨勫崗璁崗璁ご閮戒竴鏍凤紝娌℃硶鍖哄垎寮�鏉ワ紝濡傛灉涓ょ璁惧
-閮借搴旂敤锛岄渶瑕侀儴缃蹭袱涓�氫俊涓棿浠躲��
+闈虫�荤増娴嬫帶涓�浣撻榾涓庣帇姹熸捣鐗堟祴鎺т竴浣撻榾涓や釜鐗堟湰鐨勫崗璁崗璁ご閮戒竴鏍凤紝
+涓轰簡鍖哄垎寮�鏉ヤ袱绉嶈澶囷紝瀵笴ommonV202404鐨刬sThisProtocolHead杩涜浜嗕慨鏀广��
-褰撳墠鎶奃riverV1_0_1椹卞姩閰嶇疆涓轰笉璧蜂綔鐢細
+鑻ヤ笉閲囩敤闈虫�荤殑鍗忚锛屾妸DriverV1_0_1椹卞姩閰嶇疆涓轰笉璧蜂綔鐢細
DriverV1_0_1绫绘敞瑙nable = false
PrefixedDataAvailableV1_0_1绫绘敞瑙nable = false
OnLineV1_0_1绫绘敞瑙nable = false
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
index 86f8b00..9918155 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
@@ -15,14 +15,22 @@
public Boolean isThisProtocolHead(byte[] bs) throws Exception{
if(bs == null){
return null ;
- }else if(bs.length >= (ProtocolConstantV206V202404.ctrlIndex - 1)
+ }else if(bs.length >= ProtocolConstantV206V202404.ctrlIndex
&& bs[0] == ProtocolConstantV206V202404.P_Head_Byte){
if(bs[2] == ProtocolConstantV206V202404.P_Head_Byte){
- return true ;
+ if(bs[3] == (byte)0x80 || bs[3] == (byte)0x81){
+ return true ;
+ }else{
+ return false ;
+ }
}else if((byte)(bs[2] & 0xF8) == ProtocolConstantV206V202404.P_Head_Byte){
//濡傛灉鎺у埗鍩熴�佸湴鍧�鍩熴�佺敤鎴锋暟鎹煙(搴旂敤灞�)鐨勫瓧鑺傛�绘暟澶т簬255锛屽垯閫氳繃鎵╁睍绗簩涓紑濮嬪瓧绗�0x68鐨勪綆3浣嶄綔涓洪暱L鐨勯珮浣嶆墿灞�
//0xF8浜岃繘鍒讹細 11111000
- return true ;
+ if(bs[3] == (byte)0x80 || bs[3] == (byte)0x81){
+ return true ;
+ }else{
+ return false ;
+ }
}else{
return false ;
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java
index 95a86a8..ff772d0 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java
@@ -30,7 +30,7 @@
MidResultToRtu resToRtu = TcpDownCommandCache.matchFromHead(resFromRtu) ;
if(resToRtu != null){
//鍖归厤鍒颁笅鍙戠殑鍛戒护
- resFromRtu.matchedCommand(resToRtu.commandId, resToRtu.rtuResultSendWebUrl) ;
+ resFromRtu.matchedCommand(resToRtu.commandId, resToRtu.param, resToRtu.rtuResultSendWebUrl) ;
this.nextDealRtuData(false, resFromRtu);
this.nextDealRtuComResult(resFromRtu);
}else{
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 4fb99e3..5567368 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,6 +1,6 @@
package com.dy.pipIrrMwTestWeb;
-import com.dy.pipIrrMwTestWeb.test.CommandCtrl;
+import com.dy.pipIrrMwTestWeb.test.CommandP206V202404Ctrl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -29,7 +29,7 @@
public class PipIrrMwTestWebApplication{
@Autowired
- private CommandCtrl test ;
+ private CommandP206V202404Ctrl 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/ComSupport.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupportP206V100.java
similarity index 79%
copy from pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupport.java
copy to pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupportP206V100.java
index e470013..5273464 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupport.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupportP206V100.java
@@ -2,9 +2,7 @@
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.CommandType;
-import com.dy.common.mw.protocol.p206V202404.CodeV202404;
-import com.dy.common.mw.protocol.p206V202404.ProtocolConstantV206V202404;
-import com.dy.common.mw.protocol.p206V202404.downVos.ComCdXyVo;
+import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
import com.dy.common.webUtil.BaseResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
@@ -19,17 +17,12 @@
* @Date: 2024/5/14 17:32
* @Description
*/
-public class ComSupport {
+public class ComSupportP206V100 {
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 rtuAddr = "620201000029" ;
protected static String rtuResultSendWebUrl = "http://127.0.0.1:65535/test/comRes/receive" ;
-
- protected static String controllerType = "57" ;//鎺у埗鍣ㄧ被鍨�
- protected static Integer projectNo = 10 ;//椤圭洰缂栫爜
-
- protected static String icCardAddr = "04BEA5BB" ;//IC鍗″湴鍧�
protected static String icCardNo = "37142501020500001" ;//IC鍗＄紪鍙凤紙鐢ㄦ埛鍗″簭鍒楀彿锛�
@@ -37,17 +30,10 @@
private RestTemplate restTemplate;
- protected ComCdXyVo comCdXyVo(){
- ComCdXyVo comVo = new ComCdXyVo() ;
- comVo.controllerType = controllerType ;
- comVo.projectNo = projectNo ;
- return comVo ;
- }
-
protected Command command(String code, Object param, String comId){
Command com = new Command() ;
com.id = comId==null?Command.defaultId:(comId.trim().equals("")?Command.defaultId:comId) ;//瀹為檯搴旂敤涓紝鏇挎崲鎴愭暟鎹簱璁板綍id
- com.protocol = ProtocolConstantV206V202404.protocolName ;
+ com.protocol = ProtocolConstantV206V1_0_0.protocolName ;
com.code = code ;
com.rtuAddr = rtuAddr ;
com.type = CommandType.outerCommand ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupport.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupportP206V202404.java
similarity index 98%
rename from pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupport.java
rename to pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupportP206V202404.java
index e470013..71a73e5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupport.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/ComSupportP206V202404.java
@@ -19,7 +19,7 @@
* @Date: 2024/5/14 17:32
* @Description
*/
-public class ComSupport {
+public class ComSupportP206V202404 {
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" ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandP206V100Ctrl.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandP206V100Ctrl.java
new file mode 100644
index 0000000..039c6ef
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandP206V100Ctrl.java
@@ -0,0 +1,55 @@
+package com.dy.pipIrrMwTestWeb.test;
+
+import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
+import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com97Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com98Vo;
+import com.dy.common.webUtil.BaseResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/5/29 09:17
+ * @Description
+ */
+@Slf4j
+@RestController
+@RequestMapping(path="comP206V100")
+@SuppressWarnings("unchecked")//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
+public class CommandP206V100Ctrl extends ComSupportP206V100 {
+
+ @GetMapping(path = "test")
+ public BaseResponse<String> test() {
+ //return this.connect() ;//杩炴帴閫氫俊涓棿浠舵祴璇�
+ //return this.cd97() ;
+ return this.cd98() ;
+ }
+
+ /**
+ * 娴嬭瘯杩為�氭��
+ * @return
+ */
+ private BaseResponse connect(){
+ return this.sendTest() ;
+ }
+
+ //APP杩滅▼寮�闃�
+ private BaseResponse cd97(){
+ Com97Vo comVo = new Com97Vo() ;
+ comVo.icCardNo = CommandP206V100Ctrl.icCardNo ;
+ comVo.moneyRemain = 234.56 ;
+ comVo.waterPrice = 1.2 ;
+
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_97, comVo, null)) ;
+ }
+ //APP杩滅▼鍏抽榾
+ private BaseResponse cd98(){
+ Com98Vo comVo = new Com98Vo() ;
+ comVo.icCardNo = CommandP206V100Ctrl.icCardNo ;
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_98, comVo, null)) ;
+ }
+
+
+}
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/CommandP206V202404Ctrl.java
similarity index 70%
rename from pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandCtrl.java
rename to pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandP206V202404Ctrl.java
index a824671..f911f5b 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/CommandP206V202404Ctrl.java
@@ -3,7 +3,6 @@
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.mw.protocol.p206V202404.downVos.*;
import com.dy.common.webUtil.BaseResponse;
-import com.dy.common.webUtil.BaseResponseUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -14,9 +13,9 @@
*/
@Slf4j
@RestController
-@RequestMapping(path="com")
+@RequestMapping(path="comP206V202404")
@SuppressWarnings("unchecked")//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
-public class CommandCtrl extends ComSupport {
+public class CommandP206V202404Ctrl extends ComSupportP206V202404 {
@GetMapping(path = "test")
public BaseResponse<String> test() {
@@ -54,18 +53,18 @@
//璁剧疆缁堢鍦板潃(AFN=0x10H)
private BaseResponse cd10(){
ComCd10Vo comVo = new ComCd10Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
- comVo.rtuNewAddr = CommandCtrl.rtuAddr ;
+ 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 = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
- comVo.icCardAddr = CommandCtrl.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
- comVo.icCardNo = CommandCtrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ 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浣嶆暟瀛楋級
@@ -75,8 +74,8 @@
//璁剧疆璁惧缁堢鍓╀綑姘撮噺鍜屽墿浣欓噾棰濇姤璀﹀�� (AFN=0x16H)
private BaseResponse cd16(){
ComCd16Vo comVo = new ComCd16Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.waterAlarm = 100 ;//鍓╀綑姘撮噺鎶ヨ鍊�,鍗曚綅:m3銆傛暣鏁帮紝鍙栧�艰寖鍥�0~9999
comVo.moneyAlarm = 3 ;//鍓╀綑閲戦鎶ヨ鍊�,鍗曚綅:鍏冦�傛暣鏁帮紝鍙栧�艰寖鍥�0~9999
@@ -85,8 +84,8 @@
//璁剧疆璁惧缁堢IP鍦板潃 (AFN=0x21H)
private BaseResponse cd21(){
ComCd21Vo comVo = new ComCd21Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ 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锛�
@@ -96,8 +95,8 @@
//璁剧疆鏈轰簳骞存渶澶у紑閲囬噺鍜屾按浣嶄笅闄� (AFN=0x22H)
private BaseResponse cd22(){
ComCd22Vo comVo = new ComCd22Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.maxAmountYear = 99998888 ;//鏈轰簳骞存渶澶х敤姘撮噺鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999
comVo.limitLevel = 9978.60; //姘翠綅涓嬮檺 鍗曚綅锛歮 鍙栧�艰寖鍥�:0~9999.99
@@ -106,8 +105,8 @@
//璁剧疆璁惧缁堢鍩熷悕(AFN=0x23H)
private BaseResponse cd23(){
ComCd23Vo comVo = new ComCd23Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ 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锛�
@@ -117,8 +116,8 @@
//璁剧疆璁惧缁堢娉ㄥ唽鍙�(AFN=0x24H)
private BaseResponse cd24(){
ComCd24Vo comVo = new ComCd24Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.registerNo = "10203040506070809000" ;//
return this.sendCom2Mw(this.command(CodeV202404.cd_24, comVo, null)) ;
@@ -126,8 +125,8 @@
//璁剧疆璁惧缁堢骞寸敤姘撮噺(AFN=0x24H)
private BaseResponse cd26(){
ComCd26Vo comVo = new ComCd26Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.maxAmountYear = 200 ;//璁惧缁堢骞寸敤姘撮噺 鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999
return this.sendCom2Mw(this.command(CodeV202404.cd_26, comVo, null)) ;
@@ -135,8 +134,8 @@
//璁剧疆璁惧缁堢鐢ㄦ按鏈夋晥(AFN=0x31H)
private BaseResponse cd31(){
ComCd31Vo comVo = new ComCd31Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.valid = false ;//鏈夋晥鎬�
return this.sendCom2Mw(this.command(CodeV202404.cd_31, comVo, null)) ;
@@ -144,8 +143,8 @@
//鏌ヨ閬ユ祴缁堢鍏呭�艰褰� (AFN=0x55H)
private BaseResponse cd55(int page){
ComCd55Vo comVo = new ComCd55Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ 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)) ;
@@ -153,34 +152,34 @@
//鏌ヨ璁惧缁堢鐢ㄦ埛鐢ㄦ按璁板綍(AFN=0x65H)
private BaseResponse cd65(int page){
ComCd65Vo comVo = new ComCd65Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ 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 = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ 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 = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ 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 = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
//comVo.icCardAddr = Test.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
- comVo.icCardNo = CommandCtrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ 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涓皬鏁扮偣
@@ -192,10 +191,10 @@
//骞冲彴/APP杩滅▼寮�鍚按娉�/闃�闂�(AFN=0x92H/AFN=0xA2H)
private BaseResponse cdA2(){
ComCd92_A2Vo comVo = new ComCd92_A2Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
//comVo.icCardAddr = Test.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
- comVo.icCardNo = CommandCtrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ 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涓皬鏁扮偣
@@ -208,9 +207,9 @@
//骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂�(AFN=0x93H/AFN=0xA3H)
private BaseResponse cd93(){
ComCd93_A3Vo comVo = new ComCd93_A3Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
- comVo.icCardNo = CommandCtrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ 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)) ;
@@ -219,8 +218,8 @@
//骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂�(AFN=0x93H/AFN=0xA3H)
private BaseResponse cd9C(){
ComCd9CVo comVo = new ComCd9CVo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.icCardAddr = "04BEA5BB" ;//
return this.sendCom2Mw(this.command(CodeV202404.cd_9C, comVo, null)) ;
@@ -228,9 +227,9 @@
//骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂�(AFN=0x93H/AFN=0xA3H)
private BaseResponse cdA3(){
ComCd93_A3Vo comVo = new ComCd93_A3Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
- comVo.icCardNo = CommandCtrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ 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)) ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-webchat/pipIrr-web-webchat.iml b/pipIrr-platform/pipIrr-web/pipIrr-web-webchat/pipIrr-web-webchat.iml
deleted file mode 100644
index cb22448..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-webchat/pipIrr-web-webchat.iml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="web" name="Web">
- <configuration>
- <webroots />
- <sourceRoots>
- <root url="file://$MODULE_DIR$/src/main/java" />
- <root url="file://$MODULE_DIR$/src/main/resources" />
- </sourceRoots>
- </configuration>
- </facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_16">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-java:0.2.12" level="project" />
- <orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-java-core:0.2.12" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.gson:gson:2.10.1" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:2.0.7" level="project" />
- <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.9.2" level="project" />
- <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
- <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
- <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.16" level="project" />
- <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents.client5:httpclient5:5.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents.core5:httpcore5:5.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents.core5:httpcore5-h2:5.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents.client5:httpclient5-fluent:5.1.3" level="project" />
- <orderEntry type="module" module-name="pipIrr-common" />
- <orderEntry type="library" name="Maven: org.apache.mina:mina-core:2.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
- <orderEntry type="module" module-name="pipIrr-global" />
- <orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.1.0" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:easyexcel-core:3.1.0" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:easyexcel-support:3.1.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
- <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-csv:1.8" level="project" />
- <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.2.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:2.1.1" level="project" />
- <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.33" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:10.1.12" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:10.1.12" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-web:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-beans:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-aop:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-expression:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:10.1.12" level="project" />
- <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:8.0.1.Final" level="project" />
- <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:3.0.2" level="project" />
- <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.5.3.Final" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework.boot:spring-boot-devtools:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.28" level="project" />
- <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-jul:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: io.micrometer:micrometer-observation:1.11.2" level="project" />
- <orderEntry type="library" name="Maven: io.micrometer:micrometer-commons:1.11.2" level="project" />
- <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.11.2" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
- <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.webjars:swagger-ui:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-starter-webmvc-api:2.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-starter-common:2.2.0" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core-jakarta:2.2.15" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations-jakarta:2.2.15" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models-jakarta:2.2.15" level="project" />
- <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-security:1.7.0" level="project" />
- <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-common:1.7.0" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core:2.2.9" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.2.9" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.2.9" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:6.1.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:6.1.2" level="project" />
- <orderEntry type="library" name="Maven: com.mysql:mysql-connector-j:8.0.33" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.20" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.20" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:4.0.3" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-core:4.0.3" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.eclipse.angus:angus-activation:2.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:4.0.3" level="project" />
- <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:4.1.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.6" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.13" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.1.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:5.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-tx:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: cglib:cglib:3.3.0" level="project" />
- <orderEntry type="library" name="Maven: org.ow2.asm:asm:7.1" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.40" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension-spring6:2.0.40" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.40" level="project" />
- <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.5.5.Final" level="project" />
- <orderEntry type="library" name="Maven: org.mapstruct:mapstruct-processor:1.5.5.Final" level="project" />
- <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.21" level="project" />
- <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.dubbo:dubbo:3.2.7" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:3.1.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:3.1.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:3.1.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.8.0" level="project" />
- <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:4.0.0" level="project" />
- <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:2.1.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.11" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.11" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.24.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.14.6" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.9.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.9.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.9.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.9.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.9.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.9.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:5.3.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.14.6" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:5.3.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-core:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jcl:6.0.11" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:6.0.11" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.9.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
- </component>
-</module>
\ No newline at end of file
--
Gitblit v1.8.0