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/PwrdevAlarmService.java | 51 +++++++++------------------------------------------
1 files changed, 9 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/whyc/service/PwrdevAlarmService.java b/src/main/java/com/whyc/service/PwrdevAlarmService.java
index 94aed4f..d3c5674 100644
--- a/src/main/java/com/whyc/service/PwrdevAlarmService.java
+++ b/src/main/java/com/whyc/service/PwrdevAlarmService.java
@@ -48,6 +48,8 @@
private AlmAnalysisParamService almAnalysisParamService;
@Autowired
private SubTablePageInfoService subTablePageInfoService;
+ @Autowired
+ private BattInfService battInfService;
//鑾峰彇鐢垫簮瀹炴椂鍛婅淇℃伅
public Response getPwrAlmReal(AlmDto almDto) {
PageHelper.startPage(almDto.getPageNum(),almDto.getPageSize());
@@ -109,49 +111,14 @@
public Response getPwrtAlmAnalyse(AlmAnalyseDto dto) {
PageHelper .startPage(dto.getPageNum(),dto.getPageSize());
List<PwrdevAlarm> list=mapper.getPwrtAlmAnalyse(dto);
+ for (PwrdevAlarm pwrAlm:list) {
+ pwrAlm.setAlmName(PowerAlarmEnum.getValue(pwrAlm.getAlmId()));
+ //鏌ヨ鐢垫簮涓嬫墍鏈夌殑鐢垫睜缁刬d
+ List<Integer> battgroupIdList = battInfService.getBattgroupIdList(pwrAlm.getPowerId());
+ pwrAlm.setBattgroupIdList(battgroupIdList);
+ }
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list!=null,pageInfo,"鐢垫簮鍛婅鍒嗘瀽");
}
- //棰勮鍒嗘瀽绠＄悊-鐢垫簮涓诲睘鎬у拰鍒嗘瀽灞炴��
- public Response getPwrHisRealInAlm(Integer powerId, String startTime, Integer almId,Integer intervalTime) throws ParseException, InterruptedException {
- //鑾峰彇鍛婅almId瀵瑰簲鐨勫垎鏋愰厤缃睘鎬у��
- AlmAnalysisParam almAnalysisParam= almAnalysisParamService.getAnalysisParam(almId);
- List<PwrdevHistorydataId> 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;
- PwrdevHistorydataId pwrHis = new PwrdevHistorydataId();
- pwrHis.setRecordDatetime(monthTimeList.get(finalII).get(0));
- pwrHis.setRecordDatetime1(monthTimeList.get(finalII).get(1));
- String table = powerId + "_" + ThreadLocalUtil.format(pwrHis.getRecordDatetime(),2);
- pwrHis.setTableName(table);//琛ㄥ悕鏃堕棿鏍煎紡閮ㄥ垎
- //鍒ゆ柇琛ㄦ槸鍚﹀瓨鍦�
- int tableNum = subTablePageInfoService.judgeTable_pwrhis(table);
- List<PwrdevHistorydataId> list = new ArrayList();
- if (tableNum > 0) {
- list = subTablePageInfoService.getPwrHisRealInAlm(pwrHis);
- }
- dataList.addAll(list);
- latch.countDown();
- });
- sleep(200);
- }
- latch.await(10, TimeUnit.MINUTES);
- List dataListSorted = dataList.stream().sorted(Comparator.comparing(PwrdevHistorydataId::getRecordDatetime)).collect(Collectors.toList());
- return new Response().setIII(1,true, dataListSorted,almAnalysisParam,"棰勮鍒嗘瀽绠＄悊-鐢垫簮涓诲睘鎬у拰鍒嗘瀽灞炴��");
- }
+
}
\ No newline at end of file
--
Gitblit v1.9.1