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 | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 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 7c274a6..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,7 +1,16 @@ 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; @@ -33,6 +42,9 @@ @Autowired private IProjectDataService projectDataService; + + @Autowired + private IHoleMediaService holeMediaService; @RequiresPermissions("geo:projectData:view") @GetMapping() @@ -71,6 +83,16 @@ } 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"; } /** @@ -160,4 +182,29 @@ 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