代码格式优化

王言钊
1 parent d51b917d
Showing 47 changed files with 284 additions and 115 deletions
src/main/java/com/cnlive/shenhe/api/ChannelControllerApi.java
src/main/java/com/cnlive/shenhe/api/CommentsControllerApi.java
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
src/main/java/com/cnlive/shenhe/api/LiveApplyControllerApi.java
src/main/java/com/cnlive/shenhe/api/LiveControllerApi.java
src/main/java/com/cnlive/shenhe/api/TopicControllerApi.java
src/main/java/com/cnlive/shenhe/bean/ErrorEnum.java
src/main/java/com/cnlive/shenhe/bean/ResponseBean.java
src/main/java/com/cnlive/shenhe/config/MyInterceptor.java
src/main/java/com/cnlive/shenhe/config/SessionFilter.java
src/main/java/com/cnlive/shenhe/config/WebConfiguration.java
src/main/java/com/cnlive/shenhe/controller/ChannelController.java
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
src/main/java/com/cnlive/shenhe/controller/ContentController.java
src/main/java/com/cnlive/shenhe/controller/EmailController.java
src/main/java/com/cnlive/shenhe/controller/LiveApplyController.java
src/main/java/com/cnlive/shenhe/controller/LiveController.java
src/main/java/com/cnlive/shenhe/controller/NotSpeakController.java
src/main/java/com/cnlive/shenhe/controller/SitesController.java
src/main/java/com/cnlive/shenhe/controller/TopicController.java
@@ -17,6 +17,13 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.List;
+
+
+
+
+/**
+ * @author Administrator
+ */
 @Controller
 @RequestMapping("/api/channel")
 public class ChannelControllerApi {
@@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.Date;
 import java.util.List;
+/**
+ * @author Administrator
+ */
 @Controller
 @RequestMapping("/api/comments")
 public class CommentsControllerApi {
@@ -30,9 +33,6 @@ public class CommentsControllerApi {
     CommentsServiceImpl commentsService;
     @Autowired
     TopicServiceImpl topicService;
-    
-//    @Value("${topic_comment_shareH5}")
-//    String topic_comment_shareH5;
     /**
      * @Auther: chenhao
@@ -44,8 +44,10 @@ public class CommentsControllerApi {
     public ResponseBean impotComment(String param) {
         logger.info("评论入库，param=====" + param);
         JSONObject json = JSONObject.parseObject(param);
-        String type=json.getString("type")==null?"else":json.getString("type");//评论类型，topic:话题
-        Integer level=json.getInteger("level")==null?1:json.getInteger("level");//评论的级别
+        //评论类型，topic:话题
+        String type=json.getString("type")==null?"else":json.getString("type");
+        //评论的级别
+        Integer level=json.getInteger("level")==null?1:json.getInteger("level");
         String programId=json.getString("programId");
         String originalUrl=json.getString("originalUrl");
         String commentTitle=json.getString("commentTitle");
@@ -173,22 +173,27 @@ public class ContentControllerApi {
         JSONObject json = JSONObject.parseObject(param);
         //判断是否存在
         ShyContent shyContent = new ShyContent();
-        shyContent.setContent_id(json.getString("momentId"));//朋友圈id
-        shyContent.setContent_tag("moment");//朋友圈标签
+        //朋友圈id
+        shyContent.setContent_id(json.getString("momentId"));
+        //朋友圈标签
+        shyContent.setContent_tag("moment");
         List<ShyContent> contentList = contentService.findshyContent(shyContent);
         //获取审核类型
         Integer shenheType = contentService.getShenheType(json.getInteger("spId"), "moment");
         //获取生活圈内容的类型 1：图片 2：视频 3：分享
         Integer contentType = json.getInteger("contentType");
-        String contentImageUrl = "";//内容图片地址
+        //内容图片地址
+        String contentImageUrl = "";
         if (contentType != null && contentType == 1) {
-            JSONArray contentImageUrlList = JSONObject.parseArray(json.getString("contentImageUrl"));//朋友圈分享的内容的url
+            //朋友圈分享的内容的url
+            JSONArray contentImageUrlList = JSONObject.parseArray(json.getString("contentImageUrl"));
             for (int i = 0; i < contentImageUrlList.size(); i++) {
                 JSONObject contentImageUrlMap = contentImageUrlList.getJSONObject(i);
                 contentImageUrl += contentImageUrlMap.getString("imageUrl") + ",";
             }
-            contentImageUrl = contentImageUrl.substring(0, contentImageUrl.length() - 1);//去掉最后一个逗号
+            //去掉最后一个逗号
+            contentImageUrl = contentImageUrl.substring(0, contentImageUrl.length() - 1);
         } else {
             contentImageUrl = json.getString("contentImageUrl");
         }
@@ -196,12 +201,14 @@ public class ContentControllerApi {
         //存在则更新
         if (contentList.size() > 0) {
             ShyContent shyContent1 = contentList.get(0);
-            shyContent1.setTitle(json.getString("title"));//标题
-            shyContent1.setTitle_image(json.getString("image"));//用户头像
+            //标题
+            shyContent1.setTitle(json.getString("title"));
+            //用户头像
+            shyContent1.setTitle_image(json.getString("image"));
             shyContent1.setShenhe_type(shenheType);//审核类型
             String contentTime = json.getString("createTime");//朋友圈内容创建时间
             if (CommonUtils.isNotEmpty(contentTime)) {
-//    			Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss");
+                //Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss");
                 shyContent1.setContent_time(new Date(Long.valueOf(contentTime)));
             }
@@ -18,7 +18,10 @@ import java.util.Date;
 import java.util.List;
-@SuppressWarnings("unused")
+
+/**
+ * @author Administrator
+ */
 @Controller
 @RequestMapping("/api/liveApply")
 public class LiveApplyControllerApi {
@@ -32,20 +35,24 @@ public class LiveApplyControllerApi {
 	public JSONObject impotVideo(String param) {
 		JSONObject map = new JSONObject();
 		JSONObject result = new JSONObject();
-		boolean YorN =true;//初始化一个请求数据库返回结果
-		
+		//初始化一个请求数据库返回结果
+		boolean YorN =true;
+
 		logger.info("直播申请入库，param=====" + param);
         JSONObject json = JSONObject.parseObject(param);
         //获取所有参数
-        String activityId = json.getString("activityId");//直播活动id
-        String channelId = json.getString("channelId");//直播频道id
-        Integer spId=null;
+		//直播活动id
+		String activityId = json.getString("activityId");
+		//直播频道id
+		String channelId = json.getString("channelId");
+		Integer spId=null;
         try {
         	spId=json.getInteger("spId");
 		} catch (Exception e) {
 			spId=null;
 		}
-        String sender = json.getString("sender");//直播发起人
+		//直播发起人
+		String sender = json.getString("sender");
         String mobile = json.getString("mobile");//联系方式
         String callback = json.getString("callback");//回调地址
         String organization = json.getString("organization");//直播发起单位
@@ -19,6 +19,9 @@ import java.util.List;
 import java.util.UUID;
+/**
+ * @author Administrator
+ */
 @SuppressWarnings("unused")
 @Controller
 @RequestMapping("/api/live")
@@ -33,12 +36,14 @@ public class LiveControllerApi {
 	public JSONObject impotVideo(String param) {
 		JSONObject map = new JSONObject();
 		JSONObject result = new JSONObject();
-		boolean YorN =true;//初始化一个请求数据库返回结果
-		
+		//初始化一个请求数据库返回结果
+		boolean YorN =true;
+
 		logger.info("直播入库，param=====" + param);
         JSONObject json = JSONObject.parseObject(param);
         //获取所有参数
-        String activityId = json.getString("activityId");//直播活动id
+		//直播活动id
+		String activityId = json.getString("activityId");
         String activityName = json.getString("activityName");//直播活动名称
         Integer activityStatus = Integer.parseInt(json.getString("activityStatus"));//直播活动状态
         String channelId = json.getString("channelId");//直播频道id
@@ -238,7 +243,7 @@ public class LiveControllerApi {
     /**
      * 测试视频流
-     * @param videoStream
+     * @param
      */
     @RequestMapping(value="ceshiFinishVideo")
     @ResponseBody
@@ -252,7 +257,7 @@ public class LiveControllerApi {
     /**
      * 测试视频流
-     * @param videoStream
+     * @param
      */
     @RequestMapping(value="queryVideo")
     @ResponseBody
@@ -25,6 +25,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+/**
+ * @author Administrator
+ */
 @Controller
 @RequestMapping("/api/topic")
 public class TopicControllerApi {
 package com.cnlive.shenhe.bean;
+/**
+ * @author Administrator
+ */
+
 public enum ErrorEnum {
     SUCCESS(0, "success"),
@@ -5,6 +5,9 @@ import com.cnlive.shenhe.utils.CommonUtils;
 import java.io.Serializable;
+/**
+ * @author Administrator
+ */
 public class ResponseBean implements Serializable {
@@ -11,6 +11,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+/**
+ * @author Administrator
+ */
 @Component
 public class MyInterceptor implements HandlerInterceptor {
     @Override
 package com.cnlive.shenhe.config;
+
 import org.slf4j.LoggerFactory;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -16,14 +17,15 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 /**
- * Created by liwei on 2018/08/28.
- *
+ * @author liwei
+ * @date 2018/08/28
+ * <p>
  * 过滤器
  */
 public class SessionFilter implements Filter {
     private static final org.slf4j.Logger logger = LoggerFactory.getLogger(SessionFilter.class);
-    HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();
-    HttpServletResponse response = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getResponse();
+    HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+    HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
     /**
      * 封装，不需要过滤的list列表
      */
@@ -44,19 +46,19 @@ public class SessionFilter implements Filter {
             url = url.substring(1);
         }
-        if (isInclude(url)){
+        if (isInclude(url)) {
             chain.doFilter(httpRequest, httpResponse);
             return;
         } else {
             HttpSession session = httpRequest.getSession();
-            if (session.getAttribute(SessionUser.getSessionKey()) != null){
+            if (session.getAttribute(SessionUser.getSessionKey()) != null) {
                 // session存在
                 chain.doFilter(httpRequest, httpResponse);
                 return;
             } else {
                 // session不存在 准备跳转失败
-                 RequestDispatcher dispatcher = request.getRequestDispatcher("/users/login");
-                 dispatcher.forward(request, response);
+                RequestDispatcher dispatcher = request.getRequestDispatcher("/users/login");
+                dispatcher.forward(request, response);
 //                chain.doFilter(httpRequest, httpResponse);
                 return;
             }
@@ -73,6 +75,7 @@ public class SessionFilter implements Filter {
     /**
      * 是否需要过滤
+     *
      * @param url
      * @return
      */
@@ -8,6 +8,7 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 /**
+ * @author Administrator
  * @Auther: 周伟鹏
  * @Date: 2018/12/4 10:51
  */
@@ -30,6 +30,9 @@ import java.util.List;
 import java.util.Map;
+/**
+ * @author Administrator
+ */
 @Controller
 @RequestMapping("/channel")
 public class ChannelController extends BaseController {
@@ -324,7 +324,8 @@ public class CommentsController extends BaseController {
         BufferedOutputStream bos = null;
         try {
             XSSFSheet sheetlist = wb.createSheet(fileName);
-            XSSFRow row = sheetlist.createRow(0);//行
+            //行
+            XSSFRow row = sheetlist.createRow(0);
             XSSFCell cell = row.createCell(0);//列
             cell.setCellValue("id");
             cell = row.createCell(1);//列
@@ -32,6 +32,9 @@ import java.io.*;
 import java.util.List;
+/**
+ * @author Administrator
+ */
 @Controller
 @RequestMapping("/content")
 public class ContentController extends BaseController {
@@ -28,6 +28,7 @@ import javax.servlet.http.HttpSession;
 import java.util.List;
 /**
+ *
  * @Auther: liwei
  * @Date: 2019/08/20 14:22
  * @Description:
@@ -37,6 +37,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+/**
+ * @author Administrator
+ */
 @Controller
 @RequestMapping("/liveApply")
 public class LiveApplyController extends BaseController {
@@ -41,6 +41,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+/**
+ * @author Administrator
+ */
 @Controller
 @RequestMapping("/live")
 public class LiveController extends BaseController {
@@ -26,6 +26,9 @@ import javax.servlet.http.HttpSession;
 import java.util.List;
+/**
+ * @author Administrator
+ */
 @Controller
 @RequestMapping("/notSpeak")
 public class NotSpeakController extends BaseController {
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpSession;
 import java.util.List;
 /**
+ * @author Administrator
  * @Auther: 周伟鹏
  * @Date: 2018/11/30 17:28
  * @Description:
@@ -32,6 +32,9 @@ import java.util.List;
 import java.util.Map;
+/**
+ * @author Administrator
+ */
 @Controller
 @RequestMapping("/topic")
 public class TopicController extends BaseController {
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpSession;
 import java.util.List;
 /**
+ * @author Administrator
  * @Auther: liwei
  * @Date: 2019/08/20 14:22
  * @Description:
@@ -2,8 +2,6 @@ package com.cnlive.shenhe.job;
 import com.cnlive.shenhe.entity.ShyChannel;
 import com.cnlive.shenhe.serviceImpl.ChannelServiceImpl;
-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.InfoUtil;
@@ -16,6 +14,9 @@ import org.springframework.stereotype.Component;
 import java.util.List;
+/**
+ * @author Administrator
+ */
 @Component
 public class ChannelJob {
     private static Logger logger = LoggerFactory.getLogger(ChannelJob.class);
@@ -2,7 +2,6 @@ package com.cnlive.shenhe.job;
 import com.cnlive.shenhe.entity.ShyComments;
 import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl;
-import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,6 +11,9 @@ import org.springframework.stereotype.Component;
 import java.util.List;
+/**
+ * @author Administrator
+ */
 @Component
 public class CommentsJob {
     private static Logger logger = LoggerFactory.getLogger(CommentsJob.class);
@@ -8,8 +8,10 @@ import com.cnlive.shenhe.mapper.ShyLiveapplyMapper;
 import com.cnlive.shenhe.serviceImpl.EmailServiceImpl;
 import com.cnlive.shenhe.serviceImpl.LiveApplyServiceImpl;
 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
-import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
-import com.cnlive.shenhe.utils.*;
+import com.cnlive.shenhe.utils.CommonConst;
+import com.cnlive.shenhe.utils.CommonUtils;
+import com.cnlive.shenhe.utils.HttpUtil;
+import com.cnlive.shenhe.utils.OpenUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +25,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+/**
+ * @author Administrator
+ */
 @Component
 public class LiveApplyJob {
     private static Logger logger = LoggerFactory.getLogger(LiveApplyJob.class);
 package com.cnlive.shenhe.job;
 import com.cnlive.shenhe.entity.ShyNotspeak;
-import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl;
 import com.cnlive.shenhe.serviceImpl.NotspeakServiceImpl;
-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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,6 +11,9 @@ import org.springframework.stereotype.Component;
 import java.util.List;
+/**
+ * @author Administrator
+ */
 @Component
 public class NotSpeakJob {
     private static Logger logger = LoggerFactory.getLogger(NotSpeakJob.class);
@@ -19,12 +19,12 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import tk.mybatis.mapper.entity.Example;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 /**
+ * @author Administrator
  * @Auther: 周伟鹏
  * @Date: 2018/11/30 11:31
  * @Description:同步用户和站点信息
@@ -55,11 +55,13 @@ public class UsersSiteJob {
             List<ShyUsers> usersList = shyUsersMapper.selectByExample(usersExample);
             if (!usersList.isEmpty()) {
                 Long tmStr = usersList.get(0).getTm();
-                if (CommonUtils.isNotNull(tmStr)) tm = tmStr + "";
+                if (CommonUtils.isNotNull(tmStr)) {
+                    tm = tmStr + "";
+                }
             }
             HashMap<String, String> dataMap = new HashMap<>();
             dataMap.put("tm", tm);
-            dataMap.put("timestamp", new Date().getTime() / 1000 + "");
+            dataMap.put("timestamp", System.currentTimeMillis() / 1000 + "");
             String httpUrl = OpenUtil.buildURL(syncUserApi, dataMap, app_key);
             logger.info("httpUrl===" + httpUrl);
             Map<String, String> resultMap = HttpUtil.init().post(httpUrl);
 package com.cnlive.shenhe.job;
 import com.cnlive.shenhe.entity.ShyVideos;
-import com.cnlive.shenhe.entity.ShyYidun;
 import com.cnlive.shenhe.serviceImpl.VideosServiceImpl;
 import com.cnlive.shenhe.serviceImpl.YiDunServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
@@ -13,6 +12,9 @@ import org.springframework.stereotype.Component;
 import java.util.List;
+/**
+ * @author Administrator
+ */
 @Component
 public class VideosJob {
     private static Logger logger = LoggerFactory.getLogger(VideosJob.class);
@@ -10,6 +10,7 @@ import java.util.ArrayList;
 import java.util.List;
 /**
+ * @author Administrator
  * @Auther: 陈浩
  * @Date: 2019/6/21 14:31
  * @Description:
@@ -7,6 +7,9 @@ import org.jsoup.select.Elements;
 import java.io.IOException;
 import java.net.URL;
+/**
+ * @author Administrator
+ */
 public class newCrawl {
     public void abc(String url) throws Exception {
         newCrawl newCl = new newCrawl();
@@ -40,7 +40,6 @@ public class ChannelServiceImpl {
     SitesServiceImpl sitesService;
-    //**************************************
     public List<ShyChannel> findshyChannel(ShyChannel shyChannel) {
         return shyChannelMapper.selectByRowBounds(shyChannel, new RowBounds(0, 100));
     }
@@ -78,6 +78,7 @@ public class CommentsServiceImpl {
     }
     public PageInfo<ShyComments> getPage(CommentsDTO commentsDTO) {
+        logger.info("接受参数对象为，CommentsDTO:{}",JSONObject.toJSON(commentsDTO));
         Example example = new Example(ShyComments.class);
         Example.Criteria criteria = example.createCriteria();
         if (CommonUtils.isNotEmpty(commentsDTO.getOrderByClause())) {
@@ -85,7 +86,7 @@ public class CommentsServiceImpl {
         } else {
             example.setOrderByClause("comment_time desc");
         }
-        if (CommonUtils.isNotNull(commentsDTO.getStart_date()) && CommonUtils.isNotNull(commentsDTO.getEnd_date())) {
+        if (CommonUtils.isNotEmpty(commentsDTO.getStart_date()) && CommonUtils.isNotEmpty(commentsDTO.getEnd_date())) {
             criteria.andGreaterThanOrEqualTo("comment_time", commentsDTO.getStart_date());
             criteria.andLessThanOrEqualTo("comment_time", commentsDTO.getEnd_date());
         }
@@ -104,9 +105,9 @@ public class CommentsServiceImpl {
         if (CommonUtils.isNotNull(commentsDTO.getComment_user_id())) {
             criteria.andEqualTo("comment_user_id", commentsDTO.getComment_user_id());
         }
-        if (CommonUtils.isNotNull(commentsDTO.getType()) && commentsDTO.getType() == "0") {
+        if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType() == "0") {
             criteria.andEqualTo("type", CommonConst.CATEGORY_TOPIC);
-        } else if (CommonUtils.isNotNull(commentsDTO.getType()) && commentsDTO.getType() == "1") {
+        } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType() == "1") {
             criteria.andEqualTo("type", CommonConst.CATEGORY_ELSE);
         }
         if (CommonUtils.isNotEmpty(commentsDTO.getActivity_id())) {
@@ -119,14 +120,14 @@ public class CommentsServiceImpl {
             }
         }
-//        if (CommonUtils.isNotEmpty(states)) {
-//            Example.Criteria criteria1 = example.createCriteria();
-//            String[] stas = states.split(",");
-//            for (String s : stas) {
-//                criteria1.orEqualTo("state", Integer.parseInt(s));
-//            }
-//            example.and(criteria1);
-//        }
+        //if (CommonUtils.isNotNull(commentsDTO.getState())) {
+        //    Example.Criteria criteria1 = example.createCriteria();
+        //    String[] stas = String.valueOf(commentsDTO.getState()).split(",");
+        //    for (String s : stas) {
+        //        criteria1.orEqualTo("state", s);
+        //    }
+        //    example.and(criteria1);
+        //}
         if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() != 3) {
             criteria.andEqualTo("state", commentsDTO.getState());
@@ -167,9 +168,9 @@ public class CommentsServiceImpl {
         if (CommonUtils.isNotNull(commentsDTO.getIs_hot())) {
             criteria.andEqualTo("is_hot", commentsDTO.getIs_hot());
         }
-        if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType()=="0") {
+        if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType() == "0") {
             criteria.andEqualTo("type", CommonConst.CATEGORY_TOPIC);
-        } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType()=="1") {
+        } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType() == "1") {
             criteria.andIsNull("type");
         }
         if (CommonUtils.isNotEmpty(commentsDTO.getActivity_id())) {
@@ -182,14 +183,14 @@ public class CommentsServiceImpl {
             }
         }
-        //if (CommonUtils.isNotEmpty(String.valueOf(commentsDTO.getState()))) {
-        //    Example.Criteria criteria1 = example.createCriteria();
-        //    String[] stas = String.valueOf(commentsDTO.getState()).split(",");
-        //    for (String s : stas) {
-        //        criteria1.orEqualTo("state", Integer.parseInt(s));
-        //    }
-        //    example.and(criteria1);
-        //}
+        if (CommonUtils.isNotEmpty(String.valueOf(commentsDTO.getState()))) {
+            Example.Criteria criteria1 = example.createCriteria();
+            String[] stas = String.valueOf(commentsDTO.getState()).split(",");
+            for (String s : stas) {
+                criteria1.orEqualTo("state", Integer.parseInt(s));
+            }
+            example.and(criteria1);
+        }
         if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() != 3) {
             criteria.andEqualTo("state", commentsDTO.getState());
@@ -264,7 +264,8 @@ public class ContentServiceImpl {
                 }
             }
-            content.setContent_status(state);// 设置图文状态为审核后的状态
+            // 设置图文状态为审核后的状态
+            content.setContent_status(state);
             content.setReceive_status(CommonConst.RECEIVE_AUDIT);// 领取状态为已审核
             content.setShenhe_msg(msg);// 设置审核消息
             if (CommonUtils.isNotEmpty(userId)) {
@@ -283,7 +284,6 @@ public class ContentServiceImpl {
         return success;
     }
-    //**********************************
     public Integer receive(String ids, Integer num, String userId, Integer spid) {
         Integer n = 0;
         if (CommonUtils.isNotEmpty(ids)) {
@@ -320,7 +320,6 @@ public class ContentServiceImpl {
         return n;
     }
-    //***************************************
     public Integer retReceive(String ids, String userId) {
         Integer n = 0;
         String[] cids = ids.split(",");
@@ -339,7 +338,7 @@ public class ContentServiceImpl {
         return n;
     }
-    //**************************************
+
     public ShyContent selectByPrimaryKey(Integer id) {
         ShyContent shyContent = shyContentMapper.selectByPrimaryKey(id);
         return shyContent;
 package com.cnlive.shenhe.serviceImpl;
+import com.alibaba.fastjson.JSON;
 import com.cnlive.shenhe.dto.EmailDTO;
 import com.cnlive.shenhe.entity.ShyEmail;
 import com.cnlive.shenhe.mapper.ShyEmailMapper;
@@ -29,6 +30,7 @@ public class EmailServiceImpl {
     ShyEmailMapper shyEmailMapper;
     public PageInfo<ShyEmail> getPage(EmailDTO emailDTO) {
+    	logger.info("接受参数列表为：{}", JSON.toJSONString(emailDTO));
         Example example = new Example(ShyEmail.class);
         Example.Criteria criteria = example.createCriteria();
         if (CommonUtils.isNotEmpty(emailDTO.getOrderByClause())) {
 package com.cnlive.shenhe.serviceImpl;
+import com.alibaba.fastjson.JSON;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.dto.LiveApplyDTO;
@@ -93,6 +94,7 @@ public class LiveApplyServiceImpl {
     //===============
     public PageInfo<ShyLiveapply> getListLiveApply(LiveApplyDTO liveApplyDTO) {
+        logger.info("接参数列表为，LiveApplyDTO:{}", JSON.toJSONString(liveApplyDTO));
         Example example = new Example(ShyLiveapply.class);
         Example.Criteria criteria = example.createCriteria();
         if (CommonUtils.isNotEmpty(liveApplyDTO.getOrderByClause())) {
 package com.cnlive.shenhe.serviceImpl;
+import com.alibaba.fastjson.JSON;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.dto.LiveDTO;
@@ -80,6 +81,7 @@ public class LiveServiceImpl {
     //===============
     public PageInfo<ShyLive> getListContent(LiveDTO liveDTO) {
+        logger.info("接受参数对象，LiveDTO:{}", JSON.toJSONString(liveDTO));
         Example example = new Example(ShyLive.class);
         Example.Criteria criteria = example.createCriteria();
         if (CommonUtils.isNotEmpty(liveDTO.getOrderByClause())) {
 package com.cnlive.shenhe.serviceImpl;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.dto.NotSpeakDTO;
@@ -251,6 +252,7 @@ public class NotspeakServiceImpl {
     }
     public PageInfo<ShyNotspeak> getPage(NotSpeakDTO notSpeakDTO) {
+    	logger.info("接受参数对象为，NotSpeakDTO:{}", JSON.toJSONString(notSpeakDTO));
         Example example = new Example(ShyNotspeak.class);
         Example.Criteria criteria = example.createCriteria();
         if (CommonUtils.isNotEmpty(notSpeakDTO.getOrderByClause())) {
 package com.cnlive.shenhe.serviceImpl;
+import com.alibaba.fastjson.JSON;
 import com.cnlive.shenhe.dto.ShyActivityDTO;
 import com.cnlive.shenhe.entity.ShyActivity;
 import com.cnlive.shenhe.mapper.ShyActivityMapper;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
@@ -22,6 +25,8 @@ import java.util.List;
 @Service
 public class ShyActivityImpl {
+    private static Logger logger = LoggerFactory.getLogger(ShyActivityImpl.class);
+
     @Autowired
     private ShyActivityMapper ShyActivityMapper;
@@ -73,6 +78,7 @@ public class ShyActivityImpl {
      * @return
      */
     public PageInfo<ShyActivity> selectByExample(ShyActivityDTO shyActivityDTO) {
+        logger.info("参数接受对象为，ShyActivityDTO:{}", JSON.toJSONString(shyActivityDTO));
         Example example = new Example(ShyActivity.class);
         //如果为空 按照倒序排序  分页查询所有
         //以创建时间为条件进行倒序
 package com.cnlive.shenhe.serviceImpl;
+import com.alibaba.fastjson.JSON;
 import com.cnlive.shenhe.dto.SitesDTO;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
@@ -7,6 +8,8 @@ import com.cnlive.shenhe.mapper.ShySitesMapper;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
@@ -15,6 +18,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 /**
  * @Auther: 周伟鹏
  * @Date: 2018/11/29 14:23
@@ -22,12 +26,14 @@ import java.util.List;
  */
 @Service
 public class SitesServiceImpl {
+    private static Logger logger = LoggerFactory.getLogger(SitesServiceImpl.class);
     @Autowired
     ShySitesMapper shySitesMapper;
     @Autowired
     UsersServiceImpl usersService;
     public PageInfo<ShySites> getPage(SitesDTO sitesDTO) {
+        logger.info("接受参数列表为，SitesDTO:{}", JSON.toJSONString(sitesDTO));
         Example example = new Example(ShySites.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
 package com.cnlive.shenhe.serviceImpl;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.dto.TopicDTO;
 import com.cnlive.shenhe.entity.ShyComments;
@@ -94,6 +95,7 @@ public class TopicServiceImpl {
     }
     public PageInfo<ShyTopic> getPage(TopicDTO topicDTO) {
+        logger.info("接受参数列表为，TopicDTO:{}", JSON.toJSONString(topicDTO));
         Example example = new Example(ShyTopic.class);
         Example.Criteria criteria = example.createCriteria();
         if (CommonUtils.isNotEmpty(topicDTO.getOrderByClause())) {
 package com.cnlive.shenhe.serviceImpl;
+import com.alibaba.fastjson.JSON;
 import com.cnlive.shenhe.dto.UsersDTO;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
@@ -19,10 +22,12 @@ import java.util.List;
  */
 @Service
 public class UsersServiceImpl {
+    private static Logger logger = LoggerFactory.getLogger(UsersServiceImpl.class);
     @Autowired
     ShyUsersMapper shyUsersMapper;
     public PageInfo<ShyUsers> getPage(UsersDTO usersDTO) {
+        logger.info("接受参数列表为，UsersDTO:{}", JSON.toJSONString(usersDTO));
         Example example = new Example(ShyUsers.class);
         Example.Criteria criteria = example.createCriteria();
         if (CommonUtils.isNotEmpty(usersDTO.getOrderByClause())) {
 package com.cnlive.shenhe.serviceImpl;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.dto.UsersFreeDTO;
 import com.cnlive.shenhe.entity.ShyUsers;
@@ -45,6 +46,7 @@ public class UsersfreeServiceImpl {
 	}
     public PageInfo<ShyUsersfree> getpage(UsersFreeDTO usersFreeDTO) {
+    	logger.info("接受参数列表为，UsersFreeDTO:{}", JSON.toJSONString(usersFreeDTO));
     	Example example = new Example(ShyUsers.class);
     	Example.Criteria criteria = example.createCriteria();
     	if (CommonUtils.isNotEmpty(usersFreeDTO.getOrderByClause())) {
@@ -38,7 +38,8 @@ import java.util.UUID;
  */
 @Service
 public class VideosServiceImpl {
-    private static Logger logger = LoggerFactory.getLogger(VideosServiceImpl.class);
+
+    private  static Logger logger = LoggerFactory.getLogger(VideofilterServiceImpl.class);
     @Autowired
     ShyVideosMapper shyVideosMapper;
     @Autowired
@@ -112,6 +113,7 @@ public class VideosServiceImpl {
     }
     public PageInfo<ShyVideos> getListContent(VideosDTO videosDTO) {
+        logger.info("接受桉树列表为，VideosDTO:{}",JSON.toJSONString(videosDTO));
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
@@ -21,8 +21,11 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+/**
+ * @author Administrator
+ */
 public class CommonUtils {
-    private static char md5Chars[] = {
+    private static char[] md5Chars = {
             '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
             'a', 'b', 'c', 'd', 'e', 'f'
     };
@@ -24,6 +24,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+/**
+ * @author Administrator
+ */
 public class HttpClientUtils {
     public static String post(String url, Map<String, Object> map) {
         // 创建post请求
@@ -42,9 +45,12 @@ public class HttpClientUtils {
             HttpEntity postEntity = new UrlEncodedFormEntity(param, "utf-8");
             // 把请求实体放到post请求中
             post.setEntity(postEntity);
-            HttpResponse response = client.execute(post); // 执行post请求
-            HttpEntity entity = response.getEntity();// 从响应中取得一个响应实体
-            text = EntityUtils.toString(entity);// 把响应实体转成文本信息
+            // 执行post请求
+            HttpResponse response = client.execute(post);
+            // 从响应中取得一个响应实体
+            HttpEntity entity = response.getEntity();
+            // 把响应实体转成文本信息
+            text = EntityUtils.toString(entity);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
@@ -57,11 +63,15 @@ public class HttpClientUtils {
         String text = "请求失败";
         HttpGet httpGet = null;
         try {
-            HttpClient client = HttpClients.createDefault();// 创建http访问的客户端
+            // 创建http访问的客户端
+            HttpClient client = HttpClients.createDefault();
             httpGet = new HttpGet(url);
-            HttpResponse response = client.execute(httpGet); // 执行get请求
-            HttpEntity entity = response.getEntity();// 从响应中取得一个响应实体
-            text = EntityUtils.toString(entity);// 把响应实体转成文本信息
+            // 执行get请求
+            HttpResponse response = client.execute(httpGet);
+            // 从响应中取得一个响应实体
+            HttpEntity entity = response.getEntity();
+            // 把响应实体转成文本信息
+            text = EntityUtils.toString(entity);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
@@ -74,7 +84,8 @@ public class HttpClientUtils {
         String text = "请求失败";
         HttpGet httpGet = null;
         try {
-            HttpClient client = HttpClients.createDefault();// 创建http访问的客户端
+            // 创建http访问的客户端
+            HttpClient client = HttpClients.createDefault();
             List<NameValuePair> params = new ArrayList<NameValuePair>();
             if (map != null && map.size() > 0) {
                 for (Map.Entry<String, String> entry : map.entrySet()) {
@@ -83,9 +94,12 @@ public class HttpClientUtils {
             }
             String paramsStr = EntityUtils.toString(new UrlEncodedFormEntity(params, "UTF-8"));
             httpGet = new HttpGet(url + "?" + paramsStr);
-            HttpResponse response = client.execute(httpGet); // 执行get请求
-            HttpEntity entity = response.getEntity();// 从响应中取得一个响应实体
-            text = EntityUtils.toString(entity);// 把响应实体转成文本信息
+            // 执行get请求
+            HttpResponse response = client.execute(httpGet);
+            // 从响应中取得一个响应实体
+            HttpEntity entity = response.getEntity();
+            // 把响应实体转成文本信息
+            text = EntityUtils.toString(entity);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
@@ -98,23 +112,31 @@ public class HttpClientUtils {
         HttpPost post = null;
         String text = "请求失败";
         try {
-            HttpClient client = HttpClients.createDefault();// 创建http访问的客户端
+            // 创建http访问的客户端
+            HttpClient client = HttpClients.createDefault();
             List<NameValuePair> param = new ArrayList<>();
             if (map != null && map.size() > 0) {
                 for (Map.Entry<String, String> entry : map.entrySet()) {
                     param.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
                 }
             }
-            HttpEntity postEntity = new UrlEncodedFormEntity(param, "utf-8");// 用参数构造请求实体
-            post = new HttpPost(url);// 创建post请求
-            post.setEntity(postEntity);// 把请求实体放到post请求中
-            HttpResponse response = client.execute(post); // 执行post请求
-            HttpEntity entity = response.getEntity();// 从响应中取得一个响应实体
-            text = EntityUtils.toString(entity);// 把响应实体转成文本信息
+            // 用参数构造请求实体
+            HttpEntity postEntity = new UrlEncodedFormEntity(param, "utf-8");
+            // 创建post请求
+            post = new HttpPost(url);
+            // 把请求实体放到post请求中
+            post.setEntity(postEntity);
+            // 执行post请求
+            HttpResponse response = client.execute(post);
+            // 从响应中取得一个响应实体
+            HttpEntity entity = response.getEntity();
+            // 把响应实体转成文本信息
+            text = EntityUtils.toString(entity);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
-            post.releaseConnection();// 释放连接
+            // 释放连接
+            post.releaseConnection();
         }
         return text;
     }
@@ -53,14 +53,35 @@ public class HttpUtil {
     private Logger logger = LoggerFactory.getLogger(HttpUtil.class);
-    private static PoolingHttpClientConnectionManager pcm;//httpclient连接池
-    private CloseableHttpClient httpClient = null; //http连接
-    private int connectTimeout = 120000;//连接超时时间
-    private int connectionRequestTimeout = 10000;//从连接池获取连接超时时间
-    private int socketTimeout = 300000;//获取数据超时时间
+    /**
+     * httpclient连接池
+     */
+    private static PoolingHttpClientConnectionManager pcm;
+    /**
+     * http连接
+     */
+    private CloseableHttpClient httpClient = null;
+    /**
+     * 连接超时时间
+     */
+    private int connectTimeout = 120000;
+    /**
+     * 从连接池获取连接超时时间
+     */
+    private int connectionRequestTimeout = 10000;
+    /**
+     * 获取数据超时时间
+     */
+    private int socketTimeout = 300000;
     private String charset = "utf-8";
-    private RequestConfig requestConfig = null;//请求配置
-    private Builder requestConfigBuilder = null;//build requestConfig
+    /**
+     * 请求配置
+     */
+    private RequestConfig requestConfig = null;
+    /**
+     * build requestConfig
+     */
+    private Builder requestConfigBuilder = null;
     private List<NameValuePair> nvps = new ArrayList<>();
     private List<Header> headers = new ArrayList<>();
@@ -298,7 +319,8 @@ public class HttpUtil {
         if (entity != null) {
             try {
                 result = EntityUtils.toString(entity, charset);
-                EntityUtils.consume(entity);//释放连接
+                //释放连接
+                EntityUtils.consume(entity);
             } catch (Exception e) {
                 logger.error("获取http请求返回值解析失败", e);
                 request.abort();
@@ -403,6 +425,7 @@ public class HttpUtil {
     /**
      * from请求
+     *
      * @param url
      * @param params
      * @return
@@ -475,13 +498,13 @@ public class HttpUtil {
         JSONObject params = new JSONObject();
-        params.put("video_id","60_8be004799c424688949704814ea0d16d");
-        params.put("state",3+"");
-        params.put("attr_tags","");
-        params.put("msg","");
+        params.put("video_id", "60_8be004799c424688949704814ea0d16d");
+        params.put("state", 3 + "");
+        params.put("attr_tags", "");
+        params.put("msg", "");
         HttpUtil httpUtil = HttpUtil.init();
-        httpUtil.setParam("param",params.toJSONString());
-        String URL ="http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify?platform=AUDIT&token=2718c88930175686e40398994cead75c";
+        httpUtil.setParam("param", params.toJSONString());
+        String URL = "http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify?platform=AUDIT&token=2718c88930175686e40398994cead75c";
         Map<String, String> post = httpUtil.post(URL);
         System.out.println(post.get("result"));
     }
 package com.cnlive.shenhe.utils;
 import javax.servlet.ServletRequest;
-
-import com.alibaba.fastjson.JSONObject;
-
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.*;
+/**
+ * @author Administrator
+ */
 public class OpenUtil {
@@ -6,13 +6,22 @@ import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+/**
+ * @author Administrator
+ */
 @Component
 public class TransitServiceUtils {
     @Autowired
-    private AmqpTemplate rabbitTemplate;
-    private String exchange = "transitService";//交换机
-    private String routingKey = "audit";//路由
+	private AmqpTemplate rabbitTemplate;
+	/**交换机
+	 *
+	 */
+	private String exchange = "transitService";
+	/**路由
+	 *
+	 */
+	private String routingKey = "audit";
     /**
      * MQ 生产者工具类
@@ -27,7 +36,7 @@ public class TransitServiceUtils {
     	try{
     		JSONObject json = new JSONObject();
     		json.put("callerId", "audit");
-    		json.put("calleeId", calleeId);//
+    		json.put("calleeId", calleeId);
     		json.put("cmdId", cmdId);
     		if (isCallback) {
     			json.put("isCallback", "0");