From 26bdd0dc8e1d37c484e6dc199fd933d32bb88e29 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期日, 19 五月 2024 12:49:59 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 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 8e1a447..0e8d971 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,8 @@
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.util.ObjectUtils;
+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 +16,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
@@ -36,7 +34,8 @@
@RequiresPermissions("geo:deviceLog:view")
@GetMapping()
- public String deviceLog() {
+ public String deviceLog(String id, ModelMap mmap) {
+ mmap.put("projectId", id);
return prefix + "/deviceLog";
}
@@ -69,7 +68,17 @@
* 鏂板璁惧鍑哄叆搴撹褰�
*/
@GetMapping("/add")
- public String add() {
+ public String add(String projectId, ModelMap mmap) {
+ Integer number = deviceLogService.selectMaxDeviceLogId(projectId);
+ if (ObjectUtils.isEmpty(number)){
+ number = 1;
+ }else {
+ number++;
+ }
+ String formattedNumber = String.format("%06d", number);
+ String code = "ZTCJ" + formattedNumber;
+ mmap.put("projectId", projectId);
+ mmap.put("code", code);
return prefix + "/add";
}
@@ -115,4 +124,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