Skip to content

A
amos-boot-zx-biz
Commit b1c6884e authored by caotao's avatar caotao
Browse files
Options

1.对于主变高压侧、主变低压侧增加排序操作。

2.社会贡献汉字进行常量抽取。
parent ba8d57bf
Hide whitespace changes
Inline Side-by-side
Showing with 178 additions and 186 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/constants/CommonConstans.java
View file @ b1c6884e
...@@ -158,4 +158,11 @@ public class CommonConstans { ...@@ -158,4 +158,11 @@ public class CommonConstans {
put("前万线", Arrays.asList("313光差保护_总正向有功电度", "313光差保护_总反向有功电度", "313光差保护_总感性无功电度", "313光差保护_总容性无功电度")); put("前万线", Arrays.asList("313光差保护_总正向有功电度", "313光差保护_总反向有功电度", "313光差保护_总感性无功电度", "313光差保护_总容性无功电度"));
} }
}; };
public static final String XIAZAO_ZHUBIANGAOYACE = "1主变高压侧";
public static final String XIAZAO_ZHUBIANDIYACE = "1主变低压侧";
public static final String ER_YANG_HUA_TAN_JIANPAILIANG= "二氧化碳减排量（t）";
public static final String BIAO_ZHUN_MEI_JIANPAILIANG = "节约标准煤（t）";
public static final String TAN_FEN_CHEN_ZHUBIANDIYACE = "碳粉尘减排量（t）";
public static final String ER_YANG_HUA_LIU_ZHUBIANDIYACE = "二氧化硫减排量（t）";
} }
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java
View file @ b1c6884e
...@@ -364,16 +364,16 @@ public class CommonServiceImpl { ...@@ -364,16 +364,16 @@ public class CommonServiceImpl {
二氧化硫减排量（t）=发电量（万kW·h）*1.51 二氧化硫减排量（t）=发电量（万kW·h）*1.51
氮氧化物减排量（t）=发电量（万kW·h）*1.69 氮氧化物减排量（t）=发电量（万kW·h）*1.69
*/ */
co2.setUnit("二氧化碳减排量（t）"); co2.setUnit(CommonConstans.ER_YANG_HUA_TAN_JIANPAILIANG);
co2.setTitle(String.format("%.2f", totalSocialContribution * CommonConstans.carbonDioxide)); co2.setTitle(String.format("%.2f", totalSocialContribution * CommonConstans.carbonDioxide));
socialContributionDtoList.add(co2); socialContributionDtoList.add(co2);
coal.setUnit("节约标准煤（t）"); coal.setUnit(CommonConstans.BIAO_ZHUN_MEI_JIANPAILIANG);
coal.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.standardCoal))); coal.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.standardCoal)));
socialContributionDtoList.add(coal); socialContributionDtoList.add(coal);
toner.setUnit("碳粉尘减排量（t）"); toner.setUnit(CommonConstans.TAN_FEN_CHEN_ZHUBIANDIYACE);
toner.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.toner ))); toner.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.toner )));
socialContributionDtoList.add(toner); socialContributionDtoList.add(toner);
so2.setUnit("二氧化硫减排量（t）"); so2.setUnit(CommonConstans.ER_YANG_HUA_LIU_ZHUBIANDIYACE);
so2.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.sulfurDioxide ))); so2.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.sulfurDioxide )));
socialContributionDtoList.add(so2); socialContributionDtoList.add(so2);
socialContributionDtoPage.setRecords(socialContributionDtoList); socialContributionDtoPage.setRecords(socialContributionDtoList);
......
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 @ b1c6884e
...@@ -26,6 +26,7 @@ import java.util.stream.Collectors; ...@@ -26,6 +26,7 @@ import java.util.stream.Collectors;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttException;
...@@ -102,6 +103,8 @@ import lombok.extern.slf4j.Slf4j; ...@@ -102,6 +103,8 @@ import lombok.extern.slf4j.Slf4j;
public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
private final static List<String> fanStatesList = Arrays.asList("报警状态", "停机状态", "故障状态", "待机状态", "维护状态", "正常发电状态"); private final static List<String> fanStatesList = Arrays.asList("报警状态", "停机状态", "故障状态", "待机状态", "维护状态", "正常发电状态");
@Autowired @Autowired
private static Map<String, EquipmentSpecificIndex> map;
@Autowired
SystemEnumMapper systemEnumMapper; SystemEnumMapper systemEnumMapper;
@Autowired @Autowired
SwitchPictureMapper switchPictureMapper; SwitchPictureMapper switchPictureMapper;
...@@ -142,19 +145,13 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -142,19 +145,13 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
private String fanStatusImagePathPrefix; private String fanStatusImagePathPrefix;
@Value("classpath:/json/topic.json") @Value("classpath:/json/topic.json")
private Resource topic; private Resource topic;
@Value("classpath:/json/fanlocation.json") @Value("classpath:/json/fanlocation.json")
private Resource fanlocation; private Resource fanlocation;
@Autowired @Autowired
private IndicatorDataMapper indicatorDataMapper; private IndicatorDataMapper indicatorDataMapper;
private List<Map> list; private List<Map> list;
@Autowired @Autowired
private EquipmentSpecificIndexMapper equipmentSpecificIndexMapper; private EquipmentSpecificIndexMapper equipmentSpecificIndexMapper;
@Autowired
private static Map<String, EquipmentSpecificIndex> map;
@Override @Override
public ResultsData getNationWideInfo(int current, int size, String gateway, String equipmentNumber) { public ResultsData getNationWideInfo(int current, int size, String gateway, String equipmentNumber) {
...@@ -266,9 +263,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -266,9 +263,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
}); });
} }
result.stream().forEach(e -> { result.stream().forEach(e -> {
if(powerOther.contains(e.getEquipmentIndexName())||e.getEquipmentIndexName().equals("日发电量")){ if (powerOther.contains(e.getEquipmentIndexName()) || e.getEquipmentIndexName().equals("日发电量")) {
e.setValue(String.format(CommonConstans.Fourdecimalplaces, e.getValueF())); e.setValue(String.format(CommonConstans.Fourdecimalplaces, e.getValueF()));
}else{ } else {
e.setValue(String.format(CommonConstans.Twodecimalplaces, e.getValueF())); e.setValue(String.format(CommonConstans.Twodecimalplaces, e.getValueF()));
} }
...@@ -339,172 +336,155 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -339,172 +336,155 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
return stationBasicMapper.selectById(stationId); return stationBasicMapper.selectById(stationId);
} }
public List<ESEquipmentsDTO> getFanStatusList(String stationId) { public List<ESEquipmentsDTO> getFanStatusList(String stationId) {
StationBasic stationBasic = getOneByStationNumber(stationId); StationBasic stationBasic = getOneByStationNumber(stationId);
if(stationBasic.getStationName().contains("GFDZ")) if (stationBasic.getStationName().contains("GFDZ")) {
{ return new ArrayList<ESEquipmentsDTO>();
return new ArrayList<ESEquipmentsDTO>(); }
} Map<String, List<String>> queryCondtion = new HashMap<>();
Map<String, List<String>> queryCondtion = new HashMap<>(); queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName,
queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("风机状态", "有功功率", "发电状态", "报警状态", "停机状态", "故障状态", "待机状态", "维护状态", "发电机转速", "正常发电状态"));
Arrays.asList("风机状态", "有功功率", "发电状态", "报警状态", "停机状态", "故障状态", "待机状态", "维护状态", "发电机转速", "正常发电状态")); queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId()));
queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId())); List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class); Map<String, List<String>> queryCondtion1 = new HashMap<>();
Map<String, List<String>> queryCondtion1 = new HashMap<>(); queryCondtion1.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("风机状态"));
queryCondtion1.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("风机状态")); queryCondtion1.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId()));
queryCondtion1.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId())); List<ESEquipments> equipNumList = commonServiceImpl.getListDataByCondtions(queryCondtion1, null,
List<ESEquipments> equipNumList = commonServiceImpl.getListDataByCondtions(queryCondtion1, null, ESEquipments.class);
ESEquipments.class);
Map<String, String> likeMap = new HashMap<String, String>();
Map<String, String> likeMap = new HashMap<String, String>(); queryCondtion.remove(CommonConstans.QueryStringEquipmentIndexName);
queryCondtion.remove(CommonConstans.QueryStringEquipmentIndexName); likeMap.put(CommonConstans.QueryStringEquipmentIndexName, "实时故障");
likeMap.put(CommonConstans.QueryStringEquipmentIndexName, "实时故障"); List<ESEquipments> resultWarn = commonServiceImpl.getListDataByCondtions(queryCondtion, null,
List<ESEquipments> resultWarn = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class, likeMap);
ESEquipments.class, likeMap);
result.addAll(resultWarn);
result.addAll(resultWarn);
// list测点转风机map并且计算风机状态
// list测点转风机map并且计算风机状态 Map<String, List<ESEquipments>> listMap = result.stream()
Map<String, List<ESEquipments>> listMap = result.stream() .collect(Collectors.groupingBy(po -> po.getEquipmentNumber()));
.collect(Collectors.groupingBy(po -> po.getEquipmentNumber())); Map<String, String> equipMap = new HashMap<>();
Map<String, String> equipMap = new HashMap<>(); for (Entry<String, List<ESEquipments>> entry : listMap.entrySet()) {
for (Entry<String, List<ESEquipments>> entry : listMap.entrySet()) { equipMap.put(entry.getKey(), "正常运行");
equipMap.put(entry.getKey(), "正常运行"); if (entry.getValue() == null) {
if (entry.getValue() == null) { continue;
continue; }
} Map<String, String> objMap = entry.getValue().stream()
Map<String, String> objMap = entry.getValue().stream() .collect(Collectors.toMap(ESEquipments::getEquipmentIndexName, ESEquipments::getValue));
.collect(Collectors.toMap(ESEquipments::getEquipmentIndexName, ESEquipments::getValue)); Map<String, Date> timeMap = entry.getValue().stream()
Map<String, Date> timeMap = entry.getValue().stream() .collect(Collectors.toMap(ESEquipments::getEquipmentIndexName, ESEquipments::getCreatedTime));
.collect(Collectors.toMap(ESEquipments::getEquipmentIndexName, ESEquipments::getCreatedTime)); Map<String, String> warnMap = entry.getValue().stream()
Map<String, String> warnMap = entry.getValue().stream() .filter(i -> i.getEquipmentIndexName().contains("实时故障"))
.filter(i -> i.getEquipmentIndexName().contains("实时故障")) .collect(Collectors.toMap(ESEquipments::getEquipmentSpecificName, ESEquipments::getValue));
.collect(Collectors.toMap(ESEquipments::getEquipmentSpecificName, ESEquipments::getValue)); String fanStatus = objMap.get("风机状态");
String fanStatus = objMap.get("风机状态"); Double power = Double.valueOf(objMap.get("有功功率"));
Double power = Double.valueOf(objMap.get("有功功率")); String elecStatus = objMap.get("发电状态") != null ? objMap.get("发电状态") : objMap.get("正常发电状态");
String elecStatus = objMap.get("发电状态") != null ? objMap.get("发电状态") : objMap.get("正常发电状态"); String fault22 = objMap.get("实时故障22");
String fault22 = objMap.get("实时故障22"); String warnStatus = objMap.get("报警状态");
String warnStatus = objMap.get("报警状态"); String standbyStatus = objMap.get("待机状态");
String standbyStatus = objMap.get("待机状态"); String stopStatus = objMap.get("停机状态");
String stopStatus = objMap.get("停机状态"); String faultStatus = objMap.get("故障状态");
String faultStatus = objMap.get("故障状态"); String mainStatus = objMap.get("维护状态");
String mainStatus = objMap.get("维护状态"); boolean isWarn = isWarn(warnMap);
boolean isWarn = isWarn(warnMap); Double fdjSpeed = Double.valueOf(objMap.get("发电机转速"));
Double fdjSpeed = Double.valueOf(objMap.get("发电机转速")); Date fdjTime = timeMap.get("发电机转速");
Date fdjTime = timeMap.get("发电机转速"); Long min = null;
Long min = null; if (fdjTime != null) {
if(fdjTime!=null) { long start = fdjTime.getTime();
long start = fdjTime.getTime(); //获取当前时间毫秒值
//获取当前时间毫秒值 long current = System.currentTimeMillis();
long current = System.currentTimeMillis();
min = (current - start) / 1000 / 60;
min = (current - start)/ 1000 / 60; }
} //正常运行
//正常运行 //1.发电状态=true(遥信)
//1.发电状态=true(遥信) //2.风机状态=8（遥测）
//2.风机状态=8（遥测） //3.有功功率>0（遥测）
//3.有功功率>0（遥测） //4.实时故障：枚举值匹配不上，以及匹配为备留信号的为正常运行
//4.实时故障：枚举值匹配不上，以及匹配为备留信号的为正常运行 if (Boolean.TRUE.toString().equalsIgnoreCase(elecStatus) && "8.0".equals(fanStatus) && power > 0 && !isWarn) {
if(Boolean.TRUE.toString().equalsIgnoreCase(elecStatus)&&"8.0".equals(fanStatus)&&power>0&&!isWarn) equipMap.put(entry.getKey(), "正常运行");
{ } else if ("11.0".equals(fanStatus)) {
equipMap.put(entry.getKey(), "正常运行"); equipMap.put(entry.getKey(), "限功率");
} } else if (Boolean.TRUE.toString().equalsIgnoreCase(warnStatus)) {
else if("11.0".equals(fanStatus)) equipMap.put(entry.getKey(), "报警运行");
{ } else if (Boolean.TRUE.toString().equalsIgnoreCase(standbyStatus) && "3.0".equals(fanStatus)) {
equipMap.put(entry.getKey(), "限功率"); equipMap.put(entry.getKey(), "待机状态");
} } else if (Boolean.TRUE.toString().equalsIgnoreCase(stopStatus) && "1.0".equals(fanStatus)) {
else if(Boolean.TRUE.toString().equalsIgnoreCase(warnStatus)) equipMap.put(entry.getKey(), "停机状态");
{ } else if (Boolean.TRUE.toString().equalsIgnoreCase(stopStatus) && Boolean.TRUE.toString().equalsIgnoreCase(faultStatus)) {
equipMap.put(entry.getKey(), "报警运行"); equipMap.put(entry.getKey(), "故障状态");
} } else if (Boolean.TRUE.toString().equalsIgnoreCase(mainStatus) && "2.0".equals(fanStatus)) {
else if(Boolean.TRUE.toString().equalsIgnoreCase(standbyStatus)&&"3.0".equals(fanStatus)) equipMap.put(entry.getKey(), "维护状态");
{ } else if (fdjSpeed > 0 && min != null && min >= 10) {
equipMap.put(entry.getKey(), "待机状态"); equipMap.put(entry.getKey(), "通讯中断");
} }
else if(Boolean.TRUE.toString().equalsIgnoreCase(stopStatus)&&"1.0".equals(fanStatus)) }
{
equipMap.put(entry.getKey(), "停机状态"); HashMap<String, String> colorMap = new HashMap<>();
} colorMap.put("正常运行", "#00aa00");
else if(Boolean.TRUE.toString().equalsIgnoreCase(stopStatus)&&Boolean.TRUE.toString().equalsIgnoreCase(faultStatus)) colorMap.put("报警运行", "#ffc400");
{ colorMap.put("停机状态", "#a3f5aa");
equipMap.put(entry.getKey(), "故障状态"); colorMap.put("故障状态", "#ff0000");
} colorMap.put("限功率", "#0055ff");
else if(Boolean.TRUE.toString().equalsIgnoreCase(mainStatus)&&"2.0".equals(fanStatus)) colorMap.put("待机状态", "#00aaff");
{ colorMap.put("维护状态", "#ff00ff");
equipMap.put(entry.getKey(), "维护状态"); colorMap.put("通讯中断", "#7d8e95");
}
else if(fdjSpeed>0&&min!=null&&min>=10) List<ESEquipmentsDTO> resultList = new ArrayList<>();
{ if (CollectionUtils.isNotEmpty(equipNumList)) {
equipMap.put(entry.getKey(), "通讯中断"); equipNumList.forEach(item -> {
} String status = equipMap.get(item.getEquipmentNumber());
} item.setAddress(status);
ESEquipmentsDTO esEquipmentsDTO = new ESEquipmentsDTO();
HashMap<String, String> colorMap = new HashMap<>(); BeanUtil.copyProperties(item, esEquipmentsDTO);
colorMap.put("正常运行", "#00aa00"); String color = colorMap.get(status);
colorMap.put("报警运行", "#ffc400"); esEquipmentsDTO.setState(status);
colorMap.put("停机状态", "#a3f5aa"); esEquipmentsDTO.setColor(color);
colorMap.put("故障状态", "#ff0000"); resultList.add(esEquipmentsDTO);
colorMap.put("限功率", "#0055ff"); });
colorMap.put("待机状态", "#00aaff"); }
colorMap.put("维护状态", "#ff00ff");
colorMap.put("通讯中断", "#7d8e95"); return resultList;
List<ESEquipmentsDTO> resultList = new ArrayList<>(); }
if (CollectionUtils.isNotEmpty(equipNumList)) {
equipNumList.forEach(item -> { @PostConstruct
String status =equipMap.get(item.getEquipmentNumber()); public void init() {
item.setAddress(status); QueryWrapper<EquipmentSpecificIndex> wrapper = new QueryWrapper<>();
ESEquipmentsDTO esEquipmentsDTO = new ESEquipmentsDTO(); wrapper.eq("is_alarm", 1);
BeanUtil.copyProperties(item, esEquipmentsDTO); List<EquipmentSpecificIndex> list = equipmentSpecificIndexMapper.selectList(wrapper);
String color = colorMap.get(status); map = list.stream().collect(Collectors.toMap(EquipmentSpecificIndex::getEquipmentSpecificName,
esEquipmentsDTO.setState(status); Function.identity(), (key1, key2) -> key2));
esEquipmentsDTO.setColor(color); }
resultList.add(esEquipmentsDTO);
}); private boolean isWarn(Map<String, String> warnMap) {
} boolean result = false;
for (Entry<String, String> entry : warnMap.entrySet()) {
return resultList; EquipmentSpecificIndex equipmentSpecificIndex = map.get(entry.getKey());
if (equipmentSpecificIndex == null || entry.getValue() == null) {
} continue;
}
@PostConstruct String valueEnum = equipmentSpecificIndex.getValueEnum();
public void init() { JSONArray arr = JSONObject.parseArray(valueEnum);
QueryWrapper<EquipmentSpecificIndex> wrapper = new QueryWrapper<>(); if (arr == null) {
wrapper.eq("is_alarm", 1); continue;
List<EquipmentSpecificIndex> list = equipmentSpecificIndexMapper.selectList(wrapper); }
map = list.stream().collect(Collectors.toMap(EquipmentSpecificIndex::getEquipmentSpecificName, for (Object o : arr) {
Function.identity(), (key1, key2) -> key2)); JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(o));
} if (json.containsKey("key") && entry.getValue().equals(json.get("key"))) {
String warn = json.getString("label");
private boolean isWarn(Map<String, String> warnMap) { if (warn.indexOf("备留") == -1) {
boolean result = false; result = true;
for (Entry<String, String> entry : warnMap.entrySet()) { break;
EquipmentSpecificIndex equipmentSpecificIndex = map.get(entry.getKey()); }
if (equipmentSpecificIndex == null || entry.getValue() == null) { }
continue; }
} if (result) {
String valueEnum = equipmentSpecificIndex.getValueEnum(); break;
JSONArray arr = JSONObject.parseArray(valueEnum); }
if(arr==null) }
{ return result;
continue; }
}
for (Object o : arr) {
JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(o));
if (json.containsKey("key") && entry.getValue().equals(json.get("key"))) {
String warn = json.getString("label");
if (warn.indexOf("备留") == -1) {
result = true;
break;
}
}
}
if (result) {
break;
}
}
return result;
}
public List<IndexDto> getFanStatusStatistics(String stationId) { public List<IndexDto> getFanStatusStatistics(String stationId) {
List<ESEquipmentsDTO> equipNumList = getFanStatusList(stationId); List<ESEquipmentsDTO> equipNumList = getFanStatusList(stationId);
...@@ -606,7 +586,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -606,7 +586,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId())); queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId()));
queryCondtion.put(CommonConstans.QueryStringEquipmentNumberKeyword, Arrays.asList(equipNum)); queryCondtion.put(CommonConstans.QueryStringEquipmentNumberKeyword, Arrays.asList(equipNum));
List<ESEquipments> equipNumList = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap); List<ESEquipments> equipNumList = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
if(ObjectUtils.isEmpty(frontModule)){ if (ObjectUtils.isEmpty(frontModule)) {
equipNumList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class); equipNumList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
} }
if (CollectionUtils.isNotEmpty(equipNumList) && !ObjectUtils.isEmpty(equipNumList.get(0).getValueF())) { if (CollectionUtils.isNotEmpty(equipNumList) && !ObjectUtils.isEmpty(equipNumList.get(0).getValueF())) {
...@@ -1381,13 +1361,17 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1381,13 +1361,17 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
// queryCodtion.put(CommonConstans.QueryStringSystemTypeKeyword, Arrays.asList("模拟量")); // queryCodtion.put(CommonConstans.QueryStringSystemTypeKeyword, Arrays.asList("模拟量"));
likeMap.put(CommonConstans.QueryStringFrontMoudle, map.get("boosterName")); likeMap.put(CommonConstans.QueryStringFrontMoudle, map.get("boosterName"));
likeMap.put(CommonConstans.QueryStringSystemTypeKeyword, "模拟量"); likeMap.put(CommonConstans.QueryStringSystemTypeKeyword, "模拟量");
if ("1主变高压侧".equals(map.get("boosterName")) || "1主变低压侧".equals(map.get("boosterName"))) { if (CommonConstans.XIAZAO_ZHUBIANGAOYACE.equals(map.get("boosterName")) || CommonConstans.XIAZAO_ZHUBIANDIYACE.equals(map.get("boosterName"))) {
likeMap.put(CommonConstans.QueryStringFrontMoudle, "压侧"); likeMap.put(CommonConstans.QueryStringFrontMoudle, "压侧");
List<ESEquipments> listData = commonServiceImpl.getListDataByCondtions(queryCodtion, null, ESEquipments.class, likeMap); List<ESEquipments> listData = commonServiceImpl.getListDataByCondtions(queryCodtion, null, ESEquipments.class, likeMap);
Integer traceIdCount = listData.stream().filter(esEquipments -> !StringUtils.isEmpty(esEquipments.getTraceId())).collect(Collectors.toList()).size();
if (traceIdCount > 0) {
listData = listData.stream().filter(esEquipments -> !StringUtils.isEmpty(esEquipments.getTraceId())).collect(Collectors.toList());
}
// 主变高压侧 // 主变高压侧
Map<String, String> zbGYC = listData.stream().filter(t -> t.getFrontModule().contains("1主变高压侧")).collect(Collectors.toMap(ESEquipments::getDisplayName, ESEquipments::getValue)); Map<String, String> zbGYC = listData.stream().filter(t -> t.getFrontModule().contains(CommonConstans.XIAZAO_ZHUBIANGAOYACE)).collect(Collectors.toMap(ESEquipments::getDisplayName, ESEquipments::getValue));
List<Map<String, String>> zbList = new ArrayList<>(); List<Map<String, String>> zbList = new ArrayList<>();
listData.stream().filter(t -> t.getFrontModule().contains("1主变低压侧")).forEach(item -> { listData.stream().filter(t -> t.getFrontModule().contains(CommonConstans.XIAZAO_ZHUBIANDIYACE)).forEach(item -> {
HashMap<String, String> zbMap = new HashMap<>(); HashMap<String, String> zbMap = new HashMap<>();
zbMap.put("traceId", item.getTraceId()); zbMap.put("traceId", item.getTraceId());
zbMap.put("title", item.getDisplayName()); zbMap.put("title", item.getDisplayName());
...@@ -1395,6 +1379,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1395,6 +1379,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
zbMap.put("grade2", keepTwoDecimalPlaces(zbGYC.getOrDefault(item.getDisplayName(), "0.0"))); zbMap.put("grade2", keepTwoDecimalPlaces(zbGYC.getOrDefault(item.getDisplayName(), "0.0")));
zbList.add(zbMap); zbList.add(zbMap);
}); });
zbList.sort(Comparator.comparingInt(o -> Integer.parseInt(o.get("traceId").toString())));
IPage<Map<String, String>> zbResult = new Page<>(); IPage<Map<String, String>> zbResult = new Page<>();
zbResult.setRecords(zbList); zbResult.setRecords(zbList);
zbResult.setCurrent(1); zbResult.setCurrent(1);
......
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java
View file @ b1c6884e
...@@ -1052,19 +1052,19 @@ public class MonitoringServiceImpl { ...@@ -1052,19 +1052,19 @@ public class MonitoringServiceImpl {
Double totalAnnual = (powerOfAnnualFD + powerOfAnnualGF); Double totalAnnual = (powerOfAnnualFD + powerOfAnnualGF);
HashMap<String, String> stringHashMap13 = new HashMap<>(); HashMap<String, String> stringHashMap13 = new HashMap<>();
stringHashMap13.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.carbonDioxide))); stringHashMap13.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.carbonDioxide)));
stringHashMap13.put("title2", "二氧化碳减排量（t）"); stringHashMap13.put("title2",CommonConstans.ER_YANG_HUA_TAN_JIANPAILIANG);
list3.add(stringHashMap13); list3.add(stringHashMap13);
HashMap<String, String> stringHashMap14 = new HashMap<>(); HashMap<String, String> stringHashMap14 = new HashMap<>();
stringHashMap14.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.standardCoal))); stringHashMap14.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.standardCoal)));
stringHashMap14.put("title2", "节约标准煤（t）"); stringHashMap14.put("title2", CommonConstans.BIAO_ZHUN_MEI_JIANPAILIANG);
list3.add(stringHashMap14); list3.add(stringHashMap14);
HashMap<String, String> stringHashMap15 = new HashMap<>(); HashMap<String, String> stringHashMap15 = new HashMap<>();
stringHashMap15.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.toner))); stringHashMap15.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.toner)));
stringHashMap15.put("title2", "碳粉尘减排量（t）"); stringHashMap15.put("title2", CommonConstans.TAN_FEN_CHEN_ZHUBIANDIYACE);
list3.add(stringHashMap15); list3.add(stringHashMap15);
HashMap<String, String> stringHashMap16 = new HashMap<>(); HashMap<String, String> stringHashMap16 = new HashMap<>();
stringHashMap16.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.sulfurDioxide))); stringHashMap16.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.sulfurDioxide)));
stringHashMap16.put("title2", "二氧化硫减排量（t）"); stringHashMap16.put("title2", CommonConstans.ER_YANG_HUA_LIU_ZHUBIANDIYACE);
list3.add(stringHashMap16); list3.add(stringHashMap16);
page3.setRecords(list3); page3.setRecords(list3);
try { try {
......
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