Merge branch 'dev'

徐近程
2 parents 3646e745 31b25e6a
Showing 3 changed files with 45 additions and 11 deletions
src/main/java/com/cnlive/shenhe/controller/ContentController.java
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java
src/main/resources/templates/page/content.html
@@ -61,13 +61,17 @@ public class ContentController extends BaseController {
     /**
      * 图文列表
-     * 
+     *
      * @param model
      * @param title
+     * @param contentId
+     * @param content_tag
      * @param start_date
      * @param end_date
      * @param receive_status
      * @param sp_desc
+     * @param source
+     * @param author
      * @param page
      * @param pageSize
      * @param orderByClause
@@ -76,7 +80,7 @@ public class ContentController extends BaseController {
      */
     @GetMapping("/page")
     public String getPage(Model model,  String title,String contentId, String content_tag,
-                          String start_date, String end_date, Integer receive_status, String sp_desc,
+                          String start_date, String end_date, Integer receive_status, String sp_desc,String source,String author,
                           Integer page, Integer pageSize, String orderByClause, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if(CommonUtils.isNull(sessionUser)){
@@ -112,7 +116,7 @@ public class ContentController extends BaseController {
             } catch (Exception e) {
             }
         }
-        PageInfo<ShyContent> contentPage = contentService.getPage( title,content_tag,contentId,  sDate, eDate, receive_status, null, page, pageSize, orderByClause, spid, userId);
+        PageInfo<ShyContent> contentPage = contentService.getPage( title,source,author,content_tag,contentId,  sDate, eDate, receive_status, null, page, pageSize, orderByClause, spid, userId);
         List<ShyContent> list = contentPage.getList();
         if (!list.isEmpty()) {
             for (ShyContent content : list) {
@@ -104,7 +104,7 @@ public class ContentServiceImpl {
         return shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
     }
-    public PageInfo<ShyContent> getPage( String title,String content_tag,String contentId,  Date start_date, Date end_date,  Integer receive_status, String updater, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId) {
+    public PageInfo<ShyContent> getPage( String title,String source,String author,String content_tag,String contentId,  Date start_date, Date end_date,  Integer receive_status, String updater, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId) {
         Example example = new Example(ShyContent.class);
         Example.Criteria criteria = example.createCriteria();
         if (CommonUtils.isNotEmpty(orderByClause)) {
@@ -121,6 +121,12 @@ public class ContentServiceImpl {
         if (CommonUtils.isNotEmpty(title)) {
             criteria.andLike("title", "%" + title + "%");
         }
+        if (CommonUtils.isNotEmpty(source)) {
+            criteria.andEqualTo("source",source);
+        }
+        if (CommonUtils.isNotEmpty(author)) {
+            criteria.andEqualTo("author",author);
+        }
         if (CommonUtils.isNotEmpty(updater)) {
             criteria.andEqualTo("updater", updater);
         }
@@ -85,6 +85,24 @@
                                     </div>
                                 </div>
+                                <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 23%;float: left;">
+                                    <div class="col-md-5" style="padding: 0;width: 100%;">
+                                        <label for="source" class="control-label cb-toolbar">来源（昵称）:</label>
+                                        <div class="col-sm-9" style="padding: 0;">
+                                            <input class="form-control" type="text" value="" id="source">
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 23%;float: left;">
+                                    <div class="col-md-5" style="padding: 0;width: 100%;">
+                                        <label for="author" class="control-label cb-toolbar">作者（sid）:</label>
+                                        <div class="col-sm-9" style="padding: 0;">
+                                            <input class="form-control" type="text" value="" id="author">
+                                        </div>
+                                    </div>
+                                </div>
+
                                 <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="content_tag" class="control-label cb-toolbar">标签:</label>
@@ -129,13 +147,15 @@
                                                 <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}">
+
+                                        <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 class="col-md-6" style="padding: 0;width: 20%;" th:if="${session.sessionUser.spid==0}">
+
+                                        <div class="col-md-6" style="padding: 0;width: 20%;" th:if="${session.sessionUser.spid==0}">
                                             <label for="contentId" class="control-label cb-toolbar">图文发布id:</label>
                                             <div class="col-sm-5" style="padding: 0;">
                                                 <input class="form-control" type="text" value="" id="contentId">
@@ -408,6 +428,8 @@
         }
         var title = "";
+        var source = "";
+        var author = "";
         var start_date ="";
         var end_date = "";
         var sp_desc ="";
@@ -417,6 +439,8 @@
         function updateValue(){
         	title = $("#video_titleID").val();
+            source = $("#source").val();
+            author = $("#author").val();
             start_date = $("#start_date").val();
             end_date = $("#end_date").val();
             var spId=[[${session.sessionUser.spid}]];
@@ -433,32 +457,32 @@
         function quanbu() {
         	updateValue();
-            window.location.href = "/content/page?title=" + title + "&start_date=" + start_date + "&end_date=" + end_date +  "&sp_desc=" + sp_desc+"&pageSize="+count+"&contentId="+contentId+"&content_tag="+content_tag;
+            window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date +  "&sp_desc=" + sp_desc+"&pageSize="+count+"&contentId="+contentId+"&content_tag="+content_tag;
         }
         //全部待领
         $('#daishen').click(function () {
         	updateValue();
             var receive_status = 0;
-            window.location.href = "/content/page?title=" + title + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc+"&pageSize="+count+"&contentId="+contentId+"&content_tag="+content_tag;
+            window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc+"&pageSize="+count+"&contentId="+contentId+"&content_tag="+content_tag;
         });
         //我的待审核
         $('#Mydaishen').click(function () {
         	updateValue();
             var receive_status = 1;
-            window.location.href = "/content/page?title=" + title + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc+"&pageSize="+count+"&contentId="+contentId+"&content_tag="+content_tag;
+            window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc+"&pageSize="+count+"&contentId="+contentId+"&content_tag="+content_tag;
         });
         //我的已审核
         $('#yishen').click(function () {
         	updateValue();
             var receive_status = 2;
-            window.location.href = "/content/page?title=" + title + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc+"&pageSize="+count+"&contentId="+contentId+"&content_tag="+content_tag;
+            window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc+"&pageSize="+count+"&contentId="+contentId+"&content_tag="+content_tag;
         });
         //查询
         $('#videos_query').click(function () {
-            window.location.href = "/content/page?title=" + title + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status="  + "&sp_desc=" + sp_desc+"&pageSize="+count+"&contentId="+contentId+"&content_tag="+content_tag;
+            window.location.href = "/content/page?title=" + title +"&source=" + source + "&author=" + author +  "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status="  + "&sp_desc=" + sp_desc+"&pageSize="+count+"&contentId="+contentId+"&content_tag="+content_tag;
         });
         /*全选的操作*/
         $('#select_all').click(function () {