Merge branch 'preview' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/baseservers into release

This commit is contained in:
dongruihua
2022-10-26 09:41:35 +08:00
2 changed files with 29 additions and 29 deletions

View File

@@ -181,20 +181,20 @@ public class CasesApi extends ApiBaseController {
if(pageSize==null){ if(pageSize==null){
pageSize=5; pageSize=5;
} }
List<CaseRankingDto> caseRankingDtos=null; List<CaseRankingDto> caseRankingDtos=casesService.queryPraises(pageSize);
IXaskCache cache= XaskCacheProvider.getCache(); // IXaskCache cache= XaskCacheProvider.getCache();
String redisNamePath="case:ranking:hot"; // String redisNamePath="case:ranking:hot";
Object cacheObject = cache.getCacheObject(redisNamePath); // Object cacheObject = cache.getCacheObject(redisNamePath);
caseRankingDtos= (List<CaseRankingDto>) cacheObject; // caseRankingDtos= (List<CaseRankingDto>) cacheObject;
if(cacheObject==null){ // if(cacheObject==null){
caseRankingDtos = casesService.queryPraises(pageSize); // caseRankingDtos = casesService.queryPraises(pageSize);
if(caseRankingDtos.size()==5){ // if(caseRankingDtos.size()==5){
cacheObject=caseRankingDtos; // cacheObject=caseRankingDtos;
cache.setCacheObject(redisNamePath,cacheObject,5,TimeUnit.MINUTES); // cache.setCacheObject(redisNamePath,cacheObject,5,TimeUnit.MINUTES);
//System.out.println("测试数据"); // //System.out.println("测试数据");
} // }
//
} // }
return success(caseRankingDtos); return success(caseRankingDtos);
} }
@@ -207,19 +207,19 @@ public class CasesApi extends ApiBaseController {
if(pageSize==null){ if(pageSize==null){
pageSize=5; pageSize=5;
} }
List<CaseRankingDto> caseRankingDtos=null; List<CaseRankingDto> caseRankingDtos=casesService.queryComment(pageSize);
IXaskCache cache = XaskCacheProvider.getCache(); // IXaskCache cache = XaskCacheProvider.getCache();
String redisNamePath="case:ranking:good"; // String redisNamePath="case:ranking:good";
Object cacheObject = cache.getCacheObject(redisNamePath); // Object cacheObject = cache.getCacheObject(redisNamePath);
caseRankingDtos= (List<CaseRankingDto>) cacheObject; // caseRankingDtos= (List<CaseRankingDto>) cacheObject;
if(cacheObject==null){ // if(cacheObject==null){
caseRankingDtos = casesService.queryComment(pageSize); // caseRankingDtos = casesService.queryComment(pageSize);
if(caseRankingDtos.size()==5){ // if(caseRankingDtos.size()==5){
cacheObject=caseRankingDtos; // cacheObject=caseRankingDtos;
cache.setCacheObject(redisNamePath,cacheObject,5,TimeUnit.MINUTES); // cache.setCacheObject(redisNamePath,cacheObject,5,TimeUnit.MINUTES);
//System.out.println("测试数据"); // //System.out.println("测试数据");
} // }
} // }
return success(caseRankingDtos); return success(caseRankingDtos);
} }

View File

@@ -143,14 +143,14 @@ public class AloneExamAnswer extends IdBaseEntity {
/** /**
* 推送时间 * 推送时间
*/ */
@JsonFormat(pattern = "yyyy--MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Column(name = "task_time") @Column(name = "task_time")
private LocalDateTime taskTime; private LocalDateTime taskTime;
/** /**
* 开始时间 * 开始时间
*/ */
@JsonFormat(pattern = "yyyy--MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Column(name = "start_time") @Column(name = "start_time")
private LocalDateTime startTime; private LocalDateTime startTime;