From 298e75c24c0f790f8f1af0fae40e5783b4590953 Mon Sep 17 00:00:00 2001 From: whycxzp <perryhsu@163.com> Date: 星期五, 14 十月 2022 10:10:06 +0800 Subject: [PATCH] 更新 --- src/main/java/com/whyc/controller/BattGroupDataController.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/whyc/controller/BattGroupDataController.java b/src/main/java/com/whyc/controller/BattGroupDataController.java index 47ff13b..953e8f8 100644 --- a/src/main/java/com/whyc/controller/BattGroupDataController.java +++ b/src/main/java/com/whyc/controller/BattGroupDataController.java @@ -1,5 +1,6 @@ package com.whyc.controller; +import com.whyc.dto.BattGroupStationInfoWithFileParam; import com.whyc.dto.Response; import com.whyc.pojo.BattgroupData; import com.whyc.service.BattGroupDataService; @@ -25,9 +26,10 @@ @ApiOperation("鍗曟暟鎹垎鏋�-鍗曚綋鏁版嵁鍒楄〃") @GetMapping("list") public Response getListWithTestTime(@RequestParam String fileId){ - List<BattgroupData> monList = service.getListWithTestTime(fileId); - Map<String,String> map = service.getStandardDeviation(monList); - return new Response().setII(1,monList,map,null); + //List<BattgroupData> monList = service.getListWithTestTime(fileId); + BattGroupStationInfoWithFileParam info = service.getListWithTestTime(fileId); + Map<String,String> map = service.getStandardDeviation(info.getDataList()); + return new Response().setII(1,info,map,null); } @ApiOperation(value = "瀵规瘮鍒嗘瀽-涓ょ粍鏁版嵁鍒楄〃",notes = "data:绗竴琛岀殑鍩虹鏁版嵁,data2:绗簩琛岀殑鍩虹鏁版嵁," + -- Gitblit v1.9.1