From e264b27268665cec4f048c79523b19a8bfeb321d Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 21 Mar 2024 16:52:43 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE-=E7=9F=A9=E9=98=B5-=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1117387703681024]在线文档更新documentonline-mapping.json关系配置文件 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1117387703681024
---
 .../dto/DocumentOnlineConfigVo.java           | 12 ++++++
 .../doumentonline/DocumentOnlineMapper.java   |  2 +-
 .../doumentonline/DocumentOnlineMapper.xml    |  4 +-
 .../DocumentOnlineInitializeIndexHandler.java | 39 +++++++++++--------
 4 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/main/java/neatlogic/framework/documentonline/dto/DocumentOnlineConfigVo.java b/src/main/java/neatlogic/framework/documentonline/dto/DocumentOnlineConfigVo.java
index 785d69648..15ac62fd1 100644
--- a/src/main/java/neatlogic/framework/documentonline/dto/DocumentOnlineConfigVo.java
+++ b/src/main/java/neatlogic/framework/documentonline/dto/DocumentOnlineConfigVo.java
@@ -15,6 +15,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 package neatlogic.framework.documentonline.dto;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.restful.annotation.EntityField;
 import org.apache.commons.lang3.StringUtils;
@@ -36,6 +37,9 @@ public class DocumentOnlineConfigVo implements Serializable {
     @EntityField(name = "common.source", type = ApiParamType.STRING)
     private String source;
 
+    @JSONField(serialize = false)
+    private boolean isUsed;
+
     public DocumentOnlineConfigVo() {}
 
     public DocumentOnlineConfigVo(DocumentOnlineConfigVo configVo) {
@@ -101,4 +105,12 @@ public class DocumentOnlineConfigVo implements Serializable {
     public int hashCode() {
         return Objects.hash(filePath, moduleGroup, menu);
     }
+
+    public boolean isUsed() {
+        return isUsed;
+    }
+
+    public void setUsed(boolean used) {
+        isUsed = used;
+    }
 }
diff --git a/src/main/java/neatlogic/module/framework/dao/mapper/doumentonline/DocumentOnlineMapper.java b/src/main/java/neatlogic/module/framework/dao/mapper/doumentonline/DocumentOnlineMapper.java
index 7aaa4d29f..ccb008eab 100644
--- a/src/main/java/neatlogic/module/framework/dao/mapper/doumentonline/DocumentOnlineMapper.java
+++ b/src/main/java/neatlogic/module/framework/dao/mapper/doumentonline/DocumentOnlineMapper.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 public interface DocumentOnlineMapper extends IDocumentOnlineCrossoverMapper {
 
-    List<DocumentOnlineConfigVo> getDocumentOnlineConfigListByFilePathList(List<String> filePathList);
+//    List<DocumentOnlineConfigVo> getDocumentOnlineConfigListByFilePathList(List<String> filePathList);
 
     List<DocumentOnlineConfigVo> getAllDocumentOnlineConfigList();
 
diff --git a/src/main/java/neatlogic/module/framework/dao/mapper/doumentonline/DocumentOnlineMapper.xml b/src/main/java/neatlogic/module/framework/dao/mapper/doumentonline/DocumentOnlineMapper.xml
index d93a64464..21bc03044 100644
--- a/src/main/java/neatlogic/module/framework/dao/mapper/doumentonline/DocumentOnlineMapper.xml
+++ b/src/main/java/neatlogic/module/framework/dao/mapper/doumentonline/DocumentOnlineMapper.xml
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="neatlogic.module.framework.dao.mapper.doumentonline.DocumentOnlineMapper">
 
-    <select id="getDocumentOnlineConfigListByFilePathList" parameterType="java.util.List" resultType="neatlogic.framework.documentonline.dto.DocumentOnlineConfigVo">
+    <!--<select id="getDocumentOnlineConfigListByFilePathList" parameterType="java.util.List" resultType="neatlogic.framework.documentonline.dto.DocumentOnlineConfigVo">
         SELECT
             `file_path` AS filePath,
             `module_group` AS moduleGroup,
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         <foreach collection="list" item="filePath" open="(" separator="," close=")">
             #{filePath}
         </foreach>
-    </select>
+    </select>-->
 
     <select id="getAllDocumentOnlineConfigList" resultType="neatlogic.framework.documentonline.dto.DocumentOnlineConfigVo">
         SELECT
diff --git a/src/main/java/neatlogic/module/framework/startup/DocumentOnlineInitializeIndexHandler.java b/src/main/java/neatlogic/module/framework/startup/DocumentOnlineInitializeIndexHandler.java
index 01f8e49af..3da0a5f48 100644
--- a/src/main/java/neatlogic/module/framework/startup/DocumentOnlineInitializeIndexHandler.java
+++ b/src/main/java/neatlogic/module/framework/startup/DocumentOnlineInitializeIndexHandler.java
@@ -209,6 +209,12 @@ public class DocumentOnlineInitializeIndexHandler extends StartupBase {
             // 禁止添加子节点
             DOCUMENT_ONLINE_DIRECTORY_ROOT.noAllowedAddChild();
         }
+
+        for (DocumentOnlineConfigVo documentOnlineConfigVo : mappingConfigList) {
+            if (!documentOnlineConfigVo.isUsed()) {
+                logger.warn("nmfs.documentonlineinitializeindexhandler.executeforalltenant.warn_c" + JSONObject.toJSONString(documentOnlineConfigVo));
+            }
+        }
         return 1;
     }
 
@@ -225,26 +231,27 @@ public class DocumentOnlineInitializeIndexHandler extends StartupBase {
      */
     private List<DocumentOnlineConfigVo> getMappingConfigByFilePath(String filePath) {
         List<DocumentOnlineConfigVo> resultList = new ArrayList<>();
-        List<String> filePathList = new ArrayList<>();
-        List<String> directoryList = new ArrayList<>();
-        String[] split = filePath.split("/");
-        for (String directory : split) {
-            directoryList.add(directory);
-            if (directoryList.size() > 2) {
-                filePathList.add(String.join("/", directoryList));
-            }
-        }
-        if (CollectionUtils.isNotEmpty(filePathList)) {
-            List<DocumentOnlineConfigVo> documentOnlineConfigList = documentOnlineMapper.getDocumentOnlineConfigListByFilePathList(filePathList);
-            for (DocumentOnlineConfigVo documentOnlineConfigVo : documentOnlineConfigList) {
-                documentOnlineConfigVo.setSource("database");
-                resultList.add(documentOnlineConfigVo);
-            }
-        }
+//        List<String> filePathList = new ArrayList<>();
+//        List<String> directoryList = new ArrayList<>();
+//        String[] split = filePath.split("/");
+//        for (String directory : split) {
+//            directoryList.add(directory);
+//            if (directoryList.size() > 2) {
+//                filePathList.add(String.join("/", directoryList));
+//            }
+//        }
+//        if (CollectionUtils.isNotEmpty(filePathList)) {
+//            List<DocumentOnlineConfigVo> documentOnlineConfigList = documentOnlineMapper.getDocumentOnlineConfigListByFilePathList(filePathList);
+//            for (DocumentOnlineConfigVo documentOnlineConfigVo : documentOnlineConfigList) {
+//                documentOnlineConfigVo.setSource("database");
+//                resultList.add(documentOnlineConfigVo);
+//            }
+//        }
         for (DocumentOnlineConfigVo documentOnlineConfigVo : mappingConfigList) {
             if (filePath.startsWith(documentOnlineConfigVo.getFilePath())) {
                 if (!resultList.contains(documentOnlineConfigVo)) {
                     resultList.add(documentOnlineConfigVo);
+                    documentOnlineConfigVo.setUsed(true);
                 }
             }
         }
-- 
Gitee