From 05150476db73294428ec22e8219b1589fd5cc897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E6=BC=8F=E6=B4=9E?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=8C=E6=88=90?= <> Date: Thu, 3 Oct 2024 01:29:59 +0800 Subject: [PATCH] comm --- .../weather/dao/WeatherFutureRepository.java | 2 +- .../service/impl/WeatherServiceImpl.java | 3 + SerialPortCommJava/.gitignore | 33 +++ .../.mvn/wrapper/maven-wrapper.properties | 19 ++ SerialPortCommJava/mvnw | 259 ++++++++++++++++++ SerialPortCommJava/mvnw.cmd | 149 ++++++++++ SerialPortCommJava/pom.xml | 119 ++++++++ .../SerialPortCommJavaApplication.java | 62 +++++ .../controller/SemeaController.java | 52 ++++ .../utils/DataChangeUtil.java | 47 ++++ .../rehome/serialportcommjava/utils/R.java | 65 +++++ .../serialportcommjava/utils/ResultCode.java | 8 + .../utils/SerialCommUtil.java | 121 ++++++++ .../src/main/resources/application.properties | 1 + .../SerialPortCommJavaApplicationTests.java | 13 + 15 files changed, 952 insertions(+), 1 deletion(-) create mode 100644 SerialPortCommJava/.gitignore create mode 100644 SerialPortCommJava/.mvn/wrapper/maven-wrapper.properties create mode 100755 SerialPortCommJava/mvnw create mode 100644 SerialPortCommJava/mvnw.cmd create mode 100644 SerialPortCommJava/pom.xml create mode 100644 SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/SerialPortCommJavaApplication.java create mode 100644 SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/controller/SemeaController.java create mode 100644 SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/utils/DataChangeUtil.java create mode 100644 SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/utils/R.java create mode 100644 SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/utils/ResultCode.java create mode 100644 SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/utils/SerialCommUtil.java create mode 100644 SerialPortCommJava/src/main/resources/application.properties create mode 100644 SerialPortCommJava/src/test/java/com/rehome/serialportcommjava/SerialPortCommJavaApplicationTests.java diff --git a/20240922/weather/src/main/java/com/rehome/weather/dao/WeatherFutureRepository.java b/20240922/weather/src/main/java/com/rehome/weather/dao/WeatherFutureRepository.java index a523206..bed1f51 100644 --- a/20240922/weather/src/main/java/com/rehome/weather/dao/WeatherFutureRepository.java +++ b/20240922/weather/src/main/java/com/rehome/weather/dao/WeatherFutureRepository.java @@ -11,7 +11,7 @@ public interface WeatherFutureRepository extends JpaRepository findByDate(String date); - @Query(value = "select * from weather_future wf where wf.city = ?1 ORDER BY id DESC LIMIT 0,5", nativeQuery = true) + @Query(value = "select * from weather_future wf where wf.city = ?1 ORDER BY id DESC LIMIT 0,1", nativeQuery = true) Optional> findAllByCity(String city); } diff --git a/20240922/weather/src/main/java/com/rehome/weather/service/impl/WeatherServiceImpl.java b/20240922/weather/src/main/java/com/rehome/weather/service/impl/WeatherServiceImpl.java index 2fae5f1..2487d3c 100644 --- a/20240922/weather/src/main/java/com/rehome/weather/service/impl/WeatherServiceImpl.java +++ b/20240922/weather/src/main/java/com/rehome/weather/service/impl/WeatherServiceImpl.java @@ -147,6 +147,7 @@ public class WeatherServiceImpl implements WeatherService { realtime.setCity(result.getCity()); SimpleDateFormat formatYYYY = new SimpleDateFormat("YYYY-MM-dd"); realtime.setDate(formatYYYY.format(new Date())); + realtime.setCreatetime(new Date()); weatherRealtimeRepository.save(realtime); resultToClient.setRealtime(realtime); /* @@ -169,6 +170,8 @@ public class WeatherServiceImpl implements WeatherService { //插入单条预报数据 Optional weatherFutureDB=weatherFutureRepository.findByDate(weatherFuture.getDate()); if(!weatherFutureDB.isPresent()){ + weatherFuture.setUpdatetime(new Date()); + weatherFuture.setCreatetime(new Date()); weatherFutureRepository.save(weatherFuture); }else{ weatherFuture.setUpdatetime(new Date()); diff --git a/SerialPortCommJava/.gitignore b/SerialPortCommJava/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/SerialPortCommJava/.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/SerialPortCommJava/.mvn/wrapper/maven-wrapper.properties b/SerialPortCommJava/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d58dfb7 --- /dev/null +++ b/SerialPortCommJava/.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/SerialPortCommJava/mvnw b/SerialPortCommJava/mvnw new file mode 100755 index 0000000..19529dd --- /dev/null +++ b/SerialPortCommJava/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-,maven-mvnd--}/ +[ -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/SerialPortCommJava/mvnw.cmd b/SerialPortCommJava/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/SerialPortCommJava/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-,maven-mvnd--}/ +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/SerialPortCommJava/pom.xml b/SerialPortCommJava/pom.xml new file mode 100644 index 0000000..8432807 --- /dev/null +++ b/SerialPortCommJava/pom.xml @@ -0,0 +1,119 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.3 + + + com.rehome + SerialPortCommJava + 1.0.0 + SerialPortCommJava + SerialPortCommJava + + 1.8 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + com.google.code.gson + gson + 2.8.2 + + + com.squareup.okhttp3 + okhttp + 3.6.0 + + + org.apache.commons + commons-lang3 + 3.9 + + + org.jetbrains + annotations + 19.0.0 + + + + org.projectlombok + lombok + 1.18.20 + true + + + + org.apache.logging.log4j + log4j-api + 2.17.1 + + + + org.apache.logging.log4j + log4j-core + 2.17.1 + + + com.github.xiaoymin + swagger-bootstrap-ui + 1.9.6 + + + commons-io + commons-io + 2.4 + + + javax.validation + validation-api + 2.0.1.Final + + + io.swagger + swagger-annotations + 1.5.20 + + + com.alibaba + fastjson + 1.2.47 + + + commons-codec + commons-codec + 1.11 + compile + + + com.fazecast + jSerialComm + 2.9.0 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/SerialPortCommJavaApplication.java b/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/SerialPortCommJavaApplication.java new file mode 100644 index 0000000..61020c6 --- /dev/null +++ b/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/SerialPortCommJavaApplication.java @@ -0,0 +1,62 @@ +package com.rehome.serialportcommjava; + +import com.rehome.serialportcommjava.controller.SemeaController; +import org.springframework.beans.BeansException; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.annotation.Resource; +import java.util.Map; + +@EnableJpaAuditing +@EnableScheduling +@SpringBootApplication +public class SerialPortCommJavaApplication implements CommandLineRunner, ApplicationContextAware { + + /** + * 获取Spring框架的上下文 + */ + private ApplicationContext applicationContext; + + @Resource + private SemeaController semeaController; + + public static void main(String[] args) { + SpringApplication.run(SerialPortCommJavaApplication.class, args); + } + + @Override + public void run(String... args) throws Exception { + + //在这里可以调用applicationContext了 + Map controllers = applicationContext.getBeansWithAnnotation(RequestMapping.class); + for (Map.Entry entry : controllers.entrySet()) { + System.out.println("------------------------"); + System.out.println(entry.getKey());//demo1Controller + } + try { + if (semeaController != null) { + System.out.println("------------------------"); + System.out.println("semeaController is not empty"); + // + + + } else { + System.out.println("semeaController is empty"); + } + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + this.applicationContext = applicationContext; + } +} diff --git a/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/controller/SemeaController.java b/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/controller/SemeaController.java new file mode 100644 index 0000000..36ab20d --- /dev/null +++ b/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/controller/SemeaController.java @@ -0,0 +1,52 @@ +package com.rehome.serialportcommjava.controller; + + +import com.rehome.serialportcommjava.utils.R; +import com.rehome.serialportcommjava.utils.SerialCommUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Api(value = "Java串口通讯测试") +public class SemeaController { + + + public static SerialCommUtil serialCommUtil = SerialCommUtil.getSerialCommUtil(); + + @ApiOperation(value = "初始化串口") + @PostMapping("/init") + public R init(String portName, int baudRate) { + boolean flag = serialCommUtil.openPort(portName, baudRate); + if(flag){ + return R.ok().data("msg","初始化成功"); + }else{ + return R.error().data("msg","初始化失败"); + } + } + + @ApiOperation(value = "向传感器发送消息") + @PostMapping("/sendMsg") + public R sendMsg( String message) { + boolean flag = serialCommUtil.sendData(message.getBytes()); + if(flag){ + return R.ok().data("msg","消息发送成功:"+ message); + }else{ + return R.error().data("msg","消息发送失败"); + } + } + + + @ApiOperation(value = "释放资源，关闭串口") + @PostMapping("/closePort") + public R closePort() { + boolean b = serialCommUtil.closePort(); + if(b){ + return R.ok(); + }else { + return R.error(); + } + } +} + diff --git a/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/utils/DataChangeUtil.java b/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/utils/DataChangeUtil.java new file mode 100644 index 0000000..7f799ba --- /dev/null +++ b/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/utils/DataChangeUtil.java @@ -0,0 +1,47 @@ +package com.rehome.serialportcommjava.utils; + +import java.lang.reflect.Type; +public class DataChangeUtil { + + /** + * 二进制转String + * @param bArr + * @return + */ + public static String byteArrayToHexString(byte[] bArr) { + StringBuffer sb = new StringBuffer(bArr.length); + String sTmp; + for (int i = 0; i < bArr.length; i++) { + sTmp = Integer.toHexString(0xFF & bArr[i]); + if (sTmp.length() < 2){ + sb.append(0); + } + sb.append(sTmp.toUpperCase()); + } + return sb.toString(); + } + /** + * hex字符串转byte数组 + * @param inHex 待转换的Hex字符串 + * @return 转换后的byte数组结果 + */ + public static byte[] hexToByteArray(String inHex){ + int hexlen = inHex.length(); + byte[] result; + if (hexlen % 2 == 1){ + //奇数 + hexlen++; + result = new byte[(hexlen/2)]; + inHex="0"+inHex; + }else { + //偶数 + result = new byte[(hexlen/2)]; + } + int j=0; + for (int i = 0; i < hexlen; i+=2){ + result[j]=(byte)Integer.parseInt(inHex.substring(i,i+2),16); + j++; + } + return result; + } +} \ No newline at end of file diff --git a/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/utils/R.java b/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/utils/R.java new file mode 100644 index 0000000..c44f0f0 --- /dev/null +++ b/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/utils/R.java @@ -0,0 +1,65 @@ +package com.rehome.serialportcommjava.utils; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.HashMap; +import java.util.Map; + +@Data +public class R { + @ApiModelProperty(value = "是否成功") + private Boolean success; + + @ApiModelProperty(value = "返回码") + private Integer code; + + @ApiModelProperty(value = "返回消息") + private String message; + + @ApiModelProperty(value = "返回数据") + private Map data = new HashMap(); + + private R(){} + + public static R ok(){ + R r = new R(); + r.setSuccess(true); + r.setCode(ResultCode.SUCCESS); + r.setMessage("成功"); + return r; + } + + public static R error(){ + R r = new R(); + r.setSuccess(false); + r.setCode(ResultCode.ERROR); + r.setMessage("失败"); + return r; + } + + public R success(Boolean success){ + this.setSuccess(success); + return this; + } + + public R message(String message){ + this.setMessage(message); + return this; + } + + public R code(Integer code){ + this.setCode(code); + return this; + } + + public R data(String key, Object value){ + this.data.put(key, value); + return this; + } + + public R data(Map map){ + this.setData(map); + return this; + } +} \ No newline at end of file diff --git a/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/utils/ResultCode.java b/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/utils/ResultCode.java new file mode 100644 index 0000000..2fbc2f4 --- /dev/null +++ b/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/utils/ResultCode.java @@ -0,0 +1,8 @@ +package com.rehome.serialportcommjava.utils; + +public interface ResultCode { + + public static Integer SUCCESS = 20000; + + public static Integer ERROR = 20001; +} \ No newline at end of file diff --git a/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/utils/SerialCommUtil.java b/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/utils/SerialCommUtil.java new file mode 100644 index 0000000..1a3dc25 --- /dev/null +++ b/SerialPortCommJava/src/main/java/com/rehome/serialportcommjava/utils/SerialCommUtil.java @@ -0,0 +1,121 @@ +package com.rehome.serialportcommjava.utils; + + +import com.fazecast.jSerialComm.SerialPort; +import com.fazecast.jSerialComm.SerialPortDataListener; +import com.fazecast.jSerialComm.SerialPortEvent; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class SerialCommUtil { + private SerialPort serialPort; + + private static SerialCommUtil serialCommUtil; + + public static SerialCommUtil getSerialCommUtil() { + if (serialCommUtil == null) { + synchronized (SerialCommUtil.class) { + if (serialCommUtil == null) { + serialCommUtil = new SerialCommUtil(); + } + } + } + return serialCommUtil; + } + + + /** + * 打开串口 + * + * @param portName 串口名称（例如 "COM3" 或 "/dev/ttyUSB0"） + * @param baudRate 波特率 + * @return 是否成功打开 + */ + public boolean openPort(String portName, int baudRate) { + serialPort = SerialPort.getCommPort(portName); + serialPort.setBaudRate(baudRate); + serialPort.setNumDataBits(8); + serialPort.setNumStopBits(SerialPort.ONE_STOP_BIT); + serialPort.setParity(SerialPort.NO_PARITY); + boolean flag = serialPort.openPort(); + serialPort.addDataListener(new DataListener()); + return flag; + } + + /** + * 关闭串口 + */ + public boolean closePort() { + if (serialPort != null && serialPort.isOpen()) { + return serialPort.closePort(); + } + return false; + } + + /** + * 发送数据 + * + * @param data 要发送的数据 + * @return 是否成功发送 + */ + public boolean sendData(byte[] data) { + if (serialPort == null || !serialPort.isOpen()) { + return false; + } + + int bytesSent = serialPort.writeBytes(data, data.length); + return bytesSent == data.length; + } + + // 数据监听器 + private static class DataListener implements SerialPortDataListener { + @Override + public int getListeningEvents() { + return SerialPort.LISTENING_EVENT_DATA_AVAILABLE; + } + + @Override + public void serialEvent(SerialPortEvent event) { + if (event.getEventType() != SerialPort.LISTENING_EVENT_DATA_AVAILABLE) return; + SerialPort comPort = event.getSerialPort(); + byte[] newData = new byte[comPort.bytesAvailable()]; + comPort.readBytes(newData, newData.length); + readData(newData); + } + } + + public static void readData(byte[] newData) { + try { + String data = DataChangeUtil.byteArrayToHexString(newData); + // 处理接收到的数据 + System.out.println("接收到的数据为: " + data); + System.out.println("========================================================================"); + System.out.println(); + } catch (Exception e) { + log.error("Bad Things",e); + } + } + + /** + * 接收数据 + * + * @param bufferSize 缓冲区大小cl + * @return 接收到的数据 + */ + public byte[] receiveData(int bufferSize) { + if (serialPort == null || !serialPort.isOpen()) { + return null; + } + + byte[] buffer = new byte[bufferSize]; + int bytesRead = serialPort.readBytes(buffer, bufferSize); + + if (bytesRead > 0) { + byte[] actualData = new byte[bytesRead]; + System.arraycopy(buffer, 0, actualData, 0, bytesRead); + return actualData; + } else { + return null; + } + } +} diff --git a/SerialPortCommJava/src/main/resources/application.properties b/SerialPortCommJava/src/main/resources/application.properties new file mode 100644 index 0000000..964b62c --- /dev/null +++ b/SerialPortCommJava/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=SerialPortCommJava diff --git a/SerialPortCommJava/src/test/java/com/rehome/serialportcommjava/SerialPortCommJavaApplicationTests.java b/SerialPortCommJava/src/test/java/com/rehome/serialportcommjava/SerialPortCommJavaApplicationTests.java new file mode 100644 index 0000000..98147ef --- /dev/null +++ b/SerialPortCommJava/src/test/java/com/rehome/serialportcommjava/SerialPortCommJavaApplicationTests.java @@ -0,0 +1,13 @@ +package com.rehome.serialportcommjava; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SerialPortCommJavaApplicationTests { + + @Test + void contextLoads() { + } + +}