zouxuan пре 4 година
родитељ
комит
3bee392e8b

+ 7 - 1
mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMessageController.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
@@ -53,7 +54,12 @@ public class SysMessageController extends BaseController {
 	@ApiOperation("获取消息分类类型")
 	@GetMapping(value = "typeList")
 	public Object typeList(){
-		return succeed(sysMessageService.queryTypeList());
+		HashMap<Object, Object> map = new HashMap<>(4);
+		map.put("ALL","全部");
+		map.put("ATTENDANCE","考勤信息");
+		map.put("COURSE","课程信息");
+		map.put("WORK","作业信息");
+		return succeed(map);
 	}
 
 	@ApiOperation("一键已读")

+ 8 - 1
mec-web/src/main/java/com/ym/mec/web/controller/SysMessageController.java

@@ -19,6 +19,8 @@ import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.PageInfo;
 
+import java.util.HashMap;
+
 @RestController
 @Api(tags = "消息服务")
 @RequestMapping("sysMessage")
@@ -48,7 +50,12 @@ public class SysMessageController extends BaseController {
 	@ApiOperation("获取消息分类类型")
 	@GetMapping(value = "typeList")
 	public Object typeList(){
-		return succeed(sysMessageService.queryTypeList());
+		HashMap<Object, Object> map = new HashMap<>(4);
+		map.put("ALL","全部");
+		map.put("PAY","缴费信息");
+		map.put("STUDENT","学员信息");
+		map.put("MUSIC","乐团信息");
+		return succeed(map);
 	}
 
 	@ApiOperation("设置已读")

+ 8 - 1
mec-web/src/main/java/com/ym/mec/web/controller/education/SysEduMessageController.java

@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
 import java.util.Map;
 
 @RestController
@@ -47,7 +49,12 @@ public class SysEduMessageController extends BaseController {
 	@ApiOperation("获取消息分类类型")
 	@GetMapping(value = "typeList")
 	public Object typeList(){
-		return succeed(sysMessageService.queryTypeList());
+		HashMap<Object, Object> map = new HashMap<>(4);
+		map.put("ALL","全部");
+		map.put("PAY","缴费信息");
+		map.put("STUDENT","学员信息");
+		map.put("MUSIC","乐团信息");
+		return succeed(map);
 	}
 
 	@ApiOperation("一键已读")