Merge branch 'usky-zyj' of uskycloud/usky-modules into master

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

@@ -353,18 +353,21 @@ public class DmpDeviceServiceImpl extends AbstractCrudService<DmpDeviceMapper, D
     public float attributeStatistic(Integer deviceType,String attribute_name){
         float f = 0;
         int deviceCount = 0;
-        LambdaQueryWrapper<DmpDevice> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(DmpDevice::getDeviceType,deviceType)
-                .eq(DmpDevice::getDeleteFlag,0);
-        deviceCount = this.count(queryWrapper);
+//        LambdaQueryWrapper<DmpDevice> queryWrapper = Wrappers.lambdaQuery();
+//        queryWrapper.eq(DmpDevice::getDeviceType,deviceType)
+//                .eq(DmpDevice::getDeleteFlag,0);
+//        deviceCount = this.count(queryWrapper);
         LambdaQueryWrapper<DataRealTime> queryWrapper1 = Wrappers.lambdaQuery();
         queryWrapper1.select(DataRealTime::getAttributeData)
                 .eq(DataRealTime::getDeviceType,deviceType)
-                .eq(DataRealTime::getAttributeName,attribute_name);
+                .eq(DataRealTime::getAttributeName,attribute_name)
+                .ne(DataRealTime::getAttributeData,-50)
+                .ne(DataRealTime::getAttributeData,0);
         List<DataRealTime> list = dataRealTimeService.list(queryWrapper1);
         if(list.size() > 0){
             for(int i=0;i<list.size();i++){
                 f += Float.parseFloat(list.get(i).getAttributeData());
+                deviceCount++;
             }
         }
         float data = f/deviceCount;