周伟鹏 / cnlive_shenhe · Commits

Commit 8bc9dc93651159cded025e6e2d884a3c1ed75fce

Authored by liwei2917
1 parent d5c41e9f

增加站点失败页面返回

Inline Side-by-side
Showing 4 changed files with 60 additions and 5 deletions
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
  View file @8bc9dc9
... ... @@ -56,6 +56,9 @@ public class CommentsController {
56 56 String start_date, String end_date, String state, Integer receive,
57 57 Integer page, Integer pageSize, String orderByClause, HttpSession session) {
58 58 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
  59 + if(CommonUtils.isNull(sessionUser)){
  60 + return "redirect:/users/login";
  61 + }
59 62 Integer spid = sessionUser.getSpid();
60 63 String userId = sessionUser.getUserId();
61 64 if (spid == 0) spid = null;
... ...
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @8bc9dc9
... ... @@ -114,12 +114,20 @@ public class VideosController {
114 114 @GetMapping("/page")
115 115 public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, HttpSession session) {
116 116 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
  117 + if(CommonUtils.isNull(sessionUser)){
  118 + return "redirect:/users/login";
  119 + }
117 120 Integer spid = sessionUser.getSpid();
118 121 String userId = sessionUser.getUserId();
119 122 if (CommonUtils.isNull(page)) page = 1;
120 123 if (CommonUtils.isNull(pageSize)) pageSize = 10;
121 124 if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
122   - spid = sitesService.findspidBySpdesc(sp_desc).getSpid();
  125 + ShySites shySite=sitesService.findspidBySpdesc(sp_desc);
  126 + if(CommonUtils.isNotNull(shySite)){
  127 + spid = shySite.getSpid();
  128 + }else{
  129 + return "page/sitesError.html";
  130 + }
123 131 } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
124 132 spid = null;
125 133 }
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/SitesServiceImpl.java
  View file @8bc9dc9
... ... @@ -62,10 +62,10 @@ public class SitesServiceImpl {
62 62 if (CommonUtils.isNotNull(spId))
63 63 criteria.andEqualTo("spid", spId);
64 64 List<ShySites> shySites = shySitesMapper.selectByExample(example);
65   - if(CommonUtils.isNotNull(shySites)){
  65 + if(CommonUtils.isNotNull(shySites)&&shySites.size()>0){
66 66 return shySites.get(0);
67 67 }
68   - return new ShySites();
  68 + return null;
69 69 }
70 70  
71 71 public ShySites findspidBySpdesc(String sp_desc) {
... ... @@ -74,10 +74,10 @@ public class SitesServiceImpl {
74 74 if (CommonUtils.isNotEmpty(sp_desc))
75 75 criteria.andEqualTo("name", sp_desc);
76 76 List<ShySites> shySites = shySitesMapper.selectByExample(example);
77   - if(CommonUtils.isNotNull(shySites)){
  77 + if(CommonUtils.isNotNull(shySites)&&shySites.size()>0){
78 78 return shySites.get(0);
79 79 }
80   - return new ShySites();
  80 + return null;
81 81 }
82 82 /**
83 83 * 获取免审白名单列表（点播）
... ...
src/main/resources/templates/page/sitesError.html 0 → 100644
  View file @8bc9dc9
  1 +<!DOCTYPE html>
  2 +<html>
  3 +<head>
  4 + <title>审核云平台</title>
  5 +
  6 + <style>
  7 + html, body {
  8 + height: 100%;
  9 + }
  10 +
  11 + body {
  12 + margin: 0;
  13 + padding: 0;
  14 + width: 100%;
  15 + display: table;
  16 + font-weight: 100;
  17 + font-family: 'Lato', sans-serif;
  18 + }
  19 +
  20 + .container {
  21 + text-align: center;
  22 + display: table-cell;
  23 + vertical-align: middle;
  24 + }
  25 +
  26 + .content {
  27 + text-align: center;
  28 + display: inline-block;
  29 + }
  30 +
  31 + .title {
  32 + font-size: 40px;
  33 + }
  34 + </style>
  35 +</head>
  36 +<body>
  37 +<div class="container">
  38 + <div class="content">
  39 + <div class="title">站点查询失败，请检查后重新查询!</div>
  40 + </div>
  41 +</div>
  42 +</body>
  43 +</html>
  44 +
... ...