Merge branch 'server-165' of uskycloud/usky-modules into master

service-park/service-park-biz/src/main/java/com/usky/park/service/impl/DmpDeviceServiceImpl.java

@@ -271,46 +271,58 @@ public class DmpDeviceServiceImpl extends AbstractCrudService<DmpDeviceMapper, D
                 List<DmpDevice> list2 = this.list(queryWrapper);
                 if(CollectionUtils.isNotEmpty(list2)){
                     for(int i=0;i<deviceIdList.size();i++){
-                        DeviceHistoryDataExportVO responseVO = new DeviceHistoryDataExportVO();
-                        for(int h=0;h<list2.size();h++){
-                            if(deviceIdList.get(i).equals(list2.get(h).getDeviceId())){
-                                String deviceName = list2.get(h).getDeviceName();
-                                responseVO.setDeviceName(deviceName);
-                                break;
-                            }
-                        }
 
                         for(int j=0;j<dateList.size();j++){
+                            DeviceHistoryDataExportVO responseVO = new DeviceHistoryDataExportVO();
+                            for(int h=0;h<list2.size();h++){
+                                if(deviceIdList.get(i).equals(list2.get(h).getDeviceId())){
+                                    String deviceName = list2.get(h).getDeviceName();
+                                    responseVO.setDeviceName(deviceName);
+                                    break;
+                                }
+                            }
                             responseVO.setDataDate(dateList.get(j)+":00:00");
+                            int count = 0;
                             for(int k=0;k<list1.size();k++){
                                 if(deviceIdList.get(i).equals(list1.get(k).getDeviceId()) && dateList.get(j).equals(list1.get(k).getDataDate().substring(0,13))){
                                     if(list1.get(k).getAttributeName().equals("wd")){
                                         responseVO.setWd(list1.get(k).getAttributeData());
+                                        count++;
                                     }
                                     if(list1.get(k).getAttributeName().equals("sd")){
                                         responseVO.setSd(list1.get(k).getAttributeData());
+                                        count++;
                                     }
                                     if(list1.get(k).getAttributeName().equals("co2")){
                                         responseVO.setCo2(list1.get(k).getAttributeData());
+                                        count++;
                                     }
                                     if(list1.get(k).getAttributeName().equals("jq")){
                                         responseVO.setJq(list1.get(k).getAttributeData());
+                                        count++;
                                     }
                                     if(list1.get(k).getAttributeName().equals("pm2.5")){
                                         responseVO.setPm2_5(list1.get(k).getAttributeData());
+                                        count++;
                                     }
                                     if(list1.get(k).getAttributeName().equals("tvoc")){
                                         responseVO.setTvoc(list1.get(k).getAttributeData());
+                                        count++;
                                     }
                                     if(list1.get(k).getAttributeName().equals("pm1.0")){
                                         responseVO.setPm1_0(list1.get(k).getAttributeData());
+                                        count++;
                                     }
                                     if(list1.get(k).getAttributeName().equals("pm10")){
                                         responseVO.setPm10(list1.get(k).getAttributeData());
+                                        count++;
                                     }
                                 }
                             }
-                            list.add(responseVO);
+                            if(count > 0){
+                                list.add(responseVO);
+                            }
+
                         }
                     }
                 }