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
10ba7f7b
Commit
10ba7f7b
authored
Jul 16, 2021
by
yzm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
文件上传到本地,并且推送给dx
parent
89a55bb0
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
35 additions
and
31 deletions
+35
-31
src/main/java/com/cx/cn/cxquartz/controller/ExtController.java
...ain/java/com/cx/cn/cxquartz/controller/ExtController.java
+7
-2
src/main/java/com/cx/cn/cxquartz/controller/QuartzController.java
.../java/com/cx/cn/cxquartz/controller/QuartzController.java
+1
-1
src/main/java/com/cx/cn/cxquartz/service/quartz/QuartzService.java
...java/com/cx/cn/cxquartz/service/quartz/QuartzService.java
+1
-1
src/main/java/com/cx/cn/cxquartz/service/quartz/impl/EventWriteService.java
...cx/cn/cxquartz/service/quartz/impl/EventWriteService.java
+11
-13
src/main/java/com/cx/cn/cxquartz/service/quartz/impl/QuartzServiceImpl.java
...cx/cn/cxquartz/service/quartz/impl/QuartzServiceImpl.java
+12
-11
src/main/java/com/cx/cn/cxquartz/util/PointUtil.java
src/main/java/com/cx/cn/cxquartz/util/PointUtil.java
+3
-3
No files found.
src/main/java/com/cx/cn/cxquartz/controller/ExtController.java
View file @
10ba7f7b
...
...
@@ -186,12 +186,17 @@ public class ExtController {
roiarray
[
1
]
=
new
Long
(
taskinfo
.
getObjecty
());
roiarray
[
2
]
=
new
Long
(
taskinfo
.
getObjectw
());
roiarray
[
3
]
=
new
Long
(
taskinfo
.
getObjecth
());
// roiarray[0] = new Long(0);
// roiarray[1] = new Long(0);
// roiarray[2] = new Long(0);
// roiarray[3] = new Long(0);
// for (TraffAlarmRecord transferRecord : traffalarmrecordlist) {
mapparam
.
put
(
"deviceCode"
,
devicecode
);
mapparam
.
put
(
"model"
,
model
);
mapparam
.
put
(
"roi"
,
roiarray
);
//
mapparam.put("roi", roiarray);
logger
.
info
(
"recogurl="
+
recogurl
);
Map
objectList
=
restTemplate
.
getForObject
(
recogurl
+
"?deviceCode={deviceCode}&model={model}&roi=
{roi}
"
,
Map
.
class
,
mapparam
);
Map
objectList
=
restTemplate
.
getForObject
(
recogurl
+
"?deviceCode={deviceCode}&model={model}&roi=
[]
"
,
Map
.
class
,
mapparam
);
try
{
logger
.
info
(
" param:{}"
,
new
ObjectMapper
().
writeValueAsString
(
mapparam
));
logger
.
info
(
" objectList result:{}"
,
new
ObjectMapper
().
writeValueAsString
(
objectList
));
...
...
src/main/java/com/cx/cn/cxquartz/controller/QuartzController.java
View file @
10ba7f7b
...
...
@@ -199,7 +199,7 @@ public class QuartzController {
return
ResultUtil
.
success
(
ResultEnum
.
PARAM_EMPTY
.
getCode
(),
ResultEnum
.
PARAM_EMPTY
.
getMessage
());
}
try
{
return
quartzService
.
startJob
(
taskNo
);
return
quartzService
.
startJob
(
taskNo
,
null
);
}
catch
(
Exception
e
)
{
logger
.
error
(
"/list/optionjob exception={}"
,
e
);
return
ResultUtil
.
fail
();
...
...
src/main/java/com/cx/cn/cxquartz/service/quartz/QuartzService.java
View file @
10ba7f7b
...
...
@@ -20,7 +20,7 @@ public interface QuartzService {
Integer
UpdateExecuteParam
(
Map
map
);
String
startJob
(
String
taskNo
)
throws
SchedulerException
;
String
startJob
(
String
taskNo
,
String
status
)
throws
SchedulerException
;
String
startOrStopJob
(
String
taskNo
,
String
status
)
throws
SchedulerException
;
void
initLoadOnlineTasks
();
...
...
src/main/java/com/cx/cn/cxquartz/service/quartz/impl/EventWriteService.java
View file @
10ba7f7b
...
...
@@ -301,11 +301,12 @@ public class EventWriteService {
&&
!
""
.
equals
(
metadata
.
get
(
"RightBtmY"
).
toString
())
)
{
try
{
lo
=
new
Location
(
Integer
.
parseInt
(
metadata
.
get
(
"LeftTopX"
).
toString
())
+
roiarray
[
0
].
intValue
(),
Integer
.
parseInt
(
metadata
.
get
(
"LeftTopY"
).
toString
())
+
roiarray
[
1
].
intValue
(),
Integer
.
parseInt
(
metadata
.
get
(
"RightBtmX"
).
toString
()),
Integer
.
parseInt
(
metadata
.
get
(
"RightBtmY"
).
toString
())
+
roiarray
[
1
].
intValue
()
lo
=
new
Location
(
Integer
.
parseInt
(
metadata
.
get
(
"LeftTopX"
).
toString
())
+
roiarray
[
0
].
intValue
(),
Integer
.
parseInt
(
metadata
.
get
(
"LeftTopY"
).
toString
())
+
roiarray
[
1
].
intValue
(),
Integer
.
parseInt
(
metadata
.
get
(
"RightBtmX"
).
toString
())
+
roiarray
[
0
].
intValue
(),
Integer
.
parseInt
(
metadata
.
get
(
"RightBtmY"
).
toString
())
+
roiarray
[
1
].
intValue
()
);
}
catch
(
Exception
ex
)
{
log
.
error
(
ex
.
toString
());
}
}
else
if
(
null
!=
objectBoundingBox
)
{
try
{
...
...
@@ -315,7 +316,7 @@ public class EventWriteService {
Integer
.
parseInt
(
objectBoundingBox
.
get
(
"y"
).
toString
())
+
Integer
.
parseInt
(
objectBoundingBox
.
get
(
"h"
).
toString
())
+
roiarray
[
1
].
intValue
()
);
}
catch
(
Exception
ex
)
{
log
.
error
(
ex
.
toString
());
}
}
else
{
if
(
null
!=
metadata
.
get
(
"FaceBoundingBox"
))
{
...
...
@@ -330,7 +331,7 @@ public class EventWriteService {
Integer
.
parseInt
(
faceBoundingBox
.
get
(
"h"
).
toString
())
+
roiarray
[
1
].
intValue
()
);
}
catch
(
Exception
ex
)
{
log
.
error
(
ex
.
toString
());
}
}
else
{
if
(
null
!=
metadata
.
get
(
"HeadBoundingBox"
))
{
...
...
@@ -343,20 +344,17 @@ public class EventWriteService {
Integer
.
parseInt
(
headBoundingBox
.
get
(
"y"
).
toString
())
+
Integer
.
parseInt
(
headBoundingBox
.
get
(
"h"
).
toString
())
+
roiarray
[
1
].
intValue
()
);
}
catch
(
Exception
ex
)
{
log
.
error
(
ex
.
toString
());
}
}
}
}
objlocation
.
put
(
"location"
,
lo
);
if
(
null
!=
lo
)
{
traff
.
setObjx
(
lo
.
getX1
());
traff
.
setObjy
(
lo
.
getY1
());
traff
.
setObjw
(
lo
.
getX
2
()
-
lo
.
getX1
());
traff
.
setObjh
(
lo
.
getY
2
()
-
lo
.
getY1
());
traff
.
setObjx
(
lo
.
getX1
()
<
lo
.
getX2
()?
lo
.
getX1
():
lo
.
getX2
()
);
traff
.
setObjy
(
lo
.
getY1
()
<
lo
.
getY2
()?
lo
.
getY1
():
lo
.
getY2
()
);
traff
.
setObjw
(
lo
.
getX
1
()<
lo
.
getX2
()?
lo
.
getX2
()
-
lo
.
getX1
():
lo
.
getX1
()
-
lo
.
getX2
());
traff
.
setObjh
(
lo
.
getY
1
()<
lo
.
getY2
()?
lo
.
getY2
()
-
lo
.
getY1
():
lo
.
getY1
()
-
lo
.
getY2
());
}
}
...
...
src/main/java/com/cx/cn/cxquartz/service/quartz/impl/QuartzServiceImpl.java
View file @
10ba7f7b
...
...
@@ -104,24 +104,25 @@ public class QuartzServiceImpl implements QuartzService, InitializingBean {
*/
@Override
@Transactional
public
String
startJob
(
String
taskNo
)
throws
SchedulerException
{
public
String
startJob
(
String
taskNo
,
String
status
)
throws
SchedulerException
{
QuartzTaskInformations
quartzTaskInformation
=
quartzTaskInformationsService
.
getTaskByTaskNo
(
taskNo
);
if
(
quartzTaskInformation
==
null
)
{
return
ResultUtil
.
success
(
ResultEnum
.
NO_DATA
.
getCode
(),
ResultEnum
.
NO_DATA
.
getMessage
());
}
String
status
=
quartzTaskInformation
.
getFrozenstatus
();
//
String status = quartzTaskInformation.getFrozenstatus();
Scheduler
scheduler
=
schedulerBean
.
getScheduler
();
long
currentTimeMillis
=
System
.
currentTimeMillis
();
QuartzTaskInformations
task
=
new
QuartzTaskInformations
();
task
.
setId
(
quartzTaskInformation
.
getId
());
task
.
setVersion
(
quartzTaskInformation
.
getVersion
());
//说明要暂停
if
(
ResultEnum
.
UNFROZEN
.
name
().
equals
(
status
))
{
if
(
ResultEnum
.
FROZEN
.
name
().
equals
(
status
))
{
//删除
scheduler
.
deleteJob
(
new
JobKey
(
taskNo
));
task
.
setFrozentime
(
currentTimeMillis
);
task
.
setFrozenstatus
(
ResultEnum
.
FROZEN
.
name
());
//说明要启动
}
else
if
(
ResultEnum
.
FROZEN
.
name
().
equals
(
status
))
{
}
else
if
(
ResultEnum
.
UNFROZEN
.
name
().
equals
(
status
))
{
//删除后启动
scheduler
.
deleteJob
(
new
JobKey
(
taskNo
));
this
.
schedule
(
quartzTaskInformation
,
scheduler
);
task
.
setUnfrozentime
(
currentTimeMillis
);
...
...
@@ -143,16 +144,16 @@ public class QuartzServiceImpl implements QuartzService, InitializingBean {
QuartzTaskInformations
task
=
new
QuartzTaskInformations
();
task
.
setId
(
quartzTaskInformation
.
getId
());
task
.
setVersion
(
quartzTaskInformation
.
getVersion
());
//
说明要
暂停
//暂停
scheduler
.
deleteJob
(
new
JobKey
(
taskNo
));
if
(
ResultEnum
.
UN
FROZEN
.
name
().
equals
(
status
))
{
if
(
ResultEnum
.
FROZEN
.
name
().
equals
(
status
))
{
task
.
setFrozentime
(
currentTimeMillis
);
task
.
setFrozenstatus
(
ResultEnum
.
UN
FROZEN
.
name
());
//
说明要
启动
}
else
if
(
ResultEnum
.
FROZEN
.
name
().
equals
(
status
))
{
task
.
setFrozenstatus
(
ResultEnum
.
FROZEN
.
name
());
//启动
}
else
if
(
ResultEnum
.
UN
FROZEN
.
name
().
equals
(
status
))
{
this
.
schedule
(
quartzTaskInformation
,
scheduler
);
task
.
setUnfrozentime
(
currentTimeMillis
);
task
.
setFrozenstatus
(
ResultEnum
.
FROZEN
.
name
());
task
.
setFrozenstatus
(
ResultEnum
.
UN
FROZEN
.
name
());
}
task
.
setLastmodifytime
(
currentTimeMillis
);
quartzTaskInformationsService
.
updateStatusById
(
task
);
...
...
src/main/java/com/cx/cn/cxquartz/util/PointUtil.java
View file @
10ba7f7b
...
...
@@ -50,16 +50,16 @@ public static ByteArrayOutputStream drawByPoints(InputStream bais,List<Map> det
Graphics
g
=
image
.
getGraphics
();
g
.
setColor
(
Color
.
RED
);
//遍历所有特征值,画到图片上
int
x
,
y
,
w
,
h
;
for
(
Map
box
:
detectObjects
)
{
if
(
null
!=
box
)
{
try
{
if
(
null
!=
box
.
get
(
"location"
))
{
x
=
0
;
y
=
0
;
w
=
0
;
h
=
0
;
try
{
Location
lo
=(
Location
)
box
.
get
(
"location"
);
logger
.
info
(
"detectObjects x1,x2,y1,y2==="
+
lo
.
toString
());
g
.
drawRect
(
lo
.
getX1
(),
lo
.
getY1
(),
lo
.
getX2
()
-
lo
.
getX1
(),
lo
.
getY2
()
-
lo
.
getY1
());
g
.
drawRect
(
lo
.
getX1
(),
lo
.
getY1
(),
lo
.
getX2
()-
lo
.
getX1
(),
lo
.
getY2
()-
lo
.
getY1
());
}
catch
(
Exception
ex
){
logger
.
error
(
"Location Map error:{}"
,
ex
.
toString
());
}
...
...
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