diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java index ac83180de..093ddbf23 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java @@ -92,6 +92,18 @@ public class LoginController { return Result.success(resultMap); } + @OperLog(operModul = "用户登录", operType = "用户id登录", operDesc = "用户id登录") + @ApiOperation(value = "用户id登录", notes = "用户id登录", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "userId", required = true, value = "用户id", paramType = "body"), + @ApiImplicitParam(name = "projectSn", required = false, value = "新用户账号类型需要传此参数", paramType = "body"), + }) + @PostMapping(value = "/userId/login") + public Result> userIdLogin(@RequestBody Map map) { + Map resultMap = systemUserService.userIdLogin(map); + return Result.success(resultMap); + } + @OperLog(operModul = "人员/设备登录", operType = "人员/设备登录", operDesc = "人员/设备登录") @ApiOperation(value = "人员/设备登录", notes = "人员/设备登录", httpMethod = "POST") @ApiImplicitParams({ diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java index ad17fdf48..05602ba52 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java @@ -78,6 +78,13 @@ public interface ISystemUserService extends IService { Map md5Login(Map map); + /** + * 用户id登录 + * @param map + * @return + */ + Map userIdLogin(Map map); + void xzUpdatePw(SystemUser systemUser); List getTenantListBySn(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index 0c5477b27..8d723e8d1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -1541,6 +1541,21 @@ public class SystemUserServiceImpl extends ServiceImpl userIdLogin(Map map) { + try { + SystemUser systemUser = systemUserMapper.selectById(MapUtils.getString(map, "userId")); + if (systemUser == null || systemUser.getUserId() == null) { + throw new OpenAlertException("账号不存在"); + } + authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(systemUser.getAccount(), systemUser.getShowPassword())); + return doLogin(map, systemUser); + } catch (AuthenticationException e) { + log.error("error:", e); + throw new CustomException("Invalid username/password supplied", HttpStatus.UNPROCESSABLE_ENTITY); + } + } + @Override public void xzUpdatePw(SystemUser systemUser) { Integer isCheckCode = systemUser.getIsCheckCode();