solax-py-library 1.0.0.36__tar.gz → 1.0.0.38__tar.gz

{solax_py_library-1.0.0.36 → solax_py_library-1.0.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: solax-py-library
-Version: 1.0.0.36
+Version: 1.0.0.38
 Summary: some common tool
 Author: shenlvyu
 Author-email: 13296718439@163.com

{solax_py_library-1.0.0.36 → solax_py_library-1.0.0.38}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "solax-py-library"
-version = "1.0.0.36"
+version = "1.0.0.38"
 description = "some common tool"
 authors = ["shenlvyu <13296718439@163.com>", "x5m8944pjl <371630856@qq.com>"]
 readme = "README.md"

{solax_py_library-1.0.0.36 → solax_py_library-1.0.0.38}/solax_py_library/smart_scene/constant/message_entry.py

@@ -159,17 +159,17 @@ MESSAGE_ENTRY = {
     "duration": {"zh_CN": "持续: {}秒", "en_US": "Last: {} seconds"},
     "systemSoc": {"zh_CN": "系统SOC {} {}%", "en_US": "System SOC {} {}%"},
     "systemImportPower": {
-        "zh_CN": "电网买电功率 {} {}KW",
-        "en_US": "Grid import power {} {}KW",
+        "zh_CN": "电网买电功率 {} {}kW",
+        "en_US": "Grid import power {} {}kW",
     },
     "systemExportPower": {
-        "zh_CN": "电网馈电功率 {} {}KW",
-        "en_US": "Grid export power {} {}KW",
+        "zh_CN": "电网馈电功率 {} {}kW",
+        "en_US": "Grid export power {} {}kW",
     },
     "cabinetSoc": {"zh_CN": "机柜SOC {} {}%", "en_US": "Cabinet SOC {} {}%"},
     "EMERGENCY": {"zh_CN": "紧急告警", "en_US": "Emergency alarm"},
     "TIPS": {"zh_CN": "状态提醒", "en_US": "State Tips"},
-    "NORMAL": {"zh_CN": "普通告警", "en_US": "Normal alarm"},
+    "NORMAL": {"zh_CN": "一般告警", "en_US": "Normal alarm"},
     "cabinetAlarm": {
         "zh_CN": "机柜下属({})设备发生{}",
         "en_US": "The equipments({}) under the cabinet occurs {}",

{solax_py_library-1.0.0.36 → solax_py_library-1.0.0.38}/solax_py_library/smart_scene/core/condition/price_condition.py

@@ -36,10 +36,14 @@ class ElePriceCondition(BaseCondition):
         price = self.value["price"]
         if None in price[0:96]:
             return False
+        max_num = max(price[0:96])
         if unit == SmartSceneUnit.NUM:  # 比最高电价低X元
-            base = max(price[0:96]) - value
+            base = max_num - value
         else:  # 比最高电价低X%
-            base = round(max(price[0:96]) * (1 - value / 100), 4)
+            if max_num < 0:
+                base = round(max_num * (1 + value / 100), 4)
+            else:
+                base = round(max_num * (1 - value / 100), 4)
         app_log.info(f"meet_func_highest_price: {base}, data_value: {price[index]}")
         if price[index] <= base:
             return True
@@ -51,10 +55,14 @@ class ElePriceCondition(BaseCondition):
         price = self.value["price"]
         if None in price[0:96]:
             return False
+        min_num = min(price[0:96])
         if unit == SmartSceneUnit.NUM:  # 比最低电价高X元
-            base = value + min(price[0:96])
+            base = min_num + value
         else:  # 比最低电价高X%
-            base = round(min(price[0:96]) * (1 + value / 100), 4)
+            if min_num < 0:
+                base = round(min_num * (1 - value / 100), 4)
+            else:
+                base = round(min_num * (1 + value / 100), 4)
         app_log.info(f"meet_func_lowest_price: {base}, data_value: {price[index]}")
         if price[index] >= base:
             return True