解决冲突

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

@@ -64,36 +64,29 @@ public class StationDataTaskImpl implements IStationDataTask {
     @Override
     public void getIndexDto(DeviceDto deviceDto) {
         //每个分机的指标数据
-        List<IndexDto> list=null;
-
+        List<IndexDto> list = null;
+        QueryResult query = influxDbConnection.query("SELECT * FROM iot_data where \"equipmentSpecificName\" =~/.*" + deviceDto.getNumberName() + ".*/  and \"gatewayId\" =~/" + deviceDto.getGateway() + "/   group by \"equipmentsIdx\" limit 1");
+        List<QueryResult.Result> queryResults = query.getResults();
+        for (int i = 0; i < queryResults.size(); i++) {
+            QueryResult.Result result = queryResults.get(i);
+            List seriesList = result.getSeries();
+            for (int j = 0; j < list.size(); j++) {
+                QueryResult.Series series = (QueryResult.Series) seriesList.get(j);
+                System.out.println(series.getName());
+                System.out.println(series.getColumns());
+                System.out.println(series.getValues());
+                System.out.println(series.getTags());
+            }
+        }
 
-        if(list!=null&&list.size()>0){
+        if (list != null && list.size() > 0) {
             //对数据切片处理
-            List<List<IndexDto>>  listfp= Lists.partition(list,100);
+            List<List<IndexDto>> listfp = Lists.partition(list, 100);
             for (List<IndexDto> indexDtos : listfp) {
                 //每个分级信息处理
                 monitorFanIndicatorImpl.UpdateMonitorFanIndicator(indexDtos);
             }
         }
-    public List<IndexDto> getIndexDto(DeviceDto deviceDto) {
-        QueryResult query =influxDbConnection.query("SELECT * FROM iot_data where \"equipmentSpecificName\" =~/.*"+deviceDto.getNumberName()+".*/  and \"gatewayId\" =~/"+deviceDto.getGateway()+"/   group by \"equipmentsIdx\" limit 1");
-        List<QueryResult.Result >  queryResults=query.getResults();
-        for (int i = 0; i <queryResults.size() ; i++) {
-            QueryResult.Result  result = queryResults.get(i);
-            List list =result.getSeries();
-            for (int j = 0; j <list.size() ; j++) {
-                QueryResult.Series series  = (QueryResult.Series) list.get(j);
-                System.out.println(series.getName());
-                System.out.println(series.getColumns());
-                System.out.println(series.getValues());
-                System.out.println(series.getTags());
-            }
-        }
-        return null;
     }
 
-    @Override
-    public void setMonitorFanIndicator(List<IndexDto> list) {
-
-    }
 }