Merge branch 'dev'

王言钊
2 parents 0ed74930 61d1ddab
Showing 15 changed files with 168 additions and 197 deletions
src/main/java/com/cnlive/shenhe/api/AvsampleCallBackControllerApi.java
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
src/main/java/com/cnlive/shenhe/api/LiveApplyControllerApi.java
src/main/java/com/cnlive/shenhe/api/LiveControllerApi.java
src/main/java/com/cnlive/shenhe/mapper/ShyActivityMapper.java
src/main/java/com/cnlive/shenhe/serviceImpl/AudioServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/ChannelServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/LiveApplyServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/ShyActivityImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/TopicServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/resources/mapper/ShyActivityMapper.xml
src/main/resources/templates/page/activity.html
@@ -70,10 +70,8 @@ public class AvsampleCallBackControllerApi {
         }
         return result;
     }
-
-    @GetMapping("/getGame")
-    public String getGame() {
-        return "html/game.html";
-    }
-
+    //@GetMapping("/getGame")
+    //public String getGame() {
+    //    return "html/game.html";
+    //}
 }
@@ -12,9 +12,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.Date;
 import java.util.List;
@@ -268,15 +270,12 @@ public class ContentControllerApi {
             return new ResponseBean(ErrorEnum.ERROR);
         }
     }
-
-    @GetMapping("/detail/{id}.html")
-    public Object getContentDetail(Model model, @PathVariable Integer id) {
-        System.out.println("数美送审页面开始进入");
-        ShyContent content = contentService.selectByPrimaryKey(id);
-        model.addAttribute("contentText", content.getContent_text());
-        model.addAttribute("contentTitle", content.getTitle());
-        return "html/contentPage.html";
-    }
-
-
+    //@GetMapping("/detail/{id}.html")
+    //public Object getContentDetail(Model model, @PathVariable Integer id) {
+    //    System.out.println("数美送审页面开始进入");
+    //    ShyContent content = contentService.selectByPrimaryKey(id);
+    //    model.addAttribute("contentText", content.getContent_text());
+    //    model.addAttribute("contentTitle", content.getTitle());
+    //    return "html/contentPage.html";
+    //}
 }
@@ -61,9 +61,9 @@ public class LiveApplyControllerApi {
         //直播主题
         String theme = json.getString("theme");
         //商务模式：0免费  1收费
-        Integer businessModel = Integer.parseInt(json.getString("businessModel"));
+        Integer businessModel = json.getInteger("businessModel");
         //内容属性：1商业类活动 0非商业活动
-        Integer contentProperty = Integer.parseInt(json.getString("contentProperty"));
+        Integer contentProperty = json.getInteger("contentProperty");
         //内容简述
         String simpleContent = json.getString("simpleContent");
         //直播类型
 package com.cnlive.shenhe.api;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.entity.ShyLive;
 import com.cnlive.shenhe.serviceImpl.LiveServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonConstStates;
 import com.cnlive.shenhe.utils.CommonUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import java.sql.Timestamp;
 import java.util.Date;
@@ -47,7 +47,7 @@ public class LiveControllerApi {
         //直播活动名称
         String activityName = json.getString("activityName");
         //直播活动状态
-        Integer activityStatus = Integer.parseInt(json.getString("activityStatus"));
+        Integer activityStatus = json.getInteger("activityStatus");
         //直播频道id
         String channelId = json.getString("channelId");
         //直播频道id
@@ -57,13 +57,11 @@ public class LiveControllerApi {
         //m3u8直播流
         String hlsUrl = json.getString("hlsUrl");
         //spid
-        Integer spId = Integer.parseInt(json.getString("spId"));
+        Integer spId = json.getInteger("spId");
         //回调地址
         String callback = json.getString("callback");
-
-
         //优先级
-        Integer isHot = Integer.parseInt(json.getString("priority"));
+        Integer isHot = json.getInteger("priority");
         //封面
         String coverImgUrl = json.getString("coverImgUrl");
         //活动描述
@@ -279,30 +277,27 @@ public class LiveControllerApi {
         }
         return map;
     }
-
-
-    @RequestMapping(value = "callbackLiveResult", method = RequestMethod.POST)
-    @ResponseBody
-    public void getFilterVideoResult(@RequestBody String json) {
-        logger.info("数美视频过滤回调,json:{}", json);
-        if (StringUtils.isNotEmpty(json)) {
-            JSONObject jsonObj = JSON.parseObject(json);
-            JSONObject resultObj = jsonObj.getJSONObject("result");
-            Integer code = resultObj.getInteger("code");
-            if (code != null && code == 1100) {
-                String riskLevel = resultObj.getString("riskLevel");
-                if ("PASS".equals(riskLevel)) {
-
-                }
-                if ("REJECT".equals(riskLevel)) {
-                    JSONObject detail = resultObj.getJSONObject("detail");
-                    logger.info("数美视频回调--REJECT,detail:{}", detail);
-                }
-                if ("REVIEW".equals(riskLevel)) {
-                }
-            } else {
-            }
-        }
-    }
-
+    //@RequestMapping(value = "callbackLiveResult", method = RequestMethod.POST)
+    //@ResponseBody
+    //public void getFilterVideoResult(@RequestBody String json) {
+    //    logger.info("数美视频过滤回调,json:{}", json);
+    //    if (StringUtils.isNotEmpty(json)) {
+    //        JSONObject jsonObj = JSON.parseObject(json);
+    //        JSONObject resultObj = jsonObj.getJSONObject("result");
+    //        Integer code = resultObj.getInteger("code");
+    //        if (code != null && code == 1100) {
+    //            String riskLevel = resultObj.getString("riskLevel");
+    //            if ("PASS".equals(riskLevel)) {
+    //
+    //            }
+    //            if ("REJECT".equals(riskLevel)) {
+    //                JSONObject detail = resultObj.getJSONObject("detail");
+    //                logger.info("数美视频回调--REJECT,detail:{}", detail);
+    //            }
+    //            if ("REVIEW".equals(riskLevel)) {
+    //            }
+    //        } else {
+    //        }
+    //    }
+    //}
 }
@@ -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
@@ -210,51 +210,38 @@ public class AudioServiceImpl {
     public PageInfo<ShyAudio> getListContent(AudioDTO audioDTO) {
         Example example = new Example(ShyAudio.class);
         Example.Criteria criteria = example.createCriteria();
-        Example.Criteria criteria2 = example.createCriteria();
         if (CommonUtils.isNotEmpty(audioDTO.getOrderByClause())) {
             example.setOrderByClause(audioDTO.getOrderByClause());
         }
         if (CommonUtils.isNotEmpty(audioDTO.getStart_date()) && CommonUtils.isNotEmpty(audioDTO.getEnd_date())) {
             criteria.andGreaterThanOrEqualTo("createTime", audioDTO.getStart_date());
-            criteria2.andGreaterThanOrEqualTo("createTime", audioDTO.getStart_date());
             criteria.andLessThanOrEqualTo("createTime", audioDTO.getEnd_date());
-            criteria2.andLessThanOrEqualTo("createTime", audioDTO.getEnd_date());
         }
         if (CommonUtils.isNotEmpty(audioDTO.getVideo_title())) {
             criteria.andLike("audioTitle", "%" + audioDTO.getVideo_title() + "%");
-            criteria2.andLike("audioTitle", "%" + audioDTO.getVideo_title() + "%");
         }
-
         if (CommonUtils.isNotEmpty(audioDTO.getVideo_priority())) {
             criteria.andEqualTo("priority", audioDTO.getVideo_priority());
-            criteria2.andEqualTo("priority", audioDTO.getVideo_priority());
         }
-
         if (CommonUtils.isNotNull(audioDTO.getSpid())) {
             criteria.andEqualTo("spId", audioDTO.getSpid());
-            criteria2.andEqualTo("spId", audioDTO.getSpid());
         } else if (CommonUtils.isNotEmpty(audioDTO.getSp_Id())) {
             criteria.andEqualTo("spId", audioDTO.getSp_Id());
-            criteria2.andEqualTo("spId", audioDTO.getSp_Id());
         }
-
         //领取状态 0-未领取 1-已领取
         if (CommonUtils.isNotNull(audioDTO.getReceive())) {
             criteria.andEqualTo("receive", audioDTO.getReceive());
-            criteria2.andEqualTo("receive", audioDTO.getReceive());
             if (audioDTO.getReceive().equals(CommonConst.RECEIVE_AFTER)) {
                 criteria.andEqualTo("receive_user_id", audioDTO.getUserId());
-                criteria2.andEqualTo("receive_user_id", audioDTO.getUserId());
             }
         }
-
-        //审核状态 0-未审核 1-已审核 2-拒绝
+        //审核状态 0-未审核 1-已审核 2-拒绝 3-我的已审
+        //不是   我的已审 进来的，只查一种状态
         if (CommonUtils.isNotNull(audioDTO.getState()) && audioDTO.getState() != 3) {
             criteria.andEqualTo("state", audioDTO.getState());
+            //是 我的已审，查通过和拒绝的两种状态
         } else if (CommonUtils.isNotNull(audioDTO.getState()) && audioDTO.getState() == 3) {
-            criteria.andEqualTo("state", 1);
-            criteria2.andEqualTo("state", 2);
-            example.or(criteria2);
+            criteria.andBetween("state", CommonConst.AUDIT_SUCCESS,CommonConst.AUDIT_REFUSE);
         }
         //默认按上传时间倒序排序
@@ -99,10 +99,7 @@ public class ChannelServiceImpl {
             criteria.andEqualTo("shenhe_status", channelDTO.getShenhe_status());
             //是 我的已审，查通过和拒绝的两种状态
         } else if (CommonUtils.isNotNull(channelDTO.getShenhe_status()) && channelDTO.getShenhe_status() == 3) {
-            Example.Criteria criteria1 = example.createCriteria();
-            criteria1.orEqualTo("shenhe_status", CommonConst.AUDIT_SUCCESS);
-            criteria1.orEqualTo("shenhe_status", CommonConst.AUDIT_REFUSE);
-            example.and(criteria1);
+            criteria.andBetween("shenhe_status",CommonConst.AUDIT_SUCCESS,CommonConst.AUDIT_REFUSE);
         }
         PageHelper.startPage(channelDTO.getPage(), channelDTO.getPageSize(), true);
@@ -123,10 +123,7 @@ public class CommentsServiceImpl {
         if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() != 3) {
             criteria.andEqualTo("state", commentsDTO.getState());
         } else if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() == 3) {
-            Example.Criteria criteria1 = example.createCriteria();
-            criteria1.orEqualTo("state", CommonConst.AUDIT_SUCCESS);
-            criteria1.orEqualTo("state", CommonConst.AUDIT_REFUSE);
-            example.and(criteria1);
+            criteria.andBetween("state",CommonConst.AUDIT_SUCCESS,CommonConst.AUDIT_REFUSE);
         }
         PageHelper.startPage(commentsDTO.getPage(), commentsDTO.getPageSize(), true);
@@ -173,14 +170,12 @@ public class CommentsServiceImpl {
                 criteria.andEqualTo("receive_user_id", commentsDTO.getUserId());
             }
         }
-
+        //不是   我的已审 进来的，只查一种状态
         if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() != 3) {
             criteria.andEqualTo("state", commentsDTO.getState());
+            //是 我的已审，查通过和拒绝的两种状态
         } else if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() == 3) {
-            Example.Criteria criteria1 = example.createCriteria();
-            criteria1.orEqualTo("state", CommonConst.AUDIT_SUCCESS);
-            criteria1.orEqualTo("state", CommonConst.AUDIT_REFUSE);
-            example.and(criteria1);
+            criteria.andBetween("state",CommonConst.AUDIT_SUCCESS,CommonConst.AUDIT_REFUSE);
         }
         List<ShyComments> commentsList = shyCommentsMapper.selectByExample(example);
@@ -65,14 +65,15 @@ public class ContentServiceImpl {
     public List<ShyContent> findShyContentWithWebPage() {
         List checkParamList = new ArrayList();
-        checkParamList.add("content");
+        //checkParamList.add("content");
         checkParamList.add("moment");
         Example example = new Example(ShyContent.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andNotIn("content_tag", checkParamList);
         criteria.andEqualTo("shenhe_type", CommonConst.AUDIT_TYPE_MACHANE);
         criteria.andEqualTo("receive_status", CommonConst.RECEIVE_BEFORE);
-        return shyContentMapper.selectByExampleAndRowBounds(example, new RowBounds(0, 100));
+        List<ShyContent> ShyContent = shyContentMapper.selectByExampleAndRowBounds(example, new RowBounds(0, 100));
+        return ShyContent;
     }
     //***************************
@@ -242,7 +243,6 @@ public class ContentServiceImpl {
                 success = false;
                 return success;
             }
-
             //如果当前图文是朋友圈的视频，通知点播云
             if (CommonUtils.isNotEmpty(content.getContent_tag())
                     && "moment".equals(content.getContent_tag())
@@ -260,7 +260,6 @@ public class ContentServiceImpl {
                     }
                 }
             }
-
             // 设置图文状态为审核后的状态
             content.setContent_status(state);
             // 领取状态为已审核
@@ -281,7 +280,6 @@ public class ContentServiceImpl {
                 success = false;
             }
         }
-
         return success;
     }
@@ -358,22 +356,16 @@ public class ContentServiceImpl {
         //获取图文免审sp
         List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_CONTENT);
         //初始化一个审核状态
-        //审核类型，1:免审，2:机审，3:人工审
+        //审核类型，1:免审，2:机审，3:人工审  默认人工审
         Integer shenheType = CommonConst.AUDIT_TYPE_USER;
         //如果当前sp是免审sp
         if (sites.contains(spId)) {
             //免审
             shenheType = CommonConst.AUDIT_TYPE_FREE;
         } else {
-            if ("content".equals(ContentTag)) {
-                //免审
-                shenheType = CommonConst.AUDIT_TYPE_FREE;
-            } else if (ContentTag.startsWith("cms_") || ContentTag.startsWith("edu_")) {
+            if ("content".equals(ContentTag) || ContentTag.startsWith("cms_") || ContentTag.startsWith("edu_")) {
                 //机审
                 shenheType = CommonConst.AUDIT_TYPE_MACHANE;
-            } else {
-                //人工审
-                shenheType = CommonConst.AUDIT_TYPE_USER;
             }
         }
         return shenheType;
@@ -382,6 +374,7 @@ public class ContentServiceImpl {
     /**
      * 易盾网站过滤
      * 送审类型：1:文本 2:图片 3.网页 4:点播音频
+     *
      * @param shyContent
      * @return
      */
@@ -391,7 +384,14 @@ public class ContentServiceImpl {
             logger.info("审核云向易盾网站检测接口提交的url:{}", contentUrl);
             //调用易盾网站检测接口
             JSONObject jsonObject = YiDunAntiFraudUtil.submitYiDunUrl(contentUrl);
+
             if (jsonObject != null) {
+                Integer code = jsonObject.getInteger("code");
+                String msg = jsonObject.getString("msg");
+                if (code != 200) {
+                    // |0待发布 |1已发布 |2已下线
+                    boolean flag = callback(shyContent.getContent_id(), "易盾机审未通过："+msg, CommonConst.AUDIT_REFUSE, shyContent.getAuditor_id(), shyContent.getUpdater());
+                }
                 JSONObject result = jsonObject.getJSONObject("result");
                 String dataId = result.getString("dataId");
                 String taskId = result.getString("taskId");
@@ -127,10 +127,12 @@ public class LiveApplyServiceImpl {
         if (CommonUtils.isNotNull(liveApplyDTO.getSpid())) {
             criteria.andEqualTo("sp_id", liveApplyDTO.getSpid());
         }
+        //不是   我的已审 进来的，只查一种状态
         if (CommonUtils.isNotNull(liveApplyDTO.getShenhe_state()) && liveApplyDTO.getShenhe_state() != 3) {
             criteria.andEqualTo("shenhe_state", liveApplyDTO.getShenhe_state());
+            //是 我的已审，查通过和拒绝的两种状态
         } else if (CommonUtils.isNotNull(liveApplyDTO.getShenhe_state()) && liveApplyDTO.getShenhe_state() == 3) {
-            criteria.andNotEqualTo("shenhe_state", 0);
+            criteria.andBetween("shenhe_state",CommonConst.AUDIT_SUCCESS,CommonConst.AUDIT_REFUSE);
         }
         if (CommonUtils.isNotNull(liveApplyDTO.getReceive())) {
             criteria.andEqualTo("receive", liveApplyDTO.getReceive());
@@ -262,10 +264,12 @@ public class LiveApplyServiceImpl {
         if (CommonUtils.isNotNull(liveApplyDTO.getSpid())) {
             criteria.andEqualTo("sp_id", liveApplyDTO.getSpid());
         }
+        //不是   我的已审 进来的，只查一种状态
         if (CommonUtils.isNotNull(liveApplyDTO.getShenhe_state()) && liveApplyDTO.getShenhe_state() != 3) {
             criteria.andEqualTo("shenhe_state", liveApplyDTO.getShenhe_state());
+            //是 我的已审，查通过和拒绝的两种状态
         } else if (CommonUtils.isNotNull(liveApplyDTO.getShenhe_state()) && liveApplyDTO.getShenhe_state() == 3) {
-            criteria.andNotEqualTo("shenhe_state", 0);
+            criteria.andBetween("shenhe_state",CommonConst.AUDIT_SUCCESS,CommonConst.AUDIT_REFUSE);
         }
         if (CommonUtils.isNotNull(liveApplyDTO.getReceive())) {
             criteria.andEqualTo("receive", liveApplyDTO.getReceive());
@@ -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;
+    }
+
 }
@@ -122,12 +122,8 @@ public class TopicServiceImpl {
             criteria.andEqualTo("shenhe_status", topicDTO.getShenhe_status());
             //是 我的已审，查通过和拒绝的两种状态
         } else if (CommonUtils.isNotNull(topicDTO.getShenhe_status()) && topicDTO.getShenhe_status() == 3) {
-            Example.Criteria criteria1 = example.createCriteria();
-            criteria1.orEqualTo("shenhe_status", 1);
-            criteria1.orEqualTo("shenhe_status", 2);
-            example.and(criteria1);
+            criteria.andBetween("shenhe_status",CommonConst.AUDIT_SUCCESS,CommonConst.AUDIT_REFUSE);
         }
-
         PageHelper.startPage(topicDTO.getPage(), topicDTO.getPageSize(), true);
         List<ShyTopic> topicList = shyTopicMapper.selectByExample(example);
         PageInfo<ShyTopic> pageInfo = new PageInfo<>(topicList);
@@ -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;
@@ -115,7 +117,6 @@ public class VideosServiceImpl {
         logger.info("接受点播列表为，VideosDTO:{}", JSON.toJSONString(videosDTO));
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
-        Example.Criteria criteria2 = example.createCriteria();
         if (CommonUtils.isNotEmpty(videosDTO.getOrderByClause())) {
             example.setOrderByClause(videosDTO.getOrderByClause());
         }
@@ -128,73 +129,58 @@ public class VideosServiceImpl {
                 e.printStackTrace();
             }
             criteria.andGreaterThanOrEqualTo("created_at", videosDTO.getStart_date());
-            criteria2.andGreaterThanOrEqualTo("created_at", videosDTO.getStart_date());
             criteria.andLessThanOrEqualTo("created_at", videosDTO.getEnd_date());
-            criteria2.andLessThanOrEqualTo("created_at", videosDTO.getEnd_date());
         }
         if (CommonUtils.isNotEmpty(videosDTO.getVideo_title())) {
             criteria.andLike("video_title", "%" + videosDTO.getVideo_title() + "%");
-            criteria2.andLike("video_title", "%" + videosDTO.getVideo_title() + "%");
         }
         if (CommonUtils.isNotEmpty(videosDTO.getVideo_priority())) {
             criteria.andEqualTo("video_priority", videosDTO.getVideo_priority());
-            criteria2.andEqualTo("video_priority", videosDTO.getVideo_priority());
         }
         if (CommonUtils.isNotEmpty(videosDTO.getVideo_id())) {
             criteria.andEqualTo("video_id", videosDTO.getVideo_id());
-            criteria2.andEqualTo("video_id", videosDTO.getVideo_id());
         }
         if (CommonUtils.isNotEmpty(videosDTO.getShen_auditor_id())) {
             if ("白名单".equals(videosDTO.getShen_auditor_id()) || "自动审核".equals(videosDTO.getShen_auditor_id())) {
                 criteria.andEqualTo("updater", videosDTO.getShen_auditor_id());
-                criteria2.andEqualTo("updater", videosDTO.getShen_auditor_id());
             } else {
                 criteria.andEqualTo("auditor_id", videosDTO.getShen_auditor_id());
-                criteria2.andEqualTo("auditor_id", videosDTO.getShen_auditor_id());
             }
         }
         if (CommonUtils.isNotEmpty(videosDTO.getSource()) && !"22".equals(videosDTO.getSource()) && !"102".equals(videosDTO.getSource())) {
             criteria.andEqualTo("source", videosDTO.getSource());
-            criteria2.andEqualTo("source", videosDTO.getSource());
         } else if (CommonUtils.isNotEmpty(videosDTO.getSource()) && "22".equals(videosDTO.getSource())) {
             criteria.andEqualTo("category", "moment");
-            criteria2.andEqualTo("category", "moment");
         } else if (CommonUtils.isNotEmpty(videosDTO.getSource()) && "102".equals(videosDTO.getSource())) {
             criteria.andEqualTo("source", "102".equals(videosDTO.getSource()) ? "0" : videosDTO.getSource());
-            criteria2.andEqualTo("source", "102".equals(videosDTO.getSource()) ? "0" : videosDTO.getSource());
         }
         if (CommonUtils.isNotEmpty(videosDTO.getVideo_user_id())) {
             criteria.andEqualTo("video_user_id", videosDTO.getVideo_user_id());
-            criteria2.andEqualTo("video_user_id", videosDTO.getVideo_user_id());
         }
         if (CommonUtils.isNotNull(videosDTO.getSpid())) {
             criteria.andEqualTo("spid", videosDTO.getSpid());
-            criteria2.andEqualTo("spid", videosDTO.getSpid());
         } else if (CommonUtils.isNotEmpty(videosDTO.getSp_Id())) {
             criteria.andEqualTo("spid", videosDTO.getSp_Id());
-            criteria2.andEqualTo("spid", videosDTO.getSp_Id());
         }
         if (CommonUtils.isNotNull(videosDTO.getReceive())) {
             criteria.andEqualTo("receive", videosDTO.getReceive());
-            criteria2.andEqualTo("receive", videosDTO.getReceive());
             if (videosDTO.getReceive().equals(CommonConst.RECEIVE_AFTER)) {
                 criteria.andEqualTo("receive_user_id", videosDTO.getUserId());
-                criteria2.andEqualTo("receive_user_id", videosDTO.getUserId());
             }
         }
+        //不是   我的已审 进来的，只查一种状态
         if (CommonUtils.isNotNull(videosDTO.getState()) && videosDTO.getState() != 3) {
             criteria.andEqualTo("state", videosDTO.getState());
+            //是 我的已审，查通过和拒绝的两种状态
         } else if (CommonUtils.isNotNull(videosDTO.getState()) && videosDTO.getState() == 3) {
-            criteria.andEqualTo("state", 1);
-            criteria2.andEqualTo("state", 2);
-            example.or(criteria2);
+            criteria.andBetween("state", CommonConst.AUDIT_SUCCESS, CommonConst.AUDIT_REFUSE);
         }
         //默认按上传时间倒序排序
         example.setOrderByClause("created_at desc");
@@ -288,7 +274,6 @@ public class VideosServiceImpl {
             example.setOrderByClause(videosDTO.getOrderByClause());
         }
         if (CommonUtils.isNotEmpty(videosDTO.getStart_date()) && CommonUtils.isNotEmpty(videosDTO.getEnd_date())) {
-
             try {
                 videosDTO.setStart_date(String.valueOf(CommonUtils.parseDate(videosDTO.getStart_date(), "yyyy-MM-dd")));
                 videosDTO.setEnd_date(String.valueOf(CommonUtils.parseDate(videosDTO.getEnd_date(), "yyyy-MM-dd")));
@@ -457,53 +442,45 @@ 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 查询审核类型    source有传空的时候 默认给0
+        Integer shType = shyActivityImpl.selectBySource(StringUtils.isEmpty(source) ? 0 : Integer.valueOf(source));
+        logger.info("审核类型为:{}", shType);
+        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                         //如果审核类型为免审                                                              //如果存在免审用户
+        if (sites.contains(shyVideo.getSpid()) || (CommonUtils.isNotNull(shType) && CommonConst.AUDIT_TYPE_FREE.equals(shType)) || CommonUtils.isNotNull(shyUserfree)) {
             logger.info("进入已经免审渠道:{}", source);
             //免审
             shenheType = CommonConst.AUDIT_TYPE_FREE;
-        } else if ("10000".equals(source)) {
-            //机审
-            shenheType = CommonConst.AUDIT_TYPE_MACHANE;
         } 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_MACHANE;
+                // 如果是人工审
+                if (CommonConst.AUDIT_TYPE_USER.equals(shType)) {
                     shenheType = CommonConst.AUDIT_TYPE_USER;
                 }
-            }
-            //如果栏目是朋友圈
-            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 {
+                if (shType != null) {
+                    // 机审或者是人工审
+                    shenheType = shType;
+                }
             }
         }
-
-
         logger.info("id : {}  审核类型: {}", shyVideo.getVideo_id(), shenheType);
         shyVideo.setShenhe_type(shenheType);
     }
@@ -514,15 +491,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");