From 8722d2bb39c6c0697647e77a879d14b28d3ef0f5 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期五, 17 五月 2024 19:16:36 +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/ProjectDataController.java | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectDataController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectDataController.java
index 7380ad3..f99e75f 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectDataController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectDataController.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.ProjectData;
@@ -19,6 +16,9 @@
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;
+
+import javax.servlet.http.HttpServletRequest;
/**
* 椤圭洰璧勬枡Controller
@@ -42,7 +42,35 @@
return prefix + "/projectData";
}
+ @RequiresPermissions("geo:projectData:view")
+ @GetMapping("/2")
+ public String projectData2(String id, String type, ModelMap mmap) {
+ mmap.put("projectId", id);
+ mmap.put("type", type);
+ return prefix + "/projectData2";
+ }
+ /**
+ * 瀵煎叆鍘嬬缉鍖�
+ */
+ @GetMapping("/importImg")
+ public String importPdf(){
+ return prefix + "/upload";
+ }
+
+ /**
+ * 鍥剧墖灞曠ず
+ */
+ @GetMapping("/viewImage")
+ public String viewImage(ModelMap mmap, @RequestParam("id") String id){
+ ProjectData data = projectDataService.selectProjectDataById(id);
+ String path = "";
+ if (!ObjectUtils.isEmpty(data)){
+ path = data.getDataUrl();
+ }
+ mmap.put("urlAddress",path);
+ return prefix + "/image_view";
+ }
/**
* 鏌ヨ椤圭洰璧勬枡鍒楄〃
@@ -121,4 +149,14 @@
public AjaxResult remove(String ids) {
return toAjax(projectDataService.deleteProjectDataByIds(ids));
}
+
+ /**
+ * 涓婁紶鍘嬬缉鍖�
+ */
+ @PostMapping("/uploadZIP")
+ @ResponseBody
+ public AjaxResult uploadZIP(MultipartFile file, HttpServletRequest request){
+ return projectDataService.uploadZIP(file,request);
+ }
+
}
--
Gitblit v1.9.1