优化定时批量禁用所有过期租户

dsk-admin/src/main/java/com/dsk/web/schedule/TenantTimerTask.java

@@ -20,11 +20,12 @@ public class TenantTimerTask {
 
     private final ISysTenantService tenantService;
 
-    //@Value("${schedule.cronExpression}")
-    //private String cronExpression;
-
+    /**
+     * 每6小时扫描并禁用已过期租户账号
+     */
     @Scheduled(cron = "0 0 0/6 * * *")
-    public void handleExpiredTenant() {
+    public void updateExpiredTenantStatus() {
+        log.info("执行定时禁用已过期租户账号(6h/次)");
         TenantHelper.ignore(tenantService::handleExpiredTenant);
     }
 

dsk-system/src/main/java/com/dsk/system/service/impl/ISysTenantServiceImpl.java

@@ -74,19 +74,22 @@ public class ISysTenantServiceImpl implements ISysTenantService {
     }
 
     /**
-     * 查询所有已过期租户
+     * 禁用所有已过期租户
      */
     @Override
     public void handleExpiredTenant() {
         Date now = new Date();
         //查询所有已过期租户
         List<SysTenant> tenantList = baseMapper.selectList(new LambdaQueryWrapper<SysTenant>()
+                .eq(SysTenant::getStatus, TenantConstants.NORMAL)
                 .gt(SysTenant::getStartTime, now)
                 .or()
                 .lt(SysTenant::getExpireTime, now));
         //批量禁用已过期租户
-        tenantList.forEach(sysTenant -> sysTenant.setStatus(TenantConstants.DISABLE));
-        baseMapper.updateBatchById(tenantList);
+        if (!tenantList.isEmpty()) {
+            tenantList.forEach(sysTenant -> sysTenant.setStatus(TenantConstants.DISABLE));
+            baseMapper.updateBatchById(tenantList);
+        }
     }
 
 //    /**