From 3e6cd1b6ed30801ffa9883bccaccbeb0e0789ef8 Mon Sep 17 00:00:00 2001 From: mashili Date: Sun, 13 Jul 2025 16:27:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5=E9=85=8D=E7=BD=AE-=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xzzn/ems/mapper/EmsStrategyTimeConfigMapper.java | 4 ++-- .../ems/service/impl/EmsStrategyTempServiceImpl.java | 11 +++++++---- .../mapper/ems/EmsStrategyTimeConfigMapper.xml | 6 +++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTimeConfigMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTimeConfigMapper.java index 0dc81b6..8b0d4d4 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTimeConfigMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTimeConfigMapper.java @@ -63,6 +63,6 @@ public interface EmsStrategyTimeConfigMapper // 获取该策略下的时间配置 public List getStrategyTimeList(EmsStrategyTimeConfig emsStrategyTimeConfig); - // 删除模板时间配置 - public void deleteTimeConfigByTemplateId(String templateId); + // 清空该月的模板信息 + public void cleanTemplateId(String templateId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTempServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTempServiceImpl.java index 6461ab6..6352059 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTempServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTempServiceImpl.java @@ -55,7 +55,6 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService String templateId = requestVo.getTemplateId(); if (StringUtils.isEmpty(templateId)) { templateId = PREFIX + DateUtils.dateTimeNow(); - } EmsStrategyTemp publicTemp = new EmsStrategyTemp(); @@ -67,8 +66,12 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService if (timeList != null && !timeList.isEmpty()) { for (EmsStrategyTempTimeConfig timeConfig : timeList) { EmsStrategyTemp temp = new EmsStrategyTemp(); - BeanUtils.copyProperties(timeConfig, temp); BeanUtils.copyProperties(publicTemp, temp); + // 时间设置 + temp.setStartTime(timeConfig.getStartTime()); + temp.setEndTime(timeConfig.getEndTime()); + temp.setChargeDischargePower(timeConfig.getChargeDischargePower()); + temp.setChargeStatus(timeConfig.getChargeStatus()); emsStrategyTempMapper.insertEmsStrategyTemp(temp); } } else {// 无时间配置只配置模板基本信息 @@ -106,8 +109,8 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService @Override public int deleteStrategyTempById(String templateId) { - // 先删除模板的时间配置 - emsStrategyTimeConfigMapper.deleteTimeConfigByTemplateId(templateId); + // 先更新配置该模板的月份数据 + emsStrategyTimeConfigMapper.cleanTemplateId(templateId); return emsStrategyTempMapper.deleteTempByTempId(templateId); } } diff --git a/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml index dd01db4..08707c1 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml @@ -107,7 +107,7 @@ order by month - - delete from ems_strategy_time_config where template_id = #{templateId} - + + update ems_strategy_time_config set template_id = '' where template_id = #{templateId} + \ No newline at end of file