jiangjiazhi / regional-platform

Commit af6aee76b5ef2d7fe32b1ddc1d49cb97915b3065

Authored by liquanyu over 9 years ago

Exists in master and in 8 other branches

枚举修改

Showing 2 changed files with 31 additions and 13 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java

...	...	@@ -113,26 +113,21 @@
113	113
114	114	/**
115	115	* 只要子节点
116		- * @param id
117	116	* @return
118	117	*/
119		- public static List<Map> getSmsServiceLeaf(int id)
	118	+ public static List<Map> getSmsServiceLeaf()
120	119	{
121	120
122	121	List<Map> list = new ArrayList<>();
123	122	for (SmsServiceEnums e : SmsServiceEnums.values()) {
124		- if(e.getPid() == id) {
125	123	Map rootMap = new HashMap();
126	124	rootMap.put("id",e.getId());
127		- rootMap.put("name",e.getName());
	125	+ rootMap.put("name", e.getName());
128	126	rootMap.put("pid", e.getPid());
129	127	if (!isLeaf(e.getId()))
130	128	{
131	129	list.add(rootMap);
132	130	}
133		-
134		-
135		- }
136	131	}
137	132	return list;
138	133

...	...	@@ -233,12 +233,36 @@
233	233	*/
234	234	@RequestMapping(value = "/getSmsTypeByObjId/{serviceObjId}", method = RequestMethod.GET)
235	235	@ResponseBody
236		- public List<Map> getAllServiceStatus(@PathVariable("serviceObjId") Integer serviceObjId) {
	236	+ public List<Map> getSmsTypeByObjId(@PathVariable("serviceObjId") Integer serviceObjId) {
237	237	List<Map> list = SmsServiceEnums.getSmsServiceByServiceObj(serviceObjId);
238	238	return list;
239	239	}
240	240
	241	+
241	242	/**
	243	+ * 获取查询页面的消息类型通过对象类型
	244	+ * @param serviceObjId
	245	+ * @return
	246	+ */
	247	+ @RequestMapping(value = "/getQuerySmsTypeByObjId/{serviceObjId}", method = RequestMethod.GET)
	248	+ @ResponseBody
	249	+ public List<Map> getQuerySmsTypeByObjId(@PathVariable("serviceObjId") Integer serviceObjId) {
	250	+ List<Map> list = null;
	251	+ if (serviceObjId == 0)
	252	+ {
	253	+ list = SmsServiceEnums.getSmsServiceLeaf();
	254	+ }
	255	+ else
	256	+ {
	257	+ list = SmsServiceEnums.getSmsServiceByServiceObj(serviceObjId);
	258	+ }
	259	+
	260	+ return list;
	261	+ }
	262	+
	263	+
	264	+
	265	+ /**
242	266	* 特殊日期类型查询
243	267	* @param serviceObjId 服务对象
244	268	* @param sendDateType 日期类型
...	...	@@ -248,7 +272,7 @@
248	272	@RequestMapping(value = "/getSpecialType/{serviceObjId}/{sendDateType}/{freq}", method = RequestMethod.GET)
249	273	@ResponseBody
250	274	public List<Map> getSpecialType(@PathVariable("serviceObjId") Integer serviceObjId,@PathVariable("sendDateType") Integer sendDateType,@PathVariable("freq") Integer freq) {
251		- List<Map> list =SpecialDateEnums.getSpecialDateByServiceObj(serviceObjId, sendDateType,freq);
	275	+ List<Map> list =SpecialDateEnums.getSpecialDateByServiceObj(serviceObjId, sendDateType, freq);
252	276	return list;
253	277	}
254	278
...	...	@@ -262,7 +286,7 @@
262	286	@RequestMapping(value = "/getDateType/{serviceObjId}/{freq}", method = RequestMethod.GET)
263	287	@ResponseBody
264	288	public List<Map> getDateType(@PathVariable("serviceObjId") Integer serviceObjId,@PathVariable("freq") Integer freq) {
265		- List<Map> list =SendDateEnums.getSendFrequency(serviceObjId,freq);
	289	+ List<Map> list =SendDateEnums.getSendFrequency(serviceObjId, freq);
266	290	return list;
267	291	}
268	292
269	293
...	...	@@ -291,10 +315,9 @@
291	315
292	316	public static void main(String a[]) {
293	317
294		- for (PatientsTypeEnum e : PatientsTypeEnum.values()) {
	318	+ List list = SmsServiceEnums.getSmsServiceLeaf();
295	319
296		- System.out.println(e.getText());
297		- }
	320	+ System.out.println(list);
298	321	}
299	322
300	323	}