质检合格时检查磁盘空间和内存容量

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

@@ -11,6 +11,7 @@ import com.xy.collections.map.JMap;
 import com.xy.device.EnumDeviceFactoryStatus;
 import com.xy.device.EnumDeviceQrCode;
 import com.xy.device.EnumDeviceQualityStatus;
+import com.xy.device.EnumDeviceQualityThreshold;
 import com.xy.dto.DeviceQualityDto;
 import com.xy.dto.DeviceQualityValueDto;
 import com.xy.entity.*;
@@ -130,12 +131,14 @@ public class DeviceQualityServiceImpl extends ServiceImpl<DeviceQualityMapper, D
                 if (qualified == deviceQuality.getQualityState()) {
                     DeviceSysinfo deviceSysinfo = deviceSysinfosJMaps.get(deviceQuality.getDeviceId());
                     Integer diskSpace = deviceSysinfo.getDiskSpace();
-                    if (diskSpace == null || diskSpace < 2) {
-                        return R.fail(deviceSysinfo.getDeviceId() + "磁盘空间不足");
+                    int diskSpaceSize = SysDictUtils.getValue(EnumDeviceQualityThreshold.Code.CODE.getCode(), EnumDeviceQualityThreshold.DISK_SPACE_SIZE.getCode(), Integer.class);
+                    if (diskSpace == null || diskSpace < diskSpaceSize) {
+                        return R.fail(deviceSysinfo.getDeviceId() + "磁盘空间不足" + diskSpaceSize + "G");
                     }
                     Integer memerySpace = deviceSysinfo.getMemerySpace();
-                    if (memerySpace == null || memerySpace < 1) {
-                        return R.fail(deviceSysinfo.getDeviceId() + "内存容量不足");
+                    int memerySpaceSize = SysDictUtils.getValue(EnumDeviceQualityThreshold.Code.CODE.getCode(), EnumDeviceQualityThreshold.MEMERY_SPACE_SIZE.getCode(), Integer.class);
+                    if (memerySpace == null || memerySpace < memerySpaceSize) {
+                        return R.fail(deviceSysinfo.getDeviceId() + "内存容量不足" + memerySpaceSize + "G");
                     }
                 }
                 deviceQuality.setQualityAuditUserId(AuthorizeUtils.getLoginId(Long.class));