设备统计数据

device-api-service/src/main/java/com/xy/service/DeviceQualityServiceImpl.java

@@ -147,20 +147,21 @@ public class DeviceQualityServiceImpl extends ServiceImpl<DeviceQualityMapper, D
         LocalDateTime now = LocalDateTime.now();
         types.forEach(type -> {
             QualityEnum qualityEnum = QualityEnum.getQualityEnum(type);
-            if (qualityEnum != null) {
-                //修改质检
-                UpdateWrapper<DeviceQuality> updateWrapper = new UpdateWrapper<DeviceQuality>()
-                        .set(qualityEnum.getBeginTime(), now)
-                        .set(qualityEnum.getEndTime(), null)
-                        .set(StringTools.humpToLine(LambdaUtils.getProperty(DeviceQuality::getUpdateTime)), now)
-                        .eq(StringTools.humpToLine(LambdaUtils.getProperty(DeviceQuality::getQualityId)), rest.getQualityId());
-                update(updateWrapper);
-                //删除质检属性
-                DeviceQualityValueDto.Vo del = new DeviceQualityValueDto.Vo()
-                        .setQualityId(rest.getQualityId())
-                        .setQualityType(type);
-                deviceQualityValueService.del(del);
+            if (qualityEnum == null) {
+                return;
             }
+            //修改质检
+            UpdateWrapper<DeviceQuality> updateWrapper = new UpdateWrapper<DeviceQuality>()
+                    .set(qualityEnum.getBeginTime(), now)
+                    .set(qualityEnum.getEndTime(), null)
+                    .set(StringTools.humpToLine(LambdaUtils.getProperty(DeviceQuality::getUpdateTime)), now)
+                    .eq(StringTools.humpToLine(LambdaUtils.getProperty(DeviceQuality::getQualityId)), rest.getQualityId());
+            update(updateWrapper);
+            //删除质检属性
+            DeviceQualityValueDto.Vo del = new DeviceQualityValueDto.Vo()
+                    .setQualityId(rest.getQualityId())
+                    .setQualityType(type);
+            deviceQualityValueService.del(del);
         });
         return R.ok();
     }
@@ -214,10 +215,6 @@ public class DeviceQualityServiceImpl extends ServiceImpl<DeviceQualityMapper, D
     public R qualityResultBack(@RequestBody DeviceQualityDto.QualityResultBack qualityResultBack) {
         Long deviceId = qualityResultBack.getDeviceId();
         String type = qualityResultBack.getType();
-        QualityEnum qualityEnum = QualityEnum.getQualityEnum(type);
-        if (qualityEnum == null) {
-            return R.ok();
-        }
         JSONObject data = qualityResultBack.getData();
         LambdaQueryWrapper<DeviceQuality> lambdaQueryWrapper = new LambdaQueryWrapper<DeviceQuality>()
                 .eq(DeviceQuality::getDeviceId, deviceId)
@@ -227,11 +224,14 @@ public class DeviceQualityServiceImpl extends ServiceImpl<DeviceQualityMapper, D
             return R.fail("设备不存在");
         }
         //修改质检
-        UpdateWrapper<DeviceQuality> updateWrapper = new UpdateWrapper<DeviceQuality>()
-                .set(qualityEnum.getEndTime(), LocalDateTime.now())
-                .eq(StringTools.humpToLine(LambdaUtils.getProperty(DeviceQuality::getDeviceId)), deviceId)
-                .eq(StringTools.humpToLine(LambdaUtils.getProperty(DeviceQuality::getShowStatus)), true);
-        update(updateWrapper);
+        QualityEnum qualityEnum = QualityEnum.getQualityEnum(type);
+        if (qualityEnum != null) {
+            UpdateWrapper<DeviceQuality> updateWrapper = new UpdateWrapper<DeviceQuality>()
+                    .set(qualityEnum.getEndTime(), LocalDateTime.now())
+                    .eq(StringTools.humpToLine(LambdaUtils.getProperty(DeviceQuality::getDeviceId)), deviceId)
+                    .eq(StringTools.humpToLine(LambdaUtils.getProperty(DeviceQuality::getShowStatus)), true);
+            update(updateWrapper);
+        }
         //修改质检值
         DeviceQualityValueDto.Vo saveOrUpdate = new DeviceQualityValueDto.Vo()
                 .setQualityType(type)