解决冲突

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

@@ -724,7 +724,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
 
     public List<Map<String,Object>>  getAnalogQuantity (String gatewayId,String frontModule){
-        String sql =   "    SELECT *  FROM indicators_"+gatewayId+" WHERE  frontModule =~/"+frontModule+"/ and systemType = '模拟量'";
+        String sql =   "    SELECT *  FROM indicators_"+gatewayId+" WHERE  frontModule =~/"+frontModule+"/ and systemType = '模拟量' and displayName != ''";
         List<IndicatorsDto> listData = influxDButils.getListData(sql, IndicatorsDto.class);
 
         List<Map<String,Object>> statusMaps = new ArrayList<>();