Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
aic_duty_strategy
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
yinxiaoling
aic_duty_strategy
Commits
56c0bf3b
Commit
56c0bf3b
authored
May 15, 2020
by
yinxiaoling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
大小写model处理
parent
f2caf526
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
9 deletions
+10
-9
StrategySetController.php
app/Http/Controllers/strategy/StrategySetController.php
+1
-1
StrategyExcel.php
app/Models/StrategyExcel.php
+1
-1
StrategySet.php
app/Models/StrategySet.php
+3
-3
StrategyTask.php
app/Models/StrategyTask.php
+1
-1
StrategyService.php
app/Service/StrategyService.php
+4
-3
No files found.
app/Http/Controllers/strategy/StrategySetController.php
View file @
56c0bf3b
...
...
@@ -8,7 +8,7 @@ use Illuminate\Foundation\Validation\ValidatesRequests;
use
Illuminate\Support\Facades\Validator
;
use
App\Http\Controllers\Tool
;
use
App\Service\StrategyService
;
use
App\
m
odels\StrategySet
;
use
App\
M
odels\StrategySet
;
//use App\Http\Requests\StrategySetCreateRequest;
class
StrategySetController
extends
Controller
...
...
app/Models/StrategyExcel.php
View file @
56c0bf3b
<?php
namespace
App\
m
odels
;
namespace
App\
M
odels
;
use
Illuminate\Database\Eloquent\Model
;
...
...
app/Models/StrategySet.php
View file @
56c0bf3b
<?php
namespace
App\
m
odels
;
namespace
App\
M
odels
;
use
Illuminate\Database\Eloquent\Model
;
...
...
@@ -10,8 +10,8 @@ class StrategySet extends Model
protected
$table
=
'strategy_set'
;
public
function
excelData
()
/*
public function excelData()
{
return $this->hasMany('App\Models\strategyExcel', 'strategy_sn', 'strategy_sn');
}
}
*/
}
app/Models/StrategyTask.php
View file @
56c0bf3b
<?php
namespace
App\
m
odels
;
namespace
App\
M
odels
;
use
Illuminate\Database\Eloquent\Model
;
...
...
app/Service/StrategyService.php
View file @
56c0bf3b
...
...
@@ -3,9 +3,9 @@ namespace App\Service;
use
Maatwebsite\Excel\Facades\Excel
;
use
Illuminate\Support\Facades\Log
;
use
App\
m
odels\StrategyExcel
;
use
App\
m
odels\StrategySet
;
use
App\
m
odels\StrategyTask
;
use
App\
M
odels\StrategyExcel
;
use
App\
M
odels\StrategySet
;
use
App\
M
odels\StrategyTask
;
use
App\Jobs\StrategyTaskJob
;
class
StrategyService
...
...
@@ -198,6 +198,7 @@ class StrategyService
$insertExcelReturn
=
StrategyExcel
::
insert
(
$insertData
);
if
(
$insertExcelReturn
){
//创建任务数据,这一步剥离出来,不然接口返回太慢,方案==,使用队列处理
$jobParams
=
[
'strategySn'
=>
$strategySn
];
// /opt/lampp/bin/php /opt/lampp/xiaoa/xiaoa-aic/artisan queue:work --queue=StrategyTask --sleep=3 --tries=0 --daemon --timeout=90
$job
=
(
new
StrategyTaskJob
(
$jobParams
))
->
onQueue
(
'StrategyTask'
);
dispatch
(
$job
);
//$this->createTaskDataJob($strategySn);
...
...
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