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

王言钊
1 parent 312f38cc
Showing 34 changed files with 1762 additions and 270 deletions
pom.xml
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/EmailDTO.java
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.cnlive.shenhe</groupId>
-    <artifactId>cnlive_shenhe_test</artifactId>
+    <artifactId>cnlive_shenhe</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -194,6 +194,7 @@
     </dependencies>
     <build>
+        <finalName>cnlive_shenhe_test-0.0.1-SNAPSHOT</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
+import com.cnlive.shenhe.dto.AudioDTO;
 import com.cnlive.shenhe.entity.ShyAudio;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
@@ -83,29 +84,30 @@ public class AudioController extends BaseController {
      * @return
      */
     @GetMapping("/page")
-    public Object getListVideos(Model model, 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, HttpSession session) {
+    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();
-        logger.info("sp_Id:{},spid:{}", sp_Id, spid);
+        logger.info("sp_Id:{},spid:{}", audioDTO.getSp_Id(), spid);
         String userId = sessionUser.getUserId();
-        if (CommonUtils.isNull(page)) page = 1;
-        if (CommonUtils.isNull(pageSize)) pageSize = 10;
-        if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
-            ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
+        //if (CommonUtils.isNull(audioDTO.getPage())) {page = 1;}
+        //if (CommonUtils.isNull(audioDTO.getPageSize())) {pageSize = 10;}
+        if (CommonUtils.isNotEmpty(audioDTO.getSp_desc()) && spid == 0) {
+            ShySites shySite = sitesService.findspidBySpdesc(audioDTO.getSp_desc());
             if (CommonUtils.isNotNull(shySite)) {
                 spid = shySite.getSpid();
             } else {
                 setmodelSite(model);
                 return "error.html";
             }
-        } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
+        } else if (CommonUtils.isEmpty(audioDTO.getSp_desc()) && spid == 0) {
             spid = null;
         }
-
-        PageInfo<ShyAudio> audioPage = audioService.getListContent(video_title, start_date, end_date, state, receive, page, pageSize, video_priority, orderByClause, spid, userId, sp_Id);
+        //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());
         if (audioPage != null && audioPage.getSize() > 0) {
             List<ShyAudio> list = audioPage.getList();
             if (list != null && list.size() > 0) {
@@ -137,16 +139,16 @@ public class AudioController extends BaseController {
         }
         //获取参数值给前台 用来判断是否需要把查看显示出来 state recive
-        String state1 = state == null ? "" : state.toString();
+        String state1 = audioDTO.getState() == null ? "" : audioDTO.getState().toString();
         String receive1 = "";
-        if (CommonUtils.isNotNull(receive)) {
-            receive1 = receive == CommonConst.RECEIVE_AFTER ? "true" : "false";
+        if (CommonUtils.isNotNull(audioDTO.getReceive())) {
+            receive1 = audioDTO.getReceive() == CommonConst.RECEIVE_AFTER ? "true" : "false";
         } else {
             receive1 = "";
         }
         model.addAttribute("state1", state1);
         model.addAttribute("receive1", receive1);
-        model.addAttribute("pageSize", pageSize);
+        model.addAttribute("pageSize", audioDTO.getPageSize());
         model.addAttribute("audioPage", audioPage);
         return "page/audio.html";
     }
@@ -276,12 +278,14 @@ public class AudioController extends BaseController {
      * @param response
      */
     @GetMapping("excel")
-    public void getExcel(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String orderByClause, HttpSession session, HttpServletResponse response) {
+    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(video_title, start_date, end_date, state, receive, video_priority, orderByClause, spid, userId);
+        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
         String fileName = "音频数据";
         String updater = "";//审核员名字
         String state1 = "";//审核状态 1已审核 2审核拒绝 0未审核
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
+import com.cnlive.shenhe.dto.ChannelDTO;
 import com.cnlive.shenhe.entity.ShyChannel;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
@@ -60,44 +61,45 @@ public class ChannelController extends BaseController {
      * @return
      */
     @GetMapping("/page")
-    public String getPage(Model model, 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, HttpSession session) {
+    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();
         String userId = sessionUser.getUserId();
-        if (CommonUtils.isNull(page)) page = 1;
-        if (CommonUtils.isNull(pageSize)) pageSize = 10;
-        if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
-            ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
+        //if (CommonUtils.isNull(page)) page = 1;
+        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
+        if (CommonUtils.isNotEmpty(channelDTO.getSp_desc()) && spid == 0) {
+            ShySites shySite = sitesService.findspidBySpdesc(channelDTO.getSp_desc());
             if (CommonUtils.isNotNull(shySite)) {
                 spid = shySite.getSpid();
             } else {
                 setmodelSite(model);
                 return "error.html";
             }
-        } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
+        } else if (CommonUtils.isEmpty(channelDTO.getSp_desc()) && spid == 0) {
             spid = null;
         }
         Date sDate = null;
         Date eDate = null;
-        if (CommonUtils.isNotEmpty(start_date)) {
+        if (CommonUtils.isNotEmpty(channelDTO.getStart_date())) {
             try {
-                sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
+                sDate = CommonUtils.parseDate(channelDTO.getStart_date(), "yyyy-MM-dd");
             } catch (Exception e) {
             }
         }
-        if (CommonUtils.isNotEmpty(end_date)) {
+        if (CommonUtils.isNotEmpty(channelDTO.getEnd_date())) {
             try {
-                eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
+                eDate = CommonUtils.parseDate(channelDTO.getEnd_date(), "yyyy-MM-dd");
             } catch (Exception e) {
             }
         }
-        PageInfo<ShyChannel> channelPage = channelService.getPage(channel_id, channel_name, receive, sDate, eDate, shenhe_status, null, page, pageSize, orderByClause, spid, userId);
+        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);
         List<ShyChannel> list = channelPage.getList();
         if (!list.isEmpty()) {
             for (ShyChannel channel : list) {
@@ -129,9 +131,9 @@ public class ChannelController extends BaseController {
             }
         }
         /* 获取参数值给前台 用来判断是否需要把查看显示出来 state recive*/
-        String state1 = shenhe_status == null ? "" : shenhe_status.toString();
+        String state1 = channelDTO.getShenhe_status() == null ? "" : channelDTO.getShenhe_status().toString();
         model.addAttribute("state1", state1);
-        model.addAttribute("pageSize", pageSize);
+        model.addAttribute("pageSize", channelDTO.getPageSize());
         model.addAttribute("channelPage", channelPage);
         return "page/channel.html";
     }
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
+import com.cnlive.shenhe.dto.CommentsDTO;
 import com.cnlive.shenhe.entity.ShyComments;
 import com.cnlive.shenhe.entity.ShyContent;
 import com.cnlive.shenhe.entity.ShySites;
@@ -55,7 +56,7 @@ public class CommentsController extends BaseController {
     @Autowired
     UsersServiceImpl usersService;
-    
+
     @Autowired
     SitesServiceImpl sitesService;
     @Autowired
@@ -76,9 +77,10 @@ public class CommentsController extends BaseController {
      * @return
      */
     @GetMapping("/page")
-    public String getPage(Model model, String activity_id, String content, Integer is_hot,
-                          String start_date, String end_date, Integer state, Integer receive,
-                          Integer page, Integer pageSize, String orderByClause, HttpSession session, Integer type, Integer comment_user_id) {
+    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";
@@ -86,24 +88,25 @@ public class CommentsController extends BaseController {
         Integer spid = sessionUser.getSpid();
         String userId = sessionUser.getUserId();
         if (spid == 0) spid = null;
-        if (CommonUtils.isNull(page)) page = 1;
-        if (CommonUtils.isNull(pageSize)) pageSize = 10;
+        //if (CommonUtils.isNull(page)) page = 1;
+        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
         Date sDate = null;
         Date eDate = null;
-        if (CommonUtils.isNotEmpty(start_date)) {
+        if (CommonUtils.isNotEmpty(commentsDTO.getStart_date())) {
             try {
-                sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
+                sDate = CommonUtils.parseDate(commentsDTO.getStart_date(), "yyyy-MM-dd");
             } catch (Exception e) {
             }
         }
-        if (CommonUtils.isNotEmpty(end_date)) {
+        if (CommonUtils.isNotEmpty(commentsDTO.getEnd_date())) {
             try {
-                eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
+                eDate = CommonUtils.parseDate(commentsDTO.getEnd_date(), "yyyy-MM-dd");
             } catch (Exception e) {
             }
         }
-        PageInfo<ShyComments> commentPage = commentsService.getPage(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.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
         List<ShyComments> list = commentPage.getList();
         if (!list.isEmpty()) {
             for (ShyComments comment : list) {
@@ -156,9 +159,9 @@ public class CommentsController extends BaseController {
             }
         }
         /* 获取参数值给前台 用来判断是否需要把查看显示出来 state recive*/
-        String state1 = state == null ? "" : state.toString();
+        String state1 = commentsDTO.getState() == null ? "" : commentsDTO.getState().toString();
         model.addAttribute("state1", state1);
-        model.addAttribute("pageSize", pageSize);
+        model.addAttribute("pageSize", commentsDTO.getPageSize());
         model.addAttribute("commentPage", commentPage);
         return "page/comment.html";
     }
@@ -188,7 +191,7 @@ public class CommentsController extends BaseController {
     public ResponseBean pass(String ids, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
-        boolean success = commentsService.updateState(ids, CommonConst.AUDIT_SUCCESS, userId,"","审核通过");
+        boolean success = commentsService.updateState(ids, CommonConst.AUDIT_SUCCESS, userId, "", "审核通过");
         if (success) {
             return new ResponseBean();
         } else {
@@ -207,7 +210,7 @@ public class CommentsController extends BaseController {
     public ResponseBean refuse(String ids, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
-        boolean success = commentsService.updateState(ids, CommonConst.AUDIT_REFUSE, userId,"","审核拒绝");
+        boolean success = commentsService.updateState(ids, CommonConst.AUDIT_REFUSE, userId, "", "审核拒绝");
         if (success) {
             return new ResponseBean();
         } else {
@@ -303,40 +306,43 @@ public class CommentsController extends BaseController {
         }
         return responseBean;
     }
-    
-    
+
+
     /**
      * 根据条件导出excel
      */
     @GetMapping("excel")
-    public void getExcel( 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, HttpSession session,HttpServletResponse response) {
-    	SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
-    	Integer spid = sessionUser.getSpid();
+    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();
         String userId = sessionUser.getUserId();
         if (spid == 0) spid = null;
-        if (CommonUtils.isNull(page)) page = 1;
-        if (CommonUtils.isNull(pageSize)) pageSize = 10;
+        //if (CommonUtils.isNull(page)) page = 1;
+        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
         Date sDate = null;
         Date eDate = null;
-        if (CommonUtils.isNotEmpty(start_date)) {
+        if (CommonUtils.isNotEmpty(commentsDTO.getStart_date())) {
             try {
-                sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
+                sDate = CommonUtils.parseDate(commentsDTO.getStart_date(), "yyyy-MM-dd");
             } catch (Exception e) {
             }
         }
-        if (CommonUtils.isNotEmpty(end_date)) {
+        if (CommonUtils.isNotEmpty(commentsDTO.getEnd_date())) {
             try {
-                eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
+                eDate = CommonUtils.parseDate(commentsDTO.getEnd_date(), "yyyy-MM-dd");
             } catch (Exception e) {
             }
         }
-        PageInfo<ShyComments> commentPage = commentsService.getPageExcel(activity_id, content, is_hot, sDate, eDate, state, receive, null, page, pageSize, orderByClause, spid, userId,type);
-        List<ShyComments> list = commentPage.getList(); 
+        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
+        List<ShyComments> list = commentPage.getList();
         String fileName = "评论数据";
-        
+
         XSSFWorkbook wb = new XSSFWorkbook();
         ServletOutputStream out = null;
         BufferedInputStream bis = null;
@@ -370,32 +376,32 @@ public class CommentsController extends BaseController {
             cell.setCellValue("审核人");
             cell = row.createCell(12);//列
             cell.setCellValue("审核意见");
-            
+
             for (int i = 0; i < list.size(); i++) {
                 row = sheetlist.createRow((short) (i + 1));//行
                 cell = row.createCell(0);//列
                 cell.setCellValue(list.get(i).getId());
                 cell = row.createCell(1);//列
-                cell.setCellValue(list.get(i).getSpid()==null?"":sitesService.findspidDescByspid(list.get(i).getSpid()).getName());
+                cell.setCellValue(list.get(i).getSpid() == null ? "" : sitesService.findspidDescByspid(list.get(i).getSpid()).getName());
                 cell = row.createCell(2);//列
                 cell.setCellValue(list.get(i).getComment_user_id());
                 cell = row.createCell(3);//列
                 cell.setCellValue(list.get(i).getComment_user_name());
-               
+
                 cell = row.createCell(4);//列
                 cell.setCellValue(list.get(i).getComment_content());
-               
+
                 cell = row.createCell(5);//列
                 cell.setCellValue(list.get(i).getComment_title());
-                
-               
-                
+
+
+
                 /*状态需要处理成用户可读*/
                 String common_type = "";//评论类型，topic:话题
-                if (list.get(i).getType().equals(CommonConst.CATEGORY_TOPIC) ) {
-                	common_type = "话题";
+                if (list.get(i).getType().equals(CommonConst.CATEGORY_TOPIC)) {
+                    common_type = "话题";
                 } else {
-                	common_type = "其他";
+                    common_type = "其他";
                 }
                 cell = row.createCell(6);//列
                 cell.setCellValue(common_type);
@@ -404,45 +410,44 @@ public class CommentsController extends BaseController {
                 /*状态需要处理成用户可读*/
                 String platform = "";//评论所属的平台
                 if (list.get(i).getPlatform().equals("a")) {
-                	platform = "安卓";
+                    platform = "安卓";
                 } else if (list.get(i).getPlatform().equals("i")) {
-                	platform = "ios";
+                    platform = "ios";
                 } else {
-                	platform = "未知";
+                    platform = "未知";
                 }
                 cell = row.createCell(8);//列
                 cell.setCellValue(platform);
-                
-              
-                
+
+
                 cell = row.createCell(9);//列
-                cell.setCellValue(list.get(i).getCreated_at()==null?"":CommonUtils.formatDate(list.get(i).getCreated_at(), "yyyy-MM-dd HH:mm:ss"));
-                
+                cell.setCellValue(list.get(i).getCreated_at() == null ? "" : CommonUtils.formatDate(list.get(i).getCreated_at(), "yyyy-MM-dd HH:mm:ss"));
+
                 /*状态需要处理成用户可读*/
                 String shenhe_Status = "";//状态 0.未审核,1:已审核,2审核失败
                 if (list.get(i).getState() == 1) {
-                	shenhe_Status = "已审核";
+                    shenhe_Status = "已审核";
                 } else if (list.get(i).getState() == 2) {
-                	shenhe_Status = "已拒绝";
+                    shenhe_Status = "已拒绝";
                 } else {
-                	shenhe_Status = "未审核";
+                    shenhe_Status = "未审核";
                 }
                 cell = row.createCell(10);//列
                 cell.setCellValue(shenhe_Status);
-                
+
                 /* 审核员需要做处理*/
                 String updater = "";//审核员名字
                 if (list.get(i).getState() != CommonConst.AUDIT_INTT) {
-                	updater = CommonUtils.isEmpty(list.get(i).getUpdater()) || "null".equals(list.get(i).getUpdater())? "自动通过":list.get(i).getUpdater();
+                    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)) {
                         ShyUsers user = new ShyUsers();
                         user.setUser_id(auditor_id);
                         user = usersService.select(user);
                         if (CommonUtils.isNotNull(user)) {
-                        	String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
+                            String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
                             String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                            updater = userName ;
+                            updater = userName;
                         }
                     }
                 }
@@ -450,7 +455,7 @@ public class CommentsController extends BaseController {
                 cell.setCellValue(updater);
                 cell = row.createCell(12);//列
                 cell.setCellValue(list.get(i).getMsg());
-               
+
             }
             ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -3,6 +3,8 @@ package com.cnlive.shenhe.controller;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
+import com.cnlive.shenhe.dto.CommentsDTO;
+import com.cnlive.shenhe.dto.ContentDTO;
 import com.cnlive.shenhe.entity.ShyContent;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
@@ -60,44 +62,46 @@ public class ContentController extends BaseController {
      * @return
      */
     @GetMapping("/page")
-    public String getPage(Model model, 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, HttpSession session) {
+    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
         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;
-        if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
-            ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
+        //if (CommonUtils.isNull(page)) page = 1;
+        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
+        if (CommonUtils.isNotEmpty(contentDTO.getSp_desc()) && spid == 0) {
+            ShySites shySite = sitesService.findspidBySpdesc(contentDTO.getSp_desc());
             if (CommonUtils.isNotNull(shySite)) {
                 spid = shySite.getSpid();
             } else {
                 setmodelSite(model);
                 return "error.html";
             }
-        } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
+        } else if (CommonUtils.isEmpty(contentDTO.getSp_desc()) && spid == 0) {
             spid = null;
         }
         Date sDate = null;
         Date eDate = null;
-        if (CommonUtils.isNotEmpty(start_date)) {
+        if (CommonUtils.isNotEmpty(contentDTO.getStart_date())) {
             try {
-                sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
+                sDate = CommonUtils.parseDate(contentDTO.getStart_date(), "yyyy-MM-dd");
             } catch (Exception e) {
             }
         }
-        if (CommonUtils.isNotEmpty(end_date)) {
+        if (CommonUtils.isNotEmpty(contentDTO.getEnd_date())) {
             try {
-                eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
+                eDate = CommonUtils.parseDate(contentDTO.getEnd_date(), "yyyy-MM-dd");
             } catch (Exception e) {
             }
         }
-        PageInfo<ShyContent> contentPage = contentService.getPage(title, source, author, content_tag, contentId, sDate, eDate, receive_status, null, page, pageSize, orderByClause, spid, userId);
+        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
         List<ShyContent> list = contentPage.getList();
         if (!list.isEmpty()) {
             for (ShyContent content : list) {
@@ -115,7 +119,7 @@ public class ContentController extends BaseController {
             }
         }
         model.addAttribute("contentPage", contentPage);
-        model.addAttribute("pageSize", pageSize);
+        model.addAttribute("pageSize", contentDTO.getPageSize());
         return "page/content.html";
     }
@@ -227,35 +231,37 @@ public class ContentController extends BaseController {
      * 根据条件导出excel
      */
     @GetMapping("excel")
-    public void getExcel(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, HttpSession session, HttpServletResponse response) {
+    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(sp_desc) && spid == 0) {
-            ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
+        if (CommonUtils.isNotEmpty(contentDTO.getSp_desc()) && spid == 0) {
+            ShySites shySite = sitesService.findspidBySpdesc(contentDTO.getSp_desc());
             if (CommonUtils.isNotNull(shySite)) {
                 spid = shySite.getSpid();
             }
-        } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
+        } else if (CommonUtils.isEmpty(contentDTO.getSp_desc()) && spid == 0) {
             spid = null;
         }
         Date sDate = null;
         Date eDate = null;
-        if (CommonUtils.isNotEmpty(start_date)) {
+        if (CommonUtils.isNotEmpty(contentDTO.getStart_date())) {
             try {
-                sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
+                sDate = CommonUtils.parseDate(contentDTO.getStart_date(), "yyyy-MM-dd");
             } catch (Exception e) {
             }
         }
-        if (CommonUtils.isNotEmpty(end_date)) {
+        if (CommonUtils.isNotEmpty(contentDTO.getEnd_date())) {
             try {
-                eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
+                eDate = CommonUtils.parseDate(contentDTO.getEnd_date(), "yyyy-MM-dd");
             } catch (Exception e) {
             }
         }
-        List<ShyContent> contentList = contentService.findByCondition(title, content_tag, contentId, sDate, eDate, receive_status, page, pageSize, orderByClause, spid);
+        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
         String fileName = "图文数据";
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
+import com.cnlive.shenhe.dto.EmailDTO;
 import com.cnlive.shenhe.entity.ShyEmail;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.serviceImpl.EmailServiceImpl;
@@ -44,15 +45,17 @@ public class EmailController extends BaseController {
     @GetMapping(value = "/page")
-    public String page(Model model, Integer page, Integer pageSize, String orderByClause,
-    		String remark,String email,  HttpSession session) {
+    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(page, pageSize, orderByClause, remark,email);
+        //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
         List<ShyEmail> list = emailPage.getList();
         JSONObject email_message = CommonConst.EMAIL_MESSAGE;
         if (!list.isEmpty()) {
@@ -84,7 +87,7 @@ public class EmailController extends BaseController {
             }
         }
         model.addAttribute("emailPage", emailPage);
-        model.addAttribute("pageSize", pageSize);
+        model.addAttribute("pageSize", emailDTO.getPageSize());
         model.addAttribute("email_message", email_message);
         return "page/email.html";
     }
 package com.cnlive.shenhe.controller;
+import com.cnlive.shenhe.dto.LiveApplyDTO;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -126,9 +127,10 @@ public class LiveApplyController extends BaseController {
      * @return
      */
     @GetMapping("/page")
-    public Object getListLiveApply(Model model,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, HttpSession session) {
+    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)){
@@ -136,21 +138,23 @@ public class LiveApplyController extends BaseController {
         }
         Integer spid = sessionUser.getSpid();
         String userId = sessionUser.getUserId();
-        if (CommonUtils.isNull(page)) page = 1;
-        if (CommonUtils.isNull(pageSize)) pageSize = 10;
-        if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
-        	ShySites shySite=sitesService.findspidBySpdesc(sp_desc);
+        //if (CommonUtils.isNull(page)) page = 1;
+        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
+        if (CommonUtils.isNotEmpty(liveApplyDTO.getSp_desc()) && spid == 0) {
+        	ShySites shySite=sitesService.findspidBySpdesc(liveApplyDTO.getSp_desc());
         	if(CommonUtils.isNotNull(shySite)){
         		spid = shySite.getSpid();
         	}else{
         		setmodelSite(model);
         		return "error.html";
         	}
-        } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
+        } else if (CommonUtils.isEmpty(liveApplyDTO.getSp_desc()) && spid == 0) {
             spid = null;
         } 
-        PageInfo<ShyLiveapply> liveApplyPage = liveApplyServiceImpl.getListLiveApply(theme, start_date,end_date,
-        	 business_model, page, pageSize, shenhe_state,receive, orderByClause, spid, userId);
+        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
         List<ShyLiveapply> list = liveApplyPage.getList();
         if (!list.isEmpty()) {
             for (ShyLiveapply liveApply : list) {
@@ -177,7 +181,7 @@ public class LiveApplyController extends BaseController {
             }
         }
         model.addAttribute("liveApplyPage", liveApplyPage);
-        model.addAttribute("pageSize", pageSize);
+        model.addAttribute("pageSize", liveApplyDTO.getPageSize());
         return "page/liveApply.html";
     }
@@ -312,22 +316,25 @@ public class LiveApplyController extends BaseController {
     * 根据条件导出excel
     */
    @GetMapping("excel")
-   public void getExcel(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, HttpSession session,HttpServletResponse response) {
+   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();
        String userId = sessionUser.getUserId();
-       if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
-       	ShySites shySite=sitesService.findspidBySpdesc(sp_desc);
+       if (CommonUtils.isNotEmpty(liveApplyDTO.getSp_desc()) && spid == 0) {
+       	ShySites shySite=sitesService.findspidBySpdesc(liveApplyDTO.getSp_desc());
        	if(CommonUtils.isNotNull(shySite)){
        		spid = shySite.getSpid();
        		}
-       	}else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
+       	}else if (CommonUtils.isEmpty(liveApplyDTO.getSp_desc()) && spid == 0) {
            spid = null;
        	}
-       List<ShyLiveapply>  liveApplyList = liveApplyServiceImpl.findByCondition(theme, start_date,end_date,
-          	 business_model, page, pageSize, shenhe_state,receive, orderByClause, spid, userId);
+       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,
        String fileName = "直播申请数据";
 package com.cnlive.shenhe.controller;
+import com.cnlive.shenhe.dto.LiveDTO;
 import com.cnlive.shenhe.utils.HttpClientUtils;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -125,9 +126,10 @@ public class LiveController extends BaseController {
      * @return
      */
     @GetMapping("/page")
-    public Object getListVideos(Model model, 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, HttpSession session) {
+    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)){
@@ -135,49 +137,50 @@ public class LiveController extends BaseController {
 //        }
         Integer spid = sessionUser.getSpid();
         String userId = sessionUser.getUserId();
-        if (CommonUtils.isNull(page)) page = 1;
-        if (CommonUtils.isNull(pageSize)) pageSize = 20;
-        if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
-            ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
+        //if (CommonUtils.isNull(page)) page = 1;
+        //if (CommonUtils.isNull(pageSize)) pageSize = 20;
+        if (CommonUtils.isNotEmpty(liveDTO.getSp_desc()) && spid == 0) {
+            ShySites shySite = sitesService.findspidBySpdesc(liveDTO.getSp_desc());
             if (CommonUtils.isNotNull(shySite)) {
                 spid = shySite.getSpid();
             } else {
                 setmodelSite(model);
                 return "error.html";
             }
-        } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
+        } else if (CommonUtils.isEmpty(liveDTO.getSp_desc()) && spid == 0) {
             spid = null;
         }
         String orderByClause = "";
-        if (shenhe_state != null && shenhe_state == 0) {//审核状态：全部待领
+        //审核状态：全部待领
+        if (liveDTO.getShenhe_state() != null && liveDTO.getShenhe_state() == 0) {
             orderByClause = "field(activity_status,1,3,2,0,4), pre_start_time ";
-        } else if (shenhe_state != null && shenhe_state == 1) {//审核状态：待审核
+        } else if (liveDTO.getShenhe_state() != null && liveDTO.getShenhe_state() == 1) {//审核状态：待审核
             orderByClause = "field(activity_status,1,3,2,0,4), pre_start_time ";
-        } else if (shenhe_state != null && shenhe_state == 2) {//审核状态：已审核
+        } else if (liveDTO.getShenhe_state() != null && liveDTO.getShenhe_state() == 2) {//审核状态：已审核
             orderByClause = "pre_start_time desc";
         } else {//审核状态：全部
             orderByClause = "is_hot desc, pre_start_time ";
-            if (activity_status != null && (activity_status == 0 || activity_status == 2 || activity_status == 4)) {//直播状态：结束、撤销、下线
+            if (liveDTO.getActivity_status() != null && (liveDTO.getActivity_status() == 0 || liveDTO.getActivity_status() == 2 || liveDTO.getActivity_status() == 4)) {//直播状态：结束、撤销、下线
                 orderByClause = "is_hot desc, pre_start_time desc";
             }
         }
-        if (CommonUtils.isNotNull(contentId)) {
+        if (CommonUtils.isNotNull(liveDTO.getContentId())) {
             Map<String, String> map = new HashMap<>(1);
-            map.put("id", contentId.toString());
+            map.put("id", liveDTO.getContentId().toString());
             String post = HttpClientUtils.get(cms_getVideoAndLiveId, map);
             JSONObject jsonObject = JSONObject.parseObject(post);
             JSONObject data = jsonObject.getJSONObject("data");
             if (data != null) {
                 String pid = data.getString("pid");
-                activity_id = pid;
+                liveDTO.setActivity_id(pid);
             } else {
-                activity_id = contentId.toString();
+                liveDTO.setActivity_id(String.valueOf(liveDTO.getContentId()));
             }
         }
-        PageInfo<ShyLive> livePage = liveService.getListContent(activity_name, start_date, end_date,
-                activity_id, activity_status, page, pageSize, shenhe_state, orderByClause, spid, userId);
+        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);
         List<ShyLive> list = livePage.getList();
         if (!list.isEmpty()) {
             for (ShyLive live : list) {
@@ -189,7 +192,7 @@ public class LiveController extends BaseController {
             }
         }
         model.addAttribute("livePage", livePage);
-        model.addAttribute("pageSize", pageSize);
+        model.addAttribute("pageSize", liveDTO.getPageSize());
         return "page/live.html";
     }
@@ -372,22 +375,23 @@ public class LiveController extends BaseController {
     * 根据条件导出excel
     */
    @GetMapping("excel")
-   public void getExcel(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, HttpSession session,HttpServletResponse response) {
+   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();
-       if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
-       	ShySites shySite=sitesService.findspidBySpdesc(sp_desc);
+       if (CommonUtils.isNotEmpty(liveDTO.getSp_desc()) && spid == 0) {
+       	ShySites shySite=sitesService.findspidBySpdesc(liveDTO.getSp_desc());
        	if(CommonUtils.isNotNull(shySite)){
        		spid = shySite.getSpid();
        		}
-       	}else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
+       	}else if (CommonUtils.isEmpty(liveDTO.getSp_desc()) && spid == 0) {
            spid = null;
        	}
-       List<ShyLive> liveList = liveService.findByCondition(activity_name, start_date,end_date,
-       	      activity_id, activity_status, page, pageSize, shenhe_state, orderByClause, spid,userId);
+       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);
        String fileName = "直播数据";
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
+import com.cnlive.shenhe.dto.NotSpeakDTO;
 import com.cnlive.shenhe.entity.ShyComments;
 import com.cnlive.shenhe.entity.ShyContent;
 import com.cnlive.shenhe.entity.ShyNotspeak;
@@ -66,16 +67,18 @@ public class NotSpeakController extends BaseController {
      * @return
      */
     @GetMapping("/page")
-    public String getPage(Model model, String user_name, Integer user_id,Integer state, 
-                          Integer page, Integer pageSize, String orderByClause, HttpSession session) {
+    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(user_name,user_id, state, page, pageSize, orderByClause);
+        //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
         List<ShyNotspeak> list = shyNotspeakPage.getList();
         if (!list.isEmpty()) {
             for (ShyNotspeak notspeak : list) {
@@ -103,7 +106,7 @@ public class NotSpeakController extends BaseController {
                 }
             }
         }
-        model.addAttribute("pageSize", pageSize);
+        model.addAttribute("pageSize", notSpeakDTO.getPageSize());
         model.addAttribute("notspeakPage", shyNotspeakPage);
         return "page/notspeak.html";
     }
@@ -25,7 +25,7 @@ import java.util.List;
  */
 @Controller
 @RequestMapping("/activity")
-public class ShyActivityController {
+public class ShyActivityController extends BaseController {
     @Autowired
     private ShyActivityImpl shyActivityImpl;
@@ -63,10 +63,11 @@ public class ShyActivityController {
     }
     @GetMapping("/page")
-    public String getShyActivity(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, Model model, String activity, Integer exempt_from_trial) {
-        PageInfo<ShyActivity> shyActivityPageInfo = shyActivityImpl.selectByExample(pageNum, pageSize, activity, exempt_from_trial);
+    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",exempt_from_trial);
+        model.addAttribute("exempt_from_trial",shyActivityDTO.getExempt_from_trial());
         model.addAttribute("ShyActivitylist", shyActivityPageInfo);
         return "page/activity.html";
     }
@@ -2,6 +2,7 @@ package com.cnlive.shenhe.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.SessionUser;
+import com.cnlive.shenhe.dto.SitesDTO;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
@@ -43,7 +44,8 @@ public class SitesController extends BaseController {
      * @return
      */
     @GetMapping(value = "/page")
-    public String page(Model model, Integer page, Integer pageSize, String orderByClause, String keyword, HttpSession session) {
+    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";
@@ -54,9 +56,9 @@ public class SitesController extends BaseController {
     		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(page, pageSize, orderByClause, keyword, spid);
+        //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);
         List<ShySites> list = sitePage.getList();
         JSONObject business = CommonConst.BUSINESS;
         if (!list.isEmpty()) {
@@ -73,7 +75,7 @@ public class SitesController extends BaseController {
             }
         }
         model.addAttribute("sitePage", sitePage);
-        model.addAttribute("pageSize", pageSize);
+        model.addAttribute("pageSize", sitesDTO.getPageSize());
         model.addAttribute("business", business);
         return "page/site.html";
     }
@@ -3,6 +3,7 @@ package com.cnlive.shenhe.controller;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
+import com.cnlive.shenhe.dto.TopicDTO;
 import com.cnlive.shenhe.entity.*;
 import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl;
 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
@@ -64,44 +65,45 @@ public class TopicController extends BaseController {
      * @return
      */
     @GetMapping("/page")
-    public String getPage(Model model,  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, HttpSession session) {
+    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;
-        if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
-        	ShySites shySite=sitesService.findspidBySpdesc(sp_desc);
+        //if (CommonUtils.isNull(page)) page = 1;
+        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
+        if (CommonUtils.isNotEmpty(topicDTO.getSp_desc()) && spid == 0) {
+        	ShySites shySite=sitesService.findspidBySpdesc(topicDTO.getSp_desc());
         	if(CommonUtils.isNotNull(shySite)){
         		spid = shySite.getSpid();
         	}else{
         		setmodelSite(model);
         		return "error.html";
         	}
-        } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
+        } else if (CommonUtils.isEmpty(topicDTO.getSp_desc()) && spid == 0) {
             spid = null;
         }
         Date sDate = null;
         Date eDate = null;
-        if (CommonUtils.isNotEmpty(start_date)) {
+        if (CommonUtils.isNotEmpty(topicDTO.getStart_date())) {
             try {
-                sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
+                sDate = CommonUtils.parseDate(topicDTO.getStart_date(), "yyyy-MM-dd");
             } catch (Exception e) {
             }
         }
-        if (CommonUtils.isNotEmpty(end_date)) {
+        if (CommonUtils.isNotEmpty(topicDTO.getEnd_date())) {
             try {
-                eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
+                eDate = CommonUtils.parseDate(topicDTO.getEnd_date(), "yyyy-MM-dd");
             } catch (Exception e) {
             }
         }
-        PageInfo<ShyTopic> topicPage = topicService.getPage( topic_name,topic_tag,topic_id,  sDate, eDate, shenhe_status, null, page, pageSize, orderByClause, spid, userId,receive);
+        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());
         List<ShyTopic> list = topicPage.getList();
         if (!list.isEmpty()) {
             for (ShyTopic topic : list) {
@@ -123,7 +125,7 @@ public class TopicController extends BaseController {
             }
         }
         model.addAttribute("topicPage", topicPage);
-        model.addAttribute("pageSize", pageSize);
+        model.addAttribute("pageSize", topicDTO.getPageSize());
         return "page/topic.html";
     }
@@ -2,6 +2,7 @@ package com.cnlive.shenhe.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.SessionUser;
+import com.cnlive.shenhe.dto.UsersDTO;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
@@ -81,17 +82,19 @@ public class UsersController extends BaseController {
     @GetMapping(value = "/page")
-    public String page(Model model, Integer page, Integer pageSize, String orderByClause,
-    		String username, String mobile, Integer sp_id, String company_brief, HttpSession session) {
+    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(page, pageSize, orderByClause, username,mobile,sp_id,company_brief);
+        //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());
         List<ShyUsers> list = usersPage.getList();
         JSONObject notice = CommonConst.NOTICE;
         if (!list.isEmpty()) {
@@ -104,7 +107,7 @@ public class UsersController extends BaseController {
             }
         }
         model.addAttribute("usersPage", usersPage);
-        model.addAttribute("pageSize", pageSize);
+        model.addAttribute("pageSize", usersDTO.getPageSize());
         model.addAttribute("notice", notice);
         return "page/users.html";
     }
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
+import com.cnlive.shenhe.dto.UsersFreeDTO;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsersfree;
 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
@@ -39,8 +40,9 @@ public class UsersFreeController extends BaseController {
     SitesServiceImpl sitesService;
     @GetMapping(value = "/page")
-    public String wangjiajiaPage(Model model, Integer page, Integer pageSize, String orderByClause,
-    		String userId, String mobile, HttpSession session) {
+    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";
@@ -50,9 +52,9 @@ public class UsersFreeController extends BaseController {
     		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(page, pageSize, orderByClause, userId,mobile);
+    	//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());
     	List<ShyUsersfree> list = usersPage.getList();
     	JSONObject category = CommonConst.CATEGORY;
     	if (!list.isEmpty()) {
@@ -77,7 +79,7 @@ public class UsersFreeController extends BaseController {
     		}
     	}
     	model.addAttribute("usersPage", usersPage);
-    	model.addAttribute("pageSize", pageSize);
+    	model.addAttribute("pageSize", usersFreeDTO.getPageSize());
     	model.addAttribute("category", category);
     	return "page/usersFree.html";
     }
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
+import com.cnlive.shenhe.dto.VideosDTO;
 import com.cnlive.shenhe.entity.ShyActivity;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
@@ -124,12 +125,14 @@ public class VideosController extends BaseController {
      * @return
      */
     @GetMapping("/page")
-    public Object getListVideos(Model model, 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, HttpSession session) {
-        if (!StringUtils.isEmpty(shen_auditor_id)) {
-            if ((!"自动审核".equals(shen_auditor_id)) && (!"白名单".equals(shen_auditor_id))) {
-                shen_auditor_id = usersService.findspidByName(shen_auditor_id);
+    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()));
+
             }
         }
@@ -139,38 +142,40 @@ public class VideosController extends BaseController {
         }
         Integer sessionUserSpid = sessionUser.getSpid();
-        logger.info("sp_Id:{},sessionUserSpid:{}", sp_Id, sessionUserSpid);
+        logger.info("sp_Id:{},sessionUserSpid:{}", videosDTO.getSp_Id(), sessionUserSpid);
         String userId = sessionUser.getUserId();
-        if (CommonUtils.isNull(page)) page = 1;
-        if (CommonUtils.isNull(pageSize)) pageSize = 10;
-        if (CommonUtils.isNotEmpty(sp_desc) && sessionUserSpid == 0) {
-            ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
+        //if (CommonUtils.isNull(page)) page = 1;
+        //if (CommonUtils.isNull(pageSize)) pageSize = 10;
+        if (CommonUtils.isNotEmpty(videosDTO.getSp_desc()) && sessionUserSpid == 0) {
+            ShySites shySite = sitesService.findspidBySpdesc(videosDTO.getSp_desc());
             if (CommonUtils.isNotNull(shySite)) {
                 sessionUserSpid = shySite.getSpid();
             } else {
                 setmodelSite(model);
                 return "error.html";
             }
-        } else if (CommonUtils.isEmpty(sp_desc) && sessionUserSpid == 0) {
+        } else if (CommonUtils.isEmpty(videosDTO.getSp_desc()) && sessionUserSpid == 0) {
             sessionUserSpid = null;
         }
-        if (CommonUtils.isNotNull(contentId)) {
+        if (CommonUtils.isNotNull(videosDTO.getContentId())) {
             Map<String, String> map = new HashMap<>(1);
-            map.put("id", contentId.toString());
+            map.put("id", videosDTO.getContentId().toString());
             String post = HttpClientUtils.get(cms_getVideoAndLiveId, map);
             JSONObject jsonObject = JSONObject.parseObject(post);
             JSONObject data = jsonObject.getJSONObject("data");
             if (data != null) {
                 String pid = data.getString("pid");
-                video_id = pid;
+                videosDTO.setVideo_id(pid);
+                //video_id = pid;
             } else {
-                video_id = contentId.toString();
+                videosDTO.setVideo_id(String.valueOf(videosDTO.getContentId()));
+                //video_id = contentId.toString();
             }
         }
-        PageInfo<ShyVideos> videoPage = videosService.getListContent(video_title, start_date, end_date, state, receive, page,
-                pageSize, video_priority, orderByClause, sessionUserSpid, userId, sp_Id, source, video_user_id, shen_auditor_id, video_id);
+        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());
         //查询查询条件
         List<ShyActivity> activityList = shyActivityImpl.selectAll();
         List<ShyVideos> list = videoPage.getList();
@@ -212,19 +217,19 @@ public class VideosController extends BaseController {
             }
         }
         /* 获取参数值给前台 用来判断是否需要把查看显示出来 state recive*/
-        String state1 = state == null ? "" : state.toString();
+        String state1 = videosDTO.getState() == null ? "" : videosDTO.getState().toString();
         String receive1;
-        if (CommonUtils.isNotNull(receive)) {
-            receive1 = receive.equals(CommonConst.RECEIVE_AFTER) ? "true" : "false";
+        if (CommonUtils.isNotNull(videosDTO.getReceive())) {
+            receive1 = videosDTO.getReceive().equals(CommonConst.RECEIVE_AFTER) ? "true" : "false";
         } else {
             receive1 = "";
         }
         model.addAttribute("state1", state1);
         model.addAttribute("receive1", receive1);
-        model.addAttribute("pageSize", pageSize);
+        model.addAttribute("pageSize", videosDTO.getPageSize());
         model.addAttribute("videoPage", videoPage);
-        model.addAttribute("sp_Id", sp_Id);
-        model.addAttribute("source", source);
+        model.addAttribute("sp_Id", videosDTO.getSp_Id());
+        model.addAttribute("source", videosDTO.getSource());
         model.addAttribute("activityList", activityList);
         return "page/video.html";
     }
@@ -345,23 +350,26 @@ public class VideosController extends BaseController {
      * @param response
      */
     @GetMapping("excel")
-    public void getExcel(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, HttpSession session, HttpServletResponse response) {
-        if (CommonUtils.isNotEmpty(sp_desc)) {
-            ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
+    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)) {
-                sp_Id = shySite.getSpid();
+                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;
-        if (sp_Id != null) {
-            spid = sp_Id;
+        if (videosDTO.getSp_Id() != null) {
+            spid = Integer.valueOf(videosDTO.getSp_Id());
         }
-        List<ShyVideos> shyVideosList = videosService.findByCondition(video_title, start_date, end_date, state, receive, video_priority, orderByClause, spid, userId, source, video_user_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());
         String fileName = "点播数据";
         String updater = "";//审核员名字
         String state1 = "";//审核状态 1已审核 2审核拒绝 0未审核
+package com.cnlive.shenhe.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ * @author yanzhaowang
+ * @create 2022-03-17 13:43
+ */
+public class AudioDTO implements Serializable {
+
+    private String video_title;
+    private String start_date;
+    private String end_date;
+    private Integer state;
+    private Integer receive;
+    private Integer page = 1;
+    private Integer pageSize = 10;
+    private String video_priority;
+    private String orderByClause;
+    private String sp_desc;
+    private String sp_Id;
+
+    public AudioDTO() {
+    }
+
+    public AudioDTO(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String orderByClause) {
+        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.state = state;
+        this.receive = receive;
+        this.page = page;
+        this.pageSize = pageSize;
+        this.video_priority = video_priority;
+        this.orderByClause = orderByClause;
+        this.sp_desc = sp_desc;
+        this.sp_Id = sp_Id;
+    }
+
+
+    public String getVideo_title() {
+        return video_title;
+    }
+
+    public void setVideo_title(String video_title) {
+        this.video_title = video_title;
+    }
+
+    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;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getReceive() {
+        return receive;
+    }
+
+    public void setReceive(Integer receive) {
+        this.receive = receive;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getVideo_priority() {
+        return video_priority;
+    }
+
+    public void setVideo_priority(String video_priority) {
+        this.video_priority = video_priority;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getSp_desc() {
+        return sp_desc;
+    }
+
+    public void setSp_desc(String sp_desc) {
+        this.sp_desc = sp_desc;
+    }
+
+    public String getSp_Id() {
+        return sp_Id;
+    }
+
+    public void setSp_Id(String sp_Id) {
+        this.sp_Id = sp_Id;
+    }
+}
+
+
+
+package com.cnlive.shenhe.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ * @author yanzhaowang
+ * @create 2022-03-17 14:19
+ */
+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;
+
+    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) {
+        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;
+    }
+
+    public String getChannel_id() {
+        return channel_id;
+    }
+
+    public void setChannel_id(String channel_id) {
+        this.channel_id = channel_id;
+    }
+
+    public String getChannel_name() {
+        return channel_name;
+    }
+
+    public void setChannel_name(String channel_name) {
+        this.channel_name = channel_name;
+    }
+
+    public Integer getReceive() {
+        return receive;
+    }
+
+    public void setReceive(Integer receive) {
+        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;
+    }
+
+    public void setShenhe_status(Integer shenhe_status) {
+        this.shenhe_status = shenhe_status;
+    }
+
+    public String getSp_desc() {
+        return sp_desc;
+    }
+
+    public void setSp_desc(String sp_desc) {
+        this.sp_desc = sp_desc;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+}
+package com.cnlive.shenhe.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ * @author yanzhaowang
+ * @create 2022-03-17 14:31
+ */
+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;
+    private Integer pageSize = 10;
+    private String orderByClause;
+    private Integer type;
+    private Integer comment_user_id;
+
+    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) {
+        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;
+        this.pageSize = pageSize;
+        this.orderByClause = orderByClause;
+        this.type = type;
+        this.comment_user_id = comment_user_id;
+    }
+
+    public String getActivity_id() {
+        return activity_id;
+    }
+
+    public void setActivity_id(String activity_id) {
+        this.activity_id = activity_id;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public Integer getIs_hot() {
+        return is_hot;
+    }
+
+    public void setIs_hot(Integer is_hot) {
+        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;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getReceive() {
+        return receive;
+    }
+
+    public void setReceive(Integer receive) {
+        this.receive = receive;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getComment_user_id() {
+        return comment_user_id;
+    }
+
+    public void setComment_user_id(Integer comment_user_id) {
+        this.comment_user_id = comment_user_id;
+    }
+}
+package com.cnlive.shenhe.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ * @author yanzhaowang
+ * @create 2022-03-17 14:48
+ */
+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;
+    private String author;
+    private Integer page = 1;
+    private Integer pageSize = 10;
+    private String orderByClause;
+
+    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;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContentId() {
+        return contentId;
+    }
+
+    public void setContentId(String contentId) {
+        this.contentId = contentId;
+    }
+
+    public String getContent_tag() {
+        return content_tag;
+    }
+
+    public void setContent_tag(String content_tag) {
+        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;
+    }
+
+    public void setReceive_status(Integer receive_status) {
+        this.receive_status = receive_status;
+    }
+
+    public String getSp_desc() {
+        return sp_desc;
+    }
+
+    public void setSp_desc(String sp_desc) {
+        this.sp_desc = sp_desc;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+}
+package com.cnlive.shenhe.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ * @author yanzhaowang
+ * @create 2022-03-17 15:15
+ */
+public class EmailDTO implements Serializable {
+    private Integer page = 1;
+    private Integer pageSize = 10;
+    private String orderByClause;
+    private String remark;
+    private String email;
+
+    public EmailDTO() {
+    }
+
+    public EmailDTO(Integer page, Integer pageSize, String orderByClause, String remark, String email) {
+        this.page = page;
+        this.pageSize = pageSize;
+        this.orderByClause = orderByClause;
+        this.remark = remark;
+        this.email = email;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+}
+package com.cnlive.shenhe.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ * @author yanzhaowang
+ * @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;
+    private Integer pageSize = 10;
+    private Integer shenhe_state;
+    private Integer receive;
+    private String sp_desc;
+    private String orderByClause;
+
+    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;
+        this.theme = theme;
+        this.business_model = business_model;
+        this.page = page;
+        this.pageSize = pageSize;
+        this.shenhe_state = shenhe_state;
+        this.receive = receive;
+        this.sp_desc = sp_desc;
+        this.orderByClause = orderByClause;
+    }
+
+    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 getTheme() {
+        return theme;
+    }
+
+    public void setTheme(String theme) {
+        this.theme = theme;
+    }
+
+    public String getBusiness_model() {
+        return business_model;
+    }
+
+    public void setBusiness_model(String business_model) {
+        this.business_model = business_model;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Integer getShenhe_state() {
+        return shenhe_state;
+    }
+
+    public void setShenhe_state(Integer shenhe_state) {
+        this.shenhe_state = shenhe_state;
+    }
+
+    public Integer getReceive() {
+        return receive;
+    }
+
+    public void setReceive(Integer receive) {
+        this.receive = receive;
+    }
+
+    public String getSp_desc() {
+        return sp_desc;
+    }
+
+    public void setSp_desc(String sp_desc) {
+        this.sp_desc = sp_desc;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+}
+package com.cnlive.shenhe.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ * @author yanzhaowang
+ * @create 2022-03-17 15:45
+ */
+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;
+    private Integer pageSize = 10;
+    private Integer shenhe_state;
+    private String sp_desc;
+    private Integer contentId;
+    private String orderByClause;
+
+    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) {
+        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;
+        this.pageSize = pageSize;
+        this.shenhe_state = shenhe_state;
+        this.sp_desc = sp_desc;
+        this.contentId = contentId;
+        this.orderByClause = orderByClause;
+    }
+
+    public String getActivity_id() {
+        return activity_id;
+    }
+
+    public void setActivity_id(String activity_id) {
+        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;
+    }
+
+    public void setActivity_name(String activity_name) {
+        this.activity_name = activity_name;
+    }
+
+    public Integer getActivity_status() {
+        return activity_status;
+    }
+
+    public void setActivity_status(Integer activity_status) {
+        this.activity_status = activity_status;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Integer getShenhe_state() {
+        return shenhe_state;
+    }
+
+    public void setShenhe_state(Integer shenhe_state) {
+        this.shenhe_state = shenhe_state;
+    }
+
+    public String getSp_desc() {
+        return sp_desc;
+    }
+
+    public void setSp_desc(String sp_desc) {
+        this.sp_desc = sp_desc;
+    }
+
+    public Integer getContentId() {
+        return contentId;
+    }
+
+    public void setContentId(Integer contentId) {
+        this.contentId = contentId;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+}
+package com.cnlive.shenhe.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ * @author yanzhaowang
+ * @create 2022-03-17 16:09
+ */
+public class NotSpeakDTO implements Serializable {
+
+    private String user_name;
+    private Integer user_id;
+    private Integer state;
+    private Integer page = 1;
+    private Integer pageSize = 10;
+    private String orderByClause;
+
+    public NotSpeakDTO() {
+    }
+
+    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;
+        this.state = state;
+        this.page = page;
+        this.pageSize = pageSize;
+        this.orderByClause = orderByClause;
+    }
+
+    public String getUser_name() {
+        return user_name;
+    }
+
+    public void setUser_name(String user_name) {
+        this.user_name = user_name;
+    }
+
+    public Integer getUser_id() {
+        return user_id;
+    }
+
+    public void setUser_id(Integer user_id) {
+        this.user_id = user_id;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+}
 package com.cnlive.shenhe.dto;
-
-import org.springframework.stereotype.Component;
+import net.bytebuddy.implementation.bind.annotation.Default;
+import org.springframework.beans.factory.annotation.Value;
 import java.io.Serializable;
@@ -10,9 +10,8 @@ import java.io.Serializable;
  * @author yanzhaowang
  * @create 2022-03-14 13:16
  */
-@Component
-public class ShyActivityDTO implements Serializable {
+public class ShyActivityDTO implements Serializable {
     private Integer pageNum = 1;
@@ -21,15 +20,18 @@ public class ShyActivityDTO implements Serializable {
     private String activity;
-    private Byte exempt_from_trial;
+    private Integer exempt_from_trial;
-    public ShyActivityDTO(Integer pageNum, Integer pageSize, String activity, Byte exempt_from_trial) {
+    public ShyActivityDTO(Integer pageNum, Integer pageSize, String activity, Integer exempt_from_trial) {
         this.pageNum = pageNum;
         this.pageSize = pageSize;
         this.activity = activity;
         this.exempt_from_trial = exempt_from_trial;
     }
+    public ShyActivityDTO() {
+    }
+
     public Integer getPageNum() {
         return pageNum;
     }
@@ -54,19 +56,11 @@ public class ShyActivityDTO implements Serializable {
         this.activity = activity;
     }
-    public Byte getExempt_from_trial() {
+    public Integer getExempt_from_trial() {
         return exempt_from_trial;
     }
-    public void setExempt_from_trial(Byte exempt_from_trial) {
+    public void setExempt_from_trial(Integer exempt_from_trial) {
         this.exempt_from_trial = exempt_from_trial;
     }
-
-    public ShyActivityDTO(String activity, Byte exempt_from_trial) {
-        this.activity = activity;
-        this.exempt_from_trial = exempt_from_trial;
-    }
-
-    public ShyActivityDTO() {
-    }
 }
+package com.cnlive.shenhe.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ * @author yanzhaowang
+ * @create 2022-03-17 16:19
+ */
+public class SitesDTO implements Serializable {
+    private Integer page = 1;
+    private Integer pageSize = 10;
+    private String orderByClause;
+    private String keyword;
+
+    public SitesDTO() {
+    }
+
+    public SitesDTO(Integer page, Integer pageSize, String orderByClause, String keyword) {
+        this.page = page;
+        this.pageSize = pageSize;
+        this.orderByClause = orderByClause;
+        this.keyword = keyword;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+}
+package com.cnlive.shenhe.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ * @author yanzhaowang
+ * @create 2022-03-17 16:21
+ */
+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;
+
+    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) {
+        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;
+    }
+
+    public String getTopic_name() {
+        return topic_name;
+    }
+
+    public void setTopic_name(String topic_name) {
+        this.topic_name = topic_name;
+    }
+
+    public String getTopic_id() {
+        return topic_id;
+    }
+
+    public void setTopic_id(String topic_id) {
+        this.topic_id = topic_id;
+    }
+
+    public String getTopic_tag() {
+        return topic_tag;
+    }
+
+    public void setTopic_tag(String topic_tag) {
+        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;
+    }
+
+    public void setShenhe_status(Integer shenhe_status) {
+        this.shenhe_status = shenhe_status;
+    }
+
+    public String getSp_desc() {
+        return sp_desc;
+    }
+
+    public void setSp_desc(String sp_desc) {
+        this.sp_desc = sp_desc;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Integer getReceive() {
+        return receive;
+    }
+
+    public void setReceive(Integer receive) {
+        this.receive = receive;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+}
+package com.cnlive.shenhe.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ * @author yanzhaowang
+ * @create 2022-03-17 16:27
+ */
+public class UsersDTO implements Serializable {
+    private Integer page = 1;
+    private Integer pageSize = 10;
+    private String orderByClause;
+    private String username;
+    private String mobile;
+    private Integer sp_id;
+    private String company_brief;
+
+    public UsersDTO() {
+    }
+
+    public UsersDTO(Integer page, Integer pageSize, String orderByClause, String username, String mobile, Integer sp_id, String company_brief) {
+        this.page = page;
+        this.pageSize = pageSize;
+        this.orderByClause = orderByClause;
+        this.username = username;
+        this.mobile = mobile;
+        this.sp_id = sp_id;
+        this.company_brief = company_brief;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public Integer getSp_id() {
+        return sp_id;
+    }
+
+    public void setSp_id(Integer sp_id) {
+        this.sp_id = sp_id;
+    }
+
+    public String getCompany_brief() {
+        return company_brief;
+    }
+
+    public void setCompany_brief(String company_brief) {
+        this.company_brief = company_brief;
+    }
+}
+package com.cnlive.shenhe.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ * @author yanzhaowang
+ * @create 2022-03-17 16:30
+ */
+public class UsersFreeDTO implements Serializable {
+
+    private Integer page = 1;
+    private Integer pageSize = 10;
+    private String orderByClause;
+    private String userId;
+    private String mobile;
+
+    public UsersFreeDTO() {
+    }
+
+    public UsersFreeDTO(Integer page, Integer pageSize, String orderByClause, String userId, String mobile) {
+        this.page = page;
+        this.pageSize = pageSize;
+        this.orderByClause = orderByClause;
+        this.userId = userId;
+        this.mobile = mobile;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+}
+package com.cnlive.shenhe.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ * @author yanzhaowang
+ * @create 2022-03-17 16:35
+ */
+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;
+    private Integer pageSize = 10;
+    private String video_priority;
+    private String orderByClause;
+    private String sp_desc;
+    private String sp_Id;
+    private String source;
+    private String video_user_id;
+    private String shen_auditor_id;
+    private Integer contentId;
+    private String video_id;
+
+    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) {
+        this.video_title = video_title;
+        this.start_date = start_date;
+        this.end_date = end_date;
+        this.state = state;
+        this.receive = receive;
+        this.page = page;
+        this.pageSize = pageSize;
+        this.video_priority = video_priority;
+        this.orderByClause = orderByClause;
+        this.sp_desc = sp_desc;
+        this.sp_Id = sp_Id;
+        this.source = source;
+        this.video_user_id = video_user_id;
+        this.shen_auditor_id = shen_auditor_id;
+        this.contentId = contentId;
+        this.video_id = video_id;
+    }
+
+    public String getVideo_title() {
+        return video_title;
+    }
+
+    public void setVideo_title(String video_title) {
+        this.video_title = video_title;
+    }
+
+    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;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getReceive() {
+        return receive;
+    }
+
+    public void setReceive(Integer receive) {
+        this.receive = receive;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getVideo_priority() {
+        return video_priority;
+    }
+
+    public void setVideo_priority(String video_priority) {
+        this.video_priority = video_priority;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getSp_desc() {
+        return sp_desc;
+    }
+
+    public void setSp_desc(String sp_desc) {
+        this.sp_desc = sp_desc;
+    }
+
+    public String getSp_Id() {
+        return sp_Id;
+    }
+
+    public void setSp_Id(String sp_Id) {
+        this.sp_Id = sp_Id;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getVideo_user_id() {
+        return video_user_id;
+    }
+
+    public void setVideo_user_id(String video_user_id) {
+        this.video_user_id = video_user_id;
+    }
+
+    public String getShen_auditor_id() {
+        return shen_auditor_id;
+    }
+
+    public void setShen_auditor_id(String shen_auditor_id) {
+        this.shen_auditor_id = shen_auditor_id;
+    }
+
+    public Integer getContentId() {
+        return contentId;
+    }
+
+    public void setContentId(Integer contentId) {
+        this.contentId = contentId;
+    }
+
+    public String getVideo_id() {
+        return video_id;
+    }
+
+    public void setVideo_id(String video_id) {
+        this.video_id = video_id;
+    }
+}
@@ -36,7 +36,8 @@ public class CommentsJob {
     /**
      * 自动退领
      */
-    @Scheduled(cron = "0 0 0 * * ? ")//每天0点执行
+    @Scheduled(cron = "0 0 0 * * ? ")
+    //每天0点执行
     public void autoRetReceive() {
         logger.info("评论自动退领的进入.....");
         ShyComments shyComments = new ShyComments();
@@ -245,7 +245,7 @@ public class LiveApplyServiceImpl {
      * @return
      */
     public List<ShyLiveapply> findByCondition(String theme, String start_date, String end_date, 
-    		Integer business_model, Integer page, Integer pageSize, 
+    		String business_model, Integer page, Integer pageSize,
     		Integer shenhe_state,Integer receive, String orderByClause, Integer spid, String userId) {
         Example example = new Example(ShyLiveapply.class);
         Example.Criteria criteria = example.createCriteria();
 package com.cnlive.shenhe.serviceImpl;
+import com.cnlive.shenhe.dto.ShyActivityDTO;
 import com.cnlive.shenhe.entity.ShyActivity;
 import com.cnlive.shenhe.mapper.ShyActivityMapper;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -68,11 +69,10 @@ public class ShyActivityImpl {
     /**
      * 查询活动
      *
-     * @param pageNum
-     * @param pageSize
+     * @param shyActivityDTO
      * @return
      */
-    public PageInfo<ShyActivity> selectByExample(Integer pageNum, Integer pageSize, String activity, Integer exempt_from_trial) {
+    public PageInfo<ShyActivity> selectByExample(ShyActivityDTO shyActivityDTO) {
         Example example = new Example(ShyActivity.class);
         //如果为空 按照倒序排序  分页查询所有
         //以创建时间为条件进行倒序
@@ -81,14 +81,14 @@ public class ShyActivityImpl {
         Example.Criteria criteria = example.createCriteria();
         // 如果查询条件不为空  按照条件走模糊查询
-        if (exempt_from_trial != null) {
-            criteria.andLike("exempt_from_trial", "%" + exempt_from_trial + "%");
+        if (shyActivityDTO.getExempt_from_trial() != null) {
+            criteria.andLike("exempt_from_trial", "%" + shyActivityDTO.getExempt_from_trial() + "%");
         }
         // 如果查询条件不为空  按照条件走模糊查询
-        if (CommonUtils.isNotEmpty(activity)) {
-            criteria.andLike("activity", "%" + activity + "%");
+        if (CommonUtils.isNotEmpty(shyActivityDTO.getActivity())) {
+            criteria.andLike("activity", "%" + shyActivityDTO.getActivity() + "%");
         }
-        PageHelper.startPage(pageNum, pageSize, true);
+        PageHelper.startPage(shyActivityDTO.getPageNum(), shyActivityDTO.getPageSize(), true);
         List<ShyActivity> shyActivities = ShyActivityMapper.selectByExample(example);
         PageInfo<ShyActivity> shyActivityPageInfo = new PageInfo<>(shyActivities);
         return shyActivityPageInfo;
@@ -287,7 +287,7 @@ public class VideosServiceImpl {
      * @param userId
      * @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, Integer source, String video_user_id) {
+    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) {
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
@@ -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.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 server.tomcat.protocol_header=x-forwarded-proto
 server.use-forward-headers=true
@@ -17,10 +17,10 @@ spring.http.encoding.enabled=true
 spring.http.encoding.force=true
 spring.thymeleaf.mode=LEGACYHTML5
+spring.thymeleaf.cache=false
 #spring.thymeleaf.encoding=UTF-8
 #spring.thymeleaf.content-type=text/html
 #\u5F00\u53D1\u65F6\u5173\u95ED\u7F13\u5B58,\u4E0D\u7136\u6CA1\u6CD5\u770B\u5230\u5B9E\u65F6\u9875\u9762
-spring.thymeleaf.cache=false
 #\u6253\u5370\u8FD0\u884C\u65F6\u7684sql
 #logging.level.com.cnlive.shenhe.mapper=debug
@@ -97,5 +97,5 @@ ks_domain=http://test.wideo.cnlive.com
 #\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84
 desdir=shen
-yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/callbackAudio
-cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanById
+yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/
+cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanByIdcallbackAudio