diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 774526f..08b7023 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.device.controller; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; @@ -36,6 +37,7 @@ public DeviceGroupInfoController(IDeviceGroupInfoService deviceGroupInfoService) { this.deviceGroupInfoService = deviceGroupInfoService; } + @ApiIgnore @ApiOperation(value = "列表查询") @GetMapping(value = "/list") @@ -43,6 +45,7 @@ QueryWrapper query = deviceGroupInfoVO.genQuery(); return ResponseDataDTO.success(deviceGroupInfoService.list(query)); } + @BussinessLog(value = "设备分组管理分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") @@ -57,19 +60,31 @@ @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody DeviceGroupInfo deviceGroupInfo) { - deviceGroupInfo.setCreateTime(new Date()); deviceGroupInfo.setUpdateTime(new Date()); + setDeviceGroupInfo(deviceGroupInfo); deviceGroupInfoService.save(deviceGroupInfo); return ResponseDataDTO.success(); } + + private void setDeviceGroupInfo(DeviceGroupInfo deviceGroupInfo) { + deviceGroupInfo.setCreateTime(new Date()); + if (StrUtil.isNotEmpty(deviceGroupInfo.getCameraIds())) { + deviceGroupInfo.setCameraNum(StrUtil.split(deviceGroupInfo.getCameraIds(), ",").size()); + } else { + deviceGroupInfo.setCameraNum(0); + } + } + @BussinessLog(value = "设备分组修改") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody DeviceGroupInfo deviceGroupInfo) { deviceGroupInfo.setUpdateTime(new Date()); + setDeviceGroupInfo(deviceGroupInfo); deviceGroupInfoService.updateById(deviceGroupInfo); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备分组删除") @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") @@ -77,6 +92,7 @@ deviceGroupInfoService.removeById(id); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备分组批量删除") @ApiOperation("批量删除") @PostMapping("/batchDelete") @@ -84,6 +100,7 @@ deviceGroupInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备分组详情查询") @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 774526f..08b7023 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.device.controller; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; @@ -36,6 +37,7 @@ public DeviceGroupInfoController(IDeviceGroupInfoService deviceGroupInfoService) { this.deviceGroupInfoService = deviceGroupInfoService; } + @ApiIgnore @ApiOperation(value = "列表查询") @GetMapping(value = "/list") @@ -43,6 +45,7 @@ QueryWrapper query = deviceGroupInfoVO.genQuery(); return ResponseDataDTO.success(deviceGroupInfoService.list(query)); } + @BussinessLog(value = "设备分组管理分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") @@ -57,19 +60,31 @@ @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody DeviceGroupInfo deviceGroupInfo) { - deviceGroupInfo.setCreateTime(new Date()); deviceGroupInfo.setUpdateTime(new Date()); + setDeviceGroupInfo(deviceGroupInfo); deviceGroupInfoService.save(deviceGroupInfo); return ResponseDataDTO.success(); } + + private void setDeviceGroupInfo(DeviceGroupInfo deviceGroupInfo) { + deviceGroupInfo.setCreateTime(new Date()); + if (StrUtil.isNotEmpty(deviceGroupInfo.getCameraIds())) { + deviceGroupInfo.setCameraNum(StrUtil.split(deviceGroupInfo.getCameraIds(), ",").size()); + } else { + deviceGroupInfo.setCameraNum(0); + } + } + @BussinessLog(value = "设备分组修改") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody DeviceGroupInfo deviceGroupInfo) { deviceGroupInfo.setUpdateTime(new Date()); + setDeviceGroupInfo(deviceGroupInfo); deviceGroupInfoService.updateById(deviceGroupInfo); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备分组删除") @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") @@ -77,6 +92,7 @@ deviceGroupInfoService.removeById(id); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备分组批量删除") @ApiOperation("批量删除") @PostMapping("/batchDelete") @@ -84,6 +100,7 @@ deviceGroupInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备分组详情查询") @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java index bc9a07e..137d768 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java @@ -142,6 +142,13 @@ @TableField(exist = false) private String areaName; + @ApiModelProperty(value = "播放地址", dataType = "String") + @TableField("play_url") + private String playUrl; + + @ApiModelProperty(value = "通道标识", dataType = "String") + @TableField("camera_index_code") + private String cameraIndexCode; @Override public String toString() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 774526f..08b7023 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.device.controller; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; @@ -36,6 +37,7 @@ public DeviceGroupInfoController(IDeviceGroupInfoService deviceGroupInfoService) { this.deviceGroupInfoService = deviceGroupInfoService; } + @ApiIgnore @ApiOperation(value = "列表查询") @GetMapping(value = "/list") @@ -43,6 +45,7 @@ QueryWrapper query = deviceGroupInfoVO.genQuery(); return ResponseDataDTO.success(deviceGroupInfoService.list(query)); } + @BussinessLog(value = "设备分组管理分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") @@ -57,19 +60,31 @@ @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody DeviceGroupInfo deviceGroupInfo) { - deviceGroupInfo.setCreateTime(new Date()); deviceGroupInfo.setUpdateTime(new Date()); + setDeviceGroupInfo(deviceGroupInfo); deviceGroupInfoService.save(deviceGroupInfo); return ResponseDataDTO.success(); } + + private void setDeviceGroupInfo(DeviceGroupInfo deviceGroupInfo) { + deviceGroupInfo.setCreateTime(new Date()); + if (StrUtil.isNotEmpty(deviceGroupInfo.getCameraIds())) { + deviceGroupInfo.setCameraNum(StrUtil.split(deviceGroupInfo.getCameraIds(), ",").size()); + } else { + deviceGroupInfo.setCameraNum(0); + } + } + @BussinessLog(value = "设备分组修改") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody DeviceGroupInfo deviceGroupInfo) { deviceGroupInfo.setUpdateTime(new Date()); + setDeviceGroupInfo(deviceGroupInfo); deviceGroupInfoService.updateById(deviceGroupInfo); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备分组删除") @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") @@ -77,6 +92,7 @@ deviceGroupInfoService.removeById(id); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备分组批量删除") @ApiOperation("批量删除") @PostMapping("/batchDelete") @@ -84,6 +100,7 @@ deviceGroupInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备分组详情查询") @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java index bc9a07e..137d768 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java @@ -142,6 +142,13 @@ @TableField(exist = false) private String areaName; + @ApiModelProperty(value = "播放地址", dataType = "String") + @TableField("play_url") + private String playUrl; + + @ApiModelProperty(value = "通道标识", dataType = "String") + @TableField("camera_index_code") + private String cameraIndexCode; @Override public String toString() { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 391b74b..bdccc06 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -12,7 +12,7 @@ min-idle: 20 web: resources: - static-locations: \casic\tmp\ + static-locations: /casic/tmp/ jms: pub-sub-domain: true # session: @@ -32,7 +32,7 @@ hikSdk: /casic/hiklib/HCNetSDK.dll hikPlay: /casic/hiklib/PlayCtrl.dll file: - uploadPath: \casic\tmp\ + uploadPath: /casic/tmp/ logging: level.root: info level.com.casic: debug