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
ebb21b03
Commit
ebb21b03
authored
Nov 21, 2024
by
ZWT
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
得到的
parent
24faa248
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
4 deletions
+13
-4
C09-base/pps-core-base/src/main/java/pps/core/base/entity/PlantPredictedPowerDataEnt.java
...java/pps/core/base/entity/PlantPredictedPowerDataEnt.java
+2
-2
C09-base/pps-core-base/src/main/java/pps/core/base/excel/ThirdApiWeatherDataListener.java
...java/pps/core/base/excel/ThirdApiWeatherDataListener.java
+1
-0
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWatherCloudServiceImpl.java
...ava/pps/core/base/service/BaseWatherCloudServiceImpl.java
+3
-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/PlantPredictedPowerDataViewMapper.xml
...apper/pps/core/base/PlantPredictedPowerDataViewMapper.xml
+5
-2
No files found.
C09-base/pps-core-base/src/main/java/pps/core/base/entity/PlantPredictedPowerDataEnt.java
View file @
ebb21b03
...
@@ -20,8 +20,8 @@ import java.util.Date;
...
@@ -20,8 +20,8 @@ import java.util.Date;
@Builder
@Builder
@TableName
(
"PLANT_PREDICTED_POWER_DATA"
)
@TableName
(
"PLANT_PREDICTED_POWER_DATA"
)
public
class
PlantPredictedPowerDataEnt
implements
Serializable
{
public
class
PlantPredictedPowerDataEnt
implements
Serializable
{
@TableId
(
type
=
IdType
.
A
UTO
)
@TableId
(
type
=
IdType
.
A
SSIGN_UUID
)
private
Integer
id
;
private
String
id
;
@XText
(
"线路id"
)
@XText
(
"线路id"
)
@TableField
@TableField
...
...
C09-base/pps-core-base/src/main/java/pps/core/base/excel/ThirdApiWeatherDataListener.java
View file @
ebb21b03
...
@@ -171,6 +171,7 @@ public class ThirdApiWeatherDataListener implements ReadListener<ThirdApiWeather
...
@@ -171,6 +171,7 @@ public class ThirdApiWeatherDataListener implements ReadListener<ThirdApiWeather
private
void
addPlantPredictedPower
(
List
<
PlantPredictedPowerDataEnt
>
batchList
,
String
plantId
,
ThirdWeatherDataView
thirdWeatherDataView
)
{
private
void
addPlantPredictedPower
(
List
<
PlantPredictedPowerDataEnt
>
batchList
,
String
plantId
,
ThirdWeatherDataView
thirdWeatherDataView
)
{
DateTime
date
=
DateUtil
.
date
(
thirdWeatherDataView
.
getForecastTime
());
DateTime
date
=
DateUtil
.
date
(
thirdWeatherDataView
.
getForecastTime
());
batchList
.
add
(
PlantPredictedPowerDataEnt
.
builder
()
batchList
.
add
(
PlantPredictedPowerDataEnt
.
builder
()
.
id
(
BaseUtils
.
randomUUIDString
())
.
plantId
(
plantId
)
.
plantId
(
plantId
)
.
createTime
(
thirdWeatherDataView
.
getCreateTime
())
.
createTime
(
thirdWeatherDataView
.
getCreateTime
())
.
yearTime
(
String
.
valueOf
(
date
.
year
()))
.
yearTime
(
String
.
valueOf
(
date
.
year
()))
...
...
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWatherCloudServiceImpl.java
View file @
ebb21b03
...
@@ -21,6 +21,7 @@ import pps.core.base.mapper.PlantPredictedPowerDataMapper;
...
@@ -21,6 +21,7 @@ import pps.core.base.mapper.PlantPredictedPowerDataMapper;
import
pps.core.base.mapper.PlantPredictedPowerDataViewMapper
;
import
pps.core.base.mapper.PlantPredictedPowerDataViewMapper
;
import
pps.core.base.mapper.WeatherDataMapper
;
import
pps.core.base.mapper.WeatherDataMapper
;
import
pps.core.common.constant.BusinessConstant
;
import
pps.core.common.constant.BusinessConstant
;
import
pps.core.common.utils.BaseUtils
;
import
xstartup.annotation.XService
;
import
xstartup.annotation.XService
;
import
xstartup.base.XContext
;
import
xstartup.base.XContext
;
import
xstartup.base.util.XCopyUtils
;
import
xstartup.base.util.XCopyUtils
;
...
@@ -219,10 +220,12 @@ public class BaseWatherCloudServiceImpl implements BaseWatherCloudService {
...
@@ -219,10 +220,12 @@ public class BaseWatherCloudServiceImpl implements BaseWatherCloudService {
List
<
PlantPredictedPowerDataEnt
>
sortList
=
allList
.
stream
().
sorted
(
Comparator
.
comparing
(
PlantPredictedPowerDataEnt:
:
getDataDate
)).
collect
(
Collectors
.
toList
());
List
<
PlantPredictedPowerDataEnt
>
sortList
=
allList
.
stream
().
sorted
(
Comparator
.
comparing
(
PlantPredictedPowerDataEnt:
:
getDataDate
)).
collect
(
Collectors
.
toList
());
for
(
int
i
=
0
;
i
<
sortList
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
sortList
.
size
();
i
++)
{
PlantPredictedPowerDataEnt
item
=
sortList
.
get
(
i
);
PlantPredictedPowerDataEnt
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
<
timeList
.
size
();
y
++)
{
for
(
int
y
=
0
;
y
<
timeList
.
size
();
y
++)
{
PlantPredictedPowerDataEnt
dao
=
XCopyUtils
.
copyNewObject
(
item
);
PlantPredictedPowerDataEnt
dao
=
XCopyUtils
.
copyNewObject
(
item
);
dao
.
setId
(
BaseUtils
.
randomUUIDString
());
dao
.
setMinTime
(
timeList
.
get
(
y
));
dao
.
setMinTime
(
timeList
.
get
(
y
));
dao
.
setDataDate
(
dao
.
getYearTime
()
+
"-"
+
dao
.
getMonthTime
()
+
"-"
+
dao
.
getDayTime
()
+
" "
+
dao
.
getHourTime
()
+
":"
+
dao
.
getMinTime
());
dao
.
setDataDate
(
dao
.
getYearTime
()
+
"-"
+
dao
.
getMonthTime
()
+
"-"
+
dao
.
getDayTime
()
+
" "
+
dao
.
getHourTime
()
+
":"
+
dao
.
getMinTime
());
int
I_i
=
i
+
1
;
int
I_i
=
i
+
1
;
...
...
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWeatherCloudServiceImpl.java
View file @
ebb21b03
...
@@ -1016,6 +1016,7 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
...
@@ -1016,6 +1016,7 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
allList
.
sort
(
Comparator
.
comparing
(
PlantPredictedPowerDataEnt:
:
getDataDate
));
allList
.
sort
(
Comparator
.
comparing
(
PlantPredictedPowerDataEnt:
:
getDataDate
));
for
(
int
i
=
0
;
i
<
allList
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
allList
.
size
();
i
++)
{
PlantPredictedPowerDataEnt
item
=
allList
.
get
(
i
);
PlantPredictedPowerDataEnt
item
=
allList
.
get
(
i
);
item
.
setId
(
BaseUtils
.
randomUUIDString
());
//判断时间是否存在
//判断时间是否存在
if
(
timeSet
.
contains
(
item
.
getDataDate
()))
{
if
(
timeSet
.
contains
(
item
.
getDataDate
()))
{
continue
;
continue
;
...
@@ -1024,6 +1025,7 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
...
@@ -1024,6 +1025,7 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
}
}
for
(
int
y
=
0
;
y
<
BusinessConstant
.
TIME_LIST
.
size
();
y
++)
{
for
(
int
y
=
0
;
y
<
BusinessConstant
.
TIME_LIST
.
size
();
y
++)
{
PlantPredictedPowerDataEnt
dao
=
XCopyUtils
.
copyNewObject
(
item
);
PlantPredictedPowerDataEnt
dao
=
XCopyUtils
.
copyNewObject
(
item
);
dao
.
setId
(
BaseUtils
.
randomUUIDString
());
dao
.
setMinTime
(
BusinessConstant
.
TIME_LIST
.
get
(
y
));
dao
.
setMinTime
(
BusinessConstant
.
TIME_LIST
.
get
(
y
));
dao
.
setDataDate
(
dao
.
getYearTime
()
+
'-'
+
dao
.
getMonthTime
()
+
'-'
+
dao
.
getDayTime
()
+
' '
+
dao
.
getHourTime
()
+
':'
+
dao
.
getMinTime
());
dao
.
setDataDate
(
dao
.
getYearTime
()
+
'-'
+
dao
.
getMonthTime
()
+
'-'
+
dao
.
getDayTime
()
+
' '
+
dao
.
getHourTime
()
+
':'
+
dao
.
getMinTime
());
batchList
.
add
(
dao
);
batchList
.
add
(
dao
);
...
...
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/PlantPredictedPowerDataViewMapper.xml
View file @
ebb21b03
...
@@ -3,7 +3,9 @@
...
@@ -3,7 +3,9 @@
<mapper
namespace=
"pps.core.base.mapper.PlantPredictedPowerDataViewMapper"
>
<mapper
namespace=
"pps.core.base.mapper.PlantPredictedPowerDataViewMapper"
>
<insert
id=
"insertBatch"
parameterType=
"java.util.List"
>
<insert
id=
"insertBatch"
parameterType=
"java.util.List"
>
INSERT INTO PLANT_PREDICTED_POWER_DATA
INSERT INTO PLANT_PREDICTED_POWER_DATA
(PLANT_ID,
(
ID,
PLANT_ID,
DATA_DATE,
DATA_DATE,
YEAR_TIME,
YEAR_TIME,
MONTH_TIME,
MONTH_TIME,
...
@@ -25,7 +27,8 @@
...
@@ -25,7 +27,8 @@
AREA_CODE
AREA_CODE
) VALUES
) VALUES
<foreach
collection=
"list"
separator=
","
item=
"item"
>
<foreach
collection=
"list"
separator=
","
item=
"item"
>
(#{item.plantId},
(#{item.id},
#{item.plantId},
#{item.dataDate},
#{item.dataDate},
#{item.yearTime},
#{item.yearTime},
#{item.monthTime},
#{item.monthTime},
...
...
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