消息分类

mec-biz/src/main/java/com/ym/mec/biz/service/SysMessageService.java

@@ -162,6 +162,4 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * 每天9点推送前一天22点之后的推送消息
 	 */
 	void pushWaitSendMessageTask();
-
-	Object queryTypeList();
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageServiceImpl.java

@@ -295,17 +295,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
-	public Object queryTypeList() {
-		HashMap<Object, Object> map = new LinkedHashMap<>(5);
-		map.put("ALL","全部");
-		map.put("PAY","缴费信息");
-		map.put("COURSE","课程信息");
-		map.put("WORK","作业信息");
-		map.put("DEFAULT","其他");
-		return map;
-	}
-
-	@Override
 	@Async
 	public void batchSendMessage(MessageSender messageSender, MessageTypeEnum type, Map<Integer, String> receivers, Date triggerTime, Integer readStatus,
 			String url,String jpushType, Object... args) {

mec-student/src/main/java/com/ym/mec/student/controller/SysMessageController.java

@@ -52,7 +52,11 @@ public class SysMessageController extends BaseController {
 	@ApiOperation("获取消息分类类型")
 	@GetMapping(value = "typeList")
 	public Object typeList(){
-		return succeed(sysMessageService.queryTypeList());
+		return succeed("[{\"value\":\"全部\",\"key\":\"ALL\"}," +
+				"{\"value\":\"缴费信息\",\"key\":\"PAY\"}," +
+				"{\"value\":\"课程信息\",\"key\":\"COURSE\"}," +
+				"{\"value\":\"作业信息\",\"key\":\"WORK\"}," +
+				"{\"value\":\"其他\",\"key\":\"DEFAULT\"}]");
 	}
 
 	@ApiOperation("一键已读")

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

@@ -9,6 +9,8 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
+import org.json.JSONArray;
+import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -55,13 +57,36 @@ public class SysMessageController extends BaseController {
 	@ApiOperation("获取消息分类类型")
 	@GetMapping(value = "typeList")
 	public Object typeList(){
-		HashMap<Object, Object> map = new LinkedHashMap<>(5);
-		map.put("ALL","全部");
-		map.put("ATTENDANCE","考勤信息");
-		map.put("COURSE","课程信息");
-		map.put("WORK","作业信息");
-		map.put("DEFAULT","其他");
-		return succeed(map);
+		return succeed("[{\"value\":\"全部\",\"key\":\"ALL\"}," +
+				"{\"value\":\"考勤信息\",\"key\":\"ATTENDANCE\"}," +
+				"{\"value\":\"课程信息\",\"key\":\"COURSE\"}," +
+				"{\"value\":\"作业信息\",\"key\":\"WORK\"}," +
+				"{\"value\":\"其他\",\"key\":\"DEFAULT\"}]");
+	}
+
+	public static void main(String[] args) {
+			JSONArray jsonArray = new JSONArray();
+			JSONObject jsonObject = new JSONObject();
+			jsonObject.put("key","ALL");
+			jsonObject.put("value","全部");
+			JSONObject jsonObject1 = new JSONObject();
+			jsonObject1.put("key","ATTENDANCE");
+			jsonObject1.put("value","考勤信息");
+			JSONObject jsonObject2 = new JSONObject();
+			jsonObject2.put("key","COURSE");
+			jsonObject2.put("value","课程信息");
+			JSONObject jsonObject3 = new JSONObject();
+			jsonObject3.put("key","WORK");
+			jsonObject3.put("value","作业信息");
+			JSONObject jsonObject4 = new JSONObject();
+			jsonObject4.put("key","DEFAULT");
+			jsonObject4.put("value","其他");
+			jsonArray.put(jsonObject);
+			jsonArray.put(jsonObject1);
+			jsonArray.put(jsonObject2);
+			jsonArray.put(jsonObject3);
+			jsonArray.put(jsonObject4);
+			System.out.println(jsonArray);
 	}
 
 	@ApiOperation("一键已读")

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

@@ -51,13 +51,11 @@ public class SysMessageController extends BaseController {
 	@ApiOperation("获取消息分类类型")
 	@GetMapping(value = "typeList")
 	public Object typeList(){
-		HashMap<Object, Object> map = new LinkedHashMap<>(5);
-		map.put("ALL","全部");
-		map.put("PAY","缴费信息");
-		map.put("STUDENT","学员信息");
-		map.put("MUSIC","乐团信息");
-		map.put("DEFAULT","其他");
-		return succeed(map);
+		return succeed("[{\"value\":\"全部\",\"key\":\"ALL\"}," +
+				"{\"value\":\"缴费信息\",\"key\":\"PAY\"}," +
+				"{\"value\":\"学员信息\",\"key\":\"STUDENT\"}," +
+				"{\"value\":\"乐团信息\",\"key\":\"MUSIC\"}," +
+				"{\"value\":\"其他\",\"key\":\"DEFAULT\"}]");
 	}
 
 	@ApiOperation("设置已读")

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

@@ -50,13 +50,11 @@ public class SysEduMessageController extends BaseController {
 	@ApiOperation("获取消息分类类型")
 	@GetMapping(value = "typeList")
 	public Object typeList(){
-		HashMap<Object, Object> map = new LinkedHashMap<>(5);
-		map.put("ALL","全部");
-		map.put("PAY","缴费信息");
-		map.put("STUDENT","学员信息");
-		map.put("MUSIC","乐团信息");
-		map.put("DEFAULT","其他");
-		return succeed(map);
+		return succeed("[{\"value\":\"全部\",\"key\":\"ALL\"}," +
+				"{\"value\":\"缴费信息\",\"key\":\"PAY\"}," +
+				"{\"value\":\"学员信息\",\"key\":\"STUDENT\"}," +
+				"{\"value\":\"乐团信息\",\"key\":\"MUSIC\"}," +
+				"{\"value\":\"其他\",\"key\":\"DEFAULT\"}]");
 	}
 
 	@ApiOperation("一键已读")