Merge branch 'dev-meta' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/service/MetaParamsConfigService.java

@@ -9,6 +9,9 @@ import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+
 @Service
 @AllArgsConstructor
 public class MetaParamsConfigService {
@@ -21,11 +24,18 @@ public class MetaParamsConfigService {
 
     public boolean getBoolean(String name) {
         String str = metaParamsConfigRepo.findByName(name).map(MetaParamsConfig::getValue)
-                .orElseThrow(new BusinessException("配置不存在"));
+                                         .orElseThrow(new BusinessException("配置不存在"));
         return str.equals("1");
     }
 
     public String getString(String name) {
         return metaParamsConfigRepo.findByName(name).map(MetaParamsConfig::getValue).orElse(null);
     }
+
+    public LocalTime getTime(String name) {
+        String str = metaParamsConfigRepo.findByName(name).map(MetaParamsConfig::getValue)
+                                         .orElseThrow(new BusinessException("配置不存在"));
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("HH:mm");
+        return LocalTime.from(dateTimeFormatter.parse(str));
+    }
 }

src/main/java/com/izouma/nineth/service/MetaRankService.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.izouma.nineth.config.MetaConstants;
 import com.izouma.nineth.domain.MetaRank;
 import com.izouma.nineth.dto.MetaRankDTO;
+import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.dto.PageWrapper;
 import com.izouma.nineth.exception.BusinessException;
@@ -44,13 +45,19 @@ public class MetaRankService {
         throw new BusinessException("非法排行榜id");
     }
 
+    public MetaRestResult<List<MetaRankDTO>> metaQuery() {
+        List<Map<String, String>> rank = metaUserGoldRecordService.rank();
+        if (CollectionUtils.isEmpty(rank)) {
+            return MetaRestResult.returnSuccess(new ArrayList<>());
+        }
+        return MetaRestResult.returnSuccess(convertMapToJavaList(rank));
+    }
+
     private Page<MetaRankDTO> buildPage(PageQuery pageQuery, List<Map<String, String>> rank) {
         if (CollectionUtils.isEmpty(rank)) {
             return null;
         }
-        JSONArray jsonArray = new JSONArray();
-        jsonArray.addAll(rank);
-        List<MetaRankDTO> metaRankDTOS = jsonArray.toJavaList(MetaRankDTO.class);
+        List<MetaRankDTO> metaRankDTOS = convertMapToJavaList(rank);
         int page = pageQuery.getPage();
         int size = pageQuery.getSize();
         int start = page * size;
@@ -70,4 +77,10 @@ public class MetaRankService {
         return new PageWrapper<>(newMetaRankDTOS, page,
                 size, totalElements).toPage();
     }
+
+    private List<MetaRankDTO> convertMapToJavaList(List<Map<String, String>> map) {
+        JSONArray jsonArray = new JSONArray();
+        jsonArray.addAll(map);
+        return jsonArray.toJavaList(MetaRankDTO.class);
+    }
 }

src/main/java/com/izouma/nineth/web/MetaRankController.java

@@ -2,6 +2,7 @@ package com.izouma.nineth.web;
 
 import com.izouma.nineth.domain.MetaRank;
 import com.izouma.nineth.dto.MetaRankDTO;
+import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.MetaRankRepo;
@@ -43,6 +44,11 @@ public class MetaRankController extends BaseController {
         return metaRankService.rank(pageQuery);
     }
 
+    @GetMapping("/metaQuery")
+    public MetaRestResult<List<MetaRankDTO>> metaQuery() {
+        return metaRankService.metaQuery();
+    }
+
     @GetMapping("/excel/rank")
     @ResponseBody
     public void excelTop(HttpServletResponse response, PageQuery pageQuery) throws IOException {