From ea6e1675bbd411e30b21369698ed4b0587c21c0e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 08 五月 2021 13:45:34 +0800
Subject: [PATCH] 优化代码

---
 service-job/src/main/java/com/java110/job/smo/impl/TaskInnerServiceSMOImpl.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/smo/impl/TaskInnerServiceSMOImpl.java b/service-job/src/main/java/com/java110/job/smo/impl/TaskInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index 3197957..6bacb97
--- a/service-job/src/main/java/com/java110/job/smo/impl/TaskInnerServiceSMOImpl.java
+++ b/service-job/src/main/java/com/java110/job/smo/impl/TaskInnerServiceSMOImpl.java
@@ -2,8 +2,8 @@
 
 
 import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.task.ITaskInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.intf.job.ITaskInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.task.TaskDto;
 import com.java110.dto.task.TaskTemplateDto;
@@ -12,7 +12,7 @@
 import com.java110.dto.user.UserDto;
 import com.java110.job.dao.ITaskAttrServiceDao;
 import com.java110.job.dao.ITaskServiceDao;
-import com.java110.job.task.TaskSystemJob;
+import com.java110.job.quartz.TaskSystemJob;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.quartz.CronScheduleBuilder;
@@ -179,8 +179,8 @@
      * @return
      */
     public int startTask(@RequestBody TaskDto taskDto) {
-//        List<TaskAttrDto> attrDtos = BeanConvertUtil.covertBeanList(taskAttrServiceDaoImpl.getTaskAttrInfo(BeanConvertUtil.beanCovertMap(taskDto)),
-//                TaskAttrDto.class);
+        List<TaskAttrDto> attrDtos = BeanConvertUtil.covertBeanList(taskAttrServiceDaoImpl.getTaskAttrInfo(BeanConvertUtil.beanCovertMap(taskDto)),
+                TaskAttrDto.class);
         Map info = new HashMap();
         info.put("templateId", taskDto.getTemplateId());
         List<TaskTemplateDto> taskTemplateDtos = BeanConvertUtil.covertBeanList(taskServiceDaoImpl.getTaskTemplateInfo(info), TaskTemplateDto.class);
@@ -188,6 +188,7 @@
         Assert.listOnlyOne(taskTemplateDtos, "妯℃澘涓嶅瓨鍦ㄦ垨瀛樺湪澶氫釜");
 
         taskDto.setTaskTemplateDto(taskTemplateDtos.get(0));
+        taskDto.setTaskAttr(attrDtos);
 
         try {
             String cronExpression = taskDto.getTaskCron();// 濡傛灉娌℃湁閰嶇疆鍒欙紝姣忎竴鍒嗚繍琛屼竴娆�

--
Gitblit v1.8.0