zhanghua
2023-11-13 a801e1102929fef6a6464f35a5894d718a01cdc6
一点一档
2个文件已修改
13 ■■■■ 已修改文件
ycl-platform/src/main/java/com/ycl/controller/smoke/OdsStatisticsController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
    }
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}";