Merge remote-tracking branch 'origin/master'

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/NewsController.java

@@ -215,8 +215,8 @@ public class NewsController extends BaseController {
 		return succeed(sysNewsInformationService.updateStatus(id));
 	}
 
-	@ApiOperation("老师手机app首页按钮")
-	@GetMapping(value = "/app/home/teacher")
+	// @ApiOperation("老师手机app首页按钮")
+	// @GetMapping(value = "/app/home/teacher")
 	public HttpResponseResult<List<SysNewsInformationDto>> teacherMenu() {
 
 		NewsInformationQueryInfo queryInfo = new NewsInformationQueryInfo();
@@ -232,7 +232,7 @@ public class NewsController extends BaseController {
 		return succeed(rows);
 	}
 
-	@ApiOperation("学生手机app首页banner、按钮、资讯")
+	@ApiOperation("学生/老师端 手机app首页banner、按钮、资讯")
 	@PostMapping(value = "/app/home")
 	public HttpResponseResult<AppHomeDto> appHome(@RequestBody AppParam param) {
 
@@ -247,7 +247,11 @@ public class NewsController extends BaseController {
 
 		AppHomeDto appHomeDto = new AppHomeDto();
 		queryInfo.setStatus(NewsStatusEnum.SHOW.getCode().toString());
-		queryInfo.setPlatformType("STUDENT");
+		if (StringUtil.isEmpty(param.getClientType())) {
+			queryInfo.setPlatformType("STUDENT");
+		} else {
+			queryInfo.setPlatformType(param.getClientType());
+		}
 		// 1热门资讯
 		queryInfo.setType(1);
 		queryInfo.setPage(1);

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/entity/SysNewsInformation.java

@@ -95,7 +95,7 @@ public class SysNewsInformation {
 	private String linkType;
 
 	// 平台类型  ADMIN:平台端  STUDENT：学生端  TEACHER：老师端 WEBSITE:官网
-	@ApiModelProperty(value = "客户端类型    STUDENT：学生端  WEBSITE:官网")
+	@ApiModelProperty(value = "客户端类型    STUDENT：学生端  WEBSITE:官网  TEACHER ：老师端")
 	private String clientType;
 
 	public String getClientType() {

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dto/AppParam.java

@@ -18,6 +18,17 @@ public class AppParam {
     @ApiModelProperty(value = "平台",required = true)
     private String platform;
 
+    @ApiModelProperty("老师端：TEACHER 学生端：STUDENT")
+    private String clientType;
+
+
+    public String getClientType() {
+        return clientType;
+    }
+
+    public void setClientType(String clientType) {
+        this.clientType = clientType;
+    }
 
     public String getVersion() {
         return version;