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

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -1055,9 +1055,14 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
 
     public Map<String, Object> getSwitchUrl(String gatewayId,String equipName ){
-        String sql = "SELECT * FROM indicators_"+gatewayId+" WHERE systemType = '开关' and frontModule =~ /"+equipName+"/ and displayName =~/合位$/";
-        String sql1 = "SELECT * FROM indicators_"+gatewayId+" WHERE systemType = '开关' and frontModule =~ /"+equipName+"/ and displayName =~/远方就地开关$/";
-        String sql2 = "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 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> listDatas = influxDButils.getListData(sql1, IndicatorsDto.class);
         List<IndicatorsDto> listDatass = influxDButils.getListData(sql2, IndicatorsDto.class);