Merge branch 'feature' into 'dev'

热点库-实时热点榜3

See merge request !327

src/main/java/com/zhiwei/brandkbs2/controller/app/AppHotController.java

@@ -99,11 +99,24 @@ public class AppHotController extends BaseController {
             jsonObjectResponseEntity = restTemplate.getForEntity(hotSearchUrl, JSONObject.class, pageSize, page, type, keyword, sort);
         }
         JSONObject result = jsonObjectResponseEntity.getBody();
-        if (Objects.nonNull(result)) {
-            return ResponseResult.success(result);
-        } else {
+        if (Objects.isNull(result)) {
             return ResponseResult.failure("响应超时");
         }
+        // 查询在榜数据
+        ResponseEntity<JSONObject> responseEntity = restTemplate.getForEntity(trendsListUrl, JSONObject.class, "realTime", type, null);
+        if (Objects.isNull(responseEntity.getBody())) {
+            return ResponseResult.success(result);
+        }
+        List<String> rankingIds = responseEntity.getBody().getJSONArray("data").stream().map(obj -> ((JSONObject) obj).getString("id")).collect(Collectors.toList());
+        List<JSONObject> list = result.getJSONArray("data").stream().map(obj -> {
+            JSONObject json = (JSONObject) obj;
+            if (rankingIds.contains(json.getString("id"))||json.getString("id").contains("测试")) {
+                json.put("inTheList", true);
+            }
+            return json;
+        }).collect(Collectors.toList());
+        result.put("data", list);
+        return ResponseResult.success(result);
     }
 
     @ApiOperation("热点库-品牌热点-关键词获取")
@@ -144,8 +157,7 @@ public class AppHotController extends BaseController {
     public ResponseResult getHotList(@RequestParam(value = "sortType", defaultValue = "realTime") String sortType,
                                      @RequestParam(value = "type", defaultValue = "weibo") String type,
                                      @RequestParam(value = "day", required = false) String day) {
-        ResponseEntity<JSONObject> jsonObjectResponseEntity;
-        jsonObjectResponseEntity = restTemplate.getForEntity(trendsListUrl, JSONObject.class, sortType, type, day);
+        ResponseEntity<JSONObject> jsonObjectResponseEntity = restTemplate.getForEntity(trendsListUrl, JSONObject.class, sortType, type, day);
         Object data = Objects.requireNonNull(jsonObjectResponseEntity.getBody()).get("data");
         if (Objects.nonNull(data)) {
             return ResponseResult.success(data);