电表类别-枚举

# Conflicts:
#	ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java
#	ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml

ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsAlarmRecordsController.java

@@ -0,0 +1,37 @@
+package com.xzzn.web.controller.ems;
+
+import com.xzzn.common.core.controller.BaseController;
+import com.xzzn.common.core.page.TableDataInfo;
+import com.xzzn.ems.domain.vo.AlarmRecordListRequestVo;
+import com.xzzn.ems.domain.vo.AlarmRecordListResponseVo;
+import com.xzzn.ems.service.IEmsAlarmRecordsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 单站监控-故障告警
+ * 
+ * @author xzzn
+ */
+@RestController
+@RequestMapping("/ems/siteAlarm")
+public class EmsAlarmRecordsController extends BaseController
+{
+
+    @Autowired
+    private IEmsAlarmRecordsService iEmsAlarmRecordsService;
+
+    /**
+     * 获取告警详情列表
+     */
+    @GetMapping("/getAlarmDetailList")
+    public TableDataInfo getAlarmDetailList(AlarmRecordListRequestVo requestVo)
+    {
+        startPage();
+        List<AlarmRecordListResponseVo> list = iEmsAlarmRecordsService.getAlarmRecordDetailList(requestVo);
+        return getDataTable(list);
+    }
+
+}

ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsHomePageController.java

@@ -36,7 +36,7 @@ public class EmsHomePageController extends BaseController{
     @GetMapping("/dataList")
     public AjaxResult list()
     {
-        return success(homePageService.getSiteTotalInfo());
+        return success(homePageService.getHomePageDataList());
     }
 
     /**

ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java

@@ -0,0 +1,64 @@
+package com.xzzn.web.controller.ems;
+
+import com.xzzn.common.core.controller.BaseController;
+import com.xzzn.common.core.domain.AjaxResult;
+import com.xzzn.common.core.page.TableDataInfo;
+import com.xzzn.ems.domain.EmsDevicesSetting;
+import com.xzzn.ems.domain.EmsSiteSetting;
+import com.xzzn.ems.domain.vo.SiteDeviceListVo;
+import com.xzzn.ems.service.IEmsDeviceSettingService;
+import com.xzzn.ems.service.IEmsSiteService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ *
+ * 站点配置
+ *
+ */
+@RestController
+@RequestMapping("/ems/siteConfig")
+public class EmsSiteConfigController extends BaseController{
+
+    @Autowired
+    private IEmsSiteService iEmsSiteService;
+
+    @Autowired
+    private IEmsDeviceSettingService iEmsDeviceSettingService;
+
+    /**
+     * 获取站点列表
+     */
+    @GetMapping("/getSiteInfoList")
+    public TableDataInfo getSiteInfoList(@RequestParam String siteName, @RequestParam String startTime, @RequestParam String endTime)
+    {
+        startPage();
+        List<EmsSiteSetting> list = iEmsSiteService.getAllSiteInfoList(siteName,startTime,endTime);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取设备列表
+     */
+    @GetMapping("/getDeviceInfoList")
+    public TableDataInfo getDeviceInfoList(@RequestParam String siteId)
+    {
+        startPage();
+        List<SiteDeviceListVo> list = iEmsSiteService.getAllDeviceList(siteId);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取设备详细信息
+     */
+    @GetMapping("/getDeviceDetailInfo")
+    public AjaxResult getDeviceDetailInfo(@RequestParam String deviceId)
+    {
+        return success(iEmsDeviceSettingService.getDeviceDetailInfo(deviceId));
+    }
+}

ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMapController.java

@@ -26,7 +26,7 @@ public class EmsSiteMapController extends BaseController{
      * 获取某个站点基本信息
      */
     @GetMapping("/getSingleSiteBaseInfo")
-    public AjaxResult getSingleSiteBaseInfo(@RequestParam Long siteId)
+    public AjaxResult getSingleSiteBaseInfo(@RequestParam String siteId)
     {
         return success(homePageService.getSingleSiteBaseInfo(siteId));
     }

ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java

@@ -2,10 +2,15 @@ package com.xzzn.web.controller.ems;
 
 import com.xzzn.common.core.controller.BaseController;
 import com.xzzn.common.core.domain.AjaxResult;
+import com.xzzn.common.core.page.TableDataInfo;
+import com.xzzn.ems.domain.vo.BatteryDataStatsListVo;
+import com.xzzn.ems.service.IEmsSiteService;
 import com.xzzn.ems.service.ISingleSiteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  *
  *  单站监控
@@ -17,13 +22,107 @@ public class EmsSiteMonitorController extends BaseController{
 
     @Autowired
     private ISingleSiteService iSingleSiteService;
+    @Autowired
+    private IEmsSiteService iEmsSiteService;
 
     /**
      * 获取单站首页数据
      */
     @GetMapping("/homeView")
-    public AjaxResult getSingleSiteViewInfo(@RequestParam Long siteId)
+    public AjaxResult getSingleSiteViewInfo(@RequestParam String siteId)
     {
         return success(iSingleSiteService.getSiteMonitorDataVo(siteId));
     }
+
+    /**
+     * 单站监控-设备监控-实时运行头部数据
+     */
+    @GetMapping("/runningHeadInfo")
+    public AjaxResult getRunningHeadInfo(@RequestParam String siteId)
+    {
+        return success(iSingleSiteService.getSiteRunningHeadInfo(siteId));
+    }
+
+    /**
+     * 单站监控-设备监控-实时运行曲线图数据
+     */
+    @GetMapping("/runningGraph")
+    public AjaxResult getRunningGraph(@RequestParam String siteId)
+    {
+        return success(iSingleSiteService.getRunningGraph(siteId));
+    }
+
+    /**
+     * 单站监控-设备监控-PCS
+     */
+    @GetMapping("/getPcsDetailInfo")
+    public AjaxResult getPcsDetailInfo(@RequestParam String siteId)
+    {
+        return success(iSingleSiteService.getPcsDetailInfo(siteId));
+    }
+
+    /**
+     * 单站监控-设备监控-BMS总览
+     */
+    @GetMapping("/getBMSOverView")
+    public AjaxResult getBMSOverView(@RequestParam String siteId)
+    {
+        return success(iSingleSiteService.getBMSOverView(siteId));
+    }
+
+    /**
+     * 单站监控-设备监控-BMS电池簇
+     */
+    @GetMapping("/getBMSBatteryCluster")
+    public AjaxResult getBMSBatteryCluster(@RequestParam String siteId)
+    {
+        return success(iSingleSiteService.getBMSBatteryCluster(siteId));
+    }
+
+    /**
+     * 获取所有电池堆
+     */
+    @GetMapping("/getStackNameList")
+    public AjaxResult getStackNameList(@RequestParam String siteId)
+    {
+        return success(iEmsSiteService.getAllStackInfo(siteId));
+    }
+
+    /**
+     * 获取所有电池簇
+     */
+    @GetMapping("/getClusterNameList")
+    public AjaxResult getClusterNameList(@RequestParam String stackDeviceId)
+    {
+        return success(iEmsSiteService.getAllClusterInfo(stackDeviceId));
+    }
+
+    /**
+     * 液冷设备参数
+     */
+    @GetMapping("/getCoolingDataList")
+    public AjaxResult getCoolingDataList(@RequestParam String siteId)
+    {
+        return success(iSingleSiteService.getCoolingDataList(siteId));
+    }
+
+    /**
+     * 获取电池簇下面的单体电池数据
+     */
+    @GetMapping("/getClusterDataInfoList")
+    public TableDataInfo getClusterDataInfoList(@RequestParam String clusterDeviceId,@RequestParam String siteId)
+    {
+        startPage();
+        List<BatteryDataStatsListVo> list = iSingleSiteService.getClusterDataInfoList(clusterDeviceId,siteId);
+        return getDataTable2(list);
+    }
+
+    /**
+     * 电表数据
+     */
+    @GetMapping("/getAmmeterDataList")
+    public AjaxResult getAmmeterDataList(@RequestParam String siteId)
+    {
+        return success(iSingleSiteService.getAmmeterDataList(siteId));
+    }
 }

ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStatisticalReportController.java

@@ -0,0 +1,48 @@
+package com.xzzn.web.controller.ems;
+
+import com.xzzn.common.core.controller.BaseController;
+import com.xzzn.common.core.domain.AjaxResult;
+import com.xzzn.common.utils.StringUtils;
+import com.xzzn.ems.domain.vo.DateSearchRequest;
+import com.xzzn.ems.service.IEmsStatsReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 单站监控-统计报表
+ * 
+ * @author xzzn
+ */
+@RestController
+@RequestMapping("/ems/statsReport")
+public class EmsStatisticalReportController extends BaseController
+{
+
+    @Autowired
+    private IEmsStatsReportService ieEmsStatsReportService;
+
+    /**
+     * 概率统计-收益指标查询
+     */
+    @GetMapping("/getRevenueData")
+    public AjaxResult getRevenueData(DateSearchRequest requestVo)
+    {
+        return success(null);
+    }
+
+    /**
+     * 概率统计-电量指标查询
+     */
+    @GetMapping("/getElectricData")
+    public AjaxResult getElectricData(DateSearchRequest requestVo)
+    {
+        if (!StringUtils.isEmpty(requestVo.getSiteId())) {
+            return success(ieEmsStatsReportService.getElectricDataResult(requestVo));
+        } else {
+            return error("站点id必传");
+        }
+    }
+
+}

ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsTicketController.java

@@ -0,0 +1,105 @@
+package com.xzzn.web.controller.ems;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.xzzn.common.utils.poi.ExcelUtil;
+import com.xzzn.ems.domain.EmsTicket;
+import com.xzzn.ems.service.IEmsTicketService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.xzzn.common.annotation.Log;
+import com.xzzn.common.core.controller.BaseController;
+import com.xzzn.common.core.domain.AjaxResult;
+import com.xzzn.common.enums.BusinessType;
+import com.xzzn.common.core.page.TableDataInfo;
+
+/**
+ * 工单主Controller
+ * 
+ * @author xzzn
+ * @date 2025-06-26
+ */
+@RestController
+@RequestMapping("/ticket")
+public class EmsTicketController extends BaseController
+{
+    @Autowired
+    private IEmsTicketService emsTicketService;
+
+    /**
+     * 查询工单主列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:ticket:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(EmsTicket emsTicket)
+    {
+        startPage();
+        List<EmsTicket> list = emsTicketService.selectEmsTicketList(emsTicket);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出工单主列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:ticket:export')")
+    @Log(title = "工单主", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EmsTicket emsTicket)
+    {
+        List<EmsTicket> list = emsTicketService.selectEmsTicketList(emsTicket);
+        ExcelUtil<EmsTicket> util = new ExcelUtil<EmsTicket>(EmsTicket.class);
+        util.exportExcel(response, list, "工单主数据");
+    }
+
+    /**
+     * 获取工单主详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:ticket:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(emsTicketService.selectEmsTicketById(id));
+    }
+
+    /**
+     * 新增工单主
+     */
+    @PreAuthorize("@ss.hasPermi('system:ticket:add')")
+    @Log(title = "工单主", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EmsTicket emsTicket)
+    {
+        return toAjax(emsTicketService.insertEmsTicket(emsTicket));
+    }
+
+    /**
+     * 修改工单主
+     */
+    @PreAuthorize("@ss.hasPermi('system:ticket:edit')")
+    @Log(title = "工单主", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmsTicket emsTicket)
+    {
+        return toAjax(emsTicketService.updateEmsTicket(emsTicket));
+    }
+
+    /**
+     * 删除工单主
+     */
+    @PreAuthorize("@ss.hasPermi('system:ticket:remove')")
+    @Log(title = "工单主", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(emsTicketService.deleteEmsTicketByIds(ids));
+    }
+}

ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java

@@ -0,0 +1,121 @@
+package com.xzzn.web.controller.ems;
+
+import com.xzzn.ems.domain.EmsMqttMessage;
+import com.xzzn.ems.service.IEmsMqttMessageService;
+import com.xzzn.ems.service.IFXXDataProcessService;
+import com.xzzn.framework.manager.MqttLifecycleManager;
+import com.xzzn.framework.web.service.MqttPublisher;
+import com.xzzn.framework.web.service.MqttSubscriber;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.eclipse.paho.client.mqttv3.IMqttMessageListener;
+import org.eclipse.paho.client.mqttv3.MqttException;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+
+@Service
+public class MqttMessageController implements MqttPublisher, MqttSubscriber {
+
+
+    private static final Log log = LogFactory.getLog(MqttMessageController.class);
+
+
+    private final MqttLifecycleManager mqttLifecycleManager;
+
+    @Autowired
+    private IEmsMqttMessageService emsMqttMessageService;
+
+    @Autowired
+    private IFXXDataProcessService fXXDataProcessService;
+
+    @Autowired
+    public MqttMessageController(MqttLifecycleManager mqttLifecycleManager) {
+        this.mqttLifecycleManager = mqttLifecycleManager;
+    }
+
+    @PostConstruct
+    public void init() {
+        // 订阅系统状态主题
+        subscribe("021_FXX_01_UP", 1, this::handleDeviceData);
+        subscribe("021_FXX_01_RECALL", 1, this::handleDeviceData);
+        subscribe("021_FXX_01_DOWN", 1, this::handleDeviceData);
+        subscribe("021_FXX_01", 1, this::handleSystemStatus);
+
+    }
+
+    // 处理系统状态消息
+    private void handleSystemStatus(String topic, MqttMessage message) {
+        String payload = new String(message.getPayload());
+        System.out.println("[SYSTEM] Status update: " + payload);
+
+        try {
+            // 业务处理逻辑
+            EmsMqttMessage mqttMessage = new EmsMqttMessage();
+            mqttMessage.setMqttTopic(topic);
+            mqttMessage.setMqttMessage(payload);
+            mqttMessage.setCreateTime(new java.util.Date());
+            mqttMessage.setUpdateTime(new java.util.Date());
+            mqttMessage.setCreateBy("system");
+            mqttMessage.setUpdateBy("system");
+            emsMqttMessageService.insertEmsMqttMessage(mqttMessage);
+        } catch (Exception e) {
+            log.error("Failed to process system status message: " + e.getMessage(), e);
+        }
+    }
+
+    // 处理设备数据
+    private void handleDeviceData(String topic, MqttMessage message) {
+        String payload = new String(message.getPayload());
+        System.out.println("[DEVICE] data: " + payload);
+        try {
+            // 业务处理逻辑
+            fXXDataProcessService.handleFxData(payload);
+
+
+            EmsMqttMessage mqttMessage = new EmsMqttMessage();
+            mqttMessage.setMqttTopic(topic);
+            mqttMessage.setMqttMessage(payload);
+            mqttMessage.setCreateTime(new java.util.Date());
+            mqttMessage.setUpdateTime(new java.util.Date());
+            mqttMessage.setCreateBy("system");
+            mqttMessage.setUpdateBy("system");
+            emsMqttMessageService.insertEmsMqttMessage(mqttMessage);
+        } catch (Exception e) {
+            log.error("Failed to process system status message: " + e.getMessage(), e);
+        }
+
+    }
+
+    @Override
+    public void publish(String topic, String message) throws MqttException {
+        mqttLifecycleManager.publish(topic, message, 0);
+    }
+
+    @Override
+    public void publish(String topic, String message, int qos) throws MqttException {
+        mqttLifecycleManager.publish(topic, message, qos);
+    }
+
+    @Override
+    public void subscribe(String topic, int qos, IMqttMessageListener listener) {
+        mqttLifecycleManager.subscribe(topic, qos, listener);
+
+
+    }
+
+    // 发送设备控制命令
+    public void sendDeviceCommand(String deviceId, String command) {
+        try {
+            String topic = "devices/" + deviceId + "/commands";
+            publish(topic, command, 1);
+        } catch (MqttException e) {
+            System.err.println("Failed to send command to device " + deviceId);
+        }
+    }
+
+
+
+}

ems-admin/src/main/resources/application.yml

@@ -127,3 +127,12 @@ xss:
   excludes: /system/notice
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
+
+mqtt:
+  broker.url: tcp://122.51.194.184:1883
+  client.id: ems-cloud
+  username: dmbroker
+  password: qwer1234
+  connection-timeout: 15
+  keep-alive-interval: 30
+  automatic-reconnect: true

ems-common/src/main/java/com/xzzn/common/constant/RedisKeyConstants.java

@@ -0,0 +1,39 @@
+package com.xzzn.common.constant;
+
+/**
+ * 数据存储 Redis key 常量
+ * 
+ * @author xzzn
+ */
+public class RedisKeyConstants
+{
+    /**
+     * pcs数据 redis key
+     */
+    public static final String PCS = "PCS_";
+
+    /**
+     * pcs branch数据 redis key
+     */
+    public static final String BRANCH = "BRANCH_";
+
+    /**
+     * stack电池堆数据 redis key
+     */
+    public static final String STACK = "STACK_";
+
+    /**
+     * cluster电池簇数据 redis key
+     */
+    public static final String CLUSTER = "CLUSTER_";
+
+    /**
+     * battery单体电池数据 redis key
+     */
+    public static final String BATTERY = "BATTERY_";
+
+    /**
+     * 电表数据 redis key
+     */
+    public static final String AMMETER = "AMMETER_";
+}

ems-common/src/main/java/com/xzzn/common/core/controller/BaseController.java

@@ -1,6 +1,8 @@
 package com.xzzn.common.core.controller;
 
 import java.beans.PropertyEditorSupport;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import org.slf4j.Logger;
@@ -199,4 +201,35 @@ public class BaseController
     {
         return getLoginUser().getUsername();
     }
+
+    /**
+     * 手动处理分页
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    protected TableDataInfo getDataTable2(List<?> list)
+    {
+        List<?> subList = new ArrayList<>();
+        // 分页梳理
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        int pageNum = pageDomain.getPageNum();
+        int pageSize = pageDomain.getPageSize();
+        if (pageNum > 0 && pageSize > 0) {
+            // 计算分页起始和结束索引
+            int startIndex = (pageNum - 1) * pageSize;
+            int endIndex = Math.min(startIndex + pageSize, list.size());
+            // 防止越界
+            if (startIndex >= list.size()) {
+                subList =  Collections.emptyList();
+            }
+            // 截取当前页数据
+            subList =  list.subList(startIndex, endIndex);
+        }
+
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setMsg("查询成功");
+        rspData.setRows(subList);
+        rspData.setTotal(list.size());
+        return rspData;
+    }
 }

ems-common/src/main/java/com/xzzn/common/core/redis/RedisCache.java

@@ -265,4 +265,15 @@ public class RedisCache
     {
         return redisTemplate.keys(pattern);
     }
+
+    /**
+     * 删除list
+     *
+     * @param key Redis键
+     * @return 对象列表
+     */
+    public boolean deleteList(final String key)
+    {
+        return redisTemplate.delete(key);
+    }
 }

ems-common/src/main/java/com/xzzn/common/enums/AlarmLevelStatus.java

@@ -0,0 +1,30 @@
+package com.xzzn.common.enums;
+
+/**
+ * alarm-告警等级
+ * 
+ * @author xzzn
+ */
+public enum AlarmLevelStatus
+{
+    WARNING("A", "提示"), GENERAL("B", "一般"), SERIOUS("C", "严重"), EMERGENCY("D", "紧急");
+
+    private final String code;
+    private final String info;
+
+    AlarmLevelStatus(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ems-common/src/main/java/com/xzzn/common/enums/AlarmStatus.java

@@ -0,0 +1,30 @@
+package com.xzzn.common.enums;
+
+/**
+ * alarm-告警状态
+ * 
+ * @author xzzn
+ */
+public enum AlarmStatus
+{
+    WAITING("0", "待处理"), DONE("1", "已处理"),PROCESSING("2", "处理中");
+
+    private final String code;
+    private final String info;
+
+    AlarmStatus(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ems-common/src/main/java/com/xzzn/common/enums/AmmeterCategory.java

@@ -0,0 +1,34 @@
+package com.xzzn.common.enums;
+
+/**
+ * ammeter-电表数据类别
+ * 
+ * @author xzzn
+ */
+public enum AmmeterCategory
+{
+    CURRENT_COMB_ACTIVE("1", "当前组合有功电能"),
+    CURRENT_COMB_REACTIVE("2", "当前组合无功电能"),
+    A_POWER("3", "A相功率"),
+    B_POWER("4", "B相功率"),
+    C_POWER("5", "C相功率");
+
+    private final String code;
+    private final String info;
+
+    AmmeterCategory(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ems-common/src/main/java/com/xzzn/common/enums/BranchStatus.java

@@ -0,0 +1,30 @@
+package com.xzzn.common.enums;
+
+/**
+ * pcs-branch-支路状态
+ * 
+ * @author xzzn
+ */
+public enum BranchStatus
+{
+    STANDBY("0", "备用"), NORMAL("1", "正常"), SWITCHING("2", "切换中");
+
+    private final String code;
+    private final String info;
+
+    BranchStatus(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ems-common/src/main/java/com/xzzn/common/enums/ChargeStatus.java

@@ -0,0 +1,30 @@
+package com.xzzn.common.enums;
+
+/**
+ * 充电状态&放电状态
+ * 
+ * @author xzzn
+ */
+public enum ChargeStatus
+{
+    CHARGING("1", "充电"), STANDBY("2", "待机"), DISCHARGING("3", "放电");
+
+    private final String code;
+    private final String info;
+
+    ChargeStatus(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ems-common/src/main/java/com/xzzn/common/enums/CommunicationStatus.java

@@ -0,0 +1,30 @@
+package com.xzzn.common.enums;
+
+/**
+ * device-通信状态
+ * 
+ * @author xzzn
+ */
+public enum CommunicationStatus
+{
+    OK("0", "正常"), SUSPEND("1", "通信中断") ,EXCEPTION("1", "异常");
+
+    private final String code;
+    private final String info;
+
+    CommunicationStatus(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ems-common/src/main/java/com/xzzn/common/enums/ControlModeStatus.java

@@ -0,0 +1,30 @@
+package com.xzzn.common.enums;
+
+/**
+ * pcs-控制模式
+ * 
+ * @author xzzn
+ */
+public enum ControlModeStatus
+{
+    REMOTE("0", "远程"), LOCAL("1", "本地");
+
+    private final String code;
+    private final String info;
+
+    ControlModeStatus(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ems-common/src/main/java/com/xzzn/common/enums/DeviceCategory.java

@@ -0,0 +1,35 @@
+package com.xzzn.common.enums;
+
+/**
+ * device-设备类别
+ * 
+ * @author xzzn
+ */
+public enum DeviceCategory
+{
+    PCS("PCS", "PCS设备"),
+    BRANCH("BRANCH", "PCS分支设备"),
+    STACK("STACK", "电池堆"),
+    CLUSTER("CLUSTER", "电池簇"),
+    BATTERY("BATTERY", "单体电池"),
+    AMMETER("AMMETER", "电表");
+
+    private final String code;
+    private final String info;
+
+    DeviceCategory(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ems-common/src/main/java/com/xzzn/common/enums/DeviceStatus.java

@@ -0,0 +1,30 @@
+package com.xzzn.common.enums;
+
+/**
+ * pcs-设备状态
+ * 
+ * @author xzzn
+ */
+public enum DeviceStatus
+{
+    ONLINE("0", "在线"), OFFLINE("1", "离线"), UNDER_REPAIR("2", "维修中");
+
+    private final String code;
+    private final String info;
+
+    DeviceStatus(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ems-common/src/main/java/com/xzzn/common/enums/DeviceType.java

@@ -0,0 +1,20 @@
+package com.xzzn.common.enums;
+
+/**
+ * device-设备类型
+ *
+ * @author xzzn
+ */
+
+public enum DeviceType
+{
+    /**
+     * 网络设备
+     */
+    TCP,
+
+    /**
+     * 串口设备
+     */
+    RTU
+}

ems-common/src/main/java/com/xzzn/common/enums/GridStatus.java

@@ -0,0 +1,30 @@
+package com.xzzn.common.enums;
+
+/**
+ * pcs-并网状态
+ * 
+ * @author xzzn
+ */
+public enum GridStatus
+{
+    GRID("0", "并网"), NOTGRID("1", "未并网");
+
+    private final String code;
+    private final String info;
+
+    GridStatus(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ems-common/src/main/java/com/xzzn/common/enums/StrategyStatus.java

@@ -0,0 +1,30 @@
+package com.xzzn.common.enums;
+
+/**
+ * strategy-策略状态
+ * 
+ * @author xzzn
+ */
+public enum StrategyStatus
+{
+    NOT_ENABLED("0", "未启用"), RUNNING("1", "已运行"),SUSPENDED("2", "已暂停"), DISABLE("1", "禁用"),DELETE("2", "删除");
+
+    private final String code;
+    private final String info;
+
+    StrategyStatus(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ems-common/src/main/java/com/xzzn/common/enums/SwitchStatus.java

@@ -0,0 +1,30 @@
+package com.xzzn.common.enums;
+
+/**
+ * pcs-开关状态
+ * 
+ * @author xzzn
+ */
+public enum SwitchStatus
+{
+    CLOSED("0", "闭合"), DISCONNECT("1", "断开"), FAULT_DISCONNECT("2", "故障断开");
+
+    private final String code;
+    private final String info;
+
+    SwitchStatus(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ems-common/src/main/java/com/xzzn/common/enums/WorkStatus.java

@@ -0,0 +1,30 @@
+package com.xzzn.common.enums;
+
+/**
+ * pcs-工作状态
+ * 
+ * @author xzzn
+ */
+public enum WorkStatus
+{
+    NORMAL("0", "正常"), ABNORMAL("1", "异常"), STOP("2", "停止");
+
+    private final String code;
+    private final String info;
+
+    WorkStatus(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ems-common/src/main/java/com/xzzn/common/utils/DateUtils.java

@@ -8,6 +8,7 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.Calendar;
 import java.util.Date;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
@@ -188,4 +189,15 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
     }
+
+    public static Long getNowMonthLong() {
+        Calendar calendar = Calendar.getInstance();
+        long month = (long) calendar.get(Calendar.MONTH) + 1; // 月份从0开始，所以要加1
+        return month;
+    }
+    public static Long getNowDayLong() {
+        Calendar calendar = Calendar.getInstance();
+        long date = calendar.get(Calendar.DAY_OF_MONTH); // 月份从0开始，所以要加1
+        return date;
+    }
 }

ems-common/src/main/java/com/xzzn/common/utils/StringUtils.java

@@ -1,5 +1,6 @@
 package com.xzzn.common.utils;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -719,4 +720,35 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         }
         return sb.toString();
     }
+
+
+    public static BigDecimal getBigDecimal(Object s){
+        BigDecimal result;
+        try {
+            result = new BigDecimal(s.toString());
+        } catch (Exception e) {
+            return BigDecimal.ZERO;
+        }
+        return result;
+    }
+
+    public static Long getLong(Object s){
+        Long result;
+        try {
+            result =  Long.parseLong(s.toString());
+        } catch (Exception e) {
+            return Long.parseLong("0");
+        }
+        return result;
+    }
+
+    public static String getString(Object s){
+        String result;
+        try {
+            result = String.valueOf(s);
+        } catch (Exception e) {
+            return "0";
+        }
+        return result;
+    }
 }

ems-framework/pom.xml

@@ -46,7 +46,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
+        <dependency>
+            <groupId>org.eclipse.paho</groupId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+        </dependency>
         <!-- 获取系统信息 -->
         <dependency>
             <groupId>com.github.oshi</groupId>

ems-framework/src/main/java/com/xzzn/framework/config/MqttConfig.java

@@ -0,0 +1,31 @@
+package com.xzzn.framework.config;
+
+import com.xzzn.framework.config.properties.MqttProperties;
+import org.eclipse.paho.client.mqttv3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.Resource;
+
+@Configuration
+public class MqttConfig {
+    private static final Logger logger = LoggerFactory.getLogger(MqttConfig.class);
+
+    @Resource
+    private MqttProperties mqttProperties;
+    @Bean
+    public MqttConnectOptions mqttConnectOptions() {
+        MqttConnectOptions options = new MqttConnectOptions();
+        options.setServerURIs(new String[]{mqttProperties.getBrokerUrl()});
+        if (!mqttProperties.getUsername().isEmpty()) options.setUserName(mqttProperties.getUsername());
+        if (!mqttProperties.getPassword().isEmpty()) options.setPassword(mqttProperties.getPassword().toCharArray());
+        options.setConnectionTimeout(mqttProperties.getConnectionTimeout());
+        options.setKeepAliveInterval(mqttProperties.getKeepAliveInterval());
+        options.setAutomaticReconnect(mqttProperties.isAutomaticReconnect());
+        options.setCleanSession(true);
+        return options;
+    }
+
+}

ems-framework/src/main/java/com/xzzn/framework/config/properties/MqttProperties.java

@@ -0,0 +1,84 @@
+package com.xzzn.framework.config.properties;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MqttProperties {
+    @Value("${mqtt.broker.url}")
+    private String brokerUrl;
+
+    @Value("${mqtt.client.id:}")
+    private String clientId;
+
+    @Value("${mqtt.username:}")
+    private String username;
+
+    @Value("${mqtt.password:}")
+    private String password;
+
+    @Value("${mqtt.connection-timeout:10}")
+    private int connectionTimeout;
+
+    @Value("${mqtt.keep-alive-interval:60}")
+    private int keepAliveInterval;
+
+    @Value("${mqtt.automatic-reconnect:true}")
+    private boolean automaticReconnect;
+
+    public String getBrokerUrl() {
+        return brokerUrl;
+    }
+
+    public void setBrokerUrl(String brokerUrl) {
+        this.brokerUrl = brokerUrl;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public int getConnectionTimeout() {
+        return connectionTimeout;
+    }
+
+    public void setConnectionTimeout(int connectionTimeout) {
+        this.connectionTimeout = connectionTimeout;
+    }
+
+    public int getKeepAliveInterval() {
+        return keepAliveInterval;
+    }
+
+    public void setKeepAliveInterval(int keepAliveInterval) {
+        this.keepAliveInterval = keepAliveInterval;
+    }
+
+    public boolean isAutomaticReconnect() {
+        return automaticReconnect;
+    }
+
+    public void setAutomaticReconnect(boolean automaticReconnect) {
+        this.automaticReconnect = automaticReconnect;
+    }
+}

ems-framework/src/main/java/com/xzzn/framework/manager/MqttLifecycleManager.java

@@ -0,0 +1,155 @@
+package com.xzzn.framework.manager;
+
+import org.eclipse.paho.client.mqttv3.*;
+import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.context.SmartLifecycle;
+import org.springframework.stereotype.Component;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Component
+public class MqttLifecycleManager implements ApplicationRunner, SmartLifecycle, MqttCallback {
+
+    private final MqttConnectOptions connectOptions;
+    private MqttClient mqttClient;
+    private volatile boolean running = false;
+
+    // 存储订阅关系: topic -> (listener, qos)
+    private final ConcurrentHashMap<String, SubscriptionInfo> subscriptions = new ConcurrentHashMap<>();
+
+    @Autowired
+    public MqttLifecycleManager(MqttConnectOptions connectOptions) {
+        this.connectOptions = connectOptions;
+    }
+
+    // Spring Boot 启动完成后执行
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        start();
+    }
+
+    @Override
+    public void start() {
+        if (running) return;
+
+        try {
+            String clientId = connectOptions.getUserName() + "-" + System.currentTimeMillis();
+            mqttClient = new MqttClient(
+                    connectOptions.getServerURIs()[0],
+                    clientId,
+                    new MemoryPersistence()
+            );
+
+            mqttClient.setCallback(this);
+            mqttClient.connect(connectOptions);
+
+            // 重连后自动重新订阅
+            resubscribeAll();
+
+            running = true;
+            System.out.println("MQTT client connected to: " + connectOptions.getServerURIs()[0]);
+        } catch (MqttException e) {
+            System.err.println("MQTT connection failed: " + e.getMessage());
+            // 添加重试逻辑
+        }
+    }
+
+    @Override
+    public void stop() {
+        if (mqttClient != null && mqttClient.isConnected()) {
+            try {
+                mqttClient.disconnect();
+                mqttClient.close();
+            } catch (MqttException e) {
+                System.err.println("Error disconnecting MQTT client: " + e.getMessage());
+            }
+        }
+        running = false;
+    }
+
+    @Override
+    public boolean isRunning() {
+        return running;
+    }
+
+    // MQTT 回调方法
+    @Override
+    public void connectionLost(Throwable cause) {
+        System.err.println("MQTT connection lost: " + cause.getMessage());
+        running = false;
+        // 自动重连由 MqttConnectOptions 处理
+    }
+
+    @Override
+    public void messageArrived(String topic, MqttMessage message) throws Exception {
+        SubscriptionInfo info = subscriptions.get(topic);
+        if (info != null && info.getListener() != null) {
+            info.getListener().messageArrived(topic, message);
+        }
+    }
+
+    @Override
+    public void deliveryComplete(IMqttDeliveryToken token) {
+        // 消息发布完成处理
+    }
+
+    // 订阅方法
+    public void subscribe(String topic, int qos, IMqttMessageListener listener) {
+        try {
+            if (mqttClient != null && mqttClient.isConnected()) {
+                mqttClient.subscribe(topic, qos);
+            }
+            subscriptions.put(topic, new SubscriptionInfo(listener, qos));
+        } catch (MqttException e) {
+            System.err.println("Subscribe failed: " + e.getMessage());
+        }
+    }
+
+    // 发布方法
+    public void publish(String topic, String payload, int qos) throws MqttException {
+        if (mqttClient != null && mqttClient.isConnected()) {
+            MqttMessage message = new MqttMessage(payload.getBytes());
+            message.setQos(qos);
+            mqttClient.publish(topic, message);
+        } else {
+            throw new MqttException(MqttException.REASON_CODE_CLIENT_NOT_CONNECTED);
+        }
+    }
+
+    // 重新订阅所有主题
+    private void resubscribeAll() {
+        if (mqttClient == null || !mqttClient.isConnected()) return;
+
+        subscriptions.forEach((topic, info) -> {
+            try {
+                mqttClient.subscribe(topic, info.getQos());
+            } catch (MqttException e) {
+                System.err.println("Resubscribe failed for topic: " + topic);
+            }
+        });
+    }
+
+    // 订阅信息内部类
+    private static class SubscriptionInfo {
+        private final IMqttMessageListener listener;
+        private final int qos;
+
+        public SubscriptionInfo(IMqttMessageListener listener, int qos) {
+            this.listener = listener;
+            this.qos = qos;
+        }
+
+        public IMqttMessageListener getListener() {
+            return listener;
+        }
+
+        public int getQos() {
+            return qos;
+        }
+    }
+}

ems-framework/src/main/java/com/xzzn/framework/web/service/MqttPublisher.java

@@ -0,0 +1,8 @@
+package com.xzzn.framework.web.service;
+
+import org.eclipse.paho.client.mqttv3.MqttException;
+
+public interface MqttPublisher {
+    void publish(String topic, String message) throws MqttException;
+    void publish(String topic, String message, int qos) throws MqttException;
+}

ems-framework/src/main/java/com/xzzn/framework/web/service/MqttSubscriber.java

@@ -0,0 +1,7 @@
+package com.xzzn.framework.web.service;
+
+import org.eclipse.paho.client.mqttv3.IMqttMessageListener;
+
+public interface MqttSubscriber {
+    void subscribe(String topic, int qos, IMqttMessageListener listener);
+}

ems-system/src/main/java/com/xzzn/ems/domain/EmsAlarmRecords.java

@@ -11,7 +11,7 @@ import com.xzzn.common.annotation.Excel;
  * 告警记录对象 ems_alarm_records
  *
  * @author xzzn
- * @date 2025-06-17
+ * @date 2025-06-29
  */
 public class EmsAlarmRecords extends BaseEntity
 {
@@ -48,11 +48,11 @@ public class EmsAlarmRecords extends BaseEntity
 
     /** 站点id */
     @Excel(name = "站点id")
-    private Long siteId;
+    private String siteId;
 
     /** 设备唯一标识符 */
     @Excel(name = "设备唯一标识符")
-    private Long deviceId;
+    private String deviceId;
 
     /** 设备名称，用于标识设备 */
     @Excel(name = "设备名称，用于标识设备")
@@ -128,22 +128,22 @@ public class EmsAlarmRecords extends BaseEntity
         return status;
     }
 
-    public void setSiteId(Long siteId)
+    public void setSiteId(String siteId)
     {
         this.siteId = siteId;
     }
 
-    public Long getSiteId()
+    public String getSiteId()
     {
         return siteId;
     }
 
-    public void setDeviceId(Long deviceId)
+    public void setDeviceId(String deviceId)
     {
         this.deviceId = deviceId;
     }
 
-    public Long getDeviceId()
+    public String getDeviceId()
     {
         return deviceId;
     }

ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryCluster.java

@@ -0,0 +1,764 @@
+package com.xzzn.ems.domain;
+
+import java.math.BigDecimal;
+
+import com.xzzn.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.xzzn.common.annotation.Excel;
+
+/**
+ * 电池簇数据对象 ems_battery_cluster
+ *
+ * @author xzzn
+ * @date 2025-06-29
+ */
+public class EmsBatteryCluster extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long id;
+
+    /** 工作状态 */
+    @Excel(name = "工作状态")
+    private String workStatus;
+
+    /** 与PCS通信状态 */
+    @Excel(name = "与PCS通信状态")
+    private String pcsCommunicationStatus;
+
+    /** 与EMS通信状态 */
+    @Excel(name = "与EMS通信状态")
+    private String emsCommunicationStatus;
+
+    /** 簇电压 (V) */
+    @Excel(name = "簇电压 (V)")
+    private BigDecimal clusterVoltage;
+
+    /** 可充电量 (kWh) */
+    @Excel(name = "可充电量 (kWh)")
+    private BigDecimal chargeableCapacity;
+
+    /** 累计充电量 (kWh) */
+    @Excel(name = "累计充电量 (kWh)")
+    private BigDecimal totalChargedCapacity;
+
+    /** 簇电流 (A) */
+    @Excel(name = "簇电流 (A)")
+    private BigDecimal clusterCurrent;
+
+    /** 可放电量 (kWh) */
+    @Excel(name = "可放电量 (kWh)")
+    private BigDecimal dischargeableCapacity;
+
+    /** 累计放电量 (kWh) */
+    @Excel(name = "累计放电量 (kWh)")
+    private BigDecimal totalDischargedCapacity;
+
+    /** SOH (%) */
+    @Excel(name = "SOH (%)")
+    private BigDecimal soh;
+
+    /** 平均温度 (℃) */
+    @Excel(name = "平均温度 (℃)")
+    private BigDecimal averageTemperature;
+
+    /** 绝缘电阻 (Ω) */
+    @Excel(name = "绝缘电阻 (Ω)")
+    private BigDecimal insulationResistance;
+
+    /** 当前SOC (%) */
+    @Excel(name = "当前SOC (%)")
+    private BigDecimal currentSoc;
+
+    /** 站点id */
+    @Excel(name = "站点id")
+    private String siteId;
+
+    /** 设备唯一标识符 */
+    @Excel(name = "设备唯一标识符")
+    private String deviceId;
+
+    /** 堆设备id */
+    @Excel(name = "堆设备id")
+    private String stackDeviceId;
+
+    /** 允许充电最大功率 */
+    @Excel(name = "允许充电最大功率")
+    private BigDecimal maxAllowedChargePower;
+
+    /** 允许放电最大功率 */
+    @Excel(name = "允许放电最大功率")
+    private BigDecimal maxAllowedDischargePower;
+
+    /** 允许充电最大电压 */
+    @Excel(name = "允许充电最大电压")
+    private BigDecimal maxAllowedChargeVoltage;
+
+    /** 允许放电最大电压 */
+    @Excel(name = "允许放电最大电压")
+    private BigDecimal maxAllowedDischargeVoltage;
+
+    /** 允许充电最大电流 */
+    @Excel(name = "允许充电最大电流")
+    private BigDecimal maxAllowedChargeCurrent;
+
+    /** 允许放电最大电流 */
+    @Excel(name = "允许放电最大电流")
+    private BigDecimal maxAllowedDischargeCurrent;
+
+    /** 组电压 */
+    @Excel(name = "组电压")
+    private BigDecimal batteryPackVoltage;
+
+    /** 组电流 */
+    @Excel(name = "组电流")
+    private BigDecimal batteryPackCurrent;
+
+    /** 模块温度 */
+    @Excel(name = "模块温度")
+    private BigDecimal batteryPackTemp;
+
+    /** 组SOC */
+    @Excel(name = "组SOC")
+    private BigDecimal batteryPackSoc;
+
+    /** 组SOH */
+    @Excel(name = "组SOH")
+    private BigDecimal batteryPackSoh;
+
+    /** 组绝缘电阻 */
+    @Excel(name = "组绝缘电阻")
+    private BigDecimal batteryPackInsulationResistance;
+
+    /** 平均单体电压 */
+    @Excel(name = "平均单体电压")
+    private BigDecimal avgCellVoltage;
+
+    /** 平均单体温度 */
+    @Excel(name = "平均单体温度")
+    private BigDecimal avgCellTemp;
+
+    /** 最高单体电压 */
+    @Excel(name = "最高单体电压")
+    private BigDecimal maxCellVoltage;
+
+    /** 最高单体电压对应点号 */
+    @Excel(name = "最高单体电压对应点号")
+    private Long maxCellVoltageId;
+
+    /** 最低单体电压 */
+    @Excel(name = "最低单体电压")
+    private BigDecimal minCellVoltage;
+
+    /** 最低单体电压对应点号 */
+    @Excel(name = "最低单体电压对应点号")
+    private Long minCellVoltageId;
+
+    /** 最高单体温度 */
+    @Excel(name = "最高单体温度")
+    private BigDecimal maxCellTemp;
+
+    /** 最高单体温度对应点号 */
+    @Excel(name = "最高单体温度对应点号")
+    private Long maxCellTempId;
+
+    /** 最低单体温度 */
+    @Excel(name = "最低单体温度")
+    private BigDecimal minCellTemp;
+
+    /** 最低单体温度对应点号 */
+    @Excel(name = "最低单体温度对应点号")
+    private Long minCellTempId;
+
+    /** 最高单体SOC */
+    @Excel(name = "最高单体SOC")
+    private BigDecimal maxCellSoc;
+
+    /** 最高单体SOC对应点号 */
+    @Excel(name = "最高单体SOC对应点号")
+    private Long maxCellSocId;
+
+    /** 最低单体SOC */
+    @Excel(name = "最低单体SOC")
+    private BigDecimal minCellSoc;
+
+    /** 最低单体SOC对应点号 */
+    @Excel(name = "最低单体SOC对应点号")
+    private Long minCellSocId;
+
+    /** 最高单体SOH */
+    @Excel(name = "最高单体SOH")
+    private BigDecimal maxCellSoh;
+
+    /** 最高单体SOH对应点号 */
+    @Excel(name = "最高单体SOH对应点号")
+    private Long maxCellSohId;
+
+    /** 最低单体SOH */
+    @Excel(name = "最低单体SOH")
+    private BigDecimal minCellSoh;
+
+    /** 最低单体SOH对应点号 */
+    @Excel(name = "最低单体SOH对应点号")
+    private Long minCellSohId;
+
+    /** 单次累计充电电量 */
+    @Excel(name = "单次累计充电电量")
+    private BigDecimal totalChargeEnergy;
+
+    /** 单次累计放电电量 */
+    @Excel(name = "单次累计放电电量")
+    private BigDecimal totalDischargeEnergy;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setWorkStatus(String workStatus)
+    {
+        this.workStatus = workStatus;
+    }
+
+    public String getWorkStatus()
+    {
+        return workStatus;
+    }
+
+    public void setPcsCommunicationStatus(String pcsCommunicationStatus)
+    {
+        this.pcsCommunicationStatus = pcsCommunicationStatus;
+    }
+
+    public String getPcsCommunicationStatus()
+    {
+        return pcsCommunicationStatus;
+    }
+
+    public void setEmsCommunicationStatus(String emsCommunicationStatus)
+    {
+        this.emsCommunicationStatus = emsCommunicationStatus;
+    }
+
+    public String getEmsCommunicationStatus()
+    {
+        return emsCommunicationStatus;
+    }
+
+    public void setClusterVoltage(BigDecimal clusterVoltage)
+    {
+        this.clusterVoltage = clusterVoltage;
+    }
+
+    public BigDecimal getClusterVoltage()
+    {
+        return clusterVoltage;
+    }
+
+    public void setChargeableCapacity(BigDecimal chargeableCapacity)
+    {
+        this.chargeableCapacity = chargeableCapacity;
+    }
+
+    public BigDecimal getChargeableCapacity()
+    {
+        return chargeableCapacity;
+    }
+
+    public void setTotalChargedCapacity(BigDecimal totalChargedCapacity)
+    {
+        this.totalChargedCapacity = totalChargedCapacity;
+    }
+
+    public BigDecimal getTotalChargedCapacity()
+    {
+        return totalChargedCapacity;
+    }
+
+    public void setClusterCurrent(BigDecimal clusterCurrent)
+    {
+        this.clusterCurrent = clusterCurrent;
+    }
+
+    public BigDecimal getClusterCurrent()
+    {
+        return clusterCurrent;
+    }
+
+    public void setDischargeableCapacity(BigDecimal dischargeableCapacity)
+    {
+        this.dischargeableCapacity = dischargeableCapacity;
+    }
+
+    public BigDecimal getDischargeableCapacity()
+    {
+        return dischargeableCapacity;
+    }
+
+    public void setTotalDischargedCapacity(BigDecimal totalDischargedCapacity)
+    {
+        this.totalDischargedCapacity = totalDischargedCapacity;
+    }
+
+    public BigDecimal getTotalDischargedCapacity()
+    {
+        return totalDischargedCapacity;
+    }
+
+    public void setSoh(BigDecimal soh)
+    {
+        this.soh = soh;
+    }
+
+    public BigDecimal getSoh()
+    {
+        return soh;
+    }
+
+    public void setAverageTemperature(BigDecimal averageTemperature)
+    {
+        this.averageTemperature = averageTemperature;
+    }
+
+    public BigDecimal getAverageTemperature()
+    {
+        return averageTemperature;
+    }
+
+    public void setInsulationResistance(BigDecimal insulationResistance)
+    {
+        this.insulationResistance = insulationResistance;
+    }
+
+    public BigDecimal getInsulationResistance()
+    {
+        return insulationResistance;
+    }
+
+    public void setCurrentSoc(BigDecimal currentSoc)
+    {
+        this.currentSoc = currentSoc;
+    }
+
+    public BigDecimal getCurrentSoc()
+    {
+        return currentSoc;
+    }
+
+    public void setSiteId(String siteId)
+    {
+        this.siteId = siteId;
+    }
+
+    public String getSiteId()
+    {
+        return siteId;
+    }
+
+    public void setDeviceId(String deviceId)
+    {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceId()
+    {
+        return deviceId;
+    }
+
+    public void setStackDeviceId(String stackDeviceId)
+    {
+        this.stackDeviceId = stackDeviceId;
+    }
+
+    public String getStackDeviceId()
+    {
+        return stackDeviceId;
+    }
+
+    public void setMaxAllowedChargePower(BigDecimal maxAllowedChargePower)
+    {
+        this.maxAllowedChargePower = maxAllowedChargePower;
+    }
+
+    public BigDecimal getMaxAllowedChargePower()
+    {
+        return maxAllowedChargePower;
+    }
+
+    public void setMaxAllowedDischargePower(BigDecimal maxAllowedDischargePower)
+    {
+        this.maxAllowedDischargePower = maxAllowedDischargePower;
+    }
+
+    public BigDecimal getMaxAllowedDischargePower()
+    {
+        return maxAllowedDischargePower;
+    }
+
+    public void setMaxAllowedChargeVoltage(BigDecimal maxAllowedChargeVoltage)
+    {
+        this.maxAllowedChargeVoltage = maxAllowedChargeVoltage;
+    }
+
+    public BigDecimal getMaxAllowedChargeVoltage()
+    {
+        return maxAllowedChargeVoltage;
+    }
+
+    public void setMaxAllowedDischargeVoltage(BigDecimal maxAllowedDischargeVoltage)
+    {
+        this.maxAllowedDischargeVoltage = maxAllowedDischargeVoltage;
+    }
+
+    public BigDecimal getMaxAllowedDischargeVoltage()
+    {
+        return maxAllowedDischargeVoltage;
+    }
+
+    public void setMaxAllowedChargeCurrent(BigDecimal maxAllowedChargeCurrent)
+    {
+        this.maxAllowedChargeCurrent = maxAllowedChargeCurrent;
+    }
+
+    public BigDecimal getMaxAllowedChargeCurrent()
+    {
+        return maxAllowedChargeCurrent;
+    }
+
+    public void setMaxAllowedDischargeCurrent(BigDecimal maxAllowedDischargeCurrent)
+    {
+        this.maxAllowedDischargeCurrent = maxAllowedDischargeCurrent;
+    }
+
+    public BigDecimal getMaxAllowedDischargeCurrent()
+    {
+        return maxAllowedDischargeCurrent;
+    }
+
+    public void setBatteryPackVoltage(BigDecimal batteryPackVoltage)
+    {
+        this.batteryPackVoltage = batteryPackVoltage;
+    }
+
+    public BigDecimal getBatteryPackVoltage()
+    {
+        return batteryPackVoltage;
+    }
+
+    public void setBatteryPackCurrent(BigDecimal batteryPackCurrent)
+    {
+        this.batteryPackCurrent = batteryPackCurrent;
+    }
+
+    public BigDecimal getBatteryPackCurrent()
+    {
+        return batteryPackCurrent;
+    }
+
+    public void setBatteryPackTemp(BigDecimal batteryPackTemp)
+    {
+        this.batteryPackTemp = batteryPackTemp;
+    }
+
+    public BigDecimal getBatteryPackTemp()
+    {
+        return batteryPackTemp;
+    }
+
+    public void setBatteryPackSoc(BigDecimal batteryPackSoc)
+    {
+        this.batteryPackSoc = batteryPackSoc;
+    }
+
+    public BigDecimal getBatteryPackSoc()
+    {
+        return batteryPackSoc;
+    }
+
+    public void setBatteryPackSoh(BigDecimal batteryPackSoh)
+    {
+        this.batteryPackSoh = batteryPackSoh;
+    }
+
+    public BigDecimal getBatteryPackSoh()
+    {
+        return batteryPackSoh;
+    }
+
+    public void setBatteryPackInsulationResistance(BigDecimal batteryPackInsulationResistance)
+    {
+        this.batteryPackInsulationResistance = batteryPackInsulationResistance;
+    }
+
+    public BigDecimal getBatteryPackInsulationResistance()
+    {
+        return batteryPackInsulationResistance;
+    }
+
+    public void setAvgCellVoltage(BigDecimal avgCellVoltage)
+    {
+        this.avgCellVoltage = avgCellVoltage;
+    }
+
+    public BigDecimal getAvgCellVoltage()
+    {
+        return avgCellVoltage;
+    }
+
+    public void setAvgCellTemp(BigDecimal avgCellTemp)
+    {
+        this.avgCellTemp = avgCellTemp;
+    }
+
+    public BigDecimal getAvgCellTemp()
+    {
+        return avgCellTemp;
+    }
+
+    public void setMaxCellVoltage(BigDecimal maxCellVoltage)
+    {
+        this.maxCellVoltage = maxCellVoltage;
+    }
+
+    public BigDecimal getMaxCellVoltage()
+    {
+        return maxCellVoltage;
+    }
+
+    public void setMaxCellVoltageId(Long maxCellVoltageId)
+    {
+        this.maxCellVoltageId = maxCellVoltageId;
+    }
+
+    public Long getMaxCellVoltageId()
+    {
+        return maxCellVoltageId;
+    }
+
+    public void setMinCellVoltage(BigDecimal minCellVoltage)
+    {
+        this.minCellVoltage = minCellVoltage;
+    }
+
+    public BigDecimal getMinCellVoltage()
+    {
+        return minCellVoltage;
+    }
+
+    public void setMinCellVoltageId(Long minCellVoltageId)
+    {
+        this.minCellVoltageId = minCellVoltageId;
+    }
+
+    public Long getMinCellVoltageId()
+    {
+        return minCellVoltageId;
+    }
+
+    public void setMaxCellTemp(BigDecimal maxCellTemp)
+    {
+        this.maxCellTemp = maxCellTemp;
+    }
+
+    public BigDecimal getMaxCellTemp()
+    {
+        return maxCellTemp;
+    }
+
+    public void setMaxCellTempId(Long maxCellTempId)
+    {
+        this.maxCellTempId = maxCellTempId;
+    }
+
+    public Long getMaxCellTempId()
+    {
+        return maxCellTempId;
+    }
+
+    public void setMinCellTemp(BigDecimal minCellTemp)
+    {
+        this.minCellTemp = minCellTemp;
+    }
+
+    public BigDecimal getMinCellTemp()
+    {
+        return minCellTemp;
+    }
+
+    public void setMinCellTempId(Long minCellTempId)
+    {
+        this.minCellTempId = minCellTempId;
+    }
+
+    public Long getMinCellTempId()
+    {
+        return minCellTempId;
+    }
+
+    public void setMaxCellSoc(BigDecimal maxCellSoc)
+    {
+        this.maxCellSoc = maxCellSoc;
+    }
+
+    public BigDecimal getMaxCellSoc()
+    {
+        return maxCellSoc;
+    }
+
+    public void setMaxCellSocId(Long maxCellSocId)
+    {
+        this.maxCellSocId = maxCellSocId;
+    }
+
+    public Long getMaxCellSocId()
+    {
+        return maxCellSocId;
+    }
+
+    public void setMinCellSoc(BigDecimal minCellSoc)
+    {
+        this.minCellSoc = minCellSoc;
+    }
+
+    public BigDecimal getMinCellSoc()
+    {
+        return minCellSoc;
+    }
+
+    public void setMinCellSocId(Long minCellSocId)
+    {
+        this.minCellSocId = minCellSocId;
+    }
+
+    public Long getMinCellSocId()
+    {
+        return minCellSocId;
+    }
+
+    public void setMaxCellSoh(BigDecimal maxCellSoh)
+    {
+        this.maxCellSoh = maxCellSoh;
+    }
+
+    public BigDecimal getMaxCellSoh()
+    {
+        return maxCellSoh;
+    }
+
+    public void setMaxCellSohId(Long maxCellSohId)
+    {
+        this.maxCellSohId = maxCellSohId;
+    }
+
+    public Long getMaxCellSohId()
+    {
+        return maxCellSohId;
+    }
+
+    public void setMinCellSoh(BigDecimal minCellSoh)
+    {
+        this.minCellSoh = minCellSoh;
+    }
+
+    public BigDecimal getMinCellSoh()
+    {
+        return minCellSoh;
+    }
+
+    public void setMinCellSohId(Long minCellSohId)
+    {
+        this.minCellSohId = minCellSohId;
+    }
+
+    public Long getMinCellSohId()
+    {
+        return minCellSohId;
+    }
+
+    public void setTotalChargeEnergy(BigDecimal totalChargeEnergy)
+    {
+        this.totalChargeEnergy = totalChargeEnergy;
+    }
+
+    public BigDecimal getTotalChargeEnergy()
+    {
+        return totalChargeEnergy;
+    }
+
+    public void setTotalDischargeEnergy(BigDecimal totalDischargeEnergy)
+    {
+        this.totalDischargeEnergy = totalDischargeEnergy;
+    }
+
+    public BigDecimal getTotalDischargeEnergy()
+    {
+        return totalDischargeEnergy;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("workStatus", getWorkStatus())
+                .append("pcsCommunicationStatus", getPcsCommunicationStatus())
+                .append("emsCommunicationStatus", getEmsCommunicationStatus())
+                .append("clusterVoltage", getClusterVoltage())
+                .append("chargeableCapacity", getChargeableCapacity())
+                .append("totalChargedCapacity", getTotalChargedCapacity())
+                .append("clusterCurrent", getClusterCurrent())
+                .append("dischargeableCapacity", getDischargeableCapacity())
+                .append("totalDischargedCapacity", getTotalDischargedCapacity())
+                .append("soh", getSoh())
+                .append("averageTemperature", getAverageTemperature())
+                .append("insulationResistance", getInsulationResistance())
+                .append("currentSoc", getCurrentSoc())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .append("siteId", getSiteId())
+                .append("deviceId", getDeviceId())
+                .append("stackDeviceId", getStackDeviceId())
+                .append("maxAllowedChargePower", getMaxAllowedChargePower())
+                .append("maxAllowedDischargePower", getMaxAllowedDischargePower())
+                .append("maxAllowedChargeVoltage", getMaxAllowedChargeVoltage())
+                .append("maxAllowedDischargeVoltage", getMaxAllowedDischargeVoltage())
+                .append("maxAllowedChargeCurrent", getMaxAllowedChargeCurrent())
+                .append("maxAllowedDischargeCurrent", getMaxAllowedDischargeCurrent())
+                .append("batteryPackVoltage", getBatteryPackVoltage())
+                .append("batteryPackCurrent", getBatteryPackCurrent())
+                .append("batteryPackTemp", getBatteryPackTemp())
+                .append("batteryPackSoc", getBatteryPackSoc())
+                .append("batteryPackSoh", getBatteryPackSoh())
+                .append("batteryPackInsulationResistance", getBatteryPackInsulationResistance())
+                .append("avgCellVoltage", getAvgCellVoltage())
+                .append("avgCellTemp", getAvgCellTemp())
+                .append("maxCellVoltage", getMaxCellVoltage())
+                .append("maxCellVoltageId", getMaxCellVoltageId())
+                .append("minCellVoltage", getMinCellVoltage())
+                .append("minCellVoltageId", getMinCellVoltageId())
+                .append("maxCellTemp", getMaxCellTemp())
+                .append("maxCellTempId", getMaxCellTempId())
+                .append("minCellTemp", getMinCellTemp())
+                .append("minCellTempId", getMinCellTempId())
+                .append("maxCellSoc", getMaxCellSoc())
+                .append("maxCellSocId", getMaxCellSocId())
+                .append("minCellSoc", getMinCellSoc())
+                .append("minCellSocId", getMinCellSocId())
+                .append("maxCellSoh", getMaxCellSoh())
+                .append("maxCellSohId", getMaxCellSohId())
+                .append("minCellSoh", getMinCellSoh())
+                .append("minCellSohId", getMinCellSohId())
+                .append("totalChargeEnergy", getTotalChargeEnergy())
+                .append("totalDischargeEnergy", getTotalDischargeEnergy())
+                .toString();
+    }
+}

ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryData.java

@@ -0,0 +1,211 @@
+package com.xzzn.ems.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xzzn.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.xzzn.common.annotation.Excel;
+
+/**
+ * 单体电池实时数据对象 ems_battery_data
+ *
+ * @author xzzn
+ * @date 2025-06-29
+ */
+public class EmsBatteryData extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long id;
+
+    /** 电池堆 */
+    @Excel(name = "电池堆")
+    private String batteryPack;
+
+    /** 电池簇 */
+    @Excel(name = "电池簇")
+    private String batteryCluster;
+
+    /** 单体编号 */
+    @Excel(name = "单体编号")
+    private String batteryCellId;
+
+    /** 电压 (V) */
+    @Excel(name = "电压 (V)")
+    private BigDecimal voltage;
+
+    /** 温度 (℃) */
+    @Excel(name = "温度 (℃)")
+    private BigDecimal temperature;
+
+    /** SOC (%) */
+    @Excel(name = "SOC (%)")
+    private BigDecimal soc;
+
+    /** SOH (%) */
+    @Excel(name = "SOH (%)")
+    private BigDecimal soh;
+
+    /** 数据采集时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "数据采集时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dataTimestamp;
+
+    /** 站点id */
+    @Excel(name = "站点id")
+    private String siteId;
+
+    /** 设备唯一标识符 */
+    @Excel(name = "设备唯一标识符")
+    private String deviceId;
+
+    /** 簇设备id */
+    @Excel(name = "簇设备id")
+    private String clusterDeviceId;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setBatteryPack(String batteryPack)
+    {
+        this.batteryPack = batteryPack;
+    }
+
+    public String getBatteryPack()
+    {
+        return batteryPack;
+    }
+
+    public void setBatteryCluster(String batteryCluster)
+    {
+        this.batteryCluster = batteryCluster;
+    }
+
+    public String getBatteryCluster()
+    {
+        return batteryCluster;
+    }
+
+    public void setBatteryCellId(String batteryCellId)
+    {
+        this.batteryCellId = batteryCellId;
+    }
+
+    public String getBatteryCellId()
+    {
+        return batteryCellId;
+    }
+
+    public void setVoltage(BigDecimal voltage)
+    {
+        this.voltage = voltage;
+    }
+
+    public BigDecimal getVoltage()
+    {
+        return voltage;
+    }
+
+    public void setTemperature(BigDecimal temperature)
+    {
+        this.temperature = temperature;
+    }
+
+    public BigDecimal getTemperature()
+    {
+        return temperature;
+    }
+
+    public void setSoc(BigDecimal soc)
+    {
+        this.soc = soc;
+    }
+
+    public BigDecimal getSoc()
+    {
+        return soc;
+    }
+
+    public void setSoh(BigDecimal soh)
+    {
+        this.soh = soh;
+    }
+
+    public BigDecimal getSoh()
+    {
+        return soh;
+    }
+
+    public void setDataTimestamp(Date dataTimestamp)
+    {
+        this.dataTimestamp = dataTimestamp;
+    }
+
+    public Date getDataTimestamp()
+    {
+        return dataTimestamp;
+    }
+
+    public void setSiteId(String siteId)
+    {
+        this.siteId = siteId;
+    }
+
+    public String getSiteId()
+    {
+        return siteId;
+    }
+
+    public void setDeviceId(String deviceId)
+    {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceId()
+    {
+        return deviceId;
+    }
+
+    public void setClusterDeviceId(String clusterDeviceId)
+    {
+        this.clusterDeviceId = clusterDeviceId;
+    }
+
+    public String getClusterDeviceId()
+    {
+        return clusterDeviceId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("batteryPack", getBatteryPack())
+                .append("batteryCluster", getBatteryCluster())
+                .append("batteryCellId", getBatteryCellId())
+                .append("voltage", getVoltage())
+                .append("temperature", getTemperature())
+                .append("soc", getSoc())
+                .append("soh", getSoh())
+                .append("dataTimestamp", getDataTimestamp())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .append("siteId", getSiteId())
+                .append("deviceId", getDeviceId())
+                .append("clusterDeviceId", getClusterDeviceId())
+                .toString();
+    }
+}

ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryStack.java

@@ -0,0 +1,673 @@
+package com.xzzn.ems.domain;
+
+import java.math.BigDecimal;
+
+import com.xzzn.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.xzzn.common.annotation.Excel;
+
+/**
+ * 电池堆数据对象 ems_battery_stack
+ *
+ * @author xzzn
+ * @date 2025-07-02
+ */
+public class EmsBatteryStack extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long id;
+
+    /** 工作状态：0-正常 1-异常 2-停止 */
+    @Excel(name = "工作状态：0-正常 1-异常 2-停止")
+    private String workStatus;
+
+    /** 与PCS通信状态：0-正常 1-通信中断 2-异常 */
+    @Excel(name = "与PCS通信状态：0-正常 1-通信中断 2-异常")
+    private String pcsCommunicationStatus;
+
+    /** 与EMS通信状态：0-正常 1-通信中断 2-异常 */
+    @Excel(name = "与EMS通信状态：0-正常 1-通信中断 2-异常")
+    private String emsCommunicationStatus;
+
+    /** 电操状态 */
+    @Excel(name = "电操状态")
+    private String operationStatus;
+
+    /** 电池堆电压/V */
+    @Excel(name = "电池堆电压/V")
+    private BigDecimal stackVoltage;
+
+    /** 电池堆电流/A */
+    @Excel(name = "电池堆电流/A")
+    private BigDecimal stackCurrent;
+
+    /** 电池堆SOC/% */
+    @Excel(name = "电池堆SOC/%")
+    private BigDecimal stackSoc;
+
+    /** 电池堆SOH/% */
+    @Excel(name = "电池堆SOH/%")
+    private BigDecimal stackSoh;
+
+    /** 最高电池电压/V */
+    @Excel(name = "最高电池电压/V")
+    private BigDecimal maxCellVoltage;
+
+    /** 最高电池电压组号 */
+    @Excel(name = "最高电池电压组号")
+    private Long maxVoltageGroupId;
+
+    /** 高电压电池所在组中的点号 */
+    @Excel(name = "高电压电池所在组中的点号")
+    private Long maxVoltageCellId;
+
+    /** 最低电池电压/V */
+    @Excel(name = "最低电池电压/V")
+    private BigDecimal minCellVoltage;
+
+    /** 最低电池电压组号 */
+    @Excel(name = "最低电池电压组号")
+    private Long minVoltageGroupId;
+
+    /** 最低电压电池所在组中的点号 */
+    @Excel(name = "最低电压电池所在组中的点号")
+    private Long minVoltageCellId;
+
+    /** 最高电池温度/℃ */
+    @Excel(name = "最高电池温度/℃")
+    private BigDecimal maxCellTemp;
+
+    /** 最高温度电池组号 */
+    @Excel(name = "最高温度电池组号")
+    private Long maxTempGroupId;
+
+    /** 最高温度电池所在组中的点号 */
+    @Excel(name = "最高温度电池所在组中的点号")
+    private Long maxTempCellId;
+
+    /** 最低电池温度/℃ */
+    @Excel(name = "最低电池温度/℃")
+    private BigDecimal minCellTemp;
+
+    /** 最低电池温度组号 */
+    @Excel(name = "最低电池温度组号")
+    private Long minTempGroupId;
+
+    /** 最低温度电池所在组中的点号 */
+    @Excel(name = "最低温度电池所在组中的点号")
+    private Long minTempCellId;
+
+    /** 堆累计充电电量/kWh */
+    @Excel(name = "堆累计充电电量/kWh")
+    private BigDecimal totalChargeCapacity;
+
+    /** 堆累计放电电量/kWh */
+    @Excel(name = "堆累计放电电量/kWh")
+    private BigDecimal totalDischargeCapacity;
+
+    /** 堆单次累计充电电量/kWh */
+    @Excel(name = "堆单次累计充电电量/kWh")
+    private BigDecimal sessionChargeCapacity;
+
+    /** 堆单次累计放电电量/kWh */
+    @Excel(name = "堆单次累计放电电量/kWh")
+    private BigDecimal sessionDischargeCapacity;
+
+    /** 堆可充电量/kWh */
+    @Excel(name = "堆可充电量/kWh")
+    private BigDecimal availableChargeCapacity;
+
+    /** 堆可放电量/kWh */
+    @Excel(name = "堆可放电量/kWh")
+    private BigDecimal availableDischargeCapacity;
+
+    /** 可用放电时间/min */
+    @Excel(name = "可用放电时间/min")
+    private Long remainingDischargeTime;
+
+    /** 可用充电时间/min */
+    @Excel(name = "可用充电时间/min")
+    private Long remainingChargeTime;
+
+    /** 允许最大放电功率/kW */
+    @Excel(name = "允许最大放电功率/kW")
+    private BigDecimal maxDischargePower;
+
+    /** 允许最大充电功率/kW */
+    @Excel(name = "允许最大充电功率/kW")
+    private BigDecimal maxChargePower;
+
+    /** 允许最大放电电流/A */
+    @Excel(name = "允许最大放电电流/A")
+    private BigDecimal maxDischargeCurrent;
+
+    /** 允许最大充电电流/A */
+    @Excel(name = "允许最大充电电流/A")
+    private BigDecimal maxChargeCurrent;
+
+    /** 当天放电次数 */
+    @Excel(name = "当天放电次数")
+    private Long dailyDischargeCycles;
+
+    /** 当天充电次数 */
+    @Excel(name = "当天充电次数")
+    private Long dailyChargeCycles;
+
+    /** 当天放电电量/kWh */
+    @Excel(name = "当天放电电量/kWh")
+    private BigDecimal dailyDischargeCapacity;
+
+    /** 当天充电电量/kWh */
+    @Excel(name = "当天充电电量/kWh")
+    private BigDecimal dailyChargeCapacity;
+
+    /** 运行温度/℃ */
+    @Excel(name = "运行温度/℃")
+    private BigDecimal operatingTemp;
+
+    /** BMS堆当前状态 */
+    @Excel(name = "BMS堆当前状态")
+    private String bmsStatus;
+
+    /** BMS充放电状态 */
+    @Excel(name = "BMS充放电状态")
+    private String bmsChargeStatus;
+
+    /** 电池堆绝缘电阻/kΩ */
+    @Excel(name = "电池堆绝缘电阻/kΩ")
+    private BigDecimal stackInsulationResistance;
+
+    /** 站点 id */
+    @Excel(name = "站点 id")
+    private String siteId;
+
+    /** 设备id */
+    @Excel(name = "设备id")
+    private String deviceId;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setWorkStatus(String workStatus)
+    {
+        this.workStatus = workStatus;
+    }
+
+    public String getWorkStatus()
+    {
+        return workStatus;
+    }
+
+    public void setPcsCommunicationStatus(String pcsCommunicationStatus)
+    {
+        this.pcsCommunicationStatus = pcsCommunicationStatus;
+    }
+
+    public String getPcsCommunicationStatus()
+    {
+        return pcsCommunicationStatus;
+    }
+
+    public void setEmsCommunicationStatus(String emsCommunicationStatus)
+    {
+        this.emsCommunicationStatus = emsCommunicationStatus;
+    }
+
+    public String getEmsCommunicationStatus()
+    {
+        return emsCommunicationStatus;
+    }
+
+    public void setOperationStatus(String operationStatus)
+    {
+        this.operationStatus = operationStatus;
+    }
+
+    public String getOperationStatus()
+    {
+        return operationStatus;
+    }
+
+    public void setStackVoltage(BigDecimal stackVoltage)
+    {
+        this.stackVoltage = stackVoltage;
+    }
+
+    public BigDecimal getStackVoltage()
+    {
+        return stackVoltage;
+    }
+
+    public void setStackCurrent(BigDecimal stackCurrent)
+    {
+        this.stackCurrent = stackCurrent;
+    }
+
+    public BigDecimal getStackCurrent()
+    {
+        return stackCurrent;
+    }
+
+    public void setStackSoc(BigDecimal stackSoc)
+    {
+        this.stackSoc = stackSoc;
+    }
+
+    public BigDecimal getStackSoc()
+    {
+        return stackSoc;
+    }
+
+    public void setStackSoh(BigDecimal stackSoh)
+    {
+        this.stackSoh = stackSoh;
+    }
+
+    public BigDecimal getStackSoh()
+    {
+        return stackSoh;
+    }
+
+    public void setMaxCellVoltage(BigDecimal maxCellVoltage)
+    {
+        this.maxCellVoltage = maxCellVoltage;
+    }
+
+    public BigDecimal getMaxCellVoltage()
+    {
+        return maxCellVoltage;
+    }
+
+    public void setMaxVoltageGroupId(Long maxVoltageGroupId)
+    {
+        this.maxVoltageGroupId = maxVoltageGroupId;
+    }
+
+    public Long getMaxVoltageGroupId()
+    {
+        return maxVoltageGroupId;
+    }
+
+    public void setMaxVoltageCellId(Long maxVoltageCellId)
+    {
+        this.maxVoltageCellId = maxVoltageCellId;
+    }
+
+    public Long getMaxVoltageCellId()
+    {
+        return maxVoltageCellId;
+    }
+
+    public void setMinCellVoltage(BigDecimal minCellVoltage)
+    {
+        this.minCellVoltage = minCellVoltage;
+    }
+
+    public BigDecimal getMinCellVoltage()
+    {
+        return minCellVoltage;
+    }
+
+    public void setMinVoltageGroupId(Long minVoltageGroupId)
+    {
+        this.minVoltageGroupId = minVoltageGroupId;
+    }
+
+    public Long getMinVoltageGroupId()
+    {
+        return minVoltageGroupId;
+    }
+
+    public void setMinVoltageCellId(Long minVoltageCellId)
+    {
+        this.minVoltageCellId = minVoltageCellId;
+    }
+
+    public Long getMinVoltageCellId()
+    {
+        return minVoltageCellId;
+    }
+
+    public void setMaxCellTemp(BigDecimal maxCellTemp)
+    {
+        this.maxCellTemp = maxCellTemp;
+    }
+
+    public BigDecimal getMaxCellTemp()
+    {
+        return maxCellTemp;
+    }
+
+    public void setMaxTempGroupId(Long maxTempGroupId)
+    {
+        this.maxTempGroupId = maxTempGroupId;
+    }
+
+    public Long getMaxTempGroupId()
+    {
+        return maxTempGroupId;
+    }
+
+    public void setMaxTempCellId(Long maxTempCellId)
+    {
+        this.maxTempCellId = maxTempCellId;
+    }
+
+    public Long getMaxTempCellId()
+    {
+        return maxTempCellId;
+    }
+
+    public void setMinCellTemp(BigDecimal minCellTemp)
+    {
+        this.minCellTemp = minCellTemp;
+    }
+
+    public BigDecimal getMinCellTemp()
+    {
+        return minCellTemp;
+    }
+
+    public void setMinTempGroupId(Long minTempGroupId)
+    {
+        this.minTempGroupId = minTempGroupId;
+    }
+
+    public Long getMinTempGroupId()
+    {
+        return minTempGroupId;
+    }
+
+    public void setMinTempCellId(Long minTempCellId)
+    {
+        this.minTempCellId = minTempCellId;
+    }
+
+    public Long getMinTempCellId()
+    {
+        return minTempCellId;
+    }
+
+    public void setTotalChargeCapacity(BigDecimal totalChargeCapacity)
+    {
+        this.totalChargeCapacity = totalChargeCapacity;
+    }
+
+    public BigDecimal getTotalChargeCapacity()
+    {
+        return totalChargeCapacity;
+    }
+
+    public void setTotalDischargeCapacity(BigDecimal totalDischargeCapacity)
+    {
+        this.totalDischargeCapacity = totalDischargeCapacity;
+    }
+
+    public BigDecimal getTotalDischargeCapacity()
+    {
+        return totalDischargeCapacity;
+    }
+
+    public void setSessionChargeCapacity(BigDecimal sessionChargeCapacity)
+    {
+        this.sessionChargeCapacity = sessionChargeCapacity;
+    }
+
+    public BigDecimal getSessionChargeCapacity()
+    {
+        return sessionChargeCapacity;
+    }
+
+    public void setSessionDischargeCapacity(BigDecimal sessionDischargeCapacity)
+    {
+        this.sessionDischargeCapacity = sessionDischargeCapacity;
+    }
+
+    public BigDecimal getSessionDischargeCapacity()
+    {
+        return sessionDischargeCapacity;
+    }
+
+    public void setAvailableChargeCapacity(BigDecimal availableChargeCapacity)
+    {
+        this.availableChargeCapacity = availableChargeCapacity;
+    }
+
+    public BigDecimal getAvailableChargeCapacity()
+    {
+        return availableChargeCapacity;
+    }
+
+    public void setAvailableDischargeCapacity(BigDecimal availableDischargeCapacity)
+    {
+        this.availableDischargeCapacity = availableDischargeCapacity;
+    }
+
+    public BigDecimal getAvailableDischargeCapacity()
+    {
+        return availableDischargeCapacity;
+    }
+
+    public void setRemainingDischargeTime(Long remainingDischargeTime)
+    {
+        this.remainingDischargeTime = remainingDischargeTime;
+    }
+
+    public Long getRemainingDischargeTime()
+    {
+        return remainingDischargeTime;
+    }
+
+    public void setRemainingChargeTime(Long remainingChargeTime)
+    {
+        this.remainingChargeTime = remainingChargeTime;
+    }
+
+    public Long getRemainingChargeTime()
+    {
+        return remainingChargeTime;
+    }
+
+    public void setMaxDischargePower(BigDecimal maxDischargePower)
+    {
+        this.maxDischargePower = maxDischargePower;
+    }
+
+    public BigDecimal getMaxDischargePower()
+    {
+        return maxDischargePower;
+    }
+
+    public void setMaxChargePower(BigDecimal maxChargePower)
+    {
+        this.maxChargePower = maxChargePower;
+    }
+
+    public BigDecimal getMaxChargePower()
+    {
+        return maxChargePower;
+    }
+
+    public void setMaxDischargeCurrent(BigDecimal maxDischargeCurrent)
+    {
+        this.maxDischargeCurrent = maxDischargeCurrent;
+    }
+
+    public BigDecimal getMaxDischargeCurrent()
+    {
+        return maxDischargeCurrent;
+    }
+
+    public void setMaxChargeCurrent(BigDecimal maxChargeCurrent)
+    {
+        this.maxChargeCurrent = maxChargeCurrent;
+    }
+
+    public BigDecimal getMaxChargeCurrent()
+    {
+        return maxChargeCurrent;
+    }
+
+    public void setDailyDischargeCycles(Long dailyDischargeCycles)
+    {
+        this.dailyDischargeCycles = dailyDischargeCycles;
+    }
+
+    public Long getDailyDischargeCycles()
+    {
+        return dailyDischargeCycles;
+    }
+
+    public void setDailyChargeCycles(Long dailyChargeCycles)
+    {
+        this.dailyChargeCycles = dailyChargeCycles;
+    }
+
+    public Long getDailyChargeCycles()
+    {
+        return dailyChargeCycles;
+    }
+
+    public void setDailyDischargeCapacity(BigDecimal dailyDischargeCapacity)
+    {
+        this.dailyDischargeCapacity = dailyDischargeCapacity;
+    }
+
+    public BigDecimal getDailyDischargeCapacity()
+    {
+        return dailyDischargeCapacity;
+    }
+
+    public void setDailyChargeCapacity(BigDecimal dailyChargeCapacity)
+    {
+        this.dailyChargeCapacity = dailyChargeCapacity;
+    }
+
+    public BigDecimal getDailyChargeCapacity()
+    {
+        return dailyChargeCapacity;
+    }
+
+    public void setOperatingTemp(BigDecimal operatingTemp)
+    {
+        this.operatingTemp = operatingTemp;
+    }
+
+    public BigDecimal getOperatingTemp()
+    {
+        return operatingTemp;
+    }
+
+    public void setBmsStatus(String bmsStatus)
+    {
+        this.bmsStatus = bmsStatus;
+    }
+
+    public String getBmsStatus()
+    {
+        return bmsStatus;
+    }
+
+    public void setBmsChargeStatus(String bmsChargeStatus)
+    {
+        this.bmsChargeStatus = bmsChargeStatus;
+    }
+
+    public String getBmsChargeStatus()
+    {
+        return bmsChargeStatus;
+    }
+
+    public void setStackInsulationResistance(BigDecimal stackInsulationResistance)
+    {
+        this.stackInsulationResistance = stackInsulationResistance;
+    }
+
+    public BigDecimal getStackInsulationResistance()
+    {
+        return stackInsulationResistance;
+    }
+
+    public void setSiteId(String siteId)
+    {
+        this.siteId = siteId;
+    }
+
+    public String getSiteId()
+    {
+        return siteId;
+    }
+
+    public void setDeviceId(String deviceId)
+    {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceId()
+    {
+        return deviceId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("workStatus", getWorkStatus())
+                .append("pcsCommunicationStatus", getPcsCommunicationStatus())
+                .append("emsCommunicationStatus", getEmsCommunicationStatus())
+                .append("operationStatus", getOperationStatus())
+                .append("stackVoltage", getStackVoltage())
+                .append("stackCurrent", getStackCurrent())
+                .append("stackSoc", getStackSoc())
+                .append("stackSoh", getStackSoh())
+                .append("maxCellVoltage", getMaxCellVoltage())
+                .append("maxVoltageGroupId", getMaxVoltageGroupId())
+                .append("maxVoltageCellId", getMaxVoltageCellId())
+                .append("minCellVoltage", getMinCellVoltage())
+                .append("minVoltageGroupId", getMinVoltageGroupId())
+                .append("minVoltageCellId", getMinVoltageCellId())
+                .append("maxCellTemp", getMaxCellTemp())
+                .append("maxTempGroupId", getMaxTempGroupId())
+                .append("maxTempCellId", getMaxTempCellId())
+                .append("minCellTemp", getMinCellTemp())
+                .append("minTempGroupId", getMinTempGroupId())
+                .append("minTempCellId", getMinTempCellId())
+                .append("totalChargeCapacity", getTotalChargeCapacity())
+                .append("totalDischargeCapacity", getTotalDischargeCapacity())
+                .append("sessionChargeCapacity", getSessionChargeCapacity())
+                .append("sessionDischargeCapacity", getSessionDischargeCapacity())
+                .append("availableChargeCapacity", getAvailableChargeCapacity())
+                .append("availableDischargeCapacity", getAvailableDischargeCapacity())
+                .append("remainingDischargeTime", getRemainingDischargeTime())
+                .append("remainingChargeTime", getRemainingChargeTime())
+                .append("maxDischargePower", getMaxDischargePower())
+                .append("maxChargePower", getMaxChargePower())
+                .append("maxDischargeCurrent", getMaxDischargeCurrent())
+                .append("maxChargeCurrent", getMaxChargeCurrent())
+                .append("dailyDischargeCycles", getDailyDischargeCycles())
+                .append("dailyChargeCycles", getDailyChargeCycles())
+                .append("dailyDischargeCapacity", getDailyDischargeCapacity())
+                .append("dailyChargeCapacity", getDailyChargeCapacity())
+                .append("operatingTemp", getOperatingTemp())
+                .append("bmsStatus", getBmsStatus())
+                .append("bmsChargeStatus", getBmsChargeStatus())
+                .append("stackInsulationResistance", getStackInsulationResistance())
+                .append("siteId", getSiteId())
+                .append("deviceId", getDeviceId())
+                .append("createTime", getCreateTime())
+                .append("createBy", getCreateBy())
+                .append("updateTime", getUpdateTime())
+                .append("updateBy", getUpdateBy())
+                .toString();
+    }
+}

ems-system/src/main/java/com/xzzn/ems/domain/EmsCoolingData.java

@@ -0,0 +1,209 @@
+package com.xzzn.ems.domain;
+
+import java.math.BigDecimal;
+
+import com.xzzn.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.xzzn.common.annotation.Excel;
+
+/**
+ * 冷却系统参数对象 ems_cooling_data
+ *
+ * @author xzzn
+ * @date 2025-06-29
+ */
+public class EmsCoolingData extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long id;
+
+    /** 系统名称，如1#液冷 */
+    @Excel(name = "系统名称，如1#液冷")
+    private String systemName;
+
+    /** 工作模式 */
+    @Excel(name = "工作模式")
+    private String workMode;
+
+    /** 当前温度 (℃) */
+    @Excel(name = "当前温度 (℃)")
+    private BigDecimal currentTemperature;
+
+    /** 制热开启点 (℃) */
+    @Excel(name = "制热开启点 (℃)")
+    private BigDecimal heatingStartPoint;
+
+    /** 制冷开启点 (℃) */
+    @Excel(name = "制冷开启点 (℃)")
+    private BigDecimal coolingStartPoint;
+
+    /** 高温告警点 (℃) */
+    @Excel(name = "高温告警点 (℃)")
+    private BigDecimal highTempAlarmPoint;
+
+    /** 制热停止点 (℃) */
+    @Excel(name = "制热停止点 (℃)")
+    private BigDecimal heatingStopPoint;
+
+    /** 制冷停止点 (℃) */
+    @Excel(name = "制冷停止点 (℃)")
+    private BigDecimal coolingStopPoint;
+
+    /** 低温告警点 (℃) */
+    @Excel(name = "低温告警点 (℃)")
+    private BigDecimal lowTempAlarmPoint;
+
+    /** 站点id */
+    @Excel(name = "站点id")
+    private String siteId;
+
+    /** 设备唯一标识符 */
+    @Excel(name = "设备唯一标识符")
+    private String deviceId;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setSystemName(String systemName)
+    {
+        this.systemName = systemName;
+    }
+
+    public String getSystemName()
+    {
+        return systemName;
+    }
+
+    public void setWorkMode(String workMode)
+    {
+        this.workMode = workMode;
+    }
+
+    public String getWorkMode()
+    {
+        return workMode;
+    }
+
+    public void setCurrentTemperature(BigDecimal currentTemperature)
+    {
+        this.currentTemperature = currentTemperature;
+    }
+
+    public BigDecimal getCurrentTemperature()
+    {
+        return currentTemperature;
+    }
+
+    public void setHeatingStartPoint(BigDecimal heatingStartPoint)
+    {
+        this.heatingStartPoint = heatingStartPoint;
+    }
+
+    public BigDecimal getHeatingStartPoint()
+    {
+        return heatingStartPoint;
+    }
+
+    public void setCoolingStartPoint(BigDecimal coolingStartPoint)
+    {
+        this.coolingStartPoint = coolingStartPoint;
+    }
+
+    public BigDecimal getCoolingStartPoint()
+    {
+        return coolingStartPoint;
+    }
+
+    public void setHighTempAlarmPoint(BigDecimal highTempAlarmPoint)
+    {
+        this.highTempAlarmPoint = highTempAlarmPoint;
+    }
+
+    public BigDecimal getHighTempAlarmPoint()
+    {
+        return highTempAlarmPoint;
+    }
+
+    public void setHeatingStopPoint(BigDecimal heatingStopPoint)
+    {
+        this.heatingStopPoint = heatingStopPoint;
+    }
+
+    public BigDecimal getHeatingStopPoint()
+    {
+        return heatingStopPoint;
+    }
+
+    public void setCoolingStopPoint(BigDecimal coolingStopPoint)
+    {
+        this.coolingStopPoint = coolingStopPoint;
+    }
+
+    public BigDecimal getCoolingStopPoint()
+    {
+        return coolingStopPoint;
+    }
+
+    public void setLowTempAlarmPoint(BigDecimal lowTempAlarmPoint)
+    {
+        this.lowTempAlarmPoint = lowTempAlarmPoint;
+    }
+
+    public BigDecimal getLowTempAlarmPoint()
+    {
+        return lowTempAlarmPoint;
+    }
+
+    public void setSiteId(String siteId)
+    {
+        this.siteId = siteId;
+    }
+
+    public String getSiteId()
+    {
+        return siteId;
+    }
+
+    public void setDeviceId(String deviceId)
+    {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceId()
+    {
+        return deviceId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("systemName", getSystemName())
+                .append("workMode", getWorkMode())
+                .append("currentTemperature", getCurrentTemperature())
+                .append("heatingStartPoint", getHeatingStartPoint())
+                .append("coolingStartPoint", getCoolingStartPoint())
+                .append("highTempAlarmPoint", getHighTempAlarmPoint())
+                .append("heatingStopPoint", getHeatingStopPoint())
+                .append("coolingStopPoint", getCoolingStopPoint())
+                .append("lowTempAlarmPoint", getLowTempAlarmPoint())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .append("siteId", getSiteId())
+                .append("deviceId", getDeviceId())
+                .toString();
+    }
+}

ems-system/src/main/java/com/xzzn/ems/domain/EmsDevicesSetting.java

@@ -0,0 +1,341 @@
+package com.xzzn.ems.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xzzn.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.xzzn.common.annotation.Excel;
+
+/**
+ * Modbus设备配置对象 ems_devices_setting
+ *
+ * @author xzzn
+ * @date 2025-07-02
+ */
+public class EmsDevicesSetting extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 设备ID，主键自增长 */
+    private Long id;
+
+    /** 设备名称，用于标识设备 */
+    @Excel(name = "设备名称，用于标识设备")
+    private String deviceName;
+
+    /** 设备类型: TCP （网络设备），RTU（串口设备) */
+    @Excel(name = "设备类型: TCP ", readConverterExp = "网=络设备")
+    private String deviceType;
+
+    /** 从站地址，默认为1 */
+    @Excel(name = "从站地址，默认为1")
+    private Long slaveId;
+
+    /** 通信超时时间(毫秒)，默认1000ms */
+    @Excel(name = "通信超时时间(毫秒)，默认1000ms")
+    private Long timeoutMs;
+
+    /** 通信失败重试次数，默认3次 */
+    @Excel(name = "通信失败重试次数，默认3次")
+    private Long retries;
+
+    /** TCP设备的IP地址，仅TCP类型需要 */
+    @Excel(name = "TCP设备的IP地址，仅TCP类型需要")
+    private String ipAddress;
+
+    /** TCP端口号，通常502，仅TCP类型需要 */
+    @Excel(name = "TCP端口号，通常502，仅TCP类型需要")
+    private Long ipPort;
+
+    /** 串口路径(如COM3或/dev/ttyUSB0)，仅RTU类型需要 */
+    @Excel(name = "串口路径(如COM3或/dev/ttyUSB0)，仅RTU类型需要")
+    private String serialPort;
+
+    /** 波特率(如9600,19200)，仅RTU类型需要 */
+    @Excel(name = "波特率(如9600,19200)，仅RTU类型需要")
+    private Long baudRate;
+
+    /** 数据位(通常8)，仅RTU类型需要 */
+    @Excel(name = "数据位(通常8)，仅RTU类型需要")
+    private Long dataBits;
+
+    /** 停止位(1或2)，仅RTU类型需要 */
+    @Excel(name = "停止位(1或2)，仅RTU类型需要")
+    private Long stopBits;
+
+    /** 校验位(NONE无校验/EVEN偶校验/ODD奇校验)，仅RTU类型需要 */
+    @Excel(name = "校验位(NONE无校验/EVEN偶校验/ODD奇校验)，仅RTU类型需要")
+    private String parity;
+
+    /** 设备描述信息 */
+    @Excel(name = "设备描述信息")
+    private String description;
+
+    /** 记录创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdAt;
+
+    /** 记录最后更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录最后更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedAt;
+
+    /** 站点id */
+    @Excel(name = "站点id")
+    private String siteId;
+
+    /** 通信状态:0-正常 1-通信中断 2-异常 */
+    @Excel(name = "通信状态:0-正常 1-通信中断 2-异常")
+    private String communicationStatus;
+
+    /** 设备唯一标识符 */
+    @Excel(name = "设备唯一标识符")
+    private String deviceId;
+
+    /** 上级设备id */
+    @Excel(name = "上级设备id")
+    private String parentId;
+
+    /** 设备类别，例如“STACK/CLUSTER/PCS等” */
+    @Excel(name = "设备类别，例如“STACK/CLUSTER/PCS等”")
+    private String deviceCategory;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setDeviceName(String deviceName)
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName()
+    {
+        return deviceName;
+    }
+
+    public void setDeviceType(String deviceType)
+    {
+        this.deviceType = deviceType;
+    }
+
+    public String getDeviceType()
+    {
+        return deviceType;
+    }
+
+    public void setSlaveId(Long slaveId)
+    {
+        this.slaveId = slaveId;
+    }
+
+    public Long getSlaveId()
+    {
+        return slaveId;
+    }
+
+    public void setTimeoutMs(Long timeoutMs)
+    {
+        this.timeoutMs = timeoutMs;
+    }
+
+    public Long getTimeoutMs()
+    {
+        return timeoutMs;
+    }
+
+    public void setRetries(Long retries)
+    {
+        this.retries = retries;
+    }
+
+    public Long getRetries()
+    {
+        return retries;
+    }
+
+    public void setIpAddress(String ipAddress)
+    {
+        this.ipAddress = ipAddress;
+    }
+
+    public String getIpAddress()
+    {
+        return ipAddress;
+    }
+
+    public void setIpPort(Long ipPort)
+    {
+        this.ipPort = ipPort;
+    }
+
+    public Long getIpPort()
+    {
+        return ipPort;
+    }
+
+    public void setSerialPort(String serialPort)
+    {
+        this.serialPort = serialPort;
+    }
+
+    public String getSerialPort()
+    {
+        return serialPort;
+    }
+
+    public void setBaudRate(Long baudRate)
+    {
+        this.baudRate = baudRate;
+    }
+
+    public Long getBaudRate()
+    {
+        return baudRate;
+    }
+
+    public void setDataBits(Long dataBits)
+    {
+        this.dataBits = dataBits;
+    }
+
+    public Long getDataBits()
+    {
+        return dataBits;
+    }
+
+    public void setStopBits(Long stopBits)
+    {
+        this.stopBits = stopBits;
+    }
+
+    public Long getStopBits()
+    {
+        return stopBits;
+    }
+
+    public void setParity(String parity)
+    {
+        this.parity = parity;
+    }
+
+    public String getParity()
+    {
+        return parity;
+    }
+
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    public String getDescription()
+    {
+        return description;
+    }
+
+    public void setCreatedAt(Date createdAt)
+    {
+        this.createdAt = createdAt;
+    }
+
+    public Date getCreatedAt()
+    {
+        return createdAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt)
+    {
+        this.updatedAt = updatedAt;
+    }
+
+    public Date getUpdatedAt()
+    {
+        return updatedAt;
+    }
+
+    public void setSiteId(String siteId)
+    {
+        this.siteId = siteId;
+    }
+
+    public String getSiteId()
+    {
+        return siteId;
+    }
+
+    public void setCommunicationStatus(String communicationStatus)
+    {
+        this.communicationStatus = communicationStatus;
+    }
+
+    public String getCommunicationStatus()
+    {
+        return communicationStatus;
+    }
+
+    public void setDeviceId(String deviceId)
+    {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceId()
+    {
+        return deviceId;
+    }
+
+    public void setParentId(String parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    public String getParentId()
+    {
+        return parentId;
+    }
+
+    public void setDeviceCategory(String deviceCategory)
+    {
+        this.deviceCategory = deviceCategory;
+    }
+
+    public String getDeviceCategory()
+    {
+        return deviceCategory;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("deviceName", getDeviceName())
+                .append("deviceType", getDeviceType())
+                .append("slaveId", getSlaveId())
+                .append("timeoutMs", getTimeoutMs())
+                .append("retries", getRetries())
+                .append("ipAddress", getIpAddress())
+                .append("ipPort", getIpPort())
+                .append("serialPort", getSerialPort())
+                .append("baudRate", getBaudRate())
+                .append("dataBits", getDataBits())
+                .append("stopBits", getStopBits())
+                .append("parity", getParity())
+                .append("description", getDescription())
+                .append("createdAt", getCreatedAt())
+                .append("updatedAt", getUpdatedAt())
+                .append("siteId", getSiteId())
+                .append("communicationStatus", getCommunicationStatus())
+                .append("deviceId", getDeviceId())
+                .append("parentId", getParentId())
+                .append("deviceCategory", getDeviceCategory())
+                .toString();
+    }
+}

ems-system/src/main/java/com/xzzn/ems/domain/EmsMqttMessage.java

@@ -6,21 +6,25 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.xzzn.common.annotation.Excel;
 
 /**
- * 站点对象 site
+ * 【请填写功能名称】对象 ems_mqtt_message
  *
  * @author xzzn
- * @date 2025-06-16
+ * @date 2025-06-27
  */
-public class EmsSite extends BaseEntity
+public class EmsMqttMessage extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 自增主键 */
+    /** 主键 */
     private Long id;
 
-    /** 站点名称 */
-    @Excel(name = "站点名称")
-    private String siteName;
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String mqttTopic;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String mqttMessage;
 
     public void setId(Long id)
     {
@@ -32,25 +36,35 @@ public class EmsSite extends BaseEntity
         return id;
     }
 
-    public void setSiteName(String siteName)
+    public void setMqttTopic(String mqttTopic)
     {
-        this.siteName = siteName;
+        this.mqttTopic = mqttTopic;
     }
 
-    public String getSiteName()
+    public String getMqttTopic()
     {
-        return siteName;
+        return mqttTopic;
+    }
+
+    public void setMqttMessage(String mqttMessage)
+    {
+        this.mqttMessage = mqttMessage;
+    }
+
+    public String getMqttMessage()
+    {
+        return mqttMessage;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
-                .append("siteName", getSiteName())
-                .append("remark", getRemark())
+                .append("mqttTopic", getMqttTopic())
+                .append("mqttMessage", getMqttMessage())
                 .append("createBy", getCreateBy())
-                .append("updateBy", getUpdateBy())
                 .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
                 .toString();
     }

ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsBranchData.java

@@ -0,0 +1,449 @@
+package com.xzzn.ems.domain;
+
+import java.math.BigDecimal;
+
+import com.xzzn.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.xzzn.common.annotation.Excel;
+
+/**
+ * pcs支路数据对象 ems_pcs_branch_data
+ *
+ * @author xzzn
+ * @date 2025-06-29
+ */
+public class EmsPcsBranchData extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long id;
+
+    /** 放电状态 */
+    @Excel(name = "放电状态")
+    private String dischargeStatus;
+
+    /** 直流功率 (kW) */
+    @Excel(name = "直流功率 (kW)")
+    private BigDecimal dcPower;
+
+    /** 直流电压 (V) */
+    @Excel(name = "直流电压 (V)")
+    private BigDecimal dcVoltage;
+
+    /** 直流电流 (A) */
+    @Excel(name = "直流电流 (A)")
+    private BigDecimal dcCurrent;
+
+    /** 站点id */
+    @Excel(name = "站点id")
+    private String siteId;
+
+    /** 设备唯一标识符 */
+    @Excel(name = "设备唯一标识符")
+    private String deviceId;
+
+    /** 支路id */
+    @Excel(name = "支路id")
+    private String branchId;
+
+    /** 电网U相电压 */
+    @Excel(name = "电网U相电压")
+    private BigDecimal gridUVoltage;
+
+    /** 电网V相电压 */
+    @Excel(name = "电网V相电压")
+    private BigDecimal gridVVoltage;
+
+    /** 电网W相电压 */
+    @Excel(name = "电网W相电压")
+    private BigDecimal gridWVoltage;
+
+    /** 输出U相电流 */
+    @Excel(name = "输出U相电流")
+    private BigDecimal outputUCurrent;
+
+    /** 输出V相电流 */
+    @Excel(name = "输出V相电流")
+    private BigDecimal outputVCurrent;
+
+    /** 输出W相电流 */
+    @Excel(name = "输出W相电流")
+    private BigDecimal outputWCurrent;
+
+    /** 视在功率 */
+    @Excel(name = "视在功率")
+    private BigDecimal apparentPower;
+
+    /** 有功功率 */
+    @Excel(name = "有功功率")
+    private BigDecimal activePower;
+
+    /** 无功功率 */
+    @Excel(name = "无功功率")
+    private BigDecimal reactivePower;
+
+    /** 功率因数 */
+    @Excel(name = "功率因数")
+    private BigDecimal powerFactor;
+
+    /** 频率 */
+    @Excel(name = "频率")
+    private BigDecimal frequency;
+
+    /** 内部温度 */
+    @Excel(name = "内部温度")
+    private BigDecimal internalTemp;
+
+    /** U相IGBT温度 */
+    @Excel(name = "U相IGBT温度")
+    private BigDecimal uIgbtTemp;
+
+    /** V相IGBT温度 */
+    @Excel(name = "V相IGBT温度")
+    private BigDecimal vIgbtTemp;
+
+    /** W相IGBT温度 */
+    @Excel(name = "W相IGBT温度")
+    private BigDecimal wIgbtTemp;
+
+    /** 并离网状态 */
+    @Excel(name = "并离网状态")
+    private String gridStatus;
+
+    /** 可用功率 */
+    @Excel(name = "可用功率")
+    private BigDecimal availablePower;
+
+    /** 总负载比 */
+    @Excel(name = "总负载比")
+    private BigDecimal totalLoadRatio;
+
+    /** 交流漏电流 */
+    @Excel(name = "交流漏电流")
+    private BigDecimal acLeakageCurrent;
+
+    /** 绝缘阻抗 */
+    @Excel(name = "绝缘阻抗")
+    private BigDecimal insulationResistance;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setDischargeStatus(String dischargeStatus)
+    {
+        this.dischargeStatus = dischargeStatus;
+    }
+
+    public String getDischargeStatus()
+    {
+        return dischargeStatus;
+    }
+
+    public void setDcPower(BigDecimal dcPower)
+    {
+        this.dcPower = dcPower;
+    }
+
+    public BigDecimal getDcPower()
+    {
+        return dcPower;
+    }
+
+    public void setDcVoltage(BigDecimal dcVoltage)
+    {
+        this.dcVoltage = dcVoltage;
+    }
+
+    public BigDecimal getDcVoltage()
+    {
+        return dcVoltage;
+    }
+
+    public void setDcCurrent(BigDecimal dcCurrent)
+    {
+        this.dcCurrent = dcCurrent;
+    }
+
+    public BigDecimal getDcCurrent()
+    {
+        return dcCurrent;
+    }
+
+    public void setSiteId(String siteId)
+    {
+        this.siteId = siteId;
+    }
+
+    public String getSiteId()
+    {
+        return siteId;
+    }
+
+    public void setDeviceId(String deviceId)
+    {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceId()
+    {
+        return deviceId;
+    }
+
+    public void setBranchId(String branchId)
+    {
+        this.branchId = branchId;
+    }
+
+    public String getBranchId()
+    {
+        return branchId;
+    }
+
+    public void setGridUVoltage(BigDecimal gridUVoltage)
+    {
+        this.gridUVoltage = gridUVoltage;
+    }
+
+    public BigDecimal getGridUVoltage()
+    {
+        return gridUVoltage;
+    }
+
+    public void setGridVVoltage(BigDecimal gridVVoltage)
+    {
+        this.gridVVoltage = gridVVoltage;
+    }
+
+    public BigDecimal getGridVVoltage()
+    {
+        return gridVVoltage;
+    }
+
+    public void setGridWVoltage(BigDecimal gridWVoltage)
+    {
+        this.gridWVoltage = gridWVoltage;
+    }
+
+    public BigDecimal getGridWVoltage()
+    {
+        return gridWVoltage;
+    }
+
+    public void setOutputUCurrent(BigDecimal outputUCurrent)
+    {
+        this.outputUCurrent = outputUCurrent;
+    }
+
+    public BigDecimal getOutputUCurrent()
+    {
+        return outputUCurrent;
+    }
+
+    public void setOutputVCurrent(BigDecimal outputVCurrent)
+    {
+        this.outputVCurrent = outputVCurrent;
+    }
+
+    public BigDecimal getOutputVCurrent()
+    {
+        return outputVCurrent;
+    }
+
+    public void setOutputWCurrent(BigDecimal outputWCurrent)
+    {
+        this.outputWCurrent = outputWCurrent;
+    }
+
+    public BigDecimal getOutputWCurrent()
+    {
+        return outputWCurrent;
+    }
+
+    public void setApparentPower(BigDecimal apparentPower)
+    {
+        this.apparentPower = apparentPower;
+    }
+
+    public BigDecimal getApparentPower()
+    {
+        return apparentPower;
+    }
+
+    public void setActivePower(BigDecimal activePower)
+    {
+        this.activePower = activePower;
+    }
+
+    public BigDecimal getActivePower()
+    {
+        return activePower;
+    }
+
+    public void setReactivePower(BigDecimal reactivePower)
+    {
+        this.reactivePower = reactivePower;
+    }
+
+    public BigDecimal getReactivePower()
+    {
+        return reactivePower;
+    }
+
+    public void setPowerFactor(BigDecimal powerFactor)
+    {
+        this.powerFactor = powerFactor;
+    }
+
+    public BigDecimal getPowerFactor()
+    {
+        return powerFactor;
+    }
+
+    public void setFrequency(BigDecimal frequency)
+    {
+        this.frequency = frequency;
+    }
+
+    public BigDecimal getFrequency()
+    {
+        return frequency;
+    }
+
+    public void setInternalTemp(BigDecimal internalTemp)
+    {
+        this.internalTemp = internalTemp;
+    }
+
+    public BigDecimal getInternalTemp()
+    {
+        return internalTemp;
+    }
+
+    public void setuIgbtTemp(BigDecimal uIgbtTemp)
+    {
+        this.uIgbtTemp = uIgbtTemp;
+    }
+
+    public BigDecimal getuIgbtTemp()
+    {
+        return uIgbtTemp;
+    }
+
+    public void setvIgbtTemp(BigDecimal vIgbtTemp)
+    {
+        this.vIgbtTemp = vIgbtTemp;
+    }
+
+    public BigDecimal getvIgbtTemp()
+    {
+        return vIgbtTemp;
+    }
+
+    public void setwIgbtTemp(BigDecimal wIgbtTemp)
+    {
+        this.wIgbtTemp = wIgbtTemp;
+    }
+
+    public BigDecimal getwIgbtTemp()
+    {
+        return wIgbtTemp;
+    }
+
+    public void setGridStatus(String gridStatus)
+    {
+        this.gridStatus = gridStatus;
+    }
+
+    public String getGridStatus()
+    {
+        return gridStatus;
+    }
+
+    public void setAvailablePower(BigDecimal availablePower)
+    {
+        this.availablePower = availablePower;
+    }
+
+    public BigDecimal getAvailablePower()
+    {
+        return availablePower;
+    }
+
+    public void setTotalLoadRatio(BigDecimal totalLoadRatio)
+    {
+        this.totalLoadRatio = totalLoadRatio;
+    }
+
+    public BigDecimal getTotalLoadRatio()
+    {
+        return totalLoadRatio;
+    }
+
+    public void setAcLeakageCurrent(BigDecimal acLeakageCurrent)
+    {
+        this.acLeakageCurrent = acLeakageCurrent;
+    }
+
+    public BigDecimal getAcLeakageCurrent()
+    {
+        return acLeakageCurrent;
+    }
+
+    public void setInsulationResistance(BigDecimal insulationResistance)
+    {
+        this.insulationResistance = insulationResistance;
+    }
+
+    public BigDecimal getInsulationResistance()
+    {
+        return insulationResistance;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("dischargeStatus", getDischargeStatus())
+                .append("dcPower", getDcPower())
+                .append("dcVoltage", getDcVoltage())
+                .append("dcCurrent", getDcCurrent())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .append("siteId", getSiteId())
+                .append("deviceId", getDeviceId())
+                .append("branchId", getBranchId())
+                .append("gridUVoltage", getGridUVoltage())
+                .append("gridVVoltage", getGridVVoltage())
+                .append("gridWVoltage", getGridWVoltage())
+                .append("outputUCurrent", getOutputUCurrent())
+                .append("outputVCurrent", getOutputVCurrent())
+                .append("outputWCurrent", getOutputWCurrent())
+                .append("apparentPower", getApparentPower())
+                .append("activePower", getActivePower())
+                .append("reactivePower", getReactivePower())
+                .append("powerFactor", getPowerFactor())
+                .append("frequency", getFrequency())
+                .append("internalTemp", getInternalTemp())
+                .append("uIgbtTemp", getuIgbtTemp())
+                .append("vIgbtTemp", getvIgbtTemp())
+                .append("wIgbtTemp", getwIgbtTemp())
+                .append("gridStatus", getGridStatus())
+                .append("availablePower", getAvailablePower())
+                .append("totalLoadRatio", getTotalLoadRatio())
+                .append("acLeakageCurrent", getAcLeakageCurrent())
+                .append("insulationResistance", getInsulationResistance())
+                .toString();
+    }
+}

ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsData.java

@@ -12,7 +12,7 @@ import com.xzzn.common.annotation.Excel;
  * PCS数据对象 ems_pcs_data
  *
  * @author xzzn
- * @date 2025-06-17
+ * @date 2025-06-29
  */
 public class EmsPcsData extends BaseEntity
 {
@@ -22,8 +22,8 @@ public class EmsPcsData extends BaseEntity
     private Long id;
 
     /** 数据更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "数据更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "数据更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date dataUpdateTime;
 
     /** 工作状态 */
@@ -124,19 +124,71 @@ public class EmsPcsData extends BaseEntity
 
     /** 站点id */
     @Excel(name = "站点id")
-    private Long siteId;
+    private String siteId;
 
     /** 设备唯一标识符 */
     @Excel(name = "设备唯一标识符")
-    private Long deviceId;
+    private String deviceId;
 
     /** 月 */
     @Excel(name = "月")
-    private int dateMonth;
+    private Long dateMonth;
 
     /** 日 */
     @Excel(name = "日")
-    private int dateDay;
+    private Long dateDay;
+
+    /** 总交流充电量 (kWh) */
+    @Excel(name = "总交流充电量 (kWh)")
+    private BigDecimal totalAcChargeEnergy;
+
+    /** 总交流放电量 (kWh) */
+    @Excel(name = "总交流放电量 (kWh)")
+    private BigDecimal totalAcDischargeEnergy;
+
+    /** 交流侧充电有功功率 */
+    @Excel(name = "交流侧充电有功功率")
+    private BigDecimal acChargeActivePower;
+
+    /** 交流侧容性无功功率 */
+    @Excel(name = "交流侧容性无功功率")
+    private BigDecimal acCapacitiveReactivePower;
+
+    /** 交流侧放电有功功率 */
+    @Excel(name = "交流侧放电有功功率")
+    private BigDecimal acDischargeActivePower;
+
+    /** 交流侧感性无功功率 */
+    @Excel(name = "交流侧感性无功功率")
+    private BigDecimal acInductiveReactivePower;
+
+    /** 最大容性无功能力 */
+    @Excel(name = "最大容性无功能力")
+    private BigDecimal maxCapacitivePowerCapacity;
+
+    /** 最大感性无功能力 */
+    @Excel(name = "最大感性无功能力")
+    private BigDecimal maxInductivePowerCapacity;
+
+    /** 最大可冲功率 */
+    @Excel(name = "最大可冲功率")
+    private BigDecimal maxChargePowerCapacity;
+
+    /** 最大可放功率 */
+    @Excel(name = "最大可放功率")
+    private BigDecimal maxDischargePowerCapacity;
+
+    /** 交流开关状态 */
+    @Excel(name = "交流开关状态")
+    private String acSwitchStatus;
+
+    /** 直流开关状态 */
+    @Excel(name = "直流开关状态")
+    private String dcSwitchStatus;
+
+    /** 远程投退状态 */
+    @Excel(name = "远程投退状态")
+    private String remoteControlStatus;
 
     public void setId(Long id)
     {
@@ -398,40 +450,174 @@ public class EmsPcsData extends BaseEntity
         return dcCurrent;
     }
 
-    public void setSiteId(Long siteId)
+    public void setSiteId(String siteId)
     {
         this.siteId = siteId;
     }
 
-    public Long getSiteId()
+    public String getSiteId()
     {
         return siteId;
     }
 
-    public void setDeviceId(Long deviceId)
+    public void setDeviceId(String deviceId)
     {
         this.deviceId = deviceId;
     }
 
-    public Long getDeviceId()
+    public String getDeviceId()
     {
         return deviceId;
     }
 
-    public int getDateMonth() {
-        return dateMonth;
-    }
-
-    public void setDateMonth(int dateMonth) {
+    public void setDateMonth(Long dateMonth)
+    {
         this.dateMonth = dateMonth;
     }
 
-    public int getDateDay() {
+    public Long getDateMonth()
+    {
+        return dateMonth;
+    }
+
+    public void setDateDay(Long dateDay)
+    {
+        this.dateDay = dateDay;
+    }
+
+    public Long getDateDay()
+    {
         return dateDay;
     }
 
-    public void setDateDay(int dateDay) {
-        this.dateDay = dateDay;
+    public void setTotalAcChargeEnergy(BigDecimal totalAcChargeEnergy)
+    {
+        this.totalAcChargeEnergy = totalAcChargeEnergy;
+    }
+
+    public BigDecimal getTotalAcChargeEnergy()
+    {
+        return totalAcChargeEnergy;
+    }
+
+    public void setTotalAcDischargeEnergy(BigDecimal totalAcDischargeEnergy)
+    {
+        this.totalAcDischargeEnergy = totalAcDischargeEnergy;
+    }
+
+    public BigDecimal getTotalAcDischargeEnergy()
+    {
+        return totalAcDischargeEnergy;
+    }
+
+    public void setAcChargeActivePower(BigDecimal acChargeActivePower)
+    {
+        this.acChargeActivePower = acChargeActivePower;
+    }
+
+    public BigDecimal getAcChargeActivePower()
+    {
+        return acChargeActivePower;
+    }
+
+    public void setAcCapacitiveReactivePower(BigDecimal acCapacitiveReactivePower)
+    {
+        this.acCapacitiveReactivePower = acCapacitiveReactivePower;
+    }
+
+    public BigDecimal getAcCapacitiveReactivePower()
+    {
+        return acCapacitiveReactivePower;
+    }
+
+    public void setAcDischargeActivePower(BigDecimal acDischargeActivePower)
+    {
+        this.acDischargeActivePower = acDischargeActivePower;
+    }
+
+    public BigDecimal getAcDischargeActivePower()
+    {
+        return acDischargeActivePower;
+    }
+
+    public void setAcInductiveReactivePower(BigDecimal acInductiveReactivePower)
+    {
+        this.acInductiveReactivePower = acInductiveReactivePower;
+    }
+
+    public BigDecimal getAcInductiveReactivePower()
+    {
+        return acInductiveReactivePower;
+    }
+
+    public void setMaxCapacitivePowerCapacity(BigDecimal maxCapacitivePowerCapacity)
+    {
+        this.maxCapacitivePowerCapacity = maxCapacitivePowerCapacity;
+    }
+
+    public BigDecimal getMaxCapacitivePowerCapacity()
+    {
+        return maxCapacitivePowerCapacity;
+    }
+
+    public void setMaxInductivePowerCapacity(BigDecimal maxInductivePowerCapacity)
+    {
+        this.maxInductivePowerCapacity = maxInductivePowerCapacity;
+    }
+
+    public BigDecimal getMaxInductivePowerCapacity()
+    {
+        return maxInductivePowerCapacity;
+    }
+
+    public void setMaxChargePowerCapacity(BigDecimal maxChargePowerCapacity)
+    {
+        this.maxChargePowerCapacity = maxChargePowerCapacity;
+    }
+
+    public BigDecimal getMaxChargePowerCapacity()
+    {
+        return maxChargePowerCapacity;
+    }
+
+    public void setMaxDischargePowerCapacity(BigDecimal maxDischargePowerCapacity)
+    {
+        this.maxDischargePowerCapacity = maxDischargePowerCapacity;
+    }
+
+    public BigDecimal getMaxDischargePowerCapacity()
+    {
+        return maxDischargePowerCapacity;
+    }
+
+    public void setAcSwitchStatus(String acSwitchStatus)
+    {
+        this.acSwitchStatus = acSwitchStatus;
+    }
+
+    public String getAcSwitchStatus()
+    {
+        return acSwitchStatus;
+    }
+
+    public void setDcSwitchStatus(String dcSwitchStatus)
+    {
+        this.dcSwitchStatus = dcSwitchStatus;
+    }
+
+    public String getDcSwitchStatus()
+    {
+        return dcSwitchStatus;
+    }
+
+    public void setRemoteControlStatus(String remoteControlStatus)
+    {
+        this.remoteControlStatus = remoteControlStatus;
+    }
+
+    public String getRemoteControlStatus()
+    {
+        return remoteControlStatus;
     }
 
     @Override
@@ -472,6 +658,19 @@ public class EmsPcsData extends BaseEntity
                 .append("deviceId", getDeviceId())
                 .append("dateMonth", getDateMonth())
                 .append("dateDay", getDateDay())
+                .append("totalAcChargeEnergy", getTotalAcChargeEnergy())
+                .append("totalAcDischargeEnergy", getTotalAcDischargeEnergy())
+                .append("acChargeActivePower", getAcChargeActivePower())
+                .append("acCapacitiveReactivePower", getAcCapacitiveReactivePower())
+                .append("acDischargeActivePower", getAcDischargeActivePower())
+                .append("acInductiveReactivePower", getAcInductiveReactivePower())
+                .append("maxCapacitivePowerCapacity", getMaxCapacitivePowerCapacity())
+                .append("maxInductivePowerCapacity", getMaxInductivePowerCapacity())
+                .append("maxChargePowerCapacity", getMaxChargePowerCapacity())
+                .append("maxDischargePowerCapacity", getMaxDischargePowerCapacity())
+                .append("acSwitchStatus", getAcSwitchStatus())
+                .append("dcSwitchStatus", getDcSwitchStatus())
+                .append("remoteControlStatus", getRemoteControlStatus())
                 .toString();
     }
 }

ems-system/src/main/java/com/xzzn/ems/domain/EmsSiteSetting.java

@@ -0,0 +1,166 @@
+package com.xzzn.ems.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xzzn.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.xzzn.common.annotation.Excel;
+
+/**
+ * 站点对象 ems_site_setting
+ *
+ * @author xzzn
+ * @date 2025-06-29
+ */
+public class EmsSiteSetting extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 自增主键 */
+    private Long id;
+
+    /** 站点名称 */
+    @Excel(name = "站点名称")
+    private String siteName;
+
+    /** 站点地址 */
+    @Excel(name = "站点地址")
+    private String siteAddress;
+
+    /** 运营时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "运营时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date runningTime;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private BigDecimal latitude;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    /** 装机容量 */
+    @Excel(name = "装机容量")
+    private BigDecimal installCapacity;
+
+    /** 装机功率 */
+    @Excel(name = "装机功率")
+    private BigDecimal installPower;
+
+    /** 站点id */
+    @Excel(name = "站点id")
+    private String siteId;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setSiteName(String siteName)
+    {
+        this.siteName = siteName;
+    }
+
+    public String getSiteName()
+    {
+        return siteName;
+    }
+
+    public void setSiteAddress(String siteAddress)
+    {
+        this.siteAddress = siteAddress;
+    }
+
+    public String getSiteAddress()
+    {
+        return siteAddress;
+    }
+
+    public void setRunningTime(Date runningTime)
+    {
+        this.runningTime = runningTime;
+    }
+
+    public Date getRunningTime()
+    {
+        return runningTime;
+    }
+
+    public void setLatitude(BigDecimal latitude)
+    {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getLatitude()
+    {
+        return latitude;
+    }
+
+    public void setLongitude(BigDecimal longitude)
+    {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLongitude()
+    {
+        return longitude;
+    }
+
+    public void setInstallCapacity(BigDecimal installCapacity)
+    {
+        this.installCapacity = installCapacity;
+    }
+
+    public BigDecimal getInstallCapacity()
+    {
+        return installCapacity;
+    }
+
+    public void setInstallPower(BigDecimal installPower)
+    {
+        this.installPower = installPower;
+    }
+
+    public BigDecimal getInstallPower()
+    {
+        return installPower;
+    }
+
+    public void setSiteId(String siteId)
+    {
+        this.siteId = siteId;
+    }
+
+    public String getSiteId()
+    {
+        return siteId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("siteName", getSiteName())
+                .append("siteAddress", getSiteAddress())
+                .append("runningTime", getRunningTime())
+                .append("latitude", getLatitude())
+                .append("longitude", getLongitude())
+                .append("installCapacity", getInstallCapacity())
+                .append("installPower", getInstallPower())
+                .append("remark", getRemark())
+                .append("createBy", getCreateBy())
+                .append("updateBy", getUpdateBy())
+                .append("createTime", getCreateTime())
+                .append("updateTime", getUpdateTime())
+                .append("siteId", getSiteId())
+                .toString();
+    }
+}

ems-system/src/main/java/com/xzzn/ems/domain/EmsTicket.java

@@ -0,0 +1,164 @@
+package com.xzzn.ems.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xzzn.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.xzzn.common.annotation.Excel;
+
+/**
+ * 工单主对象 ems_ticket
+ * 
+ * @author xzzn
+ * @date 2025-06-26
+ */
+public class EmsTicket extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 工单号（规则：T+日期+6位随机） */
+    @Excel(name = "工单号", readConverterExp = "规=则：T+日期+6位随机")
+    private String ticketNo;
+
+    /** 提交用户ID */
+    @Excel(name = "提交用户ID")
+    private String userId;
+
+    /** 工单标题 */
+    @Excel(name = "工单标题")
+    private String title;
+
+    /** 问题描述 */
+    @Excel(name = "问题描述")
+    private String content;
+
+    /** 图片URL数组 */
+    @Excel(name = "图片URL数组")
+    private String images;
+
+    /** 1待处理 2处理中 3已完成 */
+    @Excel(name = "1待处理 2处理中 3已完成")
+    private Long status;
+
+    /** 完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date completeTime;
+
+    /** 处理人ID */
+    @Excel(name = "处理人ID")
+    private Long workUserId;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+
+    public void setTicketNo(String ticketNo) 
+    {
+        this.ticketNo = ticketNo;
+    }
+
+    public String getTicketNo() 
+    {
+        return ticketNo;
+    }
+
+    public void setUserId(String userId) 
+    {
+        this.userId = userId;
+    }
+
+    public String getUserId() 
+    {
+        return userId;
+    }
+
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+
+    public void setImages(String images) 
+    {
+        this.images = images;
+    }
+
+    public String getImages() 
+    {
+        return images;
+    }
+
+    public void setStatus(Long status) 
+    {
+        this.status = status;
+    }
+
+    public Long getStatus() 
+    {
+        return status;
+    }
+
+    public void setCompleteTime(Date completeTime) 
+    {
+        this.completeTime = completeTime;
+    }
+
+    public Date getCompleteTime() 
+    {
+        return completeTime;
+    }
+
+    public void setWorkUserId(Long workUserId) 
+    {
+        this.workUserId = workUserId;
+    }
+
+    public Long getWorkUserId() 
+    {
+        return workUserId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("ticketNo", getTicketNo())
+            .append("userId", getUserId())
+            .append("title", getTitle())
+            .append("content", getContent())
+            .append("images", getImages())
+            .append("status", getStatus())
+            .append("createTime", getCreateTime())
+            .append("completeTime", getCompleteTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("workUserId", getWorkUserId())
+            .toString();
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.xzzn.ems.domain.vo;
+
+/**
+ * 首页看板数据概览-告警等级分布
+ */
+public class AlarmGradeList {
+    /**
+     * 告警等级
+     */
+    private String grade;
+
+    /**
+     * 数据一
+     */
+    private int num1;
+
+    /**
+     * 数据三
+     */
+    private int num2;
+
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
+    public int getNum1() {
+        return num1;
+    }
+
+    public void setNum1(int num1) {
+        this.num1 = num1;
+    }
+
+    public int getNum2() {
+        return num2;
+    }
+
+    public void setNum2(int num2) {
+        this.num2 = num2;
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.xzzn.ems.domain.vo;
+
+
+import java.util.Date;
+
+/**
+ * 单站监控-故障告警请求
+ *
+ */
+public class AlarmRecordListRequestVo {
+    /** 站点id */
+    private String siteId;
+
+    /** 设备类型 */
+    private String deviceType;
+
+    /** 告警等级 */
+    private String alarmLevel;
+
+    /** 告警发生时间 */
+    private String alarmStartTime;
+
+    /** 告警结束时间 */
+    private String alarmEndTime;
+
+    public String getSiteId() {
+        return siteId;
+    }
+
+    public void setSiteId(String siteId) {
+        this.siteId = siteId;
+    }
+
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public String getAlarmLevel() {
+        return alarmLevel;
+    }
+
+    public void setAlarmLevel(String alarmLevel) {
+        this.alarmLevel = alarmLevel;
+    }
+
+    public String getAlarmStartTime() {
+        return alarmStartTime;
+    }
+
+    public void setAlarmStartTime(String alarmStartTime) {
+        this.alarmStartTime = alarmStartTime;
+    }
+
+    public String getAlarmEndTime() {
+        return alarmEndTime;
+    }
+
+    public void setAlarmEndTime(String alarmEndTime) {
+        this.alarmEndTime = alarmEndTime;
+    }
+}

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

@@ -0,0 +1,78 @@
+package com.xzzn.ems.domain.vo;
+
+
+import com.xzzn.common.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 单站监控-故障告警返回
+ *
+ */
+public class AlarmRecordListResponseVo {
+    /** 设备名称 */
+    private String deviceName;
+
+    /** 告警等级 */
+    private String alarmLevel;
+
+    /** 告警内容 */
+    private String alarmContent;
+
+    /** 告警发生时间 */
+    private Date alarmStartTime;
+
+    /** 告警结束时间 */
+    private Date alarmEndTime;
+
+    /** 状态 */
+    private String status;
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getAlarmLevel() {
+        return alarmLevel;
+    }
+
+    public void setAlarmLevel(String alarmLevel) {
+        this.alarmLevel = alarmLevel;
+    }
+
+    public String getAlarmContent() {
+        return alarmContent;
+    }
+
+    public void setAlarmContent(String alarmContent) {
+        this.alarmContent = alarmContent;
+    }
+
+    public Date getAlarmStartTime() {
+        return alarmStartTime;
+    }
+
+    public void setAlarmStartTime(Date alarmStartTime) {
+        this.alarmStartTime = alarmStartTime;
+    }
+
+    public Date getAlarmEndTime() {
+        return alarmEndTime;
+    }
+
+    public void setAlarmEndTime(Date alarmEndTime) {
+        this.alarmEndTime = alarmEndTime;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.xzzn.ems.domain.vo;
+
+/**
+ * 首页看板数据概览-告警趋势
+ */
+public class AlarmTrendList {
+    /**
+     * 月份
+     */
+    private int dateMonth;
+
+    /**
+     * 报警数
+     */
+    private int alarmNum;
+
+    public int getDateMonth() {
+        return dateMonth;
+    }
+
+    public void setDateMonth(int dateMonth) {
+        this.dateMonth = dateMonth;
+    }
+
+    public int getAlarmNum() {
+        return alarmNum;
+    }
+
+    public void setAlarmNum(int alarmNum) {
+        this.alarmNum = alarmNum;
+    }
+}

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

@@ -0,0 +1,31 @@
+package com.xzzn.ems.domain.vo;
+
+import java.util.List;
+
+/**
+ * 电表数据
+ */
+public class AmmeterDataResponse {
+
+    /** 总表信息 */
+    private AmmeterLoadDataVo ammeterLoadData;
+
+    /** 储能表信息 */
+    private AmmeterMeteDataVo ammeterMeteData;
+
+    public AmmeterLoadDataVo getAmmeterLoadData() {
+        return ammeterLoadData;
+    }
+
+    public void setAmmeterLoadDataVoList(AmmeterLoadDataVo ammeterLoadData) {
+        this.ammeterLoadData = ammeterLoadData;
+    }
+
+    public AmmeterMeteDataVo getAmmeterMeteData() {
+        return ammeterMeteData;
+    }
+
+    public void setAmmeterMeteDataVoList(AmmeterMeteDataVo ammeterMeteData) {
+        this.ammeterMeteData = ammeterMeteData;
+    }
+}

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

@@ -0,0 +1,57 @@
+package com.xzzn.ems.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 电表-总表数据
+ */
+public class AmmeterLoadDataVo {
+
+    /** 电表名称 */
+    private String deviceName;
+
+    /** 通信状态 */
+    private String emsCommunicationStatus;
+
+    /** 数据更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dataUpdateTime;
+
+    /** 总表数据信息 */
+    private List<LoadDataDetailInfo> loadDataDetailInfo;
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getEmsCommunicationStatus() {
+        return emsCommunicationStatus;
+    }
+
+    public void setEmsCommunicationStatus(String emsCommunicationStatus) {
+        this.emsCommunicationStatus = emsCommunicationStatus;
+    }
+
+    public Date getDataUpdateTime() {
+        return dataUpdateTime;
+    }
+
+    public void setDataUpdateTime(Date dataUpdateTime) {
+        this.dataUpdateTime = dataUpdateTime;
+    }
+
+    public List<LoadDataDetailInfo> getLoadDataDetailInfo() {
+        return loadDataDetailInfo;
+    }
+
+    public void setLoadDataDetailInfo(List<LoadDataDetailInfo> loadDataDetailInfo) {
+        this.loadDataDetailInfo = loadDataDetailInfo;
+    }
+}

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

@@ -0,0 +1,57 @@
+package com.xzzn.ems.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 电表-总表数据
+ */
+public class AmmeterMeteDataVo {
+
+    /** 电表名称 */
+    private String deviceName;
+
+    /** 通信状态 */
+    private String emsCommunicationStatus;
+
+    /** 数据更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dataUpdateTime;
+
+    /** 储能表数据信息 */
+    private List<MeteDataDetailInfo> meteDataDetailInfo;
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getEmsCommunicationStatus() {
+        return emsCommunicationStatus;
+    }
+
+    public void setEmsCommunicationStatus(String emsCommunicationStatus) {
+        this.emsCommunicationStatus = emsCommunicationStatus;
+    }
+
+    public Date getDataUpdateTime() {
+        return dataUpdateTime;
+    }
+
+    public void setDataUpdateTime(Date dataUpdateTime) {
+        this.dataUpdateTime = dataUpdateTime;
+    }
+
+    public List<MeteDataDetailInfo> getMeteDataDetailInfo() {
+        return meteDataDetailInfo;
+    }
+
+    public void setMeteDataDetailInfo(List<MeteDataDetailInfo> meteDataDetailInfo) {
+        this.meteDataDetailInfo = meteDataDetailInfo;
+    }
+}

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

@@ -0,0 +1,76 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * BMS电池簇-电池单体数据
+ */
+public class BMSBatteryClusterDataList {
+    /**
+     * 名称
+     */
+    private String dataName;
+
+    /** 单体平均值 */
+    private BigDecimal avgData;
+
+    /** 单体最小值 */
+    private BigDecimal minData;
+
+    /** 单体最小值ID  */
+    private String minDataID;
+
+    /** 单体最大值  */
+    private BigDecimal maxData;
+
+    /** 单体最大值ID */
+    private String maxDataID;
+
+    public String getDataName() {
+        return dataName;
+    }
+
+    public void setDataName(String dataName) {
+        this.dataName = dataName;
+    }
+
+    public BigDecimal getAvgData() {
+        return avgData;
+    }
+
+    public void setAvgData(BigDecimal avgData) {
+        this.avgData = avgData;
+    }
+
+    public BigDecimal getMinData() {
+        return minData;
+    }
+
+    public void setMinData(BigDecimal minData) {
+        this.minData = minData;
+    }
+
+    public String getMinDataID() {
+        return minDataID;
+    }
+
+    public void setMinDataID(String minDataID) {
+        this.minDataID = minDataID;
+    }
+
+    public BigDecimal getMaxData() {
+        return maxData;
+    }
+
+    public void setMaxData(BigDecimal maxData) {
+        this.maxData = maxData;
+    }
+
+    public String getMaxDataID() {
+        return maxDataID;
+    }
+
+    public void setMaxDataID(String maxDataID) {
+        this.maxDataID = maxDataID;
+    }
+}

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

@@ -0,0 +1,197 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * BMS电池簇数据
+ *
+ */
+public class BMSBatteryClusterVo {
+
+    /** 设备名称 */
+    private String deviceName;
+
+    /** 工作状态 */
+    private String workStatus;
+
+    /** 与PCS通信状态 */
+    private String pcsCommunicationStatus;
+
+    /** 与EMS通信状态 */
+    private String emsCommunicationStatus;
+
+    /** 簇电压 (V) */
+    private BigDecimal clusterVoltage;
+
+    /** 可充电量 (kWh) */
+    private BigDecimal chargeableCapacity;
+
+    /** 累计充电量 (kWh) */
+    private BigDecimal totalChargedCapacity;
+
+    /** 簇电流 (A) */
+    private BigDecimal clusterCurrent;
+
+    /** 可放电量 (kWh) */
+    private BigDecimal dischargeableCapacity;
+
+    /** 累计放电量 (kWh) */
+    private BigDecimal totalDischargedCapacity;
+
+    /** SOH (%) */
+    private BigDecimal soh;
+
+    /** 平均温度 (℃) */
+    private BigDecimal averageTemperature;
+
+    /** 绝缘电阻 (Ω) */
+    private BigDecimal insulationResistance;
+
+    /** 当前SOC (%) */
+    private BigDecimal currentSoc;
+
+    /** 站点id */
+    private String siteId;
+
+    /** 设备唯一标识符 */
+    private String deviceId;
+
+    private List<BMSBatteryClusterDataList> batteryDataList;
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getWorkStatus() {
+        return workStatus;
+    }
+
+    public void setWorkStatus(String workStatus) {
+        this.workStatus = workStatus;
+    }
+
+    public String getPcsCommunicationStatus() {
+        return pcsCommunicationStatus;
+    }
+
+    public void setPcsCommunicationStatus(String pcsCommunicationStatus) {
+        this.pcsCommunicationStatus = pcsCommunicationStatus;
+    }
+
+    public String getEmsCommunicationStatus() {
+        return emsCommunicationStatus;
+    }
+
+    public void setEmsCommunicationStatus(String emsCommunicationStatus) {
+        this.emsCommunicationStatus = emsCommunicationStatus;
+    }
+
+    public BigDecimal getClusterVoltage() {
+        return clusterVoltage;
+    }
+
+    public void setClusterVoltage(BigDecimal clusterVoltage) {
+        this.clusterVoltage = clusterVoltage;
+    }
+
+    public BigDecimal getChargeableCapacity() {
+        return chargeableCapacity;
+    }
+
+    public void setChargeableCapacity(BigDecimal chargeableCapacity) {
+        this.chargeableCapacity = chargeableCapacity;
+    }
+
+    public BigDecimal getTotalChargedCapacity() {
+        return totalChargedCapacity;
+    }
+
+    public void setTotalChargedCapacity(BigDecimal totalChargedCapacity) {
+        this.totalChargedCapacity = totalChargedCapacity;
+    }
+
+    public BigDecimal getClusterCurrent() {
+        return clusterCurrent;
+    }
+
+    public void setClusterCurrent(BigDecimal clusterCurrent) {
+        this.clusterCurrent = clusterCurrent;
+    }
+
+    public BigDecimal getDischargeableCapacity() {
+        return dischargeableCapacity;
+    }
+
+    public void setDischargeableCapacity(BigDecimal dischargeableCapacity) {
+        this.dischargeableCapacity = dischargeableCapacity;
+    }
+
+    public BigDecimal getTotalDischargedCapacity() {
+        return totalDischargedCapacity;
+    }
+
+    public void setTotalDischargedCapacity(BigDecimal totalDischargedCapacity) {
+        this.totalDischargedCapacity = totalDischargedCapacity;
+    }
+
+    public BigDecimal getSoh() {
+        return soh;
+    }
+
+    public void setSoh(BigDecimal soh) {
+        this.soh = soh;
+    }
+
+    public BigDecimal getAverageTemperature() {
+        return averageTemperature;
+    }
+
+    public void setAverageTemperature(BigDecimal averageTemperature) {
+        this.averageTemperature = averageTemperature;
+    }
+
+    public BigDecimal getInsulationResistance() {
+        return insulationResistance;
+    }
+
+    public void setInsulationResistance(BigDecimal insulationResistance) {
+        this.insulationResistance = insulationResistance;
+    }
+
+    public BigDecimal getCurrentSoc() {
+        return currentSoc;
+    }
+
+    public void setCurrentSoc(BigDecimal currentSoc) {
+        this.currentSoc = currentSoc;
+    }
+
+    public String getSiteId() {
+        return siteId;
+    }
+
+    public void setSiteId(String siteId) {
+        this.siteId = siteId;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public List<BMSBatteryClusterDataList> getBatteryDataList() {
+        return batteryDataList;
+    }
+
+    public void setBatteryDataList(List<BMSBatteryClusterDataList> batteryDataList) {
+        this.batteryDataList = batteryDataList;
+    }
+}

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

@@ -0,0 +1,120 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * BMS总览-电池堆电池簇单体数据
+ */
+public class BMSBatteryDataList {
+    /**
+     * 簇号
+     */
+    private String clusterId;
+
+    /** 簇电压 (V) */
+    private BigDecimal clusterVoltage;
+
+    /** 簇电流 (A) */
+    private BigDecimal clusterCurrent;
+
+    /** 簇SOC (%) */
+    private BigDecimal currentSoc;
+
+    /** 单体最高电压 (V) */
+    private BigDecimal maxCellVoltage;
+
+    /** 单体最低电压 (V) */
+    private BigDecimal minCellVoltage;
+
+    /** 单体最高温度 (℃) */
+    private BigDecimal maxCellTemp;
+
+    /** 单体最低温度 (℃) */
+    private BigDecimal minCellTemp;
+
+    /** 换电站id */
+    private String siteId;
+
+    /** 堆id */
+    private String stackDeviceId;
+
+    public String getClusterId() {
+        return clusterId;
+    }
+
+    public void setClusterId(String clusterId) {
+        this.clusterId = clusterId;
+    }
+
+    public String getStackDeviceId() {
+        return stackDeviceId;
+    }
+
+    public void setStackDeviceId(String stackDeviceId) {
+        this.stackDeviceId = stackDeviceId;
+    }
+
+    public String getSiteId() {
+        return siteId;
+    }
+
+    public void setSiteId(String siteId) {
+        this.siteId = siteId;
+    }
+
+    public BigDecimal getMinCellTemp() {
+        return minCellTemp;
+    }
+
+    public void setMinCellTemp(BigDecimal minCellTemp) {
+        this.minCellTemp = minCellTemp;
+    }
+
+    public BigDecimal getMaxCellTemp() {
+        return maxCellTemp;
+    }
+
+    public void setMaxCellTemp(BigDecimal maxCellTemp) {
+        this.maxCellTemp = maxCellTemp;
+    }
+
+    public BigDecimal getMinCellVoltage() {
+        return minCellVoltage;
+    }
+
+    public void setMinCellVoltage(BigDecimal minCellVoltage) {
+        this.minCellVoltage = minCellVoltage;
+    }
+
+    public BigDecimal getMaxCellVoltage() {
+        return maxCellVoltage;
+    }
+
+    public void setMaxCellVoltage(BigDecimal maxCellVoltage) {
+        this.maxCellVoltage = maxCellVoltage;
+    }
+
+    public BigDecimal getCurrentSoc() {
+        return currentSoc;
+    }
+
+    public void setCurrentSoc(BigDecimal currentSoc) {
+        this.currentSoc = currentSoc;
+    }
+
+    public BigDecimal getClusterCurrent() {
+        return clusterCurrent;
+    }
+
+    public void setClusterCurrent(BigDecimal clusterCurrent) {
+        this.clusterCurrent = clusterCurrent;
+    }
+
+    public BigDecimal getClusterVoltage() {
+        return clusterVoltage;
+    }
+
+    public void setClusterVoltage(BigDecimal clusterVoltage) {
+        this.clusterVoltage = clusterVoltage;
+    }
+}

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

@@ -0,0 +1,197 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * BMS总览数据
+ *
+ */
+public class BMSOverViewVo {
+
+    /** 设备名称 */
+    private String deviceName;
+
+    /** 工作状态 */
+    private String workStatus;
+
+    /** 与PCS通信状态 */
+    private String pcsCommunicationStatus;
+
+    /** 与EMS通信状态 */
+    private String emsCommunicationStatus;
+
+    /** 电池堆总电压 (V) */
+    private BigDecimal stackVoltage;
+
+    /** 可充电量 (kWh) */
+    private BigDecimal availableChargeCapacity;
+
+    /** 累计充电量 (kWh) */
+    private BigDecimal totalChargeCapacity;
+
+    /** 电池堆总电流 (A) */
+    private BigDecimal stackCurrent;
+
+    /** 可放电量 (kWh) */
+    private BigDecimal availableDischargeCapacity;
+
+    /** 累计放电量 (kWh) */
+    private BigDecimal totalDischargeCapacity;
+
+    /** SOH (%) */
+    private BigDecimal stackSoh;
+
+    /** 平均温度 (℃) */
+    private BigDecimal operatingTemp;
+
+    /** 绝缘电阻 (Ω) */
+    private BigDecimal stackInsulationResistance;
+
+    /** 当前SOC (%) */
+    private BigDecimal stackSoc;
+
+    /** 站点id */
+    private String siteId;
+
+    /** 设备唯一标识符 */
+    private String deviceId;
+
+    private List<BMSBatteryDataList> batteryDataList;
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getWorkStatus() {
+        return workStatus;
+    }
+
+    public void setWorkStatus(String workStatus) {
+        this.workStatus = workStatus;
+    }
+
+    public String getPcsCommunicationStatus() {
+        return pcsCommunicationStatus;
+    }
+
+    public void setPcsCommunicationStatus(String pcsCommunicationStatus) {
+        this.pcsCommunicationStatus = pcsCommunicationStatus;
+    }
+
+    public String getEmsCommunicationStatus() {
+        return emsCommunicationStatus;
+    }
+
+    public void setEmsCommunicationStatus(String emsCommunicationStatus) {
+        this.emsCommunicationStatus = emsCommunicationStatus;
+    }
+
+    public BigDecimal getStackVoltage() {
+        return stackVoltage;
+    }
+
+    public void setStackVoltage(BigDecimal stackVoltage) {
+        this.stackVoltage = stackVoltage;
+    }
+
+    public BigDecimal getAvailableChargeCapacity() {
+        return availableChargeCapacity;
+    }
+
+    public void setAvailableChargeCapacity(BigDecimal availableChargeCapacity) {
+        this.availableChargeCapacity = availableChargeCapacity;
+    }
+
+    public BigDecimal getTotalChargeCapacity() {
+        return totalChargeCapacity;
+    }
+
+    public void setTotalChargeCapacity(BigDecimal totalChargeCapacity) {
+        this.totalChargeCapacity = totalChargeCapacity;
+    }
+
+    public BigDecimal getStackCurrent() {
+        return stackCurrent;
+    }
+
+    public void setStackCurrent(BigDecimal stackCurrent) {
+        this.stackCurrent = stackCurrent;
+    }
+
+    public BigDecimal getAvailableDischargeCapacity() {
+        return availableDischargeCapacity;
+    }
+
+    public void setAvailableDischargeCapacity(BigDecimal availableDischargeCapacity) {
+        this.availableDischargeCapacity = availableDischargeCapacity;
+    }
+
+    public BigDecimal getTotalDischargeCapacity() {
+        return totalDischargeCapacity;
+    }
+
+    public void setTotalDischargeCapacity(BigDecimal totalDischargeCapacity) {
+        this.totalDischargeCapacity = totalDischargeCapacity;
+    }
+
+    public BigDecimal getStackSoh() {
+        return stackSoh;
+    }
+
+    public void setStackSoh(BigDecimal stackSoh) {
+        this.stackSoh = stackSoh;
+    }
+
+    public BigDecimal getOperatingTemp() {
+        return operatingTemp;
+    }
+
+    public void setOperatingTemp(BigDecimal operatingTemp) {
+        this.operatingTemp = operatingTemp;
+    }
+
+    public BigDecimal getStackInsulationResistance() {
+        return stackInsulationResistance;
+    }
+
+    public void setStackInsulationResistance(BigDecimal stackInsulationResistance) {
+        this.stackInsulationResistance = stackInsulationResistance;
+    }
+
+    public BigDecimal getStackSoc() {
+        return stackSoc;
+    }
+
+    public void setStackSoc(BigDecimal stackSoc) {
+        this.stackSoc = stackSoc;
+    }
+
+    public String getSiteId() {
+        return siteId;
+    }
+
+    public void setSiteId(String siteId) {
+        this.siteId = siteId;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public List<BMSBatteryDataList> getBatteryDataList() {
+        return batteryDataList;
+    }
+
+    public void setBatteryDataList(List<BMSBatteryDataList> batteryDataList) {
+        this.batteryDataList = batteryDataList;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.xzzn.ems.domain.vo;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 实时运行-电池平均SOC数据
@@ -8,26 +9,21 @@ import java.math.BigDecimal;
  */
 public class BatteryAveSOCVo {
     /**
-     * 月份 月+日
+     * 数据时间
      */
-    private String monthDay;
+    private Date createDate;
 
     /**
      * 实时SOC
      */
     private BigDecimal batterySOC;
 
-    /**
-     * 昨日SOC
-     */
-    private BigDecimal ytdBatterySOC;
-
-    public String getMonthDay() {
-        return monthDay;
+    public Date getCreateDate() {
+        return createDate;
     }
 
-    public void setMonthDay(String monthDay) {
-        this.monthDay = monthDay;
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
     }
 
     public BigDecimal getBatterySOC() {
@@ -37,12 +33,4 @@ public class BatteryAveSOCVo {
     public void setBatterySOC(BigDecimal batterySOC) {
         this.batterySOC = batterySOC;
     }
-
-    public BigDecimal getYtdBatterySOC() {
-        return ytdBatterySOC;
-    }
-
-    public void setYtdBatterySOC(BigDecimal ytdBatterySOC) {
-        this.ytdBatterySOC = ytdBatterySOC;
-    }
 }

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

@@ -1,6 +1,7 @@
 package com.xzzn.ems.domain.vo;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 实时运行-电池平均温度数据
@@ -8,27 +9,21 @@ import java.math.BigDecimal;
  */
 public class BatteryAveTempVo {
     /**
-     * 月份 月+日
+     * 数据时间
      */
-    private String monthDay;
+    private Date createDate;
 
     /**
      * 实时温度
      */
     private BigDecimal batteryTemp;
 
-    /**
-     * 昨日温度
-     */
-    private BigDecimal batteryYtdTemp;
-
-
-    public String getMonthDay() {
-        return monthDay;
+    public Date getCreateDate() {
+        return createDate;
     }
 
-    public void setMonthDay(String monthDay) {
-        this.monthDay = monthDay;
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
     }
 
     public BigDecimal getBatteryTemp() {
@@ -38,12 +33,4 @@ public class BatteryAveTempVo {
     public void setBatteryTemp(BigDecimal batteryTemp) {
         this.batteryTemp = batteryTemp;
     }
-
-    public BigDecimal getBatteryYtdTemp() {
-        return batteryYtdTemp;
-    }
-
-    public void setBatteryYtdTemp(BigDecimal batteryYtdTemp) {
-        this.batteryYtdTemp = batteryYtdTemp;
-    }
 }

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

@@ -0,0 +1,130 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * BMS电池簇-电池单体数据
+ */
+public class BatteryClusterDataDetailVo {
+
+    /** 设备id */
+    private String siteId;
+
+    /** 电池簇id */
+    private String clusterId;
+
+    /** 电压平均值 */
+    private BigDecimal avgVoltage;
+
+    /** 电压最大值 */
+    private BigDecimal maxVoltage;
+
+    /** 电压最小值  */
+    private BigDecimal minVoltage;
+
+    /** 温度平均值  */
+    private BigDecimal avgTemp;
+
+    /** 温度最大值 */
+    private BigDecimal maxTemp;
+
+    /** 温度最小值  */
+    private BigDecimal minTemp;
+
+    /** soc平均值  */
+    private BigDecimal avgSoc;
+
+    /** soc最大值 */
+    private BigDecimal maxSoc;
+
+    /** soc最小值 */
+    private BigDecimal minSoc;
+
+    public String getSiteId() {
+        return siteId;
+    }
+
+    public void setSiteId(String siteId) {
+        this.siteId = siteId;
+    }
+
+    public String getClusterId() {
+        return clusterId;
+    }
+
+    public void setClusterId(String clusterId) {
+        this.clusterId = clusterId;
+    }
+
+    public BigDecimal getAvgVoltage() {
+        return avgVoltage;
+    }
+
+    public void setAvgVoltage(BigDecimal avgVoltage) {
+        this.avgVoltage = avgVoltage;
+    }
+
+    public BigDecimal getMaxVoltage() {
+        return maxVoltage;
+    }
+
+    public void setMaxVoltage(BigDecimal maxVoltage) {
+        this.maxVoltage = maxVoltage;
+    }
+
+    public BigDecimal getMinVoltage() {
+        return minVoltage;
+    }
+
+    public void setMinVoltage(BigDecimal minVoltage) {
+        this.minVoltage = minVoltage;
+    }
+
+    public BigDecimal getAvgTemp() {
+        return avgTemp;
+    }
+
+    public void setAvgTemp(BigDecimal avgTemp) {
+        this.avgTemp = avgTemp;
+    }
+
+    public BigDecimal getMaxTemp() {
+        return maxTemp;
+    }
+
+    public void setMaxTemp(BigDecimal maxTemp) {
+        this.maxTemp = maxTemp;
+    }
+
+    public BigDecimal getMinTemp() {
+        return minTemp;
+    }
+
+    public void setMinTemp(BigDecimal minTemp) {
+        this.minTemp = minTemp;
+    }
+
+    public BigDecimal getAvgSoc() {
+        return avgSoc;
+    }
+
+    public void setAvgSoc(BigDecimal avgSoc) {
+        this.avgSoc = avgSoc;
+    }
+
+    public BigDecimal getMaxSoc() {
+        return maxSoc;
+    }
+
+    public void setMaxSoc(BigDecimal maxSoc) {
+        this.maxSoc = maxSoc;
+    }
+
+    public BigDecimal getMinSoc() {
+        return minSoc;
+    }
+
+    public void setMinSoc(BigDecimal minSoc) {
+        this.minSoc = minSoc;
+    }
+}

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

@@ -0,0 +1,89 @@
+package com.xzzn.ems.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 单站监控-单体电池数据
+ *
+ */
+public class BatteryDataStatsListVo {
+    /** 单体电池设备id */
+    private String deviceId;
+
+    /** 电压 (V) */
+    private BigDecimal voltage;
+
+    /** 温度 (℃) */
+    private BigDecimal temperature;
+
+    /** SOC (%) */
+    private BigDecimal soc;
+
+    /** SOH (%) */
+    private BigDecimal soh;
+    
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date dataTimestamp;
+
+    /** 簇号 */
+    private String clusterDeviceId;
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public BigDecimal getVoltage() {
+        return voltage;
+    }
+
+    public void setVoltage(BigDecimal voltage) {
+        this.voltage = voltage;
+    }
+
+    public BigDecimal getTemperature() {
+        return temperature;
+    }
+
+    public void setTemperature(BigDecimal temperature) {
+        this.temperature = temperature;
+    }
+
+    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 Date getDataTimestamp() {
+        return dataTimestamp;
+    }
+
+    public void setDataTimestamp(Date dataTimestamp) {
+        this.dataTimestamp = dataTimestamp;
+    }
+
+    public String getClusterDeviceId() {
+        return clusterDeviceId;
+    }
+
+    public void setClusterDeviceId(String clusterDeviceId) {
+        this.clusterDeviceId = clusterDeviceId;
+    }
+}

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

@@ -0,0 +1,47 @@
+package com.xzzn.ems.domain.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * 入参-时间
+ *
+ */
+public class DateSearchRequest {
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
+    private String siteId;
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getSiteId() {
+        return siteId;
+    }
+
+    public void setSiteId(String siteId) {
+        this.siteId = siteId;
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.xzzn.ems.domain.vo;
+
+/**
+ * 首页看板数据概览-设备告警占比
+ */
+public class DeviceAlarmProportionList {
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 数量
+     */
+    private int alarmNum;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public int getAlarmNum() {
+        return alarmNum;
+    }
+
+    public void setAlarmNum(int alarmNum) {
+        this.alarmNum = alarmNum;
+    }
+}

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

@@ -0,0 +1,76 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 概率统计-电量指标返回
+ *
+ */
+public class ElectricDataInfoVo {
+
+    /**
+     * 显示时间单位
+     */
+    private String unit;
+
+    /**
+     * 总充电量
+     */
+    private BigDecimal totalChargedCap;
+
+    /**
+     * 总放电量
+     */
+    private BigDecimal totalDisChargedCap;
+
+    /**
+     * 综合效率 = 放电量/充电量
+     */
+    private BigDecimal efficiency;
+
+    /**
+     * 按天放电统计
+     */
+    private List<SiteMonitorDataVo> sevenDayDisChargeStats;
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public BigDecimal getTotalChargedCap() {
+        return totalChargedCap;
+    }
+
+    public void setTotalChargedCap(BigDecimal totalChargedCap) {
+        this.totalChargedCap = totalChargedCap;
+    }
+
+    public BigDecimal getTotalDisChargedCap() {
+        return totalDisChargedCap;
+    }
+
+    public void setTotalDisChargedCap(BigDecimal totalDisChargedCap) {
+        this.totalDisChargedCap = totalDisChargedCap;
+    }
+
+    public BigDecimal getEfficiency() {
+        return efficiency;
+    }
+
+    public void setEfficiency(BigDecimal efficiency) {
+        this.efficiency = efficiency;
+    }
+
+    public List<SiteMonitorDataVo> getSevenDayDisChargeStats() {
+        return sevenDayDisChargeStats;
+    }
+
+    public void setSevenDayDisChargeStats(List<SiteMonitorDataVo> sevenDayDisChargeStats) {
+        this.sevenDayDisChargeStats = sevenDayDisChargeStats;
+    }
+}

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

@@ -0,0 +1,47 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * 首页看板数据概览-电量指标
+ */
+public class ElectricIndexList {
+    /**
+     * 月份
+     */
+    private int dateMonth;
+
+    /**
+     * 充电量
+     */
+    private BigDecimal chargeEnergy;
+
+    /**
+     * 放电量
+     */
+    private BigDecimal disChargeEnergy;
+
+    public int getDateMonth() {
+        return dateMonth;
+    }
+
+    public void setDateMonth(int dateMonth) {
+        this.dateMonth = dateMonth;
+    }
+
+    public BigDecimal getChargeEnergy() {
+        return chargeEnergy;
+    }
+
+    public void setChargeEnergy(BigDecimal chargeEnergy) {
+        this.chargeEnergy = chargeEnergy;
+    }
+
+    public BigDecimal getDisChargeEnergy() {
+        return disChargeEnergy;
+    }
+
+    public void setDisChargeEnergy(BigDecimal disChargeEnergy) {
+        this.disChargeEnergy = disChargeEnergy;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.xzzn.ems.domain.vo;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 实时运行-储能功率数据
@@ -8,9 +9,9 @@ import java.math.BigDecimal;
  */
 public class EnergyStoragePowVo {
     /**
-     * 月份 月+日
+     * 显示日期
      */
-    private String monthDay;
+    private Date createDate;
 
     /**
      * pcs实时有功功率
@@ -22,22 +23,13 @@ public class EnergyStoragePowVo {
      */
     private BigDecimal pcsTotalReactivePower;
 
-    /**
-     * pcs昨日有功功率
-     */
-    private BigDecimal pcsYtdActPower;
 
-    /**
-     * pcs昨日无功功率
-     */
-    private BigDecimal pcsYtdReactivePower;
-
-    public String getMonthDay() {
-        return monthDay;
+    public Date getCreateDate() {
+        return createDate;
     }
 
-    public void setMonthDay(String monthDay) {
-        this.monthDay = monthDay;
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
     }
 
     public BigDecimal getPcsTotalActPower() {
@@ -55,20 +47,4 @@ public class EnergyStoragePowVo {
     public void setPcsTotalReactivePower(BigDecimal pcsTotalReactivePower) {
         this.pcsTotalReactivePower = pcsTotalReactivePower;
     }
-
-    public BigDecimal getPcsYtdActPower() {
-        return pcsYtdActPower;
-    }
-
-    public void setPcsYtdActPower(BigDecimal pcsYtdActPower) {
-        this.pcsYtdActPower = pcsYtdActPower;
-    }
-
-    public BigDecimal getPcsYtdReactivePower() {
-        return pcsYtdReactivePower;
-    }
-
-    public void setPcsYtdReactivePower(BigDecimal pcsYtdReactivePower) {
-        this.pcsYtdReactivePower = pcsYtdReactivePower;
-    }
 }

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

@@ -0,0 +1,74 @@
+package com.xzzn.ems.domain.vo;
+
+import java.util.List;
+
+/**
+ * 首页看板-数据概览
+ *
+ */
+public class HomePageDataViewVo {
+    /**
+     * 电量指标
+     */
+    private List<ElectricIndexList> elecDataList;
+
+    /**
+     * 系统效率
+     */
+    private List<SystemEfficiencyList> sysEfficList;
+
+    /**
+     * 告警趋势
+     */
+    private List<AlarmTrendList> alarmDataList;
+
+    /**
+     * 设备告警占比
+     */
+    private List<DeviceAlarmProportionList> deviceAlarmList;
+
+    /**
+     * 告警等级分布
+     */
+    private List<AlarmGradeList> alarmLevelList;
+
+    public List<ElectricIndexList> getElecDataList() {
+        return elecDataList;
+    }
+
+    public void setElecDataList(List<ElectricIndexList> elecDataList) {
+        this.elecDataList = elecDataList;
+    }
+
+    public List<SystemEfficiencyList> getSysEfficList() {
+        return sysEfficList;
+    }
+
+    public void setSysEfficList(List<SystemEfficiencyList> sysEfficList) {
+        this.sysEfficList = sysEfficList;
+    }
+
+    public List<AlarmTrendList> getAlarmDataList() {
+        return alarmDataList;
+    }
+
+    public void setAlarmDataList(List<AlarmTrendList> alarmDataList) {
+        this.alarmDataList = alarmDataList;
+    }
+
+    public List<DeviceAlarmProportionList> getDeviceAlarmList() {
+        return deviceAlarmList;
+    }
+
+    public void setDeviceAlarmList(List<DeviceAlarmProportionList> deviceAlarmList) {
+        this.deviceAlarmList = deviceAlarmList;
+    }
+
+    public List<AlarmGradeList> getAlarmLevelList() {
+        return alarmLevelList;
+    }
+
+    public void setAlarmLevelList(List<AlarmGradeList> alarmLevelList) {
+        this.alarmLevelList = alarmLevelList;
+    }
+}

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

@@ -0,0 +1,76 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * 电表-总表数据展示
+ */
+public class LoadDataDetailInfo
+{
+    /** 类别 */
+    private String category;
+
+    /** 总 (kWh) */
+    private BigDecimal totalKwh = BigDecimal.ZERO;
+
+    /** 尖 (kWh) */
+    private BigDecimal peakKwh = BigDecimal.ZERO;
+
+    /** 峰 (kWh) */
+    private BigDecimal highKwh = BigDecimal.ZERO;
+
+    /** 平 (kWh) */
+    private BigDecimal flatKwh = BigDecimal.ZERO;
+
+    /** 谷 (kWh) */
+    private BigDecimal valleyKwh = BigDecimal.ZERO;
+
+
+    public BigDecimal getValleyKwh() {
+        return valleyKwh;
+    }
+
+    public void setValleyKwh(BigDecimal valleyKwh) {
+        this.valleyKwh = valleyKwh;
+    }
+
+    public BigDecimal getFlatKwh() {
+        return flatKwh;
+    }
+
+    public void setFlatKwh(BigDecimal flatKwh) {
+        this.flatKwh = flatKwh;
+    }
+
+    public BigDecimal getPeakKwh() {
+        return peakKwh;
+    }
+
+    public void setPeakKwh(BigDecimal peakKwh) {
+        this.peakKwh = peakKwh;
+    }
+
+    public BigDecimal getHighKwh() {
+        return highKwh;
+    }
+
+    public void setHighKwh(BigDecimal highKwh) {
+        this.highKwh = highKwh;
+    }
+
+    public BigDecimal getTotalKwh() {
+        return totalKwh;
+    }
+
+    public void setTotalKwh(BigDecimal totalKwh) {
+        this.totalKwh = totalKwh;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * 电表-储能表数据展示
+ */
+public class MeteDataDetailInfo
+{
+    /** 类别：A相 B相 C相*/
+    private String category;
+
+    /** 有功功率 */
+    private BigDecimal activePower = BigDecimal.ZERO;
+
+    /** 无功功率 */
+    private BigDecimal reactivePower = BigDecimal.ZERO;
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public BigDecimal getActivePower() {
+        return activePower;
+    }
+
+    public void setActivePower(BigDecimal activePower) {
+        this.activePower = activePower;
+    }
+
+    public BigDecimal getReactivePower() {
+        return reactivePower;
+    }
+
+    public void setReactivePower(BigDecimal reactivePower) {
+        this.reactivePower = reactivePower;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.xzzn.ems.domain.vo;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 实时运行-pcs平均温度数据
@@ -8,26 +9,22 @@ import java.math.BigDecimal;
  */
 public class PCSAveTempVo {
     /**
-     * 月份 月+日
+     * 数据时间
      */
-    private String monthDay;
+    private Date createDate;
 
     /**
      * 实时温度
      */
     private BigDecimal pcsTemp;
 
-    /**
-     * 昨日同时段温度（到分）
-     */
-    private BigDecimal pcsYtdTemp;
 
-    public String getMonthDay() {
-        return monthDay;
+    public Date getCreateDate() {
+        return createDate;
     }
 
-    public void setMonthDay(String monthDay) {
-        this.monthDay = monthDay;
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
     }
 
     public BigDecimal getPcsTemp() {
@@ -37,12 +34,4 @@ public class PCSAveTempVo {
     public void setPcsTemp(BigDecimal pcsTemp) {
         this.pcsTemp = pcsTemp;
     }
-
-    public BigDecimal getPcsYtdTemp() {
-        return pcsYtdTemp;
-    }
-
-    public void setPcsYtdTemp(BigDecimal pcsYtdTemp) {
-        this.pcsYtdTemp = pcsYtdTemp;
-    }
 }

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

@@ -0,0 +1,91 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * PCS支路数据
+ *
+ * @author xzzn
+ * @date 2025-06-24
+ */
+public class PcsBranchInfo
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 放电状态 */
+    private String dischargeStatus;
+
+    /** 直流功率 (kW) */
+    private BigDecimal dcPower;
+
+    /** 直流电压 (V) */
+    private BigDecimal dcVoltage;
+
+    /** 直流电流 (A) */
+    private BigDecimal dcCurrent;
+
+    /** 站点id */
+    private String siteId;
+
+    /** 设备唯一标识符 */
+    private String deviceId;
+
+    /** 支路id */
+    private String branchId;
+
+    public String getDischargeStatus() {
+        return dischargeStatus;
+    }
+
+    public void setDischargeStatus(String dischargeStatus) {
+        this.dischargeStatus = dischargeStatus;
+    }
+
+    public BigDecimal getDcPower() {
+        return dcPower;
+    }
+
+    public void setDcPower(BigDecimal dcPower) {
+        this.dcPower = dcPower;
+    }
+
+    public BigDecimal getDcVoltage() {
+        return dcVoltage;
+    }
+
+    public void setDcVoltage(BigDecimal dcVoltage) {
+        this.dcVoltage = dcVoltage;
+    }
+
+    public BigDecimal getDcCurrent() {
+        return dcCurrent;
+    }
+
+    public void setDcCurrent(BigDecimal dcCurrent) {
+        this.dcCurrent = dcCurrent;
+    }
+
+    public String getSiteId() {
+        return siteId;
+    }
+
+    public void setSiteId(String siteId) {
+        this.siteId = siteId;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getBranchId() {
+        return branchId;
+    }
+
+    public void setBranchId(String branchId) {
+        this.branchId = branchId;
+    }
+}

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

@@ -0,0 +1,293 @@
+package com.xzzn.ems.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xzzn.common.annotation.Excel;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 单个PCS详细数据
+ *
+ * @author xzzn
+ * @date 2025-06-24
+ */
+public class PcsDetailInfoVo {
+
+    /** 通讯状态 */
+    private String communicationStatus;
+
+    /** 数据更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dataUpdateTime;
+
+    /** 工作状态 */
+    private String workStatus;
+
+    /** 并网状态 */
+    private String gridStatus;
+
+    /** 设备状态 */
+    private String deviceStatus;
+
+    /** 控制模式 */
+    private String controlMode;
+
+    /** 总交流有功电率 (kW) */
+    private BigDecimal totalActivePower;
+
+    /** 当天交流充电量 (kWh) */
+    private BigDecimal dailyAcChargeEnergy;
+
+    /** A相电压 (V) */
+    private BigDecimal aPhaseVoltage;
+
+    /** A相电流 (A) */
+    private BigDecimal aPhaseCurrent;
+
+    /** 总交流无功电率 (kVar) */
+    private BigDecimal totalReactivePower;
+
+    /** 当天交流放电量 (kWh) */
+    @Excel(name = " (kWh)")
+    private BigDecimal dailyAcDischargeEnergy;
+
+    /** B相电压 (V) */
+    private BigDecimal bPhaseVoltage;
+
+    /** B相电流 (A) */
+    private BigDecimal bPhaseCurrent;
+
+    /** 总交流视在功率 (kVA) */
+    private BigDecimal totalApparentPower;
+
+    /** PCS模块温度 (℃) */
+    private BigDecimal pcsModuleTemperature;
+
+    /** C相电压 (V) */
+    private BigDecimal cPhaseVoltage;
+
+    /** C相电流 (A) */
+    private BigDecimal cPhaseCurrent;
+
+    /** 总交流功率因数 */
+    private BigDecimal totalPowerFactor;
+
+    /** PCS环境温度 (℃) */
+    private BigDecimal pcsEnvironmentTemperature;
+
+    /** 交流频率 (Hz) */
+    private BigDecimal acFrequency;
+
+    /** 站点id */
+    private String siteId;
+
+    /** 设备唯一标识符 */
+    private String deviceId;
+
+    /** 设备名称 */
+    private String deviceName;
+
+    private List<PcsBranchInfo> pcsBranchInfoList;
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getSiteId() {
+        return siteId;
+    }
+
+    public void setSiteId(String siteId) {
+        this.siteId = siteId;
+    }
+
+    public BigDecimal getAcFrequency() {
+        return acFrequency;
+    }
+
+    public void setAcFrequency(BigDecimal acFrequency) {
+        this.acFrequency = acFrequency;
+    }
+
+    public BigDecimal getPcsEnvironmentTemperature() {
+        return pcsEnvironmentTemperature;
+    }
+
+    public void setPcsEnvironmentTemperature(BigDecimal pcsEnvironmentTemperature) {
+        this.pcsEnvironmentTemperature = pcsEnvironmentTemperature;
+    }
+
+    public BigDecimal getTotalPowerFactor() {
+        return totalPowerFactor;
+    }
+
+    public void setTotalPowerFactor(BigDecimal totalPowerFactor) {
+        this.totalPowerFactor = totalPowerFactor;
+    }
+
+    public BigDecimal getcPhaseCurrent() {
+        return cPhaseCurrent;
+    }
+
+    public void setcPhaseCurrent(BigDecimal cPhaseCurrent) {
+        this.cPhaseCurrent = cPhaseCurrent;
+    }
+
+    public BigDecimal getcPhaseVoltage() {
+        return cPhaseVoltage;
+    }
+
+    public void setcPhaseVoltage(BigDecimal cPhaseVoltage) {
+        this.cPhaseVoltage = cPhaseVoltage;
+    }
+
+    public BigDecimal getPcsModuleTemperature() {
+        return pcsModuleTemperature;
+    }
+
+    public void setPcsModuleTemperature(BigDecimal pcsModuleTemperature) {
+        this.pcsModuleTemperature = pcsModuleTemperature;
+    }
+
+    public BigDecimal getTotalApparentPower() {
+        return totalApparentPower;
+    }
+
+    public void setTotalApparentPower(BigDecimal totalApparentPower) {
+        this.totalApparentPower = totalApparentPower;
+    }
+
+    public BigDecimal getbPhaseCurrent() {
+        return bPhaseCurrent;
+    }
+
+    public void setbPhaseCurrent(BigDecimal bPhaseCurrent) {
+        this.bPhaseCurrent = bPhaseCurrent;
+    }
+
+    public BigDecimal getbPhaseVoltage() {
+        return bPhaseVoltage;
+    }
+
+    public void setbPhaseVoltage(BigDecimal bPhaseVoltage) {
+        this.bPhaseVoltage = bPhaseVoltage;
+    }
+
+    public BigDecimal getDailyAcDischargeEnergy() {
+        return dailyAcDischargeEnergy;
+    }
+
+    public void setDailyAcDischargeEnergy(BigDecimal dailyAcDischargeEnergy) {
+        this.dailyAcDischargeEnergy = dailyAcDischargeEnergy;
+    }
+
+    public BigDecimal getTotalReactivePower() {
+        return totalReactivePower;
+    }
+
+    public void setTotalReactivePower(BigDecimal totalReactivePower) {
+        this.totalReactivePower = totalReactivePower;
+    }
+
+    public BigDecimal getaPhaseCurrent() {
+        return aPhaseCurrent;
+    }
+
+    public void setaPhaseCurrent(BigDecimal aPhaseCurrent) {
+        this.aPhaseCurrent = aPhaseCurrent;
+    }
+
+    public BigDecimal getaPhaseVoltage() {
+        return aPhaseVoltage;
+    }
+
+    public void setaPhaseVoltage(BigDecimal aPhaseVoltage) {
+        this.aPhaseVoltage = aPhaseVoltage;
+    }
+
+    public BigDecimal getDailyAcChargeEnergy() {
+        return dailyAcChargeEnergy;
+    }
+
+    public void setDailyAcChargeEnergy(BigDecimal dailyAcChargeEnergy) {
+        this.dailyAcChargeEnergy = dailyAcChargeEnergy;
+    }
+
+    public BigDecimal getTotalActivePower() {
+        return totalActivePower;
+    }
+
+    public void setTotalActivePower(BigDecimal totalActivePower) {
+        this.totalActivePower = totalActivePower;
+    }
+
+    public String getControlMode() {
+        return controlMode;
+    }
+
+    public void setControlMode(String controlMode) {
+        this.controlMode = controlMode;
+    }
+
+    public String getDeviceStatus() {
+        return deviceStatus;
+    }
+
+    public void setDeviceStatus(String deviceStatus) {
+        this.deviceStatus = deviceStatus;
+    }
+
+    public String getGridStatus() {
+        return gridStatus;
+    }
+
+    public void setGridStatus(String gridStatus) {
+        this.gridStatus = gridStatus;
+    }
+
+    public String getWorkStatus() {
+        return workStatus;
+    }
+
+    public void setWorkStatus(String workStatus) {
+        this.workStatus = workStatus;
+    }
+
+    public Date getDataUpdateTime() {
+        return dataUpdateTime;
+    }
+
+    public void setDataUpdateTime(Date dataUpdateTime) {
+        this.dataUpdateTime = dataUpdateTime;
+    }
+
+    public List<PcsBranchInfo> getPcsBranchInfoList() {
+        return pcsBranchInfoList;
+    }
+
+    public String getCommunicationStatus() {
+        return communicationStatus;
+    }
+
+    public void setCommunicationStatus(String communicationStatus) {
+        this.communicationStatus = communicationStatus;
+    }
+
+    public void setPcsBranchInfoList(List<PcsBranchInfo> pcsBranchInfoList) {
+        this.pcsBranchInfoList = pcsBranchInfoList;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.xzzn.ems.domain.vo;
 
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -9,6 +8,11 @@ import java.util.List;
  *
  */
 public class SingleSiteBaseInfo {
+    /**
+     * 站点名称
+     */
+    private String siteName;
+
     /**
      * 今日充电量
      */
@@ -27,12 +31,17 @@ public class SingleSiteBaseInfo {
     /**
      * 总放电量
      */
-    private BigDecimal totalDischargedCap;
+    private BigDecimal totalDisChargedCap;
+
+    /**
+     * 站点坐标
+     */
+    private String[] siteLocation;
 
     /**
      * 站点位置
      */
-    private String siteLocation;
+    private String siteAddress;
 
     /**
      * 投运时间
@@ -42,17 +51,25 @@ public class SingleSiteBaseInfo {
     /**
      * 装机功率（MW）
      */
-    private BigDecimal installedPower;
+    private BigDecimal installPower;
 
     /**
      * 装机容量（MW）
      */
-    private BigDecimal installedCap;
+    private BigDecimal installCapacity;
 
     /**
      * 七天放电统计
      */
-    private List<SiteMonitorDataVo> SevenDayDischargeStats;
+    private List<SiteMonitorDataVo> sevenDayDisChargeStats;
+
+    public String getSiteName() {
+        return siteName;
+    }
+
+    public void setSiteName(String siteName) {
+        this.siteName = siteName;
+    }
 
     public BigDecimal getDayChargedCap() {
         return dayChargedCap;
@@ -62,28 +79,20 @@ public class SingleSiteBaseInfo {
         this.dayChargedCap = dayChargedCap;
     }
 
-    public List<SiteMonitorDataVo> getSevenDayDischargeStats() {
-        return SevenDayDischargeStats;
+    public BigDecimal getInstallPower() {
+        return installPower;
     }
 
-    public void setSevenDayDischargeStats(List<SiteMonitorDataVo> sevenDayDischargeStats) {
-        SevenDayDischargeStats = sevenDayDischargeStats;
+    public void setInstallPower(BigDecimal installPower) {
+        this.installPower = installPower;
     }
 
-    public BigDecimal getInstalledCap() {
-        return installedCap;
+    public BigDecimal getInstallCapacity() {
+        return installCapacity;
     }
 
-    public void setInstalledCap(BigDecimal installedCap) {
-        this.installedCap = installedCap;
-    }
-
-    public BigDecimal getInstalledPower() {
-        return installedPower;
-    }
-
-    public void setInstalledPower(BigDecimal installedPower) {
-        this.installedPower = installedPower;
+    public void setInstallCapacity(BigDecimal installCapacity) {
+        this.installCapacity = installCapacity;
     }
 
     public String getRunningTime() {
@@ -94,20 +103,28 @@ public class SingleSiteBaseInfo {
         this.runningTime = runningTime;
     }
 
-    public String getSiteLocation() {
+    public String[] getSiteLocation() {
         return siteLocation;
     }
 
-    public void setSiteLocation(String siteLocation) {
+    public void setSiteLocation(String[] siteLocation) {
         this.siteLocation = siteLocation;
     }
 
-    public BigDecimal getTotalDischargedCap() {
-        return totalDischargedCap;
+    public String getSiteAddress() {
+        return siteAddress;
     }
 
-    public void setTotalDischargedCap(BigDecimal totalDischargedCap) {
-        this.totalDischargedCap = totalDischargedCap;
+    public void setSiteAddress(String siteAddress) {
+        this.siteAddress = siteAddress;
+    }
+
+    public BigDecimal getTotalDisChargedCap() {
+        return totalDisChargedCap;
+    }
+
+    public void setTotalDisChargedCap(BigDecimal totalDisChargedCap) {
+        this.totalDisChargedCap = totalDisChargedCap;
     }
 
     public BigDecimal getTotalChargedCap() {
@@ -125,4 +142,12 @@ public class SingleSiteBaseInfo {
     public void setDayDisChargedCap(BigDecimal dayDisChargedCap) {
         this.dayDisChargedCap = dayDisChargedCap;
     }
+
+    public List<SiteMonitorDataVo> getSevenDayDisChargeStats() {
+        return sevenDayDisChargeStats;
+    }
+
+    public void setSevenDayDisChargeStats(List<SiteMonitorDataVo> sevenDayDisChargeStats) {
+        this.sevenDayDisChargeStats = sevenDayDisChargeStats;
+    }
 }

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

@@ -0,0 +1,68 @@
+package com.xzzn.ems.domain.vo;
+
+/**
+ * 站点管理-站点设备列表
+ *
+ */
+public class SiteDeviceListVo {
+    /** 站点id */
+    private String siteId;
+    /** 站点名称 */
+    private String siteName;
+    /** 设备id */
+    private String deviceId;
+    /** 设备名称 */
+    private String deviceName;
+    /** 设备类型 */
+    private String deviceType;
+    /** 通信状态 */
+    private String communicationStatus;
+
+    public String getSiteId() {
+        return siteId;
+    }
+
+    public void setSiteId(String siteId) {
+        this.siteId = siteId;
+    }
+
+    public String getSiteName() {
+        return siteName;
+    }
+
+    public void setSiteName(String siteName) {
+        this.siteName = siteName;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public String getCommunicationStatus() {
+        return communicationStatus;
+    }
+
+    public void setCommunicationStatus(String communicationStatus) {
+        this.communicationStatus = communicationStatus;
+    }
+}

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

@@ -22,6 +22,8 @@ public class SiteMonitorDataVo {
      */
     private BigDecimal chargedCap;
 
+    private BigDecimal dailyEfficiency;
+
     public String getAmmeterDate() {
         return ammeterDate;
     }
@@ -45,4 +47,12 @@ public class SiteMonitorDataVo {
     public void setChargedCap(BigDecimal chargedCap) {
         this.chargedCap = chargedCap;
     }
+
+    public BigDecimal getDailyEfficiency() {
+        return dailyEfficiency;
+    }
+
+    public void setDailyEfficiency(BigDecimal dailyEfficiency) {
+        this.dailyEfficiency = dailyEfficiency;
+    }
 }

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

@@ -1,43 +1,12 @@
 package com.xzzn.ems.domain.vo;
 
-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 +27,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/domain/vo/SiteMonitorRunningHeadInfoVo.java

@@ -0,0 +1,100 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * 单站监控-设备监控-实时运行头部行数据
+ *
+ */
+public class SiteMonitorRunningHeadInfoVo {
+    /**
+     * 实时有功功率
+     */
+    private BigDecimal totalActivePower;
+
+    /**
+     * 实时无功功率
+     */
+    private BigDecimal totalReactivePower;
+
+    /**
+     * 电池簇SOC
+     */
+    private BigDecimal soc;
+
+    /**
+     * 电池堆SOH
+     */
+    private BigDecimal soh;
+
+    /**
+     * 今日充电量
+     */
+    private BigDecimal dayChargedCap;
+
+    /**
+     * 今日放电量
+     */
+    private BigDecimal dayDisChargedCap;
+
+    /**
+     * 站点id
+     */
+    private String siteId;
+
+    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 String getSiteId() {
+        return siteId;
+    }
+
+    public void setSiteId(String siteId) {
+        this.siteId = siteId;
+    }
+}

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

@@ -15,12 +15,12 @@ public class SiteTotalInfoVo {
     /**
      * 装机功率（MW）
      */
-    private BigDecimal installedPower;
+    private BigDecimal installPower;
 
     /**
      * 装机容量（MW）
      */
-    private BigDecimal installedCap;
+    private BigDecimal installCapacity;
 
     /**
      * 总充电量（MWH）
@@ -56,28 +56,28 @@ public class SiteTotalInfoVo {
         this.totalChargedCap = totalChargedCap;
     }
 
-    public BigDecimal getInstalledCap() {
-        return installedCap;
+    public BigDecimal getInstallCapacity() {
+        return installCapacity;
     }
 
-    public void setInstalledCap(BigDecimal installedCap) {
-        this.installedCap = installedCap;
+    public void setInstallCapacity(BigDecimal installCapacity) {
+        this.installCapacity = installCapacity;
     }
 
-    public BigDecimal getInstalledPower() {
-        return installedPower;
+    public BigDecimal getInstallPower() {
+        return installPower;
     }
 
-    public void setInstalledPower(BigDecimal installedPower) {
-        this.installedPower = installedPower;
+    public void setInstallPower(BigDecimal installPower) {
+        this.installPower = installPower;
     }
 
     @Override
     public String toString() {
         return "SiteVo{" +
                 "siteNum=" + siteNum +
-                ", installedPower=" + installedPower +
-                ", installedCap=" + installedCap +
+                ", installedPower=" + installPower +
+                ", installedCap=" + installCapacity +
                 ", totalChargedCap=" + totalChargedCap +
                 ", totalDischargedCap=" + totalDischargedCap +
                 '}';

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

@@ -0,0 +1,34 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * 首页看板数据概览-系统效率
+ */
+public class SystemEfficiencyList {
+    /**
+     * 月份
+     */
+    private int dateMonth;
+
+    /**
+     * 系统效率
+     */
+    private BigDecimal systemEfficiency;
+
+    public int getDateMonth() {
+        return dateMonth;
+    }
+
+    public void setDateMonth(int dateMonth) {
+        this.dateMonth = dateMonth;
+    }
+
+    public BigDecimal getSystemEfficiency() {
+        return systemEfficiency;
+    }
+
+    public void setSystemEfficiency(BigDecimal systemEfficiency) {
+        this.systemEfficiency = systemEfficiency;
+    }
+}

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

@@ -2,7 +2,7 @@ package com.xzzn.ems.mapper;
 
 import java.util.List;
 import com.xzzn.ems.domain.EmsAlarmRecords;
-import com.xzzn.ems.domain.vo.SiteMonitorHomeAlarmVo;
+import com.xzzn.ems.domain.vo.*;
 
 /**
  * 告警记录Mapper接口
@@ -64,5 +64,19 @@ public interface EmsAlarmRecordsMapper
      * 根据站点id获取告警记录
      *
      */
-    public List<SiteMonitorHomeAlarmVo> getAlarmRecordsBySiteId(Long siteId);
+    public List<SiteMonitorHomeAlarmVo> getAlarmRecordsBySiteId(String siteId);
+
+    /**
+     * 获取告警趋势数据
+     *
+     */
+    public List<AlarmTrendList> getAlarmTrendList();
+
+    /**
+     * 获取设备告警占比
+     *
+     */
+    public List<DeviceAlarmProportionList> getDeviceAlarmPropList();
+
+    public List<AlarmRecordListResponseVo> getAlarmRecordDetailList(AlarmRecordListRequestVo requestVo);
 }

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

@@ -0,0 +1,61 @@
+package com.xzzn.ems.mapper;
+
+import java.util.List;
+import com.xzzn.ems.domain.EmsAmmeterData;
+
+/**
+ * 总数据Mapper接口
+ *
+ * @author xzzn
+ * @date 2025-07-03
+ */
+public interface EmsAmmeterDataMapper
+{
+    /**
+     * 查询总数据
+     *
+     * @param id 总数据主键
+     * @return 总数据
+     */
+    public EmsAmmeterData selectEmsAmmeterDataById(Long id);
+
+    /**
+     * 查询总数据列表
+     *
+     * @param emsAmmeterData 总数据
+     * @return 总数据集合
+     */
+    public List<EmsAmmeterData> selectEmsAmmeterDataList(EmsAmmeterData emsAmmeterData);
+
+    /**
+     * 新增总数据
+     *
+     * @param emsAmmeterData 总数据
+     * @return 结果
+     */
+    public int insertEmsAmmeterData(EmsAmmeterData emsAmmeterData);
+
+    /**
+     * 修改总数据
+     *
+     * @param emsAmmeterData 总数据
+     * @return 结果
+     */
+    public int updateEmsAmmeterData(EmsAmmeterData emsAmmeterData);
+
+    /**
+     * 删除总数据
+     *
+     * @param id 总数据主键
+     * @return 结果
+     */
+    public int deleteEmsAmmeterDataById(Long id);
+
+    /**
+     * 批量删除总数据
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsAmmeterDataByIds(Long[] ids);
+}

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

@@ -0,0 +1,71 @@
+package com.xzzn.ems.mapper;
+
+import java.util.List;
+import com.xzzn.ems.domain.EmsBatteryCluster;
+import com.xzzn.ems.domain.vo.BMSBatteryDataList;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 电池簇数据Mapper接口
+ *
+ * @author xzzn
+ * @date 2025-06-22
+ */
+public interface EmsBatteryClusterMapper
+{
+    /**
+     * 查询电池簇数据
+     *
+     * @param id 电池簇数据主键
+     * @return 电池簇数据
+     */
+    public EmsBatteryCluster selectEmsBatteryClusterById(Long id);
+
+    /**
+     * 查询电池簇数据列表
+     *
+     * @param emsBatteryCluster 电池簇数据
+     * @return 电池簇数据集合
+     */
+    public List<EmsBatteryCluster> selectEmsBatteryClusterList(EmsBatteryCluster emsBatteryCluster);
+
+    /**
+     * 新增电池簇数据
+     *
+     * @param emsBatteryCluster 电池簇数据
+     * @return 结果
+     */
+    public int insertEmsBatteryCluster(EmsBatteryCluster emsBatteryCluster);
+
+    /**
+     * 修改电池簇数据
+     *
+     * @param emsBatteryCluster 电池簇数据
+     * @return 结果
+     */
+    public int updateEmsBatteryCluster(EmsBatteryCluster emsBatteryCluster);
+
+    /**
+     * 删除电池簇数据
+     *
+     * @param id 电池簇数据主键
+     * @return 结果
+     */
+    public int deleteEmsBatteryClusterById(Long id);
+
+    /**
+     * 批量删除电池簇数据
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsBatteryClusterByIds(Long[] ids);
+
+    /**
+     * 根据site_di和堆id获取簇数据和单体数据
+     * @param siteId
+     * @param stackDeviceId
+     * @return
+     */
+    public List<BMSBatteryDataList> getBmsBatteryData(@Param("siteId")String siteId, @Param("stackDeviceId")String stackDeviceId);
+}

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

@@ -0,0 +1,98 @@
+package com.xzzn.ems.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.xzzn.ems.domain.EmsBatteryData;
+import com.xzzn.ems.domain.vo.BatteryClusterDataDetailVo;
+import com.xzzn.ems.domain.vo.BatteryDataStatsListVo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 单体电池实时数据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(String siteId);
+
+    /**
+     * 根据siteId和簇id获取单体数据
+     * @param siteId
+     * @param clusterDeviceId
+     * @return
+     */
+    public BatteryClusterDataDetailVo getBatteryDataByClusterId(@Param("siteId")String siteId, @Param("clusterDeviceId")String clusterDeviceId);
+
+    /**
+     * 获取最大最小的单体id
+     * @param dataVo
+     * @return
+     */
+    public List<Map<String, Object>> getDataIdsMap(BatteryClusterDataDetailVo dataVo);
+
+    /**
+     * 根据电池簇设备id获取下面所有单体电池
+     * @param clusterDeviceId
+     * @return
+     */
+    public List<BatteryDataStatsListVo> getAllBatteryDataByClusterId(@Param("clusterDeviceId") String clusterDeviceId,@Param("siteId") String siteId);
+
+
+    int insertEmsBatteryDataList(List<EmsBatteryData> emsBatteryDataList);
+}

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

@@ -0,0 +1,69 @@
+package com.xzzn.ems.mapper;
+
+import java.util.List;
+import com.xzzn.ems.domain.EmsBatteryStack;
+import com.xzzn.ems.domain.vo.BMSOverViewVo;
+
+/**
+ * 电池堆数据Mapper接口
+ *
+ * @author xzzn
+ * @date 2025-06-23
+ */
+public interface EmsBatteryStackMapper
+{
+    /**
+     * 查询电池堆数据
+     *
+     * @param id 电池堆数据主键
+     * @return 电池堆数据
+     */
+    public EmsBatteryStack selectEmsBatteryStackById(Long id);
+
+    /**
+     * 查询电池堆数据列表
+     *
+     * @param emsBatteryStack 电池堆数据
+     * @return 电池堆数据集合
+     */
+    public List<EmsBatteryStack> selectEmsBatteryStackList(EmsBatteryStack emsBatteryStack);
+
+    /**
+     * 新增电池堆数据
+     *
+     * @param emsBatteryStack 电池堆数据
+     * @return 结果
+     */
+    public int insertEmsBatteryStack(EmsBatteryStack emsBatteryStack);
+
+    /**
+     * 修改电池堆数据
+     *
+     * @param emsBatteryStack 电池堆数据
+     * @return 结果
+     */
+    public int updateEmsBatteryStack(EmsBatteryStack emsBatteryStack);
+
+    /**
+     * 删除电池堆数据
+     *
+     * @param id 电池堆数据主键
+     * @return 结果
+     */
+    public int deleteEmsBatteryStackById(Long id);
+
+    /**
+     * 批量删除电池堆数据
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsBatteryStackByIds(Long[] ids);
+
+    /**
+     * 获取电池堆信息
+     * @param siteId
+     * @return
+     */
+    public List<BMSOverViewVo> selectEmsBatteryStackBySiteId(String siteId);
+}

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

@@ -0,0 +1,68 @@
+package com.xzzn.ems.mapper;
+
+import java.util.List;
+import com.xzzn.ems.domain.EmsCoolingData;
+
+/**
+ * 冷却系统参数Mapper接口
+ *
+ * @author xzzn
+ * @date 2025-06-25
+ */
+public interface EmsCoolingDataMapper
+{
+    /**
+     * 查询冷却系统参数
+     *
+     * @param id 冷却系统参数主键
+     * @return 冷却系统参数
+     */
+    public EmsCoolingData selectEmsCoolingDataById(Long id);
+
+    /**
+     * 查询冷却系统参数列表
+     *
+     * @param emsCoolingData 冷却系统参数
+     * @return 冷却系统参数集合
+     */
+    public List<EmsCoolingData> selectEmsCoolingDataList(EmsCoolingData emsCoolingData);
+
+    /**
+     * 新增冷却系统参数
+     *
+     * @param emsCoolingData 冷却系统参数
+     * @return 结果
+     */
+    public int insertEmsCoolingData(EmsCoolingData emsCoolingData);
+
+    /**
+     * 修改冷却系统参数
+     *
+     * @param emsCoolingData 冷却系统参数
+     * @return 结果
+     */
+    public int updateEmsCoolingData(EmsCoolingData emsCoolingData);
+
+    /**
+     * 删除冷却系统参数
+     *
+     * @param id 冷却系统参数主键
+     * @return 结果
+     */
+    public int deleteEmsCoolingDataById(Long id);
+
+    /**
+     * 批量删除冷却系统参数
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsCoolingDataByIds(Long[] ids);
+
+    /**
+     * 获取液冷数据
+     * @param siteId
+     * @return
+     */
+    public List<EmsCoolingData> getCoolingDataList(String siteId);
+}

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

@@ -0,0 +1,91 @@
+package com.xzzn.ems.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.xzzn.ems.domain.EmsDevicesSetting;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * Modbus设备配置Mapper接口
+ *
+ * @author xzzn
+ * @date 2025-06-24
+ */
+public interface EmsDevicesSettingMapper
+{
+    /**
+     * 查询Modbus设备配置
+     *
+     * @param id Modbus设备配置主键
+     * @return Modbus设备配置
+     */
+    public EmsDevicesSetting selectEmsDevicesSettingById(Long id);
+
+    /**
+     * 查询Modbus设备配置列表
+     *
+     * @param emsDevicesSetting Modbus设备配置
+     * @return Modbus设备配置集合
+     */
+    public List<EmsDevicesSetting> selectEmsDevicesSettingList(EmsDevicesSetting emsDevicesSetting);
+
+    /**
+     * 新增Modbus设备配置
+     *
+     * @param emsDevicesSetting Modbus设备配置
+     * @return 结果
+     */
+    public int insertEmsDevicesSetting(EmsDevicesSetting emsDevicesSetting);
+
+    /**
+     * 修改Modbus设备配置
+     *
+     * @param emsDevicesSetting Modbus设备配置
+     * @return 结果
+     */
+    public int updateEmsDevicesSetting(EmsDevicesSetting emsDevicesSetting);
+
+    /**
+     * 删除Modbus设备配置
+     *
+     * @param id Modbus设备配置主键
+     * @return 结果
+     */
+    public int deleteEmsDevicesSettingById(Long id);
+
+    /**
+     * 批量删除Modbus设备配置
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsDevicesSettingByIds(Long[] ids);
+    /**
+     * 根据父类设备id获取子设备id
+     * @param parentId
+     * @return
+     */
+    public List<Map<String, Object>> getDeviceInfoByParentId(String parentId);
+    /**
+     * 获取该设备下的所有电表
+     * @param siteId
+     * @return
+     */
+    public List<EmsDevicesSetting> getAllBatteryDeviceBySiteId(String siteId);
+
+    /**
+     * 根据site_id和device_category获取指定设备信息
+     * @param siteId
+     * @param deviceCategory
+     * @return
+     */
+    public List<Map<String, Object>> getDeviceInfosBySiteIdAndCategory(@Param("siteId")String siteId, @Param("deviceCategory")String deviceCategory);
+
+    /**
+     * 获取该设备的详细数据
+     * @param deviceId
+     * @return
+     */
+    public EmsDevicesSetting getDeviceDetailInfo(String deviceId);
+}

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

@@ -0,0 +1,62 @@
+package com.xzzn.ems.mapper;
+
+import com.xzzn.ems.domain.EmsMqttMessage;
+
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author xzzn
+ * @date 2025-06-27
+ */
+public interface EmsMqttMessageMapper
+{
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    public EmsMqttMessage selectEmsMqttMessageById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param emsMqttMessage 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<EmsMqttMessage> selectEmsMqttMessageList(EmsMqttMessage emsMqttMessage);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param emsMqttMessage 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertEmsMqttMessage(EmsMqttMessage emsMqttMessage);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param emsMqttMessage 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateEmsMqttMessage(EmsMqttMessage emsMqttMessage);
+
+    /**
+     * 删除【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    public int deleteEmsMqttMessageById(Long id);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsMqttMessageByIds(Long[] ids);
+}

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

@@ -0,0 +1,73 @@
+package com.xzzn.ems.mapper;
+
+import java.util.List;
+import com.xzzn.ems.domain.EmsPcsBranchData;
+import com.xzzn.ems.domain.vo.PcsBranchInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * pcs支路数据Mapper接口
+ *
+ * @author xzzn
+ * @date 2025-06-29
+ */
+public interface EmsPcsBranchDataMapper
+{
+    /**
+     * 查询pcs支路数据
+     *
+     * @param id pcs支路数据主键
+     * @return pcs支路数据
+     */
+    public EmsPcsBranchData selectEmsPcsBranchDataById(Long id);
+
+    /**
+     * 查询pcs支路数据列表
+     *
+     * @param emsPcsBranchData pcs支路数据
+     * @return pcs支路数据集合
+     */
+    public List<EmsPcsBranchData> selectEmsPcsBranchDataList(EmsPcsBranchData emsPcsBranchData);
+
+    /**
+     * 新增pcs支路数据
+     *
+     * @param emsPcsBranchData pcs支路数据
+     * @return 结果
+     */
+    public int insertEmsPcsBranchData(EmsPcsBranchData emsPcsBranchData);
+
+    /**
+     * 修改pcs支路数据
+     *
+     * @param emsPcsBranchData pcs支路数据
+     * @return 结果
+     */
+    public int updateEmsPcsBranchData(EmsPcsBranchData emsPcsBranchData);
+
+    /**
+     * 删除pcs支路数据
+     *
+     * @param id pcs支路数据主键
+     * @return 结果
+     */
+    public int deleteEmsPcsBranchDataById(Long id);
+
+    /**
+     * 批量删除pcs支路数据
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsPcsBranchDataByIds(Long[] ids);
+
+    /**
+     * 根据site_id和device_id获取支路最新数据
+     * @param siteId
+     * @param deviceId
+     * @return
+     */
+    public List<PcsBranchInfo> getPcsBranchInfoList(@Param("siteId")String siteId, @Param("deviceId")String deviceId);
+
+    int insertPcsBranchDataList(List<EmsPcsBranchData> list);
+}

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

@@ -1,9 +1,13 @@
 package com.xzzn.ems.mapper;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
+
 import com.xzzn.ems.domain.EmsPcsData;
-import com.xzzn.ems.domain.vo.SiteMonitorDataVo;
+import com.xzzn.ems.domain.vo.*;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * PCS数据Mapper接口
@@ -66,12 +70,78 @@ public interface EmsPcsDataMapper
      * @param siteId
      * @return
      */
-    public List<SiteMonitorDataVo> getPcsDataBySiteId(Long siteId);
+    public List<SiteMonitorDataVo> getPcsDataBySiteId(@Param("siteId")String siteId, @Param("limitTime")int limitTime);
 
     /**
-     * 根据站点获取电网实时功率=sum（总交流有功电率）
+     * 根据站点获取设备监控的实时运行头信息
      * @param siteId
      * @return
      */
-    public BigDecimal getGridNrtPower(Long siteId);
+    public SiteMonitorRunningHeadInfoVo getSiteRunningHeadInfo(String siteId);
+
+    /**
+     * 获取每月的充电量和放电量
+     * @return
+     */
+    public List<ElectricIndexList> getElectDataList();
+
+    /**
+     * 根据site_id获取所有pcs最新update的数据
+     * @param siteId
+     * @return
+     */
+    public List<PcsDetailInfoVo> getPcsDetailInfoBySiteId(String siteId);
+
+    /**
+     * 获取总充+总放
+     * @return
+     */
+    public Map<String, BigDecimal> getPcsTotalChargeData(String siteId);
+
+    /**
+     * 根据时间按天获取充放电量
+     * @param siteId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public List<SiteMonitorDataVo> getPcsDataByDay(@Param("siteId")String siteId, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
+    /**
+     * 根据时间按月获取充放电量
+     * @param siteId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public List<SiteMonitorDataVo> getPcsDataByMonth(@Param("siteId")String siteId, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
+    /**
+     * 根据时间按小时获取充放电量
+     * @param siteId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public List<SiteMonitorDataVo> getPcsDataByHour(@Param("siteId")String siteId, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
+
+    /**
+     * 获取实时运行-储能功率
+     * @param siteId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public List<EnergyStoragePowVo> getStoragePowerList(@Param("siteId")String siteId, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
+
+    /**
+     * 获取实时运行-pcs平均温度
+     * @param siteId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public List<PCSAveTempVo> getPcsAveTempList(@Param("siteId")String siteId, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
+
+    public List<BatteryAveSOCVo> getAveSocList(@Param("siteId")String siteId, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
+
+    public List<BatteryAveTempVo> getBatteryAveTempList(@Param("siteId")String siteId, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
 }

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

@@ -1,67 +0,0 @@
-package com.xzzn.ems.mapper;
-
-import java.util.List;
-import com.xzzn.ems.domain.EmsSite;
-import com.xzzn.ems.domain.vo.SiteTotalInfoVo;
-
-/**
- * 站点Mapper接口
- *
- * @author xzzn
- * @date 2025-06-16
- */
-public interface EmsSiteMapper
-{
-    /**
-     * 查询站点
-     *
-     * @param id 站点主键
-     * @return 站点
-     */
-    public EmsSite selectSiteById(Long id);
-
-    /**
-     * 查询站点列表
-     *
-     * @return 站点集合
-     */
-    public List<EmsSite> selectSiteList();
-
-    /**
-     * 新增站点
-     *
-     * @param site 站点
-     * @return 结果
-     */
-    public int insertSite(EmsSite site);
-
-    /**
-     * 修改站点
-     *
-     * @param site 站点
-     * @return 结果
-     */
-    public int updateSite(EmsSite site);
-
-    /**
-     * 删除站点
-     *
-     * @param id 站点主键
-     * @return 结果
-     */
-    public int deleteSiteById(Long id);
-
-    /**
-     * 批量删除站点
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteSiteByIds(Long[] ids);
-
-    /**
-     * 获取站点总信息
-     * @return
-     */
-    public SiteTotalInfoVo getSiteTotalInfo();
-}

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

@@ -0,0 +1,93 @@
+package com.xzzn.ems.mapper;
+
+import java.util.List;
+import com.xzzn.ems.domain.EmsSiteSetting;
+import com.xzzn.ems.domain.vo.SiteDeviceListVo;
+import com.xzzn.ems.domain.vo.SiteTotalInfoVo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 站点Mapper接口
+ *
+ * @author xzzn
+ * @date 2025-06-20
+ */
+public interface EmsSiteSettingMapper
+{
+    /**
+     * 查询站点
+     *
+     * @param id 站点主键
+     * @return 站点
+     */
+    public EmsSiteSetting selectEmsSiteSettingById(Long id);
+
+    /**
+     * 查询站点列表
+     *
+     * @param emsSiteSetting 站点
+     * @return 站点集合
+     */
+    public List<EmsSiteSetting> selectEmsSiteSettingList(EmsSiteSetting emsSiteSetting);
+
+    /**
+     * 新增站点
+     *
+     * @param emsSiteSetting 站点
+     * @return 结果
+     */
+    public int insertEmsSiteSetting(EmsSiteSetting emsSiteSetting);
+
+    /**
+     * 修改站点
+     *
+     * @param emsSiteSetting 站点
+     * @return 结果
+     */
+    public int updateEmsSiteSetting(EmsSiteSetting emsSiteSetting);
+
+    /**
+     * 删除站点
+     *
+     * @param id 站点主键
+     * @return 结果
+     */
+    public int deleteEmsSiteSettingById(Long id);
+
+    /**
+     * 批量删除站点
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsSiteSettingByIds(Long[] ids);
+
+    /**
+     * 获取站点总信息
+     * @return
+     */
+    public SiteTotalInfoVo getSiteTotalInfo();
+
+    /**
+     * 根据站点id获取站点信息
+     * @param siteId
+     * @return
+     */
+    public EmsSiteSetting selectEmsSiteSettingBySiteId(String siteId);
+
+
+    /**
+     * 根据站点名称和投运时间获取站点列表
+     * @param siteName
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    public List<EmsSiteSetting> getSiteInfoList(@Param("siteName")String siteName, @Param("startTime")String startTime, @Param("endTime")String endTime);
+
+    /**
+     * 获取站点的设备列表
+     * @return
+     */
+    public List<SiteDeviceListVo> getAllSiteDeviceList(String siteId);
+}

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

@@ -0,0 +1,62 @@
+package com.xzzn.ems.mapper;
+
+import com.xzzn.ems.domain.EmsTicket;
+
+import java.util.List;
+
+/**
+ * 工单主Mapper接口
+ * 
+ * @author xzzn
+ * @date 2025-06-26
+ */
+public interface EmsTicketMapper 
+{
+    /**
+     * 查询工单主
+     * 
+     * @param id 工单主主键
+     * @return 工单主
+     */
+    public EmsTicket selectEmsTicketById(String id);
+
+    /**
+     * 查询工单主列表
+     * 
+     * @param emsTicket 工单主
+     * @return 工单主集合
+     */
+    public List<EmsTicket> selectEmsTicketList(EmsTicket emsTicket);
+
+    /**
+     * 新增工单主
+     * 
+     * @param emsTicket 工单主
+     * @return 结果
+     */
+    public int insertEmsTicket(EmsTicket emsTicket);
+
+    /**
+     * 修改工单主
+     * 
+     * @param emsTicket 工单主
+     * @return 结果
+     */
+    public int updateEmsTicket(EmsTicket emsTicket);
+
+    /**
+     * 删除工单主
+     * 
+     * @param id 工单主主键
+     * @return 结果
+     */
+    public int deleteEmsTicketById(String id);
+
+    /**
+     * 批量删除工单主
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsTicketByIds(String[] ids);
+}

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

@@ -0,0 +1,70 @@
+package com.xzzn.ems.service;
+
+import java.util.List;
+import com.xzzn.ems.domain.EmsAlarmRecords;
+import com.xzzn.ems.domain.vo.AlarmRecordListRequestVo;
+import com.xzzn.ems.domain.vo.AlarmRecordListResponseVo;
+
+/**
+ * 告警记录Service接口
+ *
+ * @author xzzn
+ * @date 2025-06-29
+ */
+public interface IEmsAlarmRecordsService
+{
+    /**
+     * 查询告警记录
+     *
+     * @param id 告警记录主键
+     * @return 告警记录
+     */
+    public EmsAlarmRecords selectEmsAlarmRecordsById(Long id);
+
+    /**
+     * 查询告警记录列表
+     *
+     * @param emsAlarmRecords 告警记录
+     * @return 告警记录集合
+     */
+    public List<EmsAlarmRecords> selectEmsAlarmRecordsList(EmsAlarmRecords emsAlarmRecords);
+
+    /**
+     * 新增告警记录
+     *
+     * @param emsAlarmRecords 告警记录
+     * @return 结果
+     */
+    public int insertEmsAlarmRecords(EmsAlarmRecords emsAlarmRecords);
+
+    /**
+     * 修改告警记录
+     *
+     * @param emsAlarmRecords 告警记录
+     * @return 结果
+     */
+    public int updateEmsAlarmRecords(EmsAlarmRecords emsAlarmRecords);
+
+    /**
+     * 批量删除告警记录
+     *
+     * @param ids 需要删除的告警记录主键集合
+     * @return 结果
+     */
+    public int deleteEmsAlarmRecordsByIds(Long[] ids);
+
+    /**
+     * 删除告警记录信息
+     *
+     * @param id 告警记录主键
+     * @return 结果
+     */
+    public int deleteEmsAlarmRecordsById(Long id);
+
+    /**
+     * 获取故障告警列表
+     * @param requestVo
+     * @return
+     */
+    public List<AlarmRecordListResponseVo> getAlarmRecordDetailList(AlarmRecordListRequestVo requestVo);
+}

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

@@ -0,0 +1,61 @@
+package com.xzzn.ems.service;
+
+import java.util.List;
+import com.xzzn.ems.domain.EmsBatteryCluster;
+
+/**
+ * 电池簇数据Service接口
+ *
+ * @author xzzn
+ * @date 2025-06-29
+ */
+public interface IEmsBatteryClusterService
+{
+    /**
+     * 查询电池簇数据
+     *
+     * @param id 电池簇数据主键
+     * @return 电池簇数据
+     */
+    public EmsBatteryCluster selectEmsBatteryClusterById(Long id);
+
+    /**
+     * 查询电池簇数据列表
+     *
+     * @param emsBatteryCluster 电池簇数据
+     * @return 电池簇数据集合
+     */
+    public List<EmsBatteryCluster> selectEmsBatteryClusterList(EmsBatteryCluster emsBatteryCluster);
+
+    /**
+     * 新增电池簇数据
+     *
+     * @param emsBatteryCluster 电池簇数据
+     * @return 结果
+     */
+    public int insertEmsBatteryCluster(EmsBatteryCluster emsBatteryCluster);
+
+    /**
+     * 修改电池簇数据
+     *
+     * @param emsBatteryCluster 电池簇数据
+     * @return 结果
+     */
+    public int updateEmsBatteryCluster(EmsBatteryCluster emsBatteryCluster);
+
+    /**
+     * 批量删除电池簇数据
+     *
+     * @param ids 需要删除的电池簇数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsBatteryClusterByIds(Long[] ids);
+
+    /**
+     * 删除电池簇数据信息
+     *
+     * @param id 电池簇数据主键
+     * @return 结果
+     */
+    public int deleteEmsBatteryClusterById(Long id);
+}

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

@@ -0,0 +1,71 @@
+package com.xzzn.ems.service;
+
+import com.xzzn.ems.domain.EmsBatteryData;
+
+import java.util.List;
+
+/**
+ * 单体电池实时数据Service接口
+ *
+ * @author xzzn
+ * @date 2025-06-27
+ */
+public interface IEmsBatteryDataService
+{
+    /**
+     * 查询单体电池实时数据
+     *
+     * @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 ids 需要删除的单体电池实时数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsBatteryDataByIds(Long[] ids);
+
+    /**
+     * 删除单体电池实时数据信息
+     *
+     * @param id 单体电池实时数据主键
+     * @return 结果
+     */
+    public int deleteEmsBatteryDataById(Long id);
+
+    /**
+     * 新增单体电池实时数据
+     *
+     * @param emsBatteryDataList 单体电池实时数据
+     * @return 结果
+     */
+    public int insertEmsBatteryDataList(List<EmsBatteryData> emsBatteryDataList);
+
+}

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

@@ -0,0 +1,61 @@
+package com.xzzn.ems.service;
+
+import java.util.List;
+import com.xzzn.ems.domain.EmsBatteryStack;
+
+/**
+ * 电池堆数据Service接口
+ *
+ * @author xzzn
+ * @date 2025-06-29
+ */
+public interface IEmsBatteryStackService
+{
+    /**
+     * 查询电池堆数据
+     *
+     * @param id 电池堆数据主键
+     * @return 电池堆数据
+     */
+    public EmsBatteryStack selectEmsBatteryStackById(Long id);
+
+    /**
+     * 查询电池堆数据列表
+     *
+     * @param emsBatteryStack 电池堆数据
+     * @return 电池堆数据集合
+     */
+    public List<EmsBatteryStack> selectEmsBatteryStackList(EmsBatteryStack emsBatteryStack);
+
+    /**
+     * 新增电池堆数据
+     *
+     * @param emsBatteryStack 电池堆数据
+     * @return 结果
+     */
+    public int insertEmsBatteryStack(EmsBatteryStack emsBatteryStack);
+
+    /**
+     * 修改电池堆数据
+     *
+     * @param emsBatteryStack 电池堆数据
+     * @return 结果
+     */
+    public int updateEmsBatteryStack(EmsBatteryStack emsBatteryStack);
+
+    /**
+     * 批量删除电池堆数据
+     *
+     * @param ids 需要删除的电池堆数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsBatteryStackByIds(Long[] ids);
+
+    /**
+     * 删除电池堆数据信息
+     *
+     * @param id 电池堆数据主键
+     * @return 结果
+     */
+    public int deleteEmsBatteryStackById(Long id);
+}

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

@@ -0,0 +1,13 @@
+package com.xzzn.ems.service;
+
+import com.xzzn.ems.domain.EmsDevicesSetting;
+
+/**
+ * 设备信息 服务层
+ *
+ */
+public interface IEmsDeviceSettingService
+{
+
+    public EmsDevicesSetting getDeviceDetailInfo(String deviceId);
+}

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

@@ -0,0 +1,62 @@
+package com.xzzn.ems.service;
+
+import com.xzzn.ems.domain.EmsMqttMessage;
+
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author xzzn
+ * @date 2025-06-27
+ */
+public interface IEmsMqttMessageService
+{
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    public EmsMqttMessage selectEmsMqttMessageById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param emsMqttMessage 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<EmsMqttMessage> selectEmsMqttMessageList(EmsMqttMessage emsMqttMessage);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param emsMqttMessage 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertEmsMqttMessage(EmsMqttMessage emsMqttMessage);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param emsMqttMessage 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateEmsMqttMessage(EmsMqttMessage emsMqttMessage);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的【请填写功能名称】主键集合
+     * @return 结果
+     */
+    public int deleteEmsMqttMessageByIds(Long[] ids);
+
+    /**
+     * 删除【请填写功能名称】信息
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    public int deleteEmsMqttMessageById(Long id);
+}

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

@@ -0,0 +1,63 @@
+package com.xzzn.ems.service;
+
+import java.util.List;
+import com.xzzn.ems.domain.EmsPcsBranchData;
+
+/**
+ * pcs支路数据Service接口
+ *
+ * @author xzzn
+ * @date 2025-06-29
+ */
+public interface IEmsPcsBranchDataService
+{
+    /**
+     * 查询pcs支路数据
+     *
+     * @param id pcs支路数据主键
+     * @return pcs支路数据
+     */
+    public EmsPcsBranchData selectEmsPcsBranchDataById(Long id);
+
+    /**
+     * 查询pcs支路数据列表
+     *
+     * @param emsPcsBranchData pcs支路数据
+     * @return pcs支路数据集合
+     */
+    public List<EmsPcsBranchData> selectEmsPcsBranchDataList(EmsPcsBranchData emsPcsBranchData);
+
+    /**
+     * 新增pcs支路数据
+     *
+     * @param emsPcsBranchData pcs支路数据
+     * @return 结果
+     */
+    public int insertEmsPcsBranchData(EmsPcsBranchData emsPcsBranchData);
+
+    /**
+     * 修改pcs支路数据
+     *
+     * @param emsPcsBranchData pcs支路数据
+     * @return 结果
+     */
+    public int updateEmsPcsBranchData(EmsPcsBranchData emsPcsBranchData);
+
+    /**
+     * 批量删除pcs支路数据
+     *
+     * @param ids 需要删除的pcs支路数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsPcsBranchDataByIds(Long[] ids);
+
+    /**
+     * 删除pcs支路数据信息
+     *
+     * @param id pcs支路数据主键
+     * @return 结果
+     */
+    public int deleteEmsPcsBranchDataById(Long id);
+
+    int insertEmsPcsBranchDataList(List<EmsPcsBranchData> list);
+}

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

@@ -0,0 +1,62 @@
+package com.xzzn.ems.service;
+
+import com.xzzn.ems.domain.EmsPcsData;
+
+import java.util.List;
+
+/**
+ * PCS数据Service接口
+ *
+ * @author xzzn
+ * @date 2025-06-27
+ */
+public interface IEmsPcsDataService
+{
+    /**
+     * 查询PCS数据
+     *
+     * @param id PCS数据主键
+     * @return PCS数据
+     */
+    public EmsPcsData selectEmsPcsDataById(Long id);
+
+    /**
+     * 查询PCS数据列表
+     *
+     * @param emsPcsData PCS数据
+     * @return PCS数据集合
+     */
+    public List<EmsPcsData> selectEmsPcsDataList(EmsPcsData emsPcsData);
+
+    /**
+     * 新增PCS数据
+     *
+     * @param emsPcsData PCS数据
+     * @return 结果
+     */
+    public int insertEmsPcsData(EmsPcsData emsPcsData);
+
+    /**
+     * 修改PCS数据
+     *
+     * @param emsPcsData PCS数据
+     * @return 结果
+     */
+    public int updateEmsPcsData(EmsPcsData emsPcsData);
+
+    /**
+     * 批量删除PCS数据
+     *
+     * @param ids 需要删除的PCS数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsPcsDataByIds(Long[] ids);
+
+    /**
+     * 删除PCS数据信息
+     *
+     * @param id PCS数据主键
+     * @return 结果
+     */
+    public int deleteEmsPcsDataById(Long id);
+}