图文免审和机审修改

liwei2917
1 parent a65ddf3a
Showing 4 changed files with 16 additions and 12 deletions
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.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
@@ -50,7 +50,7 @@ public class ContentControllerApi {
         List<ShyContent> contentList = contentService.findshyContent(shyContent);
         //获取审核类型
-        Integer shenheType = contentService.getShenheType(json.getInteger("spId"));
+        Integer shenheType = contentService.getShenheType(json.getInteger("spId"),"content");
         //存在则更新
         if (contentList.size() > 0) {
             ShyContent shyContent1 = contentList.get(0);
@@ -127,7 +127,7 @@ public class ContentControllerApi {
     	shyContent.setContent_tag("moment");//朋友圈标签
     	List<ShyContent> contentList = contentService.findshyContent(shyContent);
     	//获取审核类型
-        Integer shenheType = contentService.getShenheType(json.getInteger("spId"));
+        Integer shenheType = contentService.getShenheType(json.getInteger("spId"),"moment");
     	//存在则更新
     	if (contentList.size() > 0) {
     		ShyContent shyContent1 = contentList.get(0);
@@ -68,7 +68,7 @@ public class ContentJob {
              for (ShyContent content : shyContentList) {
             	 logger.info("定时发送数美检测的content_id："+content.getId());
               //数美图片过滤
-             contentService.contentFilter(content,"");
+             contentService.contentFilter(content,"NEWS");
              }
          }
     }
@@ -336,7 +336,7 @@ public class ContentServiceImpl {
      * 获得审核类型
      * @param spId
      */
-    public Integer getShenheType(Integer spId){
+    public Integer getShenheType(Integer spId,String ContentTag){
 		//获取图文免审sp
         List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_CONTENT);
@@ -346,7 +346,11 @@ public class ContentServiceImpl {
         if(sites.contains(spId)){
         	shenheType=1;//免审
         }else{
-        	shenheType=2;//机审
+        	if("content".equals(ContentTag)){
+        		shenheType=2;//机审
+        	}else{
+        		shenheType=3;//人工审
+        	}
         }
         return shenheType;
 	}
@@ -48,12 +48,12 @@ 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);
+//	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) {
@@ -394,7 +394,7 @@ 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");