周伟鹏 / cnlive_shenhe · Commits

Commit a0260a399e6958b31d7f89557709581c725a545b

Authored by 王言钊
1 parent 312f38cc

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

Inline Side-by-side
Showing 34 changed files with 1762 additions and 270 deletions
... ... @@ -4,7 +4,7 @@
4 4 <modelVersion>4.0.0</modelVersion>
5 5  
6 6 <groupId>com.cnlive.shenhe</groupId>
7   - <artifactId>cnlive_shenhe_test</artifactId>
  7 + <artifactId>cnlive_shenhe</artifactId>
8 8 <version>0.0.1-SNAPSHOT</version>
9 9 <packaging>jar</packaging>
10 10  
... ... @@ -194,6 +194,7 @@
194 194 </dependencies>
195 195  
196 196 <build>
  197 + <finalName>cnlive_shenhe_test-0.0.1-SNAPSHOT</finalName>
197 198 <plugins>
198 199 <plugin>
199 200 <groupId>org.springframework.boot</groupId>
... ...
src/main/java/com/cnlive/shenhe/controller/AudioController.java
  View file @a0260a3
... ... @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
5 5 import com.cnlive.shenhe.bean.ErrorEnum;
6 6 import com.cnlive.shenhe.bean.ResponseBean;
7 7 import com.cnlive.shenhe.bean.SessionUser;
  8 +import com.cnlive.shenhe.dto.AudioDTO;
8 9 import com.cnlive.shenhe.entity.ShyAudio;
9 10 import com.cnlive.shenhe.entity.ShySites;
10 11 import com.cnlive.shenhe.entity.ShyUsers;
... ... @@ -83,29 +84,30 @@ public class AudioController extends BaseController {
83 84 * @return
84 85 */
85 86 @GetMapping("/page")
86   - 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) {
  87 + public Object getListVideos(Model model, AudioDTO audioDTO, HttpSession session) {
  88 + //, 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
87 89 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
88 90 if (CommonUtils.isNull(sessionUser)) {
89 91 return "redirect:/users/login";
90 92 }
91 93 Integer spid = sessionUser.getSpid();
92   - logger.info("sp_Id:{},spid:{}", sp_Id, spid);
  94 + logger.info("sp_Id:{},spid:{}", audioDTO.getSp_Id(), spid);
93 95 String userId = sessionUser.getUserId();
94   - if (CommonUtils.isNull(page)) page = 1;
95   - if (CommonUtils.isNull(pageSize)) pageSize = 10;
96   - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
97   - ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
  96 + //if (CommonUtils.isNull(audioDTO.getPage())) {page = 1;}
  97 + //if (CommonUtils.isNull(audioDTO.getPageSize())) {pageSize = 10;}
  98 + if (CommonUtils.isNotEmpty(audioDTO.getSp_desc()) && spid == 0) {
  99 + ShySites shySite = sitesService.findspidBySpdesc(audioDTO.getSp_desc());
98 100 if (CommonUtils.isNotNull(shySite)) {
99 101 spid = shySite.getSpid();
100 102 } else {
101 103 setmodelSite(model);
102 104 return "error.html";
103 105 }
104   - } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
  106 + } else if (CommonUtils.isEmpty(audioDTO.getSp_desc()) && spid == 0) {
105 107 spid = null;
106 108 }
107   -
108   - PageInfo<ShyAudio> audioPage = audioService.getListContent(video_title, start_date, end_date, state, receive, page, pageSize, video_priority, orderByClause, spid, userId, sp_Id);
  109 + //video_title, start_date, end_date, state, receive, page, pageSize, video_priority, orderByClause, spid, userId, sp_Id
  110 + 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());
109 111 if (audioPage != null && audioPage.getSize() > 0) {
110 112 List<ShyAudio> list = audioPage.getList();
111 113 if (list != null && list.size() > 0) {
... ... @@ -137,16 +139,16 @@ public class AudioController extends BaseController {
137 139 }
138 140  
139 141 //获取参数值给前台 用来判断是否需要把查看显示出来 state recive
140   - String state1 = state == null ? "" : state.toString();
  142 + String state1 = audioDTO.getState() == null ? "" : audioDTO.getState().toString();
141 143 String receive1 = "";
142   - if (CommonUtils.isNotNull(receive)) {
143   - receive1 = receive == CommonConst.RECEIVE_AFTER ? "true" : "false";
  144 + if (CommonUtils.isNotNull(audioDTO.getReceive())) {
  145 + receive1 = audioDTO.getReceive() == CommonConst.RECEIVE_AFTER ? "true" : "false";
144 146 } else {
145 147 receive1 = "";
146 148 }
147 149 model.addAttribute("state1", state1);
148 150 model.addAttribute("receive1", receive1);
149   - model.addAttribute("pageSize", pageSize);
  151 + model.addAttribute("pageSize", audioDTO.getPageSize());
150 152 model.addAttribute("audioPage", audioPage);
151 153 return "page/audio.html";
152 154 }
... ... @@ -276,12 +278,14 @@ public class AudioController extends BaseController {
276 278 * @param response
277 279 */
278 280 @GetMapping("excel")
279   - 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) {
  281 + public void getExcel(AudioDTO audioDTO, HttpSession session, HttpServletResponse response) {
  282 + //String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String orderByClause
280 283 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
281 284 Integer spid = sessionUser.getSpid();
282 285 String userId = sessionUser.getUserId();
283 286 if (spid == 0) spid = null;
284   - List<ShyAudio> shyAudioList = audioService.findByCondition(video_title, start_date, end_date, state, receive, video_priority, orderByClause, spid, userId);
  287 + 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);
  288 + //video_title, start_date, end_date, state, receive, video_priority, orderByClause
285 289 String fileName = "音频数据";
286 290 String updater = "";//审核员名字
287 291 String state1 = "";//审核状态 1已审核 2审核拒绝 0未审核
... ...
src/main/java/com/cnlive/shenhe/controller/ChannelController.java
  View file @a0260a3
... ... @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
4 4 import com.cnlive.shenhe.bean.ErrorEnum;
5 5 import com.cnlive.shenhe.bean.ResponseBean;
6 6 import com.cnlive.shenhe.bean.SessionUser;
  7 +import com.cnlive.shenhe.dto.ChannelDTO;
7 8 import com.cnlive.shenhe.entity.ShyChannel;
8 9 import com.cnlive.shenhe.entity.ShySites;
9 10 import com.cnlive.shenhe.entity.ShyUsers;
... ... @@ -60,44 +61,45 @@ public class ChannelController extends BaseController {
60 61 * @return
61 62 */
62 63 @GetMapping("/page")
63   - public String getPage(Model model, String channel_id, String channel_name, Integer receive,
64   - String start_date, String end_date, Integer shenhe_status, String sp_desc,
65   - Integer page, Integer pageSize, String orderByClause, HttpSession session) {
  64 + public String getPage(Model model, ChannelDTO channelDTO, HttpSession session) {
  65 + //String channel_id, String channel_name, Integer receive,
  66 + // String start_date, String end_date, Integer shenhe_status, String sp_desc,
  67 + // Integer page, Integer pageSize, String orderByClause,
66 68 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
67 69 if (CommonUtils.isNull(sessionUser)) {
68 70 return "redirect:/users/login";
69 71 }
70 72 Integer spid = sessionUser.getSpid();
71 73 String userId = sessionUser.getUserId();
72   - if (CommonUtils.isNull(page)) page = 1;
73   - if (CommonUtils.isNull(pageSize)) pageSize = 10;
74   - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
75   - ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
  74 + //if (CommonUtils.isNull(page)) page = 1;
  75 + //if (CommonUtils.isNull(pageSize)) pageSize = 10;
  76 + if (CommonUtils.isNotEmpty(channelDTO.getSp_desc()) && spid == 0) {
  77 + ShySites shySite = sitesService.findspidBySpdesc(channelDTO.getSp_desc());
76 78 if (CommonUtils.isNotNull(shySite)) {
77 79 spid = shySite.getSpid();
78 80 } else {
79 81 setmodelSite(model);
80 82 return "error.html";
81 83 }
82   - } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
  84 + } else if (CommonUtils.isEmpty(channelDTO.getSp_desc()) && spid == 0) {
83 85 spid = null;
84 86 }
85 87 Date sDate = null;
86 88 Date eDate = null;
87 89  
88   - if (CommonUtils.isNotEmpty(start_date)) {
  90 + if (CommonUtils.isNotEmpty(channelDTO.getStart_date())) {
89 91 try {
90   - sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
  92 + sDate = CommonUtils.parseDate(channelDTO.getStart_date(), "yyyy-MM-dd");
91 93 } catch (Exception e) {
92 94 }
93 95 }
94   - if (CommonUtils.isNotEmpty(end_date)) {
  96 + if (CommonUtils.isNotEmpty(channelDTO.getEnd_date())) {
95 97 try {
96   - eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
  98 + eDate = CommonUtils.parseDate(channelDTO.getEnd_date(), "yyyy-MM-dd");
97 99 } catch (Exception e) {
98 100 }
99 101 }
100   - PageInfo<ShyChannel> channelPage = channelService.getPage(channel_id, channel_name, receive, sDate, eDate, shenhe_status, null, page, pageSize, orderByClause, spid, userId);
  102 + 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);
101 103 List<ShyChannel> list = channelPage.getList();
102 104 if (!list.isEmpty()) {
103 105 for (ShyChannel channel : list) {
... ... @@ -129,9 +131,9 @@ public class ChannelController extends BaseController {
129 131 }
130 132 }
131 133 /* 获取参数值给前台 用来判断是否需要把查看显示出来 state recive*/
132   - String state1 = shenhe_status == null ? "" : shenhe_status.toString();
  134 + String state1 = channelDTO.getShenhe_status() == null ? "" : channelDTO.getShenhe_status().toString();
133 135 model.addAttribute("state1", state1);
134   - model.addAttribute("pageSize", pageSize);
  136 + model.addAttribute("pageSize", channelDTO.getPageSize());
135 137 model.addAttribute("channelPage", channelPage);
136 138 return "page/channel.html";
137 139 }
... ...
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
  View file @a0260a3
... ... @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
4 4 import com.cnlive.shenhe.bean.ErrorEnum;
5 5 import com.cnlive.shenhe.bean.ResponseBean;
6 6 import com.cnlive.shenhe.bean.SessionUser;
  7 +import com.cnlive.shenhe.dto.CommentsDTO;
7 8 import com.cnlive.shenhe.entity.ShyComments;
8 9 import com.cnlive.shenhe.entity.ShyContent;
9 10 import com.cnlive.shenhe.entity.ShySites;
... ... @@ -55,7 +56,7 @@ public class CommentsController extends BaseController {
55 56  
56 57 @Autowired
57 58 UsersServiceImpl usersService;
58   -
  59 +
59 60 @Autowired
60 61 SitesServiceImpl sitesService;
61 62 @Autowired
... ... @@ -76,9 +77,10 @@ public class CommentsController extends BaseController {
76 77 * @return
77 78 */
78 79 @GetMapping("/page")
79   - public String getPage(Model model, String activity_id, String content, Integer is_hot,
80   - String start_date, String end_date, Integer state, Integer receive,
81   - Integer page, Integer pageSize, String orderByClause, HttpSession session, Integer type, Integer comment_user_id) {
  80 + public String getPage(Model model, CommentsDTO commentsDTO, HttpSession session) {
  81 + //String activity_id, String content, Integer is_hot,
  82 + // String start_date, String end_date, Integer state, Integer receive,
  83 + // Integer page, Integer pageSize, String orderByClause, Integer type, Integer comment_user_id
82 84 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
83 85 if (CommonUtils.isNull(sessionUser)) {
84 86 return "redirect:/users/login";
... ... @@ -86,24 +88,25 @@ public class CommentsController extends BaseController {
86 88 Integer spid = sessionUser.getSpid();
87 89 String userId = sessionUser.getUserId();
88 90 if (spid == 0) spid = null;
89   - if (CommonUtils.isNull(page)) page = 1;
90   - if (CommonUtils.isNull(pageSize)) pageSize = 10;
  91 + //if (CommonUtils.isNull(page)) page = 1;
  92 + //if (CommonUtils.isNull(pageSize)) pageSize = 10;
91 93 Date sDate = null;
92 94 Date eDate = null;
93 95  
94   - if (CommonUtils.isNotEmpty(start_date)) {
  96 + if (CommonUtils.isNotEmpty(commentsDTO.getStart_date())) {
95 97 try {
96   - sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
  98 + sDate = CommonUtils.parseDate(commentsDTO.getStart_date(), "yyyy-MM-dd");
97 99 } catch (Exception e) {
98 100 }
99 101 }
100   - if (CommonUtils.isNotEmpty(end_date)) {
  102 + if (CommonUtils.isNotEmpty(commentsDTO.getEnd_date())) {
101 103 try {
102   - eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
  104 + eDate = CommonUtils.parseDate(commentsDTO.getEnd_date(), "yyyy-MM-dd");
103 105 } catch (Exception e) {
104 106 }
105 107 }
106   - PageInfo<ShyComments> commentPage = commentsService.getPage(activity_id, content, is_hot, sDate, eDate, state, receive, null, page, pageSize, orderByClause, spid, userId, type, comment_user_id);
  108 + 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());
  109 + //activity_id, content, is_hot, sDate, eDate, state, receive, null, page, pageSize, orderByClause, spid, userId, type, comment_user_id
107 110 List<ShyComments> list = commentPage.getList();
108 111 if (!list.isEmpty()) {
109 112 for (ShyComments comment : list) {
... ... @@ -156,9 +159,9 @@ public class CommentsController extends BaseController {
156 159 }
157 160 }
158 161 /* 获取参数值给前台 用来判断是否需要把查看显示出来 state recive*/
159   - String state1 = state == null ? "" : state.toString();
  162 + String state1 = commentsDTO.getState() == null ? "" : commentsDTO.getState().toString();
160 163 model.addAttribute("state1", state1);
161   - model.addAttribute("pageSize", pageSize);
  164 + model.addAttribute("pageSize", commentsDTO.getPageSize());
162 165 model.addAttribute("commentPage", commentPage);
163 166 return "page/comment.html";
164 167 }
... ... @@ -188,7 +191,7 @@ public class CommentsController extends BaseController {
188 191 public ResponseBean pass(String ids, HttpSession session) {
189 192 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
190 193 String userId = sessionUser.getUserId();
191   - boolean success = commentsService.updateState(ids, CommonConst.AUDIT_SUCCESS, userId,"","审核通过");
  194 + boolean success = commentsService.updateState(ids, CommonConst.AUDIT_SUCCESS, userId, "", "审核通过");
192 195 if (success) {
193 196 return new ResponseBean();
194 197 } else {
... ... @@ -207,7 +210,7 @@ public class CommentsController extends BaseController {
207 210 public ResponseBean refuse(String ids, HttpSession session) {
208 211 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
209 212 String userId = sessionUser.getUserId();
210   - boolean success = commentsService.updateState(ids, CommonConst.AUDIT_REFUSE, userId,"","审核拒绝");
  213 + boolean success = commentsService.updateState(ids, CommonConst.AUDIT_REFUSE, userId, "", "审核拒绝");
211 214 if (success) {
212 215 return new ResponseBean();
213 216 } else {
... ... @@ -303,40 +306,43 @@ public class CommentsController extends BaseController {
303 306 }
304 307 return responseBean;
305 308 }
306   -
307   -
  309 +
  310 +
308 311 /**
309 312 * 根据条件导出excel
310 313 */
311 314 @GetMapping("excel")
312   - public void getExcel( String activity_id, String content, Integer is_hot,
313   - String start_date, String end_date, Integer state, Integer receive,Integer type,
314   - Integer page, Integer pageSize, String orderByClause, HttpSession session,HttpServletResponse response) {
315   - SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
316   - Integer spid = sessionUser.getSpid();
  315 + public void getExcel(CommentsDTO commentsDTO, HttpSession session, HttpServletResponse response) {
  316 +
  317 + //String activity_id, String content, Integer is_hot,
  318 + // String start_date, String end_date, Integer state, Integer receive, Integer type,
  319 + // Integer page, Integer pageSize, String orderByClause,
  320 + SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
  321 + Integer spid = sessionUser.getSpid();
317 322 String userId = sessionUser.getUserId();
318 323 if (spid == 0) spid = null;
319   - if (CommonUtils.isNull(page)) page = 1;
320   - if (CommonUtils.isNull(pageSize)) pageSize = 10;
  324 + //if (CommonUtils.isNull(page)) page = 1;
  325 + //if (CommonUtils.isNull(pageSize)) pageSize = 10;
321 326 Date sDate = null;
322 327 Date eDate = null;
323 328  
324   - if (CommonUtils.isNotEmpty(start_date)) {
  329 + if (CommonUtils.isNotEmpty(commentsDTO.getStart_date())) {
325 330 try {
326   - sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
  331 + sDate = CommonUtils.parseDate(commentsDTO.getStart_date(), "yyyy-MM-dd");
327 332 } catch (Exception e) {
328 333 }
329 334 }
330   - if (CommonUtils.isNotEmpty(end_date)) {
  335 + if (CommonUtils.isNotEmpty(commentsDTO.getEnd_date())) {
331 336 try {
332   - eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
  337 + eDate = CommonUtils.parseDate(commentsDTO.getEnd_date(), "yyyy-MM-dd");
333 338 } catch (Exception e) {
334 339 }
335 340 }
336   - PageInfo<ShyComments> commentPage = commentsService.getPageExcel(activity_id, content, is_hot, sDate, eDate, state, receive, null, page, pageSize, orderByClause, spid, userId,type);
337   - List<ShyComments> list = commentPage.getList();
  341 + 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());
  342 + //activity_id, content, is_hot, sDate, eDate, state, receive, null, page, pageSize, orderByClause, spid, userId, type
  343 + List<ShyComments> list = commentPage.getList();
338 344 String fileName = "评论数据";
339   -
  345 +
340 346 XSSFWorkbook wb = new XSSFWorkbook();
341 347 ServletOutputStream out = null;
342 348 BufferedInputStream bis = null;
... ... @@ -370,32 +376,32 @@ public class CommentsController extends BaseController {
370 376 cell.setCellValue("审核人");
371 377 cell = row.createCell(12);//列
372 378 cell.setCellValue("审核意见");
373   -
  379 +
374 380 for (int i = 0; i < list.size(); i++) {
375 381 row = sheetlist.createRow((short) (i + 1));//行
376 382 cell = row.createCell(0);//列
377 383 cell.setCellValue(list.get(i).getId());
378 384 cell = row.createCell(1);//列
379   - cell.setCellValue(list.get(i).getSpid()==null?"":sitesService.findspidDescByspid(list.get(i).getSpid()).getName());
  385 + cell.setCellValue(list.get(i).getSpid() == null ? "" : sitesService.findspidDescByspid(list.get(i).getSpid()).getName());
380 386 cell = row.createCell(2);//列
381 387 cell.setCellValue(list.get(i).getComment_user_id());
382 388 cell = row.createCell(3);//列
383 389 cell.setCellValue(list.get(i).getComment_user_name());
384   -
  390 +
385 391 cell = row.createCell(4);//列
386 392 cell.setCellValue(list.get(i).getComment_content());
387   -
  393 +
388 394 cell = row.createCell(5);//列
389 395 cell.setCellValue(list.get(i).getComment_title());
390   -
391   -
392   -
  396 +
  397 +
  398 +
393 399 /*状态需要处理成用户可读*/
394 400 String common_type = "";//评论类型，topic:话题
395   - if (list.get(i).getType().equals(CommonConst.CATEGORY_TOPIC) ) {
396   - common_type = "话题";
  401 + if (list.get(i).getType().equals(CommonConst.CATEGORY_TOPIC)) {
  402 + common_type = "话题";
397 403 } else {
398   - common_type = "其他";
  404 + common_type = "其他";
399 405 }
400 406 cell = row.createCell(6);//列
401 407 cell.setCellValue(common_type);
... ... @@ -404,45 +410,44 @@ public class CommentsController extends BaseController {
404 410 /*状态需要处理成用户可读*/
405 411 String platform = "";//评论所属的平台
406 412 if (list.get(i).getPlatform().equals("a")) {
407   - platform = "安卓";
  413 + platform = "安卓";
408 414 } else if (list.get(i).getPlatform().equals("i")) {
409   - platform = "ios";
  415 + platform = "ios";
410 416 } else {
411   - platform = "未知";
  417 + platform = "未知";
412 418 }
413 419 cell = row.createCell(8);//列
414 420 cell.setCellValue(platform);
415   -
416   -
417   -
  421 +
  422 +
418 423 cell = row.createCell(9);//列
419   - cell.setCellValue(list.get(i).getCreated_at()==null?"":CommonUtils.formatDate(list.get(i).getCreated_at(), "yyyy-MM-dd HH:mm:ss"));
420   -
  424 + cell.setCellValue(list.get(i).getCreated_at() == null ? "" : CommonUtils.formatDate(list.get(i).getCreated_at(), "yyyy-MM-dd HH:mm:ss"));
  425 +
421 426 /*状态需要处理成用户可读*/
422 427 String shenhe_Status = "";//状态 0.未审核,1:已审核,2审核失败
423 428 if (list.get(i).getState() == 1) {
424   - shenhe_Status = "已审核";
  429 + shenhe_Status = "已审核";
425 430 } else if (list.get(i).getState() == 2) {
426   - shenhe_Status = "已拒绝";
  431 + shenhe_Status = "已拒绝";
427 432 } else {
428   - shenhe_Status = "未审核";
  433 + shenhe_Status = "未审核";
429 434 }
430 435 cell = row.createCell(10);//列
431 436 cell.setCellValue(shenhe_Status);
432   -
  437 +
433 438 /* 审核员需要做处理*/
434 439 String updater = "";//审核员名字
435 440 if (list.get(i).getState() != CommonConst.AUDIT_INTT) {
436   - updater = CommonUtils.isEmpty(list.get(i).getUpdater()) || "null".equals(list.get(i).getUpdater())? "自动通过":list.get(i).getUpdater();
  441 + updater = CommonUtils.isEmpty(list.get(i).getUpdater()) || "null".equals(list.get(i).getUpdater()) ? "自动通过" : list.get(i).getUpdater();
437 442 String auditor_id = list.get(i).getAuditor_id();
438 443 if (CommonUtils.isNotEmpty(auditor_id)) {
439 444 ShyUsers user = new ShyUsers();
440 445 user.setUser_id(auditor_id);
441 446 user = usersService.select(user);
442 447 if (CommonUtils.isNotNull(user)) {
443   - String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
  448 + String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
444 449 String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
445   - updater = userName ;
  450 + updater = userName;
446 451 }
447 452 }
448 453 }
... ... @@ -450,7 +455,7 @@ public class CommentsController extends BaseController {
450 455 cell.setCellValue(updater);
451 456 cell = row.createCell(12);//列
452 457 cell.setCellValue(list.get(i).getMsg());
453   -
  458 +
454 459 }
455 460  
456 461 ByteArrayOutputStream os = new ByteArrayOutputStream();
... ...
src/main/java/com/cnlive/shenhe/controller/ContentController.java
  View file @a0260a3
... ... @@ -3,6 +3,8 @@ package com.cnlive.shenhe.controller;
3 3 import com.cnlive.shenhe.bean.ErrorEnum;
4 4 import com.cnlive.shenhe.bean.ResponseBean;
5 5 import com.cnlive.shenhe.bean.SessionUser;
  6 +import com.cnlive.shenhe.dto.CommentsDTO;
  7 +import com.cnlive.shenhe.dto.ContentDTO;
6 8 import com.cnlive.shenhe.entity.ShyContent;
7 9 import com.cnlive.shenhe.entity.ShySites;
8 10 import com.cnlive.shenhe.entity.ShyUsers;
... ... @@ -60,44 +62,46 @@ public class ContentController extends BaseController {
60 62 * @return
61 63 */
62 64 @GetMapping("/page")
63   - public String getPage(Model model, String title, String contentId, String content_tag,
64   - String start_date, String end_date, Integer receive_status, String sp_desc, String source, String author,
65   - Integer page, Integer pageSize, String orderByClause, HttpSession session) {
  65 + public String getPage(Model model, ContentDTO contentDTO , HttpSession session) {
  66 + //String title, String contentId, String content_tag,
  67 + // String start_date, String end_date, Integer receive_status, String sp_desc, String source, String author,
  68 + // Integer page, Integer pageSize, String orderByClause
66 69 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
67 70 if (CommonUtils.isNull(sessionUser)) {
68 71 return "redirect:/users/login";
69 72 }
70 73 Integer spid = sessionUser.getSpid();
71 74 String userId = sessionUser.getUserId();
72   - if (CommonUtils.isNull(page)) page = 1;
73   - if (CommonUtils.isNull(pageSize)) pageSize = 10;
74   - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
75   - ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
  75 + //if (CommonUtils.isNull(page)) page = 1;
  76 + //if (CommonUtils.isNull(pageSize)) pageSize = 10;
  77 + if (CommonUtils.isNotEmpty(contentDTO.getSp_desc()) && spid == 0) {
  78 + ShySites shySite = sitesService.findspidBySpdesc(contentDTO.getSp_desc());
76 79 if (CommonUtils.isNotNull(shySite)) {
77 80 spid = shySite.getSpid();
78 81 } else {
79 82 setmodelSite(model);
80 83 return "error.html";
81 84 }
82   - } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
  85 + } else if (CommonUtils.isEmpty(contentDTO.getSp_desc()) && spid == 0) {
83 86 spid = null;
84 87 }
85 88 Date sDate = null;
86 89 Date eDate = null;
87 90  
88   - if (CommonUtils.isNotEmpty(start_date)) {
  91 + if (CommonUtils.isNotEmpty(contentDTO.getStart_date())) {
89 92 try {
90   - sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
  93 + sDate = CommonUtils.parseDate(contentDTO.getStart_date(), "yyyy-MM-dd");
91 94 } catch (Exception e) {
92 95 }
93 96 }
94   - if (CommonUtils.isNotEmpty(end_date)) {
  97 + if (CommonUtils.isNotEmpty(contentDTO.getEnd_date())) {
95 98 try {
96   - eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
  99 + eDate = CommonUtils.parseDate(contentDTO.getEnd_date(), "yyyy-MM-dd");
97 100 } catch (Exception e) {
98 101 }
99 102 }
100   - PageInfo<ShyContent> contentPage = contentService.getPage(title, source, author, content_tag, contentId, sDate, eDate, receive_status, null, page, pageSize, orderByClause, spid, userId);
  103 + 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);
  104 + //title, source, author, content_tag, contentId, sDate, eDate, receive_status, null, page, pageSize, orderByClause, spid, userId
101 105 List<ShyContent> list = contentPage.getList();
102 106 if (!list.isEmpty()) {
103 107 for (ShyContent content : list) {
... ... @@ -115,7 +119,7 @@ public class ContentController extends BaseController {
115 119 }
116 120 }
117 121 model.addAttribute("contentPage", contentPage);
118   - model.addAttribute("pageSize", pageSize);
  122 + model.addAttribute("pageSize", contentDTO.getPageSize());
119 123 return "page/content.html";
120 124 }
121 125  
... ... @@ -227,35 +231,37 @@ public class ContentController extends BaseController {
227 231 * 根据条件导出excel
228 232 */
229 233 @GetMapping("excel")
230   - public void getExcel(String title, String contentId, String content_tag,
231   - String start_date, String end_date, Integer receive_status, String sp_desc,
232   - Integer page, Integer pageSize, String orderByClause, HttpSession session, HttpServletResponse response) {
  234 + public void getExcel(ContentDTO contentDTO, HttpSession session, HttpServletResponse response) {
  235 + //String title, String contentId, String content_tag,
  236 + // String start_date, String end_date, Integer receive_status, String sp_desc,
  237 + // Integer page, Integer pageSize, String orderByClause
233 238 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
234 239 Integer spid = sessionUser.getSpid();
235   - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
236   - ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
  240 + if (CommonUtils.isNotEmpty(contentDTO.getSp_desc()) && spid == 0) {
  241 + ShySites shySite = sitesService.findspidBySpdesc(contentDTO.getSp_desc());
237 242 if (CommonUtils.isNotNull(shySite)) {
238 243 spid = shySite.getSpid();
239 244 }
240   - } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
  245 + } else if (CommonUtils.isEmpty(contentDTO.getSp_desc()) && spid == 0) {
241 246 spid = null;
242 247 }
243 248 Date sDate = null;
244 249 Date eDate = null;
245 250  
246   - if (CommonUtils.isNotEmpty(start_date)) {
  251 + if (CommonUtils.isNotEmpty(contentDTO.getStart_date())) {
247 252 try {
248   - sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
  253 + sDate = CommonUtils.parseDate(contentDTO.getStart_date(), "yyyy-MM-dd");
249 254 } catch (Exception e) {
250 255 }
251 256 }
252   - if (CommonUtils.isNotEmpty(end_date)) {
  257 + if (CommonUtils.isNotEmpty(contentDTO.getEnd_date())) {
253 258 try {
254   - eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
  259 + eDate = CommonUtils.parseDate(contentDTO.getEnd_date(), "yyyy-MM-dd");
255 260 } catch (Exception e) {
256 261 }
257 262 }
258   - List<ShyContent> contentList = contentService.findByCondition(title, content_tag, contentId, sDate, eDate, receive_status, page, pageSize, orderByClause, spid);
  263 + List<ShyContent> contentList = contentService.findByCondition(contentDTO.getTitle(), contentDTO.getContent_tag(), contentDTO.getContentId(), sDate, eDate, contentDTO.getReceive_status(), contentDTO.getPage(), contentDTO.getPageSize(), contentDTO.getOrderByClause(), spid);
  264 + //title, content_tag, contentId, sDate, eDate, receive_status, page, pageSize, orderByClause, spid
259 265  
260 266 String fileName = "图文数据";
261 267  
... ...
src/main/java/com/cnlive/shenhe/controller/EmailController.java
  View file @a0260a3
... ... @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
4 4 import com.cnlive.shenhe.bean.ErrorEnum;
5 5 import com.cnlive.shenhe.bean.ResponseBean;
6 6 import com.cnlive.shenhe.bean.SessionUser;
  7 +import com.cnlive.shenhe.dto.EmailDTO;
7 8 import com.cnlive.shenhe.entity.ShyEmail;
8 9 import com.cnlive.shenhe.entity.ShyUsers;
9 10 import com.cnlive.shenhe.serviceImpl.EmailServiceImpl;
... ... @@ -44,15 +45,17 @@ public class EmailController extends BaseController {
44 45  
45 46  
46 47 @GetMapping(value = "/page")
47   - public String page(Model model, Integer page, Integer pageSize, String orderByClause,
48   - String remark,String email, HttpSession session) {
  48 + public String page(Model model, EmailDTO emailDTO, HttpSession session) {
  49 + //Integer page, Integer pageSize, String orderByClause,
  50 + // String remark,String email
49 51 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
50 52 if(CommonUtils.isNull(sessionUser)){
51 53 return "redirect:/users/login";
52 54 }
53   - if (CommonUtils.isNull(page)) page = 1;
54   - if (CommonUtils.isNull(pageSize)) pageSize = 10;
55   - PageInfo<ShyEmail> emailPage = emailServiceImpl.getPage(page, pageSize, orderByClause, remark,email);
  55 + //if (CommonUtils.isNull(page)) page = 1;
  56 + //if (CommonUtils.isNull(pageSize)) pageSize = 10;
  57 + PageInfo<ShyEmail> emailPage = emailServiceImpl.getPage(emailDTO.getPage(), emailDTO.getPageSize(), emailDTO.getOrderByClause(), emailDTO.getRemark(),emailDTO.getEmail());
  58 + //page, pageSize, orderByClause, remark,email
56 59 List<ShyEmail> list = emailPage.getList();
57 60 JSONObject email_message = CommonConst.EMAIL_MESSAGE;
58 61 if (!list.isEmpty()) {
... ... @@ -84,7 +87,7 @@ public class EmailController extends BaseController {
84 87 }
85 88 }
86 89 model.addAttribute("emailPage", emailPage);
87   - model.addAttribute("pageSize", pageSize);
  90 + model.addAttribute("pageSize", emailDTO.getPageSize());
88 91 model.addAttribute("email_message", email_message);
89 92 return "page/email.html";
90 93 }
... ...
src/main/java/com/cnlive/shenhe/controller/LiveApplyController.java
  View file @a0260a3
1 1 package com.cnlive.shenhe.controller;
2 2  
  3 +import com.cnlive.shenhe.dto.LiveApplyDTO;
3 4 import org.apache.poi.xssf.usermodel.XSSFCell;
4 5 import org.apache.poi.xssf.usermodel.XSSFRow;
5 6 import org.apache.poi.xssf.usermodel.XSSFSheet;
... ... @@ -126,9 +127,10 @@ public class LiveApplyController extends BaseController {
126 127 * @return
127 128 */
128 129 @GetMapping("/page")
129   - public Object getListLiveApply(Model model,String start_date,String end_date,
130   - String theme, String business_model, Integer page,Integer pageSize,
131   - Integer shenhe_state,Integer receive, String sp_desc,String orderByClause, HttpSession session) {
  130 + public Object getListLiveApply(Model model, LiveApplyDTO liveApplyDTO, HttpSession session) {
  131 + //String start_date,String end_date,
  132 + // String theme, String business_model, Integer page,Integer pageSize,
  133 + // Integer shenhe_state,Integer receive, String sp_desc,String orderByClause
132 134 System.out.println("进入直播申请内容页");
133 135 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
134 136 if(CommonUtils.isNull(sessionUser)){
... ... @@ -136,21 +138,23 @@ public class LiveApplyController extends BaseController {
136 138 }
137 139 Integer spid = sessionUser.getSpid();
138 140 String userId = sessionUser.getUserId();
139   - if (CommonUtils.isNull(page)) page = 1;
140   - if (CommonUtils.isNull(pageSize)) pageSize = 10;
141   - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
142   - ShySites shySite=sitesService.findspidBySpdesc(sp_desc);
  141 + //if (CommonUtils.isNull(page)) page = 1;
  142 + //if (CommonUtils.isNull(pageSize)) pageSize = 10;
  143 + if (CommonUtils.isNotEmpty(liveApplyDTO.getSp_desc()) && spid == 0) {
  144 + ShySites shySite=sitesService.findspidBySpdesc(liveApplyDTO.getSp_desc());
143 145 if(CommonUtils.isNotNull(shySite)){
144 146 spid = shySite.getSpid();
145 147 }else{
146 148 setmodelSite(model);
147 149 return "error.html";
148 150 }
149   - } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
  151 + } else if (CommonUtils.isEmpty(liveApplyDTO.getSp_desc()) && spid == 0) {
150 152 spid = null;
151 153 }
152   - PageInfo<ShyLiveapply> liveApplyPage = liveApplyServiceImpl.getListLiveApply(theme, start_date,end_date,
153   - business_model, page, pageSize, shenhe_state,receive, orderByClause, spid, userId);
  154 + PageInfo<ShyLiveapply> liveApplyPage = liveApplyServiceImpl.getListLiveApply(liveApplyDTO.getTheme(), liveApplyDTO.getStart_date(),liveApplyDTO.getEnd_date(),
  155 + liveApplyDTO.getBusiness_model(), liveApplyDTO.getPage(), liveApplyDTO.getPageSize(), liveApplyDTO.getShenhe_state(),liveApplyDTO.getReceive(), liveApplyDTO.getOrderByClause(), spid, userId);
  156 + //theme, start_date,end_date,
  157 + // business_model, page, pageSize, shenhe_state,receive, orderByClause, spid, userId
154 158 List<ShyLiveapply> list = liveApplyPage.getList();
155 159 if (!list.isEmpty()) {
156 160 for (ShyLiveapply liveApply : list) {
... ... @@ -177,7 +181,7 @@ public class LiveApplyController extends BaseController {
177 181 }
178 182 }
179 183 model.addAttribute("liveApplyPage", liveApplyPage);
180   - model.addAttribute("pageSize", pageSize);
  184 + model.addAttribute("pageSize", liveApplyDTO.getPageSize());
181 185 return "page/liveApply.html";
182 186 }
183 187  
... ... @@ -312,22 +316,25 @@ public class LiveApplyController extends BaseController {
312 316 * 根据条件导出excel
313 317 */
314 318 @GetMapping("excel")
315   - public void getExcel(String start_date,String end_date,
316   - String theme, Integer business_model, Integer page,Integer pageSize,
317   - Integer shenhe_state,Integer receive, String sp_desc,String orderByClause, HttpSession session,HttpServletResponse response) {
  319 + public void getExcel(LiveApplyDTO liveApplyDTO, HttpSession session,HttpServletResponse response) {
  320 + //String start_date,String end_date,
  321 + // String theme, Integer business_model, Integer page,Integer pageSize,
  322 + // Integer shenhe_state,Integer receive, String sp_desc,String orderByClause
318 323 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
319 324 Integer spid = sessionUser.getSpid();
320 325 String userId = sessionUser.getUserId();
321   - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
322   - ShySites shySite=sitesService.findspidBySpdesc(sp_desc);
  326 + if (CommonUtils.isNotEmpty(liveApplyDTO.getSp_desc()) && spid == 0) {
  327 + ShySites shySite=sitesService.findspidBySpdesc(liveApplyDTO.getSp_desc());
323 328 if(CommonUtils.isNotNull(shySite)){
324 329 spid = shySite.getSpid();
325 330 }
326   - }else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
  331 + }else if (CommonUtils.isEmpty(liveApplyDTO.getSp_desc()) && spid == 0) {
327 332 spid = null;
328 333 }
329   - List<ShyLiveapply> liveApplyList = liveApplyServiceImpl.findByCondition(theme, start_date,end_date,
330   - business_model, page, pageSize, shenhe_state,receive, orderByClause, spid, userId);
  334 + List<ShyLiveapply> liveApplyList = liveApplyServiceImpl.findByCondition(liveApplyDTO.getTheme(), liveApplyDTO.getStart_date(),liveApplyDTO.getEnd_date(),
  335 + liveApplyDTO.getBusiness_model(), liveApplyDTO.getPage(), liveApplyDTO.getPageSize(), liveApplyDTO.getShenhe_state(),liveApplyDTO.getReceive(), liveApplyDTO.getOrderByClause(), spid, userId);
  336 + //theme, start_date,end_date,
  337 + // business_model, page, pageSize, shenhe_state,receive, orderByClause,
331 338  
332 339 String fileName = "直播申请数据";
333 340  
... ...
src/main/java/com/cnlive/shenhe/controller/LiveController.java
  View file @a0260a3
1 1 package com.cnlive.shenhe.controller;
2 2  
  3 +import com.cnlive.shenhe.dto.LiveDTO;
3 4 import com.cnlive.shenhe.utils.HttpClientUtils;
4 5 import org.apache.poi.xssf.usermodel.XSSFCell;
5 6 import org.apache.poi.xssf.usermodel.XSSFRow;
... ... @@ -125,9 +126,10 @@ public class LiveController extends BaseController {
125 126 * @return
126 127 */
127 128 @GetMapping("/page")
128   - public Object getListVideos(Model model, String activity_id, String start_date, String end_date,
129   - String activity_name, Integer activity_status, Integer page, Integer pageSize,
130   - Integer shenhe_state, String sp_desc, Integer contentId, HttpSession session) {
  129 + public Object getListVideos(Model model, LiveDTO liveDTO, HttpSession session) {
  130 + //String activity_id, String start_date, String end_date,
  131 + // String activity_name, Integer activity_status, Integer page, Integer pageSize,
  132 + // Integer shenhe_state, String sp_desc, Integer contentId
131 133 System.out.println("进入直播内容页");
132 134 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
133 135 // if(CommonUtils.isNull(sessionUser)){
... ... @@ -135,49 +137,50 @@ public class LiveController extends BaseController {
135 137 // }
136 138 Integer spid = sessionUser.getSpid();
137 139 String userId = sessionUser.getUserId();
138   - if (CommonUtils.isNull(page)) page = 1;
139   - if (CommonUtils.isNull(pageSize)) pageSize = 20;
140   - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
141   - ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
  140 + //if (CommonUtils.isNull(page)) page = 1;
  141 + //if (CommonUtils.isNull(pageSize)) pageSize = 20;
  142 + if (CommonUtils.isNotEmpty(liveDTO.getSp_desc()) && spid == 0) {
  143 + ShySites shySite = sitesService.findspidBySpdesc(liveDTO.getSp_desc());
142 144 if (CommonUtils.isNotNull(shySite)) {
143 145 spid = shySite.getSpid();
144 146 } else {
145 147 setmodelSite(model);
146 148 return "error.html";
147 149 }
148   - } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
  150 + } else if (CommonUtils.isEmpty(liveDTO.getSp_desc()) && spid == 0) {
149 151 spid = null;
150 152 }
151 153 String orderByClause = "";
152   - if (shenhe_state != null && shenhe_state == 0) {//审核状态：全部待领
  154 + //审核状态：全部待领
  155 + if (liveDTO.getShenhe_state() != null && liveDTO.getShenhe_state() == 0) {
153 156 orderByClause = "field(activity_status,1,3,2,0,4), pre_start_time ";
154   - } else if (shenhe_state != null && shenhe_state == 1) {//审核状态：待审核
  157 + } else if (liveDTO.getShenhe_state() != null && liveDTO.getShenhe_state() == 1) {//审核状态：待审核
155 158 orderByClause = "field(activity_status,1,3,2,0,4), pre_start_time ";
156   - } else if (shenhe_state != null && shenhe_state == 2) {//审核状态：已审核
  159 + } else if (liveDTO.getShenhe_state() != null && liveDTO.getShenhe_state() == 2) {//审核状态：已审核
157 160 orderByClause = "pre_start_time desc";
158 161 } else {//审核状态：全部
159 162 orderByClause = "is_hot desc, pre_start_time ";
160   - if (activity_status != null && (activity_status == 0 || activity_status == 2 || activity_status == 4)) {//直播状态：结束、撤销、下线
  163 + if (liveDTO.getActivity_status() != null && (liveDTO.getActivity_status() == 0 || liveDTO.getActivity_status() == 2 || liveDTO.getActivity_status() == 4)) {//直播状态：结束、撤销、下线
161 164 orderByClause = "is_hot desc, pre_start_time desc";
162 165 }
163 166 }
164 167  
165   - if (CommonUtils.isNotNull(contentId)) {
  168 + if (CommonUtils.isNotNull(liveDTO.getContentId())) {
166 169 Map<String, String> map = new HashMap<>(1);
167   - map.put("id", contentId.toString());
  170 + map.put("id", liveDTO.getContentId().toString());
168 171 String post = HttpClientUtils.get(cms_getVideoAndLiveId, map);
169 172 JSONObject jsonObject = JSONObject.parseObject(post);
170 173 JSONObject data = jsonObject.getJSONObject("data");
171 174 if (data != null) {
172 175 String pid = data.getString("pid");
173   - activity_id = pid;
  176 + liveDTO.setActivity_id(pid);
174 177 } else {
175   - activity_id = contentId.toString();
  178 + liveDTO.setActivity_id(String.valueOf(liveDTO.getContentId()));
176 179 }
177 180 }
178 181  
179   - PageInfo<ShyLive> livePage = liveService.getListContent(activity_name, start_date, end_date,
180   - activity_id, activity_status, page, pageSize, shenhe_state, orderByClause, spid, userId);
  182 + PageInfo<ShyLive> livePage = liveService.getListContent(liveDTO.getActivity_name(), liveDTO.getStart_date(), liveDTO.getEnd_date(),
  183 + liveDTO.getActivity_id(), liveDTO.getActivity_status(), liveDTO.getPage(), liveDTO.getPageSize(), liveDTO.getShenhe_state(), orderByClause, spid, userId);
181 184 List<ShyLive> list = livePage.getList();
182 185 if (!list.isEmpty()) {
183 186 for (ShyLive live : list) {
... ... @@ -189,7 +192,7 @@ public class LiveController extends BaseController {
189 192 }
190 193 }
191 194 model.addAttribute("livePage", livePage);
192   - model.addAttribute("pageSize", pageSize);
  195 + model.addAttribute("pageSize", liveDTO.getPageSize());
193 196 return "page/live.html";
194 197 }
195 198  
... ... @@ -372,22 +375,23 @@ public class LiveController extends BaseController {
372 375 * 根据条件导出excel
373 376 */
374 377 @GetMapping("excel")
375   - public void getExcel(String activity_id,String start_date,String end_date,
376   - String activity_name, Integer activity_status, Integer page,Integer pageSize,
377   - Integer shenhe_state, String orderByClause, String sp_desc, HttpSession session,HttpServletResponse response) {
  378 + public void getExcel(LiveDTO liveDTO, HttpSession session,HttpServletResponse response) {
  379 + //String activity_id,String start_date,String end_date,
  380 + // String activity_name, Integer activity_status, Integer page,Integer pageSize,
  381 + // Integer shenhe_state, String orderByClause, String sp_desc
378 382 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
379 383 Integer spid = sessionUser.getSpid();
380 384 String userId = sessionUser.getUserId();
381   - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
382   - ShySites shySite=sitesService.findspidBySpdesc(sp_desc);
  385 + if (CommonUtils.isNotEmpty(liveDTO.getSp_desc()) && spid == 0) {
  386 + ShySites shySite=sitesService.findspidBySpdesc(liveDTO.getSp_desc());
383 387 if(CommonUtils.isNotNull(shySite)){
384 388 spid = shySite.getSpid();
385 389 }
386   - }else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
  390 + }else if (CommonUtils.isEmpty(liveDTO.getSp_desc()) && spid == 0) {
387 391 spid = null;
388 392 }
389   - List<ShyLive> liveList = liveService.findByCondition(activity_name, start_date,end_date,
390   - activity_id, activity_status, page, pageSize, shenhe_state, orderByClause, spid,userId);
  393 + List<ShyLive> liveList = liveService.findByCondition(liveDTO.getActivity_name(), liveDTO.getStart_date(),liveDTO.getEnd_date(),
  394 + liveDTO.getActivity_id(), liveDTO.getActivity_status(), liveDTO.getPage(), liveDTO.getPageSize(), liveDTO.getShenhe_state(), liveDTO.getOrderByClause(), spid,userId);
391 395  
392 396 String fileName = "直播数据";
393 397  
... ...
src/main/java/com/cnlive/shenhe/controller/NotSpeakController.java
  View file @a0260a3
... ... @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
4 4 import com.cnlive.shenhe.bean.ErrorEnum;
5 5 import com.cnlive.shenhe.bean.ResponseBean;
6 6 import com.cnlive.shenhe.bean.SessionUser;
  7 +import com.cnlive.shenhe.dto.NotSpeakDTO;
7 8 import com.cnlive.shenhe.entity.ShyComments;
8 9 import com.cnlive.shenhe.entity.ShyContent;
9 10 import com.cnlive.shenhe.entity.ShyNotspeak;
... ... @@ -66,16 +67,18 @@ public class NotSpeakController extends BaseController {
66 67 * @return
67 68 */
68 69 @GetMapping("/page")
69   - public String getPage(Model model, String user_name, Integer user_id,Integer state,
70   - Integer page, Integer pageSize, String orderByClause, HttpSession session) {
  70 + public String getPage(Model model, NotSpeakDTO notSpeakDTO, HttpSession session) {
  71 + //String user_name, Integer user_id,Integer state,
  72 + // Integer page, Integer pageSize, String orderByClause
71 73 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
72 74 if(CommonUtils.isNull(sessionUser)){
73 75 return "redirect:/users/login";
74 76 }
75 77 String userId = sessionUser.getUserId();
76   - if (CommonUtils.isNull(page)) page = 1;
77   - if (CommonUtils.isNull(pageSize)) pageSize = 10;
78   - PageInfo<ShyNotspeak> shyNotspeakPage = notSpeakService.getPage(user_name,user_id, state, page, pageSize, orderByClause);
  78 + //if (CommonUtils.isNull(page)) page = 1;
  79 + //if (CommonUtils.isNull(pageSize)) pageSize = 10;
  80 + PageInfo<ShyNotspeak> shyNotspeakPage = notSpeakService.getPage(notSpeakDTO.getUser_name(),notSpeakDTO.getUser_id(), notSpeakDTO.getState(), notSpeakDTO.getPage(), notSpeakDTO.getPageSize(), notSpeakDTO.getOrderByClause());
  81 + //user_name,user_id, state, page, pageSize, orderByClause
79 82 List<ShyNotspeak> list = shyNotspeakPage.getList();
80 83 if (!list.isEmpty()) {
81 84 for (ShyNotspeak notspeak : list) {
... ... @@ -103,7 +106,7 @@ public class NotSpeakController extends BaseController {
103 106 }
104 107 }
105 108 }
106   - model.addAttribute("pageSize", pageSize);
  109 + model.addAttribute("pageSize", notSpeakDTO.getPageSize());
107 110 model.addAttribute("notspeakPage", shyNotspeakPage);
108 111 return "page/notspeak.html";
109 112 }
... ...
src/main/java/com/cnlive/shenhe/controller/ShyActivityController.java
  View file @a0260a3
... ... @@ -25,7 +25,7 @@ import java.util.List;
25 25 */
26 26 @Controller
27 27 @RequestMapping("/activity")
28   -public class ShyActivityController {
  28 +public class ShyActivityController extends BaseController {
29 29 @Autowired
30 30 private ShyActivityImpl shyActivityImpl;
31 31  
... ... @@ -63,10 +63,11 @@ public class ShyActivityController {
63 63 }
64 64  
65 65 @GetMapping("/page")
66   - public String getShyActivity(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, Model model, String activity, Integer exempt_from_trial) {
67   - PageInfo<ShyActivity> shyActivityPageInfo = shyActivityImpl.selectByExample(pageNum, pageSize, activity, exempt_from_trial);
  66 + public String getShyActivity(ShyActivityDTO shyActivityDTO, Model model) {
  67 + //@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, String activity, Integer exempt_from_trial
  68 + PageInfo<ShyActivity> shyActivityPageInfo = shyActivityImpl.selectByExample(shyActivityDTO);
68 69 List<ShyActivity> list = shyActivityPageInfo.getList();
69   - model.addAttribute("exempt_from_trial",exempt_from_trial);
  70 + model.addAttribute("exempt_from_trial",shyActivityDTO.getExempt_from_trial());
70 71 model.addAttribute("ShyActivitylist", shyActivityPageInfo);
71 72 return "page/activity.html";
72 73 }
... ...
src/main/java/com/cnlive/shenhe/controller/SitesController.java
  View file @a0260a3
... ... @@ -2,6 +2,7 @@ package com.cnlive.shenhe.controller;
2 2  
3 3 import com.alibaba.fastjson.JSONObject;
4 4 import com.cnlive.shenhe.bean.SessionUser;
  5 +import com.cnlive.shenhe.dto.SitesDTO;
5 6 import com.cnlive.shenhe.entity.ShySites;
6 7 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
7 8 import com.cnlive.shenhe.utils.CommonConst;
... ... @@ -43,7 +44,8 @@ public class SitesController extends BaseController {
43 44 * @return
44 45 */
45 46 @GetMapping(value = "/page")
46   - public String page(Model model, Integer page, Integer pageSize, String orderByClause, String keyword, HttpSession session) {
  47 + public String page(Model model, SitesDTO sitesDTO, HttpSession session) {
  48 + //Integer page, Integer pageSize, String orderByClause, String keyword
47 49 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
48 50 if(CommonUtils.isNull(sessionUser)){
49 51 return "redirect:/users/login";
... ... @@ -54,9 +56,9 @@ public class SitesController extends BaseController {
54 56 return "error.html";
55 57 }
56 58 if (spid == 0) spid = null;
57   - if (CommonUtils.isNull(page)) page = 1;
58   - if (CommonUtils.isNull(pageSize)) pageSize = 10;
59   - PageInfo<ShySites> sitePage = sitesService.getPage(page, pageSize, orderByClause, keyword, spid);
  59 + //if (CommonUtils.isNull(page)) page = 1;
  60 + //if (CommonUtils.isNull(pageSize)) pageSize = 10;
  61 + PageInfo<ShySites> sitePage = sitesService.getPage(sitesDTO.getPage(), sitesDTO.getPageSize(), sitesDTO.getOrderByClause(), sitesDTO.getKeyword(), spid);
60 62 List<ShySites> list = sitePage.getList();
61 63 JSONObject business = CommonConst.BUSINESS;
62 64 if (!list.isEmpty()) {
... ... @@ -73,7 +75,7 @@ public class SitesController extends BaseController {
73 75 }
74 76 }
75 77 model.addAttribute("sitePage", sitePage);
76   - model.addAttribute("pageSize", pageSize);
  78 + model.addAttribute("pageSize", sitesDTO.getPageSize());
77 79 model.addAttribute("business", business);
78 80 return "page/site.html";
79 81 }
... ...
src/main/java/com/cnlive/shenhe/controller/TopicController.java
  View file @a0260a3
... ... @@ -3,6 +3,7 @@ package com.cnlive.shenhe.controller;
3 3 import com.cnlive.shenhe.bean.ErrorEnum;
4 4 import com.cnlive.shenhe.bean.ResponseBean;
5 5 import com.cnlive.shenhe.bean.SessionUser;
  6 +import com.cnlive.shenhe.dto.TopicDTO;
6 7 import com.cnlive.shenhe.entity.*;
7 8 import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl;
8 9 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
... ... @@ -64,44 +65,45 @@ public class TopicController extends BaseController {
64 65 * @return
65 66 */
66 67 @GetMapping("/page")
67   - public String getPage(Model model, String topic_name,String topic_id, String topic_tag,
68   - String start_date, String end_date, Integer shenhe_status, String sp_desc,
69   - Integer page, Integer pageSize,Integer receive, String orderByClause, HttpSession session) {
  68 + public String getPage(Model model, TopicDTO topicDTO, HttpSession session) {
  69 + //String topic_name,String topic_id, String topic_tag,
  70 + // String start_date, String end_date, Integer shenhe_status, String sp_desc,
  71 + // Integer page, Integer pageSize,Integer receive, String orderByClause
70 72 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
71 73 if(CommonUtils.isNull(sessionUser)){
72 74 return "redirect:/users/login";
73 75 }
74 76 Integer spid = sessionUser.getSpid();
75 77 String userId = sessionUser.getUserId();
76   - if (CommonUtils.isNull(page)) page = 1;
77   - if (CommonUtils.isNull(pageSize)) pageSize = 10;
78   - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
79   - ShySites shySite=sitesService.findspidBySpdesc(sp_desc);
  78 + //if (CommonUtils.isNull(page)) page = 1;
  79 + //if (CommonUtils.isNull(pageSize)) pageSize = 10;
  80 + if (CommonUtils.isNotEmpty(topicDTO.getSp_desc()) && spid == 0) {
  81 + ShySites shySite=sitesService.findspidBySpdesc(topicDTO.getSp_desc());
80 82 if(CommonUtils.isNotNull(shySite)){
81 83 spid = shySite.getSpid();
82 84 }else{
83 85 setmodelSite(model);
84 86 return "error.html";
85 87 }
86   - } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
  88 + } else if (CommonUtils.isEmpty(topicDTO.getSp_desc()) && spid == 0) {
87 89 spid = null;
88 90 }
89 91 Date sDate = null;
90 92 Date eDate = null;
91 93  
92   - if (CommonUtils.isNotEmpty(start_date)) {
  94 + if (CommonUtils.isNotEmpty(topicDTO.getStart_date())) {
93 95 try {
94   - sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
  96 + sDate = CommonUtils.parseDate(topicDTO.getStart_date(), "yyyy-MM-dd");
95 97 } catch (Exception e) {
96 98 }
97 99 }
98   - if (CommonUtils.isNotEmpty(end_date)) {
  100 + if (CommonUtils.isNotEmpty(topicDTO.getEnd_date())) {
99 101 try {
100   - eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
  102 + eDate = CommonUtils.parseDate(topicDTO.getEnd_date(), "yyyy-MM-dd");
101 103 } catch (Exception e) {
102 104 }
103 105 }
104   - PageInfo<ShyTopic> topicPage = topicService.getPage( topic_name,topic_tag,topic_id, sDate, eDate, shenhe_status, null, page, pageSize, orderByClause, spid, userId,receive);
  106 + 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());
105 107 List<ShyTopic> list = topicPage.getList();
106 108 if (!list.isEmpty()) {
107 109 for (ShyTopic topic : list) {
... ... @@ -123,7 +125,7 @@ public class TopicController extends BaseController {
123 125 }
124 126 }
125 127 model.addAttribute("topicPage", topicPage);
126   - model.addAttribute("pageSize", pageSize);
  128 + model.addAttribute("pageSize", topicDTO.getPageSize());
127 129 return "page/topic.html";
128 130 }
129 131  
... ...
src/main/java/com/cnlive/shenhe/controller/UsersController.java
  View file @a0260a3
... ... @@ -2,6 +2,7 @@ package com.cnlive.shenhe.controller;
2 2  
3 3 import com.alibaba.fastjson.JSONObject;
4 4 import com.cnlive.shenhe.bean.SessionUser;
  5 +import com.cnlive.shenhe.dto.UsersDTO;
5 6 import com.cnlive.shenhe.entity.ShySites;
6 7 import com.cnlive.shenhe.entity.ShyUsers;
7 8 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
... ... @@ -81,17 +82,19 @@ public class UsersController extends BaseController {
81 82  
82 83  
83 84 @GetMapping(value = "/page")
84   - public String page(Model model, Integer page, Integer pageSize, String orderByClause,
85   - String username, String mobile, Integer sp_id, String company_brief, HttpSession session) {
  85 + public String page(Model model, UsersDTO usersDTO, HttpSession session) {
  86 +
  87 + //Integer page, Integer pageSize, String orderByClause,
  88 + // String username, String mobile, Integer sp_id, String company_brief
86 89 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
87 90 if(CommonUtils.isNull(sessionUser)){
88 91 return "redirect:/users/login";
89 92 }
90 93 Integer spid = sessionUser.getSpid();
91 94 if (spid == 0) spid = null;
92   - if (CommonUtils.isNull(page)) page = 1;
93   - if (CommonUtils.isNull(pageSize)) pageSize = 10;
94   - PageInfo<ShyUsers> usersPage = usersService.getPage(page, pageSize, orderByClause, username,mobile,sp_id,company_brief);
  95 + //if (CommonUtils.isNull(page)) page = 1;
  96 + //if (CommonUtils.isNull(pageSize)) pageSize = 10;
  97 + PageInfo<ShyUsers> usersPage = usersService.getPage(usersDTO.getPage(), usersDTO.getPageSize(), usersDTO.getOrderByClause(), usersDTO.getUsername(),usersDTO.getMobile(),usersDTO.getSp_id(),usersDTO.getCompany_brief());
95 98 List<ShyUsers> list = usersPage.getList();
96 99 JSONObject notice = CommonConst.NOTICE;
97 100 if (!list.isEmpty()) {
... ... @@ -104,7 +107,7 @@ public class UsersController extends BaseController {
104 107 }
105 108 }
106 109 model.addAttribute("usersPage", usersPage);
107   - model.addAttribute("pageSize", pageSize);
  110 + model.addAttribute("pageSize", usersDTO.getPageSize());
108 111 model.addAttribute("notice", notice);
109 112 return "page/users.html";
110 113 }
... ...
src/main/java/com/cnlive/shenhe/controller/UsersFreeController.java
  View file @a0260a3
... ... @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
4 4 import com.cnlive.shenhe.bean.ErrorEnum;
5 5 import com.cnlive.shenhe.bean.ResponseBean;
6 6 import com.cnlive.shenhe.bean.SessionUser;
  7 +import com.cnlive.shenhe.dto.UsersFreeDTO;
7 8 import com.cnlive.shenhe.entity.ShySites;
8 9 import com.cnlive.shenhe.entity.ShyUsersfree;
9 10 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
... ... @@ -39,8 +40,9 @@ public class UsersFreeController extends BaseController {
39 40 SitesServiceImpl sitesService;
40 41  
41 42 @GetMapping(value = "/page")
42   - public String wangjiajiaPage(Model model, Integer page, Integer pageSize, String orderByClause,
43   - String userId, String mobile, HttpSession session) {
  43 + public String wangjiajiaPage(Model model, UsersFreeDTO usersFreeDTO, HttpSession session) {
  44 + //Integer page, Integer pageSize, String orderByClause,
  45 + // String userId, String mobile
44 46 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
45 47 if(CommonUtils.isNull(sessionUser)){
46 48 return "redirect:/users/login";
... ... @@ -50,9 +52,9 @@ public class UsersFreeController extends BaseController {
50 52 return "page/error.html";
51 53 }
52 54 if (spid == 0) spid = null;
53   - if (CommonUtils.isNull(page)) page = 1;
54   - if (CommonUtils.isNull(pageSize)) pageSize = 10;
55   - PageInfo<ShyUsersfree> usersPage = usersfreeService.getpage(page, pageSize, orderByClause, userId,mobile);
  55 + //if (CommonUtils.isNull(page)) page = 1;
  56 + //if (CommonUtils.isNull(pageSize)) pageSize = 10;
  57 + PageInfo<ShyUsersfree> usersPage = usersfreeService.getpage(usersFreeDTO.getPage(), usersFreeDTO.getPageSize(), usersFreeDTO.getOrderByClause(), usersFreeDTO.getUserId(),usersFreeDTO.getMobile());
56 58 List<ShyUsersfree> list = usersPage.getList();
57 59 JSONObject category = CommonConst.CATEGORY;
58 60 if (!list.isEmpty()) {
... ... @@ -77,7 +79,7 @@ public class UsersFreeController extends BaseController {
77 79 }
78 80 }
79 81 model.addAttribute("usersPage", usersPage);
80   - model.addAttribute("pageSize", pageSize);
  82 + model.addAttribute("pageSize", usersFreeDTO.getPageSize());
81 83 model.addAttribute("category", category);
82 84 return "page/usersFree.html";
83 85 }
... ...
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @a0260a3
... ... @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
5 5 import com.cnlive.shenhe.bean.ErrorEnum;
6 6 import com.cnlive.shenhe.bean.ResponseBean;
7 7 import com.cnlive.shenhe.bean.SessionUser;
  8 +import com.cnlive.shenhe.dto.VideosDTO;
8 9 import com.cnlive.shenhe.entity.ShyActivity;
9 10 import com.cnlive.shenhe.entity.ShySites;
10 11 import com.cnlive.shenhe.entity.ShyUsers;
... ... @@ -124,12 +125,14 @@ public class VideosController extends BaseController {
124 125 * @return
125 126 */
126 127 @GetMapping("/page")
127   - public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize,
128   - String video_priority, String orderByClause, String sp_desc, String sp_Id, String source, String video_user_id,
129   - String shen_auditor_id, Integer contentId, String video_id, HttpSession session) {
130   - if (!StringUtils.isEmpty(shen_auditor_id)) {
131   - if ((!"自动审核".equals(shen_auditor_id)) && (!"白名单".equals(shen_auditor_id))) {
132   - shen_auditor_id = usersService.findspidByName(shen_auditor_id);
  128 + public Object getListVideos(Model model, VideosDTO videosDTO, HttpSession session) {
  129 + //String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize,
  130 + // String video_priority, String orderByClause, String sp_desc, String sp_Id, String source, String video_user_id,
  131 + // String shen_auditor_id, Integer contentId, String video_id
  132 + if (!StringUtils.isEmpty(videosDTO.getShen_auditor_id())) {
  133 + if ((!"自动审核".equals(videosDTO.getShen_auditor_id())) && (!"白名单".equals(videosDTO.getShen_auditor_id()))) {
  134 + videosDTO.setShen_auditor_id(usersService.findspidByName(videosDTO.getShen_auditor_id()));
  135 +
133 136 }
134 137 }
135 138  
... ... @@ -139,38 +142,40 @@ public class VideosController extends BaseController {
139 142 }
140 143  
141 144 Integer sessionUserSpid = sessionUser.getSpid();
142   - logger.info("sp_Id:{},sessionUserSpid:{}", sp_Id, sessionUserSpid);
  145 + logger.info("sp_Id:{},sessionUserSpid:{}", videosDTO.getSp_Id(), sessionUserSpid);
143 146 String userId = sessionUser.getUserId();
144   - if (CommonUtils.isNull(page)) page = 1;
145   - if (CommonUtils.isNull(pageSize)) pageSize = 10;
146   - if (CommonUtils.isNotEmpty(sp_desc) && sessionUserSpid == 0) {
147   - ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
  147 + //if (CommonUtils.isNull(page)) page = 1;
  148 + //if (CommonUtils.isNull(pageSize)) pageSize = 10;
  149 + if (CommonUtils.isNotEmpty(videosDTO.getSp_desc()) && sessionUserSpid == 0) {
  150 + ShySites shySite = sitesService.findspidBySpdesc(videosDTO.getSp_desc());
148 151 if (CommonUtils.isNotNull(shySite)) {
149 152 sessionUserSpid = shySite.getSpid();
150 153 } else {
151 154 setmodelSite(model);
152 155 return "error.html";
153 156 }
154   - } else if (CommonUtils.isEmpty(sp_desc) && sessionUserSpid == 0) {
  157 + } else if (CommonUtils.isEmpty(videosDTO.getSp_desc()) && sessionUserSpid == 0) {
155 158 sessionUserSpid = null;
156 159 }
157 160  
158   - if (CommonUtils.isNotNull(contentId)) {
  161 + if (CommonUtils.isNotNull(videosDTO.getContentId())) {
159 162 Map<String, String> map = new HashMap<>(1);
160   - map.put("id", contentId.toString());
  163 + map.put("id", videosDTO.getContentId().toString());
161 164 String post = HttpClientUtils.get(cms_getVideoAndLiveId, map);
162 165 JSONObject jsonObject = JSONObject.parseObject(post);
163 166 JSONObject data = jsonObject.getJSONObject("data");
164 167 if (data != null) {
165 168 String pid = data.getString("pid");
166   - video_id = pid;
  169 + videosDTO.setVideo_id(pid);
  170 + //video_id = pid;
167 171 } else {
168   - video_id = contentId.toString();
  172 + videosDTO.setVideo_id(String.valueOf(videosDTO.getContentId()));
  173 + //video_id = contentId.toString();
169 174 }
170 175 }
171 176  
172   - PageInfo<ShyVideos> videoPage = videosService.getListContent(video_title, start_date, end_date, state, receive, page,
173   - pageSize, video_priority, orderByClause, sessionUserSpid, userId, sp_Id, source, video_user_id, shen_auditor_id, video_id);
  177 + PageInfo<ShyVideos> videoPage = videosService.getListContent(videosDTO.getVideo_title(), videosDTO.getStart_date(), videosDTO.getEnd_date(), videosDTO.getState(), videosDTO.getReceive(), videosDTO.getPage(),
  178 + 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());
174 179 //查询查询条件
175 180 List<ShyActivity> activityList = shyActivityImpl.selectAll();
176 181 List<ShyVideos> list = videoPage.getList();
... ... @@ -212,19 +217,19 @@ public class VideosController extends BaseController {
212 217 }
213 218 }
214 219 /* 获取参数值给前台 用来判断是否需要把查看显示出来 state recive*/
215   - String state1 = state == null ? "" : state.toString();
  220 + String state1 = videosDTO.getState() == null ? "" : videosDTO.getState().toString();
216 221 String receive1;
217   - if (CommonUtils.isNotNull(receive)) {
218   - receive1 = receive.equals(CommonConst.RECEIVE_AFTER) ? "true" : "false";
  222 + if (CommonUtils.isNotNull(videosDTO.getReceive())) {
  223 + receive1 = videosDTO.getReceive().equals(CommonConst.RECEIVE_AFTER) ? "true" : "false";
219 224 } else {
220 225 receive1 = "";
221 226 }
222 227 model.addAttribute("state1", state1);
223 228 model.addAttribute("receive1", receive1);
224   - model.addAttribute("pageSize", pageSize);
  229 + model.addAttribute("pageSize", videosDTO.getPageSize());
225 230 model.addAttribute("videoPage", videoPage);
226   - model.addAttribute("sp_Id", sp_Id);
227   - model.addAttribute("source", source);
  231 + model.addAttribute("sp_Id", videosDTO.getSp_Id());
  232 + model.addAttribute("source", videosDTO.getSource());
228 233 model.addAttribute("activityList", activityList);
229 234 return "page/video.html";
230 235 }
... ... @@ -345,23 +350,26 @@ public class VideosController extends BaseController {
345 350 * @param response
346 351 */
347 352 @GetMapping("excel")
348   - public void getExcel(String video_title, String start_date, String end_date, Integer state, Integer
349   - receive, String video_priority, Integer source, String video_user_id, String orderByClause, Integer
350   - sp_Id, String sp_desc, HttpSession session, HttpServletResponse response) {
351   - if (CommonUtils.isNotEmpty(sp_desc)) {
352   - ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
  353 + public void getExcel(VideosDTO videosDTO, HttpSession session, HttpServletResponse response) {
  354 +
  355 + //String video_title, String start_date, String end_date, Integer state, Integer
  356 + //receive, String video_priority, Integer source, String video_user_id, String orderByClause, Integer
  357 + //sp_Id, String sp_desc,
  358 + if (CommonUtils.isNotEmpty(videosDTO.getSp_desc())) {
  359 + ShySites shySite = sitesService.findspidBySpdesc(videosDTO.getSp_desc());
353 360 if (CommonUtils.isNotNull(shySite)) {
354   - sp_Id = shySite.getSpid();
  361 + videosDTO.setSp_Id(String.valueOf(shySite.getSpid()));
  362 + //sp_Id = shySite.getSpid();
355 363 }
356 364 }
357 365 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
358 366 Integer spid = sessionUser.getSpid();
359 367 String userId = sessionUser.getUserId();
360 368 if (spid == 0) spid = null;
361   - if (sp_Id != null) {
362   - spid = sp_Id;
  369 + if (videosDTO.getSp_Id() != null) {
  370 + spid = Integer.valueOf(videosDTO.getSp_Id());
363 371 }
364   - List<ShyVideos> shyVideosList = videosService.findByCondition(video_title, start_date, end_date, state, receive, video_priority, orderByClause, spid, userId, source, video_user_id);
  372 + 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());
365 373 String fileName = "点播数据";
366 374 String updater = "";//审核员名字
367 375 String state1 = "";//审核状态 1已审核 2审核拒绝 0未审核
... ...
src/main/java/com/cnlive/shenhe/dto/AudioDTO.java 0 → 100644
  View file @a0260a3
  1 +package com.cnlive.shenhe.dto;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +/**
  6 + * @author Administrator
  7 + * @author yanzhaowang
  8 + * @create 2022-03-17 13:43
  9 + */
  10 +public class AudioDTO implements Serializable {
  11 +
  12 + private String video_title;
  13 + private String start_date;
  14 + private String end_date;
  15 + private Integer state;
  16 + private Integer receive;
  17 + private Integer page = 1;
  18 + private Integer pageSize = 10;
  19 + private String video_priority;
  20 + private String orderByClause;
  21 + private String sp_desc;
  22 + private String sp_Id;
  23 +
  24 + public AudioDTO() {
  25 + }
  26 +
  27 + public AudioDTO(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String orderByClause) {
  28 + this.video_title = video_title;
  29 + this.start_date = start_date;
  30 + this.end_date = end_date;
  31 + this.state = state;
  32 + this.receive = receive;
  33 + this.video_priority = video_priority;
  34 + this.orderByClause = orderByClause;
  35 + }
  36 +
  37 + 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) {
  38 + this.video_title = video_title;
  39 + this.start_date = start_date;
  40 + this.end_date = end_date;
  41 + this.state = state;
  42 + this.receive = receive;
  43 + this.page = page;
  44 + this.pageSize = pageSize;
  45 + this.video_priority = video_priority;
  46 + this.orderByClause = orderByClause;
  47 + this.sp_desc = sp_desc;
  48 + this.sp_Id = sp_Id;
  49 + }
  50 +
  51 +
  52 + public String getVideo_title() {
  53 + return video_title;
  54 + }
  55 +
  56 + public void setVideo_title(String video_title) {
  57 + this.video_title = video_title;
  58 + }
  59 +
  60 + public String getStart_date() {
  61 + return start_date;
  62 + }
  63 +
  64 + public void setStart_date(String start_date) {
  65 + this.start_date = start_date;
  66 + }
  67 +
  68 + public String getEnd_date() {
  69 + return end_date;
  70 + }
  71 +
  72 + public void setEnd_date(String end_date) {
  73 + this.end_date = end_date;
  74 + }
  75 +
  76 + public Integer getState() {
  77 + return state;
  78 + }
  79 +
  80 + public void setState(Integer state) {
  81 + this.state = state;
  82 + }
  83 +
  84 + public Integer getReceive() {
  85 + return receive;
  86 + }
  87 +
  88 + public void setReceive(Integer receive) {
  89 + this.receive = receive;
  90 + }
  91 +
  92 + public Integer getPage() {
  93 + return page;
  94 + }
  95 +
  96 + public void setPage(Integer page) {
  97 + this.page = page;
  98 + }
  99 +
  100 + public Integer getPageSize() {
  101 + return pageSize;
  102 + }
  103 +
  104 + public void setPageSize(Integer pageSize) {
  105 + this.pageSize = pageSize;
  106 + }
  107 +
  108 + public String getVideo_priority() {
  109 + return video_priority;
  110 + }
  111 +
  112 + public void setVideo_priority(String video_priority) {
  113 + this.video_priority = video_priority;
  114 + }
  115 +
  116 + public String getOrderByClause() {
  117 + return orderByClause;
  118 + }
  119 +
  120 + public void setOrderByClause(String orderByClause) {
  121 + this.orderByClause = orderByClause;
  122 + }
  123 +
  124 + public String getSp_desc() {
  125 + return sp_desc;
  126 + }
  127 +
  128 + public void setSp_desc(String sp_desc) {
  129 + this.sp_desc = sp_desc;
  130 + }
  131 +
  132 + public String getSp_Id() {
  133 + return sp_Id;
  134 + }
  135 +
  136 + public void setSp_Id(String sp_Id) {
  137 + this.sp_Id = sp_Id;
  138 + }
  139 +}
  140 +
  141 +
  142 +
... ...
src/main/java/com/cnlive/shenhe/dto/ChannelDTO.java 0 → 100644
  View file @a0260a3
  1 +package com.cnlive.shenhe.dto;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +/**
  6 + * @author Administrator
  7 + * @author yanzhaowang
  8 + * @create 2022-03-17 14:19
  9 + */
  10 +public class ChannelDTO implements Serializable {
  11 +
  12 + private String channel_id;
  13 + private String channel_name;
  14 + private Integer receive;
  15 + private String start_date;
  16 + private String end_date;
  17 + private Integer shenhe_status;
  18 + private String sp_desc;
  19 + private Integer page = 1;
  20 + private Integer pageSize = 10;
  21 + private String orderByClause;
  22 +
  23 + public ChannelDTO() {
  24 + }
  25 +
  26 + 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) {
  27 + this.channel_id = channel_id;
  28 + this.channel_name = channel_name;
  29 + this.receive = receive;
  30 + this.start_date = start_date;
  31 + this.end_date = end_date;
  32 + this.shenhe_status = shenhe_status;
  33 + this.sp_desc = sp_desc;
  34 + this.page = page;
  35 + this.pageSize = pageSize;
  36 + this.orderByClause = orderByClause;
  37 + }
  38 +
  39 + public String getChannel_id() {
  40 + return channel_id;
  41 + }
  42 +
  43 + public void setChannel_id(String channel_id) {
  44 + this.channel_id = channel_id;
  45 + }
  46 +
  47 + public String getChannel_name() {
  48 + return channel_name;
  49 + }
  50 +
  51 + public void setChannel_name(String channel_name) {
  52 + this.channel_name = channel_name;
  53 + }
  54 +
  55 + public Integer getReceive() {
  56 + return receive;
  57 + }
  58 +
  59 + public void setReceive(Integer receive) {
  60 + this.receive = receive;
  61 + }
  62 +
  63 + public String getStart_date() {
  64 + return start_date;
  65 + }
  66 +
  67 + public void setStart_date(String start_date) {
  68 + this.start_date = start_date;
  69 + }
  70 +
  71 + public String getEnd_date() {
  72 + return end_date;
  73 + }
  74 +
  75 + public void setEnd_date(String end_date) {
  76 + this.end_date = end_date;
  77 + }
  78 +
  79 + public Integer getShenhe_status() {
  80 + return shenhe_status;
  81 + }
  82 +
  83 + public void setShenhe_status(Integer shenhe_status) {
  84 + this.shenhe_status = shenhe_status;
  85 + }
  86 +
  87 + public String getSp_desc() {
  88 + return sp_desc;
  89 + }
  90 +
  91 + public void setSp_desc(String sp_desc) {
  92 + this.sp_desc = sp_desc;
  93 + }
  94 +
  95 + public Integer getPage() {
  96 + return page;
  97 + }
  98 +
  99 + public void setPage(Integer page) {
  100 + this.page = page;
  101 + }
  102 +
  103 + public Integer getPageSize() {
  104 + return pageSize;
  105 + }
  106 +
  107 + public void setPageSize(Integer pageSize) {
  108 + this.pageSize = pageSize;
  109 + }
  110 +
  111 + public String getOrderByClause() {
  112 + return orderByClause;
  113 + }
  114 +
  115 + public void setOrderByClause(String orderByClause) {
  116 + this.orderByClause = orderByClause;
  117 + }
  118 +}
... ...
src/main/java/com/cnlive/shenhe/dto/CommentsDTO.java 0 → 100644
  View file @a0260a3
  1 +package com.cnlive.shenhe.dto;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +/**
  6 + * @author Administrator
  7 + * @author yanzhaowang
  8 + * @create 2022-03-17 14:31
  9 + */
  10 +public class CommentsDTO implements Serializable {
  11 +
  12 + private String activity_id;
  13 + private String content;
  14 + private Integer is_hot;
  15 + private String start_date;
  16 + private String end_date;
  17 + private Integer state;
  18 + private Integer receive;
  19 + private Integer page = 1;
  20 + private Integer pageSize = 10;
  21 + private String orderByClause;
  22 + private Integer type;
  23 + private Integer comment_user_id;
  24 +
  25 + public CommentsDTO() {
  26 + }
  27 +
  28 + 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) {
  29 + this.activity_id = activity_id;
  30 + this.content = content;
  31 + this.is_hot = is_hot;
  32 + this.start_date = start_date;
  33 + this.end_date = end_date;
  34 + this.state = state;
  35 + this.receive = receive;
  36 + this.page = page;
  37 + this.pageSize = pageSize;
  38 + this.orderByClause = orderByClause;
  39 + this.type = type;
  40 + this.comment_user_id = comment_user_id;
  41 + }
  42 +
  43 + public String getActivity_id() {
  44 + return activity_id;
  45 + }
  46 +
  47 + public void setActivity_id(String activity_id) {
  48 + this.activity_id = activity_id;
  49 + }
  50 +
  51 + public String getContent() {
  52 + return content;
  53 + }
  54 +
  55 + public void setContent(String content) {
  56 + this.content = content;
  57 + }
  58 +
  59 + public Integer getIs_hot() {
  60 + return is_hot;
  61 + }
  62 +
  63 + public void setIs_hot(Integer is_hot) {
  64 + this.is_hot = is_hot;
  65 + }
  66 +
  67 + public String getStart_date() {
  68 + return start_date;
  69 + }
  70 +
  71 + public void setStart_date(String start_date) {
  72 + this.start_date = start_date;
  73 + }
  74 +
  75 + public String getEnd_date() {
  76 + return end_date;
  77 + }
  78 +
  79 + public void setEnd_date(String end_date) {
  80 + this.end_date = end_date;
  81 + }
  82 +
  83 + public Integer getState() {
  84 + return state;
  85 + }
  86 +
  87 + public void setState(Integer state) {
  88 + this.state = state;
  89 + }
  90 +
  91 + public Integer getReceive() {
  92 + return receive;
  93 + }
  94 +
  95 + public void setReceive(Integer receive) {
  96 + this.receive = receive;
  97 + }
  98 +
  99 + public Integer getPage() {
  100 + return page;
  101 + }
  102 +
  103 + public void setPage(Integer page) {
  104 + this.page = page;
  105 + }
  106 +
  107 + public Integer getPageSize() {
  108 + return pageSize;
  109 + }
  110 +
  111 + public void setPageSize(Integer pageSize) {
  112 + this.pageSize = pageSize;
  113 + }
  114 +
  115 + public String getOrderByClause() {
  116 + return orderByClause;
  117 + }
  118 +
  119 + public void setOrderByClause(String orderByClause) {
  120 + this.orderByClause = orderByClause;
  121 + }
  122 +
  123 + public Integer getType() {
  124 + return type;
  125 + }
  126 +
  127 + public void setType(Integer type) {
  128 + this.type = type;
  129 + }
  130 +
  131 + public Integer getComment_user_id() {
  132 + return comment_user_id;
  133 + }
  134 +
  135 + public void setComment_user_id(Integer comment_user_id) {
  136 + this.comment_user_id = comment_user_id;
  137 + }
  138 +}
... ...
src/main/java/com/cnlive/shenhe/dto/ContentDTO.java 0 → 100644
  View file @a0260a3
  1 +package com.cnlive.shenhe.dto;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +/**
  6 + * @author Administrator
  7 + * @author yanzhaowang
  8 + * @create 2022-03-17 14:48
  9 + */
  10 +public class ContentDTO implements Serializable {
  11 +
  12 + private String title;
  13 + private String contentId;
  14 + private String content_tag;
  15 + private String start_date;
  16 + private String end_date;
  17 + private Integer receive_status;
  18 + private String sp_desc;
  19 + private String source;
  20 + private String author;
  21 + private Integer page = 1;
  22 + private Integer pageSize = 10;
  23 + private String orderByClause;
  24 +
  25 + public ContentDTO() {
  26 + }
  27 +
  28 + 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) {
  29 + this.title = title;
  30 + this.contentId = contentId;
  31 + this.content_tag = content_tag;
  32 + this.start_date = start_date;
  33 + this.end_date = end_date;
  34 + this.receive_status = receive_status;
  35 + this.sp_desc = sp_desc;
  36 + this.source = source;
  37 + this.author = author;
  38 + this.page = page;
  39 + this.pageSize = pageSize;
  40 + this.orderByClause = orderByClause;
  41 + }
  42 +
  43 + public String getTitle() {
  44 + return title;
  45 + }
  46 +
  47 + public void setTitle(String title) {
  48 + this.title = title;
  49 + }
  50 +
  51 + public String getContentId() {
  52 + return contentId;
  53 + }
  54 +
  55 + public void setContentId(String contentId) {
  56 + this.contentId = contentId;
  57 + }
  58 +
  59 + public String getContent_tag() {
  60 + return content_tag;
  61 + }
  62 +
  63 + public void setContent_tag(String content_tag) {
  64 + this.content_tag = content_tag;
  65 + }
  66 +
  67 + public String getStart_date() {
  68 + return start_date;
  69 + }
  70 +
  71 + public void setStart_date(String start_date) {
  72 + this.start_date = start_date;
  73 + }
  74 +
  75 + public String getEnd_date() {
  76 + return end_date;
  77 + }
  78 +
  79 + public void setEnd_date(String end_date) {
  80 + this.end_date = end_date;
  81 + }
  82 +
  83 + public Integer getReceive_status() {
  84 + return receive_status;
  85 + }
  86 +
  87 + public void setReceive_status(Integer receive_status) {
  88 + this.receive_status = receive_status;
  89 + }
  90 +
  91 + public String getSp_desc() {
  92 + return sp_desc;
  93 + }
  94 +
  95 + public void setSp_desc(String sp_desc) {
  96 + this.sp_desc = sp_desc;
  97 + }
  98 +
  99 + public String getSource() {
  100 + return source;
  101 + }
  102 +
  103 + public void setSource(String source) {
  104 + this.source = source;
  105 + }
  106 +
  107 + public String getAuthor() {
  108 + return author;
  109 + }
  110 +
  111 + public void setAuthor(String author) {
  112 + this.author = author;
  113 + }
  114 +
  115 + public Integer getPage() {
  116 + return page;
  117 + }
  118 +
  119 + public void setPage(Integer page) {
  120 + this.page = page;
  121 + }
  122 +
  123 + public Integer getPageSize() {
  124 + return pageSize;
  125 + }
  126 +
  127 + public void setPageSize(Integer pageSize) {
  128 + this.pageSize = pageSize;
  129 + }
  130 +
  131 + public String getOrderByClause() {
  132 + return orderByClause;
  133 + }
  134 +
  135 + public void setOrderByClause(String orderByClause) {
  136 + this.orderByClause = orderByClause;
  137 + }
  138 +}
... ...
src/main/java/com/cnlive/shenhe/dto/EmailDTO.java 0 → 100644
  View file @a0260a3
  1 +package com.cnlive.shenhe.dto;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +/**
  6 + * @author Administrator
  7 + * @author yanzhaowang
  8 + * @create 2022-03-17 15:15
  9 + */
  10 +public class EmailDTO implements Serializable {
  11 + private Integer page = 1;
  12 + private Integer pageSize = 10;
  13 + private String orderByClause;
  14 + private String remark;
  15 + private String email;
  16 +
  17 + public EmailDTO() {
  18 + }
  19 +
  20 + public EmailDTO(Integer page, Integer pageSize, String orderByClause, String remark, String email) {
  21 + this.page = page;
  22 + this.pageSize = pageSize;
  23 + this.orderByClause = orderByClause;
  24 + this.remark = remark;
  25 + this.email = email;
  26 + }
  27 +
  28 + public Integer getPage() {
  29 + return page;
  30 + }
  31 +
  32 + public void setPage(Integer page) {
  33 + this.page = page;
  34 + }
  35 +
  36 + public Integer getPageSize() {
  37 + return pageSize;
  38 + }
  39 +
  40 + public void setPageSize(Integer pageSize) {
  41 + this.pageSize = pageSize;
  42 + }
  43 +
  44 + public String getOrderByClause() {
  45 + return orderByClause;
  46 + }
  47 +
  48 + public void setOrderByClause(String orderByClause) {
  49 + this.orderByClause = orderByClause;
  50 + }
  51 +
  52 + public String getRemark() {
  53 + return remark;
  54 + }
  55 +
  56 + public void setRemark(String remark) {
  57 + this.remark = remark;
  58 + }
  59 +
  60 + public String getEmail() {
  61 + return email;
  62 + }
  63 +
  64 + public void setEmail(String email) {
  65 + this.email = email;
  66 + }
  67 +}
... ...
src/main/java/com/cnlive/shenhe/dto/LiveApplyDTO.java 0 → 100644
  View file @a0260a3
  1 +package com.cnlive.shenhe.dto;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +/**
  6 + * @author Administrator
  7 + * @author yanzhaowang
  8 + * @create 2022-03-17 15:22
  9 + */
  10 +public class LiveApplyDTO implements Serializable {
  11 + private String start_date;
  12 + private String end_date;
  13 + private String theme;
  14 + private String business_model;
  15 + private Integer page = 1;
  16 + private Integer pageSize = 10;
  17 + private Integer shenhe_state;
  18 + private Integer receive;
  19 + private String sp_desc;
  20 + private String orderByClause;
  21 +
  22 + public LiveApplyDTO() {
  23 + }
  24 +
  25 + 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) {
  26 + this.start_date = start_date;
  27 + this.end_date = end_date;
  28 + this.theme = theme;
  29 + this.business_model = business_model;
  30 + this.page = page;
  31 + this.pageSize = pageSize;
  32 + this.shenhe_state = shenhe_state;
  33 + this.receive = receive;
  34 + this.sp_desc = sp_desc;
  35 + this.orderByClause = orderByClause;
  36 + }
  37 +
  38 + public String getStart_date() {
  39 + return start_date;
  40 + }
  41 +
  42 + public void setStart_date(String start_date) {
  43 + this.start_date = start_date;
  44 + }
  45 +
  46 + public String getEnd_date() {
  47 + return end_date;
  48 + }
  49 +
  50 + public void setEnd_date(String end_date) {
  51 + this.end_date = end_date;
  52 + }
  53 +
  54 + public String getTheme() {
  55 + return theme;
  56 + }
  57 +
  58 + public void setTheme(String theme) {
  59 + this.theme = theme;
  60 + }
  61 +
  62 + public String getBusiness_model() {
  63 + return business_model;
  64 + }
  65 +
  66 + public void setBusiness_model(String business_model) {
  67 + this.business_model = business_model;
  68 + }
  69 +
  70 + public Integer getPage() {
  71 + return page;
  72 + }
  73 +
  74 + public void setPage(Integer page) {
  75 + this.page = page;
  76 + }
  77 +
  78 + public Integer getPageSize() {
  79 + return pageSize;
  80 + }
  81 +
  82 + public void setPageSize(Integer pageSize) {
  83 + this.pageSize = pageSize;
  84 + }
  85 +
  86 + public Integer getShenhe_state() {
  87 + return shenhe_state;
  88 + }
  89 +
  90 + public void setShenhe_state(Integer shenhe_state) {
  91 + this.shenhe_state = shenhe_state;
  92 + }
  93 +
  94 + public Integer getReceive() {
  95 + return receive;
  96 + }
  97 +
  98 + public void setReceive(Integer receive) {
  99 + this.receive = receive;
  100 + }
  101 +
  102 + public String getSp_desc() {
  103 + return sp_desc;
  104 + }
  105 +
  106 + public void setSp_desc(String sp_desc) {
  107 + this.sp_desc = sp_desc;
  108 + }
  109 +
  110 + public String getOrderByClause() {
  111 + return orderByClause;
  112 + }
  113 +
  114 + public void setOrderByClause(String orderByClause) {
  115 + this.orderByClause = orderByClause;
  116 + }
  117 +}
... ...
src/main/java/com/cnlive/shenhe/dto/LiveDTO.java 0 → 100644
  View file @a0260a3
  1 +package com.cnlive.shenhe.dto;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +/**
  6 + * @author Administrator
  7 + * @author yanzhaowang
  8 + * @create 2022-03-17 15:45
  9 + */
  10 +public class LiveDTO implements Serializable {
  11 +
  12 + private String activity_id;
  13 + private String start_date;
  14 + private String end_date;
  15 + private String activity_name;
  16 + private Integer activity_status;
  17 + private Integer page = 1;
  18 + private Integer pageSize = 10;
  19 + private Integer shenhe_state;
  20 + private String sp_desc;
  21 + private Integer contentId;
  22 + private String orderByClause;
  23 +
  24 + public LiveDTO() {
  25 + }
  26 +
  27 + 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) {
  28 + this.activity_id = activity_id;
  29 + this.start_date = start_date;
  30 + this.end_date = end_date;
  31 + this.activity_name = activity_name;
  32 + this.activity_status = activity_status;
  33 + this.page = page;
  34 + this.pageSize = pageSize;
  35 + this.shenhe_state = shenhe_state;
  36 + this.sp_desc = sp_desc;
  37 + this.contentId = contentId;
  38 + this.orderByClause = orderByClause;
  39 + }
  40 +
  41 + public String getActivity_id() {
  42 + return activity_id;
  43 + }
  44 +
  45 + public void setActivity_id(String activity_id) {
  46 + this.activity_id = activity_id;
  47 + }
  48 +
  49 + public String getStart_date() {
  50 + return start_date;
  51 + }
  52 +
  53 + public void setStart_date(String start_date) {
  54 + this.start_date = start_date;
  55 + }
  56 +
  57 + public String getEnd_date() {
  58 + return end_date;
  59 + }
  60 +
  61 + public void setEnd_date(String end_date) {
  62 + this.end_date = end_date;
  63 + }
  64 +
  65 + public String getActivity_name() {
  66 + return activity_name;
  67 + }
  68 +
  69 + public void setActivity_name(String activity_name) {
  70 + this.activity_name = activity_name;
  71 + }
  72 +
  73 + public Integer getActivity_status() {
  74 + return activity_status;
  75 + }
  76 +
  77 + public void setActivity_status(Integer activity_status) {
  78 + this.activity_status = activity_status;
  79 + }
  80 +
  81 + public Integer getPage() {
  82 + return page;
  83 + }
  84 +
  85 + public void setPage(Integer page) {
  86 + this.page = page;
  87 + }
  88 +
  89 + public Integer getPageSize() {
  90 + return pageSize;
  91 + }
  92 +
  93 + public void setPageSize(Integer pageSize) {
  94 + this.pageSize = pageSize;
  95 + }
  96 +
  97 + public Integer getShenhe_state() {
  98 + return shenhe_state;
  99 + }
  100 +
  101 + public void setShenhe_state(Integer shenhe_state) {
  102 + this.shenhe_state = shenhe_state;
  103 + }
  104 +
  105 + public String getSp_desc() {
  106 + return sp_desc;
  107 + }
  108 +
  109 + public void setSp_desc(String sp_desc) {
  110 + this.sp_desc = sp_desc;
  111 + }
  112 +
  113 + public Integer getContentId() {
  114 + return contentId;
  115 + }
  116 +
  117 + public void setContentId(Integer contentId) {
  118 + this.contentId = contentId;
  119 + }
  120 +
  121 + public String getOrderByClause() {
  122 + return orderByClause;
  123 + }
  124 +
  125 + public void setOrderByClause(String orderByClause) {
  126 + this.orderByClause = orderByClause;
  127 + }
  128 +}
... ...
src/main/java/com/cnlive/shenhe/dto/NotSpeakDTO.java 0 → 100644
  View file @a0260a3
  1 +package com.cnlive.shenhe.dto;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +/**
  6 + * @author Administrator
  7 + * @author yanzhaowang
  8 + * @create 2022-03-17 16:09
  9 + */
  10 +public class NotSpeakDTO implements Serializable {
  11 +
  12 + private String user_name;
  13 + private Integer user_id;
  14 + private Integer state;
  15 + private Integer page = 1;
  16 + private Integer pageSize = 10;
  17 + private String orderByClause;
  18 +
  19 + public NotSpeakDTO() {
  20 + }
  21 +
  22 + public NotSpeakDTO(String user_name, Integer user_id, Integer state, Integer page, Integer pageSize, String orderByClause) {
  23 + this.user_name = user_name;
  24 + this.user_id = user_id;
  25 + this.state = state;
  26 + this.page = page;
  27 + this.pageSize = pageSize;
  28 + this.orderByClause = orderByClause;
  29 + }
  30 +
  31 + public String getUser_name() {
  32 + return user_name;
  33 + }
  34 +
  35 + public void setUser_name(String user_name) {
  36 + this.user_name = user_name;
  37 + }
  38 +
  39 + public Integer getUser_id() {
  40 + return user_id;
  41 + }
  42 +
  43 + public void setUser_id(Integer user_id) {
  44 + this.user_id = user_id;
  45 + }
  46 +
  47 + public Integer getState() {
  48 + return state;
  49 + }
  50 +
  51 + public void setState(Integer state) {
  52 + this.state = state;
  53 + }
  54 +
  55 + public Integer getPage() {
  56 + return page;
  57 + }
  58 +
  59 + public void setPage(Integer page) {
  60 + this.page = page;
  61 + }
  62 +
  63 + public Integer getPageSize() {
  64 + return pageSize;
  65 + }
  66 +
  67 + public void setPageSize(Integer pageSize) {
  68 + this.pageSize = pageSize;
  69 + }
  70 +
  71 + public String getOrderByClause() {
  72 + return orderByClause;
  73 + }
  74 +
  75 + public void setOrderByClause(String orderByClause) {
  76 + this.orderByClause = orderByClause;
  77 + }
  78 +}
... ...
src/main/java/com/cnlive/shenhe/dto/ShyActivityDTO.java
  View file @a0260a3
1 1 package com.cnlive.shenhe.dto;
2 2  
3   -
4   -import org.springframework.stereotype.Component;
  3 +import net.bytebuddy.implementation.bind.annotation.Default;
  4 +import org.springframework.beans.factory.annotation.Value;
5 5  
6 6 import java.io.Serializable;
7 7  
... ... @@ -10,9 +10,8 @@ import java.io.Serializable;
10 10 * @author yanzhaowang
11 11 * @create 2022-03-14 13:16
12 12 */
13   -@Component
14   -public class ShyActivityDTO implements Serializable {
15 13  
  14 +public class ShyActivityDTO implements Serializable {
16 15  
17 16  
18 17 private Integer pageNum = 1;
... ... @@ -21,15 +20,18 @@ public class ShyActivityDTO implements Serializable {
21 20  
22 21 private String activity;
23 22  
24   - private Byte exempt_from_trial;
  23 + private Integer exempt_from_trial;
25 24  
26   - public ShyActivityDTO(Integer pageNum, Integer pageSize, String activity, Byte exempt_from_trial) {
  25 + public ShyActivityDTO(Integer pageNum, Integer pageSize, String activity, Integer exempt_from_trial) {
27 26 this.pageNum = pageNum;
28 27 this.pageSize = pageSize;
29 28 this.activity = activity;
30 29 this.exempt_from_trial = exempt_from_trial;
31 30 }
32 31  
  32 + public ShyActivityDTO() {
  33 + }
  34 +
33 35 public Integer getPageNum() {
34 36 return pageNum;
35 37 }
... ... @@ -54,19 +56,11 @@ public class ShyActivityDTO implements Serializable {
54 56 this.activity = activity;
55 57 }
56 58  
57   - public Byte getExempt_from_trial() {
  59 + public Integer getExempt_from_trial() {
58 60 return exempt_from_trial;
59 61 }
60 62  
61   - public void setExempt_from_trial(Byte exempt_from_trial) {
  63 + public void setExempt_from_trial(Integer exempt_from_trial) {
62 64 this.exempt_from_trial = exempt_from_trial;
63 65 }
64   -
65   - public ShyActivityDTO(String activity, Byte exempt_from_trial) {
66   - this.activity = activity;
67   - this.exempt_from_trial = exempt_from_trial;
68   - }
69   -
70   - public ShyActivityDTO() {
71   - }
72 66 }
... ...
src/main/java/com/cnlive/shenhe/dto/SitesDTO.java 0 → 100644
  View file @a0260a3
  1 +package com.cnlive.shenhe.dto;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +/**
  6 + * @author Administrator
  7 + * @author yanzhaowang
  8 + * @create 2022-03-17 16:19
  9 + */
  10 +public class SitesDTO implements Serializable {
  11 + private Integer page = 1;
  12 + private Integer pageSize = 10;
  13 + private String orderByClause;
  14 + private String keyword;
  15 +
  16 + public SitesDTO() {
  17 + }
  18 +
  19 + public SitesDTO(Integer page, Integer pageSize, String orderByClause, String keyword) {
  20 + this.page = page;
  21 + this.pageSize = pageSize;
  22 + this.orderByClause = orderByClause;
  23 + this.keyword = keyword;
  24 + }
  25 +
  26 + public Integer getPage() {
  27 + return page;
  28 + }
  29 +
  30 + public void setPage(Integer page) {
  31 + this.page = page;
  32 + }
  33 +
  34 + public Integer getPageSize() {
  35 + return pageSize;
  36 + }
  37 +
  38 + public void setPageSize(Integer pageSize) {
  39 + this.pageSize = pageSize;
  40 + }
  41 +
  42 + public String getOrderByClause() {
  43 + return orderByClause;
  44 + }
  45 +
  46 + public void setOrderByClause(String orderByClause) {
  47 + this.orderByClause = orderByClause;
  48 + }
  49 +
  50 + public String getKeyword() {
  51 + return keyword;
  52 + }
  53 +
  54 + public void setKeyword(String keyword) {
  55 + this.keyword = keyword;
  56 + }
  57 +}
... ...
src/main/java/com/cnlive/shenhe/dto/TopicDTO.java 0 → 100644
  View file @a0260a3
  1 +package com.cnlive.shenhe.dto;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +/**
  6 + * @author Administrator
  7 + * @author yanzhaowang
  8 + * @create 2022-03-17 16:21
  9 + */
  10 +public class TopicDTO implements Serializable {
  11 +
  12 + private String topic_name;
  13 + private String topic_id;
  14 + private String topic_tag;
  15 + private String start_date;
  16 + private String end_date;
  17 + private Integer shenhe_status;
  18 + private String sp_desc;
  19 + private Integer page = 1;
  20 + private Integer pageSize = 10;
  21 + private Integer receive;
  22 + private String orderByClause;
  23 +
  24 + public TopicDTO() {
  25 + }
  26 +
  27 + 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) {
  28 + this.topic_name = topic_name;
  29 + this.topic_id = topic_id;
  30 + this.topic_tag = topic_tag;
  31 + this.start_date = start_date;
  32 + this.end_date = end_date;
  33 + this.shenhe_status = shenhe_status;
  34 + this.sp_desc = sp_desc;
  35 + this.page = page;
  36 + this.pageSize = pageSize;
  37 + this.receive = receive;
  38 + this.orderByClause = orderByClause;
  39 + }
  40 +
  41 + public String getTopic_name() {
  42 + return topic_name;
  43 + }
  44 +
  45 + public void setTopic_name(String topic_name) {
  46 + this.topic_name = topic_name;
  47 + }
  48 +
  49 + public String getTopic_id() {
  50 + return topic_id;
  51 + }
  52 +
  53 + public void setTopic_id(String topic_id) {
  54 + this.topic_id = topic_id;
  55 + }
  56 +
  57 + public String getTopic_tag() {
  58 + return topic_tag;
  59 + }
  60 +
  61 + public void setTopic_tag(String topic_tag) {
  62 + this.topic_tag = topic_tag;
  63 + }
  64 +
  65 + public String getStart_date() {
  66 + return start_date;
  67 + }
  68 +
  69 + public void setStart_date(String start_date) {
  70 + this.start_date = start_date;
  71 + }
  72 +
  73 + public String getEnd_date() {
  74 + return end_date;
  75 + }
  76 +
  77 + public void setEnd_date(String end_date) {
  78 + this.end_date = end_date;
  79 + }
  80 +
  81 + public Integer getShenhe_status() {
  82 + return shenhe_status;
  83 + }
  84 +
  85 + public void setShenhe_status(Integer shenhe_status) {
  86 + this.shenhe_status = shenhe_status;
  87 + }
  88 +
  89 + public String getSp_desc() {
  90 + return sp_desc;
  91 + }
  92 +
  93 + public void setSp_desc(String sp_desc) {
  94 + this.sp_desc = sp_desc;
  95 + }
  96 +
  97 + public Integer getPage() {
  98 + return page;
  99 + }
  100 +
  101 + public void setPage(Integer page) {
  102 + this.page = page;
  103 + }
  104 +
  105 + public Integer getPageSize() {
  106 + return pageSize;
  107 + }
  108 +
  109 + public void setPageSize(Integer pageSize) {
  110 + this.pageSize = pageSize;
  111 + }
  112 +
  113 + public Integer getReceive() {
  114 + return receive;
  115 + }
  116 +
  117 + public void setReceive(Integer receive) {
  118 + this.receive = receive;
  119 + }
  120 +
  121 + public String getOrderByClause() {
  122 + return orderByClause;
  123 + }
  124 +
  125 + public void setOrderByClause(String orderByClause) {
  126 + this.orderByClause = orderByClause;
  127 + }
  128 +}
... ...
src/main/java/com/cnlive/shenhe/dto/UsersDTO.java 0 → 100644
  View file @a0260a3
  1 +package com.cnlive.shenhe.dto;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +/**
  6 + * @author Administrator
  7 + * @author yanzhaowang
  8 + * @create 2022-03-17 16:27
  9 + */
  10 +public class UsersDTO implements Serializable {
  11 + private Integer page = 1;
  12 + private Integer pageSize = 10;
  13 + private String orderByClause;
  14 + private String username;
  15 + private String mobile;
  16 + private Integer sp_id;
  17 + private String company_brief;
  18 +
  19 + public UsersDTO() {
  20 + }
  21 +
  22 + public UsersDTO(Integer page, Integer pageSize, String orderByClause, String username, String mobile, Integer sp_id, String company_brief) {
  23 + this.page = page;
  24 + this.pageSize = pageSize;
  25 + this.orderByClause = orderByClause;
  26 + this.username = username;
  27 + this.mobile = mobile;
  28 + this.sp_id = sp_id;
  29 + this.company_brief = company_brief;
  30 + }
  31 +
  32 + public Integer getPage() {
  33 + return page;
  34 + }
  35 +
  36 + public void setPage(Integer page) {
  37 + this.page = page;
  38 + }
  39 +
  40 + public Integer getPageSize() {
  41 + return pageSize;
  42 + }
  43 +
  44 + public void setPageSize(Integer pageSize) {
  45 + this.pageSize = pageSize;
  46 + }
  47 +
  48 + public String getOrderByClause() {
  49 + return orderByClause;
  50 + }
  51 +
  52 + public void setOrderByClause(String orderByClause) {
  53 + this.orderByClause = orderByClause;
  54 + }
  55 +
  56 + public String getUsername() {
  57 + return username;
  58 + }
  59 +
  60 + public void setUsername(String username) {
  61 + this.username = username;
  62 + }
  63 +
  64 + public String getMobile() {
  65 + return mobile;
  66 + }
  67 +
  68 + public void setMobile(String mobile) {
  69 + this.mobile = mobile;
  70 + }
  71 +
  72 + public Integer getSp_id() {
  73 + return sp_id;
  74 + }
  75 +
  76 + public void setSp_id(Integer sp_id) {
  77 + this.sp_id = sp_id;
  78 + }
  79 +
  80 + public String getCompany_brief() {
  81 + return company_brief;
  82 + }
  83 +
  84 + public void setCompany_brief(String company_brief) {
  85 + this.company_brief = company_brief;
  86 + }
  87 +}
... ...
src/main/java/com/cnlive/shenhe/dto/UsersFreeDTO.java 0 → 100644
  View file @a0260a3
  1 +package com.cnlive.shenhe.dto;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +/**
  6 + * @author Administrator
  7 + * @author yanzhaowang
  8 + * @create 2022-03-17 16:30
  9 + */
  10 +public class UsersFreeDTO implements Serializable {
  11 +
  12 + private Integer page = 1;
  13 + private Integer pageSize = 10;
  14 + private String orderByClause;
  15 + private String userId;
  16 + private String mobile;
  17 +
  18 + public UsersFreeDTO() {
  19 + }
  20 +
  21 + public UsersFreeDTO(Integer page, Integer pageSize, String orderByClause, String userId, String mobile) {
  22 + this.page = page;
  23 + this.pageSize = pageSize;
  24 + this.orderByClause = orderByClause;
  25 + this.userId = userId;
  26 + this.mobile = mobile;
  27 + }
  28 +
  29 + public Integer getPage() {
  30 + return page;
  31 + }
  32 +
  33 + public void setPage(Integer page) {
  34 + this.page = page;
  35 + }
  36 +
  37 + public Integer getPageSize() {
  38 + return pageSize;
  39 + }
  40 +
  41 + public void setPageSize(Integer pageSize) {
  42 + this.pageSize = pageSize;
  43 + }
  44 +
  45 + public String getOrderByClause() {
  46 + return orderByClause;
  47 + }
  48 +
  49 + public void setOrderByClause(String orderByClause) {
  50 + this.orderByClause = orderByClause;
  51 + }
  52 +
  53 + public String getUserId() {
  54 + return userId;
  55 + }
  56 +
  57 + public void setUserId(String userId) {
  58 + this.userId = userId;
  59 + }
  60 +
  61 + public String getMobile() {
  62 + return mobile;
  63 + }
  64 +
  65 + public void setMobile(String mobile) {
  66 + this.mobile = mobile;
  67 + }
  68 +}
... ...
src/main/java/com/cnlive/shenhe/dto/VideosDTO.java 0 → 100644
  View file @a0260a3
  1 +package com.cnlive.shenhe.dto;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +/**
  6 + * @author Administrator
  7 + * @author yanzhaowang
  8 + * @create 2022-03-17 16:35
  9 + */
  10 +public class VideosDTO implements Serializable {
  11 +
  12 + private String video_title;
  13 + private String start_date;
  14 + private String end_date;
  15 + private Integer state;
  16 + private Integer receive;
  17 + private Integer page = 1;
  18 + private Integer pageSize = 10;
  19 + private String video_priority;
  20 + private String orderByClause;
  21 + private String sp_desc;
  22 + private String sp_Id;
  23 + private String source;
  24 + private String video_user_id;
  25 + private String shen_auditor_id;
  26 + private Integer contentId;
  27 + private String video_id;
  28 +
  29 + public VideosDTO() {
  30 + }
  31 +
  32 + 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) {
  33 + this.video_title = video_title;
  34 + this.start_date = start_date;
  35 + this.end_date = end_date;
  36 + this.state = state;
  37 + this.receive = receive;
  38 + this.page = page;
  39 + this.pageSize = pageSize;
  40 + this.video_priority = video_priority;
  41 + this.orderByClause = orderByClause;
  42 + this.sp_desc = sp_desc;
  43 + this.sp_Id = sp_Id;
  44 + this.source = source;
  45 + this.video_user_id = video_user_id;
  46 + this.shen_auditor_id = shen_auditor_id;
  47 + this.contentId = contentId;
  48 + this.video_id = video_id;
  49 + }
  50 +
  51 + public String getVideo_title() {
  52 + return video_title;
  53 + }
  54 +
  55 + public void setVideo_title(String video_title) {
  56 + this.video_title = video_title;
  57 + }
  58 +
  59 + public String getStart_date() {
  60 + return start_date;
  61 + }
  62 +
  63 + public void setStart_date(String start_date) {
  64 + this.start_date = start_date;
  65 + }
  66 +
  67 + public String getEnd_date() {
  68 + return end_date;
  69 + }
  70 +
  71 + public void setEnd_date(String end_date) {
  72 + this.end_date = end_date;
  73 + }
  74 +
  75 + public Integer getState() {
  76 + return state;
  77 + }
  78 +
  79 + public void setState(Integer state) {
  80 + this.state = state;
  81 + }
  82 +
  83 + public Integer getReceive() {
  84 + return receive;
  85 + }
  86 +
  87 + public void setReceive(Integer receive) {
  88 + this.receive = receive;
  89 + }
  90 +
  91 + public Integer getPage() {
  92 + return page;
  93 + }
  94 +
  95 + public void setPage(Integer page) {
  96 + this.page = page;
  97 + }
  98 +
  99 + public Integer getPageSize() {
  100 + return pageSize;
  101 + }
  102 +
  103 + public void setPageSize(Integer pageSize) {
  104 + this.pageSize = pageSize;
  105 + }
  106 +
  107 + public String getVideo_priority() {
  108 + return video_priority;
  109 + }
  110 +
  111 + public void setVideo_priority(String video_priority) {
  112 + this.video_priority = video_priority;
  113 + }
  114 +
  115 + public String getOrderByClause() {
  116 + return orderByClause;
  117 + }
  118 +
  119 + public void setOrderByClause(String orderByClause) {
  120 + this.orderByClause = orderByClause;
  121 + }
  122 +
  123 + public String getSp_desc() {
  124 + return sp_desc;
  125 + }
  126 +
  127 + public void setSp_desc(String sp_desc) {
  128 + this.sp_desc = sp_desc;
  129 + }
  130 +
  131 + public String getSp_Id() {
  132 + return sp_Id;
  133 + }
  134 +
  135 + public void setSp_Id(String sp_Id) {
  136 + this.sp_Id = sp_Id;
  137 + }
  138 +
  139 + public String getSource() {
  140 + return source;
  141 + }
  142 +
  143 + public void setSource(String source) {
  144 + this.source = source;
  145 + }
  146 +
  147 + public String getVideo_user_id() {
  148 + return video_user_id;
  149 + }
  150 +
  151 + public void setVideo_user_id(String video_user_id) {
  152 + this.video_user_id = video_user_id;
  153 + }
  154 +
  155 + public String getShen_auditor_id() {
  156 + return shen_auditor_id;
  157 + }
  158 +
  159 + public void setShen_auditor_id(String shen_auditor_id) {
  160 + this.shen_auditor_id = shen_auditor_id;
  161 + }
  162 +
  163 + public Integer getContentId() {
  164 + return contentId;
  165 + }
  166 +
  167 + public void setContentId(Integer contentId) {
  168 + this.contentId = contentId;
  169 + }
  170 +
  171 + public String getVideo_id() {
  172 + return video_id;
  173 + }
  174 +
  175 + public void setVideo_id(String video_id) {
  176 + this.video_id = video_id;
  177 + }
  178 +}
... ...
src/main/java/com/cnlive/shenhe/job/CommentsJob.java
  View file @a0260a3
... ... @@ -36,7 +36,8 @@ public class CommentsJob {
36 36 /**
37 37 * 自动退领
38 38 */
39   - @Scheduled(cron = "0 0 0 * * ? ")//每天0点执行
  39 + @Scheduled(cron = "0 0 0 * * ? ")
  40 + //每天0点执行
40 41 public void autoRetReceive() {
41 42 logger.info("评论自动退领的进入.....");
42 43 ShyComments shyComments = new ShyComments();
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/LiveApplyServiceImpl.java
  View file @a0260a3
... ... @@ -245,7 +245,7 @@ public class LiveApplyServiceImpl {
245 245 * @return
246 246 */
247 247 public List<ShyLiveapply> findByCondition(String theme, String start_date, String end_date,
248   - Integer business_model, Integer page, Integer pageSize,
  248 + String business_model, Integer page, Integer pageSize,
249 249 Integer shenhe_state,Integer receive, String orderByClause, Integer spid, String userId) {
250 250 Example example = new Example(ShyLiveapply.class);
251 251 Example.Criteria criteria = example.createCriteria();
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/ShyActivityImpl.java
  View file @a0260a3
1 1 package com.cnlive.shenhe.serviceImpl;
2 2  
3 3  
  4 +import com.cnlive.shenhe.dto.ShyActivityDTO;
4 5 import com.cnlive.shenhe.entity.ShyActivity;
5 6 import com.cnlive.shenhe.mapper.ShyActivityMapper;
6 7 import com.cnlive.shenhe.utils.CommonUtils;
... ... @@ -68,11 +69,10 @@ public class ShyActivityImpl {
68 69 /**
69 70 * 查询活动
70 71 *
71   - * @param pageNum
72   - * @param pageSize
  72 + * @param shyActivityDTO
73 73 * @return
74 74 */
75   - public PageInfo<ShyActivity> selectByExample(Integer pageNum, Integer pageSize, String activity, Integer exempt_from_trial) {
  75 + public PageInfo<ShyActivity> selectByExample(ShyActivityDTO shyActivityDTO) {
76 76 Example example = new Example(ShyActivity.class);
77 77 //如果为空 按照倒序排序 分页查询所有
78 78 //以创建时间为条件进行倒序
... ... @@ -81,14 +81,14 @@ public class ShyActivityImpl {
81 81 Example.Criteria criteria = example.createCriteria();
82 82  
83 83 // 如果查询条件不为空 按照条件走模糊查询
84   - if (exempt_from_trial != null) {
85   - criteria.andLike("exempt_from_trial", "%" + exempt_from_trial + "%");
  84 + if (shyActivityDTO.getExempt_from_trial() != null) {
  85 + criteria.andLike("exempt_from_trial", "%" + shyActivityDTO.getExempt_from_trial() + "%");
86 86 }
87 87 // 如果查询条件不为空 按照条件走模糊查询
88   - if (CommonUtils.isNotEmpty(activity)) {
89   - criteria.andLike("activity", "%" + activity + "%");
  88 + if (CommonUtils.isNotEmpty(shyActivityDTO.getActivity())) {
  89 + criteria.andLike("activity", "%" + shyActivityDTO.getActivity() + "%");
90 90 }
91   - PageHelper.startPage(pageNum, pageSize, true);
  91 + PageHelper.startPage(shyActivityDTO.getPageNum(), shyActivityDTO.getPageSize(), true);
92 92 List<ShyActivity> shyActivities = ShyActivityMapper.selectByExample(example);
93 93 PageInfo<ShyActivity> shyActivityPageInfo = new PageInfo<>(shyActivities);
94 94 return shyActivityPageInfo;
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
  View file @a0260a3
... ... @@ -287,7 +287,7 @@ public class VideosServiceImpl {
287 287 * @param userId
288 288 * @return
289 289 */
290   - 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) {
  290 + 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) {
291 291 Example example = new Example(ShyVideos.class);
292 292 Example.Criteria criteria = example.createCriteria();
293 293 Example.Criteria criteria2 = example.createCriteria();
... ...
src/main/resources/application.properties
  View file @a0260a3
... ... @@ -2,7 +2,7 @@ spring.datasource.url=jdbc:mysql://120.92.102.31:3306/new_shy?serverTimezone=Asi
2 2 spring.datasource.username=root
3 3 spring.datasource.password=M345sdfss4!
4 4  
5   -spring.datasource.driver-class-name=com.mysql.jdbc.Driver
  5 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
6 6  
7 7 server.tomcat.protocol_header=x-forwarded-proto
8 8 server.use-forward-headers=true
... ... @@ -17,10 +17,10 @@ spring.http.encoding.enabled=true
17 17 spring.http.encoding.force=true
18 18  
19 19 spring.thymeleaf.mode=LEGACYHTML5
  20 +spring.thymeleaf.cache=false
20 21 #spring.thymeleaf.encoding=UTF-8
21 22 #spring.thymeleaf.content-type=text/html
22 23 #\u5F00\u53D1\u65F6\u5173\u95ED\u7F13\u5B58,\u4E0D\u7136\u6CA1\u6CD5\u770B\u5230\u5B9E\u65F6\u9875\u9762
23   -spring.thymeleaf.cache=false
24 24  
25 25 #\u6253\u5370\u8FD0\u884C\u65F6\u7684sql
26 26 #logging.level.com.cnlive.shenhe.mapper=debug
... ... @@ -97,5 +97,5 @@ ks_domain=http://test.wideo.cnlive.com
97 97  
98 98 #\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84
99 99 desdir=shen
100   -yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/callbackAudio
101   -cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanById
  100 +yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/
  101 +cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanByIdcallbackAudio
... ...