|
|
@@ -9,7 +9,9 @@ import com.ruoyi.common.core.domain.model.LoginUser;
|
|
|
import com.ruoyi.common.enums.AccessFromType;
|
|
|
import com.ruoyi.common.enums.ExamType;
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
+import com.ruoyi.dz.domain.DzCards;
|
|
|
import com.ruoyi.dz.domain.DzControl;
|
|
|
+import com.ruoyi.dz.service.IDzCardsService;
|
|
|
import com.ruoyi.dz.service.IDzControlService;
|
|
|
import com.ruoyi.framework.web.service.SysPermissionService;
|
|
|
import com.ruoyi.framework.web.service.TokenService;
|
|
|
@@ -18,6 +20,7 @@ import com.ruoyi.web.service.CommService;
|
|
|
import com.ruoyi.web.service.SysLoginService;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
+import io.swagger.annotations.ApiParam;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.commons.lang3.math.NumberUtils;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
@@ -38,14 +41,16 @@ public class UserController {
|
|
|
private final TokenService tokenService;
|
|
|
private final CommService commService;
|
|
|
private final ISysConfigService configService;
|
|
|
+ private final IDzCardsService dzCardsService;
|
|
|
|
|
|
- public UserController(IDzControlService dzControlService, SysLoginService loginService, SysPermissionService permissionService, TokenService tokenService, CommService commService, ISysConfigService configService) {
|
|
|
+ public UserController(IDzControlService dzControlService, SysLoginService loginService, SysPermissionService permissionService, TokenService tokenService, CommService commService, ISysConfigService configService, IDzCardsService dzCardsService) {
|
|
|
this.dzControlService = dzControlService;
|
|
|
this.loginService = loginService;
|
|
|
this.permissionService = permissionService;
|
|
|
this.tokenService = tokenService;
|
|
|
this.commService = commService;
|
|
|
this.configService = configService;
|
|
|
+ this.dzCardsService = dzCardsService;
|
|
|
}
|
|
|
|
|
|
@GetMapping(value = "provinces")
|
|
|
@@ -129,7 +134,7 @@ public class UserController {
|
|
|
/**
|
|
|
* 登录方法
|
|
|
*
|
|
|
- * @param loginBody 登录信息
|
|
|
+ * @param loginBody 登录信息i
|
|
|
* @return 结果
|
|
|
*/
|
|
|
@PostMapping("userLogin")
|
|
|
@@ -179,4 +184,15 @@ public class UserController {
|
|
|
}
|
|
|
return ajax;
|
|
|
}
|
|
|
+
|
|
|
+ @PostMapping("verifyCard")
|
|
|
+ @ApiOperation("校验卡")
|
|
|
+ public AjaxResult userLogin(@ApiParam("卡号") @RequestParam String cardNo, @ApiParam("密码") @RequestParam String password)
|
|
|
+ {
|
|
|
+ DzCards cards = dzCardsService.selectDzCardsByCardNo(cardNo);
|
|
|
+ if(null == cards || !cards.getPassword().equals(password)) {
|
|
|
+ return AjaxResult.error("卡号或密码不正确");
|
|
|
+ }
|
|
|
+ return AjaxResult.success(cards);
|
|
|
+ }
|
|
|
}
|