Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-18 6662074ac2366a1068f54cefb1e46af7fca4fc81

 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);
    }

}