From 2d10f00422f1c501f2cffec29fef1c6a8eba3a55 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 31 一月 2024 13:57:44 +0800
Subject: [PATCH] 禁出电子围栏报警逻辑bug修改提交
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 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 8c103db..8ff1f37 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
@@ -3,6 +3,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.common.constant.CameraConstants;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
@@ -27,6 +28,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
import java.util.*;
@@ -59,7 +61,16 @@
List<ArdCameras> list = ardCamerasService.selectArdCamerasList(ardCamera);
return getDataTable(list);
}
-
+ /**
+ * 鏌ヨ鐩告満璁惧鍒楄〃锛堜笉鏍￠獙鏉冮檺锛�
+ */
+ @GetMapping("/list/noPerm")
+ @ApiOperation("鏌ヨ鐩告満璁惧鍒楄〃")
+ public TableDataInfo listNoPerm(ArdCameras ardCamera) {
+ startPage();
+ List<ArdCameras> list = ardCamerasService.selectArdCamerasList(ardCamera);
+ return getDataTable(list);
+ }
/**
* 瀵煎嚭鐩告満璁惧鍒楄〃
*/
@@ -137,6 +148,27 @@
return toAjax(ardCamerasService.deleteArdCamerasByIds(ids));
}
+ @Log(title = "瀵煎叆鐩告満璁惧", businessType = BusinessType.IMPORT)
+ @PreAuthorize("@ss.hasPermi('device:cameras:import')")
+ @PostMapping("/importData")
+ @ApiOperation("瀵煎叆鐩告満璁惧")
+ public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
+ ExcelUtil<ArdCameras> util = new ExcelUtil<ArdCameras>(ArdCameras.class);
+ List<ArdCameras> camerasList = util.importExcel(file.getInputStream());
+ String operName = getUsername();
+ String message = ardCamerasService.importCameras(camerasList, updateSupport, operName);
+ return success(message);
+ }
+
+ @PostMapping("/importTemplate")
+ @ApiOperation("鐩告満璁惧瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) {
+ ExcelUtil<ArdCameras> util = new ExcelUtil<ArdCameras>(ArdCameras.class);
+ util.importTemplateExcel(response, "鐩告満璁惧鏁版嵁");
+ }
+
+
+
@GetMapping("/options")
@ApiOperation("閫夋嫨鐩告満鏁版嵁")
public List options(ArdCameras ardCameras) {
--
Gitblit v1.9.3