msb_37571 7 months ago
parent 4a88ff003b
commit b4f82d9985

Binary file not shown.

@ -1,2 +0,0 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

308
mvnw vendored

@ -1,308 +0,0 @@
#!/bin/sh
# ----------------------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# Apache Maven Wrapper startup batch script, version 3.2.0
#
# Required ENV vars:
# ------------------
# JAVA_HOME - location of a JDK home dir
#
# Optional ENV vars
# -----------------
# MAVEN_OPTS - parameters passed to the Java VM when running Maven
# e.g. to debug Maven itself, use
# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
# ----------------------------------------------------------------------------
if [ -z "$MAVEN_SKIP_RC" ] ; then
if [ -f /usr/local/etc/mavenrc ] ; then
. /usr/local/etc/mavenrc
fi
if [ -f /etc/mavenrc ] ; then
. /etc/mavenrc
fi
if [ -f "$HOME/.mavenrc" ] ; then
. "$HOME/.mavenrc"
fi
fi
# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
darwin=false;
mingw=false
case "$(uname)" in
CYGWIN*) cygwin=true ;;
MINGW*) mingw=true;;
Darwin*) darwin=true
# Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
# See https://developer.apple.com/library/mac/qa/qa1170/_index.html
if [ -z "$JAVA_HOME" ]; then
if [ -x "/usr/libexec/java_home" ]; then
JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME
else
JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
fi
fi
;;
esac
if [ -z "$JAVA_HOME" ] ; then
if [ -r /etc/gentoo-release ] ; then
JAVA_HOME=$(java-config --jre-home)
fi
fi
# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin ; then
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
[ -n "$CLASSPATH" ] &&
CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
fi
# For Mingw, ensure paths are in UNIX format before anything is touched
if $mingw ; then
[ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] &&
JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)"
fi
if [ -z "$JAVA_HOME" ]; then
javaExecutable="$(which javac)"
if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then
# readlink(1) is not available as standard on Solaris 10.
readLink=$(which readlink)
if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
if $darwin ; then
javaHome="$(dirname "\"$javaExecutable\"")"
javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac"
else
javaExecutable="$(readlink -f "\"$javaExecutable\"")"
fi
javaHome="$(dirname "\"$javaExecutable\"")"
javaHome=$(expr "$javaHome" : '\(.*\)/bin')
JAVA_HOME="$javaHome"
export JAVA_HOME
fi
fi
fi
if [ -z "$JAVACMD" ] ; then
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"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
else
JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)"
fi
fi
if [ ! -x "$JAVACMD" ] ; then
echo "Error: JAVA_HOME is not defined correctly." >&2
echo " We cannot execute $JAVACMD" >&2
exit 1
fi
if [ -z "$JAVA_HOME" ] ; then
echo "Warning: JAVA_HOME environment variable is not set."
fi
# traverses directory structure from process work directory to filesystem root
# first directory with .mvn subdirectory is considered project base directory
find_maven_basedir() {
if [ -z "$1" ]
then
echo "Path not specified to find_maven_basedir"
return 1
fi
basedir="$1"
wdir="$1"
while [ "$wdir" != '/' ] ; do
if [ -d "$wdir"/.mvn ] ; then
basedir=$wdir
break
fi
# workaround for JBEAP-8937 (on Solaris 10/Sparc)
if [ -d "${wdir}" ]; then
wdir=$(cd "$wdir/.." || exit 1; pwd)
fi
# end of workaround
done
printf '%s' "$(cd "$basedir" || exit 1; pwd)"
}
# concatenates all lines of a file
concat_lines() {
if [ -f "$1" ]; then
# Remove \r in case we run on Windows within Git Bash
# and check out the repository with auto CRLF management
# enabled. Otherwise, we may read lines that are delimited with
# \r\n and produce $'-Xarg\r' rather than -Xarg due to word
# splitting rules.
tr -s '\r\n' ' ' < "$1"
fi
}
log() {
if [ "$MVNW_VERBOSE" = true ]; then
printf '%s\n' "$1"
fi
}
BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
if [ -z "$BASE_DIR" ]; then
exit 1;
fi
MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
log "$MAVEN_PROJECTBASEDIR"
##########################################################################################
# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
# This allows using the maven wrapper in projects that prohibit checking in binary data.
##########################################################################################
wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
if [ -r "$wrapperJarPath" ]; then
log "Found $wrapperJarPath"
else
log "Couldn't find $wrapperJarPath, downloading it ..."
if [ -n "$MVNW_REPOURL" ]; then
wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
else
wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
fi
while IFS="=" read -r key value; do
# Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )
safeValue=$(echo "$value" | tr -d '\r')
case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;;
esac
done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
log "Downloading from: $wrapperUrl"
if $cygwin; then
wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
fi
if command -v wget > /dev/null; then
log "Found wget ... using wget"
[ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
else
wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
fi
elif command -v curl > /dev/null; then
log "Found curl ... using curl"
[ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
else
curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
fi
else
log "Falling back to using Java to download"
javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
# For Cygwin, switch paths to Windows format before running javac
if $cygwin; then
javaSource=$(cygpath --path --windows "$javaSource")
javaClass=$(cygpath --path --windows "$javaClass")
fi
if [ -e "$javaSource" ]; then
if [ ! -e "$javaClass" ]; then
log " - Compiling MavenWrapperDownloader.java ..."
("$JAVA_HOME/bin/javac" "$javaSource")
fi
if [ -e "$javaClass" ]; then
log " - Running MavenWrapperDownloader.java ..."
("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
fi
fi
fi
fi
##########################################################################################
# End of extension
##########################################################################################
# If specified, validate the SHA-256 sum of the Maven wrapper jar file
wrapperSha256Sum=""
while IFS="=" read -r key value; do
case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;;
esac
done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
if [ -n "$wrapperSha256Sum" ]; then
wrapperSha256Result=false
if command -v sha256sum > /dev/null; then
if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then
wrapperSha256Result=true
fi
elif command -v shasum > /dev/null; then
if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then
wrapperSha256Result=true
fi
else
echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available."
echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties."
exit 1
fi
if [ $wrapperSha256Result = false ]; then
echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2
echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2
echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2
exit 1
fi
fi
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
[ -n "$CLASSPATH" ] &&
CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
[ -n "$MAVEN_PROJECTBASEDIR" ] &&
MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
fi
# Provide a "standardized" way to retrieve the CLI args that will
# work with both Windows and non-Windows executions.
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
export MAVEN_CMD_LINE_ARGS
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
# shellcheck disable=SC2086 # safe args
exec "$JAVACMD" \
$MAVEN_OPTS \
$MAVEN_DEBUG_OPTS \
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

205
mvnw.cmd vendored

@ -1,205 +0,0 @@
@REM ----------------------------------------------------------------------------
@REM Licensed to the Apache Software Foundation (ASF) under one
@REM or more contributor license agreements. See the NOTICE file
@REM distributed with this work for additional information
@REM regarding copyright ownership. The ASF licenses this file
@REM to you under the Apache License, Version 2.0 (the
@REM "License"); you may not use this file except in compliance
@REM with the License. You may obtain a copy of the License at
@REM
@REM https://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@REM KIND, either express or implied. See the License for the
@REM specific language governing permissions and limitations
@REM under the License.
@REM ----------------------------------------------------------------------------
@REM ----------------------------------------------------------------------------
@REM Apache Maven Wrapper startup batch script, version 3.2.0
@REM
@REM Required ENV vars:
@REM JAVA_HOME - location of a JDK home dir
@REM
@REM Optional ENV vars
@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
@REM e.g. to debug Maven itself, use
@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
@REM ----------------------------------------------------------------------------
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
@echo off
@REM set title of command window
title %0
@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
@REM set %HOME% to equivalent of $HOME
if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
@REM Execute a user defined script before this one
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
@REM check for pre script, once with legacy .bat ending and once with .cmd ending
if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
:skipRcPre
@setlocal
set ERROR_CODE=0
@REM To isolate internal variables from possible post scripts, we use another setlocal
@setlocal
@REM ==== START VALIDATION ====
if not "%JAVA_HOME%" == "" goto OkJHome
echo.
echo Error: JAVA_HOME not found in your environment. >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
echo location of your Java installation. >&2
echo.
goto error
:OkJHome
if exist "%JAVA_HOME%\bin\java.exe" goto init
echo.
echo Error: JAVA_HOME is set to an invalid directory. >&2
echo JAVA_HOME = "%JAVA_HOME%" >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
echo location of your Java installation. >&2
echo.
goto error
@REM ==== END VALIDATION ====
:init
@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
@REM Fallback to current working directory if not found.
set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
set EXEC_DIR=%CD%
set WDIR=%EXEC_DIR%
:findBaseDir
IF EXIST "%WDIR%"\.mvn goto baseDirFound
cd ..
IF "%WDIR%"=="%CD%" goto baseDirNotFound
set WDIR=%CD%
goto findBaseDir
:baseDirFound
set MAVEN_PROJECTBASEDIR=%WDIR%
cd "%EXEC_DIR%"
goto endDetectBaseDir
:baseDirNotFound
set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
cd "%EXEC_DIR%"
:endDetectBaseDir
IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
@setlocal EnableExtensions EnableDelayedExpansion
for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
:endReadAdditionalConfig
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
)
@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
if exist %WRAPPER_JAR% (
if "%MVNW_VERBOSE%" == "true" (
echo Found %WRAPPER_JAR%
)
) else (
if not "%MVNW_REPOURL%" == "" (
SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
)
if "%MVNW_VERBOSE%" == "true" (
echo Couldn't find %WRAPPER_JAR%, downloading it ...
echo Downloading from: %WRAPPER_URL%
)
powershell -Command "&{"^
"$webclient = new-object System.Net.WebClient;"^
"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
"}"^
"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
"}"
if "%MVNW_VERBOSE%" == "true" (
echo Finished downloading %WRAPPER_JAR%
)
)
@REM End of extension
@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file
SET WRAPPER_SHA_256_SUM=""
FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B
)
IF NOT %WRAPPER_SHA_256_SUM%=="" (
powershell -Command "&{"^
"$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^
"If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^
" Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^
" Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^
" Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^
" exit 1;"^
"}"^
"}"
if ERRORLEVEL 1 goto error
)
@REM Provide a "standardized" way to retrieve the CLI args that will
@REM work with both Windows and non-Windows executions.
set MAVEN_CMD_LINE_ARGS=%*
%MAVEN_JAVA_EXE% ^
%JVM_CONFIG_MAVEN_PROPS% ^
%MAVEN_OPTS% ^
%MAVEN_DEBUG_OPTS% ^
-classpath %WRAPPER_JAR% ^
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
%WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
if ERRORLEVEL 1 goto error
goto end
:error
set ERROR_CODE=1
:end
@endlocal & set ERROR_CODE=%ERROR_CODE%
if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
@REM check for post script, once with legacy .bat ending and once with .cmd ending
if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
:skipRcPost
@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
if "%MAVEN_BATCH_PAUSE%"=="on" pause
if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
cmd /C exit /B %ERROR_CODE%

@ -1,13 +0,0 @@
package com.example.yuanzhoutest;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
public class ServletInitializer extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(YuanzhoutestApplication.class);
}
}

@ -0,0 +1,56 @@
package com.example.yuanzhoutest.controller;
import com.example.yuanzhoutest.entity.*;
import com.example.yuanzhoutest.service.ApproveService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@RequestMapping("/approve")
public class ApproveController {
@Autowired
private ApproveService approveService;
@PostMapping(value = "/list")
public Result<ApproveList> getApproveList(@RequestBody() ApproveRequestVO requestVO){
if(requestVO.getPageIndex() == null ){
requestVO.setPageIndex(1);
}
if(requestVO.getPageSize() == null){
requestVO.setPageSize(10);
}
requestVO.setCurrentIndex((requestVO.getPageIndex()-1) * requestVO.getPageSize());
List<ApproveList> approveList = approveService.getApproveListByPage(requestVO);
long approveListCount = approveService.getApproveListCountByPage(requestVO);
Result<ApproveList> result = new Result<>();
result.setData(approveList);
result.setTotal(approveListCount);
result.setCurrentIndex(requestVO.getCurrentIndex());
result.setPageIndex(requestVO.getPageIndex());
result.setPageSize(result.getPageSize());
return result;
}
@PostMapping(value = "/detail")
public ApproveListFullInfo getdetail(@RequestBody() ApproveRequestVO requestVO){
ApproveListFullInfo approveListFullInfo = new ApproveListFullInfo();
ApproveList approveList = approveService.getApproveById(requestVO.getId());
List<ApproveListDetail> approveDetailList = approveService.getApproveDetailListById(requestVO.getId());
approveListFullInfo.setApproveList(approveList);
approveListFullInfo.setApproveListDetailList(approveDetailList);
return approveListFullInfo;
}
@PostMapping(value = "/add")
public void addApprove(@RequestBody() ApproveListFullInfo approveFullInfo){
Long id = approveService.saveApprove(approveFullInfo.getApproveList());
approveService.saveApproveDetail(approveFullInfo.getApproveListDetailList(), id);
}
}

@ -1,27 +0,0 @@
package com.example.yuanzhoutest.controller;
import com.example.yuanzhoutest.entity.UserEntity;
import com.example.yuanzhoutest.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.concurrent.ConcurrentHashMap;
@RestController
@RequestMapping("/wuyuan/user")
public class UserController {
@Autowired
private UserService userService;
@PostMapping(value = "/login/password")
public UserEntity passLogin(@RequestBody() UserEntity dto){
UserEntity vo = userService.selectOneByPhone(dto.getPhone());
return vo;
}
}

@ -0,0 +1,29 @@
package com.example.yuanzhoutest.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.yuanzhoutest.entity.ApproveList;
import com.example.yuanzhoutest.entity.ApproveListDetail;
import com.example.yuanzhoutest.entity.ApproveRequestVO;
import com.example.yuanzhoutest.entity.Coordinate;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface ApproveMapper extends BaseMapper<ApproveList> {
List<ApproveList> getApproveListByPage(@Param("requestVO") ApproveRequestVO requestVO);
long getApproveListCountByPage(@Param("requestVO") ApproveRequestVO requestVO);
ApproveList getApproveById(@Param("id") Long id);
List<ApproveListDetail> getApproveDetailListById(@Param("approveId") Long approveId);
void saveApprove(@Param("approve")ApproveList approveList);
void saveApproveDetail(@Param("approveDetailList")List<ApproveListDetail> approveDetailList);
void saveCoordinate(@Param("coordinateList")List<Coordinate> coordinateList);
}

@ -1,12 +0,0 @@
package com.example.yuanzhoutest.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.yuanzhoutest.entity.UserEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface UserMapper extends BaseMapper<UserEntity> {
UserEntity selectOneByPhone(@Param("phone") String phone);
}

@ -12,14 +12,14 @@ import java.util.Date;
@NoArgsConstructor
@Getter
@Setter
public class ApproveList extends Page {
private long id;
private int auditStatus;
public class ApproveList {
private Long id;
private Integer auditStatus;
/**
*
*/
private int documentStatus;
private Integer documentStatus;
/**
*
*/
@ -27,7 +27,7 @@ public class ApproveList extends Page {
/**
*
*/
private Date getDocumentDate;
private String documentDate;
/**
*
@ -55,7 +55,7 @@ public class ApproveList extends Page {
/**
*
*/
private Date estTime;
private String estTime;
/**
*
*/
@ -68,7 +68,7 @@ public class ApproveList extends Page {
/**
*
*/
private int saleType;
private Integer saleType;
/**
*
*/

@ -3,12 +3,15 @@ package com.example.yuanzhoutest.entity;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
@Getter
@Setter
public class ApproveListDetail {
private Long id;
private Long approveId;
private Long inventionId;
private Long inventionId;
private String inventionCode;
private String inventionName;
@ -16,4 +19,6 @@ public class ApproveListDetail {
private String model;
private String toDmodel;
private String qualityRequire;
private List<Coordinate> coordinateList;
}

@ -0,0 +1,13 @@
package com.example.yuanzhoutest.entity;
import lombok.Data;
import java.util.List;
@Data
public class ApproveListFullInfo {
private ApproveList approveList;
private List<ApproveListDetail> approveListDetailList;
}

@ -0,0 +1,39 @@
package com.example.yuanzhoutest.entity;
import lombok.Data;
@Data
public class ApproveRequestVO extends Page {
private Long id;
/**
*
*/
private String documentCode;
/**
*
*/
private String documentStartDate;
/**
*
*/
private String documentEndDate;
/**
*
*/
private String supplier;
/**
*
*/
private Integer documentStatus;
/**
*
*/
private Integer auditStatus;
/**
*
*/
private String inventoryCode;
}

@ -0,0 +1,16 @@
package com.example.yuanzhoutest.entity;
import lombok.Data;
@Data
public class Coordinate {
private Long id;
private Long detailId;
private String xcode;
private String ycode;
private Boolean isTotal;
private Long num;
}

@ -1,38 +1,51 @@
package com.example.yuanzhoutest.entity;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import lombok.*;
@AllArgsConstructor
@NoArgsConstructor
@Data
public class Page {
/**
*
*/
private Integer pageIndex;
private Integer pageSize;
private Integer currentIndex;
public Integer getPageIndex() {
return pageIndex;
}
public void setPageIndex(Integer pageIndex) {
this.pageIndex = pageIndex;
}
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
/**
*
*/
private Integer pageSize;
public Integer getCurrentIndex() {
return currentIndex;
}
/**
*
*/
private Integer currentIndex;
public void setCurrentIndex(Integer currentIndex) {
this.currentIndex = currentIndex;
}
// public void setPageIndex(Integer pageIndex) {
// if(pageIndex == null){
// this.pageIndex = 0;
// return;
// }
// this.pageIndex = pageIndex;
// }
//
// public void setPageSize(Integer pageSize) {
// if(pageSize == null){
// this.pageSize = 0;
// return;
// }
// this.pageSize = pageSize;
// }
//
// public void setCurrentIndex(Integer currentIndex) {
// if(pageIndex == null){
// this.pageIndex = 0;
// }
// if(pageSize == null){
// this.pageSize = 0;
// }
// this.currentIndex = pageIndex * pageSize + 1;
// }
@Override
public String toString() {

@ -0,0 +1,14 @@
package com.example.yuanzhoutest.entity;
import lombok.Data;
import java.util.List;
@Data
public class Result<T> {
private long total;
private Integer pageIndex;
private Integer pageSize;
private Integer currentIndex;
private List<T> data;
}

@ -1,48 +0,0 @@
package com.example.yuanzhoutest.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import lombok.Data;
import java.util.Date;
@Data
@TableName("admin_user")
public class UserEntity {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
private String userName;
private String phone;
private String password;
private Date registerTime;
private Boolean isCancellation;
@Version
private Long version;
public UserEntity(Long id, String userName, String phone) {
this.id = id;
this.userName = userName;
this.phone = phone;
}
@Override
public String toString() {
return "UserEntity{" +
"id=" + id +
", userName='" + userName + '\'' +
", phone='" + phone + '\'' +
", password='" + password + '\'' +
", registerTime=" + registerTime +
", isCancellation=" + isCancellation +
", version=" + version +
'}';
}
}

@ -0,0 +1,214 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.yuanzhoutest.dao.ApproveMapper">
<select id="getApproveListByPage" resultType="com.example.yuanzhoutest.entity.ApproveList"
parameterType="com.example.yuanzhoutest.entity.ApproveRequestVO">
select
id,
auditStatus,
documentStatus,
documentCode,
documentDate,
approveType,
supplierCode,
supplierName,
applyDepartment,
applier,
estTime,
inventoryCode,
orderCode,
saleType,
description
from
approve_list
<where>
1 = 1
<if test="requestVO.documentCode != '' and requestVO.documentCode != null">
and documentCode like concat('%',#{requestVO.documentCode},'%')
</if>
<if test="requestVO.documentStartDate != '' and requestVO.documentStartDate != null">
and documentDate >= #{requestVO.documentStartDate}
</if>
<if test="requestVO.documentEndDate != '' and requestVO.documentEndDate != null">
and #{requestVO.documentEndDate} >= documentDate
</if>
<if test="requestVO.supplier != '' and requestVO.supplier != null">
and (supplierCode like concat('%',#{requestVO.supplier},'%')
or supplierName like concat('%',#{requestVO.supplier},'%'))
</if>
<if test="requestVO.auditStatus != null">
and auditStatus = #{requestVO.auditStatus}
</if>
<if test="requestVO.documentStatus != null">
and documentStatus = #{requestVO.documentStatus}
</if>
<if test="requestVO.inventoryCode != '' and requestVO.inventoryCode != null">
and inventoryCode like concat('%',#{requestVO.inventoryCode},'%')
</if>
</where>
limit #{requestVO.currentIndex},#{requestVO.pageSize}
</select>
<select id="getApproveListCountByPage" resultType="java.lang.Long"
parameterType="com.example.yuanzhoutest.entity.ApproveRequestVO">
select
count(*) from approve_list
<where>
1 = 1
<if test="requestVO.documentCode != '' and requestVO.documentCode != null">
and documentCode like concat('%',#{requestVO.documentCode},'%')
</if>
<if test="requestVO.documentStartDate != '' and requestVO.documentStartDate != null">
and documentDate >= #{requestVO.documentStartDate}
</if>
<if test="requestVO.documentEndDate != '' and requestVO.documentEndDate != null">
and #{requestVO.documentEndDate} >= documentDate
</if>
<if test="requestVO.supplier != '' and requestVO.supplier != null">
and (supplierCode like concat('%',#{requestVO.supplier},'%')
or supplierName like concat('%',#{requestVO.supplier},'%'))
</if>
<if test="requestVO.auditStatus != null">
and auditStatus = #{requestVO.auditStatus}
</if>
<if test="requestVO.documentStatus != null">
and documentStatus = #{requestVO.documentStatus}
</if>
<if test="requestVO.inventoryCode != '' and requestVO.inventoryCode != null">
and inventoryCode like concat('%',#{requestVO.inventoryCode},'%')
</if>
</where>
</select>
<select id="getApproveById" resultType="com.example.yuanzhoutest.entity.ApproveList"
parameterType="java.lang.Long">
select
id,
auditStatus,
documentStatus,
documentCode,
documentDate,
approveType,
supplierCode,
supplierName,
applyDepartment,
applier,
estTime,
inventoryCode,
orderCode,
saleType,
description
from
approve_list
<where>
id = #{id}
</where>
</select>
<select id="getApproveDetailListById">
select
id,
inventionid,
inventionCode,
inventionName,
productName,
model,
`2Dmode`,
qualityrequire,
supplierCode,
supplierName,
num,
remark
from
approve_list_detail where approveId = #{approveId}
</select>
<insert id="saveApprove">
insert
into
approve_list
(id,
auditStatus,
documentStatus,
documentCode,
documentDate,
approveType,
supplierCode,
supplierName,
applyDepartment,
applier,
estTime,
inventoryCode,
orderCode,
saleType,
description)
values(#{approve.id},
#{approve.auditStatus},
#{approve.documentStatus},
#{approve.documentCode},
#{approve.documentDate},
#{approve.approveType},
#{approve.supplierCode},
#{approve.supplierName},
#{approve.applyDepartment},
#{approve.applier},
#{approve.estTime},
#{approve.inventoryCode},
#{approve.orderCode},
#{approve.saleType},
#{approve.description})
</insert>
<insert id="saveApproveDetail">
insert
into
approve_list_detail (
id,
approveId,
inventionId,
inventionCode,
inventionName,
productName,
model,
`2Dmode`,
qualityRequire,
supplierCode,
supplierName,
num,
remark)
values
<foreach item="param" index="index" collection="approveDetailList" open="(" close=")" separator=",">
#{param.id},
#{param.approveId},
#{param.inventionId},
#{param.inventionCode},
#{param.inventionName},
#{param.productName},
#{param.model},
#{param.`2Dmode`},
#{param.qualityRequire},
#{param.supplierCode},
#{param.supplierName},
#{param.num},
#{param.remark}
</foreach>
</insert>
<insert id="saveCoordinate">
insert
into
coordinate_data (
id,
detailId,
xcode,
ycode,
num)
values
<foreach item="param" index="index" collection="coordinateList" open="(" close=")" separator=",">
#{param.id},
#{param.detailId},
#{param.xcode},
#{param.ycode},
#{param.num}
</insert>
</mapper>

@ -1,13 +0,0 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.yuanzhoutest.dao.UserMapper">
<select id="selectOneByPhone" resultType="com.example.yuanzhoutest.entity.UserEntity" parameterType="java.lang.String">
select *
from admin_user
where phone = #{phone}
and is_cancellation = 0;
</select>
</mapper>

@ -0,0 +1,23 @@
package com.example.yuanzhoutest.service;
import com.example.yuanzhoutest.entity.ApproveList;
import com.example.yuanzhoutest.entity.ApproveListDetail;
import com.example.yuanzhoutest.entity.ApproveRequestVO;
import java.util.List;
public interface ApproveService {
List<ApproveList> getApproveListByPage(ApproveRequestVO requestVO);
long getApproveListCountByPage(ApproveRequestVO requestVO);
ApproveList getApproveById(Long id);
List<ApproveListDetail> getApproveDetailListById(Long id);
Long saveApprove(ApproveList approveList);
void saveApproveDetail(List<ApproveListDetail> approveDetailList, Long approveId);
}

@ -1,10 +0,0 @@
package com.example.yuanzhoutest.service;
import com.example.yuanzhoutest.entity.UserEntity;
import java.util.List;
public interface UserService {
UserEntity selectOneByPhone(String phone);
}

@ -0,0 +1,69 @@
package com.example.yuanzhoutest.service.impl;
import com.example.yuanzhoutest.dao.ApproveMapper;
import com.example.yuanzhoutest.entity.ApproveList;
import com.example.yuanzhoutest.entity.ApproveListDetail;
import com.example.yuanzhoutest.entity.ApproveRequestVO;
import com.example.yuanzhoutest.entity.Coordinate;
import com.example.yuanzhoutest.service.ApproveService;
import com.example.yuanzhoutest.util.SnowflakeIdWorker;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@Service
public class ApproveServiceImpl implements ApproveService {
@Autowired
private ApproveMapper approveMapper;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Override
public List<ApproveList> getApproveListByPage(ApproveRequestVO requestVO) {
return approveMapper.getApproveListByPage(requestVO);
}
@Override
public long getApproveListCountByPage(ApproveRequestVO requestVO) {
return approveMapper.getApproveListCountByPage(requestVO);
}
@Override
public ApproveList getApproveById(Long id){
return approveMapper.getApproveById(id);
}
public List<ApproveListDetail> getApproveDetailListById(Long id){
return approveMapper.getApproveDetailListById(id);
}
@Override
public Long saveApprove(ApproveList approveList){
Long id = snowflakeIdWorker.getUUID();
approveList.setId(id);
approveMapper.saveApprove(approveList);
return id;
}
@Override
public void saveApproveDetail(List<ApproveListDetail> approveDetailList, Long approveId){
List<Coordinate> coordinateList = new ArrayList<>();
approveDetailList.stream().forEach(v -> {
long id = snowflakeIdWorker.getUUID();
v.setApproveId(approveId);
v.setId(id);
v.getCoordinateList().stream().forEach(t -> {
t.setDetailId(id);
t.setId(snowflakeIdWorker.getUUID());
});
coordinateList.addAll(v.getCoordinateList());
});
approveMapper.saveApproveDetail(approveDetailList);
approveMapper.saveCoordinate(coordinateList);
}
}

@ -1,22 +0,0 @@
package com.example.yuanzhoutest.service.impl;
import com.example.yuanzhoutest.dao.UserMapper;
import com.example.yuanzhoutest.entity.UserEntity;
import com.example.yuanzhoutest.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Service
public class UserServiceImpl implements UserService {
@Autowired
private UserMapper userMapper;
@Override
@Transactional
public UserEntity selectOneByPhone(String phone) {
return userMapper.selectOneByPhone(phone);
}
}

@ -0,0 +1,143 @@
package com.example.yuanzhoutest.util;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.stereotype.Component;
import java.net.Inet4Address;
import java.net.UnknownHostException;
import java.util.Random;
@Component
public class SnowflakeIdWorker {
/** 时间部分所占长度 */
private final int TIME_LEN = 41;
/** 数据中心id所占长度 */
private final int DATA_LEN = 5;
/** 机器id所占长度 */
private final int WORK_LEN = 5;
/** 毫秒内存序列所占长度 */
private final int SEQ_LEN = 12;
/** 定义起始时间 2020-07-27*/
private final long START_TIME = 1595835560497L;
/** 上次生成ID的时间戳 */
private long LAST_TIME_STAMP = -1L;
/** 时间部分向左移动的位数 22 */
private final int TIME_LEFT_BIT = 64 - 1 - TIME_LEN;
/** 自动获取数据中心id可以手动定义0-31之间的数 */
private final long DATA_ID = getDataId();
/** 自动机器id可以手动定义0-31之间的数 */
private final long WORK_ID = getWorkId();
/** 数据中心id最大值 31 */
private final int DATA_MAX_NUM = ~(-1 << DATA_LEN);
/** 机器id最大值 31 */
private final int WORK_MAX_NUM = ~(-1 << WORK_LEN);
/** 随机获取数据中心id的参数 32 */
private final int DATA_RANDOM = DATA_MAX_NUM + 1;
/** 随机获取机器id的参数 32 */
private final int WORK_RANDOM = WORK_MAX_NUM + 1;
/** 数据中心id左移位数 17 */
private final int DATA_LEFT_BIT = TIME_LEFT_BIT - DATA_LEN;
/** 机器id左移位数 12 */
private final int WORK_LEFT_BIT = DATA_LEFT_BIT - WORK_LEN;
/** 上一次毫秒内存序列值 */
private long LAST_SEQ = 0L;
/** 毫秒内存列的最大值 4095 */
private final long SEQ_MAX_NUM = ~(-1 << SEQ_LEN);
/**
* Smax+1
* @param s hostName/hostAddress
* @param max /id
* @return
*/
private int getHostId(String s, int max) {
byte[] bytes = s.getBytes();
int sums = 0;
for (int b : bytes) {
sums += b;
}
return sums % (max + 1);
}
/**
* host address 0-31
* @return ID
*/
private int getWorkId() {
try {
return getHostId(Inet4Address.getLocalHost().getHostAddress(), WORK_MAX_NUM);
} catch (UnknownHostException e) {
return new Random().nextInt(WORK_RANDOM);
}
}
/**
* host name 0-31
* @return IDID
*/
private int getDataId() {
try{
return getHostId(Inet4Address.getLocalHost().getHostName(), DATA_MAX_NUM);
}catch(Exception e){
return new Random().nextInt(DATA_RANDOM);
}
}
/**
*
* @param lastMillis
* @return
*/
private long nextMillis(long lastMillis) {
long now = System.currentTimeMillis();
while (now <= lastMillis) {
now = System.currentTimeMillis();
}
return now;
}
/**
*
* @return ID
*/
public synchronized long getUUID() {
long now = System.currentTimeMillis();
// 如果当前时间小于上一次ID生成的时间戳说明系统时钟回退过此时因抛出异常
if (now < LAST_TIME_STAMP) {
throw new RuntimeException(String.format("系统时间错误! %d 毫秒内拒绝生成雪花ID", START_TIME));
}
if (now == LAST_TIME_STAMP) {
LAST_SEQ = (LAST_SEQ + 1) & SEQ_MAX_NUM;
if (LAST_SEQ == 0) {
now = nextMillis(LAST_TIME_STAMP);
}
} else {
LAST_SEQ = 0;
}
// 上次生成ID的时间戳
LAST_TIME_STAMP = now;
return ((now - START_TIME) << TIME_LEFT_BIT | (DATA_ID << DATA_LEFT_BIT) | (WORK_ID << WORK_LEFT_BIT) | LAST_SEQ);
}
// /**
// * 主函数测试
// * @param args
// */
// public void main(String[] args) {
// long start = System.currentTimeMillis();
// int num = 300000;
// for (int i = 0; i < num; i++) {
// System.out.println(getUUID());
// }
// long end = System.currentTimeMillis();
//
// System.out.println("共生成 " + num + " 个ID用时 " + (end - start) + " 毫秒");
// }
}

@ -5,7 +5,7 @@ spring:
# mysql????
datasource:
# ????? ?? ????
url: jdbc:mysql://127.0.0.1:3306/wuyuantest?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://192.168.1.18:3306/wuyuantest?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
username: root # ??
password: 123456 # ??
driver-class-name: com.mysql.cj.jdbc.Driver

@ -1,7 +1,6 @@
package com.example.yuanzhoutest;
import com.example.yuanzhoutest.entity.UserEntity;
import com.example.yuanzhoutest.service.UserService;
import com.example.yuanzhoutest.service.ApproveService;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@ -9,11 +8,8 @@ import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
class YuanzhoutestApplicationTests {
@Autowired // 注入个人仓库
private UserService userService;
private ApproveService approveService;
@Test
public void testAddPerson() {
UserEntity user = userService.selectOneByPhone(String.valueOf(111));
System.out.println(user.toString());
}
}

Loading…
Cancel
Save