From 2753ad7aee272a5a5a8a0124b1feea5a1e4cc83e Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 22:40:52 +0800
Subject: [PATCH] 电源告警参数返回
---
src/main/java/com/whyc/service/PwrdevAlarmService.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/PwrdevAlarmService.java b/src/main/java/com/whyc/service/PwrdevAlarmService.java
index 2c6c0e8..d3c5674 100644
--- a/src/main/java/com/whyc/service/PwrdevAlarmService.java
+++ b/src/main/java/com/whyc/service/PwrdevAlarmService.java
@@ -10,26 +10,46 @@
import com.whyc.dto.AlarmDto;
import com.whyc.dto.Param.AlmAnalyseDto;
import com.whyc.dto.Real.AlmDto;
+import com.whyc.dto.Real.RealDateDTO;
import com.whyc.dto.Response;
+import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.PwrdevAlarmMapper;
import com.whyc.pojo.db_alarm.DevalarmData;
+import com.whyc.pojo.db_data_history.BattRealdataId;
+import com.whyc.pojo.db_data_history.PwrdevHistorydataId;
+import com.whyc.pojo.db_param.AlmAnalysisParam;
+import com.whyc.pojo.db_param.AppParam;
import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarm;
import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarmParam;
import com.whyc.pojo.web_site.AlarmInspection;
import com.whyc.util.ActionUtil;
+import com.whyc.util.DateUtil;
+import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+
+import static java.lang.Thread.sleep;
@Service
public class PwrdevAlarmService {
@Autowired(required = false)
private PwrdevAlarmMapper mapper;
+ @Autowired
+ private AppParamService appParamService;
+ @Autowired
+ private AlmAnalysisParamService almAnalysisParamService;
+ @Autowired
+ private SubTablePageInfoService subTablePageInfoService;
+ @Autowired
+ private BattInfService battInfService;
//鑾峰彇鐢垫簮瀹炴椂鍛婅淇℃伅
public Response getPwrAlmReal(AlmDto almDto) {
PageHelper.startPage(almDto.getPageNum(),almDto.getPageSize());
@@ -91,7 +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,"鐢垫簮鍛婅鍒嗘瀽");
}
+
}
\ No newline at end of file
--
Gitblit v1.9.1