Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

chenhuan

2024-05-20 c6f79f5720c5d4a700b8b759a93393559409fd1c

 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectDataController.java

@@ -5,7 +5,11 @@
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;
@@ -39,6 +43,9 @@
    @Autowired
    private IProjectDataService projectDataService;

    @Autowired
    private IHoleMediaService holeMediaService;

    @RequiresPermissions("geo:projectData:view")
    @GetMapping()
    public String projectData(String id, String type, ModelMap mmap) {
@@ -59,7 +66,8 @@
     * 导入压缩包
     */
    @GetMapping("/importImg")
    public String importPdf(){
    public String importPdf(String projectDataId,ModelMap mmap){
        mmap.put("projectDataId",projectDataId);
        return prefix + "/upload";
    }

@@ -183,28 +191,19 @@
    @ResponseBody
    public TableDataInfo listFile(String id){
        List<FileVo> paths = new ArrayList<>();
        ProjectData projectData = projectDataService.selectProjectDataById(id);
//        if (!ObjectUtils.isEmpty(projectData)){
//            String num = project.getNum();
//
//            String diskPath = Global.getUploadPath()  + "\\sources\\项目资料\\"+num;
//
//            File file = new File(diskPath);
//
//            if(FileUtil.exist(file)){
//                if(file.isDirectory()){
//                    File []lists  = file.listFiles();
//                    for(int i =0;i<lists.length;i++){
//                        String name =lists[i].getName();
//                        String path = urlPrefixPath + num + "/" +name;
//                        FileVo vo  = new FileVo() ;
//                        vo.setName(name);
//                        vo.setPath(path);
//                        paths.add(vo);
//                    }
//                }
//            }
//        }

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