Commit 101d9ed7f307a2c7efac376b73f6a1ff8825a7aa
1 parent
a0260a39
获取审核类型新增contentTag
Showing
2 changed files
with
4 additions
and
7 deletions
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java
| @@ -344,22 +344,21 @@ public class ContentServiceImpl { | @@ -344,22 +344,21 @@ public class ContentServiceImpl { | ||
| 344 | * @param spId | 344 | * @param spId |
| 345 | */ | 345 | */ |
| 346 | public Integer getShenheType(Integer spId, String ContentTag) { | 346 | public Integer getShenheType(Integer spId, String ContentTag) { |
| 347 | - | ||
| 348 | //获取图文免审sp | 347 | //获取图文免审sp |
| 349 | List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_CONTENT); | 348 | List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_CONTENT); |
| 350 | //初始化一个审核状态 | 349 | //初始化一个审核状态 |
| 351 | - Integer shenheType = 3;//审核类型,1:免审,2:机审,3:人工审 | 350 | + //审核类型,1:免审,2:机审,3:人工审 |
| 351 | + Integer shenheType = 3; | ||
| 352 | //如果当前sp是免审sp | 352 | //如果当前sp是免审sp |
| 353 | if (sites.contains(spId)) { | 353 | if (sites.contains(spId)) { |
| 354 | shenheType = 1;//免审 | 354 | shenheType = 1;//免审 |
| 355 | } else { | 355 | } else { |
| 356 | - if ("content".equals(ContentTag)) { | 356 | + if ("content".equals(ContentTag) || ContentTag.startsWith("cms_") || ContentTag.startsWith("edu_")) { |
| 357 | shenheType = 2;//机审 | 357 | shenheType = 2;//机审 |
| 358 | } else { | 358 | } else { |
| 359 | shenheType = 3;//人工审 | 359 | shenheType = 3;//人工审 |
| 360 | } | 360 | } |
| 361 | } | 361 | } |
| 362 | - | ||
| 363 | return shenheType; | 362 | return shenheType; |
| 364 | } | 363 | } |
| 365 | 364 |
src/main/java/com/cnlive/shenhe/utils/AuditPass.java
| @@ -127,8 +127,6 @@ public class AuditPass { | @@ -127,8 +127,6 @@ public class AuditPass { | ||
| 127 | /** | 127 | /** |
| 128 | * 直播云信息同步 | 128 | * 直播云信息同步 |
| 129 | * | 129 | * |
| 130 | - * @param json | ||
| 131 | - * @param callBack | ||
| 132 | * @return | 130 | * @return |
| 133 | */ | 131 | */ |
| 134 | public JSONObject syncLive(String activity_id) { | 132 | public JSONObject syncLive(String activity_id) { |
| @@ -231,7 +229,7 @@ public class AuditPass { | @@ -231,7 +229,7 @@ public class AuditPass { | ||
| 231 | json.put("status", state); | 229 | json.put("status", state); |
| 232 | json.put("msg", msg); | 230 | json.put("msg", msg); |
| 233 | String httpUtilResult = HttpClientUtils.HttpPostWithJson(callback, json.toString()); | 231 | String httpUtilResult = HttpClientUtils.HttpPostWithJson(callback, json.toString()); |
| 234 | - logger.info("cms审核返回数据,httpUtilResult=====" + httpUtilResult); | 232 | + logger.info("cms审核返回数据,httpUtilResult====={}===请求参数:{}", httpUtilResult, json.toString()); |
| 235 | return JSONObject.parseObject(httpUtilResult); | 233 | return JSONObject.parseObject(httpUtilResult); |
| 236 | } | 234 | } |
| 237 | 235 |