|
@@ -88,15 +88,14 @@ public class ApiCropController extends BaseComponent {
|
|
|
return R.succ(cityLand);
|
|
|
}
|
|
|
|
|
|
- @RequestMapping("/data")
|
|
|
- public BaseResult data(@RequestBody String data) throws FactoryException, TransformException {
|
|
|
+ @RequestMapping("/list")
|
|
|
+ public BaseResult list(@RequestBody String data) throws FactoryException, TransformException {
|
|
|
CropVo vo = JSON.parseObject(data, CropVo.class);
|
|
|
List<CropLand> cityLandList = null;
|
|
|
cityLandList = cityLandService.findByExecutor(testId);
|
|
|
- List<CropImage> cropImages = cropImageService.findByCropIds(cityLandList.stream().map(CropLand::getId).collect(Collectors.toList()));
|
|
|
+ List<CropImage> cropImages = cropImageService.findSimpleByCropIds(cityLandList.stream().map(CropLand::getId).collect(Collectors.toList()));
|
|
|
setImages(cityLandList, cropImages);
|
|
|
cityLandList.stream().forEach(cityLand -> {
|
|
|
- cityLand.setGeojson(GeoCastUtil.gjson.toString(cityLand.getGeom()));
|
|
|
});
|
|
|
return R.succ(cityLandList);
|
|
|
}
|