Skip to content

A
amos-boot-biz
Commit 07bb6a9e authored by zhangsen's avatar zhangsen
Browse files
Options

文档问题处理

parent 2abbc541
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 26 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 @ 07bb6a9e
......@@ -87,10 +87,12 @@ public class CommonConstans {
public static final String QueryStringSystemType = "systemType";
public static final String QueryStringSystemTypeKeyword = "systemType.keyword";
public static final String QueryStringEquipmentNumber = "equipmentNumber";
public static final String QueryStringEquipmentNumberKeyword = "equipmentNumber.keyword";
public static final String QueryStringValue = "value";
public static final String QueryStringValueKeyword = "value.keyword";
public static final String QueryStringDataType = "dataType";
public static final String QueryStringDisplayName = "displayName";
public static final String QueryStringDisplayNameKeyword = "displayName.keyword";
public static final String QueryStringIsAlarm = "isAlarm";
public static final String QueryStringIsAlarmKeyword = "isAlarm.keyword";
public static final String Twodecimalplaces= "%.2f";
......
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 @ 07bb6a9e
......@@ -823,4 +823,18 @@ public class MonitorFanIdxController extends BaseController {
Page<Map<String, Object>> result = monitorFanIndicator.nbqStatus(stationBasic.getFanGatewayId());
return ResponseHelper.buildResponse(result);
}
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@ApiOperation(value = "实时告警")
@GetMapping("/getEventByEquipIndex")
public ResponseModel<ResultsData> getEventByEquipIndex(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@RequestParam(value = "stationId") String stationId,
@RequestParam(value = "equipIndex") String equipIndex,
@RequestParam(value = "frontModule") String frontModule) {
StationBasic stationBasic = stationBasicMapper.selectById(stationId);
String gatewayId = stationBasic.getFanGatewayId();
ResultsData resultsData = equipAlarmEventService.getEventByEquipIndex(gatewayId, current, size, equipIndex, frontModule);
return ResponseHelper.buildResponse(resultsData);
}
}
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 @ 07bb6a9e
......@@ -186,13 +186,13 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
String sql = "";
Map<String, List<String>> queryCondtion = new HashMap<>();
queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId()));
Map<String, String> shouldQueryCondtion = new HashMap<>();
shouldQueryCondtion.put("frontModule", frontModule);
shouldQueryCondtion.put("equipmentNumber", equipNum);
Map<String, String> likeMap = new HashMap<>();
likeMap.put("frontModule", frontModule);
likeMap.put("equipmentNumber", equipNum);
if (StringUtils.isNotEmpty(systemType)) {
shouldQueryCondtion.put("systemType", systemType);
likeMap.put("systemType", systemType);
}
List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, shouldQueryCondtion, ESEquipments.class);
List<ESEquipments> result = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
result.stream().forEach(e -> {
e.setValue(String.format(CommonConstans.Twodecimalplaces, e.getValueDouble()));
});
......@@ -492,7 +492,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
}
Map<String, List<String>> queryCondtion = new HashMap<>();
queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
queryCondtion.put(CommonConstans.QueryStringEquipmentNumber, Arrays.asList(name));
queryCondtion.put(CommonConstans.QueryStringEquipmentNumberKeyword, Arrays.asList(name));
List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
name = indicatorsDtoList.get(0).getEquipmentSpecificName();
StringBuffer param = new StringBuffer();
......@@ -737,14 +737,19 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
public List<Map<String, Object>> getStatusGzp(String gatewayId, String systemType, String frontModule, String equipNum) {
String sql = " SELECT displayName ,equipmentNumber , value as state,equipmentIndexName FROM indicators_" + gatewayId + " WHERE frontModule =~/" + frontModule + "/ and systemType = '" + systemType + "'";
Map<String, List<String>> queryCondtion = new HashMap<>();
queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
queryCondtion.put(CommonConstans.QueryStringSystemTypeKeyword, Arrays.asList(systemType));
if (null != equipNum) {
sql = " SELECT displayName , equipmentNumber , value as state,equipmentIndexName FROM indicators_" + gatewayId + " WHERE frontModule =~/" + frontModule + "/ and systemType = '" + systemType + "' and equipmentNumber ='" + equipNum + "'";
queryCondtion.put(CommonConstans.QueryStringEquipmentNumberKeyword, Arrays.asList(equipNum));
}
List<IndicatorsDto> listData = influxDButils.getListData(sql, IndicatorsDto.class);
Map<String, String> likeMap = new HashMap<>();
likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, frontModule);
List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
List<Map<String, Object>> statusMaps = new ArrayList<>();
for (IndicatorsDto listDatum : listData) {
for (ESEquipments listDatum : indicatorsDtoList) {
Map<String, Object> statusMap = new HashMap<>();
String data = listDatum.getDisplayName();
if (StringUtils.isEmpty(data)) {
......@@ -757,9 +762,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
}
}
statusMap.put("data", data);
statusMap.put("state", listDatum.getState().equals("false") ? 1 : 0);
statusMap.put("status", listDatum.getState().equals("false") ? 1 : 0);
statusMap.put("title", listDatum.getState().equals("false") ? "断" : "通");
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") ? "通" : "断");
statusMaps.add(statusMap);
}
return statusMaps;
......@@ -1424,7 +1429,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
HashMap<String, Object> resultMap = new HashMap<>();
Map<String, List<String>> queryCondtion = new HashMap<>();
queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
queryCondtion.put(CommonConstans.QueryStringEquipmentNumber, Arrays.asList(equipmentNumber));
queryCondtion.put(CommonConstans.QueryStringEquipmentNumberKeyword, Arrays.asList(equipmentNumber));
List<ESEquipments> list = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class).subList(0, 1);
if (!ValidationUtil.isEmpty(list)) {
// resultMap.put("equipmentSpecificName", list.get(0).getEquipmentSpecificName());
......@@ -1440,7 +1445,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
} else {
type = "光伏逆变器系统";
queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("待机", "故障停机", "告警运行", "限额运行", "停机", "通讯故障", "降额运行", "运行"));
queryCondtion.put(CommonConstans.QueryStringValue, Arrays.asList("true"));
queryCondtion.put(CommonConstans.QueryStringValueKeyword, Arrays.asList("true"));
List<ESEquipments> list1 = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
resultMap.put("status", AlarmDesc.getCode(list1.get(0).getEquipmentIndexName()));
queryEquipNum = "#" + Integer.parseInt(equipNames[0]);
......@@ -1487,15 +1492,12 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
if (null != equipmentNumber) {
listData = esEquipmentsList.stream().filter(esEquipments -> !esEquipments.getEquipmentNumber().contains(equipmentNumber)).collect(Collectors.toList());
}
LinkedHashSet<ESEquipments> data = new LinkedHashSet<>(listData);
List<Map<String, Object>> statusMaps = new ArrayList<>();
for (ESEquipments listDatum : data) {
Map<String, Object> statusMap = new HashMap<>();
statusMap.put("equipmentNumber", listDatum.getEquipmentNumber());
statusMap.put("equipmentSpecificName", listDatum.getEquipmentSpecificName().substring(5).replace("/", " "));
statusMaps.add(statusMap);
}
return statusMaps;
return listData.stream().map(item -> {
HashMap<String, Object> map = new HashMap<>();
map.put("equipmentNumber", item.getEquipmentNumber());
map.put("equipmentSpecificName", item.getEquipmentSpecificName().substring(5).replace("/", " "));
return map;
}).distinct().collect(Collectors.toList());
}
public String keepTwoDecimalPlaces(String value) {
......@@ -1514,11 +1516,11 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
HashMap<String, Object> resultMap = new HashMap<>();
Map<String, List<String>> queryCondtion = new HashMap<>();
queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
queryCondtion.put(CommonConstans.QueryStringEquipmentNumber, Arrays.asList(equipmentNumber));
queryCondtion.put(CommonConstans.QueryStringEquipmentNumberKeyword, Arrays.asList(equipmentNumber));
queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList(equipmentIndexName));
List<ESEquipments> list = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
if (!ValidationUtil.isEmpty(list)) {
resultMap.put("value", String.format(CommonConstans.Twodecimalplaces, Double.parseDouble(list.get(0).getValue())));
resultMap.put("value", String.format(CommonConstans.Twodecimalplaces, Double.parseDouble(list.get(0).getValueDouble().toString())));
}
return resultMap;
}
......
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