update

陈浩
1 parent f9248009
Showing 8 changed files with 83 additions and 69 deletions
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/entity/ShyComments.java
src/main/java/com/cnlive/shenhe/entity/ShyVideos.java
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/resources/mapper/ShyCommentsMapper.xml
src/main/resources/mapper/ShyVideosMapper.xml
@@ -3,7 +3,8 @@ 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.entity.AcpComments;
+import com.cnlive.shenhe.bean.SessionUser;
+import com.cnlive.shenhe.entity.ShyComments;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl;
 import com.cnlive.shenhe.utils.AuditPass;
@@ -15,6 +16,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpSession;
 import java.util.Arrays;
 import java.util.List;
@@ -39,9 +42,9 @@ public class CommentsController {
     @PostMapping("/import")
     @ResponseBody
     public ResponseBean impotComment(@RequestBody JSONObject json){
-        AcpComments acpComments = new AcpComments();
+        ShyComments shyComments = new ShyComments();
         ShySites shySites = new ShySites();
-        acpComments.setState(CommonConst.AUDIT_INTT);
+        shyComments.setState(CommonConst.AUDIT_INTT);
         //判断是否白名单
         shySites.setSpid(json.getInteger("spId"));
         List<ShySites> shySitesList = commentsService.getBusiness(shySites);
@@ -51,7 +54,7 @@ public class CommentsController {
                 String[] business = write_business.split(",");
                 List<String> asList = Arrays.asList(business);
                 if(asList.contains(CommonConst.BUSINESS_COMMENT+"")){
-                    acpComments.setState(CommonConst.AUDIT_SUCCESS);
+                    shyComments.setState(CommonConst.AUDIT_SUCCESS);
                     //封装json数据传参进行回调
                     JSONObject json1 = new JSONObject();
                     json1.put("activity_id",json.getString("activityId"));
@@ -60,27 +63,27 @@ public class CommentsController {
                     json1.put("msg","");
                     Pass.commentPass(json1);
                 }else {
-                    acpComments.setState(CommonConst.AUDIT_INTT);
+                    shyComments.setState(CommonConst.AUDIT_INTT);
                 }
             }
         }
         //封装数据入库
-        acpComments.setProgram_id(json.getInteger("programId"));
-        acpComments.setComment_original_url(json.getString("originalUrl"));
-        acpComments.setComment_title(json.getString("commentTitle"));
-        acpComments.setComment_user_id(json.getInteger("commentUserId"));
-        acpComments.setComment_user_name(json.getString("commentUserName"));
-        acpComments.setComment_user_avatar(json.getString("commentUserAvatar"));
-        acpComments.setComment_user_ip(json.getString("commentUserIP"));
-        acpComments.setComment_content(json.getString("commentContent"));
-        acpComments.setComment_time(json.getDate("commentTime"));
-        acpComments.setSpid(json.getInteger("spId"));
-        acpComments.setApp_id(json.getString("appId"));
-        acpComments.setPlatform(json.getString("platform"));
-        acpComments.setActivity_id(json.getString("activityId"));
-        acpComments.setIs_hot(json.getBoolean("priority"));
-        acpComments.setCallback(json.getString("callback"));
-        int i = commentsService.impotComments(acpComments);
+        shyComments.setProgram_id(json.getInteger("programId"));
+        shyComments.setComment_original_url(json.getString("originalUrl"));
+        shyComments.setComment_title(json.getString("commentTitle"));
+        shyComments.setComment_user_id(json.getInteger("commentUserId"));
+        shyComments.setComment_user_name(json.getString("commentUserName"));
+        shyComments.setComment_user_avatar(json.getString("commentUserAvatar"));
+        shyComments.setComment_user_ip(json.getString("commentUserIP"));
+        shyComments.setComment_content(json.getString("commentContent"));
+        shyComments.setComment_time(json.getDate("commentTime"));
+        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(json.getString("callback"));
+        int i = commentsService.impotComments(shyComments);
         if(i>0){
             return  new ResponseBean(ErrorEnum.SUCCESS);
         }else {
@@ -95,9 +98,11 @@ public class CommentsController {
      */
     @PostMapping("/shenheComment")
     @ResponseBody
-    public ResponseBean shenheInfo(@RequestBody JSONObject json){
+    public ResponseBean shenheInfo(@RequestBody JSONObject json,Integer id,HttpSession session){
         Pass.commentPass(json);
-        int i = commentsService.updateComment(json);
+        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 {
@@ -119,12 +124,14 @@ public class CommentsController {
      * @param orderByClause
      * @return
      */
-    @RequestMapping("/table")
+    @RequestMapping("/page")
     @ResponseBody
-    public Object getListComments(String activity_id,String content,Integer is_hot,String start_date,String end_date,Integer state,String auditor,Integer page,Integer pageSize,String orderByClause){
+    public Object getListComments(String activity_id, String content, Integer is_hot, String start_date, String end_date, Integer state, String auditor, Integer page, Integer pageSize, String orderByClause, HttpSession session){
+        SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
+        Integer spid = sessionUser.getSpid();
         if(CommonUtils.isNull(page))page=1;
         if(CommonUtils.isNull(pageSize))pageSize=10;
-        return  commentsService.getListComments(activity_id,content,is_hot,start_date,end_date,state,auditor,page,pageSize,orderByClause);
+        return  commentsService.getListComments(activity_id,content,is_hot,start_date,end_date,state,auditor,page,pageSize,orderByClause,spid);
     }
     /**
@@ -6,6 +6,7 @@ import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyVideos;
+import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.serviceImpl.VideosServiceImpl;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
@@ -32,7 +33,8 @@ public class VideosController {
     AuditPass Pass;
     @Autowired
     VideosServiceImpl videosService;
-
+    @Autowired
+    UsersServiceImpl usersService;
     /**
      *  视频送审接口
      * @param json
@@ -88,12 +90,14 @@ public class VideosController {
      */
     @RequestMapping("/shenheVideo")
     @ResponseBody
-    public ResponseBean shenheInfo(String activity_id,int state,String attr_tags,String msg){
+    public ResponseBean shenheInfo(Integer id,String activity_id,int state,String attr_tags,String msg,HttpSession session){
+        SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
+        String userId = sessionUser.getUserId();
         String code = Pass.auditPass(activity_id, state, attr_tags, msg);
 //        if(code.equals("-1")){
 //            return new ResponseBean(ErrorEnum.ERROR);
 //        }
-        int i = videosService.updateVideo(activity_id, state, attr_tags, msg);
+        int i = videosService.updateVideo(id,userId,activity_id, state, attr_tags, msg);
         if(i==0){
             return new ResponseBean(ErrorEnum.ERROR);
         }
@@ -61,9 +61,9 @@ public class ShyComments {
     private String updater;
     /**
-     * 审核员
+     * 审核员id
      */
-    private String auditor;
+    private String auditor_id;
     /**
      * 回调函数
@@ -313,21 +313,21 @@ public class ShyComments {
     }
     /**
-     * 获取审核员
+     * 获取审核员id
      *
-     * @return auditor - 审核员
+     * @return auditor_id - 审核员id
      */
-    public String getAuditor() {
-        return auditor;
+    public String getAuditor_id() {
+        return auditor_id;
     }
     /**
-     * 设置审核员
+     * 设置审核员id
      *
-     * @param auditor 审核员
+     * @param auditor_id 审核员id
      */
-    public void setAuditor(String auditor) {
-        this.auditor = auditor;
+    public void setAuditor_id(String auditor_id) {
+        this.auditor_id = auditor_id;
     }
     /**
@@ -35,7 +35,7 @@ public class ShyVideos {
     /**
      * 审核员id
      */
-    private Integer auditor;
+    private String auditor_id;
     /**
      * 回调地址
@@ -198,19 +198,19 @@ public class ShyVideos {
     /**
      * 获取审核员id
      *
-     * @return auditor - 审核员id
+     * @return auditor_id - 审核员id
      */
-    public Integer getAuditor() {
-        return auditor;
+    public String getAuditor_id() {
+        return auditor_id;
     }
     /**
      * 设置审核员id
      *
-     * @param auditor 审核员id
+     * @param auditor_id 审核员id
      */
-    public void setAuditor(Integer auditor) {
-        this.auditor = auditor;
+    public void setAuditor_id(String auditor_id) {
+        this.auditor_id = auditor_id;
     }
     /**
 package com.cnlive.shenhe.serviceImpl;
 import com.alibaba.fastjson.JSONObject;
-import com.cnlive.shenhe.entity.AcpComments;
+import com.cnlive.shenhe.entity.ShyComments;
 import com.cnlive.shenhe.entity.ShySites;
-import com.cnlive.shenhe.mapper.AcpCommentsMapper;
+import com.cnlive.shenhe.mapper.ShyCommentsMapper;
 import com.cnlive.shenhe.mapper.ShySitesMapper;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageHelper;
@@ -22,7 +22,7 @@ import java.util.List;
 @Service
 public class CommentsServiceImpl {
     @Autowired
-    AcpCommentsMapper acpCommentsMapper;
+    ShyCommentsMapper shyCommentsMapper ;
     @Autowired
     ShySitesMapper shySitesMapper;
@@ -31,22 +31,22 @@ public class CommentsServiceImpl {
         List<ShySites> sitesList = shySitesMapper.select(shySites);
         return sitesList;
     }
-    public int impotComments(AcpComments acpComments){
-        int result = acpCommentsMapper.insert(acpComments);
+    public int impotComments(ShyComments shyComments){
+        int result = shyCommentsMapper.insert(shyComments);
         return result;
     }
-    public int updateComment(JSONObject json){
-        AcpComments acpComments = new AcpComments();
-        acpComments.setActivity_id(json.getString("activity_id"));
-        Integer id = acpCommentsMapper.select(acpComments).get(0).getId();
-        acpComments.setId(id);
-        acpComments.setState(json.getInteger("state"));
-        acpComments.setMsg(json.getString("msg"));
-        int result = acpCommentsMapper.updateByPrimaryKeySelective(acpComments);
+    public int updateComment(JSONObject json,Integer id,String auditor_id){
+        ShyComments shyComments = new ShyComments();
+        shyComments.setId(id);
+        shyComments.setAuditor_id(auditor_id);
+        shyComments.setActivity_id(json.getString("activity_id"));
+        shyComments.setState(json.getInteger("state"));
+        shyComments.setMsg(json.getString("msg"));
+        int result = shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
         return result;
     }
-    public PageInfo<AcpComments> getListComments(String activity_id,String content,Integer is_hot,String start_date,String end_date,Integer state,String auditor,Integer page,Integer pageSize,String orderByClause){
-        Example example = new Example(AcpComments.class);
+    public PageInfo<ShyComments> getListComments(String activity_id,String content,Integer is_hot,String start_date,String end_date,Integer state,String auditor,Integer page,Integer pageSize,String orderByClause,Integer spid){
+        Example example = new Example(ShyComments.class);
         Example.Criteria criteria = example.createCriteria();
         if (CommonUtils.isNotEmpty(orderByClause)) {
             example.setOrderByClause(orderByClause);
@@ -61,6 +61,9 @@ public class CommentsServiceImpl {
         if (CommonUtils.isNotEmpty(auditor)){
             criteria.andEqualTo("auditor",  auditor );
         }
+        if (CommonUtils.isNotNull(spid)){
+            criteria.andEqualTo("spid", spid );
+        }
         if (CommonUtils.isNotNull(is_hot)){
             criteria.andEqualTo("is_hot", is_hot );
         }
@@ -70,13 +73,13 @@ public class CommentsServiceImpl {
         //默认按上传时间倒序排序
         example.setOrderByClause("comment_time desc");
         PageHelper.startPage(page, pageSize, true);
-        List<AcpComments> commentsList = acpCommentsMapper.selectByExample(example);
-        PageInfo<AcpComments> pageInfo = new PageInfo<>(commentsList);
+        List<ShyComments> commentsList = shyCommentsMapper.selectByExample(example);
+        PageInfo<ShyComments> pageInfo = new PageInfo<>(commentsList);
         return pageInfo;
     }
     public Object getDetailsComment(Integer id){
-        AcpComments comment = acpCommentsMapper.selectByPrimaryKey(id);
+        ShyComments comment = shyCommentsMapper.selectByPrimaryKey(id);
         return comment;
     }
 }
@@ -33,11 +33,11 @@ public class VideosServiceImpl {
         List<ShySites> sitesList = shySitesMapper.select(shySites);
         return sitesList;
     }
-    public int updateVideo(String activity_id,int state,String attr_tags,String msg){
+    public int updateVideo(Integer id,String auditor_id,String activity_id,int state,String attr_tags,String msg){
         ShyVideos shyVideos = new ShyVideos();
-        shyVideos.setVideo_id(activity_id);
-        Integer id = shyVideosMapper.select(shyVideos).get(0).getId();
         shyVideos.setId(id);
+        shyVideos.setAuditor_id(auditor_id);
+        shyVideos.setVideo_id(activity_id);
         shyVideos.setState(state);
         shyVideos.setVideo_tags(attr_tags);
         shyVideos.setMsg(msg);
@@ -17,7 +17,7 @@
     <result column="app_id" jdbcType="VARCHAR" property="app_id" />
     <result column="comment_original_url" jdbcType="VARCHAR" property="comment_original_url" />
     <result column="updater" jdbcType="VARCHAR" property="updater" />
-    <result column="auditor" jdbcType="VARCHAR" property="auditor" />
+    <result column="auditor_id" jdbcType="VARCHAR" property="auditor_id" />
     <result column="callback" jdbcType="VARCHAR" property="callback" />
     <result column="is_hot" jdbcType="BIT" property="is_hot" />
     <result column="msg" jdbcType="VARCHAR" property="msg" />
@@ -12,7 +12,7 @@
     <result column="video_imgs" jdbcType="VARCHAR" property="video_imgs" />
     <result column="video_tags" jdbcType="VARCHAR" property="video_tags" />
     <result column="updater" jdbcType="VARCHAR" property="updater" />
-    <result column="auditor" jdbcType="INTEGER" property="auditor" />
+    <result column="auditor_id" jdbcType="VARCHAR" property="auditor_id" />
     <result column="callback" jdbcType="VARCHAR" property="callback" />
     <result column="video_priority" jdbcType="VARCHAR" property="video_priority" />
     <result column="msg" jdbcType="VARCHAR" property="msg" />