From a5b7ba070f03327f8848593a31c44cc79e7bb24a Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 11 七月 2024 21:53:14 +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/Cd_99_Down.java | 16
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/LocalDecoder.java | 37
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java | 19
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplication.java | 33
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Up.java | 6
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java | 38
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/test/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplicationTests.java | 13
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrControllerTramp.java | 6
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml | 191 +++
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/LocalCodecFactory.java | 35
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java | 6
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpConnect.java | 62 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmClientAmountDay.java | 94 +
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java | 4
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnitConfigVo.java | 6
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java | 3
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/resources/log4j2.xml | 2
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/mvnw | 259 +++++
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/Config.xml | 9
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/pom.xml | 141 ++
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/.gitignore | 33
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Down.java | 15
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/LocalEncoder.java | 27
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml | 4
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmClientAmountDayLast.java | 102 ++
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/pom.xml | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java | 8
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java | 12
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/application.yml | 29
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java | 3
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml | 181 +++
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 7
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java | 287 +++++
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/resources/log4j2.xml | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java | 3
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml | 23
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/ServerProperties.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java | 15
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Up.java | 6
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java | 6
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java | 100 +
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java | 343 ++++++
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/mvnw.cmd | 149 ++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java | 14
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/log4j2.xml | 39
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnitAdapter.java | 7
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/MyThreadJob.java | 158 --
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpHandler.java | 77 +
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java | 8
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/AdapterImp_TcpClUnit.java | 19
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealIntakeAmountDay.java | 66 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayLastMapper.java | 65 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultToRtu.java | 2
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/ComSupportP206V1_0_0.java | 2
pipIrr-platform/pipIrr-web/pom.xml | 1
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml | 20
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/.mvn/wrapper/maven-wrapper.properties | 19
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java | 25
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml | 3
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java | 24
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayMapper.java | 74 +
63 files changed, 2,700 insertions(+), 265 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 62278cc..7116f14 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,9 +1,5 @@
package com.dy.common.mw.protocol;
-import com.dy.common.mw.protocol.p206V1_0_0.*;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd97Vo;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd98Vo;
-
/**
* 浠嶳TU鏀跺埌鏁版嵁
*/
@@ -30,11 +26,12 @@
ProtocolUnit.getInstance().adapter.getSingleActionFromRtu(this.protocolName).doAction(this);
}
- public void matchedCommand(String commandId, Object toRtuMidResultParam, String rtuResultSendWebUrl){
+ public void matchedCommand(String commandId, 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)){
@@ -60,6 +57,7 @@
}
}
}
+ */
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 45864bb..9ff83f4 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
@@ -24,7 +24,7 @@
public boolean isSendFirst;//浼樺厛鍏朵粬鍙戦�侊紝渚嬪鍚勫懡浠ょ殑搴旂瓟
public boolean isQuickSend;//閫熷彂鍛戒护锛屽嵆涓嶅彈涓嬪彂鏁版嵁鏃堕棿闂撮殧闄愬埗
- public Object param ;//缂撳瓨涓�浜涙暟鎹紝渚嬪涓哄吋瀹圭帇宸ワ紙姹熸捣锛夊崗璁笌闈虫�诲崗璁紙铏氭嫙IC鍗＄紪鍙烽暱搴︿笉涓�鑷达級锛屾妸涓嶅吋瀹圭殑铏氭嫙IC鍗＄紪鍙风殑鍓嶅崐閮ㄥ垎鏀惧叆姝ゅ
+ //public Object param ;//缂撳瓨涓�浜涙暟鎹紝渚嬪涓哄吋瀹圭帇宸ワ紙姹熸捣锛夊崗璁笌闈虫�诲崗璁紙铏氭嫙IC鍗＄紪鍙烽暱搴︿笉涓�鑷达級锛屾妸涓嶅吋瀹圭殑铏氭嫙IC鍗＄紪鍙风殑鍓嶅崐閮ㄥ垎鏀惧叆姝ゅ
public MidResultToRtu(){
hasResponse = true ;
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 0817c1b..3e347ff 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
@@ -202,25 +202,25 @@
};
}
- /**
- * 澶勭悊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} ;
- }
- }
+// /**
+// * 澶勭悊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/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 2efc729..d51fa90 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
@@ -105,10 +105,10 @@
cdData.totalAmount = tpInt/100.0 ;
index += 5 ;
- //鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�5瀛楄妭BCD鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
- cdData.icCardNo = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
+ //鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�8瀛楄妭浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗銆�
+ cdData.icCardNo = GlParse.parseIcCardNo(bs, index) ;
- index += 5 ;
+ index += 8 ;
//IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
cdData.icCardAddr = ByteUtil.bytes2Hex_LE(bs, false, index, 4) ;
@@ -156,10 +156,10 @@
cdData.totalAmount = tpInt/100.0 ;
index += 5 ;
- //鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�5瀛楄妭BCD鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
- cdData.icCardNo = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
+ //鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�8瀛楄妭浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗銆�
+ cdData.icCardNo = GlParse.parseIcCardNo(bs, index) ;
- index += 5 ;
+ index += 8 ;
//IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
cdData.icCardAddr = ByteUtil.bytes2Hex_LE(bs, false, index, 4) ;
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 0deb3cb..877e0b8 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
@@ -97,10 +97,10 @@
cdData.cardAddr = ByteUtil.bytes2Hex_LE(bs, false, index, 4) ;
index += 4 ;
- //鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�5瀛楄妭BCD鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
- cdData.cardNo = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
+ //鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�8瀛楄妭浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗銆�
+ cdData.cardNo = GlParse.parseIcCardNo(bs, index) ;
- index += 5 ;
+ index += 8 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
cdData.remainMoney = tpInt/100.0 ;
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 33787cd..e981b9c 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
@@ -92,16 +92,17 @@
throw new Exception("姘翠环涓嶈兘涓虹┖") ;
}
- String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
- if(icCardNoGrp[0] != null){
- midRs.param = icCardNoGrp[0] ;
- }
+ //String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
+ //if(icCardNoGrp[0] != null){
+ // midRs.param = icCardNoGrp[0] ;
+ //}
- byte[] bs = new byte[11] ;
+ byte[] bs = new byte[14] ;
index = 0 ;
- ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
+ GlCreate.createIcCardNo(cvo.icCardNo, bs, index);
+ //ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
- index += 5 ;
+ index += 8 ;
Integer money = Double.valueOf(cvo.moneyRemain * 100.0D).intValue() ;
byte[] bTemp = ByteUtil.int2BCD_LE(money) ;
int bTempLen = bTemp.length ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Up.java
index 7e4f9ef..b3a9ece 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlParse;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd97Vo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
@@ -62,8 +63,9 @@
DataCd97Vo cdData = new DataCd97Vo() ;
dV1.subData = cdData ;
//铏氭嫙鍗″彿
- cdData.cardNo = ByteUtil.BCD2String_LE(bs, ProtocolConstantV206V1_0_0.dataIndex, ProtocolConstantV206V1_0_0.dataIndex+4) ;
- if(bs[ProtocolConstantV206V1_0_0.dataIndex + 5] == (byte)0xAA){
+ cdData.cardNo = GlParse.parseIcCardNo(bs, ProtocolConstantV206V1_0_0.dataIndex) ;
+
+ if(bs[ProtocolConstantV206V1_0_0.dataIndex + 8] == (byte)0xAA){
cdData.success = true ;
}else{
cdData.success = false ;
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 ae52d59..cc54382 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
@@ -86,12 +86,15 @@
throw new Exception("铏氭嫙IC鍗＄紪鍙蜂笉鑳戒负绌�") ;
}
- 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, icCardNoGrp[1], 0) ;
+ //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, icCardNoGrp[1], 0) ;
+ byte[] bs = new byte[8] ;
+ GlCreate.createIcCardNo(cvo.icCardNo, bs, 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_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Up.java
index 777f9b4..d3c28fe 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlParse;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd98Vo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
@@ -62,8 +63,9 @@
DataCd98Vo cdData = new DataCd98Vo() ;
dV1.subData = cdData ;
//铏氭嫙鍗″彿
- cdData.cardNo = ByteUtil.BCD2String_LE(bs, ProtocolConstantV206V1_0_0.dataIndex, ProtocolConstantV206V1_0_0.dataIndex+4) ;
- if(bs[ProtocolConstantV206V1_0_0.dataIndex + 5] == (byte)0xAA){
+ cdData.cardNo = GlParse.parseIcCardNo(bs, ProtocolConstantV206V1_0_0.dataIndex) ;
+
+ if(bs[ProtocolConstantV206V1_0_0.dataIndex + 8] == (byte)0xAA){
cdData.success = true ;
}else{
cdData.success = false ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java
index d7ff9b7..f017296 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java
@@ -97,14 +97,16 @@
throw new Exception("鐢ㄦ按鏃堕暱鍙栧�艰寖鍥存槸0~9999鍒嗛挓") ;
}
- String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
- if(icCardNoGrp[0] != null){
- midRs.param = icCardNoGrp[0] ;
- }
+ //String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
+ //if(icCardNoGrp[0] != null){
+ // midRs.param = icCardNoGrp[0] ;
+ //}
+ //byte[] bs = new byte[13] ;
+ //index = 0 ;
+ //ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
+ byte[] bs = new byte[8] ;
+ GlCreate.createIcCardNo(cvo.icCardNo, bs, 0);
- byte[] bs = new byte[13] ;
- index = 0 ;
- ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
index += 5 ;
Integer money = Double.valueOf(cvo.moneyRemain * 100.0D).intValue() ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java
index 3c8baa4..29efc43 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java
@@ -97,14 +97,14 @@
throw new Exception("棰勭敤姘撮噺鍙栧�艰寖鍥存槸0~9999m3") ;
}
- String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
- if(icCardNoGrp[0] != null){
- midRs.param = icCardNoGrp[0] ;
- }
-
- byte[] bs = new byte[13] ;
+ //String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
+ //if(icCardNoGrp[0] != null){
+ // midRs.param = icCardNoGrp[0] ;
+ //}
+ byte[] bs = new byte[16] ;
index = 0 ;
- ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
+ //ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
+ GlCreate.createIcCardNo(cvo.icCardNo, bs, 0);
index += 5 ;
Integer money = Double.valueOf(cvo.moneyRemain * 100.0D).intValue() ;
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 7b0e72a..d2caefe 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
@@ -28,11 +28,35 @@
ByteUtil.string2BCD_LE(bs, DateTime.yyMMddhhmmss(), index) ;
}
+ public static void createTp(String yyMMddhhmmss, byte[] bs, int index) throws Exception {
+ ByteUtil.string2BCD_LE(bs, yyMMddhhmmss, index) ;
+ }
+
public static void createLen(byte[] bsNoTail) throws Exception {
int len = bsNoTail.length - ProtocolConstantV206V1_0_0.lenHead2ctrl;
bsNoTail[ProtocolConstantV206V1_0_0.dataLenIndex] = (byte)len ;
}
+
+ /**
+ * 鐢熸垚IC鍗＄紪鐮�
+ * 6瀛楄妭BCD鐮侊紙12浣嶈鏀垮尯鍒掞級 + 2瀛楄妭HEX
+ * @param icCardNo
+ * @param bs
+ * @param index
+ * @throws Exception
+ */
+ public static void createIcCardNo(String icCardNo, byte[] bs, int index) throws Exception {
+ String icCardNo1 = icCardNo.substring(0, 12) ;
+ String icCardNo2 = icCardNo.substring(12) ;
+
+ Integer icCardNo2Int = Integer.parseInt(icCardNo2) ;
+ ByteUtilUnsigned.short2Bytes_LE(bs, icCardNo2Int.shortValue(), index);
+
+ index += 2 ;
+ ByteUtil.string2BCD_LE(bs, icCardNo1, index) ;
+ }
+
public static byte[] createCrcTail(byte[] bsNoTail) throws Exception {
int crc = new CRC8_for_2_0().CRC8(bsNoTail, ProtocolConstantV206V1_0_0.ctrlIndex, bsNoTail.length -1) ;
byte[] bytes = new byte[ProtocolConstantV206V1_0_0.lenTail] ;
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 6e5a7a9..028f991 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
@@ -3,6 +3,7 @@
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataAlarmVo;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataStateVo;
import com.dy.common.util.ByteUtil;
+import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -39,6 +40,24 @@
return avo ;
}
+ /**
+ * 鍒嗘瀽IC鍗＄紪鍙�
+ * @param bs 涓婅瀛楄妭鏁扮粍
+ * @param index 鍚浣�
+ * @return 鎺у埗鍣ㄥ湴鍧�
+ * @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 ;
+ }
+ return rtuAddrBCD + rtuAddrStr ;
+ }
+
+
+
public static String parseTp(byte[] bs, short index){
String dt = "" ;
try{
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
index f3f8dfc..d0f7034 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
@@ -1035,6 +1035,31 @@
return fromIndex ;
}
+ /**
+ * 鍗佸叚杩涘埗杞瓧鑺傛暟缁�
+ * @param hex the hex string
+ * @return 杩斿洖 byte[]
+ */
+ public static int hex2Bytes_LE(String hex, byte[] bs, int fromIndex) {
+ if (hex == null || hex.equals("")) {
+ return fromIndex;
+ }
+ hex = hex.toUpperCase(Locale.ENGLISH);
+ int length = hex.length() / 2;
+ char[] hexChars = hex.toCharArray();
+ byte[] d = new byte[length];
+ for (int i = 0; i < length; i++) {
+ int pos = i * 2;
+ d[i] = (byte) (charToByte(hexChars[pos]) << 4 | charToByte(hexChars[pos + 1]));
+ }
+ for(int i = 0 ; i < d.length; i++){
+ bs[fromIndex++] = d[(d.length - 1) - i] ;
+ }
+ return fromIndex ;
+ }
+
+
+
private static final char[] HEX_CHAR = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
// /**
// * 灏哹yte[]杞崲涓�16杩涘埗瀛楃涓�
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayLastMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayLastMapper.java
new file mode 100644
index 0000000..bafb46b
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayLastMapper.java
@@ -0,0 +1,65 @@
+package com.dy.pipIrrGlobal.daoRm;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoRm.RmClientAmountDayLast;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/7/9 14:33
+ * @Description
+ */
+@Mapper
+public interface RmClientAmountDayLastMapper extends BaseMapper<RmClientAmountDayLast> {
+ /**
+ * delete by primary key
+ *
+ * @param id primaryKey
+ * @return deleteCount
+ */
+ int deleteByPrimaryKey(Long id);
+
+ List<RmClientAmountDayLast> selectByClientId(Long clientId) ;
+
+ /**
+ * insert record to table
+ *
+ * @param record the record
+ * @return insert count
+ */
+ int insert(RmClientAmountDayLast record);
+
+ /**
+ * insert record to table selective
+ *
+ * @param record the record
+ * @return insert count
+ */
+ int insertSelective(RmClientAmountDayLast record);
+
+ /**
+ * select by primary key
+ *
+ * @param id primary key
+ * @return object by primary key
+ */
+ RmClientAmountDayLast selectByPrimaryKey(Long id);
+
+ /**
+ * update record selective
+ *
+ * @param record the updated record
+ * @return update count
+ */
+ int updateByPrimaryKeySelective(RmClientAmountDayLast record);
+
+ /**
+ * update record
+ *
+ * @param record the updated record
+ * @return update count
+ */
+ int updateByPrimaryKey(RmClientAmountDayLast record);
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayMapper.java
new file mode 100644
index 0000000..37d8992
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayMapper.java
@@ -0,0 +1,74 @@
+package com.dy.pipIrrGlobal.daoRm;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoRm.RmClientAmountDay;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/7/9 14:33
+ * @Description
+ */
+@Mapper
+public interface RmClientAmountDayMapper extends BaseMapper<RmClientAmountDay> {
+ /**
+ * delete by primary key
+ *
+ * @param id primaryKey
+ * @return deleteCount
+ */
+ int deleteByPrimaryKey(Long id);
+
+ /**
+ * insert record to table
+ *
+ * @param record the record
+ * @return insert count
+ */
+ int insert(RmClientAmountDay record);
+
+ /**
+ * insert record to table selective
+ *
+ * @param record the record
+ * @return insert count
+ */
+ int insertSelective(RmClientAmountDay record);
+
+ /**
+ * select by primary key
+ *
+ * @param id primary key
+ * @return object by primary key
+ */
+ RmClientAmountDay selectByPrimaryKey(Long id);
+
+ /**
+ * select by primary key
+ *
+ * @param clientId clientId
+ * @param dt dt
+ * @return objects by ByClientAndDate
+ */
+ List<RmClientAmountDay> selectByClientAndDate(@Param("clientId")Long clientId, @Param("dt")Date dt) ;
+
+ /**
+ * update record selective
+ *
+ * @param record the updated record
+ * @return update count
+ */
+ int updateByPrimaryKeySelective(RmClientAmountDay record);
+
+ /**
+ * update record
+ *
+ * @param record the updated record
+ * @return update count
+ */
+ int updateByPrimaryKey(RmClientAmountDay record);
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
index a16b166..6f977b5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
@@ -69,6 +69,12 @@
*/
@Schema(description = "鍙戠幇鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date findDt;
+ /**
+ * 鏈烘瀯tag
+ */
+ @Schema(description = "鏈烘瀯tag", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "鏈烘瀯tag涓嶈兘涓虹┖")
+ public String orgTag;
/**
* 娣诲姞鏂瑰紡;1-绯荤粺鑷姩锛�2-鎵嬪姩
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrControllerTramp.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrControllerTramp.java
index 22a5e73..09bb17f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrControllerTramp.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrControllerTramp.java
@@ -61,5 +61,11 @@
@Schema(description = "鍙戠幇鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
// @NotNull(message = "鍙戠幇鏃堕棿涓嶈兘涓虹┖")
public Date findDt;//鍙戠幇鏃堕棿锛� yyyy-mm-dd HH:MM:SS锛�
+ /**
+ * 鏈烘瀯tag
+ */
+ @Schema(description = "鏈烘瀯tag", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "鏈烘瀯tag涓嶈兘涓虹┖")
+ public String orgTag;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmClientAmountDay.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmClientAmountDay.java
new file mode 100644
index 0000000..9f943eb
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmClientAmountDay.java
@@ -0,0 +1,94 @@
+package com.dy.pipIrrGlobal.pojoRm;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.util.Date;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/7/9 14:33
+ * @Description 鍐滄埛鏃ョ敤姘撮噺缁熻
+ */
+
+@TableName(value="rm_client_amount_day", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "鍐滄埛鏃ョ敤姘撮噺缁熻")
+public class RmClientAmountDay implements BaseEntity {
+
+ public static final long serialVersionUID = 2024007091435002L;
+ /**
+ * 涓婚敭
+ */
+ @Schema(description = "涓婚敭", requiredMode = Schema.RequiredMode.REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ public Long id;
+
+ /**
+ * 鍐滄埛id
+ */
+ public Long clientId;
+
+ /**
+ * 鏃ュ彇姘撮噺
+ */
+ public Double amount;
+
+ /**
+ * 鏃ュ彇鑺辫垂閲戦
+ */
+ public Double money;
+
+ /**
+ * 缁熻鏃ユ湡(yyyy-mm-dd)
+ */
+ @Schema(description = "缁熻鏃ユ湡", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ public Date dt;
+
+ /**
+ * 缁熻鏃ユ渶鍚庝竴娆″紑闃�鏃ユ湡鏃堕棿锛坹yyy-mm-dd HH:MM:SS锛�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS")
+ public Date openDtLast;
+
+ /**
+ * 缁熻鏃ユ渶鍚庝竴娆″叧闃�鏃ユ湡鏃堕棿锛坹yyy-mm-dd HH:MM:SS锛�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS")
+ public Date closeDtLast;
+
+ /**
+ * 缁熻鏃ユ渶鍚庝竴娆″紑闃�鍙栨按閲�
+ */
+ public Double thisAmountLast;
+
+ /**
+ * 缁熻鏃ユ渶鍚庝竴娆″紑闃�鑺辫垂閲戦
+ */
+ public Double thisMoneyLast;
+
+ /**
+ * 缁熻鏃ユ渶鍚庝竴娆″紑闃�鍙栨按鏃堕暱锛堝垎閽燂級
+ */
+ public Integer thisTimeLast;
+
+ /**
+ * 缁熻鏃ユ渶鍚庝竴娆″叧闃�涓婃姤鎺у埗鍣ㄦ椂閽�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS")
+ public Date rtuDtLast;
+
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmClientAmountDayLast.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmClientAmountDayLast.java
new file mode 100644
index 0000000..23fb4d2
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmClientAmountDayLast.java
@@ -0,0 +1,102 @@
+package com.dy.pipIrrGlobal.pojoRm;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.util.Date;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/7/9 14:33
+ * @Description 鍐滄埛鏃ョ敤姘撮噺缁熻
+ */
+
+@TableName(value="rm_client_amount_day_last", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "鍐滄埛鏃ョ敤姘撮噺缁熻")
+public class RmClientAmountDayLast implements BaseEntity {
+
+ public static final long serialVersionUID = 2024007091435001L;
+ /**
+ * 涓婚敭
+ */
+ @Schema(description = "涓婚敭", requiredMode = Schema.RequiredMode.REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ public Long id;
+
+ /**
+ * 鐢辨渶鏂版暟鎹寔鏈夊巻鍙叉暟鎹腑鐨勬渶鏂拌褰旾D锛屼互鏂逛究蹇�熸煡璇�
+ * json涓嶅簭鍒楀寲姝ゅ睘鎬э紝鍗充笉鍚戝墠绔〉闈㈠彂閫佸強鏄剧ず
+ */
+ @Schema(hidden=true)
+ @JSONField(serialize = false)
+ public Long lastHistoryId;
+
+ /**
+ * 鍐滄埛id
+ */
+ public Long clientId;
+
+ /**
+ * 鏃ュ彇姘撮噺
+ */
+ public Double amount;
+
+ /**
+ * 鏃ュ彇鑺辫垂閲戦
+ */
+ public Double money;
+
+ /**
+ * 缁熻鏃ユ湡(yyyy-mm-dd)
+ */
+ @Schema(description = "缁熻鏃ユ湡", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ public Date dt;
+
+ /**
+ * 缁熻鏃ユ渶鍚庝竴娆″紑闃�鏃ユ湡鏃堕棿锛坹yyy-mm-dd HH:MM:SS锛�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS")
+ public Date openDtLast;
+
+ /**
+ * 缁熻鏃ユ渶鍚庝竴娆″叧闃�鏃ユ湡鏃堕棿锛坹yyy-mm-dd HH:MM:SS锛�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS")
+ public Date closeDtLast;
+
+ /**
+ * 缁熻鏃ユ渶鍚庝竴娆″紑闃�鍙栨按閲�
+ */
+ public Double thisAmountLast;
+
+ /**
+ * 缁熻鏃ユ渶鍚庝竴娆″紑闃�鑺辫垂閲戦
+ */
+ public Double thisMoneyLast;
+
+ /**
+ * 缁熻鏃ユ渶鍚庝竴娆″紑闃�鍙栨按鏃堕暱锛堝垎閽燂級
+ */
+ public Integer thisTimeLast;
+
+ /**
+ * 缁熻鏃ユ渶鍚庝竴娆″叧闃�涓婃姤鎺у埗鍣ㄦ椂閽�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS")
+ public Date rtuDtLast;
+
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 330cfe7..42b01c1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -133,8 +133,11 @@
#閫氳鍗忚
#protocol: DYJS_2023,DYJS_2024
mw:
- #鍛戒护鍙戦�佸湴鍧�
- comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
+ #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
+ ym:
+ comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
+ sp:
+ comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
#鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃
rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
#寰俊灏忕▼搴忓洖璋冨湴鍧�
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
index a663b66..e9b32bd 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -9,6 +9,7 @@
<result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
<result column="protocol" jdbcType="VARCHAR" property="protocol" />
<result column="findDt" jdbcType="TIMESTAMP" property="findDt" />
+ <result column="orgTag" jdbcType="VARCHAR" property="orgTag" />
<result column="addWays" jdbcType="TINYINT" property="addWays" />
<result column="operator" jdbcType="BIGINT" property="operator" />
<result column="operateDt" jdbcType="TIMESTAMP" property="operateDt" />
@@ -22,7 +23,7 @@
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, intakeId, rtuAddr, protocol, findDt, addWays, `operator`, operateDt, deleted
+ id, intakeId, rtuAddr, protocol, findDt, orgTag, addWays, `operator`, operateDt, deleted
</sql>
<sql id="Part_Column_List">
<!--@mbg.generated-->
@@ -43,12 +44,13 @@
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoPr.PrController">
<!--@mbg.generated-->
insert into pr_controller (id, intakeId, rtuAddr,
- protocol, findDt, addWays,
+ protocol, findDt, orgTag, addWays,
`operator`, operateDt, deleted
)
values (#{id,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR},
- #{protocol,jdbcType=VARCHAR}, #{findDt,jdbcType=TIMESTAMP}, #{addWays,jdbcType=TINYINT},
- #{operator,jdbcType=BIGINT}, #{operateDt,jdbcType=TIMESTAMP}, #{deleted,jdbcType=TINYINT}
+ #{protocol,jdbcType=VARCHAR}, #{findDt,jdbcType=TIMESTAMP}, #{orgTag,jdbcType=VARCHAR},
+ #{addWays,jdbcType=TINYINT}, #{operator,jdbcType=BIGINT}, #{operateDt,jdbcType=TIMESTAMP},
+ #{deleted,jdbcType=TINYINT}
)
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoPr.PrController">
@@ -69,6 +71,9 @@
</if>
<if test="findDt != null">
findDt,
+ </if>
+ <if test="orgTag != null">
+ orgTag,
</if>
<if test="addWays != null">
addWays,
@@ -98,6 +103,9 @@
</if>
<if test="findDt != null">
#{findDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="orgTag != null">
+ #{orgTag,jdbcType=VARCHAR},
</if>
<if test="addWays != null">
#{addWays,jdbcType=TINYINT},
@@ -129,6 +137,9 @@
<if test="findDt != null">
findDt = #{findDt,jdbcType=TIMESTAMP},
</if>
+ <if test="orgTag != null">
+ orgTag = #{orgTag,jdbcType=VARCHAR},
+ </if>
<if test="addWays != null">
addWays = #{addWays,jdbcType=TINYINT},
</if>
@@ -151,6 +162,7 @@
rtuAddr = #{rtuAddr,jdbcType=VARCHAR},
protocol = #{protocol,jdbcType=VARCHAR},
findDt = #{findDt,jdbcType=TIMESTAMP},
+ orgTag = #{orgTag,jdbcType=VARCHAR},
addWays = #{addWays,jdbcType=TINYINT},
`operator` = #{operator,jdbcType=BIGINT},
operateDt = #{operateDt,jdbcType=TIMESTAMP},
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
index 877c01d..c4fab1e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
@@ -8,10 +8,11 @@
<result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
<result column="protocol" jdbcType="VARCHAR" property="protocol" />
<result column="findDt" jdbcType="TIMESTAMP" property="findDt" />
+ <result column="orgTag" jdbcType="VARCHAR" property="orgTag" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, rtuAddr, protocol, findDt
+ id, rtuAddr, protocol, findDt, orgTag
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -37,9 +38,9 @@
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoPr.PrControllerTramp">
<!--@mbg.generated-->
insert into pr_controller_tramp (id, rtuAddr, protocol,
- findDt)
+ findDt, orgTag)
values (#{id,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR},
- #{findDt,jdbcType=TIMESTAMP})
+ #{findDt,jdbcType=TIMESTAMP},#{orgTag,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoPr.PrControllerTramp">
<!--@mbg.generated-->
@@ -57,6 +58,9 @@
<if test="findDt != null">
findDt,
</if>
+ <if test="orgTag != null">
+ orgTag,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -70,6 +74,9 @@
</if>
<if test="findDt != null">
#{findDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="orgTag != null">
+ #{orgTag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
@@ -86,6 +93,9 @@
<if test="findDt != null">
findDt = #{findDt,jdbcType=TIMESTAMP},
</if>
+ <if test="orgTag != null">
+ orgTag = #{orgTag,jdbcType=VARCHAR},
+ </if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@@ -94,7 +104,8 @@
update pr_controller_tramp
set rtuAddr = #{rtuAddr,jdbcType=VARCHAR},
protocol = #{protocol,jdbcType=VARCHAR},
- findDt = #{findDt,jdbcType=TIMESTAMP}
+ findDt = #{findDt,jdbcType=TIMESTAMP},
+ orgTag = #{orgTag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
@@ -113,7 +124,8 @@
select CAST(id AS char)AS id,
rtuAddr,
protocol,
- findDt
+ findDt,
+ orgTag
FROM pr_controller_tramp
<where>
<if test="id != null and id !=''">
@@ -125,7 +137,6 @@
<if test="protocol != null and protocol != ''">
AND protocol = #{protocol,jdbcType=VARCHAR}
</if>
-
</where>
</select>
<!-- 鏍规嵁鏉′欢鑾峰彇娴佹氮鎺у埗鍣ㄦ暟閲�-->
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
new file mode 100644
index 0000000..c7f20a2
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.daoRm.RmClientAmountDayLastMapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmClientAmountDayLast">
+ <!--@mbg.generated-->
+ <!--@Table rm_client_amount_day_last-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="last_history_id" jdbcType="BIGINT" property="lastHistoryId" />
+ <result column="client_id" jdbcType="BIGINT" property="clientId" />
+ <result column="amount" jdbcType="FLOAT" property="amount" />
+ <result column="money" jdbcType="FLOAT" property="money" />
+ <result column="dt" jdbcType="DATE" property="dt" />
+ <result column="open_dt_last" jdbcType="TIMESTAMP" property="openDtLast" />
+ <result column="close_dt_last" jdbcType="TIMESTAMP" property="closeDtLast" />
+ <result column="this_amount_last" jdbcType="FLOAT" property="thisAmountLast" />
+ <result column="this_money_last" jdbcType="FLOAT" property="thisMoneyLast" />
+ <result column="this_time_last" jdbcType="INTEGER" property="thisTimeLast" />
+ <result column="rtu_dt_last" jdbcType="TIMESTAMP" property="rtuDtLast" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, last_history_id, client_id, amount, money, dt, open_dt_last, close_dt_last, this_amount_last,
+ this_money_last, this_time_last, rtu_dt_last
+ </sql>
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from rm_client_amount_day_last
+ where id = #{id,jdbcType=BIGINT}
+ </select>
+ <select id="selectByClientId" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from rm_client_amount_day_last
+ where client_id = #{ClientId,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ delete from rm_client_amount_day_last
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmClientAmountDayLast">
+ <!--@mbg.generated-->
+ insert into rm_client_amount_day_last (id, last_history_id, client_id,
+ amount, money, dt, open_dt_last,
+ close_dt_last, this_amount_last, this_money_last,
+ this_time_last, rtu_dt_last)
+ values (#{id,jdbcType=BIGINT}, #{lastHistoryId,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT},
+ #{amount,jdbcType=FLOAT}, #{money,jdbcType=FLOAT}, #{dt,jdbcType=DATE}, #{openDtLast,jdbcType=TIMESTAMP},
+ #{closeDtLast,jdbcType=TIMESTAMP}, #{thisAmountLast,jdbcType=FLOAT}, #{thisMoneyLast,jdbcType=FLOAT},
+ #{thisTimeLast,jdbcType=INTEGER}, #{rtuDtLast,jdbcType=TIMESTAMP})
+ </insert>
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmClientAmountDayLast">
+ <!--@mbg.generated-->
+ insert into rm_client_amount_day_last
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="lastHistoryId != null">
+ last_history_id,
+ </if>
+ <if test="clientId != null">
+ client_id,
+ </if>
+ <if test="amount != null">
+ amount,
+ </if>
+ <if test="money != null">
+ money,
+ </if>
+ <if test="dt != null">
+ dt,
+ </if>
+ <if test="openDtLast != null">
+ open_dt_last,
+ </if>
+ <if test="closeDtLast != null">
+ close_dt_last,
+ </if>
+ <if test="thisAmountLast != null">
+ this_amount_last,
+ </if>
+ <if test="thisMoneyLast != null">
+ this_money_last,
+ </if>
+ <if test="thisTimeLast != null">
+ this_time_last,
+ </if>
+ <if test="rtuDtLast != null">
+ rtu_dt_last,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
+ <if test="lastHistoryId != null">
+ #{lastHistoryId,jdbcType=BIGINT},
+ </if>
+ <if test="clientId != null">
+ #{clientId,jdbcType=BIGINT},
+ </if>
+ <if test="amount != null">
+ #{amount,jdbcType=FLOAT},
+ </if>
+ <if test="money != null">
+ #{money,jdbcType=FLOAT},
+ </if>
+ <if test="dt != null">
+ #{dt,jdbcType=DATE},
+ </if>
+ <if test="openDtLast != null">
+ #{openDtLast,jdbcType=TIMESTAMP},
+ </if>
+ <if test="closeDtLast != null">
+ #{closeDtLast,jdbcType=TIMESTAMP},
+ </if>
+ <if test="thisAmountLast != null">
+ #{thisAmountLast,jdbcType=FLOAT},
+ </if>
+ <if test="thisMoneyLast != null">
+ #{thisMoneyLast,jdbcType=FLOAT},
+ </if>
+ <if test="thisTimeLast != null">
+ #{thisTimeLast,jdbcType=INTEGER},
+ </if>
+ <if test="rtuDtLast != null">
+ #{rtuDtLast,jdbcType=TIMESTAMP},
+ </if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmClientAmountDayLast">
+ <!--@mbg.generated-->
+ update rm_client_amount_day_last
+ <set>
+ <if test="lastHistoryId != null">
+ last_history_id = #{lastHistoryId,jdbcType=BIGINT},
+ </if>
+ <if test="clientId != null">
+ client_id = #{clientId,jdbcType=BIGINT},
+ </if>
+ <if test="amount != null">
+ amount = #{amount,jdbcType=FLOAT},
+ </if>
+ <if test="money != null">
+ money = #{money,jdbcType=FLOAT},
+ </if>
+ <if test="dt != null">
+ dt = #{dt,jdbcType=DATE},
+ </if>
+ <if test="openDtLast != null">
+ open_dt_last = #{openDtLast,jdbcType=TIMESTAMP},
+ </if>
+ <if test="closeDtLast != null">
+ close_dt_last = #{closeDtLast,jdbcType=TIMESTAMP},
+ </if>
+ <if test="thisAmountLast != null">
+ this_amount_last = #{thisAmountLast,jdbcType=FLOAT},
+ </if>
+ <if test="thisMoneyLast != null">
+ this_money_last = #{thisMoneyLast,jdbcType=FLOAT},
+ </if>
+ <if test="thisTimeLast != null">
+ this_time_last = #{thisTimeLast,jdbcType=INTEGER},
+ </if>
+ <if test="rtuDtLast != null">
+ rtu_dt_last = #{rtuDtLast,jdbcType=TIMESTAMP},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmClientAmountDayLast">
+ <!--@mbg.generated-->
+ update rm_client_amount_day_last
+ set last_history_id = #{lastHistoryId,jdbcType=BIGINT},
+ client_id = #{clientId,jdbcType=BIGINT},
+ amount = #{amount,jdbcType=FLOAT},
+ money = #{money,jdbcType=FLOAT},
+ dt = #{dt,jdbcType=DATE},
+ open_dt_last = #{openDtLast,jdbcType=TIMESTAMP},
+ close_dt_last = #{closeDtLast,jdbcType=TIMESTAMP},
+ this_amount_last = #{thisAmountLast,jdbcType=FLOAT},
+ this_money_last = #{thisMoneyLast,jdbcType=FLOAT},
+ this_time_last = #{thisTimeLast,jdbcType=INTEGER},
+ rtu_dt_last = #{rtuDtLast,jdbcType=TIMESTAMP}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
new file mode 100644
index 0000000..cbd5d43
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.daoRm.RmClientAmountDayMapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmClientAmountDay">
+ <!--@mbg.generated-->
+ <!--@Table rm_client_amount_day-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="client_id" jdbcType="BIGINT" property="clientId" />
+ <result column="amount" jdbcType="FLOAT" property="amount" />
+ <result column="money" jdbcType="FLOAT" property="money" />
+ <result column="dt" jdbcType="DATE" property="dt" />
+ <result column="open_dt_last" jdbcType="TIMESTAMP" property="openDtLast" />
+ <result column="close_dt_last" jdbcType="TIMESTAMP" property="closeDtLast" />
+ <result column="this_amount_last" jdbcType="FLOAT" property="thisAmountLast" />
+ <result column="this_money_last" jdbcType="FLOAT" property="thisMoneyLast" />
+ <result column="this_time_last" jdbcType="INTEGER" property="thisTimeLast" />
+ <result column="rtu_dt_last" jdbcType="TIMESTAMP" property="rtuDtLast" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, client_id, amount, money, dt, open_dt_last, close_dt_last, this_amount_last, this_money_last,
+ this_time_last, rtu_dt_last
+ </sql>
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from rm_client_amount_day
+ where id = #{id,jdbcType=BIGINT}
+ </select>
+
+ <select id="selectByClientAndDate" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from rm_client_amount_day
+ where client_id = #{clientId,jdbcType=BIGINT} and dt = #{dt,jdbcType=DATE}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ delete from rm_client_amount_day
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmClientAmountDay">
+ <!--@mbg.generated-->
+ insert into rm_client_amount_day (id, client_id, amount, money,
+ dt, open_dt_last, close_dt_last,
+ this_amount_last, this_money_last, this_time_last,
+ rtu_dt_last)
+ values (#{id,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT}, #{amount,jdbcType=FLOAT}, #{money,jdbcType=FLOAT},
+ #{dt,jdbcType=DATE}, #{openDtLast,jdbcType=TIMESTAMP}, #{closeDtLast,jdbcType=TIMESTAMP},
+ #{thisAmountLast,jdbcType=FLOAT}, #{thisMoneyLast,jdbcType=FLOAT}, #{thisTimeLast,jdbcType=INTEGER},
+ #{rtuDtLast,jdbcType=TIMESTAMP})
+ </insert>
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmClientAmountDay">
+ <!--@mbg.generated-->
+ insert into rm_client_amount_day
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="clientId != null">
+ client_id,
+ </if>
+ <if test="amount != null">
+ amount,
+ </if>
+ <if test="money != null">
+ money,
+ </if>
+ <if test="dt != null">
+ dt,
+ </if>
+ <if test="openDtLast != null">
+ open_dt_last,
+ </if>
+ <if test="closeDtLast != null">
+ close_dt_last,
+ </if>
+ <if test="thisAmountLast != null">
+ this_amount_last,
+ </if>
+ <if test="thisMoneyLast != null">
+ this_money_last,
+ </if>
+ <if test="thisTimeLast != null">
+ this_time_last,
+ </if>
+ <if test="rtuDtLast != null">
+ rtu_dt_last,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
+ <if test="clientId != null">
+ #{clientId,jdbcType=BIGINT},
+ </if>
+ <if test="amount != null">
+ #{amount,jdbcType=FLOAT},
+ </if>
+ <if test="money != null">
+ #{money,jdbcType=FLOAT},
+ </if>
+ <if test="dt != null">
+ #{dt,jdbcType=DATE},
+ </if>
+ <if test="openDtLast != null">
+ #{openDtLast,jdbcType=TIMESTAMP},
+ </if>
+ <if test="closeDtLast != null">
+ #{closeDtLast,jdbcType=TIMESTAMP},
+ </if>
+ <if test="thisAmountLast != null">
+ #{thisAmountLast,jdbcType=FLOAT},
+ </if>
+ <if test="thisMoneyLast != null">
+ #{thisMoneyLast,jdbcType=FLOAT},
+ </if>
+ <if test="thisTimeLast != null">
+ #{thisTimeLast,jdbcType=INTEGER},
+ </if>
+ <if test="rtuDtLast != null">
+ #{rtuDtLast,jdbcType=TIMESTAMP},
+ </if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmClientAmountDay">
+ <!--@mbg.generated-->
+ update rm_client_amount_day
+ <set>
+ <if test="clientId != null">
+ client_id = #{clientId,jdbcType=BIGINT},
+ </if>
+ <if test="amount != null">
+ amount = #{amount,jdbcType=FLOAT},
+ </if>
+ <if test="money != null">
+ money = #{money,jdbcType=FLOAT},
+ </if>
+ <if test="dt != null">
+ dt = #{dt,jdbcType=DATE},
+ </if>
+ <if test="openDtLast != null">
+ open_dt_last = #{openDtLast,jdbcType=TIMESTAMP},
+ </if>
+ <if test="closeDtLast != null">
+ close_dt_last = #{closeDtLast,jdbcType=TIMESTAMP},
+ </if>
+ <if test="thisAmountLast != null">
+ this_amount_last = #{thisAmountLast,jdbcType=FLOAT},
+ </if>
+ <if test="thisMoneyLast != null">
+ this_money_last = #{thisMoneyLast,jdbcType=FLOAT},
+ </if>
+ <if test="thisTimeLast != null">
+ this_time_last = #{thisTimeLast,jdbcType=INTEGER},
+ </if>
+ <if test="rtuDtLast != null">
+ rtu_dt_last = #{rtuDtLast,jdbcType=TIMESTAMP},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmClientAmountDay">
+ <!--@mbg.generated-->
+ update rm_client_amount_day
+ set client_id = #{clientId,jdbcType=BIGINT},
+ amount = #{amount,jdbcType=FLOAT},
+ money = #{money,jdbcType=FLOAT},
+ dt = #{dt,jdbcType=DATE},
+ open_dt_last = #{openDtLast,jdbcType=TIMESTAMP},
+ close_dt_last = #{closeDtLast,jdbcType=TIMESTAMP},
+ this_amount_last = #{thisAmountLast,jdbcType=FLOAT},
+ this_money_last = #{thisMoneyLast,jdbcType=FLOAT},
+ this_time_last = #{thisTimeLast,jdbcType=INTEGER},
+ rtu_dt_last = #{rtuDtLast,jdbcType=TIMESTAMP}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java
index d390f5f..01ef2c9 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java
@@ -130,6 +130,10 @@
try {
///////////////
//鍩烘湰閰嶇疆
+ ServerProperties.orgTag = this.conf.getSetAttrTxt(this.doc, "config.base", "orgTag", null, false, null) ;
+ if(ServerProperties.orgTag==null || ServerProperties.orgTag.trim().equals("")){
+ throw new Exception("鏈烘瀯tag涓嶈兘涓虹┖") ;
+ }
ServerProperties.isLowPower = conf.getSetAttrBoolean(doc, "config.base", "isLowPower", null, null) ;
if(ServerProperties.isLowPower == null){
ServerProperties.isLowPower = false ;
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/ServerProperties.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/ServerProperties.java
index 855d88f..19e02ec 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/ServerProperties.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/ServerProperties.java
@@ -3,6 +3,8 @@
public class ServerProperties {
//鏄惁涓轰綆鍔熻��
+ public static String orgTag = "ym" ;
+ //鏄惁涓轰綆鍔熻��
public static Boolean isLowPower = false ;
//鍦ㄦ敮鎸佸閫氫俊鍗忚鏃讹紝鍙湁RTU涓婄嚎浜嗭紝鎵嶈兘璇嗗埆鍑鸿RTU瀹為檯鐢ㄧ殑閫氫俊鍗忚锛岃繘鑰岀敤姝ゅ崗璁В鏋愪笂琛屾暟鎹強鏋勯�犱笅琛屽懡浠ゃ��
//濡傛灉RTU鏈浘涓婄嚎锛堥�氫俊涓棿浠跺惎鍔ㄥ悗璇TU鏈浘涓婄嚎锛夛紝閭ｄ箞鍦ㄥ悜瀹冨彂閫佷笅琛屽懡浠ゆ椂锛屼笉鑳藉垽鏂嚭鍏堕噰鐢ㄧ殑鍗忚锛屼篃涓嶈兘鏋勯�犲懡浠わ紝灏ゅ叾鏄綆鍔熻�楁儏鍐典笅锛屼笉涓婄嚎鏄甯哥幇璞°��
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 ff772d0..95a86a8 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.param, resToRtu.rtuResultSendWebUrl) ;
+ resFromRtu.matchedCommand(resToRtu.commandId, resToRtu.rtuResultSendWebUrl) ;
this.nextDealRtuData(false, resFromRtu);
this.nextDealRtuComResult(resFromRtu);
}else{
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
index a83efff..847d2b8 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
@@ -50,9 +50,13 @@
@Autowired
private RmWorkReportHistoryMapper rmWorkReportHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙插伐浣滄姤鏁版嵁DAO
@Autowired
- private RmIntakeAmountDayLastMapper rmIntakeAmountDayLastMapperDao ;//鍙栨按鍙ｅ彇姘村拰婕忔崯缁熻鏈�鏂版暟鎹瓺AO
+ private RmIntakeAmountDayLastMapper rmIntakeAmountDayLastMapperDao ;//鍙栨按鍙ｅ彇姘寸粺璁℃渶鏂版暟鎹瓺AO
@Autowired
private RmIntakeAmountDayMapper rmIntakeAmountDayMapperDao ;//鍙栨按鍙ｅ彇姘村拰婕忔崯缁熻DAO
+ @Autowired
+ private RmClientAmountDayLastMapper rmClientAmountDayLastMapperDao ;//鍐滄埛鏃ョ敤姘撮噺缁熻鏈�鏂版暟鎹瓺AO
+ @Autowired
+ private RmClientAmountDayMapper rmClientAmountDayMapperDao ;//鍐滄埛鏃ョ敤姘撮噺缁熻鏁版嵁DAO
@Autowired
private RmLossLastMapper rmLossLastMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂版暟鎹瓺AO
@Autowired
@@ -417,7 +421,7 @@
//
////////////////////////////////////////////////
/**
- * 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * 寰楀埌鏈�鏂拌褰�
* @param intakeId
* @return
*/
@@ -429,7 +433,7 @@
return null ;
}
/**
- * 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * 淇濆瓨鏈�鏂拌褰�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
@@ -437,7 +441,7 @@
this.rmIntakeAmountDayLastMapperDao.insert(po) ;
}
/**
- * 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * 淇濆瓨璁板綍
* @param po
*/
@Transactional(rollbackFor = Exception.class)
@@ -445,15 +449,15 @@
this.rmIntakeAmountDayMapperDao.insert(po) ;
}
/**
- * 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * 淇濆瓨鏈�鏂拌褰�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
- public void updateRmIntakeAmountLast(RmIntakeAmountDay po){
- this.rmIntakeAmountDayMapperDao.updateByPrimaryKey(po) ;
+ public void updateRmIntakeAmountLast(RmIntakeAmountDayLast po){
+ this.rmIntakeAmountDayLastMapperDao.updateByPrimaryKey(po) ;
}
/**
- * 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * 淇濆瓨鍘嗗彶璁板綍
* @param po
*/
@Transactional(rollbackFor = Exception.class)
@@ -462,7 +466,7 @@
}
/**
- * 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙茶褰曚腑鐨勬渶鏂拌褰�
+ * 寰楀埌绗﹀悎鏉′欢鐨勫巻鍙茶褰�
* @param id
* @return
*/
@@ -470,32 +474,80 @@
return rmIntakeAmountDayMapperDao.selectByPrimaryKey(id) ;
}
+ /////////////////////////////////////////////////
+ //
+ // 鍐滄埛鏃ョ敤姘撮噺鍙婅姳璐圭粺璁″姛鑳�
+ //
+ ////////////////////////////////////////////////
+ /**
+ * 寰楀埌鏈�鏂拌褰�
+ * @param clientId
+ * @return
+ */
+ public RmClientAmountDayLast getRmClientAmountLast(Long clientId){
+ List<RmClientAmountDayLast> list = rmClientAmountDayLastMapperDao.selectByClientId(clientId) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+ /**
+ * 淇濆瓨鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmClientAmountLast(RmClientAmountDayLast po){
+ this.rmClientAmountDayLastMapperDao.insert(po) ;
+ }
+ /**
+ * 淇濆瓨璁板綍
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmClientAmountDay(RmClientAmountDay po){
+ this.rmClientAmountDayMapperDao.insert(po) ;
+ }
+ /**
+ * 鏇存柊鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmClientAmountLast(RmClientAmountDayLast po){
+ this.rmClientAmountDayLastMapperDao.updateByPrimaryKey(po) ;
+ }
+ /**
+ * 鏇存柊璁板綍
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmClientAmountDay(RmClientAmountDay po){
+ this.rmClientAmountDayMapperDao.updateByPrimaryKey(po) ;
+ }
/**
- * 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * 寰楀埌绗﹀悎鏉′欢鐨勫巻鍙茶褰�
+ * @param id
+ * @return
+ */
+ public RmClientAmountDay getRmClientAmountDay(Long id){
+ return rmClientAmountDayMapperDao.selectByPrimaryKey(id) ;
+ }
+
+
+ /**
+ * 寰楀埌绗﹀悎鏉′欢鐨勫巻鍙茶褰�
+ * @param clientId
* @param dt
* @return
*/
- public RmIntakeAmountDay getRmIntakeAmountLastByDate(Date dt){
- List<RmIntakeAmountDay> list = rmIntakeAmountDayMapperDao.selectByDate(dt) ;
+ public RmClientAmountDay getRmClientAmountByClientAndDate(Long clientId, Date dt){
+ List<RmClientAmountDay> list = rmClientAmountDayMapperDao.selectByClientAndDate(clientId, dt) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
return null ;
}
- /**
- * 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙茶褰曚腑鐨勬煇鏃ヨ褰�
- * @param dt
- * @return
- */
- public RmIntakeAmountDay getRmIntakeAmountDayByDate(Date dt){
- List<RmIntakeAmountDay> list = rmIntakeAmountDayMapperDao.selectByDate(dt) ;
- if(list != null && list.size() > 0){
- return list.get(0) ;
- }
- return null ;
- }
/////////////////////////////////////////////////
//
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java
new file mode 100644
index 0000000..1260bd9
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java
@@ -0,0 +1,343 @@
+package com.dy.rtuMw.server.rtuData.p206V1_0_0;
+
+import com.dy.common.mw.protocol.Data;
+import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83CloseVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83OpenVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd84Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCdC0Vo;
+import com.dy.common.util.DateTime;
+import com.dy.pipIrrGlobal.pojoPr.PrController;
+import com.dy.pipIrrGlobal.pojoRm.RmClientAmountDay;
+import com.dy.pipIrrGlobal.pojoRm.RmClientAmountDayLast;
+import com.dy.pipIrrGlobal.pojoRm.RmIntakeAmountDay;
+import com.dy.pipIrrGlobal.pojoRm.RmIntakeAmountDayLast;
+import com.dy.pipIrrGlobal.pojoSe.SeClient;
+import com.dy.rtuMw.server.rtuData.TaskSurpport;
+import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.Date;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/7/9 10:00
+ * @Description 鍐滄埛鏃ョ敤姘撮噺缁熻
+ */
+public class TkDealClientAmountDay extends TaskSurpport {
+
+ private static final Logger log = LogManager.getLogger(TkDealClientAmountDay.class.getName());
+
+ //绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
+ public static final String taskId = "TkDealClientAmountDay";
+
+ /**
+ * 鎵ц鑺傜偣浠诲姟: 鍙栨按鍙ｆ棩鐢ㄦ按閲忓拰婕忔崯閲�
+ *
+ * @param data 闇�瑕佸鐞嗙殑鏁版嵁
+ */
+ @Override
+ public void execute(Object data) {
+ Data d = (Data) data;
+ DataV1_0_1 dV1_0_1 = (DataV1_0_1) d.getSubData();//鍓嶉潰浠诲姟宸茬粡鍒ゆ柇涓嶄负null
+ Object cdObj = dV1_0_1.subData;
+ if (cdObj != null && cdObj instanceof DataCd83CloseVo) {
+ /*
+ 鍙兘閲囩敤DataCd83CloseVo鏉ヨ绠楀啘鎴锋棩鐢ㄦ按閲忕殑鍘熷洜锛�
+ 1銆佸鏋滈噰鐢―ataCd84Vo鏉ヨ绠楀啘鎴锋棩鐢ㄦ按閲忥紝蹇呴』閲囩敤鏈绱娴侀噺鍑忎笂娆＄疮娴侀噺鐨勫樊鍊间綔涓洪樁娈靛啘鎴风敤姘撮噺锛�
+ 鐒跺悗鍚勪釜闃舵鐩稿姞锛屽緱鍒版湰娆″啘鎴风敤姘撮噺锛岃繖涓敤姘撮噺杩樻病鍔犲埌鍐滄埛鏃ョ敤姘撮噺涓紝鍥犱负鍙湁鏀朵笉鍒癉ataCd83CloseVo
+ 涓婃姤鏁版嵁鏃舵墠鑳藉姞鍒板啘鎴风敤姘撮噺涓紝鍚﹀垯灏变細閲嶅璁＄畻锛屼絾浠�涔堟椂鍊欏強鑳藉惁鏀跺埌DataCd83CloseVo涓嶅彲棰勭煡銆�
+ 2銆佸鏋滃啘鎴锋湁澶氬紶IC鍗★紝鍚屾椂鍦ㄥ涓彇姘村彛鍙栨按锛屽皢浼氭槸鏇村鏉傜殑璁＄畻锛岃澶氭儏褰㈡洿涓嶅彲棰勬祴锛屼笖鏃堕棿澶嶆潅搴�
+ 蹇呯劧寰堥珮锛岃繖鏍风▼搴忚繍琛屾椂闂存洿闀匡紝灏嗕細閫犳垚涓婅鏁版嵁鍫靛鐜拌薄銆�
+ 3銆佹墍浠ュ彧閲囩敤涓婃姤鏁版嵁DataCd83CloseVo浣滀负璁＄畻鍐滄埛鐢ㄦ按閲忕殑鏁版嵁鏉ユ簮锛岃繖鏃跺繀鐒朵細鏈夋紡鎶ョ己澶辨儏鍐靛彂鐢燂紝閲囩敤琛ユ姤鏈哄埗鍙互寮ヨˉ涓�浜涖��
+ */
+ /*
+ 琛ユ姤DataCd83CloseVo澶勭悊鏂规硶锛�
+ 閲囩敤DataCd83CloseVo鏁版嵁涓殑鍏抽榾鏃堕棿closeDt璁＄畻鍑哄啘鎴风敤姘存棩鏈燂紝涓嶈兘鐢ㄦ暟鎹帴鏀舵棩鏈熸椂闂翠綔涓哄啘鎴风敤姘存棩鏈燂紝
+ 浣嗚繖绉嶈绠楁柟娉曞彲鑳戒細鏈夐噸澶嶄笂鎶ユ儏鍐靛彂鐢燂紝鍗抽噸澶嶈绠椾簡锛屽鏋滆鍒ゆ柇閲嶅锛屽繀鐒惰澧炲姞涓�涓叧闃�鏃堕棿鏁版嵁搴撹〃锛屽鍔犳椂闂�
+ 澶嶆潅搴︼紝璁＄畻鐢ㄦ椂灏嗕細闀匡紝鏈郴缁熷亣璁惧彧瑕丷TU涓婃姤涓婃潵鏁版嵁浜嗭紝璇存槑褰撳墠缃戠粶杈冨ソ锛屽繀鐒惰兘鏀跺埌涓嬭搴旂瓟锛屼笉浼氬彂琛岄噸澶嶈ˉ鎶ャ��
+ */
+ Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ SeClient clientVo = (SeClient)objs[3] ;//杩欎釜鍊煎璞′腑鍙湁id鍜宯ame浼氭湁鍊�
+ if(clientVo != null && clientVo.getId() != null)
+ try {
+ this.doDeal(sv, clientVo, controller, d.getRtuAddr(), dV1_0_1, (DataCd83CloseVo) cdObj);
+ } catch (Exception e) {
+ log.error("淇濆瓨鍙栨按鍙ｆ棩鐢ㄦ按閲忓拰婕忔崯閲忔暟鎹椂鍙戠敓寮傚父", e);
+ }
+ }
+ }
+
+ /**
+ * 涓氬姟澶勭悊
+ *
+ * @param sv 鏈嶅姟
+ * @param clientVo 鍐滄埛瀵硅薄
+ * @param controller 鎺у埗鍣ㄥ璞�
+ * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
+ * @param dV1_0_1 涓婃姤鏁版嵁
+ * @param cdData 涓婃姤鍏抽榾鏁版嵁瀵硅薄
+ */
+ private void doDeal(DbSv sv, SeClient clientVo, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo cdData) throws Exception {
+ RmClientAmountDayLast poLast = sv.getRmClientAmountLast(clientVo.getId());
+ if (poLast == null) {
+ //鏁版嵁搴撲腑涓嶅瓨鍦ㄨ鍐滄埛鐨勬棩鍙栨按閲忔暟鎹�
+ //棣栧厛鐢熸垚鏈�鏂版暟鎹強鍘嗗彶鏁版嵁锛屽苟鍏堜繚瀛�
+ poLast = this.newRmClientAmountLast(clientVo, dV1_0_1, cdData);
+ this.newAndSaveHistoryDataDeal(sv, clientVo, dV1_0_1, cdData, poLast);
+ sv.saveRmClientAmountLast(poLast);
+ } else {
+ if(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt).equals(poLast.rtuDtLast)){
+ //RTU鏃堕挓绛変簬鏈湴鏈�鏂版暟鎹腑鐨凴TU鏃堕挓锛岄噸澶嶄笂鎶ユ暟鎹紝涓嶈繘琛屼换浣曞鐞�
+ }else if(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt).after(poLast.rtuDtLast)){
+ //RTU鏃堕挓鏅氫簬鏈湴鏈�鏂版暟鎹腑鐨凴TU鏃堕挓锛屾槸鏂颁笂鎶ユ暟鎹�
+ Date upYmd = DateTime.dateFrom_yyyy_MM_dd1(cdData.closeDt);//閲囩敤鍏抽榾鏃ユ湡浣滀负缁熻鏃ユ湡
+ if(upYmd.equals(poLast.dt)){
+ //鍚屼竴澶╂暟鎹�
+ poLast = this.updateRmClientAmountLastBySameDateNewData(clientVo, dV1_0_1, cdData, poLast);
+ RmClientAmountDay poHistory = null ;
+ if(poLast.lastHistoryId != null){
+ poHistory = sv.getRmClientAmountDay(poLast.lastHistoryId) ;
+ }
+ if(poHistory == null){
+ this.newAndSaveHistoryDataDeal(sv, clientVo, dV1_0_1, cdData, poLast);
+ }else{
+ poHistory = this.updateRmClientAmountBySameDateNewData(clientVo, poHistory, poLast, dV1_0_1, cdData);
+ sv.updateRmClientAmountDay(poHistory);
+ }
+ sv.saveRmClientAmountLast(poLast);
+ }else if(upYmd.after(poLast.dt)){
+ //鏂扮殑鏃ユ湡
+ poLast = this.updateRmClientAmountLastByNewDateNewData(clientVo, dV1_0_1, cdData, poLast);
+ this.newAndSaveHistoryDataDeal(sv, clientVo, dV1_0_1, cdData, poLast);
+ sv.saveRmClientAmountLast(poLast);
+ }else{
+ //杩欑鎯呭喌涓嶅瓨鍦�
+ }
+ sv.updateRmClientAmountLast(poLast);
+ }else{
+ //RTU鏃堕挓鏃╀簬鏈湴鏈�鏂版暟鎹腑鐨凴TU鏃堕挓锛屾槸琛ユ姤鏁版嵁
+ Date upYmd = DateTime.dateFrom_yyyy_MM_dd1(cdData.closeDt);//閲囩敤鍏抽榾鏃ユ湡浣滀负缁熻鏃ユ湡
+ RmClientAmountDay poHistory = sv.getRmClientAmountByClientAndDate(clientVo.getId(), upYmd) ;
+ if(poHistory == null){
+ //鏃犲巻鍙叉暟鎹�
+ this.newAndSaveHistoryDataDeal(sv, clientVo, dV1_0_1, cdData, null);
+ }else{
+ poHistory = this.updateOldRmClientAmountBySupplyData(clientVo, poHistory, dV1_0_1, cdData);
+ sv.updateRmClientAmountDay(poHistory);
+ }
+ }
+ }
+ }
+
+
+ /**
+ * 鐢熸垚鏂扮殑鎺у埗鍣ㄦ紡鎹熸棩缁熻鏈�鏂拌褰�
+ * @param clientVo
+ * @param dV1_0_1
+ * @param cdData
+ * @return
+ * @throws Exception
+ */
+ private RmClientAmountDayLast newRmClientAmountLast(SeClient clientVo, DataV1_0_1 dV1_0_1, DataCd83CloseVo cdData)throws Exception {
+ RmClientAmountDayLast po = new RmClientAmountDayLast() ;
+ po.clientId = clientVo.getId();
+ po.amount = cdData.thisAmount ;
+ po.money = cdData.thisMoney ;
+ po.dt = DateTime.dateFrom_yyyy_MM_dd1(cdData.closeDt);//閲囩敤鍏抽榾鏃ユ湡浣滀负缁熻鏃ユ湡
+ po.openDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.openDt);
+ po.closeDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.closeDt);
+ po.thisAmountLast = cdData.thisAmount ;
+ po.thisMoneyLast = cdData.thisMoney ;
+ po.thisTimeLast = cdData.thisTime ;
+ po.rtuDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
+ return po ;
+ }
+
+ /**
+ * 鐢熸垚鏂扮殑鎺у埗鍣ㄦ紡鎹熸棩缁熻鍘嗗彶璁板綍
+ * @param clientVo
+ * @param dV1_0_1
+ * @param cdData
+ * @param lastPo
+ * @return
+ * @throws Exception
+ */
+ private RmClientAmountDay newRmClientAmountDay(SeClient clientVo, DataV1_0_1 dV1_0_1, DataCd83CloseVo cdData, RmClientAmountDayLast lastPo)throws Exception {
+ RmClientAmountDay poHistory = new RmClientAmountDay() ;
+ poHistory.clientId = clientVo.getId();
+ if(lastPo != null){
+ if(poHistory.amount != null){
+ poHistory.amount += lastPo.amount ;
+ }else{
+ poHistory.amount = lastPo.amount ;
+ }
+ if(poHistory.money != null){
+ poHistory.money += lastPo.money ;
+ }else{
+ poHistory.money = lastPo.money ;
+ }
+ poHistory.dt = lastPo.dt ;
+ poHistory.openDtLast = lastPo.openDtLast ;
+ poHistory.closeDtLast = lastPo.closeDtLast ;
+ poHistory.thisAmountLast = lastPo.thisAmountLast ;
+ poHistory.thisMoneyLast = lastPo.thisMoneyLast ;
+ poHistory.thisTimeLast = lastPo.thisTimeLast ;
+ poHistory.rtuDtLast = lastPo.rtuDtLast ;
+ }else{
+ poHistory.amount = cdData.thisAmount ;
+ poHistory.money = cdData.thisMoney ;
+ poHistory.dt = DateTime.dateFrom_yyyy_MM_dd1(cdData.closeDt);//閲囩敤鍏抽榾鏃ユ湡浣滀负缁熻鏃ユ湡
+ poHistory.openDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.openDt);
+ poHistory.closeDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.closeDt);
+ poHistory.thisAmountLast = cdData.thisAmount ;
+ poHistory.thisMoneyLast = cdData.thisMoney ;
+ poHistory.thisTimeLast = cdData.thisTime ;
+ poHistory.rtuDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
+ }
+ return poHistory ;
+ }
+
+
+ /**
+ * 淇濆瓨鏂扮殑鍘嗗彶鏁版嵁璁板綍锛屽苟鎶奍D璧嬪�肩粰鏈�鏂拌褰曠殑 lastHistoryId
+ * @param sv
+ * @param clientVo
+ * @param dV1_0_1
+ * @param cdData
+ * @param lastPo
+ * @throws Exception
+ * @return RmIntakeAmountDay
+ */
+ private RmClientAmountDay newAndSaveHistoryDataDeal(DbSv sv, SeClient clientVo, DataV1_0_1 dV1_0_1, DataCd83CloseVo cdData, RmClientAmountDayLast lastPo)throws Exception {
+ RmClientAmountDay poHistory = this.newRmClientAmountDay(clientVo, dV1_0_1, cdData, lastPo) ;
+ sv.saveRmClientAmountDay(poHistory);
+ //鐢辨渶鏂版暟鎹寔鏈夊巻鍙叉暟鎹腑鐨勬渶鏂拌褰旾D锛屼互鏂逛究蹇�熸煡璇�
+ lastPo.lastHistoryId = poHistory == null ? null: poHistory.id ;
+ return poHistory ;
+ }
+
+ /**
+ * 鏇存柊鏈�鏂版暟鎹�
+ * @param clientVo
+ * @param dV1_0_1
+ * @param cdData
+ * @param lastPo
+ * @return
+ * @throws Exception
+ */
+ private RmClientAmountDayLast updateRmClientAmountLastBySameDateNewData(SeClient clientVo, DataV1_0_1 dV1_0_1, DataCd83CloseVo cdData, RmClientAmountDayLast lastPo)throws Exception {
+ lastPo.clientId = clientVo.getId();
+ if(lastPo.amount != null){
+ lastPo.amount += cdData.thisAmount ;
+ }else{
+ lastPo.amount = cdData.thisAmount ;
+ }
+ if(lastPo.money != null){
+ lastPo.money += cdData.thisMoney ;
+ }else{
+ lastPo.money = cdData.thisMoney ;
+ }
+ lastPo.dt = DateTime.dateFrom_yyyy_MM_dd1(cdData.closeDt);//閲囩敤鍏抽榾鏃ユ湡浣滀负缁熻鏃ユ湡
+ lastPo.openDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.openDt);
+ lastPo.closeDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.closeDt);
+ lastPo.thisAmountLast = cdData.thisAmount ;
+ lastPo.thisMoneyLast = cdData.thisMoney ;
+ lastPo.thisTimeLast = cdData.thisTime ;
+ lastPo.rtuDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
+ return lastPo ;
+ }
+
+
+ /**
+ * 鏇存柊鏈�鏂版暟鎹�
+ * @param clientVo
+ * @param dV1_0_1
+ * @param cdData
+ * @param lastPo
+ * @return
+ * @throws Exception
+ */
+ private RmClientAmountDayLast updateRmClientAmountLastByNewDateNewData(SeClient clientVo, DataV1_0_1 dV1_0_1, DataCd83CloseVo cdData, RmClientAmountDayLast lastPo)throws Exception {
+ lastPo.clientId = clientVo.getId();
+ lastPo.amount = cdData.thisAmount ;
+ lastPo.money = cdData.thisMoney ;
+ lastPo.dt = DateTime.dateFrom_yyyy_MM_dd1(cdData.closeDt);//閲囩敤鍏抽榾鏃ユ湡浣滀负缁熻鏃ユ湡
+ lastPo.openDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.openDt);
+ lastPo.closeDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.closeDt);
+ lastPo.thisAmountLast = cdData.thisAmount ;
+ lastPo.thisMoneyLast = cdData.thisMoney ;
+ lastPo.thisTimeLast = cdData.thisTime ;
+ lastPo.rtuDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
+ return lastPo ;
+ }
+ /**
+ * 鏇存柊鏈�鏂版暟鎹�
+ * @param clientVo
+ * @param poHistory
+ * @param dV1_0_1
+ * @param cdData
+ * @param lastPo
+ * @return
+ * @throws Exception
+ */
+ private RmClientAmountDay updateRmClientAmountBySameDateNewData(SeClient clientVo, RmClientAmountDay poHistory, RmClientAmountDayLast lastPo, DataV1_0_1 dV1_0_1, DataCd83CloseVo cdData)throws Exception {
+ poHistory.clientId = clientVo.getId();
+ if(poHistory.amount != null){
+ poHistory.amount += cdData.thisAmount ;
+ }else{
+ poHistory.amount = cdData.thisAmount ;
+ }
+ if(poHistory.money != null){
+ poHistory.money += cdData.thisMoney ;
+ }else{
+ poHistory.money = cdData.thisMoney ;
+ }
+ poHistory.dt = lastPo.dt ;
+ poHistory.openDtLast = lastPo.openDtLast ;
+ poHistory.closeDtLast = lastPo.closeDtLast ;
+ poHistory.thisAmountLast = lastPo.thisAmountLast ;
+ poHistory.thisMoneyLast = lastPo.thisMoneyLast ;
+ poHistory.thisTimeLast = lastPo.thisTimeLast ;
+ poHistory.rtuDtLast = lastPo.rtuDtLast ;
+ return poHistory ;
+ }
+
+ /**
+ * 鏇存柊鏈�鏂版暟鎹�
+ * @param clientVo
+ * @param poHistory
+ * @param dV1_0_1
+ * @param cdData
+ * @return
+ * @throws Exception
+ */
+ private RmClientAmountDay updateOldRmClientAmountBySupplyData(SeClient clientVo, RmClientAmountDay poHistory, DataV1_0_1 dV1_0_1, DataCd83CloseVo cdData)throws Exception {
+ poHistory.clientId = clientVo.getId();
+ if(poHistory.amount != null){
+ poHistory.amount += cdData.thisAmount ;
+ }else{
+ poHistory.amount = cdData.thisAmount ;
+ }
+ if(poHistory.money != null){
+ poHistory.money += cdData.thisMoney ;
+ }else{
+ poHistory.money = cdData.thisMoney ;
+ }
+ poHistory.dt = DateTime.dateFrom_yyyy_MM_dd1(cdData.closeDt);//閲囩敤鍏抽榾鏃ユ湡浣滀负缁熻鏃ユ湡
+ poHistory.openDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.openDt) ;
+ poHistory.closeDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.closeDt) ;
+ poHistory.thisAmountLast = cdData.thisAmount ;
+ poHistory.thisMoneyLast = cdData.thisMoney ;
+ poHistory.thisTimeLast = cdData.thisTime ;
+ poHistory.rtuDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt) ;
+ return poHistory ;
+ }
+
+
+
+
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealIntakeAmountDay.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealIntakeAmountDay.java
index 07ecd63..0f1af39 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealIntakeAmountDay.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealIntakeAmountDay.java
@@ -22,7 +22,7 @@
*/
public class TkDealIntakeAmountDay extends TaskSurpport {
- private static final Logger log = LogManager.getLogger(TkDealLoss.class.getName());
+ private static final Logger log = LogManager.getLogger(TkDealIntakeAmountDay.class.getName());
//绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
public static final String taskId = "TkDealIntakeAmountDay";
@@ -73,23 +73,40 @@
private void doDeal(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, UpDataVo dataVo) throws Exception {
RmIntakeAmountDayLast poLast = sv.getRmIntakeAmountLast(controller.getIntakeId());
if (poLast == null) {
- //鏁版嵁搴撲腑涓嶅瓨鍦ㄨ鍙栨按鍙ｇ殑婕忔崯鏁版嵁
+ //鏁版嵁搴撲腑涓嶅瓨鍦ㄨ鍙栨按鍙ｇ殑鏃ュ彇姘撮噺鏁版嵁
//棣栧厛鐢熸垚鏈�鏂版暟鎹強鍘嗗彶鏁版嵁锛屽苟鍏堜繚瀛�
poLast = this.newRmIntakeAmountLast(controller, rtuAddr, dV1_0_1, dataVo);
this.newAndSaveHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataVo, poLast);
sv.saveRmIntakeAmountLast(poLast);
} else {
if(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataVo.rtuDt).before(poLast.rtuDtLast)){
- //RTU鏃堕挓鏃╀簬鏈湴RTU鏃堕挓锛屾槸琛ユ姤锛岃ˉ鎶ユ病娉曡绠楀彇姘村彛鏃ョ疮璁″彇姘撮噺锛屽洜涓洪噰鐢ㄧ殑鏄疮璁℃祦閲忕浉宸殑璁＄畻鏂规硶
+ //RTU鏃堕挓鏃╀簬鏈湴RTU鏃堕挓锛屾槸琛ユ姤锛屼笉鐢ㄨˉ鎶ユ潵璁＄畻鍙栨按鍙ｆ棩绱鍙栨按閲忥紝鍥犱负閲囩敤鐨勬槸绱娴侀噺鐩稿樊鐨勮绠楁柟娉曪紝
+ //鍏跺疄琛ユ姤鐨勯噺鍊硷紝鍩轰簬鍓嶉潰涓婃姤鏁版嵁宸茬粡璁＄畻鍖呭惈浜嗭紝鍙槸閲忓�煎綊缁撶殑鏃ユ湡涓嶆纭舰浜嗐��
}else if(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataVo.rtuDt).equals(poLast.rtuDtLast)){
//RTU鏃堕挓绛変簬鏈湴RTU鏃堕挓锛岄噸澶嶄笂鎶ユ暟鎹紝涓嶈繘琛屼换浣曞鐞�
}else{
- //涓婅鏁版嵁涓殑鏃ユ湡鏃堕棿绗﹀悎鍙绠楃殑鏉′欢
+ //涓婅鏁版嵁涓殑鏃ユ湡鏃堕棿绗﹀悎璁＄畻鐨勬潯浠�
if(!rtuAddr.equals(poLast.rtuAddrLast)){
- //鏇存崲浜嗘帶鍒跺櫒锛屽彧鏇存崲鎺у埗鍣ㄥ湴鍧�锛屼笉杩涜姘撮噺璁＄畻
- poLast = this.updateRmIntakeAmountLastByControllerChange(poLast, controller, rtuAddr, dV1_0_1, dataVo);
- //鍥犱负涓婅鏁版嵁涓殑鏃ユ湡鏃堕棿鏄彲杩涜璁＄畻鐨勶紝鎵�浠ユ柊鐢熸垚涓�涓巻鍙茶褰�
- this.newAndSaveHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataVo, poLast);
+ //鏇存崲浜嗘帶鍒跺櫒锛屽鐞嗘柟娉曪細鍙洿鎹㈡帶鍒跺櫒鍦板潃锛屼笉杩涜姘撮噺璁＄畻
+ //鍥犱负涓婅鏁版嵁涓殑鏃ユ湡鏃堕棿鏄彲杩涜璁＄畻鐨�
+ if(DateTime.dateFrom_yyyy_MM_dd1(dV1_0_1.dt).equals(poLast.dt)){
+ //鍚屼竴澶╂暟鎹�
+ poLast = this.updateRmIntakeAmountLastByControllerChange(poLast, controller, rtuAddr, dV1_0_1, dataVo);
+ RmIntakeAmountDay poHistory = null ;
+ if(poLast.lastHistoryId != null){
+ poHistory = sv.getRmIntakeAmountDay(poLast.lastHistoryId) ;
+ }
+ if(poHistory == null){
+ this.newAndSaveHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataVo, poLast);
+ }else{
+ poHistory = this.updateRmIntakeAmountByControllerChange(poHistory, poLast, controller, rtuAddr, dV1_0_1, dataVo);
+ sv.updateRmIntakeAmountDay(poHistory);
+ }
+ }else{
+ //闈炲悓涓�澶╋紝鎵�浠ユ柊鐢熸垚涓�涓巻鍙茶褰�
+ poLast = this.updateRmIntakeAmountLastByControllerChange(poLast, controller, rtuAddr, dV1_0_1, dataVo);
+ this.newAndSaveHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataVo, poLast);
+ }
sv.saveRmIntakeAmountLast(poLast);
}else{
//鏈洿鎹㈡帶鍒跺櫒
@@ -117,6 +134,8 @@
}
}
}
+ //鏇存柊鏈�鏂版暟鎹�
+ sv.updateRmIntakeAmountLast(poLast);
}
}
@@ -164,14 +183,13 @@
}else{
po.amount = 0.0D ;
}
- po.amount = lastPo==null?0.0D:lastPo.amount ;
po.totalAmountLast = cdData.totalAmount ;
return po ;
}
/**
- * 淇濆瓨鏂扮殑寮�闃�涓婃姤鍘嗗彶鏁版嵁璁板綍锛屽苟鎶奍D璧嬪�肩粰鏈�鏂拌褰曠殑 lastHistoryId
+ * 淇濆瓨鏂扮殑鍘嗗彶鏁版嵁璁板綍锛屽苟鎶奍D璧嬪�肩粰鏈�鏂拌褰曠殑 lastHistoryId
* @param sv
* @param controller
* @param rtuAddr
@@ -206,7 +224,7 @@
lastPo.dt = DateTime.dateFrom_yyyy_MM_dd1(dV1_0_1.dt);
lastPo.dtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
lastPo.rtuDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
- //lastPo.amount = lastPo.amount ; //绱鍙栨按閲忎笉鍙�
+ //lastPo.amount = lastPo.amount ; //鏃ョ疮璁″彇姘撮噺涓嶅彉
lastPo.totalAmountLast = cdData.totalAmount ;
return lastPo ;
}
@@ -231,12 +249,11 @@
if(difference > 0){
lastPo.amount = difference;
}else{
- //po.amount = po.amount ; //绱鍙栨按閲忎笉鍙�
+ //po.amount = po.amount ; //鏃ョ疮璁″彇姘撮噺涓嶅彉
}
lastPo.totalAmountLast = cdData.totalAmount ;
return lastPo ;
}
-
/**
* 鏇存柊鏈�鏂拌褰�
@@ -265,6 +282,29 @@
}
/**
+ * 鐢熸垚鏂扮殑鎺у埗鍣ㄦ紡鎹熸棩缁熻鏈�鏂拌褰�
+ * @param controller
+ * @param rtuAddr
+ * @param dV1_0_1
+ * @param cdData
+ * @return
+ * @throws Exception
+ */
+ private RmIntakeAmountDay updateRmIntakeAmountByControllerChange(RmIntakeAmountDay po, RmIntakeAmountDayLast lastPo, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, UpDataVo cdData)throws Exception {
+ po.intakeId = controller==null?null:controller.getIntakeId();
+ po.controllerIdLast = controller==null?null:controller.getId();
+ po.rtuAddrLast = rtuAddr;
+ po.dt = lastPo.dt ;
+ po.dtLast = lastPo.dtLast;
+ po.rtuDtLast = lastPo.rtuDtLast;
+
+ po.amount = lastPo.amount ;
+ po.totalAmountLast = lastPo.totalAmountLast ;
+
+ return po ;
+ }
+
+ /**
* 鏇存柊鍘嗗彶璁板綍
* @param controller
* @param rtuAddr
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java
index 828d061..225fc0c 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java
@@ -94,6 +94,7 @@
//杩欑鎯呭喌涓嶅瓨鍦紙RTU鏃堕挓鏃╀簬鏈湴璁板綍涓殑RTU鏃堕挓锛圧TU绌胯秺鍥炶繃鍘讳簡锛屽彲鑳芥椂閽熼噸缃簡锛夛紝姝ょ鎯呭喌涓嶅鐞嗭級
}
}
+ sv.updateRmLossLast(poLast);
}
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
index c49c3c0..536a3db 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
@@ -7,6 +7,7 @@
import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.*;
import com.dy.pipIrrGlobal.pojoSe.SeClient;
+import com.dy.rtuMw.server.ServerProperties;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import com.dy.common.mw.protocol.Data;
@@ -46,7 +47,7 @@
controllerTramp = sv.getPrControllerTrampByRtuAddr(rtuAddr);
if(controllerTramp == null){
//绗竴娆″彂鐜�
- controllerTramp = new PrControllerTramp(null, rtuAddr, d.getProtocol(), new Date()) ;
+ controllerTramp = new PrControllerTramp(null, rtuAddr, d.getProtocol(), new Date(), ServerProperties.orgTag) ;
//绗竴娆″彂鐜帮紝涓嬪彂娓呯┖RTU鍘嗗彶鍛戒护锛屼互浣垮叾閲嶆柊寮�濮嬭褰曟柊鍦扮偣鐨勬暟鎹�
this.sendClearCommand(rtuAddr, d.protocol);
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java
index 3158cfb..2ca35ca 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java
@@ -8,6 +8,7 @@
import com.dy.common.springUtil.SpringContextUtil;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
+import com.dy.rtuMw.server.ServerProperties;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import com.dy.rtuMw.web.com.CommandCtrl;
@@ -45,7 +46,7 @@
controllerTramp = sv.getPrControllerTrampByRtuAddr(rtuAddr);
if(controllerTramp == null){
//绗竴娆″彂鐜�
- controllerTramp = new PrControllerTramp(null, rtuAddr, d.getProtocol(), new Date()) ;
+ controllerTramp = new PrControllerTramp(null, rtuAddr, d.getProtocol(), new Date(), ServerProperties.orgTag) ;
//绗竴娆″彂鐜帮紝涓嬪彂娓呯┖RTU鍘嗗彶鍛戒护锛屼互浣垮叾閲嶆柊寮�濮嬭褰曟柊鍦扮偣鐨勬暟鎹�
this.sendClearCommand(rtuAddr, d.protocol);
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
index 5faedf0..55cd26e 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
@@ -21,7 +21,8 @@
<task id="TkDealOpenValveReport" name="鎺у埗鍣ㄥ紑闃�涓婃姤(鍔熻兘鐮�83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealOpenValveReport" />
<task id="TkDealCloseValveReport" name="鎺у埗鍣ㄥ叧闃�涓婃姤(鍔熻兘鐮�83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealCloseValveReport" />
<task id="TkDealLoss" name="鍙栨按鍙ｆ棩婕忔崯閲�(鍔熻兘鐮丆0)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealLoss" />
- <task id="TkDealIntakeAmountDay" name="鍙栨按鍙ｆ棩鐢ㄦ按閲忓拰婕忔崯閲�(鍔熻兘鐮�84銆佸姛鑳界爜83銆佸姛鑳界爜C0)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealIntakeAmountDay" />
+ <task id="TkDealIntakeAmountDay" name="鍙栨按鍙ｆ棩鐢ㄦ按閲�(鍔熻兘鐮�84銆佸姛鑳界爜83銆佸姛鑳界爜C0)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealIntakeAmountDay" />
+ <task id="TkDealClientAmountDay" name="鍐滄埛鏃ョ敤姘撮噺(鍔熻兘鐮�84銆佸姛鑳界爜83銆佸姛鑳界爜C0)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealClientAmountDay" />
</task>
<!-- 璇嗗埆鍛戒护鍝嶅簲鏁版嵁 -->
<task id="TkFindComResponse" name="璇嗗埆鍝嶅簲鍛戒护鏁版嵁" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkFindComResponse">
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
index e096222..87ad035 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
@@ -3,6 +3,7 @@
<server name="閫氫俊涓棿浠�" showStartInfo="true" company="http://www.dyjs.com"/>
<!--
鍩烘湰閰嶇疆
+ orgTag 鏈烘瀯tag(瀵瑰簲鏈烘瀯tag,鍜屾暟鎹簮鍚庣紑)
isLowPower: 鏄惁涓轰綆鍔熻��
onlyOneProtocol锛氬湪鏀寔澶氶�氫俊鍗忚鏃讹紝鍙湁RTU涓婄嚎浜嗭紝鎵嶈兘璇嗗埆鍑鸿RTU瀹為檯鐢ㄧ殑閫氫俊鍗忚锛岃繘鑰岀敤姝ゅ崗璁В鏋愪笂琛屾暟鎹強鏋勯�犱笅琛屽懡浠ゃ��
濡傛灉RTU鏈浘涓婄嚎锛堥�氫俊涓棿浠跺惎鍔ㄥ悗璇TU鏈浘涓婄嚎锛夛紝閭ｄ箞鍦ㄥ悜瀹冨彂閫佷笅琛屽懡浠ゆ椂锛屼笉鑳藉垽鏂嚭鍏堕噰鐢ㄧ殑鍗忚锛屼篃涓嶈兘鏋勯�犲懡浠わ紝灏ゅ叾鏄綆鍔熻�楁儏鍐典笅锛屼笉涓婄嚎鏄甯哥幇璞°��
@@ -18,7 +19,8 @@
cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
disconnectedByNoUpDataMinutes锛氭病鏈変笂琛屾暟鎹殑鍒嗛挓鏁帮紝杈惧埌杩欎釜鍒嗛挓鏁帮紝璁や负RTU鏂綉浜嗭紝鍙栧�艰寖鍥存槸2_100
-->
- <base
+ <base
+ orgTag="ym"
isLowPower="false"
onlyOneProtocol="true"
downComandMaxResendTimes="1"
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/MyThreadJob.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/MyThreadJob.java
index 0f58f3e..fe1eae5 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/MyThreadJob.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/MyThreadJob.java
@@ -14,6 +14,16 @@
private static final Logger log = LogManager.getLogger(MyThreadJob.class) ;
+ public static String icCardAddr = "3B7D1E1A" ;
+ public static String icCardNo = "61181622830147821" ;
+ public static String openValveDt = "240711163700" ;
+ public static String cdC0 = "C0" ;
+ public static String cd83Open = "83Open" ;
+ public static String cd83Close = "83Close" ;
+
+
+ public static String curCd = cdC0 ;//閫氳繃淇敼杩欎釜鍊硷紝鏉ユ敼鍙樹笂鎶ユ暟鎹被鍨�
+
public String rtuAddr;
public String serverIp;
public Integer serverPort;
@@ -44,7 +54,7 @@
if(sendTimes <= ServerProperties.sendTimes){
log.info("RTU" + rtuAddr + "寮�濮嬩换鍔�");
log.info("RTU" + rtuAddr + "灏嗚鎵ц" + ServerProperties.sendTimes + "杞浠诲姟锛屽綋鍓嶈疆娆℃槸" + sendTimes);
- sendDataOfP206V1_0_0() ;
+ sendDataOfP206V1_0_0(curCd) ;
}else{
if(ServerProperties.sendOverThenCloseConnect == 1){
log.info("RTU" + rtuAddr + "绛夊緟涓�浼氾紝浠ユ帴鏀堕�氫俊涓棿浠朵笅琛屾暟鎹�");
@@ -64,11 +74,20 @@
}
}
- private void sendDataOfP206V1_0_0(){
+ private void sendDataOfP206V1_0_0(String cd){
try{
if(heartbeatTimes > ServerProperties.heartbeatTimes){
heartbeatTimes = 1 ;
- this.sendReportData() ;
+ byte[] bs = null ;
+ if(cd.equals(cdC0)){
+ bs = RtuUpData.createCdC0(this.rtuAddr) ;
+ }else if(cd.equals(cd83Open)){
+ bs = RtuUpData.createCd83Open(this.rtuAddr, icCardAddr, icCardNo, openValveDt) ;
+ }else if(cd.equals(cd83Close)){
+ bs = RtuUpData.createCd83Close(this.rtuAddr, icCardAddr, icCardNo, openValveDt) ;
+ }
+ this.session.write(bs) ;
+ log.info("RTU" + rtuAddr + "鍙戦�佷簡涓婅鏁版嵁锛�" + ByteUtil.bytes2Hex(bs, false));
TcpClUnit.clientSendData();
sendTimes++ ;
}else{
@@ -82,7 +101,7 @@
}
private void sendHeartbeat(){
try{
- byte[] bs = this.createHeartbeat() ;
+ byte[] bs = RtuUpData.createHeartbeat(this.rtuAddr) ;
this.session.write(bs) ;
log.info("RTU" + rtuAddr + "鍙戦�佷簡蹇冭烦鏁版嵁锛�" + ByteUtil.bytes2Hex(bs, false));
}catch (Exception e){
@@ -90,15 +109,6 @@
}
}
- private void sendReportData(){
- try{
- byte[] bs = this.createReport() ;
- this.session.write(bs) ;
- log.info("RTU" + rtuAddr + "鍙戦�佷簡涓婃姤鏁版嵁锛�" + ByteUtil.bytes2Hex(bs, false));
- }catch (Exception e){
- e.printStackTrace();
- }
- }
private void jobOver(){
if(ServerProperties.sendOverThenCloseConnect == 1){
@@ -108,128 +118,6 @@
TcpClUnit.clientOver() ;
}
- /**
- * 鏋勯�犲績璺虫暟鎹�
- * @return 瀛楄妭鏁扮粍
- * @throws Exception 寮傚父
- */
- public byte[] createHeartbeat( ) 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 ;
-
- index++ ;
- bsHead[index] = 0 ;//甯ч暱搴�
-
- index++ ;
- bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
-
- index++ ;
- bsHead[index] = commonV1_0_1.createCtrl((byte)0x80, (byte)0) ;//鎺у埗鍩熷姛鑳界爜锛氱‘璁� 璁ゅ彲
-
- index++ ;
- GlCreate.createRtuAddr(this.rtuAddr, bsHead, index);
- index += 5 ;
-
- ByteUtil.hex2Bytes("02", bsHead, index) ;
-
- byte[] bs = new byte[1] ;
- bs[0] = (byte)0xF2 ;//鏁版嵁鍩燂細 1 涓瓧鑺傦紝F0 鐧诲綍锛� F1 閫�鍑虹櫥褰曪紝F2 鍦ㄧ嚎淇濇寔銆�
-
- bytes = ByteUtil.bytesMerge(bsHead, bs) ;
-
- GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
-
- byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
-
- bytes = ByteUtil.bytesMerge(bytes, bsTail) ;
-
- return bytes ;
- }
-
- /**
- * 鏋勯�犱笂鎶ユ暟鎹�
- * @return 瀛楄妭鏁扮粍
- * @throws Exception 寮傚父
- */
- public byte[] createReport( ) 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 ;
-
- index++ ;
- bsHead[index] = 0 ;//甯ч暱搴�
-
- index++ ;
- bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
-
- index++ ;
- bsHead[index] = commonV1_0_1.createCtrl((byte)0x80, (byte)3) ;//鎺у埗鍩熷姛鑳界爜3锛氳嚜鎶ュ抚锛屾祦閲忥紙姘撮噺锛夊弬鏁�
-
- index++ ;
- GlCreate.createRtuAddr(this.rtuAddr, bsHead, index);
- index += 5 ;
-
- ByteUtil.hex2Bytes("C0", bsHead, index) ;
-
- byte[] bs = new byte[2] ;
- bs[0] = (byte)0x04 ;//鏈夋祦閲忔暟鎹�
- bs[1] = (byte)0xE0 ;//鏈夋按鍘嬨�佺數姹犵數鍘嬨�佷俊鍙峰己搴�
-
- bytes = ByteUtil.bytesMerge(bsHead, bs) ;
-
- bs = new byte[5] ;//鐬椂娴侀噺
- bs[0] = ByteUtil.int2BCD_LE (21)[0] ;
- bs[1] = ByteUtil.int2BCD_LE (43)[0] ;
- bs[2] = ByteUtil.int2BCD_LE (65)[0] ;
- bytes = ByteUtil.bytesMerge(bytes, bs) ;
-
- bs = new byte[5] ;//绱娴侀噺
- bs[0] = ByteUtil.int2BCD_LE (21)[0] ;
- bs[1] = ByteUtil.int2BCD_LE (43)[0] ;
- bs[2] = ByteUtil.int2BCD_LE (65)[0] ;
- bs[3] = ByteUtil.int2BCD_LE (87)[0] ;
- bytes = ByteUtil.bytesMerge(bytes, bs) ;
-
- bs = new byte[5] ;//鎹熷け娴侀噺
- bs[0] = ByteUtil.int2BCD_LE (10)[0] ;
- bs[1] = ByteUtil.int2BCD_LE (32)[0] ;
- bs[2] = ByteUtil.int2BCD_LE (54)[0] ;
- bytes = ByteUtil.bytesMerge(bytes, bs) ;
-
- bs = new byte[4] ;//姘村帇
- bs[0] = ByteUtil.int2BCD_LE (10)[0] ;
- bs[1] = ByteUtil.int2BCD_LE (32)[0] ;
- bs[2] = ByteUtil.int2BCD_LE (4)[0] ;
- bytes = ByteUtil.bytesMerge(bytes, bs) ;
-
- bs = new byte[4] ;//鐢垫睜鐢靛帇
- bs[0] = ByteUtil.int2BCD_LE (10)[0] ;
- bs[1] = ByteUtil.int2BCD_LE (32)[0] ;
- bs[2] = ByteUtil.int2BCD_LE (10)[0] ;
- bs[3] = ByteUtil.int2BCD_LE (32)[0] ;
- bytes = ByteUtil.bytesMerge(bytes, bs) ;
-
- bs = new byte[1] ;//淇″彿寮哄害
- bs[0] = ByteUtil.int2BCD_LE (21)[0] ;
- bytes = ByteUtil.bytesMerge(bytes, bs) ;
-
- bs = new byte[6] ;//鏃堕挓
- GlCreate.createTp(bs, 0);
- bytes = ByteUtil.bytesMerge(bytes, bs) ;
-
- GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
-
- byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
-
- bytes = ByteUtil.bytesMerge(bytes, bsTail) ;
-
- return bytes ;
- }
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java
new file mode 100644
index 0000000..f3659c2
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java
@@ -0,0 +1,287 @@
+package com.dy.testClient.tcpClient;
+
+import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
+import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
+import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlCreate;
+import com.dy.common.util.ByteUtil;
+import com.dy.common.util.ByteUtilUnsigned;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/7/11 13:55
+ * @Description
+ */
+public class RtuUpData {
+
+ private static byte[] creatHead(String rtuAddr, String code, byte ctrl)throws Exception {
+ byte[] bsHead = new byte[ProtocolConstantV206V1_0_0.lenHead2Code] ;
+ byte index = 0 ;
+ bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+
+ index++ ;
+ bsHead[index] = 0 ;//甯ч暱搴�
+
+ index++ ;
+ bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+
+ index++ ;
+ bsHead[index] = ctrl; //鎺у埗鍩熷姛鑳界爜
+
+ index++ ;
+ GlCreate.createRtuAddr(rtuAddr, bsHead, index);
+ index += 5 ;
+
+ ByteUtil.hex2Bytes(code, bsHead, index) ;
+
+ return bsHead ;
+ }
+
+
+ /**
+ * 鏋勯�犲績璺虫暟鎹�
+ * @return 瀛楄妭鏁扮粍
+ * @throws Exception 寮傚父
+ */
+ public static byte[] createHeartbeat(String rtuAddr) throws Exception {
+ byte[] bytes = creatHead(rtuAddr, "02", (byte)0xB0);
+
+ byte[] bs = new byte[1] ;
+ bs[0] = (byte)0xF2 ;//鏁版嵁鍩燂細 1 涓瓧鑺傦紝F0 鐧诲綍锛� F1 閫�鍑虹櫥褰曪紝F2 鍦ㄧ嚎淇濇寔銆�
+
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
+
+ byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
+
+ bytes = ByteUtil.bytesMerge(bytes, bsTail) ;
+
+ return bytes ;
+ }
+
+ /**
+ * 鏋勯�犱笂鎶ユ暟鎹�
+ * @return 瀛楄妭鏁扮粍
+ * @throws Exception 寮傚父
+ */
+ public static byte[] createCd83Open(String rtuAddr, String icCardAddr, String icCardNo, String openValveDt) throws Exception {
+ byte[] bytes = creatHead(rtuAddr, "83", (byte)0xB0);
+
+ byte[] bs = new byte[1] ;
+ bs[0] = (byte)0x01 ;//鍒峰崱寮�闃�
+
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[5] ;//绱娴侀噺
+ bs[0] = ByteUtil.int2BCD_LE (21)[0] ;
+ bs[1] = ByteUtil.int2BCD_LE (43)[0] ;
+ bs[2] = ByteUtil.int2BCD_LE (0)[0] ;
+ bs[3] = ByteUtil.int2BCD_LE (0)[0] ;
+ bs[4] = ByteUtil.int2BCD_LE (0)[0] ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[8] ;//IC鍗＄紪鍙�
+ GlCreate.createIcCardNo(icCardNo, bs, 0);
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[4] ;//IC鍗″湴鍧�
+ ByteUtil.hex2Bytes_LE(icCardAddr, bs, 0);
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[4] ;//鐢ㄦ按鎴蜂綑棰�
+ bs[0] = ByteUtil.int2BCD_LE (21)[0] ;
+ bs[1] = ByteUtil.int2BCD_LE (43)[0] ;
+ bs[2] = ByteUtil.int2BCD_LE (0)[0] ;
+ bs[3] = ByteUtil.int2BCD_LE (0)[0] ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[6] ;//寮�闃�鏃堕棿
+ GlCreate.createTp(openValveDt, bs, 0);
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[6] ;//鎺у埗鍣ㄦ椂閽�
+ GlCreate.createTp(bs, 0);
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
+
+ byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
+
+ bytes = ByteUtil.bytesMerge(bytes, bsTail) ;
+
+ return bytes ;
+ }
+
+
+ /**
+ * 鏋勯�犱笂鎶ユ暟鎹�
+ * @return 瀛楄妭鏁扮粍
+ * @throws Exception 寮傚父
+ */
+ public static byte[] createCd83Close(String rtuAddr, String icCardAddr, String icCardNo, String openValveDt) throws Exception {
+ byte[] bytes = creatHead(rtuAddr, "83", (byte)0xB0);
+
+ byte[] bs = new byte[1] ;
+ bs[0] = (byte)0x02 ;//鍒峰崱鍏抽榾
+
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[5] ;//绱娴侀噺
+ bs[0] = ByteUtil.int2BCD_LE (21)[0] ;
+ bs[1] = ByteUtil.int2BCD_LE (53)[0] ;
+ bs[2] = ByteUtil.int2BCD_LE (0)[0] ;
+ bs[3] = ByteUtil.int2BCD_LE (0)[0] ;
+ bs[4] = ByteUtil.int2BCD_LE (0)[0] ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[8] ;//IC鍗＄紪鍙�
+ GlCreate.createIcCardNo(icCardNo, bs, 0);
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[4] ;//IC鍗″湴鍧�
+ ByteUtil.hex2Bytes_LE(icCardAddr, bs, 0);
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[4] ;//鐢ㄦ按鎴蜂綑棰�
+ bs[0] = ByteUtil.int2BCD_LE (21)[0] ;
+ bs[1] = ByteUtil.int2BCD_LE (33)[0] ;
+ bs[2] = ByteUtil.int2BCD_LE (0)[0] ;
+ bs[3] = ByteUtil.int2BCD_LE (0)[0] ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[6] ;//寮�闃�鏃堕棿
+ GlCreate.createTp(openValveDt, bs, 0);
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[6] ;//鍏抽榾鏃堕棿
+ GlCreate.createTp(bs, 0);
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[5] ;//鐢ㄦ按鎴锋湰娆＄敤姘撮噺
+ bs[0] = ByteUtil.int2BCD_LE (0)[0] ;
+ bs[1] = ByteUtil.int2BCD_LE (10)[0] ;
+ bs[2] = ByteUtil.int2BCD_LE (0)[0] ;
+ bs[3] = ByteUtil.int2BCD_LE (0)[0] ;
+ bs[4] = ByteUtil.int2BCD_LE (0)[0] ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[4] ;//鐢ㄦ按鎴锋湰娆℃秷璐归噾棰�
+ bs[0] = ByteUtil.int2BCD_LE (0)[0] ;
+ bs[1] = ByteUtil.int2BCD_LE (10)[0] ;
+ bs[2] = ByteUtil.int2BCD_LE (0)[0] ;
+ bs[3] = ByteUtil.int2BCD_LE (0)[0] ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[2] ;//鐢ㄦ按鎴锋湰娆＄敤姘存椂闀�
+ bs[0] = ByteUtil.int2BCD_LE (10)[0] ;
+ bs[1] = ByteUtil.int2BCD_LE (0)[0] ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[1] ;//姘翠环绫诲瀷
+ bs[0] = ByteUtil.int2BCD_LE (1)[0] ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[2] ;//姘翠环
+ bs[0] = ByteUtil.int2BCD_LE (0)[0] ;
+ bs[1] = ByteUtil.int2BCD_LE (1)[0] ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[6] ;//鎺у埗鍣ㄦ椂閽�
+ GlCreate.createTp(bs, 0);
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[1] ;//鍗＄被鍨�
+ bs[0] = ByteUtil.int2BCD_LE (1)[0] ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
+
+ byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
+
+ bytes = ByteUtil.bytesMerge(bytes, bsTail) ;
+
+ return bytes ;
+ }
+
+ /**
+ * 鏋勯�犱笂鎶ユ暟鎹�
+ * @return 瀛楄妭鏁扮粍
+ * @throws Exception 寮傚父
+ */
+ public static byte[] createCdC0(String rtuAddr) 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 ;
+
+ index++ ;
+ bsHead[index] = 0 ;//甯ч暱搴�
+
+ index++ ;
+ bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+
+ index++ ;
+ bsHead[index] = commonV1_0_1.createCtrl((byte)0x80, (byte)3) ;//鎺у埗鍩熷姛鑳界爜3锛氳嚜鎶ュ抚锛屾祦閲忥紙姘撮噺锛夊弬鏁�
+
+ index++ ;
+ GlCreate.createRtuAddr(rtuAddr, bsHead, index);
+ index += 5 ;
+
+ ByteUtil.hex2Bytes("C0", bsHead, index) ;
+
+ byte[] bs = new byte[2] ;
+ bs[0] = (byte)0x04 ;//鏈夋祦閲忔暟鎹�
+ bs[1] = (byte)0xE0 ;//鏈夋按鍘嬨�佺數姹犵數鍘嬨�佷俊鍙峰己搴�
+
+ bytes = ByteUtil.bytesMerge(bsHead, bs) ;
+
+ bs = new byte[5] ;//鐬椂娴侀噺
+ bs[0] = ByteUtil.int2BCD_LE (21)[0] ;
+ bs[1] = ByteUtil.int2BCD_LE (43)[0] ;
+ bs[2] = ByteUtil.int2BCD_LE (65)[0] ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[5] ;//绱娴侀噺
+ bs[0] = ByteUtil.int2BCD_LE (21)[0] ;
+ bs[1] = ByteUtil.int2BCD_LE (43)[0] ;
+ bs[2] = ByteUtil.int2BCD_LE (65)[0] ;
+ bs[3] = ByteUtil.int2BCD_LE (87)[0] ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[5] ;//鎹熷け娴侀噺
+ bs[0] = ByteUtil.int2BCD_LE (10)[0] ;
+ bs[1] = ByteUtil.int2BCD_LE (32)[0] ;
+ bs[2] = ByteUtil.int2BCD_LE (54)[0] ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[4] ;//姘村帇
+ bs[0] = ByteUtil.int2BCD_LE (10)[0] ;
+ bs[1] = ByteUtil.int2BCD_LE (32)[0] ;
+ bs[2] = ByteUtil.int2BCD_LE (4)[0] ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[4] ;//鐢垫睜鐢靛帇
+ bs[0] = ByteUtil.int2BCD_LE (10)[0] ;
+ bs[1] = ByteUtil.int2BCD_LE (32)[0] ;
+ bs[2] = ByteUtil.int2BCD_LE (10)[0] ;
+ bs[3] = ByteUtil.int2BCD_LE (32)[0] ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[1] ;//淇″彿寮哄害
+ bs[0] = ByteUtil.int2BCD_LE (21)[0] ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[6] ;//鏃堕挓
+ GlCreate.createTp(bs, 0);
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
+
+ byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
+
+ bytes = ByteUtil.bytesMerge(bytes, bsTail) ;
+
+ return bytes ;
+ }
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/resources/log4j2.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/resources/log4j2.xml
index 104ed67..c75e1cd 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/resources/log4j2.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/resources/log4j2.xml
@@ -12,7 +12,7 @@
/logs/testJgroups.log褰撳墠杞欢鎵�鍦ㄧ‖鐩樻牴鐩綍
logs/testJgroups.log褰撳墠杞欢鎵�鍦ㄧ洰褰�
-->
- <RollingFile name="File" fileName="logs/mwTestCl.log" filePattern="logs/aepTest-%d{yyyyMMdd}-%i.log">
+ <RollingFile name="File" fileName="logs/mwTestCl.log" filePattern="logs/mwTestCl-%d{yyyyMMdd}-%i.log">
<PatternLayout charset="UTF-8" pattern="%d %-5p [%t] (%class.%method:%L) - %m%n%throwable"/>
<Policies>
<TimeBasedTriggeringPolicy interval="7" />
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java
index 04d80ad..e77a63c 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java
@@ -105,8 +105,8 @@
if(txt.startsWith("0")){
throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrStart鐨勬暟鍊间笉鑳戒互0寮�澶�!");
}
- if(txt.length() != 10){
- throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrStart鐨勬暟鍊奸暱搴﹀繀椤讳负10浣�!");
+ if(!(txt.length() == 10 || txt.length() == 12)){
+ throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrStart鐨勬暟鍊奸暱搴﹀繀椤讳负10浣嶆垨12浣�!");
}
ServerProperties.rtuAddrStart = Long.valueOf(txt) ;
@@ -121,8 +121,8 @@
if(txt.startsWith("0")){
throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrEnd鐨勬暟鍊间笉鑳戒互0寮�澶�!");
}
- if(txt.length() != 10){
- throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrEnd鐨勬暟鍊奸暱搴﹀繀椤讳负10浣�!");
+ if(!(txt.length() == 10 || txt.length() == 12)){
+ throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrEnd鐨勬暟鍊奸暱搴﹀繀椤讳负10浣嶆垨12浣�!");
}
ServerProperties.rtuAddrEnd = Long.valueOf(txt) ;
if(ServerProperties.rtuAddrEnd <= ServerProperties.rtuAddrStart){
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/resources/log4j2.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/resources/log4j2.xml
index 6dae26f..b83fd9a 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/resources/log4j2.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/resources/log4j2.xml
@@ -12,7 +12,7 @@
/logs/testJgroups.log褰撳墠杞欢鎵�鍦ㄧ‖鐩樻牴鐩綍
logs/testJgroups.log褰撳墠杞欢鎵�鍦ㄧ洰褰�
-->
- <RollingFile name="File" fileName="logs/mwTestSv.log" filePattern="logs/aepTest-%d{yyyyMMdd}-%i.log">
+ <RollingFile name="File" fileName="logs/mwTestSv.log" filePattern="logs/mwTestSv-%d{yyyyMMdd}-%i.log">
<PatternLayout charset="UTF-8" pattern="%d %-5p [%t] (%class.%method:%L) - %m%n%throwable"/>
<Policies>
<TimeBasedTriggeringPolicy interval="7" />
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/.gitignore b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/.mvn/wrapper/maven-wrapper.properties b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..8f96f52
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/mvnw b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/mvnw
new file mode 100644
index 0000000..d7c358e
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/mvnw
@@ -0,0 +1,259 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.3.2
+#
+# Optional ENV vars
+# -----------------
+# JAVA_HOME - location of a JDK home dir, required when download maven via java source
+# MVNW_REPOURL - repo url base for downloading maven distribution
+# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
+# ----------------------------------------------------------------------------
+
+set -euf
+[ "${MVNW_VERBOSE-}" != debug ] || set -x
+
+# OS specific support.
+native_path() { printf %s\\n "$1"; }
+case "$(uname)" in
+CYGWIN* | MINGW*)
+ [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
+ native_path() { cygpath --path --windows "$1"; }
+ ;;
+esac
+
+# set JAVACMD and JAVACCMD
+set_java_home() {
+ # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
+ if [ -n "${JAVA_HOME-}" ]; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACCMD="$JAVA_HOME/jre/sh/javac"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ JAVACCMD="$JAVA_HOME/bin/javac"
+
+ if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
+ echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
+ echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
+ return 1
+ fi
+ fi
+ else
+ JAVACMD="$(
+ 'set' +e
+ 'unset' -f command 2>/dev/null
+ 'command' -v java
+ )" || :
+ JAVACCMD="$(
+ 'set' +e
+ 'unset' -f command 2>/dev/null
+ 'command' -v javac
+ )" || :
+
+ if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
+ echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
+ return 1
+ fi
+ fi
+}
+
+# hash string like Java String::hashCode
+hash_string() {
+ str="${1:-}" h=0
+ while [ -n "$str" ]; do
+ char="${str%"${str#?}"}"
+ h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
+ str="${str#?}"
+ done
+ printf %x\\n $h
+}
+
+verbose() { :; }
+[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
+
+die() {
+ printf %s\\n "$1" >&2
+ exit 1
+}
+
+trim() {
+ # MWRAPPER-139:
+ # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+ # Needed for removing poorly interpreted newline sequences when running in more
+ # exotic environments such as mingw bash on Windows.
+ printf "%s" "${1}" | tr -d '[:space:]'
+}
+
+# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
+while IFS="=" read -r key value; do
+ case "${key-}" in
+ distributionUrl) distributionUrl=$(trim "${value-}") ;;
+ distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
+ esac
+done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
+[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
+
+case "${distributionUrl##*/}" in
+maven-mvnd-*bin.*)
+ MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
+ case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
+ *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
+ :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
+ :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
+ :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
+ *)
+ echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
+ distributionPlatform=linux-amd64
+ ;;
+ esac
+ distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
+ ;;
+maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
+*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
+esac
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
+distributionUrlName="${distributionUrl##*/}"
+distributionUrlNameMain="${distributionUrlName%.*}"
+distributionUrlNameMain="${distributionUrlNameMain%-bin}"
+MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
+MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
+
+exec_maven() {
+ unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
+ exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
+}
+
+if [ -d "$MAVEN_HOME" ]; then
+ verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+ exec_maven "$@"
+fi
+
+case "${distributionUrl-}" in
+*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
+*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
+esac
+
+# prepare tmp dir
+if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
+ clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
+ trap clean HUP INT TERM EXIT
+else
+ die "cannot create temp dir"
+fi
+
+mkdir -p -- "${MAVEN_HOME%/*}"
+
+# Download and Install Apache Maven
+verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+verbose "Downloading from: $distributionUrl"
+verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+# select .zip or .tar.gz
+if ! command -v unzip >/dev/null; then
+ distributionUrl="${distributionUrl%.zip}.tar.gz"
+ distributionUrlName="${distributionUrl##*/}"
+fi
+
+# verbose opt
+__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
+[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
+
+# normalize http auth
+case "${MVNW_PASSWORD:+has-password}" in
+'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+esac
+
+if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
+ verbose "Found wget ... using wget"
+ wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
+elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
+ verbose "Found curl ... using curl"
+ curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
+elif set_java_home; then
+ verbose "Falling back to use Java to download"
+ javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
+ targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
+ cat >"$javaSource" <<-END
+ public class Downloader extends java.net.Authenticator
+ {
+ protected java.net.PasswordAuthentication getPasswordAuthentication()
+ {
+ return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
+ }
+ public static void main( String[] args ) throws Exception
+ {
+ setDefault( new Downloader() );
+ java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
+ }
+ }
+ END
+ # For Cygwin/MinGW, switch paths to Windows format before running javac and java
+ verbose " - Compiling Downloader.java ..."
+ "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
+ verbose " - Running Downloader.java ..."
+ "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
+fi
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+if [ -n "${distributionSha256Sum-}" ]; then
+ distributionSha256Result=false
+ if [ "$MVN_CMD" = mvnd.sh ]; then
+ echo "Checksum validation is not supported for maven-mvnd." >&2
+ echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+ exit 1
+ elif command -v sha256sum >/dev/null; then
+ if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then
+ distributionSha256Result=true
+ fi
+ elif command -v shasum >/dev/null; then
+ if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
+ distributionSha256Result=true
+ fi
+ else
+ echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+ echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+ exit 1
+ fi
+ if [ $distributionSha256Result = false ]; then
+ echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
+ echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
+ exit 1
+ fi
+fi
+
+# unzip and move
+if command -v unzip >/dev/null; then
+ unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
+else
+ tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
+fi
+printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url"
+mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
+
+clean || :
+exec_maven "$@"
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/mvnw.cmd b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/mvnw.cmd
new file mode 100644
index 0000000..6f779cf
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/mvnw.cmd
@@ -0,0 +1,149 @@
+<# : batch portion
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.3.2
+@REM
+@REM Optional ENV vars
+@REM MVNW_REPOURL - repo url base for downloading maven distribution
+@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
+@REM ----------------------------------------------------------------------------
+
+@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
+@SET __MVNW_CMD__=
+@SET __MVNW_ERROR__=
+@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
+@SET PSModulePath=
+@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
+ IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
+)
+@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
+@SET __MVNW_PSMODULEP_SAVE=
+@SET __MVNW_ARG0_NAME__=
+@SET MVNW_USERNAME=
+@SET MVNW_PASSWORD=
+@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
+@echo Cannot start maven from wrapper >&2 && exit /b 1
+@GOTO :EOF
+: end batch / begin powershell #>
+
+$ErrorActionPreference = "Stop"
+if ($env:MVNW_VERBOSE -eq "true") {
+ $VerbosePreference = "Continue"
+}
+
+# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
+$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
+if (!$distributionUrl) {
+ Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+}
+
+switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
+ "maven-mvnd-*" {
+ $USE_MVND = $true
+ $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
+ $MVN_CMD = "mvnd.cmd"
+ break
+ }
+ default {
+ $USE_MVND = $false
+ $MVN_CMD = $script -replace '^mvnw','mvn'
+ break
+ }
+}
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+if ($env:MVNW_REPOURL) {
+ $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
+ $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
+}
+$distributionUrlName = $distributionUrl -replace '^.*/',''
+$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
+$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
+if ($env:MAVEN_USER_HOME) {
+ $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
+}
+$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
+$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
+
+if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
+ Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+ Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+ exit $?
+}
+
+if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
+ Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
+}
+
+# prepare tmp dir
+$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
+$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
+$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
+trap {
+ if ($TMP_DOWNLOAD_DIR.Exists) {
+ try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+ catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+ }
+}
+
+New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
+
+# Download and Install Apache Maven
+Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+Write-Verbose "Downloading from: $distributionUrl"
+Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+$webclient = New-Object System.Net.WebClient
+if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
+ $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
+}
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
+if ($distributionSha256Sum) {
+ if ($USE_MVND) {
+ Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
+ }
+ Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
+ if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
+ Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
+ }
+}
+
+# unzip and move
+Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
+Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
+try {
+ Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
+} catch {
+ if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
+ Write-Error "fail to move MAVEN_HOME"
+ }
+} finally {
+ try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+ catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+}
+
+Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/pom.xml b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/pom.xml
new file mode 100644
index 0000000..8076af7
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/pom.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>pipIrr-web</artifactId>
+ <groupId>com.dy</groupId>
+ <version>1.0.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <packaging>jar</packaging>
+ <artifactId>pipIrr-mwTest-rtu</artifactId>
+ <version>1.0.0</version>
+ <name>pipIrr-mwTest-rtu</name>
+ <description>妯℃嫙RTU锛堥澇鎬诲崗璁級</description>
+
+ <dependencies>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <!-- 鐢熸垚涓嶅寘鍚緷璧杍ar鐨勫彲鎵цjar鍖�
+ <plugin>
+ !- spring boot鎻愪緵鐨刴aven鎵撳寘鎻掍欢 -
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ !-
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ -
+ <configuration>
+ !- 涓嶅姞鐨勮瘽鏈�缁堝寘鍚嶄负: ${artifactId}-${version}.jar, 鍔犱簡鐨勮瘽鏈�缁堝寘鍚�: ${artifactId}-${version}-${classifier}.jar -
+ <classifier>execute</classifier>
+ !- 涓嶆寚瀹氱敓鎴愯矾寰勭殑璇�, 榛樿淇濆瓨鍦� ${build.directory} 涓� -
+ <outputDirectory>${project.build.directory}/execute</outputDirectory>
+ <finalName>${artifactId}-${version}</finalName>
+ <layout>ZIP</layout>
+ <mainClass>com.dy.pipIrrBase.PipIrrBaseApplication</mainClass>
+ <includes>
+ <include>
+ <groupId>com.dy</groupId>
+ <artifactId>pipIrr-common</artifactId>
+ </include>
+ <include>
+ <groupId>com.dy</groupId>
+ <artifactId>pipIrr-global</artifactId>
+ </include>
+ </includes>
+ <excludes>
+ <exclude>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+
+ </plugin>
+ -->
+ <!-- 鎷疯礉渚濊禆鐨刯ar鍖呭埌lib鐩綍-->
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+ <!-- 涓嶅姞鐨勮瘽鏈�缁堝寘鍚嶄负: ${artifactId}-${version}.jar, 鍔犱簡鐨勮瘽鏈�缁堝寘鍚�: ${artifactId}-${version}-${classifier}.jar
+ <classifier>execute</classifier>
+ -->
+ <!-- ${project.build.directory}鏄痬aven鍙橀噺锛屽唴缃殑锛岃〃绀簍arget鐩綍,濡傛灉涓嶅啓锛屽皢鍦ㄦ牴鐩綍涓嬪垱寤�/lib -->
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ <!-- excludeTransitive:鏄惁涓嶅寘鍚棿鎺ヤ緷璧栧寘锛屾瘮濡傛垜浠緷璧朅锛屼絾鏄疉鍙堜緷璧栦簡B锛屾垜浠槸鍚︿篃瑕佹妸B鎵撹繘鍘� 榛樿涓嶆墦-->
+ <excludeTransitive>false</excludeTransitive>
+ <!-- 澶嶅埗鐨刯ar鏂囦欢鍘绘帀鐗堟湰淇℃伅 -->
+ <stripVersion>false</stripVersion>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <layout>ZIP</layout>
+ <mainClass>com.dy.rtuMw.PipIrrMwAcceptApplication</mainClass>
+ <includes>
+ <include>
+ <groupId>com.dy</groupId>
+ <artifactId>pipIrr-common</artifactId>
+ </include>
+ <include>
+ <groupId>com.dy</groupId>
+ <artifactId>pipIrr-global</artifactId>
+ </include>
+ </includes>
+ <excludes>
+ <exclude>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <!-- 璁剧疆java缂栬瘧鐗堟湰锛岃繍琛岀幆澧冪増鏈� -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <!-- source锛� 婧愪唬鐮佺紪璇戠増鏈紱target锛� 鐩爣骞冲彴缂栬瘧鐗堟湰锛沞ncoding锛� 瀛楃闆嗙紪鐮併�� -->
+ <configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ <encoding>${encoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- 瑙ｅ喅璧勬簮鏂囦欢鐨勭紪鐮侀棶棰� -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>${encoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- maven閲屾墽琛屾祴璇曠敤渚嬬殑鎻掍欢 -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- 涓嬮潰瑙ｅ喅锛氬綋杩涜Maven Lifecycle package鏃舵姤閿欙細Could not find artifact org.apache.mina:mina-core:bundle:2.2.1 in maven (https://repo1.maven.org/maven2/)-->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/AdapterImp_TcpClUnit.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/AdapterImp_TcpClUnit.java
new file mode 100644
index 0000000..e693023
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/AdapterImp_TcpClUnit.java
@@ -0,0 +1,19 @@
+package com.dy.pipIrrMwTestRtu;
+
+import com.dy.pipIrrMwTestRtu.tcpClient.TcpClUnitAdapter;
+import com.dy.pipIrrMwTestRtu.tcpClient.TcpClUnitConfigVo;
+
+
+public class AdapterImp_TcpClUnit implements TcpClUnitAdapter {
+
+ private TcpClUnitConfigVo configVo ;
+
+ public TcpClUnitConfigVo getConfig() {
+ return configVo;
+ }
+
+ public void setConfig(TcpClUnitConfigVo configVo){
+ this.configVo = configVo ;
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplication.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplication.java
new file mode 100644
index 0000000..98c4ab9
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplication.java
@@ -0,0 +1,33 @@
+package com.dy.pipIrrMwTestRtu;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
+
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) //绂佹鍚姩鏁版嵁搴撹繛鎺ユ睜
+@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.pipIrrMwTestRtu"},
+ excludeFilters = {
+ @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {
+ com.dy.common.apiDoc.SpringApiConfig.class //涓�绉嶆帓闄ょ被鐨勬柟寮�
+ }),
+ @ComponentScan.Filter(type = FilterType.REGEX, pattern = {
+ //浜岀鎺掗櫎绫荤殑鏂瑰紡锛屽啓姝ｅ垯琛ㄨ揪寮忥紝闇�瑕佸鐩爣绫荤殑瀹屽叏闄愬畾鍚嶅畬鍏ㄥ尮閰嶏紝鍚﹀垯涓嶇敓鏁�
+ "com.dy.common.aop..*",
+ "com.dy.common.apiDoc..*",
+ "com.dy.common.multiDataSource..*",
+ "com.dy.common.mybatis..*",
+ "com.dy.common.singleDataSource..*",
+ "com.dy.common.webFilter..*",
+ "com.dy.common.webListener..*"
+ })
+ }
+)
+public class PipIrrMwTestRtuApplication{
+
+ public static void main(String[] args) {
+ SpringApplication.run(PipIrrMwTestRtuApplication.class, args);
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/LocalCodecFactory.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/LocalCodecFactory.java
new file mode 100644
index 0000000..47af50b
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/LocalCodecFactory.java
@@ -0,0 +1,35 @@
+package com.dy.pipIrrMwTestRtu.tcpClient;
+
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolCodecFactory;
+import org.apache.mina.filter.codec.ProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolEncoder;
+
+public class LocalCodecFactory implements ProtocolCodecFactory {
+ private ProtocolEncoder encoder;
+ private ProtocolDecoder decoder;
+
+ public LocalCodecFactory() {
+ encoder = new LocalEncoder();
+ decoder = new LocalDecoder();
+ }
+
+ /**
+ * 寰楀埌鍗忚缂栫爜鍣�
+ * @param ioSession 缃戠粶浼氳瘽
+ * @return 鍗忚缂栫爜鍣�
+ */
+ @Override
+ public ProtocolEncoder getEncoder(IoSession ioSession) {
+ return encoder;
+ }
+ /**
+ * 寰楀埌鍗忚瑙ｇ爜鍣�
+ * @param ioSession 缃戠粶浼氳瘽
+ * @return 鍗忚瑙ｇ爜鍣�
+ */
+ @Override
+ public ProtocolDecoder getDecoder(IoSession ioSession) {
+ return decoder;
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/LocalDecoder.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/LocalDecoder.java
new file mode 100644
index 0000000..4d89c6c
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/LocalDecoder.java
@@ -0,0 +1,37 @@
+package com.dy.pipIrrMwTestRtu.tcpClient;
+
+import com.dy.common.util.ByteUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+
+import java.io.IOException;
+
+public class LocalDecoder extends CumulativeProtocolDecoder {
+
+ private static final Logger log = LogManager.getLogger(LocalDecoder.class) ;
+
+ private static final String DECODER_STATE_KEY = LocalDecoder.class.getName() + ".STATE";
+
+ public static final int MAX_SIZE = 2147483647 ;
+
+
+ /**
+ * 瀵圭綉缁滀紶杈撴潵鐨勬暟鎹繘琛岃В鐮�
+ */
+ protected boolean doDecode(IoSession session, IoBuffer in, ProtocolDecoderOutput out) throws IOException, Exception{
+ int remain = in.remaining() ;
+ if(remain > 0){
+ byte[] preByte = new byte[remain];
+ in.get(preByte) ;
+ in.position(0) ;
+ log.info("鏀跺埌涓績涓嬭鏁版嵁锛�" + ByteUtil.bytes2Hex(preByte, true));
+ }
+ return true;
+ }
+
+
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/LocalEncoder.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/LocalEncoder.java
new file mode 100644
index 0000000..a030b2d
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/LocalEncoder.java
@@ -0,0 +1,27 @@
+package com.dy.pipIrrMwTestRtu.tcpClient;
+
+import com.dy.common.util.ByteUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
+import org.apache.mina.filter.codec.ProtocolEncoderOutput;
+
+import java.io.IOException;
+
+public class LocalEncoder extends ProtocolEncoderAdapter {
+
+ private static final Logger log = LogManager.getLogger(LocalEncoder.class) ;
+
+ /**
+ * 瀵规暟鎹繘琛岀紪鐮侊紝浠ュ缃戠粶浼犺緭
+ */
+ public void encode(IoSession session, Object message, ProtocolEncoderOutput out) throws IOException, Exception{
+ byte[] data = (byte[])message;
+ log.info("涓嬭鏁版嵁锛�" + ByteUtil.bytes2Hex(data, true));
+
+ out.write(IoBuffer.allocate((data==null?0:data.length), false).put(data).flip());
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnitAdapter.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnitAdapter.java
new file mode 100644
index 0000000..20eaecb
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnitAdapter.java
@@ -0,0 +1,7 @@
+package com.dy.pipIrrMwTestRtu.tcpClient;
+
+import com.dy.common.mw.UnitAdapterInterface;
+
+public interface TcpClUnitAdapter extends UnitAdapterInterface {
+ public TcpClUnitConfigVo getConfig() ;
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnitConfigVo.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnitConfigVo.java
new file mode 100644
index 0000000..96f34d8
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnitConfigVo.java
@@ -0,0 +1,6 @@
+package com.dy.pipIrrMwTestRtu.tcpClient;
+
+public class TcpClUnitConfigVo {
+ public String mwServerIp ;
+ public Integer mwServerPort ;
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpConnect.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpConnect.java
new file mode 100644
index 0000000..be55666
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpConnect.java
@@ -0,0 +1,62 @@
+package com.dy.pipIrrMwTestRtu.tcpClient;
+
+import com.dy.common.util.Callback;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolCodecFilter;
+import org.apache.mina.transport.socket.SocketConnector;
+import org.apache.mina.transport.socket.nio.NioSocketConnector;
+
+import java.net.InetSocketAddress;
+
+public class TcpConnect {
+
+ /**
+ * 鍒ゆ柇浼氳瘽鏄惁鏈夋晥
+ * @param se 缃戠粶浼氳瘽
+ * @return 鏄惁杩炴帴
+ */
+ public boolean isConnected(IoSession se) {
+ return (se != null && se.isConnected());
+ }
+
+ /**
+ * 鍒涘缓鏂颁細璇�
+ * @param host 鏈嶅姟鍣║RI
+ * @param port 鏈嶅姟鍣ㄧ鍙�
+ * @param connectTimeout 杩炴帴瓒呮椂鏃堕暱
+ * @param handler 鏁版嵁澶勭悊鑰�
+ * @param callback 鍥炶皟
+ * @return 缃戠粶浼氳瘽
+ */
+ public void createSession(String host ,
+ int port ,
+ int connectTimeout ,
+ TcpHandler handler,
+ Callback callback) throws Exception{
+ SocketConnector connector = new NioSocketConnector();
+ connector.getFilterChain().addLast("codec", new ProtocolCodecFilter(new LocalCodecFactory()));
+ connector.setHandler(handler);
+ ConnectFuture connectFuture = connector.connect(new InetSocketAddress(host, port));
+ connectFuture.awaitUninterruptibly(connectTimeout);
+ IoSession se = connectFuture.getSession();
+ callback.call(se) ;
+ }
+
+
+ /**
+ * 鍏抽棴浼氳瘽鑱旀帴
+ * @param se
+ * @param connectTimeout
+ */
+ public void disconnect(IoSession se , int connectTimeout) {
+ if (se != null) {
+ try{
+ se.closeNow().awaitUninterruptibly(connectTimeout);
+ }catch(Exception e){
+ }finally{
+ se = null;
+ }
+ }
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpHandler.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpHandler.java
new file mode 100644
index 0000000..01c4a53
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpHandler.java
@@ -0,0 +1,77 @@
+package com.dy.pipIrrMwTestRtu.tcpClient;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.FilterEvent;
+
+public class TcpHandler extends IoHandlerAdapter {
+
+ private static Logger log = LogManager.getLogger(TcpHandler.class.getName()) ;
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void sessionCreated(IoSession session) throws Exception {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void sessionOpened(IoSession session) throws Exception {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void sessionClosed(IoSession session) throws Exception {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void messageReceived(IoSession session, Object message) throws Exception {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void messageSent(IoSession session, Object message) throws Exception {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void inputClosed(IoSession session) throws Exception {
+ session.closeNow();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void event(IoSession session, FilterEvent event) throws Exception {
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/Config.xml b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/Config.xml
new file mode 100644
index 0000000..b35e39d
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/Config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+ <server name="RTU妯℃嫙" showStartInfo="true" company="http://www.dyjs.com"/>
+
+ <!--
+ enable:鏄惁鍚姩
+ -->
+ <tcpCl mwServerIp="127.0.0.1" mwServerPort="60000" />
+</config>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/application.yml
new file mode 100644
index 0000000..bf28011
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/application.yml
@@ -0,0 +1,29 @@
+logging:
+ charset:
+ console: UTF-8
+ config:
+ classpath: log4j2.yml
+
+#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
+server:
+ error:
+ whitelabel:
+ enabled: false
+ port: 65534
+ servlet:
+ context-path: /rtu #web璁块棶涓婁笅鏂囪矾寰�
+ encoding:
+ #鍙栨秷榛樿鐨勫瓧绗﹂泦缂栫爜
+ enabled: true
+ #璁剧疆寮哄埗浣跨敤鎸囧畾瀛楃缂栫爜闆�
+ force: true
+ #浣跨敤鐨勫瓧绗︾紪鐮�
+ charset: utf-8
+
+#绂佹鍚姩鏁版嵁搴撹繛鎺ユ睜
+spring:
+ #autoconfigure:
+ # exclude:
+ # - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
+ # - org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration
+ # - org.springframework.boot.autoconfigure.jdbc.JndiDataSourceAutoConfiguration
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/log4j2.xml b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..8c46b0b
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/log4j2.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="OFF">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout charset="GBK" pattern="%d %-5p [%t] (%F:%L) - %m%n%throwable"/>
+ </Console>
+ <!--
+ fileName="${sys:user.home}/logs/aepTest.log" filePattern="${sys:user.home}/logs/aepTest-%d{yyyy-MM}-%i.log.gz"
+ fileName="/logs/testJgroups.log" filePattern="/logs/testJgroups-%d{yyyyMMdd}-%i.log.gz"
+ fileName="logs/testJgroups.log" filePattern="logs/testJgroups-%d{yyyyMMdd}-%i.log.gz"
+ sys:user.home褰撳墠鐢ㄦ埛鍦ㄦ搷浣滅郴缁熶腑鐨勬枃妗ｇ洰褰�
+ /logs/testJgroups.log褰撳墠杞欢鎵�鍦ㄧ‖鐩樻牴鐩綍
+ logs/testJgroups.log褰撳墠杞欢鎵�鍦ㄧ洰褰�
+ -->
+ <RollingFile name="File" fileName="logs/mwRtu.log" filePattern="logs/mwRtu-%d{yyyyMMdd}-%i.log">
+ <PatternLayout charset="UTF-8" pattern="%d %-5p [%t] (%class.%method:%L) - %m%n%throwable"/>
+ <Policies>
+ <TimeBasedTriggeringPolicy interval="7" />
+ <SizeBasedTriggeringPolicy size="10MB"/>
+ </Policies>
+ <DefaultRolloverStrategy max="50" />
+ </RollingFile>
+ </Appenders>
+ <Loggers>
+ <!--
+ <Logger name="com.zhzc.jgTest" level="debug">
+ <AppenderRef ref="Console"/>
+ </Logger>
+ <Logger name="org.jgroups" level="info">
+ <AppenderRef ref="File"/>
+ </Logger>
+ -->
+ <!-- Root涓庡悇涓狶ogger鍚屾椂璧蜂綔鐢� -->
+ <Root level="info">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="File"/>
+ </Root>
+ </Loggers>
+</Configuration>
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/test/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplicationTests.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/test/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplicationTests.java
new file mode 100644
index 0000000..506d009
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/test/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplicationTests.java
@@ -0,0 +1,13 @@
+package com.dy.pipIrrMwTestRtu;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class PipIrrMwTestRtuApplicationTests {
+
+ @Test
+ void contextLoads() {
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/pom.xml b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/pom.xml
index be397d1..291a9ef 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/pom.xml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/pom.xml
@@ -13,7 +13,7 @@
<packaging>jar</packaging>
<artifactId>pipIrr-mwTest-web</artifactId>
<version>1.0.0</version>
- <name>pipIrr-mw-rtu</name>
+ <name>pipIrr-mwTest-web</name>
<description>閫氫俊涓棿浠朵腑蹇冩湇鍔＄涓嬪彂鍛戒护娴嬭瘯</description>
<dependencies>
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 7a6aef6..ad39965 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
@@ -28,9 +28,6 @@
)
public class PipIrrMwTestWebApplication{
- @Autowired
- 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/p206V1_0_0/ComSupportP206V1_0_0.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/ComSupportP206V1_0_0.java
index 4224bb4..b5dd099 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/ComSupportP206V1_0_0.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/ComSupportP206V1_0_0.java
@@ -23,7 +23,7 @@
protected static String rtuAddr = "532328059995" ;
protected static String rtuResultSendWebUrl = "http://127.0.0.1:65535/test/comRes/receive" ;
- protected static String vsIcCardNo = "7044010666" ;//铏氭嫙IC鍗＄紪鍙凤紙鐢ㄦ埛铏氭嫙鍗″簭鍒楀彿锛�
+ protected static String vsIcCardNo = "61181622830147822" ;//铏氭嫙IC鍗＄紪鍙凤紙鐢ㄦ埛铏氭嫙鍗″簭鍒楀彿锛�
@Autowired
diff --git a/pipIrr-platform/pipIrr-web/pom.xml b/pipIrr-platform/pipIrr-web/pom.xml
index ef476fa..abd60b2 100644
--- a/pipIrr-platform/pipIrr-web/pom.xml
+++ b/pipIrr-platform/pipIrr-web/pom.xml
@@ -18,6 +18,7 @@
<description>姝ゆā鍧椾负鍏朵粬web妯″潡鐨勫眬閮ㄥ叏灞�妯″潡锛屽彧瀹氫箟渚濊禆</description>
<modules>
+ <module>pipIrr-mwTest-rtu</module>
<module>pipIrr-mwTest-web</module>
<module>pipIrr-web-sso</module>
<module>pipIrr-web-base</module>
--
Gitblit v1.8.0