From 81b84d86e5e32f6fbc955f8bb4f5865802ca9c47 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Wed, 18 Dec 2019 12:20:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EKPI=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/aps/model/GanttLineModel.java      |  5 ++--
 .../cn/estsh/i3plus/pojo/aps/model/KPIModel.java   | 25 +++++++++++++++++
 .../i3plus/pojo/aps/model/ResourceLodaRequest.java | 23 ++++++++++++++++
 .../i3plus/pojo/base/enumutil/ApsEnumUtil.java     | 31 ++++++++++++++++++++++
 4 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java
index f085c30..0c5ab45 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java
@@ -4,8 +4,7 @@ import lombok.Data;
 
 @Data
 public class GanttLineModel {
-    private long id;
-    private long source;
-    private long target;
+    private long from;
+    private long to;
     private int type;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java
new file mode 100644
index 0000000..b5007f0
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java
@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+/**
+ * KPI接口数据
+ */
+@Data
+public class KPIModel {
+    private Integer salesOrderCount;
+
+    private Integer productOrderCount;
+
+    private Integer schedWorkCount;
+
+    private Integer noSchedWorkCount;
+
+    private Integer confirmOrderCount;
+
+    private String produceTimes;
+
+    private String settingTimes;
+
+    private Integer overdueSalesCount;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java
new file mode 100644
index 0000000..c35f89e
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java
@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ResourceLodaRequest {
+    private ApsEnumUtil.RESOURCE_LOAD_SPAN span;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date begin;     // 统计开始时间
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date end;       // 统计结束时间
+
+    private Long[] resourceIds;
+}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
index 0d23467..fb63168 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
@@ -1079,4 +1079,35 @@ public class ApsEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 资源符合时间间隔类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RESOURCE_LOAD_SPAN {
+        ONE_HOUR("ONE_HOUR", "1小时"),
+        TWO_HOUR("TWO_HOUR", "2小时"),
+        SIX_HOUR("SIX_HOUR", "6小时"),
+        EIGHT_HOUR("EIGHT_HOUR", "8小时"),
+        TWELVE_HOUR("TWELVE_HOUR", "12小时"),
+        ONE_DAY("ONE_DAY", "1天"),
+        ONE_WEEK("ONE_WEEK", "1周"),
+        ONE_MONTH("ONE_MONTH", "1月");
+
+        private String value;
+        private String description;
+
+        RESOURCE_LOAD_SPAN(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }