fangcheng / regional-platform

Authored by jiangjiazhi almost 9 years ago

Showing 4 changed files

...	...	@@ -30,7 +30,7 @@
30	30	EBYYTX(16,"儿保预约提醒",14,"2"),
31	31	YSGXHZD(17,"医生个性化指导",0,"0,1,2,3"),
32	32	GSFWTZ(18,"公司服务通知",0,""),
33		- FWKT(19,"服务开通",18,"0,1,2,3"),
	33	+ FWKT(19,"服务提醒",18,"0,1,2,3"),
34	34	YWTG(20,"业务推广",18,"0,1,2,3"),
35	35	QT(21,"其他",0,""),
36	36	JRWH(22,"节日问候",21,"0,1,2,3"),
...	...	@@ -96,7 +96,7 @@
96	96	rootMap.put("pid",e.getPid());
97	97	if (isLeaf(e.getId()))
98	98	{
99		- rootMap.put("child",getSmsServiceTree(e.getId()));
	99	+ rootMap.put("children",getSmsServiceTree(e.getId()));
100	100	rootMap.put("isLeaf",false);
101	101	}
102	102	else

...	...	@@ -38,13 +38,17 @@
38	38	return 0;
39	39	}
40	40
41		- public static List<String> getWeekEnums() {
42		- List<String> list = new ArrayList<>();
	41	+ public static List<Map> getWeekEnums() {
	42	+ List<Map> list = new ArrayList<>();
43	43	for (WeekEnums e : WeekEnums.values()) {
44		- list.add(e.getName());
	44	+ Map rootMap = new HashMap();
	45	+ rootMap.put("id", e.getId());
	46	+ rootMap.put("name", e.getName());
	47	+ list.add(rootMap);
45	48	}
46	49	return list;
47	50	}
	51	+
48	52
49	53	private int id;
50	54

...	...	@@ -331,13 +331,13 @@
331	331	*/
332	332	@RequestMapping(value = "/getWeeks", method = RequestMethod.GET)
333	333	@ResponseBody
334		- public List<String> getWeeks() {
	334	+ public List<Map> getWeeks() {
335	335	return WeekEnums.getWeekEnums();
336	336	}
337	337
338	338	public static void main(String a[]) {
339	339
340		- List list = SmsServiceEnums.getSmsServiceLeaf();
	340	+ List<Map> list = SmsServiceEnums.getSmsServiceTree(-1);
341	341
342	342	System.out.println(list);
343	343	}

1	1	package com.lyms.platform.operate.web.controller;
2	2
3	3	import com.lyms.platform.common.base.BaseController;
	4	+import com.lyms.platform.common.enums.SendTimeEnums;
4	5	import com.lyms.platform.common.enums.SmsServiceEnums;
5	6	import com.lyms.platform.common.result.BaseResponse;
6	7	import com.lyms.platform.common.utils.JsonUtil;
...	...	@@ -77,6 +78,17 @@
77	78	@ResponseBody
78	79	public BaseResponse querySmsConfigByHid(@PathVariable("hid") String hid) {
79	80	return smsConfigFacade.querySmsConfigByHid(hid);
	81	+ }
	82	+
	83	+ /**
	84	+ * 获取服务树结构
	85	+ * @return
	86	+ */
	87	+ @RequestMapping(value = "/getServiceTreeData", method = RequestMethod.GET)
	88	+ @ResponseBody
	89	+ public List<Map> getServiceTreeData() {
	90	+ List<Map> list = SmsServiceEnums.getSmsServiceTree(-1);
	91	+ return list;
80	92	}
81	93
82	94	}