Merge remote-tracking branch 'origin/dev' into dev

王言钊
2 parents 06c9e43f 3a1321f2
Showing 3 changed files with 15 additions and 13 deletions
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
src/main/java/com/cnlive/shenhe/job/YiDunUrlResultJob.java
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java
@@ -48,9 +48,11 @@ public class ContentControllerApi {
         shyContent.setContent_id(contentId);
         //图文标签
         shyContent.setContent_tag("content");
-
+        //图文标签
+        String contentTag = json.getString("content_tag");
+        String newContentTag = StringUtils.isEmpty(contentTag) ? "content" : contentTag;
         //获取审核类型
-        Integer shenheType = contentService.getShenheType(json.getInteger("spId"), "content");
+        Integer shenheType = contentService.getShenheType(json.getInteger("spId"), newContentTag);
         List<ShyContent> contentList = contentService.findshyContent(shyContent);
         //存在则更新
         if (contentList.size() > 0) {
@@ -86,8 +88,7 @@ public class ContentControllerApi {
             //spid
             shyContent1.setSp_id(json.getInteger("spId"));
             //图文标签
-            String contentTag = json.getString("content_tag");
-            shyContent1.setContent_tag(StringUtils.isEmpty(contentTag) ? "content" : contentTag);
+            shyContent1.setContent_tag(newContentTag);
             //领取状态
             shyContent1.setReceive_status(CommonConst.RECEIVE_BEFORE);
             //最后一次更新时间
@@ -100,7 +101,7 @@ public class ContentControllerApi {
                 return new ResponseBean(ErrorEnum.ERROR);
             }
         }
-        return saveContent(json, shyContent, shenheType);
+        return saveContent(json, shyContent, shenheType, newContentTag);
     }
     /**
@@ -111,7 +112,7 @@ public class ContentControllerApi {
      * @param shenheType
      * @return
      */
-    private ResponseBean saveContent(JSONObject json, ShyContent shyContent, Integer shenheType) {
+    private ResponseBean saveContent(JSONObject json, ShyContent shyContent, Integer shenheType, String contentTag) {
         //如果不存在直接插入
         //标题
         shyContent.setTitle(json.getString("title"));
@@ -134,8 +135,7 @@ public class ContentControllerApi {
             shyContent.setContent_time(timestamp);
         }
-        String contentTag = json.getString("content_tag");
-        shyContent.setContent_tag(StringUtils.isEmpty(contentTag) ? "content" : contentTag);
+        shyContent.setContent_tag(contentTag);
         shyContent.setCreate_date(CommonUtils.getCurrentTime());
         //回调地址
@@ -56,7 +56,7 @@ public class YiDunUrlResultJob {
     /**
      * 定时查询易盾网站检测结果接口
      */
-    @Scheduled(cron = "0 0/1 * * * ? ")//每分钟一次
+    @Scheduled(cron = "0 0/5 * * * ? ")//每5分钟一次
     public void YiDunUrl() {
         try {
             Map<String, String> params = new HashMap<String, String>(5);
@@ -357,12 +357,15 @@ public class ContentServiceImpl {
         Integer shenheType = 3;
         //如果当前sp是免审sp
         if (sites.contains(spId)) {
-            shenheType = 1;//免审
+            //免审
+            shenheType = 1;
         } else {
             if ("content".equals(ContentTag) || ContentTag.startsWith("cms_") || ContentTag.startsWith("edu_")) {
-                shenheType = 2;//机审
+                //机审
+                shenheType = 2;
             } else {
-                shenheType = 3;//人工审
+                //人工审
+                shenheType = 3;
             }
         }
         return shenheType;
@@ -375,7 +378,6 @@ public class ContentServiceImpl {
      * @return
      */
     public void contentFilter(ShyContent shyContent) {
-//        String contentUrl = localhost_url + "/api/content/detail/" + shyContent.getId() + ".html";
         String contentUrl = shyContent.getContent_url();
         logger.info("向易盾网站检测接口提交的url:" + contentUrl);
         //调用易盾网站检测接口