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 index 1267d36..ad20c48 100644 --- 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 @@ -18,7 +18,6 @@ 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; -import com.xzzn.common.utils.poi.ExcelUtil; /** * 时间配置Controller @@ -40,20 +39,7 @@ public class EmsStrategyTimeConfigController extends BaseController @GetMapping("/list") public AjaxResult list(EmsStrategyTimeConfig emsStrategyTimeConfig) { - return success(emsStrategyTimeConfigService.selectEmsStrategyTimeConfigList(emsStrategyTimeConfig)); - } - - /** - * 导出时间配置列表 - */ - @PreAuthorize("@ss.hasPermi('system:config:export')") - @Log(title = "时间配置", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, EmsStrategyTimeConfig emsStrategyTimeConfig) - { - List list = emsStrategyTimeConfigService.selectEmsStrategyTimeConfigList(emsStrategyTimeConfig); - ExcelUtil util = new ExcelUtil(EmsStrategyTimeConfig.class); - util.exportExcel(response, list, "时间配置数据"); + return success(emsStrategyTimeConfigService.getStrategyTimeList(emsStrategyTimeConfig)); } /** @@ -72,9 +58,15 @@ public class EmsStrategyTimeConfigController extends BaseController @PreAuthorize("@ss.hasPermi('system:config:add')") @Log(title = "时间配置", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody EmsStrategyTimeConfig emsStrategyTimeConfig) + public AjaxResult add(@RequestBody List emsStrategyTimeConfigList) { - return toAjax(emsStrategyTimeConfigService.insertEmsStrategyTimeConfig(emsStrategyTimeConfig)); + boolean result = emsStrategyTimeConfigService.insertEmsStrategyTimeConfig(emsStrategyTimeConfigList); + if (result){ + return success(); + }else { + return error("编辑失败请重试！"); + } + } /** diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTimeConfig.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTimeConfig.java index 17256d6..5ba82ef 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTimeConfig.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTimeConfig.java @@ -34,9 +34,9 @@ public class EmsStrategyTimeConfig extends BaseEntity @Excel(name = "站点id") private String siteId; - /** 模板id */ - @Excel(name = "模板id") - private String templateId; + /** 模版id */ + @Excel(name = "模版id") + private Long templateId; public void setId(Long id) { @@ -88,12 +88,12 @@ public class EmsStrategyTimeConfig extends BaseEntity return siteId; } - public void setTemplateId(String templateId) + public void setTemplateId(Long templateId) { this.templateId = templateId; } - public String getTemplateId() + public Long getTemplateId() { return templateId; } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTimeConfigVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTimeConfigVo.java new file mode 100644 index 0000000..18862ce --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTimeConfigVo.java @@ -0,0 +1,99 @@ +package com.xzzn.ems.domain.vo; + +/** + * 时间配置显示对象 + * + * @author xzzn + * @date 2025-07-12 + */ +public class StrategyTimeConfigVo +{ + /** */ + private Long id; + + /** 关联的策略ID */ + private Long strategyId; + + /** 月份，1-12 */ + private Long month; + + /** 站点id */ + private String siteId; + + /** 充放电模式 */ + private String chargeDischargeMode; + + /** 模板id */ + private Long templateId; + + /** 模板名称 */ + private String templateName; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setStrategyId(Long strategyId) + { + this.strategyId = strategyId; + } + + public Long getStrategyId() + { + return strategyId; + } + + public void setMonth(Long month) + { + this.month = month; + } + + public Long getMonth() + { + return month; + } + + public void setChargeDischargeMode(String chargeDischargeMode) + { + this.chargeDischargeMode = chargeDischargeMode; + } + + public String getChargeDischargeMode() + { + return chargeDischargeMode; + } + + public void setSiteId(String siteId) + { + this.siteId = siteId; + } + + public String getSiteId() + { + return siteId; + } + + public void setTemplateId(Long templateId) + { + this.templateId = templateId; + } + + public Long getTemplateId() + { + return templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } +} 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 2662826..0754ce5 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 @@ -2,6 +2,7 @@ package com.xzzn.ems.mapper; import java.util.List; import com.xzzn.ems.domain.EmsStrategyTimeConfig; +import com.xzzn.ems.domain.vo.StrategyTimeConfigVo; /** * 时间配置Mapper接口 @@ -58,4 +59,7 @@ public interface EmsStrategyTimeConfigMapper * @return 结果 */ public int deleteEmsStrategyTimeConfigByIds(Long[] ids); + + // 获取该策略下的时间配置 + public List getStrategyTimeList(EmsStrategyTimeConfig emsStrategyTimeConfig); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsStrategyTimeConfigService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsStrategyTimeConfigService.java index dd658d6..3a8a1ea 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/IEmsStrategyTimeConfigService.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsStrategyTimeConfigService.java @@ -2,6 +2,7 @@ package com.xzzn.ems.service; import java.util.List; import com.xzzn.ems.domain.EmsStrategyTimeConfig; +import com.xzzn.ems.domain.vo.StrategyTimeConfigVo; /** * 时间配置Service接口 @@ -33,7 +34,7 @@ public interface IEmsStrategyTimeConfigService * @param emsStrategyTimeConfig 时间配置 * @return 结果 */ - public int insertEmsStrategyTimeConfig(EmsStrategyTimeConfig emsStrategyTimeConfig); + public boolean insertEmsStrategyTimeConfig(List emsStrategyTimeConfig); /** * 修改时间配置 @@ -58,4 +59,12 @@ public interface IEmsStrategyTimeConfigService * @return 结果 */ public int deleteEmsStrategyTimeConfigById(Long id); + + /** + * 获取策略的时间配置列表 + * + * @param emsStrategyTimeConfig 时间配置 + * @return 时间配置集合 + */ + public List getStrategyTimeList(EmsStrategyTimeConfig emsStrategyTimeConfig); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTimeConfigServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTimeConfigServiceImpl.java index fb35ed4..42f9d2b 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTimeConfigServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTimeConfigServiceImpl.java @@ -2,6 +2,7 @@ package com.xzzn.ems.service.impl; import java.util.List; import com.xzzn.common.utils.DateUtils; +import com.xzzn.ems.domain.vo.StrategyTimeConfigVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.xzzn.ems.mapper.EmsStrategyTimeConfigMapper; @@ -47,14 +48,28 @@ public class EmsStrategyTimeConfigServiceImpl implements IEmsStrategyTimeConfigS /** * 新增时间配置 * - * @param emsStrategyTimeConfig 时间配置 + * @param timeConfigList 时间配置 * @return 结果 */ @Override - public int insertEmsStrategyTimeConfig(EmsStrategyTimeConfig emsStrategyTimeConfig) + public boolean insertEmsStrategyTimeConfig(List timeConfigList) { - emsStrategyTimeConfig.setCreateTime(DateUtils.getNowDate()); - return emsStrategyTimeConfigMapper.insertEmsStrategyTimeConfig(emsStrategyTimeConfig); + if (timeConfigList != null) { + for (EmsStrategyTimeConfig strategyTimeConfig : timeConfigList) { + Long id = strategyTimeConfig.getId(); + // 新增 + if (id == null) { + strategyTimeConfig.setCreateTime(DateUtils.getNowDate()); + emsStrategyTimeConfigMapper.insertEmsStrategyTimeConfig(strategyTimeConfig); + } else {//更新 + strategyTimeConfig.setUpdateTime(DateUtils.getNowDate()); + emsStrategyTimeConfigMapper.updateEmsStrategyTimeConfig(strategyTimeConfig); + } + } + } else { + return false; + } + return true; } /** @@ -93,4 +108,14 @@ public class EmsStrategyTimeConfigServiceImpl implements IEmsStrategyTimeConfigS { return emsStrategyTimeConfigMapper.deleteEmsStrategyTimeConfigById(id); } + + /** + * 获取策略时间配置显示数据 + * @param emsStrategyTimeConfig 时间配置 + * @return + */ + public List getStrategyTimeList(EmsStrategyTimeConfig emsStrategyTimeConfig) + { + return emsStrategyTimeConfigMapper.getStrategyTimeList(emsStrategyTimeConfig); + } } diff --git a/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml index 49175c1..e67ef9e 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml @@ -29,7 +29,7 @@ and month = #{month} and charge_discharge_mode = #{chargeDischargeMode} and site_id = #{siteId} - and template_id = #{templateId} + and template_id = #{templateId} @@ -93,4 +93,18 @@ #{id} + + + \ No newline at end of file