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
b48292d4
Commit
b48292d4
authored
Aug 25, 2022
by
lcn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG修复
parent
07d65473
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
alarm_setting_dao.py
unify_api/modules/alarm_manager/dao/alarm_setting_dao.py
+1
-0
electric.py
unify_api/modules/electric/views/electric.py
+1
-1
No files found.
unify_api/modules/alarm_manager/dao/alarm_setting_dao.py
View file @
b48292d4
...
@@ -35,6 +35,7 @@ async def get_list_alarm_dao(mid_sql, page_size, page_num):
...
@@ -35,6 +35,7 @@ async def get_list_alarm_dao(mid_sql, page_size, page_num):
sql
=
f
"SELECT point_1min_event.*, company.fullname "
\
sql
=
f
"SELECT point_1min_event.*, company.fullname "
\
f
"FROM `point_1min_event` LEFT JOIN company "
\
f
"FROM `point_1min_event` LEFT JOIN company "
\
f
"on company.cid=point_1min_event.cid where {mid_sql} "
\
f
"on company.cid=point_1min_event.cid where {mid_sql} "
\
f
"order by event_datetime desc "
\
f
"limit {start}, {page_size}"
f
"limit {start}, {page_size}"
async
with
MysqlUtil
()
as
conn
:
async
with
MysqlUtil
()
as
conn
:
data
=
await
conn
.
fetchall
(
sql
)
data
=
await
conn
.
fetchall
(
sql
)
...
...
unify_api/modules/electric/views/electric.py
View file @
b48292d4
...
@@ -769,7 +769,7 @@ async def qual_history_service_new15(start, end, intervel, slots, pid):
...
@@ -769,7 +769,7 @@ async def qual_history_service_new15(start, end, intervel, slots, pid):
for
slot
in
slots
:
for
slot
in
slots
:
if
slot
in
datas
.
keys
():
if
slot
in
datas
.
keys
():
for
stats_item
in
stats_items
:
for
stats_item
in
stats_items
:
value
=
datas
[
slot
]
.
get
(
stats_item
)
or
""
value
=
datas
[
slot
]
.
get
(
stats_item
,
""
)
if
value
and
stats_item
==
"freq_dev_mean"
:
if
value
and
stats_item
==
"freq_dev_mean"
:
# 如果频率偏差保留两位小数之后为0了,那么直接返回0,防止出现-0.00 的情况
# 如果频率偏差保留两位小数之后为0了,那么直接返回0,防止出现-0.00 的情况
if
abs
(
value
)
<
0.05
:
if
abs
(
value
)
<
0.05
:
...
...
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