接口123

admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysUserController.java

@@ -58,14 +58,12 @@ public class SysUserController {
             accessToken.setCreated(new Date());
             accessToken.setType(user.getUserType());
             accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId()));
-
             accessToken.setCode(result.getCode());
             accessToken.setMessage(result.getMessage());
-
             accessToken.setUserId(user.getId());
             accessToken.setPhone(user.getPhone());
-
             accessToken.setLoginIp(remoteHost);
+            accessToken.setUser(user);
         }
         if (result.getCode() == 10004) {
             accessToken.setAccountName("游客");
@@ -74,8 +72,6 @@ public class SysUserController {
             accessToken.setLoginIp("");
             accessToken.setCode(result.getCode());
             accessToken.setMessage(result.getMessage());
-
-
             accessToken.setLoginIp(remoteHost);
         }
         if (result.getCode() == 10001) {

admin/src/main/java/com/huimv/farm/damsubsidy/entity/AccessToken.java

@@ -18,6 +18,15 @@ public class AccessToken {
     private String userName;
     private Long userId;
     private String phone;
+    private SysUser user;
+
+    public SysUser getUser() {
+        return user;
+    }
+
+    public void setUser(SysUser user) {
+        this.user = user;
+    }
 
     public Long getUserId() {
         return userId;
@@ -112,7 +121,7 @@ public class AccessToken {
         this.message = message;
     }
 
-    public AccessToken(String token, String loginIp, Date created, String accountName, Integer code, Integer type, String message) {
+    public AccessToken(String token, String loginIp, Date created, String accountName, Integer code, Integer type, String message,SysUser user) {
         this.token = token;
         this.loginIp = loginIp;
         this.created = created;
@@ -120,5 +129,6 @@ public class AccessToken {
         this.code = code;
         this.type = type;
         this.message = message;
+        this.user = user;
     }
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/SysUserServiceImpl.java

@@ -154,12 +154,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         user.setIdCardBackUrl(paramsMap.get("idCordBackUrl"));
         user.setCreateTime(new Date());
 //        user.setCreateUser(paramsMap.get("userName"));
-        if (ObjectUtil.isNotEmpty(paramsMap.get("address"))) {
-            user.setAddress(paramsMap.get("address"));
+        if (ObjectUtil.isNotEmpty(paramsMap.get("detailedAdressCode"))) {
+            user.setDetailedAdressCode(paramsMap.get("detailedAdressCode"));
+        }
+        if (Integer.parseInt(paramsMap.get("type")) == 1) {
+            user.setVeterId(Integer.parseInt(paramsMap.get("veterId")));
         }
-//        if (Integer.parseInt(paramsMap.get("type")) == 1) {
-//            user.setVeterId(Integer.parseInt(paramsMap.get("veterId")));
-//        }
         if (Integer.parseInt(paramsMap.get("type")) == 3) {
             QueryWrapper<PovertyUserRegist> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("XM", paramsMap.get("userName")).eq("ZJHM", paramsMap.get("idCord"));
@@ -171,6 +171,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             } else {
                 user.setFarmType(0);
             }
+            user.setDetailedAdress(paramsMap.get("address"));
         }
         if (Integer.parseInt(paramsMap.get("type")) == 2 ||Integer.parseInt(paramsMap.get("type")) == 3) {
             user.setAccoutType(1);