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 | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattGroupDataController.java b/src/main/java/com/whyc/controller/BattGroupDataController.java
index 2a985a1..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;
@@ -11,8 +12,8 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
@Api(tags = "鐢垫睜缁勬暟鎹�")
@RestController
@@ -24,15 +25,18 @@
@ApiOperation("鍗曟暟鎹垎鏋�-鍗曚綋鏁版嵁鍒楄〃")
@GetMapping("list")
- public Response getList(@RequestParam int battGroupId){
- List<BattgroupData> monList = service.getListWithTestTime(battGroupId);
- return new Response().set(1,monList);
+ public Response getListWithTestTime(@RequestParam String fileId){
+ //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("瀵规瘮鍒嗘瀽-涓ょ粍鏁版嵁鍒楄〃")
- @GetMapping("compareList")
- public Response getComparedList(@RequestParam int baseBattGroupId,@RequestParam int battGroupId){
- return service.getComparedList(baseBattGroupId,battGroupId);
+ @ApiOperation(value = "瀵规瘮鍒嗘瀽-涓ょ粍鏁版嵁鍒楄〃",notes = "data:绗竴琛岀殑鍩虹鏁版嵁,data2:绗簩琛岀殑鍩虹鏁版嵁," +
+ "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