图文白名单和机审修改

liwei2917
1 parent 4e201c1f
Showing 4 changed files with 13 additions and 8 deletions
src/main/java/com/cnlive/shenhe/controller/ContentController.java
src/main/java/com/cnlive/shenhe/job/ContentJob.java
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/AntiFraudUtil.java
@@ -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();
@@ -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,"","白名单");
 			}
 		}
     }
@@ -207,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();
@@ -259,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);
@@ -364,7 +366,7 @@ public class ContentServiceImpl {
               try{
             	  //调用数美接口
             	   result =  AntiFraudUtil.filterArticle(Token_id,shyContent.getContent_url(),channel);
-            	   type=result.getString("type");
+            	   type=result.getString("riskLevel");
             	   desc=result.getString("desc");//数美失败结果的详情
               }catch(Exception e){
             	  type=CommonConst.REJECT;//报错就给一个拒绝状态
@@ -374,8 +376,8 @@ public class ContentServiceImpl {
             	  desc="数美审核通过了";
             	  shyContent.setShenhe_msg(desc);
             	  //修改图文状态
-            	  callback(shyContent.getId().toString(),desc,CommonConst.AUDIT_SUCCESS,"");
-              }else if(type.toLowerCase().equals(CommonConst.REJECT)){//数美拒绝
+            	  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);
@@ -392,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;
                 }