Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
performance
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zry
performance
Commits
3dd3d5a8
Commit
3dd3d5a8
authored
Dec 16, 2021
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
数据提取改为异步执行,列头写入改为以提取结果为主
parent
6b4bcb05
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
performance/Performance.Api/Controllers/TemplateController.cs
+2
-4
performance/Performance.Services/ExtractExcelService/SheetDataWrite/IncomeDataWrite.cs
+1
-1
No files found.
performance/Performance.Api/Controllers/TemplateController.cs
View file @
3dd3d5a8
...
...
@@ -38,7 +38,6 @@ public class TemplateController : Controller
private
readonly
AllotService
allotService
;
private
readonly
LogManageService
logService
;
private
readonly
IServiceScopeFactory
serviceScopeFactory
;
private
readonly
IBackgroundTaskQueue
_backgroundTaskQueue
;
private
readonly
ExtractService
extractService
;
public
TemplateController
(
...
...
@@ -53,7 +52,6 @@ public class TemplateController : Controller
HospitalService
hospitalService
,
AllotService
allotService
,
LogManageService
logService
,
IBackgroundTaskQueue
backgroundTaskQueue
,
IServiceScopeFactory
serviceScopeFactory
,
ExtractService
extractService
)
{
...
...
@@ -69,7 +67,6 @@ public class TemplateController : Controller
this
.
allotService
=
allotService
;
this
.
logService
=
logService
;
this
.
serviceScopeFactory
=
serviceScopeFactory
;
_backgroundTaskQueue
=
backgroundTaskQueue
;
this
.
extractService
=
extractService
;
}
...
...
@@ -240,8 +237,9 @@ public ApiResponse NewExtractData([CustomizeValidator, FromBody] ExtractRequest
{
logger
.
LogInformation
(
"同一项目中进行提取"
);
_backgroundTaskQueue
.
QueueBackgroundWorkItem
(
async
token
=>
Task
.
Run
(()
=>
{
Thread
.
Sleep
(
1000
);
using
(
var
scope
=
serviceScopeFactory
.
CreateScope
())
{
var
scopedServices
=
scope
.
ServiceProvider
.
GetRequiredService
<
ExtractService
>();
...
...
performance/Performance.Services/ExtractExcelService/SheetDataWrite/IncomeDataWrite.cs
View file @
3dd3d5a8
...
...
@@ -49,7 +49,7 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType sheetTyp
if
(
exdict
.
ContainsKey
(
ExDataDict
.
IncomeFactor
)
&&
exdict
[
ExDataDict
.
IncomeFactor
]
is
List
<
cof_drugtype_factor
>
factors
&&
factors
.
Any
(
t
=>
t
.
ExModuleId
==
module
.
Id
))
{
factors
=
factors
.
Where
(
t
=>
t
.
ExModuleId
==
module
.
Id
).
ToList
();
categories
=
categories
.
Union
(
factors
.
Select
(
t
=>
t
.
Charge
)).
Distinct
();
//
categories = categories.Union(factors.Select(t => t.Charge)).Distinct();
headers
=
categories
.
GroupJoin
(
factors
,
inner
=>
new
{
category
=
inner
.
NoBlank
()
},
outer
=>
new
{
category
=
outer
.
Charge
.
NoBlank
()
},
(
inner
,
outer
)
=>
new
{
inner
,
outer
})
.
Select
(
t
=>
new
ExcelHeader
{
...
...
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