Commit 9261c459 by 张祺

修改启动任务的方法

parent 16f9ea0e
...@@ -530,7 +530,7 @@ public class TaskServiceImpl implements TaskService { ...@@ -530,7 +530,7 @@ public class TaskServiceImpl implements TaskService {
List<TaskIndicator> taskIndicators = new ArrayList<>(); List<TaskIndicator> taskIndicators = new ArrayList<>();
for (TaskRuleIndicator indicator : indicators) { for (TaskRuleIndicator indicator : indicators) {
List<BaseIndDef> baseIndDefs = List<BaseIndDef> baseIndDefs =
this.indRelService.getRelByIndId(indicator.getIndId(), "0"); this.indRelService.getRelByIndId(indicator.getIndId(), "1");
getBaseIndDef(ruleId, null, baseIndDefs, taskIndicators); getBaseIndDef(ruleId, null, baseIndDefs, taskIndicators);
} }
if (CollectionUtils.isNotEmpty(taskIndicators)) { if (CollectionUtils.isNotEmpty(taskIndicators)) {
...@@ -613,7 +613,8 @@ public class TaskServiceImpl implements TaskService { ...@@ -613,7 +613,8 @@ public class TaskServiceImpl implements TaskService {
if (result.isSuccess()) { if (result.isSuccess()) {
LogManager.logInfo(Constants.LOG_CONTEXT_API, "任务id:{},名字:{}下发成功", rule.getId(), rule.getName() ); LogManager.logInfo(Constants.LOG_CONTEXT_API, "任务id:{},名字:{}下发成功", rule.getId(), rule.getName() );
} else { } else {
LogManager.logInfo(Constants.LOG_CONTEXT_API, "任务id:{},名字:{}下发失败", rule.getId(), rule.getName() ); LogManager.logInfo(Constants.LOG_CONTEXT_API, "任务id:{},名字:{}下发失败, {}",
rule.getId(), rule.getName(), result.getMsg() );
} }
return result; return result;
} }
...@@ -628,6 +629,9 @@ public class TaskServiceImpl implements TaskService { ...@@ -628,6 +629,9 @@ public class TaskServiceImpl implements TaskService {
private void getBaseIndDef(Integer ruleId, String parentIndId, List<BaseIndDef> baseIndDefs, List<TaskIndicator> taskIndicators) { private void getBaseIndDef(Integer ruleId, String parentIndId, List<BaseIndDef> baseIndDefs, List<TaskIndicator> taskIndicators) {
if (CollectionUtils.isNotEmpty(baseIndDefs)) { if (CollectionUtils.isNotEmpty(baseIndDefs)) {
for (BaseIndDef baseIndDef : baseIndDefs) { for (BaseIndDef baseIndDef : baseIndDefs) {
if (baseIndDef == null) {
continue;
}
TaskIndicator taskIndicator = new TaskIndicator(); TaskIndicator taskIndicator = new TaskIndicator();
taskIndicator.setIndFormula(baseIndDef.getIndFormat()); taskIndicator.setIndFormula(baseIndDef.getIndFormat());
taskIndicator.setRuleId(ruleId); taskIndicator.setRuleId(ruleId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment