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/service/PowerInfService.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/whyc/service/PowerInfService.java b/src/main/java/com/whyc/service/PowerInfService.java
index 321d3ff..90e1e71 100644
--- a/src/main/java/com/whyc/service/PowerInfService.java
+++ b/src/main/java/com/whyc/service/PowerInfService.java
@@ -6,10 +6,12 @@
 import com.github.pagehelper.PageInfo;
 import com.whyc.dto.PowerDto;
 import com.whyc.dto.Response;
+import com.whyc.dto.Statistic.StationStic;
 import com.whyc.mapper.BaojigroupPowerMapper;
 import com.whyc.mapper.BaojigroupUsrMapper;
 import com.whyc.mapper.PowerInfMapper;
 import com.whyc.mapper.StationInfMapper;
+import com.whyc.pojo.db_station.BattInf;
 import com.whyc.pojo.db_station.PowerInf;
 import com.whyc.pojo.db_station.StationInf;
 import com.whyc.pojo.db_user.BaojigroupPower;
@@ -131,4 +133,19 @@
         List<String> list=mapper.getProtocolByUid(uid);
         return new Response().setII(1,list.size()>0,list,"鑾峰彇鐢垫簮鍗忚(涓嬫媺)");
     }
+    //鑾峰彇鐢垫簮淇℃伅
+    public PowerInf getPowerInfById(Integer powerId) {
+        QueryWrapper wrapper=new QueryWrapper();
+        wrapper.eq("power_id",powerId);
+        wrapper.last("limit 1");
+        PowerInf pinf=mapper.selectOne(wrapper);
+        return pinf;
+    }
+    //鐢垫簮淇℃伅缁熻
+    public Response getPowerStatistic(StationStic stic) {
+        PageHelper.startPage(stic.getPageNum(),stic.getPageSize());
+        List<PowerInf> list=mapper.getPowerStatistic(stic);
+        PageInfo<PowerInf> pageInfo=new PageInfo<>(list);
+        return new Response().setII(1,list.size()>0,pageInfo,"鐢垫簮淇℃伅缁熻");
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.1