|
@ -3,6 +3,7 @@ package com.yxt.supervise.monitor.biz.scheduled; |
|
|
import cn.hutool.core.date.DateUtil; |
|
|
import cn.hutool.core.date.DateUtil; |
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
|
import com.yxt.common.base.utils.StringUtils; |
|
|
import com.yxt.supervise.monitor.api.entity.Device; |
|
|
import com.yxt.supervise.monitor.api.entity.Device; |
|
|
import com.yxt.supervise.monitor.api.entity.DeviceImage; |
|
|
import com.yxt.supervise.monitor.api.entity.DeviceImage; |
|
|
import com.yxt.supervise.monitor.api.entity.WareHouse; |
|
|
import com.yxt.supervise.monitor.api.entity.WareHouse; |
|
@ -93,9 +94,11 @@ public class SyncDetection implements SchedulingConfigurer { |
|
|
deviceVo.setEndImage(ed.getImgAfter()); |
|
|
deviceVo.setEndImage(ed.getImgAfter()); |
|
|
deviceVo.setStartTime(sdf.format(ed.getCreateTime())); |
|
|
deviceVo.setStartTime(sdf.format(ed.getCreateTime())); |
|
|
deviceVo.setEndTime(sdf.format(ed.getModifyTime())); |
|
|
deviceVo.setEndTime(sdf.format(ed.getModifyTime())); |
|
|
|
|
|
if(StringUtils.isNotEmpty(ed.getSimilarity())){ |
|
|
deviceVos.add(deviceVo); |
|
|
deviceVos.add(deviceVo); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
PushPoliceImageAllVo pushPoliceImageAllVo = new PushPoliceImageAllVo(); |
|
|
PushPoliceImageAllVo pushPoliceImageAllVo = new PushPoliceImageAllVo(); |
|
|
pushPoliceImageAllVo.setSid(wareHouse.getSid()); |
|
|
pushPoliceImageAllVo.setSid(wareHouse.getSid()); |
|
|