增加免审类型

郑超
1 parent d94a2113
Showing 2 changed files with 28 additions and 16 deletions
src/main/java/com/cnlive/shenhe/api/VideosControllerApi.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
@@ -122,7 +122,8 @@ public class VideosControllerApi {
             shyVideos.setReceive(CommonConst.RECEIVE_BEFORE);
             shyVideos.setReceive_user_id(null);
             shyVideos.setUpdated_at(CommonUtils.getCurrentTime());
-            videosService.getShenheType(shyVideos);//获取审核类型
+            //获取审核类型
+            videosService.getShenheType(shyVideos);
             boolean YorN = videosService.updateshyVideos(shyVideos);
             if (YorN == true) {
                 return new ResponseBean(ErrorEnum.SUCCESS);
 package com.cnlive.shenhe.serviceImpl;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
-import com.cnlive.shenhe.entity.*;
-import com.cnlive.shenhe.job.VideosJob;
+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.ShySitesMapper;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.mapper.ShyVideosMapper;
-import com.cnlive.shenhe.utils.*;
+import com.cnlive.shenhe.utils.AuditPass;
+import com.cnlive.shenhe.utils.CommonConst;
+import com.cnlive.shenhe.utils.CommonUtils;
+import com.cnlive.shenhe.utils.YiDunAntiFraudUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-
-
 import org.apache.ibatis.session.RowBounds;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,7 +27,9 @@ import tk.mybatis.mapper.entity.Example;
 import java.sql.Timestamp;
 import java.text.ParseException;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
 /**
  * @Auther: chenhao
@@ -109,7 +113,7 @@ public class VideosServiceImpl {
         return shyVideosMapper.updateByPrimaryKey(shyVideos);
     }
-    public PageInfo<ShyVideos> getListContent(String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, Integer spid, String userId, String sp_Id,String source,String video_user_id,String shen_auditor_id,String video_id) {
+    public PageInfo<ShyVideos> getListContent(String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, Integer spid, String userId, String sp_Id, String source, String video_user_id, String shen_auditor_id, String video_id) {
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
@@ -147,11 +151,11 @@ public class VideosServiceImpl {
             criteria2.andEqualTo("video_id", video_id);
         }
-        if(CommonUtils.isNotEmpty(shen_auditor_id)){
-            if("白名单".equals(shen_auditor_id)||"自动审核".equals(shen_auditor_id)){
+        if (CommonUtils.isNotEmpty(shen_auditor_id)) {
+            if ("白名单".equals(shen_auditor_id) || "自动审核".equals(shen_auditor_id)) {
                 criteria.andEqualTo("updater", shen_auditor_id);
                 criteria2.andEqualTo("updater", shen_auditor_id);
-            }else{
+            } else {
                 criteria.andEqualTo("auditor_id", shen_auditor_id);
                 criteria2.andEqualTo("auditor_id", shen_auditor_id);
             }
@@ -173,7 +177,7 @@ public class VideosServiceImpl {
         if (CommonUtils.isNotNull(spid)) {
             criteria.andEqualTo("spid", spid);
             criteria2.andEqualTo("spid", spid);
-        } else if(CommonUtils.isNotEmpty(sp_Id)) {
+        } else if (CommonUtils.isNotEmpty(sp_Id)) {
             criteria.andEqualTo("spid", sp_Id);
             criteria2.andEqualTo("spid", sp_Id);
         }
@@ -283,7 +287,7 @@ public class VideosServiceImpl {
      * @param userId
      * @return
      */
-    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,Integer source,String video_user_id) {
+    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, Integer source, String video_user_id) {
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
@@ -317,7 +321,7 @@ public class VideosServiceImpl {
             criteria.andEqualTo("video_user_id", video_user_id);
         }
-        if (source!=null) {
+        if (source != null) {
             criteria.andEqualTo("source", source);
         }
@@ -467,7 +471,14 @@ public class VideosServiceImpl {
         //审核类型，1:免审，2:机审，3:人工审
         Integer shenheType = 3;
         //如果当前sp是免审sp
-        if (sites.contains(shyVideo.getSpid()) || "1".equals(shyVideo.getSource()) || "9".equals(shyVideo.getSource()) || "8".equals(shyVideo.getSource()) || "29".equals(shyVideo.getSource()) || "30".equals(shyVideo.getSource()) || "31".equals(shyVideo.getSource()) || "36".equals(shyVideo.getSource()) || "38".equals(shyVideo.getSource()) || "39".equals(shyVideo.getSource())|| "40".equals(shyVideo.getSource())) {
+        if (sites.contains(shyVideo.getSpid()) || "1".equals(shyVideo.getSource())
+                || "9".equals(shyVideo.getSource()) || "8".equals(shyVideo.getSource())
+                || "29".equals(shyVideo.getSource())
+                || "30".equals(shyVideo.getSource()) || "31".equals(shyVideo.getSource())
+                || "36".equals(shyVideo.getSource()) || "38".equals(shyVideo.getSource())
+                || "39".equals(shyVideo.getSource())
+                || "40".equals(shyVideo.getSource()) || "50".equals(shyVideo.getSource())
+                || "51".equals(shyVideo.getSource())) {
             //免审
             shenheType = 1;
         } else {