Commit 54d6c33f9ad0efd1901d606390a8d79bc5bcbd54
Exists in
master
Merge remote-tracking branch 'origin/master'
Showing
5 changed files
with
47 additions
and
2 deletions
Show diff stats
src/main/java/com/sincere/student/controller/AdminController.java
| @@ -278,9 +278,10 @@ public class AdminController { | @@ -278,9 +278,10 @@ public class AdminController { | ||
| 278 | @RequestMapping(value = "/video/getList" , method = RequestMethod.POST) | 278 | @RequestMapping(value = "/video/getList" , method = RequestMethod.POST) |
| 279 | public BaseDto<Page<Video>> getVideoList(@RequestBody VideoSearchDto videoSearchDto){ | 279 | public BaseDto<Page<Video>> getVideoList(@RequestBody VideoSearchDto videoSearchDto){ |
| 280 | BaseDto<Page<Video>> result = new BaseDto<>() ; | 280 | BaseDto<Page<Video>> result = new BaseDto<>() ; |
| 281 | - videoSearchDto.setStatus(0); | 281 | + videoSearchDto.setStatus(1); |
| 282 | Page<Video> page = videoService.getList(videoSearchDto); | 282 | Page<Video> page = videoService.getList(videoSearchDto); |
| 283 | result.setData(page); | 283 | result.setData(page); |
| 284 | + System.out.println("result:"+result.toString()+"----------page:"+page.toString()); | ||
| 284 | return result ; | 285 | return result ; |
| 285 | } | 286 | } |
| 286 | 287 |
src/main/java/com/sincere/student/dto/BaseDto.java
| @@ -40,4 +40,13 @@ public class BaseDto<T> { | @@ -40,4 +40,13 @@ public class BaseDto<T> { | ||
| 40 | public BaseDto() { | 40 | public BaseDto() { |
| 41 | this.success = true ; | 41 | this.success = true ; |
| 42 | } | 42 | } |
| 43 | + | ||
| 44 | + @Override | ||
| 45 | + public String toString() { | ||
| 46 | + return "BaseDto{" + | ||
| 47 | + "success=" + success + | ||
| 48 | + ", message='" + message + '\'' + | ||
| 49 | + ", data=" + data + | ||
| 50 | + '}'; | ||
| 51 | + } | ||
| 43 | } | 52 | } |
src/main/java/com/sincere/student/model/Video.java
| @@ -170,4 +170,24 @@ public class Video { | @@ -170,4 +170,24 @@ public class Video { | ||
| 170 | public void setCreateTime(Date createTime) { | 170 | public void setCreateTime(Date createTime) { |
| 171 | this.createTime = createTime; | 171 | this.createTime = createTime; |
| 172 | } | 172 | } |
| 173 | + | ||
| 174 | + @Override | ||
| 175 | + public String toString() { | ||
| 176 | + return "Video{" + | ||
| 177 | + "id=" + id + | ||
| 178 | + ", universityId=" + universityId + | ||
| 179 | + ", columnType=" + columnType + | ||
| 180 | + ", videoUrl='" + videoUrl + '\'' + | ||
| 181 | + ", videoUrlList=" + videoUrlList + | ||
| 182 | + ", sort=" + sort + | ||
| 183 | + ", createTime=" + createTime + | ||
| 184 | + ", name='" + name + '\'' + | ||
| 185 | + ", code='" + code + '\'' + | ||
| 186 | + ", status=" + status + | ||
| 187 | + ", imgUrl='" + imgUrl + '\'' + | ||
| 188 | + ", duration='" + duration + '\'' + | ||
| 189 | + ", videoName='" + videoName + '\'' + | ||
| 190 | + ", coverUrl='" + coverUrl + '\'' + | ||
| 191 | + '}'; | ||
| 192 | + } | ||
| 173 | } | 193 | } |
src/main/java/com/sincere/student/utils/Page.java
| @@ -52,4 +52,14 @@ public class Page<T> { | @@ -52,4 +52,14 @@ public class Page<T> { | ||
| 52 | public void setList(List<T> list) { | 52 | public void setList(List<T> list) { |
| 53 | this.list = list; | 53 | this.list = list; |
| 54 | } | 54 | } |
| 55 | + | ||
| 56 | + @Override | ||
| 57 | + public String toString() { | ||
| 58 | + return "Page{" + | ||
| 59 | + "page=" + page + | ||
| 60 | + ", pageSize=" + pageSize + | ||
| 61 | + ", count=" + count + | ||
| 62 | + ", list=" + list + | ||
| 63 | + '}'; | ||
| 64 | + } | ||
| 55 | } | 65 | } |
src/main/resources/application.yaml
| @@ -9,6 +9,11 @@ spring: | @@ -9,6 +9,11 @@ spring: | ||
| 9 | password: QWer123$%^ | 9 | password: QWer123$%^ |
| 10 | url: jdbc:sqlserver://47.110.50.251:33419;database=consultative | 10 | url: jdbc:sqlserver://47.110.50.251:33419;database=consultative |
| 11 | driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver | 11 | driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver |
| 12 | + | ||
| 13 | +# username: SZJXTUSER | ||
| 14 | +# password: xst200919 | ||
| 15 | +# url: jdbc:sqlserver://60.190.202.57:14333;database=consultative | ||
| 16 | +# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver | ||
| 12 | # cache: | 17 | # cache: |
| 13 | # type: redis | 18 | # type: redis |
| 14 | # redis: | 19 | # redis: |
| @@ -26,4 +31,4 @@ mybatis: | @@ -26,4 +31,4 @@ mybatis: | ||
| 26 | 31 | ||
| 27 | logging: | 32 | logging: |
| 28 | level: | 33 | level: |
| 29 | - com.sincere.student.mapper: debug | ||
| 30 | \ No newline at end of file | 34 | \ No newline at end of file |
| 35 | + com.sincere.student.mapper: info | ||
| 31 | \ No newline at end of file | 36 | \ No newline at end of file |