Merge branch 'dev' of http://61.169.120.202:8888/youxiw20000/trash into dev

youxiw2000
2 parents b5846a74 e7af6460
Showing 2 changed files with 71 additions and 3 deletions
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
trash-unit/src/main/java/com/trash/dropPointInfo/controller/DropPointInfoController.java
@@ -99,6 +99,8 @@ public class RemoteServerUtils {
 	public static String GETAUTH = "/api/gpsservice/cs/authority";
+	public static String AREAS = "/api/gisservice/v2/jurisdictions/areas?dict=1";
+
 	public static JSONArray getUnitetransport(String id) {
 		JSONArray list = null;
 		try {
@@ -1301,8 +1303,29 @@ public class RemoteServerUtils {
 		return get(GETAUTH, null, token.replace("Bearer ", ""));
 	}
-	
-	
-	
+
+	public static String getAreasList(){
+		if (okHttpClient == null) {
+			okHttpClient = getOkClient();
+		}
+
+		String token = SecurityUtils.getLoginUser().getToken();
+
+
+		if (token.contains("durable:")) {
+			token = "Bearer " + token;
+		} else {
+			token = "Bearer auth:token:" + token;
+		}
+		Request request = new Request.Builder().url(remote + AREAS).addHeader("Authorization", token).get().build();
+		try {
+			okhttp3.Response response = okHttpClient.newCall(request).execute();
+			String result = response.body().string();
+			return result;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
 }
 package com.trash.dropPointInfo.controller;
 import java.util.List;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.trash.common.utils.RemoteServerUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -54,6 +58,47 @@ public class DropPointInfoController extends BaseController
     public AjaxResult export(DropPointInfo dropPointInfo)
     {
         List<DropPointInfo> list = dropPointInfoService.selectDropPointInfoList(dropPointInfo);
+        JSONArray jsonArray = new JSONArray();
+        try{
+            jsonArray =  JSONArray.parseArray(RemoteServerUtils.getAreasList());
+        }catch(NullPointerException exception){
+            return AjaxResult.error("获取区县信息失败");
+        }
+
+        JSONArray cs = new JSONArray();
+        for(Object jsonObject : jsonArray){
+            JSONObject jsonObject1 = (JSONObject) jsonObject;
+            if(jsonObject1.getString("code").equals("430100")){
+                cs = jsonObject1.getJSONArray("items");
+                break;
+            }
+        }
+        for(DropPointInfo dropPointInfo1 : list){
+            for(Object jsonObject : cs){
+                JSONObject jsonObject1 = (JSONObject) jsonObject;
+                if(dropPointInfo1.getDistrict().equals(jsonObject1.getString("code"))){
+                    dropPointInfo1.setDistrict(jsonObject1.getString("name"));
+                }
+                if(jsonObject1.getJSONArray("items")!=null) {
+                    for(Object jsonObject2 : jsonObject1.getJSONArray("items")){
+                        JSONObject jsonObject3 = (JSONObject) jsonObject2;
+                        if(dropPointInfo1.getStreet().equals(jsonObject3.getString("code"))){
+                            dropPointInfo1.setStreet(jsonObject3.getString("name"));
+                        }
+                        if(jsonObject3.getJSONArray("items")!=null){
+                            for(Object jsonObject4 : jsonObject3.getJSONArray("items")){
+                                JSONObject jsonObject5 = (JSONObject) jsonObject4;
+                                if(dropPointInfo1.getCommunity().equals(jsonObject5.getString("code"))){
+                                    dropPointInfo1.setCommunity(jsonObject5.getString("name"));
+                                }
+                            }
+                        }
+                    }
+                }
+
+            }
+        }
+        System.out.println(cs);
         ExcelUtil<DropPointInfo> util = new ExcelUtil<DropPointInfo>(DropPointInfo.class);
         return util.exportExcel(list, "投放点信息管理");
     }