1、完善超分功能

2、完善积分系统
3、新增任务列表

src/main/java/com/ai/da/common/utils/AsyncCallerUtil.java

@@ -2,7 +2,6 @@ package com.ai.da.common.utils;
 
 import com.ai.da.common.config.exception.BusinessException;
 import com.ai.da.model.dto.GenerateToPythonDTO;
-import com.ai.da.model.dto.SuperResolutionDTO;
 import com.ai.da.python.PythonService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,52 +71,4 @@ public class AsyncCallerUtil {
         }
     }
 
-    public CompletableFuture<String> callSRAsync(SuperResolutionDTO superResolutionDTO) {
-        return CompletableFuture.supplyAsync(() -> pythonService.superResolution(superResolutionDTO));
-    }
-
-    public String SR(SuperResolutionDTO superResolutionDTO) {
-        ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(5);
-        String taskId = superResolutionDTO.getUniqueId();
-        ScheduledFuture<?> timeoutTask = null;
-        if (!waitingStatus.containsKey(taskId)) waitingStatus.put(taskId, true);
-
-        try {
-            CompletableFuture<String> generateResult = callSRAsync(superResolutionDTO);
-            // 5秒后第一次确认，之后每隔10秒确认一次用户选择结果
-            timeoutTask = scheduledExecutorService.scheduleAtFixedRate(() -> {
-                // 调用另一个接口获取用户的选择
-                if (!waitingStatus.get(taskId)) {
-                    // 如果用户选择取消，则取消对generate的调用
-                    generateResult.cancel(true);
-                    waitingStatus.remove(taskId);
-                } else log.info("===============持续等待===============");
-            }, 5, 10, TimeUnit.SECONDS);
-
-            log.info("阻塞等待结果...");
-            // 阻塞，等待结果
-            String result = generateResult.get();
-            // 取消定时任务
-            timeoutTask.cancel(true);
-            waitingStatus.remove(taskId);
-            return result;
-        } catch (CancellationException e) {
-            // generateResult.cancel(true);通过抛出异常取消该任务
-            log.info("==========成功取消generate任务==========");
-            return null;
-        } catch (InterruptedException | ExecutionException | BusinessException e) {
-            // 处理异常
-            log.error("发生错误 ： " + e, e);
-            // 取消定时任务
-            assert timeoutTask != null;
-            timeoutTask.cancel(true);
-            throw new BusinessException(e.getMessage());
-        } finally {
-            // 关闭线程池
-//            executorService.shutdown();
-//            scheduledExecutorService.shutdown();
-        }
-    }
-
-
 }

src/main/java/com/ai/da/common/utils/RedisUtil.java

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -69,10 +70,15 @@ public class RedisUtil {
     /**
      * 获取当前ZSet中数据量的总和
      */
-    public Long getZSetTotal(String key) {
+    public Long getZSetTotalCount(String key) {
         return redisTemplate.opsForZSet().zCard(key);
     }
 
+
+    public Set<String> getZSetTotalData(String key){
+        return redisTemplate.opsForZSet().range(key, 0, -1);
+    }
+
     //- - - - - - - - - - - - - - - - - - - - -  set类型 - - - - - - - - - - - - - - - - - - - -
 
     /**
@@ -138,4 +144,16 @@ public class RedisUtil {
         return redisTemplate.opsForValue().get(key);
     }
 
+    public Set<String> getKeysFromString(String key){
+        return redisTemplate.keys(key);
+    }
+
+    public List<String> getMultiValue(Set<String> keys){
+        return redisTemplate.opsForValue().multiGet(keys);
+    }
+
+    public Long getExpire(String key){
+        return redisTemplate.getExpire(key);
+    }
+
 }