Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
taxh5
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
data_server
taxh5
Commits
62db6f00
Commit
62db6f00
authored
Mar 25, 2019
by
何娜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test
parent
e9416ff3
Pipeline
#5023
passed with stage
in 2 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
task.js
app/controller/task.js
+8
-5
No files found.
app/controller/task.js
View file @
62db6f00
...
...
@@ -105,6 +105,7 @@ class TaskController extends Controller {
const
{
ctx
,
service
}
=
this
;
const
{
taskId
}
=
ctx
.
request
.
body
;
const
result
=
await
service
.
task
.
fetchTask
({
taskId
});
ctx
.
logger
.
info
(
'原始数据result:----'
,
result
,
'-----------------666'
)
ctx
.
success
();
let
taskNote
=
{
status
:
'init'
,
...
...
@@ -144,7 +145,6 @@ class TaskController extends Controller {
note
:
{
message
:
'task success'
},
};
try
{
// const insertData = await service.washData.wash(result);
const
order
=
await
service
.
order
.
getOneByTaskId
(
taskId
);
if
(
!
order
)
{
throw
new
Error
(
'任务已经结束了'
);
...
...
@@ -152,13 +152,16 @@ class TaskController extends Controller {
const
{
orderId
,
appkey
}
=
order
;
ctx
.
logger
.
info
(
result
.
cityId
)
const
script
=
await
service
.
scripts
.
fetchOneScripts
(
result
.
cityId
);
ctx
.
logger
.
info
(
'callback-script'
,
JSON
.
stringify
(
script
))
ctx
.
logger
.
info
(
'callback-script-----------'
,
JSON
.
stringify
(
script
))
result
.
cityId
=
'12'
;
result
.
cityName
=
'北京'
;
result
.
taskId
=
taskId
;
result
.
data
=
JSON
.
parse
(
result
.
data
.
data
);
result
.
orderSn
=
orderId
;
result
.
orderId
=
orderId
;
// result.cityName = script.name || 'unknown';
result
.
taskId
=
taskId
;
// result.appKey = appkey;
result
.
appKey
=
appkey
;
delete
result
.
code
;
delete
result
.
msg
;
await
service
.
storage
.
write
(
result
);
await
service
.
partner
.
notice
(
order
);
}
catch
(
err
)
{
...
...
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