优化活动管理模块及点播模块

王言钊
1 parent 1add0887
Showing 5 changed files with 88 additions and 74 deletions
src/main/java/com/cnlive/shenhe/mapper/ShyActivityMapper.java
src/main/java/com/cnlive/shenhe/serviceImpl/ShyActivityImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/resources/mapper/ShyActivityMapper.xml
src/main/resources/templates/page/activity.html
@@ -22,4 +22,11 @@ public interface ShyActivityMapper extends Mapper&lt;ShyActivity&gt; {
      * @return
      */
     ShyActivity selectById(@Param("id")Integer id);
+
+    /**
+     * 根据 source 查询审核类型
+     * @param id
+     * @return
+     */
+    Integer selectBySource(@Param("id")Integer id);
 }
 \ No newline at end of file
@@ -40,7 +40,7 @@ public class ShyActivityImpl {
         Date date = new Date();
         shyActivity.setCreate_time(date);
         shyActivity.setUpdate_time(date);
-        shyActivity.setExempt_from_trial(0);
+        shyActivity.setExempt_from_trial(3);
         int i = shyActivityMapper.insertSelective(shyActivity);
         return i;
     }
@@ -123,12 +123,21 @@ public class ShyActivityImpl {
         List<ShyActivity> shyActivities = shyActivityMapper.selectAll();
         return shyActivities;
     }
+
     /**
      * 根据id查询单个对象
      */
-    public ShyActivity selectById(Integer id){
+    public ShyActivity selectById(Integer id) {
         ShyActivity shyActivity = shyActivityMapper.selectById(id);
         return shyActivity;
     }
+    /**
+     * 根据source查询审核类型
+     */
+    public Integer selectBySource(Integer id) {
+        Integer shtype = shyActivityMapper.selectBySource(id);
+        return shtype;
+    }
+
 }
@@ -6,7 +6,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.dto.VideosDTO;
-import com.cnlive.shenhe.entity.*;
+import com.cnlive.shenhe.entity.ShyUsers;
+import com.cnlive.shenhe.entity.ShyUsersfree;
+import com.cnlive.shenhe.entity.ShyVideos;
+import com.cnlive.shenhe.entity.ShyYidun;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.mapper.ShyVideosMapper;
 import com.cnlive.shenhe.utils.*;
@@ -22,7 +25,6 @@ import org.springframework.util.StringUtils;
 import tk.mybatis.mapper.entity.Example;
 import java.text.ParseException;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -457,53 +459,42 @@ public class VideosServiceImpl {
     public void getShenheType(ShyVideos shyVideo) {
         //获取点播免审sp
         List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_VIDEO);
-        List<Integer> shyActivities = shyActivityImpl.selectByExample(CommonConst.AUDIT_TYPE_FREE);
-        logger.info("免审渠道列表:{}====sites:{}", JSON.toJSONString(shyActivities), sites.toString());
+        // List<Integer> shyActivities = shyActivityImpl.selectByExample(CommonConst.AUDIT_TYPE_FREE);
+        logger.info("====sites:{}", sites.toString());
         String source = shyVideo.getSource();
+        // 根据source 查询审核类型
+        Integer shType = shyActivityImpl.selectBySource(StringUtils.isEmpty(source) ? 0 : Integer.valueOf(source));
+
+        ShyUsersfree shyUserfree = null;
+        //如果用户id存在
+        if (CommonUtils.isNotEmpty(shyVideo.getVideo_user_id())) {
+            shyUserfree = usersfreeServiceImpl.selectUser(shyVideo.getSpid(), shyVideo.getCategory(), shyVideo.getVideo_user_id());
+        }
         //初始化一个审核状态
         //审核类型，1:免审，2:机审，3:人工审
         Integer shenheType = CommonConst.AUDIT_TYPE_USER;
-        //如果当前sp是免审sp  source有传空的时候 默认给0
-        if (sites.contains(shyVideo.getSpid()) || shyActivities.contains(StringUtils.isEmpty(source) ? "0" : Integer.valueOf(source))) {
+        //如果当前sp是免审sp  source有传空的时候 默认给0                                             //如果存在免审用户
+        if (sites.contains(shyVideo.getSpid()) || shType.equals(CommonConst.AUDIT_TYPE_FREE) || CommonUtils.isNotNull(shyUserfree)) {
             logger.info("进入已经免审渠道:{}", source);
             //免审
             shenheType = CommonConst.AUDIT_TYPE_FREE;
-        } else if ("10000".equals(source)) {
-            //机审
-            shenheType = CommonConst.AUDIT_TYPE_MACHANE;
-        } else {
+        }  else {
             //如果栏目是“目击者”
             if (CommonUtils.isNotEmpty(shyVideo.getCategory()) && shyVideo.getCategory().equals(CommonConst.CATEGORY_WITNESS)) {
-                //如果用户id存在
-                if (CommonUtils.isNotEmpty(shyVideo.getVideo_user_id())) {
-                    ShyUsersfree shyUserfree = usersfreeServiceImpl.selectUser(shyVideo.getSpid(), shyVideo.getCategory(), shyVideo.getVideo_user_id());
-                    //如果存在免审用户
-                    if (CommonUtils.isNotNull(shyUserfree)) {
-                        //免审
-                        shenheType = CommonConst.AUDIT_TYPE_FREE;
-                    } else {
-                        //用户不免审
-                        //机审
-                        shenheType = CommonConst.AUDIT_TYPE_MACHANE;
-                    }
-                } else {
-                    //如果用户id不存在
-                    //机审
-                    shenheType = CommonConst.AUDIT_TYPE_MACHANE;
-                }
-                if (manualReview(shyVideo)) {
-                    //给审核变量 赋值人工审核
-                    shenheType = CommonConst.AUDIT_TYPE_USER;
+                // 机审
+                shenheType = CommonConst.AUDIT_TYPE_MACHANE;
+                // 如果是人工审
+                if (shType.equals(CommonConst.AUDIT_TYPE_USER)){
+                    shenheType = shType;
                 }
-            }
-            //如果栏目是朋友圈
-            if (CommonUtils.isNotEmpty(shyVideo.getCategory()) && shyVideo.getCategory().equals(CommonConst.CATEGORY_MOMENT)) {
-                //免审
+                // 如果栏目是朋友圈
+            } else if (CommonUtils.isNotEmpty(shyVideo.getCategory()) && shyVideo.getCategory().equals(CommonConst.CATEGORY_MOMENT)) {
+                // 免审
                 shenheType = CommonConst.AUDIT_TYPE_FREE;
+            }else {
+                shenheType = shType;
             }
         }
-
-
         logger.info("id : {}  审核类型: {}", shyVideo.getVideo_id(), shenheType);
         shyVideo.setShenhe_type(shenheType);
     }
@@ -514,15 +505,15 @@ public class VideosServiceImpl {
      * @param shyVideo
      * @return
      */
-    public boolean manualReview(ShyVideos shyVideo) {
-        String[] list = {"41", "42", "43", "44", "45", "46", "47","515","516","517","518"};
-        List<String> asList = Arrays.asList(list);
-        if (asList.contains(shyVideo.getSource())) {
-            //人工审 返回true
-            return true;
-        }
-        return false;
-    }
+    //public boolean manualReview(ShyVideos shyVideo) {
+    //    String[] list = {"41", "42", "43", "44", "45", "46", "47","515","516","517","518"};
+    //    List<String> asList = Arrays.asList(list);
+    //    if (asList.contains(shyVideo.getSource())) {
+    //        //人工审 返回true
+    //        return true;
+    //    }
+    //    return false;
+    //}
     /**
      * 人工审核拒绝方法
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cnlive.shenhe.mapper.ShyActivityMapper">
-  <resultMap id="BaseResultMap" type="com.cnlive.shenhe.entity.ShyActivity">
-    <!--
-      WARNING - @mbg.generated
-    -->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="activity" jdbcType="VARCHAR" property="activity" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="create_time" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="update_time" />
-    <result column="exempt_from_trial" jdbcType="INTEGER" property="exempt_from_trial" />
-  </resultMap>
-  <select id="selectAllByExempt_from_trial" resultType="java.lang.Integer">
-    select id from shy_activity where exempt_from_trial=${exempt_from_trial};
-  </select>
+    <resultMap id="BaseResultMap" type="com.cnlive.shenhe.entity.ShyActivity">
+        <!--
+          WARNING - @mbg.generated
+        -->
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="activity" jdbcType="VARCHAR" property="activity"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="create_time"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="update_time"/>
+        <result column="exempt_from_trial" jdbcType="INTEGER" property="exempt_from_trial"/>
+    </resultMap>
+    <select id="selectAllByExempt_from_trial" resultType="java.lang.Integer">
+        select id from shy_activity where exempt_from_trial=${exempt_from_trial};
+    </select>
     <select id="selectById" resultType="com.cnlive.shenhe.entity.ShyActivity">
-      select * from shy_activity where id=${id}
+        select * from shy_activity where id=${id}
+    </select>
+    <select id="selectBySource" resultType="java.lang.Integer">
+        select  exempt_from_trial  from shy_activity where id=${id};
     </select>
@@ -114,13 +114,17 @@
                                 </div>
                                 <div class="col-md-5 pull-right" style="padding: 0; width: 15%;">
                                     <label for="sp_id" class="control-label cb-toolbar"
-                                           style="font-size: 15px; top: 8px; font-weight: 100;">是否审核:</label>
+                                           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="">--全部免审类型--</option>
-                                            <option value="0" name="非免审" th:selected="${exempt_from_trial ==0}" >非免审</option>
-                                            <option value="1" name="免审" th:selected="${exempt_from_trial ==1}" >免审</option>
+                                            <option value="">--审核类型--</option>
+                                            <option value="1" name="免审" th:selected="${exempt_from_trial ==1}">免审
+                                            </option>
+                                            <option value="2" name="机审" th:selected="${exempt_from_trial ==2}">机审
+                                            </option>
+                                            <option value="3" name="人工审" th:selected="${exempt_from_trial ==3}">人工审
+                                            </option>
                                         </select>
                                     </div>
                                 </div>
@@ -188,10 +192,10 @@
                                                 14:27:17
                                             </td>
-                                            <td style="text-align: center; width: 12%;"
-                                                th:text="${ShyActivity.exempt_from_trial} == 1 ? 免审 : 非免审">
-                                                2016-08-03
-                                                14:27:17
+                                            <td style="text-align: center; width: 12%;">
+                                                <span th:if="${ShyActivity.exempt_from_trial==1}">免审</span>
+                                                <span th:if="${ShyActivity.exempt_from_trial==2}">机审</span>
+                                                <span th:if="${ShyActivity.exempt_from_trial==3}">人工审</span>
                                             </td>
                                             <td style="text-align: center; width: 10%;">
@@ -219,8 +223,7 @@
                                             <option value="10" th:selected="${ShyActivitylist.pageSize==10}">10</option>
                                             <option value="20" th:selected="${ShyActivitylist.pageSize==20}">20</option>
                                             <option value="50" th:selected="${ShyActivitylist.pageSize==50}">50</option>
-                                            <option value="100" th:selected="${ShyActivitylist.pageSize==100}">100
-                                            </option>
+                                            <option value="100" th:selected="${ShyActivitylist.pageSize==100}">100</option>
                                         </select> <span class="pagination-info">条记录</span>
                                     </div>
                                     <div class="pull-right pagination">
@@ -306,8 +309,9 @@
                                 <select class="" id="exempt_from_trial" name="exempt_from_trial">
                                     <option value="" name="-选择审核类型-">-选择审核类型-</option>
-                                    <option value="0" name="非免审">非免审</option>
-                                    <option value="1" name="免审">免审</option>
+                                    <option value="1" name="非免审">免审</option>
+                                    <option value="2" name="免审">机审</option>
+                                    <option value="3" name="免审">人工审</option>
                                 </select>
                             </div>
                         </div>
@@ -396,7 +400,7 @@
         //打开编辑窗口
         function edit(Id, activity, exempt_from_trial) {
-            $("#myModalLabel").text("编辑活动名称是否免审");
+            $("#myModalLabel").text("编辑活动审核类型");
             $("#id").val(Id);
             $("#activity").val(activity);
             $("#activity").attr("readonly", "true");