From 33e1f47419d28736b17d6947bb15ccc290b2905a Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 26 二月 2025 17:42:45 +0800 Subject: [PATCH] 1、代码完善; 2、江海协议解析不正确处修改,如金额是4位小数; 3、根据江海协议,新建RTU模拟器模块,可以上报心跳、开阀、关阀数据。 --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml | 3 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/.mvn/wrapper/maven-wrapper.properties | 19 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/说明.txt | 1 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/ProtocolConstantV206V202404.java | 2 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpClUnitConfigVo.java | 8 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/LocalEncoder.java | 30 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/config.xml | 5 pipIrr-platform/pipIrr-mw/pom.xml | 1 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/.gitattributes | 2 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java | 2 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java | 6 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/downData/DownData.java | 33 + pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java | 2 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/mvnw.cmd | 149 ++++ pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/LocalCodecFactory.java | 39 + pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/log4j2.xml | 31 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpClUnitAdapter.java | 13 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpHeartBeat.java | 57 + pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java | 214 ++++++ pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java | 4 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/AdapterImp_TcpClUnit.java | 23 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/.gitignore | 34 + pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/PipIrrMwSimulateRtu202404Application.java | 152 ++++ pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/LocalDecoder.java | 43 + pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpHandler.java | 97 ++ pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java | 2 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/Starter.java | 78 ++ pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/ServerProperties.java | 29 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpData.java | 52 + pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpConnect.java | 66 ++ pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpClUnit.java | 53 + pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/application.yml | 5 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/mvnw | 259 +++++++ pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java | 5 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/pom.xml | 181 +++++ pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/Server.java | 100 +++ pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/test/java/com/dy/simRtu202404/pipirrmwsimulatertu202404/PipIrrMwSimulateRtu202404ApplicationTests.java | 13 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/Worker.java | 121 +++ 38 files changed, 1,921 insertions(+), 13 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java index 4eb2494..e4619c3 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java @@ -14,7 +14,7 @@ /** * 妫�鏌ュご * @param bs 涓婅瀛楄妭鏁扮粍 - * @return [rt1->true:鏄湰鍗忚P206锛宖alse:涓嶆槸鏈崗璁�; rt2->true:鏄按璧勬簮鍗忚锛宖alse:鏄崌绾у崗璁甝 + * @return [銆�0銆�->true:鏄湰鍗忚P206锛宖alse:涓嶆槸鏈崗璁�; 銆�1銆�->true:鏄按璧勬簮鍗忚锛宖alse:鏄崌绾у崗璁甝 * @throws Exception 寮傚父 */ public Boolean[] isThisProtocolHead(byte[] bs) throws Exception{ diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/ProtocolConstantV206V202404.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/ProtocolConstantV206V202404.java index 5e15453..b2a80d2 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/ProtocolConstantV206V202404.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/ProtocolConstantV206V202404.java @@ -2,8 +2,6 @@ public class ProtocolConstantV206V202404 { - public static final String version = "202404" ; - /** * 娉ㄨВ鐩稿叧 */ diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java index f56919e..d03d85e 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java @@ -153,7 +153,7 @@ index += 5 ; Long moneyRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4) ; - cdData.moneyRemain = moneyRemain/100.0D; + cdData.moneyRemain = moneyRemain/10000.0D; index += 5 ; Long waterRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4) ; @@ -169,7 +169,7 @@ index += 4 ; int thisMoney = ByteUtil.BCD2Int_LE(bs, index, index + 3) ; - cdData.thisMoney = thisMoney/100.0D; + cdData.thisMoney = thisMoney/10000.0D; index += 4 ; cdData.thisDuration = ByteUtil.BCD2Int_LE(bs, index, index + 1) ; 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 79375db..181012d 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 @@ -132,7 +132,7 @@ }else{ System.out.println("@@@@@@$ #@@@@@@@@@$ &@@@@@@@@" ) ; } - System.out.println("@@@@@@@@@@@@@@@@@@@@@@# &@@@@@@@@ Runing in standalone mode" ) ; + System.out.println("@@@@@@@@@@@@@@@@@@@@@@# &@@@@@@@@ Running in standalone mode" ) ; System.out.println("@@@@@@@@@@@@@@@@@@@@@& &@@@@@@@@ Startup in " + (System.currentTimeMillis() - start) + " MS" ) ; System.out.println("@@@@@@@@@@@@@@@@@@@# &@@@@@@@@ " + company) ; System.out.println("@@@@@@@@@@@@@@@@#O &@@@@@@@@") ; diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java index 2ea92e3..60a7880 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java @@ -3,6 +3,7 @@ import com.dy.common.mw.protocol.Data; import com.dy.common.mw.protocol.p206V202404.DataV202404; import com.dy.common.mw.protocol.p206V202404.upVos.DataCd02Vo; +import com.dy.common.mw.protocol.p206V202404.upVos.DataCd8AVo; import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp; import com.dy.rtuMw.server.rtuData.TaskSurpport; import org.apache.logging.log4j.LogManager; @@ -36,8 +37,8 @@ boolean toNext = true ; if(d.getSubData() != null) { DataV202404 dataV202404 = (DataV202404)d.getSubData() ; - if(dataV202404 != null && dataV202404.subData != null && dataV202404.subData instanceof DataCd02Vo){ - //杩囨护鎺夊績璺虫暟鎹� + if(dataV202404 != null && dataV202404.subData != null && (dataV202404.subData instanceof DataCd8AVo || dataV202404.subData instanceof DataCd02Vo)){ + //杩囨护鎺夌櫥褰曞拰蹇冭烦鏁版嵁 toNext = false ; } } 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 21a6d95..7ef41eb 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 @@ -43,9 +43,9 @@ Data d = (Data)data ; String rtuAddr = d.getRtuAddr() ;//TkRtuData閲屽垽鏂簡rtuAddr涓虹┖ if(d.subData != null && d.subData instanceof DataV202404){ - DataV202404 dataV1 = (DataV202404)d.subData ; - if(dataV1.subData != null && dataV1.subData instanceof DataCd02Vo){ - //杩囨护鎺夊績璺虫暟鎹� + DataV202404 dataV202404 = (DataV202404)d.subData ; + if(dataV202404.subData != null && (dataV202404.subData instanceof DataCd8AVo || dataV202404.subData instanceof DataCd02Vo)){ + //杩囨护鎺夌櫥褰曞拰蹇冭烦鏁版嵁锛屼絾绗竴娆′笉杩囨护 if(onceUpDataRtus.containsKey(rtuAddr)){ return ; } diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml index 37760be..190fcb6 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml @@ -3,7 +3,8 @@ datasource: #閰嶇疆鏁版嵁婧� type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull + # url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull username: root password: dysql,;.abc!@# druid: diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java index 789a053..6f63306 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java @@ -84,7 +84,7 @@ System.out.println("@@@@@@$ O@@@@@@@@@ &@@@@@@@@") ; } System.out.println("@@@@@@$ #@@@@@@@@@$ &@@@@@@@@ 鏈琑TU妯℃嫙鍦板潃 " + ServerProperties.rtuAddr ) ; - System.out.println("@@@@@@@@@@@@@@@@@@@@@@# &@@@@@@@@ Runing in standalone mode" ) ; + System.out.println("@@@@@@@@@@@@@@@@@@@@@@# &@@@@@@@@ Running in standalone mode" ) ; System.out.println("@@@@@@@@@@@@@@@@@@@@@& &@@@@@@@@ Startup in " + (System.currentTimeMillis() - start) + " MS" ) ; System.out.println("@@@@@@@@@@@@@@@@@@@# &@@@@@@@@ " + company) ; System.out.println("@@@@@@@@@@@@@@@@#O &@@@@@@@@") ; diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/.gitattributes b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/.gitignore b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/.gitignore new file mode 100644 index 0000000..c1be7d5 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/.gitignore @@ -0,0 +1,34 @@ +HELP.md +target/ +/pipIrr-mw-simulate-rtu202404.iml +!.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-mw/pipIrr-mw-simulate-rtu202404/.mvn/wrapper/maven-wrapper.properties b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d58dfb7 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/.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 +# +# http://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.9/apache-maven-3.9.9-bin.zip diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/mvnw b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/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 +# +# http://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-mw/pipIrr-mw-simulate-rtu202404/mvnw.cmd b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/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 http://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-mw/pipIrr-mw-simulate-rtu202404/pom.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/pom.xml new file mode 100644 index 0000000..9e639b8 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/pom.xml @@ -0,0 +1,181 @@ +<?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-mw</artifactId> + <groupId>com.dy</groupId> + <version>1.0.0</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <packaging>jar</packaging> + <artifactId>pipIrr-mw-simulate-rtu202404</artifactId> + <version>1.0.0</version> + <name>pipIrr-mw-simulate-rtu202404</name> + <description>RTU妯℃嫙鍣紝妯℃嫙鐜嬫睙娴峰崗璁殑RTU</description> + + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-json</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!-- 鍔ㄦ�佸姞杞芥柊缂栬瘧鐨勭被 --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-devtools</artifactId> + <scope>runtime</scope> + </dependency> + + + <!-- apache mina --> + <dependency> + <groupId>org.apache.mina</groupId> + <artifactId>mina-core</artifactId> + <version>2.2.2</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>2.0.7</version> + </dependency> + + <!-- 娴嬭瘯 --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + </dependency> + </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> + <!-- 瑙e喅璧勬簮鏂囦欢鐨勭紪鐮侀棶棰� --> + <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> + <!-- 涓嬮潰瑙e喅锛氬綋杩涜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> diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/AdapterImp_TcpClUnit.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/AdapterImp_TcpClUnit.java new file mode 100644 index 0000000..8d6e689 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/AdapterImp_TcpClUnit.java @@ -0,0 +1,23 @@ +package com.dy.simRtu202404; + + +import com.dy.simRtu202404.tcpClient.TcpClUnitAdapter; +import com.dy.simRtu202404.tcpClient.TcpClUnitConfigVo; +/** + * @Author: liurunyu + * @Date: 2025/02/26 11:10 + * @Description + */ +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-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/PipIrrMwSimulateRtu202404Application.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/PipIrrMwSimulateRtu202404Application.java new file mode 100644 index 0000000..1473f15 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/PipIrrMwSimulateRtu202404Application.java @@ -0,0 +1,152 @@ +package com.dy.simRtu202404; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.WebApplicationType; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.FilterType; + +@Slf4j +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) //绂佹鍚姩鏁版嵁搴撹繛鎺ユ睜 +@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.simRtu202404"}, + excludeFilters = { + @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = { + com.dy.common.apiDoc.SpringApiConfig.class, //涓�绉嶆帓闄ょ被鐨勬柟寮� + com.dy.pipIrrGlobal.config.DingTalk.class + }), + @ComponentScan.Filter(type = FilterType.REGEX, pattern = { + //浜岀鎺掗櫎绫荤殑鏂瑰紡锛屽啓姝e垯琛ㄨ揪寮忥紝闇�瑕佸鐩爣绫荤殑瀹屽叏闄愬畾鍚嶅畬鍏ㄥ尮閰嶏紝鍚﹀垯涓嶇敓鏁� + "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..*", + "com.dy.pipIrrGlobal.webCtrls..*" + }) + } +) +public class PipIrrMwSimulateRtu202404Application implements CommandLineRunner { + + public static void main(String[] args) { + parseArg0(args, 0) ; + parseArg1(args, 1) ; + parseArg2(args, 2) ; + parseArg3(args, 3) ; + parseArg4(args, 4) ; + parseArg5(args, 5) ; + + new SpringApplicationBuilder(PipIrrMwSimulateRtu202404Application.class) + .web(WebApplicationType.NONE)//涓嶅惎鍔╳eb鏈嶅姟 + .run(args); + } + + private static void parseArg0(String[] args, int index){ + if(args != null + && args.length > index + && args[index] != null + && !args[index].trim().equals("")){ + ServerProperties.rtuAddr = args[index] ;//鏈ā鎷熷櫒妯℃嫙RTU鍦板潃 + log.info("鍙傛暟1锛�" + ServerProperties.rtuAddr); + } + if(ServerProperties.rtuAddr == null){ + ServerProperties.rtuAddr = "37142501020100218" ; + } + } + private static void parseArg1(String[] args, int index){ + if(args != null + && args.length > index + && args[index] != null + && !args[index].trim().equals("")){ + ServerProperties.icCardAddr = args[index] ;//IC鍗″湴鍧� + log.info("鍙傛暟2锛�" + ServerProperties.icCardAddr); + } + if(ServerProperties.icCardAddr == null){ + ServerProperties.icCardAddr = "C49A340D" ; + } + } + private static void parseArg2(String[] args, int index){ + if(args != null + && args.length > index + && args[index] != null + && !args[index].trim().equals("")){ + ServerProperties.icCardNo = args[index] ;//IC鍗$紪鍙� + log.info("鍙傛暟3锛�" + ServerProperties.icCardNo); + } + if(ServerProperties.icCardNo == null){ + ServerProperties.icCardNo = "37142501020100257" ; + } + } + private static void parseArg3(String[] args, int index){ + if(args != null + && args.length > index + && args[index] != null + && !args[index].trim().equals("")){ + ServerProperties.serverIp = args[index] ;//閫氫俊涓棿浠舵湇鍔$IP + log.info("鍙傛暟4锛�" + ServerProperties.serverIp); + } + if(ServerProperties.serverIp == null){ + ServerProperties.serverIp = "127.0.0.1" ; + } + } + private static void parseArg4(String[] args, int index){ + if(args != null + && args.length > index + && args[index] != null + && !args[index].trim().equals("")){ + ServerProperties.serverPort = Integer.parseInt(args[index]) ;//閫氫俊涓棿浠舵湇鍔$绔彛 + log.info("鍙傛暟5锛�" + ServerProperties.serverPort); + } + if(ServerProperties.serverPort == null){ + ServerProperties.serverPort = 60000 ; + } + } + private static void parseArg5(String[] args, int index){ + if(args != null + && args.length > index + && args[index] != null + && !args[index].trim().equals("")){ + ServerProperties.type = Integer.parseInt(args[index]) ;//杩愯鏂瑰紡 + log.info("鍙傛暟6锛�" + ServerProperties.type); + } + if(ServerProperties.type == null){ + ServerProperties.type = 0 ; + } + } + /** + * Spring瀹瑰櫒鍚姩瀹屾垚鍚庯紝鎵ц涓嬮潰鏂规硶 + * @param args 鍙傛暟 + * @throws Exception 寮傚父 + */ + @Override + public void run(String... args) throws Exception { + try{ + //绛夊緟涓�涓� + Thread.sleep(500L); + }catch (Exception e){ + e.printStackTrace(); + } + finally { + this.startMwSv() ; + } + } + + private void startMwSv(){ + if(sv != null){ + sv.startServer(); + } + } + + + private Server sv ; + + @Autowired + public void setSv(Server sv){ + this.sv = sv ; + } +} diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/Server.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/Server.java new file mode 100644 index 0000000..b63daf2 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/Server.java @@ -0,0 +1,100 @@ +package com.dy.simRtu202404; + +import com.dy.common.mw.UnitInterface; +import com.dy.common.util.ConfigXml4Springboot; +import com.dy.simRtu202404.tcpClient.TcpClUnit; +import com.dy.simRtu202404.tcpClient.TcpClUnitConfigVo; +import org.jdom2.Document; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.ResourceLoader; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author: liurunyu + * @Date: 2025/02/26 11:03 + * @Description + */ +@Component +public class Server { + @Autowired + protected ResourceLoader resourceLoader ; + + private ConfigXml4Springboot conf = null ; + private Document doc = null ; + private boolean showStartInfo = false ; + + private List<UnitInterface> units = new ArrayList<UnitInterface>() ; + + /** + * 鍚姩鏈嶅姟 + */ + public void startServer() { + long start = System.currentTimeMillis(); + try { + this.conf = new ConfigXml4Springboot() ; + this.doc = this.conf.createDom(resourceLoader, "config.xml") ; + //////////////// + //鏈嶅姟 閰嶇疆 + this.showStartInfo = this.conf.getSetAttrBoolean(this.doc, "config.server", "showStartInfo", null, null) ; + + this.startUnits() ; + + String svName ; + try{ + svName = this.conf.getSetAttrTxt(this.doc, "config.server", "name", null, false, null) ; + }catch(Exception e){ + svName = "" ; + } + + String company ; + try{ + company = this.conf.getSetAttrTxt(this.doc, "config.server", "company", null, true, null) ; + }catch(Exception e){ + company = "" ; + } + System.out.println("OOOOOOOOOO OOOOOOOO OOOOOOOO") ; + System.out.println("@@@@@@@@@@@@@@@@#O $@@@@@@@@& @@@@@@@@#") ; + System.out.println("@@@@@@@@@@@@@@@@@@@# @@@@@@@@# $@@@@@@@@&") ; + System.out.println("@@@@@@@@@@@@@@@@@@@@@# #@@@@@@@@@@@@@@@@O") ; + System.out.println("@@@@@@@@@@@@@@@@@@@@@@@ &@@@@@@@@@@@@@@") ; + System.out.println("@@@@@@$ $@@@@@@@@@& O@@@@@@@@@@@#") ; + System.out.println("@@@@@@$ @@@@@@@@@ @@@@@@@@@& " + svName ) ; + System.out.println("@@@@@@$ O@@@@@@@@@ &@@@@@@@@") ; + + if(ServerProperties.serverIp != null){ + System.out.println("@@@@@@$ O@@@@@@@@@ &@@@@@@@@ 杩滅▼涓棿浠舵湇鍔� " + (ServerProperties.serverIp + " " + ServerProperties.serverPort) ) ; + }else{ + System.out.println("@@@@@@$ O@@@@@@@@@ &@@@@@@@@") ; + } + System.out.println("@@@@@@$ #@@@@@@@@@$ &@@@@@@@@ 鏈琑TU鍦板潃 " + ServerProperties.rtuAddr ) ; + System.out.println("@@@@@@@@@@@@@@@@@@@@@@# &@@@@@@@@ Running in standalone mode" ) ; + System.out.println("@@@@@@@@@@@@@@@@@@@@@& &@@@@@@@@ Startup in " + (System.currentTimeMillis() - start) + " MS" ) ; + System.out.println("@@@@@@@@@@@@@@@@@@@# &@@@@@@@@ " + company) ; + System.out.println("@@@@@@@@@@@@@@@@#O &@@@@@@@@") ; + + }catch(Exception e){ + e.printStackTrace(); + } + } + + + private void startUnits() { + try { + // /////////////// + // TCP 妯″潡 + TcpClUnitConfigVo tcpVo = new TcpClUnitConfigVo(); + AdapterImp_TcpClUnit tcpAdap = new AdapterImp_TcpClUnit(); + tcpAdap.setConfig(tcpVo); + TcpClUnit tcpUnit = TcpClUnit.getInstance(); + tcpUnit.setAdapter(tcpAdap); + tcpUnit.start(obj -> { + }); + units.add(tcpUnit) ; + }catch (Exception e){ + e.printStackTrace(); + } + } +} diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/ServerProperties.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/ServerProperties.java new file mode 100644 index 0000000..867ee8f --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/ServerProperties.java @@ -0,0 +1,29 @@ +package com.dy.simRtu202404; + + +/** + * @Author: liurunyu + * @Date: 2025/02/26 11:03 + * @Description + */ +public class ServerProperties { + + public static String rtuAddr ; + public static String icCardAddr ;//IC鍗″湴鍧� + public static String icCardNo ;//IC鍗$紪鍙� + + public static String serverIp ;//閫氫俊涓棿浠舵湇鍔$IP + public static Integer serverPort ;//閫氫俊涓棿浠舵湇鍔$绔彛 + public static Integer connectTimeout = 3000 ; + + /** + * 杩愯鏂瑰紡 + * 0锛氬彧涓婃姤蹇冭烦 + * 1锛氫笂鎶ュ績璺� + 1娆★紙寮�闃�锛� + * 2锛氫笂鎶ュ績璺� + 1娆★紙鍏抽榾锛� + * 3锛氫笂鎶ュ績璺� + 1娆★紙寮�闃� + 鍏抽榾锛� + * 4锛氫笂鎶ュ績璺� + n娆★紙寮�闃� + 鍏抽榾锛� + */ + public static Integer type ; + +} diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/LocalCodecFactory.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/LocalCodecFactory.java new file mode 100644 index 0000000..2ca75ee --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/LocalCodecFactory.java @@ -0,0 +1,39 @@ +package com.dy.simRtu202404.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; +/** + * @Author: liurunyu + * @Date: 2025/02/26 11:10 + * @Description + */ +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; + } + /** + * 寰楀埌鍗忚瑙g爜鍣� + * @param ioSession 缃戠粶浼氳瘽 + * @return 鍗忚瑙g爜鍣� + */ + @Override + public ProtocolDecoder getDecoder(IoSession ioSession) { + return decoder; + } +} diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/LocalDecoder.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/LocalDecoder.java new file mode 100644 index 0000000..be2070e --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/LocalDecoder.java @@ -0,0 +1,43 @@ +package com.dy.simRtu202404.tcpClient; + +import com.dy.common.util.ByteUtil; +import com.dy.simRtu202404.tcpClient.downData.DownData; +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; +/** + * @Author: liurunyu + * @Date: 2025/02/26 11:10 + * @Description + */ +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[] bs = new byte[remain]; + in.get(bs) ; + in.position(0) ; + log.info("鏀跺埌涓棿浠朵笅琛屾暟鎹細" + ByteUtil.bytes2Hex(bs, true)); + new DownData().parseData(bs); + } + return true; + } + + +} diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/LocalEncoder.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/LocalEncoder.java new file mode 100644 index 0000000..9a77bf2 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/LocalEncoder.java @@ -0,0 +1,30 @@ +package com.dy.simRtu202404.tcpClient; + +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; +/** + * @Author: liurunyu + * @Date: 2025/02/26 11:10 + * @Description + */ +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-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/Starter.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/Starter.java new file mode 100644 index 0000000..32501c9 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/Starter.java @@ -0,0 +1,78 @@ +package com.dy.simRtu202404.tcpClient; + +import com.dy.common.util.Callback; +import com.dy.simRtu202404.ServerProperties; +import com.dy.simRtu202404.tcpClient.upData.UpData; +import com.dy.simRtu202404.tcpClient.upData.UpHeartBeat; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.mina.core.session.IoSession; + +/** + * @Author: liurunyu + * @Date: 2025/02/26 11:10 + * @Description + */ +public class Starter { + + private static final Logger log = LogManager.getLogger(TcpClUnit.class) ; + + private static Starter instance = new Starter() ; + + private static TcpClUnitConfigVo confVo ; + + public static IoSession session ; + + private Starter(){ + } + + public static Starter getInstance(TcpClUnitConfigVo confVo){ + Starter.confVo = confVo ; + return instance ; + } + + public void doStart(){ + new Thread(() -> { + Exception ex ; + while(true){ + ex = null ; + try { + new TcpConnect().createSession( + ServerProperties.serverIp, + ServerProperties.serverPort, + ServerProperties.connectTimeout, + new TcpHandler(), + new Callback() { + @Override + public void call(Object obj) { + if (obj == null) { + log.error("鍒涘缓缃戠粶浼氳瘽杩斿洖涓簄ull"); + } else { + Starter.session = (IoSession) obj; + log.info("鎴愬姛鍒涘缓涓庨�氫俊涓棿浠剁殑缃戠粶杩炴帴"); + Worker.getInstance(Starter.session).doWork(); + } + } + @Override + public void call(Object... objs) { + } + @Override + public void exception(Exception e) { + } + }); + }catch (Exception e){ + ex = e ; + } + if(ex == null){ + break ; + }else{ + try{ + Thread.sleep(100); + }catch (Exception e){ + } + } + } + }).start(); + } + +} diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpClUnit.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpClUnit.java new file mode 100644 index 0000000..8c64e10 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpClUnit.java @@ -0,0 +1,53 @@ +package com.dy.simRtu202404.tcpClient; + +import com.dy.common.mw.UnitAdapterInterface; +import com.dy.common.mw.UnitCallbackInterface; +import com.dy.common.mw.UnitInterface; + +/** + * @Author: liurunyu + * @Date: 2025/02/26 11:10 + * @Description + */ +public class TcpClUnit implements UnitInterface { + + private static TcpClUnit instance = new TcpClUnit() ; + + public static TcpClUnitAdapter adapter ; + public static TcpClUnitConfigVo confVo ; + + private static Starter worker ; + + private TcpClUnit(){} ; + + public static TcpClUnit getInstance(){ + return instance ; + } + + @Override + public void setAdapter(UnitAdapterInterface adapter) throws Exception { + if(adapter == null){ + throw new Exception("Tcp Client妯″潡閫傞厤鍣ㄥ璞′笉鑳戒负绌猴紒") ; + } + TcpClUnit.adapter = (TcpClUnitAdapter)adapter ; + TcpClUnit.confVo = TcpClUnit.adapter.getConfig() ; + if(TcpClUnit.confVo == null){ + throw new Exception("Tcp Client妯″潡閰嶇疆瀵硅薄涓嶈兘涓虹┖锛�") ; + } + TcpClUnit.worker = Starter.getInstance(TcpClUnit.confVo) ; + } + + @Override + public void start(UnitCallbackInterface callback) throws Exception { + System.out.println("Tcp Client妯″潡鎴愬姛鍚姩"); + TcpClUnit.worker.doStart(); + callback.call(null) ; + } + + @Override + public void stop(UnitCallbackInterface callback) throws Exception { + callback.call(null); + } + + +} diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpClUnitAdapter.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpClUnitAdapter.java new file mode 100644 index 0000000..b63180c --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpClUnitAdapter.java @@ -0,0 +1,13 @@ +package com.dy.simRtu202404.tcpClient; + +import com.dy.common.mw.UnitAdapterInterface; +/** + * @Author: liurunyu + * @Date: 2025/02/26 11:10 + * @Description + */ +public interface TcpClUnitAdapter extends UnitAdapterInterface { + + TcpClUnitConfigVo getConfig() ; + +} diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpClUnitConfigVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpClUnitConfigVo.java new file mode 100644 index 0000000..19b371f --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpClUnitConfigVo.java @@ -0,0 +1,8 @@ +package com.dy.simRtu202404.tcpClient; +/** + * @Author: liurunyu + * @Date: 2025/02/26 11:10 + * @Description + */ +public class TcpClUnitConfigVo { +} diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpConnect.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpConnect.java new file mode 100644 index 0000000..e482126 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpConnect.java @@ -0,0 +1,66 @@ +package com.dy.simRtu202404.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; +/** + * @Author: liurunyu + * @Date: 2025/02/26 11:10 + * @Description + */ +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-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpHandler.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpHandler.java new file mode 100644 index 0000000..c7a840c --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/TcpHandler.java @@ -0,0 +1,97 @@ +package com.dy.simRtu202404.tcpClient; + +import com.dy.common.util.ByteUtil; +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; + +/** + * @Author: liurunyu + * @Date: 2025/02/26 11:10 + * @Description + */ +public class TcpHandler extends IoHandlerAdapter { + + private static Logger log = LogManager.getLogger(TcpHandler.class.getName()) ; + + /** + * {@inheritDoc} + */ + @Override + public void sessionCreated(IoSession session) throws Exception { + super.sessionCreated(session); + } + + /** + * {@inheritDoc} + */ + @Override + public void sessionOpened(IoSession session) throws Exception { + super.sessionOpened(session); + } + + /** + * {@inheritDoc} + */ + @Override + public void sessionClosed(IoSession session) throws Exception { + super.sessionClosed(session); + } + + /** + * {@inheritDoc} + */ + @Override + public void sessionIdle(IoSession session, IdleStatus status) throws Exception { + super.sessionIdle(session, status); + } + + /** + * {@inheritDoc} + */ + @Override + public void exceptionCaught(IoSession session, Throwable cause) throws Exception { + } + + /** + * {@inheritDoc} + */ + @Override + public void messageReceived(IoSession session, Object message) throws Exception { + if(message != null){ + byte[] bs = (byte[])message ; + log.info("鏀跺埌涓棿浠舵暟鎹細" + ByteUtil.bytes2Hex(bs, true)); + } + } + + /** + * {@inheritDoc} + */ + @Override + public void messageSent(IoSession session, Object message) throws Exception { + if(message != null){ + byte[] bs = (byte[])message ; + log.info("\n缃戠粶鍙戦�佷簡鏁版嵁锛�" + + (session==null?"":(session.getRemoteAddress() != null?("涓棿浠剁綉鍧�鏄細" + session.getRemoteAddress().toString()):"")) + + ("\n鏁版嵁锛�" + ByteUtil.bytes2Hex(bs, true))); + } + } + + /** + * {@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-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/Worker.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/Worker.java new file mode 100644 index 0000000..09f97ab --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/Worker.java @@ -0,0 +1,121 @@ +package com.dy.simRtu202404.tcpClient; + +import com.dy.simRtu202404.ServerProperties; +import com.dy.simRtu202404.tcpClient.upData.UpData; +import com.dy.simRtu202404.tcpClient.upData.UpHeartBeat; +import com.dy.simRtu202404.tcpClient.upData.UpOpenCloseValve; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.mina.core.session.IoSession; + +/** + * @Author: liurunyu + * @Date: 2025/2/26 14:39 + * @Description + */ +public class Worker { + + private static final Logger log = LogManager.getLogger(TcpClUnit.class) ; + + protected static IoSession session ; + + private static Worker instance = new Worker() ; + + private static Integer UpHeartBeatTimes = 0 ; + private static boolean isOpenValve = false ; + private static boolean isCloseValve = false ; + private static Integer OpenedCount = 0 ; + private static Integer ClosedCount = 0 ; + + private Worker(){ + } + + public static Worker getInstance(IoSession session){ + Worker.session = session ; + return instance ; + } + + public void doWork(){ + UpData.setSession(Starter.session); + new Thread(new Runnable(){ + @Override + public void run() { + while(true){ + try { + reportData() ; + Thread.sleep(1000L); + }catch (Exception e){ + continue; + } + } + } + }).start(); + } + private void reportData() throws Exception{ + UpHeartBeat.upCd02Data(ServerProperties.rtuAddr); + UpHeartBeatTimes += 1 ; + + Thread.sleep(10000L); + + if(UpHeartBeatTimes == 2){ + UpHeartBeatTimes = 0 ; + if(ServerProperties.type == 1){ + if(!isOpenValve){ + UpOpenCloseValve.upCd84Data(ServerProperties.rtuAddr); + isOpenValve = true ; + } + } + + if(ServerProperties.type == 2){ + if(!isCloseValve){ + UpOpenCloseValve.upCd85Data(ServerProperties.rtuAddr); + isCloseValve = true ; + } + } + + if(ServerProperties.type == 3){ + if(!isOpenValve){ + UpOpenCloseValve.upCd84Data(ServerProperties.rtuAddr); + isOpenValve = true ; + } + OpenedCount += 1 ; + if(OpenedCount == 10){ + OpenedCount = 0 ; + if(!isCloseValve){ + UpOpenCloseValve.upCd85Data(ServerProperties.rtuAddr); + isCloseValve = true ; + } + } + } + + if(ServerProperties.type == 4){ + if(!isOpenValve && !isCloseValve){ + //鍒濇 + UpOpenCloseValve.upCd84Data(ServerProperties.rtuAddr); + isOpenValve = true ; + isCloseValve = false ; + }else{ + if(isOpenValve){ + OpenedCount += 1 ; + } + if(OpenedCount == 10){ + OpenedCount = 0 ; + UpOpenCloseValve.upCd85Data(ServerProperties.rtuAddr); + isOpenValve = false ; + isCloseValve = true ; + } + + if(isCloseValve){ + ClosedCount += 1 ; + } + if(ClosedCount == 10){ + ClosedCount = 0 ; + UpOpenCloseValve.upCd84Data(ServerProperties.rtuAddr); + isOpenValve = true ; + isCloseValve = false ; + } + } + } + } + } +} diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/downData/DownData.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/downData/DownData.java new file mode 100644 index 0000000..73e2762 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/downData/DownData.java @@ -0,0 +1,33 @@ +package com.dy.simRtu202404.tcpClient.downData; + +import com.dy.common.mw.protocol.p206V202404.ProtocolConstantV206V202404; + +/** + * @Author: liurunyu + * @Date: 2025/02/26 11:10 + * @Description + */ +public class DownData { + + private static int count9602 = 0; + + public void parseData(byte[] bs){ + if(bs != null && bs.length > 0){ + if(bs.length >= (ProtocolConstantV206V202404.ctrlIndex) + && bs[0] == ProtocolConstantV206V202404.P_Head_Byte + && bs[2] == ProtocolConstantV206V202404.P_Head_Byte){ + this.dealP206V1(bs); + }else if(bs.length >= (ProtocolConstantV206V202404.UG_codeIndex) + && bs[0] == ProtocolConstantV206V202404.UG_P_Head_Byte + && bs[3] == ProtocolConstantV206V202404.UG_P_Head_Byte){ + this.dealUpgrade(bs); + } + + } + } + private void dealP206V1(byte[] bs){ + //搴旇鏄摼璺娴嬫暟鎹� + } + private void dealUpgrade(byte[] bs){ + } +} diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpData.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpData.java new file mode 100644 index 0000000..940e79f --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpData.java @@ -0,0 +1,52 @@ +package com.dy.simRtu202404.tcpClient.upData; + +import com.dy.common.mw.protocol.p206V202404.ProtocolConstantV206V202404; +import com.dy.common.mw.protocol.p206V202404.parse.global.GlCreate; +import com.dy.common.util.ByteUtil; +import org.apache.mina.core.session.IoSession; + +/** + * @Author: liurunyu + * @Date: 2025/02/26 11:10 + * @Description + */ +public class UpData { + + protected static IoSession session ; + + private static Object synObj = new Object() ; + + public static void setSession(IoSession session){ + UpData.session = session ; + } + + protected static void upSend(byte[] bs) throws Exception{ + synchronized (synObj){ + session.write(bs) ; + } + } + + protected static byte[] creatHead(String rtuAddr, String code, byte ctrl)throws Exception { + byte[] bsHead = new byte[ProtocolConstantV206V202404.lenHead2Code] ; + byte index = 0 ; + bsHead[index] = ProtocolConstantV206V202404.P_Head_Byte ; + + index++ ; + bsHead[index] = 0 ;//甯ч暱搴� + + index++ ; + bsHead[index] = ProtocolConstantV206V202404.P_Head_Byte ; + + index++ ; + bsHead[index] = ctrl; //鎺у埗鍩熷姛鑳界爜 + + index++ ; + GlCreate.createRtuAddr(rtuAddr, bsHead, index); + index += 8 ; + + ByteUtil.hex2Bytes(code, bsHead, index) ; + + return bsHead ; + } + +} diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpHeartBeat.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpHeartBeat.java new file mode 100644 index 0000000..faccaf1 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpHeartBeat.java @@ -0,0 +1,57 @@ +package com.dy.simRtu202404.tcpClient.upData; + +import com.dy.common.mw.protocol.p206V202404.parse.global.GlCreate; +import com.dy.common.util.ByteUtil; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +/** + * @Author: liurunyu + * @Date: 2025/02/26 11:10 + * @Description + */ +public class UpHeartBeat extends UpData { + + private static final Logger log = LogManager.getLogger(UpHeartBeat.class) ; + + public static void upCd02Data(String rtuAddr){ + try{ + if(UpData.session != null && UpData.session.isConnected()){ + byte[] bs = createCd02Data(rtuAddr) ; + UpData.upSend(bs) ; + }else{ + log.error("鏈繛鎺ラ�氫俊涓棿浠讹紝涓嶈兘鍙戦�佹暟鎹�"); + } + }catch (Exception e){ + log.error("鍚戦�氫俊涓棿浠跺彂閫佹暟鎹骇鐢熷紓甯�", e); + } + } + + + /** + * 鏋勯�犲績璺虫暟鎹� + * @return 瀛楄妭鏁扮粍 + * @throws Exception 寮傚父 + */ + private static byte[] createCd02Data(String rtuAddr) throws Exception { + byte[] bytes = creatHead(rtuAddr, "02", (byte)0x81); + + byte[] bs = new byte[]{(byte)0x02} ;//0x02:琛ㄩ榾涓�浣撴満 + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[]{(byte)0x0A} ;//椤圭洰缂栧彿 + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[]{(byte)0xF2} ;//淇濇寔鍦ㄧ嚎 + 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-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java new file mode 100644 index 0000000..8f04053 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java @@ -0,0 +1,214 @@ +package com.dy.simRtu202404.tcpClient.upData; + +import com.dy.common.mw.protocol.p206V202404.parse.global.GlCreate; +import com.dy.common.util.ByteUtil; +import com.dy.common.util.DateTime; +import com.dy.simRtu202404.ServerProperties; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +/** + * @Author: liurunyu + * @Date: 2025/2/26 11:42 + * @Description + */ +public class UpOpenCloseValve extends UpData { + + private static final Logger log = LogManager.getLogger(UpOpenCloseValve.class) ; + + private static String orderNo = null ; + private static String openValveDt = null ; + + private static Double totalWaterAmount = 1234.56 ;//绱娴侀噺 + private static Double remainMoney = 65.4321 ;//鍓╀綑閲戦 + + private static Double thisWaterAmount = 100.00 ;//鏈浣跨敤鐢甸噺 + private static Double thisMoney = 10.00 ;//鏈浣跨敤閲戦 + + public static void upCd84Data(String rtuAddr){ + try{ + if(UpData.session != null && UpData.session.isConnected()){ + byte[] bs = createCd84Data(rtuAddr) ; + UpData.upSend(bs) ; + }else{ + log.error("鏈繛鎺ラ�氫俊涓棿浠讹紝涓嶈兘鍙戦�佹暟鎹�"); + } + }catch (Exception e){ + log.error("鍚戦�氫俊涓棿浠跺彂閫佹暟鎹骇鐢熷紓甯�", e); + } + } + + public static void upCd85Data(String rtuAddr){ + try{ + if(UpData.session != null && UpData.session.isConnected()){ + byte[] bs = createCd85Data(rtuAddr) ; + UpData.upSend(bs) ; + }else{ + log.error("鏈繛鎺ラ�氫俊涓棿浠讹紝涓嶈兘鍙戦�佹暟鎹�"); + } + }catch (Exception e){ + log.error("鍚戦�氫俊涓棿浠跺彂閫佹暟鎹骇鐢熷紓甯�", e); + } + } + + + /** + * 鏋勯�犲紑闃�鏁版嵁 + * @return 瀛楄妭鏁扮粍 + * @throws Exception 寮傚父 + */ + private static byte[] createCd84Data(String rtuAddr) throws Exception { + orderNo = DateTime.yyyyMMddHHmmss() + "00" ; + openValveDt = DateTime.yyMMddhhmmss() ; + + byte[] bytes = creatHead(rtuAddr, "84", (byte)0x81); + + byte[] bs = new byte[]{(byte)0x02} ;//0x02:琛ㄩ榾涓�浣撴満 + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[]{(byte)0x0A} ;//椤圭洰缂栧彿 + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[]{(byte)0xF0} ;//0xf0:闃�闂� 0x00:姘存车 + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[]{(byte)0x00} ;//0x00:姝e父鍒峰崱寮�娉�/闃�鐢ㄦ按 + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[4] ;//鐢ㄦ埛IC鍗″彿 4瀛楄妭HEX鐮�(杩滅▼寮�娉�/闃�鏃舵鏁版嵁涓�0) + GlCreate.createIcCardAddr(ServerProperties.icCardAddr, bs, 0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[8] ;//鐢ㄦ埛搴忓垪鍙� 8瀛楄妭 6瀛楄妭BCD:琛屾斂缂栧彿 2瀛楄妭HEX:鐢ㄦ埛缂栧彿 + GlCreate.createIcCardNo(ServerProperties.icCardNo, bs, 0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[8] ;//鏈璁㈠崟鍙� 8瀛楄妭 BCD鐮� + ByteUtil.string2BCD_LE( bs, orderNo,0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[6] ;//寮�娉�/闃�鏃堕棿 6瀛楄妭鐨凚CD鐮�(绉掑垎鏃舵棩鏈堝勾) + ByteUtil.string2BCD_LE( bs, openValveDt,0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[5] ;//姘磋〃绱姘撮噺 5瀛楄妭BCD鐮侊紝鍗曚綅0.01绔嬫柟绫� + ByteUtil.int2BCD_LE(Double.valueOf(totalWaterAmount * 100).intValue(), bs, 0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[5] ;//鐢佃〃绱鐢甸噺 5瀛楄妭BCD鐮侊紝鍗曚綅0.01搴� + ByteUtil.int2BCD_LE(0, bs, 0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[5] ;//鐢ㄦ埛鍓╀綑閲戦 5瀛楄妭BCD鐮侊紝 鍗曚綅0.0001鍏� + ByteUtil.int2BCD_LE(Double.valueOf(remainMoney * 10000).intValue(), bs, 0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[5] ;//鐢ㄦ埛鍓╀綑姘撮噺 5瀛楄妭BCD鐮侊紝 鍗曚綅0.01m3 + ByteUtil.int2BCD_LE(0, bs, 0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[4] ;//鏈轰簳/闃�鐘舵�佸強鎶ヨ淇℃伅 4瀛楄妭HEX鐮� 瀹氫箟瑙佽〃41 + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + + GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑 + + byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓� + + bytes = ByteUtil.bytesMerge(bytes, bsTail) ; + + return bytes ; + } + + /** + * 鏋勯�犲叧闃�鏁版嵁 + * @return 瀛楄妭鏁扮粍 + * @throws Exception 寮傚父 + */ + private static byte[] createCd85Data(String rtuAddr) throws Exception { + if(orderNo == null){ + orderNo = DateTime.yyyyMMddHHmmss() + "00" ; + } + if(openValveDt == null){ + openValveDt = DateTime.yyMMddhhmmss() ; + } + + totalWaterAmount -= thisWaterAmount ; + remainMoney -= thisMoney ; + + byte[] bytes = creatHead(rtuAddr, "85", (byte)0x81); + + byte[] bs = new byte[]{(byte)0x02} ;//0x02:琛ㄩ榾涓�浣撴満 + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[]{(byte)0x0A} ;//椤圭洰缂栧彿 + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[]{(byte)0x01} ;//鍏虫车/闃�鏂瑰紡 0x00:鍒峰崱闂� 0x01:骞冲彴鍏� 0x02:APP鍏� 0x03:闈炴硶鍗″叧 0x04:姘磋〃閫氳寮傚父鍏� 0x05:鐢佃〃寮傚父鍏� 0x06:鍓╀綑姘撮噺涓嶈冻鍏� 0x07:鍓╀綑閲戦涓�0鍏� 0x08:寮�娉�/闃�鍚庣閬撴病鏈夋祦閲忓叧 0x09:鎺夌數鍐嶄笂鐢靛叧锛�0x0a:姘磋〃鐬椂娴侀噺涓�0鍏筹紝0x0b:鍒峰崱寮�娉碉紝杩滅▼鍏炽��0x0c:鐢垫睜浣庣數鍘嬪叧銆� + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[4] ;//鐢ㄦ埛IC鍗″彿 4瀛楄妭HEX鐮�(杩滅▼寮�娉�/闃�鏃舵鏁版嵁涓�0) + GlCreate.createIcCardAddr(ServerProperties.icCardAddr, bs, 0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[8] ;//鐢ㄦ埛搴忓垪鍙� 8瀛楄妭 6瀛楄妭BCD:琛屾斂缂栧彿 2瀛楄妭HEX:鐢ㄦ埛缂栧彿 + GlCreate.createIcCardNo(ServerProperties.icCardNo, bs, 0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[8] ;//鏈璁㈠崟鍙� 8瀛楄妭 BCD鐮� + ByteUtil.string2BCD_LE( bs, orderNo,0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[6] ;//寮�濮嬫椂闂� 6瀛楄妭鐨凚CD鐮�(绉掑垎鏃舵棩鏈堝勾) + ByteUtil.string2BCD_LE( bs, openValveDt,0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[6] ;//缁撴潫鏃堕棿 6瀛楄妭鐨凚CD鐮�(绉掑垎鏃舵棩鏈堝勾) + ByteUtil.string2BCD_LE( bs, DateTime.yyyyMMddHHmmss(),0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[5] ;//姘磋〃绱姘撮噺 5瀛楄妭BCD鐮侊紝鍗曚綅0.01绔嬫柟绫� + ByteUtil.int2BCD_LE(Double.valueOf(totalWaterAmount * 100).intValue(), bs, 0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[5] ;//鐢佃〃绱鐢甸噺 5瀛楄妭BCD鐮侊紝鍗曚綅0.01搴� + ByteUtil.int2BCD_LE(0, bs, 0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[5] ;//鐢ㄦ埛鍓╀綑閲戦 5瀛楄妭BCD鐮侊紝 鍗曚綅0.0001鍏� + ByteUtil.int2BCD_LE(Double.valueOf(remainMoney * 10000).intValue(), bs, 0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[5] ;//鐢ㄦ埛鍓╀綑姘撮噺 5瀛楄妭BCD鐮侊紝 鍗曚綅0.01m3 + ByteUtil.int2BCD_LE(0, bs, 0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[4] ;//鏈浣跨敤鐢甸噺 4瀛楄妭BCD鐮� 鍗曚綅0.01搴� + ByteUtil.int2BCD_LE(0, bs, 0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[4] ;//鏈浣跨敤姘撮噺 4瀛楄妭BCD鐮� 鍗曚綅0.01绔嬫柟绫� + ByteUtil.int2BCD_LE(Double.valueOf(thisWaterAmount * 10000).intValue(), bs, 0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[4] ;//鏈浣跨敤閲戦 4瀛楄妭BCD鐮� 鍗曚綅0.0001鍏� + ByteUtil.int2BCD_LE(Double.valueOf(thisMoney * 10000).intValue(), bs, 0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[2] ;//鏈浣跨敤鏃堕棿闀� 2瀛楄妭BCD鐮� 鍗曚綅锛氬垎閽� + ByteUtil.int2BCD_LE(10, bs, 0); + bytes = ByteUtil.bytesMerge(bytes, bs) ; + + bs = new byte[4] ;//鏈轰簳/闃�鐘舵�佸強鎶ヨ淇℃伅 4瀛楄妭HEX鐮� 瀹氫箟瑙佽〃41 + 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-mw-simulate-rtu202404/src/main/resources/application.yml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/application.yml new file mode 100644 index 0000000..d35af25 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/application.yml @@ -0,0 +1,5 @@ +logging: + charset: + console: UTF-8 + config: + classpath: log4j2.yml diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/config.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/config.xml new file mode 100644 index 0000000..0b9f3fe --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/config.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<config> + <server name="RTU妯℃嫙鍣紙鐜嬫睙娴凤級" showStartInfo="true" company="http://www.dyjs.com"/> + +</config> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/log4j2.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/log4j2.xml new file mode 100644 index 0000000..da3d606 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/log4j2.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="OFF"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout charset="UTF-8" pattern="%d %-5p [%t] (%F:%L) - %m%n%throwable"/> + </Console> + <RollingFile name="File" fileName="logs/simRtu202404.log" filePattern="logs/simRtu-%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-mw/pipIrr-mw-simulate-rtu202404/src/test/java/com/dy/simRtu202404/pipirrmwsimulatertu202404/PipIrrMwSimulateRtu202404ApplicationTests.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/test/java/com/dy/simRtu202404/pipirrmwsimulatertu202404/PipIrrMwSimulateRtu202404ApplicationTests.java new file mode 100644 index 0000000..9f7dadc --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/test/java/com/dy/simRtu202404/pipirrmwsimulatertu202404/PipIrrMwSimulateRtu202404ApplicationTests.java @@ -0,0 +1,13 @@ +package com.dy.simRtu202404.pipirrmwsimulatertu202404; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class PipIrrMwSimulateRtu202404ApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/\350\257\264\346\230\216.txt" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/\350\257\264\346\230\216.txt" new file mode 100644 index 0000000..9e76ff5 --- /dev/null +++ "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/\350\257\264\346\230\216.txt" @@ -0,0 +1 @@ +鏈ā鍧楁槸RTU妯℃嫙鍣紝妯℃嫙鐜嬫睙娴峰崗璁殑RTU \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-mw/pom.xml b/pipIrr-platform/pipIrr-mw/pom.xml index 98c84aa..a4afe51 100644 --- a/pipIrr-platform/pipIrr-mw/pom.xml +++ b/pipIrr-platform/pipIrr-mw/pom.xml @@ -17,6 +17,7 @@ <modules> <module>pipIrr-mw-rtu</module> <module>pipIrr-mw-simulate-rtu</module> + <module>pipIrr-mw-simulate-rtu202404</module> <module>pipIrr-mwTest-server</module> <module>pipIrr-mwTest-client</module> </modules> -- Gitblit v1.8.0