策略配置-模板修改

ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStrategyTempController.java

@@ -53,7 +53,12 @@ public class EmsStrategyTempController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody StrategyTempConfigRequest requestVo)
     {
-        return success(emsStrategyTempService.addNewTempAndTimeConfig(requestVo));
+        boolean result = emsStrategyTempService.addNewTempAndTimeConfig(requestVo);
+        if (result) {
+            return success();
+        } else  {
+            return AjaxResult.error("新增失败请重试！");
+        }
     }
 
     /**
@@ -62,13 +67,13 @@ public class EmsStrategyTempController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:temp:edit')")
     @Log(title = "模板", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody EmsStrategyTemp emsStrategyTemp)
+    public AjaxResult edit(@RequestBody StrategyTempConfigRequest requestVo)
     {
-        int result = emsStrategyTempService.updateEmsStrategyTemp(emsStrategyTemp);
+        boolean result = emsStrategyTempService.updateEmsStrategyTemp(requestVo);
-        if (result > 0) {
+        if (result) {
-            return success(result);
+            return success();
         } else  {
-            return AjaxResult.error("新增失败请重试！");
+            return AjaxResult.error("更新失败，请重试！");
         }
     }
 

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 = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
-    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "开始时间", width = 30, dateFormat = "HH:mm:ss")
     private Date startTime;
 
     /** 结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
-    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "HH:mm:ss")
     private Date endTime;
 
     /** 充放功率 (kW) */

ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTempConfigRequest.java

@@ -37,6 +37,14 @@ public class StrategyTempConfigRequest
     /** 模板时间 */
     private List<EmsStrategyTempTimeConfig> timeConfigList;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public void setStrategyId(Long strategyId)
     {
         this.strategyId = strategyId;

ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTempTimeConfigVo.java

@@ -35,11 +35,11 @@ public class StrategyTempTimeConfigVo
     private String siteId;
 
     /** 开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
     private Date startTime;
 
     /** 结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
     private Date endTime;
 
     /** 充放功率 (kW) */

ems-system/src/main/java/com/xzzn/ems/service/IEmsStrategyTempService.java

@@ -20,15 +20,15 @@ public interface IEmsStrategyTempService
     public List<StrategyTempTimeConfigVo> selectEmsStrategyTempList(Long id);
 
     // 新增模板及时间配置
-    public int addNewTempAndTimeConfig(StrategyTempConfigRequest requestVo);
+    public boolean addNewTempAndTimeConfig(StrategyTempConfigRequest requestVo);
 
     /**
      * 修改模板
      *
-     * @param emsStrategyTemp 模板
+     * @param requestVo 模板
      * @return 结果
      */
-    public int updateEmsStrategyTemp(EmsStrategyTemp emsStrategyTemp);
+    public boolean updateEmsStrategyTemp(StrategyTempConfigRequest requestVo);
 
     /**
      * 批量删除模板

ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTempServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 import com.xzzn.ems.mapper.EmsStrategyTempMapper;
 import com.xzzn.ems.domain.EmsStrategyTemp;
 import com.xzzn.ems.service.IEmsStrategyTempService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 模板Service业务层处理
@@ -43,7 +44,7 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService
         EmsStrategyTemp temp = emsStrategyTempMapper.selectEmsStrategyTempById(templateId);
         if (temp != null)  {
             List<EmsStrategyTempTimeConfig> timeList = emsStrategyTempTimeConfigMapper.getTimeListByTempId(templateId);
-            if (timeList != null)  {
+            if (timeList != null && !timeList.isEmpty())  {
                 for (EmsStrategyTempTimeConfig timeConfig : timeList) {
                     StrategyTempTimeConfigVo vo = new StrategyTempTimeConfigVo();
                     BeanUtils.copyProperties(timeConfig, vo);
@@ -62,14 +63,37 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService
     /**
      * 修改模板
      *
-     * @param emsStrategyTemp 模板
+     * @param requestVo 模板
      * @return 结果
      */
     @Override
-    public int updateEmsStrategyTemp(EmsStrategyTemp emsStrategyTemp)
+    @Transactional(rollbackFor = Exception.class)
+    public boolean updateEmsStrategyTemp(StrategyTempConfigRequest requestVo)
     {
-        emsStrategyTemp.setUpdateTime(DateUtils.getNowDate());
+        Long id = requestVo.getId();
-        return emsStrategyTempMapper.updateEmsStrategyTemp(emsStrategyTemp);
+        // 根据模板id校验该模板是否存在
+        EmsStrategyTemp temp = emsStrategyTempMapper.selectEmsStrategyTempById(id);
+        if (temp == null)  {
+            return false;
+        }
+        // 更新模板数据
+        BeanUtils.copyProperties(requestVo, temp);
+        emsStrategyTempMapper.updateEmsStrategyTemp(temp);
+
+        // 先删除再加
+        emsStrategyTempTimeConfigMapper.deleteTimeConfigByTempId(id);
+
+        List<EmsStrategyTempTimeConfig> timeList = requestVo.getTimeConfigList();
+        if (timeList != null)  {
+            for (EmsStrategyTempTimeConfig timeConfig : timeList) {
+                timeConfig.setTemplateId(id);
+                timeConfig.setCreateTime(DateUtils.getNowDate());
+                timeConfig.setUpdateTime(DateUtils.getNowDate());
+                emsStrategyTempTimeConfigMapper.insertEmsStrategyTempTimeConfig(timeConfig);
+            }
+        }
+
+        return true;
     }
 
     /**
@@ -101,8 +125,10 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService
         return emsStrategyTempMapper.getTempNameList(strategyId, siteId);
     }
 
+    // 新增模板和时间配置
     @Override
-    public int addNewTempAndTimeConfig(StrategyTempConfigRequest requestVo) {
+    @Transactional(rollbackFor = Exception.class)
+    public boolean addNewTempAndTimeConfig(StrategyTempConfigRequest requestVo) {
         EmsStrategyTemp emsStrategyTemp = new EmsStrategyTemp();
         BeanUtils.copyProperties(requestVo, emsStrategyTemp);
         emsStrategyTemp.setCreateTime(DateUtils.getNowDate());
@@ -116,7 +142,7 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService
                 emsStrategyTempTimeConfigMapper.insertEmsStrategyTempTimeConfig(timeConfig);
             }
         }
-        return 1;
+        return true;
     }