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
18488d5e
Commit
18488d5e
authored
Nov 21, 2024
by
ZWT
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
得到的
parent
6ff1a906
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
4 deletions
+9
-4
C09-base/pps-core-base/src/main/java/pps/core/base/entity/WindPredictionFutureEnt.java
...in/java/pps/core/base/entity/WindPredictionFutureEnt.java
+2
-2
C09-base/pps-core-base/src/main/java/pps/core/base/entity/WindPredictionFutureView.java
...n/java/pps/core/base/entity/WindPredictionFutureView.java
+1
-1
C09-base/pps-core-base/src/main/java/pps/core/base/excel/ThirdApiWeatherDataListener2.java
...ava/pps/core/base/excel/ThirdApiWeatherDataListener2.java
+1
-0
C09-base/pps-core-base/src/main/java/pps/core/base/excel/WindPredictionDataListener.java
.../java/pps/core/base/excel/WindPredictionDataListener.java
+1
-0
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWeatherCloudServiceImpl.java
...va/pps/core/base/service/BaseWeatherCloudServiceImpl.java
+2
-0
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/WindPredictionFutureViewMapper.xml
...s/mapper/pps/core/base/WindPredictionFutureViewMapper.xml
+2
-1
No files found.
C09-base/pps-core-base/src/main/java/pps/core/base/entity/WindPredictionFutureEnt.java
View file @
18488d5e
...
@@ -27,8 +27,8 @@ import java.util.Date;
...
@@ -27,8 +27,8 @@ import java.util.Date;
@TableName
(
"WIND_PREDICTION_FUTURE"
)
@TableName
(
"WIND_PREDICTION_FUTURE"
)
public
class
WindPredictionFutureEnt
implements
Serializable
{
public
class
WindPredictionFutureEnt
implements
Serializable
{
@XText
(
"ID"
)
@XText
(
"ID"
)
@TableId
(
type
=
IdType
.
A
UTO
)
@TableId
(
type
=
IdType
.
A
SSIGN_UUID
)
private
Lo
ng
id
;
private
Stri
ng
id
;
@XText
(
"风电站ID"
)
@XText
(
"风电站ID"
)
@TableField
@TableField
...
...
C09-base/pps-core-base/src/main/java/pps/core/base/entity/WindPredictionFutureView.java
View file @
18488d5e
...
@@ -24,7 +24,7 @@ import java.util.Date;
...
@@ -24,7 +24,7 @@ import java.util.Date;
public
class
WindPredictionFutureView
implements
Serializable
{
public
class
WindPredictionFutureView
implements
Serializable
{
@XText
(
"ID"
)
@XText
(
"ID"
)
@TableField
@TableField
private
Lo
ng
id
;
private
Stri
ng
id
;
@XText
(
"风电站ID"
)
@XText
(
"风电站ID"
)
@TableField
@TableField
...
...
C09-base/pps-core-base/src/main/java/pps/core/base/excel/ThirdApiWeatherDataListener2.java
View file @
18488d5e
...
@@ -92,6 +92,7 @@ public class ThirdApiWeatherDataListener2 implements ReadListener<ThirdApiWeathe
...
@@ -92,6 +92,7 @@ public class ThirdApiWeatherDataListener2 implements ReadListener<ThirdApiWeathe
historyView
.
setWns100m
(
data
.
getWns100m
());
historyView
.
setWns100m
(
data
.
getWns100m
());
historyView
.
setWnsGrd100m
(
data
.
getWnsGrd100m
());
historyView
.
setWnsGrd100m
(
data
.
getWnsGrd100m
());
WindPredictionFutureView
futureView
=
new
WindPredictionFutureView
();
WindPredictionFutureView
futureView
=
new
WindPredictionFutureView
();
futureView
.
setId
(
BaseUtils
.
randomUUIDString
());
futureView
.
setStationId
(
stationId
);
futureView
.
setStationId
(
stationId
);
futureView
.
setDataTime
(
dateTime
);
futureView
.
setDataTime
(
dateTime
);
futureView
.
setWindDirection
(
data
.
getWnd
());
futureView
.
setWindDirection
(
data
.
getWnd
());
...
...
C09-base/pps-core-base/src/main/java/pps/core/base/excel/WindPredictionDataListener.java
View file @
18488d5e
...
@@ -75,6 +75,7 @@ public class WindPredictionDataListener implements ReadListener<WindPredictionEx
...
@@ -75,6 +75,7 @@ public class WindPredictionDataListener implements ReadListener<WindPredictionEx
//去重
//去重
if
(
futureList
.
stream
()
if
(
futureList
.
stream
()
.
noneMatch
(
item
->
DateUtil
.
compare
(
item
.
getDataTime
(),
build
.
getDataTime
())
==
0
))
{
.
noneMatch
(
item
->
DateUtil
.
compare
(
item
.
getDataTime
(),
build
.
getDataTime
())
==
0
))
{
build
.
setId
(
BaseUtils
.
randomUUIDString
());
futureList
.
add
(
build
);
futureList
.
add
(
build
);
}
}
}
else
{
}
else
{
...
...
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWeatherCloudServiceImpl.java
View file @
18488d5e
...
@@ -807,6 +807,7 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
...
@@ -807,6 +807,7 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
.
collect
(
Collectors
.
toList
());
.
collect
(
Collectors
.
toList
());
for
(
int
i
=
0
;
i
<
sortList
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
sortList
.
size
();
i
++)
{
WindPredictionFutureView
item
=
sortList
.
get
(
i
);
WindPredictionFutureView
item
=
sortList
.
get
(
i
);
item
.
setId
(
BaseUtils
.
randomUUIDString
());
batchList
.
add
(
item
);
batchList
.
add
(
item
);
if
(
i
<
sortList
.
size
()
-
1
)
{
if
(
i
<
sortList
.
size
()
-
1
)
{
for
(
int
y
=
0
;
y
<
BusinessConstant
.
TIME_LIST
.
size
();
y
++)
{
for
(
int
y
=
0
;
y
<
BusinessConstant
.
TIME_LIST
.
size
();
y
++)
{
...
@@ -826,6 +827,7 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
...
@@ -826,6 +827,7 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
dao
.
setPressure
(
this
.
compute
(
Objects
.
isNull
(
item
.
getPressure
())
?
BigDecimal
.
ZERO
:
item
.
getPressure
(),
dao
.
setPressure
(
this
.
compute
(
Objects
.
isNull
(
item
.
getPressure
())
?
BigDecimal
.
ZERO
:
item
.
getPressure
(),
Objects
.
isNull
(
nextData
.
getPressure
())
?
BigDecimal
.
ZERO
:
nextData
.
getPressure
(),
Objects
.
isNull
(
nextData
.
getPressure
())
?
BigDecimal
.
ZERO
:
nextData
.
getPressure
(),
valueOf
));
valueOf
));
dao
.
setId
(
BaseUtils
.
randomUUIDString
());
batchList
.
add
(
dao
);
batchList
.
add
(
dao
);
}
}
}
}
...
...
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/WindPredictionFutureViewMapper.xml
View file @
18488d5e
...
@@ -58,10 +58,11 @@
...
@@ -58,10 +58,11 @@
</delete>
</delete>
<insert
id=
"insertBatch"
parameterType=
"java.util.List"
>
<insert
id=
"insertBatch"
parameterType=
"java.util.List"
>
INSERT INTO WIND_PREDICTION_FUTURE (STATION_ID, DATA_TIME, WIND_DIRECTION, WIND_SPEED, AIR_TEMPERATURE,
INSERT INTO WIND_PREDICTION_FUTURE (
ID,
STATION_ID, DATA_TIME, WIND_DIRECTION, WIND_SPEED, AIR_TEMPERATURE,
HUMIDITY, PRESSURE ,ACTUAL_WIND_SPEED ,ACTUAL_POWER ,PREDICTED_POWER) VALUES
HUMIDITY, PRESSURE ,ACTUAL_WIND_SPEED ,ACTUAL_POWER ,PREDICTED_POWER) VALUES
<foreach
collection=
"list"
separator=
","
item=
"item"
>
<foreach
collection=
"list"
separator=
","
item=
"item"
>
(
(
#{item.id},
#{item.stationId},
#{item.stationId},
#{item.dataTime},
#{item.dataTime},
#{item.windDirection},
#{item.windDirection},
...
...
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