Skip to content

A
amos-boot-biz
Commit 3e57ff14 authored by caotao's avatar caotao
Browse files
Options

更新获取风机状态及光伏状态的问题

parent 2dfa8f8c
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 65 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 @ 3e57ff14
...@@ -2,9 +2,11 @@ package com.yeejoin.amos.boot.module.jxiop.biz.constants; ...@@ -2,9 +2,11 @@ package com.yeejoin.amos.boot.module.jxiop.biz.constants;
import org.checkerframework.checker.units.qual.C; import org.checkerframework.checker.units.qual.C;
import java.util.HashMap;
public class CommonConstans { public class CommonConstans {
//光伏发电量系数 //光伏发电量系数
public static final Double pvGenPoweActor = 0.0001; public static final Double pvGenPoweActor = 0.000001;
// 风电站： // 风电站：
// （日/月/年）发电量=场站所有风机（日/月/年）发电量总和 // （日/月/年）发电量=场站所有风机（日/月/年）发电量总和
// 装机容量=场站所有风机装机容量总和 // 装机容量=场站所有风机装机容量总和
...@@ -31,4 +33,49 @@ public class CommonConstans { ...@@ -31,4 +33,49 @@ public class CommonConstans {
public static final Double tToWT = 0.0001; public static final Double tToWT = 0.0001;
//万Kwh转MV //万Kwh转MV
public static final Integer wkwhToMv = 10; public static final Integer wkwhToMv = 10;
// 正常运行 发电状态=1
// 告警运行 报警状态=1
// 正常停机 停机状态=1
// 故障停机 故障状态=1
// 限功率
// 待机状态 待机状态=1
// 维护状态 维护状态=1
// 通讯中断
public static final HashMap<String, String> fanStatus = new HashMap<String, String>() {
{
put("发电状态", "正常运行");
put("报警状态", "告警运行");
put("停机状态", "正常停机");
put("故障状态", "故障停机");
put("待机状态", "待机状态");
put("维护状态", "维护状态");
put("限功率", "限功率");
put("通讯中断", "通讯中断");
}
};
// 正常运行 运行=1
// 正常停机 停机=1
// 限功率 限额运行=1
// 限电停机 降额运行=1
// 告警运行 告警运行=1
// 故障停机 故障停机=1
// 待机状态 待机=1
// 通讯中断 通讯故障=1
public static final HashMap<String, String> pvStatus = new HashMap<String, String>() {
{
put("运行", "正常运行");
put("停机", "正常停机");
put("限额运行", "限功率");
put("降额运行", "限电停机");
put("告警运行", "告警运行");
put("故障停机", "故障停机");
put("待机", "待机状态");
put("通讯故障", "通讯中断");
}
};
} }
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 @ 3e57ff14
...@@ -541,7 +541,7 @@ public class MonitorFanIdxController extends BaseController { ...@@ -541,7 +541,7 @@ public class MonitorFanIdxController extends BaseController {
Map<String, String> map = monitorFanIndicatorMapper.getMajorBoosterStationInfoBySort(gatewayId, equipName); Map<String, String> map = monitorFanIndicatorMapper.getMajorBoosterStationInfoBySort(gatewayId, equipName);
String name = map.get("text").equals("1主变高压侧") || map.get("text").equals("1主变低压侧") ?map.get("text").substring(0,3):map.get("text"); String name = map.get("text").equals("1主变高压侧") || map.get("text").equals("1主变低压侧") ?map.get("text").substring(0,3):map.get("text");
String sql = " SELECT * FROM indicators_" + gatewayId + " WHERE (equipmentIndexName ='待机' or equipmentIndexName ='故障停机' or equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' or equipmentIndexName ='停机 or 'equipmentIndexName ='停机' or equipmentIndexName ='停机') and value = 'true'";
Map<String, Object> switchUrl = monitorFanIndicatorImpl.getSwitchUrl(gatewayId, name); Map<String, Object> switchUrl = monitorFanIndicatorImpl.getSwitchUrl(gatewayId, name);
List<Map<String, Object>> statusMonitoring = monitorFanIndicator.getStatusGzp(gatewayId ,"网络",name,null); List<Map<String, Object>> statusMonitoring = monitorFanIndicator.getStatusGzp(gatewayId ,"网络",name,null);
......
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 @ 3e57ff14
...@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic; ...@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
import com.yeejoin.amos.boot.module.jxiop.api.mapper.MonitorFanIndicatorMapper; import com.yeejoin.amos.boot.module.jxiop.api.mapper.MonitorFanIndicatorMapper;
import com.yeejoin.amos.boot.module.jxiop.api.mapper.RegionMapper; import com.yeejoin.amos.boot.module.jxiop.api.mapper.RegionMapper;
import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper; import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
import com.yeejoin.amos.boot.module.jxiop.biz.constants.CommonConstans;
import com.yeejoin.amos.boot.module.jxiop.biz.dto.*; import com.yeejoin.amos.boot.module.jxiop.biz.dto.*;
import com.yeejoin.amos.boot.module.jxiop.biz.entity.*; import com.yeejoin.amos.boot.module.jxiop.biz.entity.*;
import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.AlarmEventMapper; import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.AlarmEventMapper;
...@@ -284,41 +285,50 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -284,41 +285,50 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
} }
public List<IndexDto> getFanStatusList(String stationId) { public List<IndexDto> getFanStatusList(String stationId) {
// StationBasic stationBasic = getOneByStationNumber(stationId);
// String sql = String.format("SELECT equipmentNumber, equipmentIndexName as state FROM \"indicators_%s\" WHERE equipmentIndexName =~/^报警状态|停机状态|故障状态|待机状态|维护状态|正常发电状态$/ and value = 'true'", stationBasic.getFanGatewayId());
// List<IndexDto> influxDBList = influxDButils.getListData(sql, IndexDto.class);
// Map<String, String> collect = influxDBList.stream().collect(Collectors.toMap(IndexDto::getEquipmentNumber, IndexDto::getState, (item1, item2) -> item1));
// String sqlEquipNumList = String.format("SELECT (DISTINCT equipmentNumber) as equipmentNumber FROM \"indicators_%s\"", stationBasic.getFanGatewayId());
// List<IndexDto> equipNumList = influxDButils.getListData(sqlEquipNumList, IndexDto.class);
// List<Map<String, String>> fanConfigPower = monitorFanIndicatorregionMapper.getFanConfigPower(stationBasic.getFanGatewayId(), null);
// String equipmentSpecificNames = fanConfigPower.stream().map(t -> t.get("equipmentSpecificName")).collect(Collectors.joining("|"));
// String powerSql = String.format("SELECT equipmentNumber, value FROM \"indicators_%s\" WHERE equipmentSpecificName =~/^%s$/ and value = '9.0'", stationBasic.getFanGatewayId(), equipmentSpecificNames);
// List<IndexDto> powerNum = influxDButils.getListData(powerSql, IndexDto.class);
// List<String> powList = powerNum.stream().map(IndexDto::getEquipmentNumber).collect(Collectors.toList());
// Date currentDayStartTime = DateUtils.dateAddMinutes(new Date(), -15);
// String time = "";
// try {
// time = DateUtils.dateFormat(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
// } catch (ParseException e) {
// e.printStackTrace();
// }
//
// String timeSql = String.format("select distinct equipmentNumber from \"indicators_%s\" where time >= '%s'", stationBasic.getFanGatewayId(), time);
// List<IndexDto> timeSqlList = influxDButils.getListData(timeSql, IndexDto.class);
// List<String> timeList = timeSqlList.stream().map(IndexDto::getEquipmentNumber).collect(Collectors.toList());
// equipNumList.forEach(item -> {
// item.setState(collect.get(item.getEquipmentNumber()));
// if (!collect.containsKey(item.getEquipmentNumber())) {
// item.setState("正常运行");
// } else if (powList.contains(item.getEquipmentNumber())) {
// item.setState("限功率");
// } else if (!timeList.contains(item.getEquipmentNumber())) {
// item.setState("通讯中断");
// }
// });
StationBasic stationBasic = getOneByStationNumber(stationId); StationBasic stationBasic = getOneByStationNumber(stationId);
String sql = String.format("SELECT equipmentNumber, equipmentIndexName as state FROM \"indicators_%s\" WHERE equipmentIndexName =~/^报警状态|停机状态|故障状态|待机状态|维护状态|正常发电状态$/ and value = 'true'", stationBasic.getFanGatewayId()); String sql = String.format("SELECT equipmentNumber, equipmentIndexName as state FROM \"indicators_%s\" WHERE equipmentIndexName =~/^发电状态|报警状态|停机状态|故障状态|待机状态|维护状态|正常发电状态$/ and value = 'true'", stationBasic.getFanGatewayId());
List<IndexDto> influxDBList = influxDButils.getListData(sql, IndexDto.class); List<IndexDto> influxDBList = influxDButils.getListData(sql, IndexDto.class);
Map<String, String> collect = influxDBList.stream().collect(Collectors.toMap(IndexDto::getEquipmentNumber, IndexDto::getState, (item1, item2) -> item1));
String sqlEquipNumList = String.format("SELECT (DISTINCT equipmentNumber) as equipmentNumber FROM \"indicators_%s\"", stationBasic.getFanGatewayId()); String sqlEquipNumList = String.format("SELECT (DISTINCT equipmentNumber) as equipmentNumber FROM \"indicators_%s\"", stationBasic.getFanGatewayId());
List<IndexDto> equipNumList = influxDButils.getListData(sqlEquipNumList, IndexDto.class); List<IndexDto> equipNumList = influxDButils.getListData(sqlEquipNumList, IndexDto.class);
List<Map<String, String>> fanConfigPower = monitorFanIndicatorregionMapper.getFanConfigPower(stationBasic.getFanGatewayId(), null); Map<String, String> collect = influxDBList.stream().collect(Collectors.toMap(IndexDto::getEquipmentNumber, IndexDto::getState, (item1, item2) -> item1));
String equipmentSpecificNames = fanConfigPower.stream().map(t -> t.get("equipmentSpecificName")).collect(Collectors.joining("|"));
String powerSql = String.format("SELECT equipmentNumber, value FROM \"indicators_%s\" WHERE equipmentSpecificName =~/^%s$/ and value = '9.0'", stationBasic.getFanGatewayId(), equipmentSpecificNames);
List<IndexDto> powerNum = influxDButils.getListData(powerSql, IndexDto.class);
List<String> powList = powerNum.stream().map(IndexDto::getEquipmentNumber).collect(Collectors.toList());
Date currentDayStartTime = DateUtils.dateAddMinutes(new Date(), -15);
String time = "";
try {
time = DateUtils.dateFormat(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
} catch (ParseException e) {
e.printStackTrace();
}
String timeSql = String.format("select distinct equipmentNumber from \"indicators_%s\" where time >= '%s'", stationBasic.getFanGatewayId(), time);
List<IndexDto> timeSqlList = influxDButils.getListData(timeSql, IndexDto.class);
List<String> timeList = timeSqlList.stream().map(IndexDto::getEquipmentNumber).collect(Collectors.toList());
equipNumList.forEach(item -> { equipNumList.forEach(item -> {
item.setState(collect.get(item.getEquipmentNumber())); String status = ObjectUtils.isEmpty(CommonConstans.fanStatus.get(item.getState())) ? "通讯中断" : CommonConstans.fanStatus.get(item.getState());
if (!collect.containsKey(item.getEquipmentNumber())) { item.setState(status);
item.setState("正常运行");
} else if (powList.contains(item.getEquipmentNumber())) {
item.setState("限功率");
} else if (!timeList.contains(item.getEquipmentNumber())) {
item.setState("通讯中断");
}
}); });
return equipNumList; return equipNumList;
} }
public List<IndexDto> getFanStatusListOptimize(String stationId) { public List<IndexDto> getFanStatusListOptimize(String stationId) {
...@@ -367,37 +377,38 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -367,37 +377,38 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
} }
public List<IndexDto> getFanStatusStatistics(String stationId) { public List<IndexDto> getFanStatusStatistics(String stationId) {
StationBasic stationBasic = getOneByStationNumber(stationId); // StationBasic stationBasic = getOneByStationNumber(stationId);
String sql = String.format("SELECT equipmentNumber, equipmentIndexName as state FROM \"indicators_%s\" WHERE equipmentIndexName =~/^报警状态|停机状态|故障状态|待机状态|维护状态|正常发电状态$/ and value = 'true'", stationBasic.getFanGatewayId()); // String sql = String.format("SELECT equipmentNumber, equipmentIndexName as state FROM \"indicators_%s\" WHERE equipmentIndexName =~/^报警状态|停机状态|故障状态|待机状态|维护状态|正常发电状态$/ and value = 'true'", stationBasic.getFanGatewayId());
List<IndexDto> influxDBList = influxDButils.getListData(sql, IndexDto.class); // List<IndexDto> influxDBList = influxDButils.getListData(sql, IndexDto.class);
Map<String, String> collect = influxDBList.stream().collect(Collectors.toMap(IndexDto::getEquipmentNumber, IndexDto::getState, (item1, item2) -> item1)); // Map<String, String> collect = influxDBList.stream().collect(Collectors.toMap(IndexDto::getEquipmentNumber, IndexDto::getState, (item1, item2) -> item1));
String sqlEquipNumList = String.format("SELECT (DISTINCT equipmentNumber) as equipmentNumber FROM \"indicators_%s\"", stationBasic.getFanGatewayId()); // String sqlEquipNumList = String.format("SELECT (DISTINCT equipmentNumber) as equipmentNumber FROM \"indicators_%s\"", stationBasic.getFanGatewayId());
List<IndexDto> equipNumList = influxDButils.getListData(sqlEquipNumList, IndexDto.class); // List<IndexDto> equipNumList = influxDButils.getListData(sqlEquipNumList, IndexDto.class);
List<Map<String, String>> fanConfigPower = monitorFanIndicatorregionMapper.getFanConfigPower(stationBasic.getFanGatewayId(), null); // List<Map<String, String>> fanConfigPower = monitorFanIndicatorregionMapper.getFanConfigPower(stationBasic.getFanGatewayId(), null);
String equipmentSpecificNames = fanConfigPower.stream().map(t -> t.get("equipmentSpecificName")).collect(Collectors.joining("|")); // String equipmentSpecificNames = fanConfigPower.stream().map(t -> t.get("equipmentSpecificName")).collect(Collectors.joining("|"));
String powerSql = String.format("SELECT equipmentNumber, value FROM \"indicators_%s\" WHERE equipmentSpecificName =~/^%s$/ and value = '9.0'", stationBasic.getFanGatewayId(), equipmentSpecificNames); // String powerSql = String.format("SELECT equipmentNumber, value FROM \"indicators_%s\" WHERE equipmentSpecificName =~/^%s$/ and value = '9.0'", stationBasic.getFanGatewayId(), equipmentSpecificNames);
List<IndexDto> powerNum = influxDButils.getListData(powerSql, IndexDto.class); // List<IndexDto> powerNum = influxDButils.getListData(powerSql, IndexDto.class);
List<String> powList = powerNum.stream().map(IndexDto::getEquipmentNumber).collect(Collectors.toList()); // List<String> powList = powerNum.stream().map(IndexDto::getEquipmentNumber).collect(Collectors.toList());
Date currentDayStartTime = DateUtils.dateAddMinutes(new Date(), -15); // Date currentDayStartTime = DateUtils.dateAddMinutes(new Date(), -15);
String time = ""; // String time = "";
try { // try {
time = DateUtils.dateFormat(currentDayStartTime, DateUtils.DATE_TIME_PATTERN); // time = DateUtils.dateFormat(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
} catch (ParseException e) { // } catch (ParseException e) {
e.printStackTrace(); // e.printStackTrace();
} // }
String timeSql = String.format("select distinct equipmentNumber from \"indicators_%s\" where time >= '%s'", stationBasic.getFanGatewayId(), time); // String timeSql = String.format("select distinct equipmentNumber from \"indicators_%s\" where time >= '%s'", stationBasic.getFanGatewayId(), time);
List<IndexDto> timeSqlList = influxDButils.getListData(timeSql, IndexDto.class); // List<IndexDto> timeSqlList = influxDButils.getListData(timeSql, IndexDto.class);
List<String> timeList = timeSqlList.stream().map(IndexDto::getEquipmentNumber).collect(Collectors.toList()); // List<String> timeList = timeSqlList.stream().map(IndexDto::getEquipmentNumber).collect(Collectors.toList());
equipNumList.forEach(item -> { // equipNumList.forEach(item -> {
item.setState(collect.get(item.getEquipmentNumber())); // item.setState(collect.get(item.getEquipmentNumber()));
if (!collect.containsKey(item.getEquipmentNumber())) { // if (!collect.containsKey(item.getEquipmentNumber())) {
item.setState("正常运行"); // item.setState("正常运行");
} else if (powList.contains(item.getEquipmentNumber())) { // } else if (powList.contains(item.getEquipmentNumber())) {
item.setState("限功率"); // item.setState("限功率");
} else if (!timeList.contains(item.getEquipmentNumber())) { // } else if (!timeList.contains(item.getEquipmentNumber())) {
item.setState("通讯中断"); // item.setState("通讯中断");
} // }
}); // });
List<IndexDto> equipNumList = getFanStatusList(stationId);
Map<String, Long> countMap = equipNumList.stream().collect(Collectors.groupingBy(IndexDto::getState, Collectors.counting())); Map<String, Long> countMap = equipNumList.stream().collect(Collectors.groupingBy(IndexDto::getState, Collectors.counting()));
List<IndexDto> resultList = new ArrayList<>(); List<IndexDto> resultList = new ArrayList<>();
List<String> list = Arrays.asList("正常运行", "告警运行", "正常停机", "故障停机", "限功率", "待机状态", "维护状态", "通讯中断"); List<String> list = Arrays.asList("正常运行", "告警运行", "正常停机", "故障停机", "限功率", "待机状态", "维护状态", "通讯中断");
...@@ -1754,6 +1765,77 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1754,6 +1765,77 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
public Map<String, Object> nbqStatus(String gatewayId) { public Map<String, Object> nbqStatus(String gatewayId) {
// String sql = " SELECT * FROM indicators_" + gatewayId + " WHERE (equipmentIndexName ='待机' or equipmentIndexName ='故障停机' or equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' or equipmentIndexName ='停机') and value = 'true'";
// List<IndicatorsDto> indicatorsDtoList = influxDButils.getListData(sql, IndicatorsDto.class);
//
// int djNum = 0;
// int gzNum = 0;
// int gjNum = 0;
// int xeNum = 0;
// int xdNum = 0;
// int txNum = 0;
// int tjNum = 0;
// int zcNum = 0;
// Map<String, Object> numMap = new HashMap<>();
//
// Set<String> equipNum = new HashSet<>();
//
// for (IndicatorsDto indicatorsDto : indicatorsDtoList) {
// switch (indicatorsDto.getEquipmentIndexName()) {
// case "待机":
// djNum += 1;
// break;
// case "故障停机":
// gzNum += 1;
// break;
// case "告警运行":
// gjNum += 1;
// break;
// case "限额运行":
// xeNum += 1;
// equipNum.add(indicatorsDto.getEquipmentNumber());
// break;
// case "停机":
// tjNum += 1;
// break;
// }
// }
//
// String xesql = " SELECT * FROM indicators_" + gatewayId + " WHERE equipmentIndexName ='有功功率' and frontModule = '逆变器' and value < '0.5'";
// List<IndicatorsDto> xeList = influxDButils.getListData(xesql, IndicatorsDto.class);
// for (IndicatorsDto dto : xeList) {
// if (!ValidationUtil.isEmpty(equipNum) && equipNum.contains(dto.getEquipmentNumber())) {
// xdNum += 1;
// }
// }
//
// String querySql = " SELECT * FROM indicators_" + gatewayId + " WHERE ( equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' ) and value != 'true'";
// List<IndicatorsDto> queryList = influxDButils.getListData(querySql, IndicatorsDto.class);
// if (!ValidationUtil.isEmpty(queryList)) {
// List<String> collect = queryList.stream().map(IndicatorsDto::getEquipmentNumber).collect(Collectors.toList());
// Set<String> strings = new HashSet<>(collect);
// zcNum = collect.size() - strings.size();
// }
//
// String querySql1 = " SELECT * FROM indicators_" + gatewayId + " equipmentIndexName ='通讯异常' and value = 'true'";
// List<IndicatorsDto> queryList1 = influxDButils.getListData(querySql1, IndicatorsDto.class);
// if (!ValidationUtil.isEmpty(queryList1)) {
// List<String> collect1 = queryList.stream().map(IndicatorsDto::getEquipmentNumber).collect(Collectors.toList());
// Set<String> strings1 = new HashSet<>(collect1);
// txNum = collect1.size() - strings1.size();
// }
//
// numMap.put("djNum", djNum);
// numMap.put("gzNum", gzNum);
// numMap.put("gjNum", gjNum);
// numMap.put("xeNum", xeNum);
// numMap.put("xdNum", xdNum);
// numMap.put("txNum", txNum);
// numMap.put("tjNum", tjNum);
// numMap.put("zcNum", zcNum);
//
// return numMap;
String sql = " SELECT * FROM indicators_" + gatewayId + " WHERE (equipmentIndexName ='待机' or equipmentIndexName ='故障停机' or equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' or equipmentIndexName ='停机') and value = 'true'"; String sql = " SELECT * FROM indicators_" + gatewayId + " WHERE (equipmentIndexName ='待机' or equipmentIndexName ='故障停机' or equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' or equipmentIndexName ='停机') and value = 'true'";
List<IndicatorsDto> indicatorsDtoList = influxDButils.getListData(sql, IndicatorsDto.class); List<IndicatorsDto> indicatorsDtoList = influxDButils.getListData(sql, IndicatorsDto.class);
...@@ -1790,7 +1872,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1790,7 +1872,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
} }
} }
String xesql = " SELECT * FROM indicators_" + gatewayId + " WHERE equipmentIndexName ='有功功率' and frontModule = '逆变器' and value < '0.5'"; String xesql = " SELECT * FROM indicators_" + gatewayId + " WHERE equipmentIndexName ='限电运行' and frontModule = '逆变器' and value = 'true'";
List<IndicatorsDto> xeList = influxDButils.getListData(xesql, IndicatorsDto.class); List<IndicatorsDto> xeList = influxDButils.getListData(xesql, IndicatorsDto.class);
for (IndicatorsDto dto : xeList) { for (IndicatorsDto dto : xeList) {
if (!ValidationUtil.isEmpty(equipNum) && equipNum.contains(dto.getEquipmentNumber())) { if (!ValidationUtil.isEmpty(equipNum) && equipNum.contains(dto.getEquipmentNumber())) {
...@@ -1798,7 +1880,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1798,7 +1880,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
} }
} }
String querySql = " SELECT * FROM indicators_" + gatewayId + " WHERE ( equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' ) and value != 'true'"; String querySql = " SELECT * FROM indicators_" + gatewayId + " equipmentIndexName ='运行' and value = 'true'";
List<IndicatorsDto> queryList = influxDButils.getListData(querySql, IndicatorsDto.class); List<IndicatorsDto> queryList = influxDButils.getListData(querySql, IndicatorsDto.class);
if (!ValidationUtil.isEmpty(queryList)) { if (!ValidationUtil.isEmpty(queryList)) {
List<String> collect = queryList.stream().map(IndicatorsDto::getEquipmentNumber).collect(Collectors.toList()); List<String> collect = queryList.stream().map(IndicatorsDto::getEquipmentNumber).collect(Collectors.toList());
...@@ -1814,7 +1896,6 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1814,7 +1896,6 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
txNum = collect1.size() - strings1.size(); txNum = collect1.size() - strings1.size();
} }
numMap.put("djNum", djNum); numMap.put("djNum", djNum);
numMap.put("gzNum", gzNum); numMap.put("gzNum", gzNum);
numMap.put("gjNum", gjNum); numMap.put("gjNum", gjNum);
...@@ -1825,7 +1906,6 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1825,7 +1906,6 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
numMap.put("zcNum", zcNum); numMap.put("zcNum", zcNum);
return numMap; return numMap;
} }
......
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