From 066be6b1af626bcc26c2e691eb17025a9508f19c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92Sakura=E9=85=B1?= Date: Sat, 23 Mar 2019 10:33:45 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=E4=B8=80?= =?UTF-8?q?=E7=9B=B4=E9=87=8D=E6=9E=84=E4=B8=80=E7=9B=B4=E7=88=BD,?= =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=8E=9F=E5=85=88=E7=9A=84daemon=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=A2=9E=E5=8A=A0=E5=AD=90=E5=8C=85=E5=90=8D=EF=BC=8C?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E4=B8=80=E4=BA=9B=E6=9C=AA=E7=9F=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/config/pigx-daemon-elastic-job-dev.yml | 12 ++++++------ .../PigxDaemonElasticJobApplication.java | 2 +- .../controller/ExecutionLogController.java | 6 +++--- .../controller/StatusTraceLogController.java | 6 +++--- .../daemon/{ => elastic}/entity/ExecutionLog.java | 2 +- .../daemon/{ => elastic}/entity/StatusTraceLog.java | 2 +- .../daemon/{ => elastic}/job/PigxDataflowJob.java | 2 +- .../pigx/daemon/{ => elastic}/job/PigxSimpleJob.java | 2 +- .../daemon/{ => elastic}/job/PigxSimpleJob2.java | 2 +- .../listener/PigxDistributeElasticJobListener.java | 2 +- .../listener/PigxElasticJobListener.java | 2 +- .../{ => elastic}/mapper/ExecutionLogMapper.java | 4 ++-- .../{ => elastic}/mapper/StatusTraceLogMapper.java | 4 ++-- .../{ => elastic}/service/ExecutionLogService.java | 4 ++-- .../{ => elastic}/service/StatusTraceLogService.java | 4 ++-- .../service/impl/ExecutionLogServiceImpl.java | 8 ++++---- .../service/impl/StatusTraceLogServiceImpl.java | 8 ++++---- .../src/main/resources/mapper/ExecutionLogMapper.xml | 4 ++-- .../main/resources/mapper/StatusTraceLogMapper.xml | 4 ++-- 19 files changed, 40 insertions(+), 40 deletions(-) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/{ => elastic}/PigxDaemonElasticJobApplication.java (97%) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/{ => elastic}/controller/ExecutionLogController.java (92%) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/{ => elastic}/controller/StatusTraceLogController.java (92%) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/{ => elastic}/entity/ExecutionLog.java (95%) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/{ => elastic}/entity/StatusTraceLog.java (95%) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/{ => elastic}/job/PigxDataflowJob.java (96%) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/{ => elastic}/job/PigxSimpleJob.java (96%) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/{ => elastic}/job/PigxSimpleJob2.java (96%) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/{ => elastic}/listener/PigxDistributeElasticJobListener.java (97%) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/{ => elastic}/listener/PigxElasticJobListener.java (96%) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/{ => elastic}/mapper/ExecutionLogMapper.java (64%) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/{ => elastic}/mapper/StatusTraceLogMapper.java (64%) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/{ => elastic}/service/ExecutionLogService.java (65%) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/{ => elastic}/service/StatusTraceLogService.java (65%) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/{ => elastic}/service/impl/ExecutionLogServiceImpl.java (57%) rename pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/{ => elastic}/service/impl/StatusTraceLogServiceImpl.java (61%) diff --git a/pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml b/pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml index e60532f6d..df43ac503 100644 --- a/pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml @@ -22,31 +22,31 @@ spring: # 普通任务 simples: spring-simple-job: - job-class: com.pig4cloud.pigx.daemon.job.PigxSimpleJob + job-class: com.pig4cloud.pigx.daemon.elastic.job.PigxSimpleJob cron: 0 0 0/1 * * ? sharding-total-count: 3 sharding-item-parameters: 0=service1,1=service2,2=service3 eventTraceRdbDataSource: 'dataSource' listener: - listener-class: com.pig4cloud.pigx.daemon.listener.PigxElasticJobListener + listener-class: com.pig4cloud.pigx.daemon.elastic.listener.PigxElasticJobListener spring-simple-job2: - job-class: com.pig4cloud.pigx.daemon.job.PigxSimpleJob2 + job-class: com.pig4cloud.pigx.daemon.elastic.job.PigxSimpleJob2 cron: 0 0 0/1 * * ? sharding-total-count: 3 sharding-item-parameters: 0=service1,1=service2,2=service3 eventTraceRdbDataSource: 'dataSource' listener: - listener-class: com.pig4cloud.pigx.daemon.listener.PigxElasticJobListener + listener-class: com.pig4cloud.pigx.daemon.elastic.listener.PigxElasticJobListener # 简单任务 dataflows: spring-dataflow-job: - job-class: com.pig4cloud.pigx.daemon.job.PigxDataflowJob + job-class: com.pig4cloud.pigx.daemon.elastic.job.PigxDataflowJob cron: 0 0 0/1 * * ? sharding-total-count: 3 sharding-item-parameters: 0=service1,1=service2,2=service3 streaming-process: true eventTraceRdbDataSource: 'dataSource' listener: - distributed-listener-class: com.pig4cloud.pigx.daemon.listener.PigxDistributeElasticJobListener + distributed-listener-class: com.pig4cloud.pigx.daemon.elastic.listener.PigxDistributeElasticJobListener started-timeout-milliseconds: 5000 completed-timeout-milliseconds: 10000 diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonElasticJobApplication.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/PigxDaemonElasticJobApplication.java similarity index 97% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonElasticJobApplication.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/PigxDaemonElasticJobApplication.java index 74ef00a9a..50a603658 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonElasticJobApplication.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/PigxDaemonElasticJobApplication.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon; +package com.pig4cloud.pigx.daemon.elastic; import com.pig4cloud.pigx.common.job.annotation.EnablePigxJob; import com.pig4cloud.pigx.common.security.annotation.EnablePigxFeignClients; diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/controller/ExecutionLogController.java similarity index 92% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/controller/ExecutionLogController.java index a96125e8a..f8ad5171d 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/controller/ExecutionLogController.java @@ -15,14 +15,14 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.controller; +package com.pig4cloud.pigx.daemon.elastic.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.common.core.util.R; -import com.pig4cloud.pigx.daemon.entity.ExecutionLog; -import com.pig4cloud.pigx.daemon.service.ExecutionLogService; +import com.pig4cloud.pigx.daemon.elastic.entity.ExecutionLog; +import com.pig4cloud.pigx.daemon.elastic.service.ExecutionLogService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/controller/StatusTraceLogController.java similarity index 92% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/controller/StatusTraceLogController.java index eeb3467c0..fadffaf93 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/controller/StatusTraceLogController.java @@ -15,13 +15,13 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.controller; +package com.pig4cloud.pigx.daemon.elastic.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.common.core.util.R; -import com.pig4cloud.pigx.daemon.entity.StatusTraceLog; -import com.pig4cloud.pigx.daemon.service.StatusTraceLogService; +import com.pig4cloud.pigx.daemon.elastic.entity.StatusTraceLog; +import com.pig4cloud.pigx.daemon.elastic.service.StatusTraceLogService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/entity/ExecutionLog.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/entity/ExecutionLog.java similarity index 95% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/entity/ExecutionLog.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/entity/ExecutionLog.java index 758aee0e8..df7f52671 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/entity/ExecutionLog.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/entity/ExecutionLog.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pigx.daemon.entity; +package com.pig4cloud.pigx.daemon.elastic.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/entity/StatusTraceLog.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/entity/StatusTraceLog.java similarity index 95% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/entity/StatusTraceLog.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/entity/StatusTraceLog.java index fb6ddcf6d..dcf1acc38 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/entity/StatusTraceLog.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/entity/StatusTraceLog.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pigx.daemon.entity; +package com.pig4cloud.pigx.daemon.elastic.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/job/PigxDataflowJob.java similarity index 96% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/job/PigxDataflowJob.java index 607c452c1..f43388f81 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/job/PigxDataflowJob.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.job; +package com.pig4cloud.pigx.daemon.elastic.job; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.dataflow.DataflowJob; diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/job/PigxSimpleJob.java similarity index 96% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/job/PigxSimpleJob.java index a58bf6ccc..c3b8b5b7f 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/job/PigxSimpleJob.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.job; +package com.pig4cloud.pigx.daemon.elastic.job; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob2.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/job/PigxSimpleJob2.java similarity index 96% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob2.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/job/PigxSimpleJob2.java index 4096a1004..11d44804c 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob2.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/job/PigxSimpleJob2.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.job; +package com.pig4cloud.pigx.daemon.elastic.job; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxDistributeElasticJobListener.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/listener/PigxDistributeElasticJobListener.java similarity index 97% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxDistributeElasticJobListener.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/listener/PigxDistributeElasticJobListener.java index 03934d5fe..ba42d487b 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxDistributeElasticJobListener.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/listener/PigxDistributeElasticJobListener.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.listener; +package com.pig4cloud.pigx.daemon.elastic.listener; import com.dangdang.ddframe.job.executor.ShardingContexts; import com.dangdang.ddframe.job.lite.api.listener.AbstractDistributeOnceElasticJobListener; diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxElasticJobListener.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/listener/PigxElasticJobListener.java similarity index 96% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxElasticJobListener.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/listener/PigxElasticJobListener.java index cafa8c3c7..7c847b8ba 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxElasticJobListener.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/listener/PigxElasticJobListener.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.listener; +package com.pig4cloud.pigx.daemon.elastic.listener; import com.dangdang.ddframe.job.executor.ShardingContexts; import com.dangdang.ddframe.job.lite.api.listener.ElasticJobListener; diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/mapper/ExecutionLogMapper.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/mapper/ExecutionLogMapper.java similarity index 64% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/mapper/ExecutionLogMapper.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/mapper/ExecutionLogMapper.java index 1688e99bf..ad7cc8279 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/mapper/ExecutionLogMapper.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/mapper/ExecutionLogMapper.java @@ -1,7 +1,7 @@ -package com.pig4cloud.pigx.daemon.mapper; +package com.pig4cloud.pigx.daemon.elastic.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pigx.daemon.entity.ExecutionLog; +import com.pig4cloud.pigx.daemon.elastic.entity.ExecutionLog; /** * 任务日志处理 diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/mapper/StatusTraceLogMapper.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/mapper/StatusTraceLogMapper.java similarity index 64% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/mapper/StatusTraceLogMapper.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/mapper/StatusTraceLogMapper.java index e517b5c2f..1efdd443c 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/mapper/StatusTraceLogMapper.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/mapper/StatusTraceLogMapper.java @@ -1,7 +1,7 @@ -package com.pig4cloud.pigx.daemon.mapper; +package com.pig4cloud.pigx.daemon.elastic.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pigx.daemon.entity.StatusTraceLog; +import com.pig4cloud.pigx.daemon.elastic.entity.StatusTraceLog; /** * 任务轨迹处理 diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/ExecutionLogService.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/service/ExecutionLogService.java similarity index 65% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/ExecutionLogService.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/service/ExecutionLogService.java index 7535d509e..5123cab27 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/ExecutionLogService.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/service/ExecutionLogService.java @@ -1,7 +1,7 @@ -package com.pig4cloud.pigx.daemon.service; +package com.pig4cloud.pigx.daemon.elastic.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pigx.daemon.entity.ExecutionLog; +import com.pig4cloud.pigx.daemon.elastic.entity.ExecutionLog; /** * 任务日志处理 diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/StatusTraceLogService.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/service/StatusTraceLogService.java similarity index 65% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/StatusTraceLogService.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/service/StatusTraceLogService.java index a2bc31086..397f37f42 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/StatusTraceLogService.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/service/StatusTraceLogService.java @@ -1,7 +1,7 @@ -package com.pig4cloud.pigx.daemon.service; +package com.pig4cloud.pigx.daemon.elastic.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pigx.daemon.entity.StatusTraceLog; +import com.pig4cloud.pigx.daemon.elastic.entity.StatusTraceLog; /** * 任务轨迹处理 diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/impl/ExecutionLogServiceImpl.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/service/impl/ExecutionLogServiceImpl.java similarity index 57% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/impl/ExecutionLogServiceImpl.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/service/impl/ExecutionLogServiceImpl.java index 2890f6d61..ee4f4933f 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/impl/ExecutionLogServiceImpl.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/service/impl/ExecutionLogServiceImpl.java @@ -1,9 +1,9 @@ -package com.pig4cloud.pigx.daemon.service.impl; +package com.pig4cloud.pigx.daemon.elastic.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pigx.daemon.entity.ExecutionLog; -import com.pig4cloud.pigx.daemon.mapper.ExecutionLogMapper; -import com.pig4cloud.pigx.daemon.service.ExecutionLogService; +import com.pig4cloud.pigx.daemon.elastic.entity.ExecutionLog; +import com.pig4cloud.pigx.daemon.elastic.mapper.ExecutionLogMapper; +import com.pig4cloud.pigx.daemon.elastic.service.ExecutionLogService; import org.springframework.stereotype.Service; /** diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/impl/StatusTraceLogServiceImpl.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/service/impl/StatusTraceLogServiceImpl.java similarity index 61% rename from pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/impl/StatusTraceLogServiceImpl.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/service/impl/StatusTraceLogServiceImpl.java index 8ac645283..46f3b76ef 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/impl/StatusTraceLogServiceImpl.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/service/impl/StatusTraceLogServiceImpl.java @@ -1,9 +1,9 @@ -package com.pig4cloud.pigx.daemon.service.impl; +package com.pig4cloud.pigx.daemon.elastic.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pigx.daemon.entity.StatusTraceLog; -import com.pig4cloud.pigx.daemon.mapper.StatusTraceLogMapper; -import com.pig4cloud.pigx.daemon.service.StatusTraceLogService; +import com.pig4cloud.pigx.daemon.elastic.entity.StatusTraceLog; +import com.pig4cloud.pigx.daemon.elastic.mapper.StatusTraceLogMapper; +import com.pig4cloud.pigx.daemon.elastic.service.StatusTraceLogService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/ExecutionLogMapper.xml b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/ExecutionLogMapper.xml index 2962264ce..81088fdfb 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/ExecutionLogMapper.xml +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/ExecutionLogMapper.xml @@ -1,10 +1,10 @@ - + - + diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/StatusTraceLogMapper.xml b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/StatusTraceLogMapper.xml index b472c09c8..98fa36a18 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/StatusTraceLogMapper.xml +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/StatusTraceLogMapper.xml @@ -1,10 +1,10 @@ - + - +