Browse Source

图片对比修改

master
wangpengfei 2 years ago
parent
commit
5aa7bafe5c
  1. 3
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java
  2. 5
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncDetection.java

3
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java

@ -121,7 +121,7 @@ public class YDeviceImageService extends ServiceImpl<YDeviceImageMapper, DeviceI
// 入库操作 // 入库操作
// 查询比对的前一张照片 今天的9:00和昨天的9:00 // 查询比对的前一张照片 今天的9:00和昨天的9:00
QueryWrapper<DeviceImage> wrapper = new QueryWrapper<>(); QueryWrapper<DeviceImage> wrapper = new QueryWrapper<>();
wrapper.eq("isShow", "1"); wrapper.eq("isShow", "0");
wrapper.eq("channelNo", device.getChannelNo()); wrapper.eq("channelNo", device.getChannelNo());
wrapper.eq("ckId", device.getCkId()); wrapper.eq("ckId", device.getCkId());
@ -142,6 +142,7 @@ public class YDeviceImageService extends ServiceImpl<YDeviceImageMapper, DeviceI
deviceImage.setIsShow("1"); deviceImage.setIsShow("1");
deviceImage.setName(device.getName()); deviceImage.setName(device.getName());
deviceImage.setCkId(device.getCkId()); deviceImage.setCkId(device.getCkId());
deviceImage.setModifyTime(new Date());
if (deviceImageList.size() > 0) { if (deviceImageList.size() > 0) {
DeviceImage deviceImageExit = deviceImageList.get(0); DeviceImage deviceImageExit = deviceImageList.get(0);

5
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncDetection.java

@ -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,7 +94,9 @@ 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()));
deviceVos.add(deviceVo); if(StringUtils.isNotEmpty(ed.getSimilarity())){
deviceVos.add(deviceVo);
}
} }
} }

Loading…
Cancel
Save