策略配置-模板修改&模板时间配置

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

@@ -1,5 +1,6 @@
 package com.xzzn.web.controller.ems;
 
+import com.xzzn.common.utils.StringUtils;
 import com.xzzn.ems.domain.EmsStrategyRunning;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -60,8 +61,16 @@ public class EmsStrategyController extends BaseController
     @PostMapping(value = "/configStrategy")
     public AjaxResult configStrategy(@RequestBody EmsStrategyRunning emsStrategyRunning)
     {
+        if (emsStrategyRunning.getMainStrategyId() == null
+                || StringUtils.isEmpty(emsStrategyRunning.getSiteId())){
+            return error("缺少必填字段");
+        }
         emsStrategyRunning.setCreateBy(getUsername());
         emsStrategyRunning.setUpdateBy(getUsername());
-        return toAjax(emsStrategyService.configStrategy(emsStrategyRunning));
+        int result = emsStrategyService.configStrategy(emsStrategyRunning);
+        if (result == -1){
+            return error("站点该策略配置运行中");
+        }
+        return success(result);
     }
 }

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

@@ -2,6 +2,8 @@ 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;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,47 +36,24 @@ public class EmsStrategyTempController extends BaseController
     private IEmsStrategyTempService emsStrategyTempService;
 
     /**
-     * 查询模板列表
+     * 获取单个模板时间配置详细信息
      */
     @PreAuthorize("@ss.hasPermi('system:temp:list')")
     @GetMapping("/list")
-    public AjaxResult list(EmsStrategyTemp emsStrategyTemp)
+    public AjaxResult list(Long templateId)
     {
-        return success(emsStrategyTempService.selectEmsStrategyTempList(emsStrategyTemp));
+        return success(emsStrategyTempService.selectEmsStrategyTempList(templateId));
     }
 
     /**
-     * 导出模板列表
-     */
-    @PreAuthorize("@ss.hasPermi('system:temp:export')")
-    @Log(title = "模板", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, EmsStrategyTemp emsStrategyTemp)
-    {
-        List<EmsStrategyTemp> list = emsStrategyTempService.selectEmsStrategyTempList(emsStrategyTemp);
-        ExcelUtil<EmsStrategyTemp> util = new ExcelUtil<EmsStrategyTemp>(EmsStrategyTemp.class);
-        util.exportExcel(response, list, "模板数据");
-    }
-
-    /**
-     * 获取模板详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('system:temp:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(emsStrategyTempService.selectEmsStrategyTempById(id));
-    }
-
-    /**
-     * 新增模板
+     * 新增模板及时间配置
      */
     @PreAuthorize("@ss.hasPermi('system:temp:add')")
     @Log(title = "模板", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody EmsStrategyTemp emsStrategyTemp)
+    public AjaxResult add(@RequestBody StrategyTempConfigRequest requestVo)
     {
-        return toAjax(emsStrategyTempService.insertEmsStrategyTemp(emsStrategyTemp));
+        return success(emsStrategyTempService.addNewTempAndTimeConfig(requestVo));
     }
 
     /**
@@ -85,7 +64,12 @@ public class EmsStrategyTempController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody EmsStrategyTemp emsStrategyTemp)
     {
-        return toAjax(emsStrategyTempService.updateEmsStrategyTemp(emsStrategyTemp));
+        int result = emsStrategyTempService.updateEmsStrategyTemp(emsStrategyTemp);
+        if (result > 0) {
+            return success(result);
+        } else  {
+            return AjaxResult.error("新增失败请重试！");
+        }
     }
 
     /**
@@ -93,10 +77,11 @@ public class EmsStrategyTempController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:temp:remove')")
     @Log(title = "模板", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
+    @DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable Long id)
     {
-        return toAjax(emsStrategyTempService.deleteEmsStrategyTempByIds(ids));
+        emsStrategyTempService.deleteStrategyTempById(id);
+        return success();
     }
 
     /**