Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
张雷
/
skreceive
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
构建
提交
问题看板
文件
提交
网络
比较
分支
标签
58106dbe
由
张雷
编写于
2022-08-17 18:12:46 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
存储到数据库
1 个父辈
f0fee236
隐藏空白字符变更
内嵌
并排
正在显示
16 个修改的文件
包含
172 行增加
和
652 行删除
mvnw
mvnw.cmd
pom.xml
src/main/java/com/it/controller/HelloController.java
src/main/java/com/it/controller/ThirdController.java
src/main/java/com/it/entity/ThirdPosition.java
src/main/java/com/it/entity/admin.java
src/main/java/com/it/mapper/ThirdMapper.java
src/main/java/com/it/mapper/adminMapper.java
src/main/java/com/it/mapper/xml/ThirdMapper.xml
src/main/java/com/it/service/IAdminService.java
src/main/java/com/it/service/IThirdService.java
src/main/java/com/it/service/impl/IAdminServiceImpl.java
src/main/java/com/it/service/impl/IThirdServiceImpl.java
src/main/java/com/it/tool/UUIDGenerator.java
src/main/resources/application.yml
mvnw
deleted
100644 → 0
查看文件 @
f0fee23
#!/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.
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# Maven Start Up Batch script
#
# Required ENV vars:
# ------------------
# JAVA_HOME - location of a JDK home dir
#
# Optional ENV vars
# -----------------
# M2_HOME - location of maven2's installed home dir
# 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 /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
export
JAVA_HOME
=
"
`
/usr/libexec/java_home
`
"
else
export
JAVA_HOME
=
"/Library/Java/Home"
fi
fi
;;
esac
if
[
-z
"
$JAVA_HOME
"
]
;
then
if
[
-r /etc/gentoo-release
]
;
then
JAVA_HOME
=
`
java-config --jre-home
`
fi
fi
if
[
-z
"
$M2_HOME
"
]
;
then
## resolve links - $0 may be a link to maven's home
PRG
=
"
$0
"
# need this for relative symlinks
while
[
-h
"
$PRG
"
]
;
do
ls
=
`
ls -ld
"
$PRG
"
`
link
=
`
expr
"
$ls
"
:
'.*-> \(.*\)$'
`
if
expr
"
$link
"
:
'/.*'
> /dev/null;
then
PRG
=
"
$link
"
else
PRG
=
"
`
dirname
"
$PRG
"
`
/
$link
"
fi
done
saveddir
=
`
pwd
`
M2_HOME
=
`
dirname
"
$PRG
"
`
/..
# make it fully qualified
M2_HOME
=
`
cd
"
$M2_HOME
"
&&
pwd
`
cd
"
$saveddir
"
# echo Using m2 at $M2_HOME
fi
# For Cygwin, ensure paths are in UNIX format before anything is touched
if
$cygwin
;
then
[
-n
"
$M2_HOME
"
]
&&
M2_HOME
=
`
cygpath --unix
"
$M2_HOME
"
`
[
-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
"
$M2_HOME
"
]
&&
M2_HOME
=
"
`
(
cd
"
$M2_HOME
"
;
pwd
)
`
"
[
-n
"
$JAVA_HOME
"
]
&&
JAVA_HOME
=
"
`
(
cd
"
$JAVA_HOME
"
;
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
=
"
`
which 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
CLASSWORLDS_LAUNCHER
=
org.codehaus.plexus.classworlds.launcher.Launcher
# 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
/.."
;
pwd
`
fi
# end of workaround
done
echo
"
${
basedir
}
"
}
# concatenates all lines of a file
concat_lines
()
{
if
[
-f
"
$1
"
]
;
then
echo
"
$(
tr -s
'\n'
' '
<
"
$1
"
)
"
fi
}
BASE_DIR
=
`
find_maven_basedir
"
$(
pwd
)
"
`
if
[
-z
"
$BASE_DIR
"
]
;
then
exit
1;
fi
##########################################################################################
# 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.
##########################################################################################
if
[
-r
"
$BASE_DIR
/.mvn/wrapper/maven-wrapper.jar"
]
;
then
if
[
"
$MVNW_VERBOSE
"
=
true
]
;
then
echo
"Found .mvn/wrapper/maven-wrapper.jar"
fi
else
if
[
"
$MVNW_VERBOSE
"
=
true
]
;
then
echo
"Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
fi
if
[
-n
"
$MVNW_REPOURL
"
]
;
then
jarUrl
=
"
$MVNW_REPOURL
/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
else
jarUrl
=
"https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
fi
while
IFS
=
"="
read
key value;
do
case
"
$key
"
in
(
wrapperUrl
)
jarUrl
=
"
$value
"
;
break
;;
esac
done
<
"
$BASE_DIR
/.mvn/wrapper/maven-wrapper.properties"
if
[
"
$MVNW_VERBOSE
"
=
true
]
;
then
echo
"Downloading from:
$jarUrl
"
fi
wrapperJarPath
=
"
$BASE_DIR
/.mvn/wrapper/maven-wrapper.jar"
if
$cygwin
;
then
wrapperJarPath
=
`
cygpath --path --windows
"
$wrapperJarPath
"
`
fi
if
command
-v wget > /dev/null;
then
if
[
"
$MVNW_VERBOSE
"
=
true
]
;
then
echo
"Found wget ... using wget"
fi
if
[
-z
"
$MVNW_USERNAME
"
]
||
[
-z
"
$MVNW_PASSWORD
"
]
;
then
wget
"
$jarUrl
"
-O
"
$wrapperJarPath
"
else
wget --http-user
=
$MVNW_USERNAME
--http-password
=
$MVNW_PASSWORD
"
$jarUrl
"
-O
"
$wrapperJarPath
"
fi
elif
command
-v curl > /dev/null;
then
if
[
"
$MVNW_VERBOSE
"
=
true
]
;
then
echo
"Found curl ... using curl"
fi
if
[
-z
"
$MVNW_USERNAME
"
]
||
[
-z
"
$MVNW_PASSWORD
"
]
;
then
curl -o
"
$wrapperJarPath
"
"
$jarUrl
"
-f
else
curl --user
$MVNW_USERNAME
:
$MVNW_PASSWORD
-o
"
$wrapperJarPath
"
"
$jarUrl
"
-f
fi
else
if
[
"
$MVNW_VERBOSE
"
=
true
]
;
then
echo
"Falling back to using Java to download"
fi
javaClass
=
"
$BASE_DIR
/.mvn/wrapper/MavenWrapperDownloader.java"
# For Cygwin, switch paths to Windows format before running javac
if
$cygwin
;
then
javaClass
=
`
cygpath --path --windows
"
$javaClass
"
`
fi
if
[
-e
"
$javaClass
"
]
;
then
if
[
! -e
"
$BASE_DIR
/.mvn/wrapper/MavenWrapperDownloader.class"
]
;
then
if
[
"
$MVNW_VERBOSE
"
=
true
]
;
then
echo
" - Compiling MavenWrapperDownloader.java ..."
fi
# Compiling the Java class
(
"
$JAVA_HOME
/bin/javac"
"
$javaClass
"
)
fi
if
[
-e
"
$BASE_DIR
/.mvn/wrapper/MavenWrapperDownloader.class"
]
;
then
# Running the downloader
if
[
"
$MVNW_VERBOSE
"
=
true
]
;
then
echo
" - Running MavenWrapperDownloader.java ..."
fi
(
"
$JAVA_HOME
/bin/java"
-cp .mvn/wrapper MavenWrapperDownloader
"
$MAVEN_PROJECTBASEDIR
"
)
fi
fi
fi
fi
##########################################################################################
# End of extension
##########################################################################################
export
MAVEN_PROJECTBASEDIR
=
${
MAVEN_BASEDIR
:-
"
$BASE_DIR
"
}
if
[
"
$MVNW_VERBOSE
"
=
true
]
;
then
echo
$MAVEN_PROJECTBASEDIR
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
"
$M2_HOME
"
]
&&
M2_HOME
=
`
cygpath --path --windows
"
$M2_HOME
"
`
[
-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
exec
"
$JAVACMD
"
\
$MAVEN_OPTS
\
-classpath
"
$MAVEN_PROJECTBASEDIR
/.mvn/wrapper/maven-wrapper.jar"
\
"-Dmaven.home=
${
M2_HOME
}
"
"-Dmaven.multiModuleProjectDirectory=
${
MAVEN_PROJECTBASEDIR
}
"
\
${
WRAPPER_LAUNCHER
}
$MAVEN_CONFIG
"
$@
"
mvnw.cmd
deleted
100644 → 0
查看文件 @
f0fee23
@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 Maven Start Up Batch script
@REM
@REM Required ENV vars:
@REM JAVA_HOME - location of a JDK home dir
@REM
@REM Optional ENV vars
@REM M2_HOME - location of maven2's installed home dir
@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 "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\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 DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
IF "%%A"=="wrapperUrl" SET DOWNLOAD_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 DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
)
if "%MVNW_VERBOSE%" == "true" (
echo Couldn't find %WRAPPER_JAR%, downloading it ...
echo Downloading from: %DOWNLOAD_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('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
"}"
if "%MVNW_VERBOSE%" == "true" (
echo Finished downloading %WRAPPER_JAR%
)
)
@REM End of extension
@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 "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\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%
exit /B %ERROR_CODE%
pom.xml
查看文件 @
58106db
...
...
@@ -126,6 +126,20 @@
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>
src/main/resources
</directory>
<filtering>
true
</filtering>
</resource>
<resource>
<directory>
src/main/java
</directory>
<includes>
<include>
**/*.xml
</include>
<include>
**/*.json
</include>
<include>
**/*.ftl
</include>
</includes>
</resource>
</resources>
</build>
</project>
...
...
src/main/java/com/it/controller/HelloController.java
deleted
100644 → 0
查看文件 @
f0fee23
package
com
.
it
.
controller
;
import
com.it.entity.admin
;
import
com.it.service.IAdminService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
@RestController
@RequestMapping
(
"/admin"
)
public
class
HelloController
{
@Autowired
private
IAdminService
adminService
;
@GetMapping
(
"/getAll"
)
public
List
<
admin
>
getAll
()
{
return
adminService
.
getAll
();
}
//保存和更新采用json格式传参
@PostMapping
(
"/save"
)
public
boolean
save
(
@RequestBody
admin
admin
)
{
return
adminService
.
save
(
admin
);
}
@GetMapping
(
"/getById/{id}"
)
public
admin
getById
(
@PathVariable
(
"id"
)
Integer
id
)
{
return
adminService
.
getById
(
id
);
}
}
src/main/java/com/it/controller/ThirdController.java
查看文件 @
58106db
...
...
@@ -36,14 +36,14 @@ public class ThirdController {
//初始化数据
private
JSONObject
initData
(
String
resMsg
)
{
resMsg
=
"{\"Gateway\":\"10030049\","
+
"\"NodeId\":\"CB8A1DEB\","
+
"\"SystemId\":\"10990145\","
+
"\"Type\":\"location_pos\","
+
"\"group\":\"5\","
+
"\"groupNumber\":1,"
+
"\"position\":{\"x\":214.44541185285127,\"y\":210.15474327170986},"
+
"\"scale\":0}"
;
//
resMsg = "{\"Gateway\":\"10030049\"," +
//
"\"NodeId\":\"CB8A1DEB\"," +
//
"\"SystemId\":\"10990145\"," +
//
"\"Type\":\"location_pos\"," +
//
"\"group\":\"5\"," +
//
"\"groupNumber\":1," +
//
"\"position\":{\"x\":214.44541185285127,\"y\":210.15474327170986}," +
//
"\"scale\":0}";
System
.
out
.
println
(
"***"
+
System
.
currentTimeMillis
()+
"报文***"
+
resMsg
);
JSONObject
jsonObject
=
new
JSONObject
();
jsonObject
=
JSONObject
.
parseObject
(
resMsg
);
...
...
src/main/java/com/it/entity/ThirdPosition.java
查看文件 @
58106db
package
com
.
it
.
entity
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
lombok.Data
;
import
net.sf.jsqlparser.expression.DateTimeLiteralExpression
;
@Data
public
class
ThirdPosition
{
//主键
@TableId
(
type
=
IdType
.
UUID
)
private
String
positionId
;
//胸牌ID
...
...
@@ -29,4 +33,10 @@ public class ThirdPosition {
//位置Y坐标
private
String
positiony
;
//创建时间
private
java
.
util
.
Date
createTime
;
//创建人
private
String
createBy
;
}
\ No newline at end of file
...
...
src/main/java/com/it/entity/admin.java
deleted
100644 → 0
查看文件 @
f0fee23
package
com
.
it
.
entity
;
import
lombok.Data
;
@Data
public
class
admin
{
private
String
userid
;
private
String
username
;
private
String
password
;
}
\ No newline at end of file
src/main/java/com/it/mapper/ThirdMapper.java
查看文件 @
58106db
...
...
@@ -8,5 +8,5 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public
interface
ThirdMapper
extends
BaseMapper
<
ThirdPosition
>
{
boolean
add
Msg
(
@Param
(
"sql"
)
String
sql
);
boolean
add
DataToDataBase
(
@Param
(
"sql"
)
String
sql
);
}
\ No newline at end of file
...
...
src/main/java/com/it/mapper/adminMapper.java
deleted
100644 → 0
查看文件 @
f0fee23
package
com
.
it
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.it.entity.admin
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.springframework.stereotype.Repository
;
@Mapper
@Repository
public
interface
adminMapper
extends
BaseMapper
<
admin
>
{
}
\ No newline at end of file
src/main/java/com/it/mapper/xml/ThirdMapper.xml
查看文件 @
58106db
...
...
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.it.mapper.ThirdMapper"
>
<insert
id=
"add
Msg
"
>
<insert
id=
"add
DataToDataBase
"
>
${sql}
</insert>
...
...
src/main/java/com/it/service/IAdminService.java
deleted
100644 → 0
查看文件 @
f0fee23
package
com
.
it
.
service
;
import
com.it.entity.admin
;
import
java.util.List
;
public
interface
IAdminService
{
Boolean
save
(
admin
admin
);
admin
getById
(
Integer
id
);
List
<
admin
>
getAll
();
}
src/main/java/com/it/service/IThirdService.java
查看文件 @
58106db
package
com
.
it
.
service
;
import
com.alibaba.fastjson.JSONObject
;
import
com.it.entity.ThirdPosition
;
import
com.it.entity.admin
;
import
java.util.List
;
public
interface
IThirdService
{
...
...
src/main/java/com/it/service/impl/IAdminServiceImpl.java
deleted
100644 → 0
查看文件 @
f0fee23
package
com
.
it
.
service
.
impl
;
import
com.it.mapper.adminMapper
;
import
com.it.entity.admin
;
import
com.it.service.IAdminService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
@Service
public
class
IAdminServiceImpl
implements
IAdminService
{
public
static
final
String
CACHE_KEY_USER
=
"user:"
;
@Autowired
private
adminMapper
adminMapper
;
@Autowired
private
RedisTemplate
redisTemplate
;
@Override
public
Boolean
save
(
admin
admin
)
{
//1 先插入mysql并成功
int
i
=
adminMapper
.
insert
(
admin
);
if
(
i
>
0
)
{
//2 需要再次查询一下mysql将数据捞回来并ok
admin
=
adminMapper
.
selectById
(
admin
.
getUserid
());
//3 将捞出来的user存进redis,完成新增功能的数据一致性。
String
key
=
CACHE_KEY_USER
+
admin
.
getUserid
();
redisTemplate
.
opsForValue
().
set
(
key
,
admin
);
}
// 插入删除等操作返回的都是影响行数,即是数字。那么则大于0为真,其他情况为假
return
true
;
}
@Override
public
admin
getById
(
Integer
id
)
{
admin
ad
=
null
;
String
key
=
CACHE_KEY_USER
+
id
;
//1 先从redis里面查询,如果有直接返回结果,如果没有再去查询mysql
ad
=
(
admin
)
redisTemplate
.
opsForValue
().
get
(
key
);
System
.
out
.
println
(
ad
);
if
(
ad
==
null
){
//2 redis里面无,继续查询mysql
ad
=
adminMapper
.
selectById
(
id
);
if
(
ad
==
null
){
//3.1 redis+mysql 都无数据
//你具体细化,防止多次穿透,我们规定,记录下导致穿透的这个key回写redis
return
ad
;
}
else
{
//3.2 mysql有,需要将数据写回redis,保证下一次的缓存命中率
redisTemplate
.
opsForValue
().
set
(
key
,
ad
);
}
}
return
ad
;
}
@Override
public
List
<
admin
>
getAll
()
{
return
adminMapper
.
selectList
(
null
);
}
}
src/main/java/com/it/service/impl/IThirdServiceImpl.java
查看文件 @
58106db
package
com
.
it
.
service
.
impl
;
import
com.alibaba.fastjson.JSONObject
;
import
com.fasterxml.jackson.annotation.ObjectIdGenerators
;
import
com.it.entity.CommonConstant
;
import
com.it.entity.ThirdPosition
;
import
com.it.mapper.ThirdMapper
;
import
com.it.service.IThirdService
;
import
com.it.tool.RedisUtil
;
import
com.it.tool.UUIDGenerator
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.text.DecimalFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
java.util.Map
;
@Service
...
...
@@ -19,22 +23,29 @@ public class IThirdServiceImpl implements IThirdService {
private
ThirdMapper
thirdMapper
;
private
static
DecimalFormat
df
=
new
DecimalFormat
(
"######0.0000"
);
private
static
SimpleDateFormat
sf
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
@Autowired
private
RedisUtil
redisUtil
;
@Override
public
void
savePosition
(
JSONObject
jsonObject
)
{
addMsgLog
(
jsonObject
);
//添加接收报文日志
ThirdPosition
thirdPosition
=
new
ThirdPosition
();
thirdPosition
.
setNodeId
(
jsonObject
.
getString
(
"NodeId"
));
Map
xyMap
=
jsonObject
.
getObject
(
"position"
,
Map
.
class
);
thirdPosition
.
setPositionx
(
xyMap
.
get
(
"x"
).
toString
());
thirdPosition
.
setPositiony
(
xyMap
.
get
(
"y"
).
toString
());
thirdPosition
.
setSystemId
(
jsonObject
.
getString
(
"SystemId"
));
thirdPosition
.
setType
(
jsonObject
.
getString
(
"Type"
));
thirdPosition
.
setGroup
(
jsonObject
.
getString
(
"group"
));
thirdPosition
.
setGroupNumber
(
jsonObject
.
getInteger
(
"groupNumber"
));
Date
t
=
new
Date
();
boolean
ok
=
addMsgLog
(
jsonObject
,
sf
.
format
(
t
));
//添加接收报文日志
if
(
ok
){
ThirdPosition
thirdPosition
=
new
ThirdPosition
();
thirdPosition
.
setNodeId
(
jsonObject
.
getString
(
"NodeId"
));
Map
xyMap
=
jsonObject
.
getObject
(
"position"
,
Map
.
class
);
thirdPosition
.
setPositionx
(
xyMap
.
get
(
"x"
).
toString
());
thirdPosition
.
setPositiony
(
xyMap
.
get
(
"y"
).
toString
());
thirdPosition
.
setSystemId
(
jsonObject
.
getString
(
"SystemId"
));
thirdPosition
.
setType
(
jsonObject
.
getString
(
"Type"
));
thirdPosition
.
setGroup
(
jsonObject
.
getString
(
"group"
));
thirdPosition
.
setGroupNumber
(
jsonObject
.
getInteger
(
"groupNumber"
));
thirdPosition
.
setCreateTime
(
t
);
changCoordinate
(
thirdPosition
);
}
}
...
...
@@ -42,18 +53,24 @@ public class IThirdServiceImpl implements IThirdService {
* 收报文日志
* @param jsonObject
*/
private
void
addMsgLog
(
JSONObject
jsonObjec
t
)
{
String
sql
=
"INSERT INTO sys_msg_log ( mag_log
) VALUES ( '"
+
jsonObject
.
toJSONString
()
+
"' )"
;
private
boolean
addMsgLog
(
JSONObject
jsonObject
,
String
forma
t
)
{
String
sql
=
"INSERT INTO sys_msg_log ( mag_log
,create_by,create_time ) VALUES ( '"
+
jsonObject
.
toJSONString
()+
"','cmcc','"
+
format
+
"' )"
;
System
.
out
.
println
(
"**********"
+
sql
);
thirdMapper
.
addMsg
(
sql
);
boolean
ok
=
addDataToDataBase
(
sql
);
return
ok
;
}
public
static
void
main
(
String
[]
args
)
{
changCoordinate
(
"101.1636962890625"
,
"325.2133483886719"
);
//SQL插入数据库
private
boolean
addDataToDataBase
(
String
sql
)
{
boolean
ok
=
thirdMapper
.
addDataToDataBase
(
sql
);
return
ok
;
}
private
static
void
changCoordinate
(
String
x1
,
String
y1
)
{
private
void
changCoordinate
(
ThirdPosition
thirdPosition
)
{
// String x1 = "101.1636962890625";
// String y1 = "325.2133483886719";
String
x1
=
thirdPosition
.
getPositionx
();
String
y1
=
thirdPosition
.
getPositiony
();
double
blc
=
100
/
2.54
;
//比例尺
double
fd_x
=
blc
*(
Double
.
valueOf
(
x1
)-
CommonConstant
.
LT_B1_X
)+
CommonConstant
.
LT_B1_X
;
...
...
@@ -72,5 +89,19 @@ public class IThirdServiceImpl implements IThirdService {
// double new_fd_x = 10*(Double.valueOf(x)-CommonConstant.MQ_B1_X)+CommonConstant.MQ_B1_X;
// double new_fd_y = 10*(Double.valueOf(y)+CommonConstant.MQ_B1_Y)-CommonConstant.MQ_B1_Y;
// System.out.println("新放大后的坐标为:X:"+new_fd_x+",Y:"+new_fd_y);
thirdPosition
.
setPositionx
(
String
.
valueOf
(
x
));
thirdPosition
.
setPositiony
(
String
.
valueOf
(
y
));
addPositionInfo
(
thirdPosition
);
//添加转换后坐标信息
}
private
boolean
addPositionInfo
(
ThirdPosition
thirdPosition
)
{
String
uuid
=
UUIDGenerator
.
creatUUID
();
String
sql
=
"INSERT INTO sys_cmcc_position ( `position_id`,`node_id`,`system_id`,`type`,`group`,"
+
"`group_number`,`position_x`,`position_y`,`create_by`,`create_time` ) VALUES "
+
" ( '"
+
uuid
+
"','"
+
thirdPosition
.
getNodeId
()+
"','"
+
thirdPosition
.
getSystemId
()+
"','"
+
thirdPosition
.
getType
()+
"','"
+
thirdPosition
.
getGroup
()+
"',"
+
""
+
thirdPosition
.
getGroupNumber
()+
",'"
+
thirdPosition
.
getPositionx
()+
"','"
+
thirdPosition
.
getPositiony
()+
"','cmcc','"
+
sf
.
format
(
thirdPosition
.
getCreateTime
())+
"' )"
;
System
.
out
.
println
(
"**********"
+
sql
);
boolean
ok
=
addDataToDataBase
(
sql
);
return
ok
;
}
}
...
...
src/main/java/com/it/tool/UUIDGenerator.java
0 → 100644
查看文件 @
58106db
package
com
.
it
.
tool
;
import
java.net.InetAddress
;
import
java.util.UUID
;
public
class
UUIDGenerator
{
private
static
final
int
IP
;
private
static
short
counter
;
private
static
final
int
JVM
;
static
{
int
ipadd
;
try
{
ipadd
=
toInt
(
InetAddress
.
getLocalHost
().
getAddress
());
}
catch
(
Exception
var2
)
{
ipadd
=
0
;
}
IP
=
ipadd
;
counter
=
0
;
JVM
=
(
int
)(
System
.
currentTimeMillis
()
>>>
8
);
}
public
UUIDGenerator
()
{
}
public
static
String
generate
()
{
return
(
new
StringBuilder
(
32
)).
append
(
format
(
getIP
())).
append
(
format
(
getJVM
())).
append
(
format
(
getHiTime
())).
append
(
format
(
getLoTime
())).
append
(
format
(
getCount
())).
toString
();
}
public
static
String
creatUUID
()
{
String
temp
=
UUID
.
randomUUID
().
toString
();
String
result
=
temp
.
replaceAll
(
"-"
,
""
);
return
result
;
}
private
static
final
String
format
(
int
intval
)
{
String
formatted
=
Integer
.
toHexString
(
intval
);
StringBuilder
buf
=
new
StringBuilder
(
"00000000"
);
buf
.
replace
(
8
-
formatted
.
length
(),
8
,
formatted
);
return
buf
.
toString
();
}
private
static
final
String
format
(
short
shortval
)
{
String
formatted
=
Integer
.
toHexString
(
shortval
);
StringBuilder
buf
=
new
StringBuilder
(
"0000"
);
buf
.
replace
(
4
-
formatted
.
length
(),
4
,
formatted
);
return
buf
.
toString
();
}
private
static
final
int
getJVM
()
{
return
JVM
;
}
private
static
final
short
getCount
()
{
Class
var0
=
UUIDGenerator
.
class
;
synchronized
(
UUIDGenerator
.
class
)
{
if
(
counter
<
0
)
{
counter
=
0
;
}
short
var10000
=
counter
;
counter
=
(
short
)(
var10000
+
1
);
return
var10000
;
}
}
private
static
final
int
getIP
()
{
return
IP
;
}
private
static
final
short
getHiTime
()
{
return
(
short
)((
int
)(
System
.
currentTimeMillis
()
>>>
32
));
}
private
static
final
int
getLoTime
()
{
return
(
int
)
System
.
currentTimeMillis
();
}
private
static
final
int
toInt
(
byte
[]
bytes
)
{
int
result
=
0
;
for
(
int
i
=
0
;
i
<
4
;
++
i
)
{
result
=
(
result
<<
8
)
-
-
128
+
bytes
[
i
];
}
return
result
;
}
}
src/main/resources/application.yml
查看文件 @
58106db
...
...
@@ -14,6 +14,7 @@ spring:
# host: redis
mybatis-plus
:
mapper-locations
:
classpath*:com/it/mapper/xml/*Mapper.xml
global-config
:
db-config
:
#使用数据库的自增策略
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论