From 49148428d71415ad2b5449cb6ea2e83f1fbb6c18 Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期二, 21 一月 2025 15:12:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java index 13e4146..6e1afbd 100644 --- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java @@ -9,6 +9,7 @@ import com.iailab.module.data.api.dto.IndexQueryDTO; import com.iailab.module.data.api.dto.echarts.BarLineDTO; import com.iailab.module.data.api.dto.echarts.SeriesItem; +import com.iailab.module.data.api.ind.IndItemApi; import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO; import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO; import com.iailab.module.data.api.plan.PlanItemApi; @@ -66,6 +67,9 @@ @Autowired private PlanItemApi planItemApi; + + @Autowired + private IndItemApi indItemApi; @Autowired private IndItemCollector indItemCollector; @@ -303,28 +307,15 @@ @PermitAll @GetMapping("/query-ind/default-value") @Operation(summary = "查询指标默认值") - public CommonResult<List<ApiIndItemValueDTO>> queryIndItemDefaultValue(HttpServletResponse response, HttpServletRequest - request,@RequestParam String itemNo) throws Exception { - apiSecurityUtils.validate(request); - List<IndItemValueVO> list = indItemCollector.queryValue(itemNo); - List<ApiIndItemValueDTO> dtoList = new ArrayList<>(); - list.forEach(item -> { - if (item != null) { - ApiIndItemValueDTO dto = new ApiIndItemValueDTO(); - dto.setDataTime(item.getDataTime()); - dto.setDataValue(item.getDataValue().doubleValue()); - dtoList.add(dto); - } - }); - return success(dtoList); + public CommonResult<List<ApiIndItemValueDTO>> queryIndItemDefaultValue(@RequestParam String itemNo) { + return success(indItemApi.queryIndItemDefaultValue(itemNo)); } @PermitAll @PostMapping("/query-ind/history-value") @Operation(summary = "查询指标历史值") public CommonResult<List<ApiIndItemValueDTO>> queryIndItemHistoryValue(@RequestBody ApiIndItemQueryDTO dto) { - List<IndItemValueVO> list = indItemCollector.queryValue(dto.getItemNo(), dto.getStart(), dto.getEnd()); - return success(ConvertUtils.sourceToTarget(list, ApiIndItemValueDTO.class)); + return success(indItemApi.queryIndItemHistoryValue(dto)); } @PermitAll -- Gitblit v1.9.3