Merge branch 'dev'

liwei2917
2 parents ea9954b8 8bc9dc93
Showing 8 changed files with 138 additions and 44 deletions
src/main/java/com/cnlive/shenhe/api/CommentsControllerApi.java
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/serviceImpl/SitesServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/resources/templates/page/comment.html
src/main/resources/templates/page/sitesError.html
src/main/resources/templates/page/video.html
@@ -56,7 +56,7 @@ public class CommentsControllerApi {
             shyComments1.setComment_content(json.getString("commentContent"));
             String commentTime = json.getString("commentTime");
             if (CommonUtils.isNotEmpty(commentTime)) {
-                Date timestamp = CommonUtils.getTimestamp(commentTime, "yyyy-MM-dd hh:mm");
+                Date timestamp = CommonUtils.getTimestamp(commentTime, "yyyy-MM-dd HH:mm:ss");
                 shyComments1.setComment_time(timestamp);
  
             }
@@ -85,7 +85,7 @@ public class CommentsControllerApi {
         shyComments.setComment_content(json.getString("commentContent"));
         String commentTime = json.getString("commentTime");
         if (CommonUtils.isNotEmpty(commentTime)) {
-            Date timestamp = CommonUtils.getTimestamp(commentTime, "yyyy-MM-dd hh:mm");
+            Date timestamp = CommonUtils.getTimestamp(commentTime, "yyyy-MM-dd HH:mm:ss");
             shyComments.setComment_time(timestamp);
         }
         shyComments.setSpid(json.getInteger("spId"));
@@ -56,6 +56,9 @@ public class CommentsController {
                           String start_date, String end_date, String state, Integer receive,
                           Integer page, Integer pageSize, String orderByClause, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
+        if(CommonUtils.isNull(sessionUser)){
+        	return "redirect:/users/login";
+        }
         Integer spid = sessionUser.getSpid();
         String userId = sessionUser.getUserId();
         if (spid == 0) spid = null;
@@ -66,13 +69,13 @@ public class CommentsController {
  
         if (CommonUtils.isNotEmpty(start_date)) {
             try {
-                sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd hh:mm");
+                sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
             } catch (Exception e) {
             }
         }
         if (CommonUtils.isNotEmpty(end_date)) {
             try {
-                eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd hh:mm");
+                eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
             } catch (Exception e) {
             }
         }
@@ -114,12 +114,20 @@ public class VideosController {
     @GetMapping("/page")
     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) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
+        if(CommonUtils.isNull(sessionUser)){
+        	return "redirect:/users/login";
+        }
         Integer spid = sessionUser.getSpid();
         String userId = sessionUser.getUserId();
         if (CommonUtils.isNull(page)) page = 1;
         if (CommonUtils.isNull(pageSize)) pageSize = 10;
         if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
-            spid = sitesService.findspidBySpdesc(sp_desc).getSpid();
+        	ShySites shySite=sitesService.findspidBySpdesc(sp_desc);
+        	if(CommonUtils.isNotNull(shySite)){
+        		spid = shySite.getSpid();
+        	}else{
+        		return "page/sitesError.html";
+        	}
         } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
             spid = null;
         }
@@ -145,7 +153,11 @@ public class VideosController {
                 //显示spid简称
                 ShySites shySites = sitesService.findspidDescByspid(videos.getSpid());
                 if (CommonUtils.isNotNull(shySites)) {
-                    videos.setSpid_desc(shySites.getName());
+                	if(CommonUtils.isNotEmpty(videos.getCategory())&&videos.getCategory().equals(CommonConst.CATEGORY_WITNESS)){
+                		videos.setSpid_desc(shySites.getName()+"目击者");
+                	}else{
+                		videos.setSpid_desc(shySites.getName());
+                	}
                 }
             }
         }
@@ -259,7 +271,7 @@ public class VideosController {
      * @param response
      */
     @GetMapping("excel")
-    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) {
+    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) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         Integer spid = sessionUser.getSpid();
         String userId = sessionUser.getUserId();
@@ -62,10 +62,10 @@ public class SitesServiceImpl {
         if (CommonUtils.isNotNull(spId))
             criteria.andEqualTo("spid", spId);
         List<ShySites> shySites = shySitesMapper.selectByExample(example);
-        if(CommonUtils.isNotNull(shySites)){
+        if(CommonUtils.isNotNull(shySites)&&shySites.size()>0){
         	return shySites.get(0);
         }
-        return new ShySites();
+        return null;
     }
  
     public ShySites findspidBySpdesc(String sp_desc) {
@@ -74,10 +74,10 @@ public class SitesServiceImpl {
         if (CommonUtils.isNotEmpty(sp_desc))
             criteria.andEqualTo("name", sp_desc);
         List<ShySites> shySites = shySitesMapper.selectByExample(example);
-        if(CommonUtils.isNotNull(shySites)){
+        if(CommonUtils.isNotNull(shySites)&&shySites.size()>0){
         	return shySites.get(0);
         }
-        return new ShySites();
+        return null;
     }
     /**
      * 获取免审白名单列表（点播）
@@ -123,15 +123,17 @@ public class VideosServiceImpl {
             Timestamp startdate = null;
             Timestamp enddate = null;
             try {
-                startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd HH:mm:ss");
-                enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd HH:mm:ss");
+//                startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd HH:mm:ss");
+//                enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd HH:mm:ss");
+                startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
+                enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
             } catch (ParseException e) {
                 e.printStackTrace();
             }
-            criteria.andGreaterThanOrEqualTo("video_upload_time", startdate);
-            criteria2.andGreaterThanOrEqualTo("video_upload_time", startdate);
-            criteria.andLessThanOrEqualTo("video_upload_time", enddate);
-            criteria2.andLessThanOrEqualTo("video_upload_time", enddate);
+            criteria.andGreaterThanOrEqualTo("created_at", startdate);
+            criteria2.andGreaterThanOrEqualTo("created_at", startdate);
+            criteria.andLessThanOrEqualTo("created_at", enddate);
+            criteria2.andLessThanOrEqualTo("created_at", enddate);
         }
         if (CommonUtils.isNotEmpty(video_title)) {
             criteria.andLike("video_title", "%" + video_title + "%");
@@ -162,7 +164,7 @@ public class VideosServiceImpl {
             example.or(criteria2);
         }
         //默认按上传时间倒序排序
-        example.setOrderByClause("video_upload_time desc");
+        example.setOrderByClause("created_at desc");
         PageHelper.startPage(page, pageSize, true);
         List<ShyVideos> shyVideosList = shyVideosMapper.selectByExample(example);
         PageInfo<ShyVideos> pageInfo = new PageInfo<>(shyVideosList);
@@ -252,7 +254,7 @@ public class VideosServiceImpl {
      * @param userId
      * @return
      */
-    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) {
+    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) {
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
@@ -263,13 +265,15 @@ public class VideosServiceImpl {
             Timestamp startdate = null;
             Timestamp enddate = null;
             try {
-                startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd HH:mm:ss");
-                enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd HH:mm:ss");
+//                startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd HH:mm:ss");
+//                enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd HH:mm:ss");
+                startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
+                enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
             } catch (ParseException e) {
                 e.printStackTrace();
             }
-            criteria.andGreaterThanOrEqualTo("video_upload_time", startdate);
-            criteria.andLessThanOrEqualTo("video_upload_time", enddate);
+            criteria.andGreaterThanOrEqualTo("created_at", startdate);
+            criteria.andLessThanOrEqualTo("created_at", enddate);
         }
         if (CommonUtils.isNotEmpty(video_title)) {
             criteria.andLike("video_title", "%" + video_title + "%");
@@ -289,7 +293,7 @@ public class VideosServiceImpl {
         }
         if (CommonUtils.isNotNull(receive)) {
             criteria.andEqualTo("receive", receive);
-            if (receive == true) {
+            if (receive == CommonConst.RECEIVE_AFTER) {
                 criteria.andEqualTo("receive_user_id", userId);
             }
         }
@@ -719,7 +719,8 @@
     <script>
         /*时间插件*/
         $('.date').datetimepicker({
-            format: 'YYYY-MM-DD HH:mm:ss',
+//             format: 'YYYY-MM-DD HH:mm:ss',
+            format: 'YYYY-MM-DD',
             locale: "zh-CN",
             toolbarPlacement: 'bottom',
             showClear: true,
+<!DOCTYPE html>
+<html>
+<head>
+    <title>审核云平台</title>
+
+    <style>
+        html, body {
+            height: 100%;
+        }
+
+        body {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            display: table;
+            font-weight: 100;
+            font-family: 'Lato', sans-serif;
+        }
+
+        .container {
+            text-align: center;
+            display: table-cell;
+            vertical-align: middle;
+        }
+
+        .content {
+            text-align: center;
+            display: inline-block;
+        }
+
+        .title {
+            font-size: 40px;
+        }
+    </style>
+</head>
+<body>
+<div class="container">
+    <div class="content">
+        <div class="title">站点查询失败，请检查后重新查询!</div>
+    </div>
+</div>
+</body>
+</html>
+
@@ -75,8 +75,8 @@
                                     <span id="a_up">▼</span><span id="a_down" style="display: none;">▲</span>
                                 </button>
                             </div>
-                            <div class="form-horizontal form-group-sm" id="forms" style="display: none;">
-                                <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 20%;">
+                            <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;">
+                                <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 15%;float: left;">
                                     <div class="col-md-5" style="padding: 0;width: 100%;">
                                         <label for="video_titleID" class="control-label cb-toolbar">标题:</label>
                                         <div class="col-sm-9" style="padding: 0;">
@@ -85,10 +85,10 @@
                                     </div>
                                 </div>
  
-                                <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 17%;">
+                                <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 10%;float: left;">
                                     <div class="col-md-5" style="padding: 0;width: 100%;">
                                         <label for="video_priority" class="control-label cb-toolbar">热点:</label>
-                                        <div class="col-sm-9" style="padding: 0;">
+                                        <div class="col-sm-8" style="padding: 0;">
                                             <select class="form-control" id="video_priority" name="video_priority">
                                                 <option value="">全部</option>
                                                 <option value="1">是</option>
@@ -101,8 +101,8 @@
  
                                 <div class="btn-group margin-bottom col-md-6 pull-right"
                                      style="position: relative;width: 75%;float: left !important;">
-                                    <div class="col-md-11" style="width: 100%;padding: 0;">
-                                        <div class="col-md-6" style="padding: 0;width: 25%;">
+                                    <div class="col-md-18" style="width: 100%;padding: 0;">
+                                        <div class="col-md-10" style="padding: 0;width: 25%;">
                                             <label for="start_date" class="control-label cb-toolbar">时间:</label>
                                             <div class="input-group col-md-9 date">
                                                 <input class="form-control date" name="start_date" type="text"
@@ -112,7 +112,7 @@
                                                 </span>
                                             </div>
                                         </div>
-                                        <div class="col-md-6" style="padding: 0;width: 25%;">
+                                        <div class="col-md-10" style="padding: 0;width: 25%;">
                                             <label for="start_date" class="control-label cb-toolbar">至</label>
                                             <div class="input-group col-md-9 date">
                                                 <input class="form-control date" name="end_date" type="text"
@@ -129,14 +129,20 @@
                                                 <input class="form-control" type="text" value="" id="sp_desc">
                                             </div>
                                         </div>
+                                          <div class="col-md-6" style="padding: 0;width: 15%;" th:if="${session.sessionUser.spid==0}">
+                                            <label for="count" class="control-label cb-toolbar">每页条数:</label>
+                                            <div class="col-sm-5" style="padding: 0;">
+                                                <input class="form-control" type="text" value="" id="count">
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
-                                <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 1%;float: left;">
-                                    <div class="col-md-1 text-center" style="width: 12%;padding: 0;float: right;">
-                                        <button type="button" class="btn btn-primary btn-sm" id="videos_query">查 询
-                                        </button>
-                                    </div>
-                                </div>
+<!--                                 <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 1%;float: left;"> -->
+<!--                                     <div class="col-md-1 text-center" style="width: 12%;padding: 0;float: right;"> -->
+<!--                                         <button type="button" class="btn btn-primary btn-sm" id="videos_query">查 询 -->
+<!--                                         </button> -->
+<!--                                     </div> -->
+<!--                                 </div> -->
                             </div>
  
                             <div class="fixed-table-container" style="padding-bottom: 0px;">
@@ -183,6 +189,11 @@
                                                 <div class="th-inner ">视频上传时间</div>
                                                 <div class="fht-cell"></div>
                                             </th>
+                                            <th style="text-align: center; width: 10%; " data-field="created_at"
+                                                tabindex="0">
+                                                <div class="th-inner ">视频送审时间</div>
+                                                <div class="fht-cell"></div>
+                                            </th>
                                             <th style="text-align: center; width: 17%; " data-field="action"
                                                 tabindex="0">
                                                 <div class="th-inner ">操作</div>
@@ -220,6 +231,10 @@
                                                 th:text="${#dates.format(video.video_upload_time, 'yyyy-MM-dd HH:mm:ss')}">
                                                 2018-03-07 16:56:20
                                             </td>
+                                            <td style="text-align: center; width: 10%;"
+                                                th:text="${#dates.format(video.created_at, 'yyyy-MM-dd HH:mm:ss')}">
+                                                2018-03-07 16:56:20
+                                            </td>
                                             <td style="text-align: center; width: 17%;">
                                                 <a class="detail" th:href="@{'/videos/details/?id='+${video.id}}">
                                                     <!--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 @@
  
         //全部
         function quanbu() {
-            window.location.href = "/videos/page?video_title=&start_date=&end_date=&state=&receive=&video_priority=";
+        	var video_priority = $("#video_priority").val();
+            var video_title = $("#video_titleID").val();
+            var start_date = $("#start_date").val();
+            var end_date = $("#end_date").val();
+            var sp_desc = $("#sp_desc").val();
+            var count = $("#count").val();
+//             window.location.href = "/videos/page?video_title=&start_date=&end_date=&state=&receive=&video_priority=";
+            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;
         }
  
         //全部待领
@@ -349,7 +371,9 @@
             var video_title = $("#video_titleID").val();
             var start_date = $("#start_date").val();
             var end_date = $("#end_date").val();
-            window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority;
+            var sp_desc = $("#sp_desc").val();
+            var count = $("#count").val();
+            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;
         });
         //我的待审核
         $('#Mydaishen').click(function () {
@@ -359,7 +383,9 @@
             var video_title = $("#video_titleID").val();
             var start_date = $("#start_date").val();
             var end_date = $("#end_date").val();
-            window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority;
+            var sp_desc = $("#sp_desc").val();
+            var count = $("#count").val();
+            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;
         });
         //我的已审核
         $('#yishen').click(function () {
@@ -369,7 +395,9 @@
             var video_title = $("#video_titleID").val();
             var start_date = $("#start_date").val();
             var end_date = $("#end_date").val();
-            window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority;
+            var sp_desc = $("#sp_desc").val();
+            var count = $("#count").val();
+            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;
         });
  
  
@@ -380,7 +408,8 @@
             var start_date = $("#start_date").val();
             var end_date = $("#end_date").val();
             var sp_desc = $("#sp_desc").val();
-            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;
+            var count = $("#count").val();
+            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;
         });
         /*全选的操作*/
         $('#select_all').click(function () {
@@ -548,7 +577,8 @@
  
         /*时间插件*/
         $('.date').datetimepicker({
-            format: 'YYYY-MM-DD HH:mm:ss',
+//             format: 'YYYY-MM-DD HH:mm:ss',
+            format: 'YYYY-MM-DD',
             locale: "zh-CN",
             toolbarPlacement: 'bottom',
             showClear: true,