From 7b798f8323e7aebd6273a12d4801aa02f83b0b71 Mon Sep 17 00:00:00 2001 From: mashili Date: Sun, 13 Jul 2025 11:58:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5=E9=85=8D=E7=BD=AE-=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ems/EmsStrategyTempController.java | 32 ++-- .../com/xzzn/ems/domain/EmsStrategyTemp.java | 82 ++++++++++- .../ems/domain/EmsStrategyTempTimeConfig.java | 8 +- .../domain/vo/StrategyTempConfigRequest.java | 10 +- .../ems/mapper/EmsStrategyTempMapper.java | 7 +- .../EmsStrategyTempTimeConfigMapper.java | 67 --------- .../ems/service/IEmsStrategyTempService.java | 33 +---- .../impl/EmsStrategyTempServiceImpl.java | 138 ++++++------------ .../mapper/ems/EmsStrategyTempMapper.xml | 38 ++++- .../ems/EmsStrategyTempTimeConfigMapper.xml | 105 ------------- 10 files changed, 195 insertions(+), 325 deletions(-) delete mode 100644 ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTempTimeConfigMapper.java delete mode 100644 ems-system/src/main/resources/mapper/ems/EmsStrategyTempTimeConfigMapper.xml 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 index 0a994f6..b8a5071 100644 --- 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 @@ -1,8 +1,5 @@ package com.xzzn.web.controller.ems; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - import com.xzzn.ems.domain.vo.StrategyTempConfigRequest; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -18,9 +15,7 @@ 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.EmsStrategyTemp; import com.xzzn.ems.service.IEmsStrategyTempService; -import com.xzzn.common.utils.poi.ExcelUtil; /** * 模板Controller @@ -35,12 +30,21 @@ 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(Long templateId) + public AjaxResult list(String templateId) { return success(emsStrategyTempService.selectEmsStrategyTempList(templateId)); } @@ -82,19 +86,9 @@ public class EmsStrategyTempController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:temp:remove')") @Log(title = "模板", businessType = BusinessType.DELETE) - @DeleteMapping("/{id}") - public AjaxResult remove(@PathVariable Long id) + @DeleteMapping("/{templateId}") + public AjaxResult remove(@PathVariable String templateId) { - emsStrategyTempService.deleteStrategyTempById(id); - return success(); - } - - /** - * 根据策略id站点id获取所有模板名称 - */ - @GetMapping("/getTempNameList") - public AjaxResult getTempNameList(Long strategyId, String siteId) - { - return success(emsStrategyTempService.getTempNameList(strategyId, siteId)); + return success(emsStrategyTempService.deleteStrategyTempById(templateId)); } } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTemp.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTemp.java index 3a68e7f..8b05e5b 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTemp.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTemp.java @@ -1,7 +1,8 @@ package com.xzzn.ems.domain; import java.math.BigDecimal; - +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import com.xzzn.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -11,7 +12,7 @@ import com.xzzn.common.annotation.Excel; * 模板对象 ems_strategy_temp * * @author xzzn - * @date 2025-07-12 + * @date 2025-07-13 */ public class EmsStrategyTemp extends BaseEntity { @@ -40,10 +41,32 @@ public class EmsStrategyTemp extends BaseEntity @Excel(name = "SDC上限 (%)") private BigDecimal sdcUp; + /** 开始时间 */ + @JsonFormat(pattern = "HH:mm") + @Excel(name = "开始时间", width = 30, dateFormat = "HH:mm") + private Date startTime; + + /** 结束时间 */ + @JsonFormat(pattern = "HH:mm") + @Excel(name = "结束时间", width = 30, dateFormat = "HH:mm") + private Date endTime; + + /** 充放功率 (kW) */ + @Excel(name = "充放功率 (kW)") + private BigDecimal chargeDischargePower; + + /** 充电状态，如“1-充电”、“2-待机” */ + @Excel(name = "充电状态，如“1-充电”、“2-待机”") + private String chargeStatus; + /** 站点id */ @Excel(name = "站点id") private String siteId; + /** 模板id */ + @Excel(name = "模板id") + private String templateId; + public void setId(Long id) { this.id = id; @@ -104,6 +127,46 @@ public class EmsStrategyTemp extends BaseEntity return sdcUp; } + public void setStartTime(Date startTime) + { + this.startTime = startTime; + } + + public Date getStartTime() + { + return startTime; + } + + public void setEndTime(Date endTime) + { + this.endTime = endTime; + } + + public Date getEndTime() + { + return endTime; + } + + public void setChargeDischargePower(BigDecimal chargeDischargePower) + { + this.chargeDischargePower = chargeDischargePower; + } + + public BigDecimal getChargeDischargePower() + { + return chargeDischargePower; + } + + public void setChargeStatus(String chargeStatus) + { + this.chargeStatus = chargeStatus; + } + + public String getChargeStatus() + { + return chargeStatus; + } + public void setSiteId(String siteId) { this.siteId = siteId; @@ -114,6 +177,16 @@ public class EmsStrategyTemp extends BaseEntity return siteId; } + public void setTemplateId(String templateId) + { + this.templateId = templateId; + } + + public String getTemplateId() + { + return templateId; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -123,12 +196,17 @@ public class EmsStrategyTemp extends BaseEntity .append("sdcLimit", getSdcLimit()) .append("sdcDown", getSdcDown()) .append("sdcUp", getSdcUp()) + .append("startTime", getStartTime()) + .append("endTime", getEndTime()) + .append("chargeDischargePower", getChargeDischargePower()) + .append("chargeStatus", getChargeStatus()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("remark", getRemark()) .append("siteId", getSiteId()) + .append("templateId", getTemplateId()) .toString(); } } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTempTimeConfig.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTempTimeConfig.java index cc01298..9bb2f52 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTempTimeConfig.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTempTimeConfig.java @@ -22,13 +22,13 @@ public class EmsStrategyTempTimeConfig extends BaseEntity private Long id; /** 开始时间 */ - @JsonFormat(pattern = "HH:mm:ss") - @Excel(name = "开始时间", width = 30, dateFormat = "HH:mm:ss") + @JsonFormat(pattern = "HH:mm") + @Excel(name = "开始时间", width = 30, dateFormat = "HH:mm") private Date startTime; /** 结束时间 */ - @JsonFormat(pattern = "HH:mm:ss") - @Excel(name = "结束时间", width = 30, dateFormat = "HH:mm:ss") + @JsonFormat(pattern = "HH:mm") + @Excel(name = "结束时间", width = 30, dateFormat = "HH:mm") private Date endTime; /** 充放功率 (kW) */ diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTempConfigRequest.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTempConfigRequest.java index 53f086e..f05d001 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTempConfigRequest.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTempConfigRequest.java @@ -15,7 +15,7 @@ public class StrategyTempConfigRequest { /** 模板id */ - private Long id; + private String templateId; /** 站点id */ private String siteId; @@ -37,12 +37,12 @@ public class StrategyTempConfigRequest /** 模板时间 */ private List timeConfigList; - public Long getId() { - return id; + public String getTemplateId() { + return templateId; } - public void setId(Long id) { - this.id = id; + public void setTemplateId(String templateId) { + this.templateId = templateId; } public void setStrategyId(Long strategyId) diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTempMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTempMapper.java index b59e610..24db8da 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTempMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTempMapper.java @@ -65,6 +65,9 @@ public interface EmsStrategyTempMapper // 获取模板名称和id public List> getTempNameList(@Param("strategyId")Long strategyId, @Param("siteId")String siteId); - // 删除模板 - public int deleteEmsStrategyTempByIds(Long id); + // 根据模板id获取模板所有的时间配置 + public List selectStrategyTempByTempId(String templateId); + + // 根据模板id全部删除 + public int deleteTempByTempId(String templateId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTempTimeConfigMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTempTimeConfigMapper.java deleted file mode 100644 index b02f10d..0000000 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTempTimeConfigMapper.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.xzzn.ems.mapper; - -import java.util.List; -import com.xzzn.ems.domain.EmsStrategyTempTimeConfig; - -/** - * 模板配置Mapper接口 - * - * @author xzzn - * @date 2025-07-12 - */ -public interface EmsStrategyTempTimeConfigMapper -{ - /** - * 查询模板配置 - * - * @param id 模板配置主键 - * @return 模板配置 - */ - public EmsStrategyTempTimeConfig selectEmsStrategyTempTimeConfigById(Long id); - - /** - * 查询模板配置列表 - * - * @param emsStrategyTempTimeConfig 模板配置 - * @return 模板配置集合 - */ - public List selectEmsStrategyTempTimeConfigList(EmsStrategyTempTimeConfig emsStrategyTempTimeConfig); - - /** - * 新增模板配置 - * - * @param emsStrategyTempTimeConfig 模板配置 - * @return 结果 - */ - public int insertEmsStrategyTempTimeConfig(EmsStrategyTempTimeConfig emsStrategyTempTimeConfig); - - /** - * 修改模板配置 - * - * @param emsStrategyTempTimeConfig 模板配置 - * @return 结果 - */ - public int updateEmsStrategyTempTimeConfig(EmsStrategyTempTimeConfig emsStrategyTempTimeConfig); - - /** - * 删除模板配置 - * - * @param id 模板配置主键 - * @return 结果 - */ - public int deleteEmsStrategyTempTimeConfigById(Long id); - - /** - * 批量删除模板配置 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteEmsStrategyTempTimeConfigByIds(Long[] ids); - - // 获取模板的时间 - public List getTimeListByTempId(Long templateId); - - // 根据模板id删除时间配置 - public void deleteTimeConfigByTempId(Long templateId); -} diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsStrategyTempService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsStrategyTempService.java index b3e9386..35ac3b8 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/IEmsStrategyTempService.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsStrategyTempService.java @@ -5,7 +5,6 @@ import java.util.Map; import com.xzzn.ems.domain.EmsStrategyTemp; import com.xzzn.ems.domain.vo.StrategyTempConfigRequest; -import com.xzzn.ems.domain.vo.StrategyTempTimeConfigVo; /** * 模板Service接口 @@ -15,13 +14,6 @@ import com.xzzn.ems.domain.vo.StrategyTempTimeConfigVo; */ public interface IEmsStrategyTempService { - - // 获取该模板下的时间配置 - public List selectEmsStrategyTempList(Long id); - - // 新增模板及时间配置 - public boolean addNewTempAndTimeConfig(StrategyTempConfigRequest requestVo); - /** * 修改模板 * @@ -30,23 +22,14 @@ public interface IEmsStrategyTempService */ public boolean updateEmsStrategyTemp(StrategyTempConfigRequest requestVo); - /** - * 批量删除模板 - * - * @param ids 需要删除的模板主键集合 - * @return 结果 - */ - public int deleteEmsStrategyTempByIds(Long[] ids); - - /** - * 删除模板信息 - * - * @param id 模板主键 - * @return 结果 - */ - public int deleteEmsStrategyTempById(Long id); - public List> getTempNameList(Long strategyId, String siteId); - public void deleteStrategyTempById(Long id); + // 获取该模板下的时间配置 + public List selectEmsStrategyTempList(String templateId); + + // 新增模板及时间配置 + public boolean addNewTempAndTimeConfig(StrategyTempConfigRequest requestVo); + + //根据templateId删除模板 + public int deleteStrategyTempById(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 c7e5d75..32b08eb 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 @@ -1,15 +1,13 @@ package com.xzzn.ems.service.impl; -import java.util.ArrayList; import java.util.List; import java.util.Map; import com.xzzn.common.utils.DateUtils; +import com.xzzn.common.utils.StringUtils; import com.xzzn.common.utils.bean.BeanUtils; import com.xzzn.ems.domain.EmsStrategyTempTimeConfig; import com.xzzn.ems.domain.vo.StrategyTempConfigRequest; -import com.xzzn.ems.domain.vo.StrategyTempTimeConfigVo; -import com.xzzn.ems.mapper.EmsStrategyTempTimeConfigMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.xzzn.ems.mapper.EmsStrategyTempMapper; @@ -26,10 +24,9 @@ import org.springframework.transaction.annotation.Transactional; @Service public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService { + private static final String PREFIX= "Temp"; @Autowired private EmsStrategyTempMapper emsStrategyTempMapper; - @Autowired - private EmsStrategyTempTimeConfigMapper emsStrategyTempTimeConfigMapper; /** * 查询模板列表 @@ -38,26 +35,42 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService * @return 模板 */ @Override - public List selectEmsStrategyTempList(Long templateId) + public List selectEmsStrategyTempList(String templateId) { - List dataList = new ArrayList<>(); - EmsStrategyTemp temp = emsStrategyTempMapper.selectEmsStrategyTempById(templateId); - if (temp != null) { - List timeList = emsStrategyTempTimeConfigMapper.getTimeListByTempId(templateId); - if (timeList != null && !timeList.isEmpty()) { - for (EmsStrategyTempTimeConfig timeConfig : timeList) { - StrategyTempTimeConfigVo vo = new StrategyTempTimeConfigVo(); - BeanUtils.copyProperties(timeConfig, vo); - BeanUtils.copyProperties(temp, vo); - dataList.add(vo); - } - } else { - StrategyTempTimeConfigVo vo = new StrategyTempTimeConfigVo(); - BeanUtils.copyProperties(temp, vo); - dataList.add(vo); - } + return emsStrategyTempMapper.selectStrategyTempByTempId(templateId); + } + + /** + * 新增模板和时间配置 + * @param requestVo + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean addNewTempAndTimeConfig(StrategyTempConfigRequest requestVo) { + // 随机生产模板id格式：Temp+时间戳 + String templateId = requestVo.getTemplateId(); + if (StringUtils.isEmpty(templateId)) { + templateId = PREFIX + DateUtils.dateTimeNow(); } - return dataList; + + EmsStrategyTemp publicTemp = new EmsStrategyTemp(); + BeanUtils.copyProperties(requestVo, publicTemp); + publicTemp.setTemplateId(templateId); + publicTemp.setCreateTime(DateUtils.getNowDate()); + + List timeList = requestVo.getTimeConfigList(); + if (timeList != null && !timeList.isEmpty()) { + for (EmsStrategyTempTimeConfig timeConfig : timeList) { + EmsStrategyTemp temp = new EmsStrategyTemp(); + BeanUtils.copyProperties(publicTemp, temp); + BeanUtils.copyProperties(timeConfig, temp); + emsStrategyTempMapper.insertEmsStrategyTemp(temp); + } + } else {// 无时间配置只配置模板基本信息 + emsStrategyTempMapper.insertEmsStrategyTemp(publicTemp); + } + return true; } /** @@ -70,88 +83,25 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService @Transactional(rollbackFor = Exception.class) public boolean updateEmsStrategyTemp(StrategyTempConfigRequest requestVo) { - Long id = requestVo.getId(); - // 根据模板id校验该模板是否存在 - EmsStrategyTemp temp = emsStrategyTempMapper.selectEmsStrategyTempById(id); - if (temp == null) { - return false; - } - // 更新模板数据 - BeanUtils.copyProperties(requestVo, temp); - emsStrategyTempMapper.updateEmsStrategyTemp(temp); + String templateId = requestVo.getTemplateId(); + // 无发匹配原数据 + // 全删 + emsStrategyTempMapper.deleteTempByTempId(templateId); - // 先删除再加 - emsStrategyTempTimeConfigMapper.deleteTimeConfigByTempId(id); - - List timeList = requestVo.getTimeConfigList(); - if (timeList != null) { - for (EmsStrategyTempTimeConfig timeConfig : timeList) { - timeConfig.setTemplateId(id); - timeConfig.setCreateTime(DateUtils.getNowDate()); - timeConfig.setUpdateTime(DateUtils.getNowDate()); - emsStrategyTempTimeConfigMapper.insertEmsStrategyTempTimeConfig(timeConfig); - } - } + // 重新新增 + addNewTempAndTimeConfig(requestVo); return true; } - /** - * 批量删除模板 - * - * @param ids 需要删除的模板主键 - * @return 结果 - */ - @Override - public int deleteEmsStrategyTempByIds(Long[] ids) - { - return emsStrategyTempMapper.deleteEmsStrategyTempByIds(ids); - } - - /** - * 删除模板信息 - * - * @param id 模板主键 - * @return 结果 - */ - @Override - public int deleteEmsStrategyTempById(Long id) - { - return emsStrategyTempMapper.deleteEmsStrategyTempById(id); - } - @Override public List> getTempNameList(Long strategyId, String siteId) { return emsStrategyTempMapper.getTempNameList(strategyId, siteId); } - // 新增模板和时间配置 - @Override - @Transactional(rollbackFor = Exception.class) - public boolean addNewTempAndTimeConfig(StrategyTempConfigRequest requestVo) { - EmsStrategyTemp emsStrategyTemp = new EmsStrategyTemp(); - BeanUtils.copyProperties(requestVo, emsStrategyTemp); - emsStrategyTemp.setCreateTime(DateUtils.getNowDate()); - emsStrategyTempMapper.insertEmsStrategyTemp(emsStrategyTemp); - - List timeList = requestVo.getTimeConfigList(); - if (timeList != null) { - for (EmsStrategyTempTimeConfig timeConfig : timeList) { - timeConfig.setCreateTime(DateUtils.getNowDate()); - timeConfig.setTemplateId(emsStrategyTemp.getId()); - emsStrategyTempTimeConfigMapper.insertEmsStrategyTempTimeConfig(timeConfig); - } - } - return true; - } - @Override - public void deleteStrategyTempById(Long id) { - // 先删除时间配置 - emsStrategyTempTimeConfigMapper.deleteTimeConfigByTempId(id); - - // 再删除模板 - emsStrategyTempMapper.deleteEmsStrategyTempById(id); + public int deleteStrategyTempById(String templateId) { + return emsStrategyTempMapper.deleteTempByTempId(templateId); } } diff --git a/ems-system/src/main/resources/mapper/ems/EmsStrategyTempMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsStrategyTempMapper.xml index 08b914d..b297a52 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsStrategyTempMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsStrategyTempMapper.xml @@ -11,16 +11,21 @@ + + + + + - select id, strategy_id, template_name, sdc_limit, sdc_down, sdc_up, create_by, create_time, update_by, update_time, remark, site_id from ems_strategy_temp + select id, strategy_id, template_name, sdc_limit, sdc_down, sdc_up, start_time, end_time, charge_discharge_power, charge_status, create_by, create_time, update_by, update_time, remark, site_id, template_id from ems_strategy_temp @@ -48,12 +58,17 @@ sdc_limit, sdc_down, sdc_up, + start_time, + end_time, + charge_discharge_power, + charge_status, create_by, create_time, update_by, update_time, remark, site_id, + template_id, #{strategyId}, @@ -61,12 +76,17 @@ #{sdcLimit}, #{sdcDown}, #{sdcUp}, + #{startTime}, + #{endTime}, + #{chargeDischargePower}, + #{chargeStatus}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark}, #{siteId}, + #{templateId}, @@ -78,12 +98,17 @@ sdc_limit = #{sdcLimit}, sdc_down = #{sdcDown}, sdc_up = #{sdcUp}, + start_time = #{startTime}, + end_time = #{endTime}, + charge_discharge_power = #{chargeDischargePower}, + charge_status = #{chargeStatus}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, site_id = #{siteId}, + template_id = #{templateId}, where id = #{id} @@ -100,7 +125,7 @@ select count(1) from ems_strategy_temp where template_id = #{templateId} + + + + + delete from ems_strategy_temp where template_id = #{templateId} + \ No newline at end of file diff --git a/ems-system/src/main/resources/mapper/ems/EmsStrategyTempTimeConfigMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsStrategyTempTimeConfigMapper.xml deleted file mode 100644 index c639a86..0000000 --- a/ems-system/src/main/resources/mapper/ems/EmsStrategyTempTimeConfigMapper.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select id, start_time, end_time, charge_discharge_power, charge_status, create_by, create_time, update_by, update_time, remark, template_id from ems_strategy_temp_time_config - - - - - - - - insert into ems_strategy_temp_time_config - - start_time, - end_time, - charge_discharge_power, - charge_status, - create_by, - create_time, - update_by, - update_time, - remark, - template_id, - - - #{startTime}, - #{endTime}, - #{chargeDischargePower}, - #{chargeStatus}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - #{templateId}, - - - - - update ems_strategy_temp_time_config - - start_time = #{startTime}, - end_time = #{endTime}, - charge_discharge_power = #{chargeDischargePower}, - charge_status = #{chargeStatus}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - template_id = #{templateId}, - - where id = #{id} - - - - delete from ems_strategy_temp_time_config where id = #{id} - - - - delete from ems_strategy_temp_time_config where id in - - #{id} - - - - - - - delete from ems_strategy_temp_time_config where template_id = #{templateId} - - \ No newline at end of file