时间范围查询统计

@@ -9,10 +9,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by JA on 17/7/3.
@@ -27,12 +26,21 @@ public class StatisticsController {
 	private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
 	@RequestMapping
-	public MessageEntity statistics(HttpServletRequest request,@RequestParam(required = false)String time) {
+	public MessageEntity statistics(HttpServletRequest request,@RequestParam(required = false) String startTime,@RequestParam(required = false) String endTime) {
 		MessageEntity.Builder builder = new MessageEntity.Builder(request);
-		if(StringUtils.isBlank(time)){
+		Map<String,Object> returnMap = new HashMap<>();
+		if(StringUtils.isBlank(startTime)){
 			Date date = new Date();
-			time = this.sdf.format(date);
+			startTime = this.sdf.format(date);
 		}
+		if(StringUtils.isBlank(endTime)){
+			Date date = new Date();
+			endTime = this.sdf.format(date);
+		}
+		List<Date> dateList = getBetweenDates(startTime, endTime);
+		if(dateList != null && dateList.size() > 0){
+			for(Date date:dateList){
+				String time = this.sdf.format(date);
 				String startDate = time + " 00:00:00";
 				String endDate = time + " 23:59:59";
 				int pv = this.shareLogMapper.findPVByDay(startDate, endDate);
@@ -44,7 +52,38 @@ public class StatisticsController {
 				map.put("uv",uv);
 				map.put("share",share);
 				map.put("img",img);
-		return builder.success(true).code("2000").content(map).create();
+				returnMap.put(time,map);
+			}
 		}
+		return builder.success(true).code("2000").content(returnMap).create();
+	}
+
+
+	private List<Date> getBetweenDates(String startString, String endString) {
+		List<Date> result = new ArrayList<>();
+		Calendar tempStart = Calendar.getInstance();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		Date start = null;
+		Date end = null;
+		try {
+			start = sdf.parse(startString);
+			end = sdf.parse(endString);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		tempStart.setTime(start);
+		result.add(tempStart.getTime());
+		tempStart.add(Calendar.DAY_OF_YEAR, 1);
+
+		Calendar tempEnd = Calendar.getInstance();
+		tempEnd.setTime(end);
+		while (tempStart.before(tempEnd) || tempStart.equals(tempEnd)) {
+			result.add(tempStart.getTime());
+			Date time = tempStart.getTime();
+			tempStart.add(Calendar.DAY_OF_YEAR, 1);
+		}
+		return result;
+	}
+
 
 }