Merge remote-tracking branch 'origin/master'

This commit is contained in:
sjm
2023-07-02 12:00:51 +08:00
14 changed files with 221 additions and 134 deletions

View File

@@ -17,8 +17,8 @@
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="jdk" jdkName="11" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="libs" level="project" /> <orderEntry type="library" name="libs" level="project" />
</component> </component>
</module> </module>

View File

@@ -11,7 +11,7 @@
Target Server Version : 80031 (8.0.31) Target Server Version : 80031 (8.0.31)
File Encoding : 65001 File Encoding : 65001
Date: 01/07/2023 13:15:25 Date: 02/07/2023 11:09:44
*/ */
SET NAMES utf8mb4; SET NAMES utf8mb4;
@@ -41,7 +41,7 @@ CREATE TABLE `article` (
`articleId` int NOT NULL AUTO_INCREMENT COMMENT '文章ID', `articleId` int NOT NULL AUTO_INCREMENT COMMENT '文章ID',
`userId` int NULL DEFAULT NULL COMMENT '用户ID', `userId` int NULL DEFAULT NULL COMMENT '用户ID',
`articleContent` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '文章内容', `articleContent` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '文章内容',
`publishTime` datetime NULL DEFAULT NULL COMMENT '发布时间', `publishTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布时间',
`isValid` int NULL DEFAULT NULL COMMENT '是否有效', `isValid` int NULL DEFAULT NULL COMMENT '是否有效',
`readCount` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '阅读次数', `readCount` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '阅读次数',
PRIMARY KEY (`articleId`) USING BTREE, PRIMARY KEY (`articleId`) USING BTREE,
@@ -59,31 +59,33 @@ CREATE TABLE `article` (
DROP TABLE IF EXISTS `category`; DROP TABLE IF EXISTS `category`;
CREATE TABLE `category` ( CREATE TABLE `category` (
`categoryId` int NOT NULL AUTO_INCREMENT COMMENT '标签ID', `categoryId` int NOT NULL AUTO_INCREMENT COMMENT '标签ID',
`category` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签内容', `category` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签内容(包含图标)',
`categoryName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称',
`isValid` int NULL DEFAULT NULL COMMENT '是否有效0/1', `isValid` int NULL DEFAULT NULL COMMENT '是否有效0/1',
PRIMARY KEY (`categoryId`) USING BTREE PRIMARY KEY (`categoryId`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 18 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '标签表' ROW_FORMAT = DYNAMIC; ) ENGINE = InnoDB AUTO_INCREMENT = 19 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '标签表' ROW_FORMAT = DYNAMIC;
-- ---------------------------- -- ----------------------------
-- Records of category -- Records of category
-- ---------------------------- -- ----------------------------
INSERT INTO `category` VALUES (1, 'C', 1); INSERT INTO `category` VALUES (0, '<i class=\"el-icon-discover\" style=\"margin-right: 10px\"></i> 综合', '综合', NULL);
INSERT INTO `category` VALUES (2, 'C#', 1); INSERT INTO `category` VALUES (1, '<i class=\"el-ico-alicyuyan\" style=\"margin-right: 10px\"></i> C', 'C', 1);
INSERT INTO `category` VALUES (3, 'C++', 1); INSERT INTO `category` VALUES (2, '<i class=\"el-ico-aliCyuyan\" style=\"margin-right: 10px\"></i> C#', 'C#', 1);
INSERT INTO `category` VALUES (4, 'CSS', 1); INSERT INTO `category` VALUES (3, '<i class=\"el-ico-alicyuyan\" style=\"margin-right: 10px\"></i> C++', 'C++', 1);
INSERT INTO `category` VALUES (5, 'Go', 1); INSERT INTO `category` VALUES (4, '<i class=\"el-ico-alicss3\" style=\"margin-right: 10px\"></i> CSS', 'CSS', 1);
INSERT INTO `category` VALUES (6, 'Java', 1); INSERT INTO `category` VALUES (5, '<i class=\"el-ico-aliGoyuyan\" style=\"margin-right: 10px\"></i> Go', 'Go', 1);
INSERT INTO `category` VALUES (7, 'JavaScript', 1); INSERT INTO `category` VALUES (6, '<i class=\"el-ico-alijava\" style=\"margin-right: 10px\"></i> Java', 'Java', 1);
INSERT INTO `category` VALUES (8, 'Kotlin', 1); INSERT INTO `category` VALUES (7, '<i class=\"el-ico-alioutline-java-script\" style=\"margin-right: 10px\"></i> JavaScript', 'JavaScript', 1);
INSERT INTO `category` VALUES (9, 'Objective-C', 1); INSERT INTO `category` VALUES (8, '<i class=\"el-ico-alikotlin\" style=\"margin-right: 10px\"></i> Kotlin', 'Kotlin', 1);
INSERT INTO `category` VALUES (10, 'PHP', 1); INSERT INTO `category` VALUES (9, '<i class=\"el-ico-alicyuyan\" style=\"margin-right: 10px\"></i> ObjectiveC', 'Objective-C', 1);
INSERT INTO `category` VALUES (11, 'python', 1); INSERT INTO `category` VALUES (10, '<i class=\"el-ico-aliphp\" style=\"margin-right: 10px\"></i> PHP', 'PHP', 1);
INSERT INTO `category` VALUES (12, 'Ruby', 1); INSERT INTO `category` VALUES (11, '<i class=\"el-ico-aliPython\" style=\"margin-right: 10px\"></i> python', 'python', 1);
INSERT INTO `category` VALUES (13, 'Rust', 1); INSERT INTO `category` VALUES (12, '<i class=\"el-ico-aliRubyyuyan\" style=\"margin-right: 10px\"></i> Ruby', 'Ruby', 1);
INSERT INTO `category` VALUES (14, 'Swift', 1); INSERT INTO `category` VALUES (13, '<i class=\"el-ico-alirust\" style=\"margin-right: 10px\"></i> Rust', 'Rust', 1);
INSERT INTO `category` VALUES (15, 'Other', 1); INSERT INTO `category` VALUES (14, '<i class=\"el-ico-aliswift\" style=\"margin-right: 10px\"></i> Swift', 'Swift', 1);
INSERT INTO `category` VALUES (16, '开源书籍', 1); INSERT INTO `category` VALUES (15, '<i class=\"el-icon-s-help\" style=\"margin-right: 10px\"></i> Other', 'Other', 1);
INSERT INTO `category` VALUES (17, '机器学习', 1); INSERT INTO `category` VALUES (16, '<i class=\"el-ico-alitushu\" style=\"margin-right: 10px\"></i> 开源书籍', '开源书籍', 1);
INSERT INTO `category` VALUES (17, '<i class=\"el-ico-alijiqixuexi___\" style=\"margin-right: 10px\"></i> 机器学习', '机器学习', 1);
-- ---------------------------- -- ----------------------------
-- Table structure for comment -- Table structure for comment
@@ -95,7 +97,7 @@ CREATE TABLE `comment` (
`projectId` int NULL DEFAULT NULL COMMENT '项目ID', `projectId` int NULL DEFAULT NULL COMMENT '项目ID',
`content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '评论内容', `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '评论内容',
`isUsed` int NULL DEFAULT NULL COMMENT '是否使用过', `isUsed` int NULL DEFAULT NULL COMMENT '是否使用过',
`commentTime` datetime NULL DEFAULT NULL COMMENT '评论时间', `commentTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评论时间',
`isValid` int NULL DEFAULT NULL COMMENT '是否有效', `isValid` int NULL DEFAULT NULL COMMENT '是否有效',
PRIMARY KEY (`commentId`) USING BTREE, PRIMARY KEY (`commentId`) USING BTREE,
INDEX `userId_comment`(`userId` ASC) USING BTREE, INDEX `userId_comment`(`userId` ASC) USING BTREE,
@@ -172,7 +174,7 @@ CREATE TABLE `user` (
`userId` int NOT NULL AUTO_INCREMENT COMMENT '用户ID', `userId` int NOT NULL AUTO_INCREMENT COMMENT '用户ID',
`userName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户名', `userName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户名',
`userPassword` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '密码', `userPassword` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '密码',
`creatTime` datetime NULL DEFAULT NULL COMMENT '创建时间', `creatTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建时间',
`isValid` int NULL DEFAULT NULL COMMENT '是否有效(0/1)', `isValid` int NULL DEFAULT NULL COMMENT '是否有效(0/1)',
`projectNum` int NULL DEFAULT NULL COMMENT '提交的项目总数', `projectNum` int NULL DEFAULT NULL COMMENT '提交的项目总数',
`searchHistory` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '搜索历史', `searchHistory` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '搜索历史',

View File

@@ -0,0 +1,44 @@
package com.hellogithub.dao;
import com.hellogithub.entity.categoryEntity;
import com.hellogithub.entity.projectEntity;
import com.hellogithub.utils.JdbcUtils;
import org.apache.commons.dbutils.QueryRunner;
import org.apache.commons.dbutils.handlers.BeanHandler;
import org.apache.commons.dbutils.handlers.BeanListHandler;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
public class categoryDao {
//返回所有标签
public List<categoryEntity> retLabel() {
List<categoryEntity> categoryEntity;
try {
Connection conn = JdbcUtils.getConnection();
QueryRunner runner = new QueryRunner();
String sql = "select * from category ";
categoryEntity = runner.query(conn, sql, new BeanListHandler<>(categoryEntity.class));
conn.close();
} catch (SQLException e) {
throw new RuntimeException(e);
}
return categoryEntity;
}
//发送Id找中文名字
public categoryEntity retNum(int id ) {
categoryEntity categoryEntity;
try {
Connection conn = JdbcUtils.getConnection();
QueryRunner runner = new QueryRunner();
String sql = "select * from category where categoryId=?";
categoryEntity = runner.query(conn, sql, new BeanHandler<>(categoryEntity.class),id);
conn.close();
} catch (SQLException e) {
throw new RuntimeException(e);
}
return categoryEntity;
}
}

View File

@@ -41,7 +41,7 @@ public class projectDao {
try { try {
Connection conn = JdbcUtils.getConnection(); Connection conn = JdbcUtils.getConnection();
QueryRunner runner = new QueryRunner(); QueryRunner runner = new QueryRunner();
String sql = "select * from project Group BY periodicals DESC limit 1"; String sql = "select * from project Order BY periodicals DESC limit 1";
projectEntity = runner.query(conn, sql, new BeanHandler<>(projectEntity.class)); projectEntity = runner.query(conn, sql, new BeanHandler<>(projectEntity.class));
conn.close(); conn.close();
} catch (SQLException e) { } catch (SQLException e) {
@@ -54,15 +54,15 @@ public class projectDao {
* *
* *
*/ */
public int countAll() { public long countAll() {
int count; long count;
projectEntity p; projectEntity p;
try { try {
Connection conn = JdbcUtils.getConnection(); Connection conn = JdbcUtils.getConnection();
QueryRunner runner = new QueryRunner(); QueryRunner runner = new QueryRunner();
String sql = "select count(*) as projectId from project"; String sql = "select count(*) as num from project";
p = runner.query(conn, sql, new BeanHandler<>(projectEntity.class)); p = runner.query(conn, sql, new BeanHandler<>(projectEntity.class));
count = p.getProjectId(); count = p.getNum();
conn.close(); conn.close();
} catch (SQLException e) { } catch (SQLException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
@@ -101,13 +101,13 @@ public class projectDao {
} }
return projectEntityList; return projectEntityList;
} }
public List<projectEntity> retSelcetByCate(int cateid){ public List<projectEntity> retSelcetByCate(int cateid,String name){
List<projectEntity> projectEntityList; List<projectEntity> projectEntityList;
try { try {
Connection conn = JdbcUtils.getConnection(); Connection conn = JdbcUtils.getConnection();
QueryRunner runner = new QueryRunner(); QueryRunner runner = new QueryRunner();
String sql = "select * from project where projectId in (select projectId from project_category where categoryId=?)"; String sql = "select * from project where projectId in (select projectId from project_category where categoryId in(select categoryId from category where categoryName = ?))";
projectEntityList = runner.query(conn, sql, new BeanListHandler<>(projectEntity.class),cateid); projectEntityList = runner.query(conn, sql, new BeanListHandler<>(projectEntity.class),name);
conn.close(); conn.close();
} catch (SQLException e) { } catch (SQLException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
@@ -115,13 +115,13 @@ public class projectDao {
return projectEntityList; return projectEntityList;
} }
public List<projectEntity> retSelcetByStartNum(int cateid){ public List<projectEntity> retSelcetByStartNum(int cateid,String name){
List<projectEntity> projectEntityList; List<projectEntity> projectEntityList;
try { try {
Connection conn = JdbcUtils.getConnection(); Connection conn = JdbcUtils.getConnection();
QueryRunner runner = new QueryRunner(); QueryRunner runner = new QueryRunner();
String sql = "select * from project where projectId in (select projectId from project_category where categoryId=?) order by lookCount desc"; String sql = "select * from project where projectId in (select projectId from project_category where categoryId in(select categoryId from category where categoryName = ?)) order by lookCount desc";
projectEntityList = runner.query(conn, sql, new BeanListHandler<>(projectEntity.class),cateid); projectEntityList = runner.query(conn, sql, new BeanListHandler<>(projectEntity.class),name);
conn.close(); conn.close();
} catch (SQLException e) { } catch (SQLException e) {
throw new RuntimeException(e); throw new RuntimeException(e);

View File

@@ -29,4 +29,14 @@ public class categoryEntity {
} }
int isValid; int isValid;
String categoryName;
public String getCategoryName() {
return categoryName;
}
public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
}
} }

View File

@@ -141,4 +141,14 @@ public class projectEntity {
public void setCategoryName(String categoryName) { public void setCategoryName(String categoryName) {
this.categoryName = categoryName; this.categoryName = categoryName;
} }
long num=0;
public long getNum() {
return num;
}
public void setNum(long num) {
this.num = num;
}
} }

View File

@@ -0,0 +1,16 @@
package com.hellogithub.service;
import com.hellogithub.dao.projectDao;
import com.hellogithub.dao.categoryDao;
import com.hellogithub.entity.categoryEntity;
import java.util.List;
public class categoryService {
private categoryDao categoryDao = new categoryDao();
public List<categoryEntity> retLabel() {return categoryDao.retLabel();}
public categoryEntity retNum(int id ){return categoryDao.retNum(id);}
}

View File

@@ -1,47 +1,30 @@
package com.hellogithub.service; package com.hellogithub.service;
import com.hellogithub.dao.UserDao;
import com.hellogithub.dao.projectDao;
import com.hellogithub.entity.projectEntity;
import java.util.HashMap; import com.hellogithub.dao.categoryDao;
import java.util.Iterator; import com.hellogithub.dao.projectDao;
import com.hellogithub.entity.categoryEntity;
import com.hellogithub.entity.projectEntity;
import java.util.List; import java.util.List;
import java.util.Map;
public class projectService { public class projectService {
private projectDao projectDao = new projectDao(); private projectDao projectDao = new projectDao();
private categoryDao categoryDao = new categoryDao();
/** /**
* 按照期刊号查询 * 按照期刊号查询
* *
* @param num * @param num
*/ */
public List<projectEntity> retTerm(String 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); List<projectEntity> projectEntityList = projectDao.retTerm(num);
for(int i =0;i<projectEntityList.size();i++) for(int i =0;i<projectEntityList.size();i++)
{ {
projectEntity projectEntity = projectEntityList.get(i); projectEntity projectEntity = projectEntityList.get(i);
projectEntity.setCategoryName(dataMap.get(projectEntity.getCategoryId())); categoryEntity categoryEntity = categoryDao.retNum(projectEntity.getCategoryId());
projectEntity.setCategoryName(categoryEntity.getCategoryName());
} }
return projectDao.retTerm(num); return projectDao.retTerm(num);
@@ -59,7 +42,7 @@ public class projectService {
* *
* *
*/ */
public int countAll() {return projectDao.countAll();} public long countAll() {return projectDao.countAll();}
/** /**
* 按照分类检索项目 * 按照分类检索项目
* *
@@ -69,65 +52,32 @@ public class projectService {
return projectDao.retCate(num); return projectDao.retCate(num);
} }
public List<projectEntity> retLatestProject(int cate) { public List<projectEntity> retLatestProject(int cate,String name) {
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; List<projectEntity> projectEntityList;
if (cate == 0) { if (cate == 0) {
projectEntityList =projectDao.retLatestProject(); projectEntityList =projectDao.retLatestProject();
for(int i =0;i<projectEntityList.size();i++) for(int i =0;i<projectEntityList.size();i++)
{ {
projectEntity projectEntity = projectEntityList.get(i); projectEntity projectEntity = projectEntityList.get(i);
projectEntity.setCategoryName(dataMap.get(projectEntity.getCategoryId())); categoryEntity categoryEntity = categoryDao.retNum(projectEntity.getCategoryId());
projectEntity.setCategoryName(categoryEntity.getCategoryName());
} }
} else { } else {
projectEntityList =projectDao.retSelcetByCate(cate); projectEntityList =projectDao.retSelcetByCate(cate,name);
for(int i =0;i<projectEntityList.size();i++) for(int i =0;i<projectEntityList.size();i++)
{ {
projectEntity projectEntity = projectEntityList.get(i); projectEntity projectEntity = projectEntityList.get(i);
projectEntity.setCategoryName(dataMap.get(projectEntity.getCategoryId())); categoryEntity categoryEntity = categoryDao.retNum(projectEntity.getCategoryId());
projectEntity.setCategoryName(categoryEntity.getCategoryName());
} }
} }
return projectEntityList; return projectEntityList;
} }
public List<projectEntity> retSelcetByStar(int cate){ public List<projectEntity> retSelcetByStar(int cate,String name){
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; List<projectEntity> projectEntityList;
if (cate == 0){ if (cate == 0){
@@ -136,47 +86,32 @@ public class projectService {
{ {
projectEntity projectEntity = projectEntityList.get(i); projectEntity projectEntity = projectEntityList.get(i);
projectEntity.setCategoryName(dataMap.get(projectEntity.getCategoryId())); categoryEntity categoryEntity = categoryDao.retNum(projectEntity.getCategoryId());
projectEntity.setCategoryName(categoryEntity.getCategoryName());
} }
}else { }else {
projectEntityList =projectDao.retSelcetByStartNum(cate); projectEntityList =projectDao.retSelcetByStartNum(cate,name);
for(int i =0;i<projectEntityList.size();i++) for(int i =0;i<projectEntityList.size();i++)
{ {
projectEntity projectEntity = projectEntityList.get(i); projectEntity projectEntity = projectEntityList.get(i);
projectEntity.setCategoryName(dataMap.get(projectEntity.getCategoryId())); categoryEntity categoryEntity = categoryDao.retNum(projectEntity.getCategoryId());
projectEntity.setCategoryName(categoryEntity.getCategoryName());
} }
} }
return projectEntityList; return projectEntityList;
} }
public List<projectEntity> selectByInput(String str){ public List<projectEntity> selectByInput(String str){
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.selectByInput(str); List<projectEntity> projectEntityList = projectDao.selectByInput(str);
for(int i =0;i<projectEntityList.size();i++) for(int i =0;i<projectEntityList.size();i++)
{ {
projectEntity projectEntity = projectEntityList.get(i); projectEntity projectEntity = projectEntityList.get(i);
projectEntity.setCategoryName(dataMap.get(projectEntity.getCategoryId())); categoryEntity categoryEntity = categoryDao.retNum(projectEntity.getCategoryId());
projectEntity.setCategoryName(categoryEntity.getCategoryName());
} }
return projectEntityList; return projectEntityList;

View File

@@ -12,6 +12,7 @@ import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
//项目总数接口
@WebServlet("/countNum") @WebServlet("/countNum")
public class countNumServlet extends HttpServlet { public class countNumServlet extends HttpServlet {
private projectService projectService=new projectService(); private projectService projectService=new projectService();
@@ -39,9 +40,10 @@ public class countNumServlet extends HttpServlet {
resp.setContentType("application/json;charset=UTF-8"); resp.setContentType("application/json;charset=UTF-8");
PrintWriter writer = resp.getWriter(); PrintWriter writer = resp.getWriter();
String str= "num:"+projectService.countAll(); String str= String.valueOf(projectService.countAll());
String jsonString = JSONObject.toJSONString(str); String jsonString = JSONObject.toJSONString(str);
writer.println(jsonString); writer.println(jsonString);
writer.close(); writer.close();
} }
} }

View File

@@ -19,7 +19,7 @@ public class latestServlet extends HttpServlet {
private com.hellogithub.service.projectService projectService=new projectService(); private com.hellogithub.service.projectService projectService=new projectService();
@Override @Override
public void init(ServletConfig config) throws ServletException { public void init(ServletConfig config) throws ServletException {
super.init(config);
} }
@Override @Override
@@ -42,7 +42,7 @@ public class latestServlet extends HttpServlet {
//返回最新期刊数字 //返回最新期刊数字
PrintWriter writer = resp.getWriter(); PrintWriter writer = resp.getWriter();
String jsonString = JSONObject.toJSONString(projectService.latestNum()); String jsonString = JSONObject.toJSONString(projectService.latestNum());
setResultOK("success",writer); // setResultOK("success",writer);
writer.println(jsonString); writer.println(jsonString);
writer.close(); writer.close();
} }
@@ -63,5 +63,10 @@ public class latestServlet extends HttpServlet {
public void setResultOK(String msg, PrintWriter writer) { public void setResultOK(String msg, PrintWriter writer) {
setResult(200, msg, writer); setResult(200, msg, writer);
} }
@Override
public void destroy() {
super.destroy();
}
} }

View File

@@ -0,0 +1,62 @@
package com.hellogithub.servlet;
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;
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
public void init(ServletConfig config) throws ServletException {
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
doPost(req, resp);
}
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
resp.setCharacterEncoding("UTF-8");
resp.setContentType("text/html; charset=utf-8");
// 设置响应头允许ajax跨域访问
String curOrigin = req.getHeader("Origin");
resp.setHeader("Access-Control-Allow-Origin", curOrigin == null ? "true" : curOrigin);
resp.setHeader("Access-Control-Allow-Credentials", "true");
resp.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, HEAD");
resp.setHeader("Access-Control-Max-Age", "3600");
resp.setHeader("Access-Control-Allow-Headers", "access-control-allow-origin, authority, content-type, version-info, X-Requested-With");
resp.setContentType("application/json;charset=UTF-8");
PrintWriter writer = resp.getWriter();
String jsonString = JSONObject.toJSONString(categoryService.retLabel());
writer.println(jsonString);
writer.close();
}
public void setResult(Integer code, String msg, PrintWriter writer) {
HashMap<String, Object> result = new HashMap<>();
result.put("code", code);
result.put("msg", msg);
String jsonString = JSONObject.toJSONString(result);
writer.println(jsonString);
writer.close();
}
public void setResultError(String msg, PrintWriter writer) {
setResult(500, msg, writer);
}
public void setResultOK(String msg, PrintWriter writer) {
setResult(200, msg, writer);
}
}

View File

@@ -43,8 +43,9 @@ public class selectLastByCateServlet extends HttpServlet {
resp.setContentType("application/json;charset=UTF-8"); resp.setContentType("application/json;charset=UTF-8");
String cate = req.getParameter("num"); String cate = req.getParameter("num");
String name = req.getParameter("name");
PrintWriter writer = resp.getWriter(); 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.println(jsonString);
writer.close(); writer.close();
} }

View File

@@ -39,9 +39,9 @@ public class selectMostStarServlet extends HttpServlet {
resp.setContentType("application/json;charset=UTF-8"); resp.setContentType("application/json;charset=UTF-8");
String cate = req.getParameter("num"); String cate = req.getParameter("num");
String name =req.getParameter("name");
PrintWriter writer = resp.getWriter(); 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.println(jsonString);
writer.close(); writer.close();
} }

View File

@@ -11,7 +11,7 @@
<title>$Title$</title> <title>$Title$</title>
</head> </head>
<body> <body>
你说的对但是hellogithub是一个.... 你说的对但是hellogithub是一个....<br>
<a></a> <a href="http://localhost:8080/#/home">主页</a>
</body> </body>
</html> </html>