diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java new file mode 100644 index 000000000..98fd77083 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java @@ -0,0 +1,37 @@ +package com.jero.modules.document.enums; + +/** + * @description + * @date 2022/1/21 15:22 + * @auth zhn + */ +public enum SearchEnum { + INDEX_NAME_DOCUMENT("文档库索引名称","documentLibrary"), + TYPE_NAME_DOCUMENT("文档库类型","document"); + + + + String name; + String value; + + private SearchEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} 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 297faebdf..83ed66043 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 @@ -26,6 +26,7 @@ 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.enums.FieldTypeEnum; +import com.jero.modules.document.enums.SearchEnum; import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.domain.service.DomainUserRelService; @@ -234,11 +235,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 1) { if (fileInfos.size() != 0) { + int i = 0; for (OSSFile fileInfo : fileInfos) { - Map mapNew = new HashMap<>(); - mapNew.put("value", fileInfo); - mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null); - resultTemp.add(mapNew); + if(i==0){ + Map mapNew = new HashMap<>(); + mapNew.put("value", fileInfo); + mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null); + mapNew.put("count",fileInfos.size()); + resultTemp.add(mapNew); + i++; + }else{ + Map mapNew = new HashMap<>(); + mapNew.put("value", fileInfo); + mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null); + resultTemp.add(mapNew); + } } } } else if (fileInfos.size() == 1) { //单个文件处理 Map mapNew = new HashMap<>(); + mapNew.put("count",fileInfos.size()); mapNew.put("value", fileInfos.get(0)); mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null); resultTemp.add(mapNew); @@ -954,17 +968,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map, String idTemp) { @@ -1146,12 +1156,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl