修改规则下发生成任务的方法

src/main/java/com/keymobile/indicators/api/hytobacco/TaskRuleCtrl.java

@@ -86,7 +86,7 @@ public class TaskRuleCtrl {
                 rule.setCreateTime(now);
                 rule.setCreator(currentUserId);
                 taskRuleService.createRule(rule);
-                LogManager.logInfo(Constants.LOG_CONTEXT_API, "创建了规则name={}", rule.getName());
+                LogManager.logInfo(Constants.LOG_CONTEXT_API, "创建了规则id={},name={}", rule.getId(), rule.getName());
             } else {
                 TaskRule t = taskRuleService.getById(rule.getId(), false);
                 rule.setCreator(t.getCreator());
@@ -94,7 +94,7 @@ public class TaskRuleCtrl {
                 taskRuleService.updateRule(rule);
                 LogManager.logInfo(Constants.LOG_CONTEXT_API, "修改id={}, name={} 的任务规则", rule.getId(), rule.getName());
             }
-            result = Result.genOkResult();
+            result = Result.genOkResult(rule);
         }
         return result;
     }

src/main/java/com/keymobile/indicators/model/entity/dataenter/TaskIndicator.java

@@ -29,6 +29,11 @@ public class TaskIndicator extends BaseModel {
     private String taskId;
 
     /**
+     * 数据时间,例如2019-03
+     */
+    private String valueTime;
+
+    /**
      * 指标id
      */
     private String indId;

src/main/java/com/keymobile/indicators/service/dataenter/TaskRuleService.java

@@ -46,6 +46,12 @@ public interface TaskRuleService {
     void updateRule(TaskRule rule);
 
     /**
+     * 只更新规则不包含相关的指标
+     * @param rule
+     */
+    void updateRuleWithInd(TaskRule rule);
+
+    /**
      * 根据规则类型、关键字分页查找规则
      * @param ruleType
      * @param ruleLevel

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskRuleServiceImpl.java

@@ -70,6 +70,7 @@ public class TaskRuleServiceImpl implements TaskRuleService {
         List<TaskRuleIndicator> indicators = rule.getIndicators();
         if (CollectionUtils.isNotEmpty(indicators)) {
             for (TaskRuleIndicator indicator : indicators) {
+                indicator.setId(null);
                 indicator.setRuleId(rule.getId());
                 indicator.setState(Constants.DATA_STATE_A);
                 indicator.setCreateTime(rule.getUpdateTime());
@@ -91,6 +92,11 @@ public class TaskRuleServiceImpl implements TaskRuleService {
     }
 
     @Override
+    public void updateRuleWithInd(TaskRule rule) {
+        taskRuleMapper.updateByPrimaryKey(rule);
+    }
+
+    @Override
     public Page<TaskRule> findRuleByPage(Integer ruleType, String ruleLevel, String keyword, int page, int pageSize) {
         long total = taskRuleMapper.findRuleCount(ruleType, ruleLevel, keyword);
         PageRequest request = PageRequest.of(page - 1, pageSize);

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskServiceImpl.java

@@ -111,6 +111,7 @@ public class TaskServiceImpl implements TaskService {
                 indicator.setId(IdWorker.getStrId());
                 indicator.setState(Constants.DATA_STATE_A);
                 indicator.setTaskId(task.getId());
+                indicator.setValueTime(task.getValueTime());
                 indicator.setRuleId(task.getRuleId());
                 taskIndicatorMapper.insert(indicator);
             }
@@ -528,7 +529,7 @@ public class TaskServiceImpl implements TaskService {
                         List<TaskIndicator> taskIndicators = new ArrayList<>();
                         for (TaskRuleIndicator indicator : indicators) {
                             List<BaseIndDef> baseIndDefs =
-                                    this.indRelService.getRelByIndId(indicator.getIndId(), "1");
+                                    this.indRelService.getRelByIndId(indicator.getIndId(), "0");
                             getBaseIndDef(ruleId, null, baseIndDefs, taskIndicators);
                         }
                         if (CollectionUtils.isNotEmpty(taskIndicators)) {
@@ -585,7 +586,7 @@ public class TaskServiceImpl implements TaskService {
                                 }
                                 this.batchCreateTask(allTasks, valueTime, ruleId);
                                 rule.setLastActiveTime(now);
-                                taskRuleService.updateRule(rule);
+                                taskRuleService.updateRuleWithInd(rule);
                                 result = Result.genOkResult();
                             }
                         } else {

src/main/resources/mybatis/mapping/TaskMapper.xml

@@ -89,10 +89,10 @@
     </sql>
 
 
-    <update id="deleteByRuleIdAndValueTime" parameterType="java.lang.Integer">
+    <update id="deleteByRuleIdAndValueTime">
     	update  data_enter_task
     	set state = 3
-    	where rule_id = #{ruleId} and value_time = #{valueTime
+    	where rule_id = #{ruleId} and value_time = #{valueTime}
     </update>
 
     <resultMap type="com.keymobile.indicators.model.entity.dataenter.TaskStatusCountResult" id="taskStatusCountResult">