From 5ad4e2b2e881204102cd0a5e96da936db19f39c7 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 11 八月 2023 11:30:47 +0800
Subject: [PATCH] 删除
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
index 1d423f6..e0efc82 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
@@ -8,9 +8,7 @@
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.hiksdk.service.impl.HikClientServiceImpl;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.inspect.service.IArdVideoInspectTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -29,7 +27,6 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo;
-
import java.util.*;
/**
@@ -151,7 +148,14 @@
@ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�")
public AjaxResult getDeptAndCamera()
{
- Map deptAndCamera = ardCamerasService.getChildDeptAndCamera();
+ Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(true);
+ return AjaxResult.success(deptAndCamera);
+ }
+ @GetMapping("/getDeptAndCameraWithCheckBox")
+ @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�(寮�鍚閫夋)")
+ public AjaxResult getDeptAndCameraWithCheckBox()
+ {
+ Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(false);
return AjaxResult.success(deptAndCamera);
}
@PostMapping("/getNearCamerasBycoordinate")
--
Gitblit v1.9.3