From b46f7fa6d77852ae9e28a062da234a2ddf9405fb Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 31 三月 2025 16:09:51 +0800
Subject: [PATCH] 2025-3-22定制修改导出去掉容量和连接条

---
 src/main/java/com/whyc/controller/BattGroupDataController.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/whyc/controller/BattGroupDataController.java b/src/main/java/com/whyc/controller/BattGroupDataController.java
index 47ff13b..8d02d7e 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,13 +26,14 @@
     @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:绗簩琛岀殑鍩虹鏁版嵁," +
-            "data3:key-value閿�煎,鍏朵腑resChangeRate:鍐呴樆鍙樺寲鐜�,volChangeRate:鐢靛帇鍙樺寲鐜�,resBalanceRate:鍐呴樆鍧囦竴鎬�,volBalanceRate:鐢靛帇鍧囦竴鎬�")
+            "data3:key-value閿�煎,鍏朵腑resChangeRate:鍐呴樆鍙樺寲鐜�,volChangeRate:鐢靛帇鍙樺寲鐜�,resBalanceRate:鍐呴樆鍧囦竴鎬�,volBalanceRate:鐢靛帇鍧囦竴鎬�,fileParamBase:鍙傝�冩枃浠剁殑鍙傛暟")
     @GetMapping("comparedList")
     public Response getComparedList(@RequestParam String baseFileId,@RequestParam String fileId){
         return service.getComparedList(baseFileId,fileId);

--
Gitblit v1.9.1