数据管理-同比分析修改2

fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java

@@ -328,6 +328,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         List<DataManagementVO> dataManagementVOList = new ArrayList<>();
         List<String> newListOne = new ArrayList<>();
         List<String> newListTwo = new ArrayList<>();
+        List<String> newListThree = new ArrayList<>();
         newListOne.add("dataTime");
         for (int i = 0; i < dataManagementOneVO.getDisplayField().size(); i++) {
             DataManagementVO dataManagementVO = new DataManagementVO();
@@ -335,6 +336,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
             dataManagementVOList.add(dataManagementVO);
             newListOne.add(dataManagementOneVO.getDisplayField().get(i).split("_")[1]);
             newListTwo.add(dataManagementOneVO.getDisplayField().get(i).split("_")[2]);
+            newListThree.add(dataManagementOneVO.getDisplayField().get(i).split("_")[1]+"_"+dataManagementOneVO.getDisplayField().get(i).split("_")[2]);
         }
         Set set = new  HashSet();
         List<DataManagementVO> newList = new  ArrayList();
@@ -387,17 +389,20 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
                         String variable_two = list.get(j)+"_"+yearOnYearList.get(k).getDeviceAttributeId();
                         System.out.println("variable_one:"+variable_one+"---variable_two:"+variable_two);
                         if (variable_one.equals(variable_two)){
-                            String variable_three = yearOnYearList.get(k).getDeviceName()+"_"+list.get(j)+"_"+yearOnYearList.get(k).getDeviceAttributeId();
-//                            System.out.println("variable_one_a:"+dataManagementOneVO.getDisplayField()+"---variable_two_b:"+variable_three+"value"+dataManagementOneVO.getDisplayField().contains(variable_three));
-//                            if (dataManagementOneVO.getDisplayField().contains(variable_three)){
+                            String variable_three = list.get(j)+"_"+yearOnYearList.get(k).getDeviceAttributeId();
+                            System.out.println("variable_one_a:"+newListThree+"---variable_two_b:"+variable_three+"---value:"+newListThree.contains(variable_three));
+                            if (newListThree.contains(variable_three)){
                                 name = yearOnYearList.get(k).getMonitorDeviceName() + "/" + FieldEscapeUtils.fieldEscapeUtils(list.get(j));
                                 time.add(yearOnYearList.get(k).getDataTime());
 //                                System.out.println();
                                 data.add(FieldEscapeUtils.transformation(yearOnYearList.get(k),list.get(j)));
-//                            }
+                            }
                         }
                     }
-                    reListOne.add(CommonIcoVO.builder().name(name).list(data).listDate(time).build());
+                    if (data!=null && !data.isEmpty()){
+                        reListOne.add(CommonIcoVO.builder().name(name).list(data).listDate(time).build());
+                    }
+
                 }
             }
         }