diff --git a/ems-admin/pom.xml b/ems-admin/pom.xml
index ed00efc..33dacfd 100644
--- a/ems-admin/pom.xml
+++ b/ems-admin/pom.xml
@@ -39,8 +39,9 @@
- mysql
- mysql-connector-java
+ com.mysql
+ mysql-connector-j
+ 8.0.33
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsAlarmRecordsController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsAlarmRecordsController.java
new file mode 100644
index 0000000..e3fc301
--- /dev/null
+++ b/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 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);
+ }
+ }
+
+}
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsEnergyPriceConfigController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsEnergyPriceConfigController.java
new file mode 100644
index 0000000..0117d6f
--- /dev/null
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsEnergyPriceConfigController.java
@@ -0,0 +1,82 @@
+package com.xzzn.web.controller.ems;
+
+import java.util.List;
+
+import com.xzzn.ems.domain.vo.EnergyPriceVo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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.IEmsEnergyPriceConfigService;
+import com.xzzn.common.core.page.TableDataInfo;
+
+/**
+ * 电价配置Controller
+ *
+ * @author xzzn
+ * @date 2025-09-28
+ */
+@RestController
+@RequestMapping("/ems/energyPriceConfig")
+public class EmsEnergyPriceConfigController extends BaseController
+{
+ @Autowired
+ private IEmsEnergyPriceConfigService emsEnergyPriceConfigService;
+
+ /**
+ * 查询电价配置列表
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(String siteId, String startTime,String endTime)
+ {
+ List list = emsEnergyPriceConfigService.selectEmsEnergyPriceConfigList(siteId,startTime,endTime);
+ return getDataTable2(list);
+ }
+
+ /**
+ * 获取电价配置详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(emsEnergyPriceConfigService.selectEmsEnergyPriceConfigById(id));
+ }
+
+ /**
+ * 新增电价配置
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:add')")
+ @Log(title = "电价配置", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody EnergyPriceVo priceVo)
+ {
+ return toAjax(emsEnergyPriceConfigService.insertEmsEnergyPriceConfig(priceVo));
+ }
+
+ /**
+ * 修改电价配置
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:edit')")
+ @Log(title = "电价配置", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody EnergyPriceVo priceVo)
+ {
+ return toAjax(emsEnergyPriceConfigService.updateEmsEnergyPriceConfig(priceVo));
+ }
+
+ /**
+ * 删除电价配置
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:remove')")
+ @Log(title = "电价配置", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(emsEnergyPriceConfigService.deleteEmsEnergyPriceConfigByIds(ids));
+ }
+}
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsFaultProtectionPlanController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsFaultProtectionPlanController.java
new file mode 100644
index 0000000..58e0570
--- /dev/null
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsFaultProtectionPlanController.java
@@ -0,0 +1,107 @@
+package com.xzzn.web.controller.ems;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.xzzn.ems.service.IEmsFaultProtectionPlanService;
+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.EmsFaultProtectionPlan;
+import com.xzzn.common.utils.poi.ExcelUtil;
+import com.xzzn.common.core.page.TableDataInfo;
+
+/**
+ * 故障告警保护方案Controller
+ *
+ * @author xzzn
+ * @date 2025-10-22
+ */
+@RestController
+@RequestMapping("/ems/protectPlan")
+public class EmsFaultProtectionPlanController extends BaseController
+{
+ @Autowired
+ private IEmsFaultProtectionPlanService emsFaultProtectionPlanService;
+
+ /**
+ * 查询故障告警保护方案列表
+ */
+ @PreAuthorize("@ss.hasPermi('system:plan:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(EmsFaultProtectionPlan emsFaultProtectionPlan)
+ {
+ startPage();
+ List list = emsFaultProtectionPlanService.selectEmsFaultProtectionPlanList(emsFaultProtectionPlan);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出故障告警保护方案列表
+ */
+ @PreAuthorize("@ss.hasPermi('system:plan:export')")
+ @Log(title = "故障告警保护方案", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, EmsFaultProtectionPlan emsFaultProtectionPlan)
+ {
+ List list = emsFaultProtectionPlanService.selectEmsFaultProtectionPlanList(emsFaultProtectionPlan);
+ ExcelUtil util = new ExcelUtil(EmsFaultProtectionPlan.class);
+ util.exportExcel(response, list, "故障告警保护方案数据");
+ }
+
+ /**
+ * 获取故障告警保护方案详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('system:plan:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(emsFaultProtectionPlanService.selectEmsFaultProtectionPlanById(id));
+ }
+
+ /**
+ * 新增故障告警保护方案
+ */
+ @PreAuthorize("@ss.hasPermi('system:plan:add')")
+ @Log(title = "故障告警保护方案", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody EmsFaultProtectionPlan emsFaultProtectionPlan)
+ {
+ emsFaultProtectionPlan.setCreateBy(getUsername());
+ return toAjax(emsFaultProtectionPlanService.insertEmsFaultProtectionPlan(emsFaultProtectionPlan));
+ }
+
+ /**
+ * 修改故障告警保护方案
+ */
+ @PreAuthorize("@ss.hasPermi('system:plan:edit')")
+ @Log(title = "故障告警保护方案", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody EmsFaultProtectionPlan emsFaultProtectionPlan)
+ {
+ emsFaultProtectionPlan.setUpdateBy(getUsername());
+ return toAjax(emsFaultProtectionPlanService.updateEmsFaultProtectionPlan(emsFaultProtectionPlan));
+ }
+
+ /**
+ * 删除故障告警保护方案
+ */
+ @PreAuthorize("@ss.hasPermi('system:plan:remove')")
+ @Log(title = "故障告警保护方案", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(emsFaultProtectionPlanService.deleteEmsFaultProtectionPlanByIds(ids));
+ }
+}
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsGeneralQueryController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsGeneralQueryController.java
new file mode 100644
index 0000000..107e835
--- /dev/null
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsGeneralQueryController.java
@@ -0,0 +1,78 @@
+package com.xzzn.web.controller.ems;
+
+import com.xzzn.common.core.controller.BaseController;
+import com.xzzn.common.core.domain.AjaxResult;
+import com.xzzn.common.enums.DeviceCategory;
+import com.xzzn.ems.domain.vo.*;
+import com.xzzn.ems.service.IGeneralQueryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * 综合查询
+ *
+ */
+@RestController
+@RequestMapping("/ems/generalQuery")
+public class EmsGeneralQueryController extends BaseController{
+
+ @Autowired
+ private IGeneralQueryService iGeneralQueryService;
+
+ /**
+ * 获取设备枚举
+ */
+ @GetMapping("/getAllDeviceCategory")
+ public AjaxResult getDeviceCategory()
+ {
+ // 获取所有枚举的信息
+ List> deviceCategoryList = new ArrayList<>();
+ for (DeviceCategory category : DeviceCategory.values()) {
+ Map categoryMap = new HashMap<>();
+ categoryMap.put("name", category.getInfo());
+ categoryMap.put("code", category.getCode());
+ deviceCategoryList.add(categoryMap);
+ }
+ return success(deviceCategoryList);
+ }
+
+ /**
+ * 点位模糊查询
+ */
+ @PostMapping("/pointFuzzyQuery")
+ public AjaxResult pointFuzzyQuery(@RequestBody PointNameRequest request)
+ {
+ return success(iGeneralQueryService.getPointNameList(request));
+ }
+
+ /**
+ * 根据点位查询点位数据变化
+ */
+ @PostMapping("/getPointValueList")
+ public AjaxResult getPointValueList(@RequestBody PointNameRequest request)
+ {
+ List result = new ArrayList<>();
+ try {
+ result = iGeneralQueryService.getPointValueList(request);
+ } catch (Exception e) {
+ logger.error("",e);
+ return error("报错请重试！");
+ }
+ return success(result);
+ }
+
+ /**
+ * 获取设备枚举
+ */
+ @GetMapping("/getAllBatteryIdsBySites/{siteIds}")
+ public AjaxResult getAllBatteryIdsBySites(@PathVariable String[] siteIds)
+ {
+ return success(iGeneralQueryService.getAllBatteryIdsBySites(siteIds));
+ }
+}
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsHomePageController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsHomePageController.java
index 6aa2e3f..23cca2d 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsHomePageController.java
+++ b/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
{
- return success(homePageService.getHomePageDataList());
+ try {
+ return success(homePageService.getHomePageDataList());
+ } catch (Exception e) {
+ return error(e.getMessage());
+ }
}
/**
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsMqttTopicConfigController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsMqttTopicConfigController.java
new file mode 100644
index 0000000..5dc661d
--- /dev/null
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsMqttTopicConfigController.java
@@ -0,0 +1,106 @@
+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.EmsMqttTopicConfig;
+import com.xzzn.ems.service.IEmsMqttTopicConfigService;
+import com.xzzn.common.utils.poi.ExcelUtil;
+import com.xzzn.common.core.page.TableDataInfo;
+
+/**
+ * 站点topic配置Controller
+ *
+ * @author xzzn
+ * @date 2025-11-06
+ */
+@RestController
+@RequestMapping("/ems/mqttConfig")
+public class EmsMqttTopicConfigController extends BaseController
+{
+ @Autowired
+ private IEmsMqttTopicConfigService emsMqttTopicConfigService;
+
+ /**
+ * 查询站点topic配置列表
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(EmsMqttTopicConfig emsMqttTopicConfig)
+ {
+ startPage();
+ List list = emsMqttTopicConfigService.selectEmsMqttTopicConfigList(emsMqttTopicConfig);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出站点topic配置列表
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:export')")
+ @Log(title = "站点topic配置", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, EmsMqttTopicConfig emsMqttTopicConfig)
+ {
+ List list = emsMqttTopicConfigService.selectEmsMqttTopicConfigList(emsMqttTopicConfig);
+ ExcelUtil util = new ExcelUtil(EmsMqttTopicConfig.class);
+ util.exportExcel(response, list, "站点topic配置数据");
+ }
+
+ /**
+ * 获取站点topic配置详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(emsMqttTopicConfigService.selectEmsMqttTopicConfigById(id));
+ }
+
+ /**
+ * 新增站点topic配置
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:add')")
+ @Log(title = "站点topic配置", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody EmsMqttTopicConfig emsMqttTopicConfig)
+ {
+ emsMqttTopicConfig.setCreateBy(getUsername());
+ return toAjax(emsMqttTopicConfigService.insertEmsMqttTopicConfig(emsMqttTopicConfig));
+ }
+
+ /**
+ * 修改站点topic配置
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:edit')")
+ @Log(title = "站点topic配置", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody EmsMqttTopicConfig emsMqttTopicConfig)
+ {
+ emsMqttTopicConfig.setUpdateBy(getUsername());
+ return toAjax(emsMqttTopicConfigService.updateEmsMqttTopicConfig(emsMqttTopicConfig));
+ }
+
+ /**
+ * 删除站点topic配置
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:remove')")
+ @Log(title = "站点topic配置", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(emsMqttTopicConfigService.deleteEmsMqttTopicConfigByIds(ids));
+ }
+}
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsPointMatchController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsPointMatchController.java
new file mode 100644
index 0000000..8441650
--- /dev/null
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsPointMatchController.java
@@ -0,0 +1,88 @@
+package com.xzzn.web.controller.ems;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+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.EmsPointMatch;
+import com.xzzn.ems.domain.vo.DevicePointMatchExportVo;
+import com.xzzn.ems.domain.vo.DevicePointMatchVo;
+import com.xzzn.ems.domain.vo.ImportPointDataRequest;
+import com.xzzn.ems.service.IEmsPointMatchService;
+import com.xzzn.common.utils.poi.ExcelUtil;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 点位匹配Controller
+ *
+ * @author xzzn
+ * @date 2025-11-04
+ */
+@RestController
+@RequestMapping("/ems/pointMatch")
+public class EmsPointMatchController extends BaseController
+{
+ @Autowired
+ private IEmsPointMatchService emsPointMatchService;
+
+ /**
+ * 导出点位匹配列表
+ */
+ @PreAuthorize("@ss.hasPermi('system:match:export')")
+ @Log(title = "点位匹配", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, EmsPointMatch emsPointMatch)
+ {
+ List list = emsPointMatchService.selectEmsPointMatchList(emsPointMatch);
+ ExcelUtil util = new ExcelUtil<>(DevicePointMatchExportVo.class);
+ util.exportExcel(response, list, "点位匹配数据");
+ }
+
+ /**
+ * 上传点位清单
+ * @param file
+ * @param updateSupport
+ * @return
+ * @throws Exception
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:import')")
+ @Log(title = "点位匹配", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+ {
+ ExcelUtil util = new ExcelUtil(EmsPointMatch.class);
+ List pointMatcheList = util.importExcel(file.getInputStream());
+ String operName = getUsername();
+ String message = emsPointMatchService.importPoint(pointMatcheList, updateSupport, operName);
+ return success(message);
+ }
+
+ /**
+ * 上传设备的点位清单
+ * @param request
+ * @return
+ * @throws Exception
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:import')")
+ @Log(title = "点位匹配", businessType = BusinessType.IMPORT)
+ @PostMapping("/importDataByDevice")
+ public void importDataByDevice(@Valid ImportPointDataRequest request, HttpServletResponse response) {
+ List list = emsPointMatchService.importDataByDevice(request, getUsername());
+ if (CollectionUtils.isNotEmpty(list)) {
+ ExcelUtil util = new ExcelUtil<>(DevicePointMatchVo.class);
+ util.exportExcel(response, list, "点位匹配数据");
+ }
+ }
+
+}
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
new file mode 100644
index 0000000..aec2ad4
--- /dev/null
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
@@ -0,0 +1,205 @@
+package com.xzzn.web.controller.ems;
+
+import com.xzzn.common.annotation.Log;
+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.enums.BusinessType;
+import com.xzzn.common.utils.file.FileUploadUtils;
+import com.xzzn.common.utils.file.MimeTypeUtils;
+import com.xzzn.ems.domain.EmsSiteSetting;
+import com.xzzn.ems.domain.vo.DeviceUpdateRequest;
+import com.xzzn.ems.domain.vo.DevicesSettingVo;
+import com.xzzn.ems.domain.vo.PointDataRequest;
+import com.xzzn.ems.domain.vo.PointQueryResponse;
+import com.xzzn.ems.domain.vo.SiteDeviceListVo;
+import com.xzzn.ems.service.IEmsDeviceSettingService;
+import com.xzzn.ems.service.IEmsSiteService;
+
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ *
+ * 站点配置
+ *
+ */
+@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 list = iEmsSiteService.getAllSiteInfoList(siteName,startTime,endTime);
+ return getDataTable(list);
+ }
+
+ /**
+ * 获取设备列表-分页
+ */
+ @GetMapping("/getDeviceInfoList")
+ public TableDataInfo getDeviceInfoList(@RequestParam(value = "siteId", required = false) String siteId,
+ @RequestParam(value = "deviceCategory", required = false) String deviceCategory)
+ {
+ startPage();
+ List list = iEmsSiteService.getAllDeviceListNoDisp(siteId, deviceCategory);
+
+ 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, null));
+ }
+
+ /**
+ * 获取所有设备类别
+ */
+ @GetMapping("/getDeviceCategory")
+ public AjaxResult getDeviceCategory()
+ {
+ return success(iEmsDeviceSettingService.getDeviceCategory());
+ }
+
+ /**
+ * 新增设备
+ */
+ @PostMapping("/addDevice")
+ public AjaxResult addDevice(@RequestBody DevicesSettingVo 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 DevicesSettingVo 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));
+ }
+
+ /**
+ * 单个站点单个设备点位查询-点位清单
+ */
+ @GetMapping("/getDevicePointList")
+ public TableDataInfo getDevicePointList(@Validated PointDataRequest request)
+ {
+ List result = iEmsDeviceSettingService.getSingleSiteDevicePoints(request);
+ return getDataTable2(result);
+ }
+
+ /**
+ * 获取指定站点下的所有设备类别
+ */
+ @GetMapping("/getSiteAllDeviceCategory")
+ public AjaxResult getSiteAllDeviceCategory(String siteId)
+ {
+ return success(iEmsDeviceSettingService.getSiteAllDeviceCategory(siteId));
+ }
+
+ /**
+ * 根据设备类别获取父类的设备id
+ */
+ @GetMapping("/getParentDeviceId")
+ public AjaxResult getParentDeviceId(@RequestParam String siteId, @RequestParam String deviceCategory)
+ {
+ return success(iEmsSiteService.getParentCategoryDeviceId(siteId, deviceCategory));
+ }
+
+ /**
+ * 获取指定站点下的指定设备类型的设备
+ */
+ @GetMapping("/getDeviceListBySiteAndCategory")
+ public AjaxResult getDeviceListBySiteAndCategory(String siteId,String deviceCategory)
+ {
+ return success(iEmsDeviceSettingService.getDeviceListBySiteAndCategory(siteId, deviceCategory));
+ }
+
+ /**
+ * PCS设备开关机
+ */
+// @PreAuthorize("@ss.hasPermi('system:device:onAndOff')")
+ @Log(title = "开关机", businessType = BusinessType.UPDATE)
+ @PostMapping("/updateDeviceStatus")
+ public AjaxResult updateDeviceStatus(@Valid @RequestBody DeviceUpdateRequest request)
+ {
+ return success(iEmsDeviceSettingService.updateDeviceStatus(request));
+ }
+}
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMapController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMapController.java
index 4c39286..4c69b9d 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMapController.java
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMapController.java
@@ -2,7 +2,7 @@ package com.xzzn.web.controller.ems;
import com.xzzn.common.core.controller.BaseController;
import com.xzzn.common.core.domain.AjaxResult;
-import com.xzzn.ems.service.IEmsSiteService;
+import com.xzzn.ems.domain.vo.DateSearchRequest;
import com.xzzn.ems.service.IHomePageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
/**
*
-// * 站点地图
+ * 站点地图
*
*/
@RestController
@@ -26,9 +26,22 @@ public class EmsSiteMapController extends BaseController{
* 获取某个站点基本信息
*/
@GetMapping("/getSingleSiteBaseInfo")
- public AjaxResult getSingleSiteBaseInfo(@RequestParam Long siteId)
+ public AjaxResult getSingleSiteBaseInfo(@RequestParam String siteId)
{
return success(homePageService.getSingleSiteBaseInfo(siteId));
}
+ /**
+ * 获取某个站点7天充放电数据
+ */
+ @GetMapping("/getSevenChargeData")
+ public AjaxResult getSevenChargeData(DateSearchRequest request)
+ {
+ String siteId = request.getSiteId();
+ if(siteId == null || siteId.isEmpty()) {
+ return error("站点必传");
+ }
+ return success(homePageService.getSevenChargeData(request));
+ }
+
}
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java
index 67a683a..3e959f5 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java
@@ -2,10 +2,22 @@ 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.BMSBatteryDataList;
+import com.xzzn.ems.domain.vo.BatteryDataStatsListVo;
+import com.xzzn.ems.domain.vo.DateSearchRequest;
+import com.xzzn.ems.domain.vo.RunningGraphRequest;
+import com.xzzn.ems.domain.vo.SiteBatteryDataList;
+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.*;
+import java.util.Arrays;
+import java.util.List;
+
/**
*
* 单站监控
@@ -17,12 +29,16 @@ public class EmsSiteMonitorController extends BaseController{
@Autowired
private ISingleSiteService iSingleSiteService;
+ @Autowired
+ private IEmsSiteService iEmsSiteService;
+ @Autowired
+ private IEmsStatsReportService iemsStatsReportService;
/**
* 获取单站首页数据
*/
@GetMapping("/homeView")
- public AjaxResult getSingleSiteViewInfo(@RequestParam Long siteId)
+ public AjaxResult getSingleSiteViewInfo(@RequestParam String siteId)
{
return success(iSingleSiteService.getSiteMonitorDataVo(siteId));
}
@@ -31,7 +47,7 @@ public class EmsSiteMonitorController extends BaseController{
* 单站监控-设备监控-实时运行头部数据
*/
@GetMapping("/runningHeadInfo")
- public AjaxResult getRunningHeadInfo(@RequestParam Long siteId)
+ public AjaxResult getRunningHeadInfo(@RequestParam String siteId)
{
return success(iSingleSiteService.getSiteRunningHeadInfo(siteId));
}
@@ -39,17 +55,35 @@ public class EmsSiteMonitorController extends BaseController{
/**
* 单站监控-设备监控-实时运行曲线图数据
*/
- @GetMapping("/runningGraph")
- public AjaxResult getRunningGraph(@RequestParam Long siteId)
+ @GetMapping("/runningGraph/storagePower")
+ public AjaxResult getRunningGraphStorage(RunningGraphRequest request)
{
- return success(iSingleSiteService.getRunningGraph(siteId));
+ return success(iSingleSiteService.getRunningGraphStorage(request));
+ }
+
+ @GetMapping("/runningGraph/pcsMaxTemp")
+ public AjaxResult getRunningGraphPcsMaxTemp(RunningGraphRequest request)
+ {
+ return success(iSingleSiteService.getRunningGraphPcsMaxTemp(request));
+ }
+
+ @GetMapping("/runningGraph/batteryAveSoc")
+ public AjaxResult getRunningGraphBatterySoc(RunningGraphRequest request)
+ {
+ return success(iSingleSiteService.getRunningGraphBatterySoc(request));
+ }
+
+ @GetMapping("/runningGraph/batteryAveTemp")
+ public AjaxResult getRunningGraphBatteryTemp(RunningGraphRequest request)
+ {
+ return success(iSingleSiteService.getRunningGraphBatteryTemp(request));
}
/**
* 单站监控-设备监控-PCS
*/
@GetMapping("/getPcsDetailInfo")
- public AjaxResult getPcsDetailInfo(@RequestParam Long siteId)
+ public AjaxResult getPcsDetailInfo(@RequestParam String siteId)
{
return success(iSingleSiteService.getPcsDetailInfo(siteId));
}
@@ -58,7 +92,7 @@ public class EmsSiteMonitorController extends BaseController{
* 单站监控-设备监控-BMS总览
*/
@GetMapping("/getBMSOverView")
- public AjaxResult getBMSOverView(@RequestParam Long siteId)
+ public AjaxResult getBMSOverView(@RequestParam String siteId)
{
return success(iSingleSiteService.getBMSOverView(siteId));
}
@@ -67,7 +101,7 @@ public class EmsSiteMonitorController extends BaseController{
* 单站监控-设备监控-BMS电池簇
*/
@GetMapping("/getBMSBatteryCluster")
- public AjaxResult getBMSBatteryCluster(@RequestParam Long siteId)
+ public AjaxResult getBMSBatteryCluster(@RequestParam String siteId)
{
return success(iSingleSiteService.getBMSBatteryCluster(siteId));
}
@@ -76,26 +110,122 @@ public class EmsSiteMonitorController extends BaseController{
* 获取所有电池堆
*/
@GetMapping("/getStackNameList")
- public AjaxResult getStackNameList(@RequestParam Long siteId)
+ public AjaxResult getStackNameList(@RequestParam String siteId)
{
- return success(iSingleSiteService.getBMSBatteryCluster(siteId));
+ 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 Long siteId)
+ public AjaxResult getClusterNameList(@RequestParam String siteId, @RequestParam String stackDeviceId)
{
- return success(iSingleSiteService.getBMSBatteryCluster(siteId));
+ return success(iEmsSiteService.getAllClusterInfo(siteId, stackDeviceId));
}
/**
* 液冷设备参数
*/
@GetMapping("/getCoolingDataList")
- public AjaxResult getCoolingDataList(@RequestParam Long siteId)
+ public AjaxResult getCoolingDataList(@RequestParam String siteId)
{
return success(iSingleSiteService.getCoolingDataList(siteId));
}
+
+ /**
+ * 获取电池簇下面的单体电池数据
+ */
+ @GetMapping("/getClusterDataInfoList")
+ public TableDataInfo getClusterDataInfoList(@RequestParam String clusterDeviceId,@RequestParam String siteId,
+ @RequestParam String stackDeviceId,@RequestParam String batteryId)
+ {
+ startPage();
+ SiteBatteryDataList siteBatteryDataList = new SiteBatteryDataList();
+ // 簇最大最小单体id数据
+ List clusterBatteryDataList = iSingleSiteService.getClusterBatteryList(siteId,stackDeviceId,clusterDeviceId);
+ siteBatteryDataList.setClusterList(clusterBatteryDataList);
+ // 单体电池数据
+ List List = iSingleSiteService.getClusterDataInfoList(clusterDeviceId,siteId,stackDeviceId,batteryId);
+ // 对batteryList进行分页处理
+ List batteryList = paginateList(List);
+ siteBatteryDataList.setBatteryList(batteryList);
+
+ // 封装分页信息
+ TableDataInfo pageInfo = new TableDataInfo();
+ pageInfo.setTotal(List.size());
+ pageInfo.setRows(Arrays.asList(siteBatteryDataList));
+ pageInfo.setCode(0);
+ pageInfo.setMsg("查询成功");
+ return pageInfo;
+ }
+
+ /**
+ * 单个单体电池曲线图
+ */
+ @GetMapping("/getSingleBatteryData")
+ public AjaxResult getSingleBatteryData(DateSearchRequest requestVo)
+ {
+ return success(iemsStatsReportService.getSingleBatteryData(requestVo));
+ }
+
+ /**
+ * 电表数据
+ */
+ @GetMapping("/getAmmeterDataList")
+ public AjaxResult getAmmeterDataList(@RequestParam String siteId)
+ {
+ return success(iSingleSiteService.getAmmeterDataList(siteId));
+ }
+
+ /**
+ * 动环数据
+ */
+ @GetMapping("/getDhDataList")
+ public AjaxResult getDhDataList(@RequestParam String siteId)
+ {
+ return success(iSingleSiteService.getDhDataList(siteId));
+ }
+
+ /**
+ * 消防数据
+ */
+ @GetMapping("/getXfDataList")
+ public AjaxResult getXfDataList(@RequestParam String siteId)
+ {
+ return success(iSingleSiteService.getXfDataList(siteId));
+ }
+
+ /**
+ * EMS数据
+ */
+ @GetMapping("/getEmsDataList")
+ public AjaxResult getEmsDataList(@RequestParam String siteId)
+ {
+ return success(iSingleSiteService.getEmsDataList(siteId));
+ }
+
+ /**
+ * 单站监控-首页-点位展示
+ * 储能功率、电网功率、负荷功率、光伏功率
+ * SOC、SOH、电池平均温度
+ */
+ @GetMapping("/getPointData")
+ public AjaxResult getPointData(DateSearchRequest requestVo)
+ {
+ if (!StringUtils.isEmpty(requestVo.getSiteId())) {
+ return success(iSingleSiteService.getPointData(requestVo));
+ } else {
+ return error("缺少必传项");
+ }
+ }
}
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStatisticalReportController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStatisticalReportController.java
new file mode 100644
index 0000000..330ecb0
--- /dev/null
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStatisticalReportController.java
@@ -0,0 +1,179 @@
+package com.xzzn.web.controller.ems;
+
+import com.xzzn.common.annotation.Log;
+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.enums.BusinessType;
+import com.xzzn.common.utils.StringUtils;
+import com.xzzn.ems.domain.vo.AmmeterRevenueStatisListVo;
+import com.xzzn.ems.domain.vo.AmmeterStatisListVo;
+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 java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 单站监控-统计报表
+ *
+ * @author xzzn
+ */
+@RestController
+@RequestMapping("/ems/statsReport")
+public class EmsStatisticalReportController extends BaseController
+{
+
+ @Autowired
+ private IEmsStatsReportService ieEmsStatsReportService;
+
+ /**
+ * 概率统计-收益指标查询
+ */
+ @GetMapping("/getRevenueData")
+ public AjaxResult getRevenueData(DateSearchRequest requestVo)
+ {
+ return success(null);
+ }
+
+ /**
+ * 概率统计-电量指标查询
+ */
+ @GetMapping("/getElectricData")
+ public AjaxResult getElectricData(DateSearchRequest requestVo)
+ {
+ if (!StringUtils.isEmpty(requestVo.getSiteId())) {
+ return success(ieEmsStatsReportService.getElectricDataResult(requestVo));
+ } else {
+ return error("站点id必传");
+ }
+ }
+
+ /**
+ * 概率统计-PCS曲线
+ */
+ @GetMapping("/getPCSData")
+ public AjaxResult getPCSData(DateSearchRequest requestVo)
+ {
+ if (!StringUtils.isEmpty(requestVo.getSiteId())&&
+ !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.getDataType())) {
+ return success(ieEmsStatsReportService.getStackDataResult(requestVo));
+ } else {
+ return error("缺少必传项");
+ }
+ }
+
+ /**
+ * 概率统计-电池温度等数据
+ */
+ @GetMapping("/getClusterData")
+ public TableDataInfo getClusterData(StatisClusterDateRequest requestVo)
+ {
+ startPage();
+ List 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 TableDataInfo getAmmeterData(StatisAmmeterDateRequest requestVo)
+ {
+ startPage();
+ List dataList = ieEmsStatsReportService.getAmmeterDataResult(requestVo);
+ return getDataTable(dataList);
+ }
+
+ /**
+ * 导出电表报表
+ */
+ @PreAuthorize("@ss.hasPermi('system:ammeterData:export')")
+ @Log(title = "电表报表", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportAmmeterData")
+ public void exportAmmeterData(HttpServletResponse response, StatisAmmeterDateRequest requestVo)
+ {
+ ieEmsStatsReportService.exportAmmeterData(response, requestVo);
+ }
+
+ /**
+ * 概率统计-电表收益报表
+ */
+ @GetMapping("/getAmmeterRevenueData")
+ public TableDataInfo getAmmeterRevenueData(StatisAmmeterDateRequest requestVo)
+ {
+ startPage();
+ List dataList = ieEmsStatsReportService.getAmmeterRevenueDataResult(requestVo);
+ return getDataTable(dataList);
+ }
+
+ /**
+ * 导出收益报表
+ */
+ @PreAuthorize("@ss.hasPermi('system:ammeterRevenueData:export')")
+ @Log(title = "收益报表", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportAmmeterRevenueData")
+ public void exportAmmeterRevenueData(HttpServletResponse response, StatisAmmeterDateRequest requestVo)
+ {
+ ieEmsStatsReportService.exportAmmeterRevenueData(response, requestVo);
+ }
+
+ /**
+ * 概率统计-功率曲线
+ */
+ @GetMapping("/getPowerData")
+ public AjaxResult getPowerData(DateSearchRequest requestVo)
+ {
+ if (!StringUtils.isEmpty(requestVo.getSiteId())) {
+ return success(ieEmsStatsReportService.getPowerDataList(requestVo));
+ } else {
+ return error("缺少必传项");
+ }
+ }
+
+}
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStrategyController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStrategyController.java
new file mode 100644
index 0000000..4c3435e
--- /dev/null
+++ b/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);
+ }
+}
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStrategyCurveController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStrategyCurveController.java
new file mode 100644
index 0000000..6761295
--- /dev/null
+++ b/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 list = emsStrategyCurveService.selectEmsStrategyCurveList(emsStrategyCurve);
+ ExcelUtil util = new ExcelUtil(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));
+ }
+}
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStrategyTempController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStrategyTempController.java
new file mode 100644
index 0000000..b8a5071
--- /dev/null
+++ b/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));
+ }
+}
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStrategyTimeConfigController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStrategyTimeConfigController.java
new file mode 100644
index 0000000..ad20c48
--- /dev/null
+++ b/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 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));
+ }
+}
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsTicketController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsTicketController.java
index 38e393d..d7e1e29 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsTicketController.java
+++ b/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 list = emsTicketService.selectEmsTicketList(emsTicket);
+ List 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()));
+ }
}
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java
new file mode 100644
index 0000000..ff74aa9
--- /dev/null
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java
@@ -0,0 +1,295 @@
+package com.xzzn.web.controller.ems;
+
+import com.xzzn.common.constant.RedisKeyConstants;
+import com.xzzn.common.core.redis.RedisCache;
+import com.xzzn.common.enums.TopicHandleType;
+import com.xzzn.common.utils.StringUtils;
+import com.xzzn.ems.domain.EmsMqttTopicConfig;
+import com.xzzn.ems.mapper.EmsMqttTopicConfigMapper;
+import com.xzzn.ems.service.IDDSDataProcessService;
+import com.xzzn.ems.service.IDeviceDataProcessService;
+import com.xzzn.ems.service.IEmsMqttMessageService;
+import com.xzzn.ems.service.IEmsStrategyService;
+import com.xzzn.ems.service.IFXXAlarmDataProcessService;
+import com.xzzn.ems.service.IFXXDataProcessService;
+import com.xzzn.ems.service.IMqttSyncLogService;
+import com.xzzn.framework.manager.MqttLifecycleManager;
+import com.xzzn.framework.web.service.MqttPublisher;
+import com.xzzn.framework.web.service.MqttSubscriber;
+
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.eclipse.paho.client.mqttv3.IMqttMessageListener;
+import org.eclipse.paho.client.mqttv3.MqttException;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MqttMessageController implements MqttPublisher, MqttSubscriber {
+
+ private static final Logger log = LoggerFactory.getLogger(MqttMessageController.class);
+
+
+ private final MqttLifecycleManager mqttLifecycleManager;
+
+ @Autowired
+ private IEmsMqttMessageService emsMqttMessageService;
+
+ @Autowired
+ private IFXXDataProcessService fXXDataProcessService;
+
+ @Autowired
+ private IDDSDataProcessService dDSDataProcessService;
+
+ @Autowired
+ private IDeviceDataProcessService deviceDataProcessService;
+
+ @Autowired
+ private IFXXAlarmDataProcessService fXXAlarmDataProcessService;
+ @Autowired
+ private EmsMqttTopicConfigMapper emsMqttTopicConfigMapper;
+ @Autowired
+ private IEmsStrategyService emsStrategyService;
+ @Autowired
+ private IMqttSyncLogService iMqttSyncLogService;
+
+ @Autowired
+ private RedisCache redisCache;
+
+ @Autowired
+ public MqttMessageController(MqttLifecycleManager mqttLifecycleManager) {
+ this.mqttLifecycleManager = mqttLifecycleManager;
+ }
+
+ @PostConstruct
+ public void init() {
+ List topicConfigList = emsMqttTopicConfigMapper.selectEmsMqttTopicConfigList(null);
+
+ if (CollectionUtils.isEmpty (topicConfigList)) {
+ log.info ("未查询到任何 MQTT 主题配置，跳过订阅");
+ return;
+ }
+
+ for (EmsMqttTopicConfig topicConfig : topicConfigList) {
+ String topic = topicConfig.getMqttTopic();
+ if (StringUtils.isEmpty(topic)) {
+ log.info ("主题配置 ID:" +topicConfig.getId() +"的 mqttTopic 为空，跳过订阅");
+ continue;
+ }
+
+ int qos = topicConfig.getQos() == null ? 1 : topicConfig.getQos();
+ if (qos < 0 || qos > 2) {
+ log.info ("主题:" + topic +"的 QoS值"+ qos + "不合法，自动调整为1");
+ qos = 1;
+ }
+
+ IMqttMessageListener listener = getMqttListenerByTopic(topic, topicConfig.getHandleType());
+ subscribe(topic, qos, listener);
+ }
+ // 订阅奉贤系统状态主题
+ /*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_FXX_01_ALARM_UP", 1, this::handleAlarmData);
+
+ // 订阅电动所系统状态主题
+ 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);*/
+
+ }
+
+ private IMqttMessageListener getMqttListenerByTopic(String topic, String handleType) {
+ TopicHandleType topicHandleType = TopicHandleType.getEnumByCode(handleType);
+ switch (topicHandleType) {
+ case DEVICE:
+ return this::handleDeviceData;
+ case DEVICE_ALARM:
+ return this::handleAlarmData;
+ case STRATEGY:
+ if (topic.equals("FAULT_PROTECTION_PLAN_UP")) {
+ return this::handleFaultProtPlanData;
+ } else if (topic.equals("FAULT_ALARM_RECORD_UP")) {
+ return this::handleFaultAlarmData;
+ } else if (topic.equals("FAULT_PLAN_ISSUE_UP")) {
+ return this::handleFaultPlanIssueData;
+ } else if (topic.equals("DEVICE_CHANGE_LOG_UP")) {
+ return this::handleDeviceChangeLogData;
+ } else {
+ return this::handleStrategyData;
+ }
+ default:
+ log.warn("Unknown handle type: " + handleType + ", using default handler");
+ return this::handleSystemStatus;
+ }
+ }
+
+ // 处理系统状态消息
+ private void handleSystemStatus(String topic, MqttMessage message) {
+ String payload = new String(message.getPayload());
+ System.out.println("[SYSTEM] Status update: " + payload);
+
+ try {
+ emsMqttMessageService.insertMqttOriginalMessage(topic,payload);
+
+ } catch (Exception e) {
+ log.error("Failed to process system status message: " + e.getMessage(), e);
+ }
+ }
+
+ // 处理设备数据
+ private void handleDeviceData(String topic, MqttMessage message) {
+ String payload = new String(message.getPayload());
+ log.error("[DEVICE] data: " + payload);
+ try {
+ // 业务处理逻辑
+// if (topic.startsWith("021_DDS")) {
+// dDSDataProcessService.handleDdsData(payload);
+// } else if (topic.startsWith("021_FXX")) {
+// fXXDataProcessService.handleFxData(payload);
+// }
+ deviceDataProcessService.handleDeviceData(payload, getSiteIdByTopic(topic));
+
+ emsMqttMessageService.insertMqttOriginalMessage(topic, payload);
+ } catch (Exception e) {
+ log.error("Failed to process device data message: " + e.getMessage(), e);
+ }
+
+ }
+
+ // 处理告警数据
+ private void handleAlarmData(String topic, MqttMessage message) {
+ String payload = new String(message.getPayload());
+ System.out.println("[DEVICE] data: " + payload);
+ try {
+ // 业务处理逻辑
+// if (topic.startsWith("021_FXX")) {
+// fXXAlarmDataProcessService.handleFxAlarmData(payload);
+// }
+ deviceDataProcessService.handleAlarmData(payload, getSiteIdByTopic(topic));
+
+ emsMqttMessageService.insertMqttOriginalMessage(topic, payload);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("Failed to process device alarm data message: " + e.getMessage(), e);
+ }
+
+ }
+
+ private String getSiteIdByTopic(String topic) {
+ String siteId = redisCache.getCacheObject(RedisKeyConstants.SITE_ID + topic);
+ if (StringUtils.isEmpty(siteId)) {
+ EmsMqttTopicConfig topicConfig = emsMqttTopicConfigMapper.selectOneByTopic(topic);
+ siteId = topicConfig.getSiteId();
+ redisCache.setCacheObject(RedisKeyConstants.SITE_ID + topic, siteId);
+ }
+ log.info("当前处理数据站点：" + siteId + ",topic: " + topic);
+ return siteId;
+ }
+
+ // 处理运行策略数据：云端-本地
+ private void handleStrategyData(String topic, MqttMessage message) {
+ String payload = new String(message.getPayload());
+ System.out.println("[处理运行策略数据] data: " + payload);
+ try {
+ // 业务处理逻辑
+ iMqttSyncLogService.handleMqttStrategyData(payload);
+
+ emsMqttMessageService.insertMqttOriginalMessage(topic,payload);
+ } catch (Exception e) {
+ log.error("Failed to process strategy data message: " + e.getMessage(), e);
+ }
+ }
+
+ // 处理设备保护告警策略数据：云端-本地
+ private void handleFaultProtPlanData(String topic, MqttMessage message) {
+ String payload = new String(message.getPayload());
+ System.out.println("[处理设备保护告警策略数据] data: " + payload);
+ try {
+ // 业务处理逻辑
+ iMqttSyncLogService.handleMqttPlanData(payload);
+
+ emsMqttMessageService.insertMqttOriginalMessage(topic,payload);
+ } catch (Exception e) {
+ log.error("Failed to process fault plan data message: " + e.getMessage(), e);
+ }
+ }
+
+ // 处理保护策略告警信息：本地-云端
+ private void handleFaultAlarmData(String topic, MqttMessage message) {
+ String payload = new String(message.getPayload());
+ System.out.println("[处理本地保护策略告警信息到云端] data: " + payload);
+ try {
+ // 业务处理逻辑
+ iMqttSyncLogService.handleFaultAlarmData(payload);
+
+ emsMqttMessageService.insertMqttOriginalMessage(topic,payload);
+ } catch (Exception e) {
+ log.error("Failed to process fault plan alarm data message: " + e.getMessage(), e);
+ }
+ }
+
+ // 处理保护策略下发日志：本地-云端
+ private void handleFaultPlanIssueData(String topic, MqttMessage message) {
+ String payload = new String(message.getPayload());
+ System.out.println("[处理本地保护策略下发日志到云端] data: " + payload);
+ try {
+ // 业务处理逻辑
+ iMqttSyncLogService.handleFaultPlanIssueData(payload);
+
+ emsMqttMessageService.insertMqttOriginalMessage(topic,payload);
+ } catch (Exception e) {
+ log.error("Failed to process fault plan issue log message: " + e.getMessage(), e);
+ }
+ }
+
+ // 处理设备状态变更日志：本地-云端
+ private void handleDeviceChangeLogData(String topic, MqttMessage message) {
+ String payload = new String(message.getPayload());
+ System.out.println("[处理本地的保护策略告警信息到云端] data: " + payload);
+ try {
+ // 业务处理逻辑
+ iMqttSyncLogService.handleDeviceChangeLogData(payload);
+
+ emsMqttMessageService.insertMqttOriginalMessage(topic,payload);
+ } catch (Exception e) {
+ log.error("Failed to process device change log message: " + e.getMessage(), e);
+ }
+ }
+
+ @Override
+ public void publish(String topic, String message) throws MqttException {
+ mqttLifecycleManager.publish(topic, message, 0);
+ }
+
+ @Override
+ public void publish(String topic, String message, int qos) throws MqttException {
+ mqttLifecycleManager.publish(topic, message, qos);
+ }
+
+ @Override
+ public void subscribe(String topic, int qos, IMqttMessageListener listener) {
+ mqttLifecycleManager.subscribe(topic, qos, listener);
+
+
+ }
+
+ // 发送设备控制命令
+ public void sendDeviceCommand(String deviceId, String command) {
+ try {
+ String topic = "devices/" + deviceId + "/commands";
+ publish(topic, command, 1);
+ } catch (MqttException e) {
+ System.err.println("Failed to send command to device " + deviceId);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/system/SysUserController.java b/ems-admin/src/main/java/com/xzzn/web/controller/system/SysUserController.java
index ffe93bb..842620f 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/system/SysUserController.java
+++ b/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));
+ }
}
diff --git a/ems-admin/src/main/resources/application-druid.yml b/ems-admin/src/main/resources/application-druid.yml
index 3c7fe20..6408036 100644
--- a/ems-admin/src/main/resources/application-druid.yml
+++ b/ems-admin/src/main/resources/application-druid.yml
@@ -1,61 +1,61 @@
-# 数据源配置
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 主库数据源
- master:
- url: jdbc:mysql://122.51.194.184:13306/setri_ems?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: ems
- password: 12345678
- # 从库数据源
- slave:
- # 从数据源开关/默认关闭
- enabled: false
- url:
- username:
- password:
- # 初始连接数
- initialSize: 5
- # 最小连接池数量
- minIdle: 10
- # 最大连接池数量
- maxActive: 20
- # 配置获取连接等待超时的时间
- maxWait: 60000
- # 配置连接超时时间
- connectTimeout: 30000
- # 配置网络超时时间
- socketTimeout: 60000
- # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
- timeBetweenEvictionRunsMillis: 60000
- # 配置一个连接在池中最小生存的时间，单位是毫秒
- minEvictableIdleTimeMillis: 300000
- # 配置一个连接在池中最大生存的时间，单位是毫秒
- maxEvictableIdleTimeMillis: 900000
- # 配置检测连接是否有效
- validationQuery: SELECT 1 FROM DUAL
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- webStatFilter:
- enabled: true
- statViewServlet:
- enabled: true
- # 设置白名单，不填则允许所有访问
- allow:
- url-pattern: /druid/*
- # 控制台管理用户名和密码
- login-username: xzzn
- login-password: 123456
- filter:
- stat:
- enabled: true
- # 慢SQL记录
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: true
- wall:
- config:
- multi-statement-allow: true
\ No newline at end of file
+## 数据源配置
+#spring:
+# datasource:
+# type: com.alibaba.druid.pool.DruidDataSource
+# driverClassName: com.mysql.cj.jdbc.Driver
+# druid:
+# # 主库数据源
+# master:
+# url: jdbc:mysql://122.51.194.184:13306/setri_ems?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# username: ems
+# password: 12345678
+# # 从库数据源
+# slave:
+# # 从数据源开关/默认关闭
+# enabled: false
+# url:
+# username:
+# password:
+# # 初始连接数
+# initialSize: 5
+# # 最小连接池数量
+# minIdle: 10
+# # 最大连接池数量
+# maxActive: 20
+# # 配置获取连接等待超时的时间
+# maxWait: 60000
+# # 配置连接超时时间
+# connectTimeout: 30000
+# # 配置网络超时时间
+# socketTimeout: 60000
+# # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+# timeBetweenEvictionRunsMillis: 60000
+# # 配置一个连接在池中最小生存的时间，单位是毫秒
+# minEvictableIdleTimeMillis: 300000
+# # 配置一个连接在池中最大生存的时间，单位是毫秒
+# maxEvictableIdleTimeMillis: 900000
+# # 配置检测连接是否有效
+# validationQuery: SELECT 1 FROM DUAL
+# testWhileIdle: true
+# testOnBorrow: false
+# testOnReturn: false
+# webStatFilter:
+# enabled: true
+# statViewServlet:
+# enabled: true
+# # 设置白名单，不填则允许所有访问
+# allow:
+# url-pattern: /druid/*
+# # 控制台管理用户名和密码
+# login-username: xzzn
+# login-password: 123456
+# filter:
+# stat:
+# enabled: true
+# # 慢SQL记录
+# log-slow-sql: true
+# slow-sql-millis: 1000
+# merge-sql: true
+# wall:
+# config:
+# multi-statement-allow: true
\ No newline at end of file
diff --git a/ems-admin/src/main/resources/application-local.yml b/ems-admin/src/main/resources/application-local.yml
new file mode 100644
index 0000000..7654dc9
--- /dev/null
+++ b/ems-admin/src/main/resources/application-local.yml
@@ -0,0 +1,207 @@
+# 项目相关配置
+xzzn:
+ # 名称
+ name: EMS
+ # 版本
+ version: 0.0.1
+ # 版权年份
+ copyrightYear: 2025
+ # 文件路径 示例（ Windows配置D:/xzzn/uploadPath，Linux配置 /home/xzzn/uploadPath）
+ profile: ../uploadPath
+ # 获取ip地址开关
+ addressEnabled: false
+ # 验证码类型 math 数字计算 char 字符验证
+ captchaType: math
+
+# 开发环境配置
+server:
+ # 服务器的HTTP端口，默认为8080
+ port: 8089
+ servlet:
+ # 应用的访问路径
+ context-path: /
+ tomcat:
+ # tomcat的URI编码
+ uri-encoding: UTF-8
+ # 连接数满后的排队数，默认为100
+ accept-count: 1000
+ threads:
+ # tomcat最大线程数，默认为200
+ max: 800
+ # Tomcat启动初始化的线程数，默认值10
+ min-spare: 100
+
+# 日志配置
+logging:
+ level:
+ com.xzzn: info
+ org.springframework: warn
+
+# 用户配置
+user:
+ password:
+ # 密码最大错误次数
+ maxRetryCount: 5
+ # 密码锁定时间（默认10分钟）
+ lockTime: 10
+
+# Spring配置
+spring:
+ # 资源信息
+ messages:
+ # 国际化资源文件路径
+ basename: i18n/messages
+ # 文件上传
+ servlet:
+ multipart:
+ # 单个文件大小
+ max-file-size: 10MB
+ # 设置总上传的文件大小
+ max-request-size: 20MB
+ # 服务模块
+ devtools:
+ restart:
+ # 热部署开关
+ enabled: true
+ # redis 配置
+ redis:
+ # 地址
+ host: 127.0.0.1
+ # 端口，默认为6379
+ port: 6379
+ # 数据库索引
+ database: 0
+ # 密码
+ password: 12345678
+ # 连接超时时间
+ timeout: 10s
+ lettuce:
+ pool:
+ # 连接池中的最小空闲连接
+ min-idle: 0
+ # 连接池中的最大空闲连接
+ max-idle: 8
+ # 连接池的最大数据库连接数
+ max-active: 8
+ # #连接池最大阻塞等待时间（使用负值表示没有限制）
+ max-wait: -1ms
+ # 数据源配置
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+ druid:
+ # 主库数据源
+ master:
+ url: jdbc:mysql://127.0.0.1:3306/setri_ems?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: ems
+ password: Aa112211!
+ # 从库数据源
+ slave:
+ # 从数据源开关/默认关闭
+ enabled: false
+ url:
+ username:
+ password:
+ # 初始连接数
+ initialSize: 5
+ # 最小连接池数量
+ minIdle: 10
+ # 最大连接池数量
+ maxActive: 20
+ # 配置获取连接等待超时的时间
+ maxWait: 60000
+ # 配置连接超时时间
+ connectTimeout: 30000
+ # 配置网络超时时间
+ socketTimeout: 60000
+ # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+ timeBetweenEvictionRunsMillis: 60000
+ # 配置一个连接在池中最小生存的时间，单位是毫秒
+ minEvictableIdleTimeMillis: 300000
+ # 配置一个连接在池中最大生存的时间，单位是毫秒
+ maxEvictableIdleTimeMillis: 900000
+ # 配置检测连接是否有效
+ validationQuery: SELECT 1 FROM DUAL
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ webStatFilter:
+ enabled: true
+ statViewServlet:
+ enabled: true
+ # 设置白名单，不填则允许所有访问
+ allow:
+ url-pattern: /druid/*
+ # 控制台管理用户名和密码
+ login-username: xzzn
+ login-password: 123456
+ filter:
+ stat:
+ enabled: true
+ # 慢SQL记录
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
+
+# token配置
+token:
+ # 令牌自定义标识
+ header: Authorization
+ # 令牌密钥
+ secret: abcdefghijklmnopqrstuvwxyz
+ # 令牌有效期（默认30分钟）
+ expireTime: 30
+
+# MyBatis配置
+mybatis:
+ # 搜索指定包别名
+ typeAliasesPackage: com.xzzn.**.domain
+ # 配置mapper的扫描，找到所有的mapper.xml映射文件
+ mapperLocations: classpath*:mapper/**/*Mapper.xml
+ # 加载全局的配置文件
+ configLocation: classpath:mybatis/mybatis-config.xml
+
+# PageHelper分页插件
+pagehelper:
+ helperDialect: mysql
+ supportMethodsArguments: true
+ params: count=countSql
+
+# Swagger配置
+swagger:
+ # 是否开启swagger
+ enabled: true
+ # 请求前缀
+ pathMapping: /dev-api
+
+# 防止XSS攻击
+xss:
+ # 过滤开关
+ enabled: true
+ # 排除链接（多个用逗号分隔）
+ excludes: /system/notice
+ # 匹配链接
+ urlPatterns: /system/*,/monitor/*,/tool/*
+
+mqtt:
+ broker.url: tcp://121.5.164.6:1883
+ client.id: ems-cloud
+ username: dmbroker
+ password: qwer1234
+ connection-timeout: 15
+ keep-alive-interval: 30
+ automatic-reconnect: true
+ topic: 021_DDS_01_UP
+ siteId: 021_DDS_01
+
+modbus:
+ pool:
+ max-total: 20
+ max-idle: 10
+ min-idle: 3
+ poll:
+ interval: "0 */5 * * * *" # 5分钟间隔
+ timeout: 30000 # 30秒超时
diff --git a/ems-admin/src/main/resources/application-prod.yml b/ems-admin/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..fee9ed4
--- /dev/null
+++ b/ems-admin/src/main/resources/application-prod.yml
@@ -0,0 +1,207 @@
+# 项目相关配置
+xzzn:
+ # 名称
+ name: EMS
+ # 版本
+ version: 0.0.1
+ # 版权年份
+ copyrightYear: 2025
+ # 文件路径 示例（ Windows配置D:/xzzn/uploadPath，Linux配置 /home/xzzn/uploadPath）
+ profile: /home/xzzn/uploadPath
+ # 获取ip地址开关
+ addressEnabled: false
+ # 验证码类型 math 数字计算 char 字符验证
+ captchaType: math
+
+# 开发环境配置
+server:
+ # 服务器的HTTP端口，默认为8080
+ port: 8089
+ servlet:
+ # 应用的访问路径
+ context-path: /
+ tomcat:
+ # tomcat的URI编码
+ uri-encoding: UTF-8
+ # 连接数满后的排队数，默认为100
+ accept-count: 1000
+ threads:
+ # tomcat最大线程数，默认为200
+ max: 800
+ # Tomcat启动初始化的线程数，默认值10
+ min-spare: 100
+
+# 日志配置
+logging:
+ level:
+ com.xzzn: info
+ org.springframework: warn
+
+# 用户配置
+user:
+ password:
+ # 密码最大错误次数
+ maxRetryCount: 5
+ # 密码锁定时间（默认10分钟）
+ lockTime: 10
+
+# Spring配置
+spring:
+ # 资源信息
+ messages:
+ # 国际化资源文件路径
+ basename: i18n/messages
+ # 文件上传
+ servlet:
+ multipart:
+ # 单个文件大小
+ max-file-size: 10MB
+ # 设置总上传的文件大小
+ max-request-size: 20MB
+ # 服务模块
+ devtools:
+ restart:
+ # 热部署开关
+ enabled: true
+ # redis 配置
+ redis:
+ # 地址
+ host: 172.17.0.9
+ # 端口，默认为6379
+ port: 6379
+ # 数据库索引
+ database: 0
+ # 密码
+ password: 12345678
+ # 连接超时时间
+ timeout: 10s
+ lettuce:
+ pool:
+ # 连接池中的最小空闲连接
+ min-idle: 0
+ # 连接池中的最大空闲连接
+ max-idle: 8
+ # 连接池的最大数据库连接数
+ max-active: 8
+ # #连接池最大阻塞等待时间（使用负值表示没有限制）
+ max-wait: -1ms
+ # 数据源配置
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+ druid:
+ # 主库数据源
+ master:
+ url: jdbc:mysql://172.17.0.13:3306/setri_ems?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: ems
+ password: Aa112211!
+ # 从库数据源
+ slave:
+ # 从数据源开关/默认关闭
+ enabled: false
+ url:
+ username:
+ password:
+ # 初始连接数
+ initialSize: 5
+ # 最小连接池数量
+ minIdle: 10
+ # 最大连接池数量
+ maxActive: 20
+ # 配置获取连接等待超时的时间
+ maxWait: 60000
+ # 配置连接超时时间
+ connectTimeout: 30000
+ # 配置网络超时时间
+ socketTimeout: 60000
+ # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+ timeBetweenEvictionRunsMillis: 60000
+ # 配置一个连接在池中最小生存的时间，单位是毫秒
+ minEvictableIdleTimeMillis: 300000
+ # 配置一个连接在池中最大生存的时间，单位是毫秒
+ maxEvictableIdleTimeMillis: 900000
+ # 配置检测连接是否有效
+ validationQuery: SELECT 1 FROM DUAL
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ webStatFilter:
+ enabled: true
+ statViewServlet:
+ enabled: true
+ # 设置白名单，不填则允许所有访问
+ allow:
+ url-pattern: /druid/*
+ # 控制台管理用户名和密码
+ login-username: xzzn
+ login-password: 123456
+ filter:
+ stat:
+ enabled: true
+ # 慢SQL记录
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
+
+# token配置
+token:
+ # 令牌自定义标识
+ header: Authorization
+ # 令牌密钥
+ secret: abcdefghijklmnopqrstuvwxyz
+ # 令牌有效期（默认30分钟）
+ expireTime: 30
+
+# MyBatis配置
+mybatis:
+ # 搜索指定包别名
+ typeAliasesPackage: com.xzzn.**.domain
+ # 配置mapper的扫描，找到所有的mapper.xml映射文件
+ mapperLocations: classpath*:mapper/**/*Mapper.xml
+ # 加载全局的配置文件
+ configLocation: classpath:mybatis/mybatis-config.xml
+
+# PageHelper分页插件
+pagehelper:
+ helperDialect: mysql
+ supportMethodsArguments: true
+ params: count=countSql
+
+# Swagger配置
+swagger:
+ # 是否开启swagger
+ enabled: true
+ # 请求前缀
+ pathMapping: /dev-api
+
+# 防止XSS攻击
+xss:
+ # 过滤开关
+ enabled: true
+ # 排除链接（多个用逗号分隔）
+ excludes: /system/notice
+ # 匹配链接
+ urlPatterns: /system/*,/monitor/*,/tool/*
+
+mqtt:
+ broker.url: tcp://121.5.164.6:1883
+ client.id: ems-cloud
+ username: dmbroker
+ password: qwer1234
+ connection-timeout: 15
+ keep-alive-interval: 30
+ automatic-reconnect: true
+ topic:
+ siteId:
+
+modbus:
+ pool:
+ max-total: 20
+ max-idle: 10
+ min-idle: 3
+ poll:
+ interval: "0 */5 * * * *" # 5分钟间隔
+ timeout: 30000 # 30秒超时
diff --git a/ems-admin/src/main/resources/application.yml b/ems-admin/src/main/resources/application.yml
index 58d7acb..cf6c040 100644
--- a/ems-admin/src/main/resources/application.yml
+++ b/ems-admin/src/main/resources/application.yml
@@ -34,7 +34,7 @@ server:
# 日志配置
logging:
level:
- com.xzzn: debug
+ com.xzzn: info
org.springframework: warn
# 用户配置
@@ -87,6 +87,66 @@ spring:
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
+ # 数据源配置
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+ druid:
+ # 主库数据源
+ master:
+ url: jdbc:mysql://122.51.194.184:13306/setri_ems?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: ems
+ password: 12345678
+ # 从库数据源
+ slave:
+ # 从数据源开关/默认关闭
+ enabled: false
+ url:
+ username:
+ password:
+ # 初始连接数
+ initialSize: 5
+ # 最小连接池数量
+ minIdle: 10
+ # 最大连接池数量
+ maxActive: 20
+ # 配置获取连接等待超时的时间
+ maxWait: 60000
+ # 配置连接超时时间
+ connectTimeout: 30000
+ # 配置网络超时时间
+ socketTimeout: 60000
+ # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+ timeBetweenEvictionRunsMillis: 60000
+ # 配置一个连接在池中最小生存的时间，单位是毫秒
+ minEvictableIdleTimeMillis: 300000
+ # 配置一个连接在池中最大生存的时间，单位是毫秒
+ maxEvictableIdleTimeMillis: 900000
+ # 配置检测连接是否有效
+ validationQuery: SELECT 1 FROM DUAL
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ webStatFilter:
+ enabled: true
+ statViewServlet:
+ enabled: true
+ # 设置白名单，不填则允许所有访问
+ allow:
+ url-pattern: /druid/*
+ # 控制台管理用户名和密码
+ login-username: xzzn
+ login-password: 123456
+ filter:
+ stat:
+ enabled: true
+ # 慢SQL记录
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
# token配置
token:
@@ -127,3 +187,23 @@ xss:
excludes: /system/notice
# 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/*
+
+mqtt:
+ broker.url: tcp://122.51.194.184:1883
+ client.id: ems-cloud
+ username: dmbroker
+ password: qwer1234
+ connection-timeout: 15
+ keep-alive-interval: 30
+ automatic-reconnect: true
+ topic:
+ siteId:
+
+modbus:
+ pool:
+ max-total: 20
+ max-idle: 10
+ min-idle: 3
+ poll:
+ interval: "0 */5 * * * *" # 5分钟间隔
+ timeout: 30000 # 30秒超时
diff --git a/ems-common/pom.xml b/ems-common/pom.xml
index 393c33e..c28364f 100644
--- a/ems-common/pom.xml
+++ b/ems-common/pom.xml
@@ -119,6 +119,12 @@
javax.servlet-api
+
+
+ com.infiniteautomation
+ modbus4j
+
+
-
\ No newline at end of file
+
diff --git a/ems-common/src/main/java/com/xzzn/common/annotation/SyncAfterInsert.java b/ems-common/src/main/java/com/xzzn/common/annotation/SyncAfterInsert.java
new file mode 100644
index 0000000..49b6d85
--- /dev/null
+++ b/ems-common/src/main/java/com/xzzn/common/annotation/SyncAfterInsert.java
@@ -0,0 +1,11 @@
+package com.xzzn.common.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 标记：调用insert后需要同步数据到其他服务器
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SyncAfterInsert {
+}
\ No newline at end of file
diff --git a/ems-common/src/main/java/com/xzzn/common/config/RuoYiConfig.java b/ems-common/src/main/java/com/xzzn/common/config/RuoYiConfig.java
index 39db47a..d56e411 100644
--- a/ems-common/src/main/java/com/xzzn/common/config/RuoYiConfig.java
+++ b/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";
+ }
}
diff --git a/ems-common/src/main/java/com/xzzn/common/constant/Constants.java b/ems-common/src/main/java/com/xzzn/common/constant/Constants.java
index c594319..9757912 100644
--- a/ems-common/src/main/java/com/xzzn/common/constant/Constants.java
+++ b/ems-common/src/main/java/com/xzzn/common/constant/Constants.java
@@ -170,4 +170,9 @@ public class Constants
*/
public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
"org.springframework", "org.apache", "com.xzzn.common.utils.file", "com.xzzn.common.config", "com.xzzn.generator" };
+
+ /**
+ * 昨日充放电最晚数据有效期
+ */
+ public static final Integer DATE_VALID_TIME = 1;
}
diff --git a/ems-common/src/main/java/com/xzzn/common/constant/RedisKeyConstants.java b/ems-common/src/main/java/com/xzzn/common/constant/RedisKeyConstants.java
new file mode 100644
index 0000000..82c0a75
--- /dev/null
+++ b/ems-common/src/main/java/com/xzzn/common/constant/RedisKeyConstants.java
@@ -0,0 +1,125 @@
+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 XF = "XF_";
+
+ /**
+ * 电池组 redis key
+ */
+ public static final String GROUP = "GROUP_";
+
+ /**
+ * BMSD原始数据 redis key
+ */
+ public static final String ORIGINAL_BMSD = "BMSD_";
+
+ /**
+ * 冷却数据 redis key
+ */
+ public static final String COOLING = "COOLING_";
+
+ /**
+ * EMS数据 redis key
+ */
+ public static final String EMS = "EMS_";
+
+ /**
+ * 点位匹配数据 redis key
+ */
+ public static final String POINT_MATCH = "POINT_MATCH_";
+
+ /**
+ * 点位枚举匹配数据 redis key
+ */
+ public static final String POINT_ENUM_MATCH = "POINT_ENUM_MATCH_";
+
+ /**
+ * topic对应站点ID redis key
+ */
+ public static final String SITE_ID = "SITE_ID_";
+
+ /**
+ * 存放单个设备同步过来的原始数据-最晚一次数据
+ */
+ public static final String ORIGINAL_MQTT_DATA = "MQTT_";
+
+ /**
+ * 存放单个设备同步过来的告警点位原始数据-最晚一次数据
+ */
+ public static final String ORIGINAL_MQTT_DATA_ALARM = "MQTT_ALARM_";
+
+ /** 存放订阅失败告警信息 */
+ public static final String TOPIC_FAILED_ALRAM_RECORD = "topic_failed_";
+ /** topic 内没有数据设备维度告警 */
+ public static final String TOPIC_EMPTY_ALARM_RECORD = "topic_empty_";
+ /** modbus读取 没有数据设备维度告警 */
+ public static final String MODBUS_EMPTY_ALARM_RECORD = "modbus_empty_";
+ /** modbus读取 设备离线告警 */
+ public static final String MODBUS_OFFLINE_ALARM_RECORD = "modbus_offline_";
+
+ /** 设备信息初始化 */
+ public static final String INIT_DEVICE_INFO = "init_device_info";
+ /** 告警匹配信息 */
+ public static final String ALARM_MATCH_INFO = "alarm_message_info";
+
+ /** 现有的告警数据 */
+ public static final String LATEST_ALARM_RECORD = "LATEST_ALARM_RECORD";
+
+ /** 预存电价时间配置 */
+ public static final String ENERGY_PRICE_TIME = "energy_price_time_";
+
+ /** dds昨日累计总收益 */
+ public static final String DDS_TOTAL_REVENUE = "total_revenue_";
+ /** fx实时总收益和当日实时收益 */
+ public static final String FXX_REALTIME_REVENUE = "realtime_revenue_";
+
+ /** 每个设备最新数据-设置失效时间-判断是否正常同步数据 */
+ public static final String SYNC_DATA= "SYNC_DATA_";
+
+ /** 每个设备最新数据-设置失效时间-判断是否正常同步数据 */
+ public static final String SYNC_DATA_ALARM = "SYNC_DATA_ALARM_";
+}
diff --git a/ems-common/src/main/java/com/xzzn/common/core/controller/BaseController.java b/ems-common/src/main/java/com/xzzn/common/core/controller/BaseController.java
index c3f46a6..6d1fb1b 100644
--- a/ems-common/src/main/java/com/xzzn/common/core/controller/BaseController.java
+++ b/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,76 @@ public class BaseController
{
return getLoginUser().getUsername();
}
+
+ /**
+ * 手动处理分页
+ */
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ protected TableDataInfo getDataTable2(List list)
+ {
+ // 1. 处理原列表为null的情况，避免空指针
+ List targetList = (list == null) ? Collections.emptyList() : list;
+ List subList;
+
+ // 2. 获取分页参数
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ int pageNum = pageDomain.getPageNum();
+ int pageSize = pageDomain.getPageSize();
+
+ // 3. 判断分页参数是否有效（pageNum和pageSize均为正数时才分页）
+ if (pageNum > 0 && pageSize > 0) {
+ // 计算起始索引（确保不小于0）
+ int startIndex = Math.max((pageNum - 1) * pageSize, 0);
+
+ // 关键修复：若起始索引已超出列表大小，直接返回空列表
+ if (startIndex >= targetList.size()) {
+ subList = Collections.emptyList();
+ } else {
+ // 计算结束索引（不超过列表大小，且不小于起始索引）
+ int endIndex = Math.min(startIndex + pageSize, targetList.size());
+ endIndex = Math.max(endIndex, startIndex); // 防止endIndex < startIndex
+
+ // 截取子列表（转换为新ArrayList，避免视图依赖）
+ subList = new ArrayList<>(targetList.subList(startIndex, endIndex));
+ }
+ } else {
+ // 分页参数无效时，返回全部数据
+ subList = new ArrayList<>(targetList);
+ }
+
+ // 4. 封装返回结果
+ TableDataInfo rspData = new TableDataInfo();
+ rspData.setCode(HttpStatus.SUCCESS);
+ rspData.setMsg("查询成功");
+ rspData.setRows(subList);
+ rspData.setTotal(targetList.size());
+ return rspData;
+ }
+
+ /**
+ * 通用分页工具方法
+ */
+ protected List paginateList(List sourceList) {
+ if (sourceList == null || sourceList.isEmpty()) {
+ return new ArrayList<>();
+ }
+ // 分页梳理
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ int pageNum = pageDomain.getPageNum();
+ int pageSize = pageDomain.getPageSize();
+ int startIndex = 0;
+ int endIndex = sourceList.size();
+ if (pageNum > 0 && pageSize > 0) {
+ // 计算起始索引（处理页码小于1的情况）
+ startIndex = Math.max((pageNum - 1) * pageSize, 0);
+ // 计算结束索引（处理超出列表长度的情况）
+ endIndex = Math.min(startIndex + pageSize, sourceList.size());
+ }
+ // 防止越界
+ if (startIndex >= sourceList.size()) {
+ return Collections.emptyList();
+ }
+ // 截取分页数据
+ return sourceList.subList(startIndex, endIndex);
+ }
}
diff --git a/ems-common/src/main/java/com/xzzn/common/core/domain/entity/SysUser.java b/ems-common/src/main/java/com/xzzn/common/core/domain/entity/SysUser.java
index ad21f2a..02e87a6 100644
--- a/ems-common/src/main/java/com/xzzn/common/core/domain/entity/SysUser.java
+++ b/ems-common/src/main/java/com/xzzn/common/core/domain/entity/SysUser.java
@@ -92,6 +92,8 @@ public class SysUser extends BaseEntity
/** 角色ID */
private Long roleId;
+ private String belongSite;
+
public SysUser()
{
@@ -310,6 +312,14 @@ public class SysUser extends BaseEntity
this.roleId = roleId;
}
+ public String getBelongSite() {
+ return belongSite;
+ }
+
+ public void setBelongSite(String belongSite) {
+ this.belongSite = belongSite;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -332,7 +342,7 @@ public class SysUser extends BaseEntity
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
- .append("dept", getDept())
+ .append("belongSite", getBelongSite())
.toString();
}
}
diff --git a/ems-common/src/main/java/com/xzzn/common/core/modbus/Modbus4jConnectionManager.java b/ems-common/src/main/java/com/xzzn/common/core/modbus/Modbus4jConnectionManager.java
new file mode 100644
index 0000000..ec5f7a4
--- /dev/null
+++ b/ems-common/src/main/java/com/xzzn/common/core/modbus/Modbus4jConnectionManager.java
@@ -0,0 +1,111 @@
+package com.xzzn.common.core.modbus;
+
+import com.serotonin.modbus4j.ModbusFactory;
+import com.serotonin.modbus4j.ModbusMaster;
+import com.serotonin.modbus4j.ip.IpParameters;
+import com.xzzn.common.core.modbus.domain.DeviceConfig;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Modbus连接管理器
+ * 使用长连接模式，维护连接缓存，复用已有连接
+ */
+@Component
+public class Modbus4jConnectionManager {
+ private static final Logger logger = LoggerFactory.getLogger(Modbus4jConnectionManager.class);
+
+ private final ModbusFactory modbusFactory = new ModbusFactory();
+
+ private final Map connectionCache = new ConcurrentHashMap<>();
+
+ /**
+ * 获取或创建连接（长连接模式）
+ */
+ public ModbusMaster borrowMaster(DeviceConfig config) throws Exception {
+ String key = buildConnectionKey(config);
+ ModbusMaster master = connectionCache.get(key);
+
+ if (master == null) {
+ synchronized (this) {
+ master = connectionCache.get(key);
+ if (master == null) {
+ master = createNewConnection(config);
+ connectionCache.put(key, master);
+ logger.info("创建新Modbus长连接: {}:{}", config.getHost(), config.getPort());
+ }
+ }
+ }
+
+
+ return master;
+ }
+
+ /**
+ * 归还连接（长连接模式，不关闭）
+ */
+ public void returnMaster(DeviceConfig config, ModbusMaster master) {
+ }
+
+ /**
+ * 废弃连接（发生异常时关闭并移除）
+ */
+ public void invalidateMaster(DeviceConfig config, ModbusMaster master) {
+ String key = buildConnectionKey(config);
+ connectionCache.remove(key);
+ destroyMaster(master, config);
+ logger.warn("废弃并移除Modbus连接: {}:{}", config.getHost(), config.getPort());
+ }
+
+ private ModbusMaster createNewConnection(DeviceConfig config) throws Exception {
+ IpParameters params = new IpParameters();
+ params.setHost(config.getHost());
+ params.setPort(config.getPort());
+ params.setEncapsulated(false);
+
+ ModbusMaster master = modbusFactory.createTcpMaster(params, true);
+ master.init();
+
+ return master;
+ }
+
+ private void destroyMaster(ModbusMaster master, DeviceConfig config) {
+ if (master != null) {
+ try {
+ master.destroy();
+ logger.debug("已关闭Modbus连接: {}:{}", config.getHost(), config.getPort());
+ } catch (Exception e) {
+ logger.warn("关闭Modbus连接异常: {}:{}", config.getHost(), config.getPort(), e);
+ }
+ }
+ }
+
+ private String buildConnectionKey(DeviceConfig config) {
+ return config.getHost() + ":" + config.getPort();
+ }
+
+ /**
+ * 关闭所有连接
+ */
+ public void closeAllConnections() {
+ for (Map.Entry entry : connectionCache.entrySet()) {
+ try {
+ if (entry.getValue() != null) {
+ entry.getValue().destroy();
+ }
+ } catch (Exception e) {
+ logger.warn("关闭Modbus连接异常: {}", entry.getKey(), e);
+ }
+ }
+ connectionCache.clear();
+ logger.info("已关闭所有Modbus连接");
+ }
+
+}
diff --git a/ems-common/src/main/java/com/xzzn/common/core/modbus/ModbusProcessor.java b/ems-common/src/main/java/com/xzzn/common/core/modbus/ModbusProcessor.java
new file mode 100644
index 0000000..1ea73d9
--- /dev/null
+++ b/ems-common/src/main/java/com/xzzn/common/core/modbus/ModbusProcessor.java
@@ -0,0 +1,486 @@
+package com.xzzn.common.core.modbus;
+
+import com.alibaba.fastjson2.JSON;
+import com.serotonin.modbus4j.BatchRead;
+import com.serotonin.modbus4j.BatchResults;
+import com.serotonin.modbus4j.ModbusMaster;
+import com.serotonin.modbus4j.code.DataType;
+import com.serotonin.modbus4j.exception.ErrorResponseException;
+import com.serotonin.modbus4j.exception.ModbusTransportException;
+import com.serotonin.modbus4j.locator.BaseLocator;
+import com.serotonin.modbus4j.msg.WriteCoilRequest;
+import com.serotonin.modbus4j.msg.WriteCoilResponse;
+import com.serotonin.modbus4j.msg.WriteCoilsRequest;
+import com.serotonin.modbus4j.msg.WriteCoilsResponse;
+import com.serotonin.modbus4j.msg.WriteRegisterRequest;
+import com.serotonin.modbus4j.msg.WriteRegisterResponse;
+import com.serotonin.modbus4j.msg.WriteRegistersRequest;
+import com.serotonin.modbus4j.msg.WriteRegistersResponse;
+import com.xzzn.common.core.modbus.domain.DeviceConfig;
+import com.xzzn.common.core.modbus.domain.TagConfig;
+import com.xzzn.common.core.modbus.domain.WriteTagConfig;
+import com.xzzn.common.core.redis.RedisCache;
+import com.xzzn.common.enums.ModBusType;
+import com.xzzn.common.enums.RegisterType;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import static com.xzzn.common.enums.RegisterType.COIL;
+import static com.xzzn.common.enums.RegisterType.DISCRETE_INPUT;
+
+@Service
+public class ModbusProcessor {
+
+ private static final Logger logger = LoggerFactory.getLogger(ModbusProcessor.class);
+ @Value("${modbus.read-timeout:8000}")
+ private int readTimeout;
+ @Value("${modbus.write-timeout:5000}")
+ private int writeTimeout;
+ @Value("${modbus.read-retries:1}")
+ private int readRetries;
+ @Value("${modbus.write-retries:1}")
+ private int writeRetries;
+
+ @Autowired
+ private RedisCache redisCache;
+ @Autowired
+ private Modbus4jConnectionManager connectionManager;
+
+ public boolean writeDataToDevice(DeviceConfig config) {
+ logger.info("writeDataToDevice: {}", JSON.toJSONString(config));
+ ModbusMaster master = null;
+ boolean result = false;
+ boolean hasError = false;
+ try {
+ master = connectionManager.borrowMaster(config);
+ master.setTimeout(writeTimeout);
+ master.setRetries(0);
+ result = writeTagValue(master, config, config.getWriteTags());
+ } catch (Exception e) {
+ logger.error("Failed to borrow connection or write to devices '{}'", config.getDeviceName(), e);
+ hasError = true;
+ }
+ finally {
+ if (master != null) {
+ if (hasError) {
+ // 发生异常时废弃连接，下次重新创建
+ connectionManager.invalidateMaster(config, master);
+ } else {
+ // 正常时归还连接
+ connectionManager.returnMaster(config, master);
+ }
+ }
+ }
+ return result;
+ }
+
+ public boolean writeDataToDeviceWithRetry(DeviceConfig config) {
+ logger.info("writeDataToDevice: {}", JSON.toJSONString(config));
+ ModbusMaster master = null;
+ boolean result;
+
+ try {
+ master = connectionManager.borrowMaster(config);
+ master.setTimeout(writeTimeout); // 设置超时时间
+ master.setRetries(0);
+
+ // 使用重试装饰器
+ ModbusMaster finalMaster = master;
+ result = RetryableModbusOperation.executeWithRetry(() -> {
+ return writeTagValue(finalMaster, config, config.getWriteTags());
+ }, writeRetries); // 最大重试次数由配置控制
+
+ } catch (Exception e) {
+ logger.error("Failed to borrow connection or write to devices '{}'", config.getDeviceName(), e);
+ result = false;
+ } finally {
+ if (master != null) {
+ connectionManager.returnMaster(config, master);
+ }
+ }
+ return result;
+ }
+
+ public boolean writeTagValue(ModbusMaster master, DeviceConfig config, List tags) {
+ tags.forEach(tag -> {
+ Map type = ModBusType.REGISTER_TYPE;
+ int firstDigit = Integer.parseInt(tag.getAddress().substring(0, 1));
+ int address = convertAddress(tag.getAddress());
+ RegisterType registerType = type.get(firstDigit);
+ logger.info("Register type: {}, address: {}, firstDigit: {}", registerType, tag.getAddress(), firstDigit);
+ switch (registerType) {
+ case COIL: {
+ boolean result = writeCoilRequest(master, config.getSlaveId(), address, Boolean.parseBoolean(String.valueOf(tag.getValue())));
+ tag.setWrite(result);
+ break;
+ }
+ case HOLDING_REGISTER: {
+ Number value = Double.parseDouble(String.valueOf(tag.getValue()));
+ double doubleValue = value.doubleValue();
+ // 检查是否在16位有符号整数范围内
+ if (doubleValue < -32768 || doubleValue > 32767) {
+ logger.warn("Value {} out of range for 16-bit signed register at address {}", doubleValue, address);
+ }
+ boolean result = writeRegisterRequest(master, config.getSlaveId(), address, (int) doubleValue);
+ tag.setWrite(result);
+ break;
+ }
+ default:
+ logger.error("Unsupported register type: {}", registerType);
+ break;
+ }
+ });
+
+ List collect = tags.stream().filter(tag -> !Objects.equals(tag.isWrite(), true)).collect(Collectors.toList());
+ if (!collect.isEmpty()) {
+ return false;
+ }
+ return true;
+ }
+
+ public static boolean writeCoilRequest(ModbusMaster master, int slaveId, int address, boolean value) {
+ try {
+ WriteCoilRequest request = new WriteCoilRequest(slaveId, address, value);
+ WriteCoilResponse response = (WriteCoilResponse)master.send(request);
+ if (response.isException()) {
+ logger.info("Write coil failed: " + response.getExceptionMessage());
+ } else {
+ logger.info("Write coil successful");
+ return true;
+ }
+ } catch (Exception e) {
+ logger.error("Failed to write coil value '{}' to address '{}'", value, address, e);
+ }
+ return false;
+ }
+
+ public static void writeCoilsRequest(ModbusMaster master, int slaveId, int address, boolean[] values) {
+ try {
+ WriteCoilsRequest request = new WriteCoilsRequest(slaveId, address, values);
+ WriteCoilsResponse response = (WriteCoilsResponse)master.send(request);
+ if (response.isException()) {
+ logger.info("Write coils failed: " + response.getExceptionMessage());
+ } else {
+ logger.info("Write coils successful");
+ }
+ } catch (Exception e) {
+ logger.error("Failed to write coils value '{}' to address '{}'", values, address, e);
+ }
+ }
+
+ public static boolean writeRegisterRequest(ModbusMaster master, int slaveId, int address, int value) {
+ try {
+ WriteRegisterRequest request = new WriteRegisterRequest(slaveId, address, value);
+ WriteRegisterResponse response = (WriteRegisterResponse)master.send(request);
+ if (response.isException()) {
+ logger.info("Write register failed: " + response.getExceptionMessage());
+ } else {
+ logger.info("Write register successful");
+ return true;
+ }
+ } catch (Exception e) {
+ logger.error("Failed to write register value '{}' to address '{}'", value, address, e);
+ }
+ return false;
+ }
+
+ public static void writeRegistersRequest(ModbusMaster master, int slaveId, int address, short[] values) {
+ try {
+ WriteRegistersRequest request = new WriteRegistersRequest(slaveId, address, values);
+ WriteRegistersResponse response = (WriteRegistersResponse)master.send(request);
+ if (response.isException()) {
+ logger.info("Write registers failed: " + response.getExceptionMessage());
+ } else {
+ logger.info("Write registers successful");
+ }
+ } catch (Exception e) {
+ logger.error("Failed to write registers value '{}' to address '{}'", values, address, e);
+ }
+ }
+
+ public static void setCoilValue(ModbusMaster master, int slaveId, int address, int value) {
+ // 写入单个线圈(从站ID, 地址, 布尔值)
+ BaseLocator coilLocator = BaseLocator.coilStatus(slaveId, address);
+ try {
+ // 写入布尔值到线圈
+ master.setValue(coilLocator, value);
+ logger.info("set coil successful");
+ } catch (ModbusTransportException | ErrorResponseException e) {
+ logger.error("Failed to set coil value '{}' to address '{}'", value, address, e);
+ }
+ }
+
+ public static void setRegisterValue(ModbusMaster master, int slaveId, int address, int value) {
+ // 写入单个保持寄存器(从站, 地址, 16位整数)
+ BaseLocator holdingLocator = BaseLocator.holdingRegister(slaveId, address, DataType.TWO_BYTE_INT_SIGNED);
+ try {
+ // 写入整数值到保持寄存器
+ master.setValue(holdingLocator, value);
+ logger.info("set register successful");
+ } catch (ModbusTransportException | ErrorResponseException e) {
+ logger.error("Failed to set register value '{}' to address '{}'", value, address, e);
+ }
+ }
+
+ public ModbusMaster borrowMaster(DeviceConfig config) throws Exception {
+ ModbusMaster master = connectionManager.borrowMaster(config);
+ // 设置了Modbus通信的超时时间为5000毫秒（5秒）。当主设备与从设备通信时，若在5秒内未收到响应，则认为通信超时并抛出异常。这有助于避免长时间等待无响应的设备。
+ master.setTimeout(readTimeout);
+ master.setRetries(readRetries);
+ return master;
+ }
+
+ public Map readDataFromDevice(DeviceConfig config, ModbusMaster master) {
+ Map deviceData = new HashMap<>();
+ boolean hasError = false;
+ try {
+ BatchResults results = readTagValues(master, config.getSlaveId(), config.getTags());
+ for (TagConfig tag : config.getTags()) {
+ if (Objects.equals(tag.getDataType(), "FOUR_BYTE_FLOAT_DBCA")){
+ Object value = results.getValue(tag.getKey());
+ value = convertValueToFloat(value);
+ deviceData.put(tag.getKey(), value);
+ }else {
+ deviceData.put(tag.getKey(), results.getValue(tag.getKey()));
+ }
+ }
+ } catch (Exception e) {
+ logger.error("Failed read from devices '{}'", config.getDeviceName(), e);
+ hasError = true;
+ }
+ finally {
+ if (master != null) {
+ if (hasError) {
+ // 发生异常时废弃连接，下次重新创建
+ connectionManager.invalidateMaster(config, master);
+ } else {
+ // 正常时归还连接
+ connectionManager.returnMaster(config, master);
+ }
+ }
+ }
+ return deviceData;
+ }
+
+ private Object readTagValue(ModbusMaster master, int slaveId, TagConfig tag) throws Exception {
+ Object value;
+ Map type = ModBusType.REGISTER_TYPE;
+ Map DATA_LENGTH = ModBusType.LENGTH;
+ int firstDigit = Integer.parseInt(tag.getAddress().substring(0, 1));
+ int address = 0;
+ int addressLength = tag.getAddress().length();
+ int exp = (int) Math.pow(10, addressLength-1);
+ if (firstDigit != 0){
+ int digit = Integer.parseInt(tag.getAddress());
+ address = digit % (exp);
+ }else {
+ address = Integer.parseInt(tag.getAddress());
+ }
+ RegisterType registerType = type.get(firstDigit);
+ int dataLength = DATA_LENGTH.get(tag.getDataType());
+ // 增加配置校验和警告
+ if ((Objects.equals(registerType, COIL) || Objects.equals(registerType, DISCRETE_INPUT))) {
+ logger.warn("Configuration warning for tag '{}': ModBusType is {} but DataType is {}. DataType should be BOOLEAN. Proceeding with BOOLEAN read.",
+ tag.getKey(), registerType, tag.getDataType());
+ }
+ try {
+ switch (registerType) {
+ case COIL: {
+
+ BaseLocator loc = BaseLocator.coilStatus(slaveId, address);
+ value = master.getValue(loc);
+ logger.info("读取线圈{}成功: {}",tag.getAddress(), value);
+ break;
+ }
+ case DISCRETE_INPUT: {
+ BaseLocator loc = BaseLocator.inputStatus(slaveId, address);
+ value = master.getValue(loc);
+ logger.info("读取输入{}成功: {}",tag.getAddress(), value);
+ break;
+ }
+ case HOLDING_REGISTER: {
+ if (dataLength == 28){
+ BaseLocator locator = BaseLocator.holdingRegister(slaveId, address, 4);
+ value = master.getValue(locator);
+ //将 value 转换为二进制数据
+ value = convertValueToFloat(value);
+ }else{
+ BaseLocator locator = BaseLocator.holdingRegister(slaveId, address, dataLength);
+ value = master.getValue(locator);
+ }
+ logger.info("读取保持寄存器{}成功: {}",tag.getAddress(), value);
+ break;
+ }
+ case INPUT_REGISTER: {
+ BaseLocator locator = BaseLocator.inputRegister(slaveId, address, dataLength);
+ value= master.getValue(locator);
+ logger.info("读取输入寄存器{}成功: {}",tag.getAddress(), value);
+
+
+ break;
+ }
+ default:
+ logger.error("Unsupported register type: {}", registerType);
+ value = null;
+ break;
+ }
+ }catch (Exception e){
+ logger.error("Failed to read tag '{}'", tag.getKey(), e);
+ value = null;
+ }
+ return value;
+ }
+
+
+ private BatchResults readTagValues(ModbusMaster master, int slaveId, List tags) throws Exception {
+ try {
+ BatchResults results = sendBatchRead(master, slaveId, tags);
+ logBatchResults(tags, results);
+ return results;
+ } catch (Exception e){
+ if (isTimeoutException(e)) {
+ logger.warn("批量读取超时，尝试降级为单点读取，slaveId: {}", slaveId);
+ BatchResults fallback = new BatchResults<>();
+ for (TagConfig tag : tags) {
+ Object value = readTagValue(master, slaveId, tag);
+ fallback.addResult(tag.getKey(), value);
+ }
+ logBatchResults(tags, fallback);
+ return fallback;
+ }
+ logger.error("Failed to read master '{}'", slaveId, e);
+ throw new Exception(e);
+ }
+ }
+
+ private BatchResults sendBatchRead(ModbusMaster master, int slaveId, List tags) throws Exception {
+ BatchRead batch = new BatchRead<>();
+ tags.forEach(tag -> {
+ Map type = ModBusType.REGISTER_TYPE;
+ Map DATA_LENGTH = ModBusType.LENGTH;
+ int firstDigit = Integer.parseInt(tag.getAddress().substring(0, 1));
+ int address = 0;
+ int addressLength = tag.getAddress().length();
+ int exp = (int) Math.pow(10, addressLength - 1);
+ if (firstDigit != 0) {
+ int digit = Integer.parseInt(tag.getAddress());
+ address = digit % (exp);
+ } else {
+ address = Integer.parseInt(tag.getAddress());
+ }
+ RegisterType registerType = type.get(firstDigit);
+ int dataLength = DATA_LENGTH.get(tag.getDataType());
+ switch (registerType) {
+ case COIL: {
+ BaseLocator loc = BaseLocator.coilStatus(slaveId, address);
+ batch.addLocator(tag.getKey(), loc);
+ break;
+ }
+ case DISCRETE_INPUT: {
+ BaseLocator loc = BaseLocator.inputStatus(slaveId, address);
+ batch.addLocator(tag.getKey(), loc);
+ break;
+ }
+ case HOLDING_REGISTER: {
+ if (dataLength == 28) {
+ BaseLocator locator = BaseLocator.holdingRegister(slaveId, address, 4);
+ batch.addLocator(tag.getKey(), locator);
+ } else {
+ BaseLocator loc = BaseLocator.holdingRegister(slaveId, address, dataLength);
+ batch.addLocator(tag.getKey(), loc);
+ }
+ break;
+ }
+ case INPUT_REGISTER: {
+ BaseLocator loc = BaseLocator.inputRegister(slaveId, address, dataLength);
+ batch.addLocator(tag.getKey(), loc);
+ break;
+ }
+ }
+ });
+
+ return master.send(batch);
+ }
+
+ private void logBatchResults(List tags, BatchResults results) {
+ List logInfoList = new ArrayList<>();
+ for (TagConfig tag : tags) {
+ StringBuilder logInfo = new StringBuilder();
+ logInfo.append(tag.getAddress());
+ if (tag.getBit() != null) {
+ logInfo.append("(").append(tag.getBit()).append("):");
+ } else {
+ logInfo.append(":");
+ }
+ logInfo.append(results.getValue(tag.getKey()));
+ logInfoList.add(logInfo.toString());
+ }
+ logger.info("批处理读取寄存器成功: {}", JSON.toJSONString(logInfoList));
+ }
+
+ private boolean isTimeoutException(Throwable e) {
+ Throwable current = e;
+ while (current != null) {
+ if (current instanceof com.serotonin.modbus4j.sero.messaging.TimeoutException) {
+ return true;
+ }
+ current = current.getCause();
+ }
+ return false;
+ }
+
+ public static float convertValueToFloat(Object value) {
+ if (!(value instanceof Number)) {
+ throw new IllegalArgumentException("Input must be a Number");
+ }
+
+ int intValue = ((Number) value).intValue();
+ String binaryData = Integer.toBinaryString(intValue);
+
+ // 补足32位二进制字符串
+ if (binaryData.length() < 32) {
+ binaryData = String.format("%32s", binaryData).replace(' ', '0');
+ }
+
+ // 分割为4个字节并重组为 dcba 格式
+ byte[] reorderedBytes = new byte[4];
+ for (int i = 0; i < 4; i++) {
+ int start = i * 8;
+ String byteStr = binaryData.substring(start, start + 8);
+ reorderedBytes[3 - i] = (byte) Integer.parseInt(byteStr, 2);
+ }
+
+ // 使用 ByteBuffer 提高可读性和安全性
+ return Float.intBitsToFloat(
+ java.nio.ByteBuffer.wrap(reorderedBytes).getInt()
+ );
+ }
+
+ /** 转换寄存器地址 */
+ public static int convertAddress(String address) {
+ if (StringUtils.isBlank(address)) {
+ return 0;
+ }
+ int firstDigit = Integer.parseInt(address.substring(0, 1));
+ int addressLength = address.length();
+ int exp = (int) Math.pow(10, addressLength-1);
+ if (firstDigit != 0){
+ int digit = Integer.parseInt(address);
+ return digit % (exp);
+ } else {
+ return Integer.parseInt(address);
+ }
+ }
+}
diff --git a/ems-common/src/main/java/com/xzzn/common/core/modbus/PooledModbusMasterFactory.java b/ems-common/src/main/java/com/xzzn/common/core/modbus/PooledModbusMasterFactory.java
new file mode 100644
index 0000000..9e77cd2
--- /dev/null
+++ b/ems-common/src/main/java/com/xzzn/common/core/modbus/PooledModbusMasterFactory.java
@@ -0,0 +1,58 @@
+package com.xzzn.common.core.modbus;
+
+
+import com.serotonin.modbus4j.ModbusFactory;
+import com.serotonin.modbus4j.ModbusMaster;
+import com.serotonin.modbus4j.ip.IpParameters;
+
+import org.apache.commons.pool2.BasePooledObjectFactory;
+import org.apache.commons.pool2.PooledObject;
+import org.apache.commons.pool2.impl.DefaultPooledObject;
+
+public class PooledModbusMasterFactory extends BasePooledObjectFactory {
+
+ private final String host;
+ private final int port;
+
+ public PooledModbusMasterFactory(String host, int port) {
+ this.host = host;
+ this.port = port;
+ }
+
+ @Override
+ public ModbusMaster create() throws Exception {
+ IpParameters params = new IpParameters();
+ params.setHost(this.host);
+ params.setPort(this.port);
+ params.setEncapsulated(false);
+
+ ModbusMaster master = new ModbusFactory().createTcpMaster(params, true);
+ master.init();
+ return master;
+ }
+
+ @Override
+ public PooledObject wrap(ModbusMaster master) {
+ return new DefaultPooledObject<>(master);
+ }
+
+ @Override
+ public void destroyObject(PooledObject p) throws Exception {
+ if (p.getObject() != null) {
+ p.getObject().destroy();
+ }
+ super.destroyObject(p);
+ }
+
+ @Override
+ public boolean validateObject(PooledObject p) {
+ // testConnectivity() 方法在 modbus4j 中不存在。
+ // 一个真正的验证需要执行一次读操作，但这需要 slaveId，而工厂是通用的，不知道 slaveId。
+ // 因此，我们使用一个较弱的验证，只检查 master 对象是否已初始化。
+ // 这无法检测到被远程设备断开的连接，错误将在实际读取操作中被捕获。
+ if (p.getObject() == null) {
+ return false;
+ }
+ return p.getObject().isInitialized();
+ }
+}
diff --git a/ems-common/src/main/java/com/xzzn/common/core/modbus/RetryableModbusOperation.java b/ems-common/src/main/java/com/xzzn/common/core/modbus/RetryableModbusOperation.java
new file mode 100644
index 0000000..b2732ee
--- /dev/null
+++ b/ems-common/src/main/java/com/xzzn/common/core/modbus/RetryableModbusOperation.java
@@ -0,0 +1,37 @@
+package com.xzzn.common.core.modbus;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Modbus重试
+ *
+ */
+public class RetryableModbusOperation {
+ private static final Logger logger = LoggerFactory.getLogger(RetryableModbusOperation.class);
+
+ public interface ModbusOperation {
+ T execute() throws Exception;
+ }
+
+ public static T executeWithRetry(ModbusOperation operation, int maxRetries) {
+ int retryCount = 0;
+ Exception lastException = null;
+
+ while (retryCount <= maxRetries) {
+ try {
+ return operation.execute();
+ } catch (Exception e) {
+ lastException = e;
+ retryCount++;
+ if (retryCount <= maxRetries) {
+ logger.info("Operation failed, retrying... (Attempt {})", retryCount);
+ }
+ }
+ }
+
+ logger.error("Max retries ({}) reached. Last error: {}", maxRetries,
+ lastException != null ? lastException.getMessage() : "Unknown");
+ throw new RuntimeException("Operation failed after " + maxRetries + " retries", lastException);
+ }
+}
diff --git a/ems-common/src/main/java/com/xzzn/common/core/modbus/config/ModbusProperties.java b/ems-common/src/main/java/com/xzzn/common/core/modbus/config/ModbusProperties.java
new file mode 100644
index 0000000..8033721
--- /dev/null
+++ b/ems-common/src/main/java/com/xzzn/common/core/modbus/config/ModbusProperties.java
@@ -0,0 +1,106 @@
+package com.xzzn.common.core.modbus.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "modbus")
+public class ModbusProperties {
+
+ private PoolConfig pool = new PoolConfig();
+ private TimeoutConfig timeout = new TimeoutConfig();
+
+ public PoolConfig getPool() {
+ return pool;
+ }
+
+ public void setPool(PoolConfig pool) {
+ this.pool = pool;
+ }
+
+ public TimeoutConfig getTimeout() {
+ return timeout;
+ }
+
+ public void setTimeout(TimeoutConfig timeout) {
+ this.timeout = timeout;
+ }
+
+ public static class PoolConfig {
+ private int maxTotal = 20;
+ private int maxIdle = 10;
+ private int minIdle = 3;
+ private long maxWait = 5000;
+ private long timeBetweenEvictionRuns = 30000;
+ private long minEvictableIdleTime = 60000;
+
+ public int getMaxTotal() {
+ return maxTotal;
+ }
+
+ public void setMaxTotal(int maxTotal) {
+ this.maxTotal = maxTotal;
+ }
+
+ public int getMaxIdle() {
+ return maxIdle;
+ }
+
+ public void setMaxIdle(int maxIdle) {
+ this.maxIdle = maxIdle;
+ }
+
+ public int getMinIdle() {
+ return minIdle;
+ }
+
+ public void setMinIdle(int minIdle) {
+ this.minIdle = minIdle;
+ }
+
+ public long getMaxWait() {
+ return maxWait;
+ }
+
+ public void setMaxWait(long maxWait) {
+ this.maxWait = maxWait;
+ }
+
+ public long getTimeBetweenEvictionRuns() {
+ return timeBetweenEvictionRuns;
+ }
+
+ public void setTimeBetweenEvictionRuns(long timeBetweenEvictionRuns) {
+ this.timeBetweenEvictionRuns = timeBetweenEvictionRuns;
+ }
+
+ public long getMinEvictableIdleTime() {
+ return minEvictableIdleTime;
+ }
+
+ public void setMinEvictableIdleTime(long minEvictableIdleTime) {
+ this.minEvictableIdleTime = minEvictableIdleTime;
+ }
+ }
+
+ public static class TimeoutConfig {
+ private int read = 10000;
+ private int write = 5000;
+
+ public int getRead() {
+ return read;
+ }
+
+ public void setRead(int read) {
+ this.read = read;
+ }
+
+ public int getWrite() {
+ return write;
+ }
+
+ public void setWrite(int write) {
+ this.write = write;
+ }
+ }
+}
diff --git a/ems-common/src/main/java/com/xzzn/common/core/modbus/domain/DeviceConfig.java b/ems-common/src/main/java/com/xzzn/common/core/modbus/domain/DeviceConfig.java
new file mode 100644
index 0000000..cbcc2ce
--- /dev/null
+++ b/ems-common/src/main/java/com/xzzn/common/core/modbus/domain/DeviceConfig.java
@@ -0,0 +1,91 @@
+package com.xzzn.common.core.modbus.domain;
+
+
+import java.util.List;
+
+
+public class DeviceConfig {
+
+
+ private String deviceNumber;
+ private String deviceName;
+ private String host;
+ private int port;
+ private long time;
+ private int slaveId;
+ private boolean enabled;
+ private List tags;
+ private List writeTags;
+
+ public String getDeviceNumber() {
+ return deviceNumber;
+ }
+
+ public void setDeviceNumber(String deviceNumber) {
+ this.deviceNumber = deviceNumber;
+ }
+
+ public String getDeviceName() {
+ return deviceName;
+ }
+
+ public void setDeviceName(String deviceName) {
+ this.deviceName = deviceName;
+ }
+
+ public String getHost() {
+ return host;
+ }
+
+ public void setHost(String host) {
+ this.host = host;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public long getTime() {
+ return time;
+ }
+
+ public void setTime(long time) {
+ this.time = time;
+ }
+
+ public int getSlaveId() {
+ return slaveId;
+ }
+
+ public void setSlaveId(int slaveId) {
+ this.slaveId = slaveId;
+ }
+
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ public void setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ }
+
+ public List getTags() {
+ return tags;
+ }
+
+ public void setTags(List tags) {
+ this.tags = tags;
+ }
+
+ public List getWriteTags() {
+ return writeTags;
+ }
+
+ public void setWriteTags(List writeTags) {
+ this.writeTags = writeTags;
+ }
+}
\ No newline at end of file
diff --git a/ems-common/src/main/java/com/xzzn/common/core/modbus/domain/TagConfig.java b/ems-common/src/main/java/com/xzzn/common/core/modbus/domain/TagConfig.java
new file mode 100644
index 0000000..7e5c3d2
--- /dev/null
+++ b/ems-common/src/main/java/com/xzzn/common/core/modbus/domain/TagConfig.java
@@ -0,0 +1,78 @@
+package com.xzzn.common.core.modbus.domain;
+
+
+
+public class TagConfig {
+ private String key;
+ private String des;
+ private String address;
+ private String dataType;
+ private float a;
+ private float k;
+ private float b;
+ private Integer bit;
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getDes() {
+ return des;
+ }
+
+ public void setDes(String des) {
+ this.des = des;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public String getDataType() {
+ return dataType;
+ }
+
+ public void setDataType(String dataType) {
+ this.dataType = dataType;
+ }
+
+ public float getA() {
+ return a;
+ }
+
+ public void setA(float a) {
+ this.a = a;
+ }
+
+ public float getK() {
+ return k;
+ }
+
+ public void setK(float k) {
+ this.k = k;
+ }
+
+ public float getB() {
+ return b;
+ }
+
+ public void setB(float b) {
+ this.b = b;
+ }
+
+ public Integer getBit() {
+ return bit;
+ }
+
+ public void setBit(Integer bit) {
+ this.bit = bit;
+ }
+}
\ No newline at end of file
diff --git a/ems-common/src/main/java/com/xzzn/common/core/modbus/domain/WriteTagConfig.java b/ems-common/src/main/java/com/xzzn/common/core/modbus/domain/WriteTagConfig.java
new file mode 100644
index 0000000..2a60fc4
--- /dev/null
+++ b/ems-common/src/main/java/com/xzzn/common/core/modbus/domain/WriteTagConfig.java
@@ -0,0 +1,31 @@
+package com.xzzn.common.core.modbus.domain;
+
+public class WriteTagConfig {
+ private Object value;
+ private String address;
+ private boolean isWrite;
+
+ public Object getValue() {
+ return value;
+ }
+
+ public void setValue(Object value) {
+ this.value = value;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public boolean isWrite() {
+ return isWrite;
+ }
+
+ public void setWrite(boolean write) {
+ isWrite = write;
+ }
+}
diff --git a/ems-common/src/main/java/com/xzzn/common/core/redis/RedisCache.java b/ems-common/src/main/java/com/xzzn/common/core/redis/RedisCache.java
index 3a55f42..b234b47 100644
--- a/ems-common/src/main/java/com/xzzn/common/core/redis/RedisCache.java
+++ b/ems-common/src/main/java/com/xzzn/common/core/redis/RedisCache.java
@@ -7,10 +7,8 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.BoundSetOperations;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.redis.core.*;
import org.springframework.stereotype.Component;
/**
@@ -243,6 +241,18 @@ public class RedisCache
return redisTemplate.opsForHash().multiGet(key, hKeys);
}
+ /**
+ * 删除Hash中的多条数据
+ *
+ * @param key Redis键
+ * @param hKey Hash键
+ * @return 是否成功
+ */
+ public boolean deleteAllCacheMapValue(final String key, final Object[] hKey)
+ {
+ return redisTemplate.opsForHash().delete(key, hKey) > 0;
+ }
+
/**
* 删除Hash中的某条数据
*
@@ -255,6 +265,18 @@ public class RedisCache
return redisTemplate.opsForHash().delete(key, hKey) > 0;
}
+
+ /**
+ * 批量往Hash中存入数据
+ *
+ * @param key Redis键
+ * @param value 值
+ */
+ public void setAllCacheMapValue(final String key, final Map value)
+ {
+ redisTemplate.opsForHash().putAll(key, value);
+ }
+
/**
* 获得缓存的基本对象列表
*
@@ -265,4 +287,89 @@ public class RedisCache
{
return redisTemplate.keys(pattern);
}
+
+ /**
+ * 删除list
+ *
+ * @param key Redis键
+ * @return 对象列表
+ */
+ public boolean deleteList(final String key)
+ {
+ return redisTemplate.delete(key);
+ }
+
+ /**
+ * 批量缓存
+ * @param cacheMap
+ */
+ public void multiSet(final Map cacheMap)
+ {
+
+ redisTemplate.opsForValue().multiSet(cacheMap);
+ }
+
+ /**
+ * 批量设置键值对，并为每个键设置相同的过期时间
+ * @param keyValueMap 键值对集合
+ * @param timeout 过期时间
+ * @param unit 时间单位
+ */
+ public void multiSetWithExpire(Map keyValueMap, long timeout, TimeUnit unit) {
+ if (keyValueMap.isEmpty()) {
+ return; // 空集合直接返回
+ }
+
+ // 使用Redis管道批量执行命令
+ redisTemplate.executePipelined(new SessionCallback