From c980c6c87c534c33d9c133940fd17b5eea2ac17d Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Fri, 10 Jul 2020 18:36:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E5=8A=9B=E5=A3=AB=E6=BC=94=E7=A4=BAde?=
 =?UTF-8?q?mo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java  | 9 +++++++--
 .../java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java     | 4 +++-
 2 files changed, 10 insertions(+), 3 deletions(-)

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 6d1814a..a5caf9e 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
@@ -28,6 +28,7 @@ public class DateDuration {
     private int time = 0;
     private double rate = 0.0;
     private boolean bValid = false;
+    private int unit = 0;
 
     public DateDuration(int value) {
         this.time = value;
@@ -147,6 +148,9 @@ public class DateDuration {
         if (amount < PRECISION)
             return getTime();
 
+        if (this.unit > 0) {
+            amount = Math.ceil(amount / this.unit);
+        }
         double result = (amount * this.rate) + this.time;
         return (int)Math.ceil(result);
     }
@@ -184,10 +188,11 @@ public class DateDuration {
         for (EV_STRING evs : lst) {
             if (evs.type == EV_STRING_TYPE.EVS_GOOD) {
                 AbstractMap.SimpleEntry<Boolean, Integer> extraTime = transTimeEach(evs.value);
-                if (extraTime.getKey() || !oFlg) {
+                if (extraTime.getKey() || oFlg) {
                     this.time += extraTime.getValue();
                 } else {
-                    this.time += extraTime.getValue() * 1;
+                    //this.time += extraTime.getValue() * 1;
+                    this.unit = extraTime.getValue();
                 }
             }
             else {
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 23def74..2229c9b 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
@@ -420,7 +420,9 @@ public class ApsEnumUtil {
         NEARLY_WORK("NEARLY_WORK", "前后工作"),
         POST_RESOURCE("POST_RESOURCE", "后资源制约"),
         SAME_ASS_RESOURCE("SAME_ASS_RESOURCE", "相同副资源"),
-        RESOURCE_PRIORITY("RESOURCE_PRIORITY", "资源优先级");
+        RESOURCE_PRIORITY("RESOURCE_PRIORITY", "资源优先级"),
+        RESOURCE_USEAGE("RESOURCE_USEAGE", "资源使用率"),
+        CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式");
 
         private String value;
         private String description;