Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gf_back
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tianchao
gf_back
Commits
aeac71c2
Commit
aeac71c2
authored
Aug 01, 2024
by
ZWT
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(吉林演示): 松原
1.修改部分第三方数据处理定时任务,修改系统来源,将固定来源按环境区分改为动态获取; BREAKING CHANGE: 无 Closes 无 [skip ci]
parent
cab09948
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/ThirdDataAccessCloudServiceImpl.java
...e/prediction/service/ThirdDataAccessCloudServiceImpl.java
+5
-4
No files found.
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/ThirdDataAccessCloudServiceImpl.java
View file @
aeac71c2
...
...
@@ -246,7 +246,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.
powerGeneration
(
power
.
getPhotovoltaicPower
())
.
powerConsumption
(
collect
.
get
(
lineId
))
.
dataDate
(
power
.
getCreateDate
())
.
systemSource
(
ThirdPartyApiConstant
.
CQ_SOURCE
)
.
systemSource
(
oilFieldCode
)
.
build
());
}
return
XTransactionHelper
.
begin
(
context
,
()
->
{
...
...
@@ -435,6 +435,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
List
<
ThirdActivePowerDailyUpdateView
>
dtoDailyList
=
new
ArrayList
<>(
cachedDataList
.
size
());
BigDecimal
photovoltaicPower
;
BigDecimal
meterPower
;
String
oilFieldCode
=
ServiceUtil
.
getOilFieldCode
(
context
);
for
(
ThirdActivePowerExcelData
o
:
cachedDataList
)
{
photovoltaicPower
=
Optional
.
ofNullable
(
o
.
getPhotovoltaicPower
())
.
orElse
(
BigDecimal
.
ZERO
)
...
...
@@ -449,13 +450,13 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.
createDate
(
o
.
getCreateDate
())
.
photovoltaicPower
(
photovoltaicPower
)
.
meterPower
(
meterPower
)
.
systemSource
(
ThirdPartyApiConstant
.
CQ_SOURCE
)
.
systemSource
(
oilFieldCode
)
.
inputTime
(
o
.
getCreateDate
())
.
build
()
);
queryWrapper
.
or
(
w
->
w
.
eq
(
ThirdActivePowerEnt:
:
getStationName
,
o
.
getStationName
())
.
eq
(
ThirdActivePowerEnt:
:
getCreateDate
,
o
.
getCreateDate
())
.
eq
(
ThirdActivePowerEnt:
:
getSystemSource
,
ThirdPartyApiConstant
.
CQ_SOURCE
)
.
eq
(
ThirdActivePowerEnt:
:
getSystemSource
,
oilFieldCode
)
);
dtoDailyList
.
add
(
ThirdActivePowerDailyUpdateView
.
builder
()
...
...
@@ -464,7 +465,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.
createDate
(
o
.
getCreateDate
())
.
photovoltaicPower
(
photovoltaicPower
)
.
meterPower
(
meterPower
)
.
systemSource
(
ThirdPartyApiConstant
.
CQ_SOURCE
)
.
systemSource
(
oilFieldCode
)
.
saveDate
(
DateUtil
.
beginOfDay
(
o
.
getCreateDate
()))
.
saveHour
(
DateUtil
.
beginOfHour
(
o
.
getCreateDate
()))
.
build
()
...
...
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