From 469160a3b1ee8d92219123e84c7010dd3dbab93d Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 7 Aug 2024 15:56:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E5=BC=95=E7=94=A8=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E7=9F=A9=E9=98=B5=E5=92=8C=E8=A7=86=E5=9B=BE=E7=9F=A9?=
 =?UTF-8?q?=E9=98=B5=E6=97=B6=EF=BC=8C=E5=AD=97=E6=AE=B5=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=80=BC=E5=A4=AA=E5=A4=9A=E4=BC=9A=E5=BC=95=E5=8F=91=E5=BE=AA?=
 =?UTF-8?q?=E7=8E=AF=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1213024554156032]表单下拉框引用自定义矩阵和视图矩阵时，字段重复值太多会引发循环查询数据库 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1213024554156032
---
 .../matrix/dao/mapper/MatrixDataMapper.xml    | 33 ++++++++++++++++---
 .../dao/mapper/MatrixViewDataMapper.xml       | 33 ++++++++++++++++---
 .../framework/matrix/dto/MatrixDataVo.java    | 11 +++++++
 3 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
index b41c68692..51800e835 100644
--- a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
+++ b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixDataMapper.xml
@@ -341,7 +341,18 @@
     <select id="getDynamicTableDataListCount" parameterType="neatlogic.framework.matrix.dto.MatrixDataVo"
             resultType="int">
         SELECT
-        COUNT(1)
+        <choose>
+            <when test="isDistinct != null and isDistinct">
+                COUNT(DISTINCT
+                <foreach collection="columnList" item="column" open=" " separator=",">
+                    a.`${column}`
+                </foreach>
+                )
+            </when>
+            <otherwise>
+                COUNT(1)
+            </otherwise>
+        </choose>
         FROM `@{DATA_SCHEMA}`.`matrix_${matrixUuid}` a
         <include refid="searchDynamicTableDataListSql"/>
     </select>
@@ -349,13 +360,25 @@
     <select id="getDynamicTableDataList" parameterType="neatlogic.framework.matrix.dto.MatrixDataVo"
             resultType="java.util.LinkedHashMap">
         SELECT
-        a.`uuid`,
-        <foreach collection="columnList" item="column" separator=",">
-            a.`${column}`
-        </foreach>
+        <choose>
+            <when test="isDistinct != null and isDistinct">
+                DISTINCT
+                <foreach collection="columnList" item="column" open=" " separator=",">
+                    a.`${column}`
+                </foreach>
+            </when>
+            <otherwise>
+                a.`uuid`,
+                <foreach collection="columnList" item="column" separator=",">
+                    a.`${column}`
+                </foreach>
+            </otherwise>
+        </choose>
         FROM `@{DATA_SCHEMA}`.`matrix_${matrixUuid}` a
         <include refid="searchDynamicTableDataListSql"/>
+        <if test="isDistinct == null or !isDistinct">
         ORDER BY a.`sort` DESC
+        </if>
         <if test="needPage == true">
             LIMIT #{startNum}, #{pageSize}
         </if>
diff --git a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixViewDataMapper.xml b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixViewDataMapper.xml
index 590698cd9..221e28c1f 100644
--- a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixViewDataMapper.xml
+++ b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixViewDataMapper.xml
@@ -209,7 +209,18 @@
     <select id="getDynamicTableDataListCount" parameterType="neatlogic.framework.matrix.dto.MatrixDataVo"
             resultType="int">
         SELECT
-        COUNT(1)
+        <choose>
+            <when test="isDistinct != null and isDistinct">
+                COUNT(DISTINCT
+                <foreach collection="columnList" item="column" open=" " separator=",">
+                    `${column}`
+                </foreach>
+                )
+            </when>
+            <otherwise>
+                COUNT(1)
+            </otherwise>
+        </choose>
         FROM `@{DATA_SCHEMA}`.`matrix_${matrixUuid}`
         <where>
             <include refid="searchDynamicTableDataSqlNew"/>
@@ -219,15 +230,27 @@
     <select id="getDynamicTableDataList" parameterType="neatlogic.framework.matrix.dto.MatrixDataVo"
             resultType="java.util.LinkedHashMap">
         SELECT
-        `uuid`,
-        <foreach collection="columnList" item="column" separator=",">
-            `${column}`
-        </foreach>
+        <choose>
+            <when test="isDistinct != null and isDistinct">
+                DISTINCT
+                <foreach collection="columnList" item="column" open=" " separator=",">
+                    `${column}`
+                </foreach>
+            </when>
+            <otherwise>
+                `uuid`,
+                <foreach collection="columnList" item="column" separator=",">
+                    `${column}`
+                </foreach>
+            </otherwise>
+        </choose>
         FROM `@{DATA_SCHEMA}`.`matrix_${matrixUuid}`
         <where>
             <include refid="searchDynamicTableDataSqlNew"/>
         </where>
+        <if test="isDistinct == null or !isDistinct">
         ORDER BY `id` DESC
+        </if>
         <if test="needPage == true">
             LIMIT #{startNum}, #{pageSize}
         </if>
diff --git a/src/main/java/neatlogic/framework/matrix/dto/MatrixDataVo.java b/src/main/java/neatlogic/framework/matrix/dto/MatrixDataVo.java
index 169c1016c..46160e5e3 100644
--- a/src/main/java/neatlogic/framework/matrix/dto/MatrixDataVo.java
+++ b/src/main/java/neatlogic/framework/matrix/dto/MatrixDataVo.java
@@ -54,6 +54,9 @@ public class MatrixDataVo extends BasePageVo {
      * 查询数据时不能为空的column列表
      */
     private List<String> notNullColumnList;
+
+    private Boolean isDistinct;
+
     public String getMatrixUuid() {
         return matrixUuid;
     }
@@ -238,4 +241,12 @@ public class MatrixDataVo extends BasePageVo {
     public void setKeywordColumnUniqueIdentifier(String keywordColumnUniqueIdentifier) {
         this.keywordColumnUniqueIdentifier = keywordColumnUniqueIdentifier;
     }
+
+    public Boolean getIsDistinct() {
+        return isDistinct;
+    }
+
+    public void setIsDistinct(Boolean distinct) {
+        isDistinct = distinct;
+    }
 }
-- 
Gitee


From 89eab0a6addd5459fe60d6bc240c332cc4bd7d22 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 7 Aug 2024 18:12:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E5=BC=95=E7=94=A8=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E7=9F=A9=E9=98=B5=E5=92=8C=E8=A7=86=E5=9B=BE=E7=9F=A9?=
 =?UTF-8?q?=E9=98=B5=E6=97=B6=EF=BC=8C=E5=AD=97=E6=AE=B5=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=80=BC=E5=A4=AA=E5=A4=9A=E4=BC=9A=E5=BC=95=E5=8F=91=E5=BE=AA?=
 =?UTF-8?q?=E7=8E=AF=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1213024554156032]表单下拉框引用自定义矩阵和视图矩阵时，字段重复值太多会引发循环查询数据库 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1213024554156032
---
 .../framework/restful/audit/ApiAuditManager.java          | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/neatlogic/framework/restful/audit/ApiAuditManager.java b/src/main/java/neatlogic/framework/restful/audit/ApiAuditManager.java
index 8434e3e8f..5cd9a3b42 100644
--- a/src/main/java/neatlogic/framework/restful/audit/ApiAuditManager.java
+++ b/src/main/java/neatlogic/framework/restful/audit/ApiAuditManager.java
@@ -16,22 +16,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 package neatlogic.framework.restful.audit;
 
 import neatlogic.framework.restful.dto.ApiAuditVo;
-import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
-
-@Component
+@Deprecated
+//@Component
 public class ApiAuditManager {
     public final static int THREAD_COUNT = 3;
     private final static int QUEUE_SIZE = 512;
 
     private static List<BlockingQueue<ApiAuditVo>> queueList = new ArrayList<>();
 
-    @PostConstruct
+//    @PostConstruct
     public void init() {
         for (int i = 0; i < THREAD_COUNT; i++) {
             BlockingQueue<ApiAuditVo> queue = new ArrayBlockingQueue<>(QUEUE_SIZE, true);
-- 
Gitee