feat(标准拆分): 标准类型提取配置文件，去除排序

laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java

@@ -192,6 +192,9 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
     private String exportExcelTempPath;
     @Value("#{'${adminRoleCode}'.split(',')}")
     private List<String> adminRoleCodeList;
+    @Value(value = "${jero.splitStandardClass}")
+    private String splitStandardClass;
+
 
     @Override
     public IPage<DocumentSplitInfo> queryByPage(DocumentSplitInfo documentSplitInfo, Integer pageNo, Integer pageSize) {
@@ -471,7 +474,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
         int count;
 
         //拆分
-        if (SplitFileTypeTypeEnum.UN.getValue().equals(sarFileSplitInfoEO.getStandardClass())){
+        if (splitStandardClass.contains(sarFileSplitInfoEO.getStandardClass())){
             count = fileSpiltService.fileEU(sarFileSplitInfoEO, SplitFileTypeTypeEnum.UN);
         }else {
             count = fileSpiltService.fileCHN(sarFileSplitInfoEO, SplitFileTypeTypeEnum.GBT);

laws-modules/src/main/java/com/jero/modules/split/enums/SplitFileTypeTypeEnum.java

@@ -12,6 +12,7 @@ public enum SplitFileTypeTypeEnum {
 	KMVSS_ARTICLE("KMVSS_Article","KMVSS_Article"),
 	US("CFR","美国"),
 	UN("UN","欧洲"),
+	EU("EU","欧盟"),
 	/**
 	 * Japan Attachment
 	 */

laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java

@@ -24,7 +24,6 @@ import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServi
 import com.jero.modules.document.enums.FieldTypeEnum;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
 import com.jero.modules.laws.common.mapper.LawsCommonMapper;
-import com.jero.modules.laws.documenttool.common.DirectoryComparator;
 import com.jero.modules.laws.documenttool.mapper.DocumentSplitMapper;
 import com.jero.modules.laws.documenttool.service.IDocumentSplitService;
 import com.jero.modules.laws.labeldatabase.entity.LawsLabelDatabase;
@@ -42,7 +41,6 @@ import com.jero.modules.split.dto.FileSplitValExportDto;
 import com.jero.modules.split.dto.FileSplitValImgExportDto;
 import com.jero.modules.split.entity.*;
 import com.jero.modules.split.enums.SplitEnum;
-import com.jero.modules.split.enums.SplitFileTypeTypeEnum;
 import com.jero.modules.split.mapper.FileSplitItemsEOMapper;
 import com.jero.modules.split.mapper.SarFileSplitItemsValEOMapper;
 import com.jero.modules.split.mapper.SarFileSplitMenuEOMapper;
@@ -168,6 +166,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
     private String splitUrl;
     @Value(value = "${jero.path.uploadCos}")
     private String uploadCospath;
+    @Value(value = "${jero.splitStandardClass}")
+    private String splitStandardClass;
 
     public static boolean ENCRYPT_ENABLE;
     public static String DECRYPT_URL;
@@ -1707,7 +1707,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
 //            if(CollectionUtils.isNotEmpty(itemNumList)) {
             List<SarFileSplitMenuTreeNode> treeList = new ArrayList<>();
             List<Map<String, Object>> itemsEOList = new ArrayList<>(addItemsEOList);
-            if (SplitFileTypeTypeEnum.UN.getValue().equals(sarFileSplitInfoEO.getStandardClass())){
+            if (splitStandardClass.contains(sarFileSplitInfoEO.getStandardClass())){
                 treeList = buildTree2(itemsEOList, treeListDisplay, menuId);
             }else {
                 treeList = buildTree(itemsEOList, treeListDisplay, menuId);
@@ -1840,7 +1840,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 // 校验名称
                 File file1 = excelfilelist.get(0);
                 String name = file1.getName().substring(0, file1.getName().lastIndexOf("."));
-                if(!"条款导入模板".equals(name) || !"clauseImport".equals(name)){
+                if(!"条款导入模板,clauseImport".contains(name)){
                     //删除原上传文件
                     FileUnZip.deleteDir(saveDirectory);
                     if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
@@ -3061,7 +3061,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
      */
     private List<SarFileSplitMenuTreeNode> buildTree(List<Map<String, Object>> addItemsEOList, Long treeListDisplay, String menuId){
         //排序
-        addItemsEOList.sort(new DirectoryComparator());
+//        addItemsEOList.sort(new DirectoryComparator());
 
         List<SarFileSplitMenuTreeNode> treeNodeList = new ArrayList<>();
         String regex = "^[0-9]{0}([0-9]|[.])+$"; //TODO 待优化：数字和点必须交替
@@ -3135,21 +3135,16 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
 
     private List<SarFileSplitMenuTreeNode> buildTree2(List<Map<String, Object>> addItemsEOList, Long treeListDisplay, String menuId){
         // 过滤出 非正常编号的数据
-        String regexs = "^[0-9]{0}([0-9]|[.])+$";
+//        String regexs = "^[0-9]{0}([0-9]|[.])+$";
-        List<Map<String, Object>> otherList =
+//        List<Map<String, Object>> otherList =
-                addItemsEOList.stream()
+//                addItemsEOList.stream()
-                        .filter(v -> !String.valueOf(v.get("item_num")).matches(regexs))
+//                        .filter(v -> !String.valueOf(v.get("item_num")).matches(regexs))
-                        .collect(Collectors.toList());
+//                        .collect(Collectors.toList());
-
-//        otherList.stream().map(v -> v.get("item_num"))
-//                .collect(Collectors.toList()).forEach(v -> {
-//                    System.out.println(v);
-//                });
 
         // 排序
-        addItemsEOList.removeAll(otherList);
+//        addItemsEOList.removeAll(otherList);
-        addItemsEOList.sort(new DirectoryComparator());
+//        addItemsEOList.sort(new DirectoryComparator());
-        addItemsEOList.addAll(otherList);
+//        addItemsEOList.addAll(otherList);
 
 
         List<SarFileSplitMenuTreeNode> treeNodeList = new ArrayList<>();

laws-single-startup/src/main/resources/application-dev-chery.yml

@@ -216,6 +216,8 @@ jero:
   splitUrl: http://10.2.16.8:8188/laws-chery/sys/split/file/getImage?fileName=
   #公式转换图片url
   mathToImgUrl: http://10.2.16.8:9998/mathToImg
+  # 拆分标准类型
+  splitStandardClass: UN,EU
   path:
     #文件上传根目录 设置
     upload: //opt//upFiles

laws-single-startup/src/main/resources/application-dev.yml

@@ -212,6 +212,8 @@ jero:
   splitUrl: http://localhost:8188/laws-chery/sys/split/file/getImage?fileName=
   #公式转换图片url
   mathToImgUrl: http://localhost:9998/mathToImg
+  # 拆分标准类型
+  splitStandardClass: UN,EU
   path:
     #文件上传根目录 设置
     upload: D://opt//upFiles

laws-single-startup/src/main/resources/application-prod.yml

@@ -208,6 +208,8 @@ jero:
   splitUrl: http://srms.sinotruk.com/laws-sinotruk/sys/split/file/getImage?fileName=
   #公式转换图片url
   mathToImgUrl: http://mathtoimg-o3lth.yf-grp:8080/mathToImg
+  # 拆分标准类型
+  splitStandardClass: UN,EU
   path:
     #文件上传根目录 设置
     upload: /app/opt/upFiles
@@ -522,4 +524,4 @@ bindPart:
   #Authorization
   auth_username: CNHTC_PO_PSRMS
   #Authorization
-  auth_password: Cnhtcpsrms2024
+  auth_password: Cnhtcpsrms2024

laws-single-startup/src/main/resources/application-test.yml

@@ -216,6 +216,8 @@ jero:
   splitUrl: http://10.2.16.10:8188/laws-chery/sys/split/file/getImage?fileName=
   #公式转换图片url
   mathToImgUrl: http://10.2.16.10:9998/mathToImg
+  # 拆分标准类型
+  splitStandardClass: UN,EU
   path:
     #文件上传根目录 设置
     upload: //opt//upFiles