作业作品家庭相册改为免审、优化图文定时任务

王言钊
1 parent 4db67ee6
Showing 3 changed files with 35 additions and 36 deletions
src/main/java/com/cnlive/shenhe/job/ContentJob.java
src/main/java/com/cnlive/shenhe/job/YiDunUrlResultJob.java
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java
@@ -40,7 +40,7 @@ public class ContentJob {
                 logger.info("当前白名单通过的content_id：" + content.getId());
                 content.setUpdater("白名单");
                 // 更新点播和审核的视频状态
-                contentService.callback(content.getId() + "", "白名单审核通过", CommonConst.AUDIT_SUCCESS, "", "白名单");
+                contentService.callback(content.getId() + "", "白名单审核通过", CommonConst.AUDIT_SUCCESS, "", content.getUpdater());
             }
         }
     }
@@ -56,6 +56,7 @@ public class ContentJob {
         if (shyContentList != null && shyContentList.size() > 0) {
             logger.info("审核云提交网页审核到易盾数据个数:{}", shyContentList.size());
             for (ShyContent content : shyContentList) {
+                content.setUpdater("机审");
                 contentService.contentFilter(content);
             }
         }
@@ -57,7 +57,7 @@ public class YiDunUrlResultJob {
      * 每分钟一次
      */
     @Scheduled(cron = "0 0/1 * * * ? ")
-    public void YiDunUrl() {
+    public void yiDunUrl() {
         try {
             Map<String, String> params = new HashMap<>(5);
             // 1.设置公共参数
@@ -79,14 +79,14 @@ public class YiDunUrlResultJob {
             int code = resultObject.getIntValue("code");
             String msg = resultObject.getString("msg");
             if (code == 200 && "ok".equals(msg)) {
-                JSONArray resultJSONArray = resultObject.getJSONArray("result");
-                if (resultJSONArray != null && resultJSONArray.size() > 0) {
-                    for (int i = 0; i < resultJSONArray.size(); i++) {
-                        String desc = "易盾网站审核";
+                JSONArray resultJsonArray = resultObject.getJSONArray("result");
+                if (resultJsonArray != null && resultJsonArray.size() > 0) {
+                    for (int i = 0; i < resultJsonArray.size(); i++) {
+                        StringBuilder desc = new StringBuilder("易盾网站审核");
                         ShyYidun newYiDunMsg = new ShyYidun();
                         ShyContent shyContent = new ShyContent();
                         try {
-                            JSONObject jsonObject = resultJSONArray.getJSONObject(i);
+                            JSONObject jsonObject = resultJsonArray.getJSONObject(i);
                             String dataId = jsonObject.getString("dataId");
                             ShyYidun yiDunMsg = yiDunServiceImpl.getYiDunMsg(dataId);
                             if (yiDunMsg == null) {
@@ -96,17 +96,16 @@ public class YiDunUrlResultJob {
                             newYiDunMsg.setDuration(-1);
                             newYiDunMsg.setUpdate_time(new Date());
                             shyContent.setId(Integer.valueOf(yiDunMsg.getContent_id()));
+                            shyContent.setUpdater("机审");
                             //检测结果, 1:正常（建议通过） 2:异常（建议拦截） 3：疑似（建议人工确认）0:无结果（检测失败）
                             int result = jsonObject.getIntValue("result");
                             newYiDunMsg.setResult_type(String.valueOf(result));
                             if (result == 1) {
-                                desc = "易盾网站审核通过了";
-                                shyContent.setReceive_status(2);
-                                shyContent.setShenhe_msg(desc);
-                                newYiDunMsg.setDesc_msg(desc);
+                                desc = new StringBuilder("易盾网站审核通过了");
+                                newYiDunMsg.setDesc_msg(desc.toString());
                                 newYiDunMsg.setCheck_status(0);
                                 //修改图文状态
-                                contentServiceImpl.callback(yiDunMsg.getContent_id(), desc, CommonConst.AUDIT_SUCCESS, "", "机审");
+                                contentServiceImpl.callback(String.valueOf(shyContent.getId()), desc.toString(), CommonConst.AUDIT_SUCCESS, "", shyContent.getUpdater());
                                 logger.info("审核云结果回调业务对接方:dataId={}", dataId);
                             } else {
                                 JSONObject evidences = jsonObject.getJSONObject("evidences");
@@ -116,28 +115,28 @@ public class YiDunUrlResultJob {
                                         JSONObject jsonObject1 = texts.getJSONObject(j);
                                         //检测结果，0：通过，1：嫌疑，2：不通过
                                         int action = jsonObject1.getIntValue("action");
-                                        String labelMsg = "";
+                                        StringBuilder labelMsg = new StringBuilder();
                                         if (action != 0) {
                                             JSONArray labels = jsonObject1.getJSONArray("labels");
-                                            labelMsg = "(";
+                                            labelMsg = new StringBuilder("(");
                                             if (labels != null && labels.size() > 0) {
                                                 for (Object obj : labels) {
                                                     JSONObject jsonObjectone = (JSONObject) obj;
                                                     Integer label = jsonObjectone.getInteger("label");
                                                     String name = TextLabels.getName(label);
-                                                    labelMsg = labelMsg + name;
+                                                    labelMsg.append(name);
                                                 }
                                             }
                                         }
                                         if (action == 1) {
-                                            desc = desc + "文字嫌疑" + labelMsg + ")";
+                                            desc.append("文字嫌疑").append(labelMsg).append(")");
                                             break;
                                         } else if (action == 2) {
-                                            desc = desc + "文字违规" + labelMsg + ")";
+                                            desc.append("文字违规").append(labelMsg).append(")");
                                             break;
                                         } else {
-                                            desc = desc + labelMsg + ")";
+                                            desc.append(labelMsg).append(")");
                                         }
                                     }
                                 }
@@ -147,10 +146,10 @@ public class YiDunUrlResultJob {
                                         JSONObject jsonObject1 = images.getJSONObject(k);
                                         //0：正常，1：不确定，2：确定
                                         int level = jsonObject1.getIntValue("level");
-                                        String labelMsg = "";
+                                        StringBuilder labelMsg = new StringBuilder();
                                         if (level != 0) {
                                             JSONArray labels = jsonObject1.getJSONArray("labels");
-                                            labelMsg = "(";
+                                            labelMsg = new StringBuilder("(");
                                             if (labels != null && labels.size() > 0) {
                                                 for (Object obj : labels) {
                                                     JSONObject jsonObjectone = (JSONObject) obj;
@@ -159,40 +158,40 @@ public class YiDunUrlResultJob {
                                                     if (labelsLevel != 0) {
                                                         Integer label = jsonObjectone.getInteger("label");
                                                         String name = ImageLabels.getName(label);
-                                                        labelMsg = labelMsg + name;
+                                                        labelMsg.append(name);
                                                     }
                                                 }
                                             }
                                         }
                                         if (level == 1) {
-                                            desc = desc + "第" + (i + 1) + "张图片嫌疑" + labelMsg + ")";
+                                            desc.append("第").append(i + 1).append("张图片嫌疑").append(labelMsg).append(")");
                                             break;
-                                        }
-                                        if (level == 2) {
-                                            desc = desc + "第" + (i + 1) + "张图片违规" + labelMsg + ")";
+                                        } else if (level == 2) {
+                                            desc.append("第").append(i + 1).append("张图片违规").append(labelMsg).append(")");
                                             break;
+                                        } else {
+                                            desc.append(labelMsg).append(")");
                                         }
                                     }
                                 }
-                                // 领取状态为已审核
-                                shyContent.setReceive_status(CommonConst.RECEIVE_AUDIT);
-                                shyContent.setShenhe_msg(desc);
-                                shyContent.setContent_status(CommonConst.AUDIT_REFUSE);
-                                newYiDunMsg.setDesc_msg(desc);
+                                newYiDunMsg.setDesc_msg(desc.toString());
                                 newYiDunMsg.setCheck_status(2);
                                 //修改图文状态
-                                contentServiceImpl.callback(yiDunMsg.getContent_id(), "机审审核拒绝", CommonConst.AUDIT_REFUSE, "", "机审");
+                                contentServiceImpl.callback(String.valueOf(shyContent.getId()), desc.toString(), CommonConst.AUDIT_REFUSE, "", shyContent.getUpdater());
                             }
                         } catch (NumberFormatException e) {
                             e.printStackTrace();
+                            // 领取状态为已审
+                            shyContent.setReceive_status(CommonConst.RECEIVE_AUDIT);
+                            shyContent.setContent_status(CommonConst.AUDIT_REFUSE);
                             //审核类型改为人工审核
                             shyContent.setShenhe_type(CommonConst.AUDIT_TYPE_USER);
                             //拒绝原因
                             shyContent.setShenhe_msg("易盾网站识别其它问题需排查");
                             newYiDunMsg.setDesc_msg("易盾网站识别其它问题需排查");
+                            contentServiceImpl.updateshyContent(shyContent);
                         }
-                        contentServiceImpl.updateshyContent(shyContent);
                         yiDunServiceImpl.updateYiDunMsg(newYiDunMsg);
                     }
                 }
@@ -419,11 +419,11 @@ public class ContentServiceImpl {
         //审核类型，1:免审，2:机审，3:人工审  默认人工审
         Integer shenheType = CommonConst.AUDIT_TYPE_USER;
         //如果当前sp是免审sp
-        if (sites.contains(spId)) {
+        if (sites.contains(spId) || ContentTag.startsWith("cms_") || ContentTag.startsWith("edu_")) {
             //免审
             shenheType = CommonConst.AUDIT_TYPE_FREE;
         } else {
-            if ("content".equals(ContentTag) || ContentTag.startsWith("cms_") || ContentTag.startsWith("edu_")) {
+            if ("content".equals(ContentTag)) {
                 //机审
                 shenheType = CommonConst.AUDIT_TYPE_MACHANE;
             }
@@ -445,13 +445,12 @@ 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已下线
-                    callback(String.valueOf(shyContent.getId()), "机审审核拒绝", CommonConst.AUDIT_REFUSE, "", "机审");
+                    callback(String.valueOf(shyContent.getId()), "机审审核拒绝", CommonConst.AUDIT_REFUSE, "", shyContent.getUpdater());
                 }
                 JSONObject result = jsonObject.getJSONObject("result");
                 String dataId = result.getString("dataId");