From 02ccfc21d5d4f767bbd92ecda89cdfcc3283728c Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 11 六月 2025 08:38:26 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem into master

---
 src/main/java/com/whyc/mapper/PowerInfMapper.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/whyc/mapper/PowerInfMapper.java b/src/main/java/com/whyc/mapper/PowerInfMapper.java
index 16111b5..d4a31dc 100644
--- a/src/main/java/com/whyc/mapper/PowerInfMapper.java
+++ b/src/main/java/com/whyc/mapper/PowerInfMapper.java
@@ -1,6 +1,7 @@
 package com.whyc.mapper;
 
 import com.whyc.dto.PowerDto;
+import com.whyc.dto.Statistic.StationStic;
 import com.whyc.pojo.db_station.PowerInf;
 import com.whyc.pojo.db_station.StationInf;
 import org.apache.ibatis.annotations.Param;
@@ -21,4 +22,8 @@
     List<String> getPowerModelByUid(Integer uid);
     //鑾峰彇鐢垫簮鍗忚(涓嬫媺)
     List<String> getProtocolByUid(Integer uid);
+    //鐢垫簮淇℃伅缁熻
+    List<PowerInf> getPowerStatistic(@Param("stic") StationStic stic);
+    //鏌ヨ鏈烘埧鎵�鍦ㄧ殑鐝粍
+    String getGroupName(Integer powerId);
 }
\ No newline at end of file

--
Gitblit v1.9.1