用户登录查询接口修改

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/BackUserAccountService.java

 package com.mmc.iuav.user.service;
 
 import com.mmc.iuav.response.ResultBody;
-import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
+import com.mmc.iuav.user.entity.BackUserAccountDO;
 import com.mmc.iuav.user.model.qo.BUserAccountQO;
 import com.mmc.iuav.user.model.vo.BUserAccountVO;
 import com.mmc.iuav.user.model.vo.BackUserAccountVO;
-import com.mmc.iuav.user.model.vo.UserAccountVO;
 
 import java.util.List;
 
@@ -63,4 +62,12 @@ public interface BackUserAccountService {
      * @return
      */
     ResultBody feignAuthUserPwd(Integer id, String authPwd);
+
+    /**
+     * 登录账号密码查询用户信息
+     * @param accountNo
+     * @param passWord
+     * @return
+     */
+    BackUserAccountDO getUserLoginInfo(String accountNo, String passWord);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/AuthServiceImpl.java

@@ -12,6 +12,7 @@ import com.mmc.iuav.user.auth.PwdUtil;
 import com.mmc.iuav.user.client.PayClient;
 import com.mmc.iuav.user.constant.WxConstant;
 import com.mmc.iuav.user.dao.CompanyAuthDao;
+import com.mmc.iuav.user.entity.BackUserAccountDO;
 import com.mmc.iuav.user.entity.CompanyAuthDO;
 import com.mmc.iuav.user.entity.UserAccountDO;
 import com.mmc.iuav.user.enums.UserAccountStatus;
@@ -21,6 +22,7 @@ import com.mmc.iuav.user.model.vo.AppUserSucVO;
 import com.mmc.iuav.user.model.vo.UserAccountVO;
 import com.mmc.iuav.user.model.vo.WxLoginVO;
 import com.mmc.iuav.user.service.AuthService;
+import com.mmc.iuav.user.service.BackUserAccountService;
 import com.mmc.iuav.user.service.UserAccountService;
 import com.mmc.iuav.user.service.WxService;
 import lombok.extern.slf4j.Slf4j;
@@ -50,6 +52,9 @@ public class AuthServiceImpl implements AuthService {
     private UserAccountService userAccountService;
 
     @Autowired
+    private BackUserAccountService backUserAccountService;
+
+    @Autowired
     private StringRedisTemplate stringRedisTemplate;
 
     @Autowired
@@ -139,7 +144,7 @@ public class AuthServiceImpl implements AuthService {
     @Override
     public ResultBody backEndLogin(LoginUserQO param) {
         //查询用户信息
-        UserAccountDO user = userAccountService.getUserLoginInfo(param.getAccountNo(), param.getPassWord());
+        BackUserAccountDO user = backUserAccountService.getUserLoginInfo(param.getAccountNo(), param.getPassWord());
         if (user == null) {
             return ResultBody.error(ResultEnum.LOGIN_ACCOUNT_NOT_EXIT_ERROR);
         }
@@ -161,13 +166,13 @@ public class AuthServiceImpl implements AuthService {
         //map.put(JwtConstant.ROLE_ID, 0);
         map.put(JwtConstant.TOKEN_TYPE, JwtConstant.M_TOKEN);
         String token = JwtUtil.createJwt(map);
-        LoginSuccessDTO loginSuccessDTO = LoginSuccessDTO.builder().token(token).userAccountId(user.getId()).accountNo(user.getAccountNo()).uid(user.getUid())
-                .userName(user.getUserName()).nickName(user.getNickName()).phoneNum(user.getPhoneNum()).portType(user.getPortType()).build();
+        LoginSuccessDTO loginSuccessDTO = LoginSuccessDTO.builder().token(token).userAccountId(user.getId()).accountNo(user.getAccountNo()).uid(user.getId() +"")
+                .userName(user.getUserName()).nickName(user.getUserName()).phoneNum(user.getPhoneNum()).portType(0).build();
         stringRedisTemplate.opsForValue().set(
                 token, JSONObject.toJSONString(loginSuccessDTO),
                 JwtConstant.EXPIRATION, TimeUnit.MILLISECONDS);
-
-        return ResultBody.success(LoginSuccessDTO.builder().token(token).userAccountId(user.getId()).accountNo(user.getAccountNo()).build());
+        loginSuccessDTO.setToken(token);
+        return ResultBody.success(loginSuccessDTO);
     }
 
     @Override

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/BackUserAccountServiceImpl.java

@@ -124,4 +124,10 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
         }
         return ResultBody.success();
     }
+
+    @Override
+    public BackUserAccountDO getUserLoginInfo(String accountNo, String passWord) {
+        BackUserAccountDO userLoginInfo = backUserAccountDao.getUserLoginInfo(accountNo, passWord);
+        return userLoginInfo;
+    }
 }