From f586113ab82adaebdd3dfbb2d07f6f0a833d85ec Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 13 Feb 2025 18:02:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E9=87=8D=E5=BB=BA?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E5=A4=B1=E8=B4=A5=E4=BA=86=E5=8D=B4=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1352076393676800]重建视图失败了却提示成功 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1352076393676800
---
 .../core/IRebuildDataBaseView.java            |  12 +-
 .../core/RebuildDataBaseViewManager.java      |  28 ++++-
 .../restful/dao/mapper/ApiAuditMapper.xml     |  15 +--
 .../handler/MatrixViewRebuildHandler.java     | 105 +++++++++++++-----
 .../CheckUpdateDataBaseViewHandler.java       |   2 +-
 .../tenantinit/DataBaseViewInitHandler.java   |  40 +++++++
 6 files changed, 156 insertions(+), 46 deletions(-)
 create mode 100644 src/main/java/neatlogic/module/framework/tenantinit/DataBaseViewInitHandler.java

diff --git a/src/main/java/neatlogic/framework/rebuilddatabaseview/core/IRebuildDataBaseView.java b/src/main/java/neatlogic/framework/rebuilddatabaseview/core/IRebuildDataBaseView.java
index 7b8d8cfd4..41779fd1e 100644
--- a/src/main/java/neatlogic/framework/rebuilddatabaseview/core/IRebuildDataBaseView.java
+++ b/src/main/java/neatlogic/framework/rebuilddatabaseview/core/IRebuildDataBaseView.java
@@ -27,7 +27,17 @@ public interface IRebuildDataBaseView {
 
     String getDescription();
 
-    List<ViewStatusInfo> execute();
+    /**
+     * 只有视图不存在时才创建视图
+     * @return
+     */
+    List<ViewStatusInfo> createViewIfNotExists();
+
+    /**
+     * 如果视图存在则删除，重新创建视图
+     * @return
+     */
+    List<ViewStatusInfo> createOrReplaceView();
 
     int getSort();
 }
diff --git a/src/main/java/neatlogic/framework/rebuilddatabaseview/core/RebuildDataBaseViewManager.java b/src/main/java/neatlogic/framework/rebuilddatabaseview/core/RebuildDataBaseViewManager.java
index ec6f59120..163741824 100644
--- a/src/main/java/neatlogic/framework/rebuilddatabaseview/core/RebuildDataBaseViewManager.java
+++ b/src/main/java/neatlogic/framework/rebuilddatabaseview/core/RebuildDataBaseViewManager.java
@@ -46,8 +46,32 @@ public class RebuildDataBaseViewManager extends ModuleInitializedListenerBase {
             moduleGroup2HandlerListMap.computeIfAbsent(context.getGroup(), key -> new ArrayList<>()).add(bean);
         }
     }
+    /**
+     * 只有视图不存在时才创建视图
+     * @return
+     */
+    public static List<ViewStatusInfo> createViewIfNotExists() {
+        List<ViewStatusInfo> resultList = new ArrayList<>();
+        List<IRebuildDataBaseView> list = new ArrayList<>();
+        List<ModuleGroupVo> activeModuleGroupList = TenantContext.get().getActiveModuleGroupList();
+        for (ModuleGroupVo moduleGroupVo : activeModuleGroupList) {
+            List<IRebuildDataBaseView> handlerList = moduleGroup2HandlerListMap.get(moduleGroupVo.getGroup());
+            if (CollectionUtils.isNotEmpty(handlerList)) {
+                list.addAll(handlerList);
+            }
+        }
+        list.sort(Comparator.comparing(IRebuildDataBaseView::getSort));
+        for (IRebuildDataBaseView rebuildDataBaseView : list) {
+            resultList.addAll(rebuildDataBaseView.createViewIfNotExists());
+        }
+        return resultList;
+    }
 
-    public static List<ViewStatusInfo> execute() {
+    /**
+     * 如果视图存在则删除，重新创建视图
+     * @return
+     */
+    public static List<ViewStatusInfo> createOrReplaceView() {
         List<ViewStatusInfo> resultList = new ArrayList<>();
         List<IRebuildDataBaseView> list = new ArrayList<>();
         List<ModuleGroupVo> activeModuleGroupList = TenantContext.get().getActiveModuleGroupList();
@@ -59,7 +83,7 @@ public class RebuildDataBaseViewManager extends ModuleInitializedListenerBase {
         }
         list.sort(Comparator.comparing(IRebuildDataBaseView::getSort));
         for (IRebuildDataBaseView rebuildDataBaseView : list) {
-            List<ViewStatusInfo> viewStatusInfoList = rebuildDataBaseView.execute();
+            List<ViewStatusInfo> viewStatusInfoList = rebuildDataBaseView.createOrReplaceView();
             EscapeTransactionJob.State s = new EscapeTransactionJob(() -> {
                 for (ViewStatusInfo viewStatusInfo : viewStatusInfoList) {
                     if (Objects.equals(viewStatusInfo.getStatus(), ViewStatusInfo.Status.FAILURE.toString())) {
diff --git a/src/main/java/neatlogic/framework/restful/dao/mapper/ApiAuditMapper.xml b/src/main/java/neatlogic/framework/restful/dao/mapper/ApiAuditMapper.xml
index 0623bfbee..facdbcaa9 100644
--- a/src/main/java/neatlogic/framework/restful/dao/mapper/ApiAuditMapper.xml
+++ b/src/main/java/neatlogic/framework/restful/dao/mapper/ApiAuditMapper.xml
@@ -152,14 +152,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             useCache="false">
         select
         COUNT(1)
-        from `api_audit` LEFT JOIN `user`
-        on `api_audit`.`user_uuid` = `user`.`uuid`
+        from `api_audit`
         <where>
             <if test="userUuid != null and userUuid != ''">
-                and `api_audit`.`user_uuid` = #{userUuid}
+                and `user_uuid` = #{userUuid}
             </if>
             <if test="tokenList != null and tokenList.size() > 0">
-                AND `api_audit`.`token` IN
+                AND `token` IN
                 <foreach collection="tokenList" item="token" open="(" separator="," close=")">
                     #{token}
                 </foreach>
@@ -174,14 +173,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                 and `ip` LIKE CONCAT('%', #{ip}, '%')
             </if>
         </where>
-        <choose>
-            <when test="orderType == 'desc' or orderType == ''">
-                order by `start_time` desc
-            </when>
-            <otherwise>
-                order by `start_time`
-            </otherwise>
-        </choose>
     </select>
 
     <select id="searchApiAuditForExport" parameterType="neatlogic.framework.restful.dto.ApiAuditVo"
diff --git a/src/main/java/neatlogic/module/framework/matrix/rebuilddatabaseview/handler/MatrixViewRebuildHandler.java b/src/main/java/neatlogic/module/framework/matrix/rebuilddatabaseview/handler/MatrixViewRebuildHandler.java
index 6864c8dc4..900ede316 100644
--- a/src/main/java/neatlogic/module/framework/matrix/rebuilddatabaseview/handler/MatrixViewRebuildHandler.java
+++ b/src/main/java/neatlogic/module/framework/matrix/rebuilddatabaseview/handler/MatrixViewRebuildHandler.java
@@ -15,7 +15,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 package neatlogic.module.framework.matrix.rebuilddatabaseview.handler;
 
+import neatlogic.framework.asynchronization.threadlocal.TenantContext;
 import neatlogic.framework.common.dto.BasePageVo;
+import neatlogic.framework.dao.mapper.SchemaMapper;
 import neatlogic.framework.matrix.constvalue.MatrixType;
 import neatlogic.framework.matrix.core.MatrixDataSourceHandlerFactory;
 import neatlogic.framework.matrix.dao.mapper.MatrixMapper;
@@ -31,6 +33,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Component
@@ -38,6 +41,8 @@ public class MatrixViewRebuildHandler implements IRebuildDataBaseView {
 
     @Resource
     private MatrixMapper matrixMapper;
+    @Resource
+    private SchemaMapper schemaMapper;
 
     @Override
     public String getDescription() {
@@ -45,40 +50,80 @@ public class MatrixViewRebuildHandler implements IRebuildDataBaseView {
     }
 
     @Override
-    public List<ViewStatusInfo> execute() {
+    public List<ViewStatusInfo> createViewIfNotExists() {
         List<ViewStatusInfo> resultList = new ArrayList<>();
         int rowNum = matrixMapper.getMatrixViewCount();
-        if (rowNum == 0) {
-            return resultList;
-        }
-        ViewDataSourceHandler viewDataSourceHandler = (ViewDataSourceHandler) MatrixDataSourceHandlerFactory.getHandler(MatrixType.VIEW.getValue());
-        BasePageVo searchVo = new BasePageVo();
-        searchVo.setRowNum(rowNum);
-        searchVo.setPageSize(100);
-        int pageCount = searchVo.getPageCount();
-        for (int currentPage = 1; currentPage <= pageCount; currentPage++) {
-            searchVo.setCurrentPage(currentPage);
-            List<MatrixViewVo> matrixViewList = matrixMapper.getMatrixViewList(searchVo);
-            if (CollectionUtils.isEmpty(matrixViewList)) {
-                continue;
+        if (rowNum > 0) {
+            ViewDataSourceHandler viewDataSourceHandler = (ViewDataSourceHandler) MatrixDataSourceHandlerFactory.getHandler(MatrixType.VIEW.getValue());
+            BasePageVo searchVo = new BasePageVo();
+            searchVo.setRowNum(rowNum);
+            searchVo.setPageSize(100);
+            int pageCount = searchVo.getPageCount();
+            for (int currentPage = 1; currentPage <= pageCount; currentPage++) {
+                searchVo.setCurrentPage(currentPage);
+                List<MatrixViewVo> matrixViewList = matrixMapper.getMatrixViewList(searchVo);
+                if (CollectionUtils.isNotEmpty(matrixViewList)) {
+                    List<String> uuidList = matrixViewList.stream().map(MatrixViewVo::getMatrixUuid).collect(Collectors.toList());
+                    List<MatrixVo> matrixList = matrixMapper.getMatrixListByUuidList(uuidList);
+                    Map<String, String> uuidToNameMap = matrixList.stream().collect(Collectors.toMap(MatrixVo::getUuid, MatrixVo::getName));
+                    for (MatrixViewVo matrixViewVo : matrixViewList) {
+                        String matrixUuid = matrixViewVo.getMatrixUuid();
+                        String tableType = schemaMapper.checkTableOrViewIsExists(TenantContext.get().getDataDbName(), "matrix_" + matrixUuid);
+                        if (Objects.equals(tableType, "VIEW")) {
+                            continue;
+                        }
+                        String matrixName = uuidToNameMap.get(matrixUuid);
+                        ViewStatusInfo viewStatusInfo = new ViewStatusInfo();
+                        viewStatusInfo.setName("matrix_" + matrixUuid);
+                        viewStatusInfo.setLabel(matrixName);
+                        try {
+                            viewDataSourceHandler.buildView(matrixUuid, matrixName, matrixViewVo.getXml());
+                            viewStatusInfo.setStatus(ViewStatusInfo.Status.SUCCESS.toString());
+                        } catch (Exception e) {
+                            viewStatusInfo.setStatus(ViewStatusInfo.Status.FAILURE.toString());
+                            viewStatusInfo.setError(e.getMessage());
+                        }
+                        resultList.add(viewStatusInfo);
+                    }
+                }
             }
-            List<String> uuidList = matrixViewList.stream().map(MatrixViewVo::getMatrixUuid).collect(Collectors.toList());
-            List<MatrixVo> matrixList = matrixMapper.getMatrixListByUuidList(uuidList);
-            Map<String, String> uuidToNameMap = matrixList.stream().collect(Collectors.toMap(MatrixVo::getUuid, MatrixVo::getName));
-            for (MatrixViewVo matrixViewVo : matrixViewList) {
-                String matrixUuid = matrixViewVo.getMatrixUuid();
-                String matrixName = uuidToNameMap.get(matrixUuid);
-                ViewStatusInfo viewStatusInfo = new ViewStatusInfo();
-                viewStatusInfo.setName("matrix_" + matrixUuid);
-                viewStatusInfo.setLabel(matrixName);
-                try {
-                    viewDataSourceHandler.buildView(matrixUuid, matrixName, matrixViewVo.getXml());
-                    viewStatusInfo.setStatus(ViewStatusInfo.Status.SUCCESS.toString());
-                } catch (Exception e) {
-                    viewStatusInfo.setStatus(ViewStatusInfo.Status.FAILURE.toString());
-                    viewStatusInfo.setError(e.getMessage());
+        }
+        return resultList;
+    }
+
+    @Override
+    public List<ViewStatusInfo> createOrReplaceView() {
+        List<ViewStatusInfo> resultList = new ArrayList<>();
+        int rowNum = matrixMapper.getMatrixViewCount();
+        if (rowNum > 0) {
+            ViewDataSourceHandler viewDataSourceHandler = (ViewDataSourceHandler) MatrixDataSourceHandlerFactory.getHandler(MatrixType.VIEW.getValue());
+            BasePageVo searchVo = new BasePageVo();
+            searchVo.setRowNum(rowNum);
+            searchVo.setPageSize(100);
+            int pageCount = searchVo.getPageCount();
+            for (int currentPage = 1; currentPage <= pageCount; currentPage++) {
+                searchVo.setCurrentPage(currentPage);
+                List<MatrixViewVo> matrixViewList = matrixMapper.getMatrixViewList(searchVo);
+                if (CollectionUtils.isNotEmpty(matrixViewList)) {
+                    List<String> uuidList = matrixViewList.stream().map(MatrixViewVo::getMatrixUuid).collect(Collectors.toList());
+                    List<MatrixVo> matrixList = matrixMapper.getMatrixListByUuidList(uuidList);
+                    Map<String, String> uuidToNameMap = matrixList.stream().collect(Collectors.toMap(MatrixVo::getUuid, MatrixVo::getName));
+                    for (MatrixViewVo matrixViewVo : matrixViewList) {
+                        String matrixUuid = matrixViewVo.getMatrixUuid();
+                        String matrixName = uuidToNameMap.get(matrixUuid);
+                        ViewStatusInfo viewStatusInfo = new ViewStatusInfo();
+                        viewStatusInfo.setName("matrix_" + matrixUuid);
+                        viewStatusInfo.setLabel(matrixName);
+                        try {
+                            viewDataSourceHandler.buildView(matrixUuid, matrixName, matrixViewVo.getXml());
+                            viewStatusInfo.setStatus(ViewStatusInfo.Status.SUCCESS.toString());
+                        } catch (Exception e) {
+                            viewStatusInfo.setStatus(ViewStatusInfo.Status.FAILURE.toString());
+                            viewStatusInfo.setError(e.getMessage());
+                        }
+                        resultList.add(viewStatusInfo);
+                    }
                 }
-                resultList.add(viewStatusInfo);
             }
         }
         return resultList;
diff --git a/src/main/java/neatlogic/module/framework/startup/CheckUpdateDataBaseViewHandler.java b/src/main/java/neatlogic/module/framework/startup/CheckUpdateDataBaseViewHandler.java
index 0e655c57a..de4abf8a5 100644
--- a/src/main/java/neatlogic/module/framework/startup/CheckUpdateDataBaseViewHandler.java
+++ b/src/main/java/neatlogic/module/framework/startup/CheckUpdateDataBaseViewHandler.java
@@ -33,7 +33,7 @@ public class CheckUpdateDataBaseViewHandler extends StartupBase {
 
     @Override
     public int executeForCurrentTenant() {
-        RebuildDataBaseViewManager.execute();
+        RebuildDataBaseViewManager.createViewIfNotExists();
         return 0;
     }
 }
diff --git a/src/main/java/neatlogic/module/framework/tenantinit/DataBaseViewInitHandler.java b/src/main/java/neatlogic/module/framework/tenantinit/DataBaseViewInitHandler.java
new file mode 100644
index 000000000..3628d8aa4
--- /dev/null
+++ b/src/main/java/neatlogic/module/framework/tenantinit/DataBaseViewInitHandler.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2025  深圳极向量科技有限公司 All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package neatlogic.module.framework.tenantinit;
+
+import neatlogic.framework.rebuilddatabaseview.core.RebuildDataBaseViewManager;
+import neatlogic.framework.tenantinit.TenantInitBase;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DataBaseViewInitHandler extends TenantInitBase {
+    @Override
+    public String getName() {
+        return "初始化数据库所有视图";
+    }
+
+    @Override
+    public void execute() {
+        RebuildDataBaseViewManager.createViewIfNotExists();
+    }
+
+    @Override
+    public int sort() {
+        return 4;
+    }
+}
-- 
Gitee


From 3f32d6af6d825758ef029ebce3642bd20fe1e6b2 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 13 Feb 2025 18:05:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E9=87=8D=E5=BB=BA?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E5=A4=B1=E8=B4=A5=E4=BA=86=E5=8D=B4=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1352076393676800]重建视图失败了却提示成功 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1352076393676800
---
 ...wHandler.java => CheckUpdateDataBaseViewStartupHandler.java} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/main/java/neatlogic/module/framework/startup/{CheckUpdateDataBaseViewHandler.java => CheckUpdateDataBaseViewStartupHandler.java} (94%)

diff --git a/src/main/java/neatlogic/module/framework/startup/CheckUpdateDataBaseViewHandler.java b/src/main/java/neatlogic/module/framework/startup/CheckUpdateDataBaseViewStartupHandler.java
similarity index 94%
rename from src/main/java/neatlogic/module/framework/startup/CheckUpdateDataBaseViewHandler.java
rename to src/main/java/neatlogic/module/framework/startup/CheckUpdateDataBaseViewStartupHandler.java
index de4abf8a5..9e8876fdb 100644
--- a/src/main/java/neatlogic/module/framework/startup/CheckUpdateDataBaseViewHandler.java
+++ b/src/main/java/neatlogic/module/framework/startup/CheckUpdateDataBaseViewStartupHandler.java
@@ -20,7 +20,7 @@ import neatlogic.framework.startup.StartupBase;
 import org.springframework.stereotype.Component;
 
 @Component
-public class CheckUpdateDataBaseViewHandler extends StartupBase {
+public class CheckUpdateDataBaseViewStartupHandler extends StartupBase {
     @Override
     public String getName() {
         return "nmfs.checkupdatedatabaseviewhandler.getname";
-- 
Gitee