From 397e0eb72ab44f324efc355db3913f5392db4265 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Wed, 22 Nov 2023 16:44:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E9=A1=B9top10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zzsfw/controller/NdKqZzsfwMenuController.java  |  8 ++++++
 .../kqapi/zzsfw/entity/vo/MatterTopVO.java         | 31 ++++++++++++++++++++++
 .../kqapi/zzsfw/manage/MatterManage.java           | 20 ++++++++++++++
 .../com/ningdatech/kqapi/menu/DuplicationTest.java |  3 +--
 4 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MatterTopVO.java

diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.java
index 82f7d42..0ff72d3 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.java
@@ -2,6 +2,8 @@ package com.ningdatech.kqapi.zzsfw.controller;
 
 
 import com.ningdatech.basic.model.ApiResponse;
+import com.ningdatech.kqapi.zzsfw.entity.vo.MatterTopVO;
+import com.ningdatech.kqapi.zzsfw.entity.vo.MattersVO;
 import com.ningdatech.kqapi.zzsfw.entity.vo.TreeVO;
 import com.ningdatech.kqapi.zzsfw.manage.MatterManage;
 import io.swagger.annotations.Api;
@@ -37,4 +39,10 @@ public class NdKqZzsfwMenuController {
     public List<TreeVO> getMatters() {
         return matterManage.getMatters();
     }
+
+    @ApiOperation(value = "top10事项", notes = "top10事项")
+    @GetMapping("/top10")
+    public List<MatterTopVO> topTen() {
+        return matterManage.topTen();
+    }
 }
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MatterTopVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MatterTopVO.java
new file mode 100644
index 0000000..791602c
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MatterTopVO.java
@@ -0,0 +1,31 @@
+package com.ningdatech.kqapi.zzsfw.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 事项
+ * </p>
+ *
+ * @author ZPF
+ * @since 2023-10-25
+ */
+@Data
+@ApiModel(value = "MatterTopVO", description = "事项top")
+public class MatterTopVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("事项名称")
+    private String matterName;
+
+    @ApiModelProperty("事项链接")
+    private String webapplyurl;
+
+    @ApiModelProperty("数量")
+    private Integer count;
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java
index d33351d..5f92786 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java
@@ -1,11 +1,15 @@
 package com.ningdatech.kqapi.zzsfw.manage;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ningdatech.kqapi.common.enumeration.CommonEnum;
 import com.ningdatech.kqapi.zzsfw.constants.ZzsfwMenuConstant;
+import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate;
 import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu;
+import com.ningdatech.kqapi.zzsfw.entity.vo.MatterTopVO;
 import com.ningdatech.kqapi.zzsfw.entity.vo.TreeVO;
+import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -28,8 +32,11 @@ public class MatterManage {
 
     private final INdKqZzsfwMenuService menuService;
 
+    private final INdKqZzsfwMatterDeduplicateService matterDeduplicateService;
+
     public List<TreeVO> getMatters() {
         List<NdKqZzsfwMenu> matters = menuService.list(Wrappers.lambdaQuery(NdKqZzsfwMenu.class)
+                .isNotNull(NdKqZzsfwMenu::getWebapplyurl)
                 .orderByAsc(NdKqZzsfwMenu::getSort));
         if(CollUtil.isEmpty(matters)){
             return Collections.emptyList();
@@ -87,4 +94,17 @@ public class MatterManage {
                     return matter;
                 }).collect(Collectors.toList());
     }
+
+    public List<MatterTopVO> topTen() {
+        List<NdKqZzsfwMattersDeduplicate> topTen = matterDeduplicateService.list(Wrappers.lambdaQuery(NdKqZzsfwMattersDeduplicate.class)
+                .orderByDesc(NdKqZzsfwMattersDeduplicate::getCountNum)
+                .last("limit 10"));
+        return topTen.stream().map(m -> {
+            MatterTopVO vo = new MatterTopVO();
+            vo.setMatterName(m.getQlName());
+            vo.setWebapplyurl(m.getWebapplyurl());
+            vo.setCount(m.getCountNum());
+            return vo;
+        }).collect(Collectors.toList());
+    }
 }
diff --git a/kqapi/src/test/java/com/ningdatech/kqapi/menu/DuplicationTest.java b/kqapi/src/test/java/com/ningdatech/kqapi/menu/DuplicationTest.java
index e71acfa..6b6a372 100644
--- a/kqapi/src/test/java/com/ningdatech/kqapi/menu/DuplicationTest.java
+++ b/kqapi/src/test/java/com/ningdatech/kqapi/menu/DuplicationTest.java
@@ -78,8 +78,7 @@ public class DuplicationTest extends AppTests {
 
     @Test
     public void syncUrl(){
-        List<NdKqZzsfwMenu> menus = menuService.list(Wrappers.lambdaQuery(NdKqZzsfwMenu.class)
-                .isNull(NdKqZzsfwMenu::getWebapplyurl));
+        List<NdKqZzsfwMenu> menus = menuService.list(Wrappers.lambdaQuery(NdKqZzsfwMenu.class));
 
         List<NdKqZzsfwMattersDeduplicate> list = matterDeduplicateService.list();