From 3470b33466cfd9ce423a46220ff81f734fae9fb7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 11:32:34 +0800
Subject: [PATCH] 预警分析管理-主属性和配置属性
---
src/main/java/com/whyc/service/BattRealdataIdService.java | 47 -----------------------------------------------
1 files changed, 0 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattRealdataIdService.java b/src/main/java/com/whyc/service/BattRealdataIdService.java
index 5c057de..86e1c17 100644
--- a/src/main/java/com/whyc/service/BattRealdataIdService.java
+++ b/src/main/java/com/whyc/service/BattRealdataIdService.java
@@ -43,11 +43,6 @@
@Autowired
private BattInfService binfService;
- @Autowired
- private AlmAnalysisParamService almAnalysisParamService;
-
- @Autowired
- private AppParamService appParamService;
//鑾峰彇鐢垫睜缁勬渶杩戜竴瀛ｅ害鐨勫崟浣撴暟鎹�
@@ -225,47 +220,5 @@
latch.await(10, TimeUnit.MINUTES);
List dataListSorted = dataList.stream().sorted(Comparator.comparing(RealDateDTO::getRecordTime)).collect(Collectors.toList());
return new Response().set(1, dataListSorted);
- }
- //鐢垫睜鍛婅鐐瑰嚮鍏蜂綋鍛婅淇℃伅鏌ョ湅浠庡憡璀﹀紑濮嬫椂闂村埌鐜板湪鐨勫巻鍙插疄鏃舵暟鎹�
- public Response getBattHisRealInAlm(Integer battgroupId, String startTime, Integer almId,Integer intervalTime) throws ParseException, InterruptedException {
- //鑾峰彇鍛婅almId瀵瑰簲鐨勫垎鏋愰厤缃睘鎬у��
- AlmAnalysisParam almAnalysisParam= almAnalysisParamService.getAnalysisParam(almId);
- List<RealDateDTO> dataList = new LinkedList<>();
- Integer cycleTime=0;
- //鑾峰彇棰勮鍒嗘瀽鍛ㄦ湡闃堝��
- if(intervalTime==null){
- AppParam appParam = appParamService.getAlarmAnalysisCycle();
- cycleTime=appParam.getParamValue().intValue();
- }else{
- cycleTime=intervalTime;
- }
- Date cyscleDate=ActionUtil.getDateAdd(ThreadLocalUtil.parse(startTime,1),cycleTime*(-1));
- //鑾峰彇cyscleDate鍒扮幇鍦ㄦ墍鏈夌殑鍘嗗彶瀹炴椂鏁版嵁
- List<List<Date>> monthTimeList = DateUtil.getMonthTime(cyscleDate,new Date());
- ThreadPoolExecutor pool = ThreadPoolExecutorFactory.getPoolExecutor();
- CountDownLatch latch = new CountDownLatch(monthTimeList.size());
- for (int i = 0; i < monthTimeList.size(); i++) {
- int finalI = i;
- pool.execute(() -> {
- int finalII = finalI;
- BattRealdataId realdata = new BattRealdataId();
- realdata.setRecordTime(monthTimeList.get(finalII).get(0));
- realdata.setRecordTime1(monthTimeList.get(finalII).get(1));
- String table = battgroupId + "_" + ThreadLocalUtil.format(realdata.getRecordTime(),2);
- realdata.setTableName(table);//琛ㄥ悕鏃堕棿鏍煎紡閮ㄥ垎
- //鍒ゆ柇琛ㄦ槸鍚﹀瓨鍦�
- int tableNum = subTablePageInfoService.judgeTable_realdata(table);
- List<RealDateDTO> list = new ArrayList();
- if (tableNum > 0) {
- list = subTablePageInfoService.getBattHisRealInAlm(realdata);
- }
- dataList.addAll(list);
- latch.countDown();
- });
- sleep(200);
- }
- latch.await(10, TimeUnit.MINUTES);
- List dataListSorted = dataList.stream().sorted(Comparator.comparing(RealDateDTO::getRecordTime)).collect(Collectors.toList());
- return new Response().setIII(1,true, dataListSorted,almAnalysisParam,"鐢垫睜鍛婅鐐瑰嚮鍏蜂綋鍛婅淇℃伅鏌ョ湅浠庡憡璀﹀紑濮嬫椂闂村埌鐜板湪鐨勫巻鍙插疄鏃舵暟鎹�");
}
}
\ No newline at end of file
--
Gitblit v1.9.1