cms同步图文内容到审核云

郑超
1 parent f519f545
Showing 4 changed files with 313 additions and 269 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/AuditPass.java
@@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import java.util.Date;
@@ -43,7 +44,8 @@ public class ContentControllerApi {
         JSONObject json = JSONObject.parseObject(param);
         //判断是否存在
         ShyContent shyContent = new ShyContent();
-        shyContent.setContent_id(json.getString("contentId"));
+        String contentId = json.getString("contentId");
+        shyContent.setContent_id(contentId);
         //图文标签
         shyContent.setContent_tag("content");
@@ -84,13 +86,15 @@ public class ContentControllerApi {
             //spid
             shyContent1.setSp_id(json.getInteger("spId"));
             //图文标签
-            shyContent1.setContent_tag("content");
+            String contentTag = json.getString("content_tag");
+            shyContent1.setContent_tag(StringUtils.isEmpty(contentTag) ? "content" : contentTag);
             //领取状态
             shyContent1.setReceive_status(CommonConst.RECEIVE_BEFORE);
             //最后一次更新时间
             shyContent1.setLast_update(CommonUtils.getCurrentTime());
             boolean YorN = contentService.updateshyContent(shyContent1);
             if (YorN == true) {
+                logger.info("图文同步接口更新成功:{}", contentId);
                 return new ResponseBean(ErrorEnum.SUCCESS);
             } else {
                 return new ResponseBean(ErrorEnum.ERROR);
@@ -130,6 +134,9 @@ public class ContentControllerApi {
             shyContent.setContent_time(timestamp);
         }
+        String contentTag = json.getString("content_tag");
+        shyContent.setContent_tag(StringUtils.isEmpty(contentTag) ? "content" : contentTag);
+
         shyContent.setCreate_date(CommonUtils.getCurrentTime());
         //回调地址
         shyContent.setCallback(json.getString("callback"));
@@ -145,6 +152,7 @@ public class ContentControllerApi {
         shyContent.setLast_update(CommonUtils.getCurrentTime());
         boolean YorN = contentService.impotContent(shyContent);
         if (YorN == true) {
+            logger.info("图文同步接口保存操作成功:{}", json.getString("contentId"));
             return new ResponseBean(ErrorEnum.SUCCESS);
         } else {
             return new ResponseBean(ErrorEnum.ERROR);
@@ -13,6 +13,11 @@ import org.springframework.stereotype.Component;
 import java.util.List;
+/**
+ * 图文发布审核
+ *
+ * @author
+ */
 @Component
 public class ContentJob {
     private static Logger logger = LoggerFactory.getLogger(ContentJob.class);
@@ -61,7 +66,6 @@ public class ContentJob {
                 if (shyYidun1 == null) {
                     logger.info("定时发送易盾检测的content_id：" + content.getId());
                     contentService.contentFilter(content);
-
                 }
             }
         }
 package com.cnlive.shenhe.serviceImpl;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.entity.*;
 import com.cnlive.shenhe.mapper.ShyCommentsMapper;
 import com.cnlive.shenhe.mapper.ShyContentMapper;
 import com.cnlive.shenhe.mapper.ShySitesMapper;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
-import com.cnlive.shenhe.utils.*;
+import com.cnlive.shenhe.utils.AuditPass;
+import com.cnlive.shenhe.utils.CommonConst;
+import com.cnlive.shenhe.utils.CommonUtils;
+import com.cnlive.shenhe.utils.YiDunAntiFraudUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.ibatis.session.RowBounds;
@@ -18,14 +20,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
-import java.sql.Timestamp;
-import java.text.ParseException;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 /**
  * @Auther: liwei
@@ -54,21 +50,21 @@ public class ContentServiceImpl {
     VideofilterServiceImpl videofilterServiceImpl;
     @Autowired
     YiDunServiceImpl yiDunServiceImpl;
-    
+
     @Value("${spring.localhost.url}")
     String localhost_url;
     public ShyContent getShyContent(ShyContent shyContent) {
         List<ShyContent> shyContentList = shyContentMapper.select(shyContent);
-        if(CommonUtils.isNotNull(shyContentList)&&shyContentList.size()>0){
-        	return shyContentList.get(0);
+        if (CommonUtils.isNotNull(shyContentList) && shyContentList.size() > 0) {
+            return shyContentList.get(0);
         }
         return new ShyContent();
     }
     //**************************************
     public List<ShyContent> findshyContent(ShyContent shyContent) {
-      
+
         return shyContentMapper.selectByRowBounds(shyContent, new RowBounds(0, 100));
     }
@@ -97,7 +93,7 @@ public class ContentServiceImpl {
         return shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
     }
-    public PageInfo<ShyContent> getPage( String title,String source,String author,String content_tag,String contentId,  Date start_date, Date end_date,  Integer receive_status, String updater, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId) {
+    public PageInfo<ShyContent> getPage(String title, String source, String author, String content_tag, String contentId, Date start_date, Date end_date, Integer receive_status, String updater, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId) {
         Example example = new Example(ShyContent.class);
         Example.Criteria criteria = example.createCriteria();
         if (CommonUtils.isNotEmpty(orderByClause)) {
@@ -105,36 +101,36 @@ public class ContentServiceImpl {
         } else {
             example.setOrderByClause("create_date desc");
         }
-        if (CommonUtils.isNotNull(start_date) ) {
+        if (CommonUtils.isNotNull(start_date)) {
             criteria.andGreaterThanOrEqualTo("create_date", start_date);
         }
-        if ( CommonUtils.isNotNull(end_date)) {
-      	  criteria.andLessThanOrEqualTo("create_date", end_date);
+        if (CommonUtils.isNotNull(end_date)) {
+            criteria.andLessThanOrEqualTo("create_date", end_date);
         }
         if (CommonUtils.isNotEmpty(title)) {
             criteria.andLike("title", "%" + title + "%");
         }
         if (CommonUtils.isNotEmpty(source)) {
-            criteria.andLike("source","%" + source + "%");
+            criteria.andLike("source", "%" + source + "%");
         }
         if (CommonUtils.isNotEmpty(author)) {
-            criteria.andEqualTo("author",author);
+            criteria.andEqualTo("author", author);
         }
         if (CommonUtils.isNotEmpty(updater)) {
             criteria.andEqualTo("updater", updater);
         }
         if (CommonUtils.isNotEmpty(content_tag)) {
-        	criteria.andEqualTo("content_tag", content_tag);
+            criteria.andEqualTo("content_tag", content_tag);
         }
         if (CommonUtils.isNotNull(spid)) {
             criteria.andEqualTo("sp_id", spid);
         }
         if (CommonUtils.isNotEmpty(contentId)) {
-        	criteria.andEqualTo("content_id", contentId);
+            criteria.andEqualTo("content_id", contentId);
         }
         if (CommonUtils.isNotNull(receive_status)) {
             criteria.andEqualTo("receive_status", receive_status);
-            if (receive_status!=CommonConst.RECEIVE_BEFORE) {
+            if (receive_status != CommonConst.RECEIVE_BEFORE) {
                 criteria.andEqualTo("auditor_id", userId);
             }
         }
@@ -144,136 +140,141 @@ public class ContentServiceImpl {
         PageInfo<ShyContent> pageInfo = new PageInfo<>(contentList);
         return pageInfo;
     }
-    
+
     /**
      * 根据条件导出数据excel
+     *
      * @return
      */
-    public List<ShyContent> findByCondition(String title,String content_tag,String contentId,  Date start_date, 
-    		Date end_date,Integer receive_status,  Integer page, 
-    		Integer pageSize, String orderByClause, Integer spid) {
-    	
-    	  Example example = new Example(ShyContent.class);
-          Example.Criteria criteria = example.createCriteria();
-          if (CommonUtils.isNotEmpty(orderByClause)) {
-              example.setOrderByClause(orderByClause);
-          } else {
-              example.setOrderByClause("create_date desc");
-          }
-          if (CommonUtils.isNotNull(start_date) ) {
-              criteria.andGreaterThanOrEqualTo("create_date", start_date);
-          }
-          if ( CommonUtils.isNotNull(end_date)) {
-        	  criteria.andLessThanOrEqualTo("create_date", end_date);
-          }
-          if (CommonUtils.isNotEmpty(title)) {
-              criteria.andLike("title", "%" + title + "%");
-          }
-          if (CommonUtils.isNotNull(spid)) {
-              criteria.andEqualTo("sp_id", spid);
-          }
-          if (CommonUtils.isNotEmpty(contentId)) {
-          	criteria.andEqualTo("content_id", contentId);
-          }
-          if (CommonUtils.isNotEmpty(content_tag)) {
-        	  criteria.andEqualTo("content_tag", content_tag);
-          }
-          if (CommonUtils.isNotNull(receive_status)) {
-              criteria.andEqualTo("receive_status", receive_status);
-          }
+    public List<ShyContent> findByCondition(String title, String content_tag, String contentId, Date start_date,
+                                            Date end_date, Integer receive_status, Integer page,
+                                            Integer pageSize, String orderByClause, Integer spid) {
+
+        Example example = new Example(ShyContent.class);
+        Example.Criteria criteria = example.createCriteria();
+        if (CommonUtils.isNotEmpty(orderByClause)) {
+            example.setOrderByClause(orderByClause);
+        } else {
+            example.setOrderByClause("create_date desc");
+        }
+        if (CommonUtils.isNotNull(start_date)) {
+            criteria.andGreaterThanOrEqualTo("create_date", start_date);
+        }
+        if (CommonUtils.isNotNull(end_date)) {
+            criteria.andLessThanOrEqualTo("create_date", end_date);
+        }
+        if (CommonUtils.isNotEmpty(title)) {
+            criteria.andLike("title", "%" + title + "%");
+        }
+        if (CommonUtils.isNotNull(spid)) {
+            criteria.andEqualTo("sp_id", spid);
+        }
+        if (CommonUtils.isNotEmpty(contentId)) {
+            criteria.andEqualTo("content_id", contentId);
+        }
+        if (CommonUtils.isNotEmpty(content_tag)) {
+            criteria.andEqualTo("content_tag", content_tag);
+        }
+        if (CommonUtils.isNotNull(receive_status)) {
+            criteria.andEqualTo("receive_status", receive_status);
+        }
         List<ShyContent> shyContentList = shyContentMapper.selectByExample(example);
         return shyContentList;
     }
-    
+
     //******************************
     public ShyContent getDetailsContent(Integer id) {
-    	ShyContent content = shyContentMapper.selectByPrimaryKey(id);
+        ShyContent content = shyContentMapper.selectByPrimaryKey(id);
         if (content.getReceive_status() == CommonConst.RECEIVE_AUDIT) {
-        	String updater = CommonUtils.isEmpty(content.getUpdater()) || "null".equals(content.getUpdater())? "白名单":content.getUpdater();
+            String updater = CommonUtils.isEmpty(content.getUpdater()) || "null".equals(content.getUpdater()) ? "白名单" : content.getUpdater();
             String auditor_id = content.getAuditor_id();
             if (CommonUtils.isNotEmpty(auditor_id)) {
                 ShyUsers user = new ShyUsers();
                 user.setUser_id(auditor_id);
                 user = shyUsersMapper.selectOne(user);
-                String email = CommonUtils.isEmpty(user.getEmail())|| "null".equals(user.getEmail()) ? "" : user.getEmail();
+                String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
                 String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                updater = userName ;
+                updater = userName;
             }
             content.setUpdater(updater);
         }
-        ShySites shySite=sitesService.findspidDescByspid(content.getSp_id());
-    	if(CommonUtils.isNotNull(shySite)){
-    		 content.setSp_desc(shySite.getName());
-    	}
+        ShySites shySite = sitesService.findspidDescByspid(content.getSp_id());
+        if (CommonUtils.isNotNull(shySite)) {
+            content.setSp_desc(shySite.getName());
+        }
         return content;
     }
     //**********************
-	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();
-			try {
-				if(CommonUtils.isNotEmpty(content.getContent_tag())&&content.getContent_tag().equals("content")){
-					result = Pass.contentPass(content.getContent_id(), state+"", msg, content.getCallback());
-				}else if(CommonUtils.isNotEmpty(content.getContent_tag())&&content.getContent_tag().equals("moment")){
-					result = Pass.momentPass(content.getContent_id(), state, msg, content.getCallback(),content.getAuthor());
-				}
-			} catch (Exception e) {
-				logger.error("图文审核回调失败，图文id:{}", content.getId());
-				success = false;
-				return success;
-			}
-			if (result == null) {
-				logger.error("图文回调错误，且无返回信息。图文id:{}", content.getId());
-				success = false;
-				return success;
-			} else {
-				Integer code = result.getInteger("errorCode");
-				if (code != 0) {
-					logger.error("图文回调错误，图文id:{}，errorCode:{},errorMessage:{}", content.getId(), code,
-							result.getString("errorMessage"));
-					success = false;
-					return success;
-				}
-				
-				//如果当前图文是朋友圈的视频，通知点播云
-				if(CommonUtils.isNotEmpty(content.getContent_tag())
-						&&content.getContent_tag().equals("moment")
-						&&CommonUtils.isNotEmpty(content.getVideo_id())
-						&&state==CommonConst.AUDIT_REFUSE){
-					ShyVideos shyVideos1 = new ShyVideos();
-			        shyVideos1.setVideo_id(content.getVideo_id());
-			        List<ShyVideos> listshyVideos = videosService.findshyVideo(shyVideos1);
-			        if (listshyVideos.size() > 0) {
-			            ShyVideos shyVideos = listshyVideos.get(0);
-					String showMsg = videosService.repulse(shyVideos.getId().toString(), msg, userId);
-					if (CommonUtils.isNotEmpty(showMsg)) {
-						success = false;
-						return success;
-					}
-			      }
-				}
-				
-				content.setContent_status(state);// 设置图文状态为审核后的状态
-				content.setReceive_status(CommonConst.RECEIVE_AUDIT);// 领取状态为已审核
-				content.setShenhe_msg(msg);// 设置审核消息
-				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);
-				if (i != 1) {
-					success = false;
-				}
-			}
-
-		return success;
-	}
+    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();
+        try {
+            if (CommonUtils.isNotEmpty(content.getContent_tag()) && content.getContent_tag().equals("content")) {
+                result = Pass.contentPass(content.getContent_id(), state + "", msg, content.getCallback());
+            } else if (CommonUtils.isNotEmpty(content.getContent_tag()) && content.getContent_tag().equals("moment")) {
+                result = Pass.momentPass(content.getContent_id(), state, msg, content.getCallback(), content.getAuthor());
+            } else if (CommonUtils.isNotEmpty(content.getContent_tag()) && content.getContent_tag().equals("cms_photoalbum")) {
+                result = Pass.cmsCommonContentPass(content.getContent_id(), state, msg, content.getCallback(), content.getAuthor());
+            } else if (CommonUtils.isNotEmpty(content.getContent_tag()) && content.getContent_tag().equals("edu_works")) {
+                result = Pass.cmsCommonContentPass(content.getContent_id(), state, msg, content.getCallback(), content.getAuthor());
+            }
+        } catch (Exception e) {
+            logger.error("图文审核回调失败，图文id:{}", content.getId());
+            success = false;
+            return success;
+        }
+        if (result == null) {
+            logger.error("图文回调错误，且无返回信息。图文id:{}", content.getId());
+            success = false;
+            return success;
+        } else {
+            Integer code = result.getInteger("errorCode");
+            if (code != 0) {
+                logger.error("图文回调错误，图文id:{}，errorCode:{},errorMessage:{}", content.getId(), code,
+                        result.getString("errorMessage"));
+                success = false;
+                return success;
+            }
+
+            //如果当前图文是朋友圈的视频，通知点播云
+            if (CommonUtils.isNotEmpty(content.getContent_tag())
+                    && content.getContent_tag().equals("moment")
+                    && CommonUtils.isNotEmpty(content.getVideo_id())
+                    && state == CommonConst.AUDIT_REFUSE) {
+                ShyVideos shyVideos1 = new ShyVideos();
+                shyVideos1.setVideo_id(content.getVideo_id());
+                List<ShyVideos> listshyVideos = videosService.findshyVideo(shyVideos1);
+                if (listshyVideos.size() > 0) {
+                    ShyVideos shyVideos = listshyVideos.get(0);
+                    String showMsg = videosService.repulse(shyVideos.getId().toString(), msg, userId);
+                    if (CommonUtils.isNotEmpty(showMsg)) {
+                        success = false;
+                        return success;
+                    }
+                }
+            }
+
+            content.setContent_status(state);// 设置图文状态为审核后的状态
+            content.setReceive_status(CommonConst.RECEIVE_AUDIT);// 领取状态为已审核
+            content.setShenhe_msg(msg);// 设置审核消息
+            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);
+            if (i != 1) {
+                success = false;
+            }
+        }
+
+        return success;
+    }
     //**********************************
     public Integer receive(String ids, Integer num, String userId, Integer spid) {
@@ -282,10 +283,10 @@ public class ContentServiceImpl {
             String[] cids = ids.split(",");
             for (String cid : cids) {
                 ShyContent shyContent = shyContentMapper.selectByPrimaryKey(Integer.parseInt(cid));
-                if (CommonUtils.isNotNull(shyContent) && shyContent.getReceive_status() == CommonConst.RECEIVE_BEFORE ) {
-                	shyContent.setAuditor_id(userId);
-                	shyContent.setReceive_status(CommonConst.RECEIVE_AFTER);
-                	shyContent.setLast_update(CommonUtils.getCurrentTime());
+                if (CommonUtils.isNotNull(shyContent) && shyContent.getReceive_status() == CommonConst.RECEIVE_BEFORE) {
+                    shyContent.setAuditor_id(userId);
+                    shyContent.setReceive_status(CommonConst.RECEIVE_AFTER);
+                    shyContent.setLast_update(CommonUtils.getCurrentTime());
                     shyContentMapper.updateByPrimaryKeySelective(shyContent);
                     n++;
                 }
@@ -299,9 +300,9 @@ public class ContentServiceImpl {
             List<ShyContent> shyContentList = shyContentMapper.selectByExampleAndRowBounds(example, new RowBounds(0, num));
             if (!shyContentList.isEmpty()) {
                 for (ShyContent shyContent : shyContentList) {
-                	shyContent.setAuditor_id(userId);
-                	shyContent.setReceive_status(CommonConst.RECEIVE_AFTER);
-                	shyContent.setLast_update(CommonUtils.getCurrentTime());
+                    shyContent.setAuditor_id(userId);
+                    shyContent.setReceive_status(CommonConst.RECEIVE_AFTER);
+                    shyContent.setLast_update(CommonUtils.getCurrentTime());
                     shyContentMapper.updateByPrimaryKeySelective(shyContent);
                     n++;
                 }
@@ -326,38 +327,41 @@ public class ContentServiceImpl {
         }
         return n;
     }
+
     //**************************************
     public ShyContent selectByPrimaryKey(Integer id) {
         ShyContent shyContent = shyContentMapper.selectByPrimaryKey(id);
         return shyContent;
     }
+
     public int updateByPrimaryKeySelective(ShyContent content) {
         return shyContentMapper.updateByPrimaryKeySelective(content);
     }
-    
+
     /**
      * 获得审核类型
+     *
      * @param spId
      */
-    public Integer getShenheType(Integer spId,String ContentTag){
-		
-		//获取图文免审sp
+    public Integer getShenheType(Integer spId, String ContentTag) {
+
+        //获取图文免审sp
         List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_CONTENT);
         //初始化一个审核状态
-        Integer shenheType=3;//审核类型，1:免审，2:机审，3:人工审
+        Integer shenheType = 3;//审核类型，1:免审，2:机审，3:人工审
         //如果当前sp是免审sp
-        if(sites.contains(spId)){
-        	shenheType=1;//免审
-        }else{
-        	if("content".equals(ContentTag)){
-        		shenheType=2;//机审
-        	}else{
-        		shenheType=3;//人工审
-        	}
+        if (sites.contains(spId)) {
+            shenheType = 1;//免审
+        } else {
+            if ("content".equals(ContentTag)) {
+                shenheType = 2;//机审
+            } else {
+                shenheType = 3;//人工审
+            }
         }
         return shenheType;
-	}
+    }
     /**
      * 易盾网站过滤
@@ -25,24 +25,24 @@ public class AuditPass {
     private String platformValue;//点播platformValue
     @Value("${live_url}")
     private String live_url;//直播同步信息
-    
+
     @Value("${queryUserByMobile}")
     private String queryUserByMobile;//用户云查网家家用户信息（通过手机号）
-    
+
     @Value("${queryUserByUserId}")
     private String queryUserByUserId;//用户云查网家家用户信息（通过用户id）
-    
+
     public static void main(String[] args) {
-    	JSONObject map= new JSONObject();
-    	map.put("platform","a" );
-    	map.put("commentUserAvatar","http://yweb0.cnliveimg.com/images/headImg/2019/1129/1575022593286.jpg" );
-    	map.put("appId","60#iqw7flx829" );
-    	map.put("commentUserIP", null);
-    	map.put("type", "topic");
-    	map.put("activityId", "802:video:comets:604_ab79303bd0074a24965a92dd6514681a#20939");
-    	HttpUtil httpUtil = HttpUtil.init();
-    	httpUtil.setParam("param", map.toJSONString());
-    	Map<String, String> post = httpUtil.post("http://test.shen.cnlive.com/api/comments/import");
+        JSONObject map = new JSONObject();
+        map.put("platform", "a");
+        map.put("commentUserAvatar", "http://yweb0.cnliveimg.com/images/headImg/2019/1129/1575022593286.jpg");
+        map.put("appId", "60#iqw7flx829");
+        map.put("commentUserIP", null);
+        map.put("type", "topic");
+        map.put("activityId", "802:video:comets:604_ab79303bd0074a24965a92dd6514681a#20939");
+        HttpUtil httpUtil = HttpUtil.init();
+        httpUtil.setParam("param", map.toJSONString());
+        Map<String, String> post = httpUtil.post("http://test.shen.cnlive.com/api/comments/import");
     }
     /**
@@ -77,6 +77,7 @@ public class AuditPass {
         Map<String, String> post = httpUtil.post(URL);
         return JSONObject.parseObject(post.get("result"));
     }
+
     /**
      * 直播视频回调
      *
@@ -87,20 +88,20 @@ public class AuditPass {
      * @return
      */
     public JSONObject livePass(String activity_id, int state, String attr_tags, String msg, String callBack) {
-    	logger.info("直播回调：id:{},state:{},attr_tags:{},exceptionMessage:{}", activity_id, state, attr_tags, msg);
-    	JSONObject params = new JSONObject();
-    	params.put("id", activity_id);
-    	params.put("state", state);
-    	params.put("attr_tags", attr_tags);
-    	params.put("exceptionMessage", msg);
-    	HttpUtil httpUtil = HttpUtil.init();
-    	httpUtil.setParam("param", params.toJSONString());
-    	Map<String, String> post = httpUtil.post(callBack);
-		String result = post.get("result");
-		logger.info("直播回调result:{}",result);
-		return JSONObject.parseObject(post.get("result"));
+        logger.info("直播回调：id:{},state:{},attr_tags:{},exceptionMessage:{}", activity_id, state, attr_tags, msg);
+        JSONObject params = new JSONObject();
+        params.put("id", activity_id);
+        params.put("state", state);
+        params.put("attr_tags", attr_tags);
+        params.put("exceptionMessage", msg);
+        HttpUtil httpUtil = HttpUtil.init();
+        httpUtil.setParam("param", params.toJSONString());
+        Map<String, String> post = httpUtil.post(callBack);
+        String result = post.get("result");
+        logger.info("直播回调result:{}", result);
+        return JSONObject.parseObject(post.get("result"));
     }
-    
+
     /**
      * 直播视频回调
      *
@@ -111,139 +112,166 @@ public class AuditPass {
      * @return
      */
     public JSONObject liveApplyPass(String activity_id, int state, String attr_tags, String msg, String callBack) {
-    	logger.info("直播申请回调：id:{},state:{},attr_tags:{},exceptionMessage:{}", activity_id, state, attr_tags, msg);
-    	JSONObject params = new JSONObject();
-    	params.put("id", activity_id);
-    	params.put("state", state);
-    	params.put("attr_tags", attr_tags);
-    	params.put("exceptionMessage", msg);
-    	HttpUtil httpUtil = HttpUtil.init();
-    	httpUtil.setParam("param", params.toJSONString());
-    	Map<String, String> post = httpUtil.post(callBack);
-    	return JSONObject.parseObject(post.get("result"));
+        logger.info("直播申请回调：id:{},state:{},attr_tags:{},exceptionMessage:{}", activity_id, state, attr_tags, msg);
+        JSONObject params = new JSONObject();
+        params.put("id", activity_id);
+        params.put("state", state);
+        params.put("attr_tags", attr_tags);
+        params.put("exceptionMessage", msg);
+        HttpUtil httpUtil = HttpUtil.init();
+        httpUtil.setParam("param", params.toJSONString());
+        Map<String, String> post = httpUtil.post(callBack);
+        return JSONObject.parseObject(post.get("result"));
     }
-    
+
     /**
-    * 直播云信息同步
-    * @param json
-    * @param callBack
-    * @return
-    */
-   public JSONObject syncLive(String activity_id) {
-   	logger.info("直播云信息同步：activity_id:{}", activity_id);
-   	HttpUtil httpUtil = HttpUtil.init();
-	httpUtil.setParam("activityId", activity_id);
-	Map<String, String> post = httpUtil.post(live_url);
-	return JSONObject.parseObject(post.get("result"));
-   }
+     * 直播云信息同步
+     *
+     * @param json
+     * @param callBack
+     * @return
+     */
+    public JSONObject syncLive(String activity_id) {
+        logger.info("直播云信息同步：activity_id:{}", activity_id);
+        HttpUtil httpUtil = HttpUtil.init();
+        httpUtil.setParam("activityId", activity_id);
+        Map<String, String> post = httpUtil.post(live_url);
+        return JSONObject.parseObject(post.get("result"));
+    }
     /**
      * 评论审核回调
+     *
      * @param json
      * @param callBack
      * @return
      */
     public JSONObject commentPass(JSONObject json, String callBack) {
-    	logger.info("评论审核回调：param:{}", json);
+        logger.info("评论审核回调：param:{}", json);
         Map<String, String> map = new HashMap<>();
         map.put("param", json.toJSONString());
         String result = HttpUtil.form(callBack, map);
         return JSONObject.parseObject(result);
     }
+
     /**
      * 评论禁言
+     *
      * @param json
      * @param callBack
      * @return
      */
     public JSONObject commentSpeak(JSONObject json, String callBack) {
-    	logger.info("评论禁言：param:{}", json);
-    	Map<String, String> map = new HashMap<>();
-    	map.put("param", json.toJSONString());
-    	String result = HttpUtil.form(callBack, map);
-    	return JSONObject.parseObject(result);
+        logger.info("评论禁言：param:{}", json);
+        Map<String, String> map = new HashMap<>();
+        map.put("param", json.toJSONString());
+        String result = HttpUtil.form(callBack, map);
+        return JSONObject.parseObject(result);
     }
-    
+
     /**
      * 频道审核回调
+     *
      * @param json
      * @param callBack
      * @return
      */
     public JSONObject channelPass(JSONObject json, String callBack) {
-    	logger.info("频道审核回调：param:{}", json);
-    	Map<String, String> map = new HashMap<>();
-    	map.put("param", json.toJSONString());
-    	String result = HttpUtil.form(callBack, map);
-    	return JSONObject.parseObject(result);
+        logger.info("频道审核回调：param:{}", json);
+        Map<String, String> map = new HashMap<>();
+        map.put("param", json.toJSONString());
+        String result = HttpUtil.form(callBack, map);
+        return JSONObject.parseObject(result);
     }
-    
-    
+
+
     /**
      * 图文审核回调
-     * @param ids
-     * @param type  1（fabu），2（xiaxian），3（shanchu）
-     * @param shenheStatus 1
+     *
      * @param msg
      * @param callBack
      * @return
      */
-    public JSONObject contentPass(String contentId, String type,String msg, String callBack) {
+    public JSONObject contentPass(String contentId, String type, String msg, String callBack) {
         logger.info("图文回调：ids:{},type:{},msg:{}", contentId, type, msg);
         HttpUtil httpUtil = HttpUtil.init();
-        String URL = callBack + "?contentId=" + contentId + "&type=" + type+ "&shenMsg=" + msg;
+        String URL = callBack + "?contentId=" + contentId + "&type=" + type + "&shenMsg=" + msg;
         Map<String, String> post = httpUtil.post(URL);
         return JSONObject.parseObject(post.get("result"));
     }
-	public JSONObject momentPass(String content_id, Integer state, String msg, String callback, String userId) {
-		logger.info("朋友圈回调：content_id:{},state:{},msg:{},userId:{}", content_id, state, msg,userId);
-		JSONObject json=new JSONObject();
-		json.put("userId",userId );
-		json.put("momentId",content_id );
-		json.put("status",state );
-		json.put("msg", msg);
-		String httpUtilResult = HttpClientUtils.HttpPostWithJson(callback, json.toString());
-		logger.info("朋友圈返回数据，httpUtilResult=====" + httpUtilResult);
+
+    public JSONObject momentPass(String content_id, Integer state, String msg, String callback, String userId) {
+        logger.info("朋友圈回调：content_id:{},state:{},msg:{},userId:{}", content_id, state, msg, userId);
+        JSONObject json = new JSONObject();
+        json.put("userId", userId);
+        json.put("momentId", content_id);
+        json.put("status", state);
+        json.put("msg", msg);
+        String httpUtilResult = HttpClientUtils.HttpPostWithJson(callback, json.toString());
+        logger.info("朋友圈返回数据，httpUtilResult=====" + httpUtilResult);
         JSONObject result = JSONObject.parseObject(httpUtilResult);
-		return result;
-	}
-	public JSONObject queryUser(String userId, String userMobile) {
-		 logger.info("用户云查询用户：userId:{},userMobile:{}", userId, userMobile);
-	        HttpUtil httpUtil = HttpUtil.init();
-	        String URL = "";
-	        if(CommonUtils.isNotEmpty(userId)){
-	        	URL = queryUserByUserId + userId;
-	        }else{
-	        	URL = queryUserByMobile + userMobile;
-	        }
-	        logger.info("用户云查询用户使用url:"+URL);
-	        Map<String, String> post = httpUtil.post(URL);
-	        return JSONObject.parseObject(post.get("result"));
-	}
-
-	//音频回调
-	public JSONObject audioPass(String audioId, int state, String attr_tags, String msg, String callBack) {
-		logger.info("点播音频回调：audioId:{},state:{},attr_tags:{},msg:{}", audioId, state, attr_tags, msg);
-		JSONObject params = new JSONObject();
-		params.put("video_id", audioId);
-		//3-成功  4-失败
-		params.put("state", state + "");
-		params.put("attr_tags", attr_tags);
-		params.put("msg", msg);
-		HttpUtil httpUtil = HttpUtil.init();
-		httpUtil.setParam("param", params.toJSONString());
-		String token = "";
-		try {
-			String cb = callBack.replace("//", "");
-			cb = cb.substring(cb.indexOf("/"));
-			token = CommonUtils.md5(cb + platformKey + platformValue);
-		} catch (NoSuchAlgorithmException e) {
-			e.printStackTrace();
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-		}
-		String URL = callBack + "?platform=" + platformKey + "&token=" + token;
-		Map<String, String> post = httpUtil.post(URL);
-		return JSONObject.parseObject(post.get("result"));
-	}
+        return result;
+    }
+
+    /**
+     * cms审核回调
+     *
+     * @param content_id
+     * @param state
+     * @param msg
+     * @param callback
+     * @param userId
+     * @return
+     */
+    public JSONObject cmsCommonContentPass(String content_id, Integer state, String msg, String callback, String userId) {
+        logger.info("cms审核回调：content_id:{},state:{},msg:{},userId:{}", content_id, state, msg, userId);
+        JSONObject json = new JSONObject();
+        json.put("userId", userId);
+        json.put("contentId", content_id);
+        json.put("status", state);
+        json.put("msg", msg);
+        String httpUtilResult = HttpClientUtils.HttpPostWithJson(callback, json.toString());
+        logger.info("cms审核返回数据，httpUtilResult=====" + httpUtilResult);
+        return JSONObject.parseObject(httpUtilResult);
+    }
+
+    public JSONObject queryUser(String userId, String userMobile) {
+        logger.info("用户云查询用户：userId:{},userMobile:{}", userId, userMobile);
+        HttpUtil httpUtil = HttpUtil.init();
+        String URL = "";
+        if (CommonUtils.isNotEmpty(userId)) {
+            URL = queryUserByUserId + userId;
+        } else {
+            URL = queryUserByMobile + userMobile;
+        }
+        logger.info("用户云查询用户使用url:" + URL);
+        Map<String, String> post = httpUtil.post(URL);
+        return JSONObject.parseObject(post.get("result"));
+    }
+
+    //音频回调
+    public JSONObject audioPass(String audioId, int state, String attr_tags, String msg, String callBack) {
+        logger.info("点播音频回调：audioId:{},state:{},attr_tags:{},msg:{}", audioId, state, attr_tags, msg);
+        JSONObject params = new JSONObject();
+        params.put("video_id", audioId);
+        //3-成功  4-失败
+        params.put("state", state + "");
+        params.put("attr_tags", attr_tags);
+        params.put("msg", msg);
+        HttpUtil httpUtil = HttpUtil.init();
+        httpUtil.setParam("param", params.toJSONString());
+        String token = "";
+        try {
+            String cb = callBack.replace("//", "");
+            cb = cb.substring(cb.indexOf("/"));
+            token = CommonUtils.md5(cb + platformKey + platformValue);
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        String URL = callBack + "?platform=" + platformKey + "&token=" + token;
+        Map<String, String> post = httpUtil.post(URL);
+        return JSONObject.parseObject(post.get("result"));
+    }
 }