Merge branch 'dev'

liwei2917
2 parents c29c4c23 bce2b10e
Showing 9 changed files with 117 additions and 16 deletions
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
src/main/java/com/cnlive/shenhe/controller/ContentController.java
src/main/java/com/cnlive/shenhe/controller/SitesController.java
src/main/java/com/cnlive/shenhe/job/ContentJob.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/SitesServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/AntiFraudUtil.java
src/main/java/com/cnlive/shenhe/utils/CommonConst.java
@@ -48,12 +48,15 @@ public class ContentControllerApi {
         shyContent.setContent_id(json.getString("contentId"));
         shyContent.setContent_tag("content");//图文标签
         List<ShyContent> contentList = contentService.findshyContent(shyContent);
+        
+        //获取审核类型
+        Integer shenheType = contentService.getShenheType(json.getInteger("spId"),"content");
         //存在则更新
         if (contentList.size() > 0) {
             ShyContent shyContent1 = contentList.get(0);
             shyContent1.setTitle(json.getString("title"));//标题
             shyContent1.setTitle_image(json.getString("titleImage"));//标题图片
-            shyContent1.setShenhe_type(CommonConst.AUDIT_TYPE_USER);//审核类型是人工
+            shyContent1.setShenhe_type(shenheType);//审核类型
             shyContent1.setContent_status(json.getInteger("contentStatus"));//当前图文的审核状态
             shyContent1.setSource(json.getString("source"));//来源
             shyContent1.setAuthor(json.getString("author"));//作者
@@ -83,7 +86,7 @@ public class ContentControllerApi {
         //如果不存在直接插入
         shyContent.setTitle(json.getString("title"));//标题
         shyContent.setTitle_image(json.getString("titleImage"));//标题图片
-        shyContent.setShenhe_type(CommonConst.AUDIT_TYPE_USER);//审核类型是人工
+        shyContent.setShenhe_type(shenheType);//审核类型
         shyContent.setContent_status(json.getInteger("contentStatus"));//当前图文的审核状态
         shyContent.setSource(json.getString("source"));//来源
         shyContent.setAuthor(json.getString("author"));//作者
@@ -123,12 +126,14 @@ public class ContentControllerApi {
     	shyContent.setContent_id(json.getString("momentId"));//朋友圈id
     	shyContent.setContent_tag("moment");//朋友圈标签
     	List<ShyContent> contentList = contentService.findshyContent(shyContent);
+    	//获取审核类型
+        Integer shenheType = contentService.getShenheType(json.getInteger("spId"),"moment");
     	//存在则更新
     	if (contentList.size() > 0) {
     		ShyContent shyContent1 = contentList.get(0);
     		shyContent1.setTitle(json.getString("title"));//标题
     		shyContent1.setTitle_image(json.getString("image"));//用户头像
-    		shyContent1.setShenhe_type(CommonConst.AUDIT_TYPE_USER);//审核类型是人工
+    		shyContent1.setShenhe_type(shenheType);//审核类型
     		String contentTime = json.getString("createTime");//朋友圈内容创建时间
     		if (CommonUtils.isNotEmpty(contentTime)) {
 //    			Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss");
@@ -158,7 +163,7 @@ public class ContentControllerApi {
     	//如果不存在直接插入
     	shyContent.setTitle(json.getString("title"));//标题
     	shyContent.setTitle_image(json.getString("image"));//用户头像
-    	shyContent.setShenhe_type(CommonConst.AUDIT_TYPE_USER);//审核类型是人工
+    	shyContent.setShenhe_type(shenheType);//审核类型
     	shyContent.setContent_status(1);//当前朋友圈内容的审核状态，先发后审
     	String contentTime = json.getString("createTime");//创建时间
     	if (CommonUtils.isNotEmpty(contentTime)) {
@@ -166,7 +166,7 @@ public class ContentController {
         boolean success =false;
         String[] contentIds = ids.split(",");
 		for (String contentId : contentIds) {
-            success = contentService.callback(contentId,"审核通过", CommonConst.AUDIT_SUCCESS, userId);
+            success = contentService.callback(contentId,"审核通过", CommonConst.AUDIT_SUCCESS, userId,"");
 		}
         if (success) {
             return new ResponseBean();
@@ -189,7 +189,7 @@ public class ContentController {
         boolean success =false;
         String[] contentIds = ids.split(",");
 		for (String contentId : contentIds) {
-			 success = contentService.callback(contentId,msg, CommonConst.AUDIT_REFUSE, userId);
+			 success = contentService.callback(contentId,msg, CommonConst.AUDIT_REFUSE, userId,"");
 		}
         if (success) {
             return new ResponseBean();
@@ -79,7 +79,7 @@ public class SitesController {
         ShySites site = sitesService.get(siteId);
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         Integer spid = sessionUser.getSpid();
-        if ((!sessionUser.isMaster() && spid != 0) || (sessionUser.isMaster() && site.getSpid() != spid)) {
+        if ((!sessionUser.isMaster() && spid != 0) ) {
             return "page/error.html";
         }
         String write = "";
@@ -39,7 +39,7 @@ public class ContentJob {
     /**
 	 * 白名单sp图文通过
 	 */
-//	@Scheduled(fixedRate = 60 * 1000)
+	@Scheduled(fixedRate = 60 * 1000)
 	public void updateVideos() {
 		ShyContent shyContent = new ShyContent();
 		shyContent.setShenhe_type(CommonConst.AUDIT_TYPE_FREE);// 审核类型为免审
@@ -50,7 +50,7 @@ public class ContentJob {
 				 logger.info("当前白名单通过的content_id："+content.getId());
 				 content.setUpdater("白名单");
 				// 更新点播和审核的视频状态
-				 contentService.callback(content.getId()+"","白名单审核通过", 1,"");
+				 contentService.callback(content.getId()+"","白名单审核通过", 1,"","白名单");
 			}
 		}
     }
@@ -58,7 +58,7 @@ public class ContentJob {
     /**
      * 定时发送数美检测视频
      */
-//   @Scheduled(cron="0 0/1 10-23 * * ? ")//每天10点到23点执行，每分钟一次
+   @Scheduled(cron="0 0/1 10-23 * * ? ")//每天10点到23点执行，每分钟一次
     public void videofilter() {
     	 ShyContent shyContent = new ShyContent();
     	 shyContent.setShenhe_type(CommonConst.AUDIT_TYPE_MACHANE);//审核类型为机审
@@ -68,7 +68,7 @@ public class ContentJob {
              for (ShyContent content : shyContentList) {
             	 logger.info("定时发送数美检测的content_id："+content.getId());
               //数美图片过滤
-//              videosService.videoFilter(video.getId(),CommonConst.DYNAMIC_USER);
+             contentService.contentFilter(content,"NEWS");
              }
          }
     }
@@ -255,7 +255,7 @@ public class CommentsServiceImpl {
      */
     public void getShenheType(ShyComments shyComments){
-		//获取点播免审sp
+		//获取评论免审sp
         List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_COMMENT);
         //初始化一个审核状态
         Integer shenheType=3;//审核类型，1:免审，2:机审，3:人工审
 package com.cnlive.shenhe.serviceImpl;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.entity.ShyComments;
 import com.cnlive.shenhe.entity.ShyContent;
 import com.cnlive.shenhe.entity.ShyLive;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
+import com.cnlive.shenhe.entity.ShyVideofilter;
 import com.cnlive.shenhe.entity.ShyVideos;
 import com.cnlive.shenhe.mapper.ShyCommentsMapper;
 import com.cnlive.shenhe.mapper.ShyContentMapper;
 import com.cnlive.shenhe.mapper.ShySitesMapper;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
+import com.cnlive.shenhe.utils.AntiFraudUtil;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -25,8 +28,12 @@ import tk.mybatis.mapper.entity.Example;
 import java.sql.Timestamp;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 /**
  * @Auther: liwei
@@ -51,6 +58,8 @@ public class ContentServiceImpl {
     SitesServiceImpl sitesService;
     @Autowired
     VideosServiceImpl videosService;
+    @Autowired
+    VideofilterServiceImpl videofilterServiceImpl;
     public ShyContent getShyContent(ShyContent shyContent) {
         List<ShyContent> shyContentList = shyContentMapper.select(shyContent);
@@ -198,7 +207,7 @@ public class ContentServiceImpl {
     }
     //**********************
-	public boolean callback(String contentId, String msg, Integer state, String userId) {
+	public boolean callback(String contentId, String msg, Integer state, String userId,String updater) {
 			boolean success = true;
 			ShyContent content = shyContentMapper.selectByPrimaryKey(Integer.parseInt(contentId));
 			JSONObject result = new JSONObject();
@@ -250,6 +259,8 @@ public class ContentServiceImpl {
 				if (CommonUtils.isNotEmpty(userId)) {
 					content.setAuditor_id(userId);
 					content.setShenhe_type(CommonConst.AUDIT_TYPE_USER);// 设置审核类型为人工
+				}else{
+					content.setUpdater(updater);//设置更新人
 				}
 				content.setLast_update(CommonUtils.getCurrentTime());
 				int i = shyContentMapper.updateByPrimaryKeySelective(content);
@@ -320,6 +331,74 @@ public class ContentServiceImpl {
     public int updateByPrimaryKeySelective(ShyContent content) {
         return shyContentMapper.updateByPrimaryKeySelective(content);
     }
+    
+    /**
+     * 获得审核类型
+     * @param spId
+     */
+    public Integer getShenheType(Integer spId,String ContentTag){
+		
+		//获取图文免审sp
+        List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_CONTENT);
+        //初始化一个审核状态
+        Integer shenheType=3;//审核类型，1:免审，2:机审，3:人工审
+        //如果当前sp是免审sp
+        if(sites.contains(spId)){
+        	shenheType=1;//免审
+        }else{
+        	if("content".equals(ContentTag)){
+        		shenheType=2;//机审
+        	}else{
+        		shenheType=3;//人工审
+        	}
+        }
+        return shenheType;
+	}
+    
+    /**
+     * 数美视频（图片）过滤
+     * @param cid 审核云中图文id
+     * @param channel 尺度
+     * @return
+     */
+    public int contentFilter(ShyContent shyContent,String channel){
+             
+              JSONObject result = null;//数美返回结果
+              String type="";//数美返回结果的类型
+              String desc="";//数美失败结果的详情
+              String Token_id=UUID.randomUUID().toString();
+              try{
+            	  //调用数美接口
+            	   result =  AntiFraudUtil.filterArticle(Token_id,shyContent.getContent_url(),channel);
+            	   type=result.getString("riskLevel");
+            	   desc=result.getString("desc");//数美失败结果的详情
+              }catch(Exception e){
+            	  type=CommonConst.REJECT;//报错就给一个拒绝状态
+            	  desc="数美审核报错了";
+              }
+              if(type.toLowerCase().equals(CommonConst.PASS)){//数美通过
+            	  desc="数美审核通过了";
+            	  shyContent.setShenhe_msg(desc);
+            	  //修改图文状态
+            	  callback(shyContent.getId().toString(),desc,CommonConst.AUDIT_SUCCESS,"","机审通过");
+              }else if(type.toLowerCase().equals(CommonConst.REJECT)||type.toLowerCase().equals(CommonConst.REVIEW)){//数美拒绝
+            	  shyContent.setShenhe_type(CommonConst.AUDIT_TYPE_USER);//审核类型改为人工审核
+            	  shyContent.setShenhe_msg(desc);//拒绝原因
+            	  updateshyContent(shyContent);
+//            	  videosService.updateDianboAndShenhe(shyVideos,4);
+              }
+              ShyVideofilter videofilter=new ShyVideofilter();
+    		  videofilter.setChannel(channel);
+    		  videofilter.setDesc_msg(desc);
+    		  videofilter.setResult_type(type);
+    		  videofilter.setToken_id(Token_id);
+    		  videofilter.setVideos_id(shyContent.getId());
+    		  videofilter.setDuration(-1);
+    		  videofilter.setCreated_at(CommonUtils.getCurrentTime());
+    		  videofilterServiceImpl.impotVideofilter(videofilter);
+    	
+    	return 0;
+    }
 }
@@ -30,15 +30,18 @@ public class SitesServiceImpl {
     public PageInfo<ShySites> getPage(Integer page, Integer pageSize, String orderByClause, String key, Integer spId) {
         Example example = new Example(ShySites.class);
         Example.Criteria criteria = example.createCriteria();
+        Example.Criteria criteria2 = example.createCriteria();
         if (CommonUtils.isNotEmpty(orderByClause)) {
             example.setOrderByClause(orderByClause);
         }
         if (CommonUtils.isNotEmpty(key)) {
             criteria.andLike("name", "%" + key + "%");
-            criteria.andLike("company", "%" + key + "%");
+            criteria2.andLike("spid",  "%" + key + "%");
+            example.or(criteria2);
         }
         if (CommonUtils.isNotNull(spId))
             criteria.andEqualTo("spid", spId);
+            criteria2.andEqualTo("spid", spId);
         PageHelper.startPage(page, pageSize, true);
         List<ShySites> shySitesList = shySitesMapper.selectByExample(example);
         PageInfo<ShySites> pageInfo = new PageInfo<ShySites>(shySitesList);
@@ -5,8 +5,12 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
+import javax.swing.plaf.basic.BasicScrollPaneUI.HSBChangeListener;
+
 /**
  * 数美 反欺诈工具类
@@ -44,6 +48,13 @@ public class AntiFraudUtil {
         //queryVideoResult("02b649b7-3451-403e-abd0-592302cec2a0");
 try {
+//	Map<Object, Object> hashMap = new HashMap<Object, Object>();
+//	hashMap.put("11", "1111");
+//	String object = (String) hashMap.get("11");
+//	String object2 = (String) hashMap.get("22");
+//	System.out.println(object);
+//	System.out.println(object2);
+
 //	System.out.println(addBlackContents("2222"));
 } catch (Exception e) {
 	e.printStackTrace();
@@ -381,14 +392,17 @@ try {
     }
     private static JSONObject getResult(JSONObject result) {
+    	
         if (result != null) {
-            System.out.println(result);
+        	System.out.println("数美过滤返回结果" + result);
+        	JSONObject jsonObj = new JSONObject();
             Integer code = result.getInteger("code");
             if (code != null && code == 1100) {  //请求成功
                 String riskLevel = result.getString("riskLevel");
                 if ("PASS".equals(riskLevel)) {
+                	jsonObj.put("type", "REJECT");
                     return result;
                 }
@@ -78,7 +78,7 @@ public class CommonConst {
      */
     public static Integer BUSINESS_CONTENT = 3;
-    public static JSONObject BUSINESS = JSONObject.parseObject("{\"1\":\"点播业务\",\"2\":\"评论业务\"}");
+    public static JSONObject BUSINESS = JSONObject.parseObject("{\"1\":\"点播业务\",\"2\":\"评论业务\",\"3\":\"图文业务\"}");
     /**
      * 抽帧状态：未抽帧