设备监控-实时运行头数据

ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRuningInfoVo.java

@@ -4,40 +4,10 @@ import java.math.BigDecimal;
 import java.util.List;
 
 /**
- * 单站监控-设备监控-实时运行数据
+ * 单站监控-设备监控-实时运行曲线数据
  *
  */
 public class SiteMonitorRuningInfoVo {
-    /**
-     * 实时有功功率
-     */
-    private BigDecimal totalActivePower;
-
-    /**
-     * 实时无功功率
-     */
-    private BigDecimal totalReactivePower;
-
-    /**
-     * 电池簇SOC
-     */
-    private BigDecimal soc;
-
-    /**
-     * 电池堆SOH
-     */
-    private BigDecimal soh;
-
-    /**
-     * 今日充电量
-     */
-    private BigDecimal dayChargedCap;
-
-    /**
-     * 今日放电量
-     */
-    private BigDecimal dayDisChargedCap;
-
     /**
      * 储能功率list
      */
@@ -58,54 +28,6 @@ public class SiteMonitorRuningInfoVo {
      */
     private List<BatteryAveTempVo> batteryAveTempList;
 
-    public BigDecimal getTotalActivePower() {
-        return totalActivePower;
-    }
-
-    public void setTotalActivePower(BigDecimal totalActivePower) {
-        this.totalActivePower = totalActivePower;
-    }
-
-    public BigDecimal getTotalReactivePower() {
-        return totalReactivePower;
-    }
-
-    public void setTotalReactivePower(BigDecimal totalReactivePower) {
-        this.totalReactivePower = totalReactivePower;
-    }
-
-    public BigDecimal getSoc() {
-        return soc;
-    }
-
-    public void setSoc(BigDecimal soc) {
-        this.soc = soc;
-    }
-
-    public BigDecimal getSoh() {
-        return soh;
-    }
-
-    public void setSoh(BigDecimal soh) {
-        this.soh = soh;
-    }
-
-    public BigDecimal getDayChargedCap() {
-        return dayChargedCap;
-    }
-
-    public void setDayChargedCap(BigDecimal dayChargedCap) {
-        this.dayChargedCap = dayChargedCap;
-    }
-
-    public BigDecimal getDayDisChargedCap() {
-        return dayDisChargedCap;
-    }
-
-    public void setDayDisChargedCap(BigDecimal dayDisChargedCap) {
-        this.dayDisChargedCap = dayDisChargedCap;
-    }
-
     public List<EnergyStoragePowVo> getEnergyStoragePowList() {
         return energyStoragePowList;
     }

ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java

@@ -0,0 +1,69 @@
+package com.xzzn.ems.mapper;
+
+import java.util.List;
+import com.xzzn.ems.domain.EmsBatteryData;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 单体电池实时数据Mapper接口
+ *
+ * @author xzzn
+ * @date 2025-06-19
+ */
+public interface EmsBatteryDataMapper
+{
+    /**
+     * 查询单体电池实时数据
+     *
+     * @param id 单体电池实时数据主键
+     * @return 单体电池实时数据
+     */
+    public EmsBatteryData selectEmsBatteryDataById(Long id);
+
+    /**
+     * 查询单体电池实时数据列表
+     *
+     * @param emsBatteryData 单体电池实时数据
+     * @return 单体电池实时数据集合
+     */
+    public List<EmsBatteryData> selectEmsBatteryDataList(EmsBatteryData emsBatteryData);
+
+    /**
+     * 新增单体电池实时数据
+     *
+     * @param emsBatteryData 单体电池实时数据
+     * @return 结果
+     */
+    public int insertEmsBatteryData(EmsBatteryData emsBatteryData);
+
+    /**
+     * 修改单体电池实时数据
+     *
+     * @param emsBatteryData 单体电池实时数据
+     * @return 结果
+     */
+    public int updateEmsBatteryData(EmsBatteryData emsBatteryData);
+
+    /**
+     * 删除单体电池实时数据
+     *
+     * @param id 单体电池实时数据主键
+     * @return 结果
+     */
+    public int deleteEmsBatteryDataById(Long id);
+
+    /**
+     * 批量删除单体电池实时数据
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsBatteryDataByIds(Long[] ids);
+
+    /**
+     * 根据siteId查询站点电池实时数据
+     * @param siteId
+     * @return
+     */
+    public EmsBatteryData getBatteryDataBySiteId(Long siteId);
+}

ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsDataMapper.java

@@ -2,8 +2,11 @@ package com.xzzn.ems.mapper;
 
 import java.math.BigDecimal;
 import java.util.List;
+
+import com.xzzn.ems.domain.EmsBatteryData;
 import com.xzzn.ems.domain.EmsPcsData;
 import com.xzzn.ems.domain.vo.SiteMonitorDataVo;
+import com.xzzn.ems.domain.vo.SiteMonitorRuningHeadInfoVo;
 
 /**
  * PCS数据Mapper接口
@@ -74,4 +77,11 @@ public interface EmsPcsDataMapper
      * @return
      */
     public BigDecimal getGridNrtPower(Long siteId);
+
+    /**
+     * 根据站点获取设备监控的实时运行头信息
+     * @param siteId
+     * @return
+     */
+    public SiteMonitorRuningHeadInfoVo getSiteRunningHeadInfo(Long siteId);
 }

ems-system/src/main/java/com/xzzn/ems/service/ISingleSiteService.java

@@ -1,7 +1,7 @@
 package com.xzzn.ems.service;
 
 import com.xzzn.ems.domain.vo.SiteMonitorHomeVo;
-import com.xzzn.ems.domain.vo.SiteMonitorRuningInfoVo;
+import com.xzzn.ems.domain.vo.SiteMonitorRuningHeadInfoVo;
 
 /**
  * 单点监控 服务层
@@ -13,5 +13,5 @@ public interface ISingleSiteService
     public SiteMonitorHomeVo getSiteMonitorDataVo(Long siteId);
 
 
-    public SiteMonitorRuningInfoVo getSiteRuningInfo(Long siteId);
+    public SiteMonitorRuningHeadInfoVo getSiteRuningHeadInfo(Long siteId);
 }

ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java

@@ -1,12 +1,10 @@
 package com.xzzn.ems.service.impl;
 
-import com.xzzn.common.utils.DateUtils;
 import com.xzzn.common.utils.StringUtils;
-import com.xzzn.ems.domain.vo.SiteMonitorDataVo;
-import com.xzzn.ems.domain.vo.SiteMonitorHomeAlarmVo;
-import com.xzzn.ems.domain.vo.SiteMonitorHomeVo;
-import com.xzzn.ems.domain.vo.SiteMonitorRuningInfoVo;
+import com.xzzn.ems.domain.EmsBatteryData;
+import com.xzzn.ems.domain.vo.*;
 import com.xzzn.ems.mapper.EmsAlarmRecordsMapper;
+import com.xzzn.ems.mapper.EmsBatteryDataMapper;
 import com.xzzn.ems.mapper.EmsPcsDataMapper;
 import com.xzzn.ems.service.ISingleSiteService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +12,6 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,6 +24,8 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
     private EmsPcsDataMapper emsPcsDataMapper;
     @Autowired
     private EmsAlarmRecordsMapper emsAlarmRecordsMapper;
+    @Autowired
+    private EmsBatteryDataMapper emsBatteryDataMapper;
 
     @Override
     public SiteMonitorHomeVo getSiteMonitorDataVo(Long siteId) {
@@ -88,8 +87,22 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
     }
 
     @Override
-    public SiteMonitorRuningInfoVo getSiteRuningInfo(Long siteId) {
-        return null;
+    public SiteMonitorRuningHeadInfoVo getSiteRuningHeadInfo(Long siteId) {
+        SiteMonitorRuningHeadInfoVo siteMonitorRuningHeadInfoVo = new SiteMonitorRuningHeadInfoVo();
+
+        if (siteId != null) {
+            // 实时有功功率/实时无功功率/今日充电量/今日放电量
+            siteMonitorRuningHeadInfoVo = emsPcsDataMapper.getSiteRunningHeadInfo(siteId);
+            // 电池簇SOC
+            // 电池堆SOH
+            EmsBatteryData emsBatteryData = emsBatteryDataMapper.getBatteryDataBySiteId(siteId);
+            if (emsBatteryData != null) {
+                siteMonitorRuningHeadInfoVo.setSoc(emsBatteryData.getSoc());
+                siteMonitorRuningHeadInfoVo.setSoh(emsBatteryData.getSoh());
+            }
+        }
+
+        return siteMonitorRuningHeadInfoVo;
     }
 
 }