Commit 7792ece6 authored by chenzhao's avatar chenzhao

修改代码

parent d87d146d
......@@ -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);
......
......@@ -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.getStationTypeName().equals("FDZ")){
if (stationBasic.getStationType().equals("FDZ")){
timingTemporarysSorageData(stationBasic.getFanGatewayId());
}
if (stationBasic.getStationTypeName().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 equipmentIndexName = '总辐射累计' ";
String sql1 = "SELECT * FROM indicators_"+gatewayId+" WHERE equipmentIndexName = '有功功率'";
String sql = "SELECT * FROM indicators_"+gatewayId+" WHERE displayName = '总辐射累计' ";
String sql1 = "SELECT * FROM indicators_"+gatewayId+" WHERE displayName = '有功功率'";
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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment