update

周伟鹏
1 parent 1226c53e
Showing 7 changed files with 27 additions and 54 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/controller/CommentsController.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/AuditPass.java
src/main/resources/templates/page/videoDetail.html
@@ -42,6 +42,7 @@ public class CommentsControllerApi {
         JSONObject json = JSONObject.parseObject(param);
         ShyComments shyComments = new ShyComments();
         ShySites shySites = new ShySites();
+        String callback = json.getString("callback");
         shyComments.setState(CommonConst.AUDIT_INTT);
         //判断是否白名单
         shySites.setSpid(json.getInteger("spId"));
@@ -61,7 +62,7 @@ public class CommentsControllerApi {
                     json1.put("msg", "");
                     JSONObject result = new JSONObject();
                     try{
-                        result = Pass.commentPass(json1);
+                        result = Pass.commentPass(json1,callback);
                     }catch (Exception e){
                         return new ResponseBean(ErrorEnum.BACK_ERROR);
                     }
@@ -88,7 +89,7 @@ public class CommentsControllerApi {
         shyComments.setPlatform(json.getString("platform"));
         shyComments.setActivity_id(json.getString("activityId"));
         shyComments.setIs_hot(json.getBoolean("priority"));
-        shyComments.setCallback(json.getString("callback"));
+        shyComments.setCallback(callback);
         int i = commentsService.impotComments(shyComments);
         if (i > 0) {
             return new ResponseBean(ErrorEnum.SUCCESS);
@@ -49,6 +49,7 @@ public class VideosControllerApi {
         shySites.setSpid(json.getInteger("spId"));
         List<ShySites> shySitesList = videosService.getBusiness(shySites);
         String videoId = json.getString("videoId");
+        String callback = json.getString("callback");
         if (!shySitesList.isEmpty()) {
             if (CommonUtils.isNotEmpty(shySitesList.get(0).getWrite_business())) {
                 String write_business = shySitesList.get(0).getWrite_business();
@@ -58,7 +59,7 @@ public class VideosControllerApi {
                     logger.info("白名单回调通过:videoId==="+videoId);
                     JSONObject result = new JSONObject();
                     try{
-                        result = Pass.auditPass(videoId, 3, "", "");
+                        result = Pass.auditPass(videoId, 3, "", "",callback);
                     }catch (Exception e){
                         return new ResponseBean(ErrorEnum.BACK_ERROR);
                     }
@@ -83,7 +84,7 @@ public class VideosControllerApi {
         shyVideos.setVideo_desc(json.getString("videoIntro"));
         shyVideos.setVideo_keyword(json.getString("videoKeyword"));
         shyVideos.setVideo_priority(json.getString("priority"));
-        shyVideos.setCallback(json.getString("callback"));
+        shyVideos.setCallback(callback);
         shyVideos.setSpid(Integer.parseInt(json.getString("spId")));
         int i = videosService.impotVideo(shyVideos);
         if (i > 0) {
 package com.cnlive.shenhe.controller;
-import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
@@ -34,30 +33,6 @@ public class CommentsController {
     UsersServiceImpl usersService;
     /**
-     * 评论修改状态接口
-     *
-     * @param json
-     * @return
-     */
-    @PostMapping("/shenheComment")
-    @ResponseBody
-    public ResponseBean shenheInfo(@RequestBody JSONObject json, Integer id, HttpSession session) {
-        JSONObject result = Pass.commentPass(json);
-        Integer code = result.getInteger("errorCode");
-        if (code != 0) {
-            return new ResponseBean(code, result.getString("errorMessage"));
-        }
-        SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
-        String userId = sessionUser.getUserId();
-        int i = commentsService.updateComment(json, id, userId);
-        if (i == 0) {
-            return new ResponseBean(ErrorEnum.ERROR);
-        } else {
-            return new ResponseBean(ErrorEnum.SUCCESS);
-        }
-    }
-
-    /**
      * 评论列表页
      *
      * @param activity_id
@@ -15,6 +15,8 @@ import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -43,8 +45,6 @@ public class VideosController {
         user.put("company", shyUsers.getCompany_brief());
         user.put("spid", shyUsers.getSp_id());
         model.addAttribute("user", user);
-
-
         return "page/video.html";
     }
@@ -57,18 +57,18 @@ public class VideosController {
      * @param msg         备注信息
      * @return
      */
-    @RequestMapping("/shenheVideo")
+    @PostMapping("/shenheVideo")
     @ResponseBody
-        public ResponseBean shenheInfo(Integer id, String activity_id, Integer state, String attr_tags, String msg, HttpSession session) {
+    public ResponseBean shenheInfo(Integer id, String activity_id, Integer state, String attr_tags, String msg, String callback, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
-        JSONObject result = Pass.auditPass(activity_id, state, attr_tags, msg);
+        JSONObject result = Pass.auditPass(activity_id, state, attr_tags, msg, callback);
         Integer code = result.getInteger("code");
         if (code != 0) {
             return new ResponseBean(code, result.getString("msg"));
         }
-        state = state==4 ? 2 : 1;
-        int i = videosService.updateVideo(id, userId, state,  msg);
+        state = state == 4 ? 2 : 1;
+        int i = videosService.updateVideo(id, userId, state, msg);
         if (i == 0) {
             return new ResponseBean(ErrorEnum.ERROR);
         }
@@ -87,7 +87,7 @@ public class VideosController {
      * @param orderByClause
      * @return
      */
-    @RequestMapping("/page")
+    @GetMapping("/page")
     public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Integer page, Integer pageSize, String video_priority, String orderByClause, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         Integer spid = sessionUser.getSpid();
@@ -121,8 +121,8 @@ public class VideosController {
      * @param id
      * @return
      */
-    @RequestMapping("/details")
-    public Object getDetailsVideo(Model model,Integer id) {
+    @GetMapping("/details")
+    public Object getDetailsVideo(Model model, Integer id) {
         ShyVideos detailsContent = videosService.getDetailsContent(id);
         Object images = JSON.parse(detailsContent.getVideo_imgs());
         model.addAttribute("images", images);
@@ -123,7 +123,7 @@ public class CommentsServiceImpl {
             json.put("msg", "");
             JSONObject result = new JSONObject();
             try {
-                result = Pass.commentPass(json);
+                result = Pass.commentPass(json,comment.getCallback());
             } catch (Exception e) {
                 logger.error("评论回调失败，activity_id:{}", comment.getActivity_id());
                 success = false;
@@ -6,8 +6,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import java.io.UnsupportedEncodingException;
-import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.Map;
@@ -19,14 +17,10 @@ import java.util.Map;
 @Component
 public class AuditPass {
     private static Logger logger = LoggerFactory.getLogger(AuditPass.class);
-    @Value("${url}")
-    private   String url;//点播url
     @Value("${platformKey}")
     private  String platformKey;//点播platformKey
     @Value("${platformValue}")
     private  String platformValue;//点播platformValue
-    @Value("${commenturl}")
-    private  String commentUrl;
     @Value("${token}")
     private String token;
     /**
@@ -37,7 +31,7 @@ public class AuditPass {
      * @param msg
      * @return
      */
-    public  JSONObject auditPass(String video_id,int state,String attr_tags,String msg){
+    public  JSONObject auditPass(String video_id,int state,String attr_tags,String msg,String callBack){
         logger.info("点播回调：video_id:{},state:{},attr_tags:{},msg:{}",video_id,state,attr_tags,msg);
         Map<String, String> paramsMap = new HashMap<>();
         JSONObject params = new JSONObject();
@@ -47,16 +41,16 @@ public class AuditPass {
         params.put("msg",msg);
         paramsMap.put("params",params.toJSONString());
         HttpUtil httpUtil = HttpUtil.init();
-        String URL =url+"?platform="+platformKey+"&token="+token;
+        String URL =callBack+"?platform="+platformKey+"&token="+token;
         httpUtil.setParamMap(paramsMap);
         Map<String, String> post = httpUtil.post(URL);
         return  JSONObject.parseObject(post.get("result"));
     }
-    public JSONObject commentPass(JSONObject json){
+    public JSONObject commentPass(JSONObject json,String callBack){
         HttpUtil httpUtil = HttpUtil.init();
         httpUtil.setStringParam(json.toJSONString());
-        Map<String, String> post = httpUtil.post(commentUrl);
+        Map<String, String> post = httpUtil.post(callBack);
         return JSONObject.parseObject(post.get("result"));
     }
 }
@@ -226,6 +226,7 @@
                                         var row_id = $("#video_id").val();
                                         var attr_tags = $('#attr_tags').val();//获取标签属性信息
                                         var msg = $('#msg').val(); //获取审核msg
+                                        var callback = [[${video.callback}]];
                                         if (attr_tags == null && msg == '') { //两个都为空 不行
                                             alert('请输入审核备注或者常用审核意见!');
                                             return false;
@@ -237,8 +238,8 @@
                                         var action_note_type = $("#action_note_type").val();
                                         if (action_note_type == 'reject') {
                                             $.ajax({
-                                                type: 'get',
-                                                data: {'id':id,'activity_id': activity_id, 'state': state, 'attr_tags': msg,'msg':msg},
+                                                type: 'post',
+                                                data: {'id':id,'activity_id': activity_id, 'state': state, 'attr_tags': msg,'msg':msg,'callback':callback[0]},
                                                 url: '/videos/shenheVideo',
                                                 success: function (data) {
                                                     window.location.href = '/videos/page?state=0'
@@ -257,12 +258,13 @@
                                         var activity_id =[[${video.video_id}]];
                                         var attr_tags = $('#attr_tags').val();//获取标签属性信息
                                         var msg = $('#msg').val(); //获取审核msg
+                                        var callback = [[${video.callback}]];
                                         if (typeof(activity_id) == "undefined") {
                                             return false;
                                         }
                                         $.ajax({
-                                            type: 'get',
-                                            data: {'id':id,'activity_id': activity_id, 'state': state, 'attr_tags': msg,'msg':msg},
+                                            type: 'post',
+                                            data: {'id':id,'activity_id': activity_id, 'state': state, 'attr_tags': msg,'msg':msg,'callback':callback[0]},
                                             url: '/videos/shenheVideo',
                                             success: function (data) {
                                                 window.location.href = '/videos/page?state=0'