From 552287dcaef7c9d846f0a1738ff81a7889203c1d Mon Sep 17 00:00:00 2001
From: User_cyk <1020691186@qq.com>
Date: Sun, 2 Jul 2023 10:40:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/hellogithub/dao/projectDao.java              | 12 ++++++------
 src/com/hellogithub/service/projectService.java      |  8 ++++----
 src/com/hellogithub/servlet/retLabelServlet.java     |  3 ++-
 .../hellogithub/servlet/selectLastByCateServlet.java |  3 ++-
 .../hellogithub/servlet/selectMostStarServlet.java   |  4 ++--
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/com/hellogithub/dao/projectDao.java b/src/com/hellogithub/dao/projectDao.java
index 880decd..2669cb8 100644
--- a/src/com/hellogithub/dao/projectDao.java
+++ b/src/com/hellogithub/dao/projectDao.java
@@ -101,13 +101,13 @@ public class projectDao {
         }
         return projectEntityList;
     }
-    public List<projectEntity> retSelcetByCate(int cateid){
+    public List<projectEntity> retSelcetByCate(int cateid,String name){
         List<projectEntity> projectEntityList;
         try {
             Connection conn = JdbcUtils.getConnection();
             QueryRunner runner = new QueryRunner();
-            String sql = "select * from project where projectId in (select projectId from project_category where categoryId=?)";
-            projectEntityList = runner.query(conn, sql, new BeanListHandler<>(projectEntity.class),cateid);
+            String sql = "select * from project where projectId in (select projectId from project_category where category in(select categoryId from categoty where categoryName = ?))";
+            projectEntityList = runner.query(conn, sql, new BeanListHandler<>(projectEntity.class),name);
             conn.close();
         } catch (SQLException e) {
             throw new RuntimeException(e);
@@ -115,13 +115,13 @@ public class projectDao {
         return projectEntityList;
     }
 
-    public List<projectEntity> retSelcetByStartNum(int cateid){
+    public List<projectEntity> retSelcetByStartNum(int cateid,String name){
         List<projectEntity> projectEntityList;
         try {
             Connection conn = JdbcUtils.getConnection();
             QueryRunner runner = new QueryRunner();
-            String sql = "select * from project where projectId in (select projectId from project_category where categoryId=?) order by lookCount desc";
-            projectEntityList = runner.query(conn, sql, new BeanListHandler<>(projectEntity.class),cateid);
+            String sql = "select * from project where projectId in (select projectId from project_category where categoryId in(select categoryId from categoty where categoryName = ?)) order by lookCount desc";
+            projectEntityList = runner.query(conn, sql, new BeanListHandler<>(projectEntity.class),name);
             conn.close();
         } catch (SQLException e) {
             throw new RuntimeException(e);
diff --git a/src/com/hellogithub/service/projectService.java b/src/com/hellogithub/service/projectService.java
index 1b31960..0b8d572 100644
--- a/src/com/hellogithub/service/projectService.java
+++ b/src/com/hellogithub/service/projectService.java
@@ -52,7 +52,7 @@ public class projectService {
         return projectDao.retCate(num);
     }
 
-    public List<projectEntity> retLatestProject(int cate) {
+    public List<projectEntity> retLatestProject(int cate,String name) {
         List<projectEntity> projectEntityList;
         if (cate == 0) {
             projectEntityList =projectDao.retLatestProject();
@@ -64,7 +64,7 @@ public class projectService {
 
             }
         } else {
-            projectEntityList =projectDao.retSelcetByCate(cate);
+            projectEntityList =projectDao.retSelcetByCate(cate,name);
             for(int i =0;i<projectEntityList.size();i++)
             {
                 projectEntity projectEntity = projectEntityList.get(i);
@@ -76,7 +76,7 @@ public class projectService {
         }
         return projectEntityList;
     }
-    public List<projectEntity> retSelcetByStar(int cate){
+    public List<projectEntity> retSelcetByStar(int cate,String name){
 
         List<projectEntity> projectEntityList;
 
@@ -91,7 +91,7 @@ public class projectService {
 
             }
         }else {
-            projectEntityList =projectDao.retSelcetByStartNum(cate);
+            projectEntityList =projectDao.retSelcetByStartNum(cate,name);
 
             for(int i =0;i<projectEntityList.size();i++)
             {
diff --git a/src/com/hellogithub/servlet/retLabelServlet.java b/src/com/hellogithub/servlet/retLabelServlet.java
index 16143b4..c575cc3 100644
--- a/src/com/hellogithub/servlet/retLabelServlet.java
+++ b/src/com/hellogithub/servlet/retLabelServlet.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.hellogithub.service.categoryService;
 import jakarta.servlet.ServletConfig;
 import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -11,7 +12,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.HashMap;
-
+@WebServlet("/retLabel")
 public class retLabelServlet extends HttpServlet {
     private  categoryService categoryService=new categoryService();
     @Override
diff --git a/src/com/hellogithub/servlet/selectLastByCateServlet.java b/src/com/hellogithub/servlet/selectLastByCateServlet.java
index 49a2f35..da255c5 100644
--- a/src/com/hellogithub/servlet/selectLastByCateServlet.java
+++ b/src/com/hellogithub/servlet/selectLastByCateServlet.java
@@ -43,8 +43,9 @@ public class selectLastByCateServlet extends HttpServlet {
         resp.setContentType("application/json;charset=UTF-8");
 
         String cate = req.getParameter("num");
+        String name = req.getParameter("name");
         PrintWriter writer = resp.getWriter();
-        String jsonString = JSONObject.toJSONString(projectService.retLatestProject(Integer.valueOf(cate)));
+        String jsonString = JSONObject.toJSONString(projectService.retLatestProject(Integer.valueOf(cate),name));
         writer.println(jsonString);
         writer.close();
     }
diff --git a/src/com/hellogithub/servlet/selectMostStarServlet.java b/src/com/hellogithub/servlet/selectMostStarServlet.java
index eb4c9ab..cb77022 100644
--- a/src/com/hellogithub/servlet/selectMostStarServlet.java
+++ b/src/com/hellogithub/servlet/selectMostStarServlet.java
@@ -39,9 +39,9 @@ public class selectMostStarServlet extends HttpServlet {
         resp.setContentType("application/json;charset=UTF-8");
 
         String cate = req.getParameter("num");
-
+        String name =req.getParameter("name");
         PrintWriter writer = resp.getWriter();
-        String jsonString = JSONObject.toJSONString(projectService.retSelcetByStar(Integer.valueOf(cate)));
+        String jsonString = JSONObject.toJSONString(projectService.retSelcetByStar(Integer.valueOf(cate), name));
         writer.println(jsonString);
         writer.close();
     }