From d0b98a0a8af7d56aa7477f212a4adcc566fc0301 Mon Sep 17 00:00:00 2001 From: dashixiong Date: Sun, 29 Jun 2025 16:20:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=89=E8=B4=A4=E6=95=B0=E6=8D=AE=E5=8D=95?= =?UTF-8?q?=E7=8B=AC=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ems/MqttMessageController.java | 21 +++- .../service/IEmsBatteryClusterService.java | 61 ++++++++++++ .../ems/service/IEmsBatteryStackService.java | 61 ++++++++++++ .../impl/EmsBatteryClusterServiceImpl.java | 96 +++++++++++++++++++ .../impl/EmsBatteryStackServiceImpl.java | 96 +++++++++++++++++++ 5 files changed, 330 insertions(+), 5 deletions(-) create mode 100644 ems-system/src/main/java/com/xzzn/ems/service/IEmsBatteryClusterService.java create mode 100644 ems-system/src/main/java/com/xzzn/ems/service/IEmsBatteryStackService.java create mode 100644 ems-system/src/main/java/com/xzzn/ems/service/impl/EmsBatteryClusterServiceImpl.java create mode 100644 ems-system/src/main/java/com/xzzn/ems/service/impl/EmsBatteryStackServiceImpl.java 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 index 542041a..1f923b2 100644 --- 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 @@ -7,10 +7,7 @@ import com.alibaba.fastjson2.TypeReference; import com.xzzn.common.utils.DateUtils; import com.xzzn.common.utils.StringUtils; import com.xzzn.ems.domain.*; -import com.xzzn.ems.service.IEmsBatteryDataService; -import com.xzzn.ems.service.IEmsMqttMessageService; -import com.xzzn.ems.service.IEmsPcsBranchDataService; -import com.xzzn.ems.service.IEmsPcsDataService; +import com.xzzn.ems.service.*; import com.xzzn.framework.manager.MqttLifecycleManager; import com.xzzn.framework.web.service.MqttPublisher; import com.xzzn.framework.web.service.MqttSubscriber; @@ -47,6 +44,14 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber { @Autowired private IEmsPcsBranchDataService emsPcsBranchDataService; + @Autowired + private IEmsBatteryClusterService emsBatteryClusterService; + + @Autowired + private IEmsBatteryStackService emsBatteryStackService; + + + @Autowired public MqttMessageController(MqttLifecycleManager mqttLifecycleManager) { this.mqttLifecycleManager = mqttLifecycleManager; @@ -200,6 +205,9 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber { data.setMinCellSocId(Long.parseLong("1")); data.setMaxCellSohId(Long.parseLong("1")); data.setMinCellSohId(Long.parseLong("1")); + data.setStackDeviceId("1"); + emsBatteryClusterService.insertEmsBatteryCluster(data); + //电池堆 //BMS 电池簇 @@ -257,6 +265,9 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber { dataStack.setMaxCellSohId(Long.parseLong("1")); dataStack.setMinCellSohId(Long.parseLong("1")); + emsBatteryStackService.insertEmsBatteryStack(dataStack); + + //单体电池 Map> records = processData(JSON.parseObject(jsonData, new TypeReference>() {})); List list = new ArrayList<>(); @@ -384,7 +395,7 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber { data.setTotalLoadRatio(BigDecimal.ZERO); data.setAcLeakageCurrent(BigDecimal.ZERO); data.setInsulationResistance(BigDecimal.ZERO); - + data.setBranchId(Long.parseLong("1")); list.add(data); } if (list.size() > 0 ) { diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsBatteryClusterService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsBatteryClusterService.java new file mode 100644 index 0000000..29a6998 --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsBatteryClusterService.java @@ -0,0 +1,61 @@ +package com.xzzn.ems.service; + +import java.util.List; +import com.xzzn.ems.domain.EmsBatteryCluster; + +/** + * 电池簇数据Service接口 + * + * @author xzzn + * @date 2025-06-29 + */ +public interface IEmsBatteryClusterService +{ + /** + * 查询电池簇数据 + * + * @param id 电池簇数据主键 + * @return 电池簇数据 + */ + public EmsBatteryCluster selectEmsBatteryClusterById(Long id); + + /** + * 查询电池簇数据列表 + * + * @param emsBatteryCluster 电池簇数据 + * @return 电池簇数据集合 + */ + public List selectEmsBatteryClusterList(EmsBatteryCluster emsBatteryCluster); + + /** + * 新增电池簇数据 + * + * @param emsBatteryCluster 电池簇数据 + * @return 结果 + */ + public int insertEmsBatteryCluster(EmsBatteryCluster emsBatteryCluster); + + /** + * 修改电池簇数据 + * + * @param emsBatteryCluster 电池簇数据 + * @return 结果 + */ + public int updateEmsBatteryCluster(EmsBatteryCluster emsBatteryCluster); + + /** + * 批量删除电池簇数据 + * + * @param ids 需要删除的电池簇数据主键集合 + * @return 结果 + */ + public int deleteEmsBatteryClusterByIds(Long[] ids); + + /** + * 删除电池簇数据信息 + * + * @param id 电池簇数据主键 + * @return 结果 + */ + public int deleteEmsBatteryClusterById(Long id); +} diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsBatteryStackService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsBatteryStackService.java new file mode 100644 index 0000000..5d48c59 --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsBatteryStackService.java @@ -0,0 +1,61 @@ +package com.xzzn.ems.service; + +import java.util.List; +import com.xzzn.ems.domain.EmsBatteryStack; + +/** + * 电池堆数据Service接口 + * + * @author xzzn + * @date 2025-06-29 + */ +public interface IEmsBatteryStackService +{ + /** + * 查询电池堆数据 + * + * @param id 电池堆数据主键 + * @return 电池堆数据 + */ + public EmsBatteryStack selectEmsBatteryStackById(Long id); + + /** + * 查询电池堆数据列表 + * + * @param emsBatteryStack 电池堆数据 + * @return 电池堆数据集合 + */ + public List selectEmsBatteryStackList(EmsBatteryStack emsBatteryStack); + + /** + * 新增电池堆数据 + * + * @param emsBatteryStack 电池堆数据 + * @return 结果 + */ + public int insertEmsBatteryStack(EmsBatteryStack emsBatteryStack); + + /** + * 修改电池堆数据 + * + * @param emsBatteryStack 电池堆数据 + * @return 结果 + */ + public int updateEmsBatteryStack(EmsBatteryStack emsBatteryStack); + + /** + * 批量删除电池堆数据 + * + * @param ids 需要删除的电池堆数据主键集合 + * @return 结果 + */ + public int deleteEmsBatteryStackByIds(Long[] ids); + + /** + * 删除电池堆数据信息 + * + * @param id 电池堆数据主键 + * @return 结果 + */ + public int deleteEmsBatteryStackById(Long id); +} diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsBatteryClusterServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsBatteryClusterServiceImpl.java new file mode 100644 index 0000000..d1f6b8f --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsBatteryClusterServiceImpl.java @@ -0,0 +1,96 @@ +package com.xzzn.ems.service.impl; + +import java.util.List; +import com.xzzn.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.xzzn.ems.mapper.EmsBatteryClusterMapper; +import com.xzzn.ems.domain.EmsBatteryCluster; +import com.xzzn.ems.service.IEmsBatteryClusterService; + +/** + * 电池簇数据Service业务层处理 + * + * @author xzzn + * @date 2025-06-29 + */ +@Service +public class EmsBatteryClusterServiceImpl implements IEmsBatteryClusterService +{ + @Autowired + private EmsBatteryClusterMapper emsBatteryClusterMapper; + + /** + * 查询电池簇数据 + * + * @param id 电池簇数据主键 + * @return 电池簇数据 + */ + @Override + public EmsBatteryCluster selectEmsBatteryClusterById(Long id) + { + return emsBatteryClusterMapper.selectEmsBatteryClusterById(id); + } + + /** + * 查询电池簇数据列表 + * + * @param emsBatteryCluster 电池簇数据 + * @return 电池簇数据 + */ + @Override + public List selectEmsBatteryClusterList(EmsBatteryCluster emsBatteryCluster) + { + return emsBatteryClusterMapper.selectEmsBatteryClusterList(emsBatteryCluster); + } + + /** + * 新增电池簇数据 + * + * @param emsBatteryCluster 电池簇数据 + * @return 结果 + */ + @Override + public int insertEmsBatteryCluster(EmsBatteryCluster emsBatteryCluster) + { + emsBatteryCluster.setCreateTime(DateUtils.getNowDate()); + return emsBatteryClusterMapper.insertEmsBatteryCluster(emsBatteryCluster); + } + + /** + * 修改电池簇数据 + * + * @param emsBatteryCluster 电池簇数据 + * @return 结果 + */ + @Override + public int updateEmsBatteryCluster(EmsBatteryCluster emsBatteryCluster) + { + emsBatteryCluster.setUpdateTime(DateUtils.getNowDate()); + return emsBatteryClusterMapper.updateEmsBatteryCluster(emsBatteryCluster); + } + + /** + * 批量删除电池簇数据 + * + * @param ids 需要删除的电池簇数据主键 + * @return 结果 + */ + @Override + public int deleteEmsBatteryClusterByIds(Long[] ids) + { + return emsBatteryClusterMapper.deleteEmsBatteryClusterByIds(ids); + } + + /** + * 删除电池簇数据信息 + * + * @param id 电池簇数据主键 + * @return 结果 + */ + @Override + public int deleteEmsBatteryClusterById(Long id) + { + return emsBatteryClusterMapper.deleteEmsBatteryClusterById(id); + } +} diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsBatteryStackServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsBatteryStackServiceImpl.java new file mode 100644 index 0000000..f1b52bc --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsBatteryStackServiceImpl.java @@ -0,0 +1,96 @@ +package com.xzzn.ems.service.impl; + +import java.util.List; +import com.xzzn.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.xzzn.ems.mapper.EmsBatteryStackMapper; +import com.xzzn.ems.domain.EmsBatteryStack; +import com.xzzn.ems.service.IEmsBatteryStackService; + +/** + * 电池堆数据Service业务层处理 + * + * @author xzzn + * @date 2025-06-29 + */ +@Service +public class EmsBatteryStackServiceImpl implements IEmsBatteryStackService +{ + @Autowired + private EmsBatteryStackMapper emsBatteryStackMapper; + + /** + * 查询电池堆数据 + * + * @param id 电池堆数据主键 + * @return 电池堆数据 + */ + @Override + public EmsBatteryStack selectEmsBatteryStackById(Long id) + { + return emsBatteryStackMapper.selectEmsBatteryStackById(id); + } + + /** + * 查询电池堆数据列表 + * + * @param emsBatteryStack 电池堆数据 + * @return 电池堆数据 + */ + @Override + public List selectEmsBatteryStackList(EmsBatteryStack emsBatteryStack) + { + return emsBatteryStackMapper.selectEmsBatteryStackList(emsBatteryStack); + } + + /** + * 新增电池堆数据 + * + * @param emsBatteryStack 电池堆数据 + * @return 结果 + */ + @Override + public int insertEmsBatteryStack(EmsBatteryStack emsBatteryStack) + { + emsBatteryStack.setCreateTime(DateUtils.getNowDate()); + return emsBatteryStackMapper.insertEmsBatteryStack(emsBatteryStack); + } + + /** + * 修改电池堆数据 + * + * @param emsBatteryStack 电池堆数据 + * @return 结果 + */ + @Override + public int updateEmsBatteryStack(EmsBatteryStack emsBatteryStack) + { + emsBatteryStack.setUpdateTime(DateUtils.getNowDate()); + return emsBatteryStackMapper.updateEmsBatteryStack(emsBatteryStack); + } + + /** + * 批量删除电池堆数据 + * + * @param ids 需要删除的电池堆数据主键 + * @return 结果 + */ + @Override + public int deleteEmsBatteryStackByIds(Long[] ids) + { + return emsBatteryStackMapper.deleteEmsBatteryStackByIds(ids); + } + + /** + * 删除电池堆数据信息 + * + * @param id 电池堆数据主键 + * @return 结果 + */ + @Override + public int deleteEmsBatteryStackById(Long id) + { + return emsBatteryStackMapper.deleteEmsBatteryStackById(id); + } +}