Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
8d201b79
Commit
8d201b79
authored
Nov 22, 2023
by
caotao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
过滤掉snCode为空的逆变器数据。
parent
7768b3bf
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
JpInverterServiceImpl.java
...t/module/hygf/biz/service/impl/JpInverterServiceImpl.java
+6
-0
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpInverterServiceImpl.java
View file @
8d201b79
...
...
@@ -142,6 +142,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
tdHYGFInverterDayGeneratePage
.
setTotal
(
tdHYGFInverterDayGenerates
.
size
());
tdHYGFInverterDayGeneratePage
.
setSize
(
size
);
tdHYGFInverterDayGeneratePage
.
setCurrent
(
current
);
tdHYGFInverterDayGenerates
=
tdHYGFInverterDayGenerates
.
stream
().
filter
(
tdHYGFInverterDayGenerate
->
StringUtils
.
isNotBlank
(
tdHYGFInverterDayGenerate
.
getSnCode
().
trim
())).
collect
(
Collectors
.
toList
());
tdHYGFInverterDayGenerates
=
tdHYGFInverterDayGenerates
.
subList
((
current
-
1
)
*
size
,
current
*
size
>
tdHYGFInverterDayGenerates
.
size
()
?
tdHYGFInverterDayGenerates
.
size
()
:
current
*
size
);
tdHYGFInverterDayGenerates
.
forEach
(
tdHYGFInverterDayGenerate
->
{
Date
date1
=
new
Date
(
tdHYGFInverterDayGenerate
.
getCreatedTime
());
...
...
@@ -164,6 +165,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
}
queryWrapper
.
orderByDesc
(
"created_time"
);
List
<
TdHYGFInverterDayGenerate
>
tdHYGFInverterDayGenerates
=
tdHYGFInverterDayGenerateMapper
.
selectList
(
queryWrapper
);
tdHYGFInverterDayGenerates
=
tdHYGFInverterDayGenerates
.
stream
().
filter
(
tdHYGFInverterDayGenerate
->
StringUtils
.
isNotBlank
(
tdHYGFInverterDayGenerate
.
getSnCode
().
trim
())).
collect
(
Collectors
.
toList
());
tdHYGFInverterDayGenerates
.
forEach
(
tdHYGFInverterDayGenerate
->
{
Date
date1
=
new
Date
(
tdHYGFInverterDayGenerate
.
getCreatedTime
());
tdHYGFInverterDayGenerate
.
setCreatedTimeStr
(
DateUtil
.
format
(
date1
,
DatePattern
.
NORM_DATETIME_PATTERN
));
...
...
@@ -184,6 +186,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
tdHYGFInverterMonthGeneratePage
.
setTotal
(
tdHYGFInverterMonthGenerates
.
size
());
tdHYGFInverterMonthGeneratePage
.
setSize
(
size
);
tdHYGFInverterMonthGeneratePage
.
setCurrent
(
current
);
tdHYGFInverterMonthGenerates
=
tdHYGFInverterMonthGenerates
.
stream
().
filter
(
tdHYGFInverterMonthGenerate
->
StringUtils
.
isNotBlank
(
tdHYGFInverterMonthGenerate
.
getSnCode
().
trim
())).
collect
(
Collectors
.
toList
());
tdHYGFInverterMonthGenerates
=
tdHYGFInverterMonthGenerates
.
subList
((
current
-
1
)
*
size
,
current
*
size
>
tdHYGFInverterMonthGenerates
.
size
()
?
tdHYGFInverterMonthGenerates
.
size
()
:
current
*
size
);
tdHYGFInverterMonthGenerates
.
forEach
(
tdHYGFInverterMonthGenerate
->
tdHYGFInverterMonthGenerate
.
setFullhour
(
Double
.
valueOf
(
String
.
format
(
"%.2f"
,
tdHYGFInverterMonthGenerate
.
getFullhour
()))));
tdHYGFInverterMonthGeneratePage
.
setRecords
(
tdHYGFInverterMonthGenerates
);
...
...
@@ -199,6 +202,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
}
queryWrapper
.
orderByDesc
(
"day_time"
);
List
<
TdHYGFInverterMonthGenerate
>
tdHYGFInverterMonthGenerates
=
tdHYGFInverterMonthGenerateMapper
.
selectList
(
queryWrapper
);
tdHYGFInverterMonthGenerates
=
tdHYGFInverterMonthGenerates
.
stream
().
filter
(
tdHYGFInverterMonthGenerate
->
StringUtils
.
isNotBlank
(
tdHYGFInverterMonthGenerate
.
getSnCode
().
trim
())).
collect
(
Collectors
.
toList
());
tdHYGFInverterMonthGenerates
.
forEach
(
tdHYGFInverterMonthGenerate
->
tdHYGFInverterMonthGenerate
.
setFullhour
(
Double
.
valueOf
(
String
.
format
(
"%.2f"
,
tdHYGFInverterMonthGenerate
.
getFullhour
()))));
return
tdHYGFInverterMonthGenerates
;
}
...
...
@@ -216,6 +220,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
tdHYGFInverterYearGeneratePage
.
setTotal
(
tdHYGFInverterYearGenerates
.
size
());
tdHYGFInverterYearGeneratePage
.
setSize
(
size
);
tdHYGFInverterYearGeneratePage
.
setCurrent
(
current
);
tdHYGFInverterYearGenerates
=
tdHYGFInverterYearGenerates
.
stream
().
filter
(
tdHYGFInverterYearGenerate
->
StringUtils
.
isNotBlank
(
tdHYGFInverterYearGenerate
.
getSnCode
().
trim
())).
collect
(
Collectors
.
toList
());
tdHYGFInverterYearGenerates
=
tdHYGFInverterYearGenerates
.
subList
((
current
-
1
)
*
size
,
current
*
size
>
tdHYGFInverterYearGenerates
.
size
()
?
tdHYGFInverterYearGenerates
.
size
()
:
current
*
size
);
tdHYGFInverterYearGenerates
.
forEach
(
tdHYGFInverterYearGenerate
->
tdHYGFInverterYearGenerate
.
setFullhour
(
Double
.
valueOf
(
String
.
format
(
"%.2f"
,
tdHYGFInverterYearGenerate
.
getFullhour
()))));
tdHYGFInverterYearGeneratePage
.
setRecords
(
tdHYGFInverterYearGenerates
);
...
...
@@ -231,6 +236,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
}
queryWrapper
.
orderByDesc
(
"month_time"
);
List
<
TdHYGFInverterYearGenerate
>
tdHYGFInverterYearGenerates
=
tdHYGFInverterYearGenerateMapper
.
selectList
(
queryWrapper
);
tdHYGFInverterYearGenerates
=
tdHYGFInverterYearGenerates
.
stream
().
filter
(
tdHYGFInverterYearGenerate
->
StringUtils
.
isNotBlank
(
tdHYGFInverterYearGenerate
.
getSnCode
().
trim
())).
collect
(
Collectors
.
toList
());
tdHYGFInverterYearGenerates
.
forEach
(
tdHYGFInverterYearGenerate
->
tdHYGFInverterYearGenerate
.
setFullhour
(
Double
.
valueOf
(
String
.
format
(
"%.2f"
,
tdHYGFInverterYearGenerate
.
getFullhour
()))));
return
tdHYGFInverterYearGenerates
;
}
...
...
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