bug修改

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

@@ -15,7 +15,6 @@ import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointProcessVariableCl
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.*;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.*;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.IndicatorDataMapper;
-import com.yeejoin.amos.component.influxdb.InfluxdbUtil;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -109,8 +108,7 @@ public class CommonServiceImpl {
     private IdxBizFanPointVarCorrelationMapper idxBizFanPointVarCorrelationMapper;
     @Autowired
     private IdxBizPvPointVarCorrelationMapper idxBizPvPointVarCorrelationMapper;
-    @Autowired
-    private InfluxdbUtil influxdbUtil;
+
     @Autowired
     private IndicatorDataMapper indicatorDataMapper;
     @Autowired

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthIndexMapper.xml

@@ -727,6 +727,7 @@
                 SUBARRAY
                 )
         ) a
+    where equipmentName is not null and equipmentName != ''
     GROUP BY
         a.equipmentName
     </select>
@@ -763,6 +764,7 @@
                 EQUIPMENT_NAME
                 )
         ) a
+        where subSystem is not null and subSystem != ''
     GROUP BY
         a.subSystem