添加一体机身份证、手机号密码登录接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -3,8 +3,8 @@ package com.ruoyi.web.controller.system;
 import java.util.List;
 import java.util.Set;
 
-import com.ruoyi.common.annotation.BussinessLog;
 import com.ruoyi.common.core.domain.model.RegisterBody;
+import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -61,6 +61,11 @@ public class SysLoginController
         return ajax;
     }
 
+    /**
+     * 微信小程序登录
+     * @param loginBody
+     * @return
+     */
     @PostMapping("/app/appLogin")
     public AjaxResult appLogin(@RequestBody LoginBody loginBody)
     {
@@ -69,6 +74,44 @@ public class SysLoginController
         return ajax;
     }
 
+    /**
+     * 一体机身份证登录
+     * @param loginBody
+     * @return
+     */
+    @PostMapping("/app/idCardLogin")
+    public AjaxResult idCardLogin(@RequestBody LoginBody loginBody)
+    {
+        if(loginBody==null||StringUtils.isBlank(loginBody.getIdCard())){
+            return AjaxResult.error("请输入有效的身份证号!");
+        }
+        AjaxResult ajax = AjaxResult.success();
+        ajax=loginService.idCardLogin(loginBody);
+        return ajax;
+    }
+
+    /**
+     * 一体机手机号/密码登录
+     * @param loginBody
+     * @return
+     */
+    @PostMapping("/app/phoneLogin")
+    public AjaxResult phoneLogin(@RequestBody LoginBody loginBody)
+    {
+        if(loginBody == null){
+            return AjaxResult.error("登录参数不能为空!");
+        }
+        if(StringUtils.isBlank(loginBody.getUsername())){
+            return AjaxResult.error("用户名为空,请输入用户名!");
+        }
+        if(StringUtils.isBlank(loginBody.getPassword())){
+            return AjaxResult.error("密码为空,请输入密码!");
+        }
+        AjaxResult ajax = AjaxResult.success();
+        ajax=loginService.phoneLogin(loginBody);
+        return ajax;
+    }
+
     /**
      * 获取用户信息
      * 

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java

@@ -181,7 +181,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
     @Override
     public AppUser getPhone(String phone) {
         return appUserMapper.selectOne(new LambdaQueryWrapper<AppUser>()
-                .eq(AppUser::getPhone, phone).orderByDesc(AppUser::getUpdateTime).last("LIMIT 1"));
+                .eq(AppUser::getPhone, phone).eq(AppUser::getDelFlag,"0").orderByDesc(AppUser::getUpdateTime).last("LIMIT 1"));
     }
 
     @Override
@@ -243,7 +243,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
         SysUser sysUser=new SysUser();
         sysUser.setUserName(appUser.getPhone());
         sysUser.setNickName(StringUtils.isEmpty(appUser.getName())?appUser.getPhone():appUser.getName());
-        sysUser.setPassword(SecurityUtils.encryptPassword("123456"));
+        sysUser.setPassword(SiteSecurityUtils.encryptPassword("123456"));
         sysUser.setPhonenumber(appUser.getPhone());
         sysUser.setSex(appUser.getSex());
         sysUser.setStatus("0");
@@ -264,7 +264,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
 
     @Override
     public AppUser selectAppuserByIdcard(String idCard) {
-        return appUserMapper.selectOne(Wrappers.<AppUser>lambdaQuery().eq(AppUser::getIdCard, idCard).orderByDesc(AppUser::getUpdateTime).last("LIMIT 1"));
+        return appUserMapper.selectOne(Wrappers.<AppUser>lambdaQuery().eq(AppUser::getIdCard, idCard).eq(AppUser::getDelFlag,"0").orderByDesc(AppUser::getUpdateTime).last("LIMIT 1"));
     }
 
     @Override

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/tymh/nwToken/NwTokenResult.java

@@ -10,13 +10,13 @@ public class NwTokenResult {
     @ApiModelProperty("错误标识（1错误0正常）")
     private String errflag;
 
-    @ApiModelProperty("错误标识（1错误0正常）")
+    @ApiModelProperty("错误文本")
     private String errtext;
 
     @JsonProperty("Access-Token")
-    @ApiModelProperty("错误标识（1错误0正常）")
+    @ApiModelProperty("访问令牌")
     private String accessToken;
 
-    @ApiModelProperty("错误标识（1错误0正常）")
+    @ApiModelProperty("access_token接口调用凭证超")
     private Long expiresIn;
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java

@@ -39,6 +39,11 @@ public class LoginBody
      */
     private String userType;
 
+    /**
+     * 身份证
+     */
+    private String idCard;
+
     public String getUsername()
     {
         return username;
@@ -102,4 +107,12 @@ public class LoginBody
     public void setUserType(String userType) {
         this.userType = userType;
     }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
 }

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -312,4 +312,47 @@ public class SysLoginService
         AppUser appUser=appUserService.registerAppUser(registerBody);
         return loginUserIdApp(appUser);
     }
+
+    /**
+     * 手机号验证登录
+     * @return
+     */
+    public AjaxResult phoneLogin(LoginBody loginBody){
+        AppUser appUser=appUserService.getPhone(loginBody.getUsername());
+        if(appUser==null){
+            return AjaxResult.error("未查询到您的注册信息，请先完成注册后再登录～");
+        }
+        if(!SiteSecurityUtils.matchesPassword(loginBody.getPassword(),appUser.getYtjPassword())){
+            return AjaxResult.error("您输入的密码有误，请核对后重新尝试～!");
+        }
+        return getAjax(appUser);
+    }
+
+    /**
+     * 身份证号登录
+     * @param loginBody
+     * @return
+     */
+    public AjaxResult idCardLogin(LoginBody loginBody){
+        AppUser appUser=appUserService.selectAppuserByIdcard(loginBody.getIdCard());
+        if(appUser==null){
+            return AjaxResult.error("未查询到您的注册信息，请先完成注册后再登录～");
+        }
+        return getAjax(appUser);
+    }
+
+    /**
+     * 获取ajax
+     * @param appUser
+     * @return
+     */
+    public AjaxResult getAjax(AppUser appUser){
+        AjaxResult ajax = AjaxResult.success();
+        String token=loginUserIdApp(appUser);
+        ajax.put(Constants.TOKEN, token);
+        ajax.put("isNewUser", false);
+        ajax.put("idCard",appUser.getIdCard());
+        ajax.put("isCompanyUser",appUser.getIsCompanyUser());
+        return ajax;
+    }
 }