代码优化

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/PrintCommonServiceImpl.java

@@ -594,14 +594,12 @@ public class PrintCommonServiceImpl implements PrintCommonService {
         try {
             SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
             int temp = file.getOriginalFilename().lastIndexOf(".");
-//            String fileName = file.getOriginalFilename().substring(0, temp);
-//            String format = file.getOriginalFilename().substring(temp, file.getOriginalFilename().length());
-            String fileName = FilenameUtils.getName(file.getOriginalFilename());
-            String format = FilenameUtils.getExtension(file.getOriginalFilename());
+            String fileName = FilenameUtils.getBaseName(file.getOriginalFilename());
+            String format = "." + FilenameUtils.getExtension(file.getOriginalFilename());
 
             SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.ATTACHMENT_TYPE);
             Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置附件类型"));
-            List<String> attachmentTypeList = Arrays.asList(sysConfig.getConfigValue().replaceAll("\\[", "").replaceAll("\\]", "").split(", "));
+            List<String> attachmentTypeList = Arrays.asList(sysConfig.getConfigValue().replaceAll("\\[", "").replaceAll("\\]", "").split(","));
             if (Objects.nonNull(format)) {
                 long count = attachmentTypeList.stream().filter(s -> format.equalsIgnoreCase(s)).count();
                 if (count == 0) {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicAttachmentServiceImpl.java

@@ -129,15 +129,12 @@ public class BasicAttachmentServiceImpl extends ServiceImpl<BasicAttachmentMappe
         BasicAttachment basicAttachment = null;
         try {
             SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-//            int temp = file.getOriginalFilename().indexOf(".");
-//            String fileName = file.getOriginalFilename().substring(0, temp);
-//            String format = file.getOriginalFilename().substring(temp, file.getOriginalFilename().length());
-            String fileName = FilenameUtils.getName(file.getOriginalFilename());
-            String format = FilenameUtils.getExtension(file.getOriginalFilename());
+            String fileName = FilenameUtils.getBaseName(file.getOriginalFilename());
+            String format = "." + FilenameUtils.getExtension(file.getOriginalFilename());
 
             SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.ATTACHMENT_TYPE);
             Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置附件类型"));
-            List<String> attachmentTypeList = Arrays.asList(sysConfig.getConfigValue().replaceAll("\\[", "").replaceAll("\\]", "").split(", "));
+            List<String> attachmentTypeList = Arrays.asList(sysConfig.getConfigValue().replaceAll("\\[", "").replaceAll("\\]", "").split(","));
 
             if (Objects.nonNull(format)) {
                 long count = attachmentTypeList.stream().filter(s -> format.equalsIgnoreCase(s)).count();

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/ReportCommonServiceImpl.java

@@ -725,14 +725,12 @@ public class ReportCommonServiceImpl implements ReportCommonService {
         try {
             SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
             int temp = file.getOriginalFilename().lastIndexOf(".");
-//            String fileName = file.getOriginalFilename().substring(0, temp);
-//            String format = file.getOriginalFilename().substring(temp, file.getOriginalFilename().length());
-            String fileName = FilenameUtils.getName(file.getOriginalFilename());
-            String format = FilenameUtils.getExtension(file.getOriginalFilename());
+            String fileName = FilenameUtils.getBaseName(file.getOriginalFilename());
+            String format = "." + FilenameUtils.getExtension(file.getOriginalFilename());
 
             SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.ATTACHMENT_TYPE);
             Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置附件类型"));
-            List<String> attachmentTypeList = Arrays.asList(sysConfig.getConfigValue().replaceAll("\\[", "").replaceAll("\\]", "").split(", "));
+            List<String> attachmentTypeList = Arrays.asList(sysConfig.getConfigValue().replaceAll("\\[", "").replaceAll("\\]", "").split(","));
             if (Objects.nonNull(format)) {
                 long count = attachmentTypeList.stream().filter(s -> format.equalsIgnoreCase(s)).count();
                 if (count == 0) {