修改包名为ozs

da/src/main/java/com/datau/da/DaApplication.java

@@ -1,6 +1,6 @@
-package com.datau.da;
+package com.ozs.da;
 
-import com.datau.da.job.JobServer;
+import com.ozs.da.job.JobServer;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

da/src/main/java/com/datau/da/config/DruidDataSourceConfiguration.java

@@ -1,4 +1,4 @@
-package com.datau.da.config;
+package com.ozs.da.config;
 
 import javax.sql.DataSource;
 

da/src/main/java/com/datau/da/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.datau.da.config;
+package com.ozs.da.config;
 
 import java.util.ArrayList;
 import java.util.List;

da/src/main/java/com/datau/da/constant/Constant.java

@@ -1,4 +1,4 @@
-package com.datau.da.constant;
+package com.ozs.da.constant;
 
 /**
  * @author 许明

da/src/main/java/com/datau/da/constant/StatusCode.java

@@ -1,6 +1,6 @@
-package com.datau.da.constant;
+package com.ozs.da.constant;
 
-import com.datau.da.entity.ReturnData;
+import com.ozs.da.entity.ReturnData;
 
 import java.util.HashMap;
 

da/src/main/java/com/datau/da/controller/DataQualityController.java

@@ -1,4 +1,4 @@
-package com.datau.da.controller;
+package com.ozs.da.controller;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -10,6 +10,10 @@ import java.util.List;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ozs.da.entity.dataquality.ListDataDTO;
+import com.ozs.da.entity.dataquality.QuerySqlDTO;
+import com.ozs.da.entity.dataquality.UpdateDataDTO;
+import com.ozs.da.service.DataQualityService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.poi.util.IOUtils;
@@ -21,14 +25,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.datau.da.entity.dataquality.ListDataDTO;
-import com.datau.da.entity.dataquality.QuerySqlDTO;
-import com.datau.da.entity.dataquality.UpdateDataDTO;
-import com.datau.da.entity.remotedb.MdmInfoDatabase;
-import com.datau.da.entity.remotedb.MdmInfoTable;
-import com.datau.da.service.DataQualityService;
-import com.datau.da.utils.R;
-import com.datau.da.utils.S;
+import com.ozs.da.entity.remotedb.MdmInfoDatabase;
+import com.ozs.da.entity.remotedb.MdmInfoTable;
+import com.ozs.da.utils.R;
+import com.ozs.da.utils.S;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -106,10 +106,10 @@ public class DataQualityController {
 			@ApiImplicitParam(name = "pageSize", value = "每页条数", required = false, paramType = "query", dataType = "Integer") })
 	@GetMapping("/da/dataQuality/listData")
 	public R<ListDataDTO> listData(@RequestParam(name = "tableId", required = true) String tableId,
-			@RequestParam(name = "primarySql", required = true) String primarySql,
-			@RequestParam(name = "qureySql", required = true) String qureySql,
-			@RequestParam(required = false, defaultValue = "1") Integer page,
-			@RequestParam(required = false, defaultValue = "10") Integer pageSize) {
+                                   @RequestParam(name = "primarySql", required = true) String primarySql,
+                                   @RequestParam(name = "qureySql", required = true) String qureySql,
+                                   @RequestParam(required = false, defaultValue = "1") Integer page,
+                                   @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
 		try {
 			return dataQualityService.listData(tableId, primarySql + qureySql, page, pageSize);
 		} catch (Exception e) {

da/src/main/java/com/datau/da/controller/TaskController.java

@@ -1,15 +1,15 @@
-package com.datau.da.controller;
+package com.ozs.da.controller;
 
-import com.datau.da.entity.PageParams;
-import com.datau.da.entity.ReturnData;
-import com.datau.da.entity.remotedb.MdmInfoColumn;
-import com.datau.da.entity.remotedb.MdmInfoDatabase;
-import com.datau.da.entity.remotedb.MdmInfoTable;
-import com.datau.da.entity.task.JobOperateCmd;
-import com.datau.da.entity.task.Task;
-import com.datau.da.feign.AccountApi;
-import com.datau.da.service.task.TaskService;
-import com.datau.da.utils.ReturnUtil;
+import com.ozs.da.entity.PageParams;
+import com.ozs.da.entity.ReturnData;
+import com.ozs.da.entity.remotedb.MdmInfoColumn;
+import com.ozs.da.entity.remotedb.MdmInfoDatabase;
+import com.ozs.da.entity.remotedb.MdmInfoTable;
+import com.ozs.da.entity.task.JobOperateCmd;
+import com.ozs.da.entity.task.Task;
+import com.ozs.da.feign.AccountApi;
+import com.ozs.da.service.task.TaskService;
+import com.ozs.da.utils.ReturnUtil;
 import com.github.pagehelper.Page;
 import io.swagger.annotations.*;
 import org.apache.logging.log4j.LogManager;

da/src/main/java/com/datau/da/dao/DataQualityDao.java

@@ -1,4 +1,4 @@
-package com.datau.da.dao;
+package com.ozs.da.dao;
 
 import org.springframework.stereotype.Repository;
 

da/src/main/java/com/datau/da/dao/TaskDao.java

@@ -1,8 +1,8 @@
-package com.datau.da.dao;
+package com.ozs.da.dao;
 
-import com.datau.da.entity.PageParams;
-import com.datau.da.entity.mail.ErrorJobInfo;
-import com.datau.da.entity.task.Task;
+import com.ozs.da.entity.PageParams;
+import com.ozs.da.entity.mail.ErrorJobInfo;
+import com.ozs.da.entity.task.Task;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

da/src/main/java/com/datau/da/entity/PageParams.java

@@ -1,4 +1,4 @@
-package com.datau.da.entity;
+package com.ozs.da.entity;
 
 /**
  * @author 宋显哲

da/src/main/java/com/datau/da/entity/ReturnData.java

@@ -1,6 +1,6 @@
-package com.datau.da.entity;
+package com.ozs.da.entity;
 
-import com.datau.da.constant.StatusCode;
+import com.ozs.da.constant.StatusCode;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

da/src/main/java/com/datau/da/entity/dataquality/ListDataDTO.java

@@ -1,4 +1,4 @@
-package com.datau.da.entity.dataquality;
+package com.ozs.da.entity.dataquality;
 
 import java.util.List;
 import java.util.Map;

da/src/main/java/com/datau/da/entity/dataquality/QuerySqlDTO.java

@@ -1,4 +1,4 @@
-package com.datau.da.entity.dataquality;
+package com.ozs.da.entity.dataquality;
 
 import io.swagger.annotations.ApiModelProperty;
 

da/src/main/java/com/datau/da/entity/dataquality/UpdateDataDTO.java

@@ -1,4 +1,4 @@
-package com.datau.da.entity.dataquality;
+package com.ozs.da.entity.dataquality;
 
 import java.util.List;
 import java.util.Map;

da/src/main/java/com/datau/da/entity/mail/ErrorJobInfo.java

@@ -1,4 +1,4 @@
-package com.datau.da.entity.mail;
+package com.ozs.da.entity.mail;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

da/src/main/java/com/datau/da/entity/mail/MailBean.java

@@ -1,4 +1,4 @@
-package com.datau.da.entity.mail;
+package com.ozs.da.entity.mail;
 
 import java.util.Vector;
 

da/src/main/java/com/datau/da/entity/model/JobParseEvent.java

@@ -1,6 +1,6 @@
-package com.datau.da.entity.model;
+package com.ozs.da.entity.model;
 
-import com.datau.da.entity.task.Task;
+import com.ozs.da.entity.task.Task;
 import com.lmax.disruptor.EventFactory;
 
 /**

da/src/main/java/com/datau/da/entity/model/ScheduleRoundEvent.java

@@ -1,6 +1,6 @@
-package com.datau.da.entity.model;
+package com.ozs.da.entity.model;
 
-import com.datau.da.entity.task.Task;
+import com.ozs.da.entity.task.Task;
 import com.lmax.disruptor.EventFactory;
 
 /**

da/src/main/java/com/datau/da/entity/remotedb/MdmCreateTableDTO.java

@@ -1,4 +1,4 @@
-package com.datau.da.entity.remotedb;
+package com.ozs.da.entity.remotedb;
 
 import java.util.List;
 

da/src/main/java/com/datau/da/entity/remotedb/MdmInfoColumn.java

@@ -1,4 +1,4 @@
-package com.datau.da.entity.remotedb;
+package com.ozs.da.entity.remotedb;
 
 import io.swagger.annotations.ApiModelProperty;
 

da/src/main/java/com/datau/da/entity/remotedb/MdmInfoDatabase.java

@@ -1,4 +1,4 @@
-package com.datau.da.entity.remotedb;
+package com.ozs.da.entity.remotedb;
 
 import io.swagger.annotations.ApiModelProperty;
 

da/src/main/java/com/datau/da/entity/remotedb/MdmInfoTable.java

@@ -1,4 +1,4 @@
-package com.datau.da.entity.remotedb;
+package com.ozs.da.entity.remotedb;
 
 import io.swagger.annotations.ApiModelProperty;
 

da/src/main/java/com/datau/da/entity/task/JobOperateCmd.java

@@ -1,4 +1,4 @@
-package com.datau.da.entity.task;
+package com.ozs.da.entity.task;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

da/src/main/java/com/datau/da/entity/task/JobScheduleTime.java

@@ -1,4 +1,4 @@
-package com.datau.da.entity.task;
+package com.ozs.da.entity.task;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

da/src/main/java/com/datau/da/entity/task/Task.java

@@ -1,4 +1,4 @@
-package com.datau.da.entity.task;
+package com.ozs.da.entity.task;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

da/src/main/java/com/datau/da/entity/token/Header.java

@@ -1,4 +1,4 @@
-package com.datau.da.entity.token;
+package com.ozs.da.entity.token;
 
 import java.io.Serializable;
 

da/src/main/java/com/datau/da/entity/token/Payload.java

@@ -1,4 +1,4 @@
-package com.datau.da.entity.token;
+package com.ozs.da.entity.token;
 
 import java.io.Serializable;
 

da/src/main/java/com/datau/da/entity/token/Token.java

@@ -1,4 +1,4 @@
-package com.datau.da.entity.token;
+package com.ozs.da.entity.token;
 
 import java.io.Serializable;
 

da/src/main/java/com/datau/da/feign/AccountApi.java

@@ -1,4 +1,4 @@
-package com.datau.da.feign;
+package com.ozs.da.feign;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;

da/src/main/java/com/datau/da/feign/DaMdmFeign.java

@@ -1,7 +1,10 @@
-package com.datau.da.feign;
+package com.ozs.da.feign;
 
-import com.datau.da.entity.remotedb.MdmCreateTableDTO;
-import com.datau.da.entity.remotedb.MdmInfoColumn;
+import com.ozs.da.entity.remotedb.MdmCreateTableDTO;
+import com.ozs.da.entity.remotedb.MdmInfoColumn;
+import com.ozs.da.entity.remotedb.MdmInfoDatabase;
+import com.ozs.da.entity.remotedb.MdmInfoTable;
+import com.ozs.da.utils.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -9,14 +12,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.datau.da.entity.remotedb.MdmInfoDatabase;
-import com.datau.da.entity.remotedb.MdmInfoTable;
-import com.datau.da.utils.R;
-
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-
 import java.util.List;
 import java.util.Map;
 
@@ -28,7 +23,7 @@ import java.util.Map;
 public interface DaMdmFeign {
 
 	@GetMapping(value = "/mdm/kpiManage/database/{id}")
-	MdmInfoDatabase database(@PathVariable(name = "id") String dbId);
+    MdmInfoDatabase database(@PathVariable(name = "id") String dbId);
 
 	@GetMapping(value = "/mdm/kpiManage/listTableByDatabaseId")
 	List<MdmInfoTable> listTableByDatabaseId(@RequestParam(name = "databaseId") String databaseId);
@@ -43,7 +38,7 @@ public interface DaMdmFeign {
 	List<MdmInfoColumn> listColumnByTableId(@RequestParam(name = "tableId") String tableId);
 
 	@GetMapping(value = "/mdm/storageManage/getTableInfoById/{tableId}")
-	R<MdmCreateTableDTO> getTableInfoById(@PathVariable(name = "tableId") String tableId);
+    R<MdmCreateTableDTO> getTableInfoById(@PathVariable(name = "tableId") String tableId);
 
 	/**
 	 * 执行sql获取查询数据

da/src/main/java/com/datau/da/handler/ScheduleRoundEventHandler.java

@@ -1,7 +1,7 @@
-package com.datau.da.handler;
+package com.ozs.da.handler;
 
-import com.datau.da.entity.model.ScheduleRoundEvent;
-import com.datau.da.service.job.JobPutService;
+import com.ozs.da.entity.model.ScheduleRoundEvent;
+import com.ozs.da.service.job.JobPutService;
 import com.lmax.disruptor.WorkHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

da/src/main/java/com/datau/da/handler/ScheduleRoundExceptionHandler.java

@@ -1,7 +1,7 @@
-package com.datau.da.handler;
+package com.ozs.da.handler;
 
-import com.datau.da.entity.task.Task;
-import com.datau.da.entity.model.ScheduleRoundEvent;
+import com.ozs.da.entity.task.Task;
+import com.ozs.da.entity.model.ScheduleRoundEvent;
 import com.lmax.disruptor.ExceptionHandler;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

da/src/main/java/com/datau/da/job/JobServer.java

@@ -1,11 +1,10 @@
-package com.datau.da.job;
-
-import com.datau.da.constant.Constant;
-import com.datau.da.entity.model.ScheduleRoundEvent;
-import com.datau.da.entity.remotedb.MdmInfoDatabase;
-import com.datau.da.entity.remotedb.MdmInfoTable;
-import com.datau.da.entity.task.Task;
-import com.datau.da.service.job.JobService;
+package com.ozs.da.job;
+
+import com.ozs.da.constant.Constant;
+import com.ozs.da.entity.model.ScheduleRoundEvent;
+import com.ozs.da.entity.remotedb.MdmInfoDatabase;
+import com.ozs.da.entity.task.Task;
+import com.ozs.da.service.job.JobService;
 import com.lmax.disruptor.RingBuffer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

da/src/main/java/com/datau/da/job/TestDemo.java

@@ -1,10 +1,9 @@
-package com.datau.da.job;
+package com.ozs.da.job;
 
-import com.datau.da.entity.model.ScheduleRoundEvent;
-import com.datau.da.entity.task.Task;
+import com.ozs.da.entity.model.ScheduleRoundEvent;
+import com.ozs.da.entity.task.Task;
 import com.lmax.disruptor.*;
 import com.lmax.disruptor.dsl.Disruptor;
-import com.lmax.disruptor.dsl.ProducerType;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

da/src/main/java/com/datau/da/job/TestHandler.java

@@ -1,7 +1,7 @@
-package com.datau.da.job;
+package com.ozs.da.job;
 
-import com.datau.da.entity.model.ScheduleRoundEvent;
-import com.datau.da.service.job.JobPutService;
+import com.ozs.da.entity.model.ScheduleRoundEvent;
+import com.ozs.da.service.job.JobPutService;
 import com.lmax.disruptor.WorkHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 

da/src/main/java/com/datau/da/service/DataQualityService.java

@@ -1,15 +1,15 @@
-package com.datau.da.service;
+package com.ozs.da.service;
 
 import java.util.List;
 
 import org.springframework.web.multipart.MultipartFile;
 
-import com.datau.da.entity.dataquality.ListDataDTO;
-import com.datau.da.entity.dataquality.QuerySqlDTO;
-import com.datau.da.entity.dataquality.UpdateDataDTO;
-import com.datau.da.entity.remotedb.MdmInfoDatabase;
-import com.datau.da.entity.remotedb.MdmInfoTable;
-import com.datau.da.utils.R;
+import com.ozs.da.entity.dataquality.ListDataDTO;
+import com.ozs.da.entity.dataquality.QuerySqlDTO;
+import com.ozs.da.entity.dataquality.UpdateDataDTO;
+import com.ozs.da.entity.remotedb.MdmInfoDatabase;
+import com.ozs.da.entity.remotedb.MdmInfoTable;
+import com.ozs.da.utils.R;
 
 /**
  * 

da/src/main/java/com/datau/da/service/impl/DataQualityServiceImpl.java

@@ -1,4 +1,4 @@
-package com.datau.da.service.impl;
+package com.ozs.da.service.impl;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -11,6 +11,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.ozs.da.entity.dataquality.ListDataDTO;
+import com.ozs.da.entity.dataquality.QuerySqlDTO;
+import com.ozs.da.entity.dataquality.UpdateDataDTO;
+import com.ozs.da.entity.remotedb.MdmInfoColumn;
+import com.ozs.da.service.DataQualityService;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellValue;
 import org.apache.poi.ss.usermodel.DateUtil;
@@ -29,17 +34,12 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.datau.da.entity.dataquality.ListDataDTO;
-import com.datau.da.entity.dataquality.QuerySqlDTO;
-import com.datau.da.entity.dataquality.UpdateDataDTO;
-import com.datau.da.entity.remotedb.MdmCreateTableDTO;
-import com.datau.da.entity.remotedb.MdmInfoColumn;
-import com.datau.da.entity.remotedb.MdmInfoDatabase;
-import com.datau.da.entity.remotedb.MdmInfoTable;
-import com.datau.da.feign.DaMdmFeign;
-import com.datau.da.service.DataQualityService;
-import com.datau.da.utils.FileTool;
-import com.datau.da.utils.R;
+import com.ozs.da.entity.remotedb.MdmCreateTableDTO;
+import com.ozs.da.entity.remotedb.MdmInfoDatabase;
+import com.ozs.da.entity.remotedb.MdmInfoTable;
+import com.ozs.da.feign.DaMdmFeign;
+import com.ozs.da.utils.FileTool;
+import com.ozs.da.utils.R;
 
 /**
  * 

da/src/main/java/com/datau/da/service/job/JobPutService.java

@@ -1,6 +1,6 @@
-package com.datau.da.service.job;
+package com.ozs.da.service.job;
 
-import com.datau.da.entity.task.Task;
+import com.ozs.da.entity.task.Task;
 
 /**
  * @author 许明

da/src/main/java/com/datau/da/service/job/JobService.java

@@ -1,4 +1,4 @@
-package com.datau.da.service.job;
+package com.ozs.da.service.job;
 
 /**
  * @author 许明

da/src/main/java/com/datau/da/service/job/ScheDisruptInitService.java

@@ -1,4 +1,4 @@
-package com.datau.da.service.job;
+package com.ozs.da.service.job;
 
 /**
  * @author 许明

da/src/main/java/com/datau/da/service/job/ScheduleJobContainerManagerService.java

@@ -1,4 +1,4 @@
-package com.datau.da.service.job;
+package com.ozs.da.service.job;
 
 import org.quartz.SchedulerException;
 

da/src/main/java/com/datau/da/service/job/TimeTriggerJobListener.java

@@ -1,4 +1,4 @@
-package com.datau.da.service.job;
+package com.ozs.da.service.job;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

da/src/main/java/com/datau/da/service/job/impl/FrequencyTriggerJob.java

@@ -1,17 +1,12 @@
-package com.datau.da.service.job.impl;
+package com.ozs.da.service.job.impl;
 
-import com.datau.da.constant.Constant;
-import com.datau.da.entity.task.Task;
-import com.datau.da.job.JobServer;
-import com.datau.da.service.job.ScheDisruptInitService;
+import com.ozs.da.constant.Constant;
+import com.ozs.da.entity.task.Task;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.quartz.JobDetail;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.BeanFactory;
 
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 

da/src/main/java/com/datau/da/service/job/impl/JobPutServiceImpl.java

@@ -1,8 +1,8 @@
-package com.datau.da.service.job.impl;
+package com.ozs.da.service.job.impl;
 
-import com.datau.da.constant.Constant;
-import com.datau.da.entity.task.Task;
-import com.datau.da.service.job.JobPutService;
+import com.ozs.da.constant.Constant;
+import com.ozs.da.entity.task.Task;
+import com.ozs.da.service.job.JobPutService;
 import org.apache.commons.lang.time.DateUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

da/src/main/java/com/datau/da/service/job/impl/JobServiceImpl.java

@@ -1,9 +1,9 @@
-package com.datau.da.service.job.impl;
+package com.ozs.da.service.job.impl;
 
-import com.datau.da.constant.Constant;
-import com.datau.da.service.job.JobService;
-import com.datau.da.service.job.ScheDisruptInitService;
-import com.datau.da.service.job.ScheduleJobContainerManagerService;
+import com.ozs.da.constant.Constant;
+import com.ozs.da.service.job.JobService;
+import com.ozs.da.service.job.ScheDisruptInitService;
+import com.ozs.da.service.job.ScheduleJobContainerManagerService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.quartz.SchedulerException;

da/src/main/java/com/datau/da/service/job/impl/ScheDisruptInitServiceImpl.java

@@ -1,11 +1,11 @@
-package com.datau.da.service.job.impl;
+package com.ozs.da.service.job.impl;
 
-import com.datau.da.constant.Constant;
-import com.datau.da.handler.ScheduleRoundEventHandler;
-import com.datau.da.handler.ScheduleRoundExceptionHandler;
-import com.datau.da.job.JobServer;
-import com.datau.da.entity.model.ScheduleRoundEvent;
-import com.datau.da.service.job.ScheDisruptInitService;
+import com.ozs.da.constant.Constant;
+import com.ozs.da.handler.ScheduleRoundEventHandler;
+import com.ozs.da.handler.ScheduleRoundExceptionHandler;
+import com.ozs.da.job.JobServer;
+import com.ozs.da.entity.model.ScheduleRoundEvent;
+import com.ozs.da.service.job.ScheDisruptInitService;
 import com.lmax.disruptor.BlockingWaitStrategy;
 import com.lmax.disruptor.RingBuffer;
 import com.lmax.disruptor.Sequence;

da/src/main/java/com/datau/da/service/job/impl/ScheduleJobContainerManagerServiceImpl.java

@@ -1,10 +1,10 @@
-package com.datau.da.service.job.impl;
+package com.ozs.da.service.job.impl;
 
-import com.datau.da.constant.Constant;
-import com.datau.da.dao.TaskDao;
-import com.datau.da.entity.task.Task;
-import com.datau.da.job.JobServer;
-import com.datau.da.service.job.ScheduleJobContainerManagerService;
+import com.ozs.da.constant.Constant;
+import com.ozs.da.dao.TaskDao;
+import com.ozs.da.entity.task.Task;
+import com.ozs.da.job.JobServer;
+import com.ozs.da.service.job.ScheduleJobContainerManagerService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.quartz.*;

da/src/main/java/com/datau/da/service/job/impl/SchedulerTimeTriggeJob.java

@@ -1,9 +1,9 @@
-package com.datau.da.service.job.impl;
+package com.ozs.da.service.job.impl;
 
-import com.datau.da.constant.Constant;
-import com.datau.da.entity.task.Task;
-import com.datau.da.service.job.TimeTriggerJobListener;
-import com.datau.da.utils.CronExpresUtil;
+import com.ozs.da.constant.Constant;
+import com.ozs.da.entity.task.Task;
+import com.ozs.da.service.job.TimeTriggerJobListener;
+import com.ozs.da.utils.CronExpresUtil;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.quartz.*;

da/src/main/java/com/datau/da/service/job/impl/TimeTriggerJob.java

@@ -1,9 +1,9 @@
-package com.datau.da.service.job.impl;
+package com.ozs.da.service.job.impl;
 
-import com.datau.da.constant.Constant;
-import com.datau.da.entity.task.Task;
-import com.datau.da.job.JobServer;
-import com.datau.da.utils.CronExpresUtil;
+import com.ozs.da.constant.Constant;
+import com.ozs.da.entity.task.Task;
+import com.ozs.da.job.JobServer;
+import com.ozs.da.utils.CronExpresUtil;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.quartz.*;

da/src/main/java/com/datau/da/service/job/impl/TriggerJob.java

@@ -1,15 +1,15 @@
-package com.datau.da.service.job.impl;
-
-import com.datau.da.constant.Constant;
-import com.datau.da.dao.TaskDao;
-import com.datau.da.entity.mail.ErrorJobInfo;
-import com.datau.da.entity.remotedb.MdmInfoDatabase;
-import com.datau.da.entity.task.Task;
-import com.datau.da.feign.DaMdmFeign;
-import com.datau.da.job.JobServer;
-import com.datau.da.utils.CommonConfUtil;
-import com.datau.da.utils.ConnectionUtil;
-import com.datau.da.utils.mail.MailUtil;
+package com.ozs.da.service.job.impl;
+
+import com.ozs.da.constant.Constant;
+import com.ozs.da.dao.TaskDao;
+import com.ozs.da.entity.mail.ErrorJobInfo;
+import com.ozs.da.entity.remotedb.MdmInfoDatabase;
+import com.ozs.da.entity.task.Task;
+import com.ozs.da.feign.DaMdmFeign;
+import com.ozs.da.job.JobServer;
+import com.ozs.da.utils.CommonConfUtil;
+import com.ozs.da.utils.ConnectionUtil;
+import com.ozs.da.utils.mail.MailUtil;
 import org.apache.commons.lang.time.DateUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

da/src/main/java/com/datau/da/service/task/TaskService.java

@@ -1,12 +1,12 @@
-package com.datau.da.service.task;
-
-import com.datau.da.entity.PageParams;
-import com.datau.da.entity.ReturnData;
-import com.datau.da.entity.remotedb.MdmInfoColumn;
-import com.datau.da.entity.remotedb.MdmInfoDatabase;
-import com.datau.da.entity.remotedb.MdmInfoTable;
-import com.datau.da.entity.task.JobOperateCmd;
-import com.datau.da.entity.task.Task;
+package com.ozs.da.service.task;
+
+import com.ozs.da.entity.PageParams;
+import com.ozs.da.entity.ReturnData;
+import com.ozs.da.entity.remotedb.MdmInfoColumn;
+import com.ozs.da.entity.remotedb.MdmInfoDatabase;
+import com.ozs.da.entity.remotedb.MdmInfoTable;
+import com.ozs.da.entity.task.JobOperateCmd;
+import com.ozs.da.entity.task.Task;
 import com.github.pagehelper.Page;
 
 import java.util.List;

da/src/main/java/com/datau/da/service/task/impl/TaskServiceImpl.java

@@ -1,30 +1,30 @@
-package com.datau.da.service.task.impl;
+package com.ozs.da.service.task.impl;
 
 import java.util.List;
 import java.util.UUID;
 
+import com.ozs.da.entity.remotedb.MdmInfoColumn;
+import com.ozs.da.service.task.TaskService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.datau.da.dao.TaskDao;
-import com.datau.da.entity.PageParams;
-import com.datau.da.entity.ReturnData;
-import com.datau.da.entity.remotedb.MdmCreateTableDTO;
-import com.datau.da.entity.remotedb.MdmInfoColumn;
-import com.datau.da.entity.remotedb.MdmInfoDatabase;
-import com.datau.da.entity.remotedb.MdmInfoTable;
-import com.datau.da.entity.task.JobOperateCmd;
-import com.datau.da.entity.task.Task;
-import com.datau.da.feign.DaMdmFeign;
-import com.datau.da.job.JobServer;
-import com.datau.da.service.job.impl.SchedulerTimeTriggeJob;
-import com.datau.da.service.job.impl.TriggerJob;
-import com.datau.da.service.task.TaskService;
-import com.datau.da.utils.CronExpresUtil;
-import com.datau.da.utils.R;
+import com.ozs.da.dao.TaskDao;
+import com.ozs.da.entity.PageParams;
+import com.ozs.da.entity.ReturnData;
+import com.ozs.da.entity.remotedb.MdmCreateTableDTO;
+import com.ozs.da.entity.remotedb.MdmInfoDatabase;
+import com.ozs.da.entity.remotedb.MdmInfoTable;
+import com.ozs.da.entity.task.JobOperateCmd;
+import com.ozs.da.entity.task.Task;
+import com.ozs.da.feign.DaMdmFeign;
+import com.ozs.da.job.JobServer;
+import com.ozs.da.service.job.impl.SchedulerTimeTriggeJob;
+import com.ozs.da.service.job.impl.TriggerJob;
+import com.ozs.da.utils.CronExpresUtil;
+import com.ozs.da.utils.R;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 

da/src/main/java/com/datau/da/utils/AesUtil.java

@@ -1,4 +1,4 @@
-package com.datau.da.utils;
+package com.ozs.da.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

da/src/main/java/com/datau/da/utils/CommonConfUtil.java

@@ -1,4 +1,4 @@
-package com.datau.da.utils;
+package com.ozs.da.utils;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

da/src/main/java/com/datau/da/utils/ConnectionUtil.java

@@ -1,14 +1,13 @@
-package com.datau.da.utils;
+package com.ozs.da.utils;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
+import com.ozs.da.entity.remotedb.MdmInfoDatabase;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.datau.da.entity.remotedb.MdmInfoDatabase;
-
 /**
  * @author 许明
  * on 2019/3/11.

da/src/main/java/com/datau/da/utils/CronExpresUtil.java

@@ -6,7 +6,7 @@
  * 修改时间：2013-12-30
  * 修改内容：TODO
  */
-package com.datau.da.utils;
+package com.ozs.da.utils;
 
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -15,7 +15,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import com.datau.da.constant.Constant;
+import com.ozs.da.constant.Constant;
 import org.quartz.CronExpression;
 import org.quartz.CronTrigger;
 import org.slf4j.Logger;

da/src/main/java/com/datau/da/utils/DateUtil.java

@@ -1,4 +1,4 @@
-package com.datau.da.utils;
+package com.ozs.da.utils;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

da/src/main/java/com/datau/da/utils/FileTool.java

@@ -1,4 +1,4 @@
-package com.datau.da.utils;
+package com.ozs.da.utils;
 
 import java.io.File;
 import java.io.FileOutputStream;

da/src/main/java/com/datau/da/utils/FtpUtils.java

@@ -1,7 +1,7 @@
-package com.datau.da.utils;
+package com.ozs.da.utils;
 
-import com.datau.da.utils.ftp.FtpClientPool;
-import com.datau.da.utils.ftp.FtpConfiguration;
+import com.ozs.da.utils.ftp.FtpClientPool;
+import com.ozs.da.utils.ftp.FtpConfiguration;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPFile;
 import org.slf4j.Logger;

da/src/main/java/com/datau/da/utils/JsonUtil.java

@@ -1,4 +1,4 @@
-package com.datau.da.utils;
+package com.ozs.da.utils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 

da/src/main/java/com/datau/da/utils/ParamUtil.java

@@ -1,4 +1,4 @@
-package com.datau.da.utils;
+package com.ozs.da.utils;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

da/src/main/java/com/datau/da/utils/R.java

@@ -1,4 +1,4 @@
-package com.datau.da.utils;
+package com.ozs.da.utils;
 
 import java.util.List;
 

da/src/main/java/com/datau/da/utils/ReturnUtil.java

@@ -1,7 +1,7 @@
-package com.datau.da.utils;
+package com.ozs.da.utils;
 
-import com.datau.da.constant.StatusCode;
-import com.datau.da.entity.ReturnData;
+import com.ozs.da.constant.StatusCode;
+import com.ozs.da.entity.ReturnData;
 import com.github.pagehelper.Page;
 
 import javax.servlet.http.HttpServletResponse;

da/src/main/java/com/datau/da/utils/S.java

@@ -1,4 +1,4 @@
-package com.datau.da.utils;
+package com.ozs.da.utils;
 
 import java.util.HashMap;
 

da/src/main/java/com/datau/da/utils/ThreadPoolUtil.java

@@ -1,4 +1,4 @@
-package com.datau.da.utils;
+package com.ozs.da.utils;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

da/src/main/java/com/datau/da/utils/TokenUtil.java

@@ -1,6 +1,6 @@
-package com.datau.da.utils;
+package com.ozs.da.utils;
 
-import com.datau.da.entity.token.Token;
+import com.ozs.da.entity.token.Token;
 import org.springframework.util.StringUtils;
 
 /**

da/src/main/java/com/datau/da/utils/ftp/FtpClientFactory.java

@@ -1,4 +1,4 @@
-package com.datau.da.utils.ftp;
+package com.ozs.da.utils.ftp;
 
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.pool2.BasePooledObjectFactory;

da/src/main/java/com/datau/da/utils/ftp/FtpClientPool.java

@@ -1,4 +1,4 @@
-package com.datau.da.utils.ftp;
+package com.ozs.da.utils.ftp;
 
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.pool2.impl.GenericObjectPool;

da/src/main/java/com/datau/da/utils/ftp/FtpConfiguration.java

@@ -1,4 +1,4 @@
-package com.datau.da.utils.ftp;
+package com.ozs.da.utils.ftp;
 
 /**
  * @author 宋显哲

da/src/main/java/com/datau/da/utils/mail/MailUtil.java

@@ -1,9 +1,9 @@
-package com.datau.da.utils.mail;
+package com.ozs.da.utils.mail;
 
-import com.datau.da.entity.mail.ErrorJobInfo;
-import com.datau.da.entity.mail.MailBean;
-import com.datau.da.service.job.impl.TriggerJob;
-import com.datau.da.utils.CommonConfUtil;
+import com.ozs.da.entity.mail.ErrorJobInfo;
+import com.ozs.da.entity.mail.MailBean;
+import com.ozs.da.service.job.impl.TriggerJob;
+import com.ozs.da.utils.CommonConfUtil;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

da/src/main/java/com/datau/da/utils/mail/SendMailUtil.java

@@ -1,6 +1,6 @@
-package com.datau.da.utils.mail;
+package com.ozs.da.utils.mail;
 
-import com.datau.da.entity.mail.MailBean;
+import com.ozs.da.entity.mail.MailBean;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

da/src/main/resources/application.yml

@@ -4,13 +4,14 @@ server:
     maxHttpHeaderSize: 102400
 log:
     file:
-        path: C:\Users\89346\Desktop\filePath
+#        path: C:\Users\89346\Desktop\
+        path: C:\workspace\logs
 #        path: /data/dyqd_app4/server-sr
         name: da.log
 datasource:
-    url: 10.199.10.6:3306/dc_test
-    username: dyqd_dc
-    password: Datau$dc19   
+    url: 124.70.58.209:1122/dc_test
+    username: admin
+    password: 106aD>>ql95K5S
 ###############常用配置项###############
 spring:
     cloud:

da/src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 server: localhost
-port: 9876
+#port: 9876
 #server: 10.199.10.10
-#port: 9999
+port: 9999
 
 #spring:
 #    cloud:

da/src/main/resources/mapper/TaskMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.datau.da.dao.TaskDao">
+<mapper namespace="com.ozs.da.dao.TaskDao">
 
-    <insert id="addTask" parameterType="com.datau.da.entity.task.Task">
+    <insert id="addTask" parameterType="com.ozs.da.entity.task.Task">
         insert into da_info_data_collection_task
         (id, task_name, period_type, task_status, schedule_offset, run_status, task_cron,
         <if test="nextRunDate != null and nextRunDate != ''">
@@ -19,7 +19,7 @@
         #{targetTableId}, #{targetTableName}, #{userId}, now(), now())
     </insert>
 
-    <select id="listTask" parameterType="com.datau.da.entity.PageParams" resultType="com.datau.da.entity.task.Task">
+    <select id="listTask" parameterType="com.ozs.da.entity.PageParams" resultType="com.ozs.da.entity.task.Task">
         select
             didct.id as id,
             didct.task_name as taskName,
@@ -40,7 +40,7 @@
         </if>
     </select>
 
-    <select id="getTaskInfoById" resultType="com.datau.da.entity.task.Task">
+    <select id="getTaskInfoById" resultType="com.ozs.da.entity.task.Task">
         select
             didct.id as id,
             didct.task_name as taskName,
@@ -65,7 +65,7 @@
         where didct.id=#{taskId}
     </select>
 
-    <update id="updateTaskById" parameterType="com.datau.da.entity.task.Task">
+    <update id="updateTaskById" parameterType="com.ozs.da.entity.task.Task">
         update da_info_data_collection_task set
         <trim suffixOverrides=",">
             update_time = now(),
@@ -146,7 +146,7 @@
 		delete from da_info_data_collection_task where id=#{taskId}
 	</delete>
 
-    <select id="getAllInitJob" resultType="com.datau.da.entity.task.Task">
+    <select id="getAllInitJob" resultType="com.ozs.da.entity.task.Task">
         select
             didct.id as id,
             didct.task_name as taskName,
@@ -166,7 +166,7 @@
         from da_info_data_collection_task didct
     </select>
 
-    <insert id="insertTaskErrorInfo" parameterType="com.datau.da.entity.mail.ErrorJobInfo">
+    <insert id="insertTaskErrorInfo" parameterType="com.ozs.da.entity.mail.ErrorJobInfo">
         insert into da_info_task_error_record (id, task_id, task_name, error_desc, send_status, create_time, update_time)
         values (uuid(), #{taskId}, #{taskName}, #{errorDesc}, #{sendStatus}, now(), now())
     </insert>
@@ -184,7 +184,7 @@
         order by update_time desc limit 1
     </select>
 
-    <select id="getErrorJobInfoById" resultType="com.datau.da.entity.mail.ErrorJobInfo">
+    <select id="getErrorJobInfoById" resultType="com.ozs.da.entity.mail.ErrorJobInfo">
         select
             id as id,
             task_id as taskId,