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
296dae06
Commit
296dae06
authored
Nov 08, 2023
by
caotao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.监盘区域发电趋势图数据展示错误问题修改。
parent
3457cfb9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
MonitoringMapController.java
.../module/jxiop/biz/controller/MonitoringMapController.java
+2
-3
LargeScreenImpl.java
...s/boot/module/jxiop/biz/service/impl/LargeScreenImpl.java
+2
-2
No files found.
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitoringMapController.java
View file @
296dae06
...
@@ -318,9 +318,8 @@ public class MonitoringMapController extends BaseController {
...
@@ -318,9 +318,8 @@ public class MonitoringMapController extends BaseController {
wrapper
.
eq
(
areaCode
!=
null
,
StationBasic:
:
getAreaCode
,
areaCode
);
wrapper
.
eq
(
areaCode
!=
null
,
StationBasic:
:
getAreaCode
,
areaCode
);
List
<
StationBasic
>
stationBasics
=
stationBasicMapper
.
selectList
(
wrapper
);
List
<
StationBasic
>
stationBasics
=
stationBasicMapper
.
selectList
(
wrapper
);
// 2023年11月8日 12点51分 库中存储的历史数据存在问题逻辑由原来的通过网关id查询数据修改为场站id
List
<
String
>
ids
=
stationBasics
.
stream
().
map
(
StationBasic:
:
getFanGatewayId
).
collect
(
Collectors
.
toList
());
List
<
String
>
ids
=
stationBasics
.
stream
().
map
(
stationBasic
->
String
.
valueOf
(
stationBasic
.
getSequenceNbr
())).
collect
(
Collectors
.
toList
());
SeriesData
map
=
largeScreenImpl
.
getSeriesDataqy
(
new
Date
(),
ids
,
areaCode
);
SeriesData
map
=
largeScreenImpl
.
getSeriesDataqy
(
new
Date
(),
ids
,
areaCode
);
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/LargeScreenImpl.java
View file @
296dae06
...
@@ -508,7 +508,7 @@ public class LargeScreenImpl {
...
@@ -508,7 +508,7 @@ public class LargeScreenImpl {
public
List
<
Double
>
gettimedateqy
(
Date
date
,
List
<
String
>
gateway
Id
){
public
List
<
Double
>
gettimedateqy
(
Date
date
,
List
<
String
>
station
Id
){
SimpleDateFormat
myFmt2
=
new
SimpleDateFormat
(
"yyyyMM"
);
SimpleDateFormat
myFmt2
=
new
SimpleDateFormat
(
"yyyyMM"
);
String
monthy
=
myFmt2
.
format
(
date
);
String
monthy
=
myFmt2
.
format
(
date
);
...
@@ -517,7 +517,7 @@ public class LargeScreenImpl {
...
@@ -517,7 +517,7 @@ public class LargeScreenImpl {
value
.
add
(
RSD
);
value
.
add
(
RSD
);
Map
<
String
,
List
<
String
>>
map
=
new
HashMap
<>();
Map
<
String
,
List
<
String
>>
map
=
new
HashMap
<>();
map
.
put
(
"equipmentIndexName.keyword"
,
value
);
map
.
put
(
"equipmentIndexName.keyword"
,
value
);
map
.
put
(
"
gatewayId.keyword"
,
gateway
Id
);
map
.
put
(
"
stationId.keyword"
,
station
Id
);
List
<
String
>
value1
=
new
ArrayList
<>();
List
<
String
>
value1
=
new
ArrayList
<>();
value1
.
add
(
monthy
);
value1
.
add
(
monthy
);
map
.
put
(
"moon.keyword"
,
value1
);
map
.
put
(
"moon.keyword"
,
value1
);
...
...
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