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
bb0e8d03
Commit
bb0e8d03
authored
Jul 29, 2024
by
ZWT
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat[零碳项目]: 松原演示
[ 1.修改日耗电日产液信息定时任务及井口生产情况表表结构,增加来源系统字段,同时修改代码批量插入逻辑; ]
parent
36a3c0c7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
3 deletions
+18
-3
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/WellheadDailyProductionSituationEnt.java
...rediction/entity/WellheadDailyProductionSituationEnt.java
+4
-0
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/WellheadDailyProductionSituationView.java
...ediction/entity/WellheadDailyProductionSituationView.java
+6
-0
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/PlantPredictedPowerCloudServiceImpl.java
...ediction/service/PlantPredictedPowerCloudServiceImpl.java
+2
-0
C12-prediction/pps-core-prediction/src/main/resources/mybatis/mapper/pps/core/prediction/WellheadDailyProductionSituationViewMapper.xml
...prediction/WellheadDailyProductionSituationViewMapper.xml
+6
-3
No files found.
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/WellheadDailyProductionSituationEnt.java
View file @
bb0e8d03
...
@@ -53,4 +53,8 @@ public class WellheadDailyProductionSituationEnt implements Serializable {
...
@@ -53,4 +53,8 @@ public class WellheadDailyProductionSituationEnt implements Serializable {
@XText
(
"日产液量(t)"
)
@XText
(
"日产液量(t)"
)
@TableField
@TableField
private
BigDecimal
dailyLiquidProduction
;
private
BigDecimal
dailyLiquidProduction
;
@XText
(
"来源系统"
)
@TableField
private
String
systemSource
;
}
}
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/WellheadDailyProductionSituationView.java
View file @
bb0e8d03
...
@@ -50,6 +50,12 @@ public class WellheadDailyProductionSituationView implements Serializable {
...
@@ -50,6 +50,12 @@ public class WellheadDailyProductionSituationView implements Serializable {
@TableField
@TableField
private
BigDecimal
dailyLiquidProduction
;
private
BigDecimal
dailyLiquidProduction
;
@XText
(
"来源系统"
)
@TableField
private
String
systemSource
;
/*------------------------ exist ------------------------*/
@XText
(
"线路ID"
)
@XText
(
"线路ID"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
lineId
;
private
String
lineId
;
...
...
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/PlantPredictedPowerCloudServiceImpl.java
View file @
bb0e8d03
...
@@ -200,6 +200,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
...
@@ -200,6 +200,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
.
wellNumbers
(
collect
)
.
wellNumbers
(
collect
)
.
build
());
.
build
());
result
.
throwIfFail
();
result
.
throwIfFail
();
String
oilFieldCode
=
ServiceUtil
.
getOilFieldCode
(
context
);
Map
<
String
,
String
>
map
=
result
.
getResult
().
stream
()
Map
<
String
,
String
>
map
=
result
.
getResult
().
stream
()
.
collect
(
Collectors
.
toMap
(
DynamicQueryBaseWellheadOutput:
:
getWellNumber
,
DynamicQueryBaseWellheadOutput:
:
getId
));
.
collect
(
Collectors
.
toMap
(
DynamicQueryBaseWellheadOutput:
:
getWellNumber
,
DynamicQueryBaseWellheadOutput:
:
getId
));
List
<
WellheadDailyProductionSituationView
>
dtoList
=
new
ArrayList
<>(
list
.
size
());
List
<
WellheadDailyProductionSituationView
>
dtoList
=
new
ArrayList
<>(
list
.
size
());
...
@@ -211,6 +212,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
...
@@ -211,6 +212,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
.
productionTime
(
wellhead
.
getProductionTime
())
.
productionTime
(
wellhead
.
getProductionTime
())
.
dailyElectricityConsumption
(
wellhead
.
getDailyElectricityConsumption
())
.
dailyElectricityConsumption
(
wellhead
.
getDailyElectricityConsumption
())
.
wellheadId
(
map
.
get
(
wellhead
.
getWellNumber
()))
.
wellheadId
(
map
.
get
(
wellhead
.
getWellNumber
()))
.
systemSource
(
oilFieldCode
)
.
build
()
.
build
()
);
);
}
}
...
...
C12-prediction/pps-core-prediction/src/main/resources/mybatis/mapper/pps/core/prediction/WellheadDailyProductionSituationViewMapper.xml
View file @
bb0e8d03
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
<result
column=
"production_time"
property=
"productionTime"
jdbcType=
"DECIMAL"
/>
<result
column=
"production_time"
property=
"productionTime"
jdbcType=
"DECIMAL"
/>
<result
column=
"daily_electricity_consumption"
property=
"dailyElectricityConsumption"
jdbcType=
"DECIMAL"
/>
<result
column=
"daily_electricity_consumption"
property=
"dailyElectricityConsumption"
jdbcType=
"DECIMAL"
/>
<result
column=
"daily_liquid_production"
property=
"dailyLiquidProduction"
jdbcType=
"DECIMAL"
/>
<result
column=
"daily_liquid_production"
property=
"dailyLiquidProduction"
jdbcType=
"DECIMAL"
/>
<result
column=
"system_source"
property=
"systemSource"
jdbcType=
"VARCHAR"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
id
id
...
@@ -18,7 +19,8 @@
...
@@ -18,7 +19,8 @@
data_date,
data_date,
production_time,
production_time,
daily_electricity_consumption,
daily_electricity_consumption,
daily_liquid_production
daily_liquid_production,
system_source
</sql>
</sql>
<select
id=
"selectOne"
parameterType=
"pps.core.prediction.entity.WellheadDailyProductionSituationView"
<select
id=
"selectOne"
parameterType=
"pps.core.prediction.entity.WellheadDailyProductionSituationView"
resultMap=
"BaseResultMap"
>
resultMap=
"BaseResultMap"
>
...
@@ -39,7 +41,7 @@
...
@@ -39,7 +41,7 @@
<insert
id=
"batchInsertList"
parameterType=
"list"
>
<insert
id=
"batchInsertList"
parameterType=
"list"
>
INSERT INTO wellhead_daily_production_situation ( wellhead_id, well_number, data_date, production_time,
INSERT INTO wellhead_daily_production_situation ( wellhead_id, well_number, data_date, production_time,
daily_electricity_consumption, daily_liquid_production )
daily_electricity_consumption, daily_liquid_production
, system_source
)
VALUES
VALUES
<foreach
collection=
"list"
item=
"item"
separator=
","
>
<foreach
collection=
"list"
item=
"item"
separator=
","
>
(
(
...
@@ -48,7 +50,8 @@
...
@@ -48,7 +50,8 @@
#{item.dataDate},
#{item.dataDate},
#{item.productionTime},
#{item.productionTime},
#{item.dailyElectricityConsumption},
#{item.dailyElectricityConsumption},
#{item.dailyLiquidProduction}
#{item.dailyLiquidProduction},
#{item.systemSource}
)
)
</foreach>
</foreach>
</insert>
</insert>
...
...
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