From 3d3326482c5ce18b8b969efa2e69c7318e16f710 Mon Sep 17 00:00:00 2001
From: User_cyk <1020691186@qq.com>
Date: Fri, 30 Jun 2023 23:45:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=94=B9=E6=88=90=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/hellogithub/entity/projectEntity.java | 10 +++
 .../hellogithub/service/projectService.java   | 76 ++++++++++++++++++-
 2 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/src/com/hellogithub/entity/projectEntity.java b/src/com/hellogithub/entity/projectEntity.java
index 46f14de..7642e03 100644
--- a/src/com/hellogithub/entity/projectEntity.java
+++ b/src/com/hellogithub/entity/projectEntity.java
@@ -131,4 +131,14 @@ public class projectEntity {
     public void setLookCount(Integer lookCount) {
         this.lookCount = lookCount;
     }
+    //多余字段
+    String categoryName;
+
+    public String getCategoryName() {
+        return categoryName;
+    }
+
+    public void setCategoryName(String categoryName) {
+        this.categoryName = categoryName;
+    }
 }
diff --git a/src/com/hellogithub/service/projectService.java b/src/com/hellogithub/service/projectService.java
index 2ccae54..36652f8 100644
--- a/src/com/hellogithub/service/projectService.java
+++ b/src/com/hellogithub/service/projectService.java
@@ -4,16 +4,50 @@ import com.hellogithub.dao.UserDao;
 import com.hellogithub.dao.projectDao;
 import com.hellogithub.entity.projectEntity;
 
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 public class projectService {
+
+
     private projectDao projectDao = new projectDao();
     /**
      * 按照期刊号查询
      *
      * @param num
      */
-    public List<projectEntity> retTerm(String num){return projectDao.retTerm(num);}
+    public List<projectEntity> retTerm(String num){
+        Map<Integer,String> dataMap=new HashMap<>();
+        dataMap.put(1,"C项目");
+        dataMap.put(2,"C#项目");
+        dataMap.put(3,"C++项目");
+        dataMap.put(4,"CSS项目");
+        dataMap.put(5,"Go项目");
+        dataMap.put(6,"Java项目");
+        dataMap.put(7,"Javascript项目");
+        dataMap.put(8,"Kotlin项目");
+        dataMap.put(9,"Obejctive-C项目");
+        dataMap.put(10,"PHP项目");
+        dataMap.put(11,"Python项目");
+        dataMap.put(12,"Ruby项目");
+        dataMap.put(13,"Rust项目");
+        dataMap.put(14,"Swift项目");
+        dataMap.put(15,"其他");
+        dataMap.put(16,"开源书籍");
+        dataMap.put(17,"机器学习");
+        List<projectEntity> projectEntityList = projectDao.retTerm(num);
+        for(int i =0;i<projectEntityList.size();i++)
+        {
+            projectEntity projectEntity = projectEntityList.get(i);
+            projectEntity.setCategoryName(dataMap.get(projectEntity.getProjectId()));
+
+        }
+        return projectDao.retTerm(num);
+
+
+    }
     /**
      * 返回最新期刊数字
      *
@@ -36,11 +70,45 @@ public class projectService {
     }
 
     public List<projectEntity> retLatestProject(int cate) {
+        Map<Integer,String> dataMap=new HashMap<>();
+        dataMap.put(1,"C项目");
+        dataMap.put(2,"C#项目");
+        dataMap.put(3,"C++项目");
+        dataMap.put(4,"CSS项目");
+        dataMap.put(5,"Go项目");
+        dataMap.put(6,"Java项目");
+        dataMap.put(7,"Javascript项目");
+        dataMap.put(8,"Kotlin项目");
+        dataMap.put(9,"Obejctive-C项目");
+        dataMap.put(10,"PHP项目");
+        dataMap.put(11,"Python项目");
+        dataMap.put(12,"Ruby项目");
+        dataMap.put(13,"Rust项目");
+        dataMap.put(14,"Swift项目");
+        dataMap.put(15,"其他");
+        dataMap.put(16,"开源书籍");
+        dataMap.put(17,"机器学习");
+        List<projectEntity> projectEntityList;
         if (cate == 0) {
-            return projectDao.retLatestProject();
+            projectEntityList =projectDao.retLatestProject();
+            for(int i =0;i<projectEntityList.size();i++)
+            {
+                projectEntity projectEntity = projectEntityList.get(i);
+                projectEntity.setCategoryName(dataMap.get(projectEntity.getProjectId()));
+
+            }
         } else {
-            return projectDao.retSelcetByCate(cate);
-        }}
+            projectEntityList =projectDao.retSelcetByCate(cate);
+            for(int i =0;i<projectEntityList.size();i++)
+            {
+                projectEntity projectEntity = projectEntityList.get(i);
+                projectEntity.setCategoryName(dataMap.get(projectEntity.getProjectId()));
+
+            }
+
+        }
+        return projectEntityList;
+    }
     public List<projectEntity> retSelcetByStar(int cate){
         if (cate==0){
             return projectDao.retMostStar();