From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期三, 16 十月 2024 17:51:32 +0800 Subject: [PATCH] 合并代码 --- ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileMapper.java | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileMapper.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileMapper.java index 9ab3a93..5f7f9c5 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileMapper.java +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileMapper.java @@ -4,6 +4,9 @@ import com.ruoyi.chargingPile.api.dto.PageChargingPileListDTO; import com.ruoyi.chargingPile.api.model.TChargingPile; import com.ruoyi.chargingPile.api.query.PageChargingPileList; +import com.ruoyi.chargingPile.api.vo.TChargingPileVO; +import com.ruoyi.chargingPile.dto.ChargingGunMonitoring; +import com.ruoyi.chargingPile.dto.GetChargingGunMonitoring; import com.ruoyi.common.core.web.page.PageInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -36,5 +39,23 @@ * @param id * @return */ - TChargingPile getChargingPile(Integer id); + TChargingPile getChargingPile(@Param("id") Integer id); + + /** + * 获取站点下充电桩及充电枪列表 + * @param siteId + * @return + */ + List<TChargingPileVO> getChargingGunList(@Param("siteId")Integer siteId); + + + /** + * 获取充电枪监控数据 + * @param pageInfo + * @param siteIds + * @param query + * @return + */ + List<ChargingGunMonitoring> getChargingGunMonitoring(PageInfo<ChargingGunMonitoring> pageInfo, @Param("siteIds") Set<Integer> siteIds, + @Param("query") GetChargingGunMonitoring query); } -- Gitblit v1.7.1