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
a7eb03e0
Commit
a7eb03e0
authored
Apr 13, 2023
by
wang.wenrong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tsp
parent
0398e9a7
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
adio_dao.py
unify_api/modules/adio/dao/adio_dao.py
+2
-1
electric.py
unify_api/modules/electric/views/electric.py
+1
-2
drop_dust.py
unify_api/modules/tsp_water/views/drop_dust.py
+3
-1
No files found.
unify_api/modules/adio/dao/adio_dao.py
View file @
a7eb03e0
...
...
@@ -2,6 +2,7 @@ from pot_libs.mysql_util.mysql_util import MysqlUtil
from
pot_libs.settings
import
SETTING
from
unify_api.modules.common.service.td_engine_service
import
\
get_td_engine_data
from
unify_api.utils.taos_new
import
parse_td_columns
async
def
get_location_dao
(
lids
):
...
...
@@ -39,6 +40,6 @@ async def get_adio_current_data(mtid):
return
{}
if
not
results
[
'data'
]:
return
{}
head
=
results
[
'head'
]
head
=
parse_td_columns
(
results
)
res
=
dict
(
zip
(
head
,
results
[
'data'
][
0
]))
return
res
unify_api/modules/electric/views/electric.py
View file @
a7eb03e0
...
...
@@ -884,8 +884,7 @@ async def post_qual_current(req, body: PageRequest) -> QualCurrentResponse:
is_succ
,
results
=
await
get_td_engine_data
(
url
,
sql
)
log
.
info
(
f
"is_succ:{is_succ}"
)
if
is_succ
:
head
=
[
re
.
findall
(
r'last_row\((.*)\)'
,
i
)[
0
]
if
"("
in
i
else
i
for
i
in
results
[
"head"
]]
head
=
parse_td_columns
(
results
)
if
not
results
[
"data"
]:
results
[
"data"
]
=
[
''
for
i
in
range
(
len
(
head
))]
res
=
dict
(
zip
(
head
,
results
[
"data"
][
0
]))
...
...
unify_api/modules/tsp_water/views/drop_dust.py
View file @
a7eb03e0
...
...
@@ -10,7 +10,9 @@ from unify_api.modules.tsp_water.service.drop_dust_service import \
@
summary
(
"降尘措施-卡片信息"
)
async
def
post_drop_dust
(
req
,
body
:
DdReq
)
->
DdResp
:
storeys
=
body
.
storeys
return
await
post_drop_dust_service
(
storeys
)
return_list
=
[]
return
DdResp
(
res_data
=
return_list
)
# return await post_drop_dust_service(storeys) todo:tsp 临时简单处理
@
summary
(
"降尘措施-雾炮-运行曲线"
)
...
...
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