From eeb9ab500bbc2b7a13150730479d42aef495229a Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Thu, 10 Jun 2021 11:57:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E7=A8=8B=E7=BB=93=E6=9E=9C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java   |  4 ++++
 .../java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java  |  5 +++++
 .../java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java  | 10 +++++-----
 .../cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java     | 13 +++++++++++++
 .../cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java   |  1 +
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
index 294ec49..a4091af 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
@@ -57,4 +57,8 @@ public class HeuristicRule extends BaseRule {
     @ApiParam(value ="组炉区间")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String batchPeriod;
+
+    @Column(name="REVER_FLUSH_PLAN")
+    @ApiParam(value ="逆向刷新计划")
+    private Boolean reverFlushPlan = false;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
index be15e07..7fce6f7 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
@@ -63,6 +63,11 @@ public class StandOperation extends BaseAPS {
     @ApiParam(value ="分割余数")
     private Double remainder;
 
+    @Column(name="MIN_SPACE_TIME")
+    @ApiParam(value ="最小时间间隔")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
+    private String minSpaceTime;
+
     @Column(name="COMB_TYPE")
     @ApiParam(value ="生产组合方式")
     @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
index a5caf9e..35f5add 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
@@ -25,12 +25,12 @@ public class DateDuration {
 
     public static final double PRECISION = 0.00001;
     private String value;
-    private int time = 0;
+    private long time = 0;
     private double rate = 0.0;
     private boolean bValid = false;
     private int unit = 0;
 
-    public DateDuration(int value) {
+    public DateDuration(long value) {
         this.time = value;
     }
 
@@ -65,7 +65,7 @@ public class DateDuration {
      * 对于无效的时间区间，返回0。单位为秒。
      * @return
      */
-    public int getTime() {
+    public long getTime() {
         return this.time;
     }
 
@@ -73,7 +73,7 @@ public class DateDuration {
      * 设置新的时间区间。
      * @return
      */
-    public void setTime(int time) {
+    public void setTime(long time) {
         this.time = time;
     }
 
@@ -144,7 +144,7 @@ public class DateDuration {
      * @param amount
      * @return
      */
-    public int getTime(double amount) {
+    public long getTime(double amount) {
         if (amount < PRECISION)
             return getTime();
 
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java
index 0846ded..6c0b455 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java
@@ -5,6 +5,12 @@ import lombok.Data;
 
 @Data
 public class RuleDetailModel {
+    @ApiParam(value ="主执行进度")
+    private Integer mainProcess = 0;
+
+    @ApiParam(value ="总规则数")
+    private Integer mainSize = 0;
+
     @ApiParam(value ="当前执行进度")
     private Integer curProcess = 0;
 
@@ -14,8 +20,15 @@ public class RuleDetailModel {
     @ApiParam(value ="进度消息")
     private String processMsg = "";
 
+    @ApiParam(value ="进度消息明细")
+    private String subMsg = "";
+
     private Boolean finish = false;
 
     @ApiParam(value ="异常消息")
     private String exception = "";
+
+    public void addProcess() {
+        this.curProcess += 1;
+    }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java
index 7344176..f3df9c1 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java
@@ -11,6 +11,7 @@ import lombok.Data;
  **/
 @Data
 public class RuleGroupProgress {
+    private Integer mainProgress;
     private String message;
     private Integer progress;
 }