diff --git a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/Device.java b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/Device.java index 2a560e1..2be0233 100644 --- a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/Device.java +++ b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/Device.java @@ -57,4 +57,13 @@ public class Device extends EntityWithId { @ApiModelProperty("序列号") private String serialNumber; + + @ApiModelProperty("左偏移") + private String leftPosition; + + @ApiModelProperty("上偏移") + private String topPosition; + + @ApiModelProperty("组号") + private String channelNo; } 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 4462abf..1450e21 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 @@ -31,12 +31,21 @@ public class YDeviceRest { @ApiOperation("分页获取设备状态列表") @GetMapping("/getDeviceStatusPage") public ResultBean getDeviceStatusPage(@RequestParam Map searchVo, - @ModelAttribute PageVo pageVo) { + @ModelAttribute PageVo pageVo) { ResultBean rb = ResultBean.fireSuccess(); rb.setData(yDeviceService.getDeviceStatusPage(searchVo, pageVo)); return rb; } + + @ApiOperation("获取摄像头列表") + @GetMapping("/getSxtList") + public ResultBean getSxtList() { + ResultBean rb = ResultBean.fireSuccess(); + rb.setData(yDeviceService.getSxtList()); + return rb; + } + @ApiOperation("添加设备组") @PostMapping("/createDeviceGroup") public ResultBean createDeviceGroup(Device device) { 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 cc8f2a1..2a283b2 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 @@ -58,6 +58,23 @@ public class YDeviceService extends ServiceImpl { } + public List getSxtList() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + + queryWrapper.eq("type", "1"); //1 摄像头 + queryWrapper.eq("isDelete", 0); + + List athleteBOIPage = null; + try { + athleteBOIPage = baseMapper.selectList(queryWrapper); + } catch (Exception e) { + System.out.println(e); + athleteBOIPage = null; + } + return athleteBOIPage; + } + + public IPage getDeviceStatusPage(Map searchVo, PageVo pageVo) { String url = "https://api2.hik-cloud.com/api/v1/open/basic/devices/list?groupNo=A1181&pageNo=" + pageVo.getCurrent() + "&pageSize=" + pageVo.getSize(); String result = ""; diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageRest.java index 4d07f98..09aa4c3 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageRest.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageRest.java @@ -43,7 +43,7 @@ public class YDeviceImageRest { @ApiOperation("单条获取抓拍信息") @GetMapping("/getShiPinByChannelNo") - public ResultBean getShiPinByChannelNo(@RequestParam String channelNo) { + public ResultBean getShiPinByChannelNo(@RequestParam String channelNo) { String spToken = ""; String url = "https://api2.hik-cloud.com/v1/ezviz/account/info"; try {