From f601f00af2e5c640be0b2c29f5a94c00253aa4f3 Mon Sep 17 00:00:00 2001 From: dongyukun <1208714201@qq.com> Date: 星期二, 06 五月 2025 09:41:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java | 3 ++- ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java | 3 ++- ansteel-biz/src/main/java/com/iailab/module/ansteel/common/enums/TraceProcessTypeEnum.java | 6 +++--- ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java | 3 ++- ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java | 3 ++- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/common/enums/TraceProcessTypeEnum.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/common/enums/TraceProcessTypeEnum.java index 774c573..eb6d1ee 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/common/enums/TraceProcessTypeEnum.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/common/enums/TraceProcessTypeEnum.java @@ -9,9 +9,9 @@ public enum TraceProcessTypeEnum { BM("BM", "备煤工序"), - LJ("LJ", "炼焦"), - GXJ("GXJ", "干熄焦"), - HC("HC", "化产"), + LJ("LJ", "炼焦工序"), + GXJ("GXJ", "干熄焦工序"), + HC("HC", "化产工序"), UNKNOW("unkuow", "未知"); private String code; diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java index eb1c449..4d1e8da 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java @@ -5,6 +5,7 @@ import com.iailab.framework.common.util.date.DateUtils; import com.iailab.module.ansteel.coking.service.*; import com.iailab.module.ansteel.common.constant.CommonConstant; +import com.iailab.module.ansteel.common.enums.TraceProcessTypeEnum; import com.iailab.module.model.api.mcs.McsApi; import com.iailab.module.model.api.mdk.MdkApi; import org.slf4j.Logger; @@ -51,7 +52,7 @@ @Autowired private MdkApi mdkApi; - private final static String process = "备煤工序"; + private final static String process = TraceProcessTypeEnum.BM.getProcess(); private final static String reportName = "备煤工序异常溯源"; diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java index b9d75b8..e5575cf 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java @@ -5,6 +5,7 @@ import com.iailab.framework.common.util.date.DateUtils; import com.iailab.module.ansteel.coking.service.*; import com.iailab.module.ansteel.common.constant.CommonConstant; +import com.iailab.module.ansteel.common.enums.TraceProcessTypeEnum; import com.iailab.module.model.api.mcs.McsApi; import com.iailab.module.model.api.mdk.MdkApi; import org.slf4j.Logger; @@ -49,7 +50,7 @@ @Autowired private MdkApi mdkApi; - private final static String process = "干熄焦工序"; + private final static String process = TraceProcessTypeEnum.GXJ.getProcess(); private final static String reportName = "干熄焦工序异常溯源"; diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java index 7a603da..5af3c23 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java @@ -5,6 +5,7 @@ import com.iailab.framework.common.util.date.DateUtils; import com.iailab.module.ansteel.coking.service.*; import com.iailab.module.ansteel.common.constant.CommonConstant; +import com.iailab.module.ansteel.common.enums.TraceProcessTypeEnum; import com.iailab.module.model.api.mcs.McsApi; import com.iailab.module.model.api.mdk.MdkApi; import org.slf4j.Logger; @@ -51,7 +52,7 @@ @Autowired private MdkApi mdkApi; - private final static String process = "化产工序"; + private final static String process = TraceProcessTypeEnum.HC.getProcess(); private final static String reportName = "化产工序异常溯源"; diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java index 2d0213a..ad56470 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java @@ -5,6 +5,7 @@ import com.iailab.framework.common.util.date.DateUtils; import com.iailab.module.ansteel.coking.service.*; import com.iailab.module.ansteel.common.constant.CommonConstant; +import com.iailab.module.ansteel.common.enums.TraceProcessTypeEnum; import com.iailab.module.model.api.mdk.MdkApi; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +48,7 @@ @Autowired private MdkApi mdkApi; - private final static String process = "炼焦工序"; + private final static String process = TraceProcessTypeEnum.LJ.getProcess(); private final static String reportName = "炼焦工序异常溯源"; -- Gitblit v1.9.3