|
@@ -18,7 +18,8 @@ import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
|
|
|
-import static com.xy.utils.Beans.copy;
|
|
|
+import static com.xy.utils.PlusBeans.toIPage;
|
|
|
+import static com.xy.utils.PlusBeans.toPageBean;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
@@ -34,11 +35,11 @@ public class SysSystemUserServiceImpl extends ServiceImpl<SysSystemUserMapper, S
|
|
|
|
|
|
@Override
|
|
|
@ApiOperation("登录")
|
|
|
- public R<String> login(SysSystemUserDto sysSystemUserDto) {
|
|
|
+ public R<String> login(SysSystemUserDto.Login login) {
|
|
|
//校验账密
|
|
|
SysSystemUser sysSystemUser = getOne(new LambdaQueryWrapper<SysSystemUser>()
|
|
|
- .eq(SysSystemUser::getAccount, sysSystemUserDto.getAccount())
|
|
|
- .eq(SysSystemUser::getPassword, SecureUtil.md5(sysSystemUserDto.getPassword()))
|
|
|
+ .eq(SysSystemUser::getAccount, login.getAccount())
|
|
|
+ .eq(SysSystemUser::getPassword, SecureUtil.md5(login.getPassword()))
|
|
|
);
|
|
|
if (sysSystemUser == null) {
|
|
|
return R.fail("账号或密码错误");
|
|
@@ -49,26 +50,27 @@ public class SysSystemUserServiceImpl extends ServiceImpl<SysSystemUserMapper, S
|
|
|
//生成token
|
|
|
StpUtil.login(sysSystemUser.getId());
|
|
|
//更新登录信息
|
|
|
- SysSystemUserDto.UpdateDto updateDto = new SysSystemUserDto.UpdateDto()
|
|
|
+ SysSystemUserDto.Update update = new SysSystemUserDto.Update()
|
|
|
.setIsLogin(true);
|
|
|
- updateDto.setId(sysSystemUser.getId());
|
|
|
- update(updateDto);
|
|
|
+ update.setId(sysSystemUser.getId());
|
|
|
+ update(update);
|
|
|
return R.ok(StpUtil.getTokenValue());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@ApiOperation("注册")
|
|
|
- public R<Boolean> register(SysSystemUserDto sysSystemUserDto) {
|
|
|
+ public R<Boolean> register(SysSystemUserDto.Login login) {
|
|
|
//校验重复
|
|
|
long count = count(new LambdaQueryWrapper<SysSystemUser>()
|
|
|
- .eq(SysSystemUser::getAccount, sysSystemUserDto.getAccount())
|
|
|
+ .eq(SysSystemUser::getAccount, login.getAccount())
|
|
|
);
|
|
|
if (count > 0) {
|
|
|
return R.fail("账号已存在");
|
|
|
}
|
|
|
//注册
|
|
|
- SysSystemUser sysSystemUser = copy(SysSystemUser.class, sysSystemUserDto)
|
|
|
- .setPassword(SecureUtil.md5(sysSystemUserDto.getPassword()))
|
|
|
+ SysSystemUser sysSystemUser = new SysSystemUser()
|
|
|
+ .setAccount(login.getAccount())
|
|
|
+ .setPassword(SecureUtil.md5(login.getPassword()))
|
|
|
.create(null);
|
|
|
save(sysSystemUser);
|
|
|
return R.ok();
|
|
@@ -76,34 +78,32 @@ public class SysSystemUserServiceImpl extends ServiceImpl<SysSystemUserMapper, S
|
|
|
|
|
|
@PostMapping("page")
|
|
|
@ApiOperation("分页查询")
|
|
|
- public R<IPage<SysSystemUserDto.Vo>> page(@RequestBody SysSystemUserDto sysSystemUserDto) {
|
|
|
- LambdaQueryWrapper<SysSystemUser> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(sysSystemUserDto, SysSystemUser.class)
|
|
|
- .ge(SysSystemUser::getCreateTime, sysSystemUserDto.getBeginCreateTime().atTime(0, 0, 0))
|
|
|
- .le(SysSystemUser::getCreateTime, sysSystemUserDto.getEndCreateTime().atTime(23, 59, 59))
|
|
|
- .build()
|
|
|
- .select(SysSystemUser.class, info -> !info.getColumn().equals(LambdaUtils.getProperty(SysSystemUser::getPassword)));
|
|
|
- IPage<SysSystemUser> page = page(sysSystemUserDto.getPage(), lambdaQueryWrapper);
|
|
|
- IPage<SysSystemUserDto.Vo> result = PlusBeans.copy(SysSystemUserDto.Vo.class, page);
|
|
|
- return R.ok(result);
|
|
|
+ public R<PageBean<SysSystemUserDto.Vo>> page(@RequestBody SysSystemUserDto.Select select) {
|
|
|
+ LambdaQueryWrapper<SysSystemUser> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(select, SysSystemUser.class)
|
|
|
+ .ge(SysSystemUser::getCreateTime, select.getBeginCreateTime().atTime(0, 0, 0))
|
|
|
+ .le(SysSystemUser::getCreateTime, select.getEndCreateTime().atTime(23, 59, 59))
|
|
|
+ .build();
|
|
|
+ IPage<SysSystemUser> page = page(toIPage(select.getPage()), lambdaQueryWrapper);
|
|
|
+ return R.ok(toPageBean(SysSystemUserDto.Vo.class, page));
|
|
|
}
|
|
|
|
|
|
@PostMapping("update")
|
|
|
@ApiOperation("修改")
|
|
|
- public R<Boolean> update(@RequestBody SysSystemUserDto.UpdateDto updateDto) {
|
|
|
+ public R<Boolean> update(@RequestBody SysSystemUserDto.Update update) {
|
|
|
SysSystemUser sysSystemUser = new SysSystemUser()
|
|
|
- .setId(updateDto.getId())
|
|
|
- .setStatus(Emptys.check(updateDto.getStatus()) ? updateDto.getStatus() : null)
|
|
|
- .setPassword(Emptys.check(updateDto.getIsAgainPwd()) && updateDto.getIsAgainPwd() ? "88888888" : null)
|
|
|
- .setPassword(Emptys.check(updateDto.getPassword()) ? SecureUtil.md5(updateDto.getPassword()) : null);
|
|
|
+ .setId(update.getId())
|
|
|
+ .setStatus(Emptys.check(update.getStatus()) ? update.getStatus() : null)
|
|
|
+ .setPassword(Emptys.check(update.getIsAgainPwd()) && update.getIsAgainPwd() ? "88888888" : null)
|
|
|
+ .setPassword(Emptys.check(update.getPassword()) ? SecureUtil.md5(update.getPassword()) : null);
|
|
|
//如果是登录则更新登录时间和次数
|
|
|
- if (Emptys.check(updateDto.getIsLogin()) && updateDto.getIsLogin()) {
|
|
|
- sysSystemUser.setLastLoginTime(LocalDateTime.now()).setLoginNum(getById(updateDto.getId()).getLoginNum() + 1);
|
|
|
+ if (Emptys.check(update.getIsLogin()) && update.getIsLogin()) {
|
|
|
+ sysSystemUser.setLastLoginTime(LocalDateTime.now()).setLoginNum(getById(update.getId()).getLoginNum() + 1);
|
|
|
} else {
|
|
|
sysSystemUser.update(Long.parseLong(SaTokenUtils.getId().toString()));
|
|
|
}
|
|
|
updateById(sysSystemUser);
|
|
|
//如果封禁账号则踢下线
|
|
|
- if (Emptys.check(updateDto.getStatus()) && !updateDto.getStatus()) {
|
|
|
+ if (Emptys.check(update.getStatus()) && !update.getStatus()) {
|
|
|
StpUtil.logout(SaTokenUtils.getId());
|
|
|
}
|
|
|
return R.ok();
|