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
7792ece6
Commit
7792ece6
authored
Jul 31, 2023
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
d87d146d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
15 deletions
+17
-15
MonitorFanIdxController.java
.../module/jxiop/biz/controller/MonitorFanIdxController.java
+10
-9
MonitorFanIndicatorImpl.java
...odule/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java
+7
-6
No files found.
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java
View file @
7792ece6
...
...
@@ -197,18 +197,18 @@ public class MonitorFanIdxController extends BaseController {
for
(
String
column
:
columnList
)
{
Double
result
=
commonService
.
getTotalByIndicatior
(
gatewayId
,
column
);
columnMap
.
put
(
column
,
String
.
format
(
"%2f"
,
result
));
columnMap
.
put
(
column
,
String
.
format
(
"%
.
2f"
,
result
));
}
for
(
String
column
:
columnLists
)
{
Double
result
=
commonService
.
getAvgvalueByIndicatior
(
gatewayId
,
column
);
columnMap
.
put
(
column
,
String
.
format
(
"%2f"
,
result
));
columnMap
.
put
(
column
,
String
.
format
(
"%
.
2f"
,
result
));
}
String
num
=
monitorFanIndicator
.
getFJCount
(
gatewayId
);
columnMap
.
put
(
"风机台数"
,
num
);
Double
capacityl
=
commonService
.
getStationCapactityByStationWerks
(
stationBasic
.
getStationNumber
());
columnMap
.
put
(
"装机容量"
,
capacityl
);
columnMap
.
put
(
"装机容量"
,
String
.
format
(
"%.2f"
,
capacityl
)
);
List
<
Map
<
String
,
Object
>>
objects
=
new
ArrayList
<>();
...
...
@@ -231,10 +231,11 @@ public class MonitorFanIdxController extends BaseController {
data5
.
put
(
"title"
,
columnMap
.
get
(
"年发电量"
).
toString
());
objects
.
add
(
data5
);
Map
<
String
,
Object
>
data6
=
new
HashMap
<>();
data6
.
put
(
"title"
,
columnMap
.
get
(
"有功功率"
).
toString
());
data6
.
put
(
"title"
,
String
.
format
(
"%.2f"
,
Double
.
parseDouble
(
columnMap
.
get
(
"有功功率"
).
toString
())/
1000
))
;
objects
.
add
(
data6
);
Map
<
String
,
Object
>
data7
=
new
HashMap
<>();
data7
.
put
(
"title"
,
Double
.
parseDouble
(
columnMap
.
get
(
"日发电量"
).
toString
())/
Double
.
parseDouble
(
columnMap
.
get
(
"装机容量"
).
toString
())*
1000
);
data7
.
put
(
"title"
,
String
.
format
(
"%.2f"
,
Double
.
parseDouble
(
columnMap
.
get
(
"日发电量"
).
toString
())/
(
Double
.
parseDouble
(
columnMap
.
get
(
"装机容量"
).
toString
())*
1000
))
);
objects
.
add
(
data7
);
IPage
<
Map
<
String
,
Object
>>
result
=
new
Page
<>();
...
...
@@ -578,15 +579,15 @@ public class MonitorFanIdxController extends BaseController {
for
(
String
column
:
columnList
)
{
Double
result
=
commonService
.
getTotalByIndicatior
(
gatewayId
,
column
);
columnMap
.
put
(
column
,
String
.
format
(
"%2f"
,
result
));
columnMap
.
put
(
column
,
String
.
format
(
"%
.
2f"
,
result
));
}
for
(
String
column
:
syLists
)
{
Double
result
=
commonService
.
getTotalByIndicatior
(
boosterGatewayId
,
column
);
columnMap
.
put
(
column
,
String
.
format
(
"%2f"
,
result
));
columnMap
.
put
(
column
,
String
.
format
(
"%
.
2f"
,
result
));
}
for
(
String
column
:
columnLists
)
{
Double
result
=
commonService
.
getAvgvalueByIndicatior
(
gatewayId
,
column
);
columnMap
.
put
(
column
,
String
.
format
(
"%2f"
,
result
));
columnMap
.
put
(
column
,
String
.
format
(
"%
.
2f"
,
result
));
}
String
num
=
monitorFanIndicator
.
getFJCount
(
gatewayId
);
...
...
@@ -605,7 +606,7 @@ public class MonitorFanIdxController extends BaseController {
data
.
put
(
"title6"
,
columnMap
.
get
(
"年发电量"
).
toString
());
data
.
put
(
"title7"
,
columnMap
.
get
(
"有功功率"
).
toString
());
data
.
put
(
"title8"
,
Double
.
parseDouble
(
columnMap
.
get
(
"日发电量"
).
toString
())/
Double
.
parseDouble
(
columnMap
.
get
(
"装机容量"
).
toString
())*
1000
);
//日利用小时
data
.
put
(
"title8"
,
String
.
format
(
"%.2f"
,
Double
.
parseDouble
(
columnMap
.
get
(
"日发电量"
).
toString
())/
(
Double
.
parseDouble
(
columnMap
.
get
(
"装机容量"
).
toString
())*
1000
)));
data
.
put
(
"title9"
,
columnMap
.
get
(
"总辐射累计"
).
toString
());
//总辐射日累计
data
.
put
(
"title0"
,
7.47
);
//综合效率
return
ResponseHelper
.
buildResponse
(
data
);
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java
View file @
7792ece6
...
...
@@ -198,7 +198,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
List
<
IndexDto
>
influxDBList
=
influxDButils
.
getListData
(
sql
,
IndexDto
.
class
);
influxDBList
.
stream
().
forEach
(
e
->{
Double
f
=
Double
.
valueOf
(
e
.
getValue
());
e
.
setValue
(
String
.
format
(
"%2f"
,
f
));
e
.
setValue
(
String
.
format
(
"%
.
2f"
,
f
));
});
List
<
IndexDto
>
collect
=
influxDBList
.
stream
()
...
...
@@ -617,10 +617,10 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
wrapper
.
eq
(
BaseEntity:
:
getIsDelete
,
false
);
List
<
StationBasic
>
stationBasics
=
stationBasicMapper
.
selectList
(
wrapper
);
for
(
StationBasic
stationBasic
:
stationBasics
)
{
if
(
stationBasic
.
getStationType
Name
().
equals
(
"FDZ"
)){
if
(
stationBasic
.
getStationType
().
equals
(
"FDZ"
)){
timingTemporarysSorageData
(
stationBasic
.
getFanGatewayId
());
}
if
(
stationBasic
.
getStationType
Name
().
equals
(
"JZSGFDZ"
)){
if
(
stationBasic
.
getStationType
().
equals
(
"JZSGFDZ"
)){
schedSolarPower
(
stationBasic
.
getBoosterGatewayId
());
}
}
...
...
@@ -756,8 +756,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
}
public
void
schedSolarPower
(
String
gatewayId
){
String
sql
=
"SELECT * FROM indicators_"
+
gatewayId
+
" WHERE
equipmentIndex
Name = '总辐射累计' "
;
String
sql1
=
"SELECT * FROM indicators_"
+
gatewayId
+
" WHERE
equipmentIndex
Name = '有功功率'"
;
String
sql
=
"SELECT * FROM indicators_"
+
gatewayId
+
" WHERE
display
Name = '总辐射累计' "
;
String
sql1
=
"SELECT * FROM indicators_"
+
gatewayId
+
" WHERE
display
Name = '有功功率'"
;
List
<
IndicatorsDto
>
indicatorsDtoList
=
influxDButils
.
getListDataAll
(
sql
,
IndicatorsDto
.
class
);
List
<
IndicatorsDto
>
indicatorsDtoLists
=
influxDButils
.
getListDataAll
(
sql1
,
IndicatorsDto
.
class
);
List
<
TemporaryData
>
temporaryDatas
=
new
ArrayList
<>();
...
...
@@ -852,7 +852,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
List
<
Map
<
String
,
Object
>>
statusMaps
=
new
ArrayList
<>();
for
(
IndicatorsDto
listDatum
:
listData
)
{
Map
<
String
,
Object
>
statusMap
=
new
HashMap
<>();
statusMap
.
put
(
"title"
,
listDatum
.
getValue
().
equals
(
""
)?
0
:
listDatum
.
getValue
(
)+
" "
+
listDatum
.
getUnit
());
statusMap
.
put
(
"title"
,
listDatum
.
getValue
().
equals
(
""
)?
0
:
keepTwoDecimalPlaces
(
listDatum
.
getValue
()
)+
" "
+
listDatum
.
getUnit
());
statusMap
.
put
(
"title1"
,
listDatum
.
getDisplayName
());
statusMaps
.
add
(
statusMap
);
}
...
...
@@ -973,6 +973,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
if
(
"风向角"
.
equals
(
item
.
getEquipmentIndexName
()))
{
windSqlList
.
add
(
item
);
}
if
(
"有功功率"
.
equals
(
item
.
getEquipmentIndexName
()))
{
item
.
setValue
(
String
.
format
(
"%.2f"
,
Double
.
parseDouble
(
item
.
getValue
())/
1000
));
powerSqlList
.
add
(
item
);
}
if
(
"瞬时风速"
.
equals
(
item
.
getEquipmentIndexName
()))
{
windSpeedSqlList
.
add
(
item
);
...
...
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