点播审核模块优化

王言钊
1 parent f27a09d9
Showing 4 changed files with 27 additions and 29 deletions
src/main/java/com/cnlive/shenhe/controller/ShyActivityController.java
src/main/java/com/cnlive/shenhe/serviceImpl/ShyActivityImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/resources/templates/page/activity.html
@@ -15,6 +15,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import java.util.Date;
+import java.util.List;
 /**
@@ -64,6 +65,10 @@ public class ShyActivityController {
     @GetMapping("/page")
     public String getShyActivity(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, Model model, String activity, String exempt_from_trial) {
         PageInfo<ShyActivity> shyActivityPageInfo = shyActivityImpl.selectByExample(pageNum, pageSize, activity, exempt_from_trial);
+        List<ShyActivity> list = shyActivityPageInfo.getList();
+        for (ShyActivity shyActivity : list) {
+            model.addAttribute("shyActivity",shyActivity);
+        }
         model.addAttribute("ShyActivitylist", shyActivityPageInfo);
         return "page/activity.html";
     }
 package com.cnlive.shenhe.serviceImpl;
+import com.cnlive.shenhe.dto.ShyActivityDTO;
 import com.cnlive.shenhe.entity.ShyActivity;
 import com.cnlive.shenhe.mapper.ShyActivityMapper;
 import com.cnlive.shenhe.utils.CommonUtils;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 import tk.mybatis.mapper.entity.Example;
+import java.security.PublicKey;
 import java.util.Date;
 import java.util.List;
@@ -68,12 +72,11 @@ public class ShyActivityImpl {
     /**
      * 查询活动
-     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    public PageInfo<ShyActivity> selectByExample(Integer pageNum, Integer pageSize, String activity, String exemptFromTrial) {
+    public PageInfo<ShyActivity> selectByExample(Integer pageNum, Integer pageSize,String activity,String exempt_from_trial) {
         Example example = new Example(ShyActivity.class);
         //如果为空 按照倒序排序  分页查询所有
         //以创建时间为条件进行倒序
@@ -82,8 +85,8 @@ public class ShyActivityImpl {
         Example.Criteria criteria = example.createCriteria();
         // 如果查询条件不为空  按照条件走模糊查询
-        if (CommonUtils.isNotEmpty(exemptFromTrial)) {
-            criteria.andLike("exemptFromTrial", "%" + exemptFromTrial + "%");
+        if (CommonUtils.isNotEmpty(exempt_from_trial)) {
+            criteria.andLike("exempt_from_trial", "%" + exempt_from_trial + "%");
         }
         // 如果查询条件不为空  按照条件走模糊查询
         if (CommonUtils.isNotEmpty(activity)) {
@@ -122,8 +122,6 @@ 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");
                 enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
             } catch (ParseException e) {
@@ -159,12 +157,18 @@ public class VideosServiceImpl {
             }
         }
-        if (CommonUtils.isNotEmpty(source) && !"moment".equals(source)) {
+
+        if (CommonUtils.isNotEmpty(source) && !"22".equals(source) && !"102".equals(source)) {
             criteria.andEqualTo("source", source);
             criteria2.andEqualTo("source", source);
-        } else if (CommonUtils.isNotEmpty(source) && "moment".equals(source)) {
+        } else if (CommonUtils.isNotEmpty(source) && "22".equals(source)) {
             criteria.andEqualTo("category", source);
             criteria2.andEqualTo("category", source);
+        } else if (CommonUtils.isNotEmpty(source) && "102".equals(source)) {
+            criteria.andEqualTo("source", "102".equals(source) ? 0 : source);
+            criteria2.andEqualTo("source", "102".equals(source) ? 0 : source);
+            boolean equals = "102".equals(source);
+            System.out.println(equals);
         }
         if (CommonUtils.isNotEmpty(video_user_id)) {
@@ -296,8 +300,6 @@ 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");
                 enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
             } catch (ParseException e) {
@@ -470,7 +472,7 @@ public class VideosServiceImpl {
         //审核类型，1:免审，2:机审，3:人工审
         Integer shenheType = 3;
         //如果当前sp是免审sp
-        if (sites.contains(shyVideo.getSpid()) || shyActivities.contains(shyVideo.getSource())){
+        if (sites.contains(shyVideo.getSpid()) || shyActivities.contains(shyVideo.getSource())) {
             //免审
             shenheType = 1;
         } else {
@@ -116,8 +116,10 @@
                                     <label for="sp_id" class="control-label cb-toolbar"
                                            style="font-size: 15px; top: 8px; font-weight: 100;">是否审核:</label>
                                     <div class="col-sm-7" style="padding: 0;">
-                                        <select class="form-control" id="exempt_from_trial_query" name="exempt_from_trial">
-                                            <option value="" name="-选择审核类型-">-选择审核类型-</option>
+
+                                        <select class="form-control" id="exempt_from_trial_query"
+                                                name="exempt_from_trial">
+                                            <option value="" name="-全部审免类型-" th:selected="selected">-全部审核类型-</option>
                                             <option value="0" name="未审核">未审免</option>
                                             <option value="1" name="已经审核">已经审免</option>
                                         </select>
@@ -193,7 +195,6 @@
                                                 14:27:17
                                             </td>
-
                                             <td style="text-align: center; width: 10%;">
                                                 <span>&nbsp;</span>
                                                 <a class="edit"
@@ -203,9 +204,9 @@
                                                 <span>&nbsp;</span>
                                                 <a class="delete" th:href="'javascript:deleted('+${ShyActivity.id}+')'">
                                                     <button class="btn btn-danger btn-xs">删除</button>
-                                                </a><span> </span><span>&nbsp;</span></td>
+                                                </a><span> </span><span>&nbsp;</span>
+                                            </td>
                                         </tr>
-
                                         </tbody>
                                     </table>
                                 </div>
@@ -309,11 +310,6 @@
                                     <option value="0" name="未审核">未审免</option>
                                     <option value="1" name="已经审核">已经审免</option>
                                 </select>
-
-
-                                <!--                                <input class="form-control" style="width:40%;" type="text" value=""-->
-                                <!--                                       id="exempt_from_trial"-->
-                                <!--                                       name="exempt_from_trial">-->
                             </div>
                         </div>
@@ -358,12 +354,6 @@
                         <div class="form-group">
                             <label class="control-label col-sm-3" style="font-size: 15px;">审核类型:</label>
                             <div class="col-sm-9" style="margin-top: -5px;margin-bottom: 20px;">
-                                <!--                                <select class="" id="exempt_from_trial1" name="exempt_from_trial">-->
-                                <!--                                    <option value="" name="选择审核类型">审核类型</option>-->
-                                <!--                                    <option value="0" name="未审核">未审核</option>-->
-                                <!--                                    <option value="1" name="已经审核">已经审核</option>-->
-                                <!--                                </select>-->
-
                                 <input class="form-control" style="width:40%;" type="text" value="0"
                                        id="exempt_from_trial1"
                                        name="exempt_from_trial">
@@ -430,10 +420,8 @@
             $("#id1").val("");
             $("#activity1").val("");
             $("#activity1").removeAttr("readonly");
-
             $("#exempt_from_trial1").val(exempt_from_trial);
             $("#exempt_from_trial1").attr("readonly", "true");
-
             $(".write_check input").prop("checked", false);
             $("#redirect_url1").val(location.pathname + location.search);
             $("#myModalLabel1").text("添加活动名称");