优化daima

java110-db/src/main/resources/mapper/job/TaskAttrServiceDaoImplMapper.xml

@@ -26,7 +26,7 @@
         <if test="operate !=null and operate != ''">
             and t.operate= #{operate}
         </if>
-        <if test="createTime !=null and createTime != ''">
+        <if test="createTime !=null">
             and t.create_time= #{createTime}
         </if>
         <if test="specCd !=null and specCd != ''">
@@ -54,7 +54,7 @@
             and t.attr_id= #{attrId}
         </if>
         and t.operate= 'ADD'
-        <if test="createTime !=null and createTime != ''">
+        <if test="createTime !=null ">
             and t.create_time= #{createTime}
         </if>
         <if test="specCd !=null and specCd != ''">
@@ -82,7 +82,7 @@
         <if test="attrId !=null and attrId != ''">
             and t.attr_id= #{attrId}
         </if>
-        <if test="createTime !=null and createTime != ''">
+        <if test="createTime !=null">
             and t.create_time= #{createTime}
         </if>
         <if test="specCd !=null and specCd != ''">
@@ -114,9 +114,6 @@
         <if test="newBId != null and newBId != ''">
             ,t.b_id = #{newBId}
         </if>
-        <if test="createTime !=null and createTime != ''">
-            , t.create_time= #{createTime}
-        </if>
         <if test="specCd !=null and specCd != ''">
             , t.spec_cd= #{specCd}
         </if>
@@ -144,7 +141,7 @@
         <if test="attrId !=null and attrId != ''">
             and t.attr_id= #{attrId}
         </if>
-        <if test="createTime !=null and createTime != ''">
+        <if test="createTime !=null">
             and t.create_time= #{createTime}
         </if>
         <if test="specCd !=null and specCd != ''">

service-job/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.job.dao.IHcFtpFileDAO;
-import com.java110.job.task.TaskSystemJob;
+import com.java110.job.quartz.TaskSystemJob;
 import org.apache.commons.validator.GenericValidator;
 import org.apache.commons.validator.util.ValidatorUtils;
 import org.quartz.*;

service-job/src/main/java/com/java110/job/task/TaskSystemJob.java

@@ -1,4 +1,4 @@
-package com.java110.job.task;
+package com.java110.job.quartz;
 
 import com.java110.dto.task.TaskDto;
 import com.java110.utils.factory.ApplicationContextFactory;

service-job/src/main/java/com/java110/job/task/TaskSystemQuartz.java

@@ -1,4 +1,4 @@
-package com.java110.job.task;
+package com.java110.job.quartz;
 
 import com.java110.dto.task.TaskDto;
 import org.slf4j.Logger;

service-job/src/main/java/com/java110/job/smo/DownloadFileFromFtpToTable.java

@@ -1,6 +1,5 @@
 package com.java110.job.smo;
 
-import com.java110.job.task.TaskSystemQuartz;
 import com.java110.job.util.FTPClientTemplate;
 import org.apache.commons.net.ftp.FTP;
 import org.apache.commons.net.ftp.FTPClient;

service-job/src/main/java/com/java110/job/smo/impl/TaskInnerServiceSMOImpl.java

@@ -12,7 +12,7 @@ import com.java110.dto.taskAttr.TaskAttrDto;
 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 @@ public class TaskInnerServiceSMOImpl extends BaseServiceSMO implements ITaskInne
      * @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 @@ public class TaskInnerServiceSMOImpl extends BaseServiceSMO implements ITaskInne
         Assert.listOnlyOne(taskTemplateDtos, "模板不存在或存在多个");
 
         taskDto.setTaskTemplateDto(taskTemplateDtos.get(0));
+        taskDto.setTaskAttr(attrDtos);
 
         try {
             String cronExpression = taskDto.getTaskCron();// 如果没有配置则，每一分运行一次

service-job/src/main/java/com/java110/job/task/TranslateOwnerPhotoToMachine.java

@@ -0,0 +1,19 @@
+package com.java110.job.task;
+
+import com.java110.dto.task.TaskDto;
+import com.java110.job.quartz.TaskSystemQuartz;
+
+/**
+ * @ClassName TransalateOwnerPhotoToMachine
+ * @Description TODO
+ * @Author wuxw
+ * @Date 2020/6/3 20:59
+ * @Version 1.0
+ * add by wuxw 2020/6/3
+ **/
+public class TranslateOwnerPhotoToMachine extends TaskSystemQuartz {
+    @Override
+    protected void process(TaskDto taskDto) throws Exception {
+
+    }
+}