周伟鹏 / cnlive_shenhe · Commits

Commit 49c75b9af851edcc3774151fc7b0fd5e7f08af26

Authored by 郑超
1 parent d491de41

update

Inline Side-by-side
Showing 15 changed files with 34 additions and 29 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @49c75b9
... ... @@ -120,6 +120,7 @@ public class VideosController extends BaseController {
120 120 */
121 121 @GetMapping("/page")
122 122 public Object getListVideos(Model model, VideosDTO videosDTO, HttpSession session) {
  123 + logger.info("列表请求参数:{}", JSON.toJSONString(videosDTO));
123 124 if (!StringUtils.isEmpty(videosDTO.getShen_auditor_id())) {
124 125 if ((!"自动审核".equals(videosDTO.getShen_auditor_id())) && (!"白名单".equals(videosDTO.getShen_auditor_id()))) {
125 126 videosDTO.setShen_auditor_id(usersService.findspidByName(videosDTO.getShen_auditor_id()));
... ... @@ -132,9 +133,9 @@ public class VideosController extends BaseController {
132 133 }
133 134 Integer spid = sessionUser.getSpid();
134 135 videosDTO.setSpid(spid);
135   - logger.info("sp_Id:{},spid:{}", videosDTO.getSp_Id(), videosDTO.getSpid());
136 136 String userId = sessionUser.getUserId();
137 137 videosDTO.setUserId(userId);
  138 + logger.info("sp_Id:{},spid:{},userId:{}", videosDTO.getSp_Id(), videosDTO.getSpid(), userId);
138 139 if (CommonUtils.isNotEmpty(videosDTO.getSp_desc()) && videosDTO.getSpid() == 0) {
139 140 ShySites shySite = sitesService.findspidBySpdesc(videosDTO.getSp_desc());
140 141 if (CommonUtils.isNotNull(shySite)) {
... ...
src/main/java/com/cnlive/shenhe/dto/AudioDTO.java
  View file @49c75b9
... ... @@ -83,7 +83,7 @@ public class AudioDTO implements Serializable {
83 83 }
84 84  
85 85 public Integer getPage() {
86   - return page;
  86 + return page == null ? 1 : page;
87 87 }
88 88  
89 89 public void setPage(Integer page) {
... ... @@ -91,7 +91,7 @@ public class AudioDTO implements Serializable {
91 91 }
92 92  
93 93 public Integer getPageSize() {
94   - return pageSize;
  94 + return pageSize == null ? 10 : pageSize;
95 95 }
96 96  
97 97 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/ChannelDTO.java
  View file @49c75b9
... ... @@ -84,7 +84,7 @@ public class ChannelDTO implements Serializable {
84 84 }
85 85  
86 86 public Integer getPage() {
87   - return page;
  87 + return page == null ? 1 : page;
88 88 }
89 89  
90 90 public void setPage(Integer page) {
... ... @@ -92,7 +92,7 @@ public class ChannelDTO implements Serializable {
92 92 }
93 93  
94 94 public Integer getPageSize() {
95   - return pageSize;
  95 + return pageSize == null ? 10 : pageSize;
96 96 }
97 97  
98 98 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/CommentsDTO.java
  View file @49c75b9
... ... @@ -87,7 +87,7 @@ public class CommentsDTO implements Serializable {
87 87 }
88 88  
89 89 public Integer getPage() {
90   - return page;
  90 + return page == null ? 1 : page;
91 91 }
92 92  
93 93 public void setPage(Integer page) {
... ... @@ -95,7 +95,7 @@ public class CommentsDTO implements Serializable {
95 95 }
96 96  
97 97 public Integer getPageSize() {
98   - return pageSize;
  98 + return pageSize == null ? 10 : pageSize;
99 99 }
100 100  
101 101 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/ContentDTO.java
  View file @49c75b9
... ... @@ -86,7 +86,7 @@ public class ContentDTO implements Serializable {
86 86 }
87 87  
88 88 public Integer getPage() {
89   - return page;
  89 + return page == null ? 1 : page;
90 90 }
91 91  
92 92 public void setPage(Integer page) {
... ... @@ -94,7 +94,7 @@ public class ContentDTO implements Serializable {
94 94 }
95 95  
96 96 public Integer getPageSize() {
97   - return pageSize;
  97 + return pageSize == null ? 10 : pageSize;
98 98 }
99 99  
100 100 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/EmailDTO.java
  View file @49c75b9
... ... @@ -26,7 +26,7 @@ public class EmailDTO implements Serializable {
26 26 }
27 27  
28 28 public Integer getPage() {
29   - return page;
  29 + return page == null ? 1 : page;
30 30 }
31 31  
32 32 public void setPage(Integer page) {
... ... @@ -34,7 +34,7 @@ public class EmailDTO implements Serializable {
34 34 }
35 35  
36 36 public Integer getPageSize() {
37   - return pageSize;
  37 + return pageSize == null ? 10 : pageSize;
38 38 }
39 39  
40 40 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/LiveApplyDTO.java
  View file @49c75b9
... ... @@ -90,7 +90,7 @@ public class LiveApplyDTO implements Serializable {
90 90 }
91 91  
92 92 public Integer getPage() {
93   - return page;
  93 + return page == null ? 1 : page;
94 94 }
95 95  
96 96 public void setPage(Integer page) {
... ... @@ -98,7 +98,7 @@ public class LiveApplyDTO implements Serializable {
98 98 }
99 99  
100 100 public Integer getPageSize() {
101   - return pageSize;
  101 + return pageSize == null ? 10 : pageSize;
102 102 }
103 103  
104 104 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/LiveDTO.java
  View file @49c75b9
... ... @@ -68,7 +68,7 @@ public class LiveDTO implements Serializable {
68 68 }
69 69  
70 70 public Integer getPage() {
71   - return page;
  71 + return page == null ? 1 : page;
72 72 }
73 73  
74 74 public void setPage(Integer page) {
... ... @@ -76,7 +76,7 @@ public class LiveDTO implements Serializable {
76 76 }
77 77  
78 78 public Integer getPageSize() {
79   - return pageSize;
  79 + return pageSize == null ? 10 : pageSize;
80 80 }
81 81  
82 82 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/NotSpeakDTO.java
  View file @49c75b9
... ... @@ -73,7 +73,7 @@ public class NotSpeakDTO implements Serializable {
73 73 }
74 74  
75 75 public Integer getPage() {
76   - return page;
  76 + return page == null ? 1 : page;
77 77 }
78 78  
79 79 public void setPage(Integer page) {
... ... @@ -81,7 +81,7 @@ public class NotSpeakDTO implements Serializable {
81 81 }
82 82  
83 83 public Integer getPageSize() {
84   - return pageSize;
  84 + return pageSize == null ? 10 : pageSize;
85 85 }
86 86  
87 87 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/SitesDTO.java
  View file @49c75b9
... ... @@ -41,7 +41,7 @@ public class SitesDTO implements Serializable {
41 41 }
42 42  
43 43 public Integer getPage() {
44   - return page;
  44 + return page == null ? 1 : page;
45 45 }
46 46  
47 47 public void setPage(Integer page) {
... ... @@ -49,7 +49,7 @@ public class SitesDTO implements Serializable {
49 49 }
50 50  
51 51 public Integer getPageSize() {
52   - return pageSize;
  52 + return pageSize == null ? 10 : pageSize;
53 53 }
54 54  
55 55 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/TopicDTO.java
  View file @49c75b9
... ... @@ -135,7 +135,7 @@ public class TopicDTO implements Serializable {
135 135 }
136 136  
137 137 public Integer getPage() {
138   - return page;
  138 + return page == null ? 1 : page;
139 139 }
140 140  
141 141 public void setPage(Integer page) {
... ... @@ -143,7 +143,7 @@ public class TopicDTO implements Serializable {
143 143 }
144 144  
145 145 public Integer getPageSize() {
146   - return pageSize;
  146 + return pageSize == null ? 10 : pageSize;
147 147 }
148 148  
149 149 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/UsersDTO.java
  View file @49c75b9
... ... @@ -30,7 +30,7 @@ public class UsersDTO implements Serializable {
30 30 }
31 31  
32 32 public Integer getPage() {
33   - return page;
  33 + return page == null ? 1 : page;
34 34 }
35 35  
36 36 public void setPage(Integer page) {
... ... @@ -38,7 +38,7 @@ public class UsersDTO implements Serializable {
38 38 }
39 39  
40 40 public Integer getPageSize() {
41   - return pageSize;
  41 + return pageSize == null ? 10 : pageSize;
42 42 }
43 43  
44 44 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/UsersFreeDTO.java
  View file @49c75b9
... ... @@ -37,7 +37,7 @@ public class UsersFreeDTO implements Serializable {
37 37 }
38 38  
39 39 public Integer getPage() {
40   - return page;
  40 + return page == null ? 1 : page;
41 41 }
42 42  
43 43 public void setPage(Integer page) {
... ... @@ -45,7 +45,7 @@ public class UsersFreeDTO implements Serializable {
45 45 }
46 46  
47 47 public Integer getPageSize() {
48   - return pageSize;
  48 + return pageSize == null ? 10 : pageSize;
49 49 }
50 50  
51 51 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/VideosDTO.java
  View file @49c75b9
... ... @@ -12,8 +12,8 @@ public class VideosDTO implements Serializable {
12 12 private String video_title;
13 13 private Integer state;
14 14 private Integer receive;
15   - private Integer page = 1;
16   - private Integer pageSize = 10;
  15 + private Integer page;
  16 + private Integer pageSize;
17 17 private String video_priority;
18 18 private String orderByClause;
19 19 private String sp_desc;
... ... @@ -93,7 +93,7 @@ public class VideosDTO implements Serializable {
93 93 }
94 94  
95 95 public Integer getPage() {
96   - return page;
  96 + return page == null ? 1 : page;
97 97 }
98 98  
99 99 public void setPage(Integer page) {
... ... @@ -101,7 +101,7 @@ public class VideosDTO implements Serializable {
101 101 }
102 102  
103 103 public Integer getPageSize() {
104   - return pageSize;
  104 + return pageSize == null ? 10 : pageSize;
105 105 }
106 106  
107 107 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
  View file @49c75b9
1 1 package com.cnlive.shenhe.serviceImpl;
2 2  
  3 +import com.alibaba.fastjson.JSON;
3 4 import com.alibaba.fastjson.JSONArray;
4 5 import com.alibaba.fastjson.JSONObject;
5 6 import com.cnlive.shenhe.bean.ErrorEnum;
... ... @@ -196,6 +197,9 @@ public class VideosServiceImpl {
196 197 }
197 198 //默认按上传时间倒序排序
198 199 example.setOrderByClause("created_at desc");
  200 + logger.info("获取点播列表封装对象:{}", JSON.toJSONString(videosDTO));
  201 + System.out.println(videosDTO.getPage());
  202 + System.out.println(videosDTO.getPageSize());
199 203 PageHelper.startPage(videosDTO.getPage(), videosDTO.getPageSize(), true);
200 204 List<ShyVideos> shyVideosList = shyVideosMapper.selectByExample(example);
201 205 PageInfo<ShyVideos> pageInfo = new PageInfo<>(shyVideosList);
... ...