From 1a4a5293b50be651520e63ea38132c9cf451ef0f Mon Sep 17 00:00:00 2001 From: yangzongjia Date: Sat, 10 Jun 2023 14:27:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=93=E5=BA=93=E8=A1=A8?= =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=20=E5=AF=B9=E6=89=80=E6=9C=89=E7=9A=84=E6=91=84=E5=83=8F?= =?UTF-8?q?=E5=A4=B4=E9=83=BD=E8=BF=9B=E8=A1=8C=E6=8B=8D=E7=85=A7=E6=8A=93?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/api/entity/DeviceImage.java | 3 +++ .../monitor/api/entity/WareHouse.java | 22 +++++++++---------- .../YxtSuperviseMonitorApplication.java | 1 + .../monitor/biz/callpolice/CallRest.java | 11 ++++++---- .../monitor/biz/device/YDeviceMapper.xml | 2 +- .../monitor/biz/device/YDeviceRest.java | 4 ++-- .../monitor/biz/device/YDeviceService.java | 10 ++++++++- .../biz/deviceImage/YDeviceImageService.java | 22 ++++++++++++------- .../monitor/biz/scheduled/SyncDetection.java | 19 ++++++++++++---- .../src/main/resources/application-test.yml | 4 ++-- 10 files changed, 65 insertions(+), 33 deletions(-) diff --git a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java index 8adee75..9646c92 100644 --- a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java +++ b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java @@ -73,4 +73,7 @@ public class DeviceImage extends EntityWithId { @ApiModelProperty("相似度") private String similarity; + + @ApiModelProperty("仓库ID") + private Integer ckId; } diff --git a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java index a72fe57..ea296e6 100644 --- a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java +++ b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java @@ -20,16 +20,16 @@ public class WareHouse { @ApiModelProperty("仓库名称") private String name; // 名称 - @ApiModelProperty("位置") - private String position; - - @ApiModelProperty("货架号") - private String code; - - @ApiModelProperty("联系人") - private String lxr; - - @ApiModelProperty("手机号") - private String lxdh; +// @ApiModelProperty("位置") +// private String position; +// +// @ApiModelProperty("货架号") +// private String code; +// +// @ApiModelProperty("联系人") +// private String lxr; +// +// @ApiModelProperty("手机号") +// private String lxdh; } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/YxtSuperviseMonitorApplication.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/YxtSuperviseMonitorApplication.java index 2aea2e5..7019a4d 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/YxtSuperviseMonitorApplication.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/YxtSuperviseMonitorApplication.java @@ -3,6 +3,7 @@ package com.yxt.supervise.monitor; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableScheduling; /** diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/CallRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/CallRest.java index 8b0ad5e..39a2dd2 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/CallRest.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/CallRest.java @@ -8,6 +8,7 @@ import com.yxt.supervise.monitor.biz.util.HttpUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.messaging.simp.SimpMessagingTemplate; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -27,6 +28,9 @@ public class CallRest { @Autowired private DemoBaseentityService demoBaseentityService; +// @Autowired +// private SimpMessagingTemplate messagingTemplate; + @ApiOperation("获取token") @GetMapping("/getCallToken") public String getCallToken() throws Exception { @@ -168,10 +172,9 @@ public class CallRest { @ApiOperation("临时测试") @GetMapping("/callTempFunc") public void callTempFunc() throws NoSuchAlgorithmException, KeyStoreException, IOException, KeyManagementException { -// String url = "https://api2.hik-cloud.com/api/v1/open/basic/devices/list?groupNo=A1181&pageNo=1&pageSize=50"; - String url = "https://api2.hik-cloud.com/api/v1/ezviz/devices/queryDeviceStatus?deviceSerial=Q16362484"; - String result = HttpUtils.sendGet(url, SyncService.haiKangToken); - System.out.println(result); +// String errorMessage = "这是一条新的报警消息。"; +// messagingTemplate.convertAndSendToUser("ee533a0427b74da79d307a77c989c2d1", "/queue/subscribe", errorMessage); +// messagingTemplate.convertAndSend("/topic/subscribe", "您收到了新的系统消息"); } } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceMapper.xml b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceMapper.xml index c81360d..42ba9e7 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceMapper.xml +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceMapper.xml @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceRest.java index c1d9dfb..f9e2c67 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceRest.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceRest.java @@ -45,9 +45,9 @@ public class YDeviceRest { @ApiOperation("获取指定设备列表") @GetMapping("/getOtherList") - public ResultBean getOtherList(String type) { + public ResultBean getOtherList(String type,String ckId) { ResultBean rb = ResultBean.fireSuccess(); - rb.setData(yDeviceService.getOtherList(type)); + rb.setData(yDeviceService.getOtherList(type,ckId)); return rb; } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java index 62bb800..b0469d9 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java @@ -63,10 +63,13 @@ public class YDeviceService extends ServiceImpl { } - public List getOtherList(String type) { + public List getOtherList(String type,String ckId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("type", type); //1 摄像头 + if(ckId != null){ + queryWrapper.eq("ckId", ckId); + } queryWrapper.eq("isDelete", 0); List athleteBOIPage = null; @@ -157,6 +160,11 @@ public class YDeviceService extends ServiceImpl { Device nvrDevice = this.getById(device.getNvrId()); device.setNvrCode(nvrDevice.getVCode()); device.setNvrSerial(nvrDevice.getSerialNumber()); + device.setCkId(nvrDevice.getCkId()); + } + if ("2".equals(device.getType())) { //电子围栏 + Device nvrDevice = this.getById(device.getBjzjId()); + device.setCkId(nvrDevice.getCkId()); } return rb.setData(this.save(device)); // // 先给海康接口添加设备 如果失败直接返回失败 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 539ba37..8739206 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 @@ -45,6 +45,9 @@ public class YDeviceImageService extends ServiceImpl param = new HashMap<>(); - param.put("deviceSerial", "L20560109"); // 设备序列号 string - param.put("channelNo", channelNo); // 组编号 string + param.put("deviceSerial", device.getNvrSerial()); // 设备序列号 string + param.put("channelNo", device.getChannelNo()); // 组编号 string String paramJson = JSONObject.toJSONString(param); String result = HttpUtils.sendPostJson(url, paramJson, SyncService.haiKangToken); JSONObject jsonObject = JSONObject.parseObject(result); @@ -83,7 +86,7 @@ public class YDeviceImageService extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("isShow", "1"); - wrapper.eq("channelNo", channelNo); + wrapper.eq("channelNo", device.getChannelNo()); wrapper.orderByDesc("createTime"); List deviceImageList = this.list(wrapper); DeviceImage deviceImage = new DeviceImage(); - deviceImage.setDeviceSerial("L20560109"); + deviceImage.setDeviceSerial(device.getNvrSerial()); deviceImage.setCreateTime(new Date()); - deviceImage.setChannelNo(channelNo); + deviceImage.setChannelNo(device.getChannelNo()); deviceImage.setIsShow("1"); + deviceImage.setCkId(device.getCkId()); if (deviceImageList.size() > 0) { DeviceImage deviceImageExit = deviceImageList.get(0); String convertImage = deviceImageExit.getImgAfter(); + Date time = deviceImageExit.getModifyTime(); + deviceImage.setCreateTime(time); deviceImage.setImgBefore(convertImage); deviceImage.setImgAfter(picName); String similar = String.valueOf(ImageCompareUtil.compareImage(filePath + "/" + convertImage, filePath + "/" + picName)); @@ -119,7 +125,7 @@ public class YDeviceImageService extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("type", "1"); //1 摄像头 + queryWrapper.eq("isDelete", 0); + List list = yDeviceService.list(queryWrapper); + for(Device device : list){ + yDeviceImageService.getImage(device); + } } }, new Trigger() { diff --git a/yxt-supervise-monitor-biz/src/main/resources/application-test.yml b/yxt-supervise-monitor-biz/src/main/resources/application-test.yml index c5c8df0..8b9a530 100644 --- a/yxt-supervise-monitor-biz/src/main/resources/application-test.yml +++ b/yxt-supervise-monitor-biz/src/main/resources/application-test.yml @@ -30,6 +30,6 @@ image: scheduleTime: cron: 0 59 * * * ? -# folder: D:\resources\download - folder: /root/huirong/monitor-java/imagesDownload + folder: D:\resources\download +# folder: /root/huirong/monitor-java/imagesDownload