Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
VideoManager
Project overview
Project overview
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
1
Merge Requests
1
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
wangjinjing
VideoManager
Commits
3d35e092
Commit
3d35e092
authored
May 06, 2021
by
wangjinjing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
7da059a0
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
82 additions
and
8 deletions
+82
-8
src/main/java/com/cx/cn/cxquartz/controller/ExtController.java
...ain/java/com/cx/cn/cxquartz/controller/ExtController.java
+23
-5
src/main/java/com/cx/cn/cxquartz/controller/IndexController.java
...n/java/com/cx/cn/cxquartz/controller/IndexController.java
+1
-1
src/main/java/com/cx/cn/cxquartz/dao/TraffPictureMapper.java
src/main/java/com/cx/cn/cxquartz/dao/TraffPictureMapper.java
+1
-0
src/main/java/com/cx/cn/cxquartz/service/quartz/TraffPictureService.java
...om/cx/cn/cxquartz/service/quartz/TraffPictureService.java
+1
-0
src/main/java/com/cx/cn/cxquartz/service/quartz/impl/TraffpictureServiceImpl.java
...cxquartz/service/quartz/impl/TraffpictureServiceImpl.java
+5
-0
src/main/java/com/cx/cn/cxquartz/vo/TraffpictureParam.java
src/main/java/com/cx/cn/cxquartz/vo/TraffpictureParam.java
+41
-0
src/main/resources/application.yml
src/main/resources/application.yml
+2
-2
src/main/resources/mapper/TraffPictureMapper.xml
src/main/resources/mapper/TraffPictureMapper.xml
+8
-0
No files found.
src/main/java/com/cx/cn/cxquartz/controller/ExtController.java
View file @
3d35e092
...
...
@@ -234,8 +234,8 @@ public class ExtController {
Long
recordid
=
Long
.
parseLong
(
String
.
valueOf
(
traffAlarmRecordService
.
inserTraffAlarmRecord
(
traffAlarmRecord
)));
FileTransferManager
.
fetchUrlsFromRecord
(
traffAlarmRecord
,
transferRecordMap
);
List
<
TransferResult
>
results
=
FileTransferManager
.
transferFile
(
transferRecordMap
,
ftp
,
basepath
);
logger
.
info
(
"缓存数据上传结果:"
+
results
.
toString
());
TraffAlarmRecord
recordBak
=
FileTransferManager
.
traffAlarmRecordUrlUpdate
(
results
);
//
logger.info("缓存数据上传结果:" + results.toString());
TraffAlarmRecord
recordBak
=
FileTransferManager
.
traffAlarmRecordUrlUpdate
(
results
);
traffAlarmRecord
.
setImg1path
(
recordBak
.
getImg1path
());
traffAlarmRecord
.
setImg2path
(
recordBak
.
getImg2path
());
traffAlarmRecord
.
setImg3path
(
recordBak
.
getImg3path
());
...
...
@@ -294,6 +294,7 @@ public class ExtController {
traffpictureParam
.
setChannelid
(
transferRecord
.
getChannelid
());
traffpictureParam
.
setRecordid
(
transferRecord
.
getRecordid
());
traffpictureParam
.
setRecordtype
(
String
.
valueOf
(
metadata
.
get
(
"Type"
)));
traffpictureParam
.
setProcessstatus
(
"0"
);
//获得imgid 对应的 base64
String
imgftpurl
=
traffPictureService
.
queryimgpath
(
traffpictureParam
);
Ftp
ftp
=
ftpService
.
reloadFtp
();
...
...
@@ -313,8 +314,12 @@ public class ExtController {
{
Pedestrian
meta
=
JSON
.
toJavaObject
(
metadata
,
Pedestrian
.
class
);
meta
.
setId
(
traffpictureParam
.
getId
());
//新增到人员详
pedestrianService.insertpedestrian(meta);
pedestrianService
.
insertpedestrian
(
meta
);
//新增到事件详情表返回主键
traffpictureParam
.
setObjx
(
meta
.
getObjectBoundingBox
().
getX
());
traffpictureParam
.
setObjy
(
meta
.
getObjectBoundingBox
().
getY
());
traffpictureParam
.
setObjw
(
meta
.
getObjectBoundingBox
().
getW
());
traffpictureParam
.
setObjh
(
meta
.
getObjectBoundingBox
().
getH
());
}
else
if
(
null
!=
metadata
&&
metadata
.
get
(
"Type"
).
equals
(
"2"
))
//车辆
{
...
...
@@ -322,21 +327,34 @@ public class ExtController {
meta
.
setId
(
traffpictureParam
.
getId
());
//新增到车辆详情表
trafficService
.
insertTraffic
(
meta
);
traffpictureParam
.
setObjx
(
meta
.
getObjectBoundingBox
().
getX
());
traffpictureParam
.
setObjy
(
meta
.
getObjectBoundingBox
().
getY
());
traffpictureParam
.
setObjw
(
meta
.
getObjectBoundingBox
().
getW
());
traffpictureParam
.
setObjh
(
meta
.
getObjectBoundingBox
().
getH
());
}
else
if
(
null
!=
metadata
&&
metadata
.
get
(
"Type"
).
equals
(
"3"
))
{
Face
meta
=
JSON
.
toJavaObject
(
metadata
,
Face
.
class
);
meta
.
setId
(
traffpictureParam
.
getId
());
//新增到车辆详情表
faceService
.
insertFace
(
meta
);
traffpictureParam
.
setObjx
(
meta
.
getFaceBoundingBox
().
getX
());
traffpictureParam
.
setObjy
(
meta
.
getFaceBoundingBox
().
getY
());
traffpictureParam
.
setObjw
(
meta
.
getFaceBoundingBox
().
getW
());
traffpictureParam
.
setObjh
(
meta
.
getFaceBoundingBox
().
getH
());
}
else
if
(
null
!=
metadata
&&
metadata
.
get
(
"Type"
).
equals
(
"4"
))
//人骑车
{
PeopleRideBicyc
meta
=
JSON
.
toJavaObject
(
metadata
,
PeopleRideBicyc
.
class
);
meta
.
setId
(
traffpictureParam
.
getId
());
//新增到车辆详情表
peopleridebicycService
.
insertPeopleRideBicyc
(
meta
);
traffpictureParam
.
setObjx
(
meta
.
getObjectBoundingBox
().
getX
());
traffpictureParam
.
setObjy
(
meta
.
getObjectBoundingBox
().
getY
());
traffpictureParam
.
setObjw
(
meta
.
getObjectBoundingBox
().
getW
());
traffpictureParam
.
setObjh
(
meta
.
getObjectBoundingBox
().
getH
());
}
//更新 traffpicture特征值
traffPictureService
.
updateTraffpicture
(
traffpictureParam
);
}
}
...
...
src/main/java/com/cx/cn/cxquartz/controller/IndexController.java
View file @
3d35e092
This diff is collapsed.
Click to expand it.
src/main/java/com/cx/cn/cxquartz/dao/TraffPictureMapper.java
View file @
3d35e092
...
...
@@ -7,5 +7,6 @@ import org.apache.ibatis.annotations.Mapper;
public
interface
TraffPictureMapper
{
int
inserTraffpicture
(
TraffpictureParam
traffalarmrecord
);
int
updateTraffpicture
(
TraffpictureParam
traffalarmrecord
);
String
queryimgpath
(
TraffpictureParam
traffpicture
);
}
\ No newline at end of file
src/main/java/com/cx/cn/cxquartz/service/quartz/TraffPictureService.java
View file @
3d35e092
...
...
@@ -5,6 +5,7 @@ import com.cx.cn.cxquartz.vo.TraffpictureParam;
public
interface
TraffPictureService
{
int
inserTraffpicture
(
TraffpictureParam
traffpicture
);
int
updateTraffpicture
(
TraffpictureParam
traffpicture
);
String
queryimgpath
(
TraffpictureParam
traffpicture
);
}
src/main/java/com/cx/cn/cxquartz/service/quartz/impl/TraffpictureServiceImpl.java
View file @
3d35e092
...
...
@@ -24,6 +24,11 @@ public class TraffpictureServiceImpl implements TraffPictureService{
return
traffPictureMapper
.
inserTraffpicture
(
traffpicture
);
}
@Override
public
int
updateTraffpicture
(
TraffpictureParam
traffpicture
)
{
return
traffPictureMapper
.
updateTraffpicture
(
traffpicture
);
}
@Override
public
String
queryimgpath
(
TraffpictureParam
traffpicture
)
{
return
traffPictureMapper
.
queryimgpath
(
traffpicture
);
...
...
src/main/java/com/cx/cn/cxquartz/vo/TraffpictureParam.java
View file @
3d35e092
...
...
@@ -59,6 +59,47 @@ public class TraffpictureParam extends Traffpicture {
@JsonIgnore
private
String
imagedata
;
@JsonIgnore
private
Integer
objx
;
@JsonIgnore
private
Integer
objy
;
@JsonIgnore
private
Integer
objw
;
@JsonIgnore
private
Integer
objh
;
public
Integer
getObjx
()
{
return
objx
;
}
public
void
setObjx
(
Integer
objx
)
{
this
.
objx
=
objx
;
}
public
Integer
getObjy
()
{
return
objy
;
}
public
void
setObjy
(
Integer
objy
)
{
this
.
objy
=
objy
;
}
public
Integer
getObjw
()
{
return
objw
;
}
public
void
setObjw
(
Integer
objw
)
{
this
.
objw
=
objw
;
}
public
Integer
getObjh
()
{
return
objh
;
}
public
void
setObjh
(
Integer
objh
)
{
this
.
objh
=
objh
;
}
public
String
getImagedata
()
{
return
imagedata
;
}
...
...
src/main/resources/application.yml
View file @
3d35e092
...
...
@@ -11,10 +11,10 @@ mybatis:
spring
:
datasource
:
#url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8
#url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8
&useSSL=false
#username: zn06
#password: znznzn8
url
:
jdbc:mysql://192.168.168.212:3306/imagepro?useUnicode=true&characterEncoding=utf-8
url
:
jdbc:mysql://192.168.168.212:3306/imagepro?useUnicode=true&characterEncoding=utf-8
&useSSL=false
username
:
root
password
:
123456
driver-class-name
:
com.mysql.jdbc.Driver
...
...
src/main/resources/mapper/TraffPictureMapper.xml
View file @
3d35e092
...
...
@@ -65,6 +65,7 @@
<if
test=
"faceimagedata != null"
>
faceimagedata,
</if>
<if
test=
"index != null"
>
pindex,
</if>
<if
test=
"imagedata != null"
>
imagedata,
</if>
<if
test=
"processstatus != null"
>
processstatus,
</if>
</trim>
<trim
prefix=
"select"
suffix=
"from dual"
suffixOverrides=
","
>
<if
test=
"recordid != null"
>
#{recordid},
</if>
...
...
@@ -88,6 +89,7 @@
<if
test=
"faceimagedata != null"
>
#{faceimagedata},
</if>
<if
test=
"index != null"
>
#{index},
</if>
<if
test=
"imagedata != null"
>
#{imagedata},
</if>
<if
test=
"processstatus != null"
>
#{processstatus},
</if>
</trim>
</insert>
...
...
@@ -107,4 +109,10 @@
</select>
<update
id=
"updateTraffpicture"
>
update traffpicture set objx=#{objx},objy=#{objy},objw=#{objw},objh=#{objh} where id=#{id}
</update>
</mapper>
\ No newline at end of file
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