revert

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

@@ -0,0 +1,58 @@
+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.common.utils.StringUtils;
+import com.xzzn.ems.domain.EmsAlarmRecords;
+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);
+    }
+
+    /**
+     * 生成工单
+     */
+    @PostMapping("/createTicketNo")
+    public AjaxResult createTicketNo(@RequestBody EmsAlarmRecords emsAlarmRecords)
+    {
+        Long id = emsAlarmRecords.getId();
+        if (id == null) {
+            return error("告警id不能为空");
+        }
+        String ticketNo= iEmsAlarmRecordsService.createTicketNo(id,getUserId());
+        if (StringUtils.isNotEmpty(ticketNo) && ticketNo.contains("T")) {
+            return  AjaxResult.success("操作成功", ticketNo);
+        } else {
+            return error(ticketNo);
+        }
+    }
+
+}

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

@@ -34,9 +34,13 @@ public class EmsHomePageController extends BaseController{
      * 首页看板数据
      */
     @GetMapping("/dataList")
-    public AjaxResult list()
+    public AjaxResult list() throws  Exception
     {
+        try {
             return success(homePageService.getHomePageDataList());
+        } catch (Exception e) {
+            return error(e.getMessage());
+        }
     }
 
     /**

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

@@ -0,0 +1,139 @@
+package com.xzzn.web.controller.ems;
+
+import com.xzzn.common.config.RuoYiConfig;
+import com.xzzn.common.core.controller.BaseController;
+import com.xzzn.common.core.domain.AjaxResult;
+import com.xzzn.common.core.page.TableDataInfo;
+import com.xzzn.common.utils.file.FileUploadUtils;
+import com.xzzn.common.utils.file.MimeTypeUtils;
+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.*;
+import org.springframework.web.multipart.MultipartFile;
+
+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 Long id)
+    {
+        return success(iEmsDeviceSettingService.getDeviceDetailInfo(id));
+    }
+
+    /**
+     * 获取设备列表-不分页
+     */
+    @GetMapping("/getDeviceList")
+    public AjaxResult getDeviceInfoList2(@RequestParam String siteId)
+    {
+        return success(iEmsSiteService.getAllDeviceList(siteId));
+    }
+
+    /**
+     * 获取所有设备类别
+     */
+    @GetMapping("/getDeviceCategory")
+    public AjaxResult getDeviceCategory()
+    {
+        return success(iEmsDeviceSettingService.getDeviceCategory());
+    }
+
+    /**
+     * 新增设备
+     */
+    @PostMapping("/addDevice")
+    public AjaxResult addDevice(@RequestBody EmsDevicesSetting devicesSetting)
+    {
+        int result = iEmsDeviceSettingService.addDevice(devicesSetting);
+        if (result > 0)  {
+            return AjaxResult.success(result);
+        }   else  {
+            return AjaxResult.error("该设备已存在");
+        }
+    }
+
+    /**
+     * 上传设备图片
+     */
+    @PostMapping("/uploadDeviceImg")
+    public AjaxResult uploadDeviceImg(@RequestParam("avatarfile") MultipartFile file) throws Exception
+    {
+        if (!file.isEmpty()) {
+            String avatar = FileUploadUtils.upload(RuoYiConfig.getDevicePath(), file, MimeTypeUtils.IMAGE_EXTENSION);
+
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("imgUrl", avatar);
+            return ajax;
+        }
+        return error("上传图片异常，请联系管理员");
+    }
+
+    /**
+     * 修改Modbus设备配置
+     */
+    @PostMapping("/updateDevice")
+    public AjaxResult updateDevice(@RequestBody EmsDevicesSetting emsDevicesSetting)
+    {
+        int result = iEmsDeviceSettingService.updateDevice(emsDevicesSetting);
+        if (result > 0)  {
+            return AjaxResult.success(result);
+        }   else  if (result == -1)  {
+            return AjaxResult.error("数据不存在");
+        }   else  if (result == -2)  {
+            return AjaxResult.error("该设备已存在");
+        }
+        return AjaxResult.success(result);
+    }
+
+    /**
+     * 删除Modbus设备配置
+     */
+    @DeleteMapping("/deleteService/{id}")
+    public AjaxResult deleteService(@PathVariable Long id)
+    {
+        return toAjax(iEmsDeviceSettingService.deleteEmsDevicesSettingById(id));
+    }
+}

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

@@ -4,7 +4,9 @@ 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.domain.vo.DateSearchRequest;
 import com.xzzn.ems.service.IEmsSiteService;
+import com.xzzn.ems.service.IEmsStatsReportService;
 import com.xzzn.ems.service.ISingleSiteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -24,6 +26,8 @@ public class EmsSiteMonitorController extends BaseController{
     private ISingleSiteService iSingleSiteService;
     @Autowired
     private IEmsSiteService iEmsSiteService;
+    @Autowired
+    private IEmsStatsReportService iemsStatsReportService;
 
     /**
      * 获取单站首页数据
@@ -46,10 +50,28 @@ public class EmsSiteMonitorController extends BaseController{
     /**
      * 单站监控-设备监控-实时运行曲线图数据
      */
-    @GetMapping("/runningGraph")
+    @GetMapping("/runningGraph/storagePower")
-    public AjaxResult getRunningGraph(@RequestParam String siteId)
+    public AjaxResult getRunningGraphStorage(@RequestParam String siteId)
     {
-        return success(iSingleSiteService.getRunningGraph(siteId));
+        return success(iSingleSiteService.getRunningGraphStorage(siteId));
+    }
+
+    @GetMapping("/runningGraph/stackAveTemp")
+    public AjaxResult getRunningGraphStackTemp(@RequestParam String siteId)
+    {
+        return success(iSingleSiteService.getRunningGraphStackTemp(siteId));
+    }
+
+    @GetMapping("/runningGraph/batteryAveSoc")
+    public AjaxResult getRunningGraphBatterySoc(@RequestParam String siteId)
+    {
+        return success(iSingleSiteService.getRunningGraphBatterySoc(siteId));
+    }
+
+    @GetMapping("/runningGraph/batteryAveTemp")
+    public AjaxResult getRunningGraphBatteryTemp(@RequestParam String siteId)
+    {
+        return success(iSingleSiteService.getRunningGraphBatteryTemp(siteId));
     }
 
     /**
@@ -88,13 +110,22 @@ public class EmsSiteMonitorController extends BaseController{
         return success(iEmsSiteService.getAllStackInfo(siteId));
     }
 
+    /**
+     * 获取所有pcs
+     */
+    @GetMapping("/getPcsNameList")
+    public AjaxResult getPcsNameList(@RequestParam String siteId)
+    {
+        return success(iEmsSiteService.getAllPcsInfo(siteId));
+    }
+
     /**
      * 获取所有电池簇
      */
     @GetMapping("/getClusterNameList")
-    public AjaxResult getClusterNameList(@RequestParam String stackDeviceId)
+    public AjaxResult getClusterNameList(@RequestParam String siteId, @RequestParam String stackDeviceId)
     {
-        return success(iEmsSiteService.getAllClusterInfo(stackDeviceId));
+        return success(iEmsSiteService.getAllClusterInfo(siteId, stackDeviceId));
     }
 
     /**
@@ -110,11 +141,20 @@ public class EmsSiteMonitorController extends BaseController{
      * 获取电池簇下面的单体电池数据
      */
     @GetMapping("/getClusterDataInfoList")
-    public TableDataInfo getClusterDataInfoList(@RequestParam String clusterDeviceId)
+    public TableDataInfo getClusterDataInfoList(@RequestParam String clusterDeviceId,@RequestParam String siteId)
     {
         startPage();
-        List<BatteryDataStatsListVo> list = iSingleSiteService.getClusterDataInfoList(clusterDeviceId);
+        List<BatteryDataStatsListVo> list = iSingleSiteService.getClusterDataInfoList(clusterDeviceId,siteId);
-        return  getDataTable(list);
+        return getDataTable2(list);
+    }
+
+    /**
+     * 单个单体电池曲线图
+     */
+    @GetMapping("/getSingleBatteryData")
+    public AjaxResult getSingleBatteryData(DateSearchRequest requestVo)
+    {
+        return success(iemsStatsReportService.getSingleBatteryData(requestVo));
     }
 
     /**

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

@@ -0,0 +1,143 @@
+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.common.utils.StringUtils;
+import com.xzzn.ems.domain.vo.ClusterStatisListVo;
+import com.xzzn.ems.domain.vo.DateSearchRequest;
+import com.xzzn.ems.domain.vo.StatisAmmeterDateRequest;
+import com.xzzn.ems.domain.vo.StatisClusterDateRequest;
+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;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 单站监控-统计报表
+ * 
+ * @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必传");
+        }
+    }
+
+    /**
+     * 概率统计-PCS曲线
+     */
+    @GetMapping("/getPCSData")
+    public AjaxResult getPCSData(DateSearchRequest requestVo)
+    {
+        if (!StringUtils.isEmpty(requestVo.getSiteId()) &&
+                !StringUtils.isEmpty(requestVo.getDeviceId()) &&
+                !StringUtils.isEmpty(requestVo.getDataType())) {
+            return success(ieEmsStatsReportService.getPCSDataResult(requestVo));
+        } else {
+            return error("缺少必传项");
+        }
+    }
+
+    /**
+     * 概率统计-电池堆曲线
+     */
+    @GetMapping("/getStackData")
+    public AjaxResult getStackData(DateSearchRequest requestVo)
+    {
+        if (!StringUtils.isEmpty(requestVo.getSiteId()) &&
+                !StringUtils.isEmpty(requestVo.getDeviceId()) &&
+                !StringUtils.isEmpty(requestVo.getDataType())) {
+            return success(ieEmsStatsReportService.getStackDataResult(requestVo));
+        } else {
+            return error("缺少必传项");
+        }
+    }
+
+    /**
+     * 概率统计-电池温度等数据
+     */
+    @GetMapping("/getClusterData")
+    public TableDataInfo getClusterData(StatisClusterDateRequest requestVo)
+    {
+        startPage();
+        List<ClusterStatisListVo> dataList =  new ArrayList<>();
+        if (!StringUtils.isEmpty(requestVo.getStackId()) &&
+                !StringUtils.isEmpty(requestVo.getClusterId())) {
+            dataList = ieEmsStatsReportService.getClusterDataResult(requestVo);
+            return getDataTable(dataList);
+        } else {
+            return getDataTable(dataList);
+        }
+    }
+
+    /**
+     * 概率统计-获取总表
+     */
+    @GetMapping("/getLoadNameList")
+    public AjaxResult getLoadNameList(String siteId)
+    {
+        if (!StringUtils.isEmpty(siteId)) {
+            return success(ieEmsStatsReportService.getLoadNameList(siteId));
+        } else {
+            return error("缺少必传项");
+        }
+    }
+
+    /**
+     * 概率统计-电表报表
+     */
+    @GetMapping("/getAmmeterData")
+    public AjaxResult getAmmeterData(StatisAmmeterDateRequest requestVo)
+    {
+        if (!StringUtils.isEmpty(requestVo.getDeviceId())) {
+            return success(ieEmsStatsReportService.getAmmeterDataResult(requestVo));
+        } else {
+            return error("缺少必传项");
+        }
+    }
+
+    /**
+     * 概率统计-功率曲线
+     */
+    @GetMapping("/getPowerData")
+    public AjaxResult getPowerData(DateSearchRequest requestVo)
+    {
+        if (!StringUtils.isEmpty(requestVo.getSiteId())
+                && !StringUtils.isEmpty(requestVo.getDeviceId())
+                && !StringUtils.isEmpty(requestVo.getDataType())) {
+            return success(ieEmsStatsReportService.getPowerDataList(requestVo));
+        } else {
+            return error("缺少必传项");
+        }
+    }
+
+}

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

@@ -0,0 +1,76 @@
+package com.xzzn.web.controller.ems;
+
+import com.xzzn.common.utils.StringUtils;
+import com.xzzn.ems.domain.EmsStrategyRunning;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.xzzn.common.core.controller.BaseController;
+import com.xzzn.common.core.domain.AjaxResult;
+import com.xzzn.ems.service.IEmsStrategyService;
+
+/**
+ * 策略Controller
+ *
+ * @author xzzn
+ * @date 2025-07-10
+ */
+@RestController
+@RequestMapping("/system/strategyRunning")
+public class EmsStrategyController extends BaseController
+{
+    @Autowired
+    private IEmsStrategyService emsStrategyService;
+
+    /**
+     * 获取站点策略配置
+     */
+    @GetMapping("/list")
+    public AjaxResult list(String siteId) {
+        return success(emsStrategyService.selectEmsStrategyRunningList(siteId));
+    }
+    /**
+     * 停止策略
+     */
+    @GetMapping(value = "/stop")
+    public AjaxResult stop(Long id)
+    {
+        return toAjax(emsStrategyService.stopRunningStrategy(id));
+    }
+
+    /**
+     * 获取主策略列表
+     */
+    @GetMapping(value = "/getMainStrategyList")
+    public AjaxResult getMainStrategyList()
+    {
+        return success(emsStrategyService.getMainStrategyList());
+    }
+
+    /**
+     * 获取辅助策略列表
+     */
+    @GetMapping(value = "/getAuxStrategyList")
+    public AjaxResult getAuxStrategyList()
+    {
+        return success(emsStrategyService.getAuxStrategyList());
+    }
+
+    /**
+     * 配置策略
+     */
+    @PostMapping(value = "/configStrategy")
+    public AjaxResult configStrategy(@RequestBody EmsStrategyRunning emsStrategyRunning)
+    {
+        if (emsStrategyRunning.getMainStrategyId() == null
+                || StringUtils.isEmpty(emsStrategyRunning.getSiteId())){
+            return error("缺少必填字段");
+        }
+        emsStrategyRunning.setCreateBy(getUsername());
+        emsStrategyRunning.setUpdateBy(getUsername());
+        int result = emsStrategyService.configStrategy(emsStrategyRunning);
+        if (result == -1){
+            return error("不支持重复添加");
+        }
+        return success(result);
+    }
+}

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

@@ -0,0 +1,113 @@
+package com.xzzn.web.controller.ems;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.xzzn.ems.domain.EmsStrategyTemp;
+import com.xzzn.ems.domain.EmsStrategyTimeConfig;
+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.ems.domain.EmsStrategyCurve;
+import com.xzzn.ems.service.IEmsStrategyCurveService;
+import com.xzzn.common.utils.poi.ExcelUtil;
+
+/**
+ * 策曲线Controller
+ *
+ * @author xzzn
+ * @date 2025-07-11
+ */
+@RestController
+@RequestMapping("/strategy/curve")
+public class EmsStrategyCurveController extends BaseController
+{
+    @Autowired
+    private IEmsStrategyCurveService emsStrategyCurveService;
+
+    /**
+     * 查询策曲线列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:curve:list')")
+    @GetMapping("/list")
+    public AjaxResult list(EmsStrategyCurve emsStrategyCurve)
+    {
+        return success(emsStrategyCurveService.selectEmsStrategyCurveList(emsStrategyCurve));
+    }
+
+    /**
+     * 导出策曲线列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:curve:export')")
+    @Log(title = "策曲线", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EmsStrategyCurve emsStrategyCurve)
+    {
+        List<EmsStrategyCurve> list = emsStrategyCurveService.selectEmsStrategyCurveList(emsStrategyCurve);
+        ExcelUtil<EmsStrategyCurve> util = new ExcelUtil<EmsStrategyCurve>(EmsStrategyCurve.class);
+        util.exportExcel(response, list, "策曲线数据");
+    }
+
+    /**
+     * 获取策曲线详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:curve:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(emsStrategyCurveService.selectEmsStrategyCurveById(id));
+    }
+
+    /**
+     * 新增策曲线
+     */
+    @PreAuthorize("@ss.hasPermi('system:curve:add')")
+    @Log(title = "策曲线", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EmsStrategyCurve emsStrategyCurve)
+    {
+        return toAjax(emsStrategyCurveService.insertEmsStrategyCurve(emsStrategyCurve));
+    }
+
+    /**
+     * 修改策曲线
+     */
+    @PreAuthorize("@ss.hasPermi('system:curve:edit')")
+    @Log(title = "策曲线", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmsStrategyCurve emsStrategyCurve)
+    {
+        return toAjax(emsStrategyCurveService.updateEmsStrategyCurve(emsStrategyCurve));
+    }
+
+    /**
+     * 删除策曲线
+     */
+    @PreAuthorize("@ss.hasPermi('system:curve:remove')")
+    @Log(title = "策曲线", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(emsStrategyCurveService.deleteEmsStrategyCurveByIds(ids));
+    }
+
+    /**
+     * 获取策略曲线图数据
+     */
+    @GetMapping("/curveList")
+    public AjaxResult getCurveList(EmsStrategyTemp tempConfig)
+    {
+        return success(emsStrategyCurveService.getStrategyCurveList(tempConfig));
+    }
+}

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

@@ -0,0 +1,94 @@
+package com.xzzn.web.controller.ems;
+
+import com.xzzn.ems.domain.vo.StrategyTempConfigRequest;
+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.ems.service.IEmsStrategyTempService;
+
+/**
+ * 模板Controller
+ *
+ * @author xzzn
+ * @date 2025-07-11
+ */
+@RestController
+@RequestMapping("/strategy/temp")
+public class EmsStrategyTempController extends BaseController
+{
+    @Autowired
+    private IEmsStrategyTempService emsStrategyTempService;
+
+    /**
+     * 根据策略id站点id获取所有模板名称
+     */
+    @GetMapping("/getTempNameList")
+    public AjaxResult getTempNameList(Long strategyId, String siteId)
+    {
+        return success(emsStrategyTempService.getTempNameList(strategyId, siteId));
+    }
+
+    /**
+     * 获取单个模板时间配置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:temp:list')")
+    @GetMapping("/list")
+    public AjaxResult list(String templateId)
+    {
+        return success(emsStrategyTempService.selectEmsStrategyTempList(templateId));
+    }
+
+    /**
+     * 新增模板及时间配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:temp:add')")
+    @Log(title = "模板", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StrategyTempConfigRequest requestVo)
+    {
+        boolean result = emsStrategyTempService.addNewTempAndTimeConfig(requestVo);
+        if (result) {
+            return success();
+        } else  {
+            return AjaxResult.error("新增失败请重试！");
+        }
+    }
+
+    /**
+     * 修改模板
+     */
+    @PreAuthorize("@ss.hasPermi('system:temp:edit')")
+    @Log(title = "模板", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody StrategyTempConfigRequest requestVo)
+    {
+        boolean result = emsStrategyTempService.updateEmsStrategyTemp(requestVo);
+        if (result) {
+            return success();
+        } else  {
+            return AjaxResult.error("更新失败，请重试！");
+        }
+    }
+
+    /**
+     * 删除模板
+     */
+    @PreAuthorize("@ss.hasPermi('system:temp:remove')")
+    @Log(title = "模板", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{templateId}")
+    public AjaxResult remove(@PathVariable String templateId)
+    {
+        return success(emsStrategyTempService.deleteStrategyTempById(templateId));
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.xzzn.web.controller.ems;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.ems.domain.EmsStrategyTimeConfig;
+import com.xzzn.ems.service.IEmsStrategyTimeConfigService;
+
+/**
+ * 时间配置Controller
+ *
+ * @author xzzn
+ * @date 2025-07-11
+ */
+@RestController
+@RequestMapping("/strategy/timeConfig")
+public class EmsStrategyTimeConfigController extends BaseController
+{
+    @Autowired
+    private IEmsStrategyTimeConfigService emsStrategyTimeConfigService;
+
+    /**
+     * 查询时间配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:list')")
+    @GetMapping("/list")
+    public AjaxResult list(EmsStrategyTimeConfig emsStrategyTimeConfig)
+    {
+        return  success(emsStrategyTimeConfigService.getStrategyTimeList(emsStrategyTimeConfig));
+    }
+
+    /**
+     * 获取时间配置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(emsStrategyTimeConfigService.selectEmsStrategyTimeConfigById(id));
+    }
+
+    /**
+     * 新增时间配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:add')")
+    @Log(title = "时间配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody List<EmsStrategyTimeConfig> emsStrategyTimeConfigList)
+    {
+        boolean result = emsStrategyTimeConfigService.insertEmsStrategyTimeConfig(emsStrategyTimeConfigList);
+        if (result){
+            return success();
+        }else {
+            return error("编辑失败请重试！");
+        }
+
+    }
+
+    /**
+     * 修改时间配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:edit')")
+    @Log(title = "时间配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmsStrategyTimeConfig emsStrategyTimeConfig)
+    {
+        return toAjax(emsStrategyTimeConfigService.updateEmsStrategyTimeConfig(emsStrategyTimeConfig));
+    }
+
+    /**
+     * 删除时间配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "时间配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(emsStrategyTimeConfigService.deleteEmsStrategyTimeConfigByIds(ids));
+    }
+}

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

@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.xzzn.common.utils.poi.ExcelUtil;
 import com.xzzn.ems.domain.EmsTicket;
+import com.xzzn.ems.domain.vo.TicketListVo;
 import com.xzzn.ems.service.IEmsTicketService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,10 +41,10 @@ public class EmsTicketController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:ticket:list')")
     @GetMapping("/list")
-    public TableDataInfo list(EmsTicket emsTicket)
+    public TableDataInfo list(Long[] status)
     {
         startPage();
-        List<EmsTicket> list = emsTicketService.selectEmsTicketList(emsTicket);
+        List<TicketListVo> list = emsTicketService.getAllTicketList(status);
         return getDataTable(list);
     }
 
@@ -102,4 +103,15 @@ public class EmsTicketController extends BaseController
     {
         return toAjax(emsTicketService.deleteEmsTicketByIds(ids));
     }
+
+    /**
+     * 废弃工单
+     */
+    @PreAuthorize("@ss.hasPermi('system:ticket:delete')")
+    @Log(title = "工单主", businessType = BusinessType.DELETE)
+    @PostMapping("/drop")
+    public AjaxResult drop(@RequestBody EmsTicket emsTicket)
+    {
+        return toAjax(emsTicketService.dropEmsTicketById(emsTicket.getId()));
+    }
 }

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

@@ -1,23 +1,12 @@
 package com.xzzn.web.controller.ems;
 
-import com.alibaba.druid.support.json.JSONParser;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
-import com.alibaba.fastjson2.TypeReference;
-import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.xzzn.common.utils.DateUtils;
-import com.xzzn.common.utils.StringUtils;
-import com.xzzn.ems.domain.EmsBatteryData;
 import com.xzzn.ems.domain.EmsMqttMessage;
-import com.xzzn.ems.domain.EmsPcsData;
+import com.xzzn.ems.service.IDDSDataProcessService;
-import com.xzzn.ems.service.IEmsBatteryDataService;
 import com.xzzn.ems.service.IEmsMqttMessageService;
-import com.xzzn.ems.service.IEmsPcsDataService;
+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.coyote.http11.Http11NioProtocol;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.eclipse.paho.client.mqttv3.IMqttMessageListener;
@@ -27,8 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
-import java.math.BigDecimal;
-import java.util.*;
 
 @Service
 public class MqttMessageController implements MqttPublisher, MqttSubscriber {
@@ -43,11 +30,10 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
     private IEmsMqttMessageService emsMqttMessageService;
 
     @Autowired
-    private IEmsBatteryDataService emsBatteryDataService;
+    private IFXXDataProcessService fXXDataProcessService;
 
     @Autowired
-    private IEmsPcsDataService emsPcsDataService;
+    private IDDSDataProcessService dDSDataProcessService;
-
     @Autowired
     public MqttMessageController(MqttLifecycleManager mqttLifecycleManager) {
         this.mqttLifecycleManager = mqttLifecycleManager;
@@ -55,12 +41,18 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
 
     @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);
 
+        // 订阅电动所系统状态主题
+        subscribe("021_DDS_01_UP", 1, this::handleDeviceData);
+        subscribe("021_DDS_01_RECALL", 1, this::handleDeviceData);
+        subscribe("021_DDS_01_DOWN", 1, this::handleDeviceData);
+        subscribe("021_DDS_01", 1, this::handleSystemStatus);
+
     }
 
     // 处理系统状态消息
@@ -69,15 +61,8 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
         System.out.println("[SYSTEM] Status update: " + payload);
 
         try {
-            // 业务处理逻辑
+            emsMqttMessageService.insertMqttOriginalMessage(topic,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);
         }
@@ -89,16 +74,13 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
         System.out.println("[DEVICE] data: " + payload);
         try {
             // 业务处理逻辑
-            handleFxData(payload);
+            if (topic.startsWith("021_DDS")) {
+                dDSDataProcessService.handleDdsData(payload);
+            } else if (topic.startsWith("021_FXX")) {
+                fXXDataProcessService.handleFxData(payload);
+            }
 
-            EmsMqttMessage mqttMessage = new EmsMqttMessage();
+            emsMqttMessageService.insertMqttOriginalMessage(topic,payload);
-            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);
         }
@@ -133,146 +115,5 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
     }
 
 
-    private void handleFxData(String message) {
-        JSONArray arraylist = JSONArray.parseArray(message);
 
-        for (int i = 0; i < arraylist.size(); i++) {
-            JSONObject obj = JSONObject.parseObject(arraylist.get(i).toString());
-
-            String deviceId = obj.get("Device").toString();
-            String jsonData = obj.get("Data").toString();
-
-            log.info("deviceId:" + deviceId);
-            if (deviceId.contains("BMS")) {
-                log.info("====================");
-                log.info("BMS data:"+ jsonData);
-
-                Map<String, Map<String, Object>> records = processData(JSON.parseObject(jsonData, new TypeReference<Map<String, Object>>() {}));
-                List<EmsBatteryData> list = new ArrayList<>();
-                //单体电池
-                for (Map.Entry<String, Map<String, Object>> record : records.entrySet()) {
-                    String recordId = record.getKey();
-                    Map<String, Object> fields = record.getValue();
-
-                    EmsBatteryData data = new EmsBatteryData();
-                    data.setDeviceId(recordId);
-                    data.setBatteryCellId(recordId);
-                    data.setSoc(StringUtils.getBigDecimal(fields.get("DTSOC")));
-                    data.setSoh(StringUtils.getBigDecimal(fields.get("DTSOH")));
-                    data.setTemperature(StringUtils.getBigDecimal(fields.get("DTWD")));
-                    data.setVoltage(StringUtils.getBigDecimal(fields.get("DTDY")));
-
-                    data.setBatteryCluster(deviceId);
-                    data.setBatteryPack(deviceId);
-
-                    // 时间戳
-                    data.setDataTimestamp(new Date());
-
-                    // ID字段
-                    data.setSiteId(("021"));
-                    data.setClusterDeviceId(("021"));
-
-                    list.add(data);
-                }
-                if (list.size() > 0 ) {
-                    emsBatteryDataService.insertEmsBatteryDataList(list);
-                }
-            } else if (deviceId.contains("PCS")) {
-                log.info("====================");
-
-                log.info("PCS data:"+ jsonData);
-                //pcs
-                EmsPcsData data = new EmsPcsData();
-                // 时间与状态类字段
-                data.setDataUpdateTime(new Date());
-                data.setWorkStatus("A");
-                data.setGridStatus("B");
-                data.setDeviceStatus("C");
-                data.setControlMode("D");
-
-                // 功率与能量类字段
-                data.setTotalActivePower(BigDecimal.ZERO);
-                data.setDailyAcChargeEnergy(BigDecimal.ZERO);
-                data.setTotalReactivePower(BigDecimal.ZERO);
-                data.setDailyAcDischargeEnergy(BigDecimal.ZERO);
-                data.setTotalApparentPower(BigDecimal.ZERO);
-                data.setTotalPowerFactor(BigDecimal.ZERO);
-                data.setDcPower(BigDecimal.ZERO);
-                data.setTotalAcChargeEnergy(BigDecimal.ZERO);
-                data.setTotalAcDischargeEnergy(BigDecimal.ZERO);
-                data.setAcChargeActivePower(BigDecimal.ZERO);
-                data.setAcCapacitiveReactivePower(BigDecimal.ZERO);
-                data.setAcDischargeActivePower(BigDecimal.ZERO);
-                data.setAcInductiveReactivePower(BigDecimal.ZERO);
-                data.setMaxCapacitivePowerCapacity(BigDecimal.ZERO);
-                data.setMaxInductivePowerCapacity(BigDecimal.ZERO);
-                data.setMaxChargePowerCapacity(BigDecimal.ZERO);
-                data.setMaxDischargePowerCapacity(BigDecimal.ZERO);
-
-
-                // 温度与环境参数
-                data.setPcsModuleTemperature(BigDecimal.ZERO);
-                data.setPcsEnvironmentTemperature(BigDecimal.ZERO);
-                data.setAcFrequency(BigDecimal.ZERO);
-
-                // 状态指示类
-                data.setBranchStatus("A");
-                data.setDischargeStatus("A");
-                data.setAcSwitchStatus("A");
-                data.setDcSwitchStatus("A");
-                data.setRemoteControlStatus("A");
-
-                // 直流参数
-                data.setDcVoltage(BigDecimal.ZERO);
-                data.setDcCurrent(BigDecimal.ZERO);
-
-                // 系统管理字段
-//                data.setCreateBy(BigDecimal.ZERO);
-//                data.setCreateTime(BigDecimal.ZERO);
-//                data.setUpdateBy(BigDecimal.ZERO);
-//                data.setUpdateTime(BigDecimal.ZERO);
-//                data.setRemark(BigDecimal.ZERO);
-                data.setSiteId(("021"));
-                data.setDeviceId(deviceId);
-                data.setDateMonth(Long.parseLong("6"));
-                data.setDateDay(Long.parseLong("28"));
-
-                data.setDeviceId(deviceId);
-
-
-
-
-                emsPcsDataService.insertEmsPcsData(data);
-
-            }
-
-        }
-
-
-    }
-
-    // 数据分组处理
-    private static Map<String, Map<String, Object>> processData(Map<String, Object> rawData) {
-        Map<String, Map<String, Object>> records = new HashMap<>();
-
-        for (Map.Entry<String, Object> entry : rawData.entrySet()) {
-            String key = entry.getKey();
-            // 提取记录ID（最后3位）
-            String recordId = key.substring(key.length() - 3);
-            try {
-                Long.parseLong(recordId);
-            } catch (Exception e) {
-                continue;
-            }
-
-            // 提取字段类型（前缀）
-            String fieldType = key.substring(0, key.length() - 3);
-
-            // 初始化记录
-            records.putIfAbsent(recordId, new HashMap<>());
-            // 存入字段值
-            records.get(recordId).put(fieldType, entry.getValue());
-        }
-        return records;
-    }
 }

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

@@ -3,6 +3,8 @@ package com.xzzn.web.controller.system;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import com.xzzn.system.service.impl.SysUserServiceImpl;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -52,6 +54,8 @@ public class SysUserController extends BaseController
 
     @Autowired
     private ISysPostService postService;
+    @Autowired
+    private SysUserServiceImpl sysUserServiceImpl;
 
     /**
      * 获取用户列表
@@ -253,4 +257,13 @@ public class SysUserController extends BaseController
     {
         return success(deptService.selectDeptTreeList(dept));
     }
+
+    /**
+     * 获取所有用户
+     */
+    @GetMapping("/getAllUser")
+    public AjaxResult getAllUser(SysUser user)
+    {
+        return  success(userService.selectUserList(user));
+    }
 }

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

@@ -34,7 +34,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.xzzn: debug
+    com.xzzn: info
     org.springframework: warn
 
 # 用户配置
@@ -131,8 +131,17 @@ xss:
 mqtt:
   broker.url: tcp://122.51.194.184:1883
   client.id: ems-cloud
-  username: admin
+  username: dmbroker
-  password: pass123
+  password: qwer1234
   connection-timeout: 15
   keep-alive-interval: 30
   automatic-reconnect: true
+
+modbus:
+  pool:
+    max-total: 20
+    max-idle: 10
+    min-idle: 3
+  poll:
+    interval: "0 */5 * * * *"  # 5分钟间隔
+    timeout: 30000             # 30秒超时

ems-common/src/main/java/com/xzzn/common/config/RuoYiConfig.java

@@ -119,4 +119,12 @@ public class RuoYiConfig
     {
         return getProfile() + "/upload";
     }
+
+    /**
+     * 获取头像上传路径
+     */
+    public static String getDevicePath()
+    {
+        return getProfile() + "/device";
+    }
 }

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

@@ -0,0 +1,54 @@
+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_";
+
+    /**
+     * 动环数据 redis key
+     */
+    public static final String DH = "DH_";
+
+    /**
+     * 电池组 redis key
+     */
+    public static final String GROUP = "GROUP_";
+
+    /**
+     * BMSD原始数据 redis key
+     */
+    public static final String ORIGINAL_BMSD = "BMSD_";
+}

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,36 @@
+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", "电表"),
+    COOLING("COOLING", "冷液体");
+
+    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/SdcLimitType.java

@@ -0,0 +1,30 @@
+package com.xzzn.common.enums;
+
+/**
+ * strategy模板-sdc限制
+ * 
+ * @author xzzn
+ */
+public enum SdcLimitType
+{
+    OFF("0", "关"), ON("1", "开");
+
+    private final String code;
+    private final String info;
+
+    SdcLimitType(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

@@ -723,12 +723,32 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
 
     public static BigDecimal getBigDecimal(Object s){
-
+        BigDecimal result;
         try {
-            return new BigDecimal(s.toString());
+            result = new BigDecimal(s.toString());
-        } catch (NumberFormatException e) {
+        } 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

@@ -50,6 +50,20 @@
             <groupId>org.eclipse.paho</groupId>
             <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
         </dependency>
+        <!-- 轮询 -->
+        <dependency>
+            <groupId>net.wimpi</groupId>
+            <artifactId>j2mod</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.github.resilience4j</groupId>
+            <artifactId>resilience4j-annotations</artifactId>
+        </dependency>
         <!-- 获取系统信息 -->
         <dependency>
             <groupId>com.github.oshi</groupId>
@@ -61,12 +75,6 @@
             <groupId>com.xzzn</groupId>
             <artifactId>ems-system</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
     </dependencies>
-
 </project>

ems-framework/src/main/java/com/xzzn/framework/aspectj/RateLimiterAspect.java

@@ -25,7 +25,7 @@ import com.xzzn.common.utils.ip.IpUtils;
  * @author xzzn
  */
 @Aspect
-@Component
+@Component("customRateLimiterAspect")
 public class RateLimiterAspect
 {
     private static final Logger log = LoggerFactory.getLogger(RateLimiterAspect.class);

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

@@ -0,0 +1,49 @@
+/*
+package com.xzzn.framework.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+@Configuration
+@EnableAsync
+public class AsyncConfig {
+
+    @Bean("modbusTaskExecutor")
+    public Executor taskExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(5);
+        executor.setMaxPoolSize(10);
+        executor.setQueueCapacity(100);
+        executor.setKeepAliveSeconds(300);
+        executor.setThreadNamePrefix("ModbusPoller-");
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        executor.initialize();
+        return executor;
+    }
+
+    */
+/**
+     * 策略下方定时任务
+     *//*
+
+    */
+/*@Bean("strategyTaskExecutor")
+    public Executor strategyTaskExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(5);
+        executor.setMaxPoolSize(10);
+        executor.setQueueCapacity(100);
+        executor.setKeepAliveSeconds(300);
+        executor.setThreadNamePrefix("StrategyPoller-");
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        executor.initialize();
+        return executor;
+    }*//*
+
+}
+*/

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

@@ -0,0 +1,38 @@
+package com.xzzn.framework.config;
+
+import com.xzzn.framework.manager.ModbusConnectionManager;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class ModbusConfig {
+
+    @Value("${modbus.pool.max-total:20}")
+    private int maxTotal;
+
+    @Value("${modbus.pool.max-idle:10}")
+    private int maxIdle;
+
+    @Value("${modbus.pool.min-idle:3}")
+    private int minIdle;
+
+    @Value("${modbus.pool.max-wait:3000}")
+    private long maxWaitMillis;
+
+    @Value("${modbus.pool.time-between-eviction-runs:30000}")
+    private long timeBetweenEvictionRunsMillis;
+
+    @Value("${modbus.pool.min-evictable-idle-time:60000}")
+    private long minEvictableIdleTimeMillis;
+
+    public ModbusConnectionManager modbusConnectionManager() {
+        ModbusConnectionManager manager = new ModbusConnectionManager();
+        manager.setMaxTotal(maxTotal);
+        manager.setMaxIdle(maxIdle);
+        manager.setMinIdle(minIdle);
+        manager.setMaxWaitMillis(maxWaitMillis);
+        manager.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
+        manager.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
+        return manager;
+    }
+}

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

@@ -1,10 +1,8 @@
 package com.xzzn.framework.config.properties;
 
-import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
-@Data
 @Configuration
 public class MqttProperties {
     @Value("${mqtt.broker.url}")
@@ -28,4 +26,59 @@ public class MqttProperties {
     @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/ModbusConnectionManager.java

@@ -0,0 +1,254 @@
+package com.xzzn.framework.manager;
+
+import com.ghgande.j2mod.modbus.net.TCPMasterConnection;
+import com.xzzn.ems.domain.EmsDevicesSetting;
+import com.xzzn.ems.mapper.EmsDevicesSettingMapper;
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PreDestroy;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
+
+@Component
+public class ModbusConnectionManager implements ApplicationRunner {
+    private static final Logger logger = LoggerFactory.getLogger(ModbusConnectionManager.class);
+
+    private final Map<Integer, ModbusConnectionWrapper> connectionPool = new ConcurrentHashMap<>();
+    // 连接池配置参数
+    private int maxTotal = 20;
+    private int maxIdle = 10;
+    private int minIdle = 3;
+    private long maxWaitMillis = 3000;
+    private long timeBetweenEvictionRunsMillis = 30000;
+    private long minEvictableIdleTimeMillis = 60000;
+
+    private ScheduledExecutorService scheduler;
+    @Autowired
+    private EmsDevicesSettingMapper deviceRepo;
+
+    @Override
+   public void run(ApplicationArguments args) throws Exception {
+        init();
+    }
+
+    public void init() {
+        // 启动心跳检测线程
+        scheduler = Executors.newSingleThreadScheduledExecutor();
+        scheduler.scheduleAtFixedRate(this::heartbeatCheck, 1, 5, TimeUnit.MINUTES);
+        logger.info("Modbus连接管理器已初始化");
+    }
+
+    /**
+     * 获取连接（带自动创建和缓存）
+     */
+
+    public ModbusConnectionWrapper getConnection(EmsDevicesSetting device) throws Exception {
+        return connectionPool.compute(Math.toIntExact(device.getId()), (id, wrapper) -> {
+            try {
+                if (wrapper == null || !wrapper.isActive()) {
+                    if (connectionPool.size() >= maxTotal) {
+                        evictIdleConnection();
+                    }
+                    logger.info("创建新连接: {}", device);
+                    return new ModbusConnectionWrapper(createRawConnection(device));
+                }
+                wrapper.updateLastAccess();
+                return wrapper;
+            } catch (Exception e) {
+                throw new RuntimeException("连接创建失败: " + device.getId(), e);
+            }
+        });
+    }
+
+    /**
+     * 创建原始Modbus连接
+     */
+    private TCPMasterConnection createRawConnection(EmsDevicesSetting device) throws Exception {
+        try {
+            InetAddress addr = InetAddress.getByName("192.168.80.100");
+            TCPMasterConnection connection = new TCPMasterConnection(addr);
+            connection.setPort(502);
+            connection.setTimeout(5000);
+            connection.connect();
+            return connection;
+        } catch (Exception e) {
+            logger.error("创建Modbus连接失败: {}", device, e);
+            throw e;
+        }
+    }
+
+    /**
+     * 心跳检测
+     */
+    private void heartbeatCheck() {
+        logger.info("开始监控Modbus连接池状态，当前连接数: {}", connectionPool.size());
+
+        // 步骤1：获取所有活跃设备列表（与轮询逻辑共用同一批设备）
+        List<EmsDevicesSetting> activeDevices = null;
+        if (activeDevices == null || activeDevices.isEmpty()) {
+            logger.warn("无活跃设备，心跳检测仅清理无效连接");
+        }
+
+        // 步骤2：清理无效连接（遍历连接池，移除已失效的连接）
+        List<Integer> invalidDeviceIds = new ArrayList<>();
+        connectionPool.forEach((deviceId, wrapper) -> {
+            try {
+                if (!wrapper.isActive()) {
+                    logger.info("连接{}已失效，移除连接", deviceId);
+                    invalidDeviceIds.add(deviceId);
+                    wrapper.close();
+                }
+            } catch (Exception e) {
+                logger.error("心跳检测异常: {}", deviceId, e);
+            }
+        });
+
+        // 批量移除无效连接（避免边遍历边修改）
+        invalidDeviceIds.forEach(connectionPool::remove);
+        logger.debug("移除无效连接后，连接池大小: {}", connectionPool.size());
+
+        // 步骤3：补充关键设备的连接（优先保障活跃设备的连接存在）
+        if (!activeDevices.isEmpty()) {
+            // 3.1 先为所有活跃设备预加载连接（确保需要轮询的设备有连接）
+            preloadCriticalConnection(activeDevices);
+
+            // 3.2 若连接数仍不足minIdle，补充额外连接（可选，避免连接池过小）
+            int currentSize = connectionPool.size();
+            if (currentSize < minIdle) {
+                logger.info("连接数{}不足最小空闲数{}，补充额外连接", currentSize, minIdle);
+                // 从活跃设备中选未创建连接的设备补充（避免重复创建）
+                List<EmsDevicesSetting> needMoreDevices = activeDevices.stream()
+                        .filter(device -> !connectionPool.containsKey(Math.toIntExact(device.getId())))
+                        .limit(minIdle - currentSize) // 只补充差额
+                        .collect(Collectors.toList());
+
+                preloadCriticalConnection(needMoreDevices); // 复用预加载方法
+            }
+        }
+    }
+
+    /**
+     * 预加载关键连接
+     */
+
+    private void preloadCriticalConnection(List<EmsDevicesSetting> devices) {
+        // 简化示例，不实现具体逻辑
+        logger.info("预加载连接: 连接池当前大小={}, 最小空闲={}", connectionPool.size(), minIdle);
+        devices.forEach(device -> {
+            try {
+                Integer deviceId = Math.toIntExact(device.getId());
+                if (!connectionPool.containsKey(deviceId)) {
+                    getConnection(device); // 复用已有创建逻辑
+                }
+            } catch (Exception e) {
+                logger.warn("预加载设备{}连接失败", device.getId(), e);
+            }
+        });
+    }
+
+    /**
+     * 移除最久未使用的空闲连接
+     */
+    private void evictIdleConnection() {
+        if (connectionPool.isEmpty()) {
+            return;
+        }
+
+        ModbusConnectionWrapper oldestWrapper = null;
+        long oldestAccessTime = Long.MAX_VALUE;
+
+        for (ModbusConnectionWrapper wrapper : connectionPool.values()) {
+            if (wrapper.isActive() && wrapper.getLastAccessTime() < oldestAccessTime) {
+                oldestAccessTime = wrapper.getLastAccessTime();
+                oldestWrapper = wrapper;
+            }
+        }
+
+        if (oldestWrapper != null) {
+            logger.info("移除空闲连接: {}", oldestWrapper.getConnection());
+            connectionPool.values().remove(oldestWrapper);
+            oldestWrapper.close();
+        }
+    }
+
+    // 移除指定设备连接
+    public void removeConnection(Integer deviceId) {
+        ModbusConnectionWrapper wrapper = connectionPool.remove(deviceId);
+        if (wrapper != null) {
+            wrapper.close(); // 双重保障，确保连接关闭
+            logger.info("连接池主动移除设备{}的连接", deviceId);
+        }
+    }
+
+    /**
+     * 判断是否应该移除空连接池
+     */
+    private boolean shouldRemoveEmptyPool(GenericObjectPool<?> pool) {
+        // 可根据配置或逻辑决定是否移除空连接池
+        // 这里简单实现为当连接池数量超过最大值时移除
+        return connectionPool.size() > maxTotal;
+    }
+
+    /**
+     * 关闭连接
+     */
+    private void closeConnection(TCPMasterConnection connection) {
+        try {
+            if (connection != null && connection.isConnected()) {
+                connection.close();
+            }
+        } catch (Exception e) {
+            logger.error("关闭Modbus连接失败", e);
+        }
+    }
+
+    // 容器销毁时关闭线程池
+    @PreDestroy
+    public void destroy() {
+        if (scheduler != null) {
+            scheduler.shutdown();
+            try {
+                if (!scheduler.awaitTermination(5, TimeUnit.SECONDS)) {
+                    scheduler.shutdownNow();
+                }
+            } catch (InterruptedException e) {
+                scheduler.shutdownNow();
+            }
+        }
+    }
+
+    // Getters and Setters
+    public void setMaxTotal(int maxTotal) {
+        this.maxTotal = maxTotal;
+    }
+
+    public void setMaxIdle(int maxIdle) {
+        this.maxIdle = maxIdle;
+    }
+
+    public void setMinIdle(int minIdle) {
+        this.minIdle = minIdle;
+    }
+
+    public void setMaxWaitMillis(long maxWaitMillis) {
+        this.maxWaitMillis = maxWaitMillis;
+    }
+
+    public void setTimeBetweenEvictionRunsMillis(long timeBetweenEvictionRunsMillis) {
+        this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis;
+    }
+
+    public void setMinEvictableIdleTimeMillis(long minEvictableIdleTimeMillis) {
+        this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
+    }
+}

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

@@ -0,0 +1,81 @@
+package com.xzzn.framework.manager;
+
+import com.ghgande.j2mod.modbus.net.SerialConnection;
+import com.ghgande.j2mod.modbus.net.TCPMasterConnection;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class ModbusConnectionWrapper {
+    private static final Logger logger = LoggerFactory.getLogger(ModbusConnectionWrapper.class);
+
+    private static final AtomicInteger COUNTER = new AtomicInteger(0);
+
+    private final Object connection;
+    private final int connectionId;
+    private volatile long lastAccessTime;
+    private volatile boolean active = true;
+
+    public ModbusConnectionWrapper(Object connection) {
+        this.connection = connection;
+        this.connectionId = COUNTER.incrementAndGet();
+        this.lastAccessTime = System.currentTimeMillis();
+        logger.info("创建连接包装: {}", this);
+    }
+
+    public boolean isActive() {
+        if (!active) return false;
+
+        try {
+            // 检查连接是否物理上有效
+            if (connection instanceof TCPMasterConnection) {
+                return ((TCPMasterConnection) connection).isConnected();
+            } else if (connection instanceof SerialConnection) {
+                return ((SerialConnection) connection).isOpen();
+            }
+        } catch (Exception e) {
+            logger.error("连接状态检查失败: {}", connectionId, e);
+            return false;
+        }
+
+        // 默认检查空闲时间
+        return System.currentTimeMillis() - lastAccessTime < 300000; // 5分钟
+    }
+
+    public void updateLastAccess() {
+        this.lastAccessTime = System.currentTimeMillis();
+    }
+
+    public Object getConnection() {
+        return connection;
+    }
+
+    public void close() {
+        try {
+            logger.info("关闭连接: {}", this);
+            if (connection instanceof TCPMasterConnection) {
+                ((TCPMasterConnection) connection).close();
+            } else if (connection instanceof SerialConnection) {
+                ((SerialConnection) connection).close();
+            }
+        } catch (Exception e) {
+            logger.error("关闭连接失败: {}", connectionId, e);
+        } finally {
+            this.active = false;
+        }
+    }
+
+    public long getLastAccessTime() {
+        return lastAccessTime;
+    }
+
+    @Override
+    public String toString() {
+        return "ModbusConnectionWrapper{" +
+                "connectionId=" + connectionId +
+                ", active=" + active +
+                ", lastAccessTime=" + lastAccessTime +
+                '}';
+    }
+}

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

@@ -17,7 +17,7 @@ public class MqttLifecycleManager implements ApplicationRunner, SmartLifecycle,
 
     private final MqttConnectOptions connectOptions;
     private MqttClient mqttClient;
-    private volatile boolean running = false;
+    private volatile boolean running = true;
 
     // 存储订阅关系: topic -> (listener, qos)
     private final ConcurrentHashMap<String, SubscriptionInfo> subscriptions = new ConcurrentHashMap<>();

ems-framework/src/main/java/com/xzzn/framework/scheduler/ModbusPoller.java

@@ -0,0 +1,126 @@
+package com.xzzn.framework.scheduler;
+
+import com.xzzn.ems.domain.EmsDevicesSetting;
+import com.xzzn.ems.mapper.EmsDevicesSettingMapper;
+import com.xzzn.ems.mapper.EmsMqttMessageMapper;
+import com.xzzn.framework.manager.ModbusConnectionManager;
+import com.xzzn.framework.manager.ModbusConnectionWrapper;
+import com.xzzn.framework.manager.MqttLifecycleManager;
+import com.xzzn.framework.web.service.ModbusService;
+import org.eclipse.paho.client.mqttv3.MqttException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@EnableScheduling
+public class ModbusPoller {
+    private static final Logger logger = LoggerFactory.getLogger(ModbusPoller.class);
+
+    private final MqttLifecycleManager mqttLifecycleManager;
+
+    @Autowired
+    private ModbusConnectionManager connectionManager;
+    @Autowired
+    private ModbusService modbusService;
+    @Autowired
+    private EmsDevicesSettingMapper deviceRepo;
+    @Autowired
+    private EmsMqttMessageMapper emsMqttMessageMapper;
+
+    @Autowired
+    public ModbusPoller(MqttLifecycleManager mqttLifecycleManager) {
+        this.mqttLifecycleManager = mqttLifecycleManager;
+    }
+    // 每5分钟触发（支持cron表达式动态配置）
+    @Scheduled(cron = "${modbus.poll.interval}")
+    @Async("modbusTaskExecutor")
+    public void pollAllDevices() {
+        logger.info("开始执行Modbus设备轮询...");
+
+        List<EmsDevicesSetting> activeDevices = deviceRepo.selectEmsDevicesSettingList(null);
+
+        EmsDevicesSetting device = activeDevices.get(0);
+        try {
+            processData(device,null);
+        } catch (Exception e) {
+            logger.error("调度设备{}任务失败", device.getId(), e);
+        }
+        /*
+        try {
+            pollSingleDevice(device);
+        } catch (Exception e) {
+            logger.error("调度设备{}任务失败", device.getId(), e);
+        }*/
+        /*activeDevices.forEach(device -> {
+            try {
+                CompletableFuture.runAsync(() -> pollSingleDevice(device))
+                        .exceptionally(e -> {
+                            logger.error("设备{}轮询异常", device.getId(), e);
+                            return null;
+                        });
+            } catch (Exception e) {
+                logger.error("调度设备{}任务失败", device.getId(), e);
+            }
+        });*/
+    }
+
+    private void pollSingleDevice(EmsDevicesSetting device) {
+        logger.debug("开始轮询设备: {}", device.getSiteId(), device.getDeviceName(), device.getId());
+
+        ModbusConnectionWrapper wrapper = null;
+        try {
+            // 获取连接
+            wrapper = connectionManager.getConnection(device);
+
+            // 读取保持寄存器
+            int[] data = modbusService.readHoldingRegisters(
+                    wrapper.getConnection(),
+                    1, //从站ID
+                    10  // 寄存器数量
+            );
+
+            // 处理读取到的数据
+            processData(device, data);
+        } catch (Exception e) {
+            logger.error("轮询设备{}失败: {}", device.getId(), e.getMessage());
+            // 标记连接为无效
+            if (wrapper != null) {
+                wrapper.close();
+                connectionManager.removeConnection(Integer.parseInt(device.getDeviceId()));
+            }
+             throw new RuntimeException("轮询设备失败", e);
+        }
+    }
+
+    // 处理获取到的数据，发到mqtt服务上
+    private void processData(EmsDevicesSetting device, int[] data) throws MqttException {
+        /*if (data == null || data.length == 0) {
+            logger.warn("设备{}返回空数据", device.getId());
+            return;
+        }*/
+
+        /*// 数据处理逻辑
+        StringBuilder sb = new StringBuilder();
+        sb.append("设备[").append(device.getDeviceName()).append("]数据: ");
+        for (int i = 0; i < data.length; i++) {
+            sb.append("R").append(i).append("=").append(data[i]).append(" ");
+        }
+        logger.info(sb.toString());*/
+
+        // 测试发送mqtt
+       /* EmsMqttMessage msg = emsMqttMessageMapper.selectEmsMqttMessageById(1L);
+        String dataJson = msg.getMqttMessage();
+        String topic = msg.getMqttTopic();
+        logger.info("topic："  + topic);
+        logger.info("dataJson："  + dataJson);
+        // 将设备数据下发到mqtt服务器上
+        mqttLifecycleManager.publish(topic, dataJson, 0);*/
+    }
+}

ems-framework/src/main/java/com/xzzn/framework/scheduler/StrategyPoller.java

@@ -0,0 +1,170 @@
+package com.xzzn.framework.scheduler;
+
+import com.alibaba.fastjson2.JSON;
+import com.xzzn.common.utils.DateUtils;
+import com.xzzn.common.utils.StringUtils;
+import com.xzzn.ems.domain.EmsStrategyCurve;
+import com.xzzn.ems.domain.EmsStrategyTemp;
+import com.xzzn.ems.domain.EmsStrategyTimeConfig;
+import com.xzzn.ems.domain.vo.StrategyPowerDataVo;
+import com.xzzn.ems.domain.vo.StrategyRunningVo;
+import com.xzzn.ems.mapper.*;
+import com.xzzn.framework.manager.ModbusConnectionManager;
+import com.xzzn.framework.manager.MqttLifecycleManager;
+import com.xzzn.framework.web.service.ModbusService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+@Component
+@EnableScheduling
+public class StrategyPoller {
+    private static final Logger logger = LoggerFactory.getLogger(StrategyPoller.class);
+
+    private final MqttLifecycleManager mqttLifecycleManager;
+
+    @Autowired
+    private ModbusConnectionManager connectionManager;
+    @Autowired
+    private ModbusService modbusService;
+    @Autowired
+    private EmsDevicesSettingMapper deviceRepo;
+    @Autowired
+    private EmsMqttMessageMapper emsMqttMessageMapper;
+    @Autowired
+    private EmsStrategyRunningMapper emsStrategyRunningMapper;
+    @Autowired
+    private EmsStrategyTempMapper emsStrategyTempMapper;
+    @Autowired
+    private EmsStrategyTimeConfigMapper emsStrategyTimeConfigMapper;
+    @Autowired
+    private EmsStrategyCurveMapper emsStrategyCurveMapper;
+
+    @Autowired
+    public StrategyPoller(MqttLifecycleManager mqttLifecycleManager) {
+        this.mqttLifecycleManager = mqttLifecycleManager;
+    }
+    // 每1分钟触发（支持cron表达式动态配置）
+    @Scheduled(cron = "0 */1 * * * *")
+    @Async("strategyTaskExecutor")
+    public void pollAllDevices() {
+        logger.info("开始执行策略数据轮询...");
+        List<StrategyRunningVo> strategyRunningVoList = emsStrategyRunningMapper.getRunningList(null);
+        strategyRunningVoList.forEach(strategyVo -> {
+            try {
+                CompletableFuture.runAsync(() -> {
+                            processData(strategyVo);
+                        })
+                        .exceptionally(e -> {
+                            logger.error("策略{}轮询异常", strategyVo.getId(), e);
+                            return null;
+                        });
+            } catch (Exception e) {
+                logger.error("策略下方{}任务失败", strategyVo.getId(), e);
+            }
+        });
+    }
+    // 处理获取到的数据，发到mqtt服务上
+    private void processData(StrategyRunningVo strategyVo) {
+        logger.info("策略下发数据处理开始");
+        // 根据运行策略获取主副策略的模板数据
+        Long mainStrategyId = strategyVo.getMainStrategyId();
+        Long auxStrategyId = strategyVo.getAuxStrategyId();
+        String siteId = strategyVo.getSiteId();
+        // 处理主策略数据
+        if (mainStrategyId != null && StringUtils.isNotBlank(siteId)) {
+            dealStrategyCurveData(mainStrategyId, siteId);
+        }
+        // 处理副策略数据
+        if (auxStrategyId != null && StringUtils.isNotBlank(siteId)) {
+            dealStrategyCurveData(auxStrategyId, siteId);
+        }
+
+        // 策略数据下发-下方格式暂无
+
+        logger.info("策略下发结束");
+    }
+
+    private void dealStrategyCurveData(Long mainStrategyId, String siteId) {
+        // 获取当前策略的所有模板
+        List<Map<String, String>> temps = emsStrategyTempMapper.getTempNameList(mainStrategyId,siteId);
+        if (temps != null && temps.size() > 0) {
+            for (Map<String, String> temp : temps) {
+                String tempId = temp.get("templateId");
+                List<EmsStrategyTimeConfig> timeConfigs = emsStrategyTimeConfigMapper.getAllTimeConfigByTempId(tempId);
+                if (timeConfigs != null && timeConfigs.size() > 0) {
+                    for (EmsStrategyTimeConfig timeConfig : timeConfigs) {
+                        EmsStrategyCurve curve = new EmsStrategyCurve();
+                        curve.setStrategyId(mainStrategyId);
+                        curve.setSiteId(siteId);
+                        curve.setTemplateId(tempId);
+                        curve.setCreateBy("system");
+                        curve.setCreateTime(DateUtils.getNowDate());
+                        curve.setUpdateBy("system");
+                        curve.setUpdateTime(DateUtils.getNowDate());
+                        // 时间设置
+                        int month = Integer.parseInt(timeConfig.getMonth().toString());
+                        String[] dateList= dealWithMonth(month);
+                        curve.setMonth(Long.valueOf(month));
+                        curve.setStartDate(DateUtils.dateTime(DateUtils.YYYY_MM_DD,dateList[0]));
+                        curve.setEndDate(DateUtils.dateTime(DateUtils.YYYY_MM_DD,dateList[1]));
+                        // powerData-存json格式
+                        List<EmsStrategyTemp> powerConfig = emsStrategyTempMapper.selectStrategyTempByTempId(tempId);
+                        List<StrategyPowerDataVo>  powerDataVoList = new ArrayList<>();
+                        for (int i = 0; i < powerConfig.size(); i++) {
+                            EmsStrategyTemp powerTemp = powerConfig.get(i);
+                            StrategyPowerDataVo powerDataVo = new StrategyPowerDataVo();
+                            powerDataVo.setPowerData(powerTemp.getChargeDischargePower());
+                            powerDataVo.setEndTime(DateUtils.parseDateToStr("HH:mm:ss",powerTemp.getEndTime()));
+                            powerDataVo.setStartTime(DateUtils.parseDateToStr("HH:mm:ss",powerTemp.getStartTime()));
+                            powerDataVoList.add(powerDataVo);
+                        }
+                        curve.setPowerData(powerDataVoList !=null ? JSON.toJSON(powerDataVoList).toString() : "");
+
+                        // 记录推送记录
+                        emsStrategyCurveMapper.insertEmsStrategyCurve(curve);
+
+                        // 设置已下发
+                        timeConfig.setIsPost(0);
+                        emsStrategyTimeConfigMapper.updateEmsStrategyTimeConfig(timeConfig);
+                    }
+                }
+            }
+        }
+    }
+
+    private String[] dealWithMonth(int month) {
+        // 获取当前年份
+        int currentYear = LocalDate.now().getYear();
+
+        // 创建YearMonth对象表示当年指定的月份
+        YearMonth yearMonth = YearMonth.of(currentYear, month);
+
+        // 获取当月的第一天和最后一天
+        LocalDate firstDay = yearMonth.atDay(1);
+        LocalDate lastDay = yearMonth.atEndOfMonth();
+
+        // 定义日期格式（年月日）
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+        // 格式化日期
+        return new String[]{
+                firstDay.format(formatter),
+                lastDay.format(formatter)
+        };
+
+    }
+
+}

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

@@ -0,0 +1,101 @@
+package com.xzzn.framework.web.service;
+
+import com.ghgande.j2mod.modbus.ModbusException;
+import com.ghgande.j2mod.modbus.ModbusIOException;
+import com.ghgande.j2mod.modbus.io.ModbusTCPTransaction;
+import com.ghgande.j2mod.modbus.msg.ReadInputRegistersRequest;
+import com.ghgande.j2mod.modbus.msg.ReadInputRegistersResponse;
+import com.ghgande.j2mod.modbus.net.SerialConnection;
+import com.ghgande.j2mod.modbus.net.TCPMasterConnection;
+import io.github.resilience4j.circuitbreaker.annotation.CircuitBreaker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.retry.annotation.Backoff;
+import org.springframework.retry.annotation.Retryable;
+import org.springframework.stereotype.Service;
+
+/**
+ * Modbus操作服务（添加重试机制）
+ */
+@Service
+public class ModbusService {
+    private static final Logger logger = LoggerFactory.getLogger(ModbusService.class);
+
+    @Retryable(
+            value = {ModbusException.class}, // 仅对自定义Modbus异常重试
+            maxAttempts = 3, // 最大重试3次（1次原始调用 + 2次重试）
+            backoff = @Backoff(delay = 1000, multiplier = 2) // 退避策略：1s → 2s → 4s
+    )
+    @CircuitBreaker(name = "modbusOperation", fallbackMethod = "readRegistersFallback")
+    public int[] readHoldingRegisters(Object connection, int startAddr, int count) throws ModbusException {
+        try {
+            if (connection instanceof TCPMasterConnection) {
+                return readTcpRegisters((TCPMasterConnection) connection, startAddr, count);
+            } else if (connection instanceof SerialConnection) {
+                return readRtuRegisters((SerialConnection) connection, startAddr, count);
+            }
+            throw new IllegalArgumentException("不支持的连接类型: " + connection.getClass().getName());
+        } catch (ModbusIOException e) {
+            throw new ModbusException("通信故障", e);
+        } catch (Exception e) {
+            throw new ModbusException("系统错误", e);
+        }
+    }
+
+    private int[] readRtuRegisters(SerialConnection connection, int startAddr, int count) {
+        return null;
+    }
+
+    private int[] readTcpRegisters(TCPMasterConnection conn, int start, int count) throws ModbusException {
+        // 验证连接是否已建立
+        if (!conn.isConnected()) {
+            throw new ModbusIOException("TCP连接未建立");
+        }
+        // 使用正确的功能码（03 - 读取保持寄存器）ReadHoldingRegistersRequest
+        ReadInputRegistersRequest request = new ReadInputRegistersRequest(start, count);
+        ModbusTCPTransaction transaction = new ModbusTCPTransaction(conn);
+        transaction.setRequest(request);
+
+        // 设置超时避免长时间阻塞
+        transaction.setRetries(2);
+        try {
+            transaction.execute();
+            ReadInputRegistersResponse response = (ReadInputRegistersResponse) transaction.getResponse();
+
+            if (response == null) {
+                throw new ModbusException("Modbus异常响应: " + response.getMessage());
+            }
+
+            // 正确解析寄存器值
+            return parseRegisters(response);
+        } catch (ModbusException e) {
+            // 记录详细错误信息
+            logger.error("读取TCP寄存器失败: {}", e.getMessage());
+            throw e;
+        }
+    }
+
+    /**
+     * 解析Modbus响应中的寄存器值
+     */
+    private int[] parseRegisters(ReadInputRegistersResponse response) {
+        int byteCount = response.getByteCount();
+        int[] result = new int[byteCount / 2];
+
+        for (int i = 0; i < result.length; i++) {
+            // 转换为无符号整数
+            result[i] = response.getRegisterValue(i) & 0xFFFF;
+        }
+
+        return result;
+    }
+
+    /**
+     * 熔断降级方法
+     */
+    public int[] readRegistersFallback(Object connection, int startAddr, int count, Exception e) {
+        logger.warn("Modbus操作降级（原因: {}），返回空数据", e.getMessage());
+        return new int[0];
+    }
+
+}

ems-system/pom.xml

@@ -22,6 +22,10 @@
             <groupId>com.xzzn</groupId>
             <artifactId>ems-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+        </dependency>
 
     </dependencies>
 

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

@@ -58,6 +58,10 @@ public class EmsAlarmRecords extends BaseEntity
     @Excel(name = "设备名称，用于标识设备")
     private String deviceName;
 
+    /** 工单号（规则：T+日期+6位随机） */
+    @Excel(name = "工单号", readConverterExp = "规=则：T+日期+6位随机")
+    private String ticketNo;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -158,6 +162,14 @@ public class EmsAlarmRecords extends BaseEntity
         return deviceName;
     }
 
+    public String getTicketNo() {
+        return ticketNo;
+    }
+
+    public void setTicketNo(String ticketNo) {
+        this.ticketNo = ticketNo;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -176,6 +188,7 @@ public class EmsAlarmRecords extends BaseEntity
                 .append("siteId", getSiteId())
                 .append("deviceId", getDeviceId())
                 .append("deviceName", getDeviceName())
+                .append("ticketNo", getTicketNo())
                 .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import com.xzzn.common.annotation.Excel;
  * 电池簇数据对象 ems_battery_cluster
  *
  * @author xzzn
- * @date 2025-06-29
+ * @date 2025-07-29
  */
 public class EmsBatteryCluster extends BaseEntity
 {
@@ -20,16 +20,16 @@ public class EmsBatteryCluster extends BaseEntity
     /**  */
     private Long id;
 
-    /** 工作状态 */
+    /** 工作状态：0-正常 1-异常 2-停止 */
-    @Excel(name = "工作状态")
+    @Excel(name = "工作状态：0-正常 1-异常 2-停止")
     private String workStatus;
 
-    /** 与PCS通信状态 */
+    /** 与PCS通信状态：0-正常 1-通信中断 2-异常 */
-    @Excel(name = "与PCS通信状态")
+    @Excel(name = "与PCS通信状态：0-正常 1-通信中断 2-异常")
     private String pcsCommunicationStatus;
 
-    /** 与EMS通信状态 */
+    /** 与EMS通信状态：0-正常 1-通信中断 2-异常 */
-    @Excel(name = "与EMS通信状态")
+    @Excel(name = "与EMS通信状态：0-正常 1-通信中断 2-异常")
     private String emsCommunicationStatus;
 
     /** 簇电压 (V) */

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

@@ -12,7 +12,7 @@ import com.xzzn.common.annotation.Excel;
  * 单体电池实时数据对象 ems_battery_data
  *
  * @author xzzn
- * @date 2025-06-29
+ * @date 2025-07-29
  */
 public class EmsBatteryData extends BaseEntity
 {
@@ -66,6 +66,10 @@ public class EmsBatteryData extends BaseEntity
     @Excel(name = "簇设备id")
     private String clusterDeviceId;
 
+    /** 单体电池内阻 */
+    @Excel(name = "单体电池内阻")
+    private BigDecimal interResistance;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -186,6 +190,16 @@ public class EmsBatteryData extends BaseEntity
         return clusterDeviceId;
     }
 
+    public void setInterResistance(BigDecimal interResistance)
+    {
+        this.interResistance = interResistance;
+    }
+
+    public BigDecimal getInterResistance()
+    {
+        return interResistance;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -206,6 +220,7 @@ public class EmsBatteryData extends BaseEntity
                 .append("siteId", getSiteId())
                 .append("deviceId", getDeviceId())
                 .append("clusterDeviceId", getClusterDeviceId())
+                .append("interResistance", getInterResistance())
                 .toString();
     }
 }

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

@@ -0,0 +1,213 @@
+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_daily_latest
+ *
+ * @author xzzn
+ * @date 2025-07-17
+ */
+public class EmsBatteryDataDailyLatest extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 电池堆 */
+    @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;
+
+    /** 日期：yyyy-MM-dd */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "日期：yyyy-MM-dd", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dateDay;
+
+    /** 数据采集时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "数据采集时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date dataTimestamp;
+
+    /** 站点id */
+    @Excel(name = "站点id")
+    private String siteId;
+
+    /** 设备唯一标识符 */
+    @Excel(name = "设备唯一标识符")
+    private String deviceId;
+
+    /** 簇设备id */
+    @Excel(name = "簇设备id")
+    private String clusterDeviceId;
+
+    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 setDateDay(Date dateDay)
+    {
+        this.dateDay = dateDay;
+    }
+
+    public Date getDateDay()
+    {
+        return dateDay;
+    }
+
+    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("batteryPack", getBatteryPack())
+                .append("batteryCluster", getBatteryCluster())
+                .append("batteryCellId", getBatteryCellId())
+                .append("voltage", getVoltage())
+                .append("temperature", getTemperature())
+                .append("soc", getSoc())
+                .append("soh", getSoh())
+                .append("dateDay", getDateDay())
+                .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/EmsBatteryGroup.java

@@ -0,0 +1,164 @@
+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_group
+ *
+ * @author xzzn
+ * @date 2025-07-29
+ */
+public class EmsBatteryGroup extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 电池组状态 */
+    @Excel(name = "电池组状态")
+    private String status;
+
+    /** 电压 (V) */
+    @Excel(name = "电压 (V)")
+    private BigDecimal voltage;
+
+    /** 电流 (A) */
+    @Excel(name = "电流 (A)")
+    private BigDecimal current;
+
+    /** SOC (%) */
+    @Excel(name = "SOC (%)")
+    private BigDecimal soc;
+
+    /** SOH (%) */
+    @Excel(name = "SOH (%)")
+    private BigDecimal soh;
+
+    /** 备电预估时长 */
+    @Excel(name = "备电预估时长")
+    private BigDecimal estimatedBackupDuration;
+
+    /** 站点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 setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setVoltage(BigDecimal voltage)
+    {
+        this.voltage = voltage;
+    }
+
+    public BigDecimal getVoltage()
+    {
+        return voltage;
+    }
+
+    public void setCurrent(BigDecimal current)
+    {
+        this.current = current;
+    }
+
+    public BigDecimal getCurrent()
+    {
+        return current;
+    }
+
+    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 setEstimatedBackupDuration(BigDecimal estimatedBackupDuration)
+    {
+        this.estimatedBackupDuration = estimatedBackupDuration;
+    }
+
+    public BigDecimal getEstimatedBackupDuration()
+    {
+        return estimatedBackupDuration;
+    }
+
+    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("status", getStatus())
+                .append("voltage", getVoltage())
+                .append("current", getCurrent())
+                .append("soc", getSoc())
+                .append("soh", getSoh())
+                .append("estimatedBackupDuration", getEstimatedBackupDuration())
+                .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

@@ -11,7 +11,7 @@ import com.xzzn.common.annotation.Excel;
  * Modbus设备配置对象 ems_devices_setting
  *
  * @author xzzn
- * @date 2025-06-29
+ * @date 2025-07-12
  */
 public class EmsDevicesSetting extends BaseEntity
 {
@@ -86,14 +86,26 @@ public class EmsDevicesSetting extends BaseEntity
     @Excel(name = "站点id")
     private String siteId;
 
-    /** 通信状态 */
+    /** 通信状态:0-正常 1-通信中断 2-异常 */
-    @Excel(name = "通信状态")
+    @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;
+
+    /** 设备图像地址 */
+    @Excel(name = "设备图像地址")
+    private String pictureUrl;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -284,6 +296,36 @@ public class EmsDevicesSetting extends BaseEntity
         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;
+    }
+
+    public void setPictureUrl(String pictureUrl)
+    {
+        this.pictureUrl = pictureUrl;
+    }
+
+    public String getPictureUrl()
+    {
+        return pictureUrl;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -306,6 +348,9 @@ public class EmsDevicesSetting extends BaseEntity
                 .append("siteId", getSiteId())
                 .append("communicationStatus", getCommunicationStatus())
                 .append("deviceId", getDeviceId())
+                .append("parentId", getParentId())
+                .append("deviceCategory", getDeviceCategory())
+                .append("pictureUrl", getPictureUrl())
                 .toString();
     }
 }

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

@@ -0,0 +1,104 @@
+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_dh_data
+ *
+ * @author xzzn
+ * @date 2025-07-28
+ */
+public class EmsDhData extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 湿度 */
+    @Excel(name = "湿度")
+    private BigDecimal humidity;
+
+    /** 温度 */
+    @Excel(name = "温度")
+    private BigDecimal temperature;
+
+    /** 站点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 setHumidity(BigDecimal humidity)
+    {
+        this.humidity = humidity;
+    }
+
+    public BigDecimal getHumidity()
+    {
+        return humidity;
+    }
+
+    public void setTemperature(BigDecimal temperature)
+    {
+        this.temperature = temperature;
+    }
+
+    public BigDecimal getTemperature()
+    {
+        return temperature;
+    }
+
+    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("humidity", getHumidity())
+                .append("temperature", getTemperature())
+                .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/EmsPcsBranchData.java

@@ -46,7 +46,7 @@ public class EmsPcsBranchData extends BaseEntity
 
     /** 支路id */
     @Excel(name = "支路id")
-    private Long branchId;
+    private String branchId;
 
     /** 电网U相电压 */
     @Excel(name = "电网U相电压")
@@ -198,12 +198,12 @@ public class EmsPcsBranchData extends BaseEntity
         return deviceId;
     }
 
-    public void setBranchId(Long branchId)
+    public void setBranchId(String branchId)
     {
         this.branchId = branchId;
     }
 
-    public Long getBranchId()
+    public String getBranchId()
     {
         return branchId;
     }

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-29
+ * @date 2025-07-07
  */
 public class EmsPcsData extends BaseEntity
 {
@@ -22,24 +22,24 @@ public class EmsPcsData extends BaseEntity
     private Long id;
 
     /** 数据更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "数据更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "数据更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date dataUpdateTime;
 
-    /** 工作状态 */
+    /** 工作状态：0-正常 1-异常 2-停止 */
-    @Excel(name = "工作状态")
+    @Excel(name = "工作状态：0-正常 1-异常 2-停止")
     private String workStatus;
 
-    /** 并网状态 */
+    /** 并网状态：0-并网 1-未并网 */
-    @Excel(name = "并网状态")
+    @Excel(name = "并网状态：0-并网 1-未并网")
     private String gridStatus;
 
-    /** 设备状态 */
+    /** 设备状态：0-在线 1-离线 2-维修中 */
-    @Excel(name = "设备状态")
+    @Excel(name = "设备状态：0-在线 1-离线 2-维修中")
     private String deviceStatus;
 
-    /** 控制模式 */
+    /** 控制模式：0-远程 1-本地 */
-    @Excel(name = "控制模式")
+    @Excel(name = "控制模式：0-远程 1-本地")
     private String controlMode;
 
     /** 总交流有功电率 (kW) */
@@ -102,12 +102,12 @@ public class EmsPcsData extends BaseEntity
     @Excel(name = "交流频率 (Hz)")
     private BigDecimal acFrequency;
 
-    /** 支路状态 */
+    /** 支路状态：0-备用 1-正常 2-切换中 */
-    @Excel(name = "支路状态")
+    @Excel(name = "支路状态：0-备用 1-正常 2-切换中")
     private String branchStatus;
 
-    /** 放电状态 */
+    /** 放电状态：0-充电中 1-待机 */
-    @Excel(name = "放电状态")
+    @Excel(name = "放电状态：0-充电中 1-待机")
     private String dischargeStatus;
 
     /** 直流功率 (kW) */
@@ -190,6 +190,22 @@ public class EmsPcsData extends BaseEntity
     @Excel(name = "远程投退状态")
     private String remoteControlStatus;
 
+    /** 系统输出U相电流 */
+    @Excel(name = "系统输出U相电流")
+    private BigDecimal sysUCurrent;
+
+    /** 系统输出V相电流 */
+    @Excel(name = "系统输出V相电流")
+    private BigDecimal sysVCurrent;
+
+    /** 系统输出W相电流 */
+    @Excel(name = "系统输出W相电流")
+    private BigDecimal sysWCurrent;
+
+    /** 电网频率 */
+    @Excel(name = "电网频率")
+    private BigDecimal dwFrequency;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -620,6 +636,46 @@ public class EmsPcsData extends BaseEntity
         return remoteControlStatus;
     }
 
+    public void setSysUCurrent(BigDecimal sysUCurrent)
+    {
+        this.sysUCurrent = sysUCurrent;
+    }
+
+    public BigDecimal getSysUCurrent()
+    {
+        return sysUCurrent;
+    }
+
+    public void setSysVCurrent(BigDecimal sysVCurrent)
+    {
+        this.sysVCurrent = sysVCurrent;
+    }
+
+    public BigDecimal getSysVCurrent()
+    {
+        return sysVCurrent;
+    }
+
+    public void setSysWCurrent(BigDecimal sysWCurrent)
+    {
+        this.sysWCurrent = sysWCurrent;
+    }
+
+    public BigDecimal getSysWCurrent()
+    {
+        return sysWCurrent;
+    }
+
+    public void setDwFrequency(BigDecimal dwFrequency)
+    {
+        this.dwFrequency = dwFrequency;
+    }
+
+    public BigDecimal getDwFrequency()
+    {
+        return dwFrequency;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -671,6 +727,10 @@ public class EmsPcsData extends BaseEntity
                 .append("acSwitchStatus", getAcSwitchStatus())
                 .append("dcSwitchStatus", getDcSwitchStatus())
                 .append("remoteControlStatus", getRemoteControlStatus())
+                .append("sysUCurrent", getSysUCurrent())
+                .append("sysVCurrent", getSysVCurrent())
+                .append("sysWCurrent", getSysWCurrent())
+                .append("dwFrequency", getDwFrequency())
                 .toString();
     }
 }

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

@@ -30,8 +30,8 @@ public class EmsSiteSetting extends BaseEntity
     private String siteAddress;
 
     /** 运营时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "运营时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "运营时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date runningTime;
 
     /** 纬度 */

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

@@ -0,0 +1,114 @@
+package com.xzzn.ems.domain;
+
+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_strategy
+ *
+ * @author xzzn
+ * @date 2025-07-10
+ */
+public class EmsStrategy extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long id;
+
+    /** 策略名称，如“削峰填谷” */
+    @Excel(name = "策略名称，如“削峰填谷”")
+    private String strategyName;
+
+    /** 策略类型：1 - 主策略；2 - 辅助策略 */
+    @Excel(name = "策略类型：1 - 主策略；2 - 辅助策略")
+    private Long strategyType;
+
+    /** 策略状态：0-未启用 1-已运行 2-已暂停 3-禁用 4-删除 */
+    @Excel(name = "策略状态：0-未启用 1-已运行 2-已暂停 3-禁用 4-删除")
+    private String status;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    private String description;
+
+    /** 主策略id */
+    @Excel(name = "主策略id")
+    private Long mainStrategy;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setStrategyName(String strategyName)
+    {
+        this.strategyName = strategyName;
+    }
+
+    public String getStrategyName()
+    {
+        return strategyName;
+    }
+
+    public void setStrategyType(Long strategyType)
+    {
+        this.strategyType = strategyType;
+    }
+
+    public Long getStrategyType()
+    {
+        return strategyType;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    public String getDescription()
+    {
+        return description;
+    }
+
+    public void setMainStrategy(Long mainStrategy)
+    {
+        this.mainStrategy = mainStrategy;
+    }
+
+    public Long getMainStrategy()
+    {
+        return mainStrategy;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("strategyName", getStrategyName())
+                .append("strategyType", getStrategyType())
+                .append("status", getStatus())
+                .append("createTime", getCreateTime())
+                .append("updateTime", getUpdateTime())
+                .append("description", getDescription())
+                .append("mainStrategy", getMainStrategy())
+                .toString();
+    }
+}

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

@@ -0,0 +1,175 @@
+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_strategy_curve
+ *
+ * @author xzzn
+ * @date 2025-07-11
+ */
+public class EmsStrategyCurve extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 关联的策略ID */
+    @Excel(name = "关联的策略ID")
+    private Long strategyId;
+
+    /** 任务编号 */
+    @Excel(name = "任务编号")
+    private Long taskNumber;
+
+    /** 开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startDate;
+
+    /** 结束日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结束日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endDate;
+
+    /** 功率数据，可以是JSON格式存储曲线数据 */
+    @Excel(name = "功率数据，可以是JSON格式存储曲线数据")
+    private String powerData;
+
+    /** 站点id */
+    @Excel(name = "站点id")
+    private String siteId;
+
+    /** 模板id */
+    @Excel(name = "模板id")
+    private String templateId;
+
+    /** 月份，1-12 */
+    @Excel(name = "月份，1-12")
+    private Long month;
+
+    /** 是否删除 0-已删除 1-未删除 */
+    @Excel(name = "是否删除 0-已删除 1-未删除")
+    private Long isDelete;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setStrategyId(Long strategyId)
+    {
+        this.strategyId = strategyId;
+    }
+
+    public Long getStrategyId()
+    {
+        return strategyId;
+    }
+
+    public void setTaskNumber(Long taskNumber)
+    {
+        this.taskNumber = taskNumber;
+    }
+
+    public Long getTaskNumber()
+    {
+        return taskNumber;
+    }
+
+    public void setStartDate(Date startDate)
+    {
+        this.startDate = startDate;
+    }
+
+    public Date getStartDate()
+    {
+        return startDate;
+    }
+
+    public void setEndDate(Date endDate)
+    {
+        this.endDate = endDate;
+    }
+
+    public Date getEndDate()
+    {
+        return endDate;
+    }
+
+    public void setPowerData(String powerData)
+    {
+        this.powerData = powerData;
+    }
+
+    public String getPowerData()
+    {
+        return powerData;
+    }
+
+    public void setSiteId(String siteId)
+    {
+        this.siteId = siteId;
+    }
+
+    public String getSiteId()
+    {
+        return siteId;
+    }
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public Long getMonth() {
+        return month;
+    }
+
+    public void setMonth(Long month) {
+        this.month = month;
+    }
+
+    public Long getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Long isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("strategyId", getStrategyId())
+                .append("taskNumber", getTaskNumber())
+                .append("startDate", getStartDate())
+                .append("endDate", getEndDate())
+                .append("powerData", getPowerData())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .append("siteId", getSiteId())
+                .append("templateId", getTemplateId())
+                .append("month", getMonth())
+                .append("isDelete", getIsDelete())
+                .toString();
+    }
+}

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

@@ -0,0 +1,115 @@
+package com.xzzn.ems.domain;
+
+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_strategy_running
+ *
+ * @author xzzn
+ * @date 2025-07-10
+ */
+public class EmsStrategyRunning extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 主要策略 */
+    @Excel(name = "主要策略")
+    private Long mainStrategyId;
+
+    /** 辅助策略 */
+    @Excel(name = "辅助策略")
+    private Long auxiliaryStrategyId;
+
+    /** 策略状态：0-未启用 1-已运行 2-已暂停 3-禁用 4-删除 */
+    @Excel(name = "策略状态：0-未启用 1-已运行 2-已暂停 3-禁用 4-删除")
+    private String status;
+
+    /** 站点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 setMainStrategyId(Long mainStrategyId)
+    {
+        this.mainStrategyId = mainStrategyId;
+    }
+
+    public Long getMainStrategyId()
+    {
+        return mainStrategyId;
+    }
+
+    public void setAuxiliaryStrategyId(Long auxiliaryStrategyId)
+    {
+        this.auxiliaryStrategyId = auxiliaryStrategyId;
+    }
+
+    public Long getAuxiliaryStrategyId()
+    {
+        return auxiliaryStrategyId;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    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("mainStrategyId", getMainStrategyId())
+                .append("auxiliaryStrategyId", getAuxiliaryStrategyId())
+                .append("status", getStatus())
+                .append("createTime", getCreateTime())
+                .append("updateTime", getUpdateTime())
+                .append("siteId", getSiteId())
+                .append("deviceId", getDeviceId())
+                .append("remark", getRemark())
+                .toString();
+    }
+}

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

@@ -0,0 +1,212 @@
+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_strategy_temp
+ *
+ * @author xzzn
+ * @date 2025-07-13
+ */
+public class EmsStrategyTemp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long id;
+
+    /** 关联的策略ID */
+    @Excel(name = "关联的策略ID")
+    private Long strategyId;
+
+    /** 模板名称，如“模板一” */
+    @Excel(name = "模板名称，如“模板一”")
+    private String templateName;
+
+    /** SDC限制 (%) 1 = 开，0 = 关 */
+    @Excel(name = "SDC限制 (%) 1 = 开，0 = 关")
+    private Integer sdcLimit;
+
+    /** SDC下限 (%) */
+    @Excel(name = "SDC下限 (%)")
+    private BigDecimal sdcDown;
+
+    /** SDC上限 (%) */
+    @Excel(name = "SDC上限 (%)")
+    private BigDecimal sdcUp;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "HH:mm")
+    @Excel(name = "开始时间", width = 30, dateFormat = "HH:mm")
+    private Date startTime;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "HH:mm")
+    @Excel(name = "结束时间", width = 30, dateFormat = "HH:mm")
+    private Date endTime;
+
+    /** 充放功率 (kW) */
+    @Excel(name = "充放功率 (kW)")
+    private BigDecimal chargeDischargePower;
+
+    /** 充电状态，如“1-充电”、“2-待机” */
+    @Excel(name = "充电状态，如“1-充电”、“2-待机”")
+    private String chargeStatus;
+
+    /** 站点id */
+    @Excel(name = "站点id")
+    private String siteId;
+
+    /** 模板id */
+    @Excel(name = "模板id")
+    private String templateId;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setStrategyId(Long strategyId)
+    {
+        this.strategyId = strategyId;
+    }
+
+    public Long getStrategyId()
+    {
+        return strategyId;
+    }
+
+    public void setTemplateName(String templateName)
+    {
+        this.templateName = templateName;
+    }
+
+    public String getTemplateName()
+    {
+        return templateName;
+    }
+
+    public void setSdcLimit(Integer sdcLimit)
+    {
+        this.sdcLimit = sdcLimit;
+    }
+
+    public Integer getSdcLimit()
+    {
+        return sdcLimit;
+    }
+
+    public void setSdcDown(BigDecimal sdcDown)
+    {
+        this.sdcDown = sdcDown;
+    }
+
+    public BigDecimal getSdcDown()
+    {
+        return sdcDown;
+    }
+
+    public void setSdcUp(BigDecimal sdcUp)
+    {
+        this.sdcUp = sdcUp;
+    }
+
+    public BigDecimal getSdcUp()
+    {
+        return sdcUp;
+    }
+
+    public void setStartTime(Date startTime)
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime()
+    {
+        return startTime;
+    }
+
+    public void setEndTime(Date endTime)
+    {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime()
+    {
+        return endTime;
+    }
+
+    public void setChargeDischargePower(BigDecimal chargeDischargePower)
+    {
+        this.chargeDischargePower = chargeDischargePower;
+    }
+
+    public BigDecimal getChargeDischargePower()
+    {
+        return chargeDischargePower;
+    }
+
+    public void setChargeStatus(String chargeStatus)
+    {
+        this.chargeStatus = chargeStatus;
+    }
+
+    public String getChargeStatus()
+    {
+        return chargeStatus;
+    }
+
+    public void setSiteId(String siteId)
+    {
+        this.siteId = siteId;
+    }
+
+    public String getSiteId()
+    {
+        return siteId;
+    }
+
+    public void setTemplateId(String templateId)
+    {
+        this.templateId = templateId;
+    }
+
+    public String getTemplateId()
+    {
+        return templateId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("strategyId", getStrategyId())
+                .append("templateName", getTemplateName())
+                .append("sdcLimit", getSdcLimit())
+                .append("sdcDown", getSdcDown())
+                .append("sdcUp", getSdcUp())
+                .append("startTime", getStartTime())
+                .append("endTime", getEndTime())
+                .append("chargeDischargePower", getChargeDischargePower())
+                .append("chargeStatus", getChargeStatus())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .append("siteId", getSiteId())
+                .append("templateId", getTemplateId())
+                .toString();
+    }
+}

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

@@ -0,0 +1,122 @@
+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_strategy_temp_time_config
+ *
+ * @author xzzn
+ * @date 2025-07-12
+ */
+public class EmsStrategyTempTimeConfig extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "HH:mm")
+    @Excel(name = "开始时间", width = 30, dateFormat = "HH:mm")
+    private Date startTime;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "HH:mm")
+    @Excel(name = "结束时间", width = 30, dateFormat = "HH:mm")
+    private Date endTime;
+
+    /** 充放功率 (kW) */
+    @Excel(name = "充放功率 (kW)")
+    private BigDecimal chargeDischargePower;
+
+    /** 充电状态，如“1-充电”、“2-待机” */
+    @Excel(name = "充电状态，如“1-充电”、“2-待机”")
+    private String chargeStatus;
+
+    /** 模板id */
+    @Excel(name = "模板id")
+    private String  templateId;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setStartTime(Date startTime)
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime()
+    {
+        return startTime;
+    }
+
+    public void setEndTime(Date endTime)
+    {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime()
+    {
+        return endTime;
+    }
+
+    public void setChargeDischargePower(BigDecimal chargeDischargePower)
+    {
+        this.chargeDischargePower = chargeDischargePower;
+    }
+
+    public BigDecimal getChargeDischargePower()
+    {
+        return chargeDischargePower;
+    }
+
+    public void setChargeStatus(String chargeStatus)
+    {
+        this.chargeStatus = chargeStatus;
+    }
+
+    public String getChargeStatus()
+    {
+        return chargeStatus;
+    }
+
+    public void setTemplateId(String  templateId)
+    {
+        this.templateId = templateId;
+    }
+
+    public String  getTemplateId()
+    {
+        return templateId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("startTime", getStartTime())
+                .append("endTime", getEndTime())
+                .append("chargeDischargePower", getChargeDischargePower())
+                .append("chargeStatus", getChargeStatus())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .append("templateId", getTemplateId())
+                .toString();
+    }
+}

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

@@ -0,0 +1,130 @@
+package com.xzzn.ems.domain;
+
+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_strategy_time_config
+ *
+ * @author xzzn
+ * @date 2025-07-12
+ */
+public class EmsStrategyTimeConfig extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long id;
+
+    /** 关联的策略ID */
+    @Excel(name = "关联的策略ID")
+    private Long strategyId;
+
+    /** 月份，1-12 */
+    @Excel(name = "月份，1-12")
+    private Long month;
+
+    /** 充放电模式，如“两充两放” */
+    @Excel(name = "充放电模式，如“两充两放”")
+    private String chargeDischargeMode;
+
+    /** 站点id */
+    @Excel(name = "站点id")
+    private String siteId;
+
+    /** 模版id */
+    @Excel(name = "模版id")
+    private String templateId;
+
+    /** 是否下发 0-已下发 1-未下发 */
+    @Excel(name = "是否下发 0-已下发 1-未下发")
+    private int isPost;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setStrategyId(Long strategyId)
+    {
+        this.strategyId = strategyId;
+    }
+
+    public Long getStrategyId()
+    {
+        return strategyId;
+    }
+
+    public void setMonth(Long month)
+    {
+        this.month = month;
+    }
+
+    public Long getMonth()
+    {
+        return month;
+    }
+
+    public void setChargeDischargeMode(String chargeDischargeMode)
+    {
+        this.chargeDischargeMode = chargeDischargeMode;
+    }
+
+    public String getChargeDischargeMode()
+    {
+        return chargeDischargeMode;
+    }
+
+    public void setSiteId(String siteId)
+    {
+        this.siteId = siteId;
+    }
+
+    public String getSiteId()
+    {
+        return siteId;
+    }
+
+    public void setTemplateId(String templateId)
+    {
+        this.templateId = templateId;
+    }
+
+    public String getTemplateId()
+    {
+        return templateId;
+    }
+
+    public int getIsPost() {
+        return isPost;
+    }
+
+    public void setIsPost(int isPost) {
+        this.isPost = isPost;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("strategyId", getStrategyId())
+                .append("month", getMonth())
+                .append("chargeDischargeMode", getChargeDischargeMode())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .append("siteId", getSiteId())
+                .append("templateId", getTemplateId())
+                .append("isPost", getIsPost())
+                .toString();
+    }
+}

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

@@ -11,13 +11,13 @@ import com.xzzn.common.annotation.Excel;
  * 工单主对象 ems_ticket
  *
  * @author xzzn
- * @date 2025-06-26
+ * @date 2025-07-15
  */
 public class EmsTicket extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**  */
     private String id;
 
     /** 工单号（规则：T+日期+6位随机） */
@@ -26,7 +26,7 @@ public class EmsTicket extends BaseEntity
 
     /** 提交用户ID */
     @Excel(name = "提交用户ID")
-    private String userId;
+    private Long userId;
 
     /** 工单标题 */
     @Excel(name = "工单标题")
@@ -44,15 +44,24 @@ public class EmsTicket extends BaseEntity
     @Excel(name = "1待处理 2处理中 3已完成")
     private Long status;
 
+    /** 期望完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "期望完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date expectedCompleteTime;
+
     /** 完成时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date completeTime;
 
     /** 处理人ID */
     @Excel(name = "处理人ID")
     private Long workUserId;
 
+    /** 0-已废弃 1-有效 */
+    @Excel(name = "0-已废弃 1-有效")
+    private Long isDelete;
+
     public void setId(String id)
     {
         this.id = id;
@@ -73,12 +82,12 @@ public class EmsTicket extends BaseEntity
         return ticketNo;
     }
 
-    public void setUserId(String userId) 
+    public void setUserId(Long userId)
     {
         this.userId = userId;
     }
 
-    public String getUserId() 
+    public Long getUserId()
     {
         return userId;
     }
@@ -123,6 +132,16 @@ public class EmsTicket extends BaseEntity
         return status;
     }
 
+    public void setExpectedCompleteTime(Date expectedCompleteTime)
+    {
+        this.expectedCompleteTime = expectedCompleteTime;
+    }
+
+    public Date getExpectedCompleteTime()
+    {
+        return expectedCompleteTime;
+    }
+
     public void setCompleteTime(Date completeTime)
     {
         this.completeTime = completeTime;
@@ -143,6 +162,16 @@ public class EmsTicket extends BaseEntity
         return workUserId;
     }
 
+    public void setIsDelete(Long isDelete)
+    {
+        this.isDelete = isDelete;
+    }
+
+    public Long getIsDelete()
+    {
+        return isDelete;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -153,12 +182,14 @@ public class EmsTicket extends BaseEntity
                 .append("content", getContent())
                 .append("images", getImages())
                 .append("status", getStatus())
-            .append("createTime", getCreateTime())
+                .append("expectedCompleteTime", getExpectedCompleteTime())
                 .append("completeTime", getCompleteTime())
+                .append("createTime", getCreateTime())
                 .append("createBy", getCreateBy())
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
                 .append("workUserId", getWorkUserId())
+                .append("isDelete", getIsDelete())
                 .toString();
     }
 }

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

@@ -1,5 +1,7 @@
 package com.xzzn.ems.domain.vo;
 
+import java.math.BigDecimal;
+
 /**
  * 首页看板数据概览-告警等级分布
  */
@@ -7,39 +9,39 @@ public class AlarmGradeList {
     /**
      * 告警等级
      */
-    private String grade;
+    private String level;
 
     /**
      * 数据一
      */
-    private int num1;
+    private int dataNum;
 
     /**
-     * 数据三
+     * 数据占比
      */
-    private int num2;
+    private BigDecimal percent;
 
-    public String getGrade() {
+    public String getLevel() {
-        return grade;
+        return level;
     }
 
-    public void setGrade(String grade) {
+    public void setLevel(String level) {
-        this.grade = grade;
+        this.level = level;
     }
 
-    public int getNum1() {
+    public int getDataNum() {
-        return num1;
+        return dataNum;
     }
 
-    public void setNum1(int num1) {
+    public void setDataNum(int dataNum) {
-        this.num1 = num1;
+        this.dataNum = dataNum;
     }
 
-    public int getNum2() {
+    public BigDecimal getPercent() {
-        return num2;
+        return percent;
     }
 
-    public void setNum2(int num2) {
+    public void setPercent(BigDecimal percent) {
-        this.num2 = num2;
+        this.percent = percent;
     }
 }

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,100 @@
+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;
+
+    /** 工单号 */
+    private String ticketNo;
+
+    /** 告警唯一标识 */
+    private String id;
+
+    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;
+    }
+
+    public String getTicketNo() {
+        return ticketNo;
+    }
+
+    public void setTicketNo(String ticketNo) {
+        this.ticketNo = ticketNo;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}

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

@@ -6,9 +6,12 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * 电表数据
+ * 电表-总表数据
  */
-public class AmmeterDataVo {
+public class AmmeterLoadDataVo {
+
+    /** 电表名称 */
+    private String deviceName;
 
     /** 通信状态 */
     private String emsCommunicationStatus;
@@ -17,7 +20,16 @@ public class AmmeterDataVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date dataUpdateTime;
 
-    private List<AmmeterDataDetailInfo> ammeterDataDetailInfos;
+    /** 总表数据信息 */
+    private List<LoadDataDetailInfo> loadDataDetailInfo;
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
 
     public String getEmsCommunicationStatus() {
         return emsCommunicationStatus;
@@ -35,11 +47,11 @@ public class AmmeterDataVo {
         this.dataUpdateTime = dataUpdateTime;
     }
 
-    public List<AmmeterDataDetailInfo> getAmmeterDataDetailInfos() {
+    public List<LoadDataDetailInfo> getLoadDataDetailInfo() {
-        return ammeterDataDetailInfos;
+        return loadDataDetailInfo;
     }
 
-    public void setAmmeterDataDetailInfos(List<AmmeterDataDetailInfo> ammeterDataDetailInfos) {
+    public void setLoadDataDetailInfo(List<LoadDataDetailInfo> loadDataDetailInfo) {
-        this.ammeterDataDetailInfos = ammeterDataDetailInfos;
+        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/AmmeterStatisListVo.java

@@ -0,0 +1,142 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * 电表数据
+ */
+public class AmmeterStatisListVo {
+
+
+    /** 类别 */
+    private String dataTime;
+
+    /** 组合有功-总 (kWh) */
+    private BigDecimal activeTotalKwh = BigDecimal.ZERO;
+
+    /** 组合有功-尖 (kWh) */
+    private BigDecimal activePeakKwh = BigDecimal.ZERO;
+
+    /** 组合有功-峰 (kWh) */
+    private BigDecimal activeHighKwh = BigDecimal.ZERO;
+
+    /** 组合有功-平 (kWh) */
+    private BigDecimal activeFlatKwh = BigDecimal.ZERO;
+
+    /** 组合有功-谷 (kWh) */
+    private BigDecimal activeValleyKwh = BigDecimal.ZERO;
+
+    /** 组合无功-总 (kWh) */
+    private BigDecimal reActiveTotalKwh = BigDecimal.ZERO;
+
+    /** 组合无功-尖 (kWh) */
+    private BigDecimal reActivePeakKwh = BigDecimal.ZERO;
+
+    /** 组合无功-峰 (kWh) */
+    private BigDecimal reActiveHighKwh = BigDecimal.ZERO;
+
+    /** 组合无功-平 (kWh) */
+    private BigDecimal reActiveFlatKwh = BigDecimal.ZERO;
+
+    /** 组合无功-谷 (kWh) */
+    private BigDecimal reActiveValleyKwh = BigDecimal.ZERO;
+
+    /** 效率-有功总/无功总 */
+    private BigDecimal effect = BigDecimal.ZERO;
+
+    public String getDataTime() {
+        return dataTime;
+    }
+
+    public void setDataTime(String dataTime) {
+        this.dataTime = dataTime;
+    }
+
+    public BigDecimal getActiveTotalKwh() {
+        return activeTotalKwh;
+    }
+
+    public void setActiveTotalKwh(BigDecimal activeTotalKwh) {
+        this.activeTotalKwh = activeTotalKwh;
+    }
+
+    public BigDecimal getActivePeakKwh() {
+        return activePeakKwh;
+    }
+
+    public void setActivePeakKwh(BigDecimal activePeakKwh) {
+        this.activePeakKwh = activePeakKwh;
+    }
+
+    public BigDecimal getActiveHighKwh() {
+        return activeHighKwh;
+    }
+
+    public void setActiveHighKwh(BigDecimal activeHighKwh) {
+        this.activeHighKwh = activeHighKwh;
+    }
+
+    public BigDecimal getActiveFlatKwh() {
+        return activeFlatKwh;
+    }
+
+    public void setActiveFlatKwh(BigDecimal activeFlatKwh) {
+        this.activeFlatKwh = activeFlatKwh;
+    }
+
+    public BigDecimal getActiveValleyKwh() {
+        return activeValleyKwh;
+    }
+
+    public void setActiveValleyKwh(BigDecimal activeValleyKwh) {
+        this.activeValleyKwh = activeValleyKwh;
+    }
+
+    public BigDecimal getReActiveTotalKwh() {
+        return reActiveTotalKwh;
+    }
+
+    public void setReActiveTotalKwh(BigDecimal reActiveTotalKwh) {
+        this.reActiveTotalKwh = reActiveTotalKwh;
+    }
+
+    public BigDecimal getReActivePeakKwh() {
+        return reActivePeakKwh;
+    }
+
+    public void setReActivePeakKwh(BigDecimal reActivePeakKwh) {
+        this.reActivePeakKwh = reActivePeakKwh;
+    }
+
+    public BigDecimal getReActiveHighKwh() {
+        return reActiveHighKwh;
+    }
+
+    public void setReActiveHighKwh(BigDecimal reActiveHighKwh) {
+        this.reActiveHighKwh = reActiveHighKwh;
+    }
+
+    public BigDecimal getReActiveFlatKwh() {
+        return reActiveFlatKwh;
+    }
+
+    public void setReActiveFlatKwh(BigDecimal reActiveFlatKwh) {
+        this.reActiveFlatKwh = reActiveFlatKwh;
+    }
+
+    public BigDecimal getReActiveValleyKwh() {
+        return reActiveValleyKwh;
+    }
+
+    public void setReActiveValleyKwh(BigDecimal reActiveValleyKwh) {
+        this.reActiveValleyKwh = reActiveValleyKwh;
+    }
+
+    public BigDecimal getEffect() {
+        return effect;
+    }
+
+    public void setEffect(BigDecimal effect) {
+        this.effect = effect;
+    }
+}

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

@@ -9,7 +9,7 @@ public class BMSBatteryDataList {
     /**
      * 簇号
      */
-    private Long clusterId;
+    private String clusterId;
 
     /** 簇电压 (V) */
     private BigDecimal clusterVoltage;
@@ -21,16 +21,16 @@ public class BMSBatteryDataList {
     private BigDecimal currentSoc;
 
     /** 单体最高电压 (V) */
-    private BigDecimal maxVoltage;
+    private BigDecimal maxCellVoltage;
 
     /** 单体最低电压 (V) */
-    private BigDecimal minVoltage;
+    private BigDecimal minCellVoltage;
 
     /** 单体最高温度 (℃) */
-    private BigDecimal maxTemperature;
+    private BigDecimal maxCellTemp;
 
     /** 单体最低温度 (℃) */
-    private BigDecimal minTemperature;
+    private BigDecimal minCellTemp;
 
     /** 换电站id */
     private String siteId;
@@ -38,44 +38,60 @@ public class BMSBatteryDataList {
     /** 堆id */
     private String stackDeviceId;
 
-    public Long getClusterId() {
+    public String getClusterId() {
         return clusterId;
     }
 
-    public void setClusterId(Long clusterId) {
+    public void setClusterId(String clusterId) {
         this.clusterId = clusterId;
     }
 
-    public BigDecimal getMinTemperature() {
+    public String getStackDeviceId() {
-        return minTemperature;
+        return stackDeviceId;
     }
 
-    public void setMinTemperature(BigDecimal minTemperature) {
+    public void setStackDeviceId(String stackDeviceId) {
-        this.minTemperature = minTemperature;
+        this.stackDeviceId = stackDeviceId;
     }
 
-    public BigDecimal getMaxTemperature() {
+    public String getSiteId() {
-        return maxTemperature;
+        return siteId;
     }
 
-    public void setMaxTemperature(BigDecimal maxTemperature) {
+    public void setSiteId(String siteId) {
-        this.maxTemperature = maxTemperature;
+        this.siteId = siteId;
     }
 
-    public BigDecimal getMinVoltage() {
+    public BigDecimal getMinCellTemp() {
-        return minVoltage;
+        return minCellTemp;
     }
 
-    public void setMinVoltage(BigDecimal minVoltage) {
+    public void setMinCellTemp(BigDecimal minCellTemp) {
-        this.minVoltage = minVoltage;
+        this.minCellTemp = minCellTemp;
     }
 
-    public BigDecimal getMaxVoltage() {
+    public BigDecimal getMaxCellTemp() {
-        return maxVoltage;
+        return maxCellTemp;
     }
 
-    public void setMaxVoltage(BigDecimal maxVoltage) {
+    public void setMaxCellTemp(BigDecimal maxCellTemp) {
-        this.maxVoltage = maxVoltage;
+        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() {

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

@@ -22,34 +22,34 @@ public class BMSOverViewVo {
     private String emsCommunicationStatus;
 
     /** 电池堆总电压 (V) */
-    private BigDecimal totalVoltage;
+    private BigDecimal stackVoltage;
 
     /** 可充电量 (kWh) */
-    private BigDecimal chargeableCapacity;
+    private BigDecimal availableChargeCapacity;
 
     /** 累计充电量 (kWh) */
-    private BigDecimal totalChargedCapacity;
+    private BigDecimal totalChargeCapacity;
 
     /** 电池堆总电流 (A) */
-    private BigDecimal totalCurrent;
+    private BigDecimal stackCurrent;
 
     /** 可放电量 (kWh) */
-    private BigDecimal dischargeableCapacity;
+    private BigDecimal availableDischargeCapacity;
 
     /** 累计放电量 (kWh) */
-    private BigDecimal totalDischargedCapacity;
+    private BigDecimal totalDischargeCapacity;
 
     /** SOH (%) */
-    private BigDecimal soh;
+    private BigDecimal stackSoh;
 
     /** 平均温度 (℃) */
-    private BigDecimal averageTemperature;
+    private BigDecimal operatingTemp;
 
     /** 绝缘电阻 (Ω) */
-    private BigDecimal insulationResistance;
+    private BigDecimal stackInsulationResistance;
 
     /** 当前SOC (%) */
-    private BigDecimal currentSoc;
+    private BigDecimal stackSoc;
 
     /** 站点id */
     private String siteId;
@@ -91,92 +91,84 @@ public class BMSOverViewVo {
         this.emsCommunicationStatus = emsCommunicationStatus;
     }
 
-    public BigDecimal getTotalVoltage() {
+    public BigDecimal getStackVoltage() {
-        return totalVoltage;
+        return stackVoltage;
     }
 
-    public void setTotalVoltage(BigDecimal totalVoltage) {
+    public void setStackVoltage(BigDecimal stackVoltage) {
-        this.totalVoltage = totalVoltage;
+        this.stackVoltage = stackVoltage;
     }
 
-    public BigDecimal getChargeableCapacity() {
+    public BigDecimal getAvailableChargeCapacity() {
-        return chargeableCapacity;
+        return availableChargeCapacity;
     }
 
-    public void setChargeableCapacity(BigDecimal chargeableCapacity) {
+    public void setAvailableChargeCapacity(BigDecimal availableChargeCapacity) {
-        this.chargeableCapacity = chargeableCapacity;
+        this.availableChargeCapacity = availableChargeCapacity;
     }
 
-    public BigDecimal getTotalChargedCapacity() {
+    public BigDecimal getTotalChargeCapacity() {
-        return totalChargedCapacity;
+        return totalChargeCapacity;
     }
 
-    public void setTotalChargedCapacity(BigDecimal totalChargedCapacity) {
+    public void setTotalChargeCapacity(BigDecimal totalChargeCapacity) {
-        this.totalChargedCapacity = totalChargedCapacity;
+        this.totalChargeCapacity = totalChargeCapacity;
     }
 
-    public BigDecimal getTotalCurrent() {
+    public BigDecimal getStackCurrent() {
-        return totalCurrent;
+        return stackCurrent;
     }
 
-    public void setTotalCurrent(BigDecimal totalCurrent) {
+    public void setStackCurrent(BigDecimal stackCurrent) {
-        this.totalCurrent = totalCurrent;
+        this.stackCurrent = stackCurrent;
     }
 
-    public BigDecimal getDischargeableCapacity() {
+    public BigDecimal getAvailableDischargeCapacity() {
-        return dischargeableCapacity;
+        return availableDischargeCapacity;
     }
 
-    public void setDischargeableCapacity(BigDecimal dischargeableCapacity) {
+    public void setAvailableDischargeCapacity(BigDecimal availableDischargeCapacity) {
-        this.dischargeableCapacity = dischargeableCapacity;
+        this.availableDischargeCapacity = availableDischargeCapacity;
     }
 
-    public BigDecimal getTotalDischargedCapacity() {
+    public BigDecimal getTotalDischargeCapacity() {
-        return totalDischargedCapacity;
+        return totalDischargeCapacity;
     }
 
-    public void setTotalDischargedCapacity(BigDecimal totalDischargedCapacity) {
+    public void setTotalDischargeCapacity(BigDecimal totalDischargeCapacity) {
-        this.totalDischargedCapacity = totalDischargedCapacity;
+        this.totalDischargeCapacity = totalDischargeCapacity;
     }
 
-    public BigDecimal getSoh() {
+    public BigDecimal getStackSoh() {
-        return soh;
+        return stackSoh;
     }
 
-    public void setSoh(BigDecimal soh) {
+    public void setStackSoh(BigDecimal stackSoh) {
-        this.soh = soh;
+        this.stackSoh = stackSoh;
     }
 
-    public BigDecimal getAverageTemperature() {
+    public BigDecimal getOperatingTemp() {
-        return averageTemperature;
+        return operatingTemp;
     }
 
-    public void setAverageTemperature(BigDecimal averageTemperature) {
+    public void setOperatingTemp(BigDecimal operatingTemp) {
-        this.averageTemperature = averageTemperature;
+        this.operatingTemp = operatingTemp;
     }
 
-    public BigDecimal getInsulationResistance() {
+    public BigDecimal getStackInsulationResistance() {
-        return insulationResistance;
+        return stackInsulationResistance;
     }
 
-    public void setInsulationResistance(BigDecimal insulationResistance) {
+    public void setStackInsulationResistance(BigDecimal stackInsulationResistance) {
-        this.insulationResistance = insulationResistance;
+        this.stackInsulationResistance = stackInsulationResistance;
     }
 
-    public BigDecimal getCurrentSoc() {
+    public BigDecimal getStackSoc() {
-        return currentSoc;
+        return stackSoc;
     }
 
-    public void setCurrentSoc(BigDecimal currentSoc) {
+    public void setStackSoc(BigDecimal stackSoc) {
-        this.currentSoc = currentSoc;
+        this.stackSoc = stackSoc;
-    }
-
-    public String getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(String deviceId) {
-        this.deviceId = deviceId;
     }
 
     public String getSiteId() {
@@ -187,6 +179,14 @@ public class BMSOverViewVo {
         this.siteId = siteId;
     }
 
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
     public List<BMSBatteryDataList> getBatteryDataList() {
         return 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;
 
-    /**
+    public Date getCreateDate() {
-     * 昨日SOC
+        return createDate;
-     */
-    private BigDecimal ytdBatterySOC;
-
-    public String getMonthDay() {
-        return monthDay;
     }
 
-    public void setMonthDay(String monthDay) {
+    public void setCreateDate(Date createDate) {
-        this.monthDay = monthDay;
+        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;
 
-    /**
+    public Date getCreateDate() {
-     * 昨日温度
+        return createDate;
-     */
-    private BigDecimal batteryYtdTemp;
-
-
-    public String getMonthDay() {
-        return monthDay;
     }
 
-    public void setMonthDay(String monthDay) {
+    public void setCreateDate(Date createDate) {
-        this.monthDay = monthDay;
+        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/BatteryDataStatsListVo.java

@@ -1,5 +1,6 @@
 package com.xzzn.ems.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -24,7 +25,11 @@ public class BatteryDataStatsListVo {
     /** SOH (%) */
     private BigDecimal soh;
     
-    private Date updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date dataTimestamp;
+
+    /** 簇号 */
+    private String clusterDeviceId;
 
     public String getDeviceId() {
         return deviceId;
@@ -66,11 +71,19 @@ public class BatteryDataStatsListVo {
         this.soh = soh;
     }
 
-    public Date getUpdateTime() {
+    public Date getDataTimestamp() {
-        return updateTime;
+        return dataTimestamp;
     }
 
-    public void setUpdateTime(Date updateTime) {
+    public void setDataTimestamp(Date dataTimestamp) {
-        this.updateTime = updateTime;
+        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/ClusterStatisListVo.java

@@ -0,0 +1,109 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * 电池簇-电池温度等数据入参
+ *
+ */
+public class ClusterStatisListVo {
+
+    /** 统计时间 */
+    private String statisDate;
+
+    /** 最高温度 */
+    private BigDecimal maxTemp;
+
+    /** 最高温度单体ID  */
+    private String maxTempId;
+
+    /** 最低温度  */
+    private BigDecimal minTemp;
+
+    /** 最低温度单体ID */
+    private String minTempId;
+
+    /** 最高电压 */
+    private BigDecimal maxVoltage;
+
+    /** 最高电压单体ID  */
+    private String maxVoltageId;
+
+    /** 最低电压  */
+    private BigDecimal minVoltage;
+
+    /** 最低电压单体ID */
+    private String minVoltageId;
+
+    public String getStatisDate() {
+        return statisDate;
+    }
+
+    public void setStatisDate(String statisDate) {
+        this.statisDate = statisDate;
+    }
+
+    public BigDecimal getMaxTemp() {
+        return maxTemp;
+    }
+
+    public void setMaxTemp(BigDecimal maxTemp) {
+        this.maxTemp = maxTemp;
+    }
+
+    public String getMaxTempId() {
+        return maxTempId;
+    }
+
+    public void setMaxTempId(String maxTempId) {
+        this.maxTempId = maxTempId;
+    }
+
+    public BigDecimal getMinTemp() {
+        return minTemp;
+    }
+
+    public void setMinTemp(BigDecimal minTemp) {
+        this.minTemp = minTemp;
+    }
+
+    public String getMinTempId() {
+        return minTempId;
+    }
+
+    public void setMinTempId(String minTempId) {
+        this.minTempId = minTempId;
+    }
+
+    public BigDecimal getMaxVoltage() {
+        return maxVoltage;
+    }
+
+    public void setMaxVoltage(BigDecimal maxVoltage) {
+        this.maxVoltage = maxVoltage;
+    }
+
+    public String getMaxVoltageId() {
+        return maxVoltageId;
+    }
+
+    public void setMaxVoltageId(String maxVoltageId) {
+        this.maxVoltageId = maxVoltageId;
+    }
+
+    public BigDecimal getMinVoltage() {
+        return minVoltage;
+    }
+
+    public void setMinVoltage(BigDecimal minVoltage) {
+        this.minVoltage = minVoltage;
+    }
+
+    public String getMinVoltageId() {
+        return minVoltageId;
+    }
+
+    public void setMinVoltageId(String minVoltageId) {
+        this.minVoltageId = minVoltageId;
+    }
+}

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

@@ -0,0 +1,77 @@
+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;
+
+    private String deviceId;
+
+    private String dataType;
+
+    private String clusterDeviceId;
+
+    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;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(String dataType) {
+        this.dataType = dataType;
+    }
+
+    public String getClusterDeviceId() {
+        return clusterDeviceId;
+    }
+
+    public void setClusterDeviceId(String clusterDeviceId) {
+        this.clusterDeviceId = clusterDeviceId;
+    }
+}

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

@@ -3,13 +3,13 @@ package com.xzzn.ems.domain.vo;
 import java.math.BigDecimal;
 
 /**
- * 首页看板数据概览-电量指标
+ * 数据统计-电量指标
  */
 public class ElectricIndexList {
     /**
      * 月份
      */
-    private int dateMonth;
+    private String dateMonth;
 
     /**
      * 充电量
@@ -21,11 +21,11 @@ public class ElectricIndexList {
      */
     private BigDecimal disChargeEnergy;
 
-    public int getDateMonth() {
+    public String getDateMonth() {
         return dateMonth;
     }
 
-    public void setDateMonth(int dateMonth) {
+    public void setDateMonth(String dateMonth) {
         this.dateMonth = dateMonth;
     }
 

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,10 @@ import java.math.BigDecimal;
  */
 public class EnergyStoragePowVo {
     /**
-     * 月份 月+日
+     * 显示日期
      */
-    private String monthDay;
+
+    private Date createDate;
 
     /**
      * pcs实时有功功率
@@ -22,22 +24,13 @@ public class EnergyStoragePowVo {
      */
     private BigDecimal pcsTotalReactivePower;
 
-    /**
-     * pcs昨日有功功率
-     */
-    private BigDecimal pcsYtdActPower;
 
-    /**
+    public Date getCreateDate() {
-     * pcs昨日无功功率
+        return createDate;
-     */
-    private BigDecimal pcsYtdReactivePower;
-
-    public String getMonthDay() {
-        return monthDay;
     }
 
-    public void setMonthDay(String monthDay) {
+    public void setCreateDate(Date createDate) {
-        this.monthDay = monthDay;
+        this.createDate = createDate;
     }
 
     public BigDecimal getPcsTotalActPower() {
@@ -55,20 +48,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/LoadDataDetailInfo.java

@@ -1,36 +1,30 @@
 package com.xzzn.ems.domain.vo;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
- * 总表详细数据
+ * 电表-总表数据展示
  */
-public class AmmeterDataDetailInfo
+public class LoadDataDetailInfo
 {
     /** 类别 */
     private String category;
 
     /** 总 (kWh) */
-    private BigDecimal totalKwh;
+    private BigDecimal totalKwh = BigDecimal.ZERO;
 
     /** 尖 (kWh) */
-    private BigDecimal sharpKwh;
+    private BigDecimal peakKwh = BigDecimal.ZERO;
 
     /** 峰 (kWh) */
-    private BigDecimal peakKwh;
+    private BigDecimal highKwh = BigDecimal.ZERO;
 
     /** 平 (kWh) */
-    private BigDecimal flatKwh;
+    private BigDecimal flatKwh = BigDecimal.ZERO;
 
     /** 谷 (kWh) */
-    private BigDecimal valleyKwh;
+    private BigDecimal valleyKwh = BigDecimal.ZERO;
 
-    /** 总表设备Id */
-    private String deviceId;
-
-    /** 数据更新时间 */
-    private Date updateTime;
 
     public BigDecimal getValleyKwh() {
         return valleyKwh;
@@ -56,12 +50,12 @@ public class AmmeterDataDetailInfo
         this.peakKwh = peakKwh;
     }
 
-    public BigDecimal getSharpKwh() {
+    public BigDecimal getHighKwh() {
-        return sharpKwh;
+        return highKwh;
     }
 
-    public void setSharpKwh(BigDecimal sharpKwh) {
+    public void setHighKwh(BigDecimal highKwh) {
-        this.sharpKwh = sharpKwh;
+        this.highKwh = highKwh;
     }
 
     public BigDecimal getTotalKwh() {
@@ -79,20 +73,4 @@ public class AmmeterDataDetailInfo
     public void setCategory(String category) {
         this.category = category;
     }
-
-    public String getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(String deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
 }

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,48 +0,0 @@
-package com.xzzn.ems.domain.vo;
-
-import java.math.BigDecimal;
-
-/**
- * 实时运行-pcs平均温度数据
- *
- */
-public class PCSAveTempVo {
-    /**
-     * 月份 月+日
-     */
-    private String monthDay;
-
-    /**
-     * 实时温度
-     */
-    private BigDecimal pcsTemp;
-
-    /**
-     * 昨日同时段温度（到分）
-     */
-    private BigDecimal pcsYtdTemp;
-
-    public String getMonthDay() {
-        return monthDay;
-    }
-
-    public void setMonthDay(String monthDay) {
-        this.monthDay = monthDay;
-    }
-
-    public BigDecimal getPcsTemp() {
-        return pcsTemp;
-    }
-
-    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

@@ -31,7 +31,7 @@ public class PcsBranchInfo
     private String deviceId;
 
     /** 支路id */
-    private Long branchId;
+    private String branchId;
 
     public String getDischargeStatus() {
         return dischargeStatus;
@@ -81,11 +81,11 @@ public class PcsBranchInfo
         this.deviceId = deviceId;
     }
 
-    public Long getBranchId() {
+    public String getBranchId() {
         return branchId;
     }
 
-    public void setBranchId(Long branchId) {
+    public void setBranchId(String branchId) {
         this.branchId = branchId;
     }
 }

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

@@ -0,0 +1,86 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * 数据统计-pcs曲线-通用对象
+ */
+public class PcsStatisListVo {
+    /**
+     * 数据日期
+     */
+    private String statisDate;
+
+    /**
+     * 有功
+     */
+    private BigDecimal activePower;
+
+    /**
+     * 无功
+     */
+    private BigDecimal reactivePower;
+
+    /**
+     * u电流
+     */
+    private BigDecimal uCurrent;
+
+    /**
+     * v电流
+     */
+    private BigDecimal vCurrent;
+
+    /**
+     * w电流
+     */
+    private BigDecimal wCurrent;
+
+    public String getStatisDate() {
+        return statisDate;
+    }
+
+    public void setStatisDate(String statisDate) {
+        this.statisDate = statisDate;
+    }
+
+    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;
+    }
+
+    public BigDecimal getuCurrent() {
+        return uCurrent;
+    }
+
+    public void setuCurrent(BigDecimal uCurrent) {
+        this.uCurrent = uCurrent;
+    }
+
+    public BigDecimal getvCurrent() {
+        return vCurrent;
+    }
+
+    public void setvCurrent(BigDecimal vCurrent) {
+        this.vCurrent = vCurrent;
+    }
+
+    public BigDecimal getwCurrent() {
+        return wCurrent;
+    }
+
+    public void setwCurrent(BigDecimal wCurrent) {
+        this.wCurrent = wCurrent;
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * 数据统计-功率曲线
+ */
+public class PowerStatisListVo {
+    /**
+     * 数据日期
+     */
+    private String statisDate;
+
+    /**
+     * 电网功率-total_apparent_power总交流视在功率
+     */
+    private BigDecimal gridPower;
+
+    /**
+     * 负载功率-total_active_power总交流有功电率
+     */
+    private BigDecimal loadPower;
+
+    /**
+     * 储能功率-max_discharge_power_capacity最大可放功率
+     */
+    private BigDecimal storagePower;
+
+    /**
+     * 光伏功率-ac_capacitive_reactive_power交流侧容性无功功率
+     */
+    private BigDecimal pvPower;
+
+    public String getStatisDate() {
+        return statisDate;
+    }
+
+    public void setStatisDate(String statisDate) {
+        this.statisDate = statisDate;
+    }
+
+    public BigDecimal getGridPower() {
+        return gridPower;
+    }
+
+    public void setGridPower(BigDecimal gridPower) {
+        this.gridPower = gridPower;
+    }
+
+    public BigDecimal getLoadPower() {
+        return loadPower;
+    }
+
+    public void setLoadPower(BigDecimal loadPower) {
+        this.loadPower = loadPower;
+    }
+
+    public BigDecimal getStoragePower() {
+        return storagePower;
+    }
+
+    public void setStoragePower(BigDecimal storagePower) {
+        this.storagePower = storagePower;
+    }
+
+    public BigDecimal getPvPower() {
+        return pvPower;
+    }
+
+    public void setPvPower(BigDecimal pvPower) {
+        this.pvPower = pvPower;
+    }
+}

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

@@ -51,12 +51,12 @@ public class SingleSiteBaseInfo {
     /**
      * 装机功率（MW）
      */
-    private BigDecimal installedPower;
+    private BigDecimal installPower;
 
     /**
      * 装机容量（MW）
      */
-    private BigDecimal installedCap;
+    private BigDecimal installCapacity;
 
     /**
      * 七天放电统计
@@ -79,20 +79,20 @@ public class SingleSiteBaseInfo {
         this.dayChargedCap = dayChargedCap;
     }
 
-    public BigDecimal getInstalledCap() {
+    public BigDecimal getInstallPower() {
-        return installedCap;
+        return installPower;
     }
 
-    public void setInstalledCap(BigDecimal installedCap) {
+    public void setInstallPower(BigDecimal installPower) {
-        this.installedCap = installedCap;
+        this.installPower = installPower;
     }
 
-    public BigDecimal getInstalledPower() {
+    public BigDecimal getInstallCapacity() {
-        return installedPower;
+        return installCapacity;
     }
 
-    public void setInstalledPower(BigDecimal installedPower) {
+    public void setInstallCapacity(BigDecimal installCapacity) {
-        this.installedPower = installedPower;
+        this.installCapacity = installCapacity;
     }
 
     public String getRunningTime() {

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

@@ -0,0 +1,108 @@
+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;
+    /** 设备类型 */
+    private String deviceCategory;
+    /** 设备类型 */
+    private String pictureUrl;
+    /** 唯一标识 */
+    private String id;
+    /** 父类id */
+    private String parentId;
+
+    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;
+    }
+
+    public String getDeviceCategory() {
+        return deviceCategory;
+    }
+
+    public void setDeviceCategory(String deviceCategory) {
+        this.deviceCategory = deviceCategory;
+    }
+
+    public String getPictureUrl() {
+        return pictureUrl;
+    }
+
+    public void setPictureUrl(String pictureUrl) {
+        this.pictureUrl = pictureUrl;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+}

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/SiteMonitorHomeAlarmVo.java

@@ -20,6 +20,14 @@ public class SiteMonitorHomeAlarmVo {
      */
     private String alarmContent;
 
+    /**
+     * 工单号
+     */
+    private String ticketNo;
+
+    /** 告警唯一标识 */
+    private String id;
+
     public String getDeviceName() {
         return deviceName;
     }
@@ -43,4 +51,20 @@ public class SiteMonitorHomeAlarmVo {
     public void setStatus(int status) {
         this.status = status;
     }
+
+    public String getTicketNo() {
+        return ticketNo;
+    }
+
+    public void setTicketNo(String ticketNo) {
+        this.ticketNo = ticketNo;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
 }

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

@@ -15,7 +15,7 @@ public class SiteMonitorRuningInfoVo {
     /**
      * pcs平均温度list
      */
-    private List<PCSAveTempVo> pcsAveTempList;
+    private List<StackAveTempVo> stackAveTempList;
 
     /**
      * 电池平均soclist
@@ -35,12 +35,12 @@ public class SiteMonitorRuningInfoVo {
         this.energyStoragePowList = energyStoragePowList;
     }
 
-    public List<PCSAveTempVo> getPcsAveTempList() {
+    public List<StackAveTempVo> getStackAveTempList() {
-        return pcsAveTempList;
+        return stackAveTempList;
     }
 
-    public void setPcsAveTempList(List<PCSAveTempVo> pcsAveTempList) {
+    public void setStackAveTempList(List<StackAveTempVo> stackAveTempList) {
-        this.pcsAveTempList = pcsAveTempList;
+        this.stackAveTempList = stackAveTempList;
     }
 
     public List<BatteryAveSOCVo> getBatteryAveSOCList() {

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

@@ -37,6 +37,11 @@ public class SiteMonitorRunningHeadInfoVo {
      */
     private BigDecimal dayDisChargedCap;
 
+    /**
+     * 站点id
+     */
+    private String siteId;
+
     public BigDecimal getTotalActivePower() {
         return totalActivePower;
     }
@@ -84,4 +89,12 @@ public class SiteMonitorRunningHeadInfoVo {
     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/StackAveTempVo.java

@@ -0,0 +1,37 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 实时运行-堆平均温度数据
+ *
+ */
+public class StackAveTempVo {
+    /**
+     * 数据时间
+     */
+    private Date createDate;
+
+    /**
+     * 实时温度
+     */
+    private BigDecimal temp;
+
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public BigDecimal getTemp() {
+        return temp;
+    }
+
+    public void setTemp(BigDecimal temp) {
+        this.temp = temp;
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.xzzn.ems.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * 数据统计-堆曲线-通用对象
+ */
+public class StackStatisListVo {
+    /**
+     * 数据日期
+     */
+    private String statisDate;
+
+    /**
+     * 有功
+     */
+    private BigDecimal temp;
+
+    /**
+     * 无功
+     */
+    private BigDecimal voltage;
+
+    /**
+     * u电流
+     */
+    private BigDecimal current;
+
+    /**
+     * v电流
+     */
+    private BigDecimal soc;
+
+    public String getStatisDate() {
+        return statisDate;
+    }
+
+    public void setStatisDate(String statisDate) {
+        this.statisDate = statisDate;
+    }
+
+    public BigDecimal getTemp() {
+        return temp;
+    }
+
+    public void setTemp(BigDecimal temp) {
+        this.temp = temp;
+    }
+
+    public BigDecimal getVoltage() {
+        return voltage;
+    }
+
+    public void setVoltage(BigDecimal voltage) {
+        this.voltage = voltage;
+    }
+
+    public BigDecimal getCurrent() {
+        return current;
+    }
+
+    public void setCurrent(BigDecimal current) {
+        this.current = current;
+    }
+
+    public BigDecimal getSoc() {
+        return soc;
+    }
+
+    public void setSoc(BigDecimal soc) {
+        this.soc = soc;
+    }
+}

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

@@ -0,0 +1,47 @@
+package com.xzzn.ems.domain.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * 报表统计-电表报表入参
+ *
+ */
+public class StatisAmmeterDateRequest {
+
+    /**
+     * 筛选时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date dateTime;
+
+    private String siteId;
+
+    private String deviceId;
+
+    public Date getDateTime() {
+        return dateTime;
+    }
+
+    public void setDateTime(Date dateTime) {
+        this.dateTime = dateTime;
+    }
+
+    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;
+    }
+}

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

@@ -0,0 +1,57 @@
+package com.xzzn.ems.domain.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * 电池簇-电池温度等数据入参
+ *
+ */
+public class StatisClusterDateRequest {
+
+    /**
+     * 筛选时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date dateTime;
+
+    private String stackId;
+
+    private String clusterId;
+
+    private String siteId;
+
+    public Date getDateTime() {
+        return dateTime;
+    }
+
+    public void setDateTime(Date dateTime) {
+        this.dateTime = dateTime;
+    }
+
+    public String getStackId() {
+        return stackId;
+    }
+
+    public void setStackId(String stackId) {
+        this.stackId = stackId;
+    }
+
+    public String getClusterId() {
+        return clusterId;
+    }
+
+    public void setClusterId(String clusterId) {
+        this.clusterId = clusterId;
+    }
+
+    public String getSiteId() {
+        return siteId;
+    }
+
+    public void setSiteId(String siteId) {
+        this.siteId = siteId;
+    }
+}

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

@@ -0,0 +1,82 @@
+package com.xzzn.ems.domain.vo;
+
+import com.xzzn.common.annotation.Excel;
+import com.xzzn.ems.domain.EmsStrategyCurve;
+
+import java.util.List;
+
+/**
+ *策略模块曲线图
+ *
+ * @author xzzn
+ * @date 2025-07-13
+ */
+public class StrategyCurveVo
+{
+
+    /** 站点id */
+    private String siteId;
+
+    /** 关联的策略ID */
+    private Long strategyId;
+
+    /** 模板名称 */
+    private String templateName;
+
+    /** 模板id */
+    private String templateId;
+
+    /** 月份 */
+    private Long month;
+
+    /** 模板时间功率 */
+    List<StrategyPowerDataVo> powerList;
+
+    public String getSiteId() {
+        return siteId;
+    }
+
+    public void setSiteId(String siteId) {
+        this.siteId = siteId;
+    }
+
+    public Long getStrategyId() {
+        return strategyId;
+    }
+
+    public void setStrategyId(Long strategyId) {
+        this.strategyId = strategyId;
+    }
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public Long getMonth() {
+        return month;
+    }
+
+    public void setMonth(Long month) {
+        this.month = month;
+    }
+
+    public List<StrategyPowerDataVo> getPowerList() {
+        return powerList;
+    }
+
+    public void setPowerList(List<StrategyPowerDataVo> powerList) {
+        this.powerList = powerList;
+    }
+}

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

@@ -0,0 +1,104 @@
+package com.xzzn.ems.domain.vo;
+
+/**
+ * 策略运行对象
+ *
+ * @author xzzn
+ * @date 2025-07-10
+ */
+public class StrategyRunningVo
+{
+    /** 策略状态：0-未启用 1-已运行 2-已暂停 3-禁用 4-删除 */
+    private String status;
+
+    /** 主策略名称 */
+    private String mainStrategyName;
+
+    /** 辅助策略名称 */
+    private String auxStrategyName;
+
+    /** 站点id */
+    private String siteId;
+
+    /** 设备唯一标识符 */
+    private String deviceId;
+
+    /** 策略运行id */
+    private Long id;
+
+    /** 主策略id */
+    private Long mainStrategyId;
+
+    /** 辅助策略id */
+    private Long auxStrategyId;
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public String getMainStrategyName() {
+        return mainStrategyName;
+    }
+
+    public void setMainStrategyName(String mainStrategyName) {
+        this.mainStrategyName = mainStrategyName;
+    }
+
+    public String getAuxStrategyName() {
+        return auxStrategyName;
+    }
+
+    public void setAuxStrategyName(String auxStrategyName) {
+        this.auxStrategyName = auxStrategyName;
+    }
+
+    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 Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getAuxStrategyId() {
+        return auxStrategyId;
+    }
+
+    public void setAuxStrategyId(Long auxStrategyId) {
+        this.auxStrategyId = auxStrategyId;
+    }
+
+    public Long getMainStrategyId() {
+        return mainStrategyId;
+    }
+
+    public void setMainStrategyId(Long mainStrategyId) {
+        this.mainStrategyId = mainStrategyId;
+    }
+}