diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index 63b88366e..2982c57e0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -8,6 +8,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.document.entity.BussDocumentLibraryEO; +import com.jero.modules.document.entity.OSSFileForDocumentLibrary; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -459,6 +460,16 @@ public class BussDocumentLibraryEOController extends JeroController getFileInfos(String id) { + List fileInfos = bussDocumentLibraryEOService.getFileInfos(id); + return Result.OK(fileInfos); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/OSSFileForDocumentLibrary.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/OSSFileForDocumentLibrary.java new file mode 100644 index 000000000..7124db002 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/OSSFileForDocumentLibrary.java @@ -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; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java index ce853f4da..1ccb5db1d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java @@ -3,6 +3,8 @@ package com.jero.modules.document.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; 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 javax.servlet.http.HttpServletRequest; @@ -198,4 +200,6 @@ public interface IBussDocumentLibraryEOService extends IService> getListBySerialNumber(String serialNumbers); List getListBySerialNumberFuzzy(String serialNumber); + + List getFileInfos(String id); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 4a992b72d..c902bbefb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -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.service.IOnlCgformCollectionService; 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.SearchEnum; 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.aspectj.util.FileUtil; import org.jetbrains.annotations.NotNull; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.mock.web.MockMultipartFile; @@ -4423,6 +4425,27 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl getFileInfos(String id) { + List fileInfos = iOSSFileService.getFileInfos(id); + List ossFileForDocumentLibraries = new ArrayList<>(); + // 拆分回传文档库,标准分解单专用 + for (OSSFile fileInfo : fileInfos) { + OSSFileForDocumentLibrary ossFileForDocumentLibrary = new OSSFileForDocumentLibrary(); + BeanUtils.copyProperties(fileInfo, ossFileForDocumentLibrary); + + List 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 *