From a801e1102929fef6a6464f35a5894d718a01cdc6 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期一, 13 十一月 2023 23:23:40 +0800 Subject: [PATCH] 一点一档 --- ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java | 2 +- ycl-platform/src/main/java/com/ycl/controller/smoke/OdsStatisticsController.java | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/controller/smoke/OdsStatisticsController.java b/ycl-platform/src/main/java/com/ycl/controller/smoke/OdsStatisticsController.java index b97f597..44472e6 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/smoke/OdsStatisticsController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/smoke/OdsStatisticsController.java @@ -1,6 +1,7 @@ package com.ycl.controller.smoke; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -84,7 +85,15 @@ public CommonResult<String> getDetectorDailyStatsDocument(@RequestParam(value = "field", required = false) String field, @RequestParam(value = "localeId", required = false) String localeId) { OdsLocaleDocument odsLocaleDocument = documentService.getByLocaleId(localeId); - String value = getFieldValueByFieldName(field, odsLocaleDocument); + String value = ""; + if ("detectorDailySumDays".equals(field)) { + odsLocaleDocument.setTenHourData(""); + odsLocaleDocument.setDevices(""); + odsLocaleDocument.setMaintenance(""); + value = JSON.toJSONString(odsLocaleDocument); + } else { + value = getFieldValueByFieldName(field, odsLocaleDocument); + } return CommonResult.success(value); } @@ -100,7 +109,7 @@ Field field = object.getClass().getDeclaredField(fieldName); //璁剧疆瀵硅薄鐨勮闂潈闄愶紝淇濊瘉瀵筽rivate鐨勫睘鎬х殑璁块棶 field.setAccessible(true); - return (String)field.get(object); + return (String) field.get(object); } catch (Exception e) { return null; } diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java b/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java index 0a3bd26..6dab4e5 100644 --- a/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java +++ b/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java @@ -498,7 +498,7 @@ String listLocaleJson = "{\"Param\":{\"id\":\"" + locale.getId() + "\"}}"; String listLocale = HttpUtil.HttpPostWithJson(host + "/admin/listLocale", listLocaleJson, auth); - String detectorDailyJson = "{\"LocaleId\":\"" + locale.getId() + "\",\"AcquitAtBegin\":" + dates[1] + ",\"AcquitAtEnd\":" + (dates[1] + 86400) + "}"; + String detectorDailyJson = "{\"LocaleId\":\"" + locale.getId() + "\",\"AcquitAtBegin\":" + (dates[1]- 7*86400) + ",\"AcquitAtEnd\":" + dates[1] + "}"; String detectorDaily = HttpUtil.HttpPostWithJson(host + "/admin/queryDataDetectorDaily", detectorDailyJson, auth); String listIntimeDataJson = "{\"StartAt\":0,\"Size\":20,\"mn\":\"" + locale.getMnLast() + "\",\"typ\":2,\"at\":0}"; -- Gitblit v1.8.0