diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncService.java index 5e41390..730815a 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncService.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncService.java @@ -116,16 +116,6 @@ public class SyncService { } - // @Async -// @Scheduled(fixedDelay = 1000 * 20 * 1) //20秒拉取一次报警信息 -// public void pushEmail() { -// try { -// yMessageInfoService.saveMessageInfo(); -// } catch (Exception ex) { -// ex.printStackTrace(); -// } -// } -// @Async @Scheduled(fixedDelay = 1000 * 60) // 60秒更新一次设备状态 public void refreshDeviceStatus() { @@ -136,52 +126,63 @@ public class SyncService { } } -// @Async + + @Async + @Scheduled(fixedDelay = 1000 * 20 * 1) //20秒拉取一次报警信息 + public void pushEmail() { + try { + yMessageInfoService.saveMessageInfo(); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + // @Async // @Scheduled(fixedDelay = 1000 * 30) // 30秒更新一次图片比对 -// public void getImage() { -// try { -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.eq("type", "1"); //1 摄像头 -// queryWrapper.eq("isDelete", 0); -// List list = yDeviceService.list(queryWrapper); -// List imageDeviceList = new ArrayList<>(); -// for (Device device : list) { -// DeviceImage deviceImage = yDeviceImageService.getImage(device); -// System.out.println(deviceImage); -// if (deviceImage != null) { -// imageDeviceList.add(deviceImage); -// } -// } -// -// List wareHouses = yWareHouseService.getNeedPushWareHouses(); -// -// SimpleDateFormat sdf = new SimpleDateFormat("YYYY-MM-dd HH:mm:ss"); -// for (WareHouse wareHouse : wareHouses) { -// List deviceVos = new ArrayList<>(); -// for (DeviceImage ed : imageDeviceList) { -// if (wareHouse.getSid().equals(ed.getCkId())) { -// DeviceVo deviceVo = new DeviceVo(); -// deviceVo.setName(ed.getName()); -// deviceVo.setSimilarity(ed.getSimilarity()); -// deviceVo.setStartImage(ed.getImgBefore()); -// deviceVo.setEndImage(ed.getImgAfter()); -// deviceVo.setStartTime(sdf.format(ed.getCreateTime())); -// deviceVo.setEndTime(sdf.format(ed.getModifyTime())); -// deviceVos.add(deviceVo); -// } -// } -// -// PushPoliceImageAllVo pushPoliceImageAllVo = new PushPoliceImageAllVo(); -// pushPoliceImageAllVo.setSid(wareHouse.getSid()); -// pushPoliceImageAllVo.setName(wareHouse.getName()); -// pushPoliceImageAllVo.setDeviceImages(deviceVos); -// pushPoliceImageAllVo.setSendTime(sdf.format(new Date())); -// pushPoliceInfoService.pushPoliceImageMessage(pushPoliceImageAllVo); -// } -// } catch (Exception ex) { -// ex.printStackTrace(); -// } -// } + public void getImage() { + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("type", "1"); //1 摄像头 + queryWrapper.eq("isDelete", 0); + List list = yDeviceService.list(queryWrapper); + List imageDeviceList = new ArrayList<>(); + for (Device device : list) { + DeviceImage deviceImage = yDeviceImageService.getImage(device); + System.out.println(deviceImage); + if (deviceImage != null) { + imageDeviceList.add(deviceImage); + } + } + + List wareHouses = yWareHouseService.getNeedPushWareHouses(); + + SimpleDateFormat sdf = new SimpleDateFormat("YYYY-MM-dd HH:mm:ss"); + for (WareHouse wareHouse : wareHouses) { + List deviceVos = new ArrayList<>(); + for (DeviceImage ed : imageDeviceList) { + if (wareHouse.getSid().equals(ed.getCkId())) { + DeviceVo deviceVo = new DeviceVo(); + deviceVo.setName(ed.getName()); + deviceVo.setSimilarity(ed.getSimilarity()); + deviceVo.setStartImage(ed.getImgBefore()); + deviceVo.setEndImage(ed.getImgAfter()); + deviceVo.setStartTime(sdf.format(ed.getCreateTime())); + deviceVo.setEndTime(sdf.format(ed.getModifyTime())); + deviceVos.add(deviceVo); + } + } + + PushPoliceImageAllVo pushPoliceImageAllVo = new PushPoliceImageAllVo(); + pushPoliceImageAllVo.setSid(wareHouse.getSid()); + pushPoliceImageAllVo.setName(wareHouse.getName()); + pushPoliceImageAllVo.setDeviceImages(deviceVos); + pushPoliceImageAllVo.setSendTime(sdf.format(new Date())); + pushPoliceInfoService.pushPoliceImageMessage(pushPoliceImageAllVo); + } + } catch (Exception ex) { + ex.printStackTrace(); + } + } }