From bc581dbe4f3248ecdb4f713c78d7fe39a6b6caa4 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Fri, 18 Oct 2024 23:58:04 +0800 Subject: [PATCH 01/43] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=80=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E5=AE=8C=E6=88=90=E7=94=A8=E6=88=B7=20?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=20=E5=BF=AB=E9=80=92=E5=91=98?= =?UTF-8?q?=E7=9A=84=E9=80=9A=E7=94=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 2 + .gitignore | 33 +++ .mvn/wrapper/maven-wrapper.properties | 20 ++ mvnw | 259 ++++++++++++++++++ mvnw.cmd | 149 ++++++++++ pom.xml | 139 ++++++++++ .../DTO/UserLoginByAccountDTO.java | 16 ++ .../DTO/UserModifyMessageDTO.java | 15 + .../DTO/UserModifyPassword.java | 24 ++ .../ExpressDistributionSystemApplication.java | 20 ++ .../config/CrossOriginConfig.java | 19 ++ .../config/MyMetaObjectHandler.java | 29 ++ .../config/MybatisPlusConfig.java | 24 ++ .../config/WebConfig.java | 18 ++ .../controller/UserController.java | 151 ++++++++++ .../entity/Address.java | 33 +++ .../entity/Code.java | 33 +++ .../entity/Goods.java | 46 ++++ .../entity/Records.java | 42 +++ .../entity/Result.java | 18 ++ .../entity/User.java | 65 +++++ .../interceptors/LoginInterceptor.java | 52 ++++ .../mapper/AddressMapper.java | 7 + .../mapper/GoodsMapper.java | 7 + .../mapper/UserMapper.java | 7 + .../service/AddressService.java | 7 + .../service/GoodsService.java | 7 + .../service/UserService.java | 7 + .../service/impl/AddressServiceImpl.java | 11 + .../service/impl/GoodsServiceImpl.java | 11 + .../service/impl/UserServiceImpl.java | 11 + .../utils/GetIdUtil.java | 11 + .../utils/JwtUtil.java | 34 +++ .../utils/Md5Util.java | 56 ++++ .../utils/ThreadLocalUtil.java | 25 ++ src/main/resources/application.yml | 29 ++ ...essDistributionSystemApplicationTests.java | 13 + 37 files changed, 1450 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/jty/expressdistributionsystem/DTO/UserLoginByAccountDTO.java create mode 100644 src/main/java/jty/expressdistributionsystem/DTO/UserModifyMessageDTO.java create mode 100644 src/main/java/jty/expressdistributionsystem/DTO/UserModifyPassword.java create mode 100644 src/main/java/jty/expressdistributionsystem/ExpressDistributionSystemApplication.java create mode 100644 src/main/java/jty/expressdistributionsystem/config/CrossOriginConfig.java create mode 100644 src/main/java/jty/expressdistributionsystem/config/MyMetaObjectHandler.java create mode 100644 src/main/java/jty/expressdistributionsystem/config/MybatisPlusConfig.java create mode 100644 src/main/java/jty/expressdistributionsystem/config/WebConfig.java create mode 100644 src/main/java/jty/expressdistributionsystem/controller/UserController.java create mode 100644 src/main/java/jty/expressdistributionsystem/entity/Address.java create mode 100644 src/main/java/jty/expressdistributionsystem/entity/Code.java create mode 100644 src/main/java/jty/expressdistributionsystem/entity/Goods.java create mode 100644 src/main/java/jty/expressdistributionsystem/entity/Records.java create mode 100644 src/main/java/jty/expressdistributionsystem/entity/Result.java create mode 100644 src/main/java/jty/expressdistributionsystem/entity/User.java create mode 100644 src/main/java/jty/expressdistributionsystem/interceptors/LoginInterceptor.java create mode 100644 src/main/java/jty/expressdistributionsystem/mapper/AddressMapper.java create mode 100644 src/main/java/jty/expressdistributionsystem/mapper/GoodsMapper.java create mode 100644 src/main/java/jty/expressdistributionsystem/mapper/UserMapper.java create mode 100644 src/main/java/jty/expressdistributionsystem/service/AddressService.java create mode 100644 src/main/java/jty/expressdistributionsystem/service/GoodsService.java create mode 100644 src/main/java/jty/expressdistributionsystem/service/UserService.java create mode 100644 src/main/java/jty/expressdistributionsystem/service/impl/AddressServiceImpl.java create mode 100644 src/main/java/jty/expressdistributionsystem/service/impl/GoodsServiceImpl.java create mode 100644 src/main/java/jty/expressdistributionsystem/service/impl/UserServiceImpl.java create mode 100644 src/main/java/jty/expressdistributionsystem/utils/GetIdUtil.java create mode 100644 src/main/java/jty/expressdistributionsystem/utils/JwtUtil.java create mode 100644 src/main/java/jty/expressdistributionsystem/utils/Md5Util.java create mode 100644 src/main/java/jty/expressdistributionsystem/utils/ThreadLocalUtil.java create mode 100644 src/main/resources/application.yml create mode 100644 src/test/java/jty/expressdistributionsystem/ExpressDistributionSystemApplicationTests.java diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/.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/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..fe9deed --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,20 @@ +# 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 +distributionSha256Sum=4ec3f26fb1a692473aea0235c300bd20f0f9fe741947c82c1234cefd76ac3a3c diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/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/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/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/pom.xml b/pom.xml new file mode 100644 index 0000000..56723ec --- /dev/null +++ b/pom.xml @@ -0,0 +1,139 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.4 + + + jty + ExpressDistributionSystem + 0.0.1-SNAPSHOT + ExpressDistributionSystem + ExpressDistributionSystem + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter-jdbc + + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + + + + mysql + mysql-connector-java + 8.0.33 + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + org.springframework.boot + spring-boot-starter-validation + + + + + com.baomidou + mybatis-plus-spring-boot3-starter + 3.5.5 + + + + + org.apache.commons + commons-lang3 + 3.12.0 + + + + + com.alibaba + fastjson + 2.0.0 + + + + + com.auth0 + java-jwt + 4.4.0 + + + + + org.jetbrains + annotations + RELEASE + compile + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/src/main/java/jty/expressdistributionsystem/DTO/UserLoginByAccountDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/UserLoginByAccountDTO.java new file mode 100644 index 0000000..db1e3d2 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/DTO/UserLoginByAccountDTO.java @@ -0,0 +1,16 @@ +package jty.expressdistributionsystem.DTO; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import lombok.Data; + +@Data +public class UserLoginByAccountDTO { + @NotBlank(message = "账号不能为空") + @Pattern(regexp = "^(?!\\s)([A-Za-z0-9]{1,10})$") + private String account; + + @NotBlank(message = "密码不能为空") + @Pattern(regexp = "^.+$") + private String password; +} diff --git a/src/main/java/jty/expressdistributionsystem/DTO/UserModifyMessageDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/UserModifyMessageDTO.java new file mode 100644 index 0000000..bbb1228 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/DTO/UserModifyMessageDTO.java @@ -0,0 +1,15 @@ +package jty.expressdistributionsystem.DTO; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import lombok.Data; + +@Data +public class UserModifyMessageDTO { + @NotBlank(message = "用户名不能为空") + private String userName; + + @NotBlank(message = "手机号不能为空") + @Pattern(regexp = "^1[3-9]\\d{9}$") + private String phone; +} diff --git a/src/main/java/jty/expressdistributionsystem/DTO/UserModifyPassword.java b/src/main/java/jty/expressdistributionsystem/DTO/UserModifyPassword.java new file mode 100644 index 0000000..a0de9c9 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/DTO/UserModifyPassword.java @@ -0,0 +1,24 @@ +package jty.expressdistributionsystem.DTO; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import lombok.Data; + +@Data +public class UserModifyPassword { + @NotBlank(message = "旧密码不能为空") + @Pattern(regexp = "^.+$") + private String OldPassword; + + @NotBlank(message = "新密码不能为空") + @Pattern(regexp = "^.+$") + private String newPassword; + + @NotBlank(message = "再次输入的密码不能为空") + @Pattern(regexp = "^.+$") + private String reNewPassword; + + @NotBlank(message = "身份证不能为空") + @Pattern(regexp = "^[1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(1[0-2]))((0[1-9])|([1-2][0-9])|(3[0-1]))\\d{3}(\\d|X|x)$") + private String identity; +} diff --git a/src/main/java/jty/expressdistributionsystem/ExpressDistributionSystemApplication.java b/src/main/java/jty/expressdistributionsystem/ExpressDistributionSystemApplication.java new file mode 100644 index 0000000..e3ef8ca --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/ExpressDistributionSystemApplication.java @@ -0,0 +1,20 @@ +package jty.expressdistributionsystem; + +import lombok.extern.slf4j.Slf4j; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +@SpringBootApplication +@MapperScan("jty.expressdistributionsystem.mapper") +@EnableTransactionManagement +@Slf4j +public class ExpressDistributionSystemApplication { + + public static void main(String[] args) { + SpringApplication.run(ExpressDistributionSystemApplication.class, args); + log.info("猫咪物流启动成功"); + } + +} diff --git a/src/main/java/jty/expressdistributionsystem/config/CrossOriginConfig.java b/src/main/java/jty/expressdistributionsystem/config/CrossOriginConfig.java new file mode 100644 index 0000000..d07fec4 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/config/CrossOriginConfig.java @@ -0,0 +1,19 @@ +package jty.expressdistributionsystem.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class CrossOriginConfig implements WebMvcConfigurer { + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOriginPatterns("*") + .allowedMethods("GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS", "PATCH") + //允许所有的请求方法访问该跨域资源服务器 + .allowCredentials(true) + .maxAge(3600) + .allowedHeaders("Authorization", "Content-Type", "Accept", "Origin", "X-Requested-With"); + } +} diff --git a/src/main/java/jty/expressdistributionsystem/config/MyMetaObjectHandler.java b/src/main/java/jty/expressdistributionsystem/config/MyMetaObjectHandler.java new file mode 100644 index 0000000..bf5df5c --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/config/MyMetaObjectHandler.java @@ -0,0 +1,29 @@ +package jty.expressdistributionsystem.config; + +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import org.apache.ibatis.reflection.MetaObject; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; + +@Component +public class MyMetaObjectHandler implements MetaObjectHandler { + private static final ThreadLocal skipUpdateFill = new ThreadLocal<>(); + + public static void setSkipUpdateFill(boolean skip) { + skipUpdateFill.set(skip); + } + + @Override + public void insertFill(MetaObject metaObject) { + this.strictInsertFill(metaObject, "createTime", LocalDateTime::now, LocalDateTime.class); + this.strictInsertFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class); + } + + @Override + public void updateFill(MetaObject metaObject) { + if (skipUpdateFill.get() == null || !skipUpdateFill.get()) { + this.strictUpdateFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class); + } + } +} diff --git a/src/main/java/jty/expressdistributionsystem/config/MybatisPlusConfig.java b/src/main/java/jty/expressdistributionsystem/config/MybatisPlusConfig.java new file mode 100644 index 0000000..d302801 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/config/MybatisPlusConfig.java @@ -0,0 +1,24 @@ +package jty.expressdistributionsystem.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.core.config.GlobalConfig; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +@Configuration +@MapperScan("jty.expressdistributionsystem.mapper") +@EnableTransactionManagement +public class MybatisPlusConfig { + // 分页插件 + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); // 如果配置多个插件, 切记分页最后添加 + // 如果有多数据源可以不配具体类型, 否则都建议配上具体的 DbType + return interceptor; + } +} diff --git a/src/main/java/jty/expressdistributionsystem/config/WebConfig.java b/src/main/java/jty/expressdistributionsystem/config/WebConfig.java new file mode 100644 index 0000000..166bfcc --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/config/WebConfig.java @@ -0,0 +1,18 @@ +package jty.expressdistributionsystem.config; + +import jakarta.annotation.Resource; +import jty.expressdistributionsystem.interceptors.LoginInterceptor; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfig implements WebMvcConfigurer { + @Resource + private LoginInterceptor loginInterceptor; + + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(loginInterceptor).excludePathPatterns("/user/login", "/user/register"); + } +} diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java new file mode 100644 index 0000000..7951a9b --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -0,0 +1,151 @@ +package jty.expressdistributionsystem.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import jakarta.annotation.Resource; +import jty.expressdistributionsystem.DTO.UserLoginByAccountDTO; +import jty.expressdistributionsystem.DTO.UserModifyMessageDTO; +import jty.expressdistributionsystem.DTO.UserModifyPassword; +import jty.expressdistributionsystem.config.MyMetaObjectHandler; +import jty.expressdistributionsystem.entity.Result; +import jty.expressdistributionsystem.entity.User; +import jty.expressdistributionsystem.mapper.UserMapper; +import jty.expressdistributionsystem.utils.GetIdUtil; +import jty.expressdistributionsystem.utils.JwtUtil; +import jty.expressdistributionsystem.utils.Md5Util; +import jty.expressdistributionsystem.utils.ThreadLocalUtil; +import org.jetbrains.annotations.NotNull; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.TimeUnit; + +@RestController +@RequestMapping("/user") +public class UserController { + @Resource + private UserMapper userMapper; + + @Resource + private StringRedisTemplate stringRedisTemplate; + + // 注册 + @PostMapping("/register") + public Result register(@RequestBody @Validated @NotNull User user) { + // 查找用户是否存在 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("user_name", user.getUserName()) + .or() + .eq("account", user.getAccount()); + User u = userMapper.selectOne(queryWrapper); + if (u != null) { + return new Result<>(409, "用户已存在", ""); + } + // 密码加密 + user.setPassword(Md5Util.getMD5String(user.getPassword())); + // 用户数据入库 + userMapper.insert(user); + return new Result<>(200, "注册成功", ""); + } + + // 通过账号登录 + @PostMapping("/loginByAccount") + public Result login(@RequestBody @Validated @NotNull UserLoginByAccountDTO userLoginByAccountDTO) { + // 查询用户是否存在 + Optional optionalUser = Optional.ofNullable(userMapper.selectOne(new QueryWrapper() + .eq("account", userLoginByAccountDTO.getAccount()))); + if (optionalUser.isEmpty() || !Md5Util.getMD5String(userLoginByAccountDTO.getPassword()).equals(optionalUser.get().getPassword())) { + return new Result<>(401, "账号或者密码错误", ""); + } + // 禁用自动填充 + MyMetaObjectHandler.setSkipUpdateFill(true); + User user = optionalUser.get(); + user.setLoginTime(LocalDateTime.now()); + userMapper.update(user, new UpdateWrapper().eq("id", user.getId())); + // 校验通过 + Map claims = new HashMap<>(); + claims.put("id", user.getId()); + claims.put("account", userLoginByAccountDTO.getAccount()); + // 获取token + String token = JwtUtil.genToken(claims); + // 存放token到redis当中进行持久化存储 + ValueOperations stringStringValueOperations = stringRedisTemplate.opsForValue(); + // 设置过期时间(1天) + stringStringValueOperations.set(token, token, 1, TimeUnit.DAYS); + // 开启自动填充 + MyMetaObjectHandler.setSkipUpdateFill(false); + // 返回token给前端 + return new Result<>(200, "登录成功", token); + } + + // 修改个人信息 + @PutMapping("/modify") + public Result modifyMessage(@RequestBody @Validated @NotNull UserModifyMessageDTO userModifyMessageDTO) { + // 获取登录用户id + Long id = GetIdUtil.getId(); + User user = userMapper.selectById(id); + // 检查phone和userName是否与当前用户信息一致 + boolean isPhoneSame = user.getPhone().equals(userModifyMessageDTO.getPhone()); + boolean isUserNameSame = user.getUserName().equals(userModifyMessageDTO.getUserName()); + if (isPhoneSame && isUserNameSame) { + return new Result<>(400, "请修改您的信息", ""); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (!isPhoneSame) { + queryWrapper.eq("phone", userModifyMessageDTO.getPhone()); + if (userMapper.selectOne(queryWrapper) != null) { + return new Result<>(400, "该手机号已被注册", ""); + } + user.setPhone(userModifyMessageDTO.getPhone()); + } + queryWrapper.clear(); + if (!isUserNameSame) { + queryWrapper.eq("user_name", userModifyMessageDTO.getUserName()); + if (userMapper.selectOne(queryWrapper) != null) { + return new Result<>(400, "该用户名已被使用", ""); + } + user.setUserName(userModifyMessageDTO.getUserName()); + } + userMapper.updateById(user); + return new Result<>(200, "用户信息修改成功", user); + } + + // 修改个人密码 + @PutMapping("/rePassword") + public Result modifyPassword(@RequestHeader("Authorization") String token, + @RequestBody @Validated @NotNull UserModifyPassword userModifyPassword) { + // 判断密码 + if (userModifyPassword.getOldPassword().equals(userModifyPassword.getNewPassword())) { + return new Result<>(409, "新密码不得和旧密码一致", ""); + } + if (!userModifyPassword.getNewPassword().equals(userModifyPassword.getReNewPassword())) { + return new Result<>(409, "两次输入密码不相同", ""); + } + Long id = GetIdUtil.getId(); + User user = userMapper.selectById(id); + if (!user.getIdentity().equals(userModifyPassword.getIdentity())) { + return new Result<>(409, "请输入您的身份证", ""); + } + user.setPassword(Md5Util.getMD5String(userModifyPassword.getNewPassword())); + userMapper.updateById(user); + // 删除redis当中的token + stringRedisTemplate.delete(token); + // 删除当前线程的存储信息 + ThreadLocalUtil.remove(); + return new Result<>(200, "密码修改成功, 请重新登陆", ""); + } + + // 获取个人信息 + @GetMapping("/info") + public Result getInfo() { + Long id = GetIdUtil.getId(); + User user = userMapper.selectById(id); + return new Result<>(200, "", user); + } +} diff --git a/src/main/java/jty/expressdistributionsystem/entity/Address.java b/src/main/java/jty/expressdistributionsystem/entity/Address.java new file mode 100644 index 0000000..eda741a --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/entity/Address.java @@ -0,0 +1,33 @@ +package jty.expressdistributionsystem.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@TableName("address") +public class Address implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @TableId("id") + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + @TableField("user_id") + @JsonSerialize(using = ToStringSerializer.class) + @NotNull + private Long userId; + + @TableField("address") + @NotBlank(message = "地址不能为空") + private String address; +} diff --git a/src/main/java/jty/expressdistributionsystem/entity/Code.java b/src/main/java/jty/expressdistributionsystem/entity/Code.java new file mode 100644 index 0000000..3410102 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/entity/Code.java @@ -0,0 +1,33 @@ +package jty.expressdistributionsystem.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@TableName("code") +public class Code implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @TableId("id") + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + @TableField("goods_id") + @JsonSerialize(using = ToStringSerializer.class) + @NotNull + private Long goodsId; + + @TableField("claim") + @NotBlank(message = "取件码不能为空") + private String claim; +} diff --git a/src/main/java/jty/expressdistributionsystem/entity/Goods.java b/src/main/java/jty/expressdistributionsystem/entity/Goods.java new file mode 100644 index 0000000..d503ef1 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/entity/Goods.java @@ -0,0 +1,46 @@ +package jty.expressdistributionsystem.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@TableName("goods") +@Data +public class Goods implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @TableId("id") + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + @TableField("send_user_id") + @JsonSerialize(using = ToStringSerializer.class) + @NotNull + private Long sendUserId; + + @TableField("get_user_id") + @JsonSerialize(using = ToStringSerializer.class) + @NotNull + private String getUserId; + + @TableField("express_code") + @NotBlank(message = "快递码未生成, 请重新填写信息") + private String expressCode; + + @TableField("name") + @NotBlank(message = "快递名称不能为空") + private String name; + + @TableField("quality") + @NotBlank(message = "快递重量不能为空") + private String quality; +} diff --git a/src/main/java/jty/expressdistributionsystem/entity/Records.java b/src/main/java/jty/expressdistributionsystem/entity/Records.java new file mode 100644 index 0000000..0018a27 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/entity/Records.java @@ -0,0 +1,42 @@ +package jty.expressdistributionsystem.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +@TableName("records") +public class Records implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @TableId("id") + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + @TableField("send_user_id") + @JsonSerialize(using = ToStringSerializer.class) + @NotNull + private Long sendUserId; + + @TableField("get_user_id") + @JsonSerialize(using = ToStringSerializer.class) + @NotNull + private Long getUserId; + + @TableField("goods_id") + @JsonSerialize(using = ToStringSerializer.class) + @NotNull + private Long goodsId; + + @TableField("create_time") + private LocalDateTime createTime; +} diff --git a/src/main/java/jty/expressdistributionsystem/entity/Result.java b/src/main/java/jty/expressdistributionsystem/entity/Result.java new file mode 100644 index 0000000..7414d73 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/entity/Result.java @@ -0,0 +1,18 @@ +package jty.expressdistributionsystem.entity; + +import lombok.Data; + +@Data +public class Result { + private int code; + + private String message; + + private T data; + + public Result(int code, String message, T data) { + this.code = code; + this.message = message; + this.data = data; + } +} diff --git a/src/main/java/jty/expressdistributionsystem/entity/User.java b/src/main/java/jty/expressdistributionsystem/entity/User.java new file mode 100644 index 0000000..5b6e18e --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/entity/User.java @@ -0,0 +1,65 @@ +package jty.expressdistributionsystem.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +@TableName("user") +public class User implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @TableId("id") + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + @TableField("user_name") + @NotBlank(message = "用户名不能为空") + private String userName; + + @TableField("account") + @NotBlank(message = "账号不能为空") + @Pattern(regexp = "^(?!\\s)([A-Za-z0-9]{1,10})$") + private String account; + + @TableField("phone") + @NotBlank(message = "手机号不能为空") + @Pattern(regexp = "^1[3-9]\\d{9}$") + private String phone; + + @TableField("password") + @NotBlank(message = "密码不能为空") + @Pattern(regexp = "^.+$") + private String password; + + @TableField("identity") + @NotBlank(message = "身份证不能为空") + @Pattern(regexp = "^[1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(1[0-2]))((0[1-9])|([1-2][0-9])|(3[0-1]))\\d{3}(\\d|X|x)$") + private String identity; + + @TableField("mark") + private Integer mark; + + @TableField("likes") + private Integer likes; + + @TableField(value = "create_time", fill = FieldFill.INSERT) + private LocalDateTime createTime; + + @TableField(value = "login_time", fill = FieldFill.UPDATE) + private LocalDateTime loginTime; + + @TableField(value = "update_time", fill = FieldFill.INSERT) + private LocalDateTime updateTime; +} diff --git a/src/main/java/jty/expressdistributionsystem/interceptors/LoginInterceptor.java b/src/main/java/jty/expressdistributionsystem/interceptors/LoginInterceptor.java new file mode 100644 index 0000000..86e27bc --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/interceptors/LoginInterceptor.java @@ -0,0 +1,52 @@ +package jty.expressdistributionsystem.interceptors; + +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jty.expressdistributionsystem.utils.JwtUtil; +import jty.expressdistributionsystem.utils.ThreadLocalUtil; +import org.jetbrains.annotations.NotNull; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.HandlerInterceptor; + +import java.util.Map; + +//注入到IOC容器 +@Component +public class LoginInterceptor implements HandlerInterceptor { + @Resource + private StringRedisTemplate stringRedisTemplate; + + @Override + public boolean preHandle(HttpServletRequest request, @NotNull HttpServletResponse response, @NotNull Object handler) { + // 令牌验证 + String token = request.getHeader("Authorization"); + try { + // 从redis获取相同的token + ValueOperations stringStringValueOperations = stringRedisTemplate.opsForValue(); + String redisToken = stringStringValueOperations.get(token); + if(redisToken == null){ + // 说明token失效 + throw new RuntimeException(); + } + Map claims = JwtUtil.parseToken(token); + // 把数据存储到ThreadLocal当中 + ThreadLocalUtil.set(claims); + // 放行 + return true; + } catch (Exception e) { + // http响应状态码为401 + response.setStatus(401); + // 不放行 + return false; + } + } + + @Override + public void afterCompletion(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, @NotNull Object handler, Exception ex) { + // 清空ThreadLocal当中的数据，防止内存泄露 + ThreadLocalUtil.remove(); + } +} \ No newline at end of file diff --git a/src/main/java/jty/expressdistributionsystem/mapper/AddressMapper.java b/src/main/java/jty/expressdistributionsystem/mapper/AddressMapper.java new file mode 100644 index 0000000..0a81cef --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/mapper/AddressMapper.java @@ -0,0 +1,7 @@ +package jty.expressdistributionsystem.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jty.expressdistributionsystem.entity.Address; + +public interface AddressMapper extends BaseMapper
{ +} diff --git a/src/main/java/jty/expressdistributionsystem/mapper/GoodsMapper.java b/src/main/java/jty/expressdistributionsystem/mapper/GoodsMapper.java new file mode 100644 index 0000000..a51e9ac --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/mapper/GoodsMapper.java @@ -0,0 +1,7 @@ +package jty.expressdistributionsystem.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jty.expressdistributionsystem.entity.Goods; + +public interface GoodsMapper extends BaseMapper { +} diff --git a/src/main/java/jty/expressdistributionsystem/mapper/UserMapper.java b/src/main/java/jty/expressdistributionsystem/mapper/UserMapper.java new file mode 100644 index 0000000..8e702db --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/mapper/UserMapper.java @@ -0,0 +1,7 @@ +package jty.expressdistributionsystem.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jty.expressdistributionsystem.entity.User; + +public interface UserMapper extends BaseMapper { +} diff --git a/src/main/java/jty/expressdistributionsystem/service/AddressService.java b/src/main/java/jty/expressdistributionsystem/service/AddressService.java new file mode 100644 index 0000000..0df97d2 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/service/AddressService.java @@ -0,0 +1,7 @@ +package jty.expressdistributionsystem.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jty.expressdistributionsystem.entity.Address; + +public interface AddressService extends IService
{ +} diff --git a/src/main/java/jty/expressdistributionsystem/service/GoodsService.java b/src/main/java/jty/expressdistributionsystem/service/GoodsService.java new file mode 100644 index 0000000..75305b0 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/service/GoodsService.java @@ -0,0 +1,7 @@ +package jty.expressdistributionsystem.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jty.expressdistributionsystem.entity.Goods; + +public interface GoodsService extends IService { +} diff --git a/src/main/java/jty/expressdistributionsystem/service/UserService.java b/src/main/java/jty/expressdistributionsystem/service/UserService.java new file mode 100644 index 0000000..e205a68 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/service/UserService.java @@ -0,0 +1,7 @@ +package jty.expressdistributionsystem.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jty.expressdistributionsystem.entity.User; + +public interface UserService extends IService { +} diff --git a/src/main/java/jty/expressdistributionsystem/service/impl/AddressServiceImpl.java b/src/main/java/jty/expressdistributionsystem/service/impl/AddressServiceImpl.java new file mode 100644 index 0000000..9aa51f5 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/service/impl/AddressServiceImpl.java @@ -0,0 +1,11 @@ +package jty.expressdistributionsystem.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jty.expressdistributionsystem.entity.Address; +import jty.expressdistributionsystem.mapper.AddressMapper; +import jty.expressdistributionsystem.service.AddressService; +import org.springframework.stereotype.Service; + +@Service +public class AddressServiceImpl extends ServiceImpl implements AddressService { +} diff --git a/src/main/java/jty/expressdistributionsystem/service/impl/GoodsServiceImpl.java b/src/main/java/jty/expressdistributionsystem/service/impl/GoodsServiceImpl.java new file mode 100644 index 0000000..e7b7104 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/service/impl/GoodsServiceImpl.java @@ -0,0 +1,11 @@ +package jty.expressdistributionsystem.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jty.expressdistributionsystem.entity.Goods; +import jty.expressdistributionsystem.mapper.GoodsMapper; +import jty.expressdistributionsystem.service.GoodsService; +import org.springframework.stereotype.Service; + +@Service +public class GoodsServiceImpl extends ServiceImpl implements GoodsService { +} diff --git a/src/main/java/jty/expressdistributionsystem/service/impl/UserServiceImpl.java b/src/main/java/jty/expressdistributionsystem/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..8b2770e --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/service/impl/UserServiceImpl.java @@ -0,0 +1,11 @@ +package jty.expressdistributionsystem.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jty.expressdistributionsystem.entity.User; +import jty.expressdistributionsystem.mapper.UserMapper; +import jty.expressdistributionsystem.service.UserService; +import org.springframework.stereotype.Service; + +@Service +public class UserServiceImpl extends ServiceImpl implements UserService { +} diff --git a/src/main/java/jty/expressdistributionsystem/utils/GetIdUtil.java b/src/main/java/jty/expressdistributionsystem/utils/GetIdUtil.java new file mode 100644 index 0000000..7ddaff3 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/utils/GetIdUtil.java @@ -0,0 +1,11 @@ +package jty.expressdistributionsystem.utils; + +import java.util.Map; + +public class GetIdUtil { + private static final Map claims = ThreadLocalUtil.get(); + + public static Long getId() { + return (Long) claims.get("id"); + } +} diff --git a/src/main/java/jty/expressdistributionsystem/utils/JwtUtil.java b/src/main/java/jty/expressdistributionsystem/utils/JwtUtil.java new file mode 100644 index 0000000..f2c1a24 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/utils/JwtUtil.java @@ -0,0 +1,34 @@ +package jty.expressdistributionsystem.utils; + +import com.auth0.jwt.JWT; +import com.auth0.jwt.algorithms.Algorithm; + +import java.util.Date; +import java.util.Map; + +/** + * JWT检验 + */ +public class JwtUtil { + + private static final String KEY = "catSys"; + + // 接收业务数据,生成token并返回 + public static String genToken(Map claims) { + return JWT.create() + .withClaim("claims", claims) + // 一天过期 + .withExpiresAt(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24)) + .sign(Algorithm.HMAC256(KEY)); + } + + // 接收token,验证token,并返回业务数据 + public static Map parseToken(String token) { + return JWT.require(Algorithm.HMAC256(KEY)) + .build() + .verify(token) + .getClaim("claims") + .asMap(); + } + +} diff --git a/src/main/java/jty/expressdistributionsystem/utils/Md5Util.java b/src/main/java/jty/expressdistributionsystem/utils/Md5Util.java new file mode 100644 index 0000000..7901293 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/utils/Md5Util.java @@ -0,0 +1,56 @@ +package jty.expressdistributionsystem.utils; + + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +public class Md5Util { + protected static char hexDigits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}; + + protected static MessageDigest messagedigest = null; + + static { + try { + messagedigest = MessageDigest.getInstance("MD5"); + } catch (NoSuchAlgorithmException nsaex) { + System.err.println(Md5Util.class.getName() + "初始化失败，MessageDigest不支持MD5Util。"); + nsaex.printStackTrace(); + } + } + + public static String getMD5String(String s) { + return getMD5String(s.getBytes()); + } + + public static boolean checkPassword(String password, String md5PwdStr) { + String s = getMD5String(password); + return s.equals(md5PwdStr); + } + + + public static String getMD5String(byte[] bytes) { + messagedigest.update(bytes); + return bufferToHex(messagedigest.digest()); + } + + private static String bufferToHex(byte bytes[]) { + return bufferToHex(bytes, 0, bytes.length); + } + + private static String bufferToHex(byte bytes[], int m, int n) { + StringBuffer stringbuffer = new StringBuffer(2 * n); + int k = m + n; + for (int l = m; l < k; l++) { + appendHexPair(bytes[l], stringbuffer); + } + return stringbuffer.toString(); + } + + private static void appendHexPair(byte bt, StringBuffer stringbuffer) { + char c0 = hexDigits[(bt & 0xf0) >> 4]; + char c1 = hexDigits[bt & 0xf]; + stringbuffer.append(c0); + stringbuffer.append(c1); + } + +} diff --git a/src/main/java/jty/expressdistributionsystem/utils/ThreadLocalUtil.java b/src/main/java/jty/expressdistributionsystem/utils/ThreadLocalUtil.java new file mode 100644 index 0000000..c5fc5b9 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/utils/ThreadLocalUtil.java @@ -0,0 +1,25 @@ +package jty.expressdistributionsystem.utils; + +/** + * 方便获取Id + */ +@SuppressWarnings("all") +public class ThreadLocalUtil { + //提供ThreadLocal对象 + private static final ThreadLocal THREAD_LOCAL = new ThreadLocal(); + + //根据键获取值 + public static T get() { + return (T) THREAD_LOCAL.get(); + } + + //存储键值对 + public static void set(Object value) { + THREAD_LOCAL.set(value); + } + + //清除ThreadLocal 防止内存泄漏 + public static void remove() { + THREAD_LOCAL.remove(); + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..e54dafc --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,29 @@ +server: + port: 5678 + +spring: + application: + #应用名称 + name: ExpressSys + datasource: + #配置数据库信息 + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/distribution?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: Grs20021127 + #redis + data: + redis: + host: localhost + port: 6379 + +mybatis-plus: + configuration: + #开启驼峰 + map-underscore-to-camel-case: true + #日志 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + global-config: + db-config: + #雪花id + id-type: ASSIGN_ID \ No newline at end of file diff --git a/src/test/java/jty/expressdistributionsystem/ExpressDistributionSystemApplicationTests.java b/src/test/java/jty/expressdistributionsystem/ExpressDistributionSystemApplicationTests.java new file mode 100644 index 0000000..e957d25 --- /dev/null +++ b/src/test/java/jty/expressdistributionsystem/ExpressDistributionSystemApplicationTests.java @@ -0,0 +1,13 @@ +package jty.expressdistributionsystem; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ExpressDistributionSystemApplicationTests { + + @Test + void contextLoads() { + } + +} From 180019adaea719b3662b077e73d98cb91281d45e Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Sat, 19 Oct 2024 00:47:22 +0800 Subject: [PATCH 02/43] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=80=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0=EF=BC=9A=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=A6=81=E7=94=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expressdistributionsystem/controller/UserController.java | 5 ++++- src/main/java/jty/expressdistributionsystem/entity/User.java | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index 7951a9b..7d6952e 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -63,9 +63,12 @@ public class UserController { if (optionalUser.isEmpty() || !Md5Util.getMD5String(userLoginByAccountDTO.getPassword()).equals(optionalUser.get().getPassword())) { return new Result<>(401, "账号或者密码错误", ""); } + User user = optionalUser.get(); + if(user.getDisabled() == 1){ + return new Result<>(403, "该账号已被禁用, 请联系管理员", ""); + } // 禁用自动填充 MyMetaObjectHandler.setSkipUpdateFill(true); - User user = optionalUser.get(); user.setLoginTime(LocalDateTime.now()); userMapper.update(user, new UpdateWrapper().eq("id", user.getId())); // 校验通过 diff --git a/src/main/java/jty/expressdistributionsystem/entity/User.java b/src/main/java/jty/expressdistributionsystem/entity/User.java index 5b6e18e..243bffb 100644 --- a/src/main/java/jty/expressdistributionsystem/entity/User.java +++ b/src/main/java/jty/expressdistributionsystem/entity/User.java @@ -54,6 +54,9 @@ public class User implements Serializable { @TableField("likes") private Integer likes; + @TableField("disabled") + private Integer disabled; + @TableField(value = "create_time", fill = FieldFill.INSERT) private LocalDateTime createTime; From c202b4f240823dbed4cc8383e62b6dab86f2488e Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Sat, 19 Oct 2024 01:10:21 +0800 Subject: [PATCH 03/43] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=80=E9=98=B6?= =?UTF-8?q?=E6=AE=B5:=20=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdminController.java | 37 +++++++++++++++++++ .../controller/UserController.java | 26 ++++++------- .../entity/Message.java | 37 +++++++++++++++++++ 3 files changed, 87 insertions(+), 13 deletions(-) create mode 100644 src/main/java/jty/expressdistributionsystem/controller/AdminController.java create mode 100644 src/main/java/jty/expressdistributionsystem/entity/Message.java diff --git a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java new file mode 100644 index 0000000..000bbfb --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java @@ -0,0 +1,37 @@ +package jty.expressdistributionsystem.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.annotation.Resource; +import jty.expressdistributionsystem.entity.Result; +import jty.expressdistributionsystem.entity.User; +import jty.expressdistributionsystem.service.UserService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/admin") +public class AdminController { + @Resource + private UserService userService; + + // 管理员查看用户信息 + @GetMapping("/userList") + public Result> getUserList(@RequestParam int page, @RequestParam int pageSize){ + if(page <= 0 || pageSize <= 0) { + return new Result<>(400, "页码和每页大小必须大于0", null); + } + // 分页 + Page pageInfo = new Page<>(page, pageSize); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + // 添加查询条件 + queryWrapper.eq(User::getMark, 0); + // 排序 + queryWrapper.orderByDesc(User::getLoginTime) + .orderByDesc(User::getCreateTime); + userService.page(pageInfo, queryWrapper); + return new Result<>(200, "", pageInfo); + } +} diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index 7d6952e..7e74468 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -9,7 +9,7 @@ import jty.expressdistributionsystem.DTO.UserModifyPassword; import jty.expressdistributionsystem.config.MyMetaObjectHandler; import jty.expressdistributionsystem.entity.Result; import jty.expressdistributionsystem.entity.User; -import jty.expressdistributionsystem.mapper.UserMapper; +import jty.expressdistributionsystem.service.UserService; import jty.expressdistributionsystem.utils.GetIdUtil; import jty.expressdistributionsystem.utils.JwtUtil; import jty.expressdistributionsystem.utils.Md5Util; @@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit; @RequestMapping("/user") public class UserController { @Resource - private UserMapper userMapper; + private UserService userService; @Resource private StringRedisTemplate stringRedisTemplate; @@ -43,14 +43,14 @@ public class UserController { queryWrapper.eq("user_name", user.getUserName()) .or() .eq("account", user.getAccount()); - User u = userMapper.selectOne(queryWrapper); + User u = userService.getOne(queryWrapper); if (u != null) { return new Result<>(409, "用户已存在", ""); } // 密码加密 user.setPassword(Md5Util.getMD5String(user.getPassword())); // 用户数据入库 - userMapper.insert(user); + userService.save(user); return new Result<>(200, "注册成功", ""); } @@ -58,7 +58,7 @@ public class UserController { @PostMapping("/loginByAccount") public Result login(@RequestBody @Validated @NotNull UserLoginByAccountDTO userLoginByAccountDTO) { // 查询用户是否存在 - Optional optionalUser = Optional.ofNullable(userMapper.selectOne(new QueryWrapper() + Optional optionalUser = Optional.ofNullable(userService.getOne(new QueryWrapper() .eq("account", userLoginByAccountDTO.getAccount()))); if (optionalUser.isEmpty() || !Md5Util.getMD5String(userLoginByAccountDTO.getPassword()).equals(optionalUser.get().getPassword())) { return new Result<>(401, "账号或者密码错误", ""); @@ -70,7 +70,7 @@ public class UserController { // 禁用自动填充 MyMetaObjectHandler.setSkipUpdateFill(true); user.setLoginTime(LocalDateTime.now()); - userMapper.update(user, new UpdateWrapper().eq("id", user.getId())); + userService.update(user, new UpdateWrapper().eq("id", user.getId())); // 校验通过 Map claims = new HashMap<>(); claims.put("id", user.getId()); @@ -92,7 +92,7 @@ public class UserController { public Result modifyMessage(@RequestBody @Validated @NotNull UserModifyMessageDTO userModifyMessageDTO) { // 获取登录用户id Long id = GetIdUtil.getId(); - User user = userMapper.selectById(id); + User user = userService.getById(id); // 检查phone和userName是否与当前用户信息一致 boolean isPhoneSame = user.getPhone().equals(userModifyMessageDTO.getPhone()); boolean isUserNameSame = user.getUserName().equals(userModifyMessageDTO.getUserName()); @@ -102,7 +102,7 @@ public class UserController { QueryWrapper queryWrapper = new QueryWrapper<>(); if (!isPhoneSame) { queryWrapper.eq("phone", userModifyMessageDTO.getPhone()); - if (userMapper.selectOne(queryWrapper) != null) { + if (userService.getOne(queryWrapper) != null) { return new Result<>(400, "该手机号已被注册", ""); } user.setPhone(userModifyMessageDTO.getPhone()); @@ -110,12 +110,12 @@ public class UserController { queryWrapper.clear(); if (!isUserNameSame) { queryWrapper.eq("user_name", userModifyMessageDTO.getUserName()); - if (userMapper.selectOne(queryWrapper) != null) { + if (userService.getOne(queryWrapper) != null) { return new Result<>(400, "该用户名已被使用", ""); } user.setUserName(userModifyMessageDTO.getUserName()); } - userMapper.updateById(user); + userService.updateById(user); return new Result<>(200, "用户信息修改成功", user); } @@ -131,12 +131,12 @@ public class UserController { return new Result<>(409, "两次输入密码不相同", ""); } Long id = GetIdUtil.getId(); - User user = userMapper.selectById(id); + User user = userService.getById(id); if (!user.getIdentity().equals(userModifyPassword.getIdentity())) { return new Result<>(409, "请输入您的身份证", ""); } user.setPassword(Md5Util.getMD5String(userModifyPassword.getNewPassword())); - userMapper.updateById(user); + userService.updateById(user); // 删除redis当中的token stringRedisTemplate.delete(token); // 删除当前线程的存储信息 @@ -148,7 +148,7 @@ public class UserController { @GetMapping("/info") public Result getInfo() { Long id = GetIdUtil.getId(); - User user = userMapper.selectById(id); + User user = userService.getById(id); return new Result<>(200, "", user); } } diff --git a/src/main/java/jty/expressdistributionsystem/entity/Message.java b/src/main/java/jty/expressdistributionsystem/entity/Message.java new file mode 100644 index 0000000..63885f3 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/entity/Message.java @@ -0,0 +1,37 @@ +package jty.expressdistributionsystem.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import org.jetbrains.annotations.NotNull; + +import java.io.Serial; +import java.io.Serializable; + +@Data +public class Message implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @TableId("id") + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + @TableField("content") + private String content; + + @TableField("send_user_id") + @NotNull + @JsonSerialize(using = ToStringSerializer.class) + private Long sendUserId; + + @TableField("get_user_id") + @NotNull + @JsonSerialize(using = ToStringSerializer.class) + private Long getUserId; + + @TableField("mark") + private Integer mark; +} From bdaec402edceeea438649223fd35fb15411f5449 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Sat, 19 Oct 2024 13:02:32 +0800 Subject: [PATCH 04/43] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E4=BA=8C=EF=BC=9A=E7=AE=A1=E7=90=86=E5=91=98=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTO/SendMessageDTO.java | 19 ++++++++ ...ssword.java => UserModifyPasswordDTO.java} | 2 +- .../config/MyMetaObjectHandler.java | 4 +- .../controller/AdminController.java | 46 +++++++++++++++---- .../controller/UserController.java | 12 ++--- .../entity/Message.java | 10 ++++ .../mapper/MessageMapper.java | 7 +++ .../service/MessageService.java | 7 +++ .../service/impl/MessageServiceImpl.java | 11 +++++ .../utils/SendMessage.java | 21 +++++++++ 10 files changed, 123 insertions(+), 16 deletions(-) create mode 100644 src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java rename src/main/java/jty/expressdistributionsystem/DTO/{UserModifyPassword.java => UserModifyPasswordDTO.java} (95%) create mode 100644 src/main/java/jty/expressdistributionsystem/mapper/MessageMapper.java create mode 100644 src/main/java/jty/expressdistributionsystem/service/MessageService.java create mode 100644 src/main/java/jty/expressdistributionsystem/service/impl/MessageServiceImpl.java create mode 100644 src/main/java/jty/expressdistributionsystem/utils/SendMessage.java diff --git a/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java new file mode 100644 index 0000000..1bf6a1c --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java @@ -0,0 +1,19 @@ +package jty.expressdistributionsystem.DTO; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +public class SendMessageDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + private String content; +} diff --git a/src/main/java/jty/expressdistributionsystem/DTO/UserModifyPassword.java b/src/main/java/jty/expressdistributionsystem/DTO/UserModifyPasswordDTO.java similarity index 95% rename from src/main/java/jty/expressdistributionsystem/DTO/UserModifyPassword.java rename to src/main/java/jty/expressdistributionsystem/DTO/UserModifyPasswordDTO.java index a0de9c9..61a8783 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/UserModifyPassword.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/UserModifyPasswordDTO.java @@ -5,7 +5,7 @@ import jakarta.validation.constraints.Pattern; import lombok.Data; @Data -public class UserModifyPassword { +public class UserModifyPasswordDTO { @NotBlank(message = "旧密码不能为空") @Pattern(regexp = "^.+$") private String OldPassword; diff --git a/src/main/java/jty/expressdistributionsystem/config/MyMetaObjectHandler.java b/src/main/java/jty/expressdistributionsystem/config/MyMetaObjectHandler.java index bf5df5c..e1653c2 100644 --- a/src/main/java/jty/expressdistributionsystem/config/MyMetaObjectHandler.java +++ b/src/main/java/jty/expressdistributionsystem/config/MyMetaObjectHandler.java @@ -17,7 +17,9 @@ public class MyMetaObjectHandler implements MetaObjectHandler { @Override public void insertFill(MetaObject metaObject) { this.strictInsertFill(metaObject, "createTime", LocalDateTime::now, LocalDateTime.class); - this.strictInsertFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class); + if (skipUpdateFill.get() == null || !skipUpdateFill.get()) { + this.strictInsertFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class); + } } @Override diff --git a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java index 000bbfb..fda8c58 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java @@ -3,13 +3,13 @@ package jty.expressdistributionsystem.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; +import jty.expressdistributionsystem.DTO.SendMessageDTO; +import jty.expressdistributionsystem.config.MyMetaObjectHandler; import jty.expressdistributionsystem.entity.Result; import jty.expressdistributionsystem.entity.User; import jty.expressdistributionsystem.service.UserService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import jty.expressdistributionsystem.utils.SendMessage; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/admin") @@ -17,21 +17,51 @@ public class AdminController { @Resource private UserService userService; - // 管理员查看用户信息 + // 管理员查看用户或者快递员信息 @GetMapping("/userList") - public Result> getUserList(@RequestParam int page, @RequestParam int pageSize){ - if(page <= 0 || pageSize <= 0) { + public Result> getUserList(@RequestParam int page, @RequestParam int pageSize, @RequestParam int mark) { + if (page <= 0 || pageSize <= 0) { return new Result<>(400, "页码和每页大小必须大于0", null); } // 分页 Page pageInfo = new Page<>(page, pageSize); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); // 添加查询条件 - queryWrapper.eq(User::getMark, 0); + queryWrapper.eq(User::getMark, mark); // 排序 queryWrapper.orderByDesc(User::getLoginTime) .orderByDesc(User::getCreateTime); userService.page(pageInfo, queryWrapper); return new Result<>(200, "", pageInfo); } + + // 拉黑删除快递员或者用户 + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Long id, @RequestParam String operation) { + User user = userService.getById(id); + switch(operation){ + // 禁用 + case "0" -> user.setDisabled(1); + // 解除禁用 + case "1" -> user.setDisabled(0); + // 直接删除 + case "2" -> { + userService.removeById(id); + return new Result<>(200, "删除成功", ""); + } + } + // 禁用自动填充 + MyMetaObjectHandler.setSkipUpdateFill(true); + userService.updateById(user); + // 开启自动填充 + MyMetaObjectHandler.setSkipUpdateFill(false); + return new Result<>(200, "操作成功", ""); + } + + // 管理员发送消息 + @PostMapping("/sendMessage") + public Result sendMessage(@RequestBody SendMessageDTO sendMessageDTO) { + SendMessage.sendMessage(sendMessageDTO); + return new Result<>(200, "发送成功", ""); + } } diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index 7e74468..ff13fdd 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import jakarta.annotation.Resource; import jty.expressdistributionsystem.DTO.UserLoginByAccountDTO; import jty.expressdistributionsystem.DTO.UserModifyMessageDTO; -import jty.expressdistributionsystem.DTO.UserModifyPassword; +import jty.expressdistributionsystem.DTO.UserModifyPasswordDTO; import jty.expressdistributionsystem.config.MyMetaObjectHandler; import jty.expressdistributionsystem.entity.Result; import jty.expressdistributionsystem.entity.User; @@ -122,20 +122,20 @@ public class UserController { // 修改个人密码 @PutMapping("/rePassword") public Result modifyPassword(@RequestHeader("Authorization") String token, - @RequestBody @Validated @NotNull UserModifyPassword userModifyPassword) { + @RequestBody @Validated @NotNull UserModifyPasswordDTO userModifyPasswordDTO) { // 判断密码 - if (userModifyPassword.getOldPassword().equals(userModifyPassword.getNewPassword())) { + if (userModifyPasswordDTO.getOldPassword().equals(userModifyPasswordDTO.getNewPassword())) { return new Result<>(409, "新密码不得和旧密码一致", ""); } - if (!userModifyPassword.getNewPassword().equals(userModifyPassword.getReNewPassword())) { + if (!userModifyPasswordDTO.getNewPassword().equals(userModifyPasswordDTO.getReNewPassword())) { return new Result<>(409, "两次输入密码不相同", ""); } Long id = GetIdUtil.getId(); User user = userService.getById(id); - if (!user.getIdentity().equals(userModifyPassword.getIdentity())) { + if (!user.getIdentity().equals(userModifyPasswordDTO.getIdentity())) { return new Result<>(409, "请输入您的身份证", ""); } - user.setPassword(Md5Util.getMD5String(userModifyPassword.getNewPassword())); + user.setPassword(Md5Util.getMD5String(userModifyPasswordDTO.getNewPassword())); userService.updateById(user); // 删除redis当中的token stringRedisTemplate.delete(token); diff --git a/src/main/java/jty/expressdistributionsystem/entity/Message.java b/src/main/java/jty/expressdistributionsystem/entity/Message.java index 63885f3..70eebb6 100644 --- a/src/main/java/jty/expressdistributionsystem/entity/Message.java +++ b/src/main/java/jty/expressdistributionsystem/entity/Message.java @@ -9,6 +9,7 @@ import org.jetbrains.annotations.NotNull; import java.io.Serial; import java.io.Serializable; +import java.time.LocalDateTime; @Data public class Message implements Serializable { @@ -32,6 +33,15 @@ public class Message implements Serializable { @JsonSerialize(using = ToStringSerializer.class) private Long getUserId; + @TableField("create_time") + private LocalDateTime createTime; + + @TableField("update_time") + private LocalDateTime updateTime; + @TableField("mark") private Integer mark; + + public Message() { + } } diff --git a/src/main/java/jty/expressdistributionsystem/mapper/MessageMapper.java b/src/main/java/jty/expressdistributionsystem/mapper/MessageMapper.java new file mode 100644 index 0000000..06c53a8 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/mapper/MessageMapper.java @@ -0,0 +1,7 @@ +package jty.expressdistributionsystem.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jty.expressdistributionsystem.entity.Message; + +public interface MessageMapper extends BaseMapper { +} diff --git a/src/main/java/jty/expressdistributionsystem/service/MessageService.java b/src/main/java/jty/expressdistributionsystem/service/MessageService.java new file mode 100644 index 0000000..c9d6025 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/service/MessageService.java @@ -0,0 +1,7 @@ +package jty.expressdistributionsystem.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jty.expressdistributionsystem.entity.Message; + +public interface MessageService extends IService { +} diff --git a/src/main/java/jty/expressdistributionsystem/service/impl/MessageServiceImpl.java b/src/main/java/jty/expressdistributionsystem/service/impl/MessageServiceImpl.java new file mode 100644 index 0000000..64fa4be --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/service/impl/MessageServiceImpl.java @@ -0,0 +1,11 @@ +package jty.expressdistributionsystem.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jty.expressdistributionsystem.entity.Message; +import jty.expressdistributionsystem.mapper.MessageMapper; +import jty.expressdistributionsystem.service.MessageService; +import org.springframework.stereotype.Service; + +@Service +public class MessageServiceImpl extends ServiceImpl implements MessageService { +} diff --git a/src/main/java/jty/expressdistributionsystem/utils/SendMessage.java b/src/main/java/jty/expressdistributionsystem/utils/SendMessage.java new file mode 100644 index 0000000..eebc769 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/utils/SendMessage.java @@ -0,0 +1,21 @@ +package jty.expressdistributionsystem.utils; + +import jakarta.annotation.Resource; +import jty.expressdistributionsystem.DTO.SendMessageDTO; +import jty.expressdistributionsystem.entity.Message; +import jty.expressdistributionsystem.service.MessageService; +import org.jetbrains.annotations.NotNull; + +public class SendMessage { + @Resource + private static MessageService messageService; + + public static void sendMessage(@NotNull SendMessageDTO sendMessageDTO) { + Long sendId = GetIdUtil.getId(); + Message message = new Message(); + message.setSendUserId(sendId); + message.setGetUserId(sendMessageDTO.getId()); + message.setContent(sendMessageDTO.getContent()); + messageService.save(message); + } +} From 0bfdba7e3570b13583b7df52d12d2dab8e0ecd3e Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Sat, 19 Oct 2024 14:53:50 +0800 Subject: [PATCH 05/43] =?UTF-8?q?=E9=AA=8C=E6=94=B6=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B9=B6=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...MessageDTO.java => UserModifyInfoDTO.java} | 2 +- .../DTO/UserModifyPasswordDTO.java | 2 +- .../config/MyMetaObjectHandler.java | 15 +++-------- .../config/WebConfig.java | 2 +- .../controller/AdminController.java | 4 --- .../controller/UserController.java | 27 ++++++++++--------- .../entity/User.java | 4 +-- 7 files changed, 22 insertions(+), 34 deletions(-) rename src/main/java/jty/expressdistributionsystem/DTO/{UserModifyMessageDTO.java => UserModifyInfoDTO.java} (90%) diff --git a/src/main/java/jty/expressdistributionsystem/DTO/UserModifyMessageDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/UserModifyInfoDTO.java similarity index 90% rename from src/main/java/jty/expressdistributionsystem/DTO/UserModifyMessageDTO.java rename to src/main/java/jty/expressdistributionsystem/DTO/UserModifyInfoDTO.java index bbb1228..e83769c 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/UserModifyMessageDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/UserModifyInfoDTO.java @@ -5,7 +5,7 @@ import jakarta.validation.constraints.Pattern; import lombok.Data; @Data -public class UserModifyMessageDTO { +public class UserModifyInfoDTO { @NotBlank(message = "用户名不能为空") private String userName; diff --git a/src/main/java/jty/expressdistributionsystem/DTO/UserModifyPasswordDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/UserModifyPasswordDTO.java index 61a8783..77dc6ee 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/UserModifyPasswordDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/UserModifyPasswordDTO.java @@ -8,7 +8,7 @@ import lombok.Data; public class UserModifyPasswordDTO { @NotBlank(message = "旧密码不能为空") @Pattern(regexp = "^.+$") - private String OldPassword; + private String oldPassword; @NotBlank(message = "新密码不能为空") @Pattern(regexp = "^.+$") diff --git a/src/main/java/jty/expressdistributionsystem/config/MyMetaObjectHandler.java b/src/main/java/jty/expressdistributionsystem/config/MyMetaObjectHandler.java index e1653c2..0bb66b2 100644 --- a/src/main/java/jty/expressdistributionsystem/config/MyMetaObjectHandler.java +++ b/src/main/java/jty/expressdistributionsystem/config/MyMetaObjectHandler.java @@ -8,24 +8,15 @@ import java.time.LocalDateTime; @Component public class MyMetaObjectHandler implements MetaObjectHandler { - private static final ThreadLocal skipUpdateFill = new ThreadLocal<>(); - - public static void setSkipUpdateFill(boolean skip) { - skipUpdateFill.set(skip); - } - @Override public void insertFill(MetaObject metaObject) { this.strictInsertFill(metaObject, "createTime", LocalDateTime::now, LocalDateTime.class); - if (skipUpdateFill.get() == null || !skipUpdateFill.get()) { - this.strictInsertFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class); - } + this.strictInsertFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class); } @Override public void updateFill(MetaObject metaObject) { - if (skipUpdateFill.get() == null || !skipUpdateFill.get()) { - this.strictUpdateFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class); - } + this.strictUpdateFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class); } } + diff --git a/src/main/java/jty/expressdistributionsystem/config/WebConfig.java b/src/main/java/jty/expressdistributionsystem/config/WebConfig.java index 166bfcc..2eb4bd7 100644 --- a/src/main/java/jty/expressdistributionsystem/config/WebConfig.java +++ b/src/main/java/jty/expressdistributionsystem/config/WebConfig.java @@ -13,6 +13,6 @@ public class WebConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(loginInterceptor).excludePathPatterns("/user/login", "/user/register"); + registry.addInterceptor(loginInterceptor).excludePathPatterns("/user/login", "/user/loginByAccount"); } } diff --git a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java index fda8c58..2531b5a 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java @@ -50,11 +50,7 @@ public class AdminController { return new Result<>(200, "删除成功", ""); } } - // 禁用自动填充 - MyMetaObjectHandler.setSkipUpdateFill(true); userService.updateById(user); - // 开启自动填充 - MyMetaObjectHandler.setSkipUpdateFill(false); return new Result<>(200, "操作成功", ""); } diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index ff13fdd..cff2ff9 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import jakarta.annotation.Resource; import jty.expressdistributionsystem.DTO.UserLoginByAccountDTO; -import jty.expressdistributionsystem.DTO.UserModifyMessageDTO; +import jty.expressdistributionsystem.DTO.UserModifyInfoDTO; import jty.expressdistributionsystem.DTO.UserModifyPasswordDTO; import jty.expressdistributionsystem.config.MyMetaObjectHandler; import jty.expressdistributionsystem.entity.Result; @@ -14,9 +14,11 @@ import jty.expressdistributionsystem.utils.GetIdUtil; import jty.expressdistributionsystem.utils.JwtUtil; import jty.expressdistributionsystem.utils.Md5Util; import jty.expressdistributionsystem.utils.ThreadLocalUtil; +import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -28,6 +30,7 @@ import java.util.concurrent.TimeUnit; @RestController @RequestMapping("/user") +@Slf4j public class UserController { @Resource private UserService userService; @@ -67,8 +70,6 @@ public class UserController { if(user.getDisabled() == 1){ return new Result<>(403, "该账号已被禁用, 请联系管理员", ""); } - // 禁用自动填充 - MyMetaObjectHandler.setSkipUpdateFill(true); user.setLoginTime(LocalDateTime.now()); userService.update(user, new UpdateWrapper().eq("id", user.getId())); // 校验通过 @@ -81,40 +82,39 @@ public class UserController { ValueOperations stringStringValueOperations = stringRedisTemplate.opsForValue(); // 设置过期时间(1天) stringStringValueOperations.set(token, token, 1, TimeUnit.DAYS); - // 开启自动填充 - MyMetaObjectHandler.setSkipUpdateFill(false); // 返回token给前端 return new Result<>(200, "登录成功", token); } // 修改个人信息 @PutMapping("/modify") - public Result modifyMessage(@RequestBody @Validated @NotNull UserModifyMessageDTO userModifyMessageDTO) { + public Result modifyInfo(@RequestBody @Validated @NotNull UserModifyInfoDTO userModifyInfoDTO) { // 获取登录用户id Long id = GetIdUtil.getId(); User user = userService.getById(id); // 检查phone和userName是否与当前用户信息一致 - boolean isPhoneSame = user.getPhone().equals(userModifyMessageDTO.getPhone()); - boolean isUserNameSame = user.getUserName().equals(userModifyMessageDTO.getUserName()); + boolean isPhoneSame = user.getPhone().equals(userModifyInfoDTO.getPhone()); + boolean isUserNameSame = user.getUserName().equals(userModifyInfoDTO.getUserName()); if (isPhoneSame && isUserNameSame) { return new Result<>(400, "请修改您的信息", ""); } QueryWrapper queryWrapper = new QueryWrapper<>(); if (!isPhoneSame) { - queryWrapper.eq("phone", userModifyMessageDTO.getPhone()); + queryWrapper.eq("phone", userModifyInfoDTO.getPhone()); if (userService.getOne(queryWrapper) != null) { return new Result<>(400, "该手机号已被注册", ""); } - user.setPhone(userModifyMessageDTO.getPhone()); + user.setPhone(userModifyInfoDTO.getPhone()); } queryWrapper.clear(); if (!isUserNameSame) { - queryWrapper.eq("user_name", userModifyMessageDTO.getUserName()); + queryWrapper.eq("user_name", userModifyInfoDTO.getUserName()); if (userService.getOne(queryWrapper) != null) { return new Result<>(400, "该用户名已被使用", ""); } - user.setUserName(userModifyMessageDTO.getUserName()); + user.setUserName(userModifyInfoDTO.getUserName()); } + user.setUpdateTime(null); userService.updateById(user); return new Result<>(200, "用户信息修改成功", user); } @@ -133,9 +133,10 @@ public class UserController { Long id = GetIdUtil.getId(); User user = userService.getById(id); if (!user.getIdentity().equals(userModifyPasswordDTO.getIdentity())) { - return new Result<>(409, "请输入您的身份证", ""); + return new Result<>(409, "身份证有误", ""); } user.setPassword(Md5Util.getMD5String(userModifyPasswordDTO.getNewPassword())); + user.setUpdateTime(null); userService.updateById(user); // 删除redis当中的token stringRedisTemplate.delete(token); diff --git a/src/main/java/jty/expressdistributionsystem/entity/User.java b/src/main/java/jty/expressdistributionsystem/entity/User.java index 243bffb..1e21d62 100644 --- a/src/main/java/jty/expressdistributionsystem/entity/User.java +++ b/src/main/java/jty/expressdistributionsystem/entity/User.java @@ -60,9 +60,9 @@ public class User implements Serializable { @TableField(value = "create_time", fill = FieldFill.INSERT) private LocalDateTime createTime; - @TableField(value = "login_time", fill = FieldFill.UPDATE) + @TableField(value = "login_time") private LocalDateTime loginTime; - @TableField(value = "update_time", fill = FieldFill.INSERT) + @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; } From 71a93b051519825a5eb930685f33b251f38ab7e8 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Sat, 19 Oct 2024 15:01:58 +0800 Subject: [PATCH 06/43] =?UTF-8?q?=E9=AA=8C=E6=94=B6=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B9=B6=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index cff2ff9..ad7deee 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -45,10 +45,12 @@ public class UserController { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("user_name", user.getUserName()) .or() - .eq("account", user.getAccount()); + .eq("account", user.getAccount()) + .or() + .eq("phone", user.getPhone()); User u = userService.getOne(queryWrapper); if (u != null) { - return new Result<>(409, "用户已存在", ""); + return new Result<>(409, "账号或用户名或手机号已存在", ""); } // 密码加密 user.setPassword(Md5Util.getMD5String(user.getPassword())); From 1b0cb4176608f0a7560f1306fc65b0410bd2c2e5 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Sat, 19 Oct 2024 15:02:49 +0800 Subject: [PATCH 07/43] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jty/expressdistributionsystem/controller/UserController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index ad7deee..84dd5cc 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -48,6 +48,7 @@ public class UserController { .eq("account", user.getAccount()) .or() .eq("phone", user.getPhone()); + User uuu = new User(); User u = userService.getOne(queryWrapper); if (u != null) { return new Result<>(409, "账号或用户名或手机号已存在", ""); From 5eef15f5578c83da3885351f5d122defebcfc502 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Sat, 19 Oct 2024 15:03:07 +0800 Subject: [PATCH 08/43] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jty/expressdistributionsystem/controller/UserController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index 84dd5cc..ad7deee 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -48,7 +48,6 @@ public class UserController { .eq("account", user.getAccount()) .or() .eq("phone", user.getPhone()); - User uuu = new User(); User u = userService.getOne(queryWrapper); if (u != null) { return new Result<>(409, "账号或用户名或手机号已存在", ""); From 9e65e55290caa3d0b0fc604bf32630b2551118f1 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Sat, 19 Oct 2024 15:03:45 +0800 Subject: [PATCH 09/43] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expressdistributionsystem/controller/UserController.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index ad7deee..2f66c75 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -6,7 +6,6 @@ import jakarta.annotation.Resource; import jty.expressdistributionsystem.DTO.UserLoginByAccountDTO; import jty.expressdistributionsystem.DTO.UserModifyInfoDTO; import jty.expressdistributionsystem.DTO.UserModifyPasswordDTO; -import jty.expressdistributionsystem.config.MyMetaObjectHandler; import jty.expressdistributionsystem.entity.Result; import jty.expressdistributionsystem.entity.User; import jty.expressdistributionsystem.service.UserService; @@ -18,7 +17,6 @@ import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; -import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; From 038760b094e58bbe590a9ce45532d776a11b16ac Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Sun, 20 Oct 2024 00:23:03 +0800 Subject: [PATCH 10/43] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=80=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=E5=92=8C=E4=BA=8C=E9=98=B6=E6=AE=B5=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=AA=8C=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdminController.java | 8 +++++++- .../jty/expressdistributionsystem/entity/Message.java | 5 +++-- .../jty/expressdistributionsystem/utils/SendMessage.java | 8 ++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java index 2531b5a..b353e00 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; import jty.expressdistributionsystem.DTO.SendMessageDTO; import jty.expressdistributionsystem.config.MyMetaObjectHandler; +import jty.expressdistributionsystem.entity.Message; import jty.expressdistributionsystem.entity.Result; import jty.expressdistributionsystem.entity.User; +import jty.expressdistributionsystem.service.MessageService; import jty.expressdistributionsystem.service.UserService; import jty.expressdistributionsystem.utils.SendMessage; import org.springframework.web.bind.annotation.*; @@ -17,6 +19,9 @@ public class AdminController { @Resource private UserService userService; + @Resource + private MessageService messageService; + // 管理员查看用户或者快递员信息 @GetMapping("/userList") public Result> getUserList(@RequestParam int page, @RequestParam int pageSize, @RequestParam int mark) { @@ -57,7 +62,8 @@ public class AdminController { // 管理员发送消息 @PostMapping("/sendMessage") public Result sendMessage(@RequestBody SendMessageDTO sendMessageDTO) { - SendMessage.sendMessage(sendMessageDTO); + Message message = SendMessage.sendMessage(sendMessageDTO); + messageService.save(message); return new Result<>(200, "发送成功", ""); } } diff --git a/src/main/java/jty/expressdistributionsystem/entity/Message.java b/src/main/java/jty/expressdistributionsystem/entity/Message.java index 70eebb6..bcb599a 100644 --- a/src/main/java/jty/expressdistributionsystem/entity/Message.java +++ b/src/main/java/jty/expressdistributionsystem/entity/Message.java @@ -1,5 +1,6 @@ package jty.expressdistributionsystem.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -33,10 +34,10 @@ public class Message implements Serializable { @JsonSerialize(using = ToStringSerializer.class) private Long getUserId; - @TableField("create_time") + @TableField(value = "create_time", fill = FieldFill.INSERT) private LocalDateTime createTime; - @TableField("update_time") + @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField("mark") diff --git a/src/main/java/jty/expressdistributionsystem/utils/SendMessage.java b/src/main/java/jty/expressdistributionsystem/utils/SendMessage.java index eebc769..f0f3e94 100644 --- a/src/main/java/jty/expressdistributionsystem/utils/SendMessage.java +++ b/src/main/java/jty/expressdistributionsystem/utils/SendMessage.java @@ -1,21 +1,17 @@ package jty.expressdistributionsystem.utils; -import jakarta.annotation.Resource; import jty.expressdistributionsystem.DTO.SendMessageDTO; import jty.expressdistributionsystem.entity.Message; -import jty.expressdistributionsystem.service.MessageService; import org.jetbrains.annotations.NotNull; public class SendMessage { - @Resource - private static MessageService messageService; - public static void sendMessage(@NotNull SendMessageDTO sendMessageDTO) { + public static Message sendMessage(@NotNull SendMessageDTO sendMessageDTO) { Long sendId = GetIdUtil.getId(); Message message = new Message(); message.setSendUserId(sendId); message.setGetUserId(sendMessageDTO.getId()); message.setContent(sendMessageDTO.getContent()); - messageService.save(message); + return message; } } From 1b19f8ee70f5ad7618ba62e76e241d2b57e87478 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Mon, 21 Oct 2024 12:10:27 +0800 Subject: [PATCH 11/43] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=89=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E7=94=A8=E6=88=B7=E5=8A=9F=E8=83=BD=EF=BC=88?= =?UTF-8?q?=E6=9C=AA=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTO/AddresseeDTO.java | 14 + .../DTO/GoodsDTO.java | 29 ++ .../DTO/PickUpExpressDTO.java | 16 + .../controller/AdminController.java | 5 +- .../controller/UserController.java | 287 ++++++++++-------- .../entity/Goods.java | 2 +- .../entity/Records.java | 10 +- .../mapper/CodeMapper.java | 7 + .../mapper/RecordsMapper.java | 7 + .../service/CodeService.java | 7 + .../service/RecordsService.java | 7 + .../service/impl/CodeServiceImpl.java | 11 + .../service/impl/RecordsServiceImpl.java | 11 + .../utils/ClaimCodeUtil.java | 19 ++ .../utils/ExpressCodeUtil.java | 18 ++ ...{SendMessage.java => SendMessageUtil.java} | 2 +- 16 files changed, 324 insertions(+), 128 deletions(-) create mode 100644 src/main/java/jty/expressdistributionsystem/DTO/AddresseeDTO.java create mode 100644 src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java create mode 100644 src/main/java/jty/expressdistributionsystem/DTO/PickUpExpressDTO.java create mode 100644 src/main/java/jty/expressdistributionsystem/mapper/CodeMapper.java create mode 100644 src/main/java/jty/expressdistributionsystem/mapper/RecordsMapper.java create mode 100644 src/main/java/jty/expressdistributionsystem/service/CodeService.java create mode 100644 src/main/java/jty/expressdistributionsystem/service/RecordsService.java create mode 100644 src/main/java/jty/expressdistributionsystem/service/impl/CodeServiceImpl.java create mode 100644 src/main/java/jty/expressdistributionsystem/service/impl/RecordsServiceImpl.java create mode 100644 src/main/java/jty/expressdistributionsystem/utils/ClaimCodeUtil.java create mode 100644 src/main/java/jty/expressdistributionsystem/utils/ExpressCodeUtil.java rename src/main/java/jty/expressdistributionsystem/utils/{SendMessage.java => SendMessageUtil.java} (94%) diff --git a/src/main/java/jty/expressdistributionsystem/DTO/AddresseeDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/AddresseeDTO.java new file mode 100644 index 0000000..a8306b4 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/DTO/AddresseeDTO.java @@ -0,0 +1,14 @@ +package jty.expressdistributionsystem.DTO; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Data +public class AddresseeDTO { + @NotNull + private Long goodsId; + + @NotBlank(message = "取件码不能为空") + private String claimCode; +} diff --git a/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java new file mode 100644 index 0000000..5f8253b --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java @@ -0,0 +1,29 @@ +package jty.expressdistributionsystem.DTO; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Data +public class GoodsDTO { + @NotBlank(message = "请选择快递公司") + private String company; + + @JsonSerialize(using = ToStringSerializer.class) + @NotNull + private Long sendUserId; + + @NotBlank(message = "收件人名字不能为空") + private String getUserName; + + @NotBlank(message = "快递名称不能为空") + private String name; + + @NotBlank(message = "快递重量不能为空") + private String quality; + + @NotBlank(message = "运送地址不能为空") + private String address; +} diff --git a/src/main/java/jty/expressdistributionsystem/DTO/PickUpExpressDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/PickUpExpressDTO.java new file mode 100644 index 0000000..c72e7a9 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/DTO/PickUpExpressDTO.java @@ -0,0 +1,16 @@ +package jty.expressdistributionsystem.DTO; + +import jakarta.validation.constraints.NotBlank; +import lombok.Data; + +@Data +public class PickUpExpressDTO { + @NotBlank(message = "收件人名字不能为空") + private String master; + + @NotBlank(message = "快递码不能为空") + private String expressCode; + + @NotBlank(message = "取件码不能为空") + private String claimCode; +} diff --git a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java index b353e00..8b60919 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java @@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; import jty.expressdistributionsystem.DTO.SendMessageDTO; -import jty.expressdistributionsystem.config.MyMetaObjectHandler; import jty.expressdistributionsystem.entity.Message; import jty.expressdistributionsystem.entity.Result; import jty.expressdistributionsystem.entity.User; import jty.expressdistributionsystem.service.MessageService; import jty.expressdistributionsystem.service.UserService; -import jty.expressdistributionsystem.utils.SendMessage; +import jty.expressdistributionsystem.utils.SendMessageUtil; import org.springframework.web.bind.annotation.*; @RestController @@ -62,7 +61,7 @@ public class AdminController { // 管理员发送消息 @PostMapping("/sendMessage") public Result sendMessage(@RequestBody SendMessageDTO sendMessageDTO) { - Message message = SendMessage.sendMessage(sendMessageDTO); + Message message = SendMessageUtil.sendMessage(sendMessageDTO); messageService.save(message); return new Result<>(200, "发送成功", ""); } diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index 2f66c75..cf01613 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -1,155 +1,198 @@ package jty.expressdistributionsystem.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; -import jty.expressdistributionsystem.DTO.UserLoginByAccountDTO; -import jty.expressdistributionsystem.DTO.UserModifyInfoDTO; -import jty.expressdistributionsystem.DTO.UserModifyPasswordDTO; -import jty.expressdistributionsystem.entity.Result; -import jty.expressdistributionsystem.entity.User; -import jty.expressdistributionsystem.service.UserService; +import jty.expressdistributionsystem.DTO.AddresseeDTO; +import jty.expressdistributionsystem.DTO.GoodsDTO; +import jty.expressdistributionsystem.DTO.PickUpExpressDTO; +import jty.expressdistributionsystem.DTO.SendMessageDTO; +import jty.expressdistributionsystem.entity.*; +import jty.expressdistributionsystem.service.*; +import jty.expressdistributionsystem.utils.ClaimCodeUtil; +import jty.expressdistributionsystem.utils.ExpressCodeUtil; import jty.expressdistributionsystem.utils.GetIdUtil; -import jty.expressdistributionsystem.utils.JwtUtil; -import jty.expressdistributionsystem.utils.Md5Util; -import jty.expressdistributionsystem.utils.ThreadLocalUtil; -import lombok.extern.slf4j.Slf4j; +import jty.expressdistributionsystem.utils.SendMessageUtil; import org.jetbrains.annotations.NotNull; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.data.redis.core.ValueOperations; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.time.LocalDateTime; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.TimeUnit; +import java.util.List; @RestController @RequestMapping("/user") -@Slf4j public class UserController { @Resource private UserService userService; @Resource - private StringRedisTemplate stringRedisTemplate; - - // 注册 - @PostMapping("/register") - public Result register(@RequestBody @Validated @NotNull User user) { - // 查找用户是否存在 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("user_name", user.getUserName()) - .or() - .eq("account", user.getAccount()) - .or() - .eq("phone", user.getPhone()); - User u = userService.getOne(queryWrapper); - if (u != null) { - return new Result<>(409, "账号或用户名或手机号已存在", ""); - } - // 密码加密 - user.setPassword(Md5Util.getMD5String(user.getPassword())); - // 用户数据入库 - userService.save(user); - return new Result<>(200, "注册成功", ""); + private MessageService messageService; + + @Resource + private RecordsService recordsService; + + @Resource + private CodeService codeService; + + @Resource + private GoodsService goodsService; + + @Resource + private AddressService addressService; + + // 用户给快递员发消息 + @PostMapping("/sendMessage") + public Result sendMessage(@Validated @RequestBody SendMessageDTO sendMessageDTO) { + Message message = SendMessageUtil.sendMessage(sendMessageDTO); + messageService.save(message); + return new Result<>(200, "发送成功", ""); } - // 通过账号登录 - @PostMapping("/loginByAccount") - public Result login(@RequestBody @Validated @NotNull UserLoginByAccountDTO userLoginByAccountDTO) { - // 查询用户是否存在 - Optional optionalUser = Optional.ofNullable(userService.getOne(new QueryWrapper() - .eq("account", userLoginByAccountDTO.getAccount()))); - if (optionalUser.isEmpty() || !Md5Util.getMD5String(userLoginByAccountDTO.getPassword()).equals(optionalUser.get().getPassword())) { - return new Result<>(401, "账号或者密码错误", ""); - } - User user = optionalUser.get(); - if(user.getDisabled() == 1){ - return new Result<>(403, "该账号已被禁用, 请联系管理员", ""); - } - user.setLoginTime(LocalDateTime.now()); - userService.update(user, new UpdateWrapper().eq("id", user.getId())); - // 校验通过 - Map claims = new HashMap<>(); - claims.put("id", user.getId()); - claims.put("account", userLoginByAccountDTO.getAccount()); - // 获取token - String token = JwtUtil.genToken(claims); - // 存放token到redis当中进行持久化存储 - ValueOperations stringStringValueOperations = stringRedisTemplate.opsForValue(); - // 设置过期时间(1天) - stringStringValueOperations.set(token, token, 1, TimeUnit.DAYS); - // 返回token给前端 - return new Result<>(200, "登录成功", token); + // 给快递员点赞 + @PostMapping("/likes") + public Result like(Long id) { + User employee = userService.getById(id); + employee.setLikes(employee.getLikes() + 1); + userService.save(employee); + return new Result<>(200, "点赞成功", ""); } - // 修改个人信息 - @PutMapping("/modify") - public Result modifyInfo(@RequestBody @Validated @NotNull UserModifyInfoDTO userModifyInfoDTO) { - // 获取登录用户id + // 用户查看自己的快递记录 + @GetMapping("/history") + public Result> getHistory(@RequestParam int page, @RequestParam int pageSize) { + if (page <= 0 || pageSize == 0) { + return new Result<>(400, "页码和每页大小必须大于0", null); + } Long id = GetIdUtil.getId(); - User user = userService.getById(id); - // 检查phone和userName是否与当前用户信息一致 - boolean isPhoneSame = user.getPhone().equals(userModifyInfoDTO.getPhone()); - boolean isUserNameSame = user.getUserName().equals(userModifyInfoDTO.getUserName()); - if (isPhoneSame && isUserNameSame) { - return new Result<>(400, "请修改您的信息", ""); + Page pageInfo = new Page<>(page, pageSize); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(Records::getSendUserId, id); + queryWrapper.orderByDesc(Records::getCreateTime); + recordsService.page(pageInfo, queryWrapper); + return new Result<>(200, "", pageInfo); + } + + // 用户收件 + @PostMapping("/addressee") + public Result addressee(@Validated @RequestBody @NotNull AddresseeDTO addresseeDTO) { + Long goodsId = addresseeDTO.getGoodsId(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("goods_id", goodsId); + Code code = codeService.getOne(queryWrapper); + // 判断取件码是否输入正确 + if (!code.getClaim().equals(addresseeDTO.getClaimCode())) { + return new Result<>(401, "请输入正确的取件码", ""); } - QueryWrapper queryWrapper = new QueryWrapper<>(); - if (!isPhoneSame) { - queryWrapper.eq("phone", userModifyInfoDTO.getPhone()); - if (userService.getOne(queryWrapper) != null) { - return new Result<>(400, "该手机号已被注册", ""); - } - user.setPhone(userModifyInfoDTO.getPhone()); + QueryWrapper recordsQueryWrapper = new QueryWrapper<>(); + recordsQueryWrapper.eq("goods_id", goodsId); + Records records = recordsService.getOne(recordsQueryWrapper); + records.setMark(1); + // 设置取件人 + records.setAddresseeId(GetIdUtil.getId()); + recordsService.save(records); + return new Result<>(200, "取件成功", ""); + } + + // 用户代取快递 + @PostMapping("/pickUp") + public Result pickUpExpress(@RequestBody @Validated @NotNull PickUpExpressDTO pickUpExpressDTO) { + // 查询快递原主人信息 + QueryWrapper userQueryWrapper = new QueryWrapper<>(); + userQueryWrapper.eq("user_name", pickUpExpressDTO.getMaster()); + User master = userService.getOne(userQueryWrapper); + if (master == null) { + return new Result<>(404, "该用户不存在", ""); } - queryWrapper.clear(); - if (!isUserNameSame) { - queryWrapper.eq("user_name", userModifyInfoDTO.getUserName()); - if (userService.getOne(queryWrapper) != null) { - return new Result<>(400, "该用户名已被使用", ""); - } - user.setUserName(userModifyInfoDTO.getUserName()); + // 查询快递信息 + QueryWrapper goodsQueryWrapper = new QueryWrapper<>(); + goodsQueryWrapper.eq("express_code", pickUpExpressDTO.getExpressCode()); + Goods goods = goodsService.getOne(goodsQueryWrapper); + if (goods == null) { + return new Result<>(404, "快递不存在", ""); } - user.setUpdateTime(null); - userService.updateById(user); - return new Result<>(200, "用户信息修改成功", user); + // 代取 + QueryWrapper recordsQueryWrapper = new QueryWrapper<>(); + recordsQueryWrapper.eq("goods_id", goods.getId()); + Records records = recordsService.getOne(recordsQueryWrapper); + records.setMark(1); + records.setAddresseeId(GetIdUtil.getId()); + recordsService.save(records); + return new Result<>(200, "待取成功", ""); } - // 修改个人密码 - @PutMapping("/rePassword") - public Result modifyPassword(@RequestHeader("Authorization") String token, - @RequestBody @Validated @NotNull UserModifyPasswordDTO userModifyPasswordDTO) { - // 判断密码 - if (userModifyPasswordDTO.getOldPassword().equals(userModifyPasswordDTO.getNewPassword())) { - return new Result<>(409, "新密码不得和旧密码一致", ""); - } - if (!userModifyPasswordDTO.getNewPassword().equals(userModifyPasswordDTO.getReNewPassword())) { - return new Result<>(409, "两次输入密码不相同", ""); + // 用户查看消息 + @GetMapping("/getMessage") + public Result> getMessage(@RequestParam int page, @RequestParam int pageSize) { + if (page <= 0 || pageSize == 0) { + return new Result<>(400, "页码和每页大小必须大于0", null); } Long id = GetIdUtil.getId(); - User user = userService.getById(id); - if (!user.getIdentity().equals(userModifyPasswordDTO.getIdentity())) { - return new Result<>(409, "身份证有误", ""); - } - user.setPassword(Md5Util.getMD5String(userModifyPasswordDTO.getNewPassword())); - user.setUpdateTime(null); - userService.updateById(user); - // 删除redis当中的token - stringRedisTemplate.delete(token); - // 删除当前线程的存储信息 - ThreadLocalUtil.remove(); - return new Result<>(200, "密码修改成功, 请重新登陆", ""); + Page messagePage = new Page<>(page, pageSize); + LambdaQueryWrapper messageLambdaQueryWrapper = new LambdaQueryWrapper<>(); + // 添加查询条件 + messageLambdaQueryWrapper.eq(Message::getSendUserId, id); + // 排序条件：先按 mark 对应值排序，然后按时间排序 + messageLambdaQueryWrapper.orderByDesc(Message::getMark) // mark 值大的排前面 + .orderByDesc(Message::getCreateTime); // 时间新的排前面 + messageService.page(messagePage, messageLambdaQueryWrapper); + return new Result<>(200, "获取成功", messagePage); } - // 获取个人信息 - @GetMapping("/info") - public Result getInfo() { - Long id = GetIdUtil.getId(); - User user = userService.getById(id); - return new Result<>(200, "", user); + // 用户确认查看消息 + @PostMapping("/confirmMessage") + public Result confirmMessage(@RequestParam Long id) { + Records records = recordsService.getById(id); + records.setMark(0); + recordsService.save(records); + return new Result<>(200, "消息查看成功", ""); + } + + // 用户获取自己写过的地址 + @GetMapping("/getAddress") + public Result> listAddress() { + LambdaQueryWrapper
addressLambdaQueryWrapper = new LambdaQueryWrapper<>(); + addressLambdaQueryWrapper.eq(Address::getUserId, GetIdUtil.getId()) + .orderByDesc(Address::getAddress); + List
list = addressService.list(addressLambdaQueryWrapper); + return new Result<>(200, "", list); + } + + // 用户寄件 + @PostMapping("/shipment") + public Result shipmentExpress(@RequestBody @Validated @NotNull GoodsDTO goodsDTO) { + // 判断用户是否存在 + LambdaQueryWrapper userLambdaQueryWrapper = new LambdaQueryWrapper<>(); + userLambdaQueryWrapper.eq(User::getUserName, goodsDTO.getGetUserName()); + User getUser = userService.getOne(userLambdaQueryWrapper); + if(getUser == null) { + return new Result<>(404, "用户不存在", null); + } + // 生成快递码 + String expressCode = ExpressCodeUtil.getExpressCode(goodsDTO.getCompany()); + // 生成取件码 + String claimCode = ClaimCodeUtil.getClaimCode(goodsDTO.getCompany()); + Goods goods = new Goods(); + goods.setSendUserId(GetIdUtil.getId()); + goods.setGetUserId(getUser.getId()); + goods.setExpressCode(expressCode); + goods.setName(goodsDTO.getName()); + goods.setQuality(goodsDTO.getQuality()); + goodsService.save(goods); + // 存进历史记录 + Records records = new Records(); + records.setSendUserId(GetIdUtil.getId()); + records.setGetUserId(getUser.getId()); + LambdaQueryWrapper
addressLambdaQueryWrapper = new LambdaQueryWrapper<>(); + addressLambdaQueryWrapper.eq(Address::getAddress, goodsDTO.getAddress()); + Address address = addressService.getOne(addressLambdaQueryWrapper); + records.setAddresseeId(address.getId()); + records.setGoodsId(goods.getId()); + recordsService.save(records); + Code code = new Code(); + code.setClaim(claimCode); + code.setGoodsId(goods.getId()); + codeService.save(code); + return new Result<>(200, "寄件成功", ""); } } diff --git a/src/main/java/jty/expressdistributionsystem/entity/Goods.java b/src/main/java/jty/expressdistributionsystem/entity/Goods.java index d503ef1..512bda3 100644 --- a/src/main/java/jty/expressdistributionsystem/entity/Goods.java +++ b/src/main/java/jty/expressdistributionsystem/entity/Goods.java @@ -30,7 +30,7 @@ public class Goods implements Serializable { @TableField("get_user_id") @JsonSerialize(using = ToStringSerializer.class) @NotNull - private String getUserId; + private Long getUserId; @TableField("express_code") @NotBlank(message = "快递码未生成, 请重新填写信息") diff --git a/src/main/java/jty/expressdistributionsystem/entity/Records.java b/src/main/java/jty/expressdistributionsystem/entity/Records.java index 0018a27..dd1107f 100644 --- a/src/main/java/jty/expressdistributionsystem/entity/Records.java +++ b/src/main/java/jty/expressdistributionsystem/entity/Records.java @@ -1,5 +1,6 @@ package jty.expressdistributionsystem.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -37,6 +38,13 @@ public class Records implements Serializable { @NotNull private Long goodsId; - @TableField("create_time") + @TableField("mark") + private Integer mark; + + @TableField("addressee_id") + @JsonSerialize(using = ToStringSerializer.class) + private Long addresseeId; + + @TableField(value = "create_time", fill = FieldFill.INSERT) private LocalDateTime createTime; } diff --git a/src/main/java/jty/expressdistributionsystem/mapper/CodeMapper.java b/src/main/java/jty/expressdistributionsystem/mapper/CodeMapper.java new file mode 100644 index 0000000..2ad692c --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/mapper/CodeMapper.java @@ -0,0 +1,7 @@ +package jty.expressdistributionsystem.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jty.expressdistributionsystem.entity.Code; + +public interface CodeMapper extends BaseMapper { +} diff --git a/src/main/java/jty/expressdistributionsystem/mapper/RecordsMapper.java b/src/main/java/jty/expressdistributionsystem/mapper/RecordsMapper.java new file mode 100644 index 0000000..0237f20 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/mapper/RecordsMapper.java @@ -0,0 +1,7 @@ +package jty.expressdistributionsystem.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jty.expressdistributionsystem.entity.Records; + +public interface RecordsMapper extends BaseMapper { +} diff --git a/src/main/java/jty/expressdistributionsystem/service/CodeService.java b/src/main/java/jty/expressdistributionsystem/service/CodeService.java new file mode 100644 index 0000000..73624a1 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/service/CodeService.java @@ -0,0 +1,7 @@ +package jty.expressdistributionsystem.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jty.expressdistributionsystem.entity.Code; + +public interface CodeService extends IService { +} diff --git a/src/main/java/jty/expressdistributionsystem/service/RecordsService.java b/src/main/java/jty/expressdistributionsystem/service/RecordsService.java new file mode 100644 index 0000000..f0b02f4 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/service/RecordsService.java @@ -0,0 +1,7 @@ +package jty.expressdistributionsystem.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jty.expressdistributionsystem.entity.Records; + +public interface RecordsService extends IService { +} diff --git a/src/main/java/jty/expressdistributionsystem/service/impl/CodeServiceImpl.java b/src/main/java/jty/expressdistributionsystem/service/impl/CodeServiceImpl.java new file mode 100644 index 0000000..72c9878 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/service/impl/CodeServiceImpl.java @@ -0,0 +1,11 @@ +package jty.expressdistributionsystem.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jty.expressdistributionsystem.entity.Code; +import jty.expressdistributionsystem.mapper.CodeMapper; +import jty.expressdistributionsystem.service.CodeService; +import org.springframework.stereotype.Service; + +@Service +public class CodeServiceImpl extends ServiceImpl implements CodeService { +} diff --git a/src/main/java/jty/expressdistributionsystem/service/impl/RecordsServiceImpl.java b/src/main/java/jty/expressdistributionsystem/service/impl/RecordsServiceImpl.java new file mode 100644 index 0000000..f80c25b --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/service/impl/RecordsServiceImpl.java @@ -0,0 +1,11 @@ +package jty.expressdistributionsystem.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jty.expressdistributionsystem.entity.Records; +import jty.expressdistributionsystem.mapper.RecordsMapper; +import jty.expressdistributionsystem.service.RecordsService; +import org.springframework.stereotype.Service; + +@Service +public class RecordsServiceImpl extends ServiceImpl implements RecordsService { +} diff --git a/src/main/java/jty/expressdistributionsystem/utils/ClaimCodeUtil.java b/src/main/java/jty/expressdistributionsystem/utils/ClaimCodeUtil.java new file mode 100644 index 0000000..c0c758d --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/utils/ClaimCodeUtil.java @@ -0,0 +1,19 @@ +package jty.expressdistributionsystem.utils; + +import org.jetbrains.annotations.NotNull; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.UUID; + +public class ClaimCodeUtil { + public static @NotNull String getClaimCode(String company) { + // 获取当前时间 + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + String timeStamp = sdf.format(new Date()); + // 生成唯一标识符 + String uniqueId = UUID.randomUUID().toString().replace("-", "").substring(0, 6); + // 将公司名、时间戳和唯一ID组合成取件码 + return company.toUpperCase() + timeStamp + uniqueId; + } +} diff --git a/src/main/java/jty/expressdistributionsystem/utils/ExpressCodeUtil.java b/src/main/java/jty/expressdistributionsystem/utils/ExpressCodeUtil.java new file mode 100644 index 0000000..17b062e --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/utils/ExpressCodeUtil.java @@ -0,0 +1,18 @@ +package jty.expressdistributionsystem.utils; + +import org.jetbrains.annotations.NotNull; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.UUID; + +public class ExpressCodeUtil { + public static @NotNull String getExpressCode(String company) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + String timeStamp = sdf.format(new Date()); + // 生成唯一标识符 + String uniqueId = UUID.randomUUID().toString().replace("-", "").substring(0, 8); + // 将公司名、时间戳和唯一ID组合成快递码 + return company.toUpperCase() + timeStamp + uniqueId; + } +} \ No newline at end of file diff --git a/src/main/java/jty/expressdistributionsystem/utils/SendMessage.java b/src/main/java/jty/expressdistributionsystem/utils/SendMessageUtil.java similarity index 94% rename from src/main/java/jty/expressdistributionsystem/utils/SendMessage.java rename to src/main/java/jty/expressdistributionsystem/utils/SendMessageUtil.java index f0f3e94..ae0a40e 100644 --- a/src/main/java/jty/expressdistributionsystem/utils/SendMessage.java +++ b/src/main/java/jty/expressdistributionsystem/utils/SendMessageUtil.java @@ -4,7 +4,7 @@ import jty.expressdistributionsystem.DTO.SendMessageDTO; import jty.expressdistributionsystem.entity.Message; import org.jetbrains.annotations.NotNull; -public class SendMessage { +public class SendMessageUtil { public static Message sendMessage(@NotNull SendMessageDTO sendMessageDTO) { Long sendId = GetIdUtil.getId(); From 7a12313da6259430a0e97c58f0acc4ee6667876a Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Mon, 21 Oct 2024 12:10:54 +0800 Subject: [PATCH 12/43] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=89=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E7=94=A8=E6=88=B7=E5=8A=9F=E8=83=BD=EF=BC=88?= =?UTF-8?q?=E6=9C=AA=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommonController.java | 155 ++++++++++++++++++ 1 file changed, 155 insertions(+) create mode 100644 src/main/java/jty/expressdistributionsystem/controller/CommonController.java diff --git a/src/main/java/jty/expressdistributionsystem/controller/CommonController.java b/src/main/java/jty/expressdistributionsystem/controller/CommonController.java new file mode 100644 index 0000000..8ab10e9 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/controller/CommonController.java @@ -0,0 +1,155 @@ +package jty.expressdistributionsystem.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import jakarta.annotation.Resource; +import jty.expressdistributionsystem.DTO.UserLoginByAccountDTO; +import jty.expressdistributionsystem.DTO.UserModifyInfoDTO; +import jty.expressdistributionsystem.DTO.UserModifyPasswordDTO; +import jty.expressdistributionsystem.entity.Result; +import jty.expressdistributionsystem.entity.User; +import jty.expressdistributionsystem.service.UserService; +import jty.expressdistributionsystem.utils.GetIdUtil; +import jty.expressdistributionsystem.utils.JwtUtil; +import jty.expressdistributionsystem.utils.Md5Util; +import jty.expressdistributionsystem.utils.ThreadLocalUtil; +import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.TimeUnit; + +@RestController +@RequestMapping("/common") +@Slf4j +public class CommonController { + @Resource + private UserService userService; + + @Resource + private StringRedisTemplate stringRedisTemplate; + + // 注册 + @PostMapping("/register") + public Result register(@RequestBody @Validated @NotNull User user) { + // 查找用户是否存在 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("user_name", user.getUserName()) + .or() + .eq("account", user.getAccount()) + .or() + .eq("phone", user.getPhone()); + User u = userService.getOne(queryWrapper); + if (u != null) { + return new Result<>(409, "账号或用户名或手机号已存在", ""); + } + // 密码加密 + user.setPassword(Md5Util.getMD5String(user.getPassword())); + // 用户数据入库 + userService.save(user); + return new Result<>(200, "注册成功", ""); + } + + // 通过账号登录 + @PostMapping("/loginByAccount") + public Result login(@RequestBody @Validated @NotNull UserLoginByAccountDTO userLoginByAccountDTO) { + // 查询用户是否存在 + Optional optionalUser = Optional.ofNullable(userService.getOne(new QueryWrapper() + .eq("account", userLoginByAccountDTO.getAccount()))); + if (optionalUser.isEmpty() || !Md5Util.getMD5String(userLoginByAccountDTO.getPassword()).equals(optionalUser.get().getPassword())) { + return new Result<>(401, "账号或者密码错误", ""); + } + User user = optionalUser.get(); + if(user.getDisabled() == 1){ + return new Result<>(403, "该账号已被禁用, 请联系管理员", ""); + } + user.setLoginTime(LocalDateTime.now()); + userService.update(user, new UpdateWrapper().eq("id", user.getId())); + // 校验通过 + Map claims = new HashMap<>(); + claims.put("id", user.getId()); + claims.put("account", userLoginByAccountDTO.getAccount()); + // 获取token + String token = JwtUtil.genToken(claims); + // 存放token到redis当中进行持久化存储 + ValueOperations stringStringValueOperations = stringRedisTemplate.opsForValue(); + // 设置过期时间(1天) + stringStringValueOperations.set(token, token, 1, TimeUnit.DAYS); + // 返回token给前端 + return new Result<>(200, "登录成功", token); + } + + // 修改个人信息 + @PutMapping("/modify") + public Result modifyInfo(@RequestBody @Validated @NotNull UserModifyInfoDTO userModifyInfoDTO) { + // 获取登录用户id + Long id = GetIdUtil.getId(); + User user = userService.getById(id); + // 检查phone和userName是否与当前用户信息一致 + boolean isPhoneSame = user.getPhone().equals(userModifyInfoDTO.getPhone()); + boolean isUserNameSame = user.getUserName().equals(userModifyInfoDTO.getUserName()); + if (isPhoneSame && isUserNameSame) { + return new Result<>(400, "请修改您的信息", ""); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (!isPhoneSame) { + queryWrapper.eq("phone", userModifyInfoDTO.getPhone()); + if (userService.getOne(queryWrapper) != null) { + return new Result<>(400, "该手机号已被注册", ""); + } + user.setPhone(userModifyInfoDTO.getPhone()); + } + queryWrapper.clear(); + if (!isUserNameSame) { + queryWrapper.eq("user_name", userModifyInfoDTO.getUserName()); + if (userService.getOne(queryWrapper) != null) { + return new Result<>(400, "该用户名已被使用", ""); + } + user.setUserName(userModifyInfoDTO.getUserName()); + } + user.setUpdateTime(null); + userService.updateById(user); + return new Result<>(200, "用户信息修改成功", user); + } + + // 修改个人密码 + @PutMapping("/rePassword") + public Result modifyPassword(@RequestHeader("Authorization") String token, + @RequestBody @Validated @NotNull UserModifyPasswordDTO userModifyPasswordDTO) { + // 判断密码 + if (userModifyPasswordDTO.getOldPassword().equals(userModifyPasswordDTO.getNewPassword())) { + return new Result<>(409, "新密码不得和旧密码一致", ""); + } + if (!userModifyPasswordDTO.getNewPassword().equals(userModifyPasswordDTO.getReNewPassword())) { + return new Result<>(409, "两次输入密码不相同", ""); + } + Long id = GetIdUtil.getId(); + User user = userService.getById(id); + if (!user.getIdentity().equals(userModifyPasswordDTO.getIdentity())) { + return new Result<>(409, "身份证有误", ""); + } + user.setPassword(Md5Util.getMD5String(userModifyPasswordDTO.getNewPassword())); + user.setUpdateTime(null); + userService.updateById(user); + // 删除redis当中的token + stringRedisTemplate.delete(token); + // 删除当前线程的存储信息 + ThreadLocalUtil.remove(); + return new Result<>(200, "密码修改成功, 请重新登陆", ""); + } + + // 获取个人信息 + @GetMapping("/info") + public Result getInfo() { + Long id = GetIdUtil.getId(); + User user = userService.getById(id); + return new Result<>(200, "", user); + } +} From 93febaf68e650c5f81cfbe8a40f6f03b68622f8a Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Mon, 21 Oct 2024 18:23:26 +0800 Subject: [PATCH 13/43] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jty/expressdistributionsystem/config/WebConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/jty/expressdistributionsystem/config/WebConfig.java b/src/main/java/jty/expressdistributionsystem/config/WebConfig.java index 2eb4bd7..03e9d58 100644 --- a/src/main/java/jty/expressdistributionsystem/config/WebConfig.java +++ b/src/main/java/jty/expressdistributionsystem/config/WebConfig.java @@ -13,6 +13,6 @@ public class WebConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(loginInterceptor).excludePathPatterns("/user/login", "/user/loginByAccount"); + registry.addInterceptor(loginInterceptor).excludePathPatterns("/common/login", "/common/loginByAccount"); } } From 9c3318523143d0b9df2f3913cdc4b60ce5adc3d7 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Wed, 23 Oct 2024 08:32:00 +0800 Subject: [PATCH 14/43] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=92=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=9F=E8=83=BD=E6=88=90=E5=8A=9F=E9=80=9A?= =?UTF-8?q?=E8=BF=87Postman=E6=B5=8B=E8=AF=95=E9=AA=8C=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTO/GoodsDTO.java | 8 +- .../DTO/SendMessageDTO.java | 10 +- .../config/WebConfig.java | 2 +- .../controller/AdminController.java | 6 +- .../controller/CommonController.java | 2 +- .../controller/UserController.java | 191 +++++++++++------- .../entity/Records.java | 8 + .../interceptors/LoginInterceptor.java | 4 +- 8 files changed, 141 insertions(+), 90 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java index 5f8253b..08b4773 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java @@ -11,10 +11,6 @@ public class GoodsDTO { @NotBlank(message = "请选择快递公司") private String company; - @JsonSerialize(using = ToStringSerializer.class) - @NotNull - private Long sendUserId; - @NotBlank(message = "收件人名字不能为空") private String getUserName; @@ -26,4 +22,8 @@ public class GoodsDTO { @NotBlank(message = "运送地址不能为空") private String address; + + @JsonSerialize(using = ToStringSerializer.class) + @NotNull + private Long expressId; } diff --git a/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java index 1bf6a1c..efc673d 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java @@ -4,16 +4,10 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; -import java.io.Serial; -import java.io.Serializable; - @Data -public class SendMessageDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - +public class SendMessageDTO { @JsonSerialize(using = ToStringSerializer.class) - private Long id; + private Long Id; private String content; } diff --git a/src/main/java/jty/expressdistributionsystem/config/WebConfig.java b/src/main/java/jty/expressdistributionsystem/config/WebConfig.java index 03e9d58..c8f41ed 100644 --- a/src/main/java/jty/expressdistributionsystem/config/WebConfig.java +++ b/src/main/java/jty/expressdistributionsystem/config/WebConfig.java @@ -13,6 +13,6 @@ public class WebConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(loginInterceptor).excludePathPatterns("/common/login", "/common/loginByAccount"); + registry.addInterceptor(loginInterceptor).excludePathPatterns("/common/register", "/common/loginByAccount"); } } diff --git a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java index 8b60919..4d197aa 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java @@ -22,7 +22,7 @@ public class AdminController { private MessageService messageService; // 管理员查看用户或者快递员信息 - @GetMapping("/userList") + @GetMapping("/infoList") public Result> getUserList(@RequestParam int page, @RequestParam int pageSize, @RequestParam int mark) { if (page <= 0 || pageSize <= 0) { return new Result<>(400, "页码和每页大小必须大于0", null); @@ -43,7 +43,7 @@ public class AdminController { @DeleteMapping("/delete/{id}") public Result delete(@PathVariable Long id, @RequestParam String operation) { User user = userService.getById(id); - switch(operation){ + switch (operation) { // 禁用 case "0" -> user.setDisabled(1); // 解除禁用 @@ -61,7 +61,7 @@ public class AdminController { // 管理员发送消息 @PostMapping("/sendMessage") public Result sendMessage(@RequestBody SendMessageDTO sendMessageDTO) { - Message message = SendMessageUtil.sendMessage(sendMessageDTO); + Message message = SendMessageUtil.sendMessage(sendMessageDTO); messageService.save(message); return new Result<>(200, "发送成功", ""); } diff --git a/src/main/java/jty/expressdistributionsystem/controller/CommonController.java b/src/main/java/jty/expressdistributionsystem/controller/CommonController.java index 8ab10e9..fa60b12 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/CommonController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/CommonController.java @@ -67,7 +67,7 @@ public class CommonController { return new Result<>(401, "账号或者密码错误", ""); } User user = optionalUser.get(); - if(user.getDisabled() == 1){ + if (user.getDisabled() == 1) { return new Result<>(403, "该账号已被禁用, 请联系管理员", ""); } user.setLoginTime(LocalDateTime.now()); diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index cf01613..610fe90 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -14,6 +14,7 @@ import jty.expressdistributionsystem.utils.ClaimCodeUtil; import jty.expressdistributionsystem.utils.ExpressCodeUtil; import jty.expressdistributionsystem.utils.GetIdUtil; import jty.expressdistributionsystem.utils.SendMessageUtil; +import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -22,6 +23,7 @@ import java.util.List; @RestController @RequestMapping("/user") +@Slf4j public class UserController { @Resource private UserService userService; @@ -51,87 +53,44 @@ public class UserController { // 给快递员点赞 @PostMapping("/likes") - public Result like(Long id) { + public Result like(@RequestParam Long id) { User employee = userService.getById(id); employee.setLikes(employee.getLikes() + 1); - userService.save(employee); + userService.updateById(employee); return new Result<>(200, "点赞成功", ""); } - // 用户查看自己的快递记录 - @GetMapping("/history") - public Result> getHistory(@RequestParam int page, @RequestParam int pageSize) { + // 用户查看发给别人消息 + @GetMapping("/sendToMessage") + public Result> sendToMessage(@RequestParam int page, @RequestParam int pageSize) { if (page <= 0 || pageSize == 0) { return new Result<>(400, "页码和每页大小必须大于0", null); } Long id = GetIdUtil.getId(); - Page pageInfo = new Page<>(page, pageSize); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(Records::getSendUserId, id); - queryWrapper.orderByDesc(Records::getCreateTime); - recordsService.page(pageInfo, queryWrapper); - return new Result<>(200, "", pageInfo); - } - - // 用户收件 - @PostMapping("/addressee") - public Result addressee(@Validated @RequestBody @NotNull AddresseeDTO addresseeDTO) { - Long goodsId = addresseeDTO.getGoodsId(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("goods_id", goodsId); - Code code = codeService.getOne(queryWrapper); - // 判断取件码是否输入正确 - if (!code.getClaim().equals(addresseeDTO.getClaimCode())) { - return new Result<>(401, "请输入正确的取件码", ""); - } - QueryWrapper recordsQueryWrapper = new QueryWrapper<>(); - recordsQueryWrapper.eq("goods_id", goodsId); - Records records = recordsService.getOne(recordsQueryWrapper); - records.setMark(1); - // 设置取件人 - records.setAddresseeId(GetIdUtil.getId()); - recordsService.save(records); - return new Result<>(200, "取件成功", ""); - } - - // 用户代取快递 - @PostMapping("/pickUp") - public Result pickUpExpress(@RequestBody @Validated @NotNull PickUpExpressDTO pickUpExpressDTO) { - // 查询快递原主人信息 - QueryWrapper userQueryWrapper = new QueryWrapper<>(); - userQueryWrapper.eq("user_name", pickUpExpressDTO.getMaster()); - User master = userService.getOne(userQueryWrapper); - if (master == null) { - return new Result<>(404, "该用户不存在", ""); - } - // 查询快递信息 - QueryWrapper goodsQueryWrapper = new QueryWrapper<>(); - goodsQueryWrapper.eq("express_code", pickUpExpressDTO.getExpressCode()); - Goods goods = goodsService.getOne(goodsQueryWrapper); - if (goods == null) { - return new Result<>(404, "快递不存在", ""); - } - // 代取 - QueryWrapper recordsQueryWrapper = new QueryWrapper<>(); - recordsQueryWrapper.eq("goods_id", goods.getId()); - Records records = recordsService.getOne(recordsQueryWrapper); - records.setMark(1); - records.setAddresseeId(GetIdUtil.getId()); - recordsService.save(records); - return new Result<>(200, "待取成功", ""); + log.info("当前登录用户的id: {}", id); + Page messagePage = new Page<>(page, pageSize); + LambdaQueryWrapper messageLambdaQueryWrapper = new LambdaQueryWrapper<>(); + // 添加查询条件 + messageLambdaQueryWrapper.eq(Message::getSendUserId, id); + // 排序条件：先按 mark 对应值排序，然后按时间排序 + messageLambdaQueryWrapper.orderByDesc(Message::getMark) // mark 值大的排前面 + .orderByDesc(Message::getCreateTime); // 时间新的排前面 + messageService.page(messagePage, messageLambdaQueryWrapper); + return new Result<>(200, "获取成功", messagePage); } - // 用户查看消息 - @GetMapping("/getMessage") - public Result> getMessage(@RequestParam int page, @RequestParam int pageSize) { + // 用户查看别人发给自己的消息 + @GetMapping("/getFromMessage") + public Result> getFromMessage(@RequestParam int page, @RequestParam int pageSize) { if (page <= 0 || pageSize == 0) { return new Result<>(400, "页码和每页大小必须大于0", null); } Long id = GetIdUtil.getId(); + log.info("当前登录用户的id: {}", id); Page messagePage = new Page<>(page, pageSize); LambdaQueryWrapper messageLambdaQueryWrapper = new LambdaQueryWrapper<>(); // 添加查询条件 - messageLambdaQueryWrapper.eq(Message::getSendUserId, id); + messageLambdaQueryWrapper.eq(Message::getGetUserId, id); // 排序条件：先按 mark 对应值排序，然后按时间排序 messageLambdaQueryWrapper.orderByDesc(Message::getMark) // mark 值大的排前面 .orderByDesc(Message::getCreateTime); // 时间新的排前面 @@ -142,12 +101,26 @@ public class UserController { // 用户确认查看消息 @PostMapping("/confirmMessage") public Result confirmMessage(@RequestParam Long id) { - Records records = recordsService.getById(id); - records.setMark(0); - recordsService.save(records); + Message message = messageService.getById(id); + message.setMark(0); + messageService.updateById(message); return new Result<>(200, "消息查看成功", ""); } + // 用户新建快递地址 + @PostMapping("/addAddress") + public Result addAddress(@RequestBody @NotNull Address address) { + // 查询快递地址是否已经存在 + LambdaQueryWrapper
addressLambdaQueryWrapper = new LambdaQueryWrapper<>(); + addressLambdaQueryWrapper.eq(Address::getAddress, address.getAddress()); + Address getAddress = addressService.getOne(addressLambdaQueryWrapper); + if (getAddress != null) { + return new Result<>(409, "该地址已存在", ""); + } + addressService.save(address); + return new Result<>(200, "地址创建成功", ""); + } + // 用户获取自己写过的地址 @GetMapping("/getAddress") public Result> listAddress() { @@ -158,6 +131,21 @@ public class UserController { return new Result<>(200, "", list); } + // 用户查看自己的发送快递记录 + @GetMapping("/history") + public Result> getHistory(@RequestParam int page, @RequestParam int pageSize) { + if (page <= 0 || pageSize == 0) { + return new Result<>(400, "页码和每页大小必须大于0", null); + } + Long id = GetIdUtil.getId(); + Page pageInfo = new Page<>(page, pageSize); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(Records::getSendUserId, id); + queryWrapper.orderByDesc(Records::getCreateTime); + recordsService.page(pageInfo, queryWrapper); + return new Result<>(200, "", pageInfo); + } + // 用户寄件 @PostMapping("/shipment") public Result shipmentExpress(@RequestBody @Validated @NotNull GoodsDTO goodsDTO) { @@ -165,9 +153,16 @@ public class UserController { LambdaQueryWrapper userLambdaQueryWrapper = new LambdaQueryWrapper<>(); userLambdaQueryWrapper.eq(User::getUserName, goodsDTO.getGetUserName()); User getUser = userService.getOne(userLambdaQueryWrapper); - if(getUser == null) { + if (getUser == null) { return new Result<>(404, "用户不存在", null); } + // 判断地址是否存在 + LambdaQueryWrapper
addressLambdaQueryWrapper = new LambdaQueryWrapper<>(); + addressLambdaQueryWrapper.eq(Address::getAddress, goodsDTO.getAddress()); + Address address = addressService.getOne(addressLambdaQueryWrapper); + if (address == null) { + return new Result<>(404, "地址不存在", null); + } // 生成快递码 String expressCode = ExpressCodeUtil.getExpressCode(goodsDTO.getCompany()); // 生成取件码 @@ -183,11 +178,9 @@ public class UserController { Records records = new Records(); records.setSendUserId(GetIdUtil.getId()); records.setGetUserId(getUser.getId()); - LambdaQueryWrapper
addressLambdaQueryWrapper = new LambdaQueryWrapper<>(); - addressLambdaQueryWrapper.eq(Address::getAddress, goodsDTO.getAddress()); - Address address = addressService.getOne(addressLambdaQueryWrapper); - records.setAddresseeId(address.getId()); + records.setAddressId(address.getId()); records.setGoodsId(goods.getId()); + records.setExpressId(goodsDTO.getExpressId()); recordsService.save(records); Code code = new Code(); code.setClaim(claimCode); @@ -195,4 +188,60 @@ public class UserController { codeService.save(code); return new Result<>(200, "寄件成功", ""); } + + // 用户收件 + @PostMapping("/addressee") + public Result addressee(@Validated @RequestBody @NotNull AddresseeDTO addresseeDTO) { + // 判断是不是自己的快递 + Long goodsId = addresseeDTO.getGoodsId(); + Goods goods = goodsService.getById(goodsId); + if (goods.getGetUserId().compareTo(GetIdUtil.getId()) != 0) { + return new Result<>(401, "签收他人快递请选择代取功能", ""); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("goods_id", goodsId); + Code code = codeService.getOne(queryWrapper); + // 判断取件码是否输入正确 + if (!code.getClaim().equals(addresseeDTO.getClaimCode())) { + return new Result<>(401, "请输入正确的取件码", ""); + } + QueryWrapper recordsQueryWrapper = new QueryWrapper<>(); + recordsQueryWrapper.eq("goods_id", goodsId); + Records records = recordsService.getOne(recordsQueryWrapper); + records.setMark(1); + // 设置取件人 + records.setAddresseeId(GetIdUtil.getId()); + recordsService.updateById(records); + return new Result<>(200, "取件成功", ""); + } + + // 用户代取快递 + @PostMapping("/pickUp") + public Result pickUpExpress(@RequestBody @Validated @NotNull PickUpExpressDTO pickUpExpressDTO) { + // 查询快递原主人信息 + QueryWrapper userQueryWrapper = new QueryWrapper<>(); + userQueryWrapper.eq("user_name", pickUpExpressDTO.getMaster()); + User master = userService.getOne(userQueryWrapper); + if (master == null) { + return new Result<>(404, "该用户不存在", ""); + } + // 查询快递信息 + QueryWrapper goodsQueryWrapper = new QueryWrapper<>(); + goodsQueryWrapper.eq("express_code", pickUpExpressDTO.getExpressCode()); + Goods goods = goodsService.getOne(goodsQueryWrapper); + if (goods == null) { + return new Result<>(404, "快递不存在", ""); + } + // 代取 + QueryWrapper recordsQueryWrapper = new QueryWrapper<>(); + recordsQueryWrapper.eq("goods_id", goods.getId()); + Records records = recordsService.getOne(recordsQueryWrapper); + if(records.getMark() == 1) { + return new Result<>(500, "快递已被签收", ""); + } + records.setMark(1); + records.setAddresseeId(GetIdUtil.getId()); + recordsService.updateById(records); + return new Result<>(200, "代取成功", ""); + } } diff --git a/src/main/java/jty/expressdistributionsystem/entity/Records.java b/src/main/java/jty/expressdistributionsystem/entity/Records.java index dd1107f..d9d20f4 100644 --- a/src/main/java/jty/expressdistributionsystem/entity/Records.java +++ b/src/main/java/jty/expressdistributionsystem/entity/Records.java @@ -33,6 +33,10 @@ public class Records implements Serializable { @NotNull private Long getUserId; + @JsonSerialize(using = ToStringSerializer.class) + @NotNull + private Long expressId; + @TableField("goods_id") @JsonSerialize(using = ToStringSerializer.class) @NotNull @@ -41,6 +45,10 @@ public class Records implements Serializable { @TableField("mark") private Integer mark; + @TableField + @JsonSerialize(using = ToStringSerializer.class) + private Long addressId; + @TableField("addressee_id") @JsonSerialize(using = ToStringSerializer.class) private Long addresseeId; diff --git a/src/main/java/jty/expressdistributionsystem/interceptors/LoginInterceptor.java b/src/main/java/jty/expressdistributionsystem/interceptors/LoginInterceptor.java index 86e27bc..e697551 100644 --- a/src/main/java/jty/expressdistributionsystem/interceptors/LoginInterceptor.java +++ b/src/main/java/jty/expressdistributionsystem/interceptors/LoginInterceptor.java @@ -21,13 +21,13 @@ public class LoginInterceptor implements HandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, @NotNull HttpServletResponse response, @NotNull Object handler) { - // 令牌验证 + // 令牌验证 String token = request.getHeader("Authorization"); try { // 从redis获取相同的token ValueOperations stringStringValueOperations = stringRedisTemplate.opsForValue(); String redisToken = stringStringValueOperations.get(token); - if(redisToken == null){ + if (redisToken == null) { // 说明token失效 throw new RuntimeException(); } From c1766f325978797e5392856035eed850777573da Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Wed, 23 Oct 2024 09:01:43 +0800 Subject: [PATCH 15/43] =?UTF-8?q?=E9=98=B6=E6=AE=B5=E5=9B=9B=EF=BC=9A?= =?UTF-8?q?=E5=BF=AB=E9=80=92=E5=91=98=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdminController.java | 9 +- .../controller/EmployeeController.java | 82 +++++++++++++++++++ .../controller/UserController.java | 4 - 3 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 src/main/java/jty/expressdistributionsystem/controller/EmployeeController.java diff --git a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java index 4d197aa..aa61bd5 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java @@ -10,6 +10,7 @@ import jty.expressdistributionsystem.entity.User; import jty.expressdistributionsystem.service.MessageService; import jty.expressdistributionsystem.service.UserService; import jty.expressdistributionsystem.utils.SendMessageUtil; +import org.jetbrains.annotations.NotNull; import org.springframework.web.bind.annotation.*; @RestController @@ -60,7 +61,13 @@ public class AdminController { // 管理员发送消息 @PostMapping("/sendMessage") - public Result sendMessage(@RequestBody SendMessageDTO sendMessageDTO) { + public Result sendMessage(@RequestBody @NotNull SendMessageDTO sendMessageDTO) { + LambdaQueryWrapper userLambdaQueryWrapper = new LambdaQueryWrapper<>(); + userLambdaQueryWrapper.eq(User::getId, sendMessageDTO.getId()); + User user = userService.getOne(userLambdaQueryWrapper); + if(user == null) { + return new Result<>(404, "用户不存在", ""); + } Message message = SendMessageUtil.sendMessage(sendMessageDTO); messageService.save(message); return new Result<>(200, "发送成功", ""); diff --git a/src/main/java/jty/expressdistributionsystem/controller/EmployeeController.java b/src/main/java/jty/expressdistributionsystem/controller/EmployeeController.java new file mode 100644 index 0000000..c215297 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/controller/EmployeeController.java @@ -0,0 +1,82 @@ +package jty.expressdistributionsystem.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.annotation.Resource; +import jty.expressdistributionsystem.DTO.SendMessageDTO; +import jty.expressdistributionsystem.entity.*; +import jty.expressdistributionsystem.service.GoodsService; +import jty.expressdistributionsystem.service.MessageService; +import jty.expressdistributionsystem.service.RecordsService; +import jty.expressdistributionsystem.service.UserService; +import jty.expressdistributionsystem.utils.GetIdUtil; +import jty.expressdistributionsystem.utils.SendMessageUtil; +import org.jetbrains.annotations.NotNull; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/employee") +public class EmployeeController { + @Resource + private UserService userService; + + @Resource + private RecordsService recordsService; + + @Resource + private GoodsService goodsService; + + @Resource + private MessageService messageService; + + // 查询所有自己派送的快递 + @GetMapping("/express") + public Result> getAllExpress(@RequestParam int page, @RequestParam int pageSize) { + if (page <= 0 || pageSize == 0) { + return new Result<>(400, "页码和每页大小必须大于0", null); + } + Long id = GetIdUtil.getId(); + Page recordsPage = new Page<>(page, pageSize); + LambdaQueryWrapper recordsLambdaQueryWrapper = new LambdaQueryWrapper<>(); + // 添加查询条件 + recordsLambdaQueryWrapper.eq(Records::getExpressId, id); + // 排序条件：先按 mark 对应值排序，然后按时间排序 + recordsLambdaQueryWrapper.orderByDesc(Records::getMark) // mark 值大的排前面 + .orderByDesc(Records::getCreateTime); // 时间新的排前面 + recordsService.page(recordsPage, recordsLambdaQueryWrapper); + return new Result<>(200, "获取成功", recordsPage); + } + + // 查询单件快递信息 + @PostMapping("/expressInfo") + public Result getExpressInfo(@RequestParam Long id) { + LambdaQueryWrapper goodsLambdaQueryWrapper = new LambdaQueryWrapper<>(); + goodsLambdaQueryWrapper.eq(Goods::getId, id); + Goods goods = goodsService.getOne(goodsLambdaQueryWrapper); + if (goods == null) { + return new Result<>(404, "快递不存在", null); + } + LambdaQueryWrapper recordsLambdaQueryWrapper = new LambdaQueryWrapper<>(); + recordsLambdaQueryWrapper.eq(Records::getGoodsId, goods.getId()) + .eq(Records::getExpressId, GetIdUtil.getId()); + Records records = recordsService.getOne(recordsLambdaQueryWrapper); + if (records == null) { + return new Result<>(401, "这不是你派送的快递, 无权查看", null); + } + return new Result<>(200, "", goods); + } + + // 联系用户 + @PostMapping("/sendMessage") + public Result sendMessageToUser(@RequestBody @NotNull SendMessageDTO sendMessageDTO) { + LambdaQueryWrapper userLambdaQueryWrapper = new LambdaQueryWrapper<>(); + userLambdaQueryWrapper.eq(User::getId, sendMessageDTO.getId()); + User user = userService.getOne(userLambdaQueryWrapper); + if (user == null) { + return new Result<>(404, "用户不存在", ""); + } + Message message = SendMessageUtil.sendMessage(sendMessageDTO); + messageService.save(message); + return new Result<>(200, "发送成功", ""); + } +} diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index 610fe90..24fac8f 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -14,7 +14,6 @@ import jty.expressdistributionsystem.utils.ClaimCodeUtil; import jty.expressdistributionsystem.utils.ExpressCodeUtil; import jty.expressdistributionsystem.utils.GetIdUtil; import jty.expressdistributionsystem.utils.SendMessageUtil; -import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -23,7 +22,6 @@ import java.util.List; @RestController @RequestMapping("/user") -@Slf4j public class UserController { @Resource private UserService userService; @@ -67,7 +65,6 @@ public class UserController { return new Result<>(400, "页码和每页大小必须大于0", null); } Long id = GetIdUtil.getId(); - log.info("当前登录用户的id: {}", id); Page messagePage = new Page<>(page, pageSize); LambdaQueryWrapper messageLambdaQueryWrapper = new LambdaQueryWrapper<>(); // 添加查询条件 @@ -86,7 +83,6 @@ public class UserController { return new Result<>(400, "页码和每页大小必须大于0", null); } Long id = GetIdUtil.getId(); - log.info("当前登录用户的id: {}", id); Page messagePage = new Page<>(page, pageSize); LambdaQueryWrapper messageLambdaQueryWrapper = new LambdaQueryWrapper<>(); // 添加查询条件 From 2e3d44d4f9fabde952746c22f206dd7028cb948e Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Thu, 24 Oct 2024 15:03:04 +0800 Subject: [PATCH 16/43] =?UTF-8?q?=E9=98=B6=E6=AE=B5=E5=9B=9B=EF=BC=9A?= =?UTF-8?q?=E5=BF=AB=E9=80=92=E5=91=98=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expressdistributionsystem/DTO/UserLoginByAccountDTO.java | 3 +++ .../expressdistributionsystem/controller/CommonController.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/jty/expressdistributionsystem/DTO/UserLoginByAccountDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/UserLoginByAccountDTO.java index db1e3d2..1a1a6b8 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/UserLoginByAccountDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/UserLoginByAccountDTO.java @@ -13,4 +13,7 @@ public class UserLoginByAccountDTO { @NotBlank(message = "密码不能为空") @Pattern(regexp = "^.+$") private String password; + + @NotBlank(message = "请选择你的登录任务") + private Integer mark; } diff --git a/src/main/java/jty/expressdistributionsystem/controller/CommonController.java b/src/main/java/jty/expressdistributionsystem/controller/CommonController.java index fa60b12..320ade6 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/CommonController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/CommonController.java @@ -67,6 +67,9 @@ public class CommonController { return new Result<>(401, "账号或者密码错误", ""); } User user = optionalUser.get(); + if(userLoginByAccountDTO.getMark() != user.getMark()) { + return new Result<>(401, "请选择正确身份", ""); + } if (user.getDisabled() == 1) { return new Result<>(403, "该账号已被禁用, 请联系管理员", ""); } From b320b3e34ca532a5a7f60e953057ecb79cb01baa Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Thu, 24 Oct 2024 15:13:15 +0800 Subject: [PATCH 17/43] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expressdistributionsystem/controller/CommonController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/jty/expressdistributionsystem/controller/CommonController.java b/src/main/java/jty/expressdistributionsystem/controller/CommonController.java index 320ade6..1f6e86b 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/CommonController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/CommonController.java @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; import java.util.HashMap; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.concurrent.TimeUnit; @@ -67,7 +68,7 @@ public class CommonController { return new Result<>(401, "账号或者密码错误", ""); } User user = optionalUser.get(); - if(userLoginByAccountDTO.getMark() != user.getMark()) { + if(!Objects.equals(userLoginByAccountDTO.getMark(), user.getMark())) { return new Result<>(401, "请选择正确身份", ""); } if (user.getDisabled() == 1) { From ba7d5d8709ded879182a75734973848f4ff121c2 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Thu, 24 Oct 2024 17:01:11 +0800 Subject: [PATCH 18/43] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTO/UserLoginByAccountDTO.java | 7 ++++--- .../expressdistributionsystem/entity/User.java | 8 ++++---- .../interceptors/GlobalExceptionHandler.java | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 src/main/java/jty/expressdistributionsystem/interceptors/GlobalExceptionHandler.java diff --git a/src/main/java/jty/expressdistributionsystem/DTO/UserLoginByAccountDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/UserLoginByAccountDTO.java index 1a1a6b8..2965b55 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/UserLoginByAccountDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/UserLoginByAccountDTO.java @@ -1,19 +1,20 @@ package jty.expressdistributionsystem.DTO; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import lombok.Data; @Data public class UserLoginByAccountDTO { @NotBlank(message = "账号不能为空") - @Pattern(regexp = "^(?!\\s)([A-Za-z0-9]{1,10})$") + @Pattern(regexp = "^(?!\\s)([A-Za-z0-9]{1,10})$", message = "账号长度在1-10位之间") private String account; @NotBlank(message = "密码不能为空") - @Pattern(regexp = "^.+$") + @Pattern(regexp = "^.+$", message = "密码不能为空") private String password; - @NotBlank(message = "请选择你的登录任务") + @NotNull private Integer mark; } diff --git a/src/main/java/jty/expressdistributionsystem/entity/User.java b/src/main/java/jty/expressdistributionsystem/entity/User.java index 1e21d62..f1acc06 100644 --- a/src/main/java/jty/expressdistributionsystem/entity/User.java +++ b/src/main/java/jty/expressdistributionsystem/entity/User.java @@ -30,22 +30,22 @@ public class User implements Serializable { @TableField("account") @NotBlank(message = "账号不能为空") - @Pattern(regexp = "^(?!\\s)([A-Za-z0-9]{1,10})$") + @Pattern(regexp = "^(?!\\s)([A-Za-z0-9]{1,10})$", message = "账号长度在1-10位之间") private String account; @TableField("phone") @NotBlank(message = "手机号不能为空") - @Pattern(regexp = "^1[3-9]\\d{9}$") + @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号有误") private String phone; @TableField("password") @NotBlank(message = "密码不能为空") - @Pattern(regexp = "^.+$") + @Pattern(regexp = "^.+$", message = "密码不能为空") private String password; @TableField("identity") @NotBlank(message = "身份证不能为空") - @Pattern(regexp = "^[1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(1[0-2]))((0[1-9])|([1-2][0-9])|(3[0-1]))\\d{3}(\\d|X|x)$") + @Pattern(regexp = "^[1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(1[0-2]))((0[1-9])|([1-2][0-9])|(3[0-1]))\\d{3}(\\d|X|x)$", message = "身份证有误") private String identity; @TableField("mark") diff --git a/src/main/java/jty/expressdistributionsystem/interceptors/GlobalExceptionHandler.java b/src/main/java/jty/expressdistributionsystem/interceptors/GlobalExceptionHandler.java new file mode 100644 index 0000000..6e55c87 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/interceptors/GlobalExceptionHandler.java @@ -0,0 +1,15 @@ +package jty.expressdistributionsystem.interceptors; + +import jty.expressdistributionsystem.entity.Result; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice +public class GlobalExceptionHandler { + @ExceptionHandler(Exception.class) + public Result handleException(Exception e){ + e.printStackTrace(); + return new Result(500, StringUtils.hasLength(e.getMessage()) ? e.getMessage() : "操作失败", ""); + } +} From de12494bbd11bf6dbd7746df20a6b23320c0b440 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Thu, 24 Oct 2024 22:23:16 +0800 Subject: [PATCH 19/43] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interceptors/GlobalExceptionHandler.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/interceptors/GlobalExceptionHandler.java b/src/main/java/jty/expressdistributionsystem/interceptors/GlobalExceptionHandler.java index 6e55c87..97bf89c 100644 --- a/src/main/java/jty/expressdistributionsystem/interceptors/GlobalExceptionHandler.java +++ b/src/main/java/jty/expressdistributionsystem/interceptors/GlobalExceptionHandler.java @@ -1,15 +1,22 @@ package jty.expressdistributionsystem.interceptors; -import jty.expressdistributionsystem.entity.Result; -import org.springframework.util.StringUtils; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; +import java.util.HashMap; +import java.util.Map; + @RestControllerAdvice public class GlobalExceptionHandler { - @ExceptionHandler(Exception.class) - public Result handleException(Exception e){ - e.printStackTrace(); - return new Result(500, StringUtils.hasLength(e.getMessage()) ? e.getMessage() : "操作失败", ""); + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity> handleValidationExceptions(MethodArgumentNotValidException ex) { + Map errors = new HashMap<>(); + ex.getBindingResult().getFieldErrors().forEach(error -> + errors.put(error.getField(), error.getDefaultMessage()) + ); + return new ResponseEntity<>(errors, HttpStatus.BAD_REQUEST); } } From 8e1250df1227d995a213d2a00662f184493b2221 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Fri, 1 Nov 2024 16:15:59 +0800 Subject: [PATCH 20/43] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdminController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java index aa61bd5..41bde0c 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java @@ -10,11 +10,13 @@ import jty.expressdistributionsystem.entity.User; import jty.expressdistributionsystem.service.MessageService; import jty.expressdistributionsystem.service.UserService; import jty.expressdistributionsystem.utils.SendMessageUtil; +import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/admin") +@Slf4j public class AdminController { @Resource private UserService userService; @@ -42,8 +44,11 @@ public class AdminController { // 拉黑删除快递员或者用户 @DeleteMapping("/delete/{id}") - public Result delete(@PathVariable Long id, @RequestParam String operation) { + public Result delete(@PathVariable Long id, @RequestParam @NotNull String operation) { User user = userService.getById(id); + if(user == null) { + return new Result<>(401, "账号不存在", ""); + } switch (operation) { // 禁用 case "0" -> user.setDisabled(1); @@ -51,7 +56,7 @@ public class AdminController { case "1" -> user.setDisabled(0); // 直接删除 case "2" -> { - userService.removeById(id); + userService.removeById(user.getId()); return new Result<>(200, "删除成功", ""); } } From 53aa97a461ab5d0e09006aefac088f086ea7db36 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Mon, 4 Nov 2024 17:02:09 +0800 Subject: [PATCH 21/43] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jty/expressdistributionsystem/DTO/UserModifyInfoDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/jty/expressdistributionsystem/DTO/UserModifyInfoDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/UserModifyInfoDTO.java index e83769c..e03fc0a 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/UserModifyInfoDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/UserModifyInfoDTO.java @@ -10,6 +10,6 @@ public class UserModifyInfoDTO { private String userName; @NotBlank(message = "手机号不能为空") - @Pattern(regexp = "^1[3-9]\\d{9}$") + @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号不存在") private String phone; } From 31ba23d47f6a0064f33ec9050607ae52422b3b8e Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Tue, 5 Nov 2024 12:06:39 +0800 Subject: [PATCH 22/43] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTO/UserModifyPasswordDTO.java | 9 +++++---- .../controller/CommonController.java | 8 +++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/DTO/UserModifyPasswordDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/UserModifyPasswordDTO.java index 77dc6ee..284b49d 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/UserModifyPasswordDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/UserModifyPasswordDTO.java @@ -7,18 +7,19 @@ import lombok.Data; @Data public class UserModifyPasswordDTO { @NotBlank(message = "旧密码不能为空") - @Pattern(regexp = "^.+$") + @Pattern(regexp = "^.+$", message = "旧密码不能为空") private String oldPassword; @NotBlank(message = "新密码不能为空") - @Pattern(regexp = "^.+$") + @Pattern(regexp = "^.+$", message = "新密码不能为空") private String newPassword; @NotBlank(message = "再次输入的密码不能为空") - @Pattern(regexp = "^.+$") + @Pattern(regexp = "^.+$", message = "再次输入的密码不能为空") private String reNewPassword; @NotBlank(message = "身份证不能为空") - @Pattern(regexp = "^[1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(1[0-2]))((0[1-9])|([1-2][0-9])|(3[0-1]))\\d{3}(\\d|X|x)$") + @Pattern(regexp = "^[1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(1[0-2]))((0[1-9])|([1-2][0-9])|(3[0-1]))\\d{3}(\\d|X|x)$", + message = "身份证格式不正确") private String identity; } diff --git a/src/main/java/jty/expressdistributionsystem/controller/CommonController.java b/src/main/java/jty/expressdistributionsystem/controller/CommonController.java index 1f6e86b..1ff7f94 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/CommonController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/CommonController.java @@ -68,7 +68,7 @@ public class CommonController { return new Result<>(401, "账号或者密码错误", ""); } User user = optionalUser.get(); - if(!Objects.equals(userLoginByAccountDTO.getMark(), user.getMark())) { + if (!Objects.equals(userLoginByAccountDTO.getMark(), user.getMark())) { return new Result<>(401, "请选择正确身份", ""); } if (user.getDisabled() == 1) { @@ -125,8 +125,8 @@ public class CommonController { // 修改个人密码 @PutMapping("/rePassword") - public Result modifyPassword(@RequestHeader("Authorization") String token, - @RequestBody @Validated @NotNull UserModifyPasswordDTO userModifyPasswordDTO) { + public Result modifyPassword( + @RequestBody @Validated @NotNull UserModifyPasswordDTO userModifyPasswordDTO) { // 判断密码 if (userModifyPasswordDTO.getOldPassword().equals(userModifyPasswordDTO.getNewPassword())) { return new Result<>(409, "新密码不得和旧密码一致", ""); @@ -142,8 +142,6 @@ public class CommonController { user.setPassword(Md5Util.getMD5String(userModifyPasswordDTO.getNewPassword())); user.setUpdateTime(null); userService.updateById(user); - // 删除redis当中的token - stringRedisTemplate.delete(token); // 删除当前线程的存储信息 ThreadLocalUtil.remove(); return new Result<>(200, "密码修改成功, 请重新登陆", ""); From 90cfec7d93e1274f88272f60299f68883a5d61d4 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Tue, 5 Nov 2024 12:54:08 +0800 Subject: [PATCH 23/43] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=89=80=E6=9C=89=E5=BF=AB=E9=80=92=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTO/ExpressListDTO.java | 16 +++++++++ .../controller/AdminController.java | 34 +++++++++++++++++-- 2 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 src/main/java/jty/expressdistributionsystem/DTO/ExpressListDTO.java diff --git a/src/main/java/jty/expressdistributionsystem/DTO/ExpressListDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/ExpressListDTO.java new file mode 100644 index 0000000..5994afb --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/DTO/ExpressListDTO.java @@ -0,0 +1,16 @@ +package jty.expressdistributionsystem.DTO; + +import jty.expressdistributionsystem.entity.Goods; +import jty.expressdistributionsystem.entity.Records; +import lombok.Data; + +@Data +public class ExpressListDTO { + private Records records; + private Goods goods; + + public ExpressListDTO(Records records, Goods goods) { + this.records = records; + this.goods = goods; + } +} diff --git a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java index 41bde0c..1706092 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java @@ -3,17 +3,22 @@ package jty.expressdistributionsystem.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; +import jty.expressdistributionsystem.DTO.ExpressListDTO; import jty.expressdistributionsystem.DTO.SendMessageDTO; -import jty.expressdistributionsystem.entity.Message; -import jty.expressdistributionsystem.entity.Result; -import jty.expressdistributionsystem.entity.User; +import jty.expressdistributionsystem.entity.*; +import jty.expressdistributionsystem.service.GoodsService; import jty.expressdistributionsystem.service.MessageService; +import jty.expressdistributionsystem.service.RecordsService; import jty.expressdistributionsystem.service.UserService; import jty.expressdistributionsystem.utils.SendMessageUtil; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; +import org.springframework.data.domain.PageImpl; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.List; + @RestController @RequestMapping("/admin") @Slf4j @@ -24,6 +29,12 @@ public class AdminController { @Resource private MessageService messageService; + @Resource + private RecordsService recordsService; + + @Resource + private GoodsService goodsService; + // 管理员查看用户或者快递员信息 @GetMapping("/infoList") public Result> getUserList(@RequestParam int page, @RequestParam int pageSize, @RequestParam int mark) { @@ -77,4 +88,21 @@ public class AdminController { messageService.save(message); return new Result<>(200, "发送成功", ""); } + + // 管理员获取所有快递信息 + @GetMapping("/express") + public Result> getAllExpress(@RequestParam int page, @RequestParam int pageSize) { + Page recordsPage = new Page<>(page, pageSize); + recordsService.page(recordsPage); + List expressListDTOList = new ArrayList<>(); + // 获取所有的快递记录 + List recordsList = recordsService.list(); + for(Records records : recordsList) { + Goods goods = goodsService.getById(records.getGoodsId()); + expressListDTOList.add(new ExpressListDTO(records, goods)); + } + Page expressDTOPage = new Page<>(recordsPage.getCurrent(), recordsPage.getSize(), recordsPage.getTotal()); + expressDTOPage.setRecords(expressListDTOList); + return new Result<>(200, "", expressDTOPage); + } } From 59db8631951af1a98f5314c1276fe6d9591bb582 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Wed, 6 Nov 2024 15:13:45 +0800 Subject: [PATCH 24/43] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTO/ExpressListDTO.java | 14 +++++++++++++- .../controller/AdminController.java | 19 +++++++++++++------ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/DTO/ExpressListDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/ExpressListDTO.java index 5994afb..d9205f6 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/ExpressListDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/ExpressListDTO.java @@ -1,16 +1,28 @@ package jty.expressdistributionsystem.DTO; +import jty.expressdistributionsystem.entity.Address; import jty.expressdistributionsystem.entity.Goods; import jty.expressdistributionsystem.entity.Records; +import jty.expressdistributionsystem.entity.User; import lombok.Data; @Data public class ExpressListDTO { private Records records; private Goods goods; + private User sender; // 寄件人 + private User recipient; // 收件人 + private User addressee; // 签收者 + private User courier; // 派送的快递员 + private Address address; // 送到哪里 - public ExpressListDTO(Records records, Goods goods) { + public ExpressListDTO(Records records, Goods goods, User sender, User recipient, User addressee, User courier, Address address) { this.records = records; this.goods = goods; + this.sender = sender; + this.recipient = recipient; + this.addressee = addressee; + this.courier = courier; + this.address = address; } } diff --git a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java index 1706092..c7f08f7 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java @@ -6,14 +6,10 @@ import jakarta.annotation.Resource; import jty.expressdistributionsystem.DTO.ExpressListDTO; import jty.expressdistributionsystem.DTO.SendMessageDTO; import jty.expressdistributionsystem.entity.*; -import jty.expressdistributionsystem.service.GoodsService; -import jty.expressdistributionsystem.service.MessageService; -import jty.expressdistributionsystem.service.RecordsService; -import jty.expressdistributionsystem.service.UserService; +import jty.expressdistributionsystem.service.*; import jty.expressdistributionsystem.utils.SendMessageUtil; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; -import org.springframework.data.domain.PageImpl; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -35,6 +31,9 @@ public class AdminController { @Resource private GoodsService goodsService; + @Resource + private AddressService addressService; + // 管理员查看用户或者快递员信息 @GetMapping("/infoList") public Result> getUserList(@RequestParam int page, @RequestParam int pageSize, @RequestParam int mark) { @@ -99,7 +98,15 @@ public class AdminController { List recordsList = recordsService.list(); for(Records records : recordsList) { Goods goods = goodsService.getById(records.getGoodsId()); - expressListDTOList.add(new ExpressListDTO(records, goods)); + // 查询寄件人、收件人、签收者、快递员信息 + User sender = userService.getById(records.getSendUserId()); + User recipient = userService.getById(records.getGetUserId()); + User addressee = userService.getById(records.getAddresseeId()); + User courier = userService.getById(records.getExpressId()); + // 查询地址信息 + Address address = addressService.getById(records.getAddressId()); + ExpressListDTO expressListDTO = new ExpressListDTO(records, goods, sender, recipient, addressee, courier, address); + expressListDTOList.add(expressListDTO); } Page expressDTOPage = new Page<>(recordsPage.getCurrent(), recordsPage.getSize(), recordsPage.getTotal()); expressDTOPage.setRecords(expressListDTOList); From c97c4a15db2d48f46cf74e7da30760d79d302bf8 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Thu, 7 Nov 2024 14:02:46 +0800 Subject: [PATCH 25/43] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expressdistributionsystem/DTO/SendMessageDTO.java | 4 +++- .../controller/AdminController.java | 10 ++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java index efc673d..690db4b 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java @@ -4,8 +4,10 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; +import java.io.Serializable; + @Data -public class SendMessageDTO { +public class SendMessageDTO implements Serializable { @JsonSerialize(using = ToStringSerializer.class) private Long Id; diff --git a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java index c7f08f7..6b18fd5 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java @@ -56,7 +56,7 @@ public class AdminController { @DeleteMapping("/delete/{id}") public Result delete(@PathVariable Long id, @RequestParam @NotNull String operation) { User user = userService.getById(id); - if(user == null) { + if (user == null) { return new Result<>(401, "账号不存在", ""); } switch (operation) { @@ -77,12 +77,6 @@ public class AdminController { // 管理员发送消息 @PostMapping("/sendMessage") public Result sendMessage(@RequestBody @NotNull SendMessageDTO sendMessageDTO) { - LambdaQueryWrapper userLambdaQueryWrapper = new LambdaQueryWrapper<>(); - userLambdaQueryWrapper.eq(User::getId, sendMessageDTO.getId()); - User user = userService.getOne(userLambdaQueryWrapper); - if(user == null) { - return new Result<>(404, "用户不存在", ""); - } Message message = SendMessageUtil.sendMessage(sendMessageDTO); messageService.save(message); return new Result<>(200, "发送成功", ""); @@ -96,7 +90,7 @@ public class AdminController { List expressListDTOList = new ArrayList<>(); // 获取所有的快递记录 List recordsList = recordsService.list(); - for(Records records : recordsList) { + for (Records records : recordsList) { Goods goods = goodsService.getById(records.getGoodsId()); // 查询寄件人、收件人、签收者、快递员信息 User sender = userService.getById(records.getSendUserId()); From 7dd2f481ac44fd058f0f175503c9f60a7cb3fbd2 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Thu, 7 Nov 2024 16:05:12 +0800 Subject: [PATCH 26/43] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=AD=A3=E5=9C=A8=E7=95=99=E8=A8=80=E7=9A=84=E4=BA=BA?= =?UTF-8?q?=E7=9A=84=E6=89=80=E6=9C=89=E8=81=8A=E5=A4=A9=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdminController.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java index 6b18fd5..51b7f85 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java @@ -7,7 +7,9 @@ import jty.expressdistributionsystem.DTO.ExpressListDTO; import jty.expressdistributionsystem.DTO.SendMessageDTO; import jty.expressdistributionsystem.entity.*; import jty.expressdistributionsystem.service.*; +import jty.expressdistributionsystem.utils.GetIdUtil; import jty.expressdistributionsystem.utils.SendMessageUtil; +import jty.expressdistributionsystem.utils.ThreadLocalUtil; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.web.bind.annotation.*; @@ -82,6 +84,24 @@ public class AdminController { return new Result<>(200, "发送成功", ""); } + // 获取正在留言的人的所有聊天记录 + @GetMapping("/allMessage") + public Result>> getAllMessage(@RequestParam Long toId) { + Long meId = GetIdUtil.getId(); + LambdaQueryWrapper messageLambdaQueryWrapper = new LambdaQueryWrapper<>(); + List> list = new ArrayList<>(); + // 先获取自己发给那个人的 + messageLambdaQueryWrapper.eq(Message::getSendUserId, meId) + .eq(Message::getGetUserId, toId); + list.add(messageService.list(messageLambdaQueryWrapper)); + // 再获取别人发给自己的 + messageLambdaQueryWrapper.clear(); + messageLambdaQueryWrapper.eq(Message::getGetUserId, meId) + .eq(Message::getSendUserId, toId); + list.add(messageService.list(messageLambdaQueryWrapper)); + return new Result<>(200, "", list); + } + // 管理员获取所有快递信息 @GetMapping("/express") public Result> getAllExpress(@RequestParam int page, @RequestParam int pageSize) { From 3b1fb1aa13f3f9daad7518625a0469c8df18644a Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Fri, 8 Nov 2024 15:36:25 +0800 Subject: [PATCH 27/43] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=85=A8=E9=83=A8=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jty/expressdistributionsystem/DTO/SendMessageDTO.java | 4 ++++ .../expressdistributionsystem/controller/AdminController.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java index 690db4b..b828540 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java @@ -2,6 +2,8 @@ package jty.expressdistributionsystem.DTO; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import java.io.Serializable; @@ -9,7 +11,9 @@ import java.io.Serializable; @Data public class SendMessageDTO implements Serializable { @JsonSerialize(using = ToStringSerializer.class) + @NotNull(message = "请选择你的聊天对象") private Long Id; + @NotBlank(message = "消息不能为空") private String content; } diff --git a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java index 51b7f85..2d1b019 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java @@ -12,6 +12,7 @@ import jty.expressdistributionsystem.utils.SendMessageUtil; import jty.expressdistributionsystem.utils.ThreadLocalUtil; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -78,7 +79,7 @@ public class AdminController { // 管理员发送消息 @PostMapping("/sendMessage") - public Result sendMessage(@RequestBody @NotNull SendMessageDTO sendMessageDTO) { + public Result sendMessage(@RequestBody @Validated SendMessageDTO sendMessageDTO) { Message message = SendMessageUtil.sendMessage(sendMessageDTO); messageService.save(message); return new Result<>(200, "发送成功", ""); From d3382cda09e752635a1a2913f50d22c99ab7a829 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Mon, 11 Nov 2024 16:28:54 +0800 Subject: [PATCH 28/43] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E5=BF=AB=E9=80=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdminController.java | 10 ++++---- .../controller/CommonController.java | 6 ++--- .../controller/UserController.java | 24 ++++++++++++++++++- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java index 2d1b019..ea969cd 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java @@ -37,7 +37,7 @@ public class AdminController { @Resource private AddressService addressService; - // 管理员查看用户或者快递员信息 + // 管理员查看用户或者快递员信息(finish) @GetMapping("/infoList") public Result> getUserList(@RequestParam int page, @RequestParam int pageSize, @RequestParam int mark) { if (page <= 0 || pageSize <= 0) { @@ -55,7 +55,7 @@ public class AdminController { return new Result<>(200, "", pageInfo); } - // 拉黑删除快递员或者用户 + // 拉黑删除快递员或者用户(finish) @DeleteMapping("/delete/{id}") public Result delete(@PathVariable Long id, @RequestParam @NotNull String operation) { User user = userService.getById(id); @@ -77,7 +77,7 @@ public class AdminController { return new Result<>(200, "操作成功", ""); } - // 管理员发送消息 + // 管理员发送消息(finish) @PostMapping("/sendMessage") public Result sendMessage(@RequestBody @Validated SendMessageDTO sendMessageDTO) { Message message = SendMessageUtil.sendMessage(sendMessageDTO); @@ -85,7 +85,7 @@ public class AdminController { return new Result<>(200, "发送成功", ""); } - // 获取正在留言的人的所有聊天记录 + // 获取正在留言的人的所有聊天记录(finish) @GetMapping("/allMessage") public Result>> getAllMessage(@RequestParam Long toId) { Long meId = GetIdUtil.getId(); @@ -103,7 +103,7 @@ public class AdminController { return new Result<>(200, "", list); } - // 管理员获取所有快递信息 + // 管理员获取所有快递信息(finish) @GetMapping("/express") public Result> getAllExpress(@RequestParam int page, @RequestParam int pageSize) { Page recordsPage = new Page<>(page, pageSize); diff --git a/src/main/java/jty/expressdistributionsystem/controller/CommonController.java b/src/main/java/jty/expressdistributionsystem/controller/CommonController.java index 1ff7f94..824b167 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/CommonController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/CommonController.java @@ -37,7 +37,7 @@ public class CommonController { @Resource private StringRedisTemplate stringRedisTemplate; - // 注册 + // 注册(finish) @PostMapping("/register") public Result register(@RequestBody @Validated @NotNull User user) { // 查找用户是否存在 @@ -58,7 +58,7 @@ public class CommonController { return new Result<>(200, "注册成功", ""); } - // 通过账号登录 + // 通过账号登录(finish) @PostMapping("/loginByAccount") public Result login(@RequestBody @Validated @NotNull UserLoginByAccountDTO userLoginByAccountDTO) { // 查询用户是否存在 @@ -147,7 +147,7 @@ public class CommonController { return new Result<>(200, "密码修改成功, 请重新登陆", ""); } - // 获取个人信息 + // 获取个人信息(finish) @GetMapping("/info") public Result getInfo() { Long id = GetIdUtil.getId(); diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index 24fac8f..0446a9e 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -19,6 +19,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Objects; @RestController @RequestMapping("/user") @@ -232,7 +233,7 @@ public class UserController { QueryWrapper recordsQueryWrapper = new QueryWrapper<>(); recordsQueryWrapper.eq("goods_id", goods.getId()); Records records = recordsService.getOne(recordsQueryWrapper); - if(records.getMark() == 1) { + if (records.getMark() == 1) { return new Result<>(500, "快递已被签收", ""); } records.setMark(1); @@ -240,4 +241,25 @@ public class UserController { recordsService.updateById(records); return new Result<>(200, "代取成功", ""); } + + // 用户查询快递 + @GetMapping("/query") + public Result queryGoods(@RequestParam Long queryCode, @RequestParam Long queryId) { + Long id = GetIdUtil.getId(); + LambdaQueryWrapper goodsLambdaQueryWrapper = new LambdaQueryWrapper<>(); + if (Objects.equals(id, queryId)) { + goodsLambdaQueryWrapper.eq(Goods::getExpressCode, queryCode); + Goods goods = goodsService.getOne(goodsLambdaQueryWrapper); + return new Result<>(200, "查询成功", goods); + } else { + goodsLambdaQueryWrapper.eq(Goods::getExpressCode, queryCode) + .eq(Goods::getGetUserId, queryId); + Goods goods = goodsService.getOne(goodsLambdaQueryWrapper); + if (goods == null) { + return new Result<>(404, "请输入正确的快递单号, 或您不是快递的收件人或者邮寄人", null); + } else { + return new Result<>(200, "查询成功", goods); + } + } + } } From 8a149c54b6e54ec2fb0253a0bc12c340fd57780a Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Mon, 11 Nov 2024 18:46:58 +0800 Subject: [PATCH 29/43] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserController.java | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index 0446a9e..5955264 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; +import jakarta.validation.constraints.NotBlank; import jty.expressdistributionsystem.DTO.AddresseeDTO; import jty.expressdistributionsystem.DTO.GoodsDTO; import jty.expressdistributionsystem.DTO.PickUpExpressDTO; @@ -242,9 +243,12 @@ public class UserController { return new Result<>(200, "代取成功", ""); } - // 用户查询快递 + // 用户查询快递(完成) @GetMapping("/query") - public Result queryGoods(@RequestParam Long queryCode, @RequestParam Long queryId) { + public Result queryGoods(@RequestParam String queryCode, @RequestParam Long queryId) { + if (queryCode.isEmpty()) { + return new Result<>(400, "查询失败", null); + } Long id = GetIdUtil.getId(); LambdaQueryWrapper goodsLambdaQueryWrapper = new LambdaQueryWrapper<>(); if (Objects.equals(id, queryId)) { @@ -262,4 +266,20 @@ public class UserController { } } } + + // 用户查询用户信息(完成) + @GetMapping("/queryInfo") + public Result queryInfo(@RequestParam Long otherId) { + User user = userService.getById(otherId); + return new Result<>(200, "", user.getUserName()); + } + + // 用户获取单个快递历史记录(完成) + @GetMapping("/singleHistory") + public Result singleHistory(@RequestParam String goodsId) { + LambdaQueryWrapper recordsLambdaQueryWrapper = new LambdaQueryWrapper<>(); + recordsLambdaQueryWrapper.eq(Records::getGoodsId, goodsId); + Records records = recordsService.getOne(recordsLambdaQueryWrapper); + return new Result<>(200, "", records); + } } From 9ef8ec7a6b16a12f19aa189c03aaaf217d7a56ee Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Tue, 12 Nov 2024 12:45:07 +0800 Subject: [PATCH 30/43] =?UTF-8?q?=E7=9C=9F=E5=AF=B9=E5=AF=84=E4=BB=B6?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expressdistributionsystem/DTO/ExpressListDTO.java | 8 +++++--- .../java/jty/expressdistributionsystem/DTO/GoodsDTO.java | 5 ++++- .../controller/AdminController.java | 7 ++++--- .../controller/UserController.java | 2 +- .../jty/expressdistributionsystem/entity/Records.java | 9 ++++++++- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/DTO/ExpressListDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/ExpressListDTO.java index d9205f6..9d5e721 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/ExpressListDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/ExpressListDTO.java @@ -14,15 +14,17 @@ public class ExpressListDTO { private User recipient; // 收件人 private User addressee; // 签收者 private User courier; // 派送的快递员 - private Address address; // 送到哪里 + private Address addressFrom; // 从哪里送的 + private Address addressTo; // 送到哪里 - public ExpressListDTO(Records records, Goods goods, User sender, User recipient, User addressee, User courier, Address address) { + public ExpressListDTO(Records records, Goods goods, User sender, User recipient, User addressee, User courier, Address addressFrom, Address addressTo) { this.records = records; this.goods = goods; this.sender = sender; this.recipient = recipient; this.addressee = addressee; this.courier = courier; - this.address = address; + this.addressFrom = addressFrom; + this.addressTo = addressTo; } } diff --git a/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java index 08b4773..f33fb46 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java @@ -20,8 +20,11 @@ public class GoodsDTO { @NotBlank(message = "快递重量不能为空") private String quality; + @NotBlank(message = "发货地不能为空") + private String addressFrom; + @NotBlank(message = "运送地址不能为空") - private String address; + private String addressTo; @JsonSerialize(using = ToStringSerializer.class) @NotNull diff --git a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java index ea969cd..a69c40e 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java @@ -118,9 +118,10 @@ public class AdminController { User recipient = userService.getById(records.getGetUserId()); User addressee = userService.getById(records.getAddresseeId()); User courier = userService.getById(records.getExpressId()); - // 查询地址信息 - Address address = addressService.getById(records.getAddressId()); - ExpressListDTO expressListDTO = new ExpressListDTO(records, goods, sender, recipient, addressee, courier, address); + // 查询地址信息: 从哪里送的 送到哪里 + Address addressTo = addressService.getById(records.getAddressId()); + Address addressFrom = addressService.getById(records.getAddressFrom()); + ExpressListDTO expressListDTO = new ExpressListDTO(records, goods, sender, recipient, addressee, courier, addressFrom, addressTo); expressListDTOList.add(expressListDTO); } Page expressDTOPage = new Page<>(recordsPage.getCurrent(), recordsPage.getSize(), recordsPage.getTotal()); diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index 5955264..f85a720 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -156,7 +156,7 @@ public class UserController { } // 判断地址是否存在 LambdaQueryWrapper
addressLambdaQueryWrapper = new LambdaQueryWrapper<>(); - addressLambdaQueryWrapper.eq(Address::getAddress, goodsDTO.getAddress()); + addressLambdaQueryWrapper.eq(Address::getAddress, goodsDTO.getAddressTo()); Address address = addressService.getOne(addressLambdaQueryWrapper); if (address == null) { return new Result<>(404, "地址不存在", null); diff --git a/src/main/java/jty/expressdistributionsystem/entity/Records.java b/src/main/java/jty/expressdistributionsystem/entity/Records.java index d9d20f4..3a12b19 100644 --- a/src/main/java/jty/expressdistributionsystem/entity/Records.java +++ b/src/main/java/jty/expressdistributionsystem/entity/Records.java @@ -33,6 +33,7 @@ public class Records implements Serializable { @NotNull private Long getUserId; + @TableField("express_id") @JsonSerialize(using = ToStringSerializer.class) @NotNull private Long expressId; @@ -45,7 +46,13 @@ public class Records implements Serializable { @TableField("mark") private Integer mark; - @TableField + // 从哪里送的 + @TableField("address_from") + @JsonSerialize(using = ToStringSerializer.class) + private Long addressFrom; + + // 送到哪里 + @TableField("address_id") @JsonSerialize(using = ToStringSerializer.class) private Long addressId; From cf59446afca6b8ab6d1d746539f191b01e0f2ab1 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Tue, 12 Nov 2024 13:06:24 +0800 Subject: [PATCH 31/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E9=87=8D?= =?UTF-8?q?=E9=87=8F=E8=87=AA=E5=AE=9A=E4=B9=89=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTO/GoodsDTO.java | 4 +++- .../entity/Goods.java | 4 +++- .../validation/QualityValidator.java | 13 ++++++++++++ .../validation/inter/ValidQuality.java | 21 +++++++++++++++++++ 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 src/main/java/jty/expressdistributionsystem/validation/QualityValidator.java create mode 100644 src/main/java/jty/expressdistributionsystem/validation/inter/ValidQuality.java diff --git a/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java index f33fb46..69fb69b 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; +import jty.expressdistributionsystem.validation.inter.ValidQuality; import lombok.Data; @Data @@ -18,7 +19,8 @@ public class GoodsDTO { private String name; @NotBlank(message = "快递重量不能为空") - private String quality; + @ValidQuality + private Double quality; @NotBlank(message = "发货地不能为空") private String addressFrom; diff --git a/src/main/java/jty/expressdistributionsystem/entity/Goods.java b/src/main/java/jty/expressdistributionsystem/entity/Goods.java index 512bda3..310e125 100644 --- a/src/main/java/jty/expressdistributionsystem/entity/Goods.java +++ b/src/main/java/jty/expressdistributionsystem/entity/Goods.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; +import jty.expressdistributionsystem.validation.inter.ValidQuality; import lombok.Data; import java.io.Serial; @@ -42,5 +43,6 @@ public class Goods implements Serializable { @TableField("quality") @NotBlank(message = "快递重量不能为空") - private String quality; + @ValidQuality + private Double quality; } diff --git a/src/main/java/jty/expressdistributionsystem/validation/QualityValidator.java b/src/main/java/jty/expressdistributionsystem/validation/QualityValidator.java new file mode 100644 index 0000000..3cbcd38 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/validation/QualityValidator.java @@ -0,0 +1,13 @@ +package jty.expressdistributionsystem.validation; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jty.expressdistributionsystem.validation.inter.ValidQuality; + +public class QualityValidator implements ConstraintValidator { + + @Override + public boolean isValid(Double value, ConstraintValidatorContext context) { + return value != null && value > 0; // 确保数值不为null且大于0 + } +} diff --git a/src/main/java/jty/expressdistributionsystem/validation/inter/ValidQuality.java b/src/main/java/jty/expressdistributionsystem/validation/inter/ValidQuality.java new file mode 100644 index 0000000..a462101 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/validation/inter/ValidQuality.java @@ -0,0 +1,21 @@ +package jty.expressdistributionsystem.validation.inter; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import jty.expressdistributionsystem.validation.QualityValidator; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Constraint(validatedBy = QualityValidator.class) // 指定验证器 +@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.PARAMETER }) +@Retention(RetentionPolicy.RUNTIME) +public @interface ValidQuality { + String message() default "快递重量必须大于0"; + + Class[] groups() default {}; + + Class[] payload() default {}; +} From ce7718f68c5a0bb174417aa48c661e10fb33afd8 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Tue, 12 Nov 2024 13:12:32 +0800 Subject: [PATCH 32/43] =?UTF-8?q?=E5=AF=84=E4=BB=B6=E5=92=8C=E6=94=B6?= =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E8=83=BD=E6=98=AF=E5=90=8C=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=9C=B0=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expressdistributionsystem/controller/UserController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index f85a720..6ee55b8 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -161,6 +161,10 @@ public class UserController { if (address == null) { return new Result<>(404, "地址不存在", null); } + // 如果寄件和收件是一个地方，禁止 + if(goodsDTO.getAddressFrom().equals(goodsDTO.getAddressTo())) { + return new Result<>(400, "寄件和收件不能是同一个地方", null); + } // 生成快递码 String expressCode = ExpressCodeUtil.getExpressCode(goodsDTO.getCompany()); // 生成取件码 From 42b288d23c17810f0a64dd4ac747f9d1d87ce3a9 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Wed, 13 Nov 2024 15:58:30 +0800 Subject: [PATCH 33/43] =?UTF-8?q?=E5=AF=84=E4=BB=B6=E5=92=8C=E6=94=B6?= =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E8=83=BD=E6=98=AF=E5=90=8C=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=9C=B0=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTO/GoodsDTO.java | 4 ---- .../controller/UserController.java | 22 ++++++++++++------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java index 69fb69b..5f892d5 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java @@ -27,8 +27,4 @@ public class GoodsDTO { @NotBlank(message = "运送地址不能为空") private String addressTo; - - @JsonSerialize(using = ToStringSerializer.class) - @NotNull - private Long expressId; } diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index 6ee55b8..4205aaa 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; -import jakarta.validation.constraints.NotBlank; import jty.expressdistributionsystem.DTO.AddresseeDTO; import jty.expressdistributionsystem.DTO.GoodsDTO; import jty.expressdistributionsystem.DTO.PickUpExpressDTO; @@ -19,6 +18,7 @@ import org.jetbrains.annotations.NotNull; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Collections; import java.util.List; import java.util.Objects; @@ -105,9 +105,9 @@ public class UserController { return new Result<>(200, "消息查看成功", ""); } - // 用户新建快递地址 + // 用户新建快递地址(finish) @PostMapping("/addAddress") - public Result addAddress(@RequestBody @NotNull Address address) { + public Result addAddress(@RequestBody @Validated Address address) { // 查询快递地址是否已经存在 LambdaQueryWrapper
addressLambdaQueryWrapper = new LambdaQueryWrapper<>(); addressLambdaQueryWrapper.eq(Address::getAddress, address.getAddress()); @@ -119,11 +119,11 @@ public class UserController { return new Result<>(200, "地址创建成功", ""); } - // 用户获取自己写过的地址 + // 用户获取自己写过的地址(finish) @GetMapping("/getAddress") - public Result> listAddress() { + public Result> listAddress(@RequestParam Long id) { LambdaQueryWrapper
addressLambdaQueryWrapper = new LambdaQueryWrapper<>(); - addressLambdaQueryWrapper.eq(Address::getUserId, GetIdUtil.getId()) + addressLambdaQueryWrapper.eq(Address::getUserId, id) .orderByDesc(Address::getAddress); List
list = addressService.list(addressLambdaQueryWrapper); return new Result<>(200, "", list); @@ -154,6 +154,7 @@ public class UserController { if (getUser == null) { return new Result<>(404, "用户不存在", null); } + userLambdaQueryWrapper.clear(); // 判断地址是否存在 LambdaQueryWrapper
addressLambdaQueryWrapper = new LambdaQueryWrapper<>(); addressLambdaQueryWrapper.eq(Address::getAddress, goodsDTO.getAddressTo()); @@ -162,7 +163,7 @@ public class UserController { return new Result<>(404, "地址不存在", null); } // 如果寄件和收件是一个地方，禁止 - if(goodsDTO.getAddressFrom().equals(goodsDTO.getAddressTo())) { + if (goodsDTO.getAddressFrom().equals(goodsDTO.getAddressTo())) { return new Result<>(400, "寄件和收件不能是同一个地方", null); } // 生成快递码 @@ -182,7 +183,12 @@ public class UserController { records.setGetUserId(getUser.getId()); records.setAddressId(address.getId()); records.setGoodsId(goods.getId()); - records.setExpressId(goodsDTO.getExpressId()); + // 系统自动分配快递员 + userLambdaQueryWrapper.eq(User::getMark, 1); + List list = userService.list(userLambdaQueryWrapper); + Collections.shuffle(list); + User user = list.get(0); + records.setExpressId(user.getId()); recordsService.save(records); Code code = new Code(); code.setClaim(claimCode); From 754d59c9b4537d94cdc7a740aacfc5f47206e63a Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Wed, 13 Nov 2024 16:33:44 +0800 Subject: [PATCH 34/43] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jty/expressdistributionsystem/DTO/GoodsDTO.java | 7 +++++-- .../controller/UserController.java | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java index 5f892d5..a520f8d 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/GoodsDTO.java @@ -18,13 +18,16 @@ public class GoodsDTO { @NotBlank(message = "快递名称不能为空") private String name; - @NotBlank(message = "快递重量不能为空") + /** + * 此处不能使用 @NotBlank + * NotBlank是用于字符串类型的 + */ @ValidQuality private Double quality; @NotBlank(message = "发货地不能为空") private String addressFrom; - @NotBlank(message = "运送地址不能为空") + @NotBlank(message = "收件地址不能为空") private String addressTo; } diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index 4205aaa..6af7f2b 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -162,6 +162,7 @@ public class UserController { if (address == null) { return new Result<>(404, "地址不存在", null); } + addressLambdaQueryWrapper.clear(); // 如果寄件和收件是一个地方，禁止 if (goodsDTO.getAddressFrom().equals(goodsDTO.getAddressTo())) { return new Result<>(400, "寄件和收件不能是同一个地方", null); @@ -178,7 +179,11 @@ public class UserController { goods.setQuality(goodsDTO.getQuality()); goodsService.save(goods); // 存进历史记录 + // 寄件方位置 + addressLambdaQueryWrapper.eq(Address::getAddress, goodsDTO.getAddressFrom()); + Address addressFrom = addressService.getOne(addressLambdaQueryWrapper); Records records = new Records(); + records.setAddressFrom(addressFrom.getId()); records.setSendUserId(GetIdUtil.getId()); records.setGetUserId(getUser.getId()); records.setAddressId(address.getId()); From e8d409bd3842cf3f19658b0efe36840100664b0a Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Wed, 13 Nov 2024 16:42:31 +0800 Subject: [PATCH 35/43] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=AB=E4=BA=BA=E5=8F=91=E7=BB=99=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E7=9A=84=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserController.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index 6af7f2b..ea25d23 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -80,20 +80,11 @@ public class UserController { // 用户查看别人发给自己的消息 @GetMapping("/getFromMessage") - public Result> getFromMessage(@RequestParam int page, @RequestParam int pageSize) { - if (page <= 0 || pageSize == 0) { - return new Result<>(400, "页码和每页大小必须大于0", null); - } - Long id = GetIdUtil.getId(); - Page messagePage = new Page<>(page, pageSize); + public Result> getFromMessage(@RequestParam Long id) { LambdaQueryWrapper messageLambdaQueryWrapper = new LambdaQueryWrapper<>(); - // 添加查询条件 messageLambdaQueryWrapper.eq(Message::getGetUserId, id); - // 排序条件：先按 mark 对应值排序，然后按时间排序 - messageLambdaQueryWrapper.orderByDesc(Message::getMark) // mark 值大的排前面 - .orderByDesc(Message::getCreateTime); // 时间新的排前面 - messageService.page(messagePage, messageLambdaQueryWrapper); - return new Result<>(200, "获取成功", messagePage); + List list = messageService.list(messageLambdaQueryWrapper); + return new Result<>(200, "", list); } // 用户确认查看消息 @@ -144,7 +135,7 @@ public class UserController { return new Result<>(200, "", pageInfo); } - // 用户寄件 + // 用户寄件(完成) @PostMapping("/shipment") public Result shipmentExpress(@RequestBody @Validated @NotNull GoodsDTO goodsDTO) { // 判断用户是否存在 From 7101d6b7d2698431fd251c8faf71deb83af9e95d Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Thu, 14 Nov 2024 15:59:42 +0800 Subject: [PATCH 36/43] =?UTF-8?q?=E5=B0=81=E8=A3=85=E5=BF=AB=E9=80=92?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTO/RecordsListDTO.java | 17 +++++ .../controller/UserController.java | 70 ++++++++++++++----- 2 files changed, 69 insertions(+), 18 deletions(-) create mode 100644 src/main/java/jty/expressdistributionsystem/DTO/RecordsListDTO.java diff --git a/src/main/java/jty/expressdistributionsystem/DTO/RecordsListDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/RecordsListDTO.java new file mode 100644 index 0000000..f3ff67c --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/DTO/RecordsListDTO.java @@ -0,0 +1,17 @@ +package jty.expressdistributionsystem.DTO; + +import jty.expressdistributionsystem.entity.Address; +import jty.expressdistributionsystem.entity.Goods; +import jty.expressdistributionsystem.entity.User; +import lombok.Data; + +@Data +public class RecordsListDTO { + private Goods goods; // 查看货物名称 + private Address addressFrom; // 查看发货地 + private Address addressTo; // 查看发到哪里 + private User employee; // 查看快递员 + private User addressee; // 查看谁签收的 + private User sendUser; // 查看谁发的 + private User getUserId; // 查看发给谁的 +} diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index ea25d23..07bb504 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; -import jty.expressdistributionsystem.DTO.AddresseeDTO; -import jty.expressdistributionsystem.DTO.GoodsDTO; -import jty.expressdistributionsystem.DTO.PickUpExpressDTO; -import jty.expressdistributionsystem.DTO.SendMessageDTO; +import jty.expressdistributionsystem.DTO.*; import jty.expressdistributionsystem.entity.*; import jty.expressdistributionsystem.service.*; import jty.expressdistributionsystem.utils.ClaimCodeUtil; @@ -18,9 +15,7 @@ import org.jetbrains.annotations.NotNull; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.Collections; -import java.util.List; -import java.util.Objects; +import java.util.*; @RestController @RequestMapping("/user") @@ -78,7 +73,7 @@ public class UserController { return new Result<>(200, "获取成功", messagePage); } - // 用户查看别人发给自己的消息 + // 用户查看别人发给自己的消息(finish) @GetMapping("/getFromMessage") public Result> getFromMessage(@RequestParam Long id) { LambdaQueryWrapper messageLambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -120,19 +115,58 @@ public class UserController { return new Result<>(200, "", list); } - // 用户查看自己的发送快递记录 + // 用户获取自己所有的快递记录 @GetMapping("/history") - public Result> getHistory(@RequestParam int page, @RequestParam int pageSize) { - if (page <= 0 || pageSize == 0) { + public Result> getHistory(@RequestParam int page, @RequestParam int pageSize) { + if (page <= 0 || pageSize <= 0) { return new Result<>(400, "页码和每页大小必须大于0", null); } - Long id = GetIdUtil.getId(); - Page pageInfo = new Page<>(page, pageSize); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(Records::getSendUserId, id); - queryWrapper.orderByDesc(Records::getCreateTime); - recordsService.page(pageInfo, queryWrapper); - return new Result<>(200, "", pageInfo); + Long userId = GetIdUtil.getId(); // 获取当前用户的ID + List recordsList = new ArrayList<>(); + // 查询作为收件人的快递记录 + LambdaQueryWrapper recordsLambdaQueryWrapper = new LambdaQueryWrapper<>(); + recordsLambdaQueryWrapper.eq(Records::getGetUserId, userId); + // 添加排序条件 + recordsLambdaQueryWrapper.orderByAsc(Records::getMark) + .orderByDesc(Records::getCreateTime); + List receivedRecords = recordsService.list(recordsLambdaQueryWrapper); + recordsLambdaQueryWrapper.clear(); + recordsList.addAll(receivedRecords); + // 查询作为寄件人的快递记录 + recordsLambdaQueryWrapper.eq(Records::getSendUserId, userId); + // 添加排序条件 + recordsLambdaQueryWrapper.orderByAsc(Records::getMark) + .orderByDesc(Records::getCreateTime); + List sentRecords = recordsService.list(recordsLambdaQueryWrapper); + recordsList.addAll(sentRecords); + // 分页处理 + int totalRecords = recordsList.size(); + int fromIndex = Math.min(pageSize * (page - 1), totalRecords); + int toIndex = Math.min(fromIndex + pageSize, totalRecords); + List pagedRecords = recordsList.subList(fromIndex, toIndex); + // 封装成GoodsListDTO + List recordsListDTOList = new ArrayList<>(); + for (Records records : pagedRecords) { + Goods goods = goodsService.getById(records.getGoodsId()); + User sender = userService.getById(records.getSendUserId()); + User recipient = userService.getById(records.getGetUserId()); + User addressee = userService.getById(records.getAddresseeId()); + User courier = userService.getById(records.getExpressId()); + Address addressFrom = addressService.getById(records.getAddressFrom()); + Address addressTo = addressService.getById(records.getAddressId()); + RecordsListDTO recordsListDTO = new RecordsListDTO(); + recordsListDTO.setGoods(goods); + recordsListDTO.setAddressFrom(addressFrom); + recordsListDTO.setAddressTo(addressTo); + recordsListDTO.setEmployee(courier); + recordsListDTO.setAddressee(addressee); + recordsListDTO.setSendUser(sender); + recordsListDTO.setGetUserId(recipient); + recordsListDTOList.add(recordsListDTO); + } + Page goodsDTOPage = new Page<>(page, pageSize, totalRecords); + goodsDTOPage.setRecords(recordsListDTOList); + return new Result<>(200, "", goodsDTOPage); } // 用户寄件(完成) From 0abbaab6f8ed4512a53ee589b10e2ad03cdf6943 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Fri, 15 Nov 2024 13:02:45 +0800 Subject: [PATCH 37/43] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTO/RecordsListDTO.java | 6 ++--- .../controller/UserController.java | 23 +++++++++++++++---- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/DTO/RecordsListDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/RecordsListDTO.java index f3ff67c..7ec24d7 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/RecordsListDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/RecordsListDTO.java @@ -1,8 +1,6 @@ package jty.expressdistributionsystem.DTO; -import jty.expressdistributionsystem.entity.Address; -import jty.expressdistributionsystem.entity.Goods; -import jty.expressdistributionsystem.entity.User; +import jty.expressdistributionsystem.entity.*; import lombok.Data; @Data @@ -14,4 +12,6 @@ public class RecordsListDTO { private User addressee; // 查看谁签收的 private User sendUser; // 查看谁发的 private User getUserId; // 查看发给谁的 + private Code code; // 快递取件码 + private Records record; // 查看是否被签收 } diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index 07bb504..b31e89b 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -11,6 +11,7 @@ import jty.expressdistributionsystem.utils.ClaimCodeUtil; import jty.expressdistributionsystem.utils.ExpressCodeUtil; import jty.expressdistributionsystem.utils.GetIdUtil; import jty.expressdistributionsystem.utils.SendMessageUtil; +import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -78,11 +79,13 @@ public class UserController { public Result> getFromMessage(@RequestParam Long id) { LambdaQueryWrapper messageLambdaQueryWrapper = new LambdaQueryWrapper<>(); messageLambdaQueryWrapper.eq(Message::getGetUserId, id); + messageLambdaQueryWrapper.orderByDesc(Message::getMark) + .orderByDesc(Message::getCreateTime); List list = messageService.list(messageLambdaQueryWrapper); return new Result<>(200, "", list); } - // 用户确认查看消息 + // 用户确认查看消息(finish) @PostMapping("/confirmMessage") public Result confirmMessage(@RequestParam Long id) { Message message = messageService.getById(id); @@ -91,6 +94,13 @@ public class UserController { return new Result<>(200, "消息查看成功", ""); } + // 用户删除聊天消息(finish) + @DeleteMapping("/deleteMsg") + public Result deleteMessage(@RequestParam Long id) { + messageService.removeById(id); + return new Result<>(200, "消息删除成功", ""); + } + // 用户新建快递地址(finish) @PostMapping("/addAddress") public Result addAddress(@RequestBody @Validated Address address) { @@ -115,7 +125,7 @@ public class UserController { return new Result<>(200, "", list); } - // 用户获取自己所有的快递记录 + // 用户获取自己所有的快递记录(finish) @GetMapping("/history") public Result> getHistory(@RequestParam int page, @RequestParam int pageSize) { if (page <= 0 || pageSize <= 0) { @@ -154,6 +164,9 @@ public class UserController { User courier = userService.getById(records.getExpressId()); Address addressFrom = addressService.getById(records.getAddressFrom()); Address addressTo = addressService.getById(records.getAddressId()); + LambdaQueryWrapper codeLambdaQueryWrapper = new LambdaQueryWrapper<>(); + codeLambdaQueryWrapper.eq(Code::getGoodsId, goods.getId()); + Code code = codeService.getOne(codeLambdaQueryWrapper); RecordsListDTO recordsListDTO = new RecordsListDTO(); recordsListDTO.setGoods(goods); recordsListDTO.setAddressFrom(addressFrom); @@ -162,6 +175,8 @@ public class UserController { recordsListDTO.setAddressee(addressee); recordsListDTO.setSendUser(sender); recordsListDTO.setGetUserId(recipient); + recordsListDTO.setCode(code); + recordsListDTO.setRecord(records); recordsListDTOList.add(recordsListDTO); } Page goodsDTOPage = new Page<>(page, pageSize, totalRecords); @@ -227,9 +242,9 @@ public class UserController { return new Result<>(200, "寄件成功", ""); } - // 用户收件 + // 用户收件(finish) @PostMapping("/addressee") - public Result addressee(@Validated @RequestBody @NotNull AddresseeDTO addresseeDTO) { + public Result addressee(@Validated @RequestBody AddresseeDTO addresseeDTO) { // 判断是不是自己的快递 Long goodsId = addresseeDTO.getGoodsId(); Goods goods = goodsService.getById(goodsId); From 83e365d75d7d56eef902da8f47aa274915c314bc Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Sat, 16 Nov 2024 01:48:18 +0800 Subject: [PATCH 38/43] =?UTF-8?q?=E7=BB=88=E4=BA=8E=E5=B0=BC=E7=8E=9B?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=AE=8C=E4=BA=86=E7=94=A8=E6=88=B7=EF=BC=8C?= =?UTF-8?q?=E5=B0=B1=E5=B7=AE=E4=BB=A3=E5=8F=96=E5=92=8C=E5=BF=AB=E9=80=92?= =?UTF-8?q?=E5=91=98=E4=BA=86=EF=BC=81=EF=BC=81=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTO/SendMessageDTO.java | 12 ++------ .../controller/AdminController.java | 2 +- .../controller/EmployeeController.java | 4 +-- .../controller/UserController.java | 30 ++++++++----------- .../utils/SendMessageUtil.java | 10 +++++-- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java index b828540..96bf8e5 100644 --- a/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java +++ b/src/main/java/jty/expressdistributionsystem/DTO/SendMessageDTO.java @@ -1,18 +1,12 @@ package jty.expressdistributionsystem.DTO; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; -import java.io.Serializable; - @Data -public class SendMessageDTO implements Serializable { - @JsonSerialize(using = ToStringSerializer.class) - @NotNull(message = "请选择你的聊天对象") - private Long Id; +public class SendMessageDTO { + @NotBlank(message = "请选择你的聊天对象") + private String toUserName; @NotBlank(message = "消息不能为空") private String content; diff --git a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java index a69c40e..9eaf765 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/AdminController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/AdminController.java @@ -80,7 +80,7 @@ public class AdminController { // 管理员发送消息(finish) @PostMapping("/sendMessage") public Result sendMessage(@RequestBody @Validated SendMessageDTO sendMessageDTO) { - Message message = SendMessageUtil.sendMessage(sendMessageDTO); + Message message = SendMessageUtil.sendMessage(sendMessageDTO, userService); messageService.save(message); return new Result<>(200, "发送成功", ""); } diff --git a/src/main/java/jty/expressdistributionsystem/controller/EmployeeController.java b/src/main/java/jty/expressdistributionsystem/controller/EmployeeController.java index c215297..f184190 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/EmployeeController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/EmployeeController.java @@ -70,12 +70,12 @@ public class EmployeeController { @PostMapping("/sendMessage") public Result sendMessageToUser(@RequestBody @NotNull SendMessageDTO sendMessageDTO) { LambdaQueryWrapper userLambdaQueryWrapper = new LambdaQueryWrapper<>(); - userLambdaQueryWrapper.eq(User::getId, sendMessageDTO.getId()); + userLambdaQueryWrapper.eq(User::getUserName, sendMessageDTO.getToUserName()); User user = userService.getOne(userLambdaQueryWrapper); if (user == null) { return new Result<>(404, "用户不存在", ""); } - Message message = SendMessageUtil.sendMessage(sendMessageDTO); + Message message = SendMessageUtil.sendMessage(sendMessageDTO, userService); messageService.save(message); return new Result<>(200, "发送成功", ""); } diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index b31e89b..99bcad3 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -39,15 +39,15 @@ public class UserController { @Resource private AddressService addressService; - // 用户给快递员发消息 + // 用户发消息(finish) @PostMapping("/sendMessage") public Result sendMessage(@Validated @RequestBody SendMessageDTO sendMessageDTO) { - Message message = SendMessageUtil.sendMessage(sendMessageDTO); + Message message = SendMessageUtil.sendMessage(sendMessageDTO, userService); messageService.save(message); return new Result<>(200, "发送成功", ""); } - // 给快递员点赞 + // 给快递员点赞(finish) @PostMapping("/likes") public Result like(@RequestParam Long id) { User employee = userService.getById(id); @@ -56,22 +56,18 @@ public class UserController { return new Result<>(200, "点赞成功", ""); } - // 用户查看发给别人消息 + // 用户查看发给别人消息(finish) @GetMapping("/sendToMessage") - public Result> sendToMessage(@RequestParam int page, @RequestParam int pageSize) { - if (page <= 0 || pageSize == 0) { - return new Result<>(400, "页码和每页大小必须大于0", null); - } - Long id = GetIdUtil.getId(); - Page messagePage = new Page<>(page, pageSize); + public Result> sendToMessage(@RequestParam String toUserName) { + LambdaQueryWrapper userLambdaQueryWrapper = new LambdaQueryWrapper<>(); + userLambdaQueryWrapper.eq(User::getUserName, toUserName); + User toUser = userService.getOne(userLambdaQueryWrapper); + Long userId = GetIdUtil.getId(); LambdaQueryWrapper messageLambdaQueryWrapper = new LambdaQueryWrapper<>(); - // 添加查询条件 - messageLambdaQueryWrapper.eq(Message::getSendUserId, id); - // 排序条件：先按 mark 对应值排序，然后按时间排序 - messageLambdaQueryWrapper.orderByDesc(Message::getMark) // mark 值大的排前面 - .orderByDesc(Message::getCreateTime); // 时间新的排前面 - messageService.page(messagePage, messageLambdaQueryWrapper); - return new Result<>(200, "获取成功", messagePage); + messageLambdaQueryWrapper.eq(Message::getSendUserId, userId) + .eq(Message::getGetUserId, toUser.getId()); + List list = messageService.list(messageLambdaQueryWrapper); + return new Result<>(200, "", list); } // 用户查看别人发给自己的消息(finish) diff --git a/src/main/java/jty/expressdistributionsystem/utils/SendMessageUtil.java b/src/main/java/jty/expressdistributionsystem/utils/SendMessageUtil.java index ae0a40e..0dbb147 100644 --- a/src/main/java/jty/expressdistributionsystem/utils/SendMessageUtil.java +++ b/src/main/java/jty/expressdistributionsystem/utils/SendMessageUtil.java @@ -1,16 +1,22 @@ package jty.expressdistributionsystem.utils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jty.expressdistributionsystem.DTO.SendMessageDTO; import jty.expressdistributionsystem.entity.Message; +import jty.expressdistributionsystem.entity.User; +import jty.expressdistributionsystem.service.UserService; import org.jetbrains.annotations.NotNull; public class SendMessageUtil { - public static Message sendMessage(@NotNull SendMessageDTO sendMessageDTO) { + public static Message sendMessage(@NotNull SendMessageDTO sendMessageDTO, UserService userService) { Long sendId = GetIdUtil.getId(); Message message = new Message(); message.setSendUserId(sendId); - message.setGetUserId(sendMessageDTO.getId()); + LambdaQueryWrapper userLambdaQueryWrapper = new LambdaQueryWrapper<>(); + userLambdaQueryWrapper.eq(User::getUserName, sendMessageDTO.getToUserName()); + User user = userService.getOne(userLambdaQueryWrapper); + message.setGetUserId(user.getId()); message.setContent(sendMessageDTO.getContent()); return message; } From 8f3c97fa52de9e01cc2596b25dea639fbc23d08b Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Sun, 17 Nov 2024 16:36:35 +0800 Subject: [PATCH 39/43] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 11 ----------- .../controller/UserController.java | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 56723ec..6d17362 100644 --- a/pom.xml +++ b/pom.xml @@ -35,11 +35,6 @@ spring-boot-starter-jdbc - - - - - org.springframework.boot spring-boot-starter-web @@ -57,12 +52,6 @@ test - - - - - - mysql diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index 99bcad3..f08bf25 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -266,7 +266,7 @@ public class UserController { // 用户代取快递 @PostMapping("/pickUp") - public Result pickUpExpress(@RequestBody @Validated @NotNull PickUpExpressDTO pickUpExpressDTO) { + public Result pickUpExpress(@RequestBody @Validated PickUpExpressDTO pickUpExpressDTO) { // 查询快递原主人信息 QueryWrapper userQueryWrapper = new QueryWrapper<>(); userQueryWrapper.eq("user_name", pickUpExpressDTO.getMaster()); From 6b54e769fdb3516ec2535a5cc691bb152e9376a8 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Mon, 18 Nov 2024 15:12:34 +0800 Subject: [PATCH 40/43] =?UTF-8?q?=E6=89=80=E6=9C=89=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTO/EmExpressDTO.java | 19 +++ .../DTO/GoodsEmDTO.java | 16 +++ .../controller/CommonController.java | 2 + .../controller/EmployeeController.java | 112 +++++++++++------- .../controller/UserController.java | 4 +- 5 files changed, 109 insertions(+), 44 deletions(-) create mode 100644 src/main/java/jty/expressdistributionsystem/DTO/EmExpressDTO.java create mode 100644 src/main/java/jty/expressdistributionsystem/DTO/GoodsEmDTO.java diff --git a/src/main/java/jty/expressdistributionsystem/DTO/EmExpressDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/EmExpressDTO.java new file mode 100644 index 0000000..2c5bb0c --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/DTO/EmExpressDTO.java @@ -0,0 +1,19 @@ +package jty.expressdistributionsystem.DTO; + +import jty.expressdistributionsystem.entity.Address; +import jty.expressdistributionsystem.entity.Goods; +import jty.expressdistributionsystem.entity.Records; +import jty.expressdistributionsystem.entity.User; +import lombok.Data; + +@Data +public class EmExpressDTO { + private User sendUser; + private User getUser; + private User addressee; + private User express; + private Address addressTo; + private Goods goods; + private Address addressFrom; + private Records records; +} diff --git a/src/main/java/jty/expressdistributionsystem/DTO/GoodsEmDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/GoodsEmDTO.java new file mode 100644 index 0000000..6de6705 --- /dev/null +++ b/src/main/java/jty/expressdistributionsystem/DTO/GoodsEmDTO.java @@ -0,0 +1,16 @@ +package jty.expressdistributionsystem.DTO; + +import lombok.Data; + +@Data +public class GoodsEmDTO { + private String name; + private String sendUser; + private String getUser; + private String employee; + private Double quality; + private String addressFrom; + private String addressTo; + private Integer mark; + private String addressee; +} diff --git a/src/main/java/jty/expressdistributionsystem/controller/CommonController.java b/src/main/java/jty/expressdistributionsystem/controller/CommonController.java index 824b167..09ea454 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/CommonController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/CommonController.java @@ -61,6 +61,8 @@ public class CommonController { // 通过账号登录(finish) @PostMapping("/loginByAccount") public Result login(@RequestBody @Validated @NotNull UserLoginByAccountDTO userLoginByAccountDTO) { + // 删除ThreadLocal存储信息 + ThreadLocalUtil.remove(); // 查询用户是否存在 Optional optionalUser = Optional.ofNullable(userService.getOne(new QueryWrapper() .eq("account", userLoginByAccountDTO.getAccount()))); diff --git a/src/main/java/jty/expressdistributionsystem/controller/EmployeeController.java b/src/main/java/jty/expressdistributionsystem/controller/EmployeeController.java index f184190..037667a 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/EmployeeController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/EmployeeController.java @@ -3,23 +3,22 @@ package jty.expressdistributionsystem.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; -import jty.expressdistributionsystem.DTO.SendMessageDTO; +import jty.expressdistributionsystem.DTO.EmExpressDTO; +import jty.expressdistributionsystem.DTO.GoodsEmDTO; import jty.expressdistributionsystem.entity.*; +import jty.expressdistributionsystem.service.AddressService; import jty.expressdistributionsystem.service.GoodsService; -import jty.expressdistributionsystem.service.MessageService; import jty.expressdistributionsystem.service.RecordsService; import jty.expressdistributionsystem.service.UserService; import jty.expressdistributionsystem.utils.GetIdUtil; -import jty.expressdistributionsystem.utils.SendMessageUtil; -import org.jetbrains.annotations.NotNull; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.List; + @RestController @RequestMapping("/employee") public class EmployeeController { - @Resource - private UserService userService; - @Resource private RecordsService recordsService; @@ -27,56 +26,85 @@ public class EmployeeController { private GoodsService goodsService; @Resource - private MessageService messageService; + private UserService userService; + + @Resource + private AddressService addressService; - // 查询所有自己派送的快递 + // 查询所有自己派送的快递(finish) @GetMapping("/express") - public Result> getAllExpress(@RequestParam int page, @RequestParam int pageSize) { - if (page <= 0 || pageSize == 0) { + public Result> getAllExpress(@RequestParam int page, @RequestParam int pageSize) { + if (page <= 0 || pageSize <= 0) { return new Result<>(400, "页码和每页大小必须大于0", null); } - Long id = GetIdUtil.getId(); - Page recordsPage = new Page<>(page, pageSize); - LambdaQueryWrapper recordsLambdaQueryWrapper = new LambdaQueryWrapper<>(); - // 添加查询条件 - recordsLambdaQueryWrapper.eq(Records::getExpressId, id); - // 排序条件：先按 mark 对应值排序，然后按时间排序 - recordsLambdaQueryWrapper.orderByDesc(Records::getMark) // mark 值大的排前面 - .orderByDesc(Records::getCreateTime); // 时间新的排前面 - recordsService.page(recordsPage, recordsLambdaQueryWrapper); - return new Result<>(200, "获取成功", recordsPage); + Long expressId = GetIdUtil.getId(); // 获取当前用户的 ID（假设此方法返回当前用户的 expressId） + // 根据 expressId 查询 Records 表中的快递记录 + LambdaQueryWrapper recordsQueryWrapper = new LambdaQueryWrapper<>(); + recordsQueryWrapper.eq(Records::getExpressId, expressId) + .orderByDesc(Records::getCreateTime); // 按时间降序排序 + Page recordsPage = recordsService.page(new Page<>(page, pageSize), recordsQueryWrapper); + List emExpressDTOList = new ArrayList<>(); + for (Records record : recordsPage.getRecords()) { + EmExpressDTO emExpressDTO = new EmExpressDTO(); + // 查询相关用户（发送者、接收者） + User sendUser = userService.getById(record.getSendUserId()); + User getUser = userService.getById(record.getGetUserId()); + User addressee = userService.getById(record.getAddresseeId()); + // 查询地址信息 + Address addressFrom = addressService.getById(record.getAddressFrom()); + Address addressTo = addressService.getById(record.getAddressId()); + // 查询商品信息 + Goods goods = goodsService.getById(record.getGoodsId()); + emExpressDTO.setSendUser(sendUser); + emExpressDTO.setGetUser(getUser); + emExpressDTO.setAddressee(addressee); + emExpressDTO.setAddressFrom(addressFrom); + emExpressDTO.setAddressTo(addressTo); + emExpressDTO.setGoods(goods); + emExpressDTO.setRecords(record); + emExpressDTOList.add(emExpressDTO); + } + Page resultPage = new Page<>(page, pageSize); + resultPage.setRecords(emExpressDTOList); + resultPage.setTotal(recordsPage.getTotal()); + return new Result<>(200, "查询成功", resultPage); } + // 查询单件快递信息 @PostMapping("/expressInfo") - public Result getExpressInfo(@RequestParam Long id) { + public Result getExpressInfo(@RequestParam String expressCode) { + if (expressCode.isEmpty()) { + return new Result<>(404, "快递不存在", null); + } LambdaQueryWrapper goodsLambdaQueryWrapper = new LambdaQueryWrapper<>(); - goodsLambdaQueryWrapper.eq(Goods::getId, id); + goodsLambdaQueryWrapper.eq(Goods::getExpressCode, expressCode); Goods goods = goodsService.getOne(goodsLambdaQueryWrapper); if (goods == null) { return new Result<>(404, "快递不存在", null); } LambdaQueryWrapper recordsLambdaQueryWrapper = new LambdaQueryWrapper<>(); - recordsLambdaQueryWrapper.eq(Records::getGoodsId, goods.getId()) - .eq(Records::getExpressId, GetIdUtil.getId()); + recordsLambdaQueryWrapper.eq(Records::getGoodsId, goods.getId()); Records records = recordsService.getOne(recordsLambdaQueryWrapper); - if (records == null) { - return new Result<>(401, "这不是你派送的快递, 无权查看", null); - } - return new Result<>(200, "", goods); - } - - // 联系用户 - @PostMapping("/sendMessage") - public Result sendMessageToUser(@RequestBody @NotNull SendMessageDTO sendMessageDTO) { - LambdaQueryWrapper userLambdaQueryWrapper = new LambdaQueryWrapper<>(); - userLambdaQueryWrapper.eq(User::getUserName, sendMessageDTO.getToUserName()); - User user = userService.getOne(userLambdaQueryWrapper); - if (user == null) { - return new Result<>(404, "用户不存在", ""); + User sendUser = userService.getById(goods.getSendUserId()); + User getUser = userService.getById(goods.getGetUserId()); + User employee = userService.getById(records.getExpressId()); + Address addressFrom = addressService.getById(records.getAddressFrom()); + Address addressTo = addressService.getById(records.getAddressId()); + User addressee = userService.getById(records.getAddresseeId()); + // 填充DTO + GoodsEmDTO goodsEmDTO = new GoodsEmDTO(); + goodsEmDTO.setName(goods.getName()); + goodsEmDTO.setSendUser(sendUser.getUserName()); + goodsEmDTO.setGetUser(getUser.getUserName()); + goodsEmDTO.setQuality(goods.getQuality()); + goodsEmDTO.setAddressFrom(addressFrom.getAddress()); + goodsEmDTO.setAddressTo(addressTo.getAddress()); + goodsEmDTO.setMark(records.getMark()); + goodsEmDTO.setEmployee(employee.getUserName()); + if (addressee != null) { + goodsEmDTO.setAddressee(addressee.getUserName()); } - Message message = SendMessageUtil.sendMessage(sendMessageDTO, userService); - messageService.save(message); - return new Result<>(200, "发送成功", ""); + return new Result<>(200, "查询成功", goodsEmDTO); } } diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java index f08bf25..7001a83 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java @@ -264,7 +264,7 @@ public class UserController { return new Result<>(200, "取件成功", ""); } - // 用户代取快递 + // 用户代取快递(finish) @PostMapping("/pickUp") public Result pickUpExpress(@RequestBody @Validated PickUpExpressDTO pickUpExpressDTO) { // 查询快递原主人信息 @@ -286,7 +286,7 @@ public class UserController { recordsQueryWrapper.eq("goods_id", goods.getId()); Records records = recordsService.getOne(recordsQueryWrapper); if (records.getMark() == 1) { - return new Result<>(500, "快递已被签收", ""); + return new Result<>(404, "快递已被签收", ""); } records.setMark(1); records.setAddresseeId(GetIdUtil.getId()); From 4ae25f1c6b67bb67443d0b6263e5e11f350e4197 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Mon, 18 Nov 2024 21:11:00 +0800 Subject: [PATCH 41/43] =?UTF-8?q?=E6=89=80=E6=9C=89=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expressdistributionsystem/controller/CommonController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/jty/expressdistributionsystem/controller/CommonController.java b/src/main/java/jty/expressdistributionsystem/controller/CommonController.java index 09ea454..d209d5e 100644 --- a/src/main/java/jty/expressdistributionsystem/controller/CommonController.java +++ b/src/main/java/jty/expressdistributionsystem/controller/CommonController.java @@ -81,6 +81,7 @@ public class CommonController { // 校验通过 Map claims = new HashMap<>(); claims.put("id", user.getId()); + ThreadLocalUtil.set(user.getId()); claims.put("account", userLoginByAccountDTO.getAccount()); // 获取token String token = JwtUtil.genToken(claims); From 157de6830ef3510305ad5dbc6e966dd3b52daf48 Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Thu, 12 Dec 2024 14:09:12 +0800 Subject: [PATCH 42/43] =?UTF-8?q?=E6=89=80=E6=9C=89=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expressdistributionsystem/config/MybatisPlusConfig.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/config/MybatisPlusConfig.java b/src/main/java/jty/expressdistributionsystem/config/MybatisPlusConfig.java index d302801..0eb1303 100644 --- a/src/main/java/jty/expressdistributionsystem/config/MybatisPlusConfig.java +++ b/src/main/java/jty/expressdistributionsystem/config/MybatisPlusConfig.java @@ -1,16 +1,13 @@ package jty.expressdistributionsystem.config; import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; @Configuration -@MapperScan("jty.expressdistributionsystem.mapper") @EnableTransactionManagement public class MybatisPlusConfig { // 分页插件 From 70959b00f0f3118547137fe981c446cee098ec7e Mon Sep 17 00:00:00 2001 From: yjxx <1055683039@qq.com> Date: Thu, 12 Dec 2024 14:57:58 +0800 Subject: [PATCH 43/43] =?UTF-8?q?=E6=89=80=E6=9C=89=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jty/expressdistributionsystem/entity/Message.java | 8 +++++--- .../java/jty/expressdistributionsystem/entity/User.java | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/jty/expressdistributionsystem/entity/Message.java b/src/main/java/jty/expressdistributionsystem/entity/Message.java index bcb599a..a1e5642 100644 --- a/src/main/java/jty/expressdistributionsystem/entity/Message.java +++ b/src/main/java/jty/expressdistributionsystem/entity/Message.java @@ -3,6 +3,7 @@ package jty.expressdistributionsystem.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; @@ -13,7 +14,11 @@ import java.io.Serializable; import java.time.LocalDateTime; @Data +@TableName("message") public class Message implements Serializable { + public Message() { + } + @Serial private static final long serialVersionUID = 1L; @@ -42,7 +47,4 @@ public class Message implements Serializable { @TableField("mark") private Integer mark; - - public Message() { - } } diff --git a/src/main/java/jty/expressdistributionsystem/entity/User.java b/src/main/java/jty/expressdistributionsystem/entity/User.java index f1acc06..87f8ae0 100644 --- a/src/main/java/jty/expressdistributionsystem/entity/User.java +++ b/src/main/java/jty/expressdistributionsystem/entity/User.java @@ -45,7 +45,8 @@ public class User implements Serializable { @TableField("identity") @NotBlank(message = "身份证不能为空") - @Pattern(regexp = "^[1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(1[0-2]))((0[1-9])|([1-2][0-9])|(3[0-1]))\\d{3}(\\d|X|x)$", message = "身份证有误") + @Pattern(regexp = "^[1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(1[0-2]))((0[1-9])|([1-2][0-9])|(3[0-1]))\\d{3}(\\d|X|x)$", + message = "身份证有误") private String identity; @TableField("mark")