From f33bb23ebe6ea8e805c84fa3020a9cc307a29a00 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Tue, 22 Oct 2024 15:14:27 +0800
Subject: [PATCH] feature:本地环境能提交到亿迅环境兼容
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java | 92 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 77 insertions(+), 15 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java
index 16a7070..772b031 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java
@@ -160,15 +160,21 @@
* @param terms
* @return List
*/
- public List<FileIdTypeInfoBaseDTO> listIdTypeInfoByOwnerIdList(Map<String, Object> terms, String mainId){
- List<FileIdTypeInfoBaseDTO> fileTypeInfoBaseDTOList = new ArrayList<>();
+ public List<FileIdTypeInfoBaseDTO> listIdTypeInfoByOwnerIdList(Map<String, Object> terms){
+ try {
+ List<FileIdTypeInfoBaseDTO> fileTypeInfoBaseDTOList = new ArrayList<>();
- List<FileInfo> fileInfoList = mapper.listByids(terms, mainId);
- if(CollectionUtils.isNotEmpty(fileInfoList)){
- fileTypeInfoBaseDTOList = this.getIdFileTypeInfoBaseDTOList(fileInfoList);
+ List<FileInfo> fileInfoList = mapper.listFile(terms);
+ if(CollectionUtils.isNotEmpty(fileInfoList)){
+ fileTypeInfoBaseDTOList = this.getIdFileTypeInfoBaseDTOList(fileInfoList);
+ }
+
+ return fileTypeInfoBaseDTOList;
+ }catch (Exception e){
+ log.error("[FileInfoService.listIdTypeInfoByOwnerIdList]调用失败，异常信息："+e, e);
+ throw new ServiceException("FileInfoService.listIdTypeInfoByOwnerIdList", e);
}
- return fileTypeInfoBaseDTOList;
}
/**
@@ -219,6 +225,7 @@
fileTypeInfoBaseDTO.setOwnerTypeName(FileOwnerTypeBaseEnum.getDes(ownerType));
fileTypeInfoBaseDTO.setSize(ownerIdFileInfoList.size());
List<FileInfoBaseDTO> fileInfoBaseDTOList = new ArrayList<>();
+ StringBuffer fileNames = new StringBuffer();
for(FileInfo fileInfo: ownerIdFileInfoList){
if(ownerType.equals(fileInfo.getOwnerType())){
FileInfoBaseDTO fileInfoBaseDTO = new FileInfoBaseDTO();
@@ -226,8 +233,15 @@
fileInfoBaseDTO.setOwnerCatName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerCat()));
fileInfoBaseDTO.setOwnerTypeName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerType()));
fileInfoBaseDTOList.add(fileInfoBaseDTO);
+ if(StringUtils.isNotBlank(fileNames)){
+ fileNames.append(fileInfo.getName());
+ }else{
+ fileNames.append("、" + fileInfo.getName());
+ }
+
}
}
+ fileTypeInfoBaseDTO.setFileNames(fileNames.toString());
fileTypeInfoBaseDTO.setFileList(fileInfoBaseDTOList);
fileTypeInfoBaseDTOList.add(fileTypeInfoBaseDTO);
}
@@ -236,9 +250,6 @@
}
}
}
-
-
-
return fileIdTypeInfoBaseDTOList;
}
@@ -247,13 +258,19 @@
* @param terms
* @return List
*/
- public List<FileIdInfoBaseDTO> listInfoByOwnerIdList(Map<String, Object> terms, String mainId) {
- List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = new ArrayList<>();
- List<FileInfo> fileInfoList = mapper.listByids(terms, mainId);
- if(CollectionUtils.isNotEmpty(fileInfoList)){
- fileIdInfoBaseDTOList = this.getFileInfoBaseDTOList(fileInfoList);
+ public List<FileIdInfoBaseDTO> listInfoByOwnerIdList(Map<String, Object> terms) {
+ try {
+ List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = new ArrayList<>();
+ List<FileInfo> fileInfoList = mapper.listFile(terms);
+ if(CollectionUtils.isNotEmpty(fileInfoList)){
+ fileIdInfoBaseDTOList = this.getFileInfoBaseDTOList(fileInfoList);
+ }
+ return fileIdInfoBaseDTOList;
+ }catch (Exception e){
+ log.error("[FileInfoService.listInfoByOwnerIdList]调用失败，异常信息："+e, e);
+ throw new ServiceException("FileInfoService.listInfoByOwnerIdList", e);
}
- return fileIdInfoBaseDTOList;
+
}
/**
@@ -458,4 +475,49 @@
}
}
+ /**
+ * 根据多个所属编号查询附件
+ * @param mainId
+ * @return List
+ */
+ public List<FileInfoBaseDTO> listByMainId(String mainId){
+ List<FileInfoBaseDTO> fileList = new ArrayList<>();
+ Map<String, Object> terms = new HashMap<>();
+ terms.put("mainId", mainId);
+ List<FileInfo> fileInfoList = mapper.listFile(terms);
+ if(CollectionUtils.isNotEmpty(fileInfoList)){
+ for (FileInfo fileInfo : fileInfoList) {
+ FileInfoBaseDTO fileInfoBaseDTO = new FileInfoBaseDTO();
+ BeanUtils.copyProperties(fileInfo, fileInfoBaseDTO);
+ fileInfoBaseDTO.setOwnerCatName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerCat()));
+ fileInfoBaseDTO.setOwnerTypeName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerType()));
+ fileList.add(fileInfoBaseDTO);
+ }
+ }
+ return fileList;
+ }
+
+ /**
+ * 根据多个所属编号查询附件
+ * @param mainId，ownerType
+ * @return List
+ */
+ public List<FileInfoBaseDTO> listByMainIdAndType(String mainId,String ownerType){
+ List<FileInfoBaseDTO> fileList = new ArrayList<>();
+ Map<String, Object> terms = new HashMap<>();
+ terms.put("mainId", mainId);
+ terms.put("ownerType", ownerType);
+ List<FileInfo> fileInfoList = mapper.listFileByType(terms);
+ if(CollectionUtils.isNotEmpty(fileInfoList)){
+ for (FileInfo fileInfo : fileInfoList) {
+ FileInfoBaseDTO fileInfoBaseDTO = new FileInfoBaseDTO();
+ BeanUtils.copyProperties(fileInfo, fileInfoBaseDTO);
+ fileInfoBaseDTO.setOwnerCatName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerCat()));
+ fileInfoBaseDTO.setOwnerTypeName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerType()));
+ fileList.add(fileInfoBaseDTO);
+ }
+ }
+ return fileList;
+ }
+
}
--
Gitblit v1.8.0