diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java index 39a70b7..d1195c2 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java @@ -121,7 +121,7 @@ public class YDeviceImageService extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("isShow", "1"); + wrapper.eq("isShow", "0"); wrapper.eq("channelNo", device.getChannelNo()); wrapper.eq("ckId", device.getCkId()); @@ -142,6 +142,7 @@ public class YDeviceImageService extends ServiceImpl 0) { DeviceImage deviceImageExit = deviceImageList.get(0); diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncDetection.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncDetection.java index d019195..25dd2ee 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncDetection.java +++ b/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 com.alibaba.fastjson.JSONObject; 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.DeviceImage; import com.yxt.supervise.monitor.api.entity.WareHouse; @@ -93,7 +94,9 @@ public class SyncDetection implements SchedulingConfigurer { deviceVo.setEndImage(ed.getImgAfter()); deviceVo.setStartTime(sdf.format(ed.getCreateTime())); deviceVo.setEndTime(sdf.format(ed.getModifyTime())); - deviceVos.add(deviceVo); + if(StringUtils.isNotEmpty(ed.getSimilarity())){ + deviceVos.add(deviceVo); + } } }