From 278cee6d200546bcbc8a6660db0c8825d2a6d059 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 17 Jan 2024 10:54:52 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B7=A5=E4=BD=9C=E5=8F=B0?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/manage/TemplateCenterManage.java | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java b/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java
index a6d91e63c1..374e793bb1 100644
--- a/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java
+++ b/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java
@@ -131,7 +131,7 @@ public class TemplateCenterManage {
         }
         // 模版管理使用次数推荐
         List<TemplateMarketDTO> manage = searchTemplateFromManage();
-        return baseResponseV2TransRecommend(v2BaseResponse, templateParams.get("template.url"));
+        return baseResponseV2TransRecommend(v2BaseResponse, manage, templateParams.get("template.url"));
     }
 
     public MarketPreviewBaseResponse searchTemplatePreview() {
@@ -165,7 +165,7 @@ public class TemplateCenterManage {
         }
     }
 
-    private MarketBaseResponse baseResponseV2TransRecommend(MarketTemplateV2BaseResponse v2BaseResponse, String url) {
+    private MarketBaseResponse baseResponseV2TransRecommend(MarketTemplateV2BaseResponse v2BaseResponse,List<TemplateMarketDTO> templateManages, String url) {
         Map<String, Long> useTime = coreOptRecentManage.findTemplateRecentUseTime();
         List<MarketMetaDataVO> categoryVO = getCategoriesV2().stream().filter(node -> !"全部".equalsIgnoreCase(node.getLabel())).collect(Collectors.toList());
         Map<String, String> categoriesMap = categoryVO.stream()
@@ -181,6 +181,22 @@ public class TemplateCenterManage {
         }
         // 最近使用排序
         Collections.sort(contents);
+        Long countDataV = contents.stream().filter(item -> "PANEL".equals(item.getTemplateType())).count();
+        Long countDashboard = contents.stream().filter(item -> "SCREEN".equals(item.getTemplateType())).count();
+        List<TemplateMarketDTO> templateDataV = templateManages.stream().filter(item -> "PANEL".equals(item.getTemplateType())).collect(Collectors.toList());
+        List<TemplateMarketDTO> templateDashboard = templateManages.stream().filter(item -> "SCREEN".equals(item.getTemplateType())).collect(Collectors.toList());
+        if(countDataV<10){
+            Long addItemCount = 10 -countDataV;
+            Long addIndex = templateDataV.size()<addItemCount? templateDataV.size() :addItemCount;
+            contents.addAll(templateDataV.subList(0,addIndex.intValue()));
+        }
+
+        if(countDashboard<10){
+            Long addItemCount = 10 -countDashboard;
+            Long addIndex = templateDashboard.size()<addItemCount? templateDashboard.size() :addItemCount;
+            contents.addAll(templateDashboard.subList(0,addIndex.intValue()));
+        }
+
         return new MarketBaseResponse(url, categoryVO, contents);
     }