|
@@ -185,17 +185,23 @@ public class TJsController extends BaseController {
|
|
if (nearbyTechnicians != null) {
|
|
if (nearbyTechnicians != null) {
|
|
Map<String, BigDecimal> collect = nearbyTechnicians.stream().collect(Collectors.toMap(TJs::getcPhone, TJs::getDistance));
|
|
Map<String, BigDecimal> collect = nearbyTechnicians.stream().collect(Collectors.toMap(TJs::getcPhone, TJs::getDistance));
|
|
js.setIds(nearbyTechnicians.stream().map(TJs::getcPhone).collect(Collectors.toList()));
|
|
js.setIds(nearbyTechnicians.stream().map(TJs::getcPhone).collect(Collectors.toList()));
|
|
|
|
+ log.info("缓存技师===========>:{}", JSONUtil.toJsonStr(nearbyTechnicians.stream().map(TJs::getcPhone).collect(Collectors.toList())));
|
|
int size = (int) page.getSize();
|
|
int size = (int) page.getSize();
|
|
int pageNum = (int) page.getCurrent();
|
|
int pageNum = (int) page.getCurrent();
|
|
- page.setSize(nearbyTechnicians.size());
|
|
|
|
|
|
+ page.setSize(100);
|
|
page.setCurrent(1);
|
|
page.setCurrent(1);
|
|
Page<TJs> all = jsService.getAll(page, js);
|
|
Page<TJs> all = jsService.getAll(page, js);
|
|
|
|
+ log.info("总条数============>:{},当前页:{}", all.getRecords().size(), pageNum);
|
|
all.getRecords().forEach(item -> {
|
|
all.getRecords().forEach(item -> {
|
|
item.setDistance(collect.get(item.getcPhone()).setScale(2, RoundingMode.DOWN));
|
|
item.setDistance(collect.get(item.getcPhone()).setScale(2, RoundingMode.DOWN));
|
|
});
|
|
});
|
|
- List<TJs> objects = (List<TJs>) ListUtils.subList(all.getRecords(), size, pageNum);
|
|
|
|
|
|
+ List<TJs> sortJs = all.getRecords().stream().sorted(Comparator.comparing(TJs::getDistance)).collect(Collectors.toList());
|
|
|
|
+
|
|
|
|
+ List<TJs> objects = (List<TJs>) ListUtils.subList(sortJs, size, pageNum);
|
|
page.setRecords(objects);
|
|
page.setRecords(objects);
|
|
page.setSize(size);
|
|
page.setSize(size);
|
|
|
|
+ page.setCurrent(pageNum);
|
|
|
|
+ //log.info("page============>:{}", JSONUtil.toJsonStr(page));
|
|
return R.ok(page);
|
|
return R.ok(page);
|
|
}
|
|
}
|
|
}
|
|
}
|