solax-py-library 1.0.0.36__py3-none-any.whl → 1.0.0.37__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- solax_py_library/smart_scene/core/condition/price_condition.py +12 -4
- {solax_py_library-1.0.0.36.dist-info → solax_py_library-1.0.0.37.dist-info}/METADATA +1 -1
- {solax_py_library-1.0.0.36.dist-info → solax_py_library-1.0.0.37.dist-info}/RECORD +4 -4
- {solax_py_library-1.0.0.36.dist-info → solax_py_library-1.0.0.37.dist-info}/WHEEL +0 -0
|
@@ -36,10 +36,14 @@ class ElePriceCondition(BaseCondition):
|
|
|
36
36
|
price = self.value["price"]
|
|
37
37
|
if None in price[0:96]:
|
|
38
38
|
return False
|
|
39
|
+
max_num = max(price[0:96])
|
|
39
40
|
if unit == SmartSceneUnit.NUM: # 比最高电价低X元
|
|
40
|
-
base =
|
|
41
|
+
base = max_num - value
|
|
41
42
|
else: # 比最高电价低X%
|
|
42
|
-
|
|
43
|
+
if max_num < 0:
|
|
44
|
+
base = round(max_num * (1 + value / 100), 4)
|
|
45
|
+
else:
|
|
46
|
+
base = round(max_num * (1 - value / 100), 4)
|
|
43
47
|
app_log.info(f"meet_func_highest_price: {base}, data_value: {price[index]}")
|
|
44
48
|
if price[index] <= base:
|
|
45
49
|
return True
|
|
@@ -51,10 +55,14 @@ class ElePriceCondition(BaseCondition):
|
|
|
51
55
|
price = self.value["price"]
|
|
52
56
|
if None in price[0:96]:
|
|
53
57
|
return False
|
|
58
|
+
min_num = min(price[0:96])
|
|
54
59
|
if unit == SmartSceneUnit.NUM: # 比最低电价高X元
|
|
55
|
-
base =
|
|
60
|
+
base = min_num + value
|
|
56
61
|
else: # 比最低电价高X%
|
|
57
|
-
|
|
62
|
+
if min_num < 0:
|
|
63
|
+
base = round(min_num * (1 - value / 100), 4)
|
|
64
|
+
else:
|
|
65
|
+
base = round(min_num * (1 + value / 100), 4)
|
|
58
66
|
app_log.info(f"meet_func_lowest_price: {base}, data_value: {price[index]}")
|
|
59
67
|
if price[index] >= base:
|
|
60
68
|
return True
|
|
@@ -24,7 +24,7 @@ solax_py_library/smart_scene/core/condition/__init__.py,sha256=1nN-N52Oq7LKdn6Ap
|
|
|
24
24
|
solax_py_library/smart_scene/core/condition/base.py,sha256=saj7dc0Su2Wi_Lx04cesHFgIPDyQUwvHuDElcaDOIHU,596
|
|
25
25
|
solax_py_library/smart_scene/core/condition/cabinet_condition.py,sha256=Umum_DvUo6xQDqci4SyiFXw8mpNrkn4l2HdZ4XPVC8c,2039
|
|
26
26
|
solax_py_library/smart_scene/core/condition/date_condition.py,sha256=ipJo8hvAgeANEwYUSa_O2j4ORc-xhDrJOSuQDMa8-9M,948
|
|
27
|
-
solax_py_library/smart_scene/core/condition/price_condition.py,sha256=
|
|
27
|
+
solax_py_library/smart_scene/core/condition/price_condition.py,sha256=yMVRX3gLP7CUYmS-oXRI8GBqoHM8Pi86wht_i8LCQWk,4545
|
|
28
28
|
solax_py_library/smart_scene/core/condition/system_condition.py,sha256=lEC0N7pZolRkYRcuDfer5jZIvzOGe2ej4oBDlRD8OLQ,1734
|
|
29
29
|
solax_py_library/smart_scene/core/condition/weather_condition.py,sha256=PkHxQzHwJLZiMsLL4xW8zvghRoQ32TV3vzkNyoF82Ak,2684
|
|
30
30
|
solax_py_library/smart_scene/core/service/__init__.py,sha256=wWzHSN2XaHnI-TNtCJWWRHnNC7s3-2GNQo9y0K_PC4Q,69
|
|
@@ -79,6 +79,6 @@ solax_py_library/utils/cloud_client.py,sha256=5dZrc5fzrNFSXqTPZd7oHt-Y9Jj6RCigB7
|
|
|
79
79
|
solax_py_library/utils/common.py,sha256=bfnZcX9uM-PjJrYAFv1UMmZgt6bGR7MaOd7jRPNHGxw,1238
|
|
80
80
|
solax_py_library/utils/struct_util.py,sha256=pL6L80GXIHasy1ZDIj89-5BzXW1BWI3TPitH7thGGIE,1577
|
|
81
81
|
solax_py_library/utils/time_util.py,sha256=bY5kj9dmyOuLEQ6uYGQK7jU7y1RMiHZgevEKnkcQcSU,1461
|
|
82
|
-
solax_py_library-1.0.0.
|
|
83
|
-
solax_py_library-1.0.0.
|
|
84
|
-
solax_py_library-1.0.0.
|
|
82
|
+
solax_py_library-1.0.0.37.dist-info/METADATA,sha256=okDozYBii5woAqsJ67PwV25DCLndCbi9a94JAveH3y4,1825
|
|
83
|
+
solax_py_library-1.0.0.37.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
|
|
84
|
+
solax_py_library-1.0.0.37.dist-info/RECORD,,
|
|
File without changes
|