用户新增修改 提交

service/zdry/src/main/java/com/founder/zdry/controller/UsersController.java

@@ -97,6 +97,7 @@ public class UsersController {
                                             @RequestBody UsersAndDevice usersAndDevice) {
         // 调用开关接口
         String result = serverZdryApi.updateDevice(usersAndDevice.getDevice());
+
         if(result.equals("success")){
             boolean flag = usersService.save(usersAndDevice.getUsers());
             if(flag){
@@ -107,7 +108,7 @@ public class UsersController {
 
             }
         }else{
-            return  MapRestResult.build(ResultCode.ERROR,"保存用户开关信息失败","1");
+            return  MapRestResult.build(ResultCode.ERROR,"保存用户开关信息失败",result);
         }
     }
 
@@ -127,7 +128,7 @@ public class UsersController {
 
             }
         }else{
-            return  MapRestResult.build(ResultCode.ERROR,"修改用户信息失败","1");
+            return  MapRestResult.build(ResultCode.ERROR,"修改用户信息失败",result);
         }
     }
 

serviceapi/zdryapi/src/main/java/com/founder/zdryapi/service/impl/ZdryApiServiceImpl.java

@@ -124,15 +124,24 @@ public class ZdryApiServiceImpl implements ZdryApiService {
             JSONObject result = JSONObject.parseObject(resultString);
 
                 // 查看是否登录
-                if (result.containsKey("error_code")) {
+                if (result.getString("error_code").equals("101")) {
                     if(getToken().equals("success")){
-                        updateDevice(deviceParam);
+                        String resultStringAll = restTemplate.postForEntity(zdryUrl+updateSbxxUrl+deviceParam.getSbImei()+"/4g/edit/", params, String.class).getBody();
+                        JSONObject resultAll = JSONObject.parseObject(resultStringAll);
+                        if (resultAll.getString("error_code").equals("1")) {
+                            return  "无效设备!";
+                        }else if(resultAll.getString("success").equals("true")){
+                            return "success";
+                        }
                     }else{
-                        return "error";
+                        return "登录错误!";
                     };
-                }
-                if (result.containsKey("success")) {
-                    return "success";
+                }else{
+                    if (result.getString("error_code").equals("1")) {
+                        return  "无效设备!";
+                    }else if(result.getString("success").equals("true")){
+                        return "success";
+                    }
                 }
         }catch (Exception e){
             e.printStackTrace();