添加牧场排名

huimv-cattle/src/main/java/com/huimv/cattle/controller/FarmStockRankController.java

@@ -98,8 +98,8 @@ public class FarmStockRankController {
             } else {
                 //status=2,显示镇汇总（养殖云）数据
                 System.out.println("status=2,显示镇汇总（养殖云）数据");
-                JSONArray farmCodes =  getFarmCodeByAdcode(farmCode);
-                if (ObjectUtil.isEmpty(farmCodes) || farmCodes.size() ==0){
+                String farmCodes =  getFarmCodeByAdcode(farmCode);
+                if (StringUtils.isBlank(farmCodes) ){
                     return new Result(ResultCode.SUCCESS,new ArrayList<>());
                 }
                 return getStockRankByDivision(farmCodes);
@@ -107,15 +107,15 @@ public class FarmStockRankController {
         }
     }
 
-    private Result getStockRankByDivision(JSONArray farmCodes) {
+    private Result getStockRankByDivision(String farmCodes) {
         System.out.println("1");
         HttpHeaders httpHeaders = new HttpHeaders();
         MediaType type = MediaType.parseMediaType("application/json;charset=UTF-8");
         httpHeaders.setContentType(type);
-        HashMap<String, JSONArray> map = new HashMap<>();
+        HashMap<String, String> map = new HashMap<>();
         //这里提交的是区县编码或乡镇编码
         map.put("farmCodes", farmCodes);
-        HttpEntity<Map<String, JSONArray>> objectHttpEntity = new HttpEntity<>(map, httpHeaders);
+        HttpEntity<Map<String, String>> objectHttpEntity = new HttpEntity<>(map, httpHeaders);
         //读取真实数据
         String remoteUrl = "http://123.60.134.84:10001/breed/api/v1.0.0/cattle/getStockRankByDivision";
         ResponseEntity<String> entity = restTemplate.postForEntity(remoteUrl, objectHttpEntity, String.class);
@@ -131,7 +131,7 @@ public class FarmStockRankController {
         }
     }
 
-    private JSONArray getFarmCodeByAdcode(String farmCode) {
+    private String getFarmCodeByAdcode(String farmCode) {
         String adcode  = "620826";
         if (!"0".equals(farmCode)){
             SysFarm list = farmService.getOne(new QueryWrapper<SysFarm>().eq("farm_code", farmCode));
@@ -144,9 +144,9 @@ public class FarmStockRankController {
         Map map = new HashMap();
         map.put("adcode",adcode);
         ResponseEntity<String> stringResponseEntity = restTemplate.postForEntity(remoteUrl, map, String.class);
-        JSONArray jsonObject = JSON.parseArray(stringResponseEntity.getBody());
-        System.out.println(jsonObject);
-        return jsonObject;
+//        JSONArray jsonObject = JSON.parseArray(stringResponseEntity.getBody());
+//        System.out.println(jsonObject);
+        return stringResponseEntity.getBody();
     }
 }