HelloGithub/hellogithub
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
cyk
2023-07-05 17:04:43 +08:00
parent 1ad40b6bb0 3ec66be8f7
commit 05658e013e
5 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/hellogithub/dao/projectDao.java
View File

@@ -24,7 +24,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 where periodicals = ? and isValid = 1ORDER BY categoryId"; String sql = "select * from project where periodicals = ? and isValid = 1 ORDER BY categoryId";
projectEntityList = runner.query(conn, sql, new BeanListHandler<>(projectEntity.class), num); projectEntityList = runner.query(conn, sql, new BeanListHandler<>(projectEntity.class), num);
conn.close(); conn.close();
} catch (SQLException e) { } catch (SQLException e) {
@@ -61,7 +61,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 count(*) as num from project where isValid = 1"; 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.getNum(); count = p.getNum();
conn.close(); conn.close();

6
src/com/hellogithub/service/projectService.java
View File

@@ -14,7 +14,7 @@ import java.util.*;
public class projectService { public class projectService {
private projectDao projectDao = new projectDao(); private static projectDao projectDao = new projectDao();
private categoryDao categoryDao = new categoryDao(); private categoryDao categoryDao = new categoryDao();
/** /**
* 按照期刊号查询 * 按照期刊号查询
@@ -27,12 +27,10 @@ public class projectService {
String now =null; String now =null;
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);
categoryEntity categoryEntity = categoryDao.retNum(projectEntity.getCategoryId()); categoryEntity categoryEntity = categoryDao.retNum(projectEntity.getCategoryId());
projectEntity.setCategoryName(categoryEntity.getCategoryName()); projectEntity.setCategoryName(categoryEntity.getCategoryName());
now =projectEntity.getCategoryName(); now =projectEntity.getCategoryName();
if(i == 0) tem = now; if(i == 0) tem = now;
if(!tem.equals(now)){ if(!tem.equals(now)){
tem=now; tem=now;
@@ -40,7 +38,6 @@ public class projectService {
projectEntityListTem = new ArrayList<>(); projectEntityListTem = new ArrayList<>();
} }
projectEntityListTem.add(projectEntity); projectEntityListTem.add(projectEntity);
} }
return JSONObject.toJSONString(dataMap); return JSONObject.toJSONString(dataMap);
@@ -189,4 +186,5 @@ public class projectService {
} }
return JSONObject.toJSONString(projectEntityList); return JSONObject.toJSONString(projectEntityList);
} }
} }

1
src/com/hellogithub/servlet/retLabelServlet.java
View File

@@ -37,7 +37,6 @@ public class retLabelServlet extends HttpServlet {
resp.setHeader("Access-Control-Max-Age", "3600"); 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.setHeader("Access-Control-Allow-Headers", "access-control-allow-origin, authority, content-type, version-info, X-Requested-With");
resp.setContentType("application/json;charset=UTF-8"); resp.setContentType("application/json;charset=UTF-8");
PrintWriter writer = resp.getWriter(); PrintWriter writer = resp.getWriter();
String jsonString = JSONObject.toJSONString(categoryService.retLabel()); String jsonString = JSONObject.toJSONString(categoryService.retLabel());
writer.println(jsonString); writer.println(jsonString);

2
src/com/hellogithub/servlet/selectByInputServlet.java
View File

@@ -22,7 +22,7 @@ public class selectByInputServlet extends HttpServlet {
private com.hellogithub.service.projectService projectService=new projectService(); private com.hellogithub.service.projectService projectService=new projectService();
private UserService userService = new UserService(); private UserService userService = new UserService();
@Override @Override
public void init(ServletConfig config) throws ServletException { public void init(ServletConfig config) throws ServletException{
} }

2
src/com/hellogithub/servlet/selectTermServlet.java
View File

@@ -39,7 +39,7 @@ public class selectTermServlet extends HttpServlet {
resp.setHeader("Access-Control-Allow-Headers", "access-control-allow-origin, authority, content-type, version-info, X-Requested-With"); 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"); resp.setContentType("application/json;charset=UTF-8");
//按照分类返回期刊 //按照分类返回期刊
String num = req.getParameter("id"); String num = req.getParameter("type");
PrintWriter writer = resp.getWriter(); PrintWriter writer = resp.getWriter();
writer.println(projectService.retTerm(num)); writer.println(projectService.retTerm(num));
// setResultOK("123",writer); // setResultOK("123",writer);