From a7aca2f0ae9455d23a7c8c5c5f2a6210b6e1fb4f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Aug 2022 18:31:09 +0800
Subject: [PATCH] fix

---
 src/main/resources/mapper/dapp/DappAchieveTreeDao.xml               |    5 ++
 src/main/java/cc/mrbird/febs/job/SystemInit.java                    |    6 ---
 src/main/java/cc/mrbird/febs/dapp/entity/DappAchieveTreeEntity.java |   11 +++++
 src/main/java/cc/mrbird/febs/dapp/mapper/DappAchieveTreeDao.java    |    4 ++
 src/main/java/cc/mrbird/febs/job/MatrixTreeInit.java                |   41 ++++++++++++++++++++
 5 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappAchieveTreeEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappAchieveTreeEntity.java
index 9a2497d..568cee9 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappAchieveTreeEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappAchieveTreeEntity.java
@@ -1,6 +1,7 @@
 package cc.mrbird.febs.dapp.entity;
 
 import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -21,4 +22,14 @@
     private int batchNo;
 
     private int validState;
+
+    @TableField(exist = false)
+    private String address;
+
+    @TableField(exist = false)
+    private String inviteId;
+
+    @TableField(exist = false)
+    private String refererId;
+
 }
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappAchieveTreeDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappAchieveTreeDao.java
index 7a5b319..301d67b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DappAchieveTreeDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappAchieveTreeDao.java
@@ -4,7 +4,11 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface DappAchieveTreeDao extends BaseMapper<DappAchieveTreeEntity> {
 
     DappAchieveTreeEntity selectByMidNode(@Param("memberId") Long memberId);
+
+    List<DappAchieveTreeEntity> selectTreeList();
 }
diff --git a/src/main/java/cc/mrbird/febs/job/MatrixTreeInit.java b/src/main/java/cc/mrbird/febs/job/MatrixTreeInit.java
new file mode 100644
index 0000000..69991c6
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/job/MatrixTreeInit.java
@@ -0,0 +1,41 @@
+package cc.mrbird.febs.job;
+
+import cc.mrbird.febs.dapp.entity.DappAchieveTreeEntity;
+import cc.mrbird.febs.dapp.mapper.DappAchieveTreeDao;
+import cc.mrbird.febs.tree.MatrixTree;
+import cc.mrbird.febs.tree.MemberNode;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.util.List;
+
+/**
+ * @author wzy
+ * @date 2022-08-26
+ **/
+@Slf4j
+@Component
+public class MatrixTreeInit {
+
+    @Autowired
+    private DappAchieveTreeDao dappAchieveTreeDao;
+
+    @PostConstruct
+    public void init() {
+        List<DappAchieveTreeEntity> tree = dappAchieveTreeDao.selectTreeList();
+
+        MatrixTree instance = MatrixTree.getInstance();
+        for (DappAchieveTreeEntity treeNode : tree) {
+
+            MemberNode node = new MemberNode();
+            node.setAddress(treeNode.getAddress());
+            node.setInviteId(treeNode.getInviteId());
+            node.setRefererId(treeNode.getRefererId());
+            node.setMemberId(treeNode.getMidNode());
+            instance.addNode(node);
+        }
+        System.out.println(11);
+    }
+}
diff --git a/src/main/java/cc/mrbird/febs/job/SystemInit.java b/src/main/java/cc/mrbird/febs/job/SystemInit.java
index 0db2e7d..9cace7b 100644
--- a/src/main/java/cc/mrbird/febs/job/SystemInit.java
+++ b/src/main/java/cc/mrbird/febs/job/SystemInit.java
@@ -24,12 +24,6 @@
 @Component
 public class SystemInit {
 
-    @Autowired
-    private RedisUtils redisUtils;
-
-    @Autowired
-    private SpringContextUtil springContextUtil;
-
     @PostConstruct
     public void init() {
         Map<String, Object> encryptBeans = SpringContextUtil.getBeansWithAnnotation(EncryptEnable.class);
diff --git a/src/main/resources/mapper/dapp/DappAchieveTreeDao.xml b/src/main/resources/mapper/dapp/DappAchieveTreeDao.xml
index 07cc0f0..65653a0 100644
--- a/src/main/resources/mapper/dapp/DappAchieveTreeDao.xml
+++ b/src/main/resources/mapper/dapp/DappAchieveTreeDao.xml
@@ -6,4 +6,9 @@
         select * from dapp_achieve_tree where mid_node=#{memberId}
     </select>
 
+    <select id="selectTreeList" resultType="cc.mrbird.febs.dapp.entity.DappAchieveTreeEntity">
+        select a.*, b.address, b.invite_id, b.referer_id from dapp_achieve_tree a
+        inner join dapp_member b on a.mid_node=b.id
+        order by a.id
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1