lxw
2022-09-09 22c2dcfdcdd0e4eddbfe3429a75b69cf61a9d0ff
src/main/java/com/whyc/service/SoftwareService.java
@@ -91,15 +91,9 @@
    }
    //查询软件列表的信息
    public Response getAllSoftware(String fileName, int pageCurr, int pageSize) {
    public Response getAllSoftware(String fileName,String applyMaterialCode,String applyModel,String owner, int pageCurr, int pageSize) {
        PageHelper.startPage(pageCurr,pageSize);
        QueryWrapper wrapper=new QueryWrapper();
        if(fileName!=null&&!fileName.isEmpty()){
            wrapper.like("file_name",fileName);
        }
        wrapper.orderByAsc("file_name");
        wrapper.orderByAsc("version");
        List list=mapper.selectList(wrapper);
        List list=mapper.getFileUrl(fileName,applyMaterialCode,applyModel,owner);
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list.size()>0,pageInfo,"软件信息返回");
    }
@@ -158,7 +152,7 @@
        file2Name = file2Name.substring(0,file2Name.lastIndexOf(".")) + "_" + dateUnion +file2Name.substring(file2Name.lastIndexOf("."));
        //存储路径
        String rootFile = CommonUtil.getRootFile();
        String softwareDir = rootFile + "software" + File.separator + software.getOwner() + File.separator + dateUnion;
        String softwareDir = rootFile + "software" + File.separator + software.getOwner();
        String softwareHttpUrl = softwareDir.substring(softwareDir.lastIndexOf("doc_file"+ File.separator + "software"));
        File softwareDirFile = new File(softwareDir);
        if(!softwareDirFile.exists()){