Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
traffic-signal-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
signal
traffic-signal-platform
Commits
d271e650
Commit
d271e650
authored
Dec 07, 2022
by
hanbing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
分模块执行Jenkins构建
parent
9162eaf6
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
106 additions
and
54 deletions
+106
-54
Jenkinsfile-utc
Jenkinsfile-utc
+53
-0
ApiInfoTask.java
...service/src/main/java/net/wanji/utc/task/ApiInfoTask.java
+0
-1
AspectLog.java
.../main/java/net/wanji/web/common/annotation/AspectLog.java
+1
-1
Ignore.java
...src/main/java/net/wanji/web/common/annotation/Ignore.java
+1
-1
Like.java
...e/src/main/java/net/wanji/web/common/annotation/Like.java
+1
-1
Const.java
...ce/src/main/java/net/wanji/web/common/constant/Const.java
+1
-1
RedisKeyConst.java
...ain/java/net/wanji/web/common/constant/RedisKeyConst.java
+1
-1
BaseEnum.java
...ce/src/main/java/net/wanji/web/common/enums/BaseEnum.java
+8
-8
WarnException.java
...in/java/net/wanji/web/common/exception/WarnException.java
+1
-1
RedisUtils.java
...e/src/main/java/net/wanji/web/common/util/RedisUtils.java
+2
-2
StringUtils.java
.../src/main/java/net/wanji/web/common/util/StringUtils.java
+23
-23
DateStyle.java
...c/main/java/net/wanji/web/common/util/date/DateStyle.java
+1
-1
DateUtils.java
...c/main/java/net/wanji/web/common/util/date/DateUtils.java
+1
-1
Week.java
...ce/src/main/java/net/wanji/web/common/util/date/Week.java
+1
-1
BaseController.java
...rc/main/java/net/wanji/web/controller/BaseController.java
+1
-1
CrossInfoMapper.java
...e/src/main/java/net/wanji/web/mapper/CrossInfoMapper.java
+3
-3
ExceptionService.java
...src/main/java/net/wanji/web/service/ExceptionService.java
+3
-3
ExceptionServiceImpl.java
...java/net/wanji/web/service/impl/ExceptionServiceImpl.java
+4
-4
No files found.
Jenkinsfile-utc
0 → 100644
View file @
d271e650
pipeline {
agent {
label 'jenkinsagent-87'
}
stages {
stage('检测环境') {
steps {
sh '''java -version
mvn -v
git version
docker -v'''
}
}
stage('拉取代码') {
steps {
checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[credentialsId: 'aa123658-f2bd-4079-9735-65b3f31d4d0e', url: 'http://10.100.1.74:56002/signal/traffic-signal-platform.git']]])
}
}
stage('编译构建utc模块') {
steps {
sh 'mvn -pl signal-utc-service clean package -Dmaven.test.skip=true jib:build -DsendCredentialsOverHttp=true'
}
}
stage('删除utc模块镜像和容器') {
steps {
sh '''
echo \'检查容器是否存在\'
containerid=`docker ps -a|grep signal-utc-service|awk \'{print $1}\'`
if [ "$containerid" != "" ];then
echo \'容器存在,删除容器\'
docker rm -f $containerid
fi
echo \'检查镜像是否存在\'
imageid=`docker images|grep signal-utc-service|awk \'{print $3}\'`
if [ "$imageid" != "" ];then
echo \'删除镜像\'
docker rmi -f $imageid
fi
'''
}
}
stage('拉取utc模块镜像') {
steps {
sh 'docker pull 10.100.1.87:5000/xinkong/signal-utc-service:0.2.1'
}
}
stage('运行utc模块容器') {
steps {
sh 'docker run -p 32000:32000 -p 15115:15115 -itd --name signal-utc-service 10.100.1.87:5000/xinkong/signal-utc-service:0.2.1'
}
}
}
}
signal-utc-service/src/main/java/net/wanji/utc/task/ApiInfoTask.java
View file @
d271e650
...
...
@@ -25,7 +25,6 @@ public class ApiInfoTask {
@Scheduled
(
fixedRate
=
2
*
60
*
1000
)
public
void
apiInfoRefresh
()
{
try
{
ManufacturerApiInfoPO
manufacturerApiInfoPO
=
new
ManufacturerApiInfoPO
();
List
<
ManufacturerApiInfoPO
>
manufacturerApiInfoPOList
=
manufacturerApiInfoMapper
.
selectAll
();
if
(
manufacturerApiInfoPOList
==
null
||
manufacturerApiInfoPOList
.
isEmpty
())
{
return
;
...
...
signal-web-service/src/main/java/net/wanji/web/common/annotation/AspectLog.java
View file @
d271e650
...
...
@@ -6,7 +6,7 @@ import java.lang.annotation.*;
/**
* @Description: [自定义注解-系统操作日志,拦截Controller请求]
* @author
hfx
* @author
wanji
* @version 1.0
* Created on 2019/4/17 14:06
*/
...
...
signal-web-service/src/main/java/net/wanji/web/common/annotation/Ignore.java
View file @
d271e650
...
...
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
/**
* @Description: [构造Example时忽略此条件]
* Created on: 2019/5/5
* @author
hfx
* @author
wanji
* @version 1.0
*/
@Target
({
ElementType
.
TYPE
,
ElementType
.
FIELD
})
...
...
signal-web-service/src/main/java/net/wanji/web/common/annotation/Like.java
View file @
d271e650
...
...
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
/**
* @Description: [构造Example时,此字段为like]
* Created on: 2019/5/5
* @author
hfx
* @author
wanji
* @version 1.0
*/
@Target
({
ElementType
.
TYPE
,
ElementType
.
FIELD
})
...
...
signal-web-service/src/main/java/net/wanji/web/common/constant/Const.java
View file @
d271e650
...
...
@@ -2,7 +2,7 @@ package net.wanji.web.common.constant;
/**
* @Description: [常量类]
* @author
hfx
* @author
wanji
* @version 1.0
* Created on 2019/4/16 15:07
*/
...
...
signal-web-service/src/main/java/net/wanji/web/common/constant/RedisKeyConst.java
View file @
d271e650
package
net
.
wanji
.
web
.
common
.
constant
;
/**
* @author
hfx
* @author
wanji
* @version 1.0
* Created on 2019/5/8 16:35
* @description: [redis key常量类]
...
...
signal-web-service/src/main/java/net/wanji/web/common/enums/BaseEnum.java
View file @
d271e650
...
...
@@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;
import
lombok.Getter
;
/**
* @author
hfx
* @author
wanji
* @version 1.0
* Created on 2019/4/16 15:07
* @Description: [枚举类]
...
...
@@ -12,7 +12,7 @@ import lombok.Getter;
public
class
BaseEnum
{
/**
* @author
hfx
* @author
wanji
* @description: [操作日志类型枚举]
* @date 2019/4/17 14:09
*/
...
...
@@ -21,7 +21,7 @@ public class BaseEnum {
}
/**
* @author
hfx
* @author
wanji
* @description: [状态]
* @date 2019/4/19 18:01
*/
...
...
@@ -37,7 +37,7 @@ public class BaseEnum {
}
/**
* @author
hfx
* @author
wanji
* @description: [厂商类型枚举类]
* @date 2019/4/19 18:01
*/
...
...
@@ -102,7 +102,7 @@ public class BaseEnum {
}
/**
* @author
hfx
* @author
wanji
* @description: [信号方向枚举类]
* @date 2019/4/19 18:01
*/
...
...
@@ -229,7 +229,7 @@ public class BaseEnum {
}
/**
* @author
hfx
* @author
wanji
* @description: [车辆类型枚举类]
* @date 2019/4/19 18:01
*/
...
...
@@ -316,7 +316,7 @@ public class BaseEnum {
}
/**
* @author
hfx
* @author
wanji
* @description: [信号中心控制枚举类]
* @date 2019/4/19 18:01
*/
...
...
@@ -378,7 +378,7 @@ public class BaseEnum {
/**
* @author
hfx
* @author
wanji
* @description: [信号中心控制-运行模式枚举类]
* @date 2019/4/19 18:01
*/
...
...
signal-web-service/src/main/java/net/wanji/web/common/exception/WarnException.java
View file @
d271e650
...
...
@@ -2,7 +2,7 @@ package net.wanji.web.common.exception;
/**
* @Description: [自定义异常,用于提示警告的Exception]
* @author
hfx
* @author
wanji
* @version 1.0
* Created on 2019/4/17 11:07
*/
...
...
signal-web-service/src/main/java/net/wanji/web/common/util/RedisUtils.java
View file @
d271e650
...
...
@@ -18,7 +18,7 @@ import java.util.concurrent.TimeUnit;
/**
* @description: redis工具类
* @author
hfx
* @author
wanji
* @version 1.0
* Created on 2019/4/29 20:34
*/
...
...
@@ -260,7 +260,7 @@ public class RedisUtils {
* @description: 根据类型生成版本号
* @param type 类型key区分
* @return 版本号
* @author
hfx
* @author
wanji
* @date 2019/5/5 19:26
*/
public
String
getVersion
(
String
type
)
{
...
...
signal-web-service/src/main/java/net/wanji/web/common/util/StringUtils.java
View file @
d271e650
...
...
@@ -9,7 +9,7 @@ import java.util.regex.Pattern;
/**
* @Description: [字符串工具类]
* @author
hfx
* @author
wanji
* @version 1.0
* Created on 2019/4/16 15:07
*/
...
...
@@ -20,7 +20,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* @description: 判断字符串是否为空
* @param value 字符串
* @return java.lang.Boolean 空:false 不是空:true
* @author
hfx
* @author
wanji
* @date 2019/4/17 9:54
*/
public
static
Boolean
isNotEmpty
(
String
value
)
{
...
...
@@ -35,7 +35,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* @description: 判断字符串是否为空
* @param value 字符串
* @return java.lang.Boolean 空:true 不是空:false
* @author
hfx
* @author
wanji
* @date 2019/4/17 9:54
*/
public
static
Boolean
isEmpty
(
String
value
)
{
...
...
@@ -49,7 +49,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* @description: 判断对象是否为空
* @param obj 对象
* @return java.lang.Boolean 空:true 不是空:false
* @author
hfx
* @author
wanji
* @date 2019/4/17 9:54
*/
public
static
Boolean
isEmpty
(
Object
obj
)
{
...
...
@@ -64,7 +64,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* @description: 判断字符串是否为空、空字符、null
* @param string 字符串
* @return java.lang.Boolean 空:true 不是空:false
* @author
hfx
* @author
wanji
* @date 2019/4/17 9:54
*/
public
static
Boolean
isRedisEmpty
(
String
string
)
{
...
...
@@ -79,7 +79,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* @description: null转化为空字符
* @param str 字符串对象
* @return java.lang.String 空字符
* @author
hfx
* @author
wanji
* @date 2019/4/17 9:58
*/
public
static
String
replaceNullToEmpty
(
String
str
)
{
...
...
@@ -93,7 +93,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* @description: 根据字符串获取Integer值,空字符串返回null
* @param str 字符串
* @return java.lang.Integer
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
Integer
getIntValue
(
String
str
)
{
...
...
@@ -111,7 +111,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* @description: 根据字符串获取Double值,空字符串返回null
* @param str 字符串
* @return java.lang.Double
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
Double
getDoubleValue
(
String
str
)
{
...
...
@@ -128,7 +128,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* @description: 根据字符串获取BigDecimal值,空字符串返回null
* @param str 字符串
* @return BigDecimal
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
BigDecimal
getBigDecimalValue
(
String
str
)
{
...
...
@@ -145,7 +145,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* <p>Description:[判断字符串是否为整数]</p>
* @param str 字符串
* @return boolean 是否是整数
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
boolean
isNumeric
(
String
str
)
{
...
...
@@ -161,7 +161,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* <p>Description:[判断字符串是否为数字类型]</p>
* @param str 字符串
* @return boolean 是否是数字类型
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
boolean
isNumber
(
String
str
)
{
...
...
@@ -173,7 +173,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* <p>Description:[字符串数组转int数组]</p>
* @param strings 字符串数组
* @return int[] int类型数组
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
int
[]
stringArrayToIntArray
(
String
[]
strings
)
{
...
...
@@ -202,7 +202,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* <p>Description:[字符串数组转Long数组]</p>
* @param strings 字符串数组
* @return int[] int类型数组
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
Long
[]
stringArrayToLongArray
(
String
[]
strings
)
{
...
...
@@ -222,7 +222,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* <p>Description:[字符类型list转Integer类型List]</p>
* @param stringList 字符串数组
* @return List<Integer> Integer类型List
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
List
<
Integer
>
stringListToIntegerList
(
List
<
String
>
stringList
)
{
...
...
@@ -240,7 +240,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* <p>Description:[字符类型list转Long类型List]</p>
* @param stringList 字符串数组
* @return List<Long> Long类型List
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
List
<
Long
>
stringListToLongList
(
List
<
String
>
stringList
)
{
...
...
@@ -261,7 +261,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* <p>Description:[字符串转小写字符串]</p>
* @param origString 原始字符串
* @return 转换后的字符串
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
String
getLowerString
(
String
origString
)
{
...
...
@@ -275,7 +275,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* <p>Description:[字符串转小写字符串]</p>
* @param origString 原始字符串
* @return 转换后的字符串
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
String
getUpperString
(
String
origString
)
{
...
...
@@ -287,7 +287,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
/**
* <p>Description:[判断字符串是否只包含数字和字母]</p>
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
boolean
containLetterAndNumber
(
String
string
)
{
...
...
@@ -296,7 +296,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
/**
* <p>Description:[判断字符串是否只包含数字和横杠(电话号校验)]</p>
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
boolean
isPhone
(
String
string
)
{
...
...
@@ -305,7 +305,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
/**
* <p>Description:[过滤表情符号]</p>
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
String
filterEmoji
(
String
string
)
{
...
...
@@ -325,7 +325,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* <p>Description:[获取URL文件名称KEY]</p>
* @param imgUrl
* @return String
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
String
getFileUrlName
(
String
imgUrl
)
{
...
...
@@ -349,7 +349,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
/**
* <p>Description:[获取uuid]</p>
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
String
getUUID
()
{
...
...
@@ -360,7 +360,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* <p>Description:[获取两个字符串数组交集]</p>
* @param str1 字符串1(逗号分隔)
* @param str2 字符串2(逗号分隔)
* @author
hfx
* @author
wanji
* @date 2019/4/16 15:34
*/
public
static
String
getIntersection
(
String
str1
,
String
str2
){
...
...
signal-web-service/src/main/java/net/wanji/web/common/util/date/DateStyle.java
View file @
d271e650
package
net
.
wanji
.
web
.
common
.
util
.
date
;
/**
* @author
hfx
* @author
wanji
* @version 1.0
* @Description: [日期风格工具类]
* Created on 2019/4/16 15:07
...
...
signal-web-service/src/main/java/net/wanji/web/common/util/date/DateUtils.java
View file @
d271e650
...
...
@@ -10,7 +10,7 @@ import java.text.SimpleDateFormat;
import
java.util.*
;
/**
* @author
hfx
* @author
wanji
* @version 1.0
* Created on 2019/4/16 15:28
* @Description: [日期工具类]
...
...
signal-web-service/src/main/java/net/wanji/web/common/util/date/Week.java
View file @
d271e650
...
...
@@ -2,7 +2,7 @@ package net.wanji.web.common.util.date;
/**
* @author
hfx
* @author
wanji
* @version 1.0
* @Description: [星期工具类]
* Created on 2019/4/16 15:07
...
...
signal-web-service/src/main/java/net/wanji/web/controller/BaseController.java
View file @
d271e650
...
...
@@ -6,7 +6,7 @@ import javax.annotation.Resource;
/**
* @Description: [基础控制类]
* @author
hfx
* @author
wanji
* @version 1.0
* Created on 2019/4/17 12:01
*/
...
...
signal-web-service/src/main/java/net/wanji/web/mapper/CrossInfoMapper.java
View file @
d271e650
...
...
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
/**
* @Description: [路口信息持久层实现]</p>
* @author
hfx
* @author
wanji
* @version 1.0
* Created on 2019年05月06日
*/
...
...
@@ -19,7 +19,7 @@ public interface CrossInfoMapper {
* @description: 根据路口id删除基础信息
* @param crossId 路口id
* @return
* @author
hfx
* @author
wanji
* @date 2020/3/19 16:10
*/
void
deleteByCrossId
(
@Param
(
"crossId"
)
String
crossId
);
...
...
@@ -28,7 +28,7 @@ public interface CrossInfoMapper {
* @description: 根据条件获取路口基础信息列表
* @param crossName 路口名称
* @return
* @author
hfx
* @author
wanji
* @date 2020/3/19 16:10
*/
void
listCrossInfo
(
@Param
(
"crossName"
)
String
crossName
);
...
...
signal-web-service/src/main/java/net/wanji/web/service/ExceptionService.java
View file @
d271e650
...
...
@@ -4,7 +4,7 @@ import javax.servlet.http.HttpServletRequest;
/**
* @Description: [异常处理service类]
* @author
hfx
* @author
wanji
* @version 1.0
* Created on 2019/4/17 12:02
*/
...
...
@@ -15,7 +15,7 @@ public interface ExceptionService {
* @param exceptionMsg 异常描述
* @param e 异常对象
* @param request 请求对象
* @author
hfx
* @author
wanji
* @date 2019/4/17 12:06
*/
void
handle
(
String
exceptionMsg
,
Exception
e
,
HttpServletRequest
request
);
...
...
@@ -24,7 +24,7 @@ public interface ExceptionService {
* @description: 异常处理
* @param exceptionMsg 异常描述
* @param e 异常对象
* @author
hfx
* @author
wanji
* @date 2019/4/17 12:06
*/
void
handle
(
String
exceptionMsg
,
Exception
e
);
...
...
signal-web-service/src/main/java/net/wanji/web/service/impl/ExceptionServiceImpl.java
View file @
d271e650
...
...
@@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletRequest;
/**
* @Description: [异常处理service实现]
* @author
hfx
* @author
wanji
* @version 1.0
* Created on 2019/4/17 12:03
*/
...
...
@@ -37,7 +37,7 @@ public class ExceptionServiceImpl implements ExceptionService {
* @param exceptionMsg 异常描述
* @param e 异常对象
* @param request 请求对象
* @author
hfx
* @author
wanji
* @date 2019/4/17 12:06
*/
@Override
...
...
@@ -53,7 +53,7 @@ public class ExceptionServiceImpl implements ExceptionService {
* @description: 异常处理detail
* @param exceptionMsg 异常描述
* @param e 异常对象
* @author
hfx
* @author
wanji
* @date 2019/4/17 12:06
*/
@Override
...
...
@@ -65,7 +65,7 @@ public class ExceptionServiceImpl implements ExceptionService {
* @description: 控制台打印异常信息
* @param exceptionLog 异常信息对象
* @return void
* @author
hfx
* @author
wanji
* @date 2019/4/17 12:35
*/
// private void consoleLog(ExceptionLog exceptionLog) {
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment