周伟鹏 / cnlive_shenhe · Commits

Commit b8f313e8ecac7b5f79f807175f9efa9202519213

Authored by liwei2917
2 parents ea9954b8 8bc9dc93

Merge branch 'dev'

Inline Side-by-side
Showing 8 changed files with 138 additions and 44 deletions
src/main/java/com/cnlive/shenhe/api/CommentsControllerApi.java
  View file @b8f313e
@@ -56,7 +56,7 @@ public class CommentsControllerApi { @@ -56,7 +56,7 @@ public class CommentsControllerApi {
56 shyComments1.setComment_content(json.getString("commentContent")); 56 shyComments1.setComment_content(json.getString("commentContent"));
57 String commentTime = json.getString("commentTime"); 57 String commentTime = json.getString("commentTime");
58 if (CommonUtils.isNotEmpty(commentTime)) { 58 if (CommonUtils.isNotEmpty(commentTime)) {
59 - Date timestamp = CommonUtils.getTimestamp(commentTime, "yyyy-MM-dd hh:mm"); 59 + Date timestamp = CommonUtils.getTimestamp(commentTime, "yyyy-MM-dd HH:mm:ss");
60 shyComments1.setComment_time(timestamp); 60 shyComments1.setComment_time(timestamp);
61 61
62 } 62 }
@@ -85,7 +85,7 @@ public class CommentsControllerApi { @@ -85,7 +85,7 @@ public class CommentsControllerApi {
85 shyComments.setComment_content(json.getString("commentContent")); 85 shyComments.setComment_content(json.getString("commentContent"));
86 String commentTime = json.getString("commentTime"); 86 String commentTime = json.getString("commentTime");
87 if (CommonUtils.isNotEmpty(commentTime)) { 87 if (CommonUtils.isNotEmpty(commentTime)) {
88 - Date timestamp = CommonUtils.getTimestamp(commentTime, "yyyy-MM-dd hh:mm"); 88 + Date timestamp = CommonUtils.getTimestamp(commentTime, "yyyy-MM-dd HH:mm:ss");
89 shyComments.setComment_time(timestamp); 89 shyComments.setComment_time(timestamp);
90 } 90 }
91 shyComments.setSpid(json.getInteger("spId")); 91 shyComments.setSpid(json.getInteger("spId"));
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
  View file @b8f313e
@@ -56,6 +56,9 @@ public class CommentsController { @@ -56,6 +56,9 @@ public class CommentsController {
56 String start_date, String end_date, String state, Integer receive, 56 String start_date, String end_date, String state, Integer receive,
57 Integer page, Integer pageSize, String orderByClause, HttpSession session) { 57 Integer page, Integer pageSize, String orderByClause, HttpSession session) {
58 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); 58 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
  59 + if(CommonUtils.isNull(sessionUser)){
  60 + return "redirect:/users/login";
  61 + }
59 Integer spid = sessionUser.getSpid(); 62 Integer spid = sessionUser.getSpid();
60 String userId = sessionUser.getUserId(); 63 String userId = sessionUser.getUserId();
61 if (spid == 0) spid = null; 64 if (spid == 0) spid = null;
@@ -66,13 +69,13 @@ public class CommentsController { @@ -66,13 +69,13 @@ public class CommentsController {
66 69
67 if (CommonUtils.isNotEmpty(start_date)) { 70 if (CommonUtils.isNotEmpty(start_date)) {
68 try { 71 try {
69 - sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd hh:mm"); 72 + sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
70 } catch (Exception e) { 73 } catch (Exception e) {
71 } 74 }
72 } 75 }
73 if (CommonUtils.isNotEmpty(end_date)) { 76 if (CommonUtils.isNotEmpty(end_date)) {
74 try { 77 try {
75 - eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd hh:mm"); 78 + eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
76 } catch (Exception e) { 79 } catch (Exception e) {
77 } 80 }
78 } 81 }
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @b8f313e
@@ -114,12 +114,20 @@ public class VideosController { @@ -114,12 +114,20 @@ public class VideosController {
114 @GetMapping("/page") 114 @GetMapping("/page")
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) { 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 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); 116 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
  117 + if(CommonUtils.isNull(sessionUser)){
  118 + return "redirect:/users/login";
  119 + }
117 Integer spid = sessionUser.getSpid(); 120 Integer spid = sessionUser.getSpid();
118 String userId = sessionUser.getUserId(); 121 String userId = sessionUser.getUserId();
119 if (CommonUtils.isNull(page)) page = 1; 122 if (CommonUtils.isNull(page)) page = 1;
120 if (CommonUtils.isNull(pageSize)) pageSize = 10; 123 if (CommonUtils.isNull(pageSize)) pageSize = 10;
121 if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) { 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 } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) { 131 } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
124 spid = null; 132 spid = null;
125 } 133 }
@@ -145,7 +153,11 @@ public class VideosController { @@ -145,7 +153,11 @@ public class VideosController {
145 //显示spid简称 153 //显示spid简称
146 ShySites shySites = sitesService.findspidDescByspid(videos.getSpid()); 154 ShySites shySites = sitesService.findspidDescByspid(videos.getSpid());
147 if (CommonUtils.isNotNull(shySites)) { 155 if (CommonUtils.isNotNull(shySites)) {
148 - videos.setSpid_desc(shySites.getName()); 156 + if(CommonUtils.isNotEmpty(videos.getCategory())&&videos.getCategory().equals(CommonConst.CATEGORY_WITNESS)){
  157 + videos.setSpid_desc(shySites.getName()+"目击者");
  158 + }else{
  159 + videos.setSpid_desc(shySites.getName());
  160 + }
149 } 161 }
150 } 162 }
151 } 163 }
@@ -259,7 +271,7 @@ public class VideosController { @@ -259,7 +271,7 @@ public class VideosController {
259 * @param response 271 * @param response
260 */ 272 */
261 @GetMapping("excel") 273 @GetMapping("excel")
262 - public void getExcel(String video_title, String start_date, String end_date, Integer state, Boolean receive, String video_priority, String orderByClause, HttpSession session, HttpServletResponse response) { 274 + public void getExcel(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String orderByClause, HttpSession session, HttpServletResponse response) {
263 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); 275 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
264 Integer spid = sessionUser.getSpid(); 276 Integer spid = sessionUser.getSpid();
265 String userId = sessionUser.getUserId(); 277 String userId = sessionUser.getUserId();
src/main/java/com/cnlive/shenhe/serviceImpl/SitesServiceImpl.java
  View file @b8f313e
@@ -62,10 +62,10 @@ public class SitesServiceImpl { @@ -62,10 +62,10 @@ public class SitesServiceImpl {
62 if (CommonUtils.isNotNull(spId)) 62 if (CommonUtils.isNotNull(spId))
63 criteria.andEqualTo("spid", spId); 63 criteria.andEqualTo("spid", spId);
64 List<ShySites> shySites = shySitesMapper.selectByExample(example); 64 List<ShySites> shySites = shySitesMapper.selectByExample(example);
65 - if(CommonUtils.isNotNull(shySites)){ 65 + if(CommonUtils.isNotNull(shySites)&&shySites.size()>0){
66 return shySites.get(0); 66 return shySites.get(0);
67 } 67 }
68 - return new ShySites(); 68 + return null;
69 } 69 }
70 70
71 public ShySites findspidBySpdesc(String sp_desc) { 71 public ShySites findspidBySpdesc(String sp_desc) {
@@ -74,10 +74,10 @@ public class SitesServiceImpl { @@ -74,10 +74,10 @@ public class SitesServiceImpl {
74 if (CommonUtils.isNotEmpty(sp_desc)) 74 if (CommonUtils.isNotEmpty(sp_desc))
75 criteria.andEqualTo("name", sp_desc); 75 criteria.andEqualTo("name", sp_desc);
76 List<ShySites> shySites = shySitesMapper.selectByExample(example); 76 List<ShySites> shySites = shySitesMapper.selectByExample(example);
77 - if(CommonUtils.isNotNull(shySites)){ 77 + if(CommonUtils.isNotNull(shySites)&&shySites.size()>0){
78 return shySites.get(0); 78 return shySites.get(0);
79 } 79 }
80 - return new ShySites(); 80 + return null;
81 } 81 }
82 /** 82 /**
83 * 获取免审白名单列表（点播） 83 * 获取免审白名单列表（点播）
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
  View file @b8f313e
@@ -123,15 +123,17 @@ public class VideosServiceImpl { @@ -123,15 +123,17 @@ public class VideosServiceImpl {
123 Timestamp startdate = null; 123 Timestamp startdate = null;
124 Timestamp enddate = null; 124 Timestamp enddate = null;
125 try { 125 try {
126 - startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd HH:mm:ss");  
127 - enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd HH:mm:ss"); 126 +// startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd HH:mm:ss");
  127 +// enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd HH:mm:ss");
  128 + startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
  129 + enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
128 } catch (ParseException e) { 130 } catch (ParseException e) {
129 e.printStackTrace(); 131 e.printStackTrace();
130 } 132 }
131 - criteria.andGreaterThanOrEqualTo("video_upload_time", startdate);  
132 - criteria2.andGreaterThanOrEqualTo("video_upload_time", startdate);  
133 - criteria.andLessThanOrEqualTo("video_upload_time", enddate);  
134 - criteria2.andLessThanOrEqualTo("video_upload_time", enddate); 133 + criteria.andGreaterThanOrEqualTo("created_at", startdate);
  134 + criteria2.andGreaterThanOrEqualTo("created_at", startdate);
  135 + criteria.andLessThanOrEqualTo("created_at", enddate);
  136 + criteria2.andLessThanOrEqualTo("created_at", enddate);
135 } 137 }
136 if (CommonUtils.isNotEmpty(video_title)) { 138 if (CommonUtils.isNotEmpty(video_title)) {
137 criteria.andLike("video_title", "%" + video_title + "%"); 139 criteria.andLike("video_title", "%" + video_title + "%");
@@ -162,7 +164,7 @@ public class VideosServiceImpl { @@ -162,7 +164,7 @@ public class VideosServiceImpl {
162 example.or(criteria2); 164 example.or(criteria2);
163 } 165 }
164 //默认按上传时间倒序排序 166 //默认按上传时间倒序排序
165 - example.setOrderByClause("video_upload_time desc"); 167 + example.setOrderByClause("created_at desc");
166 PageHelper.startPage(page, pageSize, true); 168 PageHelper.startPage(page, pageSize, true);
167 List<ShyVideos> shyVideosList = shyVideosMapper.selectByExample(example); 169 List<ShyVideos> shyVideosList = shyVideosMapper.selectByExample(example);
168 PageInfo<ShyVideos> pageInfo = new PageInfo<>(shyVideosList); 170 PageInfo<ShyVideos> pageInfo = new PageInfo<>(shyVideosList);
@@ -252,7 +254,7 @@ public class VideosServiceImpl { @@ -252,7 +254,7 @@ public class VideosServiceImpl {
252 * @param userId 254 * @param userId
253 * @return 255 * @return
254 */ 256 */
255 - public List<ShyVideos> findByCondition(String video_title, String start_date, String end_date, Integer state, Boolean receive, String video_priority, String orderByClause, Integer spid, String userId) { 257 + public List<ShyVideos> findByCondition(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String orderByClause, Integer spid, String userId) {
256 Example example = new Example(ShyVideos.class); 258 Example example = new Example(ShyVideos.class);
257 Example.Criteria criteria = example.createCriteria(); 259 Example.Criteria criteria = example.createCriteria();
258 Example.Criteria criteria2 = example.createCriteria(); 260 Example.Criteria criteria2 = example.createCriteria();
@@ -263,13 +265,15 @@ public class VideosServiceImpl { @@ -263,13 +265,15 @@ public class VideosServiceImpl {
263 Timestamp startdate = null; 265 Timestamp startdate = null;
264 Timestamp enddate = null; 266 Timestamp enddate = null;
265 try { 267 try {
266 - startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd HH:mm:ss");  
267 - enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd HH:mm:ss"); 268 +// startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd HH:mm:ss");
  269 +// enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd HH:mm:ss");
  270 + startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
  271 + enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
268 } catch (ParseException e) { 272 } catch (ParseException e) {
269 e.printStackTrace(); 273 e.printStackTrace();
270 } 274 }
271 - criteria.andGreaterThanOrEqualTo("video_upload_time", startdate);  
272 - criteria.andLessThanOrEqualTo("video_upload_time", enddate); 275 + criteria.andGreaterThanOrEqualTo("created_at", startdate);
  276 + criteria.andLessThanOrEqualTo("created_at", enddate);
273 } 277 }
274 if (CommonUtils.isNotEmpty(video_title)) { 278 if (CommonUtils.isNotEmpty(video_title)) {
275 criteria.andLike("video_title", "%" + video_title + "%"); 279 criteria.andLike("video_title", "%" + video_title + "%");
@@ -289,7 +293,7 @@ public class VideosServiceImpl { @@ -289,7 +293,7 @@ public class VideosServiceImpl {
289 } 293 }
290 if (CommonUtils.isNotNull(receive)) { 294 if (CommonUtils.isNotNull(receive)) {
291 criteria.andEqualTo("receive", receive); 295 criteria.andEqualTo("receive", receive);
292 - if (receive == true) { 296 + if (receive == CommonConst.RECEIVE_AFTER) {
293 criteria.andEqualTo("receive_user_id", userId); 297 criteria.andEqualTo("receive_user_id", userId);
294 } 298 }
295 } 299 }
src/main/resources/templates/page/comment.html
  View file @b8f313e
@@ -719,7 +719,8 @@ @@ -719,7 +719,8 @@
719 <script> 719 <script>
720 /*时间插件*/ 720 /*时间插件*/
721 $('.date').datetimepicker({ 721 $('.date').datetimepicker({
722 - format: 'YYYY-MM-DD HH:mm:ss', 722 +// format: 'YYYY-MM-DD HH:mm:ss',
  723 + format: 'YYYY-MM-DD',
723 locale: "zh-CN", 724 locale: "zh-CN",
724 toolbarPlacement: 'bottom', 725 toolbarPlacement: 'bottom',
725 showClear: true, 726 showClear: true,
src/main/resources/templates/page/sitesError.html 0 → 100644
  View file @b8f313e
  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 +
src/main/resources/templates/page/video.html
  View file @b8f313e
@@ -75,8 +75,8 @@ @@ -75,8 +75,8 @@
75 <span id="a_up">▼</span><span id="a_down" style="display: none;">▲</span> 75 <span id="a_up">▼</span><span id="a_down" style="display: none;">▲</span>
76 </button> 76 </button>
77 </div> 77 </div>
78 - <div class="form-horizontal form-group-sm" id="forms" style="display: none;">  
79 - <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 20%;"> 78 + <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;">
  79 + <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 15%;float: left;">
80 <div class="col-md-5" style="padding: 0;width: 100%;"> 80 <div class="col-md-5" style="padding: 0;width: 100%;">
81 <label for="video_titleID" class="control-label cb-toolbar">标题:</label> 81 <label for="video_titleID" class="control-label cb-toolbar">标题:</label>
82 <div class="col-sm-9" style="padding: 0;"> 82 <div class="col-sm-9" style="padding: 0;">
@@ -85,10 +85,10 @@ @@ -85,10 +85,10 @@
85 </div> 85 </div>
86 </div> 86 </div>
87 87
88 - <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 17%;"> 88 + <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 10%;float: left;">
89 <div class="col-md-5" style="padding: 0;width: 100%;"> 89 <div class="col-md-5" style="padding: 0;width: 100%;">
90 <label for="video_priority" class="control-label cb-toolbar">热点:</label> 90 <label for="video_priority" class="control-label cb-toolbar">热点:</label>
91 - <div class="col-sm-9" style="padding: 0;"> 91 + <div class="col-sm-8" style="padding: 0;">
92 <select class="form-control" id="video_priority" name="video_priority"> 92 <select class="form-control" id="video_priority" name="video_priority">
93 <option value="">全部</option> 93 <option value="">全部</option>
94 <option value="1">是</option> 94 <option value="1">是</option>
@@ -101,8 +101,8 @@ @@ -101,8 +101,8 @@
101 101
102 <div class="btn-group margin-bottom col-md-6 pull-right" 102 <div class="btn-group margin-bottom col-md-6 pull-right"
103 style="position: relative;width: 75%;float: left !important;"> 103 style="position: relative;width: 75%;float: left !important;">
104 - <div class="col-md-11" style="width: 100%;padding: 0;">  
105 - <div class="col-md-6" style="padding: 0;width: 25%;"> 104 + <div class="col-md-18" style="width: 100%;padding: 0;">
  105 + <div class="col-md-10" style="padding: 0;width: 25%;">
106 <label for="start_date" class="control-label cb-toolbar">时间:</label> 106 <label for="start_date" class="control-label cb-toolbar">时间:</label>
107 <div class="input-group col-md-9 date"> 107 <div class="input-group col-md-9 date">
108 <input class="form-control date" name="start_date" type="text" 108 <input class="form-control date" name="start_date" type="text"
@@ -112,7 +112,7 @@ @@ -112,7 +112,7 @@
112 </span> 112 </span>
113 </div> 113 </div>
114 </div> 114 </div>
115 - <div class="col-md-6" style="padding: 0;width: 25%;"> 115 + <div class="col-md-10" style="padding: 0;width: 25%;">
116 <label for="start_date" class="control-label cb-toolbar">至</label> 116 <label for="start_date" class="control-label cb-toolbar">至</label>
117 <div class="input-group col-md-9 date"> 117 <div class="input-group col-md-9 date">
118 <input class="form-control date" name="end_date" type="text" 118 <input class="form-control date" name="end_date" type="text"
@@ -129,14 +129,20 @@ @@ -129,14 +129,20 @@
129 <input class="form-control" type="text" value="" id="sp_desc"> 129 <input class="form-control" type="text" value="" id="sp_desc">
130 </div> 130 </div>
131 </div> 131 </div>
  132 + <div class="col-md-6" style="padding: 0;width: 15%;" th:if="${session.sessionUser.spid==0}">
  133 + <label for="count" class="control-label cb-toolbar">每页条数:</label>
  134 + <div class="col-sm-5" style="padding: 0;">
  135 + <input class="form-control" type="text" value="" id="count">
  136 + </div>
  137 + </div>
132 </div> 138 </div>
133 </div> 139 </div>
134 - <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 1%;float: left;">  
135 - <div class="col-md-1 text-center" style="width: 12%;padding: 0;float: right;">  
136 - <button type="button" class="btn btn-primary btn-sm" id="videos_query">查 询  
137 - </button>  
138 - </div>  
139 - </div> 140 +<!-- <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 1%;float: left;"> -->
  141 +<!-- <div class="col-md-1 text-center" style="width: 12%;padding: 0;float: right;"> -->
  142 +<!-- <button type="button" class="btn btn-primary btn-sm" id="videos_query">查 询 -->
  143 +<!-- </button> -->
  144 +<!-- </div> -->
  145 +<!-- </div> -->
140 </div> 146 </div>
141 147
142 <div class="fixed-table-container" style="padding-bottom: 0px;"> 148 <div class="fixed-table-container" style="padding-bottom: 0px;">
@@ -183,6 +189,11 @@ @@ -183,6 +189,11 @@
183 <div class="th-inner ">视频上传时间</div> 189 <div class="th-inner ">视频上传时间</div>
184 <div class="fht-cell"></div> 190 <div class="fht-cell"></div>
185 </th> 191 </th>
  192 + <th style="text-align: center; width: 10%; " data-field="created_at"
  193 + tabindex="0">
  194 + <div class="th-inner ">视频送审时间</div>
  195 + <div class="fht-cell"></div>
  196 + </th>
186 <th style="text-align: center; width: 17%; " data-field="action" 197 <th style="text-align: center; width: 17%; " data-field="action"
187 tabindex="0"> 198 tabindex="0">
188 <div class="th-inner ">操作</div> 199 <div class="th-inner ">操作</div>
@@ -220,6 +231,10 @@ @@ -220,6 +231,10 @@
220 th:text="${#dates.format(video.video_upload_time, 'yyyy-MM-dd HH:mm:ss')}"> 231 th:text="${#dates.format(video.video_upload_time, 'yyyy-MM-dd HH:mm:ss')}">
221 2018-03-07 16:56:20 232 2018-03-07 16:56:20
222 </td> 233 </td>
  234 + <td style="text-align: center; width: 10%;"
  235 + th:text="${#dates.format(video.created_at, 'yyyy-MM-dd HH:mm:ss')}">
  236 + 2018-03-07 16:56:20
  237 + </td>
223 <td style="text-align: center; width: 17%;"> 238 <td style="text-align: center; width: 17%;">
224 <a class="detail" th:href="@{'/videos/details/?id='+${video.id}}"> 239 <a class="detail" th:href="@{'/videos/details/?id='+${video.id}}">
225 <!--th:if="${ (video.receive==true and session.sessionUser.userId==video.receive_user_id) or (video.state==1 or video.state==2) }"--> 240 <!--th:if="${ (video.receive==true and session.sessionUser.userId==video.receive_user_id) or (video.state==1 or video.state==2) }"-->
@@ -338,7 +353,14 @@ @@ -338,7 +353,14 @@
338 353
339 //全部 354 //全部
340 function quanbu() { 355 function quanbu() {
341 - window.location.href = "/videos/page?video_title=&start_date=&end_date=&state=&receive=&video_priority="; 356 + var video_priority = $("#video_priority").val();
  357 + var video_title = $("#video_titleID").val();
  358 + var start_date = $("#start_date").val();
  359 + var end_date = $("#end_date").val();
  360 + var sp_desc = $("#sp_desc").val();
  361 + var count = $("#count").val();
  362 +// window.location.href = "/videos/page?video_title=&start_date=&end_date=&state=&receive=&video_priority=";
  363 + window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
342 } 364 }
343 365
344 //全部待领 366 //全部待领
@@ -349,7 +371,9 @@ @@ -349,7 +371,9 @@
349 var video_title = $("#video_titleID").val(); 371 var video_title = $("#video_titleID").val();
350 var start_date = $("#start_date").val(); 372 var start_date = $("#start_date").val();
351 var end_date = $("#end_date").val(); 373 var end_date = $("#end_date").val();
352 - window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority; 374 + var sp_desc = $("#sp_desc").val();
  375 + var count = $("#count").val();
  376 + window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
353 }); 377 });
354 //我的待审核 378 //我的待审核
355 $('#Mydaishen').click(function () { 379 $('#Mydaishen').click(function () {
@@ -359,7 +383,9 @@ @@ -359,7 +383,9 @@
359 var video_title = $("#video_titleID").val(); 383 var video_title = $("#video_titleID").val();
360 var start_date = $("#start_date").val(); 384 var start_date = $("#start_date").val();
361 var end_date = $("#end_date").val(); 385 var end_date = $("#end_date").val();
362 - window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority; 386 + var sp_desc = $("#sp_desc").val();
  387 + var count = $("#count").val();
  388 + window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
363 }); 389 });
364 //我的已审核 390 //我的已审核
365 $('#yishen').click(function () { 391 $('#yishen').click(function () {
@@ -369,7 +395,9 @@ @@ -369,7 +395,9 @@
369 var video_title = $("#video_titleID").val(); 395 var video_title = $("#video_titleID").val();
370 var start_date = $("#start_date").val(); 396 var start_date = $("#start_date").val();
371 var end_date = $("#end_date").val(); 397 var end_date = $("#end_date").val();
372 - window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority; 398 + var sp_desc = $("#sp_desc").val();
  399 + var count = $("#count").val();
  400 + window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
373 }); 401 });
374 402
375 403
@@ -380,7 +408,8 @@ @@ -380,7 +408,8 @@
380 var start_date = $("#start_date").val(); 408 var start_date = $("#start_date").val();
381 var end_date = $("#end_date").val(); 409 var end_date = $("#end_date").val();
382 var sp_desc = $("#sp_desc").val(); 410 var sp_desc = $("#sp_desc").val();
383 - window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=&video_priority=" + video_priority + "&sp_desc=" + sp_desc; 411 + var count = $("#count").val();
  412 + window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
384 }); 413 });
385 /*全选的操作*/ 414 /*全选的操作*/
386 $('#select_all').click(function () { 415 $('#select_all').click(function () {
@@ -548,7 +577,8 @@ @@ -548,7 +577,8 @@
548 577
549 /*时间插件*/ 578 /*时间插件*/
550 $('.date').datetimepicker({ 579 $('.date').datetimepicker({
551 - format: 'YYYY-MM-DD HH:mm:ss', 580 +// format: 'YYYY-MM-DD HH:mm:ss',
  581 + format: 'YYYY-MM-DD',
552 locale: "zh-CN", 582 locale: "zh-CN",
553 toolbarPlacement: 'bottom', 583 toolbarPlacement: 'bottom',
554 showClear: true, 584 showClear: true,