Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
U
unify_api2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chaonan
unify_api2
Commits
4754c324
Commit
4754c324
authored
Aug 26, 2022
by
lcn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG修复
parent
b48292d4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
list_alarm.py
unify_api/modules/alarm_manager/views/list_alarm.py
+5
-2
elec_statistics.py
unify_api/modules/elec_charge/views/elec_statistics.py
+1
-1
No files found.
unify_api/modules/alarm_manager/views/list_alarm.py
View file @
4754c324
...
@@ -44,8 +44,11 @@ async def post_list_alarm(req, body: PageRequest) -> ListAlarmResponse:
...
@@ -44,8 +44,11 @@ async def post_list_alarm(req, body: PageRequest) -> ListAlarmResponse:
_range
=
body
.
filter
.
ranges
[
0
]
_range
=
body
.
filter
.
ranges
[
0
]
_
,
start
,
end
=
_range
.
field
,
_range
.
start
,
_range
.
end
_
,
start
,
end
=
_range
.
field
,
_range
.
start
,
_range
.
end
if
body
.
filter
.
equals
:
if
body
.
filter
.
equals
:
_equal
=
body
.
filter
.
equals
[
0
]
for
equal
in
body
.
filter
.
equals
:
point_id
=
_equal
.
value
if
equal
.
field
==
'cid'
:
cid
=
equal
.
value
elif
equal
.
field
==
'point_id'
:
point_id
=
equal
.
value
if
body
.
filter
.
in_groups
:
if
body
.
filter
.
in_groups
:
for
in_group
in
body
.
filter
.
in_groups
:
for
in_group
in
body
.
filter
.
in_groups
:
if
in_group
.
field
==
'type'
:
if
in_group
.
field
==
'type'
:
...
...
unify_api/modules/elec_charge/views/elec_statistics.py
View file @
4754c324
...
@@ -31,7 +31,7 @@ async def post_max_p(req, body: MaxpReq) -> MaxpResp:
...
@@ -31,7 +31,7 @@ async def post_max_p(req, body: MaxpReq) -> MaxpResp:
point_id
=
body
.
point_id
point_id
=
body
.
point_id
start
=
body
.
start
start
=
body
.
start
end
=
body
.
end
end
=
body
.
end
max_val
,
max_val_time
=
await
pttl_max
(
cid
,
start
,
end
,
point_id
=
point_id
)
max_val
,
max_val_time
=
await
pttl_max
_new15
(
cid
,
start
,
end
,
point_id
=
point_id
)
return
MaxpResp
(
maxp
=
max_val
,
date_time
=
max_val_time
)
return
MaxpResp
(
maxp
=
max_val
,
date_time
=
max_val_time
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment