Commit 10ba7f7b authored by yzm's avatar yzm

文件上传到本地,并且推送给dx

parent 89a55bb0
...@@ -186,12 +186,17 @@ public class ExtController { ...@@ -186,12 +186,17 @@ public class ExtController {
roiarray[1] = new Long(taskinfo.getObjecty()); roiarray[1] = new Long(taskinfo.getObjecty());
roiarray[2] = new Long(taskinfo.getObjectw()); roiarray[2] = new Long(taskinfo.getObjectw());
roiarray[3] = new Long(taskinfo.getObjecth()); 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) { // for (TraffAlarmRecord transferRecord : traffalarmrecordlist) {
mapparam.put("deviceCode", devicecode); mapparam.put("deviceCode", devicecode);
mapparam.put("model", model); mapparam.put("model", model);
mapparam.put("roi", roiarray); //mapparam.put("roi", roiarray);
logger.info("recogurl="+recogurl); 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 { try {
logger.info(" param:{}", new ObjectMapper().writeValueAsString(mapparam)); logger.info(" param:{}", new ObjectMapper().writeValueAsString(mapparam));
logger.info(" objectList result:{}", new ObjectMapper().writeValueAsString(objectList)); logger.info(" objectList result:{}", new ObjectMapper().writeValueAsString(objectList));
......
...@@ -199,7 +199,7 @@ public class QuartzController { ...@@ -199,7 +199,7 @@ public class QuartzController {
return ResultUtil.success(ResultEnum.PARAM_EMPTY.getCode(), ResultEnum.PARAM_EMPTY.getMessage()); return ResultUtil.success(ResultEnum.PARAM_EMPTY.getCode(), ResultEnum.PARAM_EMPTY.getMessage());
} }
try { try {
return quartzService.startJob(taskNo); return quartzService.startJob(taskNo,null);
} catch (Exception e) { } catch (Exception e) {
logger.error("/list/optionjob exception={}", e); logger.error("/list/optionjob exception={}", e);
return ResultUtil.fail(); return ResultUtil.fail();
......
...@@ -20,7 +20,7 @@ public interface QuartzService { ...@@ -20,7 +20,7 @@ public interface QuartzService {
Integer UpdateExecuteParam(Map map); 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; String startOrStopJob(String taskNo,String status) throws SchedulerException;
void initLoadOnlineTasks(); void initLoadOnlineTasks();
......
...@@ -301,11 +301,12 @@ public class EventWriteService { ...@@ -301,11 +301,12 @@ public class EventWriteService {
&& !"".equals(metadata.get("RightBtmY").toString()) && !"".equals(metadata.get("RightBtmY").toString())
) { ) {
try { try {
lo = new Location(Integer.parseInt(metadata.get("LeftTopX").toString()) + roiarray[0].intValue(), Integer.parseInt(metadata.get("LeftTopY").toString()) + roiarray[1].intValue(), lo = new Location(
Integer.parseInt(metadata.get("RightBtmX").toString()), Integer.parseInt(metadata.get("RightBtmY").toString()) + roiarray[1].intValue() 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) { } catch (Exception ex) {
log.error(ex.toString());
} }
} else if (null != objectBoundingBox) { } else if (null != objectBoundingBox) {
try { try {
...@@ -315,7 +316,7 @@ public class EventWriteService { ...@@ -315,7 +316,7 @@ public class EventWriteService {
Integer.parseInt(objectBoundingBox.get("y").toString()) + Integer.parseInt(objectBoundingBox.get("h").toString()) + roiarray[1].intValue() Integer.parseInt(objectBoundingBox.get("y").toString()) + Integer.parseInt(objectBoundingBox.get("h").toString()) + roiarray[1].intValue()
); );
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex.toString());
} }
} else { } else {
if (null != metadata.get("FaceBoundingBox")) { if (null != metadata.get("FaceBoundingBox")) {
...@@ -330,7 +331,7 @@ public class EventWriteService { ...@@ -330,7 +331,7 @@ public class EventWriteService {
Integer.parseInt(faceBoundingBox.get("h").toString()) + roiarray[1].intValue() Integer.parseInt(faceBoundingBox.get("h").toString()) + roiarray[1].intValue()
); );
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex.toString());
} }
} else { } else {
if (null != metadata.get("HeadBoundingBox")) { if (null != metadata.get("HeadBoundingBox")) {
...@@ -343,20 +344,17 @@ public class EventWriteService { ...@@ -343,20 +344,17 @@ public class EventWriteService {
Integer.parseInt(headBoundingBox.get("y").toString()) + Integer.parseInt(headBoundingBox.get("h").toString()) + roiarray[1].intValue() Integer.parseInt(headBoundingBox.get("y").toString()) + Integer.parseInt(headBoundingBox.get("h").toString()) + roiarray[1].intValue()
); );
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex.toString());
} }
} }
} }
} }
objlocation.put("location",lo); objlocation.put("location",lo);
if(null!=lo) { if(null!=lo) {
traff.setObjx(lo.getX1()); traff.setObjx(lo.getX1()<lo.getX2()?lo.getX1():lo.getX2());
traff.setObjy(lo.getY1()); traff.setObjy(lo.getY1()<lo.getY2()?lo.getY1():lo.getY2());
traff.setObjw(lo.getX2() - lo.getX1()); traff.setObjw(lo.getX1()<lo.getX2()?lo.getX2() - lo.getX1():lo.getX1() - lo.getX2());
traff.setObjh(lo.getY2() - lo.getY1()); traff.setObjh(lo.getY1()<lo.getY2()?lo.getY2() - lo.getY1():lo.getY1() - lo.getY2());
} }
} }
......
...@@ -104,24 +104,25 @@ public class QuartzServiceImpl implements QuartzService, InitializingBean { ...@@ -104,24 +104,25 @@ public class QuartzServiceImpl implements QuartzService, InitializingBean {
*/ */
@Override @Override
@Transactional @Transactional
public String startJob(String taskNo) throws SchedulerException { public String startJob(String taskNo,String status) throws SchedulerException {
QuartzTaskInformations quartzTaskInformation = quartzTaskInformationsService.getTaskByTaskNo(taskNo); QuartzTaskInformations quartzTaskInformation = quartzTaskInformationsService.getTaskByTaskNo(taskNo);
if (quartzTaskInformation == null) { if (quartzTaskInformation == null) {
return ResultUtil.success(ResultEnum.NO_DATA.getCode(), ResultEnum.NO_DATA.getMessage()); return ResultUtil.success(ResultEnum.NO_DATA.getCode(), ResultEnum.NO_DATA.getMessage());
} }
String status = quartzTaskInformation.getFrozenstatus(); //String status = quartzTaskInformation.getFrozenstatus();
Scheduler scheduler = schedulerBean.getScheduler(); Scheduler scheduler = schedulerBean.getScheduler();
long currentTimeMillis = System.currentTimeMillis(); long currentTimeMillis = System.currentTimeMillis();
QuartzTaskInformations task = new QuartzTaskInformations(); QuartzTaskInformations task = new QuartzTaskInformations();
task.setId(quartzTaskInformation.getId()); task.setId(quartzTaskInformation.getId());
task.setVersion(quartzTaskInformation.getVersion()); task.setVersion(quartzTaskInformation.getVersion());
//说明要暂停 //说明要暂停
if (ResultEnum.UNFROZEN.name().equals(status)) { if (ResultEnum.FROZEN.name().equals(status)) {
//删除
scheduler.deleteJob(new JobKey(taskNo)); scheduler.deleteJob(new JobKey(taskNo));
task.setFrozentime(currentTimeMillis); task.setFrozentime(currentTimeMillis);
task.setFrozenstatus(ResultEnum.FROZEN.name()); task.setFrozenstatus(ResultEnum.FROZEN.name());
//说明要启动 } else if (ResultEnum.UNFROZEN.name().equals(status)) {
} else if (ResultEnum.FROZEN.name().equals(status)) { //删除后启动
scheduler.deleteJob(new JobKey(taskNo)); scheduler.deleteJob(new JobKey(taskNo));
this.schedule(quartzTaskInformation, scheduler); this.schedule(quartzTaskInformation, scheduler);
task.setUnfrozentime(currentTimeMillis); task.setUnfrozentime(currentTimeMillis);
...@@ -143,16 +144,16 @@ public class QuartzServiceImpl implements QuartzService, InitializingBean { ...@@ -143,16 +144,16 @@ public class QuartzServiceImpl implements QuartzService, InitializingBean {
QuartzTaskInformations task = new QuartzTaskInformations(); QuartzTaskInformations task = new QuartzTaskInformations();
task.setId(quartzTaskInformation.getId()); task.setId(quartzTaskInformation.getId());
task.setVersion(quartzTaskInformation.getVersion()); task.setVersion(quartzTaskInformation.getVersion());
//说明要暂停 //暂停
scheduler.deleteJob(new JobKey(taskNo)); scheduler.deleteJob(new JobKey(taskNo));
if (ResultEnum.UNFROZEN.name().equals(status)) { if (ResultEnum.FROZEN.name().equals(status)) {
task.setFrozentime(currentTimeMillis); task.setFrozentime(currentTimeMillis);
task.setFrozenstatus(ResultEnum.UNFROZEN.name()); task.setFrozenstatus(ResultEnum.FROZEN.name());
//说明要启动 //启动
} else if (ResultEnum.FROZEN.name().equals(status)) { } else if (ResultEnum.UNFROZEN.name().equals(status)) {
this.schedule(quartzTaskInformation, scheduler); this.schedule(quartzTaskInformation, scheduler);
task.setUnfrozentime(currentTimeMillis); task.setUnfrozentime(currentTimeMillis);
task.setFrozenstatus(ResultEnum.FROZEN.name()); task.setFrozenstatus(ResultEnum.UNFROZEN.name());
} }
task.setLastmodifytime(currentTimeMillis); task.setLastmodifytime(currentTimeMillis);
quartzTaskInformationsService.updateStatusById(task); quartzTaskInformationsService.updateStatusById(task);
......
...@@ -50,16 +50,16 @@ public static ByteArrayOutputStream drawByPoints(InputStream bais,List<Map> det ...@@ -50,16 +50,16 @@ public static ByteArrayOutputStream drawByPoints(InputStream bais,List<Map> det
Graphics g = image.getGraphics(); Graphics g = image.getGraphics();
g.setColor(Color.RED); g.setColor(Color.RED);
//遍历所有特征值,画到图片上 //遍历所有特征值,画到图片上
int x,y,w,h;
for (Map box : detectObjects) { for (Map box : detectObjects) {
if (null != box) { if (null != box) {
try { try {
if (null != box.get("location")) { if (null != box.get("location")) {
x=0;y=0;w=0;h=0;
try { try {
Location lo =(Location) box.get("location"); Location lo =(Location) box.get("location");
logger.info("detectObjects x1,x2,y1,y2==="+lo.toString()); logger.info("detectObjects x1,x2,y1,y2==="+lo.toString());
g.drawRect(lo.getX1(), lo.getY1(), g.drawRect(lo.getX1(),lo.getY1(),lo.getX2()-lo.getX1(),lo.getY2()-lo.getY1());
lo.getX2() - lo.getX1(),
lo.getY2() - lo.getY1());
}catch (Exception ex){ }catch (Exception ex){
logger.error("Location Map error:{}", ex.toString()); logger.error("Location Map error:{}", ex.toString());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment