周伟鹏 / cnlive_shenhe · Commits

Commit 465fe3b6ef046cb86fa66d88b6c0ffb882c8ae8e

Authored by 王言钊
1 parent 7529f223

优化封装好的DTO接受前端参数，优化Controller、ServiceImpl控制台打印接受参数对象

Inline Side-by-side
Showing 37 changed files with 332 additions and 837 deletions
src/main/java/com/cnlive/shenhe/controller/AudioController.java
  View file @465fe3b
... ... @@ -75,6 +75,7 @@ public class AudioController extends BaseController {
75 75 */
76 76 @GetMapping("/page")
77 77 public Object getListVideos(Model model, AudioDTO audioDTO, HttpSession session) {
  78 + logger.info("列表请求参数:{}", JSON.toJSONString(audioDTO));
78 79 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
79 80 if (CommonUtils.isNull(sessionUser)) {
80 81 return "redirect:/users/login";
... ...
src/main/java/com/cnlive/shenhe/controller/ChannelController.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.controller;
2 2  
  3 +import com.alibaba.fastjson.JSON;
3 4 import com.alibaba.fastjson.JSONObject;
4 5 import com.cnlive.shenhe.bean.ErrorEnum;
5 6 import com.cnlive.shenhe.bean.ResponseBean;
... ... @@ -56,6 +57,7 @@ public class ChannelController extends BaseController {
56 57 */
57 58 @GetMapping("/page")
58 59 public String getPage(Model model, ChannelDTO channelDTO, HttpSession session) {
  60 + logger.info("列表请求参数:{}", JSON.toJSONString(channelDTO));
59 61 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
60 62 if (CommonUtils.isNull(sessionUser)) {
61 63 return "redirect:/users/login";
... ... @@ -76,15 +78,15 @@ public class ChannelController extends BaseController {
76 78 channelDTO.setSpid(null);
77 79 }
78 80  
79   - if (CommonUtils.isNotEmpty(channelDTO.getsDate())) {
  81 + if (CommonUtils.isNotEmpty(channelDTO.getStart_date())) {
80 82 try {
81   - channelDTO.setsDate(String.valueOf(CommonUtils.parseDate(channelDTO.getsDate(), "yyyy-MM-dd")));
  83 + channelDTO.setStart_date(String.valueOf(CommonUtils.parseDate(channelDTO.getStart_date(), "yyyy-MM-dd")));
82 84 } catch (Exception e) {
83 85 }
84 86 }
85   - if (CommonUtils.isNotEmpty(channelDTO.geteDate())) {
  87 + if (CommonUtils.isNotEmpty(channelDTO.getEnd_date())) {
86 88 try {
87   - channelDTO.seteDate(String.valueOf(CommonUtils.parseDate(channelDTO.geteDate(), "yyyy-MM-dd")));
  89 + channelDTO.setEnd_date(String.valueOf(CommonUtils.parseDate(channelDTO.getEnd_date(), "yyyy-MM-dd")));
88 90 } catch (Exception e) {
89 91 }
90 92 }
... ...
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.controller;
2 2  
  3 +import com.alibaba.fastjson.JSON;
3 4 import com.alibaba.fastjson.JSONObject;
4 5 import com.cnlive.shenhe.bean.ErrorEnum;
5 6 import com.cnlive.shenhe.bean.ResponseBean;
... ... @@ -60,7 +61,7 @@ public class CommentsController extends BaseController {
60 61 */
61 62 @GetMapping("/page")
62 63 public String getPage(Model model, CommentsDTO commentsDTO, HttpSession session) {
63   -
  64 + logger.info("列表请求参数:{}", JSON.toJSONString(commentsDTO));
64 65 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
65 66 if (CommonUtils.isNull(sessionUser)) {
66 67 return "redirect:/users/login";
... ... @@ -73,15 +74,15 @@ public class CommentsController extends BaseController {
73 74 commentsDTO.setSpid(null);
74 75 }
75 76  
76   - if (CommonUtils.isNotEmpty(commentsDTO.getsDate())) {
  77 + if (CommonUtils.isNotEmpty(commentsDTO.getStart_date())) {
77 78 try {
78   - commentsDTO.setsDate(String.valueOf(CommonUtils.parseDate(commentsDTO.getsDate(), "yyyy-MM-dd")));
  79 + commentsDTO.setStart_date(String.valueOf(CommonUtils.parseDate(commentsDTO.getStart_date(), "yyyy-MM-dd")));
79 80 } catch (Exception e) {
80 81 }
81 82 }
82   - if (CommonUtils.isNotEmpty(commentsDTO.geteDate())) {
  83 + if (CommonUtils.isNotEmpty(commentsDTO.getEnd_date())) {
83 84 try {
84   - commentsDTO.seteDate(String.valueOf(CommonUtils.parseDate(commentsDTO.geteDate(), "yyyy-MM-dd")));
  85 + commentsDTO.setEnd_date(String.valueOf(CommonUtils.parseDate(commentsDTO.getEnd_date(), "yyyy-MM-dd")));
85 86 } catch (Exception e) {
86 87 }
87 88 }
... ... @@ -301,15 +302,15 @@ public class CommentsController extends BaseController {
301 302 commentsDTO.setSpid(null);
302 303 }
303 304  
304   - if (CommonUtils.isNotEmpty(commentsDTO.getsDate())) {
  305 + if (CommonUtils.isNotEmpty(commentsDTO.getStart_date())) {
305 306 try {
306   - commentsDTO.setsDate(String.valueOf(CommonUtils.parseDate(commentsDTO.getsDate(), "yyyy-MM-dd")));
  307 + commentsDTO.setStart_date(String.valueOf(CommonUtils.parseDate(commentsDTO.getStart_date(), "yyyy-MM-dd")));
307 308 } catch (Exception e) {
308 309 }
309 310 }
310   - if (CommonUtils.isNotEmpty(commentsDTO.geteDate())) {
  311 + if (CommonUtils.isNotEmpty(commentsDTO.getEnd_date())) {
311 312 try {
312   - commentsDTO.seteDate(String.valueOf(CommonUtils.parseDate(commentsDTO.geteDate(), "yyyy-MM-dd")));
  313 + commentsDTO.setEnd_date(String.valueOf(CommonUtils.parseDate(commentsDTO.getEnd_date(), "yyyy-MM-dd")));
313 314 } catch (Exception e) {
314 315 }
315 316 }
... ...
src/main/java/com/cnlive/shenhe/controller/ContentController.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.controller;
2 2  
  3 +import com.alibaba.fastjson.JSON;
3 4 import com.cnlive.shenhe.bean.ErrorEnum;
4 5 import com.cnlive.shenhe.bean.ResponseBean;
5 6 import com.cnlive.shenhe.bean.SessionUser;
... ... @@ -17,6 +18,8 @@ import org.apache.poi.xssf.usermodel.XSSFCell;
17 18 import org.apache.poi.xssf.usermodel.XSSFRow;
18 19 import org.apache.poi.xssf.usermodel.XSSFSheet;
19 20 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
  21 +import org.slf4j.Logger;
  22 +import org.slf4j.LoggerFactory;
20 23 import org.springframework.beans.factory.annotation.Autowired;
21 24 import org.springframework.stereotype.Controller;
22 25 import org.springframework.ui.Model;
... ... @@ -32,6 +35,7 @@ import java.util.List;
32 35 @Controller
33 36 @RequestMapping("/content")
34 37 public class ContentController extends BaseController {
  38 + private static Logger logger = LoggerFactory.getLogger(ContentController.class);
35 39 @Autowired
36 40 ContentServiceImpl contentService;
37 41 @Autowired
... ... @@ -50,6 +54,7 @@ public class ContentController extends BaseController {
50 54 */
51 55 @GetMapping("/page")
52 56 public String getPage(Model model, ContentDTO contentDTO, HttpSession session) {
  57 + logger.info("列表请求参数:{}", JSON.toJSONString(contentDTO));
53 58 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
54 59 if (CommonUtils.isNull(sessionUser)) {
55 60 return "redirect:/users/login";
... ... @@ -70,15 +75,15 @@ public class ContentController extends BaseController {
70 75 contentDTO.setSpid(null);
71 76 }
72 77  
73   - if (CommonUtils.isNotEmpty(String.valueOf(contentDTO.getsDate()))) {
  78 + if (CommonUtils.isNotEmpty(String.valueOf(contentDTO.getStart_date()))) {
74 79 try {
75   - contentDTO.setsDate(String.valueOf(CommonUtils.parseDate(String.valueOf(contentDTO.getsDate()), "yyyy-MM-dd")));
  80 + contentDTO.setStart_date(String.valueOf(CommonUtils.parseDate(String.valueOf(contentDTO.getStart_date()), "yyyy-MM-dd")));
76 81 } catch (Exception e) {
77 82 }
78 83 }
79   - if (CommonUtils.isNotEmpty(contentDTO.geteDate())) {
  84 + if (CommonUtils.isNotEmpty(contentDTO.getEnd_date())) {
80 85 try {
81   - contentDTO.seteDate(String.valueOf(CommonUtils.parseDate(contentDTO.geteDate(), "yyyy-MM-dd")));
  86 + contentDTO.setEnd_date(String.valueOf(CommonUtils.parseDate(contentDTO.getEnd_date(), "yyyy-MM-dd")));
82 87 } catch (Exception e) {
83 88 }
84 89 }
... ... @@ -227,15 +232,15 @@ public class ContentController extends BaseController {
227 232 contentDTO.setSpid(null);
228 233 }
229 234  
230   - if (CommonUtils.isNotEmpty(contentDTO.getsDate())) {
  235 + if (CommonUtils.isNotEmpty(contentDTO.getStart_date())) {
231 236 try {
232   - contentDTO.setsDate(String.valueOf((CommonUtils.parseDate(contentDTO.getsDate(), "yyyy-MM-dd"))));
  237 + contentDTO.setStart_date(String.valueOf((CommonUtils.parseDate(contentDTO.getStart_date(), "yyyy-MM-dd"))));
233 238 } catch (Exception e) {
234 239 }
235 240 }
236   - if (CommonUtils.isNotEmpty(contentDTO.geteDate())) {
  241 + if (CommonUtils.isNotEmpty(contentDTO.getEnd_date())) {
237 242 try {
238   - contentDTO.seteDate(String.valueOf(CommonUtils.parseDate(contentDTO.geteDate(), "yyyy-MM-dd")));
  243 + contentDTO.setEnd_date(String.valueOf(CommonUtils.parseDate(contentDTO.getEnd_date(), "yyyy-MM-dd")));
239 244 } catch (Exception e) {
240 245 }
241 246 }
... ...
src/main/java/com/cnlive/shenhe/controller/EmailController.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.controller;
2 2  
  3 +import com.alibaba.fastjson.JSON;
3 4 import com.alibaba.fastjson.JSONObject;
4 5 import com.cnlive.shenhe.bean.ErrorEnum;
5 6 import com.cnlive.shenhe.bean.ResponseBean;
... ... @@ -13,7 +14,8 @@ import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
13 14 import com.cnlive.shenhe.utils.CommonConst;
14 15 import com.cnlive.shenhe.utils.CommonUtils;
15 16 import com.github.pagehelper.PageInfo;
16   -
  17 +import org.slf4j.Logger;
  18 +import org.slf4j.LoggerFactory;
17 19 import org.springframework.beans.factory.annotation.Autowired;
18 20 import org.springframework.stereotype.Controller;
19 21 import org.springframework.ui.Model;
... ... @@ -22,9 +24,8 @@ import org.springframework.web.bind.annotation.PostMapping;
22 24 import org.springframework.web.bind.annotation.RequestMapping;
23 25 import org.springframework.web.bind.annotation.ResponseBody;
24 26  
25   -import java.util.List;
26   -
27 27 import javax.servlet.http.HttpSession;
  28 +import java.util.List;
28 29  
29 30 /**
30 31 * @Auther: liwei
... ... @@ -34,6 +35,7 @@ import javax.servlet.http.HttpSession;
34 35 @Controller
35 36 @RequestMapping("/email")
36 37 public class EmailController extends BaseController {
  38 + private static Logger logger = LoggerFactory.getLogger(EmailController.class);
37 39  
38 40 @Autowired
39 41 EmailServiceImpl emailServiceImpl;
... ... @@ -46,6 +48,7 @@ public class EmailController extends BaseController {
46 48  
47 49 @GetMapping(value = "/page")
48 50 public String page(Model model, EmailDTO emailDTO, HttpSession session) {
  51 + logger.info("列表请求参数:{}", JSON.toJSONString(emailDTO));
49 52 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
50 53 if(CommonUtils.isNull(sessionUser)){
51 54 return "redirect:/users/login";
... ...
src/main/java/com/cnlive/shenhe/controller/LiveApplyController.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.controller;
2 2  
3   -import com.cnlive.shenhe.dto.LiveApplyDTO;
4   -import org.apache.poi.xssf.usermodel.XSSFCell;
5   -import org.apache.poi.xssf.usermodel.XSSFRow;
6   -import org.apache.poi.xssf.usermodel.XSSFSheet;
7   -import org.apache.poi.xssf.usermodel.XSSFWorkbook;
  3 +import com.alibaba.fastjson.JSON;
8 4 import com.alibaba.fastjson.JSONObject;
9 5 import com.cnlive.shenhe.bean.ErrorEnum;
10 6 import com.cnlive.shenhe.bean.ResponseBean;
11 7 import com.cnlive.shenhe.bean.SessionUser;
  8 +import com.cnlive.shenhe.dto.LiveApplyDTO;
12 9 import com.cnlive.shenhe.entity.ShyLiveapply;
13 10 import com.cnlive.shenhe.entity.ShySites;
14 11 import com.cnlive.shenhe.entity.ShyUsers;
15   -import com.cnlive.shenhe.serviceImpl.LiveApplyServiceImpl;
16   -import com.cnlive.shenhe.serviceImpl.LiveServiceImpl;
17   -import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
18   -import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
19   -import com.cnlive.shenhe.serviceImpl.VideosServiceImpl;
  12 +import com.cnlive.shenhe.serviceImpl.*;
20 13 import com.cnlive.shenhe.utils.AuditPass;
21 14 import com.cnlive.shenhe.utils.CommonConst;
22 15 import com.cnlive.shenhe.utils.CommonUtils;
23 16 import com.github.pagehelper.PageInfo;
  17 +import org.apache.poi.xssf.usermodel.XSSFCell;
  18 +import org.apache.poi.xssf.usermodel.XSSFRow;
  19 +import org.apache.poi.xssf.usermodel.XSSFSheet;
  20 +import org.apache.poi.xssf.usermodel.XSSFWorkbook;
24 21 import org.slf4j.Logger;
25 22 import org.slf4j.LoggerFactory;
26 23 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -122,6 +119,7 @@ public class LiveApplyController extends BaseController {
122 119 */
123 120 @GetMapping("/page")
124 121 public Object getListLiveApply(Model model, LiveApplyDTO liveApplyDTO, HttpSession session) {
  122 + logger.info("列表请求参数:{}", JSON.toJSONString(liveApplyDTO));
125 123 System.out.println("进入直播申请内容页");
126 124 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
127 125 if(CommonUtils.isNull(sessionUser)){
... ...
src/main/java/com/cnlive/shenhe/controller/LiveController.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.controller;
2 2  
3   -import com.cnlive.shenhe.dto.LiveDTO;
4   -import com.cnlive.shenhe.utils.HttpClientUtils;
5   -import org.apache.poi.xssf.usermodel.XSSFCell;
6   -import org.apache.poi.xssf.usermodel.XSSFRow;
7   -import org.apache.poi.xssf.usermodel.XSSFSheet;
8   -import org.apache.poi.xssf.usermodel.XSSFWorkbook;
  3 +import com.alibaba.fastjson.JSON;
9 4 import com.alibaba.fastjson.JSONObject;
10 5 import com.cnlive.shenhe.bean.ErrorEnum;
11 6 import com.cnlive.shenhe.bean.ResponseBean;
12 7 import com.cnlive.shenhe.bean.SessionUser;
  8 +import com.cnlive.shenhe.dto.LiveDTO;
13 9 import com.cnlive.shenhe.entity.ShyLive;
14 10 import com.cnlive.shenhe.entity.ShySites;
15 11 import com.cnlive.shenhe.entity.ShyUsers;
... ... @@ -20,7 +16,12 @@ import com.cnlive.shenhe.serviceImpl.VideosServiceImpl;
20 16 import com.cnlive.shenhe.utils.AuditPass;
21 17 import com.cnlive.shenhe.utils.CommonConst;
22 18 import com.cnlive.shenhe.utils.CommonUtils;
  19 +import com.cnlive.shenhe.utils.HttpClientUtils;
23 20 import com.github.pagehelper.PageInfo;
  21 +import org.apache.poi.xssf.usermodel.XSSFCell;
  22 +import org.apache.poi.xssf.usermodel.XSSFRow;
  23 +import org.apache.poi.xssf.usermodel.XSSFSheet;
  24 +import org.apache.poi.xssf.usermodel.XSSFWorkbook;
24 25 import org.slf4j.Logger;
25 26 import org.slf4j.LoggerFactory;
26 27 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -118,6 +119,7 @@ public class LiveController extends BaseController {
118 119 */
119 120 @GetMapping("/page")
120 121 public Object getListVideos(Model model, LiveDTO liveDTO, HttpSession session) {
  122 + logger.info("列表请求参数:{}", JSON.toJSONString(liveDTO));
121 123 System.out.println("进入直播内容页");
122 124 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
123 125 Integer spid = sessionUser.getSpid();
... ...
src/main/java/com/cnlive/shenhe/controller/NotSpeakController.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.controller;
2 2  
3 3  
  4 +import com.alibaba.fastjson.JSON;
4 5 import com.cnlive.shenhe.bean.ResponseBean;
5 6 import com.cnlive.shenhe.bean.SessionUser;
6 7 import com.cnlive.shenhe.dto.NotSpeakDTO;
... ... @@ -52,6 +53,7 @@ public class NotSpeakController extends BaseController {
52 53 */
53 54 @GetMapping("/page")
54 55 public String getPage(Model model, NotSpeakDTO notSpeakDTO, HttpSession session) {
  56 + logger.info("列表请求参数:{}", JSON.toJSONString(notSpeakDTO));
55 57 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
56 58 if(CommonUtils.isNull(sessionUser)){
57 59 return "redirect:/users/login";
... ...
src/main/java/com/cnlive/shenhe/controller/ShyActivityController.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.controller;
2 2  
3 3  
  4 +import com.alibaba.fastjson.JSON;
4 5 import com.cnlive.shenhe.bean.ErrorEnum;
5 6 import com.cnlive.shenhe.bean.ResponseBean;
6 7 import com.cnlive.shenhe.dto.ShyActivityDTO;
7 8 import com.cnlive.shenhe.entity.ShyActivity;
8 9 import com.cnlive.shenhe.serviceImpl.ShyActivityImpl;
9 10 import com.github.pagehelper.PageInfo;
  11 +import org.slf4j.Logger;
  12 +import org.slf4j.LoggerFactory;
10 13 import org.springframework.beans.factory.annotation.Autowired;
11 14 import org.springframework.stereotype.Controller;
12 15 import org.springframework.ui.Model;
13   -import org.springframework.web.bind.annotation.*;
  16 +import org.springframework.web.bind.annotation.GetMapping;
  17 +import org.springframework.web.bind.annotation.PostMapping;
  18 +import org.springframework.web.bind.annotation.RequestMapping;
  19 +import org.springframework.web.bind.annotation.ResponseBody;
  20 +
14 21 import java.util.List;
15 22  
16 23  
... ... @@ -22,6 +29,9 @@ import java.util.List;
22 29 @Controller
23 30 @RequestMapping("/activity")
24 31 public class ShyActivityController extends BaseController {
  32 +
  33 + private static Logger logger = LoggerFactory.getLogger(ShyActivityController.class);
  34 +
25 35 @Autowired
26 36 private ShyActivityImpl shyActivityImpl;
27 37  
... ... @@ -60,6 +70,7 @@ public class ShyActivityController extends BaseController {
60 70  
61 71 @GetMapping("/page")
62 72 public String getShyActivity(ShyActivityDTO shyActivityDTO, Model model) {
  73 + logger.info("列表请求参数:{}", JSON.toJSONString(shyActivityDTO));
63 74 PageInfo<ShyActivity> shyActivityPageInfo = shyActivityImpl.selectByExample(shyActivityDTO);
64 75 List<ShyActivity> list = shyActivityPageInfo.getList();
65 76 model.addAttribute("exempt_from_trial",shyActivityDTO.getExempt_from_trial());
... ...
src/main/java/com/cnlive/shenhe/controller/SitesController.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.controller;
2 2  
  3 +import com.alibaba.fastjson.JSON;
3 4 import com.alibaba.fastjson.JSONObject;
4 5 import com.cnlive.shenhe.bean.SessionUser;
5 6 import com.cnlive.shenhe.dto.SitesDTO;
... ... @@ -42,7 +43,7 @@ public class SitesController extends BaseController {
42 43 */
43 44 @GetMapping(value = "/page")
44 45 public String page(Model model, SitesDTO sitesDTO, HttpSession session) {
45   -
  46 + logger.info("列表请求参数:{}", JSON.toJSONString(sitesDTO));
46 47 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
47 48 if(CommonUtils.isNull(sessionUser)){
48 49 return "redirect:/users/login";
... ...
src/main/java/com/cnlive/shenhe/controller/TopicController.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.controller;
2 2  
  3 +import com.alibaba.fastjson.JSON;
3 4 import com.cnlive.shenhe.bean.ErrorEnum;
4 5 import com.cnlive.shenhe.bean.ResponseBean;
5 6 import com.cnlive.shenhe.bean.SessionUser;
6 7 import com.cnlive.shenhe.dto.TopicDTO;
7   -import com.cnlive.shenhe.entity.*;
  8 +import com.cnlive.shenhe.entity.ShySites;
  9 +import com.cnlive.shenhe.entity.ShyTopic;
8 10 import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl;
9 11 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
10 12 import com.cnlive.shenhe.serviceImpl.TopicServiceImpl;
... ... @@ -13,14 +15,16 @@ import com.cnlive.shenhe.utils.AuditPass;
13 15 import com.cnlive.shenhe.utils.CommonConst;
14 16 import com.cnlive.shenhe.utils.CommonUtils;
15 17 import com.github.pagehelper.PageInfo;
16   -
17 18 import org.slf4j.Logger;
18 19 import org.slf4j.LoggerFactory;
19 20 import org.springframework.beans.factory.annotation.Autowired;
20 21 import org.springframework.beans.factory.annotation.Value;
21 22 import org.springframework.stereotype.Controller;
22 23 import org.springframework.ui.Model;
23   -import org.springframework.web.bind.annotation.*;
  24 +import org.springframework.web.bind.annotation.GetMapping;
  25 +import org.springframework.web.bind.annotation.PostMapping;
  26 +import org.springframework.web.bind.annotation.RequestMapping;
  27 +import org.springframework.web.bind.annotation.ResponseBody;
24 28  
25 29 import javax.servlet.http.HttpSession;
26 30 import java.util.HashMap;
... ... @@ -57,7 +61,7 @@ public class TopicController extends BaseController {
57 61 */
58 62 @GetMapping("/page")
59 63 public String getPage(Model model, TopicDTO topicDTO, HttpSession session) {
60   -
  64 + logger.info("列表请求参数:{}", JSON.toJSONString(topicDTO));
61 65 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
62 66 if(CommonUtils.isNull(sessionUser)){
63 67 return "redirect:/users/login";
... ... @@ -78,15 +82,15 @@ public class TopicController extends BaseController {
78 82 topicDTO.setSpid(null);
79 83 }
80 84  
81   - if (CommonUtils.isNotEmpty(topicDTO.getsDate())) {
  85 + if (CommonUtils.isNotEmpty(topicDTO.getStart_date())) {
82 86 try {
83   - topicDTO.setsDate(String.valueOf(CommonUtils.parseDate(topicDTO.getsDate(), "yyyy-MM-dd")));
  87 + topicDTO.setStart_date(String.valueOf(CommonUtils.parseDate(topicDTO.getStart_date(), "yyyy-MM-dd")));
84 88 } catch (Exception e) {
85 89 }
86 90 }
87   - if (CommonUtils.isNotEmpty(topicDTO.geteDate())) {
  91 + if (CommonUtils.isNotEmpty(topicDTO.getEnd_date())) {
88 92 try {
89   - topicDTO.seteDate(String.valueOf(CommonUtils.parseDate(topicDTO.geteDate(), "yyyy-MM-dd")));
  93 + topicDTO.setEnd_date(String.valueOf(CommonUtils.parseDate(topicDTO.getEnd_date(), "yyyy-MM-dd")));
90 94 } catch (Exception e) {
91 95 }
92 96 }
... ...
src/main/java/com/cnlive/shenhe/controller/UsersController.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.controller;
2 2  
  3 +import com.alibaba.fastjson.JSON;
3 4 import com.alibaba.fastjson.JSONObject;
4 5 import com.cnlive.shenhe.bean.SessionUser;
5 6 import com.cnlive.shenhe.dto.UsersDTO;
... ... @@ -10,24 +11,20 @@ import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
10 11 import com.cnlive.shenhe.utils.CommonConst;
11 12 import com.cnlive.shenhe.utils.CommonUtils;
12 13 import com.github.pagehelper.PageInfo;
13   -
14 14 import org.jasig.cas.client.authentication.AttributePrincipal;
  15 +import org.slf4j.Logger;
  16 +import org.slf4j.LoggerFactory;
15 17 import org.springframework.beans.factory.annotation.Autowired;
16 18 import org.springframework.stereotype.Controller;
17 19 import org.springframework.ui.Model;
18   -import org.springframework.web.bind.annotation.GetMapping;
19   -import org.springframework.web.bind.annotation.PathVariable;
20   -import org.springframework.web.bind.annotation.PostMapping;
21   -import org.springframework.web.bind.annotation.RequestMapping;
22   -import org.springframework.web.bind.annotation.ResponseBody;
  20 +import org.springframework.web.bind.annotation.*;
23 21  
  22 +import javax.servlet.http.HttpServletRequest;
  23 +import javax.servlet.http.HttpSession;
24 24 import java.util.HashMap;
25 25 import java.util.List;
26 26 import java.util.Map;
27 27  
28   -import javax.servlet.http.HttpServletRequest;
29   -import javax.servlet.http.HttpSession;
30   -
31 28 /**
32 29 * @Auther: liwei
33 30 * @Date: 2019/08/20 14:22
... ... @@ -37,6 +34,8 @@ import javax.servlet.http.HttpSession;
37 34 @RequestMapping("/users")
38 35 public class UsersController extends BaseController {
39 36  
  37 + private static Logger logger = LoggerFactory.getLogger(UsersController.class);
  38 +
40 39 @Autowired
41 40 UsersServiceImpl usersService;
42 41 @Autowired
... ... @@ -83,7 +82,7 @@ public class UsersController extends BaseController {
83 82  
84 83 @GetMapping(value = "/page")
85 84 public String page(Model model, UsersDTO usersDTO, HttpSession session) {
86   -
  85 + logger.info("列表请求参数:{}", JSON.toJSONString(usersDTO));
87 86 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
88 87 if(CommonUtils.isNull(sessionUser)){
89 88 return "redirect:/users/login";
... ...
src/main/java/com/cnlive/shenhe/controller/UsersFreeController.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.controller;
2 2  
  3 +import com.alibaba.fastjson.JSON;
3 4 import com.alibaba.fastjson.JSONObject;
4 5 import com.cnlive.shenhe.bean.ErrorEnum;
5 6 import com.cnlive.shenhe.bean.ResponseBean;
... ... @@ -12,7 +13,8 @@ import com.cnlive.shenhe.serviceImpl.UsersfreeServiceImpl;
12 13 import com.cnlive.shenhe.utils.CommonConst;
13 14 import com.cnlive.shenhe.utils.CommonUtils;
14 15 import com.github.pagehelper.PageInfo;
15   -
  16 +import org.slf4j.Logger;
  17 +import org.slf4j.LoggerFactory;
16 18 import org.springframework.beans.factory.annotation.Autowired;
17 19 import org.springframework.stereotype.Controller;
18 20 import org.springframework.ui.Model;
... ... @@ -21,9 +23,8 @@ import org.springframework.web.bind.annotation.PostMapping;
21 23 import org.springframework.web.bind.annotation.RequestMapping;
22 24 import org.springframework.web.bind.annotation.ResponseBody;
23 25  
24   -import java.util.List;
25   -
26 26 import javax.servlet.http.HttpSession;
  27 +import java.util.List;
27 28  
28 29 /**
29 30 * @Auther: liwei
... ... @@ -34,6 +35,9 @@ import javax.servlet.http.HttpSession;
34 35 @RequestMapping("/usersFree")
35 36 public class UsersFreeController extends BaseController {
36 37  
  38 + private static Logger logger = LoggerFactory.getLogger(UsersFreeController.class);
  39 +
  40 +
37 41 @Autowired
38 42 UsersfreeServiceImpl usersfreeService;
39 43 @Autowired
... ... @@ -41,6 +45,7 @@ public class UsersFreeController extends BaseController {
41 45  
42 46 @GetMapping(value = "/page")
43 47 public String wangjiajiaPage(Model model, UsersFreeDTO usersFreeDTO, HttpSession session) {
  48 + logger.info("列表请求参数:{}", JSON.toJSONString(usersFreeDTO));
44 49 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
45 50 if(CommonUtils.isNull(sessionUser)){
46 51 return "redirect:/users/login";
... ...
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @465fe3b
... ... @@ -190,7 +190,7 @@ public class VideosController extends BaseController {
190 190 videos.setSpid_desc(shySites.getName() + "(目击者)");
191 191 String source1 = videos.getSource();
192 192 for (ShyActivity activity : activityList) {
193   - if (activity.getId().equals(Integer.valueOf(source1))) {
  193 + if (activity.getId().equals(source1)) {
194 194 videos.setSpid_desc(activity.getActivity());
195 195 break;
196 196 }
... ...
src/main/java/com/cnlive/shenhe/dto/AudioDTO.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.dto;
2 2  
  3 +import com.cnlive.shenhe.entity.ShyAudio;
  4 +
3 5 import java.io.Serializable;
4 6  
5 7 /**
... ... @@ -7,13 +9,11 @@ import java.io.Serializable;
7 9 * @author yanzhaowang
8 10 * @create 2022-03-17 13:43
9 11 */
10   -public class AudioDTO implements Serializable {
  12 +public class AudioDTO extends ShyAudio implements Serializable {
11 13  
12 14 private String video_title;
13   - private String sDate ;
14   - private String eDate ;
15   - private Integer state;
16   - private Integer receive;
  15 + private String start_date;
  16 + private String end_date;
17 17 private Integer page = 1;
18 18 private Integer pageSize = 10;
19 19 private String video_priority;
... ... @@ -26,12 +26,10 @@ public class AudioDTO implements Serializable {
26 26 public AudioDTO() {
27 27 }
28 28  
29   - public AudioDTO(String video_title, String sDate, String eDate, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id, Integer spid, String userId) {
  29 + public AudioDTO(String video_title, String start_date, String end_date, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id, Integer spid, String userId) {
30 30 this.video_title = video_title;
31   - this.sDate = sDate;
32   - this.eDate = eDate;
33   - this.state = state;
34   - this.receive = receive;
  31 + this.start_date = start_date;
  32 + this.end_date = end_date;
35 33 this.page = page;
36 34 this.pageSize = pageSize;
37 35 this.video_priority = video_priority;
... ... @@ -42,44 +40,28 @@ public class AudioDTO implements Serializable {
42 40 this.userId = userId;
43 41 }
44 42  
45   - public String getVideo_title() {
46   - return video_title;
47   - }
48   -
49   - public void setVideo_title(String video_title) {
50   - this.video_title = video_title;
51   - }
52   -
53   - public String getsDate() {
54   - return sDate;
  43 + public String getStart_date() {
  44 + return start_date;
55 45 }
56 46  
57   - public void setsDate(String sDate) {
58   - this.sDate = sDate;
  47 + public void setStart_date(String start_date) {
  48 + this.start_date = start_date;
59 49 }
60 50  
61   - public String geteDate() {
62   - return eDate;
  51 + public String getEnd_date() {
  52 + return end_date;
63 53 }
64 54  
65   - public void seteDate(String eDate) {
66   - this.eDate = eDate;
  55 + public void setEnd_date(String end_date) {
  56 + this.end_date = end_date;
67 57 }
68 58  
69   - public Integer getState() {
70   - return state;
71   - }
72   -
73   - public void setState(Integer state) {
74   - this.state = state;
75   - }
76   -
77   - public Integer getReceive() {
78   - return receive;
  59 + public String getVideo_title() {
  60 + return video_title;
79 61 }
80 62  
81   - public void setReceive(Integer receive) {
82   - this.receive = receive;
  63 + public void setVideo_title(String video_title) {
  64 + this.video_title = video_title;
83 65 }
84 66  
85 67 public Integer getPage() {
... ... @@ -98,6 +80,7 @@ public class AudioDTO implements Serializable {
98 80 this.pageSize = pageSize;
99 81 }
100 82  
  83 +
101 84 public String getVideo_priority() {
102 85 return video_priority;
103 86 }
... ...
src/main/java/com/cnlive/shenhe/dto/ChannelDTO.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.dto;
2 2  
  3 +import com.cnlive.shenhe.entity.ShyChannel;
  4 +
3 5 import java.io.Serializable;
4   -import java.util.Date;
5 6  
6 7 /**
7 8 * @author Administrator
8 9 * @author yanzhaowang
9 10 * @create 2022-03-17 14:19
10 11 */
11   -public class ChannelDTO implements Serializable {
  12 +public class ChannelDTO extends ShyChannel implements Serializable {
12 13  
13   - private String channel_id;
14   - private String channel_name;
15   - private Integer receive;
16   - private Integer shenhe_status;
17   - private String sp_desc;
18 14 private Integer page = 1;
19 15 private Integer pageSize = 10;
20 16 private String orderByClause;
21 17 private Integer spid;
22 18 private String userId;
23   - private String updater;
24   - private String sDate ;
25   - private String eDate ;
  19 + private String start_date;
  20 + private String end_date;
  21 + private Integer receive;
26 22  
27 23 public ChannelDTO() {
28 24 }
29 25  
30   - public ChannelDTO(String channel_id, String channel_name, Integer receive, Integer shenhe_status, String sp_desc, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId, String updater, String sDate, String eDate) {
31   - this.channel_id = channel_id;
32   - this.channel_name = channel_name;
33   - this.receive = receive;
34   - this.shenhe_status = shenhe_status;
35   - this.sp_desc = sp_desc;
  26 + public ChannelDTO(Integer page, Integer pageSize, String orderByClause, Integer spid, String userId, String start_date, String end_date, Integer receive) {
36 27 this.page = page;
37 28 this.pageSize = pageSize;
38 29 this.orderByClause = orderByClause;
39 30 this.spid = spid;
40 31 this.userId = userId;
41   - this.updater = updater;
42   - this.sDate = sDate;
43   - this.eDate = eDate;
44   - }
45   -
46   - public String getChannel_id() {
47   - return channel_id;
48   - }
49   -
50   - public void setChannel_id(String channel_id) {
51   - this.channel_id = channel_id;
52   - }
53   -
54   - public String getChannel_name() {
55   - return channel_name;
56   - }
57   -
58   - public void setChannel_name(String channel_name) {
59   - this.channel_name = channel_name;
60   - }
61   -
62   - public Integer getReceive() {
63   - return receive;
64   - }
65   -
66   - public void setReceive(Integer receive) {
  32 + this.start_date = start_date;
  33 + this.end_date = end_date;
67 34 this.receive = receive;
68 35 }
69 36  
70   - public Integer getShenhe_status() {
71   - return shenhe_status;
72   - }
73   -
74   - public void setShenhe_status(Integer shenhe_status) {
75   - this.shenhe_status = shenhe_status;
76   - }
77   -
78   - public String getSp_desc() {
79   - return sp_desc;
80   - }
81   -
82   - public void setSp_desc(String sp_desc) {
83   - this.sp_desc = sp_desc;
84   - }
85   -
86 37 public Integer getPage() {
87 38 return page == null ? 1 : page;
88 39 }
... ... @@ -123,27 +74,27 @@ public class ChannelDTO implements Serializable {
123 74 this.userId = userId;
124 75 }
125 76  
126   - public String getsDate() {
127   - return sDate;
  77 + public String getStart_date() {
  78 + return start_date;
128 79 }
129 80  
130   - public void setsDate(String sDate) {
131   - this.sDate = sDate;
  81 + public void setStart_date(String start_date) {
  82 + this.start_date = start_date;
132 83 }
133 84  
134   - public String geteDate() {
135   - return eDate;
  85 + public String getEnd_date() {
  86 + return end_date;
136 87 }
137 88  
138   - public void seteDate(String eDate) {
139   - this.eDate = eDate;
  89 + public void setEnd_date(String end_date) {
  90 + this.end_date = end_date;
140 91 }
141 92  
142   - public String getUpdater() {
143   - return updater;
  93 + public Integer getReceive() {
  94 + return receive;
144 95 }
145 96  
146   - public void setUpdater(String updater) {
147   - this.updater = updater;
  97 + public void setReceive(Integer receive) {
  98 + this.receive = receive;
148 99 }
149 100 }
... ...
src/main/java/com/cnlive/shenhe/dto/CommentsDTO.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.dto;
2 2  
  3 +import com.cnlive.shenhe.entity.ShyComments;
  4 +
3 5 import java.io.Serializable;
4 6  
5 7 /**
... ... @@ -7,51 +9,27 @@ import java.io.Serializable;
7 9 * @author yanzhaowang
8 10 * @create 2022-03-17 14:31
9 11 */
10   -public class CommentsDTO implements Serializable {
  12 +public class CommentsDTO extends ShyComments implements Serializable {
11 13  
12   - private String activity_id;
13 14 private String content;
14   - private Integer is_hot;
15   - private Integer state;
16   - private Integer receive;
17 15 private Integer page = 1;
18 16 private Integer pageSize = 10;
19 17 private String orderByClause;
20   - private Integer type;
21   - private Integer comment_user_id;
22   - private String sDate ;
23   - private String eDate ;
24   - private Integer spid;
  18 + private String start_date;
  19 + private String end_date;
25 20 private String userId;
26   - private String updater;
27 21  
28 22 public CommentsDTO() {
29 23 }
30 24  
31   - public CommentsDTO(String activity_id, String content, Integer is_hot, Integer state, Integer receive, Integer page, Integer pageSize, String orderByClause, Integer type, Integer comment_user_id, String sDate, String eDate, Integer spid, String userId, String updater) {
32   - this.activity_id = activity_id;
  25 + public CommentsDTO(String content, Integer page, Integer pageSize, String orderByClause, String start_date, String end_date, String userId) {
33 26 this.content = content;
34   - this.is_hot = is_hot;
35   - this.state = state;
36   - this.receive = receive;
37 27 this.page = page;
38 28 this.pageSize = pageSize;
39 29 this.orderByClause = orderByClause;
40   - this.type = type;
41   - this.comment_user_id = comment_user_id;
42   - this.sDate = sDate;
43   - this.eDate = eDate;
44   - this.spid = spid;
  30 + this.start_date = start_date;
  31 + this.end_date = end_date;
45 32 this.userId = userId;
46   - this.updater = updater;
47   - }
48   -
49   - public String getActivity_id() {
50   - return activity_id;
51   - }
52   -
53   - public void setActivity_id(String activity_id) {
54   - this.activity_id = activity_id;
55 33 }
56 34  
57 35 public String getContent() {
... ... @@ -62,30 +40,6 @@ public class CommentsDTO implements Serializable {
62 40 this.content = content;
63 41 }
64 42  
65   - public Integer getIs_hot() {
66   - return is_hot;
67   - }
68   -
69   - public void setIs_hot(Integer is_hot) {
70   - this.is_hot = is_hot;
71   - }
72   -
73   - public Integer getState() {
74   - return state;
75   - }
76   -
77   - public void setState(Integer state) {
78   - this.state = state;
79   - }
80   -
81   - public Integer getReceive() {
82   - return receive;
83   - }
84   -
85   - public void setReceive(Integer receive) {
86   - this.receive = receive;
87   - }
88   -
89 43 public Integer getPage() {
90 44 return page == null ? 1 : page;
91 45 }
... ... @@ -110,59 +64,28 @@ public class CommentsDTO implements Serializable {
110 64 this.orderByClause = orderByClause;
111 65 }
112 66  
113   - public Integer getType() {
114   - return type;
115   - }
116   -
117   - public void setType(Integer type) {
118   - this.type = type;
119   - }
120   -
121   - public Integer getComment_user_id() {
122   - return comment_user_id;
123   - }
124   -
125   - public void setComment_user_id(Integer comment_user_id) {
126   - this.comment_user_id = comment_user_id;
127   - }
128   -
129   - public String getsDate() {
130   - return sDate;
131   - }
132   -
133   - public void setsDate(String sDate) {
134   - this.sDate = sDate;
135   - }
136   -
137   - public String geteDate() {
138   - return eDate;
139   - }
140   -
141   - public void seteDate(String eDate) {
142   - this.eDate = eDate;
  67 + public String getUserId() {
  68 + return userId;
143 69 }
144 70  
145   - public Integer getSpid() {
146   - return spid;
  71 + public void setUserId(String userId) {
  72 + this.userId = userId;
147 73 }
148 74  
149   - public void setSpid(Integer spid) {
150   - this.spid = spid;
151   - }
152 75  
153   - public String getUserId() {
154   - return userId;
  76 + public String getStart_date() {
  77 + return start_date;
155 78 }
156 79  
157   - public void setUserId(String userId) {
158   - this.userId = userId;
  80 + public void setStart_date(String start_date) {
  81 + this.start_date = start_date;
159 82 }
160 83  
161   - public String getUpdater() {
162   - return updater;
  84 + public String getEnd_date() {
  85 + return end_date;
163 86 }
164 87  
165   - public void setUpdater(String updater) {
166   - this.updater = updater;
  88 + public void setEnd_date(String end_date) {
  89 + this.end_date = end_date;
167 90 }
168 91 }
... ...
src/main/java/com/cnlive/shenhe/dto/ContentDTO.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.dto;
2 2  
  3 +import com.cnlive.shenhe.entity.ShyContent;
  4 +
3 5 import java.io.Serializable;
4   -import java.util.Date;
5 6  
6 7 /**
7 8 * @author Administrator
8 9 * @author yanzhaowang
9 10 * @create 2022-03-17 14:48
10 11 */
11   -public class ContentDTO implements Serializable {
  12 +public class ContentDTO extends ShyContent implements Serializable {
12 13  
13   - private String title;
14 14 private String contentId;
15   - private String content_tag;
16   - private Integer receive_status;
17   - private String sp_desc;
18   - private String source;
19   - private String author;
20 15 private Integer page = 1;
21 16 private Integer pageSize = 10;
22 17 private String orderByClause;
23   - private String sDate;
24   - private String eDate;
  18 + private String start_date;
  19 + private String end_date;
25 20 private Integer spid;
26 21 private String userId;
27   - private String updater;
28 22  
29 23 public ContentDTO() {
30 24 }
31 25  
32   - public String getTitle() {
33   - return title;
34   - }
35   -
36   - public void setTitle(String title) {
37   - this.title = title;
38   - }
39 26  
40 27 public String getContentId() {
41 28 return contentId;
... ... @@ -45,46 +32,6 @@ public class ContentDTO implements Serializable {
45 32 this.contentId = contentId;
46 33 }
47 34  
48   - public String getContent_tag() {
49   - return content_tag;
50   - }
51   -
52   - public void setContent_tag(String content_tag) {
53   - this.content_tag = content_tag;
54   - }
55   -
56   - public Integer getReceive_status() {
57   - return receive_status;
58   - }
59   -
60   - public void setReceive_status(Integer receive_status) {
61   - this.receive_status = receive_status;
62   - }
63   -
64   - public String getSp_desc() {
65   - return sp_desc;
66   - }
67   -
68   - public void setSp_desc(String sp_desc) {
69   - this.sp_desc = sp_desc;
70   - }
71   -
72   - public String getSource() {
73   - return source;
74   - }
75   -
76   - public void setSource(String source) {
77   - this.source = source;
78   - }
79   -
80   - public String getAuthor() {
81   - return author;
82   - }
83   -
84   - public void setAuthor(String author) {
85   - this.author = author;
86   - }
87   -
88 35 public Integer getPage() {
89 36 return page == null ? 1 : page;
90 37 }
... ... @@ -126,45 +73,31 @@ public class ContentDTO implements Serializable {
126 73 this.userId = userId;
127 74 }
128 75  
129   - public String getsDate() {
130   - return sDate;
131   - }
132   -
133   - public void setsDate(String sDate) {
134   - this.sDate = sDate;
135   - }
136 76  
137   - public String geteDate() {
138   - return eDate;
  77 + public String getStart_date() {
  78 + return start_date;
139 79 }
140 80  
141   - public void seteDate(String eDate) {
142   - this.eDate = eDate;
  81 + public void setStart_date(String start_date) {
  82 + this.start_date = start_date;
143 83 }
144 84  
145   - public String getUpdater() {
146   - return updater;
  85 + public String getEnd_date() {
  86 + return end_date;
147 87 }
148 88  
149   - public void setUpdater(String updater) {
150   - this.updater = updater;
  89 + public void setEnd_date(String end_date) {
  90 + this.end_date = end_date;
151 91 }
152 92  
153   - public ContentDTO(String title, String contentId, String content_tag, Integer receive_status, String sp_desc, String source, String author, Integer page, Integer pageSize, String orderByClause, String sDate, String eDate, Integer spid, String userId, String updater) {
154   - this.title = title;
  93 + public ContentDTO(String contentId, Integer page, Integer pageSize, String orderByClause, String start_date, String end_date, Integer spid, String userId) {
155 94 this.contentId = contentId;
156   - this.content_tag = content_tag;
157   - this.receive_status = receive_status;
158   - this.sp_desc = sp_desc;
159   - this.source = source;
160   - this.author = author;
161 95 this.page = page;
162 96 this.pageSize = pageSize;
163 97 this.orderByClause = orderByClause;
164   - this.sDate = sDate;
165   - this.eDate = eDate;
  98 + this.start_date = start_date;
  99 + this.end_date = end_date;
166 100 this.spid = spid;
167 101 this.userId = userId;
168   - this.updater = updater;
169 102 }
170 103 }
... ...
src/main/java/com/cnlive/shenhe/dto/EmailDTO.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.dto;
2 2  
  3 +import com.cnlive.shenhe.entity.ShyEmail;
  4 +
3 5 import java.io.Serializable;
4 6  
5 7 /**
... ... @@ -7,22 +9,18 @@ import java.io.Serializable;
7 9 * @author yanzhaowang
8 10 * @create 2022-03-17 15:15
9 11 */
10   -public class EmailDTO implements Serializable {
  12 +public class EmailDTO extends ShyEmail implements Serializable {
11 13 private Integer page = 1;
12 14 private Integer pageSize = 10;
13 15 private String orderByClause;
14   - private String remark;
15   - private String email;
16 16  
17 17 public EmailDTO() {
18 18 }
19 19  
20   - public EmailDTO(Integer page, Integer pageSize, String orderByClause, String remark, String email) {
  20 + public EmailDTO(Integer page, Integer pageSize, String orderByClause) {
21 21 this.page = page;
22 22 this.pageSize = pageSize;
23 23 this.orderByClause = orderByClause;
24   - this.remark = remark;
25   - this.email = email;
26 24 }
27 25  
28 26 public Integer getPage() {
... ... @@ -49,19 +47,4 @@ public class EmailDTO implements Serializable {
49 47 this.orderByClause = orderByClause;
50 48 }
51 49  
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 50 }
... ...
src/main/java/com/cnlive/shenhe/dto/LiveApplyDTO.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.dto;
2 2  
  3 +import com.cnlive.shenhe.entity.ShyLiveapply;
  4 +
3 5 import java.io.Serializable;
4 6  
5 7 /**
... ... @@ -7,54 +9,47 @@ import java.io.Serializable;
7 9 * @author yanzhaowang
8 10 * @create 2022-03-17 15:22
9 11 */
10   -public class LiveApplyDTO implements Serializable {
  12 +public class LiveApplyDTO extends ShyLiveapply implements Serializable {
  13 +
11 14  
12 15  
13   - private String theme;
14   - private String business_model;
15 16 private Integer page = 1;
16 17 private Integer pageSize = 10;
17   - private Integer shenhe_state;
18   - private Integer receive;
19 18 private String sp_desc;
20 19 private String orderByClause;
21 20 private Integer spid;
22 21 private String userId;
23   - private String sDate;
24   - private String eDate;
  22 + private String start_date;
  23 + private String end_date;
25 24  
26 25 public LiveApplyDTO() {
27 26 }
28 27  
29   - public LiveApplyDTO(String sDate, String eDate, String theme, String business_model, Integer page, Integer pageSize, Integer shenhe_state, Integer receive, String sp_desc, String orderByClause, Integer spid, String userId) {
30   - this.sDate = sDate;
31   - this.eDate = eDate;
32   - this.theme = theme;
33   - this.business_model = business_model;
  28 + public LiveApplyDTO(Integer page, Integer pageSize, String sp_desc, String orderByClause, Integer spid, String userId, String start_date, String end_date) {
34 29 this.page = page;
35 30 this.pageSize = pageSize;
36   - this.shenhe_state = shenhe_state;
37   - this.receive = receive;
38 31 this.sp_desc = sp_desc;
39 32 this.orderByClause = orderByClause;
40 33 this.spid = spid;
41 34 this.userId = userId;
  35 + this.start_date = start_date;
  36 + this.end_date = end_date;
42 37 }
43 38  
44   - public String getsDate() {
45   - return sDate;
  39 + public String getStart_date() {
  40 + return start_date;
46 41 }
47 42  
48   - public void setsDate(String sDate) {
49   - this.sDate = sDate;
  43 + public void setStart_date(String start_date) {
  44 + this.start_date = start_date;
50 45 }
51 46  
52   - public String geteDate() {
53   - return eDate;
  47 + public String getEnd_date() {
  48 + return end_date;
54 49 }
55 50  
56   - public void seteDate(String eDate) {
57   - this.eDate = eDate;
  51 + public void setEnd_date(String end_date) {
  52 + this.end_date = end_date;
58 53 }
59 54  
60 55 public Integer getSpid() {
... ... @@ -73,22 +68,6 @@ public class LiveApplyDTO implements Serializable {
73 68 this.userId = userId;
74 69 }
75 70  
76   - public String getTheme() {
77   - return theme;
78   - }
79   -
80   - public void setTheme(String theme) {
81   - this.theme = theme;
82   - }
83   -
84   - public String getBusiness_model() {
85   - return business_model;
86   - }
87   -
88   - public void setBusiness_model(String business_model) {
89   - this.business_model = business_model;
90   - }
91   -
92 71 public Integer getPage() {
93 72 return page == null ? 1 : page;
94 73 }
... ... @@ -105,22 +84,6 @@ public class LiveApplyDTO implements Serializable {
105 84 this.pageSize = pageSize;
106 85 }
107 86  
108   - public Integer getShenhe_state() {
109   - return shenhe_state;
110   - }
111   -
112   - public void setShenhe_state(Integer shenhe_state) {
113   - this.shenhe_state = shenhe_state;
114   - }
115   -
116   - public Integer getReceive() {
117   - return receive;
118   - }
119   -
120   - public void setReceive(Integer receive) {
121   - this.receive = receive;
122   - }
123   -
124 87 public String getSp_desc() {
125 88 return sp_desc;
126 89 }
... ...
src/main/java/com/cnlive/shenhe/dto/LiveDTO.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.dto;
2 2  
  3 +import com.cnlive.shenhe.entity.ShyLive;
  4 +
3 5 import java.io.Serializable;
4 6  
5 7 /**
... ... @@ -7,64 +9,31 @@ import java.io.Serializable;
7 9 * @author yanzhaowang
8 10 * @create 2022-03-17 15:45
9 11 */
10   -public class LiveDTO implements Serializable {
  12 +public class LiveDTO extends ShyLive implements Serializable {
11 13  
12   - private String activity_id;
13   - private String activity_name;
14   - private Integer activity_status;
15 14 private Integer page = 1;
16 15 private Integer pageSize = 10;
17   - private Integer shenhe_state;
18 16 private String sp_desc;
19 17 private Integer contentId;
20 18 private String orderByClause;
21   -
22 19 private Integer spid;
23 20 private String userId;
24   - private String sDate;
25   - private String eDate;
  21 + private String start_date;
  22 + private String end_date;
26 23  
27 24 public LiveDTO() {
28 25 }
29 26  
30   - public LiveDTO(String activity_id, String activity_name, Integer activity_status, Integer page, Integer pageSize, Integer shenhe_state, String sp_desc, Integer contentId, String orderByClause, Integer spid, String userId, String sDate, String eDate) {
31   - this.activity_id = activity_id;
32   - this.activity_name = activity_name;
33   - this.activity_status = activity_status;
  27 + public LiveDTO(Integer page, Integer pageSize, String sp_desc, Integer contentId, String orderByClause, Integer spid, String userId, String start_date, String end_date) {
34 28 this.page = page;
35 29 this.pageSize = pageSize;
36   - this.shenhe_state = shenhe_state;
37 30 this.sp_desc = sp_desc;
38 31 this.contentId = contentId;
39 32 this.orderByClause = orderByClause;
40 33 this.spid = spid;
41 34 this.userId = userId;
42   - this.sDate = sDate;
43   - this.eDate = eDate;
44   - }
45   -
46   - public String getActivity_id() {
47   - return activity_id;
48   - }
49   -
50   - public void setActivity_id(String activity_id) {
51   - this.activity_id = activity_id;
52   - }
53   -
54   - public String getActivity_name() {
55   - return activity_name;
56   - }
57   -
58   - public void setActivity_name(String activity_name) {
59   - this.activity_name = activity_name;
60   - }
61   -
62   - public Integer getActivity_status() {
63   - return activity_status;
64   - }
65   -
66   - public void setActivity_status(Integer activity_status) {
67   - this.activity_status = activity_status;
  35 + this.start_date = start_date;
  36 + this.end_date = end_date;
68 37 }
69 38  
70 39 public Integer getPage() {
... ... @@ -83,14 +52,6 @@ public class LiveDTO implements Serializable {
83 52 this.pageSize = pageSize;
84 53 }
85 54  
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 55 public String getSp_desc() {
95 56 return sp_desc;
96 57 }
... ... @@ -131,19 +92,19 @@ public class LiveDTO implements Serializable {
131 92 this.userId = userId;
132 93 }
133 94  
134   - public String getsDate() {
135   - return sDate;
  95 + public String getStart_date() {
  96 + return start_date;
136 97 }
137 98  
138   - public void setsDate(String sDate) {
139   - this.sDate = sDate;
  99 + public void setStart_date(String start_date) {
  100 + this.start_date = start_date;
140 101 }
141 102  
142   - public String geteDate() {
143   - return eDate;
  103 + public String getEnd_date() {
  104 + return end_date;
144 105 }
145 106  
146   - public void seteDate(String eDate) {
147   - this.eDate = eDate;
  107 + public void setEnd_date(String end_date) {
  108 + this.end_date = end_date;
148 109 }
149 110 }
... ...
src/main/java/com/cnlive/shenhe/dto/NotSpeakDTO.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.dto;
2 2  
  3 +import com.cnlive.shenhe.entity.ShyNotspeak;
  4 +
3 5 import java.io.Serializable;
4 6  
5 7 /**
... ... @@ -7,11 +9,9 @@ import java.io.Serializable;
7 9 * @author yanzhaowang
8 10 * @create 2022-03-17 16:09
9 11 */
10   -public class NotSpeakDTO implements Serializable {
  12 +public class NotSpeakDTO extends ShyNotspeak implements Serializable {
  13 +
11 14  
12   - private String user_name;
13   - private Integer user_id;
14   - private Integer state;
15 15 private Integer page = 1;
16 16 private Integer pageSize = 10;
17 17 private String orderByClause;
... ... @@ -28,50 +28,13 @@ public class NotSpeakDTO implements Serializable {
28 28 this.userId = userId;
29 29 }
30 30  
31   - public NotSpeakDTO(String user_name, Integer user_id, Integer state, Integer page, Integer pageSize, String orderByClause, String userId) {
32   -
33   - this.user_name = user_name;
34   - this.user_id = user_id;
35   - this.state = state;
  31 + public NotSpeakDTO(Integer page, Integer pageSize, String orderByClause, String userId) {
36 32 this.page = page;
37 33 this.pageSize = pageSize;
38 34 this.orderByClause = orderByClause;
39 35 this.userId = userId;
40 36 }
41 37  
42   - public NotSpeakDTO(String user_name, Integer user_id, Integer state, Integer page, Integer pageSize, String orderByClause) {
43   - this.user_name = user_name;
44   - this.user_id = user_id;
45   - this.state = state;
46   - this.page = page;
47   - this.pageSize = pageSize;
48   - this.orderByClause = orderByClause;
49   - }
50   -
51   - public String getUser_name() {
52   - return user_name;
53   - }
54   -
55   - public void setUser_name(String user_name) {
56   - this.user_name = user_name;
57   - }
58   -
59   - public Integer getUser_id() {
60   - return user_id;
61   - }
62   -
63   - public void setUser_id(Integer user_id) {
64   - this.user_id = user_id;
65   - }
66   -
67   - public Integer getState() {
68   - return state;
69   - }
70   -
71   - public void setState(Integer state) {
72   - this.state = state;
73   - }
74   -
75 38 public Integer getPage() {
76 39 return page == null ? 1 : page;
77 40 }
... ...
src/main/java/com/cnlive/shenhe/dto/ShyActivityDTO.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.dto;
2 2  
3   -import net.bytebuddy.implementation.bind.annotation.Default;
4   -import org.springframework.beans.factory.annotation.Value;
  3 +import com.cnlive.shenhe.entity.ShyActivity;
5 4  
6 5 import java.io.Serializable;
7 6  
... ... @@ -11,22 +10,17 @@ import java.io.Serializable;
11 10 * @create 2022-03-14 13:16
12 11 */
13 12  
14   -public class ShyActivityDTO implements Serializable {
  13 +public class ShyActivityDTO extends ShyActivity implements Serializable {
15 14  
16 15  
17 16 private Integer pageNum = 1;
18 17  
19 18 private Integer pageSize = 10;
20 19  
21   - private String activity;
22 20  
23   - private Integer exempt_from_trial;
24   -
25   - public ShyActivityDTO(Integer pageNum, Integer pageSize, String activity, Integer exempt_from_trial) {
  21 + public ShyActivityDTO(Integer pageNum, Integer pageSize) {
26 22 this.pageNum = pageNum;
27 23 this.pageSize = pageSize;
28   - this.activity = activity;
29   - this.exempt_from_trial = exempt_from_trial;
30 24 }
31 25  
32 26 public ShyActivityDTO() {
... ... @@ -47,20 +41,4 @@ public class ShyActivityDTO implements Serializable {
47 41 public void setPageSize(Integer pageSize) {
48 42 this.pageSize = pageSize;
49 43 }
50   -
51   - public String getActivity() {
52   - return activity;
53   - }
54   -
55   - public void setActivity(String activity) {
56   - this.activity = activity;
57   - }
58   -
59   - public Integer getExempt_from_trial() {
60   - return exempt_from_trial;
61   - }
62   -
63   - public void setExempt_from_trial(Integer exempt_from_trial) {
64   - this.exempt_from_trial = exempt_from_trial;
65   - }
66 44 }
... ...
src/main/java/com/cnlive/shenhe/dto/SitesDTO.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.dto;
2 2  
  3 +import com.cnlive.shenhe.entity.ShySites;
  4 +
3 5 import java.io.Serializable;
4 6  
5 7 /**
... ... @@ -7,7 +9,7 @@ import java.io.Serializable;
7 9 * @author yanzhaowang
8 10 * @create 2022-03-17 16:19
9 11 */
10   -public class SitesDTO implements Serializable {
  12 +public class SitesDTO extends ShySites implements Serializable {
11 13 private Integer page = 1;
12 14 private Integer pageSize = 10;
13 15 private String orderByClause;
... ...
src/main/java/com/cnlive/shenhe/dto/TopicDTO.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.dto;
2 2  
  3 +import com.cnlive.shenhe.entity.ShyTopic;
  4 +
3 5 import java.io.Serializable;
4 6  
5 7 /**
... ... @@ -7,67 +9,47 @@ import java.io.Serializable;
7 9 * @author yanzhaowang
8 10 * @create 2022-03-17 16:21
9 11 */
10   -public class TopicDTO implements Serializable {
  12 +public class TopicDTO extends ShyTopic implements Serializable {
11 13  
12 14 private String topic_name;
13   - private String topic_id;
14   - private String topic_tag;
15   - private Integer shenhe_status;
16   - private String sp_desc;
17 15 private Integer page = 1;
18 16 private Integer pageSize = 10;
19 17 private Integer receive;
20 18 private String orderByClause;
21   - private String sDate;
22   - private String eDate;
  19 + private String start_date;
  20 + private String end_date;
23 21 private Integer spid;
24 22 private String userId;
25   - private String updater;
26   - private String title;
27 23  
28 24 public TopicDTO() {
29 25 }
30 26  
31   - public TopicDTO(String topic_name, String topic_id, String topic_tag, Integer shenhe_status, String sp_desc, Integer page, Integer pageSize, Integer receive, String orderByClause, String sDate, String eDate, Integer spid, String userId, String updater, String title) {
  27 + public TopicDTO(String topic_name, Integer page, Integer pageSize, Integer receive, String orderByClause, String start_date, String end_date, Integer spid, String userId) {
32 28 this.topic_name = topic_name;
33   - this.topic_id = topic_id;
34   - this.topic_tag = topic_tag;
35   - this.shenhe_status = shenhe_status;
36   - this.sp_desc = sp_desc;
37 29 this.page = page;
38 30 this.pageSize = pageSize;
39 31 this.receive = receive;
40 32 this.orderByClause = orderByClause;
41   - this.sDate = sDate;
42   - this.eDate = eDate;
  33 + this.start_date = start_date;
  34 + this.end_date = end_date;
43 35 this.spid = spid;
44 36 this.userId = userId;
45   - this.updater = updater;
46   - this.title = title;
47   - }
48   -
49   - public String getTitle() {
50   - return title;
51 37 }
52 38  
53   - public void setTitle(String title) {
54   - this.title = title;
  39 + public String getStart_date() {
  40 + return start_date;
55 41 }
56 42  
57   - public String getsDate() {
58   - return sDate;
  43 + public void setStart_date(String start_date) {
  44 + this.start_date = start_date;
59 45 }
60 46  
61   - public void setsDate(String sDate) {
62   - this.sDate = sDate;
  47 + public String getEnd_date() {
  48 + return end_date;
63 49 }
64 50  
65   - public String geteDate() {
66   - return eDate;
67   - }
68   -
69   - public void seteDate(String eDate) {
70   - this.eDate = eDate;
  51 + public void setEnd_date(String end_date) {
  52 + this.end_date = end_date;
71 53 }
72 54  
73 55 public Integer getSpid() {
... ... @@ -86,13 +68,7 @@ public class TopicDTO implements Serializable {
86 68 this.userId = userId;
87 69 }
88 70  
89   - public String getUpdater() {
90   - return updater;
91   - }
92 71  
93   - public void setUpdater(String updater) {
94   - this.updater = updater;
95   - }
96 72  
97 73 public String getTopic_name() {
98 74 return topic_name;
... ... @@ -102,38 +78,6 @@ public class TopicDTO implements Serializable {
102 78 this.topic_name = topic_name;
103 79 }
104 80  
105   - public String getTopic_id() {
106   - return topic_id;
107   - }
108   -
109   - public void setTopic_id(String topic_id) {
110   - this.topic_id = topic_id;
111   - }
112   -
113   - public String getTopic_tag() {
114   - return topic_tag;
115   - }
116   -
117   - public void setTopic_tag(String topic_tag) {
118   - this.topic_tag = topic_tag;
119   - }
120   -
121   - public Integer getShenhe_status() {
122   - return shenhe_status;
123   - }
124   -
125   - public void setShenhe_status(Integer shenhe_status) {
126   - this.shenhe_status = shenhe_status;
127   - }
128   -
129   - public String getSp_desc() {
130   - return sp_desc;
131   - }
132   -
133   - public void setSp_desc(String sp_desc) {
134   - this.sp_desc = sp_desc;
135   - }
136   -
137 81 public Integer getPage() {
138 82 return page == null ? 1 : page;
139 83 }
... ...
src/main/java/com/cnlive/shenhe/dto/UsersDTO.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.dto;
2 2  
  3 +import com.cnlive.shenhe.entity.ShyUsers;
  4 +
3 5 import java.io.Serializable;
4 6  
5 7 /**
... ... @@ -7,26 +9,18 @@ import java.io.Serializable;
7 9 * @author yanzhaowang
8 10 * @create 2022-03-17 16:27
9 11 */
10   -public class UsersDTO implements Serializable {
  12 +public class UsersDTO extends ShyUsers implements Serializable {
11 13 private Integer page = 1;
12 14 private Integer pageSize = 10;
13 15 private String orderByClause;
14   - private String username;
15   - private String mobile;
16   - private Integer sp_id;
17   - private String company_brief;
18 16  
19 17 public UsersDTO() {
20 18 }
21 19  
22   - public UsersDTO(Integer page, Integer pageSize, String orderByClause, String username, String mobile, Integer sp_id, String company_brief) {
  20 + public UsersDTO(Integer page, Integer pageSize, String orderByClause) {
23 21 this.page = page;
24 22 this.pageSize = pageSize;
25 23 this.orderByClause = orderByClause;
26   - this.username = username;
27   - this.mobile = mobile;
28   - this.sp_id = sp_id;
29   - this.company_brief = company_brief;
30 24 }
31 25  
32 26 public Integer getPage() {
... ... @@ -53,35 +47,4 @@ public class UsersDTO implements Serializable {
53 47 this.orderByClause = orderByClause;
54 48 }
55 49  
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 50 }
... ...
src/main/java/com/cnlive/shenhe/dto/UsersFreeDTO.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.dto;
2 2  
  3 +import com.cnlive.shenhe.entity.ShyUsersfree;
  4 +
3 5 import java.io.Serializable;
4 6  
5 7 /**
... ... @@ -7,24 +9,22 @@ import java.io.Serializable;
7 9 * @author yanzhaowang
8 10 * @create 2022-03-17 16:30
9 11 */
10   -public class UsersFreeDTO implements Serializable {
  12 +public class UsersFreeDTO extends ShyUsersfree implements Serializable {
11 13  
12 14 private Integer page = 1;
13 15 private Integer pageSize = 10;
14 16 private String orderByClause;
15 17 private String userId;
16   - private String mobile;
17 18 private Integer spid;
18 19  
19 20 public UsersFreeDTO() {
20 21 }
21 22  
22   - public UsersFreeDTO(Integer page, Integer pageSize, String orderByClause, String userId, String mobile, Integer spid) {
  23 + public UsersFreeDTO(Integer page, Integer pageSize, String orderByClause, String userId, Integer spid) {
23 24 this.page = page;
24 25 this.pageSize = pageSize;
25 26 this.orderByClause = orderByClause;
26 27 this.userId = userId;
27   - this.mobile = mobile;
28 28 this.spid = spid;
29 29 }
30 30  
... ... @@ -67,12 +67,4 @@ public class UsersFreeDTO implements Serializable {
67 67 public void setUserId(String userId) {
68 68 this.userId = userId;
69 69 }
70   -
71   - public String getMobile() {
72   - return mobile;
73   - }
74   -
75   - public void setMobile(String mobile) {
76   - this.mobile = mobile;
77   - }
78 70 }
... ...
src/main/java/com/cnlive/shenhe/dto/VideosDTO.java
  View file @465fe3b
1 1 package com.cnlive.shenhe.dto;
2 2  
  3 +import com.cnlive.shenhe.entity.ShyVideos;
  4 +
3 5 import java.io.Serializable;
4 6  
5 7 /**
... ... @@ -7,90 +9,52 @@ import java.io.Serializable;
7 9 * @author yanzhaowang
8 10 * @create 2022-03-17 16:35
9 11 */
10   -public class VideosDTO implements Serializable {
11   -
12   - private String video_title;
13   - private Integer state;
14   - private Integer receive;
15   - private Integer page;
16   - private Integer pageSize;
17   - private String video_priority;
  12 +public class VideosDTO extends ShyVideos implements Serializable {
  13 +
  14 +
  15 + private Integer page = 1;
  16 + private Integer pageSize = 10;
18 17 private String orderByClause;
19 18 private String sp_desc;
20 19 private String sp_Id;
21   - private String source;
22   - private String video_user_id;
23 20 private String shen_auditor_id;
24 21 private Integer contentId;
25   - private String video_id;
26   - private String sDate;
27   - private String eDate;
28   - private Integer spid;
  22 + private String start_date;
  23 + private String end_date;
29 24 private String userId;
30 25  
31 26 public VideosDTO() {
32 27 }
33 28  
34   - public VideosDTO(String video_title, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id, String source, String video_user_id, String shen_auditor_id, Integer contentId, String video_id, String sDate, String eDate, Integer spid, String userId) {
35   - this.video_title = video_title;
36   - this.state = state;
37   - this.receive = receive;
  29 + public VideosDTO(Integer page, Integer pageSize, String orderByClause, String sp_desc, String sp_Id, String shen_auditor_id, Integer contentId, String start_date, String end_date, String userId) {
38 30 this.page = page;
39 31 this.pageSize = pageSize;
40   - this.video_priority = video_priority;
41 32 this.orderByClause = orderByClause;
42 33 this.sp_desc = sp_desc;
43 34 this.sp_Id = sp_Id;
44   - this.source = source;
45   - this.video_user_id = video_user_id;
46 35 this.shen_auditor_id = shen_auditor_id;
47 36 this.contentId = contentId;
48   - this.video_id = video_id;
49   - this.sDate = sDate;
50   - this.eDate = eDate;
51   - this.spid = spid;
  37 + this.start_date = start_date;
  38 + this.end_date = end_date;
52 39 this.userId = userId;
53 40 }
54 41  
55   - public String getVideo_title() {
56   - return video_title;
  42 + public String getStart_date() {
  43 + return start_date;
57 44 }
58 45  
59   - public void setVideo_title(String video_title) {
60   - this.video_title = video_title;
  46 + public void setStart_date(String start_date) {
  47 + this.start_date = start_date;
61 48 }
62 49  
63   - public String getsDate() {
64   - return sDate;
  50 + public String getEnd_date() {
  51 + return end_date;
65 52 }
66 53  
67   - public void setsDate(String sDate) {
68   - this.sDate = sDate;
  54 + public void setEnd_date(String end_date) {
  55 + this.end_date = end_date;
69 56 }
70 57  
71   - public String geteDate() {
72   - return eDate;
73   - }
74   -
75   - public void seteDate(String eDate) {
76   - this.eDate = eDate;
77   - }
78   -
79   - public Integer getState() {
80   - return state;
81   - }
82   -
83   - public void setState(Integer state) {
84   - this.state = state;
85   - }
86   -
87   - public Integer getReceive() {
88   - return receive;
89   - }
90   -
91   - public void setReceive(Integer receive) {
92   - this.receive = receive;
93   - }
94 58  
95 59 public Integer getPage() {
96 60 return page == null ? 1 : page;
... ... @@ -108,14 +72,6 @@ public class VideosDTO implements Serializable {
108 72 this.pageSize = pageSize;
109 73 }
110 74  
111   - public String getVideo_priority() {
112   - return video_priority;
113   - }
114   -
115   - public void setVideo_priority(String video_priority) {
116   - this.video_priority = video_priority;
117   - }
118   -
119 75 public String getOrderByClause() {
120 76 return orderByClause;
121 77 }
... ... @@ -140,22 +96,6 @@ public class VideosDTO implements Serializable {
140 96 this.sp_Id = sp_Id;
141 97 }
142 98  
143   - public String getSource() {
144   - return source;
145   - }
146   -
147   - public void setSource(String source) {
148   - this.source = source;
149   - }
150   -
151   - public String getVideo_user_id() {
152   - return video_user_id;
153   - }
154   -
155   - public void setVideo_user_id(String video_user_id) {
156   - this.video_user_id = video_user_id;
157   - }
158   -
159 99 public String getShen_auditor_id() {
160 100 return shen_auditor_id;
161 101 }
... ... @@ -172,22 +112,6 @@ public class VideosDTO implements Serializable {
172 112 this.contentId = contentId;
173 113 }
174 114  
175   - public String getVideo_id() {
176   - return video_id;
177   - }
178   -
179   - public void setVideo_id(String video_id) {
180   - this.video_id = video_id;
181   - }
182   -
183   - public Integer getSpid() {
184   - return spid;
185   - }
186   -
187   - public void setSpid(Integer spid) {
188   - this.spid = spid;
189   - }
190   -
191 115 public String getUserId() {
192 116 return userId;
193 117 }
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/AudioServiceImpl.java
  View file @465fe3b
... ... @@ -211,11 +211,11 @@ public class AudioServiceImpl {
211 211 if (CommonUtils.isNotEmpty(audioDTO.getOrderByClause())) {
212 212 example.setOrderByClause(audioDTO.getOrderByClause());
213 213 }
214   - if (CommonUtils.isNotEmpty(audioDTO.getsDate()) && CommonUtils.isNotEmpty(audioDTO.geteDate())) {
215   - criteria.andGreaterThanOrEqualTo("createTime", audioDTO.getsDate());
216   - criteria2.andGreaterThanOrEqualTo("createTime", audioDTO.getsDate());
217   - criteria.andLessThanOrEqualTo("createTime", audioDTO.geteDate());
218   - criteria2.andLessThanOrEqualTo("createTime", audioDTO.geteDate());
  214 + if (CommonUtils.isNotEmpty(audioDTO.getStart_date()) && CommonUtils.isNotEmpty(audioDTO.getEnd_date())) {
  215 + criteria.andGreaterThanOrEqualTo("createTime", audioDTO.getStart_date());
  216 + criteria2.andGreaterThanOrEqualTo("createTime", audioDTO.getStart_date());
  217 + criteria.andLessThanOrEqualTo("createTime", audioDTO.getEnd_date());
  218 + criteria2.andLessThanOrEqualTo("createTime", audioDTO.getEnd_date());
219 219 }
220 220 if (CommonUtils.isNotEmpty(audioDTO.getVideo_title())) {
221 221 criteria.andLike("audioTitle", "%" + audioDTO.getVideo_title() + "%");
... ... @@ -256,6 +256,7 @@ public class AudioServiceImpl {
256 256  
257 257 //默认按上传时间倒序排序
258 258 example.setOrderByClause("createTime desc");
  259 + logger.info("page="+audioDTO.getPage()+"-----------pageSize="+audioDTO.getPageSize());
259 260 PageHelper.startPage(audioDTO.getPage(), audioDTO.getPageSize(), true);
260 261 List<ShyAudio> shyAudioList = shyAudioMapper.selectByExample(example);
261 262 PageInfo<ShyAudio> pageInfo = new PageInfo<>(shyAudioList);
... ... @@ -294,9 +295,9 @@ public class AudioServiceImpl {
294 295 if (CommonUtils.isNotEmpty(audioDTO.getOrderByClause())) {
295 296 example.setOrderByClause(audioDTO.getOrderByClause());
296 297 }
297   - if (CommonUtils.isNotEmpty(audioDTO.getsDate()) && CommonUtils.isNotEmpty(audioDTO.geteDate())) {
298   - criteria.andGreaterThanOrEqualTo("createTime", audioDTO.getsDate());
299   - criteria.andLessThanOrEqualTo("createTime", audioDTO.geteDate());
  298 + if (CommonUtils.isNotEmpty(audioDTO.getStart_date()) && CommonUtils.isNotEmpty(audioDTO.getEnd_date())) {
  299 + criteria.andGreaterThanOrEqualTo("createTime", audioDTO.getStart_date());
  300 + criteria.andLessThanOrEqualTo("createTime", audioDTO.getEnd_date());
300 301 }
301 302 if (CommonUtils.isNotEmpty(audioDTO.getVideo_title())) {
302 303 criteria.andLike("audioTitle", "%" + audioDTO.getVideo_title() + "%");
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/ChannelServiceImpl.java
  View file @465fe3b
... ... @@ -69,11 +69,11 @@ public class ChannelServiceImpl {
69 69 } else {
70 70 example.setOrderByClause("created_at desc");
71 71 }
72   - if (CommonUtils.isNotNull(channelDTO.getsDate())) {
73   - criteria.andGreaterThanOrEqualTo("created_at", channelDTO.getsDate());
  72 + if (CommonUtils.isNotNull(channelDTO.getStart_date())) {
  73 + criteria.andGreaterThanOrEqualTo("created_at", channelDTO.getStart_date());
74 74 }
75   - if (CommonUtils.isNotNull(channelDTO.geteDate())) {
76   - criteria.andLessThanOrEqualTo("created_at", channelDTO.geteDate());
  75 + if (CommonUtils.isNotNull(channelDTO.getEnd_date())) {
  76 + criteria.andLessThanOrEqualTo("created_at", channelDTO.getEnd_date());
77 77 }
78 78 if (CommonUtils.isNotEmpty(channelDTO.getChannel_name())) {
79 79 criteria.andLike("channel_name", "%" + channelDTO.getChannel_name() + "%");
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
  View file @465fe3b
... ... @@ -85,9 +85,9 @@ public class CommentsServiceImpl {
85 85 } else {
86 86 example.setOrderByClause("comment_time desc");
87 87 }
88   - if (CommonUtils.isNotNull(commentsDTO.getsDate()) && CommonUtils.isNotNull(commentsDTO.geteDate())) {
89   - criteria.andGreaterThanOrEqualTo("comment_time", commentsDTO.getsDate());
90   - criteria.andLessThanOrEqualTo("comment_time", commentsDTO.geteDate());
  88 + if (CommonUtils.isNotNull(commentsDTO.getStart_date()) && CommonUtils.isNotNull(commentsDTO.getEnd_date())) {
  89 + criteria.andGreaterThanOrEqualTo("comment_time", commentsDTO.getStart_date());
  90 + criteria.andLessThanOrEqualTo("comment_time", commentsDTO.getEnd_date());
91 91 }
92 92 if (CommonUtils.isNotEmpty(commentsDTO.getContent())) {
93 93 criteria.andLike("comment_content", "%" + commentsDTO.getContent() + "%");
... ... @@ -104,9 +104,9 @@ public class CommentsServiceImpl {
104 104 if (CommonUtils.isNotNull(commentsDTO.getComment_user_id())) {
105 105 criteria.andEqualTo("comment_user_id", commentsDTO.getComment_user_id());
106 106 }
107   - if (CommonUtils.isNotNull(commentsDTO.getType()) && commentsDTO.getType() == 0) {
  107 + if (CommonUtils.isNotNull(commentsDTO.getType()) && commentsDTO.getType() == "0") {
108 108 criteria.andEqualTo("type", CommonConst.CATEGORY_TOPIC);
109   - } else if (CommonUtils.isNotNull(commentsDTO.getType()) && commentsDTO.getType() == 1) {
  109 + } else if (CommonUtils.isNotNull(commentsDTO.getType()) && commentsDTO.getType() == "1") {
110 110 criteria.andEqualTo("type", CommonConst.CATEGORY_ELSE);
111 111 }
112 112 if (CommonUtils.isNotEmpty(commentsDTO.getActivity_id())) {
... ... @@ -150,9 +150,9 @@ public class CommentsServiceImpl {
150 150 } else {
151 151 example.setOrderByClause("comment_time desc");
152 152 }
153   - if (CommonUtils.isNotNull(commentsDTO.getsDate()) && CommonUtils.isNotNull(commentsDTO.geteDate())) {
154   - criteria.andGreaterThanOrEqualTo("comment_time", commentsDTO.getsDate());
155   - criteria.andLessThanOrEqualTo("comment_time", commentsDTO.geteDate());
  153 + if (CommonUtils.isNotNull(commentsDTO.getStart_date()) && CommonUtils.isNotNull(commentsDTO.getEnd_date())) {
  154 + criteria.andGreaterThanOrEqualTo("comment_time", commentsDTO.getStart_date());
  155 + criteria.andLessThanOrEqualTo("comment_time", commentsDTO.getEnd_date());
156 156 }
157 157 if (CommonUtils.isNotEmpty(commentsDTO.getContent())) {
158 158 criteria.andLike("comment_content", "%" + commentsDTO.getContent() + "%");
... ... @@ -166,9 +166,9 @@ public class CommentsServiceImpl {
166 166 if (CommonUtils.isNotNull(commentsDTO.getIs_hot())) {
167 167 criteria.andEqualTo("is_hot", commentsDTO.getIs_hot());
168 168 }
169   - if (CommonUtils.isNotNull(commentsDTO.getType())&&commentsDTO.getType()==0) {
  169 + if (CommonUtils.isNotNull(commentsDTO.getType())&&commentsDTO.getType()=="0") {
170 170 criteria.andEqualTo("type", CommonConst.CATEGORY_TOPIC);
171   - }else if(CommonUtils.isNotNull(commentsDTO.getType())&&commentsDTO.getType()==1){
  171 + }else if(CommonUtils.isNotNull(commentsDTO.getType())&&commentsDTO.getType()=="1"){
172 172 criteria.andIsNull("type");
173 173 }
174 174 if (CommonUtils.isNotEmpty(commentsDTO.getActivity_id())) {
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java
  View file @465fe3b
... ... @@ -114,11 +114,11 @@ public class ContentServiceImpl {
114 114 } else {
115 115 example.setOrderByClause("create_date desc");
116 116 }
117   - if (CommonUtils.isNotNull(contentDTO.getsDate())) {
118   - criteria.andGreaterThanOrEqualTo("create_date", contentDTO.getsDate());
  117 + if (CommonUtils.isNotNull(contentDTO.getStart_date())) {
  118 + criteria.andGreaterThanOrEqualTo("create_date", contentDTO.getStart_date());
119 119 }
120   - if (CommonUtils.isNotNull(contentDTO.geteDate())) {
121   - criteria.andLessThanOrEqualTo("create_date", contentDTO.geteDate());
  120 + if (CommonUtils.isNotNull(contentDTO.getEnd_date())) {
  121 + criteria.andLessThanOrEqualTo("create_date", contentDTO.getEnd_date());
122 122 }
123 123 if (CommonUtils.isNotEmpty(contentDTO.getTitle())) {
124 124 criteria.andLike("title", "%" + contentDTO.getTitle() + "%");
... ... @@ -168,11 +168,11 @@ public class ContentServiceImpl {
168 168 } else {
169 169 example.setOrderByClause("create_date desc");
170 170 }
171   - if (CommonUtils.isNotNull(contentDTO.getsDate())) {
172   - criteria.andGreaterThanOrEqualTo("create_date", contentDTO.getsDate());
  171 + if (CommonUtils.isNotNull(contentDTO.getStart_date())) {
  172 + criteria.andGreaterThanOrEqualTo("create_date", contentDTO.getStart_date());
173 173 }
174   - if (CommonUtils.isNotNull(contentDTO.geteDate())) {
175   - criteria.andLessThanOrEqualTo("create_date", contentDTO.geteDate());
  174 + if (CommonUtils.isNotNull(contentDTO.getEnd_date())) {
  175 + criteria.andLessThanOrEqualTo("create_date", contentDTO.getEnd_date());
176 176 }
177 177 if (CommonUtils.isNotEmpty(contentDTO.getTitle())) {
178 178 criteria.andLike("title", "%" + contentDTO.getTitle() + "%");
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/LiveApplyServiceImpl.java
  View file @465fe3b
... ... @@ -100,19 +100,19 @@ public class LiveApplyServiceImpl {
100 100 }else{
101 101 example.setOrderByClause("created_at desc");
102 102 }
103   - if (CommonUtils.isNotEmpty(liveApplyDTO.getsDate())) {
  103 + if (CommonUtils.isNotEmpty(liveApplyDTO.getStart_date())) {
104 104 Timestamp startdate = null;
105 105 try {
106   - startdate = CommonUtils.parseDate(liveApplyDTO.getsDate(), "yyyy-MM-dd");
  106 + startdate = CommonUtils.parseDate(liveApplyDTO.getStart_date(), "yyyy-MM-dd");
107 107 } catch (ParseException e) {
108 108 e.printStackTrace();
109 109 }
110 110 criteria.andGreaterThanOrEqualTo("pre_start_time", startdate);
111 111 }
112   - if ( CommonUtils.isNotEmpty(liveApplyDTO.geteDate())) {
  112 + if ( CommonUtils.isNotEmpty(liveApplyDTO.getEnd_date())) {
113 113 Timestamp enddate = null;
114 114 try {
115   - enddate = CommonUtils.parseDate(liveApplyDTO.geteDate(), "yyyy-MM-dd");
  115 + enddate = CommonUtils.parseDate(liveApplyDTO.getEnd_date(), "yyyy-MM-dd");
116 116 } catch (ParseException e) {
117 117 e.printStackTrace();
118 118 }
... ... @@ -233,19 +233,19 @@ public class LiveApplyServiceImpl {
233 233 }else{
234 234 example.setOrderByClause("pre_start_time");
235 235 }
236   - if (CommonUtils.isNotEmpty(liveApplyDTO.getsDate())) {
  236 + if (CommonUtils.isNotEmpty(liveApplyDTO.getStart_date())) {
237 237 Timestamp startdate = null;
238 238 try {
239   - startdate = CommonUtils.parseDate(liveApplyDTO.getsDate(), "yyyy-MM-dd");
  239 + startdate = CommonUtils.parseDate(liveApplyDTO.getStart_date(), "yyyy-MM-dd");
240 240 } catch (ParseException e) {
241 241 e.printStackTrace();
242 242 }
243 243 criteria.andGreaterThanOrEqualTo("pre_start_time", startdate);
244 244 }
245   - if ( CommonUtils.isNotEmpty(liveApplyDTO.geteDate())) {
  245 + if ( CommonUtils.isNotEmpty(liveApplyDTO.getEnd_date())) {
246 246 Timestamp enddate = null;
247 247 try {
248   - enddate = CommonUtils.parseDate(liveApplyDTO.geteDate(), "yyyy-MM-dd");
  248 + enddate = CommonUtils.parseDate(liveApplyDTO.getEnd_date(), "yyyy-MM-dd");
249 249 } catch (ParseException e) {
250 250 e.printStackTrace();
251 251 }
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/LiveServiceImpl.java
  View file @465fe3b
... ... @@ -85,19 +85,19 @@ public class LiveServiceImpl {
85 85 if (CommonUtils.isNotEmpty(liveDTO.getOrderByClause())) {
86 86 example.setOrderByClause(liveDTO.getOrderByClause());
87 87 }
88   - if (CommonUtils.isNotEmpty(liveDTO.getsDate())) {
  88 + if (CommonUtils.isNotEmpty(liveDTO.getStart_date())) {
89 89 Timestamp startdate = null;
90 90 try {
91   - startdate = CommonUtils.parseDate(liveDTO.getsDate(), "yyyy-MM-dd");
  91 + startdate = CommonUtils.parseDate(liveDTO.getStart_date(), "yyyy-MM-dd");
92 92 } catch (ParseException e) {
93 93 e.printStackTrace();
94 94 }
95 95 criteria.andGreaterThanOrEqualTo("activity_start_time", startdate);
96 96 }
97   - if ( CommonUtils.isNotEmpty(liveDTO.geteDate())) {
  97 + if ( CommonUtils.isNotEmpty(liveDTO.getEnd_date())) {
98 98 Timestamp enddate = null;
99 99 try {
100   - enddate = CommonUtils.parseDate(liveDTO.geteDate(), "yyyy-MM-dd");
  100 + enddate = CommonUtils.parseDate(liveDTO.getEnd_date(), "yyyy-MM-dd");
101 101 } catch (ParseException e) {
102 102 e.printStackTrace();
103 103 }
... ... @@ -213,19 +213,19 @@ public class LiveServiceImpl {
213 213 }else{
214 214 example.setOrderByClause("activity_start_time");
215 215 }
216   - if (CommonUtils.isNotEmpty(liveDTO.getsDate())) {
  216 + if (CommonUtils.isNotEmpty(liveDTO.getStart_date())) {
217 217 Timestamp startdate = null;
218 218 try {
219   - startdate = CommonUtils.parseDate(liveDTO.getsDate(), "yyyy-MM-dd");
  219 + startdate = CommonUtils.parseDate(liveDTO.getStart_date(), "yyyy-MM-dd");
220 220 } catch (ParseException e) {
221 221 e.printStackTrace();
222 222 }
223 223 criteria.andGreaterThanOrEqualTo("activity_start_time", startdate);
224 224 }
225   - if (CommonUtils.isNotEmpty(liveDTO.geteDate())) {
  225 + if (CommonUtils.isNotEmpty(liveDTO.getEnd_date())) {
226 226 Timestamp enddate = null;
227 227 try {
228   - enddate = CommonUtils.parseDate(liveDTO.geteDate(), "yyyy-MM-dd");
  228 + enddate = CommonUtils.parseDate(liveDTO.getEnd_date(), "yyyy-MM-dd");
229 229 } catch (ParseException e) {
230 230 e.printStackTrace();
231 231 }
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/TopicServiceImpl.java
  View file @465fe3b
... ... @@ -101,11 +101,11 @@ public class TopicServiceImpl {
101 101 } else {
102 102 example.setOrderByClause("create_date desc");
103 103 }
104   - if (CommonUtils.isNotNull(topicDTO.getsDate()) ) {
105   - criteria.andGreaterThanOrEqualTo("create_date", topicDTO.getsDate());
  104 + if (CommonUtils.isNotNull(topicDTO.getStart_date()) ) {
  105 + criteria.andGreaterThanOrEqualTo("create_date", topicDTO.getStart_date());
106 106 }
107   - if ( CommonUtils.isNotNull(topicDTO.geteDate())) {
108   - criteria.andLessThanOrEqualTo("create_date", topicDTO.geteDate());
  107 + if ( CommonUtils.isNotNull(topicDTO.getEnd_date())) {
  108 + criteria.andLessThanOrEqualTo("create_date", topicDTO.getEnd_date());
109 109 }
110 110 if (CommonUtils.isNotEmpty(topicDTO.getTopic_name())) {
111 111 criteria.andLike("title", "%" + topicDTO.getTopic_name() + "%");
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
  View file @465fe3b
... ... @@ -118,18 +118,18 @@ public class VideosServiceImpl {
118 118 if (CommonUtils.isNotEmpty(videosDTO.getOrderByClause())) {
119 119 example.setOrderByClause(videosDTO.getOrderByClause());
120 120 }
121   - if (CommonUtils.isNotEmpty(videosDTO.getsDate()) && CommonUtils.isNotEmpty(videosDTO.geteDate())) {
  121 + if (CommonUtils.isNotEmpty(videosDTO.getStart_date()) && CommonUtils.isNotEmpty(videosDTO.getEnd_date())) {
122 122  
123 123 try {
124   - videosDTO.setsDate(String.valueOf(CommonUtils.parseDate(videosDTO.getsDate(), "yyyy-MM-dd")));
125   - videosDTO.seteDate(String.valueOf(CommonUtils.parseDate(videosDTO.geteDate(), "yyyy-MM-dd")));
  124 + videosDTO.setStart_date(String.valueOf(CommonUtils.parseDate(videosDTO.getStart_date(), "yyyy-MM-dd")));
  125 + videosDTO.setEnd_date(String.valueOf(CommonUtils.parseDate(videosDTO.getEnd_date(), "yyyy-MM-dd")));
126 126 } catch (ParseException e) {
127 127 e.printStackTrace();
128 128 }
129   - criteria.andGreaterThanOrEqualTo("created_at", videosDTO.getsDate());
130   - criteria2.andGreaterThanOrEqualTo("created_at", videosDTO.getsDate());
131   - criteria.andLessThanOrEqualTo("created_at", videosDTO.geteDate());
132   - criteria2.andLessThanOrEqualTo("created_at", videosDTO.geteDate());
  129 + criteria.andGreaterThanOrEqualTo("created_at", videosDTO.getStart_date());
  130 + criteria2.andGreaterThanOrEqualTo("created_at", videosDTO.getStart_date());
  131 + criteria.andLessThanOrEqualTo("created_at", videosDTO.getEnd_date());
  132 + criteria2.andLessThanOrEqualTo("created_at", videosDTO.getEnd_date());
133 133 }
134 134 if (CommonUtils.isNotEmpty(videosDTO.getVideo_title())) {
135 135 criteria.andLike("video_title", "%" + videosDTO.getVideo_title() + "%");
... ... @@ -198,8 +198,6 @@ public class VideosServiceImpl {
198 198 //默认按上传时间倒序排序
199 199 example.setOrderByClause("created_at desc");
200 200 logger.info("获取点播列表封装对象:{}", JSON.toJSONString(videosDTO));
201   - System.out.println(videosDTO.getPage());
202   - System.out.println(videosDTO.getPageSize());
203 201 PageHelper.startPage(videosDTO.getPage(), videosDTO.getPageSize(), true);
204 202 List<ShyVideos> shyVideosList = shyVideosMapper.selectByExample(example);
205 203 PageInfo<ShyVideos> pageInfo = new PageInfo<>(shyVideosList);
... ... @@ -289,16 +287,16 @@ public class VideosServiceImpl {
289 287 if (CommonUtils.isNotEmpty(videosDTO.getOrderByClause())) {
290 288 example.setOrderByClause(videosDTO.getOrderByClause());
291 289 }
292   - if (CommonUtils.isNotEmpty(videosDTO.getsDate()) && CommonUtils.isNotEmpty(videosDTO.geteDate())) {
  290 + if (CommonUtils.isNotEmpty(videosDTO.getStart_date()) && CommonUtils.isNotEmpty(videosDTO.getEnd_date())) {
293 291  
294 292 try {
295   - videosDTO.setsDate(String.valueOf(CommonUtils.parseDate(videosDTO.getsDate(), "yyyy-MM-dd")));
296   - videosDTO.seteDate(String.valueOf(CommonUtils.parseDate(videosDTO.geteDate(), "yyyy-MM-dd")));
  293 + videosDTO.setStart_date(String.valueOf(CommonUtils.parseDate(videosDTO.getStart_date(), "yyyy-MM-dd")));
  294 + videosDTO.setEnd_date(String.valueOf(CommonUtils.parseDate(videosDTO.getEnd_date(), "yyyy-MM-dd")));
297 295 } catch (ParseException e) {
298 296 e.printStackTrace();
299 297 }
300   - criteria.andGreaterThanOrEqualTo("created_at", videosDTO.getsDate());
301   - criteria.andLessThanOrEqualTo("created_at", videosDTO.geteDate());
  298 + criteria.andGreaterThanOrEqualTo("created_at", videosDTO.getStart_date());
  299 + criteria.andLessThanOrEqualTo("created_at", videosDTO.getEnd_date());
302 300 }
303 301 if (CommonUtils.isNotEmpty(videosDTO.getVideo_title())) {
304 302 criteria.andLike("video_title", "%" + videosDTO.getVideo_title() + "%");
... ...
src/main/resources/templates/common/frame.html
  View file @465fe3b
... ... @@ -86,7 +86,6 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
86 86 <li><a href="/topic/page?shenhe_status=0&receive=0" id="/topic/page"> 话题审核</a></li>
87 87 <li><a href="/channel/page?shenhe_status=0&receive=0" id="/channel/page"> 频道审核</a></li>
88 88 <li><a href="/liveApply/page?shenhe_state=0&receive=0" id="/liveApply/page">直播申请审核</a></li>
89   - <li><a href="/activity/page?shenhe_state=0&receive=0" id="/activity/page"> 活动管理</a></li>
90 89 </ul>
91 90 </li>
92 91 <li class="treeview" th:if="${session.sessionUser.spid==0 }">
... ... @@ -99,7 +98,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
99 98 <li><a href="/email/page" id="/email/page"> 邮件消息管理</a></li>
100 99 <li><a href="/usersFree/page" id="/usersFree/page"> 网++白名单管理</a></li>
101 100 <li><a href="/notSpeak/page" id="/notSpeak/page"> 网++禁言管理</a></li>
102   -<!-- <li><a href="/activity/page" id="/activity/page"> 活动管理</a></li>-->
  101 + <li><a href="/activity/page" id="/activity/page"> 活动管理</a></li>
103 102 </ul>
104 103 </li>
105 104 </ul>
... ...