|
|
@@ -1,10 +1,7 @@
|
|
|
package com.sysu.admin.api.crop;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
-import com.sysu.admin.controller.aland.CropAreaStat;
|
|
|
-import com.sysu.admin.controller.aland.Land;
|
|
|
-import com.sysu.admin.controller.aland.LandAreaStat;
|
|
|
-import com.sysu.admin.controller.aland.LandService;
|
|
|
+import com.sysu.admin.controller.aland.*;
|
|
|
import com.sysu.admin.controller.crop.CropLand;
|
|
|
import com.sysu.admin.controller.crop.images.CropImage;
|
|
|
import com.sysu.admin.controller.crop.images.ImageType;
|
|
|
@@ -21,7 +18,10 @@ import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
+import java.util.Set;
|
|
|
|
|
|
@RequestMapping("/api/land")
|
|
|
@RestController("ApiLandController2")
|
|
|
@@ -45,6 +45,21 @@ public class ApiLandController extends BaseComponent {
|
|
|
return R.succ(landService.getStatSoil(commonVo.getDistrict(), commonVo.getCity(), commonVo.getStatType()));
|
|
|
}
|
|
|
|
|
|
+ @RequestMapping("/soil_cutline")
|
|
|
+ public BaseResult getSoilCutline(){
|
|
|
+ Set<String> stringSet = StatItemData.typeMap.keySet();
|
|
|
+ Map<String, Map> res= new HashMap<>();
|
|
|
+ stringSet.stream().forEach(s -> {
|
|
|
+ String[] names = StatItemData.get(s,"Names");
|
|
|
+ String[] colors = StatItemData.get(s,"Colors");
|
|
|
+ Map<String, String[]> item = new HashMap<>();
|
|
|
+ item.put("names", names);
|
|
|
+ item.put("colors", colors);
|
|
|
+ res.put(s, item);
|
|
|
+ });
|
|
|
+ return R.succ(res);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
@RequestMapping("/list")
|
|
|
public PaginationResult list(@RequestBody CommonVo commonVo){
|
