guomengjiao месяцев назад: 5
Родитель
Сommit
d53d1e2aba

+ 1 - 1
renren-admin/src/main/java/io/renren/modules/qmgj/api/ApiController.java

@@ -794,7 +794,7 @@ public class ApiController {
 
     @PostMapping("/hotCityList")
     public R hotCityList(@RequestBody Map<String, Object> params) {
-        return R.ok().put("page", serviceCityService.queryPage(params));
+        return serviceCityService.hotCityList(params);
     }
 
     @GetMapping("/region/urbanDistrictList")

+ 3 - 0
renren-admin/src/main/java/io/renren/modules/qyh/service/ServiceCityService.java

@@ -2,6 +2,7 @@ package io.renren.modules.qyh.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import io.renren.common.utils.PageUtils;
+import io.renren.common.utils.R;
 import io.renren.modules.qyh.entity.ServiceCityEntity;
 
 import java.util.Map;
@@ -16,5 +17,7 @@ public interface ServiceCityService extends IService<ServiceCityEntity> {
     void saveEntity(ServiceCityEntity serviceCityEntity);
 
     void updateEntityById(ServiceCityEntity serviceCityEntity);
+
+    R hotCityList(Map<String, Object> params);
 }
 

+ 25 - 0
renren-admin/src/main/java/io/renren/modules/qyh/service/impl/ServiceCityServiceImpl.java

@@ -1,18 +1,23 @@
 package io.renren.modules.qyh.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.renren.common.utils.PageUtils;
 import io.renren.common.utils.Query;
+import io.renren.common.utils.R;
 import io.renren.modules.qyh.entity.ServiceCityEntity;
 import io.renren.modules.qyh.mapper.ServiceCityMapper;
 import io.renren.modules.qyh.service.ServiceCityService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
 @Service("serviceCityService")
@@ -37,4 +42,24 @@ public class ServiceCityServiceImpl extends ServiceImpl<ServiceCityMapper, Servi
     public void updateEntityById(ServiceCityEntity serviceCityEntity) {
         this.updateById(serviceCityEntity);
     }
+
+    @Override
+    public R hotCityList(Map<String, Object> params) {
+        JSONArray jsonArray = new JSONArray();
+        List<ServiceCityEntity> list = this.list();
+        //按首字母分组
+        Map<String, List<ServiceCityEntity>> map = list.stream().collect(Collectors.groupingBy(ServiceCityEntity::getLetter));
+        //分组后按首字母排序
+        map.entrySet().stream().sorted(Map.Entry.comparingByKey());
+        for (Map.Entry<String, List<ServiceCityEntity>> entry : map.entrySet()) {
+            Map<String, Object> map1 = new HashMap<>();
+            map1.put("letter", entry.getKey());
+            map1.put("city", entry.getValue());
+            jsonArray.add(map1);
+        }
+        //查热门 按排序排
+        List<ServiceCityEntity> hot = list.stream().filter(item -> item.getIsHot().equals("1"))
+                .sorted((o1, o2) -> o1.getSort() - o2.getSort()).collect(Collectors.toList());
+        return R.ok().put("hot",hot).put("city",jsonArray);
+    }
 }