From 9091740e4964c6065c6549cd1599624d0fb24cbd Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 31 五月 2024 16:32:30 +0800
Subject: [PATCH] 巡检需要的大光电查询修改提交
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 b5727f2..ba8493e 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
@@ -116,6 +116,7 @@
camera.setState("0");
int i = ardCamerasService.insertArdCameras(camera);
if (i > 0) {
+ cameraSdkService.logout(camera.getId());
AjaxResult result = cameraSdkService.login(camera);
return success(result.get("msg"));
} else {
@@ -140,6 +141,7 @@
camera.setState("0");
int i = ardCamerasService.updateArdCameras(camera);
if (i > 0) {
+ cameraSdkService.logout(camera.getId());
AjaxResult result = cameraSdkService.login(camera);
return success(result.get("msg"));
} else {
@@ -216,7 +218,8 @@
@GetMapping("/getDeptAndCameraWithCheckBox")
@ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�(寮�鍚閫夋)")
public AjaxResult getDeptAndCameraWithCheckBox() {
- Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(false);
+ //Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(false);
+ List<Map<String, Object>> deptAndCamera = ardCamerasService.getChildDeptAndCameraOwn(false);
return AjaxResult.success(deptAndCamera);
}
--
Gitblit v1.9.3