Merge remote-tracking branch 'origin/master'

陈杰
2 parents 455cb086 05fca018
Showing 5 changed files with 47 additions and 2 deletions Show diff stats
src/main/java/com/sincere/student/controller/AdminController.java
src/main/java/com/sincere/student/dto/BaseDto.java
src/main/java/com/sincere/student/model/Video.java
src/main/java/com/sincere/student/utils/Page.java
src/main/resources/application.yaml
@@ -278,9 +278,10 @@ public class AdminController {
     @RequestMapping(value = "/video/getList" , method = RequestMethod.POST)
     public BaseDto<Page<Video>> getVideoList(@RequestBody VideoSearchDto videoSearchDto){
         BaseDto<Page<Video>> result = new BaseDto<>() ;
-        videoSearchDto.setStatus(0);
+        videoSearchDto.setStatus(1);
         Page<Video> page = videoService.getList(videoSearchDto);
         result.setData(page);
+        System.out.println("result:"+result.toString()+"----------page:"+page.toString());
         return result ;
     }
  
@@ -40,4 +40,13 @@ public class BaseDto&lt;T&gt; {
     public BaseDto() {
         this.success = true ;
     }
+
+    @Override
+    public String toString() {
+        return "BaseDto{" +
+                "success=" + success +
+                ", message='" + message + '\'' +
+                ", data=" + data +
+                '}';
+    }
 }
@@ -170,4 +170,24 @@ public class Video {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    @Override
+    public String toString() {
+        return "Video{" +
+                "id=" + id +
+                ", universityId=" + universityId +
+                ", columnType=" + columnType +
+                ", videoUrl='" + videoUrl + '\'' +
+                ", videoUrlList=" + videoUrlList +
+                ", sort=" + sort +
+                ", createTime=" + createTime +
+                ", name='" + name + '\'' +
+                ", code='" + code + '\'' +
+                ", status=" + status +
+                ", imgUrl='" + imgUrl + '\'' +
+                ", duration='" + duration + '\'' +
+                ", videoName='" + videoName + '\'' +
+                ", coverUrl='" + coverUrl + '\'' +
+                '}';
+    }
 }
@@ -52,4 +52,14 @@ public class Page&lt;T&gt; {
     public void setList(List<T> list) {
         this.list = list;
     }
+
+    @Override
+    public String toString() {
+        return "Page{" +
+                "page=" + page +
+                ", pageSize=" + pageSize +
+                ", count=" + count +
+                ", list=" + list +
+                '}';
+    }
 }
@@ -9,6 +9,11 @@ spring:
     password: QWer123$%^
     url: jdbc:sqlserver://47.110.50.251:33419;database=consultative
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+
+#    username: SZJXTUSER
+#    password: xst200919
+#    url: jdbc:sqlserver://60.190.202.57:14333;database=consultative
+#    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
 #  cache:
 #    type: redis
 #  redis:
@@ -26,4 +31,4 @@ mybatis:
  
 logging:
   level:
-    com.sincere.student.mapper: debug
 \ No newline at end of file
+    com.sincere.student.mapper: info
 \ No newline at end of file
...	...	@@ -278,9 +278,10 @@ public class AdminController {
278	278	@RequestMapping(value = "/video/getList" , method = RequestMethod.POST)
279	279	public BaseDto<Page<Video>> getVideoList(@RequestBody VideoSearchDto videoSearchDto){
280	280	BaseDto<Page<Video>> result = new BaseDto<>() ;
281		- videoSearchDto.setStatus(0);
	281	+ videoSearchDto.setStatus(1);
282	282	Page<Video> page = videoService.getList(videoSearchDto);
283	283	result.setData(page);
	284	+ System.out.println("result:"+result.toString()+"----------page:"+page.toString());
284	285	return result ;
285	286	}
286	287
...	...
...	...	@@ -40,4 +40,13 @@ public class BaseDto<T> {
40	40	public BaseDto() {
41	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	}
...	...
...	...	@@ -170,4 +170,24 @@ public class Video {
170	170	public void setCreateTime(Date createTime) {
171	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	}
...	...
...	...	@@ -52,4 +52,14 @@ public class Page<T> {
52	52	public void setList(List<T> list) {
53	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	}
...	...
...	...	@@ -9,6 +9,11 @@ spring:
9	9	password: QWer123$%^
10	10	url: jdbc:sqlserver://47.110.50.251:33419;database=consultative
11	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	17	# cache:
13	18	# type: redis
14	19	# redis:
...	...	@@ -26,4 +31,4 @@ mybatis:
26	31
27	32	logging:
28	33	level:
29		- com.sincere.student.mapper: debug
30	34	\ No newline at end of file
	35	+ com.sincere.student.mapper: info
31	36	\ No newline at end of file
...	...