jiangjiazhi / regional-platform

Authored by jiangjiazhi over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 13 additions and 6 deletions

...	...	@@ -18,6 +18,7 @@
18	18
19	19	import javax.servlet.http.HttpServletRequest;
20	20	import javax.validation.Valid;
	21	+import java.util.Map;
21	22
22	23
23	24	/**
...	...	@@ -81,7 +82,7 @@
81	82	@TokenRequired
82	83	@RequestMapping(value = "/report/{id}",method = RequestMethod.GET)
83	84	@ResponseBody
84		- public BaseResponse report(@PathVariable String id,HttpServletRequest request){
	85	+ public Map report(@PathVariable String id,HttpServletRequest request){
85	86	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
86	87	return tempFacade.reportList(loginState.getId(),id);
87	88	}

...	...	@@ -167,26 +167,32 @@
167	167	* @param id 记录id
168	168	* @return
169	169	*/
170		- public BaseResponse reportList(Integer userId, String id) {
	170	+ public Map reportList(Integer userId, String id) {
171	171	TempModel tem = tempService.findOneById(id);
172	172	Assert.notNull(tem, "查看的记录已被删除");
173	173	LinkedHashMap<String, Double> data = tem.getTempList();
	174	+ Map map = new HashMap();
	175	+ map.put("errorcode",ErrorCodeConstants.SUCCESS);
	176	+ map.put("errormsg", "成功");
	177	+ List<String> time = new ArrayList<>();
	178	+ List<String> temp=new ArrayList<>();
	179	+ map.put("time",time);
	180	+ map.put("temp",temp);
174	181	if (null == data \|\| data.isEmpty()) {
175		- return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	182	+ return map;
176	183	}
177	184	/* Set<Map.Entry<String, Double>> set = data.entrySet();
178	185
179	186	ArrayList<Map.Entry<String, Double>> da = new ArrayList<Map.Entry<String, Double>>(set);
180	187	Collections.reverse(da);*/
181	188	;
182		- List<String> time = new ArrayList<>();
183		- List<String> temp=new ArrayList<>();
	189	+
184	190	for (int i = 0; i < 7; i++) {
185	191	String t = DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(), -i));
186	192	time.add(t);
187	193	temp.add(String.valueOf(data.get(t)));
188	194	}
189		- return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	195	+ return map;
190	196	}
191	197	}