From 6662074ac2366a1068f54cefb1e46af7fca4fc81 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期六, 18 五月 2024 17:27:22 +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 | 98 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 93 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 b1f2552..2ccb64f 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
@@ -1,16 +1,22 @@
package com.javaweb.geo.controller;
+import java.io.File;
+import java.util.ArrayList;
import java.util.List;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.javaweb.common.config.Global;
+import com.javaweb.geo.domain.Hole;
+import com.javaweb.geo.domain.HoleMedia;
+import com.javaweb.geo.service.IHoleMediaService;
+import com.javaweb.geo.vo.FileVo;
import org.apache.shiro.authz.annotation.RequiresPermissions;
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 +25,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
@@ -34,12 +43,56 @@
@Autowired
private IProjectDataService projectDataService;
+ @Autowired
+ private IHoleMediaService holeMediaService;
+
@RequiresPermissions("geo:projectData:view")
@GetMapping()
public String projectData(String id, String type, ModelMap mmap) {
mmap.put("projectId", id);
mmap.put("type", type);
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(String projectDataId,ModelMap mmap){
+ mmap.put("projectDataId",projectDataId);
+ 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";
+ }
+
+ /**
+ * 椤圭洰鏂囦欢鍒楄〃椤甸潰
+ * @return
+ */
+ @GetMapping("/projectDataFileList")
+ public String projectDataFileList(String id ,ModelMap modelMap){
+ modelMap.put("id",id);
+ return prefix + "/files";
}
/**
@@ -119,4 +172,39 @@
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);
+ }
+
+ /**
+ * 鑾峰彇鏂囦欢鍒楄〃
+ * @param id
+ * @return
+ */
+ @PostMapping( "/listFile")
+ @ResponseBody
+ public TableDataInfo listFile(String id){
+ List<FileVo> paths = new ArrayList<>();
+
+ HoleMedia holeMedia = new HoleMedia();
+ holeMedia.setRecordId(id);
+ List<HoleMedia> holeMedias =holeMediaService.selectHoleMediaList(holeMedia);
+
+ if(ObjectUtil.isNotEmpty(holeMedias)){
+ for(HoleMedia holeMedia1 :holeMedias ){
+ FileVo vo = new FileVo() ;
+ vo.setName(holeMedia1.getName());
+ vo.setPath(holeMedia1.getInternetPath());
+ paths.add(vo);
+ }
+ }
+ return getDataTable(paths);
+ }
+
}
--
Gitblit v1.9.1