代码整理

周伟鹏
1 parent 4cfe4471
Showing 11 changed files with 123 additions and 104 deletions
src/main/java/com/cnlive/shenhe/ShenheApplication.java
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/controller/CommentsController.java
src/main/java/com/cnlive/shenhe/controller/UsersController.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/serviceImpl/VideosServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/AuditPass.java
src/main/resources/templates/error.html → src/main/resources/templates/page/error.html
@@ -63,6 +63,7 @@ public class ShenheApplication extends SpringBootServletInitializer {
         Map<String,String>  initParameters = new HashMap<String, String>();
         initParameters.put("casServerLoginUrl", CAS_SERVER_LOGIN_URL);
         initParameters.put("service", SERVICE_LOGIN);
+        initParameters.put("ignorePattern", "/api/*");
         registration.setInitParameters(initParameters);
         // 设定加载的顺序
         registration.setOrder(2);
@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.Arrays;
 import java.util.List;
 @Controller
-@RequestMapping("/commentsApi")
+@RequestMapping("/api/comments")
 public class CommentsControllerApi {
     @Autowired
@@ -51,7 +51,11 @@ public class CommentsControllerApi {
                     json1.put("state",CommonConst.AUDIT_SUCCESS);
                     json1.put("attr_tags","");
                     json1.put("msg","");
-                    Pass.commentPass(json1);
+                    JSONObject result = Pass.commentPass(json1);
+                    Integer code = result.getInteger("errorCode");
+                    if (code != 0) {
+                        return new ResponseBean(code, result.getString("errorMessage"));
+                    }
                 }else {
                     shyComments.setState(CommonConst.AUDIT_INTT);
                 }
 package com.cnlive.shenhe.api;
+
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
@@ -11,16 +12,21 @@ import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+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 java.util.Arrays;
 import java.util.List;
+
 /**
  * @Auther: chenhao
  * @Date: 2018/12/6 11:17
  * @Description: 视频送审接口
  */
 @Controller
-@RequestMapping("/videosApi")
+@RequestMapping("/api/videos")
 public class VideosControllerApi {
     @Autowired
     AuditPass Pass;
@@ -29,25 +35,28 @@ public class VideosControllerApi {
     @Autowired
     UsersServiceImpl usersService;
-
     @PostMapping("/import")
     @ResponseBody
-    public ResponseBean impotVideo(@RequestBody  JSONObject json){
+    public ResponseBean impotVideo(@RequestBody JSONObject json) {
         ShySites shySites = new ShySites();
         ShyVideos shyVideos = new ShyVideos();
         shyVideos.setState(CommonConst.AUDIT_INTT);
         //判断是否白名单
         shySites.setSpid(json.getInteger("spId"));
         List<ShySites> shySitesList = videosService.getBusiness(shySites);
-        if(!shySitesList.isEmpty()){
-            if(CommonUtils.isNotEmpty(shySitesList.get(0).getWrite_business())){
+        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+"")){
+                if (asList.contains(CommonConst.BUSINESS_VIDEO + "")) {
                     shyVideos.setState(CommonConst.AUDIT_SUCCESS);
-                    Pass.auditPass(json.getString("videoId"),CommonConst.AUDIT_SUCCESS,"","");
-                }else {
+                    JSONObject result = Pass.auditPass(json.getString("videoId"), CommonConst.AUDIT_SUCCESS, "", "");
+                    Integer code = result.getInteger("code");
+                    if (code != 0) {
+                        return new ResponseBean(code, result.getString("msg"));
+                    }
+                } else {
                     shyVideos.setState(CommonConst.AUDIT_INTT);
                 }
             }
@@ -63,10 +72,10 @@ public class VideosControllerApi {
         shyVideos.setCallback(json.getString("callback"));
         shyVideos.setSpid(Integer.parseInt(json.getString("spId")));
         int i = videosService.impotVideo(shyVideos);
-        if(i>0){
-            return  new ResponseBean(ErrorEnum.SUCCESS);
-        }else {
-            return  new ResponseBean(ErrorEnum.ERROR);
+        if (i > 0) {
+            return new ResponseBean(ErrorEnum.SUCCESS);
+        } else {
+            return new ResponseBean(ErrorEnum.ERROR);
         }
     }
 }
 package com.cnlive.shenhe.bean;
-/**
- * Created with IntelliJ IDEA.
- * Description:
- * User: fan xiao chun
- * Date: 2018-07-25
- * Time: 18:25
- */
+
 public enum ErrorEnum {
     SUCCESS(0, "success"),
     ERROR(500, "服务异常"),
     RECORD_NOT_EXIST(10001, "记录不存在"),
     PARAM_ERROR(10002, "参数错误"),
-
-
     NOT_LOGIN(4000, "登录失效或未登录"),
     ACCESS_DENIED(40001, "没有权限");
@@ -13,6 +13,7 @@ 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;
@@ -24,29 +25,33 @@ public class CommentsController {
     @Autowired
     CommentsServiceImpl commentsService;
-
-
     /**
      * 评论修改状态接口
+     *
      * @param json
      * @return
      */
     @PostMapping("/shenheComment")
     @ResponseBody
-    public ResponseBean shenheInfo(@RequestBody JSONObject json,Integer id,HttpSession session){
-        Pass.commentPass(json);
+    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 {
+        int i = commentsService.updateComment(json, id, userId);
+        if (i == 0) {
+            return new ResponseBean(ErrorEnum.ERROR);
+        } else {
             return new ResponseBean(ErrorEnum.SUCCESS);
         }
     }
     /**
      * 评论列表页
+     *
      * @param activity_id
      * @param content
      * @param is_hot
@@ -61,22 +66,23 @@ public class CommentsController {
      */
     @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, HttpSession session){
+    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,spid);
+        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, spid);
     }
     /**
      * 评论查看接口
+     *
      * @param id
      * @return
      */
     @RequestMapping("/details")
     @ResponseBody
-    public Object getDetailsComments(Integer id){
-        return  commentsService.getDetailsComment(id);
+    public Object getDetailsComments(Integer id) {
+        return commentsService.getDetailsComment(id);
     }
 }
@@ -58,7 +58,7 @@ public class UsersController {
                 return "page/head.html";
             }
         }
-        return "error.html";
+        return "page/error.html";
     }
     @RequestMapping("/logout")
 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;
@@ -9,7 +10,9 @@ import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
 import javax.servlet.http.HttpSession;
 @Controller
@@ -26,30 +29,33 @@ public class VideosController {
     /**
      * 审核信息返回接口
+     *
      * @param activity_id 视频id
-     * @param state 状态码
-     * @param attr_tags 标签
-     * @param msg 备注信息
+     * @param state       状态码
+     * @param attr_tags   标签
+     * @param msg         备注信息
      * @return
      */
     @RequestMapping("/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, 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(id,userId,activity_id, state, attr_tags, msg);
-        if(i==0){
+        JSONObject result = Pass.auditPass(activity_id, state, attr_tags, msg);
+        Integer code = result.getInteger("code");
+        if (code != 0) {
+            return new ResponseBean(code, result.getString("msg"));
+        }
+        int i = videosService.updateVideo(id, userId, state, attr_tags, msg);
+        if (i == 0) {
             return new ResponseBean(ErrorEnum.ERROR);
         }
-        return  new ResponseBean(ErrorEnum.SUCCESS);
+        return new ResponseBean(ErrorEnum.SUCCESS);
     }
     /**
      * 内容分页列表接口
+     *
      * @param video_title
      * @param start_date
      * @param end_date
@@ -61,26 +67,28 @@ public class VideosController {
      */
     @RequestMapping("/page")
     @ResponseBody
-    public Object getListVideos(String video_title, String start_date, String end_date, Integer state, Integer page, Integer pageSize, String orderByClause, HttpSession session){
+    public Object getListVideos(String video_title, String start_date, String end_date, Integer state, 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;
-        if(CommonUtils.isNotNull(spid)&&spid==0){spid=82;}
-        return  videosService.getListContent(video_title,start_date,end_date,state,page,pageSize,orderByClause,spid);
+        if (CommonUtils.isNull(page)) page = 1;
+        if (CommonUtils.isNull(pageSize)) pageSize = 10;
+        if (CommonUtils.isNotNull(spid) && spid == 0) {
+            spid = 82;
+        }
+        return videosService.getListContent(video_title, start_date, end_date, state, page, pageSize, orderByClause, spid);
     }
     /**
      * 内容详情页接口（查看）
+     *
      * @param id
      * @return
      */
     @RequestMapping("/details")
     @ResponseBody
-    public Object getDetailsVideo(Integer id){
-        return  videosService.getDetailsContent(id);
+    public Object getDetailsVideo(Integer id) {
+        return videosService.getDetailsContent(id);
     }
-
 }
@@ -22,52 +22,52 @@ import java.util.List;
 @Service
 public class CommentsServiceImpl {
     @Autowired
-    ShyCommentsMapper shyCommentsMapper ;
+    ShyCommentsMapper shyCommentsMapper;
     @Autowired
     ShySitesMapper shySitesMapper;
-    public List<ShySites> getBusiness (ShySites shySites ) {
+    public List<ShySites> getBusiness(ShySites shySites) {
         List<ShySites> sitesList = shySitesMapper.select(shySites);
         return sitesList;
     }
-    public int impotComments(ShyComments shyComments){
+
+    public int impotComments(ShyComments shyComments) {
         int result = shyCommentsMapper.insert(shyComments);
         return result;
     }
-    public int updateComment(JSONObject json,Integer id,String auditor_id){
-        ShyComments shyComments = new ShyComments();
-        shyComments.setId(id);
+
+    public int updateComment(JSONObject json, Integer id, String auditor_id) {
+        ShyComments shyComments = shyCommentsMapper.selectByPrimaryKey(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;
+        return shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
     }
-    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){
+
+    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);
         }
-        if (CommonUtils.isNotEmpty(start_date)&&CommonUtils.isNotEmpty(end_date)) {
-            criteria.andGreaterThanOrEqualTo("comment_time",start_date);
-            criteria.andLessThanOrEqualTo("comment_time",end_date);
+        if (CommonUtils.isNotEmpty(start_date) && CommonUtils.isNotEmpty(end_date)) {
+            criteria.andGreaterThanOrEqualTo("comment_time", start_date);
+            criteria.andLessThanOrEqualTo("comment_time", end_date);
         }
-        if (CommonUtils.isNotEmpty(content)){
+        if (CommonUtils.isNotEmpty(content)) {
             criteria.andLike("comment_content", "%" + content + "%");
         }
-        if (CommonUtils.isNotEmpty(auditor)){
-            criteria.andEqualTo("auditor",  auditor );
+        if (CommonUtils.isNotEmpty(auditor)) {
+            criteria.andEqualTo("auditor", auditor);
         }
-        if (CommonUtils.isNotNull(spid)){
-            criteria.andEqualTo("spid", spid );
+        if (CommonUtils.isNotNull(spid)) {
+            criteria.andEqualTo("spid", spid);
         }
-        if (CommonUtils.isNotNull(is_hot)){
-            criteria.andEqualTo("is_hot", is_hot );
+        if (CommonUtils.isNotNull(is_hot)) {
+            criteria.andEqualTo("is_hot", is_hot);
         }
-        if (CommonUtils.isNotEmpty(activity_id)){
+        if (CommonUtils.isNotEmpty(activity_id)) {
             criteria.andEqualTo("activity_id", activity_id);
         }
         //默认按上传时间倒序排序
@@ -78,7 +78,7 @@ public class CommentsServiceImpl {
         return pageInfo;
     }
-    public Object getDetailsComment(Integer id){
+    public Object getDetailsComment(Integer id) {
         ShyComments comment = shyCommentsMapper.selectByPrimaryKey(id);
         return comment;
     }
 package com.cnlive.shenhe.serviceImpl;
+
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyVideos;
 import com.cnlive.shenhe.mapper.ShySitesMapper;
@@ -10,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
-import java.util.Date;
 import java.util.List;
 /**
@@ -25,42 +25,42 @@ public class VideosServiceImpl {
     @Autowired
     ShySitesMapper shySitesMapper;
-    public int impotVideo(ShyVideos shyVideos){
+    public int impotVideo(ShyVideos shyVideos) {
         int result = shyVideosMapper.insert(shyVideos);
         return result;
     }
-    public List<ShySites> getBusiness (ShySites shySites ){
+
+    public List<ShySites> getBusiness(ShySites shySites) {
         List<ShySites> sitesList = shySitesMapper.select(shySites);
         return sitesList;
     }
-    public int updateVideo(Integer id,String auditor_id,String activity_id,Integer state,String attr_tags,String msg){
-        ShyVideos shyVideos = new ShyVideos();
-        shyVideos.setId(id);
+
+    public int updateVideo(Integer id, String auditor_id, Integer state, String attr_tags, String msg) {
+        ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(id);
         shyVideos.setAuditor_id(auditor_id);
-        shyVideos.setVideo_id(activity_id);
         shyVideos.setState(state);
         shyVideos.setVideo_tags(attr_tags);
         shyVideos.setMsg(msg);
-        return  shyVideosMapper.updateByPrimaryKeySelective(shyVideos);
+        return shyVideosMapper.updateByPrimaryKeySelective(shyVideos);
     }
-    public PageInfo<ShyVideos> getListContent(String video_title, String start_date,String end_date,Integer state, Integer page, Integer pageSize, String orderByClause, Integer spid){
+    public PageInfo<ShyVideos> getListContent(String video_title, String start_date, String end_date, Integer state, Integer page, Integer pageSize, String orderByClause, Integer spid) {
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
         if (CommonUtils.isNotEmpty(orderByClause)) {
             example.setOrderByClause(orderByClause);
         }
-        if (CommonUtils.isNotEmpty(start_date)&&CommonUtils.isNotEmpty(end_date)) {
-            criteria.andGreaterThanOrEqualTo("video_upload_time",start_date);
-            criteria.andLessThanOrEqualTo("video_upload_time",end_date);
+        if (CommonUtils.isNotEmpty(start_date) && CommonUtils.isNotEmpty(end_date)) {
+            criteria.andGreaterThanOrEqualTo("video_upload_time", start_date);
+            criteria.andLessThanOrEqualTo("video_upload_time", end_date);
         }
-        if (CommonUtils.isNotEmpty(video_title)){
+        if (CommonUtils.isNotEmpty(video_title)) {
             criteria.andLike("video_title", "%" + video_title + "%");
         }
-        if (CommonUtils.isNotNull(state)){
-            criteria.andEqualTo("state", state );
+        if (CommonUtils.isNotNull(state)) {
+            criteria.andEqualTo("state", state);
         }
-        if (CommonUtils.isNotNull(spid)){
+        if (CommonUtils.isNotNull(spid)) {
             criteria.andEqualTo("spid", spid);
         }
         //默认按上传时间倒序排序
@@ -71,7 +71,7 @@ public class VideosServiceImpl {
         return pageInfo;
     }
-    public Object getDetailsContent(Integer id){
+    public Object getDetailsContent(Integer id) {
         ShyVideos DetailsshyVideos = shyVideosMapper.selectByPrimaryKey(id);
         return DetailsshyVideos;
     }
 package com.cnlive.shenhe.utils;
 import com.alibaba.fastjson.JSONObject;
-import org.apache.http.entity.StringEntity;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -35,7 +34,7 @@ public class AuditPass {
      * @param msg
      * @return
      */
-    public  String auditPass(String activity_id,int state,String attr_tags,String msg){
+    public  JSONObject auditPass(String activity_id,int state,String attr_tags,String msg){
         String token = null;
         try {
             token = CommonUtils.md5(url+platformKey+platformValue);
@@ -53,13 +52,13 @@ public class AuditPass {
         String URL =url+"?platform="+platformKey+"&token="+token;
         httpUtil.setParamMap(params);
         Map<String, String> post = httpUtil.post(URL);
-        String code = post.get("code");
-        return  code;
+        return  JSONObject.parseObject(post.get("result"));
     }
-    public void commentPass(JSONObject json){
+    public JSONObject commentPass(JSONObject json){
         HttpUtil httpUtil = HttpUtil.init();
         httpUtil.setStringParam(json.toJSONString());
-        httpUtil.post(commentUrl);
+        Map<String, String> post = httpUtil.post(commentUrl);
+        return JSONObject.parseObject(post.get("result"));
     }
 }