From 3c1f800884faa256b541b0f5c77db9c215155fa0 Mon Sep 17 00:00:00 2001
From: User_cyk <1020691186@qq.com>
Date: Tue, 4 Jul 2023 10:59:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=8F=E6=9C=BA=E6=8E=A8?=
 =?UTF-8?q?=E8=8D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/hellogithub/dao/projectDao.java         | 16 ----------------
 src/com/hellogithub/service/projectService.java | 15 +++++++++++----
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/com/hellogithub/dao/projectDao.java b/src/com/hellogithub/dao/projectDao.java
index 376e097..559d669 100644
--- a/src/com/hellogithub/dao/projectDao.java
+++ b/src/com/hellogithub/dao/projectDao.java
@@ -156,22 +156,6 @@ public class projectDao {
         }
         return projectEntityList;
     }
-//    //返回标签
-//    public List<> retAllLabelBy(String str) {
-//        List<projectEntity> projectEntityList;
-//        try {
-//            Connection conn = JdbcUtils.getConnection();
-//            QueryRunner runner = new QueryRunner();
-//            String sql = "SELECT * FROM project WHERE projectName LIKE %?%";
-//            projectEntityList = runner.query(conn, sql, new BeanListHandler<>(projectEntity.class), str);
-//            conn.close();
-//        } catch (SQLException e) {
-//            throw new RuntimeException(e);
-//        }
-//        return ;
-//    }
-
-
     /**
      * 根据项目ID返回项目所有内容
      */
diff --git a/src/com/hellogithub/service/projectService.java b/src/com/hellogithub/service/projectService.java
index 87de785..bcdba5a 100644
--- a/src/com/hellogithub/service/projectService.java
+++ b/src/com/hellogithub/service/projectService.java
@@ -18,8 +18,6 @@ public class projectService {
     private categoryDao categoryDao = new categoryDao();
     /**
      * 按照期刊号查询
-     *
-     * @param num
      */
     public String retTerm(String num){
         List<projectEntity> projectEntityList = projectDao.retTerm(num);
@@ -162,13 +160,22 @@ public class projectService {
         long t = System.currentTimeMillis();
         Random random = new Random(t);
         List<projectEntity> projectEntityList1 = projectDao.retLatestProject();
-        for(int i=0;i<5;i++)
+        Set<Integer> integers =new HashSet<>();
+        while(integers.size()<5){
+            int num = random.nextInt(projectEntityList1.size());
+            integers.add(num);
+        }
+        Iterator<Integer> it = integers.iterator();
+        while(it.hasNext())
         {
-            projectEntity projectEntity =projectEntityList1.get(random.nextInt(projectEntityList1.size()));
+            int id = it.next();
+            projectEntity projectEntity =projectEntityList1.get(id);
             categoryEntity categoryEntity = categoryDao.retNum(projectEntity.getCategoryId());
             projectEntity.setCategoryName(categoryEntity.getCategoryName());
             projectEntityList.add(projectEntity);
+            System.out.println(id);
         }
+
         return projectEntityList;
     }
 }
\ No newline at end of file