From d8475b8670b6b4cbcd1bc9e57d30a6f433d206ab Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期一, 23 六月 2025 23:33:54 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem
---
src/main/java/com/whyc/controller/AnalysisAlmController.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/controller/AnalysisAlmController.java b/src/main/java/com/whyc/controller/AnalysisAlmController.java
index 3b06e08..4bba89c 100644
--- a/src/main/java/com/whyc/controller/AnalysisAlmController.java
+++ b/src/main/java/com/whyc/controller/AnalysisAlmController.java
@@ -1,12 +1,14 @@
package com.whyc.controller;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.whyc.constant.BattSingalIdEnum;
import com.whyc.dto.AnalysisAlm.AnalysisChangeRes;
import com.whyc.dto.Param.AlmAnalyseDto;
import com.whyc.dto.Response;
-import com.whyc.service.AlmAnalysisParamService;
-import com.whyc.service.BattRealdataIdService;
-import com.whyc.service.BattalarmDataService;
-import com.whyc.service.PwrdevAlarmService;
+import com.whyc.pojo.db_alarm.BattalarmData;
+import com.whyc.pojo.db_param.AppParam;
+import com.whyc.service.*;
import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -14,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
+import java.util.List;
@RequestMapping("analysis")
@RestController
@@ -27,12 +30,27 @@
@Autowired
private AlmAnalysisParamService almAnalysisParamService;
+
+ @Autowired
+ private DevalarmDataService devalarmDataService;
+
+ @Autowired
+ private AppParamService appParamService;
+
@PostMapping("getBattAlmAnalyse")
@ApiOperation("棰勮鍒嗘瀽绠＄悊-鐢垫睜鍛婅")
public Response getBattAlmAnalyse(@RequestBody AlmAnalyseDto dto){
Integer uid= ActionUtil.getUser().getId();
dto.setUid(uid);
return battalarmDataService.getBattAlmAnalyse(dto);
+ }
+
+ @PostMapping("getDevAlmAnalyse")
+ @ApiOperation("棰勮鍒嗘瀽绠＄悊-璁惧鍛婅")
+ public Response getDevAlmAnalyse(@RequestBody AlmAnalyseDto dto){
+ Integer uid= ActionUtil.getUser().getId();
+ dto.setUid(uid);
+ return devalarmDataService.getDevAlmAnalyse(dto);
}
@PostMapping("getPwrtAlmAnalyse")
@@ -61,4 +79,16 @@
return almAnalysisParamService.getAlmSummaryParam();
}
+ @GetMapping("updateAlarmAnalysisCycle")
+ @ApiOperation("棰勮鍒嗘瀽绠＄悊-璁剧疆鏃堕棿闂撮殧")
+ public Response updateAlarmAnalysisCycle(@RequestParam Integer intervalTime){
+ return appParamService.updateAlarmAnalysisCycle(intervalTime);
+ }
+
+ @GetMapping("getAlarmAnalysisCycle")
+ @ApiOperation("棰勮鍒嗘瀽绠＄悊-鏌ヨ鏃堕棿闂撮殧")
+ public Response getAlarmAnalysisCycle(){
+ AppParam appParam= appParamService.getAlarmAnalysisCycle();
+ return new Response().setII(1,appParam!=null,appParam,"鏌ヨ鏃堕棿闂撮殧");
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1