bug50460
This commit is contained in:
+13
-2
@@ -8,6 +8,7 @@ import com.jero.common.aspect.annotation.AutoLog;
|
|||||||
import com.jero.common.system.base.controller.JeroController;
|
import com.jero.common.system.base.controller.JeroController;
|
||||||
import com.jero.common.system.query.QueryGenerator;
|
import com.jero.common.system.query.QueryGenerator;
|
||||||
import com.jero.modules.document.entity.BussDocumentLibraryEO;
|
import com.jero.modules.document.entity.BussDocumentLibraryEO;
|
||||||
|
import com.jero.modules.document.entity.OSSFileForDocumentLibrary;
|
||||||
import com.jero.modules.document.service.IBussDocumentLibraryEOService;
|
import com.jero.modules.document.service.IBussDocumentLibraryEOService;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
@@ -459,6 +460,16 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
|
|||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查看已上传的文件
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@ApiOperation(value="查看已上传的文件", notes="查看已上传的文件")
|
||||||
|
@GetMapping(value = "/getFileInfos")
|
||||||
|
@RequiresPermissions("document:queryPageInfo")
|
||||||
|
public Result<?> getFileInfos(String id) {
|
||||||
|
List<OSSFileForDocumentLibrary> fileInfos = bussDocumentLibraryEOService.getFileInfos(id);
|
||||||
|
return Result.OK(fileInfos);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+17
@@ -0,0 +1,17 @@
|
|||||||
|
package com.jero.modules.document.entity;
|
||||||
|
|
||||||
|
import com.jero.modules.oss.entity.OSSFile;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Author: liyawei
|
||||||
|
* @Description:
|
||||||
|
* @Date: Created in 17:25 2022/4/25
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class OSSFileForDocumentLibrary extends OSSFile {
|
||||||
|
|
||||||
|
// 拆分回传文档库,标准分解单专用
|
||||||
|
private Integer splitFlag;
|
||||||
|
private String splitInfoId;
|
||||||
|
}
|
||||||
+4
@@ -3,6 +3,8 @@ package com.jero.modules.document.service;
|
|||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import com.jero.modules.document.entity.BussDocumentLibraryEO;
|
import com.jero.modules.document.entity.BussDocumentLibraryEO;
|
||||||
|
import com.jero.modules.document.entity.OSSFileForDocumentLibrary;
|
||||||
|
import com.jero.modules.oss.entity.OSSFile;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
@@ -198,4 +200,6 @@ public interface IBussDocumentLibraryEOService extends IService<BussDocumentLibr
|
|||||||
List<Map<String, Object>> getListBySerialNumber(String serialNumbers);
|
List<Map<String, Object>> getListBySerialNumber(String serialNumbers);
|
||||||
|
|
||||||
List<String> getListBySerialNumberFuzzy(String serialNumber);
|
List<String> getListBySerialNumberFuzzy(String serialNumber);
|
||||||
|
|
||||||
|
List<OSSFileForDocumentLibrary> getFileInfos(String id);
|
||||||
}
|
}
|
||||||
|
|||||||
+23
@@ -23,6 +23,7 @@ import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServi
|
|||||||
import com.jero.modules.collection.entity.OnlCgformCollection;
|
import com.jero.modules.collection.entity.OnlCgformCollection;
|
||||||
import com.jero.modules.collection.service.IOnlCgformCollectionService;
|
import com.jero.modules.collection.service.IOnlCgformCollectionService;
|
||||||
import com.jero.modules.document.entity.BussDocumentLibraryEO;
|
import com.jero.modules.document.entity.BussDocumentLibraryEO;
|
||||||
|
import com.jero.modules.document.entity.OSSFileForDocumentLibrary;
|
||||||
import com.jero.modules.document.enums.FieldTypeEnum;
|
import com.jero.modules.document.enums.FieldTypeEnum;
|
||||||
import com.jero.modules.document.enums.SearchEnum;
|
import com.jero.modules.document.enums.SearchEnum;
|
||||||
import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
|
import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
|
||||||
@@ -62,6 +63,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.aspectj.util.FileUtil;
|
import org.aspectj.util.FileUtil;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.mock.web.MockMultipartFile;
|
import org.springframework.mock.web.MockMultipartFile;
|
||||||
@@ -4423,6 +4425,27 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
return bussDocumentLibraryEOMapper.getListBySerialNumberFuzzy(serialNumber);
|
return bussDocumentLibraryEOMapper.getListBySerialNumberFuzzy(serialNumber);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<OSSFileForDocumentLibrary> getFileInfos(String id) {
|
||||||
|
List<OSSFile> fileInfos = iOSSFileService.getFileInfos(id);
|
||||||
|
List<OSSFileForDocumentLibrary> ossFileForDocumentLibraries = new ArrayList<>();
|
||||||
|
// 拆分回传文档库,标准分解单专用
|
||||||
|
for (OSSFile fileInfo : fileInfos) {
|
||||||
|
OSSFileForDocumentLibrary ossFileForDocumentLibrary = new OSSFileForDocumentLibrary();
|
||||||
|
BeanUtils.copyProperties(fileInfo, ossFileForDocumentLibrary);
|
||||||
|
|
||||||
|
List<SarFileSplitInfoEO> infoEOList = sarFileSplitInfoService.queryByFileId(fileInfo.getId());
|
||||||
|
if (CollectionUtil.isNotEmpty(infoEOList)) {
|
||||||
|
ossFileForDocumentLibrary.setSplitFlag(1);
|
||||||
|
ossFileForDocumentLibrary.setSplitInfoId(infoEOList.get(0).getId());
|
||||||
|
} else {
|
||||||
|
ossFileForDocumentLibrary.setSplitFlag(0);
|
||||||
|
}
|
||||||
|
ossFileForDocumentLibraries.add(ossFileForDocumentLibrary);
|
||||||
|
}
|
||||||
|
return ossFileForDocumentLibraries;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 验证字符串是不是id
|
* 验证字符串是不是id
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user