Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MyEMS
MyEMS能源管理系统
提交
bbb3f71c
M
MyEMS能源管理系统
项目概览
MyEMS
/
MyEMS能源管理系统
通知
47
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
MyEMS能源管理系统
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bbb3f71c
编写于
4月 25, 2024
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
updated in myems-api/core/datasource.py
上级
92ac1daf
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
36 addition
and
1 deletion
+36
-1
myems-api/core/datasource.py
myems-api/core/datasource.py
+36
-1
未找到文件。
myems-api/core/datasource.py
浏览文件 @
bbb3f71c
...
@@ -462,6 +462,20 @@ class DataSourcePointCollection:
...
@@ -462,6 +462,20 @@ class DataSourcePointCollection:
cursor
.
execute
(
query_point
,
(
id_
,))
cursor
.
execute
(
query_point
,
(
id_
,))
rows_point
=
cursor
.
fetchall
()
rows_point
=
cursor
.
fetchall
()
cnx_history
=
mysql
.
connector
.
connect
(
**
config
.
myems_historical_db
)
history
=
cnx_history
.
cursor
()
history
.
execute
(
" SELECT point_id, utc_date_time, actual_value "
" FROM tbl_analog_value_latest "
)
analog
=
history
.
fetchall
()
history
.
execute
(
" SELECT point_id, utc_date_time, actual_value "
" FROM tbl_digital_value_latest "
)
digital
=
history
.
fetchall
()
history
.
execute
(
" SELECT point_id, utc_date_time, actual_value "
" FROM tbl_energy_value_latest "
)
energy
=
history
.
fetchall
()
if
rows_point
is
not
None
and
len
(
rows_point
)
>
0
:
if
rows_point
is
not
None
and
len
(
rows_point
)
>
0
:
for
row
in
rows_point
:
for
row
in
rows_point
:
meta_result
=
{
"id"
:
row
[
0
],
meta_result
=
{
"id"
:
row
[
0
],
...
@@ -476,7 +490,28 @@ class DataSourcePointCollection:
...
@@ -476,7 +490,28 @@ class DataSourcePointCollection:
"is_trend"
:
bool
(
row
[
9
]),
"is_trend"
:
bool
(
row
[
9
]),
"is_virtual"
:
bool
(
row
[
10
]),
"is_virtual"
:
bool
(
row
[
10
]),
"address"
:
row
[
11
],
"address"
:
row
[
11
],
"description"
:
row
[
12
]}
"description"
:
row
[
12
],
"analog_value"
:
None
,
"digital_value"
:
None
,
"energy_value"
:
None
}
for
point
in
analog
:
if
point
[
0
]
==
meta_result
[
'id'
]
and
isinstance
(
point
[
1
],
datetime
):
date
=
datetime
.
now
(
timezone
.
utc
).
replace
(
tzinfo
=
None
)
duration
=
date
-
point
[
1
]
if
duration
.
days
==
0
and
duration
.
seconds
<=
600
:
meta_result
[
'analog_value'
]
=
point
[
2
]
for
point
in
digital
:
if
point
[
0
]
==
meta_result
[
'id'
]
and
isinstance
(
point
[
1
],
datetime
):
date
=
datetime
.
now
(
timezone
.
utc
).
replace
(
tzinfo
=
None
)
duration
=
date
-
point
[
1
]
if
duration
.
days
==
0
and
duration
.
seconds
<=
600
:
meta_result
[
'digital_value'
]
=
point
[
2
]
for
point
in
energy
:
if
point
[
0
]
==
meta_result
[
'id'
]
and
isinstance
(
point
[
1
],
datetime
):
date
=
datetime
.
now
(
timezone
.
utc
).
replace
(
tzinfo
=
None
)
duration
=
date
-
point
[
1
]
if
duration
.
days
==
0
and
duration
.
seconds
<=
600
:
meta_result
[
'energy_value'
]
=
point
[
2
]
result
.
append
(
meta_result
)
result
.
append
(
meta_result
)
cursor
.
close
()
cursor
.
close
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录