策略配置-策略时间配置

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));
+        return  success(emsStrategyTimeConfigService.getStrategyTimeList(emsStrategyTimeConfig));
-    }
-
-    /**
-     * 导出时间配置列表
-     */
-    @PreAuthorize("@ss.hasPermi('system:config:export')")
-    @Log(title = "时间配置", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, EmsStrategyTimeConfig emsStrategyTimeConfig)
-    {
-        List<EmsStrategyTimeConfig> list = emsStrategyTimeConfigService.selectEmsStrategyTimeConfigList(emsStrategyTimeConfig);
-        ExcelUtil<EmsStrategyTimeConfig> util = new ExcelUtil<EmsStrategyTimeConfig>(EmsStrategyTimeConfig.class);
-        util.exportExcel(response, list, "时间配置数据");
     }
 
     /**
@@ -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<EmsStrategyTimeConfig> emsStrategyTimeConfigList)
     {
-        return toAjax(emsStrategyTimeConfigService.insertEmsStrategyTimeConfig(emsStrategyTimeConfig));
+        boolean result = emsStrategyTimeConfigService.insertEmsStrategyTimeConfig(emsStrategyTimeConfigList);
+        if (result){
+            return success();
+        }else {
+            return error("编辑失败请重试！");
+        }
+
     }
 
     /**

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 */
+    /** 模版id */
-    @Excel(name = "模板id")
+    @Excel(name = "模版id")
-    private String templateId;
+    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;
     }

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;
+    }
+}

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<StrategyTimeConfigVo> getStrategyTimeList(EmsStrategyTimeConfig emsStrategyTimeConfig);
 }

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> emsStrategyTimeConfig);
 
     /**
      * 修改时间配置
@@ -58,4 +59,12 @@ public interface IEmsStrategyTimeConfigService
      * @return 结果
      */
     public int deleteEmsStrategyTimeConfigById(Long id);
+
+    /**
+     * 获取策略的时间配置列表
+     *
+     * @param emsStrategyTimeConfig 时间配置
+     * @return 时间配置集合
+     */
+    public List<StrategyTimeConfigVo> getStrategyTimeList(EmsStrategyTimeConfig emsStrategyTimeConfig);
 }

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<EmsStrategyTimeConfig> timeConfigList)
     {
-        emsStrategyTimeConfig.setCreateTime(DateUtils.getNowDate());
+        if (timeConfigList != null) {
-        return emsStrategyTimeConfigMapper.insertEmsStrategyTimeConfig(emsStrategyTimeConfig);
+            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<StrategyTimeConfigVo> getStrategyTimeList(EmsStrategyTimeConfig emsStrategyTimeConfig)
+    {
+        return emsStrategyTimeConfigMapper.getStrategyTimeList(emsStrategyTimeConfig);
+    }
 }

ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml

@@ -29,7 +29,7 @@
             <if test="month != null "> and month = #{month}</if>
             <if test="chargeDischargeMode != null  and chargeDischargeMode != ''"> and charge_discharge_mode = #{chargeDischargeMode}</if>
             <if test="siteId != null  and siteId != ''"> and site_id = #{siteId}</if>
-            <if test="templateId != null  and templateId != ''"> and template_id = #{templateId}</if>
+            <if test="templateId != null "> and template_id = #{templateId}</if>
         </where>
     </select>
 
@@ -93,4 +93,18 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="getStrategyTimeList" parameterType="EmsStrategyTimeConfig" resultType="com.xzzn.ems.domain.vo.StrategyTimeConfigVo">
+        select  t.id,
+                t.month,
+                t.charge_discharge_mode as chargeDischargeMode,
+                t.template_id as templateId,
+                temp.template_name as templateName
+        from ems_strategy_time_config t
+         LEFT JOIN ems_strategy_temp temp on t.template_id = temp.id
+        where t.site_id = #{siteId}
+        and t.strategy_id = #{strategyId}
+        order by month
+    </select>
+
 </mapper>