Skip to content

A
amos-boot-biz
Commit 5aa36fc6 authored by zhangsen's avatar zhangsen
Browse files
Options

equipName改为非必填

parent 1f546c48
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
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 @ 5aa36fc6
...@@ -1055,9 +1055,14 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1055,9 +1055,14 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
public Map<String, Object> getSwitchUrl(String gatewayId,String equipName ){ public Map<String, Object> getSwitchUrl(String gatewayId,String equipName ){
String sql = "SELECT * FROM indicators_"+gatewayId+" WHERE systemType = '开关' and frontModule =~ /"+equipName+"/ and displayName =~/合位$/"; String sql = "SELECT * FROM indicators_" + gatewayId + " WHERE systemType = '开关'" + " and displayName =~/合位$/";
String sql1 = "SELECT * FROM indicators_"+gatewayId+" WHERE systemType = '开关' and frontModule =~ /"+equipName+"/ and displayName =~/远方就地开关$/"; String sql1 = "SELECT * FROM indicators_" + gatewayId + " WHERE systemType = '开关'" + " and displayName =~/远方就地开关$/";
String sql2 = "SELECT * FROM indicators_"+gatewayId+" WHERE systemType = '开关' and frontModule =~ /"+equipName+"/ and displayName =~/接地刀位置$/"; String sql2 = "SELECT * FROM indicators_" + gatewayId + " WHERE systemType = '开关'" + " and displayName =~/接地刀位置$/";
if (StringUtils.isNotEmpty(equipName)) {
sql = "SELECT * FROM indicators_"+gatewayId+" WHERE systemType = '开关' and frontModule =~ /"+equipName+"/ and displayName =~/合位$/";
sql1 = "SELECT * FROM indicators_"+gatewayId+" WHERE systemType = '开关' and frontModule =~ /"+equipName+"/ and displayName =~/远方就地开关$/";
sql2 = "SELECT * FROM indicators_"+gatewayId+" WHERE systemType = '开关' and frontModule =~ /"+equipName+"/ and displayName =~/接地刀位置$/";
}
List<IndicatorsDto> listData = influxDButils.getListData(sql, IndicatorsDto.class); List<IndicatorsDto> listData = influxDButils.getListData(sql, IndicatorsDto.class);
List<IndicatorsDto> listDatas = influxDButils.getListData(sql1, IndicatorsDto.class); List<IndicatorsDto> listDatas = influxDButils.getListData(sql1, IndicatorsDto.class);
List<IndicatorsDto> listDatass = influxDButils.getListData(sql2, IndicatorsDto.class); List<IndicatorsDto> listDatass = influxDButils.getListData(sql2, IndicatorsDto.class);
......
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