Merge branch 'master' into test

device-api-service/src/main/java/com/xy/job/DeviceEventMsgJob.java

@@ -8,6 +8,7 @@ import com.xy.entity.SysDictRedis;
 import com.xy.service.DeviceEventMsgServiceImpl;
 import com.xy.sys.EnumDataClearSize;
 import com.xy.utils.DataTime;
+import com.xy.utils.RecursionUtils;
 import com.xy.utils.SysDictUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -38,17 +39,16 @@ public class DeviceEventMsgJob {
         SysDictRedis sysDictRedis = SysDictUtils.get(EnumDataClearSize.Code.CODE.getCode(), EnumDataClearSize.DEVICE_ERRORS_RECORD_DAY.getCode());
         Integer saveDay = Integer.valueOf(sysDictRedis.getValue());
         String beginTime = DataTime.getStringAround(0, 0, (~(saveDay - 1)), 0, 0, 0);
-        deviceEventMsg(beginTime);
-        return ReturnT.SUCCESS;
-    }
-
-    private void deviceEventMsg(String beginTime) {
         LambdaQueryWrapper<DeviceEventMsg> lambdaQueryWrapper = new LambdaQueryWrapper<DeviceEventMsg>()
                 .le(DeviceEventMsg::getCreateTime, beginTime)
                 .last("limit 10000");
-        boolean remove = deviceEventMsgService.remove(lambdaQueryWrapper);
-        if (remove) {
-            deviceEventMsg(beginTime);
-        }
+        RecursionUtils.recursion(current -> {
+            boolean remove = deviceEventMsgService.remove(lambdaQueryWrapper);
+            if (!remove) {
+                return false;
+            }
+            return true;
+        });
+        return ReturnT.SUCCESS;
     }
 }

device-api-service/src/main/java/com/xy/job/DeviceNetRecordJob.java

@@ -8,6 +8,7 @@ import com.xy.entity.SysDictRedis;
 import com.xy.service.DeviceNetRecordServiceImpl;
 import com.xy.sys.EnumDataClearSize;
 import com.xy.utils.DataTime;
+import com.xy.utils.RecursionUtils;
 import com.xy.utils.SysDictUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -38,17 +39,16 @@ public class DeviceNetRecordJob {
         SysDictRedis sysDictRedis = SysDictUtils.get(EnumDataClearSize.Code.CODE.getCode(), EnumDataClearSize.DEVICE_NET_RECORD_DAY.getCode());
         Integer saveDay = Integer.valueOf(sysDictRedis.getValue());
         String beginTime = DataTime.getStringAround(0, 0, (~(saveDay - 1)), 0, 0, 0);
-        deviceNetRecord(beginTime);
-        return ReturnT.SUCCESS;
-    }
-
-    private void deviceNetRecord(String beginTime) {
         LambdaQueryWrapper<DeviceNetRecord> lambdaQueryWrapper = new LambdaQueryWrapper<DeviceNetRecord>()
                 .le(DeviceNetRecord::getCreateTime, beginTime)
                 .last("limit 10000");
-        boolean remove = deviceNetRecordService.remove(lambdaQueryWrapper);
-        if (remove) {
-            deviceNetRecord(beginTime);
-        }
+        RecursionUtils.recursion(current -> {
+            boolean remove = deviceNetRecordService.remove(lambdaQueryWrapper);
+            if (!remove) {
+                return false;
+            }
+            return true;
+        });
+        return ReturnT.SUCCESS;
     }
 }

device-api-service/src/main/java/com/xy/job/DeviceTempRecordsJob.java

@@ -8,6 +8,7 @@ import com.xy.entity.SysDictRedis;
 import com.xy.service.DeviceTempRecordsServiceImpl;
 import com.xy.sys.EnumDataClearSize;
 import com.xy.utils.DataTime;
+import com.xy.utils.RecursionUtils;
 import com.xy.utils.SysDictUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -39,17 +40,16 @@ public class DeviceTempRecordsJob {
         SysDictRedis sysDictRedis = SysDictUtils.get(EnumDataClearSize.Code.CODE.getCode(), EnumDataClearSize.DEVICE_TEMP_RECORDS_DAY.getCode());
         Integer saveDay = Integer.valueOf(sysDictRedis.getValue());
         String beginTime = DataTime.getStringAround(0, 0, (~(saveDay - 1)), 0, 0, 0);
-        deviceTempRecords(beginTime);
-        return ReturnT.SUCCESS;
-    }
-
-    private void deviceTempRecords(String beginTime) {
         LambdaQueryWrapper<DeviceTempRecords> lambdaQueryWrapper = new LambdaQueryWrapper<DeviceTempRecords>()
                 .le(DeviceTempRecords::getCreateTime, beginTime)
                 .last("limit 10000");
-        boolean remove = deviceTempRecordsService.remove(lambdaQueryWrapper);
-        if (remove) {
-            deviceTempRecords(beginTime);
-        }
+        RecursionUtils.recursion(current -> {
+            boolean remove = deviceTempRecordsService.remove(lambdaQueryWrapper);
+            if (!remove) {
+                return false;
+            }
+            return true;
+        });
+        return ReturnT.SUCCESS;
     }
 }

device-api-service/src/main/java/com/xy/job/MqttCommandJob.java

@@ -11,6 +11,7 @@ import com.xy.service.MqttServiceImpl;
 import com.xy.sys.EnumDataClearSize;
 import com.xy.utils.DataTime;
 import com.xy.utils.JobUtils;
+import com.xy.utils.RecursionUtils;
 import com.xy.utils.SysDictUtils;
 import com.xy.utils.enums.MqttCommandStatusEnum;
 import lombok.AllArgsConstructor;
@@ -41,18 +42,17 @@ public class MqttCommandJob {
         SysDictRedis sysDictRedis = SysDictUtils.get(EnumDataClearSize.Code.CODE.getCode(), EnumDataClearSize.MQTT_COMMAND_DAY.getCode());
         Integer saveDay = Integer.valueOf(sysDictRedis.getValue());
         String beginTime = DataTime.getStringAround(0, 0, (~(saveDay - 1)), 0, 0, 0);
-        mqttCommand(beginTime);
-        return ReturnT.SUCCESS;
-    }
-
-    private void mqttCommand(String beginTime) {
         LambdaQueryWrapper<MqttCommand> lambdaQueryWrapper = new LambdaQueryWrapper<MqttCommand>()
                 .le(MqttCommand::getSendTime, beginTime)
                 .last("limit 10000");
-        boolean remove = mqttService.remove(lambdaQueryWrapper);
-        if (remove) {
-            mqttCommand(beginTime);
-        }
+        RecursionUtils.recursion(current -> {
+            boolean remove = mqttService.remove(lambdaQueryWrapper);
+            if (!remove) {
+                return false;
+            }
+            return true;
+        });
+        return ReturnT.SUCCESS;
     }
 
     /**