zw/pkAssistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改 DTO字段

Browse Source
This commit is contained in:
Ziin
2025-08-07 22:01:19 +08:00
parent 5caa4b6580
commit a2172c691b
6 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/vvpkassistant/User/model/DTO/LoginInfoDTO.java
View File

@@ -25,5 +25,5 @@ public class LoginInfoDTO {
*/ */
private String status; private String status;
private Integer userId; private Integer id;
} }

2
src/main/java/vvpkassistant/User/model/DTO/ScanInfoDTO.java
View File

@@ -9,5 +9,5 @@ import lombok.Data;
@Data @Data
public class ScanInfoDTO { public class ScanInfoDTO {
private String uuid; private String uuid;
private Integer userId; private Integer id;
} }

3
src/main/java/vvpkassistant/User/service/UserService.java
View File

@@ -1,6 +1,7 @@
package vvpkassistant.User.service; package vvpkassistant.User.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import vvpkassistant.User.model.DTO.LoginInfoDTO;
import vvpkassistant.User.model.DTO.ScanInfoDTO; import vvpkassistant.User.model.DTO.ScanInfoDTO;
import vvpkassistant.User.model.DTO.UserModelDTO; import vvpkassistant.User.model.DTO.UserModelDTO;
import vvpkassistant.User.model.UserModel; import vvpkassistant.User.model.UserModel;
@@ -27,7 +28,7 @@ public interface UserService extends IService<UserModel> {
Object checkQrcode(String uuid); Object checkQrcode(String uuid);
void scanQrcode(ScanInfoDTO scanInfoDTO); LoginInfoDTO scanQrcode(ScanInfoDTO scanInfoDTO);
void confirm(ScanInfoDTO scanInfoDTO); void confirm(ScanInfoDTO scanInfoDTO);

10
src/main/java/vvpkassistant/User/service/UserServiceImpl.java
View File

@@ -230,7 +230,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserModel> implements
return loginInfoDTO; return loginInfoDTO;
} }
if (LoginStatusEnum.CONFIRMED.name().equals(loginInfoDTO.getStatus())) { if (LoginStatusEnum.CONFIRMED.name().equals(loginInfoDTO.getStatus())) {
UserModel userModel = userDao.selectById(loginInfoDTO.getUserId()); UserModel userModel = userDao.selectById(loginInfoDTO.getId());
StpUtil.login(userModel.getId()); StpUtil.login(userModel.getId());
UserModelVO userModelVO = BeanUtil.copyProperties(userModel, UserModelVO.class); UserModelVO userModelVO = BeanUtil.copyProperties(userModel, UserModelVO.class);
userModelVO.setToken(StpUtil.getTokenValue()); userModelVO.setToken(StpUtil.getTokenValue());
@@ -241,16 +241,14 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserModel> implements
} }
@Override @Override
public void scanQrcode(ScanInfoDTO scanInfoDTO) { public LoginInfoDTO scanQrcode(ScanInfoDTO scanInfoDTO) {
LoginInfoDTO loginInfoDTO = qrcodeCache.getIfPresent(scanInfoDTO.getUuid()); LoginInfoDTO loginInfoDTO = qrcodeCache.getIfPresent(scanInfoDTO.getUuid());
if (loginInfoDTO != null) { if (loginInfoDTO != null) {
loginInfoDTO.setStatus(LoginStatusEnum.SCANNED.name()); loginInfoDTO.setStatus(LoginStatusEnum.SCANNED.name());
}
if (loginInfoDTO != null) {
qrcodeCache.put(scanInfoDTO.getUuid(),loginInfoDTO); qrcodeCache.put(scanInfoDTO.getUuid(),loginInfoDTO);
} }
log.info("-------扫码成功uuid:{}-------", scanInfoDTO.getUuid()); log.info("-------扫码成功uuid:{}-------", scanInfoDTO.getUuid());
return loginInfoDTO;
} }
@Override @Override
@@ -258,7 +256,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserModel> implements
LoginInfoDTO loginInfoDTO = qrcodeCache.getIfPresent(scanInfoDTO.getUuid()); LoginInfoDTO loginInfoDTO = qrcodeCache.getIfPresent(scanInfoDTO.getUuid());
if (loginInfoDTO != null) { if (loginInfoDTO != null) {
loginInfoDTO.setStatus(LoginStatusEnum.CONFIRMED.name()); loginInfoDTO.setStatus(LoginStatusEnum.CONFIRMED.name());
loginInfoDTO.setUserId(scanInfoDTO.getUserId()); loginInfoDTO.setId(scanInfoDTO.getId());
qrcodeCache.put(scanInfoDTO.getUuid(),loginInfoDTO); qrcodeCache.put(scanInfoDTO.getUuid(),loginInfoDTO);
} }
log.info("-------确认登录成功uuid:{}-------", scanInfoDTO.getUuid()); log.info("-------确认登录成功uuid:{}-------", scanInfoDTO.getUuid());

3
src/main/java/vvpkassistant/controller/UserController.java
View File

@@ -427,8 +427,7 @@ public class UserController {
@PostMapping("/scan") @PostMapping("/scan")
public ResponseData<?> scanQrCode(@RequestBody ScanInfoDTO scanInfoDTO) { public ResponseData<?> scanQrCode(@RequestBody ScanInfoDTO scanInfoDTO) {
userService.scanQrcode(scanInfoDTO); return ResponseData.success( userService.scanQrcode(scanInfoDTO));
return ResponseData.success("");
} }
@PostMapping("/confirm") @PostMapping("/confirm")

1
src/main/java/vvpkassistant/mail/service/MailServiceImpl.java
View File

@@ -6,7 +6,6 @@ import cn.hutool.extra.mail.MailUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.Caffeine;
import com.ibm.j9ddr.tools.ddrinteractive.IFieldFormatter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;