Skip to content

Commit c2db6b4

Browse files
cppcppcppcpp
committed
首页功能完善+jUnit单元测试
1 parent 40d4388 commit c2db6b4

File tree

12 files changed

+117
-12
lines changed

12 files changed

+117
-12
lines changed

‎pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@
9696
<version>2.8.5</version>
9797
</dependency>
9898

99+
<dependency>
100+
<groupId>org.springframework</groupId>
101+
<artifactId>spring-test</artifactId>
102+
<version>4.3.8.RELEASE</version>
103+
</dependency>
99104

100105
<!-- https://mvnrepository.com/artifact/junit/junit -->
101106
<dependency>

‎src/main/java/com/njxz/exam/controller/HomeController.java

Lines changed: 55 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package com.njxz.exam.controller;
22

3+
import java.text.SimpleDateFormat;
4+
import java.util.ArrayList;
35
import java.util.Date;
6+
import java.util.HashMap;
47
import java.util.List;
8+
import java.util.Map;
59

610
import javax.servlet.http.HttpSession;
711
import javax.validation.Valid;
@@ -15,7 +19,11 @@
1519
import org.springframework.web.bind.annotation.RequestMapping;
1620
import org.springframework.web.bind.annotation.RequestMethod;
1721

22+
import com.njxz.exam.modle.News;
23+
import com.njxz.exam.modle.SystemConfig;
1824
import com.njxz.exam.modle.User;
25+
import com.njxz.exam.service.NewsService;
26+
import com.njxz.exam.service.SystemConfigService;
1927
import com.njxz.exam.service.UserService;
2028
import com.njxz.exam.util.Logable;
2129
import com.njxz.exam.util.StringUtil;
@@ -27,11 +35,15 @@ public class HomeController extends Logable {
2735
private UserService userService;
2836
@Autowired
2937
private HttpSession session;
38+
@Autowired
39+
private NewsService newsService;
40+
@Autowired
41+
private SystemConfigService scs;
3042

31-
//测试
32-
@RequestMapping(value="/test",method=RequestMethod.GET)
33-
public String test() {
34-
return "test";
43+
@RequestMapping(value="/",method=RequestMethod.GET)
44+
public String test(Model model) {
45+
model.addAttribute("user", new User());
46+
return "redirect:/login";
3547
}
3648

3749

@@ -86,7 +98,45 @@ public String login(@Valid User user, BindingResult bindingResult, Model model)
8698
// 处理对首页--index发起的请求
8799
@RequestMapping(value = "/index", method = RequestMethod.GET)
88100
public String index(Model model) {
89-
model.addAttribute("user", session.getAttribute("user"));
101+
SimpleDateFormat format=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
102+
List<Map<String, Object>> resultList=new ArrayList<>();
103+
104+
User user=(User) session.getAttribute("user");
105+
if(user==null) {
106+
return "login";
107+
}
108+
109+
model.addAttribute("user", user);
110+
String power=user.getPower()==1?"录入人员":user.getPower()==2?"教师":user.getPower()==3?"管理员":"";
111+
model.addAttribute("power", power);
112+
113+
//公告信息---取最近的五条
114+
List<News> lists=newsService.latelyNews(5);
115+
for(News news:lists) {
116+
Map<String, Object> map=new HashMap<String, Object>();
117+
map.put("nId", news.getnId().toString());
118+
map.put("nContent", news.getnContent());
119+
map.put("addTime",format.format(news.getnAddTime()));
120+
map.put("userId", news.getUserId());
121+
//添加人姓名
122+
if(news.getUserId()!=null) {
123+
User user2=userService.findUser(news.getUserId().toString());
124+
if(user2!=null) {
125+
map.put("userName",user2.getName());
126+
}else {
127+
map.put("userName", "该用户已注销");
128+
}
129+
}else {
130+
map.put("userName","");
131+
}
132+
resultList.add(map);
133+
}
134+
model.addAttribute("newsList", resultList);
135+
136+
//系统信息
137+
List<SystemConfig> list = scs.getAll();
138+
model.addAttribute("systemConfigs", list);
139+
90140
return "index";
91141
}
92142

‎src/main/java/com/njxz/exam/dao/NewsMapper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,5 @@ public interface NewsMapper {
3131

3232
List<News> getAll();
3333

34-
@Select("select * from news order by n_add_time limit 0,#{count}")
3534
List<News> latelyNews(@Param("count")int count);
3635
}

‎src/main/java/com/njxz/exam/mapper/NewsMapper.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,4 +197,8 @@
197197
n_add_time = #{nAddTime,jdbcType=TIMESTAMP}
198198
where n_id = #{nId,jdbcType=BIGINT}
199199
</update>
200+
201+
<select id="latelyNews" resultMap="BaseResultMap">
202+
select * from news order by n_add_time limit 0,#{count}
203+
</select>
200204
</mapper>

‎src/main/java/com/njxz/exam/modle/News.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,9 @@ public Date getnAddTime() {
5151
public void setnAddTime(Date nAddTime) {
5252
this.nAddTime = nAddTime;
5353
}
54+
55+
@Override
56+
public String toString() {
57+
return "News [nId=" + nId + ", userId=" + userId + ", nContent=" + nContent + ", nAddTime=" + nAddTime + "]";
58+
}
5459
}

‎src/main/webapp/WEB-INF/jsp/index.jsp

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -428,14 +428,47 @@
428428
<!-- END PAGE HEADER-->
429429

430430
<!-- BEGIN PAGE CONTENT-->
431-
432431
<div class="row-fluid">
433-
434432
<div class="span12">
435-
<!-- 内容主体部分 -->
436-
欢迎你，<c:out value="${user.name}"/>
433+
欢迎您，<c:out value="${user.name}"/>，您的身份是<c:out value="${power}" />
437434
</div>
438-
435+
</div>
436+
<div class="row-fluid">
437+
<div class="span7">
438+
<table border="1" class="table table-striped table-bordered">
439+
<th colspan="3">公告信息</th>
440+
<tr>
441+
<td>发布信息</td>
442+
<td>发布人</td>
443+
<td>发布时间</td>
444+
</tr>
445+
446+
<c:if test='${newsList!=null}'>
447+
<c:forEach items="${newsList}" var="news">
448+
<tr>
449+
<td>${news.nContent}</td>
450+
<td>${news.userName}</td>
451+
<td>${news.addTime }</td>
452+
</tr>
453+
</c:forEach>
454+
</c:if>
455+
</table>
456+
</div>
457+
458+
<div class="span5">
459+
<table border="1" class="table table-striped table-bordered">
460+
<th colspan="2">系统信息</th>
461+
462+
<c:if test='${systemConfigs!=null}'>
463+
<c:forEach items="${systemConfigs}" var="systemConfig">
464+
<tr>
465+
<td>${systemConfig.key}</td>
466+
<td>${systemConfig.value}</td>
467+
</tr>
468+
</c:forEach>
469+
</c:if>
470+
</table>
471+
</div>
439472
</div>
440473

441474
<!-- END PAGE CONTENT-->

‎target/classes/com/njxz/exam/controller/HomeController.class

2.21 KB
Binary file not shown.

‎target/classes/com/njxz/exam/dao/NewsMapper.class

-147 Bytes
Binary file not shown.

‎target/classes/com/njxz/exam/mapper/NewsMapper.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,4 +197,8 @@
197197
n_add_time = #{nAddTime,jdbcType=TIMESTAMP}
198198
where n_id = #{nId,jdbcType=BIGINT}
199199
</update>
200+
201+
<select id="latelyNews" resultMap="BaseResultMap">
202+
select * from news order by n_add_time limit 0,#{count}
203+
</select>
200204
</mapper>

‎target/classes/com/njxz/exam/modle/News.class

374 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)