合并

src/main/java/com/huiju/estateagents/controller/TaPersonController.java

@@ -581,12 +581,12 @@ public class TaPersonController extends BaseController {
     
     /**
      * 微信添加人员添加城市
-     * @param location
+     * @param params
      * @param request
      * @return
      */
     @PutMapping("/wx/person/city")
-    public ResponseBean updatePersonCity(@RequestBody String location, HttpServletRequest request) {
+    public ResponseBean updatePersonCity(@RequestBody String params, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -594,9 +594,12 @@ public class TaPersonController extends BaseController {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        JSONObject jsonObject = JSONObject.parseObject(location);
+        JSONObject jsonObject = JSONObject.parseObject(params);
+        String lat = jsonObject.getString("lat");
+        String lon = jsonObject.getString("lon");
+        String location = lon+","+lat;
         RestTemplate restTemplate = new RestTemplate();
-        String result = restTemplate.getForObject("https://restapi.amap.com/v3/geocode/regeo?key="+ CommConstant.GD_KEY + "&location=" + jsonObject.getString("location") + "&output=json", String.class);
+        String result = restTemplate.getForObject("https://restapi.amap.com/v3/geocode/regeo?key="+ CommConstant.GD_KEY + "&location=" +location+ "&output=json", String.class);
         JSONObject resultJson = JSONObject.parseObject(result);
         if (!resultJson.getString("status").equals(CommConstant.STATUS_NORMAL)){
             String adcode =  resultJson.getJSONObject("regeocode").getJSONObject("addressComponent").getString("adcode");

src/main/java/com/huiju/estateagents/entity/SysButtonInMenu.java

@@ -49,8 +49,7 @@ public class SysButtonInMenu implements Serializable {
     private String code;
     
     private String remark;
-
-
+    
     @TableField(exist = false)
     private List<Integer> roles;
 }