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
a8d74ae7
Commit
a8d74ae7
authored
Mar 23, 2021
by
chentian
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
0c246e9a
872faf1d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
12 deletions
+10
-12
common/common_utils/src/main/java/com/founder/commonutils/peopleEntity/FaceSearchParam.java
+3
-3
serviceapi/imageapi/src/main/java/com/founder/imageapi/mapper/xml/CameraInfoMapper.xml
+4
-4
serviceapi/imageapi/src/main/java/com/founder/imageapi/service/impl/CommonService.java
+2
-4
serviceapi/imageapi/src/main/java/com/founder/imageapi/service/impl/ImageServiceImpl.java
+1
-1
No files found.
common/common_utils/src/main/java/com/founder/commonutils/peopleEntity/FaceSearchParam.java
View file @
a8d74ae7
...
...
@@ -34,7 +34,7 @@ public class FaceSearchParam {
private
String
ids
=
""
;
private
Integer
mergeType
=
1
;
//相似度 默认0.92
private
String
scoreThreshold
=
"0.92"
;
private
Double
scoreThreshold
=
0.92
;
//开始时间 格式 2019-12-07 00:00:00
private
String
starttime
=
""
;
//结束时间 格式 2020-03-06 23:59:59
...
...
@@ -159,11 +159,11 @@ public class FaceSearchParam {
this
.
mergeType
=
mergeType
;
}
public
String
getScoreThreshold
()
{
public
Double
getScoreThreshold
()
{
return
scoreThreshold
;
}
public
void
setScoreThreshold
(
String
scoreThreshold
)
{
public
void
setScoreThreshold
(
Double
scoreThreshold
)
{
this
.
scoreThreshold
=
scoreThreshold
;
}
...
...
serviceapi/imageapi/src/main/java/com/founder/imageapi/mapper/xml/CameraInfoMapper.xml
View file @
a8d74ae7
...
...
@@ -4,7 +4,7 @@
<select
id=
"getCameraInfoByIds"
parameterType=
"java.lang.String"
resultType=
"com.founder.commonutils.peopleEntity.Camera"
>
select
id
as cameraId,
ID
as cameraId,
NAME as cameraName,
CITY as areaName,
STATION_ID as areaCode,
...
...
@@ -14,9 +14,9 @@
x as x,
y as y,
area_name
as cameraType
from
t_camera_info camera
where 1=1
<if
test=
"cameraIds!=null and cameraIds!=''"
>
and
CAMERA_CODE
in ${cameraIds}
</if>
NAME
as cameraType
from
TB_ZY_CAMERA
where 1=1
<if
test=
"cameraIds!=null and cameraIds!=''"
>
and
ID
in ${cameraIds}
</if>
</select>
</mapper>
serviceapi/imageapi/src/main/java/com/founder/imageapi/service/impl/CommonService.java
View file @
a8d74ae7
...
...
@@ -19,11 +19,10 @@ public class CommonService {
private
CameraInfoMapper
cameraInfoDao
;
public
Map
<
String
,
Object
>
getCameraInfoByIds
(
String
cameraId
)
{
Map
<
String
,
Object
>
returnM
ap
=
new
HashMap
<>();
Map
<
String
,
Object
>
m
ap
=
new
HashMap
<>();
List
<
Camera
>
cameras
=
cameraInfoDao
.
getCameraInfoByIds
(
cameraId
);
if
(
cameras
!=
null
&&
cameras
.
size
()>
0
)
{
for
(
Camera
camera:
cameras
){
Map
<
String
,
String
>
map
=
new
HashMap
<>();
String
address
=
camera
.
getAreaName
()
+
" "
+
camera
.
getAreaCodeName
()+
""
+
camera
.
getCameraName
();
String
areaName
=
camera
.
getAreaName
();
String
x
=
camera
.
getX
(),
y
=
camera
.
getY
();
...
...
@@ -39,11 +38,10 @@ public class CommonService {
map
.
put
(
"districtCodeName"
,
areaName
);
// 地区名称
map
.
put
(
"areaCode"
,
areaCode
);
// 派出所代码
map
.
put
(
"areaCodeName"
,
areaCodeName
);
// 派出所名称
returnMap
.
put
(
camera
.
getCameraId
(),
map
);
}
}
return
returnM
ap
;
return
m
ap
;
}
...
...
serviceapi/imageapi/src/main/java/com/founder/imageapi/service/impl/ImageServiceImpl.java
View file @
a8d74ae7
...
...
@@ -501,7 +501,7 @@ public class ImageServiceImpl implements ImageService {
p
.
setCameraType
((
String
)
map
.
get
(
"cameraType"
));
p
.
setDistrictCode
((
String
)
map
.
get
(
"districtCode"
));
p
.
setDistrictCodeName
((
String
)
map
.
get
(
"districtCodeName"
));
//
p.setDistrictCodeName((String)map.get("districtCodeName"));
p
.
setAreaCode
((
String
)
map
.
get
(
"areaCode"
));
p
.
setAreaCodeName
((
String
)
map
.
get
(
"areaCodeName"
));
...
...
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