优化 返回任务属性

java110-bean/src/main/java/com/java110/dto/task/TaskDto.java

@@ -1,9 +1,11 @@
 package com.java110.dto.task;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.taskAttr.TaskAttrDto;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -23,6 +25,8 @@ public class TaskDto extends PageDto implements Serializable {
     private String templateName;
     private String taskId;
 
+    private List<TaskAttrDto> taskAttr;
+
 
     private Date createTime;
 
@@ -102,4 +106,12 @@ public class TaskDto extends PageDto implements Serializable {
     public void setTemplateName(String templateName) {
         this.templateName = templateName;
     }
+
+    public List<TaskAttrDto> getTaskAttr() {
+        return taskAttr;
+    }
+
+    public void setTaskAttr(List<TaskAttrDto> taskAttr) {
+        this.taskAttr = taskAttr;
+    }
 }

service-api/src/main/java/com/java110/api/listener/task/ListTasksListener.java

@@ -6,7 +6,9 @@ import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
 import com.java110.core.smo.task.ITaskInnerServiceSMO;
+import com.java110.core.smo.taskAttr.ITaskAttrInnerServiceSMO;
 import com.java110.dto.task.TaskDto;
+import com.java110.dto.taskAttr.TaskAttrDto;
 import com.java110.result.ResultVo;
 import com.java110.utils.constant.ServiceCodeTaskConstant;
 import com.java110.utils.util.BeanConvertUtil;
@@ -27,6 +29,9 @@ public class ListTasksListener extends AbstractServiceApiListener {
     @Autowired
     private ITaskInnerServiceSMO taskInnerServiceSMOImpl;
 
+    @Autowired
+    private ITaskAttrInnerServiceSMO taskAttrInnerServiceSMOImpl;
+
     @Override
     public String getServiceCode() {
         return ServiceCodeTaskConstant.LIST_TASKS;
@@ -68,6 +73,7 @@ public class ListTasksListener extends AbstractServiceApiListener {
 
         if (count > 0) {
             taskDtos = taskInnerServiceSMOImpl.queryTasks(taskDto);
+            freshTaskAttr(taskDtos);
         } else {
             taskDtos = new ArrayList<>();
         }
@@ -79,4 +85,21 @@ public class ListTasksListener extends AbstractServiceApiListener {
         context.setResponseEntity(responseEntity);
 
     }
+
+    /**
+     * 查询属性
+     *
+     * @param taskDtos
+     */
+    private void freshTaskAttr(List<TaskDto> taskDtos) {
+
+        for (TaskDto taskDto : taskDtos) {
+            TaskAttrDto taskAttrDto = new TaskAttrDto();
+            taskAttrDto.setTaskId(taskDto.getTaskId());
+            List<TaskAttrDto> taskAttrDtos = taskAttrInnerServiceSMOImpl.queryTaskAttrs(taskAttrDto);
+            taskDto.setTaskAttr(taskAttrDtos);
+        }
+
+
+    }
 }