From c4660251cde90266bb611b65db16cd4e42140de5 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Thu, 27 May 2021 13:36:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B5=84=E6=BA=90=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E4=B8=AD=E9=97=B4=E8=AE=A1=E7=AE=97=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java    |  5 +++++
 .../i3plus/pojo/aps/model/RuleDetailModel.java      | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
index 28e424e..eb2a239 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
@@ -1,9 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.ERuleGroup;
+import cn.estsh.i3plus.pojo.aps.model.RuleDetailModel;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -44,6 +46,9 @@ public class RuleGroup extends BaseAPS {
     @ApiParam(value ="当前执行的规则名称")
     private transient String curDetailName;
 
+    @FieldAnnotation(property = false)
+    private transient RuleDetailModel model;
+
     @JsonBackReference
     public List<RuleDetail> getDetails() { return BeanRelation.list(this, ERuleGroup.Details); }
 }
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
new file mode 100644
index 0000000..0846ded
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java
@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class RuleDetailModel {
+    @ApiParam(value ="当前执行进度")
+    private Integer curProcess = 0;
+
+    @ApiParam(value ="总行数")
+    private Integer totalSize = 0;
+
+    @ApiParam(value ="进度消息")
+    private String processMsg = "";
+
+    private Boolean finish = false;
+
+    @ApiParam(value ="异常消息")
+    private String exception = "";
+}