更改接口逻辑，评论审核定时任务

陈浩
1 parent 3d5a1343
Showing 6 changed files with 203 additions and 85 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/job/CommentsJob.java
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/SitesServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import java.sql.Timestamp;
+import java.time.Year;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -41,43 +42,43 @@ public class CommentsControllerApi {
     public ResponseBean impotComment(String param) {
         logger.info("评论入库，param=====" + param);
         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"));
-        List<ShySites> shySitesList = commentsService.getBusiness(shySites);
-        if (!shySitesList.isEmpty()) {
-            if (CommonUtils.isNotEmpty(shySitesList.get(0).getWrite_business())) {
-                String write_business = shySitesList.get(0).getWrite_business();
-                String[] business = write_business.split(",");
-                List<String> asList = Arrays.asList(business);
-                if (asList.contains(CommonConst.BUSINESS_COMMENT + "")) {
-                    shyComments.setState(CommonConst.AUDIT_SUCCESS);
-                    //封装json数据传参进行回调
-                    JSONObject json1 = new JSONObject();
-                    json1.put("activity_id", json.getString("activityId"));
-                    json1.put("state", 3);
-                    json1.put("attr_tags", "");
-                    json1.put("msg", "");
-                    JSONObject result = new JSONObject();
-                    try {
-                        result = Pass.commentPass(json1, callback);
-                    } catch (Exception e) {
-                        logger.error("评论回调失败，activity_id:{}", json.getString("activityId"));
-                        return new ResponseBean(ErrorEnum.BACK_ERROR);
-                    }
-                    Integer code = result.getInteger("errorCode");
-                    if (code != 0) {
-                        logger.error("评论回调错误，activity_id:{},code:{},errorMessage:{}", json.getString("activityId"), code, result.getString("errorMessage"));
-                        return new ResponseBean(code, result.getString("errorMessage"));
-                    }
-                    shyComments.setState(CommonConst.AUDIT_SUCCESS);
-                }
+        shyComments.setActivity_id(json.getString("activityId"));
+        List<ShyComments> commentsList = commentsService.findshyComments(shyComments);
+        //存在则更新
+        if (commentsList.size() > 0) {
+            ShyComments shyComments1 = commentsList.get(0);
+            shyComments1.setState(CommonConst.AUDIT_INTT);
+            shyComments1.setProgram_id(json.getString("programId"));
+            shyComments1.setComment_original_url(json.getString("originalUrl"));
+            shyComments1.setComment_title(json.getString("commentTitle"));
+            shyComments1.setComment_user_id(json.getInteger("commentUserId"));
+            shyComments1.setComment_user_name(json.getString("commentUserName"));
+            shyComments1.setComment_user_avatar(json.getString("commentUserAvatar"));
+            shyComments1.setComment_user_ip(json.getString("commentUserIP"));
+            shyComments1.setComment_content(json.getString("commentContent"));
+            String commentTime = json.getString("commentTime");
+            if (CommonUtils.isNotEmpty(commentTime)) {
+                Date timestamp = CommonUtils.getTimestamp(commentTime, "yyyy-MM-dd hh:mm");
+                shyComments1.setComment_time(timestamp);
+
+            }
+            shyComments1.setSpid(json.getInteger("spId"));
+            shyComments1.setApp_id(json.getString("appId"));
+            shyComments1.setPlatform(json.getString("platform"));
+            shyComments1.setActivity_id(json.getString("activityId"));
+            shyComments1.setIs_hot(json.getBoolean("priority"));
+            shyComments1.setCallback(json.getString("callback"));
+            boolean YorN = commentsService.updateshyComments1(shyComments1);
+            if (YorN == true) {
+                return new ResponseBean(ErrorEnum.SUCCESS);
+            } else {
+                return new ResponseBean(ErrorEnum.ERROR);
             }
         }
-        //封装数据入库
+        //如果不存在直接插入
+        shyComments.setState(CommonConst.AUDIT_INTT);
         shyComments.setProgram_id(json.getString("programId"));
         shyComments.setComment_original_url(json.getString("originalUrl"));
         shyComments.setComment_title(json.getString("commentTitle"));
@@ -87,19 +88,18 @@ public class CommentsControllerApi {
         shyComments.setComment_user_ip(json.getString("commentUserIP"));
         shyComments.setComment_content(json.getString("commentContent"));
         String commentTime = json.getString("commentTime");
-        if(CommonUtils.isNotEmpty(commentTime)){
+        if (CommonUtils.isNotEmpty(commentTime)) {
             Date timestamp = CommonUtils.getTimestamp(commentTime, "yyyy-MM-dd hh:mm");
             shyComments.setComment_time(timestamp);
-
         }
         shyComments.setSpid(json.getInteger("spId"));
         shyComments.setApp_id(json.getString("appId"));
         shyComments.setPlatform(json.getString("platform"));
         shyComments.setActivity_id(json.getString("activityId"));
         shyComments.setIs_hot(json.getBoolean("priority"));
-        shyComments.setCallback(callback);
-        int i = commentsService.impotComments(shyComments);
-        if (i > 0) {
+        shyComments.setCallback(json.getString("callback"));
+        boolean YorN = commentsService.impotComments(shyComments);
+        if (YorN == true) {
             return new ResponseBean(ErrorEnum.SUCCESS);
         } else {
             return new ResponseBean(ErrorEnum.ERROR);
@@ -36,60 +36,65 @@ public class VideosControllerApi {
     VideosServiceImpl videosService;
     @Autowired
     UsersServiceImpl usersService;
-
+    //先统一入库，入库时查询是否已有，有，更新 无，插入  白名单单独定时任务
     @PostMapping("/import")
     @ResponseBody
     public ResponseBean impotVideo(String param) {
         logger.info("点播入库，param=====" + param);
         JSONObject json = JSONObject.parseObject(param);
-        ShySites shySites = new ShySites();
-        ShyVideos shyVideos = new ShyVideos();
-        shyVideos.setState(CommonConst.AUDIT_INTT);
-        //判断是否白名单
-        shySites.setSpid(json.getInteger("spId"));
-        List<ShySites> shySitesList = videosService.getBusiness(shySites);
+        ShyVideos shyVideos1 = new ShyVideos();
+        //g得到视频id去查询是否已有
         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();
-                String[] business = write_business.split(",");
-                List<String> asList = Arrays.asList(business);
-                if (asList.contains(CommonConst.BUSINESS_VIDEO + "")) {
-                    logger.info("白名单回调通过:videoId===" + videoId);
-                    JSONObject result = new JSONObject();
-                    try {
-                        result = Pass.auditPass(videoId, 3, "", "", callback);
-                    } catch (Exception e) {
-                        logger.error("点播回调失败，videoId:{}", videoId);
-                        return new ResponseBean(ErrorEnum.BACK_ERROR);
-                    }
-                    Integer code = result.getInteger("code");
-                    if (code != 0) {
-                        logger.error("点播回调错误，videoId:{},code:{},msg:{}", videoId, code, result.getString("msg"));
-                        return new ResponseBean(code, result.getString("msg"));
-                    }
-                    shyVideos.setState(CommonConst.AUDIT_SUCCESS);
-                }
+        shyVideos1.setVideo_id(videoId);
+        //查询一下 存在，更新 没有，插入
+        List<ShyVideos> listshyVideos = videosService.findshyVideo(shyVideos1);
+        if(listshyVideos.size()>0){
+            ShyVideos shyVideos = listshyVideos.get(0);
+            //封装数据入库
+            shyVideos.setVideo_id(videoId);
+            shyVideos.setVideo_title(json.getString("videoTitle"));
+            shyVideos.setVideo_url(json.getString("videoUrl"));
+            String videoCoverUrl = json.getString("videoCoverUrl");
+            shyVideos.setVideo_imgs(videoCoverUrl);
+            if (CommonUtils.isNotEmpty(videoCoverUrl)) {
+                String poster = json.getJSONObject("videoCoverUrl").getString("224*126");
+                shyVideos.setVideo_poster(poster);
+            }
+            shyVideos.setVideo_desc(json.getString("videoIntro"));
+            shyVideos.setVideo_tags(json.getString("videoTag"));
+            shyVideos.setVideo_keyword(json.getString("videoKeyword"));
+            shyVideos.setVideo_upload_time(json.getDate(" uploadTime"));
+            shyVideos.setVideo_priority(json.getString("priority"));
+            shyVideos.setCallback(json.getString("callback"));
+            shyVideos.setSpid(Integer.parseInt(json.getString("spId")));
+            shyVideos.setState(CommonConst.AUDIT_INTT);
+            boolean YorN = videosService.updateshyVideos(shyVideos);
+            if(YorN == true){
+                return new ResponseBean(ErrorEnum.SUCCESS);
+            }else {
+                return new ResponseBean(ErrorEnum.ERROR);
             }
         }
-        //封装数据入库
-        shyVideos.setVideo_id(videoId);
-        shyVideos.setVideo_title(json.getString("videoTitle"));
-        shyVideos.setVideo_url(json.getString("videoUrl"));
+        //查了，没有，直接插入数据库
+        shyVideos1.setVideo_id(videoId);
+        shyVideos1.setVideo_title(json.getString("videoTitle"));
+        shyVideos1.setVideo_url(json.getString("videoUrl"));
         String videoCoverUrl = json.getString("videoCoverUrl");
-        shyVideos.setVideo_imgs(videoCoverUrl);
+        shyVideos1.setVideo_imgs(videoCoverUrl);
         if (CommonUtils.isNotEmpty(videoCoverUrl)) {
             String poster = json.getJSONObject("videoCoverUrl").getString("224*126");
-            shyVideos.setVideo_poster(poster);
+            shyVideos1.setVideo_poster(poster);
         }
-        shyVideos.setVideo_desc(json.getString("videoIntro"));
-        shyVideos.setVideo_keyword(json.getString("videoKeyword"));
-        shyVideos.setVideo_priority(json.getString("priority"));
-        shyVideos.setCallback(callback);
-        shyVideos.setSpid(Integer.parseInt(json.getString("spId")));
-        int i = videosService.impotVideo(shyVideos);
-        if (i > 0) {
+        shyVideos1.setVideo_desc(json.getString("videoIntro"));
+        shyVideos1.setVideo_tags(json.getString("videoTag"));
+        shyVideos1.setVideo_keyword(json.getString("videoKeyword"));
+        shyVideos1.setVideo_upload_time(json.getDate("uploadTime"));
+        shyVideos1.setVideo_priority(json.getString("priority"));
+        shyVideos1.setCallback(json.getString("callback"));
+        shyVideos1.setSpid(Integer.parseInt(json.getString("spId")));
+        shyVideos1.setState(CommonConst.AUDIT_INTT);
+        boolean result = videosService.impotVideo(shyVideos1);
+        if (result == true) {
             return new ResponseBean(ErrorEnum.SUCCESS);
         } else {
             return new ResponseBean(ErrorEnum.ERROR);
+package com.cnlive.shenhe.job;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cnlive.shenhe.bean.ErrorEnum;
+import com.cnlive.shenhe.bean.ResponseBean;
+import com.cnlive.shenhe.entity.ShyComments;
+import com.cnlive.shenhe.entity.ShySites;
+import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl;
+import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
+import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
+import com.cnlive.shenhe.utils.AuditPass;
+import com.cnlive.shenhe.utils.CommonConst;
+import com.cnlive.shenhe.utils.CommonUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Component
+public class CommentsJob {
+    private static Logger logger = LoggerFactory.getLogger(CommentsJob.class);
+    @Autowired
+    SitesServiceImpl sitesService;
+    @Autowired
+    AuditPass Pass;
+    @Autowired
+    CommentsServiceImpl commentsService;
+
+    @Autowired
+    UsersServiceImpl usersService;
+
+
+    @Scheduled(fixedRate = 30 * 60 * 1000)
+    public void syncComments() {
+
+        //收集免审的spid
+        List<ShySites> sitesList = sitesService.findAll();
+        ArrayList<Integer> sites = new ArrayList<Integer>();
+        for (ShySites shySites : sitesList) {
+            if (CommonUtils.isNotEmpty(shySites.getWrite_business())) {
+                String[] business = shySites.getWrite_business().split(",");
+                List<String> asList = Arrays.asList(business);
+                if (asList.contains(CommonConst.BUSINESS_COMMENT + "")) {
+                    sites.add(shySites.getSpid());
+                }
+            }
+        }
+        //遍历免审的spid去更改状态值
+        ShyComments shyComments = new ShyComments();
+        for (int spid : sites) {
+            shyComments.setSpid(spid);
+            List<ShyComments> commentsList = commentsService.findshyComments(shyComments);
+            if (commentsList.size() > 0) {
+                for (ShyComments comments : commentsList) {
+                    //封装json数据传参进行回调
+                    JSONObject json1 = new JSONObject();
+                    json1.put("activity_id", comments.getActivity_id());
+                    json1.put("state", 3);
+                    json1.put("attr_tags", "");
+                    json1.put("msg", "");
+                    JSONObject result = new JSONObject();
+                    try {
+                        result = Pass.commentPass(json1, comments.getCallback());
+                    } catch (Exception e) {
+                        logger.error("评论回调失败，activity_id:{}", comments.getActivity_id());
+                    }
+                    comments.setState(CommonConst.AUDIT_SUCCESS);
+                    int i = commentsService.updateComment(json1, null, comments.getAuditor_id());
+                }
+            }
+        }
+    }
+}
@@ -44,9 +44,25 @@ public class CommentsServiceImpl {
         return sitesList;
     }
-    public int impotComments(ShyComments shyComments) {
+    //**************************************
+    public List<ShyComments> findshyComments(ShyComments shyComments) {
+        List<ShyComments> commentsList = shyCommentsMapper.select(shyComments);
+        return commentsList;
+    }
+    public boolean updateshyComments1(ShyComments shyComments) {
+        int result = shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
+        if(result==0){
+            return false;
+        }
+        return true;
+    }
+
+    public boolean impotComments(ShyComments shyComments) {
         int result = shyCommentsMapper.insert(shyComments);
-        return result;
+        if(result==0){
+            return false;
+        }
+        return true;
     }
     public int updateComment(JSONObject json, Integer id, String auditor_id) {
@@ -47,4 +47,8 @@ public class SitesServiceImpl {
     public boolean update(ShySites site) {
         return shySitesMapper.updateByPrimaryKeySelective(site)==1;
     }
+    public List<ShySites> findAll() {
+        List<ShySites> shySites = shySitesMapper.selectAll();
+        return shySites;
+    }
 }
@@ -31,16 +31,31 @@ public class VideosServiceImpl {
     @Autowired
     ShyUsersMapper shyUsersMapper;
-    public int impotVideo(ShyVideos shyVideos) {
+    public boolean impotVideo(ShyVideos shyVideos) {
         int result = shyVideosMapper.insert(shyVideos);
-        return result;
+        if(result==0){
+            return false;
+        }
+        return true;
     }
     public List<ShySites> getBusiness(ShySites shySites) {
         List<ShySites> sitesList = shySitesMapper.select(shySites);
         return sitesList;
     }
+//    重改逻辑后新加的方法============================
+    public List<ShyVideos> findshyVideo(ShyVideos shyVideos) {
+        List<ShyVideos> shyVideoslist = shyVideosMapper.select(shyVideos);
+        return shyVideoslist;
+    }
+    public boolean updateshyVideos(ShyVideos shyVideos) {
+        int i = shyVideosMapper.updateByPrimaryKeySelective(shyVideos);
+        if(i==0){
+            return false;
+        }
+        return true;
+    }
     public int updateVideo(Integer id, String auditor_id, Integer state,  String msg) {
         ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(id);
         shyVideos.setAuditor_id(auditor_id);