From 19763ebd20ad16435f3c1ccfdc8abd1518712cc1 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 24 Dec 2025 15:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java b/ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java
index 821df96..cbbfddf 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java
@@ -14,6 +14,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.jdbc.Null;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -24,12 +25,12 @@
/**
* 相机设备Controller
*
- * @author ruoyi
+ * @author ard
* @date 2023-01-31
*/
@Slf4j
@RestController
-@RequestMapping("/device/cameras")
+@RequestMapping("/device/camera")
@Api(tags = "相机管理接口")
public class ArdCameraController extends BaseController {
@@ -39,7 +40,7 @@
/**
* 查询相机设备列表
*/
- @PreAuthorize("@ss.hasPermi('device:cameras:list')")
+ @PreAuthorize("@ss.hasPermi('device:camera:list')")
@GetMapping("/list")
@ApiOperation("查询相机设备列表")
public TableDataInfo list(ArdCamera ardCamera) {
@@ -53,7 +54,7 @@
* 导出相机设备列表
*/
@ApiOperation("导出相机设备列表")
- @PreAuthorize("@ss.hasPermi('device:cameras:export')")
+ @PreAuthorize("@ss.hasPermi('device:camera:export')")
@Log(title = "相机设备", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ArdCamera ardCamera) {
@@ -66,7 +67,7 @@
* 获取相机设备详细信息
*/
@ApiOperation("获取相机设备详细信息")
- @PreAuthorize("@ss.hasPermi('device:cameras:query')")
+ @PreAuthorize("@ss.hasPermi('device:camera:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
return success(ardCameraService.selectArdCameraById(id));
@@ -76,12 +77,16 @@
* 新增相机设备
*/
@ApiOperation("新增相机设备")
- @PreAuthorize("@ss.hasPermi('device:cameras:add')")
+ @PreAuthorize("@ss.hasPermi('device:camera:add')")
@Log(title = "相机设备", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArdCamera camera) {
if (DeviceConstants.NOT_UNIQUE.equals(ardCameraService.checkCameraIpAndPortUnique(camera))) {
return error("新增相机'" + camera.getIp() + ":" + camera.getPort() + "'失败，相机已存在");
+ }
+ ArdCamera existingCamera = ardCameraService.checkAirportHasCamera(camera);
+ if (existingCamera != null) {
+ return error("该机场已被相机【" + existingCamera.getName() + "】(" + existingCamera.getIp() + ") 关联");
}
return success(ardCameraService.insertArdCamera(camera));
}
@@ -90,12 +95,16 @@
* 修改相机设备
*/
@ApiOperation("修改相机设备")
- @PreAuthorize("@ss.hasPermi('device:cameras:edit')")
+ @PreAuthorize("@ss.hasPermi('device:camera:edit')")
@Log(title = "相机设备", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArdCamera camera) {
if (DeviceConstants.NOT_UNIQUE.equals(ardCameraService.checkCameraIpAndPortUnique(camera))) {
return error("修改相机'" + camera.getIp() + ":" + camera.getPort() + "'失败，相机已存在");
+ }
+ ArdCamera existingCamera = ardCameraService.checkAirportHasCamera(camera);
+ if (existingCamera != null) {
+ return error("该机场已被相机【" + existingCamera.getName() + "】(" + existingCamera.getIp() + ") 关联");
}
return success(ardCameraService.updateArdCamera(camera));
}
@@ -104,7 +113,7 @@
* 删除相机设备
*/
@ApiOperation("删除相机设备")
- @PreAuthorize("@ss.hasPermi('device:cameras:remove')")
+ @PreAuthorize("@ss.hasPermi('device:camera:remove')")
@Log(title = "相机设备", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
@@ -113,7 +122,7 @@
@Log(title = "导入相机设备", businessType = BusinessType.IMPORT)
- @PreAuthorize("@ss.hasPermi('device:cameras:import')")
+ @PreAuthorize("@ss.hasPermi('device:camera:import')")
@PostMapping("/importData")
@ApiOperation("导入相机设备")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
--
Gitblit v1.9.3