评论审核修改时间获取以及审核类型

liwei2917
1 parent 8a70aec8
Showing 6 changed files with 101 additions and 54 deletions
src/main/java/com/cnlive/shenhe/api/CommentsControllerApi.java
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
src/main/java/com/cnlive/shenhe/entity/ShyComments.java
src/main/java/com/cnlive/shenhe/job/CommentsJob.java
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
src/main/resources/templates/page/comment.html
@@ -56,7 +56,7 @@ public class CommentsControllerApi {
             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:ss");
+                Date timestamp = CommonUtils.getTimestamp(commentTime, "yyyy-MM-dd HH:mm");
                 shyComments1.setComment_time(timestamp);
             }
@@ -85,7 +85,7 @@ public class CommentsControllerApi {
         shyComments.setComment_content(json.getString("commentContent"));
         String commentTime = json.getString("commentTime");
         if (CommonUtils.isNotEmpty(commentTime)) {
-            Date timestamp = CommonUtils.getTimestamp(commentTime, "yyyy-MM-dd HH:mm:ss");
+            Date timestamp = CommonUtils.getTimestamp(commentTime, "yyyy-MM-dd HH:mm");
             shyComments.setComment_time(timestamp);
         }
         shyComments.setSpid(json.getInteger("spId"));
@@ -93,6 +93,7 @@ public class CommentsControllerApi {
         shyComments.setPlatform(json.getString("platform"));
         shyComments.setIs_hot(json.getBoolean("priority"));
         shyComments.setCallback(json.getString("callback"));
+        commentsService.getShenheType(shyComments);
         boolean YorN = commentsService.impotComments(shyComments);
         if (YorN == true) {
             return new ResponseBean(ErrorEnum.SUCCESS);
@@ -5,9 +5,11 @@ import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
 import com.cnlive.shenhe.entity.ShyComments;
+import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.entity.ShyVideos;
 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;
@@ -36,6 +38,9 @@ public class CommentsController {
     @Autowired
     UsersServiceImpl usersService;
+    
+    @Autowired
+    SitesServiceImpl sitesService;
     /**
      * 评论列表页
@@ -98,6 +103,11 @@ public class CommentsController {
                     }
                     comment.setUpdater(updater);
                 }
+                //显示spid简称
+                ShySites shySites = sitesService.findspidDescByspid(comment.getSpid());
+                if (CommonUtils.isNotNull(shySites)) {
+                		comment.setSpid_desc(shySites.getName());
+                }
             }
         }
         model.addAttribute("commentPage", commentPage);
@@ -129,7 +139,7 @@ public class CommentsController {
     public ResponseBean pass(String ids, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
-        boolean success = commentsService.updateState(ids, CommonConst.AUDIT_SUCCESS, userId);
+        boolean success = commentsService.updateState(ids, CommonConst.AUDIT_SUCCESS, userId,"","审核通过");
         if (success) {
             return new ResponseBean();
         } else {
@@ -148,7 +158,7 @@ public class CommentsController {
     public ResponseBean refuse(String ids, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
-        boolean success = commentsService.updateState(ids, CommonConst.AUDIT_REFUSE, userId);
+        boolean success = commentsService.updateState(ids, CommonConst.AUDIT_REFUSE, userId,"","审核拒绝");
         if (success) {
             return new ResponseBean();
         } else {
@@ -54,6 +54,11 @@ public class ShyComments {
      * 原文链接url
      */
     private String comment_original_url;
+    
+    /**
+     * 审核类型，1:免审，2:机审，3:人工审
+     */
+    private Integer shenhe_type;
     /**
      * 更新者
@@ -303,6 +308,9 @@ public class ShyComments {
     public void setComment_original_url(String comment_original_url) {
         this.comment_original_url = comment_original_url;
     }
+    
+    @Transient
+    private String spid_desc;
     /**
      * 获取更新者
@@ -529,4 +537,22 @@ public class ShyComments {
     public void setReceive_user_id(String receive_user_id) {
         this.receive_user_id = receive_user_id;
     }
+
+	public Integer getShenhe_type() {
+		return shenhe_type;
+	}
+
+	public void setShenhe_type(Integer shenhe_type) {
+		this.shenhe_type = shenhe_type;
+	}
+
+	public String getSpid_desc() {
+		return spid_desc;
+	}
+
+	public void setSpid_desc(String spid_desc) {
+		this.spid_desc = spid_desc;
+	}
+	
+    
 }
 \ No newline at end of file
@@ -37,51 +37,38 @@ public class CommentsJob {
     @Scheduled(fixedRate = 60 * 1000)
     public void updateComments() {
-        //收集免审的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);
+            shyComments.setShenhe_type(CommonConst.AUDIT_TYPE_FREE);// 审核类型为免审
             shyComments.setState(CommonConst.AUDIT_INTT);
             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());
-                        Integer errorCode = result.getInteger("errorCode");
-                        if (0 == errorCode) {
-                            int i = commentsService.updateComment(comments.getId(), CommonConst.AUDIT_SUCCESS, json1.getString("errorMessage"));
-                            if (i != 1) {
-                                logger.error("评论审核回调失败，activity_id:{},errorCode:{},errorMessage:{}", comments.getActivity_id(), errorCode, result.getString("errorMessage"));
-                            }
-                        } else {
-                            commentsService.updateComment(comments.getId(), CommonConst.AUDIT_CALLBACK_FAIL, "白名单回调失败");
-                            logger.error("评论审核回调失败，activity_id:{},errorCode:{},errorMessage:{}", comments.getActivity_id(), errorCode, result.getString("errorMessage"));
-                        }
-                    } catch (Exception e) {
-                        logger.error("评论回调失败，activity_id:{}", comments.getActivity_id(),e);
-                    }
+                	commentsService.updateState(comments.getId().toString(), CommonConst.AUDIT_SUCCESS, "","白名单","白名单通过");
+//                    //封装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());
+//                        Integer errorCode = result.getInteger("errorCode");
+//                        if (0 == errorCode) {
+//                            int i = commentsService.updateComment(comments.getId(), CommonConst.AUDIT_SUCCESS, json1.getString("msg"));
+//                            if (i != 1) {
+//                                logger.error("评论审核回调失败，activity_id:{},errorCode:{},errorMessage:{}", comments.getActivity_id(), errorCode, result.getString("errorMessage"));
+//                            }
+//                        } else {
+//                            commentsService.updateComment(comments.getId(), CommonConst.AUDIT_CALLBACK_FAIL, "白名单回调失败");
+//                            logger.error("评论审核回调失败，activity_id:{},errorCode:{},errorMessage:{}", comments.getActivity_id(), errorCode, result.getString("errorMessage"));
+//                        }
+//                    } catch (Exception e) {
+//                        logger.error("评论回调失败，activity_id:{}", comments.getActivity_id(),e);
+//                    }
                 }
             }
-        }
     }
     /**
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.entity.ShyComments;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
+import com.cnlive.shenhe.entity.ShyUsersfree;
 import com.cnlive.shenhe.entity.ShyVideos;
 import com.cnlive.shenhe.mapper.ShyCommentsMapper;
 import com.cnlive.shenhe.mapper.ShySitesMapper;
@@ -40,6 +41,9 @@ public class CommentsServiceImpl {
     ShyUsersMapper shyUsersMapper;
     @Autowired
     AuditPass Pass;
+    
+    @Autowired
+    SitesServiceImpl sitesService;
     public List<ShySites> getBusiness(ShySites shySites) {
         List<ShySites> sitesList = shySitesMapper.select(shySites);
@@ -142,22 +146,17 @@ public class CommentsServiceImpl {
         return comment;
     }
-    public boolean updateState(String ids, Integer state, String userId) {
+    public boolean updateState(String ids, Integer state, String userId,String updater,String msg) {
         boolean success = true;
         String[] commentIds = ids.split(",");
         for (String commentId : commentIds) {
             ShyComments comment = shyCommentsMapper.selectByPrimaryKey(Integer.parseInt(commentId));
-//            if (!comment.getReceive() || CommonUtils.isEmpty(comment.getReceive_user_id()) || !userId.equals(comment.getReceive_user_id())) {
-//                logger.error("领取逻辑不符，不能审核，activity_id:{}", comment.getActivity_id());
-//                success = false;
-//                break;
-//            }
             JSONObject json = new JSONObject();
             json.put("activity_id", comment.getActivity_id());
             json.put("state", state + 2);
             json.put("attr_tags", "");
-            json.put("msg", "");
+            json.put("msg", msg);
             JSONObject result = new JSONObject();
             try {
                 result = Pass.commentPass(json, comment.getCallback());
@@ -178,7 +177,14 @@ public class CommentsServiceImpl {
                     break;
                 }
                 comment.setState(state);
-                comment.setAuditor_id(userId);
+                comment.setMsg(msg);
+                if(CommonUtils.isEmpty(userId)){
+                	comment.setUpdater(updater);
+                }else{
+                	comment.setAuditor_id(userId);
+                	comment.setReceive(1);//已领取
+                	comment.setReceive_user_id(userId);
+                }
                 int i = shyCommentsMapper.updateByPrimaryKeySelective(comment);
                 if (i != 1) {
                     success = false;
@@ -242,6 +248,23 @@ public class CommentsServiceImpl {
     public int updateByPrimaryKeySelective(ShyComments comments) {
         return shyCommentsMapper.updateByPrimaryKeySelective(comments);
     }
+    
+    /**
+     * 获得审核类型
+     * @param shyComments
+     */
+    public void getShenheType(ShyComments shyComments){
+		
+		//获取点播免审sp
+        List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_COMMENT);
+        //初始化一个审核状态
+        Integer shenheType=3;//审核类型，1:免审，2:机审，3:人工审
+        //如果当前sp是免审sp
+        if(sites.contains(shyComments.getSpid())){
+        	shenheType=1;//免审
+        }
+        shyComments.setShenhe_type(shenheType);
+	}
 }
@@ -65,13 +65,13 @@
                                                 class="btn btn-sm margin-r-5 action_bottom"
                                                 onclick="searchStatus('0',0)">全部待领
                                         </button>
-                                        <button type="button" id="my_after_button"
+                                        <button type="button" id="my_brfore_button"
                                                 class="btn btn-sm margin-r-5 action_bottom"
-                                                onclick="searchStatus('1,2',1)">我的已审
+                                                onclick="searchStatus('0',1)">我的待审
                                         </button>
-                                        <button type="button" id="my_brfore_button"
+                                        <button type="button" id="my_after_button"
                                                 class="btn btn-sm margin-r-5 action_bottom"
-                                                onclick="searchStatus('0',1)">我的未审
+                                                onclick="searchStatus('1,2',1)">我的已审
                                         </button>
                                     </div>
                                     <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query"
@@ -241,7 +241,7 @@
                                                     <input data-index="0" name="btSelectItem" type="checkbox"
                                                            th:value="${comment.id}"></td>
                                                 <td style="text-align: center; width: 5%;"
-                                                    th:text="${session.sessionUser.company}">网加加
+                                                    th:text="${comment.spid_desc}">网加加
                                                 </td>
                                                 <td style="text-align: center; width: 5%;"
                                                     th:text="${comment.comment_user_name}">鱼