对一大波idea提醒需要优化的地方进行处理

zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/entry/DocEntry.java

@@ -9,7 +9,7 @@ import java.util.LinkedList;
  * @since 20230713
  */
 public class DocEntry {
-    LinkedList<MediaEntry> medias = new LinkedList<>();
+    final LinkedList<MediaEntry> medias = new LinkedList<>();
     String context = "";
     String name = "";
 

zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/ConditionalStrategySelector.java

@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
  */
 @Component
 public class ConditionalStrategySelector {
-    Map<Class<?>,ConditionalStrategySeletorUnit> cache = new HashMap<>();
+    final Map<Class<?>,ConditionalStrategySeletorUnit> cache = new HashMap<>();
 
     /**
      * 注册所有策略
@@ -44,17 +44,14 @@ public class ConditionalStrategySelector {
             return null;
         }
         T strategy = (T) conditionalStrategySeletorUnit.getStrategy(condition);
-        if (null == strategy) {
-            return null;
-        }
         return strategy;
     }
 
-    class ConditionalStrategySeletorUnit<T extends IConditionalStrategy> {
-        List<T> strategys;
+    static class ConditionalStrategySeletorUnit<T extends IConditionalStrategy> {
+        final List<T> strategys;
 
         //策略集体实现到二层缓存
-        ConcurrentHashMap<String, T> cache = new ConcurrentHashMap<>();
+        final ConcurrentHashMap<String, T> cache = new ConcurrentHashMap<>();
 
         public ConditionalStrategySeletorUnit(List<T> strategys) {
             this.strategys = strategys;

zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/base/IConditionalStrategy.java

@@ -8,9 +8,9 @@ package com.zyplayer.doc.wiki.batch.strategy.base;
  * @since 20230713
  */
 public interface IConditionalStrategy {
-    public String getCondition();
+    String getCondition();
 
-    public default boolean matchCondition(String key){
+    default boolean matchCondition(String key){
         return key.equals(getCondition());
     }
 }

zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/comb/ICombDependencyStrategy.java

@@ -14,6 +14,6 @@ import java.util.ArrayList;
  * @since 20230717
  */
 public interface ICombDependencyStrategy extends IConditionalStrategy {
-    public void comb(ArrayList<DocEntry> docs, File file);
+    void comb(ArrayList<DocEntry> docs, File file);
 }
 

zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/comb/MDCombDependencyStrategy.java

@@ -25,9 +25,9 @@ public class MDCombDependencyStrategy implements ICombDependencyStrategy {
         docEntry.setName(FileUtil.getName(file));
         String info = FileUtil.readUtf8String(file);
         docEntry.setContext(info);
-        while (info.indexOf(LEFT_TAG) >= 0 && info.indexOf(RIGHT_TAG) >= 0) {
+        while (info.contains(LEFT_TAG) && info.contains(RIGHT_TAG)) {
             String window = info;
-            while(window.indexOf(LEFT_TAG)>=0){
+            while(window.contains(LEFT_TAG)){
                 int leftOffset = window.indexOf(LEFT_TAG)+2;
                 window= window.substring(leftOffset);
                 int rightOffset = window.indexOf(")")+1;

zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/file/MDFileStrategy.java

@@ -4,7 +4,6 @@ import cn.hutool.core.io.IoUtil;
 import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
 import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile;
 import com.zyplayer.doc.data.service.manage.WikiPageService;
-import com.zyplayer.doc.wiki.service.WikiPageFileServiceEx;
 import com.zyplayer.doc.wiki.service.WikiPageUploadService;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.codec.Charsets;

zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java

@@ -33,6 +33,7 @@ import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
+import java.nio.file.Files;
 import java.util.Optional;
 
 /**
@@ -104,7 +105,7 @@ public class WikiCommonController {
             response.setHeader("Content-disposition", "inline;filename=" + URLEncoder.encode(fileName, "UTF-8"));
 //			response.setHeader("Content-disposition", "inline;filename=" + fileName);
 //			response.setHeader("Content-Disposition", "inline; fileName=" + fileName + ";filename*=utf-8''" + URLEncoder.encode(fileName, "UTF-8"));
-            InputStream inputStream = new FileInputStream(file);
+            InputStream inputStream = Files.newInputStream(file.toPath());
             OutputStream os = response.getOutputStream();
             byte[] b = new byte[2048];
             int length;

zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiOpenApiController.java

@@ -141,7 +141,7 @@ public class WikiOpenApiController {
             pageFile.setFileUrl("zyplayer-doc-wiki/common/file?uuid=" + pageFile.getUuid());
         }
         // 高并发下会有覆盖问题，但不重要~
-        Integer viewNum = Optional.ofNullable(wikiPageSel.getViewNum()).orElse(0);
+        int viewNum = Optional.ofNullable(wikiPageSel.getViewNum()).orElse(0);
         WikiPage wikiPageUp = new WikiPage();
         wikiPageUp.setId(wikiPageSel.getId());
         wikiPageUp.setViewNum(viewNum + 1);

zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageAuthController.java

@@ -114,7 +114,7 @@ public class WikiPageAuthController {
                 UserAuth userAuth = this.createUserAuth(pageId, currentUser.getUserId(), authVo.getUserId(), authId);
                 userAuthList.add(userAuth);
             }
-            if (userAuthList.size() <= 0) {
+            if (userAuthList.isEmpty()) {
                 continue;
             }
             // 保存权限，重新登录后可用，后期可以考虑在这里直接修改缓存里的用户权限

zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java

@@ -146,7 +146,7 @@ public class WikiPageController {
         vo.setCanUploadFile((canUploadFile == null) ? 1 : 0);
         vo.setCanConfigAuth((canConfigAuth == null) ? 1 : 0);
         // 高并发下会有覆盖问题，但不重要~
-        Integer viewNum = Optional.ofNullable(wikiPageSel.getViewNum()).orElse(0);
+        int viewNum = Optional.ofNullable(wikiPageSel.getViewNum()).orElse(0);
         WikiPage wikiPageUp = new WikiPage();
         wikiPageUp.setId(wikiPageSel.getId());
         wikiPageUp.setViewNum(viewNum + 1);
@@ -216,7 +216,7 @@ public class WikiPageController {
 
     public boolean isLassoDoll(WikiPage wikiPage, Long moveToPageId) {
         if (0L != moveToPageId) {
-            if (wikiPage.getId() == moveToPageId) {
+            if (wikiPage.getId().equals(moveToPageId)) {
                 return true;
             }
             UpdateWrapper<WikiPage> wrapper = new UpdateWrapper<>();

zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageHistoryController.java

@@ -2,7 +2,6 @@ package com.zyplayer.doc.wiki.controller;
 
 import cn.hutool.core.util.ZipUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zyplayer.doc.core.annotation.AuthMan;

zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageTemplateController.java

@@ -4,48 +4,23 @@ import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.zyplayer.doc.core.annotation.AuthMan;
-import com.zyplayer.doc.core.exception.ConfirmException;
 import com.zyplayer.doc.core.json.DocResponseJson;
 import com.zyplayer.doc.core.json.ResponseJson;
 import com.zyplayer.doc.data.config.security.DocUserDetails;
 import com.zyplayer.doc.data.config.security.DocUserUtil;
 import com.zyplayer.doc.data.repository.manage.entity.*;
-import com.zyplayer.doc.data.repository.manage.mapper.WikiPageContentMapper;
-import com.zyplayer.doc.data.repository.manage.mapper.WikiPageMapper;
-import com.zyplayer.doc.data.repository.manage.param.SearchByEsParam;
-import com.zyplayer.doc.data.repository.manage.vo.SpaceNewsVo;
 import com.zyplayer.doc.data.repository.manage.vo.WikiPageTemplateInfoVo;
 import com.zyplayer.doc.data.repository.manage.vo.WikiTemplateTagVo;
-import com.zyplayer.doc.data.repository.support.consts.DocSysType;
-import com.zyplayer.doc.data.repository.support.consts.UserMsgType;
 import com.zyplayer.doc.data.service.manage.*;
-import com.zyplayer.doc.data.utils.CachePrefix;
-import com.zyplayer.doc.data.utils.CacheUtil;
-import com.zyplayer.doc.wiki.controller.vo.WikiPageContentVo;
-import com.zyplayer.doc.wiki.controller.vo.WikiPageVo;
-import com.zyplayer.doc.wiki.framework.consts.SpaceType;
 import com.zyplayer.doc.wiki.service.WikiPageUploadService;
-import com.zyplayer.doc.wiki.service.common.WikiPageAuthService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.docx4j.XmlUtils;
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.docx4j.openpackaging.parts.WordprocessingML.AltChunkType;
-import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -74,7 +49,7 @@ public class WikiPageTemplateController {
         WikiPageTemplate exist = wikiPageTemplateService.getWikiPageTemplateBySpaceAndPage(wikiPageTemplate.getSpaceId(), wikiPageTemplate.getPageId());
         if (null == exist) {
             DocUserDetails currentUser = DocUserUtil.getCurrentUser();
-            if (wikiPageTemplate.getTagName().equals("")) {
+            if (wikiPageTemplate.getTagName().isEmpty()) {
                 wikiPageTemplate.setTagName("无标签");
             }
             wikiPageTemplate.setCreated(new Date());
@@ -107,7 +82,7 @@ public class WikiPageTemplateController {
                 tagList.add(param.getValue()[0]);
             }
         });
-        if (tagList.size() < 1) {
+        if (tagList.isEmpty()) {
             tagList.add("");
         }
         List<WikiPageTemplateInfoVo> wikiPageTemplateInfoVos = wikiPageTemplateService.filterAll(currentUser.getUserId(), name, open, tagList, pageNum);

zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java

@@ -1,7 +1,6 @@
 package com.zyplayer.doc.wiki.controller;
 
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.NumberUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -28,7 +27,6 @@ import com.zyplayer.doc.wiki.framework.consts.WikiAuthType;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -192,7 +190,7 @@ public class WikiSpaceController {
 			this.createUserAuth(userAuthList, authVo.getPageFileUpload(), spaceId, WikiAuthType.PAGE_FILE_UPLOAD, authVo.getGroupId());
 			this.createUserAuth(userAuthList, authVo.getPageFileDelete(), spaceId, WikiAuthType.PAGE_FILE_DELETE, authVo.getGroupId());
 			this.createUserAuth(userAuthList, authVo.getPageAuthManage(), spaceId, WikiAuthType.PAGE_AUTH_MANAGE, authVo.getGroupId());
-			if (userAuthList.size() > 0) {
+			if (!userAuthList.isEmpty()) {
 				userGroupAuthService.saveBatch(userAuthList);
 			}
 		}

zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/config/CheckWikiFileSavePath.java

@@ -16,7 +16,7 @@ import javax.annotation.PostConstruct;
  */
 @Component
 public class CheckWikiFileSavePath {
-	private static Logger logger = LoggerFactory.getLogger(CheckWikiFileSavePath.class);
+	private static final Logger logger = LoggerFactory.getLogger(CheckWikiFileSavePath.class);
 	
 	@Value("${zyplayer.doc.wiki.upload-path:}")
 	private String uploadPath;

zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/WikiPageFileServiceEx.java

@@ -4,7 +4,6 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.zyplayer.doc.core.json.DocResponseJson;
-import com.zyplayer.doc.core.json.ResponseJson;
 import com.zyplayer.doc.data.config.security.DocUserDetails;
 import com.zyplayer.doc.data.config.security.DocUserUtil;
 import com.zyplayer.doc.data.repository.manage.entity.UserMessage;

zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/WikiPageUploadService.java

@@ -2,14 +2,12 @@ package com.zyplayer.doc.wiki.service;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.zyplayer.doc.core.exception.ConfirmException;
-import com.zyplayer.doc.core.json.DocResponseJson;
 import com.zyplayer.doc.data.config.security.DocUserDetails;
 import com.zyplayer.doc.data.config.security.DocUserUtil;
 import com.zyplayer.doc.data.repository.manage.entity.UserMessage;
 import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
 import com.zyplayer.doc.data.repository.manage.entity.WikiPageContent;
 import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
-import com.zyplayer.doc.data.repository.manage.mapper.WikiPageContentMapper;
 import com.zyplayer.doc.data.repository.manage.mapper.WikiPageMapper;
 import com.zyplayer.doc.data.repository.support.consts.DocSysType;
 import com.zyplayer.doc.data.repository.support.consts.UserMsgType;