Skip to content

A
amos-boot-biz
Commit 795c1d1f authored by chenzhao's avatar chenzhao
Browse files
Options

Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

parents b7118dce 673b0758
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 31 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanWarningRecordMapper.xml
View file @ 795c1d1f
......@@ -50,7 +50,7 @@
AND a.GATEWAY_ID = #{stationId}
</if>
</where>
order by REC_DATE DESC
order by recDate DESC
limit #{current}, #{size}
</select>
......
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 @ 795c1d1f
......@@ -440,7 +440,13 @@ public class MonitorFanIdxController extends BaseController {
return CommonResponseUtil.success();
}
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@ApiOperation(value = "统一获取集电线与风机状态")
@GetMapping("/fanLineList")
public void getFanLineList() {
getStatusJDX();
getListByFJ();
}
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取升压站信息 通过排序等")
......
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 @ 795c1d1f
......@@ -226,7 +226,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
});
Collator instance = Collator.getInstance(Locale.CHINA);
if (needDisplayDisplayNameSystemType.contains(systemType) && needDisplayDisplayNameFrontModule.contains(frontModule)) {
result.sort(Comparator.comparing(ESEquipments::getTraceId,Comparator.comparingInt(Integer::parseInt)));
result.sort(Comparator.comparing(ESEquipments::getTraceId, Comparator.comparingInt(Integer::parseInt)));
} else {
Collections.sort(result, (e1, e2) -> {
return instance.compare(e1.getEquipmentIndexName(), e2.getEquipmentIndexName());
......@@ -855,12 +855,12 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
data = listDatum.getDisplayName();
}
}
statusMap.put("addres",listDatum.getAddress());
statusMap.put("addres", listDatum.getAddress());
statusMap.put("data", data);
statusMap.put("state", listDatum.getValue().equals("false") ? 0 : 1);
statusMap.put("status", listDatum.getValue().equals("false") ? 0 : 1);
statusMap.put("title", listDatum.getValue().equals("false") ? "断" : "通");
if(systemType.equals("网络")){
if (systemType.equals("网络")) {
statusMap.put("state", listDatum.getValue().equals("false") ? 1 : 0);
}
statusMaps.add(statusMap);
......@@ -897,7 +897,6 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
});
return statusMaps;
}
......@@ -966,11 +965,12 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
HashMap<String, String> fanstatutsHashMap = new HashMap<>();
StationBasic stationBasic = stationBasicMapper.selectById(stationId);
Map<String, List<String>> queryCondtion = new HashMap<>();
queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("瞬时风速"));
queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("瞬时风速", "有功功率"));
queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
List<ESEquipments> listData = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("有功功率"));
List<ESEquipments> listData1 = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
List<ESEquipments> listDataAll = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
Map<String, Object> listDataWindSpeed = listDataAll.stream().filter(esEquipments -> esEquipments.getEquipmentIndexName().equals("瞬时风速")).collect(Collectors.toMap(ESEquipments::getEquipmentNumber, ESEquipments::getValueF));
// queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("有功功率"));
Map<String, Object> listDataActivePower = listDataAll.stream().filter(esEquipments -> esEquipments.getEquipmentIndexName().equals("有功功率")).collect(Collectors.toMap(ESEquipments::getEquipmentNumber, ESEquipments::getValueF));
TpriDmpDatabook tpriDmpDatabook = tpriDmpDatabookServiceImpl.getTpriDmpDatabookByDataName("风机");
List<Map<String, Object>> dataMaps = sjglZsjZsbtzServiceImpl.sjglZsjZsbtzMapper.getStationInfoMapByStationWerks(werks, tpriDmpDatabook.getDataid().toString());
//获取风机列表
......@@ -983,31 +983,29 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
for (Map<String, Object> dataMap : dataMaps) {
List<String> numList = Arrays.asList(dataMap.get("equipNum").toString().split(","));
List<Map<String, Object>> statusMaps = new ArrayList<>();
for (ESEquipments listDatum : listData) {
if (null == listDatum.getValueF()) {
listDatum.setValueF(0F);
}
for (ESEquipments indicatorsDto : listData1) {
if (listDatum.getEquipmentNumber().equals(indicatorsDto.getEquipmentNumber())) {
listDatum.setValueLabel(String.valueOf(indicatorsDto.getValueF() == null ? 0 : indicatorsDto.getValueF()));
}
}
// for (ESEquipments listDatum : listData) {
// if (null == listDatum.getValueF()) {
// listDatum.setValueF(0F);
// }
// for (ESEquipments indicatorsDto : listData1) {
// if (listDatum.getEquipmentNumber().equals(indicatorsDto.getEquipmentNumber())) {
// listDatum.setValueLabel(String.valueOf(indicatorsDto.getValueF() == null ? 0 : indicatorsDto.getValueF()));
// }
// }
for (String num : numList) {
if (Integer.parseInt(num) == Integer.parseInt(listDatum.getEquipmentNumber())) {
Map<String, Object> map = new HashMap<>();
map.put("title", prefix + listDatum.getEquipmentNumber());
String equipmentNumber = String.format("%02d", Integer.parseInt(num));
map.put("title", prefix + equipmentNumber);
//用于参数传递
map.put("title1", listDatum.getEquipmentNumber());
map.put("windSpeed", listDatum.getValueF());
map.put("power", listDatum.getValueLabel());
map.put("title1", equipmentNumber);
map.put("windSpeed", listDataWindSpeed.get(equipmentNumber));
map.put("power", listDataActivePower.get(equipmentNumber));
//获取风机状态如果获取到的状态为空-则默认为正常运行状态
String fantStatus = ObjectUtils.isEmpty(fanstatutsHashMap.get(listDatum.getEquipmentNumber())) ? "通讯中断" : fanstatutsHashMap.get(listDatum.getEquipmentNumber());
String fantStatus = ObjectUtils.isEmpty(fanstatutsHashMap.get(equipmentNumber)) ? "通讯中断" : fanstatutsHashMap.get(equipmentNumber);
map.put("url", fanStatusImagePathPrefix + File.separator + "风机-" + fantStatus + ".gif");
statusMaps.add(map);
}
}
}
IPage<Map<String, Object>> result = new Page<>();
result.setRecords(statusMaps);
result.setCurrent(1);
......@@ -1330,7 +1328,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
stringStringHashMap.put("value1", "0.0");
stringStringHashMap.put("value2", "0.0");
stringStringHashMap.put("value3", "0.0");
if(!map.get("boosterName").toString().equals("35kVⅠ母PT")){
if (!map.get("boosterName").toString().equals("35kVⅠ母PT")) {
listData.forEach(item -> {
if (item.getDisplayName().equals("Ia")) {
......@@ -1343,7 +1341,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
stringStringHashMap.put("value3", item.getValueF() == null ? "0" : keepTwoDecimalPlaces(item.getValueF().toString()));
}
});
}else{
} else {
stringStringHashMap.put("value1", "");
stringStringHashMap.put("value2", "");
stringStringHashMap.put("value3", "");
......@@ -2154,7 +2152,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
likeMap.put(CommonConstans.QueryStringEquipmentIndexNameNotKeyword, "路电流");
//hlx=hlx.replace("#0", "#");
//likeMap.put(CommonConstans.QueryStringEquipmentSpecificNameNotKeyword, hlx);
String nhlx =zz+"/"+nbq+"/"+ hlx.replace("#0", "#");
String nhlx = zz + "/" + nbq + "/" + hlx.replace("#0", "#");
List<ESEquipments> list = commonServiceImpl.getListDataByCondtionsAndLike(queryConditon, null,
ESEquipments.class, likeMap);
......@@ -2166,7 +2164,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
// ESEquipments.class, likeMap1);
if (!ValidationUtil.isEmpty(list)) {
list=list.stream().filter(i->i.getEquipmentSpecificName().contains(nhlx)).collect(Collectors.toList());
list = list.stream().filter(i -> i.getEquipmentSpecificName().contains(nhlx)).collect(Collectors.toList());
Double avageValue = 0.0;
avageValue = list.stream().filter(e -> !ObjectUtils.isEmpty(e.getValueF()))
......
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