From 5e697a70c7e49e18bc3bc2f75c2e9ad5bda17489 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期五, 17 五月 2024 15:40:23 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java
index 10cc8a0..94af662 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java
@@ -6,11 +6,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import com.javaweb.common.annotation.Log;
import com.javaweb.common.enums.BusinessType;
import com.javaweb.geo.domain.DeviceLog;
@@ -19,6 +15,7 @@
import com.javaweb.common.core.domain.AjaxResult;
import com.javaweb.common.utils.poi.ExcelUtil;
import com.javaweb.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
/**
* 璁惧鍑哄叆搴撹褰旵ontroller
@@ -70,7 +67,8 @@
* 鏂板璁惧鍑哄叆搴撹褰�
*/
@GetMapping("/add")
- public String add() {
+ public String add(String projectId, ModelMap mmap) {
+ mmap.put("projectId", projectId);
return prefix + "/add";
}
@@ -116,4 +114,17 @@
public AjaxResult remove(String ids) {
return toAjax(deviceLogService.deleteDeviceLogByIds(ids));
}
+
+
+ /**
+ * 瀵煎叆璁惧鍑哄叆搴撹褰�
+ */
+ @RequiresPermissions("geo:deviceLog:import")
+ @Log(title = "瀵煎叆璁惧鍑哄叆搴撹褰�")
+ @PostMapping( "/importDeviceLog/{projectId}")
+ @ResponseBody
+ public AjaxResult importDeviceLog(@PathVariable("projectId") String projectId, @RequestParam("file") MultipartFile file, boolean updateSupport) throws Exception{
+ String message = deviceLogService.importDeviceLog(projectId,file,updateSupport);
+ return AjaxResult.success(message);
+ }
}
--
Gitblit v1.9.1