|
@ -492,6 +492,9 @@ public class EsStatisticsController extends BaseController {
|
|
|
if (org.springframework.util.StringUtils.isEmpty(year)) {
|
|
|
year = Constant.getNowYear();
|
|
|
}
|
|
|
if ("13".equals(idx)){
|
|
|
idx="1";
|
|
|
}
|
|
|
// JSONObject json = statisticsAllService.getDateTotal(startDate, endDate, interval, area, level, idx, lowCode,year);
|
|
|
JSONObject json = statisticsESService.getDateTotal(startDate, endDate, interval, area, level, idx, lowCode, year);
|
|
|
result.put("index_" + idx, json);
|
|
@ -832,7 +835,7 @@ public class EsStatisticsController extends BaseController {
|
|
|
try {
|
|
|
|
|
|
return write(200, "查询成功", "data", statisticsESService.getStatTitleInfo(getUID(), startDate, endDate));
|
|
|
//return write(200, "查询成功", "data", statisticsESService.getStatTitleInfo("zbqD201703150222",startDate,endDate));
|
|
|
//return write(200, "查询成功", "data", statisticsESService.getStatTitleInfo("xh1D201703150222",startDate,endDate));
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
error(e);
|
|
@ -885,7 +888,7 @@ public class EsStatisticsController extends BaseController {
|
|
|
@RequestParam(required = true) String isNow) {
|
|
|
try {
|
|
|
return write(200, "查询成功", "data", statisticsESService.getReyStatbyTeamNow(getUID(), startDate, endDate, isNow));
|
|
|
//return write(200, "查询成功", "data", statisticsESService.getReyStatbyTeamNow("zbqD201703150222",startDate,endDate,isNow));
|
|
|
//return write(200, "查询成功", "data", statisticsESService.getReyStatbyTeamNow("xh1D201703150222",startDate,endDate,isNow));
|
|
|
} catch (Exception e) {
|
|
|
error(e);
|
|
|
return error(-1, "查询失败");
|