From 305bf77bd37bb476f58c3e1499a4be3c352b66cc Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 24 Nov 2023 10:23:28 +0800
Subject: [PATCH] 标签统计
---
src/main/java/org/springblade/modules/label/service/impl/LabelServiceImpl.java | 4 +++-
src/main/java/org/springblade/common/node/TreeIntegerNode.java | 5 +++++
src/main/java/org/springblade/modules/label/mapper/LabelMapper.xml | 9 ++++++++-
src/main/resources/application.yml | 3 +++
4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/common/node/TreeIntegerNode.java b/src/main/java/org/springblade/common/node/TreeIntegerNode.java
index 9d98571..b919300 100644
--- a/src/main/java/org/springblade/common/node/TreeIntegerNode.java
+++ b/src/main/java/org/springblade/common/node/TreeIntegerNode.java
@@ -31,6 +31,11 @@
private String name;
/**
+ * 总数量
+ */
+ private Integer count;
+
+ /**
* 排序
*/
private Integer sort;
diff --git a/src/main/java/org/springblade/modules/label/mapper/LabelMapper.xml b/src/main/java/org/springblade/modules/label/mapper/LabelMapper.xml
index 8b3385f..9794f4d 100644
--- a/src/main/java/org/springblade/modules/label/mapper/LabelMapper.xml
+++ b/src/main/java/org/springblade/modules/label/mapper/LabelMapper.xml
@@ -29,7 +29,14 @@
<select id="getLabelTreeList" resultType="org.springblade.common.node.TreeIntegerNode">
- select id as id,parent_id as parentId,label_name as name, sort FROM jczz_label where is_deleted = 0
+ SELECT
+ jl.id AS id,
+ jl.parent_id AS parentId,
+ jl.label_name AS NAME,
+ jl.sort,
+ (SELECT count(1) from jczz_user_house_label where label_id = jl.id ) count
+ FROM
+ jczz_label jl where is_deleted = 0
</select>
diff --git a/src/main/java/org/springblade/modules/label/service/impl/LabelServiceImpl.java b/src/main/java/org/springblade/modules/label/service/impl/LabelServiceImpl.java
index 7f0e1ab..4749551 100644
--- a/src/main/java/org/springblade/modules/label/service/impl/LabelServiceImpl.java
+++ b/src/main/java/org/springblade/modules/label/service/impl/LabelServiceImpl.java
@@ -27,6 +27,7 @@
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
/**
* 标签管理 服务实现类
@@ -54,7 +55,8 @@
@Override
public List<TreeIntegerNode> tree(LabelVO label) {
- List<TreeIntegerNode> nodeTree = NodeTreeUtil.getNodeTree(baseMapper.getLabelTreeList(label));
+ Map<Integer, TreeIntegerNode> labelTreeList = baseMapper.getLabelTreeList(label);
+ List<TreeIntegerNode> nodeTree = NodeTreeUtil.getNodeTree(labelTreeList);
nodeTree.forEach(node -> recursion(node));
return nodeTree;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4c6629c..73b825f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -49,6 +49,9 @@
main:
allow-circular-references: true
+# jackson:
+# date-format: yyyy-MM-dd HH:mm:ss
+# time-zone: GMT+8
# mybatis
mybatis-plus:
mapper-locations: classpath:org/springblade/**/mapper/*Mapper.xml
--
Gitblit v1.9.3