diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStrategyController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStrategyController.java index e534224..4c3435e 100644 --- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStrategyController.java +++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStrategyController.java @@ -69,7 +69,7 @@ public class EmsStrategyController extends BaseController emsStrategyRunning.setUpdateBy(getUsername()); int result = emsStrategyService.configStrategy(emsStrategyRunning); if (result == -1){ - return error("站点该策略配置运行中"); + return error("不支持重复添加"); } return success(result); } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyRunningVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyRunningVo.java index 5531027..4bac091 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyRunningVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyRunningVo.java @@ -26,6 +26,12 @@ public class StrategyRunningVo /** 策略运行id */ private Long id; + /** 主策略id */ + private Long mainStrategyId; + + /** 辅助策略id */ + private Long auxStrategyId; + public void setStatus(String status) { this.status = status; @@ -79,4 +85,20 @@ public class StrategyRunningVo public void setId(Long id) { this.id = id; } + + public Long getAuxStrategyId() { + return auxStrategyId; + } + + public void setAuxStrategyId(Long auxStrategyId) { + this.auxStrategyId = auxStrategyId; + } + + public Long getMainStrategyId() { + return mainStrategyId; + } + + public void setMainStrategyId(Long mainStrategyId) { + this.mainStrategyId = mainStrategyId; + } } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyServiceImpl.java index 4bce076..3f358a2 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyServiceImpl.java @@ -27,8 +27,7 @@ public class EmsStrategyServiceImpl implements IEmsStrategyService @Override public List selectEmsStrategyRunningList(String siteId) { - List dataList = emsStrategyRunningMapper.getRunningList(siteId); - return dataList; + return emsStrategyRunningMapper.getRunningList(siteId); } @Override @@ -53,10 +52,14 @@ public class EmsStrategyServiceImpl implements IEmsStrategyService if (existStrategy != null) { return -1; } - // 不存在则插入 + // 传策略组id-更新 + if (emsStrategyRunning.getId() != null){ + emsStrategyRunning.setUpdateTime(DateUtils.getNowDate()); + return emsStrategyRunningMapper.updateEmsStrategyRunning(emsStrategyRunning); + } + // 否则新增 emsStrategyRunning.setStatus("1"); emsStrategyRunning.setCreateTime(DateUtils.getNowDate()); - emsStrategyRunning.setUpdateTime(DateUtils.getNowDate()); return emsStrategyRunningMapper.insertEmsStrategyRunning(emsStrategyRunning); } } diff --git a/ems-system/src/main/resources/mapper/ems/EmsStrategyRunningMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsStrategyRunningMapper.xml index 19d5206..030e983 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsStrategyRunningMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsStrategyRunningMapper.xml @@ -91,7 +91,9 @@ t.`status`, t.site_id as siteId, main.strategy_name as mainStrategyName, - aux.strategy_name as auxStrategyName + aux.strategy_name as auxStrategyName, + main.id as mainStrategyId, + aux.id as auxStrategyId from ems_strategy_running t LEFT JOIN ems_strategy main on t.main_strategy_id = main.id LEFT JOIN ems_strategy aux on t.auxiliary_strategy_id = aux.id