From 8e1b0e5b023876e0543ae26a270761de405d0d62 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 14:45:57 +0800
Subject: [PATCH] 历史实时数据右侧修改
---
src/main/java/com/whyc/service/BattRealdataIdService.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattRealdataIdService.java b/src/main/java/com/whyc/service/BattRealdataIdService.java
index 86e1c17..cfa95d3 100644
--- a/src/main/java/com/whyc/service/BattRealdataIdService.java
+++ b/src/main/java/com/whyc/service/BattRealdataIdService.java
@@ -11,6 +11,8 @@
import com.whyc.pojo.db_data_history.BattRealdataId;
import com.whyc.pojo.db_param.AlmAnalysisParam;
import com.whyc.pojo.db_param.AppParam;
+import com.whyc.pojo.db_ram_db.BattRtstate;
+import com.whyc.pojo.db_station.BattInf;
import com.whyc.util.ActionUtil;
import com.whyc.util.DateUtil;
import com.whyc.util.ThreadLocalUtil;
@@ -42,6 +44,9 @@
@Autowired
private BattInfService binfService;
+
+ @Autowired(required = false)
+ private BattRtstateService rtstateService;
@@ -185,6 +190,16 @@
}
//鍘嗗彶瀹炴椂鏁版嵁
public Response getBattRealDataHis(Integer battgroupId, Integer granularity,String startTime,String endTime) throws ParseException, InterruptedException {
+ Map<String,Object> map=new HashMap<>();
+ //瀹炴椂鑾峰彇鐢垫睜缁勪俊鎭�
+ BattRtstate battRtstate = rtstateService.getBattRealInfo(battgroupId);
+ //鑾峰彇鐢垫睜缁勪俊鎭�
+ BattInf binf = binfService.getBinfByBattgroupId(battgroupId);
+ map.put("鏍囩О瀹归噺",binf.getMoncapstd());
+ map.put("钃勭數姹犳暟閲�",binf.getMoncount());
+ map.put("鏍囩О鐢靛帇",binf.getMonvolstd());
+ map.put("娴厖鐢靛帇",battRtstate.getGroupVol());
+
List<RealDateDTO> dataList = new LinkedList<>();
List<List<Date>> monthTimeList = DateUtil.getMonthTime(ThreadLocalUtil.parse(startTime,1), ThreadLocalUtil.parse(endTime,1));
ThreadPoolExecutor pool = ThreadPoolExecutorFactory.getPoolExecutor();
@@ -219,6 +234,6 @@
}
latch.await(10, TimeUnit.MINUTES);
List dataListSorted = dataList.stream().sorted(Comparator.comparing(RealDateDTO::getRecordTime)).collect(Collectors.toList());
- return new Response().set(1, dataListSorted);
+ return new Response().setIII(1, dataListSorted!=null,dataListSorted,map,"鍘嗗彶瀹炴椂鏌ヨ");
}
}
\ No newline at end of file
--
Gitblit v1.9.1