Merge remote-tracking branch 'origin/master'
# Conflicts: # src/com/hellogithub/dao/UserDao.java # src/com/hellogithub/dao/projectDao.java # src/com/hellogithub/service/UserService.java # src/com/hellogithub/service/projectService.java # src/com/hellogithub/servlet/selectMostStarServlet.java # src/com/hellogithub/servlet/userNumServlet.java
This commit is contained in:
@@ -4,7 +4,6 @@ import com.hellogithub.entity.userEntity;
|
||||
import com.hellogithub.utils.JdbcUtils;
|
||||
import org.apache.commons.dbutils.QueryRunner;
|
||||
import org.apache.commons.dbutils.handlers.BeanHandler;
|
||||
import org.apache.commons.dbutils.handlers.ScalarHandler;
|
||||
|
||||
import java.sql.*;
|
||||
|
||||
@@ -172,6 +171,24 @@ public class UserDao {
|
||||
return num;
|
||||
}
|
||||
|
||||
/*
|
||||
*
|
||||
* 返回用户总数
|
||||
* */
|
||||
public int queryUserCount(){
|
||||
int num;
|
||||
try {
|
||||
Connection conn = JdbcUtils.getConnection();
|
||||
QueryRunner runner = new QueryRunner();
|
||||
String sql="select count(*) from user";
|
||||
num = runner.query(conn,sql,new BeanHandler<>(Integer.class));
|
||||
} catch (SQLException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
return num;
|
||||
}
|
||||
|
||||
public Long retUserNum(){
|
||||
Long count;
|
||||
try {
|
||||
|
@@ -62,7 +62,7 @@ public class projectDao {
|
||||
try {
|
||||
Connection conn = JdbcUtils.getConnection();
|
||||
QueryRunner runner = new QueryRunner();
|
||||
String sql = "select count(*) from project";
|
||||
String sql = "select count(1) from project";
|
||||
count = runner.query(conn, sql, new BeanHandler<>(Integer.class));
|
||||
conn.close();
|
||||
} catch (SQLException e) {
|
||||
@@ -153,7 +153,4 @@ public class projectDao {
|
||||
return projectEntityList;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@@ -4,8 +4,10 @@ import com.hellogithub.dao.UserDao;
|
||||
import com.hellogithub.dao.projectDao;
|
||||
import com.hellogithub.entity.projectEntity;
|
||||
|
||||
import java.sql.Array;
|
||||
import java.util.*;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class projectService {
|
||||
|
||||
@@ -107,17 +109,76 @@ public class projectService {
|
||||
}
|
||||
return projectEntityList;
|
||||
}
|
||||
/**
|
||||
* 返回根据标签查询最热门的项目
|
||||
* */
|
||||
public List<projectEntity> retSelcetByStar(int cate){
|
||||
if (cate==0){
|
||||
return projectDao.retMostStar();
|
||||
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){
|
||||
projectEntityList =projectDao.retMostStar();
|
||||
for(int i =0;i<projectEntityList.size();i++)
|
||||
{
|
||||
|
||||
projectEntity projectEntity = projectEntityList.get(i);
|
||||
projectEntity.setCategoryName(dataMap.get(projectEntity.getCategoryId()));
|
||||
|
||||
}
|
||||
}else {
|
||||
return projectDao.retSelcetByStartNum(cate);
|
||||
projectEntityList =projectDao.retSelcetByStartNum(cate);
|
||||
|
||||
for(int i =0;i<projectEntityList.size();i++)
|
||||
{
|
||||
|
||||
projectEntity projectEntity = projectEntityList.get(i);
|
||||
projectEntity.setCategoryName(dataMap.get(projectEntity.getCategoryId()));
|
||||
|
||||
}
|
||||
}
|
||||
return projectEntityList;
|
||||
}
|
||||
|
||||
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);
|
||||
for(int i =0;i<projectEntityList.size();i++)
|
||||
{
|
||||
projectEntity projectEntity = projectEntityList.get(i);
|
||||
projectEntity.setCategoryName(dataMap.get(projectEntity.getCategoryId()));
|
||||
|
||||
|
||||
}
|
||||
return projectEntityList;
|
||||
}
|
||||
}
|
73
src/com/hellogithub/servlet/selectByInputServlet.java
Normal file
73
src/com/hellogithub/servlet/selectByInputServlet.java
Normal file
@@ -0,0 +1,73 @@
|
||||
package com.hellogithub.servlet;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.hellogithub.entity.projectEntity;
|
||||
import com.hellogithub.service.projectService;
|
||||
import jakarta.servlet.ServletConfig;
|
||||
import jakarta.servlet.ServletException;
|
||||
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;
|
||||
import java.util.List;
|
||||
|
||||
public class selectByInputServlet extends HttpServlet {
|
||||
private com.hellogithub.service.projectService projectService=new projectService();
|
||||
@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 str = req.getParameter("xxxxx");
|
||||
List<projectEntity> projectEntityList = projectService.selectByInput(str);
|
||||
if(projectEntityList.size() == 0 ){
|
||||
setResultError("查询结果为空",writer);
|
||||
}
|
||||
else{
|
||||
String jsonString = JSONObject.toJSONString(projectEntityList);
|
||||
setResultOK("success",writer);
|
||||
writer.println(jsonString);
|
||||
writer.close();
|
||||
setResultOK("success",writer);
|
||||
}
|
||||
|
||||
}
|
||||
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);
|
||||
}
|
||||
}
|
@@ -11,11 +11,7 @@ import jakarta.servlet.http.HttpServletResponse;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.PrintWriter;
|
||||
/**
|
||||
* 根据标签查询最热门的项目
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
@WebServlet("/selectMostStar")
|
||||
public class selectMostStarServlet extends HttpServlet {
|
||||
private projectService projectService=new projectService();
|
||||
@@ -42,7 +38,8 @@ public class selectMostStarServlet extends HttpServlet {
|
||||
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");
|
||||
|
||||
String cate = req.getParameter("cate");
|
||||
String cate = req.getParameter("num");
|
||||
|
||||
PrintWriter writer = resp.getWriter();
|
||||
String jsonString = JSONObject.toJSONString(projectService.retSelcetByStar(Integer.valueOf(cate)));
|
||||
writer.println(jsonString);
|
||||
|
@@ -5,6 +5,9 @@ import com.hellogithub.dao.UserDao;
|
||||
import jakarta.servlet.ServletConfig;
|
||||
import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.annotation.WebServlet;
|
||||
import com.hellogithub.service.UserService;
|
||||
import jakarta.servlet.ServletConfig;
|
||||
import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.http.HttpServlet;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
@@ -20,12 +23,20 @@ public class userNumServlet extends HttpServlet {
|
||||
@Override
|
||||
public void init(ServletConfig config) throws ServletException {
|
||||
super.init(config);
|
||||
import java.util.HashMap;
|
||||
|
||||
public class userNumServlet extends HttpServlet {
|
||||
private UserService userService = new UserService();
|
||||
@Override
|
||||
public void init(ServletConfig config) throws ServletException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
|
||||
|
||||
doPost(req,resp);
|
||||
doPost(req, resp);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -51,5 +62,33 @@ public class userNumServlet extends HttpServlet {
|
||||
@Override
|
||||
protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
|
||||
super.service(req, resp);
|
||||
int num = userService.queryUserCount();
|
||||
String str= "num:"+num ;
|
||||
String jsonString = JSONObject.toJSONString(str);
|
||||
writer.println(jsonString);
|
||||
if(num == 0)
|
||||
{
|
||||
setResultError("用户总数为空",writer);
|
||||
}else{
|
||||
setResultOK("success",writer);
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user