优化了项目中所有Controller+Service接口，将零散的参数数据封装成DTO对象

王言钊
1 parent 101d9ed7
Showing 38 changed files with 1092 additions and 974 deletions
src/main/java/com/cnlive/shenhe/controller/AudioController.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/ShyActivityController.java
src/main/java/com/cnlive/shenhe/controller/SitesController.java
src/main/java/com/cnlive/shenhe/controller/TopicController.java
src/main/java/com/cnlive/shenhe/controller/UsersController.java
src/main/java/com/cnlive/shenhe/controller/UsersFreeController.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/dto/AudioDTO.java
src/main/java/com/cnlive/shenhe/dto/ChannelDTO.java
src/main/java/com/cnlive/shenhe/dto/CommentsDTO.java
src/main/java/com/cnlive/shenhe/dto/ContentDTO.java
src/main/java/com/cnlive/shenhe/dto/LiveApplyDTO.java
src/main/java/com/cnlive/shenhe/dto/LiveDTO.java
@@ -69,45 +69,33 @@ public class AudioController extends BaseController {
      * 音频数据分页获取
      *
      * @param model
-     * @param video_title
-     * @param start_date
-     * @param end_date
-     * @param state
-     * @param receive
-     * @param page
-     * @param pageSize
-     * @param video_priority
-     * @param orderByClause
-     * @param sp_desc
-     * @param sp_Id
+     * @param audioDTO
      * @param session
      * @return
      */
     @GetMapping("/page")
     public Object getListVideos(Model model, AudioDTO audioDTO, HttpSession session) {
-        //, String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if (CommonUtils.isNull(sessionUser)) {
             return "redirect:/users/login";
         }
         Integer spid = sessionUser.getSpid();
+        audioDTO.setSpid(spid);
         logger.info("sp_Id:{},spid:{}", audioDTO.getSp_Id(), spid);
         String userId = sessionUser.getUserId();
-        //if (CommonUtils.isNull(audioDTO.getPage())) {page = 1;}
-        //if (CommonUtils.isNull(audioDTO.getPageSize())) {pageSize = 10;}
+        audioDTO.setUserId(userId);
         if (CommonUtils.isNotEmpty(audioDTO.getSp_desc()) && spid == 0) {
             ShySites shySite = sitesService.findspidBySpdesc(audioDTO.getSp_desc());
             if (CommonUtils.isNotNull(shySite)) {
-                spid = shySite.getSpid();
+                audioDTO.setSpid(shySite.getSpid());
             } else {
                 setmodelSite(model);
                 return "error.html";
             }
         } else if (CommonUtils.isEmpty(audioDTO.getSp_desc()) && spid == 0) {
-            spid = null;
+            audioDTO.setSpid(null);
         }
-        //video_title, start_date, end_date, state, receive, page, pageSize, video_priority, orderByClause, spid, userId, sp_Id
-        PageInfo<ShyAudio> audioPage = audioService.getListContent(audioDTO.getVideo_title(), audioDTO.getStart_date(), audioDTO.getEnd_date(), audioDTO.getState(), audioDTO.getReceive(), audioDTO.getPage(), audioDTO.getPageSize(), audioDTO.getVideo_priority(), audioDTO.getOrderByClause(), spid, userId, audioDTO.getSp_Id());
+        PageInfo<ShyAudio> audioPage = audioService.getListContent(audioDTO);
         if (audioPage != null && audioPage.getSize() > 0) {
             List<ShyAudio> list = audioPage.getList();
             if (list != null && list.size() > 0) {
@@ -142,7 +130,7 @@ public class AudioController extends BaseController {
         String state1 = audioDTO.getState() == null ? "" : audioDTO.getState().toString();
         String receive1 = "";
         if (CommonUtils.isNotNull(audioDTO.getReceive())) {
-            receive1 = audioDTO.getReceive() == CommonConst.RECEIVE_AFTER ? "true" : "false";
+            receive1 = audioDTO.getReceive().equals(CommonConst.RECEIVE_AFTER) ? "true" : "false";
         } else {
             receive1 = "";
         }
@@ -174,7 +162,7 @@ public class AudioController extends BaseController {
             for (String cid : cids) {
                 ShyAudio shyAudio = audioService.selectByPrimaryKey(Integer.parseInt(cid));
                 if (CommonUtils.isNotNull(shyAudio)) {
-                    if (shyAudio.getState() != CommonConst.AUDIT_INTT || shyAudio.getReceive() == CommonConst.RECEIVE_AFTER) {
+                    if (!shyAudio.getState().equals(CommonConst.AUDIT_INTT) || shyAudio.getReceive().equals(CommonConst.RECEIVE_AFTER)) {
                         return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "您领取的内容中有已被领取或者已经被审核，请检查并重试");
                     }
                 } else {
@@ -204,7 +192,7 @@ public class AudioController extends BaseController {
         String[] cids = ids.split(",");
         for (String cid : cids) {
             ShyAudio shyAudio = audioService.selectByPrimaryKey(Integer.parseInt(cid));
-            if (shyAudio.getState() != CommonConst.AUDIT_INTT || shyAudio.getReceive() == CommonConst.RECEIVE_BEFORE || !shyAudio.getReceive_user_id().equals(userId)) {
+            if (!shyAudio.getState() .equals( CommonConst.AUDIT_INTT )|| shyAudio.getReceive() .equals(CommonConst.RECEIVE_BEFORE)  || !shyAudio.getReceive_user_id().equals(userId)) {
                 return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "退领失败，您选中的内容包含已退领的或已经审核的");
             }
         }
@@ -252,9 +240,9 @@ public class AudioController extends BaseController {
         String yuming = "";
         Integer plat = shyAudio.getBucketType();
-        if (plat == CommonConst.QINIU_PLAT) {
+        if (plat .equals( CommonConst.QINIU_PLAT)) {
             yuming = qn_domain + "/";
-        } else if (plat == CommonConst.KS_PLAT) {
+        } else if (plat .equals( CommonConst.KS_PLAT)) {
             yuming = ks_domain + "/";
         }
         shyAudio.setAttr_tags(CommonUtils.isEmpty(shyAudio.getAttr_tags()) ? "" : shyAudio.getAttr_tags());
@@ -267,25 +255,21 @@ public class AudioController extends BaseController {
     /**
      * 根据条件导出excel
      *
-     * @param video_title
-     * @param start_date
-     * @param end_date
-     * @param state
-     * @param receive
-     * @param video_priority
-     * @param orderByClause
+     * @param audioDTO
      * @param session
      * @param response
      */
     @GetMapping("excel")
     public void getExcel(AudioDTO audioDTO, HttpSession session, HttpServletResponse response) {
-        //String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String orderByClause
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         Integer spid = sessionUser.getSpid();
         String userId = sessionUser.getUserId();
-        if (spid == 0) spid = null;
-        List<ShyAudio> shyAudioList = audioService.findByCondition(audioDTO.getVideo_title(),audioDTO.getStart_date(),audioDTO.getEnd_date(),audioDTO.getState(),audioDTO.getReceive(),audioDTO.getVideo_priority(),audioDTO.getOrderByClause(), spid, userId);
-        //video_title, start_date, end_date, state, receive, video_priority, orderByClause
+        audioDTO.setSpid(spid);
+        audioDTO.setUserId(userId);
+        if (spid == 0) {
+            audioDTO.setSpid(null);
+        }
+        List<ShyAudio> shyAudioList = audioService.findByCondition(audioDTO);
         String fileName = "音频数据";
         String updater = "";//审核员名字
         String state1 = "";//审核状态 1已审核 2审核拒绝 0未审核
@@ -345,7 +329,7 @@ public class AudioController extends BaseController {
                 cell.setCellValue(shyAudioList.get(i).getAudioTag());
                 cell = row.createCell(5);//列
                 //审核员需要做处理
-                if (shyAudioList.get(i).getState() != CommonConst.AUDIT_INTT) {
+                if (!shyAudioList.get(i).getState().equals(CommonConst.AUDIT_INTT)) {
                     updater = CommonUtils.isEmpty(shyAudioList.get(i).getUploader()) || "null".equals(shyAudioList.get(i).getUploader()) ? "白名单" : shyAudioList.get(i).getUploader();
                     String auditor_id = shyAudioList.get(i).getAuditor_id();
                     if (CommonUtils.isNotEmpty(auditor_id)) {
@@ -412,19 +396,23 @@ public class AudioController extends BaseController {
         } catch (final Exception e) {
             e.printStackTrace();
             try {
-                if (bis != null)
+                if (bis != null) {
                     bis.close();
-                if (bos != null)
+                }
+                if (bos != null) {
                     bos.close();
+                }
             } catch (Exception e1) {
                 e1.printStackTrace();
             }
         } finally {
             try {
-                if (bis != null)
+                if (bis != null) {
                     bis.close();
-                if (bos != null)
+                }
+                if (bos != null) {
                     bos.close();
+                }
             } catch (Exception e2) {
                 e2.printStackTrace();
             }
@@ -51,55 +51,45 @@ public class ChannelController extends BaseController {
      * 评论列表页
      *
      * @param model
-     * @param start_date
-     * @param end_date
-     * @param sp_desc
-     * @param page
-     * @param pageSize
-     * @param orderByClause
+     * @param channelDTO
      * @param session
      * @return
      */
     @GetMapping("/page")
     public String getPage(Model model, ChannelDTO channelDTO, HttpSession session) {
-        //String channel_id, String channel_name, Integer receive,
-        //        String start_date, String end_date, Integer shenhe_status, String sp_desc,
-        //        Integer page, Integer pageSize, String orderByClause,
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if (CommonUtils.isNull(sessionUser)) {
             return "redirect:/users/login";
         }
         Integer spid = sessionUser.getSpid();
+        channelDTO.setSpid(spid);
         String userId = sessionUser.getUserId();
-        //if (CommonUtils.isNull(page)) page = 1;
-        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
+        channelDTO.setUserId(userId);
         if (CommonUtils.isNotEmpty(channelDTO.getSp_desc()) && spid == 0) {
             ShySites shySite = sitesService.findspidBySpdesc(channelDTO.getSp_desc());
             if (CommonUtils.isNotNull(shySite)) {
-                spid = shySite.getSpid();
+                channelDTO.setSpid(shySite.getSpid());
             } else {
                 setmodelSite(model);
                 return "error.html";
             }
         } else if (CommonUtils.isEmpty(channelDTO.getSp_desc()) && spid == 0) {
-            spid = null;
+            channelDTO.setSpid(null);
         }
-        Date sDate = null;
-        Date eDate = null;
-        if (CommonUtils.isNotEmpty(channelDTO.getStart_date())) {
+        if (CommonUtils.isNotEmpty(channelDTO.getsDate())) {
             try {
-                sDate = CommonUtils.parseDate(channelDTO.getStart_date(), "yyyy-MM-dd");
+                channelDTO.setsDate(String.valueOf(CommonUtils.parseDate(channelDTO.getsDate(), "yyyy-MM-dd")));
             } catch (Exception e) {
             }
         }
-        if (CommonUtils.isNotEmpty(channelDTO.getEnd_date())) {
+        if (CommonUtils.isNotEmpty(channelDTO.geteDate())) {
             try {
-                eDate = CommonUtils.parseDate(channelDTO.getEnd_date(), "yyyy-MM-dd");
+                channelDTO.seteDate(String.valueOf(CommonUtils.parseDate(channelDTO.geteDate(), "yyyy-MM-dd")));
             } catch (Exception e) {
             }
         }
-        PageInfo<ShyChannel> channelPage = channelService.getPage(channelDTO.getChannel_id(), channelDTO.getChannel_name(), channelDTO.getReceive(), sDate, eDate, channelDTO.getShenhe_status(), null, channelDTO.getPage(), channelDTO.getPageSize(), channelDTO.getOrderByClause(), spid, userId);
+        PageInfo<ShyChannel> channelPage = channelService.getPage(channelDTO);
         List<ShyChannel> list = channelPage.getList();
         if (!list.isEmpty()) {
             for (ShyChannel channel : list) {
@@ -9,7 +9,6 @@ import com.cnlive.shenhe.entity.ShyComments;
 import com.cnlive.shenhe.entity.ShyContent;
 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.ContentServiceImpl;
 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
@@ -65,52 +64,41 @@ public class CommentsController extends BaseController {
     /**
      * 评论列表页
      *
-     * @param activity_id
-     * @param content
-     * @param is_hot
-     * @param start_date
-     * @param end_date
-     * @param state
-     * @param page
-     * @param pageSize
-     * @param orderByClause
+     * @param commentsDTO
      * @return
      */
     @GetMapping("/page")
     public String getPage(Model model, CommentsDTO commentsDTO, HttpSession session) {
-        //String activity_id, String content, Integer is_hot,
-        //        String start_date, String end_date, Integer state, Integer receive,
-        //        Integer page, Integer pageSize, String orderByClause, Integer type, Integer comment_user_id
+
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if (CommonUtils.isNull(sessionUser)) {
             return "redirect:/users/login";
         }
         Integer spid = sessionUser.getSpid();
+        commentsDTO.setSpid(spid);
         String userId = sessionUser.getUserId();
-        if (spid == 0) spid = null;
-        //if (CommonUtils.isNull(page)) page = 1;
-        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
-        Date sDate = null;
-        Date eDate = null;
+        commentsDTO.setUserId(userId);
+        if (spid == 0) {
+            commentsDTO.setSpid(null);
+        }
-        if (CommonUtils.isNotEmpty(commentsDTO.getStart_date())) {
+        if (CommonUtils.isNotEmpty(commentsDTO.getsDate())) {
             try {
-                sDate = CommonUtils.parseDate(commentsDTO.getStart_date(), "yyyy-MM-dd");
+                commentsDTO.setsDate(String.valueOf(CommonUtils.parseDate(commentsDTO.getsDate(), "yyyy-MM-dd")));
             } catch (Exception e) {
             }
         }
-        if (CommonUtils.isNotEmpty(commentsDTO.getEnd_date())) {
+        if (CommonUtils.isNotEmpty(commentsDTO.geteDate())) {
             try {
-                eDate = CommonUtils.parseDate(commentsDTO.getEnd_date(), "yyyy-MM-dd");
+                commentsDTO.seteDate(String.valueOf(CommonUtils.parseDate(commentsDTO.geteDate(), "yyyy-MM-dd")));
             } catch (Exception e) {
             }
         }
-        PageInfo<ShyComments> commentPage = commentsService.getPage(commentsDTO.getActivity_id(), commentsDTO.getContent(), commentsDTO.getIs_hot(), sDate, eDate, commentsDTO.getState(), commentsDTO.getReceive(), null, commentsDTO.getPage(), commentsDTO.getPageSize(), commentsDTO.getOrderByClause(), spid, userId, commentsDTO.getType(), commentsDTO.getComment_user_id());
-        //activity_id, content, is_hot, sDate, eDate, state, receive, null, page, pageSize, orderByClause, spid, userId, type, comment_user_id
+        PageInfo<ShyComments> commentPage = commentsService.getPage(commentsDTO);
         List<ShyComments> list = commentPage.getList();
         if (!list.isEmpty()) {
             for (ShyComments comment : list) {
-                if (comment.getState() != CommonConst.AUDIT_INTT) {
+                if (!comment.getState().equals(CommonConst.AUDIT_INTT)) {
                     String updater = CommonUtils.isEmpty(comment.getUpdater()) || "null".equals(comment.getUpdater()) ? "白名单" : comment.getUpdater();
                     String auditor_id = comment.getAuditor_id();
                     if (CommonUtils.isNotEmpty(auditor_id)) {
@@ -313,33 +301,28 @@ public class CommentsController extends BaseController {
      */
     @GetMapping("excel")
     public void getExcel(CommentsDTO commentsDTO, HttpSession session, HttpServletResponse response) {
-
-        //String activity_id, String content, Integer is_hot,
-        //        String start_date, String end_date, Integer state, Integer receive, Integer type,
-        //        Integer page, Integer pageSize, String orderByClause,
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         Integer spid = sessionUser.getSpid();
+        commentsDTO.setSpid(spid);
         String userId = sessionUser.getUserId();
-        if (spid == 0) spid = null;
-        //if (CommonUtils.isNull(page)) page = 1;
-        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
-        Date sDate = null;
-        Date eDate = null;
+        commentsDTO.setUserId(userId);
+        if (spid == 0) {
+            commentsDTO.setSpid(null);
+        }
-        if (CommonUtils.isNotEmpty(commentsDTO.getStart_date())) {
+        if (CommonUtils.isNotEmpty(commentsDTO.getsDate())) {
             try {
-                sDate = CommonUtils.parseDate(commentsDTO.getStart_date(), "yyyy-MM-dd");
+                commentsDTO.setsDate(String.valueOf(CommonUtils.parseDate(commentsDTO.getsDate(), "yyyy-MM-dd")));
             } catch (Exception e) {
             }
         }
-        if (CommonUtils.isNotEmpty(commentsDTO.getEnd_date())) {
+        if (CommonUtils.isNotEmpty(commentsDTO.geteDate())) {
             try {
-                eDate = CommonUtils.parseDate(commentsDTO.getEnd_date(), "yyyy-MM-dd");
+                commentsDTO.seteDate(String.valueOf(CommonUtils.parseDate(commentsDTO.geteDate(), "yyyy-MM-dd")));
             } catch (Exception e) {
             }
         }
-        PageInfo<ShyComments> commentPage = commentsService.getPageExcel(commentsDTO.getActivity_id(), commentsDTO.getContent(), commentsDTO.getIs_hot(), sDate, eDate, commentsDTO.getState(), commentsDTO.getReceive(), null, commentsDTO.getPage(), commentsDTO.getPageSize(), commentsDTO.getOrderByClause(), spid, userId, commentsDTO.getType());
-        //activity_id, content, is_hot, sDate, eDate, state, receive, null, page, pageSize, orderByClause, spid, userId, type
+        PageInfo<ShyComments> commentPage = commentsService.getPageExcel(commentsDTO);
         List<ShyComments> list = commentPage.getList();
         String fileName = "评论数据";
@@ -437,7 +420,7 @@ public class CommentsController extends BaseController {
                 /* 审核员需要做处理*/
                 String updater = "";//审核员名字
-                if (list.get(i).getState() != CommonConst.AUDIT_INTT) {
+                if (!list.get(i).getState().equals(CommonConst.AUDIT_INTT)) {
                     updater = CommonUtils.isEmpty(list.get(i).getUpdater()) || "null".equals(list.get(i).getUpdater()) ? "自动通过" : list.get(i).getUpdater();
                     String auditor_id = list.get(i).getAuditor_id();
                     if (CommonUtils.isNotEmpty(auditor_id)) {
@@ -475,19 +458,23 @@ public class CommentsController extends BaseController {
         } catch (final Exception e) {
             e.printStackTrace();
             try {
-                if (bis != null)
+                if (bis != null) {
                     bis.close();
-                if (bos != null)
+                }
+                if (bos != null) {
                     bos.close();
+                }
             } catch (Exception e1) {
                 e1.printStackTrace();
             }
         } finally {
             try {
-                if (bis != null)
+                if (bis != null) {
                     bis.close();
-                if (bos != null)
+                }
+                if (bos != null) {
                     bos.close();
+                }
             } catch (Exception e2) {
                 e2.printStackTrace();
             }
@@ -46,66 +46,49 @@ public class ContentController extends BaseController {
      * 图文列表
      *
      * @param model
-     * @param title
-     * @param contentId
-     * @param content_tag
-     * @param start_date
-     * @param end_date
-     * @param receive_status
-     * @param sp_desc
-     * @param source
-     * @param author
-     * @param page
-     * @param pageSize
-     * @param orderByClause
+     * @param contentDTO
      * @param session
      * @return
      */
     @GetMapping("/page")
-    public String getPage(Model model, ContentDTO contentDTO , HttpSession session) {
-        //String title, String contentId, String content_tag,
-        //        String start_date, String end_date, Integer receive_status, String sp_desc, String source, String author,
-        //        Integer page, Integer pageSize, String orderByClause
+    public String getPage(Model model, ContentDTO contentDTO, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if (CommonUtils.isNull(sessionUser)) {
             return "redirect:/users/login";
         }
         Integer spid = sessionUser.getSpid();
+        contentDTO.setSpid(spid);
         String userId = sessionUser.getUserId();
-        //if (CommonUtils.isNull(page)) page = 1;
-        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
-        if (CommonUtils.isNotEmpty(contentDTO.getSp_desc()) && spid == 0) {
+        contentDTO.setUserId(userId);
+        if (CommonUtils.isNotEmpty(contentDTO.getSp_desc()) && contentDTO.getSpid() == 0) {
             ShySites shySite = sitesService.findspidBySpdesc(contentDTO.getSp_desc());
             if (CommonUtils.isNotNull(shySite)) {
-                spid = shySite.getSpid();
+                contentDTO.setSpid(shySite.getSpid());
             } else {
                 setmodelSite(model);
                 return "error.html";
             }
-        } else if (CommonUtils.isEmpty(contentDTO.getSp_desc()) && spid == 0) {
-            spid = null;
+        } else if (CommonUtils.isEmpty(contentDTO.getSp_desc()) && contentDTO.getSpid() == 0) {
+            contentDTO.setSpid(null);
         }
-        Date sDate = null;
-        Date eDate = null;
-        if (CommonUtils.isNotEmpty(contentDTO.getStart_date())) {
+        if (CommonUtils.isNotEmpty(String.valueOf(contentDTO.getsDate()))) {
             try {
-                sDate = CommonUtils.parseDate(contentDTO.getStart_date(), "yyyy-MM-dd");
+                contentDTO.setsDate(String.valueOf(CommonUtils.parseDate(String.valueOf(contentDTO.getsDate()), "yyyy-MM-dd")));
             } catch (Exception e) {
             }
         }
-        if (CommonUtils.isNotEmpty(contentDTO.getEnd_date())) {
+        if (CommonUtils.isNotEmpty(contentDTO.geteDate())) {
             try {
-                eDate = CommonUtils.parseDate(contentDTO.getEnd_date(), "yyyy-MM-dd");
+                contentDTO.seteDate(String.valueOf(CommonUtils.parseDate(contentDTO.geteDate(), "yyyy-MM-dd")));
             } catch (Exception e) {
             }
         }
-        PageInfo<ShyContent> contentPage = contentService.getPage(contentDTO.getTitle(), contentDTO.getSource(), contentDTO.getAuthor(), contentDTO.getContent_tag(), contentDTO.getContentId(), sDate, eDate, contentDTO.getReceive_status(), null, contentDTO.getPage(), contentDTO.getPageSize(), contentDTO.getOrderByClause(), spid, userId);
-        //title, source, author, content_tag, contentId, sDate, eDate, receive_status, null, page, pageSize, orderByClause, spid, userId
+        PageInfo<ShyContent> contentPage = contentService.getPage(contentDTO);
         List<ShyContent> list = contentPage.getList();
         if (!list.isEmpty()) {
             for (ShyContent content : list) {
-                if (content.getReceive_status() == CommonConst.RECEIVE_AUDIT) {
+                if (content.getReceive_status().equals(CommonConst.RECEIVE_AUDIT)) {
                     String auditor_id = content.getAuditor_id();
                     String updater = CommonUtils.isEmpty(content.getUpdater()) || "null".equals(content.getUpdater()) ? "白名单" : content.getUpdater();
                     updater = sitesService.getUpdater(updater, auditor_id);
@@ -232,37 +215,33 @@ public class ContentController extends BaseController {
      */
     @GetMapping("excel")
     public void getExcel(ContentDTO contentDTO, HttpSession session, HttpServletResponse response) {
-        //String title, String contentId, String content_tag,
-        //        String start_date, String end_date, Integer receive_status, String sp_desc,
-        //        Integer page, Integer pageSize, String orderByClause
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         Integer spid = sessionUser.getSpid();
-        if (CommonUtils.isNotEmpty(contentDTO.getSp_desc()) && spid == 0) {
+        contentDTO.setSpid(spid);
+        String userId = sessionUser.getUserId();
+        contentDTO.setUserId(userId);
+        if (CommonUtils.isNotEmpty(contentDTO.getSp_desc()) && contentDTO.getSpid() == 0) {
             ShySites shySite = sitesService.findspidBySpdesc(contentDTO.getSp_desc());
             if (CommonUtils.isNotNull(shySite)) {
-                spid = shySite.getSpid();
+                contentDTO.setSpid(shySite.getSpid());
             }
-        } else if (CommonUtils.isEmpty(contentDTO.getSp_desc()) && spid == 0) {
-            spid = null;
+        } else if (CommonUtils.isEmpty(contentDTO.getSp_desc()) && contentDTO.getSpid() == 0) {
+            contentDTO.setSpid(null);
         }
-        Date sDate = null;
-        Date eDate = null;
-        if (CommonUtils.isNotEmpty(contentDTO.getStart_date())) {
+        if (CommonUtils.isNotEmpty(contentDTO.getsDate())) {
             try {
-                sDate = CommonUtils.parseDate(contentDTO.getStart_date(), "yyyy-MM-dd");
+                contentDTO.setsDate(String.valueOf((CommonUtils.parseDate(contentDTO.getsDate(), "yyyy-MM-dd"))));
             } catch (Exception e) {
             }
         }
-        if (CommonUtils.isNotEmpty(contentDTO.getEnd_date())) {
+        if (CommonUtils.isNotEmpty(contentDTO.geteDate())) {
             try {
-                eDate = CommonUtils.parseDate(contentDTO.getEnd_date(), "yyyy-MM-dd");
+                contentDTO.seteDate(String.valueOf(CommonUtils.parseDate(contentDTO.geteDate(), "yyyy-MM-dd")));
             } catch (Exception e) {
             }
         }
-        List<ShyContent> contentList = contentService.findByCondition(contentDTO.getTitle(), contentDTO.getContent_tag(), contentDTO.getContentId(), sDate, eDate, contentDTO.getReceive_status(), contentDTO.getPage(), contentDTO.getPageSize(), contentDTO.getOrderByClause(), spid);
-        //title, content_tag, contentId, sDate, eDate, receive_status, page, pageSize, orderByClause, spid
-
+        List<ShyContent> contentList = contentService.findByCondition(contentDTO);
         String fileName = "图文数据";
         XSSFWorkbook wb = new XSSFWorkbook();
@@ -322,7 +301,7 @@ public class ContentController extends BaseController {
                 }
                 cell = row.createCell(4);//列
                 cell.setCellValue(contentTag);
-               
+
                 /*状态需要处理成用户可读*/
                 String shenheType = "";//审核类型，1:免审，2:机审，3:人工审
                 if (contentList.get(i).getShenhe_type() == 1) {
@@ -334,7 +313,7 @@ public class ContentController extends BaseController {
                 }
                 cell = row.createCell(5);//列
                 cell.setCellValue(shenheType);
-                
+
                 /*状态需要处理成用户可读*/
                 String contentStatus = "";//内容状态:0:待发布,1:已发布,2:已下线，3:已删除
                 if (contentList.get(i).getContent_status() == 0) {
@@ -353,7 +332,7 @@ public class ContentController extends BaseController {
                 cell.setCellValue(contentList.get(i).getContent_time() == null ? "" : CommonUtils.formatDate(contentList.get(i).getContent_time(), "yyyy-MM-dd HH:mm:ss"));
                 cell = row.createCell(8);//列
                 cell.setCellValue(contentList.get(i).getCreate_date() == null ? "" : CommonUtils.formatDate(contentList.get(i).getCreate_date(), "yyyy-MM-dd HH:mm:ss"));
-                
+
                 /*状态需要处理成用户可读*/
                 String receiveStatus = "";//领取状态。0：未领取；1：已领取,2:已审核
                 if (contentList.get(i).getReceive_status() == 1) {
@@ -366,10 +345,10 @@ public class ContentController extends BaseController {
                 cell = row.createCell(9);//列
                 cell.setCellValue(receiveStatus);
-                
+
                 /* 审核员需要做处理*/
                 String updater = "";//审核员名字
-                if (contentList.get(i).getReceive_status() != CommonConst.RECEIVE_BEFORE) {
+                if (!contentList.get(i).getReceive_status().equals(CommonConst.RECEIVE_BEFORE)) {
                     updater = CommonUtils.isEmpty(contentList.get(i).getUpdater()) || "null".equals(contentList.get(i).getUpdater()) ? "自动通过" : contentList.get(i).getUpdater();
                     String auditor_id = contentList.get(i).getAuditor_id();
                     if (CommonUtils.isNotEmpty(auditor_id)) {
@@ -414,19 +393,23 @@ public class ContentController extends BaseController {
         } catch (final Exception e) {
             e.printStackTrace();
             try {
-                if (bis != null)
+                if (bis != null) {
                     bis.close();
-                if (bos != null)
+                }
+                if (bos != null) {
                     bos.close();
+                }
             } catch (Exception e1) {
                 e1.printStackTrace();
             }
         } finally {
             try {
-                if (bis != null)
+                if (bis != null) {
                     bis.close();
-                if (bos != null)
+                }
+                if (bos != null) {
                     bos.close();
+                }
             } catch (Exception e2) {
                 e2.printStackTrace();
             }
@@ -46,16 +46,11 @@ public class EmailController extends BaseController {
     @GetMapping(value = "/page")
     public String page(Model model, EmailDTO emailDTO, HttpSession session) {
-        //Integer page, Integer pageSize, String orderByClause,
-        //        String remark,String email
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if(CommonUtils.isNull(sessionUser)){
         	return "redirect:/users/login";
         }
-        //if (CommonUtils.isNull(page)) page = 1;
-        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
-        PageInfo<ShyEmail> emailPage = emailServiceImpl.getPage(emailDTO.getPage(), emailDTO.getPageSize(), emailDTO.getOrderByClause(), emailDTO.getRemark(),emailDTO.getEmail());
-        //page, pageSize, orderByClause, remark,email
+        PageInfo<ShyEmail> emailPage = emailServiceImpl.getPage(emailDTO);
         List<ShyEmail> list = emailPage.getList();
         JSONObject email_message = CommonConst.EMAIL_MESSAGE;
         if (!list.isEmpty()) {
@@ -66,9 +66,9 @@ public class LiveApplyController extends BaseController {
     /**
      * 直播申请审核信息回调接口
      *
-     * @param activity_id 视频id
+     * @param ids 视频id
      * @param state       状态码
-     * @param attr_tags   标签
+     * @param
      * @param msg         备注信息
      * @return
      */
@@ -117,48 +117,36 @@ public class LiveApplyController extends BaseController {
     /**
      * 内容分页列表接口
      *
-     * @param video_title
-     * @param start_date
-     * @param end_date
-     * @param state
-     * @param page
-     * @param pageSize
-     * @param orderByClause
+     * @param liveApplyDTO
      * @return
      */
     @GetMapping("/page")
     public Object getListLiveApply(Model model, LiveApplyDTO liveApplyDTO, HttpSession session) {
-        //String start_date,String end_date,
-        //        String theme, String business_model, Integer page,Integer pageSize,
-        //        Integer shenhe_state,Integer receive, String sp_desc,String orderByClause
     	System.out.println("进入直播申请内容页"); 
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if(CommonUtils.isNull(sessionUser)){
         	return "redirect:/users/login";
         }
         Integer spid = sessionUser.getSpid();
+        liveApplyDTO.setSpid(spid);
         String userId = sessionUser.getUserId();
-        //if (CommonUtils.isNull(page)) page = 1;
-        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
+        liveApplyDTO.setUserId(userId);
         if (CommonUtils.isNotEmpty(liveApplyDTO.getSp_desc()) && spid == 0) {
         	ShySites shySite=sitesService.findspidBySpdesc(liveApplyDTO.getSp_desc());
         	if(CommonUtils.isNotNull(shySite)){
-        		spid = shySite.getSpid();
+        	    liveApplyDTO.setSpid(shySite.getSpid());
         	}else{
         		setmodelSite(model);
         		return "error.html";
         	}
         } else if (CommonUtils.isEmpty(liveApplyDTO.getSp_desc()) && spid == 0) {
-            spid = null;
+            liveApplyDTO.setSpid(null);
         } 
-        PageInfo<ShyLiveapply> liveApplyPage = liveApplyServiceImpl.getListLiveApply(liveApplyDTO.getTheme(), liveApplyDTO.getStart_date(),liveApplyDTO.getEnd_date(),
-        	 liveApplyDTO.getBusiness_model(), liveApplyDTO.getPage(), liveApplyDTO.getPageSize(), liveApplyDTO.getShenhe_state(),liveApplyDTO.getReceive(), liveApplyDTO.getOrderByClause(), spid, userId);
-        //theme, start_date,end_date,
-        //        business_model, page, pageSize, shenhe_state,receive, orderByClause, spid, userId
+        PageInfo<ShyLiveapply> liveApplyPage = liveApplyServiceImpl.getListLiveApply(liveApplyDTO);
         List<ShyLiveapply> list = liveApplyPage.getList();
         if (!list.isEmpty()) {
             for (ShyLiveapply liveApply : list) {
-            	 if (liveApply.getShenhe_state() != CommonConst.AUDIT_INTT) {
+            	 if (!liveApply.getShenhe_state().equals(CommonConst.AUDIT_INTT)) {
                      String updater =CommonUtils.isEmpty(liveApply.getUpdater()) || "null".equals(liveApply.getUpdater())? "白名单":liveApply.getUpdater();
                      String auditor_id = liveApply.getAuditor();
                      if (CommonUtils.isNotEmpty(auditor_id)) {
@@ -226,7 +214,7 @@ public class LiveApplyController extends BaseController {
             for (String cid : cids) {
             	ShyLiveapply shyLiveapply = liveApplyServiceImpl.selectByPrimaryKey(Integer.parseInt(cid));
                 if (CommonUtils.isNotNull(shyLiveapply)) {
-                    if (shyLiveapply.getShenhe_state() != CommonConst.RECEIVE_BEFORE ) {
+                    if (!shyLiveapply.getShenhe_state().equals(CommonConst.RECEIVE_BEFORE)) {
                         return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "您领取的内容中有已被领取或者已经被审核，请检查并重试");
                     }
                 } else {
@@ -317,25 +305,21 @@ public class LiveApplyController extends BaseController {
     */
    @GetMapping("excel")
    public void getExcel(LiveApplyDTO liveApplyDTO, HttpSession session,HttpServletResponse response) {
-       //String start_date,String end_date,
-       //        String theme, Integer business_model, Integer page,Integer pageSize,
-       //        Integer shenhe_state,Integer receive, String sp_desc,String orderByClause
        SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
        Integer spid = sessionUser.getSpid();
+       liveApplyDTO.setSpid(spid);
        String userId = sessionUser.getUserId();
+       liveApplyDTO.setUserId(userId);
        if (CommonUtils.isNotEmpty(liveApplyDTO.getSp_desc()) && spid == 0) {
        	ShySites shySite=sitesService.findspidBySpdesc(liveApplyDTO.getSp_desc());
        	if(CommonUtils.isNotNull(shySite)){
-       		spid = shySite.getSpid();
+       	    liveApplyDTO.setSpid(shySite.getSpid());
        		}
        	}else if (CommonUtils.isEmpty(liveApplyDTO.getSp_desc()) && spid == 0) {
-           spid = null;
+           liveApplyDTO.setSpid(null);
        	}
-       List<ShyLiveapply>  liveApplyList = liveApplyServiceImpl.findByCondition(liveApplyDTO.getTheme(), liveApplyDTO.getStart_date(),liveApplyDTO.getEnd_date(),
-               liveApplyDTO.getBusiness_model(), liveApplyDTO.getPage(), liveApplyDTO.getPageSize(), liveApplyDTO.getShenhe_state(),liveApplyDTO.getReceive(), liveApplyDTO.getOrderByClause(), spid, userId);
-       //theme, start_date,end_date,
-       //        business_model, page, pageSize, shenhe_state,receive, orderByClause,
-       
+       List<ShyLiveapply>  liveApplyList = liveApplyServiceImpl.findByCondition(liveApplyDTO);
+
        String fileName = "直播申请数据";
        XSSFWorkbook wb = new XSSFWorkbook();
@@ -429,19 +413,23 @@ public class LiveApplyController extends BaseController {
        } catch (final Exception e) {
            e.printStackTrace();
            try {
-               if (bis != null)
+               if (bis != null) {
                    bis.close();
-               if (bos != null)
+               }
+               if (bos != null) {
                    bos.close();
+               }
            } catch (Exception e1) {
                e1.printStackTrace();
            }
        } finally {
            try {
-               if (bis != null)
+               if (bis != null) {
                    bis.close();
-               if (bos != null)
+               }
+               if (bos != null) {
                    bos.close();
+               }
            } catch (Exception e2) {
                e2.printStackTrace();
            }
@@ -112,43 +112,28 @@ public class LiveController extends BaseController {
      * 内容分页列表接口
      *
      * @param model
-     * @param activity_id
-     * @param start_date
-     * @param end_date
-     * @param activity_name
-     * @param activity_status
-     * @param page
-     * @param pageSize
-     * @param shenhe_state
-     * @param sp_desc
-     * @param contentId
+     * @param liveDTO
      * @param session
      * @return
      */
     @GetMapping("/page")
     public Object getListVideos(Model model, LiveDTO liveDTO, HttpSession session) {
-        //String activity_id, String start_date, String end_date,
-        //        String activity_name, Integer activity_status, Integer page, Integer pageSize,
-        //        Integer shenhe_state, String sp_desc, Integer contentId
         System.out.println("进入直播内容页");
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
-//        if(CommonUtils.isNull(sessionUser)){
-//        	return "redirect:/users/login";
-//        }
         Integer spid = sessionUser.getSpid();
         String userId = sessionUser.getUserId();
-        //if (CommonUtils.isNull(page)) page = 1;
-        //if (CommonUtils.isNull(pageSize)) pageSize = 20;
+        liveDTO.setSpid(spid);
+        liveDTO.setUserId(userId);
         if (CommonUtils.isNotEmpty(liveDTO.getSp_desc()) && spid == 0) {
             ShySites shySite = sitesService.findspidBySpdesc(liveDTO.getSp_desc());
             if (CommonUtils.isNotNull(shySite)) {
-                spid = shySite.getSpid();
+                liveDTO.setSpid(shySite.getSpid());
             } else {
                 setmodelSite(model);
                 return "error.html";
             }
         } else if (CommonUtils.isEmpty(liveDTO.getSp_desc()) && spid == 0) {
-            spid = null;
+            liveDTO.setSpid(null);
         }
         String orderByClause = "";
         //审核状态：全部待领
@@ -179,8 +164,7 @@ public class LiveController extends BaseController {
             }
         }
-        PageInfo<ShyLive> livePage = liveService.getListContent(liveDTO.getActivity_name(), liveDTO.getStart_date(), liveDTO.getEnd_date(),
-                liveDTO.getActivity_id(), liveDTO.getActivity_status(), liveDTO.getPage(), liveDTO.getPageSize(), liveDTO.getShenhe_state(), orderByClause, spid, userId);
+        PageInfo<ShyLive> livePage = liveService.getListContent(liveDTO);
         List<ShyLive> list = livePage.getList();
         if (!list.isEmpty()) {
             for (ShyLive live : list) {
@@ -376,22 +360,21 @@ public class LiveController extends BaseController {
     */
    @GetMapping("excel")
    public void getExcel(LiveDTO liveDTO, HttpSession session,HttpServletResponse response) {
-       //String activity_id,String start_date,String end_date,
-       //        String activity_name, Integer activity_status, Integer page,Integer pageSize,
-       //        Integer shenhe_state, String orderByClause, String sp_desc
+
        SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
        Integer spid = sessionUser.getSpid();
        String userId = sessionUser.getUserId();
+       liveDTO.setSpid(spid);
+       liveDTO.setUserId(userId);
        if (CommonUtils.isNotEmpty(liveDTO.getSp_desc()) && spid == 0) {
        	ShySites shySite=sitesService.findspidBySpdesc(liveDTO.getSp_desc());
        	if(CommonUtils.isNotNull(shySite)){
-       		spid = shySite.getSpid();
+       		liveDTO.setSpid(shySite.getSpid());
        		}
        	}else if (CommonUtils.isEmpty(liveDTO.getSp_desc()) && spid == 0) {
-           spid = null;
+           liveDTO.setSpid(null);
        	}
-       List<ShyLive> liveList = liveService.findByCondition(liveDTO.getActivity_name(), liveDTO.getStart_date(),liveDTO.getEnd_date(),
-       	      liveDTO.getActivity_id(), liveDTO.getActivity_status(), liveDTO.getPage(), liveDTO.getPageSize(), liveDTO.getShenhe_state(), liveDTO.getOrderByClause(), spid,userId);
+       List<ShyLive> liveList = liveService.findByCondition(liveDTO);
        String fileName = "直播数据";
@@ -526,19 +509,23 @@ public class LiveController extends BaseController {
        } catch (final Exception e) {
            e.printStackTrace();
            try {
-               if (bis != null)
+               if (bis != null) {
                    bis.close();
-               if (bos != null)
+               }
+               if (bos != null) {
                    bos.close();
+               }
            } catch (Exception e1) {
                e1.printStackTrace();
            }
        } finally {
            try {
-               if (bis != null)
+               if (bis != null) {
                    bis.close();
-               if (bos != null)
+               }
+               if (bos != null) {
                    bos.close();
+               }
            } catch (Exception e2) {
                e2.printStackTrace();
            }
@@ -55,30 +55,19 @@ public class NotSpeakController extends BaseController {
     /**
      * 禁言列表页
      *
-     * @param activity_id
-     * @param content
-     * @param is_hot
-     * @param start_date
-     * @param end_date
-     * @param state
-     * @param page
-     * @param pageSize
-     * @param orderByClause
+     * @param notSpeakDTO
      * @return
      */
     @GetMapping("/page")
     public String getPage(Model model, NotSpeakDTO notSpeakDTO, HttpSession session) {
-        //String user_name, Integer user_id,Integer state,
-        //        Integer page, Integer pageSize, String orderByClause
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if(CommonUtils.isNull(sessionUser)){
         	return "redirect:/users/login";
         }
         String userId = sessionUser.getUserId();
-        //if (CommonUtils.isNull(page)) page = 1;
-        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
-        PageInfo<ShyNotspeak> shyNotspeakPage = notSpeakService.getPage(notSpeakDTO.getUser_name(),notSpeakDTO.getUser_id(), notSpeakDTO.getState(), notSpeakDTO.getPage(), notSpeakDTO.getPageSize(), notSpeakDTO.getOrderByClause());
-        //user_name,user_id, state, page, pageSize, orderByClause
+        notSpeakDTO.setUserId(userId);
+        PageInfo<ShyNotspeak> shyNotspeakPage = notSpeakService.getPage(notSpeakDTO);
+
         List<ShyNotspeak> list = shyNotspeakPage.getList();
         if (!list.isEmpty()) {
             for (ShyNotspeak notspeak : list) {
@@ -115,7 +104,7 @@ public class NotSpeakController extends BaseController {
     /**
      * 禁言(通过评论进入)
      * @param commentId
-     * @param type
+     * @param
      * @param time
      * @param session
      * @return
@@ -131,8 +120,8 @@ public class NotSpeakController extends BaseController {
     /**
      * 查询禁言状态(通过评论进入)
      * @param commentId
-     * @param type
-     * @param time
+     * @param
+     * @param
      * @param session
      * @return
      */
@@ -6,15 +6,11 @@ import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.dto.ShyActivityDTO;
 import com.cnlive.shenhe.entity.ShyActivity;
 import com.cnlive.shenhe.serviceImpl.ShyActivityImpl;
-import com.cnlive.shenhe.utils.CommonConst;
-import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
 import java.util.List;
@@ -64,7 +60,6 @@ public class ShyActivityController extends BaseController {
     @GetMapping("/page")
     public String getShyActivity(ShyActivityDTO shyActivityDTO, Model model) {
-        //@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, String activity, Integer exempt_from_trial
         PageInfo<ShyActivity> shyActivityPageInfo = shyActivityImpl.selectByExample(shyActivityDTO);
         List<ShyActivity> list = shyActivityPageInfo.getList();
         model.addAttribute("exempt_from_trial",shyActivityDTO.getExempt_from_trial());
@@ -37,28 +37,27 @@ public class SitesController extends BaseController {
     /**
      * 站点白名单分页列表
      *
-     * @param page
-     * @param pageSize
-     * @param orderByClause
-     * @param keyword
+     * @param sitesDTO
      * @return
      */
     @GetMapping(value = "/page")
     public String page(Model model, SitesDTO sitesDTO, HttpSession session) {
-        //Integer page, Integer pageSize, String orderByClause, String keyword
+
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if(CommonUtils.isNull(sessionUser)){
         	return "redirect:/users/login";
         }
         Integer spid = sessionUser.getSpid();
+        sitesDTO.setSpId(spid);
         if (!sessionUser.isMaster() && spid != 0) {
         	setmodelSite(model);
     		return "error.html";
         }
-        if (spid == 0) spid = null;
-        //if (CommonUtils.isNull(page)) page = 1;
-        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
-        PageInfo<ShySites> sitePage = sitesService.getPage(sitesDTO.getPage(), sitesDTO.getPageSize(), sitesDTO.getOrderByClause(), sitesDTO.getKeyword(), spid);
+        if (spid == 0) {
+            sitesDTO.setSpId(null);
+        }
+
+        PageInfo<ShySites> sitePage = sitesService.getPage(sitesDTO);
         List<ShySites> list = sitePage.getList();
         JSONObject business = CommonConst.BUSINESS;
         if (!list.isEmpty()) {
@@ -53,61 +53,50 @@ public class TopicController extends BaseController {
      * 图文列表
      * 
      * @param model
-     * @param title
-     * @param start_date
-     * @param end_date
-     * @param receive_status
-     * @param sp_desc
-     * @param page
-     * @param pageSize
-     * @param orderByClause
+     * @param topicDTO
      * @param session
      * @return
      */
     @GetMapping("/page")
     public String getPage(Model model, TopicDTO topicDTO, HttpSession session) {
-        //String topic_name,String topic_id, String topic_tag,
-        //        String start_date, String end_date, Integer shenhe_status, String sp_desc,
-        //        Integer page, Integer pageSize,Integer receive, String orderByClause
+
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if(CommonUtils.isNull(sessionUser)){
         	return "redirect:/users/login";
         }
         Integer spid = sessionUser.getSpid();
         String userId = sessionUser.getUserId();
-        //if (CommonUtils.isNull(page)) page = 1;
-        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
+        topicDTO.setSpid(spid);
+        topicDTO.setUserId(userId);
         if (CommonUtils.isNotEmpty(topicDTO.getSp_desc()) && spid == 0) {
         	ShySites shySite=sitesService.findspidBySpdesc(topicDTO.getSp_desc());
         	if(CommonUtils.isNotNull(shySite)){
-        		spid = shySite.getSpid();
+        		topicDTO.setSpid(shySite.getSpid());
         	}else{
         		setmodelSite(model);
         		return "error.html";
         	}
         } else if (CommonUtils.isEmpty(topicDTO.getSp_desc()) && spid == 0) {
-            spid = null;
+           topicDTO.setSpid(null);
         }
-        Date sDate = null;
-        Date eDate = null;
-        if (CommonUtils.isNotEmpty(topicDTO.getStart_date())) {
+        if (CommonUtils.isNotEmpty(topicDTO.getsDate())) {
             try {
-                sDate = CommonUtils.parseDate(topicDTO.getStart_date(), "yyyy-MM-dd");
+                topicDTO.setsDate(String.valueOf(CommonUtils.parseDate(topicDTO.getsDate(), "yyyy-MM-dd")));
             } catch (Exception e) {
             }
         }
-        if (CommonUtils.isNotEmpty(topicDTO.getEnd_date())) {
+        if (CommonUtils.isNotEmpty(topicDTO.geteDate())) {
             try {
-                eDate = CommonUtils.parseDate(topicDTO.getEnd_date(), "yyyy-MM-dd");
+                topicDTO.seteDate(String.valueOf(CommonUtils.parseDate(topicDTO.geteDate(), "yyyy-MM-dd")));
             } catch (Exception e) {
             }
         }
-        PageInfo<ShyTopic> topicPage = topicService.getPage( topicDTO.getTopic_name(),topicDTO.getTopic_tag(),topicDTO.getTopic_id(),  sDate, eDate, topicDTO.getShenhe_status(), null, topicDTO.getPage(), topicDTO.getPageSize(), topicDTO.getOrderByClause(), spid, userId,topicDTO.getReceive());
+        PageInfo<ShyTopic> topicPage = topicService.getPage(topicDTO);
         List<ShyTopic> list = topicPage.getList();
         if (!list.isEmpty()) {
             for (ShyTopic topic : list) {
-                if (topic.getShenhe_status() != CommonConst.AUDIT_INTT) {
+                if (!topic.getShenhe_status().equals(CommonConst.AUDIT_INTT)) {
                 	String auditor_id = topic.getAuditor_id();
                 	String updater = CommonUtils.isEmpty(topic.getUpdater()) || "null".equals(topic.getUpdater())? "白名单":topic.getUpdater();
                     updater =sitesService.getUpdater(updater,auditor_id);
@@ -84,17 +84,17 @@ public class UsersController extends BaseController {
     @GetMapping(value = "/page")
     public String page(Model model, UsersDTO usersDTO, HttpSession session) {
-        //Integer page, Integer pageSize, String orderByClause,
-        //        String username, String mobile, Integer sp_id, String company_brief
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if(CommonUtils.isNull(sessionUser)){
         	return "redirect:/users/login";
         }
         Integer spid = sessionUser.getSpid();
-        if (spid == 0) spid = null;
-        //if (CommonUtils.isNull(page)) page = 1;
-        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
-        PageInfo<ShyUsers> usersPage = usersService.getPage(usersDTO.getPage(), usersDTO.getPageSize(), usersDTO.getOrderByClause(), usersDTO.getUsername(),usersDTO.getMobile(),usersDTO.getSp_id(),usersDTO.getCompany_brief());
+        usersDTO.setSp_id(spid);
+        if (spid == 0) {
+            usersDTO.setSp_id(null);
+        }
+
+        PageInfo<ShyUsers> usersPage = usersService.getPage(usersDTO);
         List<ShyUsers> list = usersPage.getList();
         JSONObject notice = CommonConst.NOTICE;
         if (!list.isEmpty()) {
@@ -114,7 +114,7 @@ public class UsersController extends BaseController {
     /**
      * 获取通知是否显示
-     * @param showType
+     * @param
      * @param session
      * @return
      */
@@ -41,8 +41,6 @@ public class UsersFreeController extends BaseController {
     @GetMapping(value = "/page")
     public String wangjiajiaPage(Model model, UsersFreeDTO usersFreeDTO, HttpSession session) {
-		//Integer page, Integer pageSize, String orderByClause,
-		//		String userId, String mobile
     	SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
     	if(CommonUtils.isNull(sessionUser)){
     		return "redirect:/users/login";
@@ -51,10 +49,10 @@ public class UsersFreeController extends BaseController {
     	if (!sessionUser.isMaster() && spid != 0) {
     		return "page/error.html";
     	}
-    	if (spid == 0) spid = null;
-    	//if (CommonUtils.isNull(page)) page = 1;
-    	//if (CommonUtils.isNull(pageSize)) pageSize = 10;
-    	PageInfo<ShyUsersfree> usersPage = usersfreeService.getpage(usersFreeDTO.getPage(), usersFreeDTO.getPageSize(), usersFreeDTO.getOrderByClause(), usersFreeDTO.getUserId(),usersFreeDTO.getMobile());
+    	if (spid == 0) {
+			spid = null;
+		}
+    	PageInfo<ShyUsersfree> usersPage = usersfreeService.getpage(usersFreeDTO);
     	List<ShyUsersfree> list = usersPage.getList();
     	JSONObject category = CommonConst.CATEGORY;
     	if (!list.isEmpty()) {
@@ -115,47 +115,36 @@ public class VideosController extends BaseController {
     /**
      * 内容分页列表接口
      *
-     * @param video_title
-     * @param start_date
-     * @param end_date
-     * @param state
-     * @param page
-     * @param pageSize
-     * @param orderByClause
+     * @param videosDTO
      * @return
      */
     @GetMapping("/page")
     public Object getListVideos(Model model, VideosDTO videosDTO, HttpSession session) {
-        //String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize,
-        //        String video_priority, String orderByClause, String sp_desc, String sp_Id, String source, String video_user_id,
-        //        String shen_auditor_id, Integer contentId, String video_id
         if (!StringUtils.isEmpty(videosDTO.getShen_auditor_id())) {
             if ((!"自动审核".equals(videosDTO.getShen_auditor_id())) && (!"白名单".equals(videosDTO.getShen_auditor_id()))) {
                 videosDTO.setShen_auditor_id(usersService.findspidByName(videosDTO.getShen_auditor_id()));
             }
         }
-
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if (CommonUtils.isNull(sessionUser)) {
             return "redirect:/users/login";
         }
-
-        Integer sessionUserSpid = sessionUser.getSpid();
-        logger.info("sp_Id:{},sessionUserSpid:{}", videosDTO.getSp_Id(), sessionUserSpid);
+        Integer spid = sessionUser.getSpid();
+        videosDTO.setSpid(spid);
+        logger.info("sp_Id:{},spid:{}", videosDTO.getSp_Id(), videosDTO.getSpid());
         String userId = sessionUser.getUserId();
-        //if (CommonUtils.isNull(page)) page = 1;
-        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
-        if (CommonUtils.isNotEmpty(videosDTO.getSp_desc()) && sessionUserSpid == 0) {
+        videosDTO.setUserId(userId);
+        if (CommonUtils.isNotEmpty(videosDTO.getSp_desc()) && videosDTO.getSpid() == 0) {
             ShySites shySite = sitesService.findspidBySpdesc(videosDTO.getSp_desc());
             if (CommonUtils.isNotNull(shySite)) {
-                sessionUserSpid = shySite.getSpid();
+                videosDTO.setSpid(shySite.getSpid());
             } else {
                 setmodelSite(model);
                 return "error.html";
             }
-        } else if (CommonUtils.isEmpty(videosDTO.getSp_desc()) && sessionUserSpid == 0) {
-            sessionUserSpid = null;
+        } else if (CommonUtils.isEmpty(videosDTO.getSp_desc()) && videosDTO.getSpid() == 0) {
+            videosDTO.setSpid(null);
         }
         if (CommonUtils.isNotNull(videosDTO.getContentId())) {
@@ -167,15 +156,12 @@ public class VideosController extends BaseController {
             if (data != null) {
                 String pid = data.getString("pid");
                 videosDTO.setVideo_id(pid);
-                //video_id = pid;
             } else {
                 videosDTO.setVideo_id(String.valueOf(videosDTO.getContentId()));
-                //video_id = contentId.toString();
             }
         }
-        PageInfo<ShyVideos> videoPage = videosService.getListContent(videosDTO.getVideo_title(), videosDTO.getStart_date(), videosDTO.getEnd_date(), videosDTO.getState(), videosDTO.getReceive(), videosDTO.getPage(),
-                videosDTO.getPageSize(), videosDTO.getVideo_priority(), videosDTO.getOrderByClause(), sessionUserSpid, userId, videosDTO.getSp_Id(), videosDTO.getSource(), videosDTO.getVideo_user_id(), videosDTO.getShen_auditor_id(), videosDTO.getVideo_id());
+        PageInfo<ShyVideos> videoPage = videosService.getListContent(videosDTO);
         //查询查询条件
         List<ShyActivity> activityList = shyActivityImpl.selectAll();
         List<ShyVideos> list = videoPage.getList();
@@ -339,37 +325,31 @@ public class VideosController extends BaseController {
     /**
      * 根据条件导出excel
      *
-     * @param video_title
-     * @param start_date
-     * @param end_date
-     * @param state
-     * @param receive
-     * @param video_priority
-     * @param orderByClause
+     * @param videosDTO
      * @param session
      * @param response
      */
     @GetMapping("excel")
     public void getExcel(VideosDTO videosDTO, HttpSession session, HttpServletResponse response) {
-        //String video_title, String start_date, String end_date, Integer state, Integer
-        //receive, String video_priority, Integer source, String video_user_id, String orderByClause, Integer
-        //sp_Id, String sp_desc,
         if (CommonUtils.isNotEmpty(videosDTO.getSp_desc())) {
             ShySites shySite = sitesService.findspidBySpdesc(videosDTO.getSp_desc());
             if (CommonUtils.isNotNull(shySite)) {
                 videosDTO.setSp_Id(String.valueOf(shySite.getSpid()));
-                //sp_Id = shySite.getSpid();
             }
         }
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         Integer spid = sessionUser.getSpid();
         String userId = sessionUser.getUserId();
-        if (spid == 0) spid = null;
+        videosDTO.setSpid(spid);
+        videosDTO.setUserId(userId);
+        if (spid == 0) {
+            videosDTO.setSpid(null);
+        }
         if (videosDTO.getSp_Id() != null) {
-            spid = Integer.valueOf(videosDTO.getSp_Id());
+            videosDTO.setSpid(Integer.valueOf(videosDTO.getSp_Id()));
         }
-        List<ShyVideos> shyVideosList = videosService.findByCondition(videosDTO.getVideo_title(), videosDTO.getStart_date(), videosDTO.getEnd_date(), videosDTO.getState(), videosDTO.getReceive(), videosDTO.getVideo_priority(), videosDTO.getOrderByClause(), spid, userId, videosDTO.getSource(), videosDTO.getVideo_user_id());
+        List<ShyVideos> shyVideosList = videosService.findByCondition(videosDTO);
         String fileName = "点播数据";
         String updater = "";//审核员名字
         String state1 = "";//审核状态 1已审核 2审核拒绝 0未审核
@@ -504,19 +484,23 @@ public class VideosController extends BaseController {
         } catch (final Exception e) {
             e.printStackTrace();
             try {
-                if (bis != null)
+                if (bis != null) {
                     bis.close();
-                if (bos != null)
+                }
+                if (bos != null) {
                     bos.close();
+                }
             } catch (Exception e1) {
                 e1.printStackTrace();
             }
         } finally {
             try {
-                if (bis != null)
+                if (bis != null) {
                     bis.close();
-                if (bos != null)
+                }
+                if (bos != null) {
                     bos.close();
+                }
             } catch (Exception e2) {
                 e2.printStackTrace();
             }
@@ -10,8 +10,8 @@ import java.io.Serializable;
 public class AudioDTO implements Serializable {
     private String video_title;
-    private String start_date;
-    private String end_date;
+    private String sDate ;
+    private String eDate ;
     private Integer state;
     private Integer receive;
     private Integer page = 1;
@@ -20,24 +20,16 @@ public class AudioDTO implements Serializable {
     private String orderByClause;
     private String sp_desc;
     private String sp_Id;
+    private Integer spid;
+    private String userId;
     public AudioDTO() {
     }
-    public AudioDTO(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String orderByClause) {
+    public AudioDTO(String video_title, String sDate, String eDate, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id, Integer spid, String userId) {
         this.video_title = video_title;
-        this.start_date = start_date;
-        this.end_date = end_date;
-        this.state = state;
-        this.receive = receive;
-        this.video_priority = video_priority;
-        this.orderByClause = orderByClause;
-    }
-
-    public AudioDTO(String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id) {
-        this.video_title = video_title;
-        this.start_date = start_date;
-        this.end_date = end_date;
+        this.sDate = sDate;
+        this.eDate = eDate;
         this.state = state;
         this.receive = receive;
         this.page = page;
@@ -46,9 +38,10 @@ public class AudioDTO implements Serializable {
         this.orderByClause = orderByClause;
         this.sp_desc = sp_desc;
         this.sp_Id = sp_Id;
+        this.spid = spid;
+        this.userId = userId;
     }
-
     public String getVideo_title() {
         return video_title;
     }
@@ -57,20 +50,20 @@ public class AudioDTO implements Serializable {
         this.video_title = video_title;
     }
-    public String getStart_date() {
-        return start_date;
+    public String getsDate() {
+        return sDate;
     }
-    public void setStart_date(String start_date) {
-        this.start_date = start_date;
+    public void setsDate(String sDate) {
+        this.sDate = sDate;
     }
-    public String getEnd_date() {
-        return end_date;
+    public String geteDate() {
+        return eDate;
     }
-    public void setEnd_date(String end_date) {
-        this.end_date = end_date;
+    public void seteDate(String eDate) {
+        this.eDate = eDate;
     }
     public Integer getState() {
@@ -136,6 +129,22 @@ public class AudioDTO implements Serializable {
     public void setSp_Id(String sp_Id) {
         this.sp_Id = sp_Id;
     }
+
+    public Integer getSpid() {
+        return spid;
+    }
+
+    public void setSpid(Integer spid) {
+        this.spid = spid;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }
 package com.cnlive.shenhe.dto;
 import java.io.Serializable;
+import java.util.Date;
 /**
  * @author Administrator
@@ -12,28 +13,34 @@ public class ChannelDTO implements Serializable {
     private String channel_id;
     private String channel_name;
     private Integer receive;
-    private String start_date;
-    private String end_date;
     private Integer shenhe_status;
     private String sp_desc;
     private Integer page = 1;
     private Integer pageSize = 10;
     private String orderByClause;
+    private Integer spid;
+    private String userId;
+    private String updater;
+    private String sDate ;
+    private String eDate ;
     public ChannelDTO() {
     }
-    public ChannelDTO(String channel_id, String channel_name, Integer receive, String start_date, String end_date, Integer shenhe_status, String sp_desc, Integer page, Integer pageSize, String orderByClause) {
+    public ChannelDTO(String channel_id, String channel_name, Integer receive, Integer shenhe_status, String sp_desc, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId, String updater, String sDate, String eDate) {
         this.channel_id = channel_id;
         this.channel_name = channel_name;
         this.receive = receive;
-        this.start_date = start_date;
-        this.end_date = end_date;
         this.shenhe_status = shenhe_status;
         this.sp_desc = sp_desc;
         this.page = page;
         this.pageSize = pageSize;
         this.orderByClause = orderByClause;
+        this.spid = spid;
+        this.userId = userId;
+        this.updater = updater;
+        this.sDate = sDate;
+        this.eDate = eDate;
     }
     public String getChannel_id() {
@@ -60,22 +67,6 @@ public class ChannelDTO implements Serializable {
         this.receive = receive;
     }
-    public String getStart_date() {
-        return start_date;
-    }
-
-    public void setStart_date(String start_date) {
-        this.start_date = start_date;
-    }
-
-    public String getEnd_date() {
-        return end_date;
-    }
-
-    public void setEnd_date(String end_date) {
-        this.end_date = end_date;
-    }
-
     public Integer getShenhe_status() {
         return shenhe_status;
     }
@@ -115,4 +106,44 @@ public class ChannelDTO implements Serializable {
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
     }
+
+    public Integer getSpid() {
+        return spid;
+    }
+
+    public void setSpid(Integer spid) {
+        this.spid = spid;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getsDate() {
+        return sDate;
+    }
+
+    public void setsDate(String sDate) {
+        this.sDate = sDate;
+    }
+
+    public String geteDate() {
+        return eDate;
+    }
+
+    public void seteDate(String eDate) {
+        this.eDate = eDate;
+    }
+
+    public String getUpdater() {
+        return updater;
+    }
+
+    public void setUpdater(String updater) {
+        this.updater = updater;
+    }
 }
@@ -12,8 +12,6 @@ public class CommentsDTO implements Serializable {
     private String activity_id;
     private String content;
     private Integer is_hot;
-    private String start_date;
-    private String end_date;
     private Integer state;
     private Integer receive;
     private Integer page = 1;
@@ -21,16 +19,19 @@ public class CommentsDTO implements Serializable {
     private String orderByClause;
     private Integer type;
     private Integer comment_user_id;
+    private String sDate ;
+    private String eDate ;
+    private Integer spid;
+    private String userId;
+    private String updater;
     public CommentsDTO() {
     }
-    public CommentsDTO(String activity_id, String content, Integer is_hot, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String orderByClause, Integer type, Integer comment_user_id) {
+    public CommentsDTO(String activity_id, String content, Integer is_hot, Integer state, Integer receive, Integer page, Integer pageSize, String orderByClause, Integer type, Integer comment_user_id, String sDate, String eDate, Integer spid, String userId, String updater) {
         this.activity_id = activity_id;
         this.content = content;
         this.is_hot = is_hot;
-        this.start_date = start_date;
-        this.end_date = end_date;
         this.state = state;
         this.receive = receive;
         this.page = page;
@@ -38,6 +39,11 @@ public class CommentsDTO implements Serializable {
         this.orderByClause = orderByClause;
         this.type = type;
         this.comment_user_id = comment_user_id;
+        this.sDate = sDate;
+        this.eDate = eDate;
+        this.spid = spid;
+        this.userId = userId;
+        this.updater = updater;
     }
     public String getActivity_id() {
@@ -64,22 +70,6 @@ public class CommentsDTO implements Serializable {
         this.is_hot = is_hot;
     }
-    public String getStart_date() {
-        return start_date;
-    }
-
-    public void setStart_date(String start_date) {
-        this.start_date = start_date;
-    }
-
-    public String getEnd_date() {
-        return end_date;
-    }
-
-    public void setEnd_date(String end_date) {
-        this.end_date = end_date;
-    }
-
     public Integer getState() {
         return state;
     }
@@ -135,4 +125,44 @@ public class CommentsDTO implements Serializable {
     public void setComment_user_id(Integer comment_user_id) {
         this.comment_user_id = comment_user_id;
     }
+
+    public String getsDate() {
+        return sDate;
+    }
+
+    public void setsDate(String sDate) {
+        this.sDate = sDate;
+    }
+
+    public String geteDate() {
+        return eDate;
+    }
+
+    public void seteDate(String eDate) {
+        this.eDate = eDate;
+    }
+
+    public Integer getSpid() {
+        return spid;
+    }
+
+    public void setSpid(Integer spid) {
+        this.spid = spid;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUpdater() {
+        return updater;
+    }
+
+    public void setUpdater(String updater) {
+        this.updater = updater;
+    }
 }
 package com.cnlive.shenhe.dto;
 import java.io.Serializable;
+import java.util.Date;
 /**
  * @author Administrator
@@ -12,8 +13,6 @@ public class ContentDTO implements Serializable {
     private String title;
     private String contentId;
     private String content_tag;
-    private String start_date;
-    private String end_date;
     private Integer receive_status;
     private String sp_desc;
     private String source;
@@ -21,25 +20,15 @@ public class ContentDTO implements Serializable {
     private Integer page = 1;
     private Integer pageSize = 10;
     private String orderByClause;
+    private String sDate;
+    private String eDate;
+    private Integer spid;
+    private String userId;
+    private String updater;
     public ContentDTO() {
     }
-    public ContentDTO(String title, String contentId, String content_tag, String start_date, String end_date, Integer receive_status, String sp_desc, String source, String author, Integer page, Integer pageSize, String orderByClause) {
-        this.title = title;
-        this.contentId = contentId;
-        this.content_tag = content_tag;
-        this.start_date = start_date;
-        this.end_date = end_date;
-        this.receive_status = receive_status;
-        this.sp_desc = sp_desc;
-        this.source = source;
-        this.author = author;
-        this.page = page;
-        this.pageSize = pageSize;
-        this.orderByClause = orderByClause;
-    }
-
     public String getTitle() {
         return title;
     }
@@ -64,22 +53,6 @@ public class ContentDTO implements Serializable {
         this.content_tag = content_tag;
     }
-    public String getStart_date() {
-        return start_date;
-    }
-
-    public void setStart_date(String start_date) {
-        this.start_date = start_date;
-    }
-
-    public String getEnd_date() {
-        return end_date;
-    }
-
-    public void setEnd_date(String end_date) {
-        this.end_date = end_date;
-    }
-
     public Integer getReceive_status() {
         return receive_status;
     }
@@ -135,4 +108,63 @@ public class ContentDTO implements Serializable {
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
     }
+
+
+    public Integer getSpid() {
+        return spid;
+    }
+
+    public void setSpid(Integer spid) {
+        this.spid = spid;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getsDate() {
+        return sDate;
+    }
+
+    public void setsDate(String sDate) {
+        this.sDate = sDate;
+    }
+
+    public String geteDate() {
+        return eDate;
+    }
+
+    public void seteDate(String eDate) {
+        this.eDate = eDate;
+    }
+
+    public String getUpdater() {
+        return updater;
+    }
+
+    public void setUpdater(String updater) {
+        this.updater = updater;
+    }
+
+    public ContentDTO(String title, String contentId, String content_tag, Integer receive_status, String sp_desc, String source, String author, Integer page, Integer pageSize, String orderByClause, String sDate, String eDate, Integer spid, String userId, String updater) {
+        this.title = title;
+        this.contentId = contentId;
+        this.content_tag = content_tag;
+        this.receive_status = receive_status;
+        this.sp_desc = sp_desc;
+        this.source = source;
+        this.author = author;
+        this.page = page;
+        this.pageSize = pageSize;
+        this.orderByClause = orderByClause;
+        this.sDate = sDate;
+        this.eDate = eDate;
+        this.spid = spid;
+        this.userId = userId;
+        this.updater = updater;
+    }
 }
@@ -8,8 +8,8 @@ import java.io.Serializable;
  * @create 2022-03-17 15:22
  */
 public class LiveApplyDTO implements Serializable {
-    private String start_date;
-    private String end_date;
+
+
     private String theme;
     private String business_model;
     private Integer page = 1;
@@ -18,13 +18,17 @@ public class LiveApplyDTO implements Serializable {
     private Integer receive;
     private String sp_desc;
     private String orderByClause;
+    private Integer spid;
+    private String userId;
+    private String sDate;
+    private String eDate;
     public LiveApplyDTO() {
     }
-    public LiveApplyDTO(String start_date, String end_date, String theme, String business_model, Integer page, Integer pageSize, Integer shenhe_state, Integer receive, String sp_desc, String orderByClause) {
-        this.start_date = start_date;
-        this.end_date = end_date;
+    public LiveApplyDTO(String sDate, String eDate, String theme, String business_model, Integer page, Integer pageSize, Integer shenhe_state, Integer receive, String sp_desc, String orderByClause, Integer spid, String userId) {
+        this.sDate = sDate;
+        this.eDate = eDate;
         this.theme = theme;
         this.business_model = business_model;
         this.page = page;
@@ -33,22 +37,40 @@ public class LiveApplyDTO implements Serializable {
         this.receive = receive;
         this.sp_desc = sp_desc;
         this.orderByClause = orderByClause;
+        this.spid = spid;
+        this.userId = userId;
+    }
+
+    public String getsDate() {
+        return sDate;
+    }
+
+    public void setsDate(String sDate) {
+        this.sDate = sDate;
     }
-    public String getStart_date() {
-        return start_date;
+    public String geteDate() {
+        return eDate;
     }
-    public void setStart_date(String start_date) {
-        this.start_date = start_date;
+    public void seteDate(String eDate) {
+        this.eDate = eDate;
     }
-    public String getEnd_date() {
-        return end_date;
+    public Integer getSpid() {
+        return spid;
     }
-    public void setEnd_date(String end_date) {
-        this.end_date = end_date;
+    public void setSpid(Integer spid) {
+        this.spid = spid;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
     }
     public String getTheme() {
@@ -114,4 +136,6 @@ public class LiveApplyDTO implements Serializable {
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
     }
+
+
 }
@@ -10,8 +10,6 @@ import java.io.Serializable;
 public class LiveDTO implements Serializable {
     private String activity_id;
-    private String start_date;
-    private String end_date;
     private String activity_name;
     private Integer activity_status;
     private Integer page = 1;
@@ -21,13 +19,16 @@ public class LiveDTO implements Serializable {
     private Integer contentId;
     private String orderByClause;
+    private Integer spid;
+    private String userId;
+    private String sDate;
+    private String eDate;
+
     public LiveDTO() {
     }
-    public LiveDTO(String activity_id, String start_date, String end_date, String activity_name, Integer activity_status, Integer page, Integer pageSize, Integer shenhe_state, String sp_desc, Integer contentId, String orderByClause) {
+    public LiveDTO(String activity_id, String activity_name, Integer activity_status, Integer page, Integer pageSize, Integer shenhe_state, String sp_desc, Integer contentId, String orderByClause, Integer spid, String userId, String sDate, String eDate) {
         this.activity_id = activity_id;
-        this.start_date = start_date;
-        this.end_date = end_date;
         this.activity_name = activity_name;
         this.activity_status = activity_status;
         this.page = page;
@@ -36,6 +37,10 @@ public class LiveDTO implements Serializable {
         this.sp_desc = sp_desc;
         this.contentId = contentId;
         this.orderByClause = orderByClause;
+        this.spid = spid;
+        this.userId = userId;
+        this.sDate = sDate;
+        this.eDate = eDate;
     }
     public String getActivity_id() {
@@ -46,22 +51,6 @@ public class LiveDTO implements Serializable {
         this.activity_id = activity_id;
     }
-    public String getStart_date() {
-        return start_date;
-    }
-
-    public void setStart_date(String start_date) {
-        this.start_date = start_date;
-    }
-
-    public String getEnd_date() {
-        return end_date;
-    }
-
-    public void setEnd_date(String end_date) {
-        this.end_date = end_date;
-    }
-
     public String getActivity_name() {
         return activity_name;
     }
@@ -125,4 +114,36 @@ public class LiveDTO implements Serializable {
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
     }
+
+    public Integer getSpid() {
+        return spid;
+    }
+
+    public void setSpid(Integer spid) {
+        this.spid = spid;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getsDate() {
+        return sDate;
+    }
+
+    public void setsDate(String sDate) {
+        this.sDate = sDate;
+    }
+
+    public String geteDate() {
+        return eDate;
+    }
+
+    public void seteDate(String eDate) {
+        this.eDate = eDate;
+    }
 }
@@ -15,10 +15,30 @@ public class NotSpeakDTO implements Serializable {
     private Integer page = 1;
     private Integer pageSize = 10;
     private String orderByClause;
+    private String userId;
     public NotSpeakDTO() {
     }
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public NotSpeakDTO(String user_name, Integer user_id, Integer state, Integer page, Integer pageSize, String orderByClause, String userId) {
+
+        this.user_name = user_name;
+        this.user_id = user_id;
+        this.state = state;
+        this.page = page;
+        this.pageSize = pageSize;
+        this.orderByClause = orderByClause;
+        this.userId = userId;
+    }
+
     public NotSpeakDTO(String user_name, Integer user_id, Integer state, Integer page, Integer pageSize, String orderByClause) {
         this.user_name = user_name;
         this.user_id = user_id;
@@ -12,6 +12,7 @@ public class SitesDTO implements Serializable {
     private Integer pageSize = 10;
     private String orderByClause;
     private String keyword;
+    private Integer spId;
     public SitesDTO() {
     }
@@ -23,6 +24,22 @@ public class SitesDTO implements Serializable {
         this.keyword = keyword;
     }
+    public SitesDTO(Integer page, Integer pageSize, String orderByClause, String keyword, Integer spId) {
+        this.page = page;
+        this.pageSize = pageSize;
+        this.orderByClause = orderByClause;
+        this.keyword = keyword;
+        this.spId = spId;
+    }
+
+    public Integer getSpId() {
+        return spId;
+    }
+
+    public void setSpId(Integer spId) {
+        this.spId = spId;
+    }
+
     public Integer getPage() {
         return page;
     }
@@ -12,30 +12,86 @@ public class TopicDTO implements Serializable {
     private String topic_name;
     private String topic_id;
     private String topic_tag;
-    private String start_date;
-    private String end_date;
     private Integer shenhe_status;
     private String sp_desc;
     private Integer page = 1;
     private Integer pageSize = 10;
     private Integer receive;
     private String orderByClause;
+    private String sDate;
+    private String eDate;
+    private Integer spid;
+    private String userId;
+    private String updater;
+    private String title;
     public TopicDTO() {
     }
-    public TopicDTO(String topic_name, String topic_id, String topic_tag, String start_date, String end_date, Integer shenhe_status, String sp_desc, Integer page, Integer pageSize, Integer receive, String orderByClause) {
+    public TopicDTO(String topic_name, String topic_id, String topic_tag, Integer shenhe_status, String sp_desc, Integer page, Integer pageSize, Integer receive, String orderByClause, String sDate, String eDate, Integer spid, String userId, String updater, String title) {
         this.topic_name = topic_name;
         this.topic_id = topic_id;
         this.topic_tag = topic_tag;
-        this.start_date = start_date;
-        this.end_date = end_date;
         this.shenhe_status = shenhe_status;
         this.sp_desc = sp_desc;
         this.page = page;
         this.pageSize = pageSize;
         this.receive = receive;
         this.orderByClause = orderByClause;
+        this.sDate = sDate;
+        this.eDate = eDate;
+        this.spid = spid;
+        this.userId = userId;
+        this.updater = updater;
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getsDate() {
+        return sDate;
+    }
+
+    public void setsDate(String sDate) {
+        this.sDate = sDate;
+    }
+
+    public String geteDate() {
+        return eDate;
+    }
+
+    public void seteDate(String eDate) {
+        this.eDate = eDate;
+    }
+
+    public Integer getSpid() {
+        return spid;
+    }
+
+    public void setSpid(Integer spid) {
+        this.spid = spid;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUpdater() {
+        return updater;
+    }
+
+    public void setUpdater(String updater) {
+        this.updater = updater;
     }
     public String getTopic_name() {
@@ -62,22 +118,6 @@ public class TopicDTO implements Serializable {
         this.topic_tag = topic_tag;
     }
-    public String getStart_date() {
-        return start_date;
-    }
-
-    public void setStart_date(String start_date) {
-        this.start_date = start_date;
-    }
-
-    public String getEnd_date() {
-        return end_date;
-    }
-
-    public void setEnd_date(String end_date) {
-        this.end_date = end_date;
-    }
-
     public Integer getShenhe_status() {
         return shenhe_status;
     }
@@ -10,8 +10,6 @@ import java.io.Serializable;
 public class VideosDTO implements Serializable {
     private String video_title;
-    private String start_date;
-    private String end_date;
     private Integer state;
     private Integer receive;
     private Integer page = 1;
@@ -25,14 +23,16 @@ public class VideosDTO implements Serializable {
     private String shen_auditor_id;
     private Integer contentId;
     private String video_id;
+    private String sDate;
+    private String eDate;
+    private Integer spid;
+    private String userId;
     public VideosDTO() {
     }
-    public VideosDTO(String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id, String source, String video_user_id, String shen_auditor_id, Integer contentId, String video_id) {
+    public VideosDTO(String video_title, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id, String source, String video_user_id, String shen_auditor_id, Integer contentId, String video_id, String sDate, String eDate, Integer spid, String userId) {
         this.video_title = video_title;
-        this.start_date = start_date;
-        this.end_date = end_date;
         this.state = state;
         this.receive = receive;
         this.page = page;
@@ -46,6 +46,10 @@ public class VideosDTO implements Serializable {
         this.shen_auditor_id = shen_auditor_id;
         this.contentId = contentId;
         this.video_id = video_id;
+        this.sDate = sDate;
+        this.eDate = eDate;
+        this.spid = spid;
+        this.userId = userId;
     }
     public String getVideo_title() {
@@ -56,20 +60,20 @@ public class VideosDTO implements Serializable {
         this.video_title = video_title;
     }
-    public String getStart_date() {
-        return start_date;
+    public String getsDate() {
+        return sDate;
     }
-    public void setStart_date(String start_date) {
-        this.start_date = start_date;
+    public void setsDate(String sDate) {
+        this.sDate = sDate;
     }
-    public String getEnd_date() {
-        return end_date;
+    public String geteDate() {
+        return eDate;
     }
-    public void setEnd_date(String end_date) {
-        this.end_date = end_date;
+    public void seteDate(String eDate) {
+        this.eDate = eDate;
     }
     public Integer getState() {
@@ -175,4 +179,20 @@ public class VideosDTO implements Serializable {
     public void setVideo_id(String video_id) {
         this.video_id = video_id;
     }
+
+    public Integer getSpid() {
+        return spid;
+    }
+
+    public void setSpid(Integer spid) {
+        this.spid = spid;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }
@@ -3,6 +3,7 @@ package com.cnlive.shenhe.serviceImpl;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
+import com.cnlive.shenhe.dto.AudioDTO;
 import com.cnlive.shenhe.entity.*;
 import com.cnlive.shenhe.mapper.ShyAudioMapper;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
@@ -104,7 +105,7 @@ public class AudioServiceImpl {
             String[] cids = ids.split(",");
             for (String cid : cids) {
                 ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(Integer.parseInt(cid));
-                if (CommonUtils.isNotNull(shyAudio) && shyAudio.getState() == CommonConst.AUDIT_INTT && shyAudio.getReceive() == CommonConst.RECEIVE_BEFORE) {
+                if (CommonUtils.isNotNull(shyAudio) && shyAudio.getState().equals(CommonConst.AUDIT_INTT) && shyAudio.getReceive().equals(CommonConst.RECEIVE_BEFORE)) {
                     shyAudio.setReceive_user_id(userId);
                     shyAudio.setReceive(CommonConst.RECEIVE_AFTER);
                     shyAudioMapper.updateByPrimaryKeySelective(shyAudio);
@@ -116,7 +117,9 @@ public class AudioServiceImpl {
             example.setOrderByClause("createTime desc");
             example.and().andEqualTo("state", CommonConst.AUDIT_INTT);
             example.and().andEqualTo("receive", CommonConst.RECEIVE_BEFORE);
-            if (CommonUtils.isNotNull(spid) && spid != 0) example.and().andEqualTo("spid", spid);
+            if (CommonUtils.isNotNull(spid) && spid != 0) {
+                example.and().andEqualTo("spid", spid);
+            }
             List<ShyAudio> shyCommentsList = shyAudioMapper.selectByExampleAndRowBounds(example, new RowBounds(0, num));
             if (!shyCommentsList.isEmpty()) {
                 for (ShyAudio shyComments : shyCommentsList) {
@@ -135,7 +138,7 @@ public class AudioServiceImpl {
         String[] cids = ids.split(",");
         for (String cid : cids) {
             ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(Integer.parseInt(cid));
-            if (shyAudio.getState() == CommonConst.AUDIT_INTT && shyAudio.getReceive() == CommonConst.RECEIVE_AFTER && shyAudio.getReceive_user_id().equals(userId)) {
+            if (shyAudio.getState().equals(CommonConst.AUDIT_INTT) && shyAudio.getReceive().equals(CommonConst.RECEIVE_AFTER) && shyAudio.getReceive_user_id().equals(userId)) {
                 shyAudio.setReceive(CommonConst.RECEIVE_BEFORE);
                 shyAudio.setReceive_user_id(null);
                 int i = shyAudioMapper.updateByPrimaryKey(shyAudio);
@@ -201,51 +204,51 @@ public class AudioServiceImpl {
     }
     //分页查询音频数据
-    public PageInfo<ShyAudio> getListContent(String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, Integer spid, String userId, String sp_Id) {
+    public PageInfo<ShyAudio> getListContent(AudioDTO audioDTO) {
         Example example = new Example(ShyAudio.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(audioDTO.getOrderByClause())) {
+            example.setOrderByClause(audioDTO.getOrderByClause());
         }
-        if (CommonUtils.isNotEmpty(start_date) && CommonUtils.isNotEmpty(end_date)) {
-            criteria.andGreaterThanOrEqualTo("createTime", start_date);
-            criteria2.andGreaterThanOrEqualTo("createTime", start_date);
-            criteria.andLessThanOrEqualTo("createTime", end_date);
-            criteria2.andLessThanOrEqualTo("createTime", end_date);
+        if (CommonUtils.isNotEmpty(audioDTO.getsDate()) && CommonUtils.isNotEmpty(audioDTO.geteDate())) {
+            criteria.andGreaterThanOrEqualTo("createTime", audioDTO.getsDate());
+            criteria2.andGreaterThanOrEqualTo("createTime", audioDTO.getsDate());
+            criteria.andLessThanOrEqualTo("createTime", audioDTO.geteDate());
+            criteria2.andLessThanOrEqualTo("createTime", audioDTO.geteDate());
         }
-        if (CommonUtils.isNotEmpty(video_title)) {
-            criteria.andLike("audioTitle", "%" + video_title + "%");
-            criteria2.andLike("audioTitle", "%" + video_title + "%");
+        if (CommonUtils.isNotEmpty(audioDTO.getVideo_title())) {
+            criteria.andLike("audioTitle", "%" + audioDTO.getVideo_title() + "%");
+            criteria2.andLike("audioTitle", "%" + audioDTO.getVideo_title() + "%");
         }
-        if (CommonUtils.isNotEmpty(video_priority)) {
-            criteria.andEqualTo("priority", video_priority);
-            criteria2.andEqualTo("priority", video_priority);
+        if (CommonUtils.isNotEmpty(audioDTO.getVideo_priority())) {
+            criteria.andEqualTo("priority", audioDTO.getVideo_priority());
+            criteria2.andEqualTo("priority", audioDTO.getVideo_priority());
         }
-        if (CommonUtils.isNotNull(spid)) {
-            criteria.andEqualTo("spId", spid);
-            criteria2.andEqualTo("spId", spid);
-        } else if (CommonUtils.isNotEmpty(sp_Id)) {
-            criteria.andEqualTo("spId", sp_Id);
-            criteria2.andEqualTo("spId", sp_Id);
+        if (CommonUtils.isNotNull(audioDTO.getSpid())) {
+            criteria.andEqualTo("spId", audioDTO.getSpid());
+            criteria2.andEqualTo("spId", audioDTO.getSpid());
+        } else if (CommonUtils.isNotEmpty(audioDTO.getSp_Id())) {
+            criteria.andEqualTo("spId", audioDTO.getSp_Id());
+            criteria2.andEqualTo("spId", audioDTO.getSp_Id());
         }
         //领取状态 0-未领取 1-已领取
-        if (CommonUtils.isNotNull(receive)) {
-            criteria.andEqualTo("receive", receive);
-            criteria2.andEqualTo("receive", receive);
-            if (receive == CommonConst.RECEIVE_AFTER) {
-                criteria.andEqualTo("receive_user_id", userId);
-                criteria2.andEqualTo("receive_user_id", userId);
+        if (CommonUtils.isNotNull(audioDTO.getReceive())) {
+            criteria.andEqualTo("receive", audioDTO.getReceive());
+            criteria2.andEqualTo("receive", audioDTO.getReceive());
+            if (audioDTO.getReceive().equals(CommonConst.RECEIVE_AFTER)) {
+                criteria.andEqualTo("receive_user_id", audioDTO.getUserId());
+                criteria2.andEqualTo("receive_user_id", audioDTO.getUserId());
             }
         }
         //审核状态 0-未审核 1-已审核 2-拒绝
-        if (CommonUtils.isNotNull(state) && state != 3) {
-            criteria.andEqualTo("state", state);
-        } else if (CommonUtils.isNotNull(state) && state == 3) {
+        if (CommonUtils.isNotNull(audioDTO.getState()) && audioDTO.getState() != 3) {
+            criteria.andEqualTo("state", audioDTO.getState());
+        } else if (CommonUtils.isNotNull(audioDTO.getState()) && audioDTO.getState() == 3) {
             criteria.andEqualTo("state", 1);
             criteria2.andEqualTo("state", 2);
             example.or(criteria2);
@@ -253,7 +256,7 @@ public class AudioServiceImpl {
         //默认按上传时间倒序排序
         example.setOrderByClause("createTime desc");
-        PageHelper.startPage(page, pageSize, true);
+        PageHelper.startPage(audioDTO.getPage(), audioDTO.getPageSize(), true);
         List<ShyAudio> shyAudioList = shyAudioMapper.selectByExample(example);
         PageInfo<ShyAudio> pageInfo = new PageInfo<>(shyAudioList);
         return pageInfo;
@@ -262,7 +265,7 @@ public class AudioServiceImpl {
     public ShyAudio getDetailsContent(Integer id) {
         ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(id);
-        if (shyAudio.getState() != CommonConst.AUDIT_INTT) {
+        if (!shyAudio.getState().equals(CommonConst.AUDIT_INTT)) {
             String updater = CommonUtils.isEmpty(shyAudio.getUploader()) || "null".equals(shyAudio.getUploader()) ? "白名单" : shyAudio.getUploader();
             String auditor_id = shyAudio.getAuditor_id();
             if (CommonUtils.isNotEmpty(auditor_id)) {
@@ -281,48 +284,40 @@ public class AudioServiceImpl {
     /**
      * 根据条件导出数据excel
      *
-     * @param video_title
-     * @param start_date
-     * @param end_date
-     * @param state
-     * @param receive
-     * @param video_priority
-     * @param orderByClause
-     * @param spid
-     * @param userId
+     * @param audioDTO
      * @return
      */
-    public List<ShyAudio> findByCondition(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String orderByClause, Integer spid, String userId) {
+    public List<ShyAudio> findByCondition(AudioDTO audioDTO) {
         Example example = new Example(ShyAudio.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(audioDTO.getOrderByClause())) {
+            example.setOrderByClause(audioDTO.getOrderByClause());
         }
-        if (CommonUtils.isNotEmpty(start_date) && CommonUtils.isNotEmpty(end_date)) {
-            criteria.andGreaterThanOrEqualTo("createTime", start_date);
-            criteria.andLessThanOrEqualTo("createTime", end_date);
+        if (CommonUtils.isNotEmpty(audioDTO.getsDate()) && CommonUtils.isNotEmpty(audioDTO.geteDate())) {
+            criteria.andGreaterThanOrEqualTo("createTime", audioDTO.getsDate());
+            criteria.andLessThanOrEqualTo("createTime", audioDTO.geteDate());
         }
-        if (CommonUtils.isNotEmpty(video_title)) {
-            criteria.andLike("audioTitle", "%" + video_title + "%");
+        if (CommonUtils.isNotEmpty(audioDTO.getVideo_title())) {
+            criteria.andLike("audioTitle", "%" + audioDTO.getVideo_title() + "%");
         }
-        if (CommonUtils.isNotNull(state) && state == 0) {
-            criteria.andEqualTo("state", state);
-        } else if (CommonUtils.isNotNull(state) && state == 1) {
-            criteria.andEqualTo("state", state);
+        if (CommonUtils.isNotNull(audioDTO.getState()) && audioDTO.getState() == 0) {
+            criteria.andEqualTo("state", audioDTO.getState());
+        } else if (CommonUtils.isNotNull(audioDTO.getState()) && audioDTO.getState() == 1) {
+            criteria.andEqualTo("state", audioDTO.getState());
             criteria2.andEqualTo("state", 2);
             example.or(criteria2);
         }
-        if (CommonUtils.isNotEmpty(video_priority)) {
-            criteria.andEqualTo("priority", video_priority);
+        if (CommonUtils.isNotEmpty(audioDTO.getVideo_priority())) {
+            criteria.andEqualTo("priority", audioDTO.getVideo_priority());
         }
-        if (CommonUtils.isNotNull(spid)) {
-            criteria.andEqualTo("spId", spid);
+        if (CommonUtils.isNotNull(audioDTO.getSpid())) {
+            criteria.andEqualTo("spId", audioDTO.getSpid());
         }
-        if (CommonUtils.isNotNull(receive)) {
-            criteria.andEqualTo("receive", receive);
-            if (receive == CommonConst.RECEIVE_AFTER) {
-                criteria.andEqualTo("receive_user_id", userId);
+        if (CommonUtils.isNotNull(audioDTO.getReceive())) {
+            criteria.andEqualTo("receive", audioDTO.getReceive());
+            if (audioDTO.getReceive().equals(CommonConst.RECEIVE_AFTER)) {
+                criteria.andEqualTo("receive_user_id", audioDTO.getUserId());
             }
         }
         //默认按上传时间倒序排序
 package com.cnlive.shenhe.serviceImpl;
 import com.alibaba.fastjson.JSONObject;
+import com.cnlive.shenhe.dto.ChannelDTO;
 import com.cnlive.shenhe.entity.ShyChannel;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.mapper.ShyChannelMapper;
@@ -61,50 +62,50 @@ public class ChannelServiceImpl {
         return true;
     }
-    public PageInfo<ShyChannel> getPage(String channelId, String channelName, Integer receive, Date start_date, Date end_date, Integer shenhe_status, String updater, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId) {
+    public PageInfo<ShyChannel> getPage(ChannelDTO channelDTO) {
         Example example = new Example(ShyChannel.class);
         Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(channelDTO.getOrderByClause())) {
+            example.setOrderByClause(channelDTO.getOrderByClause());
         } else {
             example.setOrderByClause("created_at desc");
         }
-        if (CommonUtils.isNotNull(start_date)) {
-            criteria.andGreaterThanOrEqualTo("created_at", start_date);
+        if (CommonUtils.isNotNull(channelDTO.getsDate())) {
+            criteria.andGreaterThanOrEqualTo("created_at", channelDTO.getsDate());
         }
-        if (CommonUtils.isNotNull(end_date)) {
-            criteria.andLessThanOrEqualTo("created_at", end_date);
+        if (CommonUtils.isNotNull(channelDTO.geteDate())) {
+            criteria.andLessThanOrEqualTo("created_at", channelDTO.geteDate());
         }
-        if (CommonUtils.isNotEmpty(channelName)) {
-            criteria.andLike("channel_name", "%" + channelName + "%");
+        if (CommonUtils.isNotEmpty(channelDTO.getChannel_name())) {
+            criteria.andLike("channel_name", "%" + channelDTO.getChannel_name() + "%");
         }
-        if (CommonUtils.isNotEmpty(updater)) {
-            criteria.andEqualTo("updater", updater);
+        if (CommonUtils.isNotEmpty(channelDTO.getUpdater())) {
+            criteria.andEqualTo("updater", channelDTO.getUpdater());
         }
-        if (CommonUtils.isNotNull(spid)) {
-            criteria.andEqualTo("sp_id", spid);
+        if (CommonUtils.isNotNull(channelDTO.getSpid())) {
+            criteria.andEqualTo("sp_id", channelDTO.getSpid());
         }
-        if (CommonUtils.isNotEmpty(channelId)) {
-            criteria.andLike("channel_id", "%" + channelId + "%");
+        if (CommonUtils.isNotEmpty(channelDTO.getChannel_id())) {
+            criteria.andLike("channel_id", "%" + channelDTO.getChannel_id() + "%");
         }
         //已认领 加上用户id
-        if (CommonUtils.isNotNull(receive) && receive == 1) {
-            criteria.andEqualTo("auditor", userId);
+        if (CommonUtils.isNotNull(channelDTO.getReceive()) && channelDTO.getReceive() == 1) {
+            criteria.andEqualTo("auditor", channelDTO.getUserId());
         }
         //不是   我的已审 进来的，只查一种状态
-        if (CommonUtils.isNotNull(shenhe_status) && shenhe_status != 3) {
-            criteria.andEqualTo("shenhe_status", shenhe_status);
+        if (CommonUtils.isNotNull(channelDTO.getShenhe_status()) && channelDTO.getShenhe_status() != 3) {
+            criteria.andEqualTo("shenhe_status", channelDTO.getShenhe_status());
             //是 我的已审，查通过和拒绝的两种状态
-        } else if (CommonUtils.isNotNull(shenhe_status) && shenhe_status == 3) {
+        } else if (CommonUtils.isNotNull(channelDTO.getShenhe_status()) && channelDTO.getShenhe_status() == 3) {
             Example.Criteria criteria1 = example.createCriteria();
             criteria1.orEqualTo("shenhe_status", 1);
             criteria1.orEqualTo("shenhe_status", 2);
             example.and(criteria1);
         }
-        PageHelper.startPage(page, pageSize, true);
+        PageHelper.startPage(channelDTO.getPage(), channelDTO.getPageSize(), true);
         List<ShyChannel> channelList = shyChannelMapper.selectByExample(example);
         PageInfo<ShyChannel> pageInfo = new PageInfo<>(channelList);
         return pageInfo;
 package com.cnlive.shenhe.serviceImpl;
 import com.alibaba.fastjson.JSONObject;
+import com.cnlive.shenhe.dto.CommentsDTO;
 import com.cnlive.shenhe.entity.ShyComments;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
@@ -78,45 +79,45 @@ public class CommentsServiceImpl {
         return shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
     }
-    public PageInfo<ShyComments> getPage(String activity_id, String content, Integer is_hot, Date start_date, Date end_date, Integer states, Integer receive, String updater, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId, Integer type, Integer comment_user_id) {
+    public PageInfo<ShyComments> getPage(CommentsDTO commentsDTO) {
         Example example = new Example(ShyComments.class);
         Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(commentsDTO.getOrderByClause())) {
+            example.setOrderByClause(commentsDTO.getOrderByClause());
         } else {
             example.setOrderByClause("comment_time desc");
         }
-        if (CommonUtils.isNotNull(start_date) && CommonUtils.isNotNull(end_date)) {
-            criteria.andGreaterThanOrEqualTo("comment_time", start_date);
-            criteria.andLessThanOrEqualTo("comment_time", end_date);
+        if (CommonUtils.isNotNull(commentsDTO.getsDate()) && CommonUtils.isNotNull(commentsDTO.geteDate())) {
+            criteria.andGreaterThanOrEqualTo("comment_time", commentsDTO.getsDate());
+            criteria.andLessThanOrEqualTo("comment_time", commentsDTO.geteDate());
         }
-        if (CommonUtils.isNotEmpty(content)) {
-            criteria.andLike("comment_content", "%" + content + "%");
+        if (CommonUtils.isNotEmpty(commentsDTO.getContent())) {
+            criteria.andLike("comment_content", "%" + commentsDTO.getContent() + "%");
         }
-        if (CommonUtils.isNotEmpty(updater)) {
-            criteria.andEqualTo("updater", updater);
+        if (CommonUtils.isNotEmpty(commentsDTO.getUpdater())) {
+            criteria.andEqualTo("updater", commentsDTO.getUpdater());
         }
-        if (CommonUtils.isNotNull(spid)) {
-            criteria.andEqualTo("spid", spid);
+        if (CommonUtils.isNotNull(commentsDTO.getSpid())) {
+            criteria.andEqualTo("spid", commentsDTO.getSpid());
         }
-        if (CommonUtils.isNotNull(is_hot)) {
-            criteria.andEqualTo("is_hot", is_hot);
+        if (CommonUtils.isNotNull(commentsDTO.getIs_hot())) {
+            criteria.andEqualTo("is_hot", commentsDTO.getIs_hot());
         }
-        if (CommonUtils.isNotNull(comment_user_id)) {
-            criteria.andEqualTo("comment_user_id", comment_user_id);
+        if (CommonUtils.isNotNull(commentsDTO.getComment_user_id())) {
+            criteria.andEqualTo("comment_user_id", commentsDTO.getComment_user_id());
         }
-        if (CommonUtils.isNotNull(type) && type == 0) {
+        if (CommonUtils.isNotNull(commentsDTO.getType()) && commentsDTO.getType() == 0) {
             criteria.andEqualTo("type", CommonConst.CATEGORY_TOPIC);
-        } else if (CommonUtils.isNotNull(type) && type == 1) {
+        } else if (CommonUtils.isNotNull(commentsDTO.getType()) && commentsDTO.getType() == 1) {
             criteria.andEqualTo("type", CommonConst.CATEGORY_ELSE);
         }
-        if (CommonUtils.isNotEmpty(activity_id)) {
-            criteria.andLike("activity_id", "%" + activity_id + "%");
+        if (CommonUtils.isNotEmpty(commentsDTO.getActivity_id())) {
+            criteria.andLike("activity_id", "%" + commentsDTO.getActivity_id() + "%");
         }
-        if (CommonUtils.isNotNull(receive)) {
-            criteria.andEqualTo("receive", receive);
-            if (receive == CommonConst.RECEIVE_AFTER) {
-                criteria.andEqualTo("receive_user_id", userId);
+        if (CommonUtils.isNotNull(commentsDTO.getReceive())) {
+            criteria.andEqualTo("receive", commentsDTO.getReceive());
+            if (commentsDTO.getReceive().equals(CommonConst.RECEIVE_AFTER) ) {
+                criteria.andEqualTo("receive_user_id", commentsDTO.getUserId());
             }
         }
@@ -129,56 +130,56 @@ public class CommentsServiceImpl {
 //            example.and(criteria1);
 //        }
-        if (CommonUtils.isNotNull(states) && states != 3) {
-            criteria.andEqualTo("state", states);
-        } else if (CommonUtils.isNotNull(states) && states == 3) {
+        if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() != 3) {
+            criteria.andEqualTo("state", commentsDTO.getState());
+        } else if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() == 3) {
             Example.Criteria criteria1 = example.createCriteria();
             criteria1.orEqualTo("state", 1);
             criteria1.orEqualTo("state", 2);
             example.and(criteria1);
         }
-        PageHelper.startPage(page, pageSize, true);
+        PageHelper.startPage(commentsDTO.getPage(), commentsDTO.getPageSize(), true);
         List<ShyComments> commentsList = shyCommentsMapper.selectByExample(example);
         PageInfo<ShyComments> pageInfo = new PageInfo<>(commentsList);
         return pageInfo;
     }
-    public PageInfo<ShyComments> getPageExcel(String activity_id, String content, Integer is_hot, Date start_date, Date end_date, Integer states, Integer receive, String updater, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId,Integer type) {
+    public PageInfo<ShyComments> getPageExcel(CommentsDTO commentsDTO) {
     	Example example = new Example(ShyComments.class);
     	Example.Criteria criteria = example.createCriteria();
-    	if (CommonUtils.isNotEmpty(orderByClause)) {
-    		example.setOrderByClause(orderByClause);
+    	if (CommonUtils.isNotEmpty(commentsDTO.getOrderByClause())) {
+    		example.setOrderByClause(commentsDTO.getOrderByClause());
     	} else {
     		example.setOrderByClause("comment_time desc");
     	}
-    	if (CommonUtils.isNotNull(start_date) && CommonUtils.isNotNull(end_date)) {
-    		criteria.andGreaterThanOrEqualTo("comment_time", start_date);
-    		criteria.andLessThanOrEqualTo("comment_time", end_date);
+    	if (CommonUtils.isNotNull(commentsDTO.getsDate()) && CommonUtils.isNotNull(commentsDTO.geteDate())) {
+    		criteria.andGreaterThanOrEqualTo("comment_time", commentsDTO.getsDate());
+    		criteria.andLessThanOrEqualTo("comment_time", commentsDTO.geteDate());
     	}
-    	if (CommonUtils.isNotEmpty(content)) {
-    		criteria.andLike("comment_content", "%" + content + "%");
+    	if (CommonUtils.isNotEmpty(commentsDTO.getContent())) {
+    		criteria.andLike("comment_content", "%" + commentsDTO.getContent() + "%");
     	}
-    	if (CommonUtils.isNotEmpty(updater)) {
-    		criteria.andEqualTo("updater", updater);
+    	if (CommonUtils.isNotEmpty(commentsDTO.getUpdater())) {
+    		criteria.andEqualTo("updater", commentsDTO.getUpdater());
     	}
-    	if (CommonUtils.isNotNull(spid)) {
-    		criteria.andEqualTo("spid", spid);
+    	if (CommonUtils.isNotNull(commentsDTO.getSpid())) {
+    		criteria.andEqualTo("spid", commentsDTO.getSpid());
     	}
-    	if (CommonUtils.isNotNull(is_hot)) {
-    		criteria.andEqualTo("is_hot", is_hot);
+    	if (CommonUtils.isNotNull(commentsDTO.getIs_hot())) {
+    		criteria.andEqualTo("is_hot", commentsDTO.getIs_hot());
     	}
-    	if (CommonUtils.isNotNull(type)&&type==0) {
+    	if (CommonUtils.isNotNull(commentsDTO.getType())&&commentsDTO.getType()==0) {
     		criteria.andEqualTo("type", CommonConst.CATEGORY_TOPIC);
-    	}else if(CommonUtils.isNotNull(type)&&type==1){
+    	}else if(CommonUtils.isNotNull(commentsDTO.getType())&&commentsDTO.getType()==1){
     		criteria.andIsNull("type");
     	}
-    	if (CommonUtils.isNotEmpty(activity_id)) {
-    		criteria.andLike("activity_id", "%" + activity_id + "%");
+    	if (CommonUtils.isNotEmpty(commentsDTO.getActivity_id())) {
+    		criteria.andLike("activity_id", "%" + commentsDTO.getActivity_id() + "%");
     	}
-    	if (CommonUtils.isNotNull(receive)) {
-    		criteria.andEqualTo("receive", receive);
-    		if (receive==CommonConst.RECEIVE_AFTER) {
-    			criteria.andEqualTo("receive_user_id", userId);
+    	if (CommonUtils.isNotNull(commentsDTO.getReceive())) {
+    		criteria.andEqualTo("receive", commentsDTO.getReceive());
+    		if (commentsDTO.getReceive().equals(CommonConst.RECEIVE_AFTER)) {
+    			criteria.andEqualTo("receive_user_id", commentsDTO.getUserId());
     		}
     	}
@@ -191,9 +192,9 @@ public class CommentsServiceImpl {
 //            example.and(criteria1);
 //        }
-    	if (CommonUtils.isNotNull(states) && states != 3) {
-    		criteria.andEqualTo("state", states);
-    	} else if (CommonUtils.isNotNull(states) && states == 3) {
+    	if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() != 3) {
+    		criteria.andEqualTo("state", commentsDTO.getState());
+    	} else if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() == 3) {
     		Example.Criteria criteria1 = example.createCriteria();
     		criteria1.orEqualTo("state", 1);
     		criteria1.orEqualTo("state", 2);
@@ -207,7 +208,7 @@ public class CommentsServiceImpl {
     public ShyComments getDetailsComment(Integer id) {
         ShyComments comment = shyCommentsMapper.selectByPrimaryKey(id);
-        if (comment.getState() != CommonConst.AUDIT_INTT) {
+        if (!comment.getState().equals(CommonConst.AUDIT_INTT)) {
         	String updater = CommonUtils.isEmpty(comment.getUpdater()) || "null".equals(comment.getUpdater())? "白名单":comment.getUpdater();
             String auditor_id = comment.getAuditor_id();
             if (CommonUtils.isNotEmpty(auditor_id)) {
@@ -278,7 +279,7 @@ public class CommentsServiceImpl {
             String[] cids = ids.split(",");
             for (String cid : cids) {
                 ShyComments shyComments = shyCommentsMapper.selectByPrimaryKey(Integer.parseInt(cid));
-                if (CommonUtils.isNotNull(shyComments) && shyComments.getState() == CommonConst.AUDIT_INTT && shyComments.getReceive()==CommonConst.RECEIVE_BEFORE) {
+                if (CommonUtils.isNotNull(shyComments) && shyComments.getState().equals(CommonConst.AUDIT_INTT) && shyComments.getReceive().equals(CommonConst.RECEIVE_BEFORE)) {
                     shyComments.setReceive_user_id(userId);
                     shyComments.setReceive(CommonConst.RECEIVE_AFTER);
                     shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
@@ -290,7 +291,9 @@ public class CommentsServiceImpl {
             example.setOrderByClause("created_at desc");
             example.and().andEqualTo("state", CommonConst.AUDIT_INTT);
             example.and().andEqualTo("receive", CommonConst.RECEIVE_AFTER);
-            if (CommonUtils.isNotNull(spid) && spid != 0) example.and().andEqualTo("spid", spid);
+            if (CommonUtils.isNotNull(spid) && spid != 0) {
+                example.and().andEqualTo("spid", spid);
+            }
             List<ShyComments> shyCommentsList = shyCommentsMapper.selectByExampleAndRowBounds(example, new RowBounds(0, num));
             if (!shyCommentsList.isEmpty()) {
                 for (ShyComments shyComments : shyCommentsList) {
@@ -309,11 +312,13 @@ public class CommentsServiceImpl {
         String[] cids = ids.split(",");
         for (String cid : cids) {
             ShyComments shyComments = shyCommentsMapper.selectByPrimaryKey(Integer.parseInt(cid));
-            if (shyComments.getState() == CommonConst.AUDIT_INTT && shyComments.getReceive()==CommonConst.RECEIVE_AFTER && userId.equals(shyComments.getReceive_user_id())) {
+            if (shyComments.getState().equals(CommonConst.AUDIT_INTT) && shyComments.getReceive().equals(CommonConst.RECEIVE_AFTER) && userId.equals(shyComments.getReceive_user_id())) {
                 shyComments.setReceive(CommonConst.RECEIVE_BEFORE);
                 shyComments.setReceive_user_id(null);
                 int i = shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
-                if (i == 1) n++;
+                if (i == 1) {
+                    n++;
+                }
             }
         }
         return n;
 package com.cnlive.shenhe.serviceImpl;
 import com.alibaba.fastjson.JSONObject;
+import com.cnlive.shenhe.dto.ContentDTO;
 import com.cnlive.shenhe.entity.*;
 import com.cnlive.shenhe.mapper.ShyCommentsMapper;
 import com.cnlive.shenhe.mapper.ShyContentMapper;
@@ -93,49 +94,52 @@ public class ContentServiceImpl {
         return shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
     }
-    public PageInfo<ShyContent> getPage(String title, String source, String author, String content_tag, String contentId, Date start_date, Date end_date, Integer receive_status, String updater, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId) {
+    public PageInfo<ShyContent> getPage(ContentDTO contentDTO) {
+        //String title, String source, String author, String content_tag,
+        //        String contentId, Date start_date, Date end_date, Integer receive_status, String updater,
+        //        Integer page, Integer pageSize, String orderByClause, Integer spid, String userId
         Example example = new Example(ShyContent.class);
         Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(contentDTO.getOrderByClause())) {
+            example.setOrderByClause(contentDTO.getOrderByClause());
         } else {
             example.setOrderByClause("create_date desc");
         }
-        if (CommonUtils.isNotNull(start_date)) {
-            criteria.andGreaterThanOrEqualTo("create_date", start_date);
+        if (CommonUtils.isNotNull(contentDTO.getsDate())) {
+            criteria.andGreaterThanOrEqualTo("create_date", contentDTO.getsDate());
         }
-        if (CommonUtils.isNotNull(end_date)) {
-            criteria.andLessThanOrEqualTo("create_date", end_date);
+        if (CommonUtils.isNotNull(contentDTO.geteDate())) {
+            criteria.andLessThanOrEqualTo("create_date", contentDTO.geteDate());
         }
-        if (CommonUtils.isNotEmpty(title)) {
-            criteria.andLike("title", "%" + title + "%");
+        if (CommonUtils.isNotEmpty(contentDTO.getTitle())) {
+            criteria.andLike("title", "%" + contentDTO.getTitle() + "%");
         }
-        if (CommonUtils.isNotEmpty(source)) {
-            criteria.andLike("source", "%" + source + "%");
+        if (CommonUtils.isNotEmpty(contentDTO.getSource())) {
+            criteria.andLike("source", "%" + contentDTO.getSource() + "%");
         }
-        if (CommonUtils.isNotEmpty(author)) {
-            criteria.andEqualTo("author", author);
+        if (CommonUtils.isNotEmpty(contentDTO.getAuthor())) {
+            criteria.andEqualTo("author", contentDTO.getAuthor());
         }
-        if (CommonUtils.isNotEmpty(updater)) {
-            criteria.andEqualTo("updater", updater);
+        if (CommonUtils.isNotEmpty(contentDTO.getUpdater())) {
+            criteria.andEqualTo("updater", contentDTO.getUpdater());
         }
-        if (CommonUtils.isNotEmpty(content_tag)) {
-            criteria.andEqualTo("content_tag", content_tag);
+        if (CommonUtils.isNotEmpty(contentDTO.getContent_tag())) {
+            criteria.andEqualTo("content_tag", contentDTO.getContent_tag());
         }
-        if (CommonUtils.isNotNull(spid)) {
-            criteria.andEqualTo("sp_id", spid);
+        if (CommonUtils.isNotNull(contentDTO.getSpid())) {
+            criteria.andEqualTo("sp_id", contentDTO.getSpid());
         }
-        if (CommonUtils.isNotEmpty(contentId)) {
-            criteria.andEqualTo("content_id", contentId);
+        if (CommonUtils.isNotEmpty(contentDTO.getContentId())) {
+            criteria.andEqualTo("content_id", contentDTO.getContentId());
         }
-        if (CommonUtils.isNotNull(receive_status)) {
-            criteria.andEqualTo("receive_status", receive_status);
-            if (receive_status != CommonConst.RECEIVE_BEFORE) {
-                criteria.andEqualTo("auditor_id", userId);
+        if (CommonUtils.isNotNull(contentDTO.getReceive_status())) {
+            criteria.andEqualTo("receive_status", contentDTO.getReceive_status());
+            if (!contentDTO.getReceive_status().equals(CommonConst.RECEIVE_BEFORE)) {
+                criteria.andEqualTo("auditor_id", contentDTO.getUserId());
             }
         }
-        PageHelper.startPage(page, pageSize, true);
+        PageHelper.startPage(contentDTO.getPage(), contentDTO.getPageSize(), true);
         List<ShyContent> contentList = shyContentMapper.selectByExample(example);
         PageInfo<ShyContent> pageInfo = new PageInfo<>(contentList);
         return pageInfo;
@@ -146,37 +150,35 @@ public class ContentServiceImpl {
      *
      * @return
      */
-    public List<ShyContent> findByCondition(String title, String content_tag, String contentId, Date start_date,
-                                            Date end_date, Integer receive_status, Integer page,
-                                            Integer pageSize, String orderByClause, Integer spid) {
+    public List<ShyContent> findByCondition(ContentDTO contentDTO) {
         Example example = new Example(ShyContent.class);
         Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(contentDTO.getOrderByClause())) {
+            example.setOrderByClause(contentDTO.getOrderByClause());
         } else {
             example.setOrderByClause("create_date desc");
         }
-        if (CommonUtils.isNotNull(start_date)) {
-            criteria.andGreaterThanOrEqualTo("create_date", start_date);
+        if (CommonUtils.isNotNull(contentDTO.getsDate())) {
+            criteria.andGreaterThanOrEqualTo("create_date", contentDTO.getsDate());
         }
-        if (CommonUtils.isNotNull(end_date)) {
-            criteria.andLessThanOrEqualTo("create_date", end_date);
+        if (CommonUtils.isNotNull(contentDTO.geteDate())) {
+            criteria.andLessThanOrEqualTo("create_date", contentDTO.geteDate());
         }
-        if (CommonUtils.isNotEmpty(title)) {
-            criteria.andLike("title", "%" + title + "%");
+        if (CommonUtils.isNotEmpty(contentDTO.getTitle())) {
+            criteria.andLike("title", "%" + contentDTO.getTitle() + "%");
         }
-        if (CommonUtils.isNotNull(spid)) {
-            criteria.andEqualTo("sp_id", spid);
+        if (CommonUtils.isNotNull(contentDTO.getSpid())) {
+            criteria.andEqualTo("sp_id", contentDTO.getSpid());
         }
-        if (CommonUtils.isNotEmpty(contentId)) {
-            criteria.andEqualTo("content_id", contentId);
+        if (CommonUtils.isNotEmpty(contentDTO.getContentId())) {
+            criteria.andEqualTo("content_id", contentDTO.getContentId());
         }
-        if (CommonUtils.isNotEmpty(content_tag)) {
-            criteria.andEqualTo("content_tag", content_tag);
+        if (CommonUtils.isNotEmpty(contentDTO.getContent_tag())) {
+            criteria.andEqualTo("content_tag", contentDTO.getContent_tag());
         }
-        if (CommonUtils.isNotNull(receive_status)) {
-            criteria.andEqualTo("receive_status", receive_status);
+        if (CommonUtils.isNotNull(contentDTO.getReceive_status())) {
+            criteria.andEqualTo("receive_status", contentDTO.getReceive_status());
         }
         List<ShyContent> shyContentList = shyContentMapper.selectByExample(example);
         return shyContentList;
@@ -186,7 +188,7 @@ public class ContentServiceImpl {
     //******************************
     public ShyContent getDetailsContent(Integer id) {
         ShyContent content = shyContentMapper.selectByPrimaryKey(id);
-        if (content.getReceive_status() == CommonConst.RECEIVE_AUDIT) {
+        if (content.getReceive_status().equals(CommonConst.RECEIVE_AUDIT)) {
             String updater = CommonUtils.isEmpty(content.getUpdater()) || "null".equals(content.getUpdater()) ? "白名单" : content.getUpdater();
             String auditor_id = content.getAuditor_id();
             if (CommonUtils.isNotEmpty(auditor_id)) {
@@ -243,7 +245,7 @@ public class ContentServiceImpl {
             if (CommonUtils.isNotEmpty(content.getContent_tag())
                     && content.getContent_tag().equals("moment")
                     && CommonUtils.isNotEmpty(content.getVideo_id())
-                    && state == CommonConst.AUDIT_REFUSE) {
+                    && state.equals(CommonConst.AUDIT_REFUSE)) {
                 ShyVideos shyVideos1 = new ShyVideos();
                 shyVideos1.setVideo_id(content.getVideo_id());
                 List<ShyVideos> listshyVideos = videosService.findshyVideo(shyVideos1);
@@ -296,7 +298,9 @@ public class ContentServiceImpl {
             example.setOrderByClause("create_date desc");
             example.and().andEqualTo("receive_status", CommonConst.RECEIVE_BEFORE);
 //            example.and().andEqualTo("receive", CommonConst.RECEIVE_AFTER);
-            if (CommonUtils.isNotNull(spid) && spid != 0) example.and().andEqualTo("spid", spid);
+            if (CommonUtils.isNotNull(spid) && spid != 0) {
+                example.and().andEqualTo("spid", spid);
+            }
             List<ShyContent> shyContentList = shyContentMapper.selectByExampleAndRowBounds(example, new RowBounds(0, num));
             if (!shyContentList.isEmpty()) {
                 for (ShyContent shyContent : shyContentList) {
@@ -317,12 +321,14 @@ public class ContentServiceImpl {
         String[] cids = ids.split(",");
         for (String cid : cids) {
             ShyContent shyContent = shyContentMapper.selectByPrimaryKey(Integer.parseInt(cid));
-            if (shyContent.getReceive_status() == CommonConst.RECEIVE_AFTER && userId.equals(shyContent.getAuditor_id())) {
+            if (shyContent.getReceive_status().equals(CommonConst.RECEIVE_AFTER) && userId.equals(shyContent.getAuditor_id())) {
                 shyContent.setReceive_status(CommonConst.RECEIVE_BEFORE);
                 shyContent.setAuditor_id(null);
                 shyContent.setLast_update(CommonUtils.getCurrentTime());
                 int i = shyContentMapper.updateByPrimaryKeySelective(shyContent);
-                if (i == 1) n++;
+                if (i == 1) {
+                    n++;
+                }
             }
         }
         return n;
 package com.cnlive.shenhe.serviceImpl;
 import com.alibaba.fastjson.JSONObject;
+import com.cnlive.shenhe.dto.EmailDTO;
 import com.cnlive.shenhe.entity.ShyEmail;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
@@ -34,23 +35,23 @@ public class EmailServiceImpl {
     @Autowired
     ShyEmailMapper shyEmailMapper;
-    public PageInfo<ShyEmail> getPage(Integer page, Integer pageSize, String orderByClause, 
-    		String  remark,String email) {
+    public PageInfo<ShyEmail> getPage(EmailDTO emailDTO) {
         Example example = new Example(ShyEmail.class);
         Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(emailDTO.getOrderByClause())) {
+            example.setOrderByClause(emailDTO.getOrderByClause());
         }else{
         	example.setOrderByClause("created_at desc");
         }
-        if (CommonUtils.isNotEmpty(remark)) {
-        	criteria.andLike("remark", "%" + remark + "%");
+        if (CommonUtils.isNotEmpty(emailDTO.getRemark())) {
+        	criteria.andLike("remark", "%" + emailDTO.getRemark() + "%");
         }
-        if (CommonUtils.isNotEmpty(email)) {
-        	criteria.andLike("email", "%" + email + "%");
+        if (CommonUtils.isNotEmpty(emailDTO.getEmail())) {
+        	criteria.andLike("email", "%" + emailDTO.getEmail() + "%");
         }
         criteria.andEqualTo("is_delete",false);
-        PageHelper.startPage(page, pageSize, true);
+        PageHelper.startPage(emailDTO.getPage(), emailDTO.getPageSize(), true);
+
         List<ShyEmail> ShyEmailList = shyEmailMapper.selectByExample(example);
         PageInfo<ShyEmail> pageInfo = new PageInfo<ShyEmail>(ShyEmailList);
         return pageInfo;
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
+import com.cnlive.shenhe.dto.LiveApplyDTO;
 import com.cnlive.shenhe.entity.ShyChannel;
 import com.cnlive.shenhe.entity.ShyLive;
 import com.cnlive.shenhe.entity.ShyLiveapply;
@@ -111,56 +112,54 @@ public class LiveApplyServiceImpl {
     }
     //===============
-    public PageInfo<ShyLiveapply> getListLiveApply(String theme, String start_date, String end_date, 
-    		String business_model, Integer page, Integer pageSize, 
-    		Integer shenhe_state,Integer receive, String orderByClause, Integer spid, String userId) {
+    public PageInfo<ShyLiveapply> getListLiveApply(LiveApplyDTO liveApplyDTO) {
         Example example = new Example(ShyLiveapply.class);
         Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(liveApplyDTO.getOrderByClause())) {
+            example.setOrderByClause(liveApplyDTO.getOrderByClause());
         }else{
         	example.setOrderByClause("created_at desc");
         }
-        if (CommonUtils.isNotEmpty(start_date)) {
+        if (CommonUtils.isNotEmpty(liveApplyDTO.getsDate())) {
             Timestamp startdate = null;
             try {
-                startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
+                startdate = CommonUtils.parseDate(liveApplyDTO.getsDate(), "yyyy-MM-dd");
             } catch (ParseException e) {
                 e.printStackTrace();
             }
             criteria.andGreaterThanOrEqualTo("pre_start_time", startdate);
         }
-        if ( CommonUtils.isNotEmpty(end_date)) {
+        if ( CommonUtils.isNotEmpty(liveApplyDTO.geteDate())) {
         	Timestamp enddate = null;
         	try {
-        		enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
+        		enddate = CommonUtils.parseDate(liveApplyDTO.geteDate(), "yyyy-MM-dd");
         	} catch (ParseException e) {
         		e.printStackTrace();
         	}
         	criteria.andLessThanOrEqualTo("pre_end_time", enddate);
         }
-        if (CommonUtils.isNotEmpty(theme)) {
-            criteria.andLike("theme", "%" + theme + "%");
+        if (CommonUtils.isNotEmpty(liveApplyDTO.getTheme())) {
+            criteria.andLike("theme", "%" + liveApplyDTO.getTheme() + "%");
         }
-        if (CommonUtils.isNotNull(business_model)) {
-            criteria.andLike("organization", "%" + business_model + "%");
+        if (CommonUtils.isNotNull(liveApplyDTO.getBusiness_model())) {
+            criteria.andLike("organization", "%" + liveApplyDTO.getBusiness_model() + "%");
         }
-        if (CommonUtils.isNotNull(spid)) {
-            criteria.andEqualTo("sp_id", spid);
+        if (CommonUtils.isNotNull(liveApplyDTO.getSpid())) {
+            criteria.andEqualTo("sp_id", liveApplyDTO.getSpid());
         }
-        if (CommonUtils.isNotNull(shenhe_state)&& shenhe_state != 3) {
-            criteria.andEqualTo("shenhe_state", shenhe_state);
-        }else if(CommonUtils.isNotNull(shenhe_state)&& shenhe_state == 3){
+        if (CommonUtils.isNotNull(liveApplyDTO.getShenhe_state())&& liveApplyDTO.getShenhe_state() != 3) {
+            criteria.andEqualTo("shenhe_state", liveApplyDTO.getShenhe_state());
+        }else if(CommonUtils.isNotNull(liveApplyDTO.getShenhe_state())&& liveApplyDTO.getShenhe_state() == 3){
         	criteria.andNotEqualTo("shenhe_state", 0);
         }
-        if (CommonUtils.isNotNull(receive)) {
-        	criteria.andEqualTo("receive", receive);
-        	if(receive!=0 && CommonUtils.isNotEmpty(userId)){
-        		criteria.andEqualTo("auditor", userId);
+        if (CommonUtils.isNotNull(liveApplyDTO.getReceive())) {
+        	criteria.andEqualTo("receive", liveApplyDTO.getReceive());
+        	if(liveApplyDTO.getReceive()!=0 && CommonUtils.isNotEmpty(liveApplyDTO.getUserId())){
+        		criteria.andEqualTo("auditor", liveApplyDTO.getUserId());
         	}
         }
-        PageHelper.startPage(page, pageSize, true);
+        PageHelper.startPage(liveApplyDTO.getPage(), liveApplyDTO.getPageSize(), true);
         List<ShyLiveapply> shyLiveApplyList = shyLiveApplyMapper.selectByExample(example);
         PageInfo<ShyLiveapply> pageInfo = new PageInfo<>(shyLiveApplyList);
         return pageInfo;
@@ -169,7 +168,7 @@ public class LiveApplyServiceImpl {
     //======================
     public ShyLiveapply getDetailsLive(Integer id) {
     	ShyLiveapply shyLiveapply = shyLiveApplyMapper.selectByPrimaryKey(id);
-        if (shyLiveapply.getShenhe_state() != CommonConst.RECEIVE_BEFORE) {
+        if (!shyLiveapply.getShenhe_state().equals(CommonConst.RECEIVE_BEFORE)) {
             String updater = CommonUtils.isEmpty(shyLiveapply.getUpdater()) || "null".equals(shyLiveapply.getUpdater())? "自动通过":shyLiveapply.getUpdater();
             String auditor_id = shyLiveapply.getAuditor();
             if (CommonUtils.isNotEmpty(auditor_id)) {
@@ -205,7 +204,9 @@ public class LiveApplyServiceImpl {
             example.setOrderByClause("pre_start_time asc");
             example.and().andEqualTo("shenhe_state", CommonConst.AUDIT_INTT);
             example.and().andEqualTo("receive", CommonConst.RECEIVE_BEFORE);
-            if (CommonUtils.isNotNull(spid) && spid != 0) example.and().andEqualTo("spid", spid);
+            if (CommonUtils.isNotNull(spid) && spid != 0) {
+                example.and().andEqualTo("spid", spid);
+            }
             List<ShyLiveapply> shyLiveapplyList = shyLiveApplyMapper.selectByExampleAndRowBounds(example, new RowBounds(0, num));
             if (!shyLiveapplyList.isEmpty()) {
                 for (ShyLiveapply shyLiveapply : shyLiveapplyList) {
@@ -225,7 +226,7 @@ public class LiveApplyServiceImpl {
         String[] cids = ids.split(",");
         for (String cid : cids) {
         	ShyLiveapply shyLiveapply = shyLiveApplyMapper.selectByPrimaryKey(Integer.parseInt(cid));
-            if (shyLiveapply.getShenhe_state() == CommonConst.AUDIT_INTT &&shyLiveapply.getReceive() == CommonConst.RECEIVE_AFTER && shyLiveapply.getAuditor().equals(userId)) {
+            if (shyLiveapply.getShenhe_state().equals(CommonConst.AUDIT_INTT) && shyLiveapply.getReceive().equals(CommonConst.RECEIVE_AFTER) && shyLiveapply.getAuditor().equals(userId)) {
             	shyLiveapply.setShenhe_state(CommonConst.AUDIT_INTT);
             	shyLiveapply.setReceive(CommonConst.RECEIVE_BEFORE);
             	shyLiveapply.setAuditor(null);
@@ -244,53 +245,51 @@ public class LiveApplyServiceImpl {
      * 根据条件导出数据excel
      * @return
      */
-    public List<ShyLiveapply> findByCondition(String theme, String start_date, String end_date, 
-    		String business_model, Integer page, Integer pageSize,
-    		Integer shenhe_state,Integer receive, String orderByClause, Integer spid, String userId) {
+    public List<ShyLiveapply> findByCondition(LiveApplyDTO liveApplyDTO) {
         Example example = new Example(ShyLiveapply.class);
         Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(liveApplyDTO.getOrderByClause())) {
+            example.setOrderByClause(liveApplyDTO.getOrderByClause());
         }else{
         	example.setOrderByClause("pre_start_time");
         }
-        if (CommonUtils.isNotEmpty(start_date)) {
+        if (CommonUtils.isNotEmpty(liveApplyDTO.getsDate())) {
             Timestamp startdate = null;
             try {
-                startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
+                startdate = CommonUtils.parseDate(liveApplyDTO.getsDate(), "yyyy-MM-dd");
             } catch (ParseException e) {
                 e.printStackTrace();
             }
             criteria.andGreaterThanOrEqualTo("pre_start_time", startdate);
         }
-        if ( CommonUtils.isNotEmpty(end_date)) {
+        if ( CommonUtils.isNotEmpty(liveApplyDTO.geteDate())) {
         	Timestamp enddate = null;
         	try {
-        		enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
+        		enddate = CommonUtils.parseDate(liveApplyDTO.geteDate(), "yyyy-MM-dd");
         	} catch (ParseException e) {
         		e.printStackTrace();
         	}
         	criteria.andLessThanOrEqualTo("pre_end_time", enddate);
         }
-        if (CommonUtils.isNotEmpty(theme)) {
-            criteria.andLike("theme", "%" + theme + "%");
+        if (CommonUtils.isNotEmpty(liveApplyDTO.getTheme())) {
+            criteria.andLike("theme", "%" + liveApplyDTO.getTheme() + "%");
         }
-        if (CommonUtils.isNotNull(business_model)) {
-            criteria.andEqualTo("business_model", business_model);
+        if (CommonUtils.isNotNull(liveApplyDTO.getBusiness_model())) {
+            criteria.andEqualTo("business_model", liveApplyDTO.getBusiness_model());
         }
-        if (CommonUtils.isNotNull(spid)) {
-            criteria.andEqualTo("sp_id", spid);
+        if (CommonUtils.isNotNull(liveApplyDTO.getSpid())) {
+            criteria.andEqualTo("sp_id", liveApplyDTO.getSpid());
         }
-        if (CommonUtils.isNotNull(shenhe_state)&& shenhe_state != 3) {
-            criteria.andEqualTo("shenhe_state", shenhe_state);
-        }else if(CommonUtils.isNotNull(shenhe_state)&& shenhe_state == 3){
+        if (CommonUtils.isNotNull(liveApplyDTO.getShenhe_state())&& liveApplyDTO.getShenhe_state() != 3) {
+            criteria.andEqualTo("shenhe_state", liveApplyDTO.getShenhe_state());
+        }else if(CommonUtils.isNotNull(liveApplyDTO.getShenhe_state())&& liveApplyDTO.getShenhe_state() == 3){
         	criteria.andNotEqualTo("shenhe_state", 0);
         }
-        if (CommonUtils.isNotNull(receive)) {
-        	criteria.andEqualTo("receive", receive);
-        	if(receive!=0 && CommonUtils.isNotEmpty(userId)){
-        		criteria.andEqualTo("auditor", userId);
+        if (CommonUtils.isNotNull(liveApplyDTO.getReceive())) {
+        	criteria.andEqualTo("receive", liveApplyDTO.getReceive());
+        	if(liveApplyDTO.getReceive()!=0 && CommonUtils.isNotEmpty(liveApplyDTO.getUserId())){
+        		criteria.andEqualTo("auditor", liveApplyDTO.getUserId());
         	}
         }
         List<ShyLiveapply> shyLiveApplyList = shyLiveApplyMapper.selectByExample(example);
@@ -299,7 +298,7 @@ public class LiveApplyServiceImpl {
     /**
      * 获得审核类型
-     * @param shyChannel
+     * @param shyLiveApply
      */
     public void getShenheType(ShyLiveapply shyLiveApply){
@@ -2,6 +2,7 @@ package com.cnlive.shenhe.serviceImpl;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
+import com.cnlive.shenhe.dto.LiveDTO;
 import com.cnlive.shenhe.entity.ShyLive;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.mapper.ShyLiveMapper;
@@ -84,53 +85,51 @@ public class LiveServiceImpl {
     }
     //===============
-    public PageInfo<ShyLive> getListContent(String activity_name, String start_date, String end_date, 
-    		String activity_id, Integer activity_status, Integer page, Integer pageSize, 
-    		Integer shenhe_state, String orderByClause, Integer spid, String userId) {
+    public PageInfo<ShyLive> getListContent(LiveDTO liveDTO) {
         Example example = new Example(ShyLive.class);
         Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(liveDTO.getOrderByClause())) {
+            example.setOrderByClause(liveDTO.getOrderByClause());
         }
-        if (CommonUtils.isNotEmpty(start_date)) {
+        if (CommonUtils.isNotEmpty(liveDTO.getsDate())) {
             Timestamp startdate = null;
             try {
-                startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
+                startdate = CommonUtils.parseDate(liveDTO.getsDate(), "yyyy-MM-dd");
             } catch (ParseException e) {
                 e.printStackTrace();
             }
             criteria.andGreaterThanOrEqualTo("activity_start_time", startdate);
         }
-        if ( CommonUtils.isNotEmpty(end_date)) {
+        if ( CommonUtils.isNotEmpty(liveDTO.geteDate())) {
         	Timestamp enddate = null;
         	try {
-        		enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
+        		enddate = CommonUtils.parseDate(liveDTO.geteDate(), "yyyy-MM-dd");
         	} catch (ParseException e) {
         		e.printStackTrace();
         	}
         	criteria.andLessThanOrEqualTo("activity_start_time", enddate);
         }
-        if (CommonUtils.isNotEmpty(activity_name)) {
-            criteria.andLike("activity_name", "%" + activity_name + "%");
+        if (CommonUtils.isNotEmpty(liveDTO.getActivity_name())) {
+            criteria.andLike("activity_name", "%" + liveDTO.getActivity_name() + "%");
         }
-        if (CommonUtils.isNotEmpty(activity_id)) {
-            criteria.andEqualTo("activity_id", activity_id);
+        if (CommonUtils.isNotEmpty(liveDTO.getActivity_id())) {
+            criteria.andEqualTo("activity_id", liveDTO.getActivity_id());
         }
-        if (CommonUtils.isNotNull(spid)) {
-            criteria.andEqualTo("sp_id", spid);
+        if (CommonUtils.isNotNull(liveDTO.getSpid())) {
+            criteria.andEqualTo("sp_id", liveDTO.getSpid());
         }
-        if (CommonUtils.isNotNull(shenhe_state)) {
-            criteria.andEqualTo("shenhe_state", shenhe_state);
-            if (shenhe_state != CommonConst.RECEIVE_BEFORE) {
-                criteria.andEqualTo("auditor", userId);
+        if (CommonUtils.isNotNull(liveDTO.getShenhe_state())) {
+            criteria.andEqualTo("shenhe_state", liveDTO.getShenhe_state());
+            if (!liveDTO.getShenhe_state().equals(CommonConst.RECEIVE_BEFORE)) {
+                criteria.andEqualTo("auditor", liveDTO.getUserId());
             }
         }
-        if (CommonUtils.isNotNull(activity_status) ) {
-            criteria.andEqualTo("activity_status", activity_status);
+        if (CommonUtils.isNotNull(liveDTO.getActivity_status()) ) {
+            criteria.andEqualTo("activity_status", liveDTO.getActivity_status());
         } 
         criteria.andEqualTo("is_show", 1);
-        PageHelper.startPage(page, pageSize, true);
+        PageHelper.startPage(liveDTO.getPage(), liveDTO.getPageSize(), true);
         List<ShyLive> shyLiveList = shyLiveMapper.selectByExample(example);
         PageInfo<ShyLive> pageInfo = new PageInfo<>(shyLiveList);
         return pageInfo;
@@ -139,7 +138,7 @@ public class LiveServiceImpl {
     //======================
     public ShyLive getDetailsLive(Integer id) {
         ShyLive shyLive = shyLiveMapper.selectByPrimaryKey(id);
-        if (shyLive.getShenhe_state() != CommonConst.RECEIVE_BEFORE) {
+        if (!shyLive.getShenhe_state().equals(CommonConst.RECEIVE_BEFORE)) {
             String updater = CommonUtils.isEmpty(shyLive.getUpdater()) || "null".equals(shyLive.getUpdater())? "自动通过":shyLive.getUpdater();
             String auditor_id = shyLive.getAuditor();
             if (CommonUtils.isNotEmpty(auditor_id)) {
@@ -173,7 +172,9 @@ public class LiveServiceImpl {
             Example example = new Example(ShyLive.class);
             example.setOrderByClause("is_hot desc, activity_start_time asc");
             example.and().andEqualTo("shenhe_state", CommonConst.RECEIVE_BEFORE);
-            if (CommonUtils.isNotNull(spid) && spid != 0) example.and().andEqualTo("spid", spid);
+            if (CommonUtils.isNotNull(spid) && spid != 0) {
+                example.and().andEqualTo("spid", spid);
+            }
             List<ShyLive> shyLiveList = shyLiveMapper.selectByExampleAndRowBounds(example, new RowBounds(0, num));
             if (!shyLiveList.isEmpty()) {
                 for (ShyLive shyLive : shyLiveList) {
@@ -192,7 +193,7 @@ public class LiveServiceImpl {
         String[] cids = ids.split(",");
         for (String cid : cids) {
             ShyLive shyLive = shyLiveMapper.selectByPrimaryKey(Integer.parseInt(cid));
-            if (shyLive.getShenhe_state() == CommonConst.RECEIVE_AFTER && shyLive.getAuditor().equals(userId)) {
+            if (shyLive.getShenhe_state().equals(CommonConst.RECEIVE_AFTER) && shyLive.getAuditor().equals(userId)) {
                 shyLive.setShenhe_state(CommonConst.RECEIVE_BEFORE);
                 shyLive.setAuditor(null);
                 int i = shyLiveMapper.updateByPrimaryKey(shyLive);
@@ -210,52 +211,50 @@ public class LiveServiceImpl {
      * 根据条件导出数据excel
      * @return
      */
-    public List<ShyLive> findByCondition(String activity_name, String start_date, String end_date, 
-    		String activity_id, Integer activity_status, Integer page, Integer pageSize, 
-    		Integer shenhe_state, String orderByClause, Integer spid, String userId) {
+    public List<ShyLive> findByCondition(LiveDTO liveDTO) {
         Example example = new Example(ShyLive.class);
         Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(liveDTO.getOrderByClause())) {
+            example.setOrderByClause(liveDTO.getOrderByClause());
         }else{
         	example.setOrderByClause("activity_start_time");
         }
-        if (CommonUtils.isNotEmpty(start_date)) {
+        if (CommonUtils.isNotEmpty(liveDTO.getsDate())) {
             Timestamp startdate = null;
             try {
-                startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
+                startdate = CommonUtils.parseDate(liveDTO.getsDate(), "yyyy-MM-dd");
             } catch (ParseException e) {
                 e.printStackTrace();
             }
             criteria.andGreaterThanOrEqualTo("activity_start_time", startdate);
         }
-        if ( CommonUtils.isNotEmpty(end_date)) {
+        if (CommonUtils.isNotEmpty(liveDTO.geteDate())) {
         	Timestamp enddate = null;
         	try {
-        		enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
+        		enddate = CommonUtils.parseDate(liveDTO.geteDate(), "yyyy-MM-dd");
         	} catch (ParseException e) {
         		e.printStackTrace();
         	}
         	criteria.andLessThanOrEqualTo("activity_start_time", enddate);
         }
-        if (CommonUtils.isNotEmpty(activity_name)) {
-            criteria.andLike("activity_name", "%" + activity_name + "%");
+        if (CommonUtils.isNotEmpty(liveDTO.getActivity_name())) {
+            criteria.andLike("activity_name", "%" + liveDTO.getActivity_name() + "%");
         }
-        if (CommonUtils.isNotEmpty(activity_id)) {
-            criteria.andEqualTo("activity_id", activity_id);
+        if (CommonUtils.isNotEmpty(liveDTO.getActivity_id())) {
+            criteria.andEqualTo("activity_id", liveDTO.getActivity_id());
         }
-        if (CommonUtils.isNotNull(spid)) {
-            criteria.andEqualTo("sp_id", spid);
+        if (CommonUtils.isNotNull(liveDTO.getSpid())) {
+            criteria.andEqualTo("sp_id", liveDTO.getSpid());
         }
-        if (CommonUtils.isNotNull(shenhe_state)) {
-            criteria.andEqualTo("shenhe_state", shenhe_state);
-            if (shenhe_state != CommonConst.RECEIVE_BEFORE) {
-                criteria.andEqualTo("auditor", userId);
+        if (CommonUtils.isNotNull(liveDTO.getShenhe_state())) {
+            criteria.andEqualTo("shenhe_state", liveDTO.getShenhe_state());
+            if (!liveDTO.getShenhe_state().equals(CommonConst.RECEIVE_BEFORE)) {
+                criteria.andEqualTo("auditor", liveDTO.getUserId());
             }
         }
-        if (CommonUtils.isNotNull(activity_status) ) {
-            criteria.andEqualTo("activity_status", activity_status);
+        if (CommonUtils.isNotNull(liveDTO.getActivity_status()) ) {
+            criteria.andEqualTo("activity_status", liveDTO.getActivity_status());
         } 
         criteria.andEqualTo("is_show", 1);
         List<ShyLive> shyLiveList = shyLiveMapper.selectByExample(example);
@@ -3,6 +3,7 @@ package com.cnlive.shenhe.serviceImpl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ResponseBean;
+import com.cnlive.shenhe.dto.NotSpeakDTO;
 import com.cnlive.shenhe.entity.ShyComments;
 import com.cnlive.shenhe.entity.ShyContent;
 import com.cnlive.shenhe.entity.ShyLive;
@@ -162,7 +163,7 @@ public class NotspeakServiceImpl {
     	List<ShyNotspeak> shyNotspeakList = findshyNotspeak(shyNotspeak);
     	if(shyNotspeakList.size()>0){
     		shyNotspeak =shyNotspeakList.get(0);
-    		return new ResponseBean(500,"当前用户已被禁言，禁言剩余时长："+(shyNotspeak.getEnd_time().getTime()-new Date().getTime())/(1000*60)+"分钟，解禁时间："+CommonUtils.formatDate(shyNotspeak.getEnd_time(), "yyyy-MM-dd HH:mm:ss"));
+    		return new ResponseBean(500,"当前用户已被禁言，禁言剩余时长："+(shyNotspeak.getEnd_time().getTime()-System.currentTimeMillis())/(1000*60)+"分钟，解禁时间："+CommonUtils.formatDate(shyNotspeak.getEnd_time(), "yyyy-MM-dd HH:mm:ss"));
     	}
     	return new ResponseBean();
     }
@@ -195,7 +196,7 @@ public class NotspeakServiceImpl {
     		}
     		String msg=CommonUtils.getCurrentDate("yyyy-MM-dd HH:mm:ss")+"解除禁言";
     		shyNotspeak.setState(type);
-    		if(type==CommonConst.SPEAK_NOT){
+    		if(type.equals(CommonConst.SPEAK_NOT)){
     			shyNotspeak.setStart_time(CommonUtils.getCurrentTime());
     			shyNotspeak.setTime(time);
     			shyNotspeak.setEnd_time(CommonUtils.getAddTime(time));
@@ -266,26 +267,25 @@ public class NotspeakServiceImpl {
     	return result;
     }
-    public PageInfo<ShyNotspeak> getPage( String user_name, Integer user_id,Integer state, 
-            Integer page, Integer pageSize, String orderByClause) {
+    public PageInfo<ShyNotspeak> getPage(NotSpeakDTO notSpeakDTO) {
         Example example = new Example(ShyNotspeak.class);
         Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(notSpeakDTO.getOrderByClause())) {
+            example.setOrderByClause(notSpeakDTO.getOrderByClause());
         } else {
             example.setOrderByClause("state desc , updated_at desc");
         }
-        if (CommonUtils.isNotEmpty(user_name)) {
-            criteria.andLike("user_name", "%" + user_name + "%");
+        if (CommonUtils.isNotEmpty(notSpeakDTO.getUser_name())) {
+            criteria.andLike("user_name", "%" + notSpeakDTO.getUser_name() + "%");
         }
-        if (CommonUtils.isNotNull(user_id)) {
-            criteria.andEqualTo("user_id", user_id);
+        if (CommonUtils.isNotNull(notSpeakDTO.getUser_id())) {
+            criteria.andEqualTo("user_id", notSpeakDTO.getUser_id());
         }
-        if (CommonUtils.isNotNull(state)) {
-            criteria.andEqualTo("state", state);
+        if (CommonUtils.isNotNull(notSpeakDTO.getState())) {
+            criteria.andEqualTo("state", notSpeakDTO.getState());
         }
-        PageHelper.startPage(page, pageSize, true);
+        PageHelper.startPage(notSpeakDTO.getPage(), notSpeakDTO.getPageSize(), true);
         List<ShyNotspeak> shyNotspeakList = shyNotspeakMapper.selectByExample(example);
         PageInfo<ShyNotspeak> pageInfo = new PageInfo<>(shyNotspeakList);
         return pageInfo;
 package com.cnlive.shenhe.serviceImpl;
+import com.cnlive.shenhe.dto.SitesDTO;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.mapper.ShySitesMapper;
@@ -27,22 +28,23 @@ public class SitesServiceImpl {
     @Autowired
     UsersServiceImpl usersService;
-    public PageInfo<ShySites> getPage(Integer page, Integer pageSize, String orderByClause, String key, Integer spId) {
+    public PageInfo<ShySites> getPage(SitesDTO sitesDTO) {
         Example example = new Example(ShySites.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(sitesDTO.getOrderByClause())) {
+            example.setOrderByClause(sitesDTO.getOrderByClause());
         }
-        if (CommonUtils.isNotEmpty(key)) {
-            criteria.andLike("name", "%" + key + "%");
-            criteria2.andLike("spid",  "%" + key + "%");
+        if (CommonUtils.isNotEmpty(sitesDTO.getKeyword())) {
+            criteria.andLike("name", "%" + sitesDTO.getKeyword() + "%");
+            criteria2.andLike("spid",  "%" + sitesDTO.getKeyword() + "%");
             example.or(criteria2);
         }
-        if (CommonUtils.isNotNull(spId))
-            criteria.andEqualTo("spid", spId);
-            criteria2.andEqualTo("spid", spId);
-        PageHelper.startPage(page, pageSize, true);
+        if (CommonUtils.isNotNull(sitesDTO.getSpId())) {
+            criteria.andEqualTo("spid", sitesDTO.getSpId());
+            criteria2.andEqualTo("spid", sitesDTO.getSpId());
+        }
+        PageHelper.startPage(sitesDTO.getPage(), sitesDTO.getPageSize(), true);
         List<ShySites> shySitesList = shySitesMapper.selectByExample(example);
         PageInfo<ShySites> pageInfo = new PageInfo<ShySites>(shySitesList);
         return pageInfo;
@@ -65,8 +67,9 @@ public class SitesServiceImpl {
     public ShySites findspidDescByspid(int spId) {
         Example example = new Example(ShySites.class);
         Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotNull(spId))
+        if (CommonUtils.isNotNull(spId)) {
             criteria.andEqualTo("spid", spId);
+        }
         List<ShySites> shySites = shySitesMapper.selectByExample(example);
         if(CommonUtils.isNotNull(shySites)&&shySites.size()>0){
         	return shySites.get(0);
@@ -77,8 +80,9 @@ public class SitesServiceImpl {
     public ShySites findspidBySpdesc(String sp_desc) {
         Example example = new Example(ShySites.class);
         Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotEmpty(sp_desc))
+        if (CommonUtils.isNotEmpty(sp_desc)) {
             criteria.andEqualTo("name", sp_desc);
+        }
         List<ShySites> shySites = shySitesMapper.selectByExample(example);
         if(CommonUtils.isNotNull(shySites)&&shySites.size()>0){
         	return shySites.get(0);
@@ -2,6 +2,7 @@ package com.cnlive.shenhe.serviceImpl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.cnlive.shenhe.dto.TopicDTO;
 import com.cnlive.shenhe.entity.ShyComments;
 import com.cnlive.shenhe.entity.ShyContent;
 import com.cnlive.shenhe.entity.ShyLive;
@@ -107,48 +108,48 @@ public class TopicServiceImpl {
         return shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
     }
-    public PageInfo<ShyTopic> getPage( String title,String topic_tag,String topicId,  Date start_date, Date end_date,  Integer shenhe_status, String updater, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId,Integer receive) {
+    public PageInfo<ShyTopic> getPage(TopicDTO topicDTO) {
         Example example = new Example(ShyTopic.class);
         Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(topicDTO.getOrderByClause())) {
+            example.setOrderByClause(topicDTO.getOrderByClause());
         } else {
             example.setOrderByClause("create_date desc");
         }
-        if (CommonUtils.isNotNull(start_date) ) {
-            criteria.andGreaterThanOrEqualTo("create_date", start_date);
+        if (CommonUtils.isNotNull(topicDTO.getsDate()) ) {
+            criteria.andGreaterThanOrEqualTo("create_date", topicDTO.getsDate());
         }
-        if ( CommonUtils.isNotNull(end_date)) {
-      	  criteria.andLessThanOrEqualTo("create_date", end_date);
+        if ( CommonUtils.isNotNull(topicDTO.geteDate())) {
+      	  criteria.andLessThanOrEqualTo("create_date", topicDTO.geteDate());
         }
-        if (CommonUtils.isNotEmpty(title)) {
-            criteria.andLike("title", "%" + title + "%");
+        if (CommonUtils.isNotEmpty(topicDTO.getTopic_name())) {
+            criteria.andLike("title", "%" + topicDTO.getTopic_name() + "%");
         }
-        if (CommonUtils.isNotEmpty(updater)) {
-            criteria.andEqualTo("updater", updater);
+        if (CommonUtils.isNotEmpty(topicDTO.getUpdater())) {
+            criteria.andEqualTo("updater", topicDTO.getUpdater());
         }
-        if (CommonUtils.isNotEmpty(topic_tag)) {
-        	criteria.andEqualTo("topic_tag", topic_tag);
+        if (CommonUtils.isNotEmpty(topicDTO.getTopic_tag())) {
+        	criteria.andEqualTo("topic_tag", topicDTO.getTopic_tag());
         }
-        if (CommonUtils.isNotNull(spid)) {
-            criteria.andEqualTo("sp_id", spid);
+        if (CommonUtils.isNotNull(topicDTO.getSpid())) {
+            criteria.andEqualTo("sp_id", topicDTO.getSpid());
         }
-        if (CommonUtils.isNotEmpty(topicId)) {
-        	criteria.andEqualTo("topic_id", topicId);
+        if (CommonUtils.isNotEmpty(topicDTO.getTopic_id())) {
+        	criteria.andEqualTo("topic_id", topicDTO.getTopic_id());
         }
-        if (CommonUtils.isNotNull(receive)&&receive==CommonConst.RECEIVE_AFTER) {
-            criteria.andEqualTo("auditor_id", userId);
+        if (CommonUtils.isNotNull(topicDTO.getReceive())&& topicDTO.getReceive().equals(CommonConst.RECEIVE_AFTER)) {
+            criteria.andEqualTo("auditor_id", topicDTO.getUserId());
         }
-        if (CommonUtils.isNotNull(shenhe_status) && shenhe_status != 3) {//不是   我的已审 进来的，只查一种状态
-            criteria.andEqualTo("shenhe_status", shenhe_status);
-        } else if (CommonUtils.isNotNull(shenhe_status) && shenhe_status == 3) {//是 我的已审，查通过和拒绝的两种状态
+        if (CommonUtils.isNotNull(topicDTO.getShenhe_status()) && topicDTO.getShenhe_status() != 3) {//不是   我的已审 进来的，只查一种状态
+            criteria.andEqualTo("shenhe_status", topicDTO.getShenhe_status());
+        } else if (CommonUtils.isNotNull(topicDTO.getShenhe_status()) && topicDTO.getShenhe_status() == 3) {//是 我的已审，查通过和拒绝的两种状态
         	Example.Criteria criteria1 = example.createCriteria();
         	criteria1.orEqualTo("shenhe_status", 1);
         	criteria1.orEqualTo("shenhe_status", 2);
         	example.and(criteria1);
         }
-        PageHelper.startPage(page, pageSize, true);
+        PageHelper.startPage(topicDTO.getPage(), topicDTO.getPageSize(), true);
         List<ShyTopic> topicList = shyTopicMapper.selectByExample(example);
         PageInfo<ShyTopic> pageInfo = new PageInfo<>(topicList);
         return pageInfo;
 package com.cnlive.shenhe.serviceImpl;
+import com.cnlive.shenhe.dto.UsersDTO;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
@@ -23,28 +24,27 @@ public class UsersServiceImpl {
     @Autowired
     ShyUsersMapper shyUsersMapper;
-    public PageInfo<ShyUsers> getPage(Integer page, Integer pageSize, String orderByClause, 
-    		String  username,String mobile,Integer sp_id,String company_brief) {
+    public PageInfo<ShyUsers> getPage(UsersDTO usersDTO) {
         Example example = new Example(ShyUsers.class);
         Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(usersDTO.getOrderByClause())) {
+            example.setOrderByClause(usersDTO.getOrderByClause());
         }else{
         	example.setOrderByClause("created_at desc");
         }
-        if (CommonUtils.isNotEmpty(username)) {
-        	criteria.andLike("username", "%" + username + "%");
+        if (CommonUtils.isNotEmpty(usersDTO.getUsername())) {
+        	criteria.andLike("username", "%" + usersDTO.getUsername() + "%");
         }
-        if(CommonUtils.isNotEmpty(mobile)){
-        	criteria.andLike("mobile",  "%" + mobile + "%" );
+        if(CommonUtils.isNotEmpty(usersDTO.getMobile())){
+        	criteria.andLike("mobile",  "%" + usersDTO.getMobile() + "%" );
         }
-        if(CommonUtils.isNotEmpty(company_brief)){
-        	criteria.andLike("company_brief",  "%" + company_brief + "%" );
+        if(CommonUtils.isNotEmpty(usersDTO.getCompany_brief())){
+        	criteria.andLike("company_brief",  "%" + usersDTO.getCompany_brief() + "%" );
         }
-        if(CommonUtils.isNotNull(sp_id)){
-        	criteria.andEqualTo("sp_id",  sp_id );
+        if(CommonUtils.isNotNull(usersDTO.getSp_id())){
+        	criteria.andEqualTo("sp_id",  usersDTO.getSp_id() );
         }
-        PageHelper.startPage(page, pageSize, true);
+        PageHelper.startPage(usersDTO.getPage(), usersDTO.getPageSize(), true);
         List<ShyUsers> ShyUsersList = shyUsersMapper.selectByExample(example);
         PageInfo<ShyUsers> pageInfo = new PageInfo<ShyUsers>(ShyUsersList);
         return pageInfo;
 package com.cnlive.shenhe.serviceImpl;
 import com.alibaba.fastjson.JSONObject;
+import com.cnlive.shenhe.dto.UsersFreeDTO;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.entity.ShyUsersfree;
 import com.cnlive.shenhe.mapper.ShyUsersfreeMapper;
@@ -46,22 +47,21 @@ public class UsersfreeServiceImpl {
 		return shyUsersfreeMapper.updateByPrimaryKeySelective(shyUsersfree);
 	}
-    public PageInfo<ShyUsersfree> getpage(Integer page, Integer pageSize, String orderByClause, 
-    		String  userId,String mobile) {
+    public PageInfo<ShyUsersfree> getpage(UsersFreeDTO usersFreeDTO) {
     	Example example = new Example(ShyUsers.class);
     	Example.Criteria criteria = example.createCriteria();
-    	if (CommonUtils.isNotEmpty(orderByClause)) {
-    		example.setOrderByClause(orderByClause);
+    	if (CommonUtils.isNotEmpty(usersFreeDTO.getOrderByClause())) {
+    		example.setOrderByClause(usersFreeDTO.getOrderByClause());
     	}else{
     		example.setOrderByClause("created_at desc");
     	}
-    	if (CommonUtils.isNotEmpty(userId)) {
-    		criteria.andEqualTo("user_id",  userId );
+    	if (CommonUtils.isNotEmpty(usersFreeDTO.getUserId())) {
+    		criteria.andEqualTo("user_id",  usersFreeDTO.getUserId() );
     	}
-    	if(CommonUtils.isNotEmpty(mobile)){
-    		criteria.andLike("mobile",  "%" + mobile + "%" );
+    	if(CommonUtils.isNotEmpty(usersFreeDTO.getMobile())){
+    		criteria.andLike("mobile",  "%" + usersFreeDTO.getMobile() + "%" );
     	}
-    	PageHelper.startPage(page, pageSize, true);
+    	PageHelper.startPage(usersFreeDTO.getPage(), usersFreeDTO.getPageSize(), true);
     	List<ShyUsersfree> ShyUsersList = shyUsersfreeMapper.selectByExample(example);
     	PageInfo<ShyUsersfree> pageInfo = new PageInfo<ShyUsersfree>(ShyUsersList);
     	return pageInfo;
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
+import com.cnlive.shenhe.dto.VideosDTO;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.entity.ShyUsersfree;
 import com.cnlive.shenhe.entity.ShyVideos;
@@ -110,96 +111,93 @@ public class VideosServiceImpl {
         return shyVideosMapper.updateByPrimaryKey(shyVideos);
     }
-    public PageInfo<ShyVideos> getListContent(String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page,
-                                              Integer pageSize, String video_priority, String orderByClause, Integer spid, String userId, String sp_Id,
-                                              String source, String video_user_id, String shen_auditor_id, String video_id) {
+    public PageInfo<ShyVideos> getListContent(VideosDTO videosDTO) {
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(videosDTO.getOrderByClause())) {
+            example.setOrderByClause(videosDTO.getOrderByClause());
         }
-        if (CommonUtils.isNotEmpty(start_date) && CommonUtils.isNotEmpty(end_date)) {
-            Timestamp startdate = null;
-            Timestamp enddate = null;
+        if (CommonUtils.isNotEmpty(videosDTO.getsDate()) && CommonUtils.isNotEmpty(videosDTO.geteDate())) {
+
             try {
-                startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
-                enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
+                videosDTO.setsDate(String.valueOf(CommonUtils.parseDate(videosDTO.getsDate(), "yyyy-MM-dd")));
+                videosDTO.seteDate(String.valueOf(CommonUtils.parseDate(videosDTO.geteDate(), "yyyy-MM-dd")));
             } catch (ParseException e) {
                 e.printStackTrace();
             }
-            criteria.andGreaterThanOrEqualTo("created_at", startdate);
-            criteria2.andGreaterThanOrEqualTo("created_at", startdate);
-            criteria.andLessThanOrEqualTo("created_at", enddate);
-            criteria2.andLessThanOrEqualTo("created_at", enddate);
+            criteria.andGreaterThanOrEqualTo("created_at", videosDTO.getsDate());
+            criteria2.andGreaterThanOrEqualTo("created_at", videosDTO.getsDate());
+            criteria.andLessThanOrEqualTo("created_at", videosDTO.geteDate());
+            criteria2.andLessThanOrEqualTo("created_at", videosDTO.geteDate());
         }
-        if (CommonUtils.isNotEmpty(video_title)) {
-            criteria.andLike("video_title", "%" + video_title + "%");
-            criteria2.andLike("video_title", "%" + video_title + "%");
+        if (CommonUtils.isNotEmpty(videosDTO.getVideo_title())) {
+            criteria.andLike("video_title", "%" + videosDTO.getVideo_title() + "%");
+            criteria2.andLike("video_title", "%" + videosDTO.getVideo_title() + "%");
         }
-        if (CommonUtils.isNotEmpty(video_priority)) {
-            criteria.andEqualTo("video_priority", video_priority);
-            criteria2.andEqualTo("video_priority", video_priority);
+        if (CommonUtils.isNotEmpty(videosDTO.getVideo_priority())) {
+            criteria.andEqualTo("video_priority", videosDTO.getVideo_priority());
+            criteria2.andEqualTo("video_priority", videosDTO.getVideo_priority());
         }
-        if (CommonUtils.isNotEmpty(video_id)) {
-            criteria.andEqualTo("video_id", video_id);
-            criteria2.andEqualTo("video_id", video_id);
+        if (CommonUtils.isNotEmpty(videosDTO.getVideo_id())) {
+            criteria.andEqualTo("video_id", videosDTO.getVideo_id());
+            criteria2.andEqualTo("video_id", videosDTO.getVideo_id());
         }
-        if (CommonUtils.isNotEmpty(shen_auditor_id)) {
-            if ("白名单".equals(shen_auditor_id) || "自动审核".equals(shen_auditor_id)) {
-                criteria.andEqualTo("updater", shen_auditor_id);
-                criteria2.andEqualTo("updater", shen_auditor_id);
+        if (CommonUtils.isNotEmpty(videosDTO.getShen_auditor_id())) {
+            if ("白名单".equals(videosDTO.getShen_auditor_id()) || "自动审核".equals(videosDTO.getShen_auditor_id())) {
+                criteria.andEqualTo("updater", videosDTO.getShen_auditor_id());
+                criteria2.andEqualTo("updater", videosDTO.getShen_auditor_id());
             } else {
-                criteria.andEqualTo("auditor_id", shen_auditor_id);
-                criteria2.andEqualTo("auditor_id", shen_auditor_id);
+                criteria.andEqualTo("auditor_id", videosDTO.getShen_auditor_id());
+                criteria2.andEqualTo("auditor_id", videosDTO.getShen_auditor_id());
             }
         }
-        if (CommonUtils.isNotEmpty(source) && !"22".equals(source) && !"102".equals(source)) {
-            criteria.andEqualTo("source", source);
-            criteria2.andEqualTo("source", source);
-        } else if (CommonUtils.isNotEmpty(source) && "22".equals(source)) {
+        if (CommonUtils.isNotEmpty(videosDTO.getSource()) && !"22".equals(videosDTO.getSource()) && !"102".equals(videosDTO.getSource())) {
+            criteria.andEqualTo("source", videosDTO.getSource());
+            criteria2.andEqualTo("source", videosDTO.getSource());
+        } else if (CommonUtils.isNotEmpty(videosDTO.getSource()) && "22".equals(videosDTO.getSource())) {
             criteria.andEqualTo("category", "moment");
             criteria2.andEqualTo("category", "moment");
-        } else if (CommonUtils.isNotEmpty(source) && "102".equals(source)) {
-            criteria.andEqualTo("source", "102".equals(source) ? "0" : source);
-            criteria2.andEqualTo("source", "102".equals(source) ? "0" : source);
+        } else if (CommonUtils.isNotEmpty(videosDTO.getSource()) && "102".equals(videosDTO.getSource())) {
+            criteria.andEqualTo("source", "102".equals(videosDTO.getSource()) ? "0" : videosDTO.getSource());
+            criteria2.andEqualTo("source", "102".equals(videosDTO.getSource()) ? "0" : videosDTO.getSource());
         }
-        if (CommonUtils.isNotEmpty(video_user_id)) {
-            criteria.andEqualTo("video_user_id", video_user_id);
-            criteria2.andEqualTo("video_user_id", video_user_id);
+        if (CommonUtils.isNotEmpty(videosDTO.getVideo_user_id())) {
+            criteria.andEqualTo("video_user_id", videosDTO.getVideo_user_id());
+            criteria2.andEqualTo("video_user_id", videosDTO.getVideo_user_id());
         }
-        if (CommonUtils.isNotNull(spid)) {
-            criteria.andEqualTo("spid", spid);
-            criteria2.andEqualTo("spid", spid);
-        } else if (CommonUtils.isNotEmpty(sp_Id)) {
-            criteria.andEqualTo("spid", sp_Id);
-            criteria2.andEqualTo("spid", sp_Id);
+        if (CommonUtils.isNotNull(videosDTO.getSpid())) {
+            criteria.andEqualTo("spid", videosDTO.getSpid());
+            criteria2.andEqualTo("spid", videosDTO.getSpid());
+        } else if (CommonUtils.isNotEmpty(videosDTO.getSp_Id())) {
+            criteria.andEqualTo("spid", videosDTO.getSp_Id());
+            criteria2.andEqualTo("spid", videosDTO.getSp_Id());
         }
-        if (CommonUtils.isNotNull(receive)) {
-            criteria.andEqualTo("receive", receive);
-            criteria2.andEqualTo("receive", receive);
-            if (receive == CommonConst.RECEIVE_AFTER) {
-                criteria.andEqualTo("receive_user_id", userId);
-                criteria2.andEqualTo("receive_user_id", userId);
+        if (CommonUtils.isNotNull(videosDTO.getReceive())) {
+            criteria.andEqualTo("receive", videosDTO.getReceive());
+            criteria2.andEqualTo("receive", videosDTO.getReceive());
+            if (videosDTO.getReceive().equals(CommonConst.RECEIVE_AFTER)) {
+                criteria.andEqualTo("receive_user_id", videosDTO.getUserId());
+                criteria2.andEqualTo("receive_user_id", videosDTO.getUserId());
             }
         }
-        if (CommonUtils.isNotNull(state) && state != 3) {
-            criteria.andEqualTo("state", state);
-        } else if (CommonUtils.isNotNull(state) && state == 3) {
+        if (CommonUtils.isNotNull(videosDTO.getState()) && videosDTO.getState() != 3) {
+            criteria.andEqualTo("state", videosDTO.getState());
+        } else if (CommonUtils.isNotNull(videosDTO.getState()) && videosDTO.getState() == 3) {
             criteria.andEqualTo("state", 1);
             criteria2.andEqualTo("state", 2);
             example.or(criteria2);
         }
         //默认按上传时间倒序排序
         example.setOrderByClause("created_at desc");
-        PageHelper.startPage(page, pageSize, true);
+        PageHelper.startPage(videosDTO.getPage(), videosDTO.getPageSize(), true);
         List<ShyVideos> shyVideosList = shyVideosMapper.selectByExample(example);
         PageInfo<ShyVideos> pageInfo = new PageInfo<>(shyVideosList);
         return pageInfo;
@@ -207,7 +205,7 @@ public class VideosServiceImpl {
     public ShyVideos getDetailsContent(Integer id) {
         ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(id);
-        if (shyVideos.getState() != CommonConst.AUDIT_INTT) {
+        if (!shyVideos.getState().equals(CommonConst.AUDIT_INTT)) {
             String updater = CommonUtils.isEmpty(shyVideos.getUpdater()) || "null".equals(shyVideos.getUpdater()) ? "白名单" : shyVideos.getUpdater();
             String auditor_id = shyVideos.getAuditor_id();
             if (CommonUtils.isNotEmpty(auditor_id)) {
@@ -241,7 +239,9 @@ public class VideosServiceImpl {
             example.setOrderByClause("created_at desc");
             example.and().andEqualTo("state", CommonConst.AUDIT_INTT);
             example.and().andEqualTo("receive", CommonConst.RECEIVE_BEFORE);
-            if (CommonUtils.isNotNull(spid) && spid != 0) example.and().andEqualTo("spid", spid);
+            if (CommonUtils.isNotNull(spid) && spid != 0) {
+                example.and().andEqualTo("spid", spid);
+            }
             List<ShyVideos> shyCommentsList = shyVideosMapper.selectByExampleAndRowBounds(example, new RowBounds(0, num));
             if (!shyCommentsList.isEmpty()) {
                 for (ShyVideos shyComments : shyCommentsList) {
@@ -259,7 +259,7 @@ public class VideosServiceImpl {
         String[] cids = ids.split(",");
         for (String cid : cids) {
             ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(Integer.parseInt(cid));
-            if (shyVideos.getState() == CommonConst.AUDIT_INTT && shyVideos.getReceive() == CommonConst.RECEIVE_AFTER && shyVideos.getReceive_user_id().equals(userId)) {
+            if (shyVideos.getState().equals(CommonConst.AUDIT_INTT) && shyVideos.getReceive().equals(CommonConst.RECEIVE_AFTER) && shyVideos.getReceive_user_id().equals(userId)) {
                 shyVideos.setReceive(CommonConst.RECEIVE_BEFORE);
                 shyVideos.setReceive_user_id(null);
                 int i = shyVideosMapper.updateByPrimaryKey(shyVideos);
@@ -276,61 +276,52 @@ public class VideosServiceImpl {
     /**
      * 根据条件导出数据excel
      *
-     * @param video_title
-     * @param start_date
-     * @param end_date
-     * @param state
-     * @param receive
-     * @param video_priority
-     * @param orderByClause
-     * @param spid
-     * @param userId
+     * @param videosDTO
      * @return
      */
-    public List<ShyVideos> findByCondition(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String orderByClause, Integer spid, String userId, String source, String video_user_id) {
+    public List<ShyVideos> findByCondition(VideosDTO videosDTO) {
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
+        if (CommonUtils.isNotEmpty(videosDTO.getOrderByClause())) {
+            example.setOrderByClause(videosDTO.getOrderByClause());
         }
-        if (CommonUtils.isNotEmpty(start_date) && CommonUtils.isNotEmpty(end_date)) {
-            Timestamp startdate = null;
-            Timestamp enddate = null;
+        if (CommonUtils.isNotEmpty(videosDTO.getsDate()) && CommonUtils.isNotEmpty(videosDTO.geteDate())) {
+
             try {
-                startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
-                enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
+                videosDTO.setsDate(String.valueOf(CommonUtils.parseDate(videosDTO.getsDate(), "yyyy-MM-dd")));
+                videosDTO.seteDate(String.valueOf(CommonUtils.parseDate(videosDTO.geteDate(), "yyyy-MM-dd")));
             } catch (ParseException e) {
                 e.printStackTrace();
             }
-            criteria.andGreaterThanOrEqualTo("created_at", startdate);
-            criteria.andLessThanOrEqualTo("created_at", enddate);
+            criteria.andGreaterThanOrEqualTo("created_at", videosDTO.getsDate());
+            criteria.andLessThanOrEqualTo("created_at", videosDTO.geteDate());
         }
-        if (CommonUtils.isNotEmpty(video_title)) {
-            criteria.andLike("video_title", "%" + video_title + "%");
+        if (CommonUtils.isNotEmpty(videosDTO.getVideo_title())) {
+            criteria.andLike("video_title", "%" + videosDTO.getVideo_title() + "%");
         }
-        if (CommonUtils.isNotNull(state)) {
-            criteria.andEqualTo("state", state);
+        if (CommonUtils.isNotNull(videosDTO.getState())) {
+            criteria.andEqualTo("state", videosDTO.getState());
         }
-        if (CommonUtils.isNotEmpty(video_priority)) {
-            criteria.andEqualTo("video_priority", video_priority);
+        if (CommonUtils.isNotEmpty(videosDTO.getVideo_priority())) {
+            criteria.andEqualTo("video_priority", videosDTO.getVideo_priority());
         }
-        if (CommonUtils.isNotEmpty(video_user_id)) {
-            criteria.andEqualTo("video_user_id", video_user_id);
+        if (CommonUtils.isNotEmpty(videosDTO.getVideo_user_id())) {
+            criteria.andEqualTo("video_user_id", videosDTO.getVideo_user_id());
         }
-        if (source != null) {
-            criteria.andEqualTo("source", source);
+        if (videosDTO.getSource() != null) {
+            criteria.andEqualTo("source", videosDTO.getSource());
         }
-        if (CommonUtils.isNotNull(spid)) {
-            criteria.andEqualTo("spid", spid);
+        if (CommonUtils.isNotNull(videosDTO.getSpid())) {
+            criteria.andEqualTo("spid", videosDTO.getSpid());
         }
-        if (CommonUtils.isNotNull(receive)) {
-            criteria.andEqualTo("receive", receive);
-            if (receive == CommonConst.RECEIVE_AFTER) {
-                criteria.andEqualTo("receive_user_id", userId);
+        if (CommonUtils.isNotNull(videosDTO.getReceive())) {
+            criteria.andEqualTo("receive", videosDTO.getReceive());
+            if (videosDTO.getReceive().equals(CommonConst.RECEIVE_AFTER)) {
+                criteria.andEqualTo("receive_user_id", videosDTO.getUserId());
             }
         }
         //默认按上传时间倒序排序
@@ -350,9 +341,9 @@ public class VideosServiceImpl {
         shyVideos.setUpdater("自动审核");
         Integer plat = shyVideos.getPlat();
         String yuming = "";
-        if (plat == CommonConst.QINIU_PLAT) {
+        if (plat.equals(CommonConst.QINIU_PLAT)) {
             yuming = qn_domain + "/";
-        } else if (plat == CommonConst.KS_PLAT) {
+        } else if (plat.equals(CommonConst.KS_PLAT)) {
             yuming = ks_domain + "/";
         }
         String url = "";
@@ -2,7 +2,7 @@ spring.datasource.url=jdbc:mysql://120.92.102.31:3306/new_shy?serverTimezone=Asi
 spring.datasource.username=root
 spring.datasource.password=M345sdfss4!
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 server.tomcat.protocol_header=x-forwarded-proto
 server.use-forward-headers=true