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/BattInfService.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattInfService.java b/src/main/java/com/whyc/service/BattInfService.java
index 7a44a74..3aa72bf 100644
--- a/src/main/java/com/whyc/service/BattInfService.java
+++ b/src/main/java/com/whyc/service/BattInfService.java
@@ -4,15 +4,13 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import com.whyc.constant.Capperformance;
-import com.whyc.constant.PowerAlarmEnum;
+import com.whyc.constant.BattCapperformanceEnum;
import com.whyc.dto.BattDto;
import com.whyc.dto.InfoDto;
+import com.whyc.dto.Param.ParamAlmDto;
import com.whyc.dto.Real.QuarterDto;
import com.whyc.dto.Response;
-import com.whyc.dto.Statistic.BattCompareStic;
-import com.whyc.dto.Statistic.MonStic;
-import com.whyc.dto.Statistic.StationStic;
+import com.whyc.dto.Statistic.*;
import com.whyc.factory.InfoFactory;
import com.whyc.mapper.BattInfMapper;
import com.whyc.mapper.PowerInfMapper;
@@ -204,6 +202,9 @@
}
if(sinf.getLatitude()!=null){
wrapper1.set("latitude",sinf.getLatitude());
+ }
+ if(sinf.getNodeStation()!=null){
+ wrapper1.set("node_station",sinf.getNodeStation());
}
wrapper1.eq("station_id",sinf.getStationId());
@@ -442,21 +443,59 @@
public List<BattInf> getMonStatistic(MonStic stic) {
return mapper.getMonStatistic(stic);
}
- //钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰
+ //钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰15
public List<BattInf> getBattCompare15Statistic(BattCompareStic stic) {
return mapper.getBattCompare15Statistic(stic);
}
//鑾峰彇瀹归噺鎬ц兘(涓嬫媺)
public Response getCapperformance() {
- Map<Integer,String> map= Capperformance.getOpInfo();
+ Map<Integer,String> map= BattCapperformanceEnum.getOpInfo();
return new Response().setII(1,true,map,"鑾峰彇瀹归噺鎬ц兘(涓嬫媺)");
}
- //钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰
+ //钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰16
public List<BattInf> getBattCompare16Statistic(BattCompareStic stic) {
return mapper.getBattCompare16Statistic(stic);
}
- //钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰
+ //钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰17
public List<BattInf> getBattCompare17Statistic(BattCompareStic stic) {
return mapper.getBattCompare17Statistic(stic);
}
+ //鏈勾搴﹀凡鏀剧數鏁伴噺缁熻(1.2.5)
+ public List<BattInf> getDischr5Statistic(DisChargeStic stic) {
+ return mapper.getDischr5Statistic(stic);
+ }
+ //鏈勾搴﹀凡鏀剧數鏁伴噺缁熻(1.2.6)
+ public List<BattInf> getDischr6Statistic(DisChargeStic stic) {
+ return mapper.getDischr6Statistic(stic);
+ }
+ //鐢垫睜缁勭數姹犳�ц兘缁熻锛堟湭鏀剧數锛屼紭绉�锛屽姡鍖栵紝鎹熷潖锛夌粺璁�(1.2.8/9/10)
+ public List<BattInf> getPerformanceStatistic(PerformanceStic stic) {
+ return mapper.getPerformanceStatistic(stic);
+ }
+ //鏈勾搴﹀凡/鏈斁鐢垫暟閲忕粺璁″彸渚у浘琛�(1.2.5)
+ public List<BattInf> getDischrChart(Integer uid) {
+ return mapper.getDischrChart(uid);
+ }
+
+ public List<BattInf> getListByUserId(Integer userId) {
+ return mapper.getListByUserId(userId);
+ }
+
+ public List<BattInf> getListByCondition(Integer userId, BattInf battInf) {
+ return mapper.getListByCondition(userId, battInf);
+ }
+
+ //鑾峰彇绔欑偣涓嬬殑鐢垫睜缁�(涓嬫媺)
+ public Response getBattByUid(Integer uid, String provice, String city, String country, String stationName) {
+ List<BattInf> list=mapper.getBattByUid(uid,provice,city,country,stationName);
+ return new Response().setII(1,list.size()>0,list,"鑾峰彇绔欑偣涓嬬殑鐢垫睜缁�(涓嬫媺)");
+ }
+ //鏍规嵁鏌ヨ鏉′欢鑾峰彇鐢垫睜缁�
+ public BattInf getBattgroupIdInf(Integer battgroupId) {
+ return mapper.getBattgroupIdInf(battgroupId);
+ }
+ //鏌ヨ鐢垫簮涓嬫墍鏈夌殑鐢垫睜缁刬d
+ public List<Integer> getBattgroupIdList(Integer powerId) {
+ return mapper.getBattgroupIdList(powerId);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1