Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
map-parent
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
常超
map-parent
Commits
6dfad6c3
Commit
6dfad6c3
authored
Apr 21, 2021
by
chentian
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
c65a9c9f
d696a52c
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
35 changed files
with
1939 additions
and
49 deletions
+1939
-49
common/common_utils/src/main/java/com/founder/commonutils/carEntity/AreaInfo.java
+100
-0
common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarKkInfo.java
+189
-1
common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarOneAreaIAnalysisSearchParam.java
+1
-1
common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarPzAnalysisSearchParam.java
+112
-0
common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarPzAnalysisSearchResult.java
+93
-0
common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarQyPzAndTaskSearchParam.java
+30
-0
common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarReceiving.java
+80
-0
common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarRy.java
+96
-0
common/common_utils/src/main/java/com/founder/commonutils/carEntity/QgjdcModel.java
+280
-0
common/common_utils/src/main/java/com/founder/commonutils/carEntity/TbStRegionalstaskresult.java
+325
-0
common/common_utils/src/main/java/com/founder/commonutils/carEntity/TrackYsModelCondition.java
+55
-0
common/common_utils/src/main/java/com/founder/commonutils/carEntity/TrackYstldCondition.java
+105
-0
common/common_utils/src/main/java/com/founder/commonutils/carEntity/TrackYstldResult.java
+87
-0
common/common_utils/src/main/java/com/founder/commonutils/carEntity/devicesGroups.java
+59
-0
common/common_utils/src/main/java/com/founder/commonutils/carEntity/reslutFl.java
+59
-0
common/common_utils/src/main/java/com/founder/commonutils/util/DataUtil.java
+43
-2
common/common_utils/src/main/java/com/founder/commonutils/util/JsonUtils.java
+32
-0
service/asj/src/main/resources/bootstrap.properties
+6
-9
service/es/src/main/java/com/founder/eszy/controller/EsExtractController.java
+4
-0
service/es/src/main/java/com/founder/eszy/controller/EsQueryController.java
+4
-0
service/es/src/main/resources/bootstrap.properties
+4
-4
service/pom.xml
+14
-0
service/publicapi/src/main/resources/bootstrap.properties
+4
-4
serviceapi/carapi/pom.xml
+4
-1
serviceapi/carapi/src/main/java/com/founder/carapi/controller/CarController.java
+33
-8
serviceapi/carapi/src/main/java/com/founder/carapi/controller/RegionalsTaskController.java
+51
-2
serviceapi/carapi/src/main/java/com/founder/carapi/mapper/CarInfoMapper.java
+10
-1
serviceapi/carapi/src/main/java/com/founder/carapi/mapper/RegInfoMapper.java
+3
-1
serviceapi/carapi/src/main/java/com/founder/carapi/mapper/xml/CarInfoMapper.xml
+0
-0
serviceapi/carapi/src/main/java/com/founder/carapi/mapper/xml/RegInfoMapper.xml
+31
-0
serviceapi/carapi/src/main/java/com/founder/carapi/service/CarService.java
+15
-5
serviceapi/carapi/src/main/java/com/founder/carapi/service/impl/CarServiceImpl.java
+0
-0
serviceapi/carapi/src/main/java/com/founder/carapi/service/impl/RegTaskServiceImpl.java
+2
-2
serviceapi/carapi/src/main/resources/bootstrap.properties
+4
-4
serviceapi/imageapi/src/main/resources/bootstrap.properties
+4
-4
No files found.
common/common_utils/src/main/java/com/founder/commonutils/carEntity/AreaInfo.java
0 → 100644
View file @
6dfad6c3
package
com
.
founder
.
commonutils
.
carEntity
;
import
io.swagger.annotations.ApiModelProperty
;
public
class
AreaInfo
{
@ApiModelProperty
(
"基站号"
)
private
String
codes
;
//多个基站以逗号分隔
@ApiModelProperty
(
"查询开始时间"
)
private
String
startTime
;
//查询开始时间
@ApiModelProperty
(
"查询结束时间"
)
private
String
endTime
;
//查询结束时间
@ApiModelProperty
(
"任务id"
)
private
String
taskId
;
//任务id
@ApiModelProperty
(
"区域名称"
)
private
String
region
;
//区域名称
@ApiModelProperty
(
"案件编号"
)
private
String
caseId
;
@ApiModelProperty
(
"案件名称"
)
private
String
caseName
;
@ApiModelProperty
(
"发送人身份证号"
)
private
String
username
;
public
String
getCodes
()
{
return
codes
;
}
public
void
setCodes
(
String
codes
)
{
this
.
codes
=
codes
;
}
public
String
getStartTime
()
{
return
startTime
;
}
public
void
setStartTime
(
String
startTime
)
{
this
.
startTime
=
startTime
;
}
public
String
getEndTime
()
{
return
endTime
;
}
public
void
setEndTime
(
String
endTime
)
{
this
.
endTime
=
endTime
;
}
public
String
getTaskId
()
{
return
taskId
;
}
public
void
setTaskId
(
String
taskId
)
{
this
.
taskId
=
taskId
;
}
public
String
getRegion
()
{
return
region
;
}
public
void
setRegion
(
String
region
)
{
this
.
region
=
region
;
}
public
String
getCaseId
()
{
return
caseId
;
}
public
void
setCaseId
(
String
caseId
)
{
this
.
caseId
=
caseId
;
}
public
String
getCaseName
()
{
return
caseName
;
}
public
void
setCaseName
(
String
caseName
)
{
this
.
caseName
=
caseName
;
}
public
String
getUsername
()
{
return
username
;
}
public
void
setUsername
(
String
username
)
{
this
.
username
=
username
;
}
@Override
public
String
toString
()
{
return
"AreaInfo{"
+
"codes='"
+
codes
+
'\''
+
", startTime='"
+
startTime
+
'\''
+
", endTime='"
+
endTime
+
'\''
+
", taskId='"
+
taskId
+
'\''
+
", region='"
+
region
+
'\''
+
", caseId='"
+
caseId
+
'\''
+
", caseName='"
+
caseName
+
'\''
+
", username='"
+
username
+
'\''
+
'}'
;
}
}
common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarKkInfo.java
View file @
6dfad6c3
...
...
@@ -16,6 +16,8 @@ import java.util.Date;
@Accessors
(
chain
=
true
)
@ApiModel
public
class
CarKkInfo
{
private
String
xxzjbh
;
private
String
id
;
//保存的卡口记录id
@ApiModelProperty
(
"卡口地址"
)
private
String
address
;
//卡口地址
...
...
@@ -26,11 +28,13 @@ public class CarKkInfo {
@ApiModelProperty
(
"纬度"
)
private
String
y
;
//纬度
@ApiModelProperty
(
"通过卡口时间"
)
private
Date
time
;
//通过卡口时间
private
String
time
;
//通过卡口时间
@ApiModelProperty
(
"通过卡口时间戳毫秒"
)
private
String
timestamp
;
//通过卡口时间戳毫秒
@ApiModelProperty
(
"值为车牌号"
)
private
String
objectValue
;
//值为车牌号
@ApiModelProperty
(
"车牌类型"
)
private
String
objectType
;
//值为车牌号
@ApiModelProperty
(
"查询开始时间"
)
private
String
kssj
;
@ApiModelProperty
(
"查询结束时间"
)
...
...
@@ -57,4 +61,188 @@ public class CarKkInfo {
private
String
sabz
;
@ApiModelProperty
(
"车轨数据来源字段名称"
)
private
String
apeTypeMc
;
public
String
getId
()
{
return
id
;
}
public
void
setId
(
String
id
)
{
this
.
id
=
id
;
}
public
String
getAddress
()
{
return
address
;
}
public
void
setAddress
(
String
address
)
{
this
.
address
=
address
;
}
public
String
getObjectType
()
{
return
objectType
;
}
public
void
setObjectType
(
String
objectType
)
{
this
.
objectType
=
objectType
;
}
public
String
getEnumber
()
{
return
Enumber
;
}
public
void
setEnumber
(
String
enumber
)
{
Enumber
=
enumber
;
}
public
String
getX
()
{
return
x
;
}
public
void
setX
(
String
x
)
{
this
.
x
=
x
;
}
public
String
getY
()
{
return
y
;
}
public
void
setY
(
String
y
)
{
this
.
y
=
y
;
}
public
String
getTime
()
{
return
time
;
}
public
void
setTime
(
String
time
)
{
this
.
time
=
time
;
}
public
String
getTimestamp
()
{
return
timestamp
;
}
public
void
setTimestamp
(
String
timestamp
)
{
this
.
timestamp
=
timestamp
;
}
public
String
getObjectValue
()
{
return
objectValue
;
}
public
void
setObjectValue
(
String
objectValue
)
{
this
.
objectValue
=
objectValue
;
}
public
String
getKssj
()
{
return
kssj
;
}
public
void
setKssj
(
String
kssj
)
{
this
.
kssj
=
kssj
;
}
public
String
getJssj
()
{
return
jssj
;
}
public
void
setJssj
(
String
jssj
)
{
this
.
jssj
=
jssj
;
}
public
String
getKkUrlPic
()
{
return
kkUrlPic
;
}
public
void
setKkUrlPic
(
String
kkUrlPic
)
{
this
.
kkUrlPic
=
kkUrlPic
;
}
public
String
getSbbh
()
{
return
sbbh
;
}
public
void
setSbbh
(
String
sbbh
)
{
this
.
sbbh
=
sbbh
;
}
public
String
getTaskId
()
{
return
taskId
;
}
public
void
setTaskId
(
String
taskId
)
{
this
.
taskId
=
taskId
;
}
public
String
getCaseId
()
{
return
caseId
;
}
public
void
setCaseId
(
String
caseId
)
{
this
.
caseId
=
caseId
;
}
public
String
getCaseName
()
{
return
caseName
;
}
public
void
setCaseName
(
String
caseName
)
{
this
.
caseName
=
caseName
;
}
public
String
getUsername
()
{
return
username
;
}
public
void
setUsername
(
String
username
)
{
this
.
username
=
username
;
}
public
String
getRegion
()
{
return
region
;
}
public
void
setRegion
(
String
region
)
{
this
.
region
=
region
;
}
public
String
getCount
()
{
return
count
;
}
public
void
setCount
(
String
count
)
{
this
.
count
=
count
;
}
public
String
getApeType
()
{
return
apeType
;
}
public
void
setApeType
(
String
apeType
)
{
this
.
apeType
=
apeType
;
}
public
String
getSabz
()
{
return
sabz
;
}
public
void
setSabz
(
String
sabz
)
{
this
.
sabz
=
sabz
;
}
public
String
getApeTypeMc
()
{
return
apeTypeMc
;
}
public
void
setApeTypeMc
(
String
apeTypeMc
)
{
this
.
apeTypeMc
=
apeTypeMc
;
}
public
String
getXxzjbh
()
{
return
xxzjbh
;
}
public
void
setXxzjbh
(
String
xxzjbh
)
{
this
.
xxzjbh
=
xxzjbh
;
}
}
common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarOneAreaIAnalysisSearchParam.java
View file @
6dfad6c3
...
...
@@ -11,7 +11,7 @@ public class CarOneAreaIAnalysisSearchParam {
private
String
startTime
=
""
;
// 开始时间
private
String
endTime
=
""
;
// 结束时间
private
String
timeCondition
=
""
;
// 2018-03-02 17:02:00-2018-03-02 17:04:00 时间段
private
String
moduleId
=
"
"
;
// 模块名tollgate
private
String
moduleId
=
"
tollgate"
;
// 模块名
private
String
color
=
""
;
// 颜色代码
private
String
includedPlateNos
=
""
;
// 包含的号牌
private
String
laneDirection
=
""
;
// 车道方向代码
...
...
common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarPzAnalysisSearchParam.java
0 → 100644
View file @
6dfad6c3
package
com
.
founder
.
commonutils
.
carEntity
;
import
java.util.List
;
/**
* 车区域碰撞伴随参数
* @Author yangyang
* @Date 2021/04/12
*/
public
class
CarPzAnalysisSearchParam
{
private
String
taskId
;
// 任务编号
private
String
xxzjbh
;
// 信息主键编号
private
Integer
minCount
=
3
;
// 最低碰撞次数
private
String
plateNo
=
""
;
// 车辆号牌号码
private
String
plateColor
=
""
;
// 车辆号牌颜色
private
Integer
pageRecordNum
=
1000
;
//分页每页限制,即本次记录数
private
Integer
recordStartNo
=
0
;
// 分页开始位置
private
String
userName
;
// testUser 查询用户名(缓存和下载使用)
private
Integer
searchFlag
=
1
;
// 1查询,0分页
private
List
<
devicesGroups
>
devicesGroups
;
// 多地点数组
private
String
region
;
// 多地点名称数组
public
String
getTaskId
()
{
return
taskId
;
}
public
void
setTaskId
(
String
taskId
)
{
this
.
taskId
=
taskId
;
}
public
String
getXxzjbh
()
{
return
xxzjbh
;
}
public
void
setXxzjbh
(
String
xxzjbh
)
{
this
.
xxzjbh
=
xxzjbh
;
}
public
Integer
getMinCount
()
{
return
minCount
;
}
public
void
setMinCount
(
Integer
minCount
)
{
this
.
minCount
=
minCount
;
}
public
String
getPlateNo
()
{
return
plateNo
;
}
public
void
setPlateNo
(
String
plateNo
)
{
this
.
plateNo
=
plateNo
;
}
public
String
getPlateColor
()
{
return
plateColor
;
}
public
void
setPlateColor
(
String
plateColor
)
{
this
.
plateColor
=
plateColor
;
}
public
Integer
getPageRecordNum
()
{
return
pageRecordNum
;
}
public
void
setPageRecordNum
(
Integer
pageRecordNum
)
{
this
.
pageRecordNum
=
pageRecordNum
;
}
public
Integer
getRecordStartNo
()
{
return
recordStartNo
;
}
public
void
setRecordStartNo
(
Integer
recordStartNo
)
{
this
.
recordStartNo
=
recordStartNo
;
}
public
String
getUserName
()
{
return
userName
;
}
public
void
setUserName
(
String
userName
)
{
this
.
userName
=
userName
;
}
public
Integer
getSearchFlag
()
{
return
searchFlag
;
}
public
void
setSearchFlag
(
Integer
searchFlag
)
{
this
.
searchFlag
=
searchFlag
;
}
public
List
<
com
.
founder
.
commonutils
.
carEntity
.
devicesGroups
>
getDevicesGroups
()
{
return
devicesGroups
;
}
public
void
setDevicesGroups
(
List
<
com
.
founder
.
commonutils
.
carEntity
.
devicesGroups
>
devicesGroups
)
{
this
.
devicesGroups
=
devicesGroups
;
}
public
String
getRegion
()
{
return
region
;
}
public
void
setRegion
(
String
region
)
{
this
.
region
=
region
;
}
}
common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarPzAnalysisSearchResult.java
0 → 100644
View file @
6dfad6c3
package
com
.
founder
.
commonutils
.
carEntity
;
import
java.util.List
;
/**
* 车车伴随返回
* @Author yangyang
* @Date 2021/04/12
*/
public
class
CarPzAnalysisSearchResult
{
private
String
taskId
;
// 任务id
private
String
xxzjbh
;
// 任务结果表xxzjbh
private
String
amount
;
// 碰撞次数
private
List
<
String
>
devices
;
// 设备编号list
private
String
groupName
;
// 地点名称
private
String
period
;
//2021-04-01 14:02:07 ~ 2021-04-02 14:02:07",
private
String
plateColor
;
// 车牌颜色
private
String
plateId
;
// 编号
private
String
objectValue
;
// 车牌号码
public
String
getTaskId
()
{
return
taskId
;
}
public
void
setTaskId
(
String
taskId
)
{
this
.
taskId
=
taskId
;
}
public
String
getXxzjbh
()
{
return
xxzjbh
;
}
public
void
setXxzjbh
(
String
xxzjbh
)
{
this
.
xxzjbh
=
xxzjbh
;
}
public
String
getAmount
()
{
return
amount
;
}
public
void
setAmount
(
String
amount
)
{
this
.
amount
=
amount
;
}
public
List
<
String
>
getDevices
()
{
return
devices
;
}
public
void
setDevices
(
List
<
String
>
devices
)
{
this
.
devices
=
devices
;
}
public
String
getGroupName
()
{
return
groupName
;
}
public
void
setGroupName
(
String
groupName
)
{
this
.
groupName
=
groupName
;
}
public
String
getPeriod
()
{
return
period
;
}
public
void
setPeriod
(
String
period
)
{
this
.
period
=
period
;
}
public
String
getPlateColor
()
{
return
plateColor
;
}
public
void
setPlateColor
(
String
plateColor
)
{
this
.
plateColor
=
plateColor
;
}
public
String
getPlateId
()
{
return
plateId
;
}
public
void
setPlateId
(
String
plateId
)
{
this
.
plateId
=
plateId
;
}
public
String
getObjectValue
()
{
return
objectValue
;
}
public
void
setObjectValue
(
String
objectValue
)
{
this
.
objectValue
=
objectValue
;
}
}
common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarQyPzAndTaskSearchParam.java
0 → 100644
View file @
6dfad6c3
package
com
.
founder
.
commonutils
.
carEntity
;
import
java.io.Serializable
;
/**
* 车区域碰撞任务参数
* @Author yangyang
* @Date 2021/04/12
*/
public
class
CarQyPzAndTaskSearchParam
implements
Serializable
{
private
AreaInfo
areaInfo
;
private
RegionalsTask
regionalsTask
;
public
AreaInfo
getAreaInfo
()
{
return
areaInfo
;
}
public
void
setAreaInfo
(
AreaInfo
areaInfo
)
{
this
.
areaInfo
=
areaInfo
;
}
public
RegionalsTask
getRegionalsTask
()
{
return
regionalsTask
;
}
public
void
setRegionalsTask
(
RegionalsTask
regionalsTask
)
{
this
.
regionalsTask
=
regionalsTask
;
}
}
common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarReceiving.java
View file @
6dfad6c3
...
...
@@ -36,4 +36,84 @@ public class CarReceiving {
@ApiModelProperty
(
"区域名称"
)
private
String
region
;
private
List
<
CarKkInfo
>
lists
;
public
String
getObjectValue
()
{
return
objectValue
;
}
public
void
setObjectValue
(
String
objectValue
)
{
this
.
objectValue
=
objectValue
;
}
public
String
getKssj
()
{
return
kssj
;
}
public
void
setKssj
(
String
kssj
)
{
this
.
kssj
=
kssj
;
}
public
String
getJssj
()
{
return
jssj
;
}
public
void
setJssj
(
String
jssj
)
{
this
.
jssj
=
jssj
;
}
public
String
getObjectType
()
{
return
objectType
;
}
public
void
setObjectType
(
String
objectType
)
{
this
.
objectType
=
objectType
;
}
public
String
getCaseId
()
{
return
caseId
;
}
public
void
setCaseId
(
String
caseId
)
{
this
.
caseId
=
caseId
;
}
public
String
getCaseName
()
{
return
caseName
;
}
public
void
setCaseName
(
String
caseName
)
{
this
.
caseName
=
caseName
;
}
public
String
getUsername
()
{
return
username
;
}
public
void
setUsername
(
String
username
)
{
this
.
username
=
username
;
}
public
String
getTaskId
()
{
return
taskId
;
}
public
void
setTaskId
(
String
taskId
)
{
this
.
taskId
=
taskId
;
}
public
String
getRegion
()
{
return
region
;
}
public
void
setRegion
(
String
region
)
{
this
.
region
=
region
;
}
public
List
<
CarKkInfo
>
getLists
()
{
return
lists
;
}
public
void
setLists
(
List
<
CarKkInfo
>
lists
)
{
this
.
lists
=
lists
;
}
}
common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarRy.java
View file @
6dfad6c3
...
...
@@ -39,4 +39,100 @@ public class CarRy {
private
String
hjdqhdz
;
@ApiModelProperty
(
"出生日期"
)
private
String
csrq
;
public
String
getXm
()
{
return
xm
;
}
public
void
setXm
(
String
xm
)
{
this
.
xm
=
xm
;
}
public
String
getMz
()
{
return
mz
;
}
public
void
setMz
(
String
mz
)
{
this
.
mz
=
mz
;
}
public
String
getXb
()
{
return
xb
;
}
public
void
setXb
(
String
xb
)
{
this
.
xb
=
xb
;
}
public
String
getSfzhm
()
{
return
sfzhm
;
}
public
void
setSfzhm
(
String
sfzhm
)
{
this
.
sfzhm
=
sfzhm
;
}
public
String
getCsdzmc
()
{
return
csdzmc
;
}
public
void
setCsdzmc
(
String
csdzmc
)
{
this
.
csdzmc
=
csdzmc
;
}
public
String
getXzzdzmc
()
{
return
xzzdzmc
;
}
public
void
setXzzdzmc
(
String
xzzdzmc
)
{
this
.
xzzdzmc
=
xzzdzmc
;
}
public
String
getImg
()
{
return
img
;
}
public
void
setImg
(
String
img
)
{
this
.
img
=
img
;
}
public
String
getPhone
()
{
return
phone
;
}
public
void
setPhone
(
String
phone
)
{
this
.
phone
=
phone
;
}
public
String
getObjValue
()
{
return
objValue
;
}
public
void
setObjValue
(
String
objValue
)
{
this
.
objValue
=
objValue
;
}
public
String
getCarType
()
{
return
carType
;
}
public
void
setCarType
(
String
carType
)
{
this
.
carType
=
carType
;
}
public
String
getHjdqhdz
()
{
return
hjdqhdz
;
}
public
void
setHjdqhdz
(
String
hjdqhdz
)
{
this
.
hjdqhdz
=
hjdqhdz
;
}
public
String
getCsrq
()
{
return
csrq
;
}
public
void
setCsrq
(
String
csrq
)
{
this
.
csrq
=
csrq
;
}
}
common/common_utils/src/main/java/com/founder/commonutils/carEntity/QgjdcModel.java
View file @
6dfad6c3
...
...
@@ -115,4 +115,284 @@ public class QgjdcModel {
// 暂住证/拘留证号
private
String
zzzjlzh
=
null
;
public
String
getSwsj
()
{
return
swsj
;
}
public
void
setSwsj
(
String
swsj
)
{
this
.
swsj
=
swsj
;
}
public
String
getCcrq
()
{
return
ccrq
;
}
public
void
setCcrq
(
String
ccrq
)
{
this
.
ccrq
=
ccrq
;
}
public
String
getCllx
()
{
return
cllx
;
}
public
void
setCllx
(
String
cllx
)
{
this
.
cllx
=
cllx
;
}
public
String
getClpp1
()
{
return
clpp1
;
}
public
void
setClpp1
(
String
clpp1
)
{
this
.
clpp1
=
clpp1
;
}
public
String
getClpp2
()
{
return
clpp2
;
}
public
void
setClpp2
(
String
clpp2
)
{
this
.
clpp2
=
clpp2
;
}
public
String
getClsbdh
()
{
return
clsbdh
;
}
public
void
setClsbdh
(
String
clsbdh
)
{
this
.
clsbdh
=
clsbdh
;
}
public
String
getClxh
()
{
return
clxh
;
}
public
void
setClxh
(
String
clxh
)
{
this
.
clxh
=
clxh
;
}
public
String
getCsys
()
{
return
csys
;
}
public
void
setCsys
(
String
csys
)
{
this
.
csys
=
csys
;
}
public
String
getDjzsbh
()
{
return
djzsbh
;
}
public
void
setDjzsbh
(
String
djzsbh
)
{
this
.
djzsbh
=
djzsbh
;
}
public
String
getDjzzxz
()
{
return
djzzxz
;
}
public
void
setDjzzxz
(
String
djzzxz
)
{
this
.
djzzxz
=
djzzxz
;
}
public
String
getFdjh
()
{
return
fdjh
;
}
public
void
setFdjh
(
String
fdjh
)
{
this
.
fdjh
=
fdjh
;
}
public
String
getFdjxh
()
{
return
fdjxh
;
}
public
void
setFdjxh
(
String
fdjxh
)
{
this
.
fdjxh
=
fdjxh
;
}
public
String
getFpjg
()
{
return
fpjg
;
}
public
void
setFpjg
(
String
fpjg
)
{
this
.
fpjg
=
fpjg
;
}
public
String
getGcjk
()
{
return
gcjk
;
}
public
void
setGcjk
(
String
gcjk
)
{
this
.
gcjk
=
gcjk
;
}
public
String
getGl
()
{
return
gl
;
}
public
void
setGl
(
String
gl
)
{
this
.
gl
=
gl
;
}
public
String
getHdzk
()
{
return
hdzk
;
}
public
void
setHdzk
(
String
hdzk
)
{
this
.
hdzk
=
hdzk
;
}
public
String
getHdzzl
()
{
return
hdzzl
;
}
public
void
setHdzzl
(
String
hdzzl
)
{
this
.
hdzzl
=
hdzzl
;
}
public
String
getHphm
()
{
return
hphm
;
}
public
void
setHphm
(
String
hphm
)
{
this
.
hphm
=
hphm
;
}
public
String
getHpzl
()
{
return
hpzl
;
}
public
void
setHpzl
(
String
hpzl
)
{
this
.
hpzl
=
hpzl
;
}
public
String
getJdcsyr
()
{
return
jdcsyr
;
}
public
void
setJdcsyr
(
String
jdcsyr
)
{
this
.
jdcsyr
=
jdcsyr
;
}
public
String
getJdczt
()
{
return
jdczt
;
}
public
void
setJdczt
(
String
jdczt
)
{
this
.
jdczt
=
jdczt
;
}
public
String
getLxfs
()
{
return
lxfs
;
}
public
void
setLxfs
(
String
lxfs
)
{
this
.
lxfs
=
lxfs
;
}
public
String
getPl
()
{
return
pl
;
}
public
void
setPl
(
String
pl
)
{
this
.
pl
=
pl
;
}
public
String
getRlzl
()
{
return
rlzl
;
}
public
void
setRlzl
(
String
rlzl
)
{
this
.
rlzl
=
rlzl
;
}
public
String
getSfzh
()
{
return
sfzh
;
}
public
void
setSfzh
(
String
sfzh
)
{
this
.
sfzh
=
sfzh
;
}
public
String
getSfzjzl
()
{
return
sfzjzl
;
}
public
void
setSfzjzl
(
String
sfzjzl
)
{
this
.
sfzjzl
=
sfzjzl
;
}
public
String
getZqyzl
()
{
return
zqyzl
;
}
public
void
setZqyzl
(
String
zqyzl
)
{
this
.
zqyzl
=
zqyzl
;
}
public
String
getZrrq
()
{
return
zrrq
;
}
public
void
setZrrq
(
String
zrrq
)
{
this
.
zrrq
=
zrrq
;
}
public
String
getZzamc
()
{
return
zzamc
;
}
public
void
setZzamc
(
String
zzamc
)
{
this
.
zzamc
=
zzamc
;
}
public
String
getZzdzqh
()
{
return
zzdzqh
;
}
public
void
setZzdzqh
(
String
zzdzqh
)
{
this
.
zzdzqh
=
zzdzqh
;
}
public
String
getZzdzxz
()
{
return
zzdzxz
;
}
public
void
setZzdzxz
(
String
zzdzxz
)
{
this
.
zzdzxz
=
zzdzxz
;
}
public
String
getZzg
()
{
return
zzg
;
}
public
void
setZzg
(
String
zzg
)
{
this
.
zzg
=
zzg
;
}
public
String
getZzl
()
{
return
zzl
;
}
public
void
setZzl
(
String
zzl
)
{
this
.
zzl
=
zzl
;
}
public
String
getZzqh
()
{
return
zzqh
;
}
public
void
setZzqh
(
String
zzqh
)
{
this
.
zzqh
=
zzqh
;
}
public
String
getZzzjlzh
()
{
return
zzzjlzh
;
}
public
void
setZzzjlzh
(
String
zzzjlzh
)
{
this
.
zzzjlzh
=
zzzjlzh
;
}
}
common/common_utils/src/main/java/com/founder/commonutils/carEntity/TbStRegionalstaskresult.java
0 → 100644
View file @
6dfad6c3
package
com
.
founder
.
commonutils
.
carEntity
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
java.util.Date
;
/**
* Created by yy on 2021/04/14
* 时空结果表---用于存储各种接口返回的解析数据
*/
@ApiModel
public
class
TbStRegionalstaskresult
{
@ApiModelProperty
(
"信息主键编号"
)
private
String
xxzjbh
;
@ApiModelProperty
(
"任务id"
)
private
String
task_id
;
@ApiModelProperty
(
"对象类型代码"
)
private
String
object_type
;
@ApiModelProperty
(
"对象类型"
)
private
String
object_type_name
;
@ApiModelProperty
(
"对象值"
)
private
String
object_value
;
@ApiModelProperty
(
"区域名称"
)
private
String
region
;
@ApiModelProperty
(
"区域列表"
)
private
String
regionList
;
@ApiModelProperty
(
"徘徊次数"
)
private
String
count
;
@ApiModelProperty
(
"是否翻译"
)
private
String
sf_check
;
//0(请求失败)1(请求成功有翻译数据) 2(请求成功无翻译数据)3(该结果不需要翻译)
@ApiModelProperty
(
"当前页"
)
private
int
page
;
private
int
rownum
=
10
;
@ApiModelProperty
(
"卡口类型"
)
private
String
apetype
;
@ApiModelProperty
(
"卡口类型名称"
)
private
String
apetypeMc
;
@ApiModelProperty
(
"卡口照片"
)
private
String
kkUrlPic
;
@ApiModelProperty
(
"X"
)
private
String
x
;
@ApiModelProperty
(
"Y"
)
private
String
y
;
@ApiModelProperty
(
"每页几条"
)
private
String
limit
;
//0(请求失败)1(请求成功有翻译数据) 2(请求成功无翻译数据)3(该结果不需要翻译)
@ApiModelProperty
(
"分类"
)
private
String
flbz
;
//0(请求失败)1(请求成功有翻译数据) 2(请求成功无翻译数据)3(该结果不需要翻译)
@ApiModelProperty
(
"分类数量"
)
private
String
flcount
;
@ApiModelProperty
(
"级别"
)
private
String
levels
;
@ApiModelProperty
(
"二级名称"
)
private
String
pid
;
@ApiModelProperty
(
"flag徘徊"
)
private
String
flag
;
@ApiModelProperty
(
"通过卡口时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
time
;
//通过卡口时间
@ApiModelProperty
(
"通过卡口时间"
)
private
String
timeGet
;
//通过卡口时间
private
int
begin
;
private
int
end
;
private
String
sabz
;
public
String
getTimeGet
()
{
return
timeGet
;
}
public
void
setTimeGet
(
String
timeGet
)
{
this
.
timeGet
=
timeGet
;
}
public
String
getSabz
()
{
return
sabz
;
}
public
void
setSabz
(
String
sabz
)
{
this
.
sabz
=
sabz
;
}
public
String
getLevels
()
{
return
levels
;
}
public
void
setLevels
(
String
levels
)
{
this
.
levels
=
levels
;
}
public
String
getPid
()
{
return
pid
;
}
public
void
setPid
(
String
pid
)
{
this
.
pid
=
pid
;
}
public
int
getBegin
()
{
return
begin
;
}
public
int
getEnd
()
{
return
end
;
}
public
String
getFlbz
()
{
return
flbz
;
}
public
void
setFlbz
(
String
flbz
)
{
this
.
flbz
=
flbz
;
}
public
String
getFlcount
()
{
return
flcount
;
}
public
void
setFlcount
(
String
flcount
)
{
this
.
flcount
=
flcount
;
}
public
String
getXxzjbh
()
{
return
xxzjbh
;
}
public
void
setXxzjbh
(
String
xxzjbh
)
{
this
.
xxzjbh
=
xxzjbh
;
}
public
String
getTask_id
()
{
return
task_id
;
}
public
void
setTask_id
(
String
task_id
)
{
this
.
task_id
=
task_id
;
}
public
String
getObject_type
()
{
return
object_type
;
}
public
void
setObject_type
(
String
object_type
)
{
this
.
object_type
=
object_type
;
}
public
String
getObject_type_name
()
{
return
object_type_name
;
}
public
void
setObject_type_name
(
String
object_type_name
)
{
this
.
object_type_name
=
object_type_name
;
}
public
String
getObject_value
()
{
return
object_value
;
}
public
void
setObject_value
(
String
object_value
)
{
this
.
object_value
=
object_value
;
}
public
String
getRegion
()
{
return
region
;
}
public
void
setRegion
(
String
region
)
{
this
.
region
=
region
;
}
public
String
getRegionList
()
{
return
regionList
;
}
public
void
setRegionList
(
String
regionList
)
{
this
.
regionList
=
regionList
;
}
public
String
getSf_check
()
{
return
sf_check
;
}
public
void
setSf_check
(
String
sf_check
)
{
this
.
sf_check
=
sf_check
;
}
public
String
getCount
()
{
return
count
;
}
public
void
setCount
(
String
count
)
{
this
.
count
=
count
;
}
public
int
getPage
()
{
return
page
;
}
public
void
setPage
(
int
page
)
{
this
.
page
=
page
;
}
public
int
getRownum
()
{
return
rownum
;
}
public
void
setRownum
(
int
rownum
)
{
this
.
rownum
=
rownum
;
}
public
void
setBegin
(
int
begin
)
{
this
.
begin
=
begin
;
}
public
void
setEnd
(
int
end
)
{
this
.
end
=
end
;
}
public
String
getLimit
()
{
return
limit
;
}
public
void
setLimit
(
String
limit
)
{
this
.
limit
=
limit
;
}
public
String
getX
()
{
return
x
;
}
public
void
setX
(
String
x
)
{
this
.
x
=
x
;
}
public
String
getY
()
{
return
y
;
}
public
void
setY
(
String
y
)
{
this
.
y
=
y
;
}
public
String
getApetype
()
{
return
apetype
;
}
public
void
setApetype
(
String
apetype
)
{
this
.
apetype
=
apetype
;
}
public
String
getApetypeMc
()
{
return
apetypeMc
;
}
public
void
setApetypeMc
(
String
apetypeMc
)
{
this
.
apetypeMc
=
apetypeMc
;
}
public
String
getKkUrlPic
()
{
return
kkUrlPic
;
}
public
void
setKkUrlPic
(
String
kkUrlPic
)
{
this
.
kkUrlPic
=
kkUrlPic
;
}
public
String
getFlag
()
{
return
flag
;
}
public
void
setFlag
(
String
flag
)
{
this
.
flag
=
flag
;
}
public
Date
getTime
()
{
return
time
;
}
public
void
setTime
(
Date
time
)
{
this
.
time
=
time
;
}
@Override
public
String
toString
()
{
return
"TbStRegionalstaskresult{"
+
"xxzjbh='"
+
xxzjbh
+
'\''
+
", task_id='"
+
task_id
+
'\''
+
", object_type='"
+
object_type
+
'\''
+
", object_type_name='"
+
object_type_name
+
'\''
+
", object_value='"
+
object_value
+
'\''
+
", region='"
+
region
+
'\''
+
", regionList='"
+
regionList
+
'\''
+
", count='"
+
count
+
'\''
+
", sf_check='"
+
sf_check
+
'\''
+
", page='"
+
page
+
'\''
+
", apetype='"
+
apetype
+
'\''
+
", apetypeMc='"
+
apetypeMc
+
'\''
+
", kkUrlPic='"
+
kkUrlPic
+
'\''
+
", x='"
+
x
+
'\''
+
", y='"
+
y
+
'\''
+
", limit='"
+
limit
+
'\''
+
", flbz='"
+
flbz
+
'\''
+
", flcount='"
+
flcount
+
'\''
+
", levels='"
+
levels
+
'\''
+
", pid='"
+
pid
+
'\''
+
", flag='"
+
flag
+
'\''
+
", time="
+
time
+
", timeGet='"
+
timeGet
+
'\''
+
", begin='"
+
begin
+
'\''
+
", end='"
+
end
+
'\''
+
", sabz='"
+
sabz
+
'\''
+
'}'
;
}
public
void
setPagePara
(
Integer
rows
){
if
(
rows
!=
null
){
this
.
begin
=
(
this
.
page
-
1
)
*
rows
;
this
.
end
=
this
.
page
*
rows
;
}
else
{
this
.
begin
=
(
this
.
page
-
1
)
*
rownum
;
this
.
end
=
this
.
page
*
rownum
;
}
}
}
common/common_utils/src/main/java/com/founder/commonutils/carEntity/TrackYsModelCondition.java
0 → 100644
View file @
6dfad6c3
package
com
.
founder
.
commonutils
.
carEntity
;
import
java.util.List
;
/**
* Created by Founder on 2019/6/27.
* 轨迹疑似停留点实体表
*/
public
class
TrackYsModelCondition
{
private
String
kssj
;
//轨迹开始时间
private
String
jssj
;
//轨迹结束时间
private
String
userName
;
//当前登录人
private
String
hm
;
//号码,如手机号码
private
List
<
TrackYstldCondition
>
returnStr
;
//地图传过来的轨迹数据
public
String
getKssj
()
{
return
kssj
;
}
public
void
setKssj
(
String
kssj
)
{
this
.
kssj
=
kssj
;
}
public
String
getUserName
()
{
return
userName
;
}
public
void
setUserName
(
String
userName
)
{
this
.
userName
=
userName
;
}
public
String
getHm
()
{
return
hm
;
}
public
void
setHm
(
String
hm
)
{
this
.
hm
=
hm
;
}
public
String
getJssj
()
{
return
jssj
;
}
public
void
setJssj
(
String
jssj
)
{
this
.
jssj
=
jssj
;
}
public
List
<
TrackYstldCondition
>
getReturnStr
()
{
return
returnStr
;
}
public
void
setReturnStr
(
List
<
TrackYstldCondition
>
returnStr
)
{
this
.
returnStr
=
returnStr
;
}
}
common/common_utils/src/main/java/com/founder/commonutils/carEntity/TrackYstldCondition.java
0 → 100644
View file @
6dfad6c3
package
com
.
founder
.
commonutils
.
carEntity
;
import
java.util.List
;
/**
* Created by Founder on 2019/6/27.
* 轨迹疑似停留点实体表
*/
public
class
TrackYstldCondition
implements
Comparable
<
TrackYstldCondition
>{
private
String
objValue
;
// 车号或者手机号
private
String
kssj
;
//开始时间年月日
private
String
jssj
;
//结束时间
private
String
x
;
//经度
private
String
y
;
//纬度
private
long
timestamp
;
// 10位时间戳
private
String
address
;
// 地址
private
int
weeb
;
// 星期几
private
int
hour
;
// 几点
private
String
timeQuantum
;
// 时间段
public
String
getObjValue
()
{
return
objValue
;
}
public
void
setObjValue
(
String
objValue
)
{
this
.
objValue
=
objValue
;
}
public
String
getKssj
()
{
return
kssj
;
}
public
void
setKssj
(
String
kssj
)
{
this
.
kssj
=
kssj
;
}
public
String
getJssj
()
{
return
jssj
;
}
public
void
setJssj
(
String
jssj
)
{
this
.
jssj
=
jssj
;
}
public
String
getX
()
{
return
x
;
}
public
void
setX
(
String
x
)
{
this
.
x
=
x
;
}
public
String
getY
()
{
return
y
;
}
public
void
setY
(
String
y
)
{
this
.
y
=
y
;
}
public
long
getTimestamp
()
{
return
timestamp
;
}
public
void
setTimestamp
(
long
timestamp
)
{
this
.
timestamp
=
timestamp
;
}
public
String
getAddress
()
{
return
address
;
}
public
void
setAddress
(
String
address
)
{
this
.
address
=
address
;
}
public
int
getWeeb
()
{
return
weeb
;
}
public
void
setWeeb
(
int
weeb
)
{
this
.
weeb
=
weeb
;
}
public
int
getHour
()
{
return
hour
;
}
public
void
setHour
(
int
hour
)
{
this
.
hour
=
hour
;
}
public
String
getTimeQuantum
()
{
return
timeQuantum
;
}
public
void
setTimeQuantum
(
String
timeQuantum
)
{
this
.
timeQuantum
=
timeQuantum
;
}
@Override
public
int
compareTo
(
TrackYstldCondition
o
)
{
return
(
int
)
this
.
getTimestamp
()-(
int
)
o
.
getTimestamp
();
}
}
common/common_utils/src/main/java/com/founder/commonutils/carEntity/TrackYstldResult.java
0 → 100644
View file @
6dfad6c3
package
com
.
founder
.
commonutils
.
carEntity
;
/**
* Created by Founder on 2021/04/14.
* 轨迹疑似停留点实体表
*/
public
class
TrackYstldResult
implements
Comparable
<
TrackYstldResult
>{
private
String
x
;
//经度
private
String
y
;
//纬度
private
String
tlsjStr
;
//停留时间差
private
int
tlsj
;
private
int
count
;
//停留次数
private
String
address
;
//地址
private
long
kssj
;
//开始时间时间戳
private
String
isAll
;
//isAll为1代表它既是停留时间最长,又是抓取次数最多的
public
String
getIsAll
()
{
return
isAll
;
}
public
void
setIsAll
(
String
isAll
)
{
this
.
isAll
=
isAll
;
}
public
long
getKssj
()
{
return
kssj
;
}
public
void
setKssj
(
long
kssj
)
{
this
.
kssj
=
kssj
;
}
public
String
getX
()
{
return
x
;
}
public
void
setX
(
String
x
)
{
this
.
x
=
x
;
}
public
String
getY
()
{
return
y
;
}
public
void
setY
(
String
y
)
{
this
.
y
=
y
;
}
public
String
getTlsjStr
()
{
return
tlsjStr
;
}
public
void
setTlsjStr
(
String
tlsjStr
)
{
this
.
tlsjStr
=
tlsjStr
;
}
public
int
getTlsj
()
{
return
tlsj
;
}
public
void
setTlsj
(
int
tlsj
)
{
this
.
tlsj
=
tlsj
;
}
public
int
getCount
()
{
return
count
;
}
public
void
setCount
(
int
count
)
{
this
.
count
=
count
;
}
public
String
getAddress
()
{
return
address
;
}
public
void
setAddress
(
String
address
)
{
this
.
address
=
address
;
}
@Override
public
int
compareTo
(
TrackYstldResult
o
)
{
//重写Comparable接口的compareTo方法,
return
o
.
getTlsj
()-
this
.
getTlsj
();
// 根据停留时间降序排列,升序修改相减顺序即可
}
}
common/common_utils/src/main/java/com/founder/commonutils/carEntity/devicesGroups.java
0 → 100644
View file @
6dfad6c3
package
com
.
founder
.
commonutils
.
carEntity
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
java.util.List
;
/**
* @ClassName: Regional
* @Auther: yy
* @Description: 任务-车碰撞
* @CreateDate: 2021/04/10
* @Version: 1.0
*/
@ApiModel
public
class
devicesGroups
{
@ApiModelProperty
(
"地点名称"
)
private
String
groupName
;
// 地点名称
@ApiModelProperty
(
"设备编号"
)
private
List
<
String
>
devices
;
// 多个设备组成的地点区域
@ApiModelProperty
(
"开始时间"
)
private
String
startTime
;
// 开始时间
@ApiModelProperty
(
"结束时间"
)
private
String
endTime
;
// 结束时间
public
String
getGroupName
()
{
return
groupName
;
}
public
void
setGroupName
(
String
groupName
)
{
this
.
groupName
=
groupName
;
}
public
List
<
String
>
getDevices
()
{
return
devices
;
}
public
void
setDevices
(
List
<
String
>
devices
)
{
this
.
devices
=
devices
;
}
public
String
getStartTime
()
{
return
startTime
;
}
public
void
setStartTime
(
String
startTime
)
{
this
.
startTime
=
startTime
;
}
public
String
getEndTime
()
{
return
endTime
;
}
public
void
setEndTime
(
String
endTime
)
{
this
.
endTime
=
endTime
;
}
}
common/common_utils/src/main/java/com/founder/commonutils/carEntity/reslutFl.java
0 → 100644
View file @
6dfad6c3
package
com
.
founder
.
commonutils
.
carEntity
;
import
io.swagger.annotations.ApiModelProperty
;
import
java.util.List
;
public
class
reslutFl
{
@ApiModelProperty
(
"分类"
)
private
String
flbz
;
//0(请求失败)1(请求成功有翻译数据) 2(请求成功无翻译数据)3(该结果不需要翻译)
@ApiModelProperty
(
"徘徊分类"
)
private
List
<
String
>
flbzs
;
//0(请求失败)1(请求成功有翻译数据) 2(请求成功无翻译数据)3(该结果不需要翻译)
@ApiModelProperty
(
"分类数量"
)
private
String
flcount
;
@ApiModelProperty
(
"级别"
)
private
String
levels
;
@ApiModelProperty
(
"二级名称"
)
private
String
pid
;
public
List
<
String
>
getFlbzs
()
{
return
flbzs
;
}
public
void
setFlbzs
(
List
<
String
>
flbzs
)
{
this
.
flbzs
=
flbzs
;
}
public
String
getFlbz
()
{
return
flbz
;
}
public
void
setFlbz
(
String
flbz
)
{
this
.
flbz
=
flbz
;
}
public
String
getFlcount
()
{
return
flcount
;
}
public
void
setFlcount
(
String
flcount
)
{
this
.
flcount
=
flcount
;
}
public
String
getLevels
()
{
return
levels
;
}
public
void
setLevels
(
String
levels
)
{
this
.
levels
=
levels
;
}
public
String
getPid
()
{
return
pid
;
}
public
void
setPid
(
String
pid
)
{
this
.
pid
=
pid
;
}
}
common/common_utils/src/main/java/com/founder/commonutils/util/DataUtil.java
View file @
6dfad6c3
package
com
.
founder
.
commonutils
.
util
;
import
com.founder.commonutils.peopleEntity.FaceSearchResult
;
import
java.text.DateFormat
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
/**
* @Author y
y
* @Author y
anru
* @Date 2020/4/2618:12
*/
public
class
DataUtil
{
...
...
@@ -319,5 +319,46 @@ public class DataUtil {
return
age
;
}
//计算时间差 传一个时间戳
public
static
String
dateStr
(
long
diff
){
DateFormat
df
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
String
result
=
""
;
try
{
// Date d1 = df.parse(endDate);
//Date d2 = df.parse(beginDate);
/* long diff = d1.getTime() - d2.getTime();//这样得到的差值是微秒级别
long days = diff / (1000 * 60 * 60 * 24);
long hours = (diff-days*(1000 * 60 * 60 * 24))/(1000* 60 * 60);
long minutes = (diff-days*(1000 * 60 * 60 * 24)-hours*(1000* 60 * 60))/(1000* 60);
result=""+days+"天"+hours+"小时"+minutes+"分";
System.out.println(""+days+"天"+hours+"小时"+minutes+"分");*/
//计算时间差
//计算天数
long
days
=
diff
/
(
1000
*
60
*
60
*
24
);
//计算小时
long
hours
=
(
diff
%
(
1000
*
60
*
60
*
24
))
/
(
1000
*
60
*
60
);
//计算分钟
long
minutes
=
(
diff
%
(
1000
*
60
*
60
))
/
(
1000
*
60
);
//计算秒
long
seconds
=
(
diff
%
(
1000
*
60
))
/
1000
;
//输出
if
(
days
>
0
){
result
=
days
+
"天"
;
}
if
(
hours
>
0
){
result
+=
hours
+
"小时"
;
}
if
(
minutes
>
0
){
result
+=
minutes
+
"分"
;
}
if
(
seconds
>
0
){
result
+=
seconds
+
"秒"
;
}
}
catch
(
Exception
e
)
{
}
return
result
;
}
}
common/common_utils/src/main/java/com/founder/commonutils/util/JsonUtils.java
0 → 100644
View file @
6dfad6c3
package
com
.
founder
.
commonutils
.
util
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.parser.Feature
;
import
org.springframework.core.io.ClassPathResource
;
import
java.io.IOException
;
import
java.lang.reflect.Type
;
import
java.nio.charset.StandardCharsets
;
/**
* Created by admin on 2020/9/11.
*/
public
class
JsonUtils
{
public
static
<
T
>
T
readJsonFromClassPath
(
String
path
,
Type
type
)
throws
IOException
{
ClassPathResource
resource
=
new
ClassPathResource
(
path
);
if
(
resource
.
exists
())
{
return
JSON
.
parseObject
(
resource
.
getInputStream
(),
StandardCharsets
.
UTF_8
,
type
,
// 自动关闭流
Feature
.
AutoCloseSource
,
// 允许注释
Feature
.
AllowComment
,
// 允许单引号
Feature
.
AllowSingleQuotes
,
// 使用 Big decimal
Feature
.
UseBigDecimal
);
}
else
{
throw
new
IOException
();
}
}
}
service/asj/src/main/resources/bootstrap.properties
View file @
6dfad6c3
#配置中心地址
#
spring.cloud.nacos.config.server-addr=47.92.48.137:8848
#
spring.cloud.nacos.discovery.server-addr=47.92.48.137:8848
spring.cloud.nacos.config.server-addr
=
47.92.48.137:8848
spring.cloud.nacos.discovery.server-addr
=
47.92.48.137:8848
spring.cloud.nacos.config.server-addr
=
26.3.13.184:8848
spring.cloud.nacos.discovery.server-addr
=
26.3.13.184:8848
#
spring.cloud.nacos.config.server-addr=26.3.13.184:8848
#
spring.cloud.nacos.discovery.server-addr=26.3.13.184:8848
spring.profiles.active
=
prod
spring.profiles.active
=
dev
# 该配置影响统一配置中心中的dataId
spring.application.name
=
asj
#dev
#spring.cloud.nacos.config.namespace=052aa986-5c18-4013-a91a-583dc01aaf8b
#prod
spring.cloud.nacos.config.namespace
=
prod
spring.cloud.nacos.config.namespace
=
dev
#spring.cloud.nacos.config.ext-config[0].data-id=image.properties
# 开启动态刷新配置,否则配置文件修改,工程无法感知
...
...
service/es/src/main/java/com/founder/eszy/controller/EsExtractController.java
View file @
6dfad6c3
...
...
@@ -6,6 +6,8 @@ import com.founder.eszy.esExtract.EsTbZyCameraTranslation;
import
com.founder.eszy.esExtract.EsTbZyJzxxTranslation
;
import
com.founder.eszy.esExtract.EsTbZyKkxxTranslation
;
import
com.founder.eszy.esSearch.EsSearch
;
import
com.founder.servicebase.logs.OperLog
;
import
com.founder.servicebase.logs.OperationType
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
...
...
@@ -31,6 +33,7 @@ public class EsExtractController {
@Value
(
"${camera_index}"
)
private
String
camera_index
;
//基站
@OperLog
(
message
=
"基站es全量抽取"
,
operation
=
OperationType
.
QUERY
)
@ApiOperation
(
value
=
"基站es全量抽取"
)
@GetMapping
(
"/jzxx"
)
public
MapRestResult
jzxx
()
{
...
...
@@ -45,6 +48,7 @@ public class EsExtractController {
}
//卡口
@OperLog
(
message
=
"卡口es全量抽取"
,
operation
=
OperationType
.
QUERY
)
@ApiOperation
(
value
=
"卡口es全量抽取"
)
@GetMapping
(
"/kkxx"
)
public
MapRestResult
kkxx
()
{
...
...
service/es/src/main/java/com/founder/eszy/controller/EsQueryController.java
View file @
6dfad6c3
...
...
@@ -6,6 +6,8 @@ import com.founder.commonutils.publicEntity.RequestBean;
import
com.founder.eszy.esSearch.EsTbZyCameraTranslationQuery
;
import
com.founder.eszy.esSearch.EsTbZyJzxxTranslationQuery
;
import
com.founder.eszy.esSearch.EsTbZyKkxxTranslationQuery
;
import
com.founder.servicebase.logs.OperLog
;
import
com.founder.servicebase.logs.OperationType
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.StringUtils
;
...
...
@@ -28,6 +30,7 @@ public class EsQueryController {
@Autowired
private
EsTbZyCameraTranslationQuery
esTbZyCameraTranslationQuery
;
//基站搜索
@OperLog
(
message
=
"基站查询"
,
operation
=
OperationType
.
QUERY
)
@ApiOperation
(
value
=
"基站查询"
)
@RequestMapping
(
value
=
"/getTbZyJzxxList"
,
method
=
RequestMethod
.
POST
)
public
MapRestResult
getTbZyJzxxList
(
@RequestBody
RequestBean
bean
)
throws
Exception
{
...
...
@@ -64,6 +67,7 @@ public class EsQueryController {
}
}
//基站搜索
@OperLog
(
message
=
"卡口查询"
,
operation
=
OperationType
.
QUERY
)
@ApiOperation
(
value
=
"卡口查询"
)
@RequestMapping
(
value
=
"/getTbZyKkxxList"
,
method
=
RequestMethod
.
POST
)
public
MapRestResult
getTbZyKkxxList
(
@RequestBody
RequestBean
bean
)
throws
Exception
{
...
...
service/es/src/main/resources/bootstrap.properties
View file @
6dfad6c3
...
...
@@ -2,14 +2,14 @@
spring.cloud.nacos.config.server-addr
=
47.92.48.137:8848
spring.cloud.nacos.discovery.server-addr
=
47.92.48.137:8848
#spring.cloud.nacos.config.server-addr=26.3.13.184:8848
#spring.cloud.nacos.discovery.server-addr=26.3.13.184:8848
spring.profiles.active
=
dev
# 该配置影响统一配置中心中的dataId
spring.application.name
=
es
#dev
spring.cloud.nacos.config.namespace
=
052aa986-5c18-4013-a91a-583dc01aaf8b
#prod
#spring.cloud.nacos.config.namespace=1ffd9d32-3f03-4eb8-bf12-98b1ce397390
spring.cloud.nacos.config.namespace
=
dev
#spring.cloud.nacos.config.ext-config[0].data-id=image.properties
# 开启动态刷新配置,否则配置文件修改,工程无法感知
...
...
service/pom.xml
View file @
6dfad6c3
...
...
@@ -89,10 +89,24 @@
<artifactId>
velocity-engine-core
</artifactId>
</dependency>
<!-- 引入spring-data-elasticsearch-->
<!--
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
</dependency>
-->
<dependency>
<groupId>
org.elasticsearch
</groupId>
<artifactId>
elasticsearch
</artifactId>
<version>
6.4.3
</version>
</dependency>
<dependency>
<groupId>
org.elasticsearch.client
</groupId>
<artifactId>
transport
</artifactId>
<version>
6.4.3
</version>
</dependency>
<!--spring切面aop依赖-->
<dependency>
<groupId>
org.springframework.boot
</groupId>
...
...
service/publicapi/src/main/resources/bootstrap.properties
View file @
6dfad6c3
...
...
@@ -2,14 +2,14 @@
spring.cloud.nacos.config.server-addr
=
47.92.48.137:8848
spring.cloud.nacos.discovery.server-addr
=
47.92.48.137:8848
#spring.cloud.nacos.config.server-addr=26.3.13.184:8848
#spring.cloud.nacos.discovery.server-addr=26.3.13.184:8848
spring.profiles.active
=
dev
# 该配置影响统一配置中心中的dataId
spring.application.name
=
publicapi
#dev
spring.cloud.nacos.config.namespace
=
052aa986-5c18-4013-a91a-583dc01aaf8b
#prod
#spring.cloud.nacos.config.namespace=1ffd9d32-3f03-4eb8-bf12-98b1ce397390
spring.cloud.nacos.config.namespace
=
dev
#spring.cloud.nacos.config.ext-config[0].data-id=image.properties
# 开启动态刷新配置,否则配置文件修改,工程无法感知
...
...
serviceapi/carapi/pom.xml
View file @
6dfad6c3
...
...
@@ -10,6 +10,8 @@
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
carapi
</artifactId>
<build>
<finalName>
carapi
</finalName>
</build>
</project>
\ No newline at end of file
serviceapi/carapi/src/main/java/com/founder/carapi/controller/CarController.java
View file @
6dfad6c3
package
com
.
founder
.
carapi
.
controller
;
import
com.founder.carapi.service.CarService
;
import
com.founder.commonutils.carEntity.
CarOneAreaIAnalysisSearchParam
;
import
com.founder.commonutils.carEntity.
*
;
import
com.founder.commonutils.publicEntity.MapRestResult
;
import
com.founder.commonutils.util.KeyUtil
;
import
com.founder.servicebase.logs.OperLog
;
import
com.founder.servicebase.logs.OperationType
;
import
io.swagger.annotations.Api
;
...
...
@@ -12,25 +13,23 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.web.bind.annotation.*
;
import
java.util.*
;
import
java.util.stream.IntStream
;
/**
* <p>
* 技侦
车辆
接口管理 前端控制器
* 技侦接口管理 前端控制器
* </p>
*
* @author yangyang
* @since 2021-04-0
8
* @since 2021-04-0
9
*/
@Api
(
description
=
"
技侦车辆
接口管理"
)
@Api
(
description
=
"接口管理"
)
@RestController
@RequestMapping
(
"/car"
)
public
class
CarController
{
@Autowired
private
CarService
carService
;
// 车辆轨迹接口(科信)
@OperLog
(
message
=
"车辆轨迹接口"
,
operation
=
OperationType
.
QUERY
)
@ApiOperation
(
value
=
"车辆轨迹接口"
)
...
...
@@ -49,7 +48,7 @@ public class CarController {
return
result
;
}
//
范围内卡口点位数据
接口
//
人像回溯
接口
@OperLog
(
message
=
"范围内卡口点位数据接口"
,
operation
=
OperationType
.
QUERY
)
@ApiOperation
(
value
=
"范围内卡口点位数据接口"
)
@PostMapping
(
value
=
"/selectKkXx"
)
...
...
@@ -76,5 +75,31 @@ public class CarController {
System
.
out
.
println
(
"车辆轨迹**请求时长**********"
+
timeDiffer
+
"毫秒"
);
return
result
;
}
//轨迹疑似停留点
@ApiOperation
(
value
=
"轨迹疑似停留点"
)
@PostMapping
(
"/getTrackYstld"
)
public
MapRestResult
getTrackYstld
(
@RequestBody
TrackYsModelCondition
track
){
return
carService
.
getTrackYstld
(
track
);
}
//轨迹疑似落脚点
@ApiOperation
(
value
=
"轨迹疑似落脚点"
)
@PostMapping
(
"/getTrackYsljd"
)
public
MapRestResult
getTrackYsljd
(
@RequestBody
TrackYsModelCondition
track
){
return
carService
.
getTrackYsljd
(
track
);
}
@ApiOperation
(
value
=
"车碰撞结果获取"
)
@PostMapping
(
"/getRegionalsResult"
)
public
MapRestResult
getRegionalsResult
(
@RequestBody
TbStRegionalstaskresult
tbStRegionalstaskresult
)
throws
Exception
{
tbStRegionalstaskresult
.
setPagePara
(
Integer
.
valueOf
(
tbStRegionalstaskresult
.
getLimit
()));
return
carService
.
getRegionalsResult
(
tbStRegionalstaskresult
);
}
@ApiOperation
(
value
=
"车碰撞结果分类获取"
)
@PostMapping
(
"/getRegionalsResultFl"
)
public
MapRestResult
getRegionalsResultFl
(
@RequestBody
TbStRegionalstaskresult
tbStRegionalstaskresult
)
throws
Exception
{
return
carService
.
getRegionalsResultFl
(
tbStRegionalstaskresult
);
}
}
serviceapi/carapi/src/main/java/com/founder/carapi/controller/RegionalsTaskController.java
View file @
6dfad6c3
...
...
@@ -55,6 +55,16 @@ public class RegionalsTaskController {
regionalsTask
.
setTaskObject
(
"06"
);
// 任务对象01 车 02 人 03 人像 06车车伴随
regTaskService
.
saveRegTask
(
regionalsTask
);
// 保存区域 集合
List
<
Regionals
>
regionalsList
=
regionalsTask
.
getRegionals
();
if
(
regionalsList
!=
null
){
IntStream
.
range
(
0
,
regionalsList
.
size
()).
forEach
(
i
->
{
Regionals
regionals
=
regionalsList
.
get
(
i
);
regionals
.
setRegionalId
(
KeyUtil
.
getUUIDKey
(
"QY"
));
regionals
.
setTaskId
(
regionalsTask
.
getTaskId
());
regTaskService
.
saveRegional
(
regionals
);
});
}
carCarAnalysisSearchParam
.
setTaskId
(
regionalsTask
.
getTaskId
());
// 线程异步调用
...
...
@@ -72,13 +82,13 @@ public class RegionalsTaskController {
}
// 任务查询接口
@ApiOperation
(
value
=
"
车车伴随
获取所有任务接口"
)
@ApiOperation
(
value
=
"获取所有任务接口"
)
@PostMapping
(
"/selecteRegionalsTasks"
)
public
MapRestResult
selecteRegionalsTasks
(
@ApiParam
(
name
=
"startTime"
,
value
=
"开始时间"
)
@RequestParam
(
required
=
false
)
String
startTime
,
@ApiParam
(
name
=
"endTime"
,
value
=
"结束时间"
)
@RequestParam
(
required
=
false
)
String
endTime
,
@ApiParam
(
name
=
"taskObject"
,
value
=
"06代表车车伴随"
)
@ApiParam
(
name
=
"taskObject"
,
value
=
"0
1代表车辆碰撞/0
6代表车车伴随"
)
@RequestParam
(
required
=
false
)
String
taskObject
,
@ApiParam
(
name
=
"carNum"
,
value
=
"车牌号"
)
@RequestParam
(
required
=
false
)
String
carNum
,
...
...
@@ -98,5 +108,44 @@ public class RegionalsTaskController {
});
return
MapRestResult
.
build
(
200
,
"获取任务结果数据成功"
,
listResult
.
size
(),
listResult
);
}
// 任务信息
// @OperLog(message = "生成车区域碰撞任务接口",operation = OperationType.QUERY)
@ApiOperation
(
value
=
"生成车区域碰撞任务接口"
)
@PostMapping
(
"/sendRegionalsTask"
)
public
MapRestResult
sendRegionalsTask
(
@RequestBody
RegionalsTask
regionalsTask
)
{
// 获取区域,开始时间 ,确认时间,保存任务信息,区域
// 生成任务编号
regionalsTask
.
setTaskId
(
KeyUtil
.
getUUIDKey
(
"RW"
));
// 状态置为 1 进度置为 任务开始
regionalsTask
.
setState
(
"1"
);
regionalsTask
.
setProgress
(
"BEGIN"
);
regionalsTask
.
setTaskType
(
"qypz"
);
// 区域碰撞
regionalsTask
.
setTaskObject
(
"01"
);
// 任务对象01 车 02 人 03 人像 06车车伴随
regTaskService
.
saveRegTask
(
regionalsTask
);
// 保存区域 集合
List
<
Regionals
>
regionalsList
=
regionalsTask
.
getRegionals
();
if
(
regionalsList
!=
null
){
IntStream
.
range
(
0
,
regionalsList
.
size
()).
forEach
(
i
->
{
Regionals
regionals
=
regionalsList
.
get
(
i
);
regionals
.
setRegionalId
(
KeyUtil
.
getUUIDKey
(
"QY"
));
regionals
.
setTaskId
(
regionalsTask
.
getTaskId
());
regTaskService
.
saveRegional
(
regionals
);
});
}
return
MapRestResult
.
build
(
200
,
"发送任务成功"
,
"1"
,
regionalsTask
.
getTaskId
());
}
@ApiOperation
(
value
=
"车区域碰撞接口"
)
@PostMapping
(
"/carRegionalCollied"
)
public
MapRestResult
sendCarQyPzRegionalsTask
(
@RequestBody
List
<
AreaInfo
>
areaInfos
)
{
try
{
MapRestResult
result
=
carService
.
MoreAreaInfoThread
(
areaInfos
);
}
catch
(
Exception
e
)
{
return
MapRestResult
.
build
(
201
,
"车区域碰撞接口失败"
,
"1"
,
"error"
);
}
return
MapRestResult
.
build
(
200
,
"车区域碰撞接口"
,
"1"
,
"success"
);
}
}
serviceapi/carapi/src/main/java/com/founder/carapi/mapper/CarInfoMapper.java
View file @
6dfad6c3
package
com
.
founder
.
carapi
.
mapper
;
import
com.founder.commonutils.carEntity.
KkXxResult
;
import
com.founder.commonutils.carEntity.
*
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.stereotype.Component
;
...
...
@@ -11,8 +11,17 @@ import java.util.List;
@Mapper
public
interface
CarInfoMapper
{
List
<
KkXxResult
>
getKkInfoByQsJwd
(
@Param
(
value
=
"qsjd"
)
String
qsjd
,
@Param
(
value
=
"qswd"
)
String
qswd
,
@Param
(
value
=
"jsjd"
)
String
jsjd
,
@Param
(
value
=
"jswd"
)
String
jswd
);
List
<
TbStRegionalstaskresult
>
getAllResult
(
TbStRegionalstaskresult
tbStRegionalstaskresult
);
List
<
TbStRegionalstaskresult
>
getAllResultall
(
TbStRegionalstaskresult
tbStRegionalstaskresult
);
Integer
getAllResultcount
(
TbStRegionalstaskresult
tbStRegionalstaskresult
);
List
<
RegionalsDetail
>
getAllRegionalsDetail
(
@Param
(
"reultId"
)
String
reultId
);
RegionalsPerson
getAllRegionalsPerson
(
@Param
(
"sfzhm"
)
String
sfzhm
);
List
<
reslutFl
>
getAllResultFlHs
(
@Param
(
"taskId"
)
String
taskId
);
List
<
reslutFl
>
getAllResultFl
(
@Param
(
"taskId"
)
String
taskId
);
}
serviceapi/carapi/src/main/java/com/founder/carapi/mapper/RegInfoMapper.java
View file @
6dfad6c3
...
...
@@ -17,6 +17,8 @@ public interface RegInfoMapper {
boolean
saveResult
(
RegionalsResult
regionalsResult
);
boolean
saveResultPz
(
CarKkInfo
carKkInfo
);
Integer
selecteRegionalsPerson
(
@Param
(
"sfzhm"
)
String
sfzhm
);
void
saveRegionalsDetail
(
RegionalsDetail
regionalsDetail
);
...
...
@@ -27,7 +29,7 @@ public interface RegInfoMapper {
void
updateRegionalsTask
(
RegionalsTask
regionalsTask
);
List
<
RegionalsTask
>
selecteRegionalsTasks
(
@Param
(
"startTime"
)
String
startTime
,
@Param
(
"endTime"
)
String
endTime
,
@Param
(
"taskObject"
)
String
taskObject
,
@Param
(
"carNum"
)
String
carNum
,
@Param
(
"fsrIdentity"
)
String
fsrIdentity
);
List
<
RegionalsTask
>
selecteRegionalsTasks
(
@Param
(
"startTime"
)
String
startTime
,
@Param
(
"endTime"
)
String
endTime
,
@Param
(
"taskObject"
)
String
taskObject
,
@Param
(
"carNum"
)
String
carNum
,
@Param
(
"fsrIdentity"
)
String
fsrIdentity
);
List
<
RegionalsCarCarResult
>
selecteRegionalsTasksResults
(
@Param
(
"taskId"
)
String
taskId
);
}
serviceapi/carapi/src/main/java/com/founder/carapi/mapper/xml/CarInfoMapper.xml
View file @
6dfad6c3
This diff is collapsed.
Click to expand it.
serviceapi/carapi/src/main/java/com/founder/carapi/mapper/xml/RegInfoMapper.xml
View file @
6dfad6c3
...
...
@@ -235,5 +235,36 @@
and d.SFZHM = P.SFZHM(+)
<if
test=
"taskId != null and taskId != ''"
>
and r.task_Id = #{ taskId , jdbcType=VARCHAR }
</if>
</select>
<!--车辆碰撞结果数据保存-->
<insert
id=
"saveResultPz"
parameterType=
"com.founder.commonutils.carEntity.CarKkInfo"
>
INSERT INTO TB_ST_REGIONALS_RESULT (
XXZJBH,
TASK_ID,
OBJECT_VALUE,
REGION,
count,
DJSJ,
apeType,
apeTypeMc,
kkUrlPic,
time,
X,
Y
)
VALUES(
#{ xxzjbh , jdbcType=VARCHAR }
,#{ taskId , jdbcType=VARCHAR }
,#{ objectValue , jdbcType=VARCHAR }
,#{ region , jdbcType=VARCHAR }
,#{ count , jdbcType=VARCHAR }
,sysdate
,#{ apeType , jdbcType=VARCHAR }
,#{ apeTypeMc , jdbcType=VARCHAR }
,#{ kkUrlPic , jdbcType=VARCHAR }
,TO_DATE(#{ time , jdbcType=VARCHAR },'yyyy-MM-dd hh24:mi:ss')
,#{ x , jdbcType=VARCHAR }
,#{ y , jdbcType=VARCHAR }
)
</insert>
</mapper>
serviceapi/carapi/src/main/java/com/founder/carapi/service/CarService.java
View file @
6dfad6c3
package
com
.
founder
.
carapi
.
service
;
import
com.founder.commonutils.carEntity.CarCarAnalysisSearchParam
;
import
com.founder.commonutils.carEntity.CarOneAreaIAnalysisSearchParam
;
import
com.founder.commonutils.carEntity.*
;
import
com.founder.commonutils.publicEntity.MapRestResult
;
import
java.util.List
;
/**
* <p>
...
...
@@ -11,16 +11,26 @@ import com.founder.commonutils.publicEntity.MapRestResult;
* </p>
*
* @author yangyang
* @since 2021-04-0
8
* @since 2021-04-0
9
*/
public
interface
CarService
{
MapRestResult
selectKkXx
(
String
qsjd
,
String
qswd
,
String
jsjd
,
String
jswd
);
MapRestResult
getCarTranslate
(
String
objectValue
,
String
kssj
,
String
jssj
);
MapRestResult
carOneAreaIAnalysis
(
CarOneAreaIAnalysisSearchParam
carOneAreaIAnalysisSearchParam
);
MapRestResult
carCarAnalysis
(
CarCarAnalysisSearchParam
carCarAnalysisSearchParam
)
throws
Exception
;
MapRestResult
carCarAnalysis
(
CarCarAnalysisSearchParam
carCarAnalysisSearchParam
)
throws
Exception
;
MapRestResult
MoreAreaInfoThread
(
List
<
AreaInfo
>
areaInfos
)
throws
Exception
;
MapRestResult
getTrackYstld
(
TrackYsModelCondition
track
);
MapRestResult
getTrackYsljd
(
TrackYsModelCondition
track
);
MapRestResult
getRegionalsResult
(
TbStRegionalstaskresult
tbStRegionalstaskresult
)
throws
Exception
;
MapRestResult
getRegionalsResultFl
(
TbStRegionalstaskresult
tbStRegionalstaskresult
)
throws
Exception
;
}
serviceapi/carapi/src/main/java/com/founder/carapi/service/impl/CarServiceImpl.java
View file @
6dfad6c3
This diff is collapsed.
Click to expand it.
serviceapi/carapi/src/main/java/com/founder/carapi/service/impl/RegTaskServiceImpl.java
View file @
6dfad6c3
...
...
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
import
java.util.List
;
/*
*
*
* <p>
* 服务实现类
* </p>
...
...
@@ -18,7 +18,7 @@ import java.util.List;
* @author yangyang
* @since 2021-04-10
*/
*/
@Service
public
class
RegTaskServiceImpl
implements
RegTaskService
{
...
...
serviceapi/carapi/src/main/resources/bootstrap.properties
View file @
6dfad6c3
...
...
@@ -2,14 +2,14 @@
spring.cloud.nacos.config.server-addr
=
47.92.48.137:8848
spring.cloud.nacos.discovery.server-addr
=
47.92.48.137:8848
#spring.cloud.nacos.config.server-addr=26.3.13.184:8848
#spring.cloud.nacos.discovery.server-addr=26.3.13.184:8848
spring.profiles.active
=
dev
# 该配置影响统一配置中心中的dataId
spring.application.name
=
carapi
#dev
spring.cloud.nacos.config.namespace
=
052aa986-5c18-4013-a91a-583dc01aaf8b
#prod
#spring.cloud.nacos.config.namespace=1ffd9d32-3f03-4eb8-bf12-98b1ce397390
spring.cloud.nacos.config.namespace
=
dev
#spring.cloud.nacos.config.ext-config[0].data-id=image.properties
# 开启动态刷新配置,否则配置文件修改,工程无法感知
...
...
serviceapi/imageapi/src/main/resources/bootstrap.properties
View file @
6dfad6c3
...
...
@@ -2,14 +2,14 @@
spring.cloud.nacos.config.server-addr
=
47.92.48.137:8848
spring.cloud.nacos.discovery.server-addr
=
47.92.48.137:8848
#spring.cloud.nacos.config.server-addr=26.3.13.184:8848
#spring.cloud.nacos.discovery.server-addr=26.3.13.184:8848
spring.profiles.active
=
dev
# 该配置影响统一配置中心中的dataId
spring.application.name
=
imageapi
#dev
spring.cloud.nacos.config.namespace
=
052aa986-5c18-4013-a91a-583dc01aaf8b
#prod
#spring.cloud.nacos.config.namespace=1ffd9d32-3f03-4eb8-bf12-98b1ce397390
spring.cloud.nacos.config.namespace
=
dev
#spring.cloud.nacos.config.ext-config[0].data-id=image.properties
# 开启动态刷新配置,否则配置文件修改,工程无法感知
...
...
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