回调错误处理

周伟鹏
1 parent 883d34b0
Showing 6 changed files with 46 additions and 16 deletions
src/main/java/com/cnlive/shenhe/api/CommentsControllerApi.java
src/main/java/com/cnlive/shenhe/api/VideosControllerApi.java
src/main/java/com/cnlive/shenhe/bean/ErrorEnum.java
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/AuditPass.java
src/main/resources/application.properties
@@ -37,9 +37,9 @@ public class CommentsControllerApi {
      */
     @PostMapping("/import")
     @ResponseBody
-    public ResponseBean impotComment(@RequestBody JSONObject param) {
-        logger.info("评论入库，param====="+param.toJSONString());
-        JSONObject json = param.getJSONObject("param");
+    public ResponseBean impotComment(String param) {
+        logger.info("评论入库，param====="+param);
+        JSONObject json = JSONObject.parseObject(param);
         ShyComments shyComments = new ShyComments();
         ShySites shySites = new ShySites();
         shyComments.setState(CommonConst.AUDIT_INTT);
@@ -59,7 +59,12 @@ public class CommentsControllerApi {
                     json1.put("state", 3);
                     json1.put("attr_tags", "");
                     json1.put("msg", "");
-                    JSONObject result = Pass.commentPass(json1);
+                    JSONObject result = new JSONObject();
+                    try{
+                        result = Pass.commentPass(json1);
+                    }catch (Exception e){
+                        return new ResponseBean(ErrorEnum.BACK_ERROR);
+                    }
                     Integer code = result.getInteger("errorCode");
                     if (code != 0) {
                         return new ResponseBean(code, result.getString("errorMessage"));
@@ -56,7 +56,12 @@ public class VideosControllerApi {
                 List<String> asList = Arrays.asList(business);
                 if (asList.contains(CommonConst.BUSINESS_VIDEO + "")) {
                     logger.info("白名单回调通过:videoId==="+videoId);
-                    JSONObject result = Pass.auditPass(videoId, 3, "", "");
+                    JSONObject result = new JSONObject();
+                    try{
+                        result = Pass.auditPass(videoId, 3, "", "");
+                    }catch (Exception e){
+                        return new ResponseBean(ErrorEnum.BACK_ERROR);
+                    }
                     Integer code = result.getInteger("code");
                     if (code != 0) {
                         return new ResponseBean(code, result.getString("msg"));
@@ -7,7 +7,8 @@ public enum ErrorEnum {
     ERROR(500, "服务异常"),
     RECORD_NOT_EXIST(10001, "记录不存在"),
     PARAM_ERROR(10002, "参数错误"),
-    NOT_LOGIN(4000, "登录失效或未登录"),
+    BACK_ERROR(10003, "回调请求失败"),
+    NOT_LOGIN(40000, "登录失效或未登录"),
     ACCESS_DENIED(40001, "没有权限");
@@ -7,9 +7,12 @@ import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.mapper.ShyCommentsMapper;
 import com.cnlive.shenhe.mapper.ShySitesMapper;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
+import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
@@ -24,13 +27,16 @@ import java.util.List;
  */
 @Service
 public class CommentsServiceImpl {
+
+    private static Logger logger = LoggerFactory.getLogger(CommentsServiceImpl.class);
     @Autowired
     ShyCommentsMapper shyCommentsMapper;
     @Autowired
     ShySitesMapper shySitesMapper;
     @Autowired
     ShyUsersMapper shyUsersMapper;
-
+    @Autowired
+    AuditPass Pass;
     public List<ShySites> getBusiness(ShySites shySites) {
         List<ShySites> sitesList = shySitesMapper.select(shySites);
@@ -110,6 +116,25 @@ public class CommentsServiceImpl {
         String[] commentIds = ids.split(",");
         for (String commentId : commentIds) {
             ShyComments comment = shyCommentsMapper.selectByPrimaryKey(Integer.parseInt(commentId));
+            JSONObject json = new JSONObject();
+            json.put("activity_id", comment.getActivity_id());
+            json.put("state", state + 2);
+            json.put("attr_tags", "");
+            json.put("msg", "");
+            JSONObject result = new JSONObject();
+            try {
+                result = Pass.commentPass(json);
+            } catch (Exception e) {
+                logger.error("评论回调失败，activity_id:{}", comment.getActivity_id());
+                success = false;
+                break;
+            }
+            Integer code = result.getInteger("errorCode");
+            if (code != 0) {
+                logger.error("评论回调失败，activity_id:{}，errorCode:{},errorMessage:{}", comment.getActivity_id(), code, result.getString("errorMessage"));
+                success = false;
+                break;
+            }
             comment.setState(state);
             comment.setAuditor_id(userId);
             int i = shyCommentsMapper.updateByPrimaryKeySelective(comment);
@@ -27,7 +27,8 @@ public class AuditPass {
     private  String platformValue;//点播platformValue
     @Value("${commenturl}")
     private  String commentUrl;
-
+    @Value("${token}")
+    private String token;
     /**
      * 点播视频回调
      * @param video_id
@@ -38,14 +39,6 @@ public class AuditPass {
      */
     public  JSONObject auditPass(String video_id,int state,String attr_tags,String msg){
         logger.info("点播回调：video_id:{},state:{},attr_tags:{},msg:{}",video_id,state,attr_tags,msg);
-        String token = null;
-        try {
-            token = CommonUtils.md5(url+platformKey+platformValue);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
         Map<String, String> paramsMap = new HashMap<>();
         JSONObject params = new JSONObject();
         params.put("video_id",video_id);
@@ -24,6 +24,7 @@ sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
 url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify
 platformKey =AUDIT
 platformValue=10011438
+token=2718c88930175686e40398994cead75c
 #ÆÀÂÛ»Øµ÷µØÖ·
 commenturl=http://comment.cnlive.com/services/commentForHd/auditCallBack
 \ No newline at end of file