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
83008177
Commit
83008177
authored
Jun 10, 2025
by
ZZH
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix equip reuse query 2025-6-10 11:35
parent
9eeefa40
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
8 deletions
+26
-8
equipment_operations_dao.py
unify_api/modules/zhiwei_u/dao/equipment_operations_dao.py
+6
-3
sid_iccid_map.py
unify_api/modules/zhiwei_u/service/sid_iccid_map.py
+20
-5
No files found.
unify_api/modules/zhiwei_u/dao/equipment_operations_dao.py
View file @
83008177
...
@@ -42,9 +42,12 @@ async def load_equip_reuse(sid):
...
@@ -42,9 +42,12 @@ async def load_equip_reuse(sid):
f
"LEFT JOIN {db}.point p on m.mtid=p.mtid "
\
f
"LEFT JOIN {db}.point p on m.mtid=p.mtid "
\
f
"WHERE m.sid=
%
s AND m.meter_no=
%
s AND m.cid=
%
s "
\
f
"WHERE m.sid=
%
s AND m.meter_no=
%
s AND m.cid=
%
s "
\
f
"AND m.demolished=0"
f
"AND m.demolished=0"
try
:
r
=
await
conn
.
fetchone
(
sql
,
args
=
(
sid
,
meter_no
,
cid
,))
r
=
await
conn
.
fetchone
(
sql
,
args
=
(
sid
,
meter_no
,
cid
,))
if
r
:
if
r
:
rlt
.
append
(
r
)
rlt
.
append
(
r
)
except
Exception
:
continue
return
rlt
return
rlt
...
...
unify_api/modules/zhiwei_u/service/sid_iccid_map.py
View file @
83008177
...
@@ -198,7 +198,7 @@ async def update_all():
...
@@ -198,7 +198,7 @@ async def update_all():
logger
.
info
(
f
"start do task, sid total:{len(sid_total)}"
)
logger
.
info
(
f
"start do task, sid total:{len(sid_total)}"
)
for
i
,
sid
in
enumerate
(
sid_total
,
start
=
1
):
for
i
,
sid
in
enumerate
(
sid_total
,
start
=
1
):
tmp
.
append
(
sid
)
tmp
.
append
(
sid
)
if
i
%
10
0
and
i
<
len
(
sid_total
):
if
i
%
2
0
and
i
<
len
(
sid_total
):
continue
continue
task_lst
=
[
load_iccid
(
sid
)
for
sid
in
tmp
]
task_lst
=
[
load_iccid
(
sid
)
for
sid
in
tmp
]
...
@@ -210,7 +210,7 @@ async def update_all():
...
@@ -210,7 +210,7 @@ async def update_all():
tmp
=
[]
tmp
=
[]
time
.
sleep
(
18
0
)
time
.
sleep
(
30
0
)
if
sid_iccids
:
if
sid_iccids
:
await
batch_insert
(
sid_iccids
)
await
batch_insert
(
sid_iccids
)
...
@@ -221,7 +221,7 @@ async def update_all():
...
@@ -221,7 +221,7 @@ async def update_all():
sid_iccids
,
fail_two
,
tmp
=
[],
set
(),
[]
sid_iccids
,
fail_two
,
tmp
=
[],
set
(),
[]
for
i
,
sid
in
enumerate
(
list
(
fail_sid
),
start
=
1
):
for
i
,
sid
in
enumerate
(
list
(
fail_sid
),
start
=
1
):
tmp
.
append
(
sid
)
tmp
.
append
(
sid
)
if
i
%
10
0
and
i
<
len
(
fail_sid
):
if
i
%
2
0
and
i
<
len
(
fail_sid
):
continue
continue
task_lst
=
[
load_iccid
(
sid
)
for
sid
in
tmp
]
task_lst
=
[
load_iccid
(
sid
)
for
sid
in
tmp
]
...
@@ -231,7 +231,7 @@ async def update_all():
...
@@ -231,7 +231,7 @@ async def update_all():
else
:
else
:
fail_two
.
add
(
_sid
)
fail_two
.
add
(
_sid
)
time
.
sleep
(
18
0
)
time
.
sleep
(
30
0
)
if
sid_iccids
:
if
sid_iccids
:
await
batch_insert
(
sid_iccids
)
await
batch_insert
(
sid_iccids
)
...
@@ -240,6 +240,21 @@ async def update_all():
...
@@ -240,6 +240,21 @@ async def update_all():
f
"fail:{len(fail_two)}"
)
f
"fail:{len(fail_two)}"
)
async
def
press_test
():
success
,
fail
=
0
,
0
sid
=
"R2104100140"
for
i
in
range
(
500
):
_
,
iccid
,
sim_opt
=
await
load_iccid
(
sid
)
logger
.
info
(
f
"iccid:{iccid}, sim_opt:{sim_opt}"
)
if
iccid
:
success
+=
1
else
:
fail
+=
1
time
.
sleep
(
7
)
logger
.
info
(
f
"finish success:{success}, fail:{fail}"
)
async
def
main2
():
async
def
main2
():
while
True
:
while
True
:
try
:
try
:
...
@@ -247,7 +262,7 @@ async def main2():
...
@@ -247,7 +262,7 @@ async def main2():
except
Exception
as
e
:
except
Exception
as
e
:
logger
.
exception
(
f
"main2 error:{e}"
)
logger
.
exception
(
f
"main2 error:{e}"
)
time
.
sleep
(
18
00
)
time
.
sleep
(
3
00
)
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
...
...
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