Merge remote-tracking branch 'origin/v30.2_break_contract_20241021' into dev_jdk17

clx-performance-web/src/main/java/com/clx/performance/service/impl/OrderChildExceptionReportServiceImpl.java

@@ -69,7 +69,7 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
     private final OrderChildExceptionReportStruct orderChildExceptionReportStruct;
     private final OrderChildExceptionReportDao orderChildExceptionReportDao;
     private final OrderChildExceptionReportDealLogDao orderChildExceptionReportDealLogDao;
-    private final RedisTemplate<String,Integer> redisTemplate;
+    private final RedisTemplate<String,Object> redisTemplate;
     private final ThirdAppConfig thirdAppConfig;
     private final OrderChildExceptionReportOperationLogDao orderChildExceptionReportOperationLogDao;
     private final BreakContractDriverRecordService breakContractDriverRecordService;
@@ -187,7 +187,7 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
         boolean isFirst = false;
 
         if (Boolean.TRUE.equals(redisTemplate.hasKey(reportCacheKey))){
-            List<Integer> range = redisTemplate.opsForList().range(reportCacheKey, 0, -1);
+            List<Object> range = redisTemplate.opsForList().range(reportCacheKey, 0, -1);
             if(CollectionUtils.isNotEmpty(range)){
                 //如果缓存中包含生成的数字，则重新获取
                 while (range.contains(randomNumber)){
@@ -209,6 +209,7 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
         return "YCSB" + datetime + randomNumber;
 
     }
+
     public String getReportCacheKey(String datetime){
         return RedisConstants.EXCEPTION_REPORT_CACHE_KEY + datetime;
     }