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

[CMLR-010] 补齐 User/Pk 侧 DTO 模型

Browse Source
This commit is contained in:
ziin
2026-02-08 20:12:46 +08:00
parent a7479b280d
commit a319c96972
19 changed files with 202 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,15 @@ import vvpkassistant.Data.ResponseInfo;
import vvpkassistant.Data.WxChatParam;
import vvpkassistant.User.mapper.UserDao;
import vvpkassistant.User.model.DTO.ScanInfoDTO;
import vvpkassistant.User.model.DTO.UserCancelPinDTO;
import vvpkassistant.User.model.DTO.UserHandlePkInfoDTO;
import vvpkassistant.User.model.DTO.UserInputUserInfoDTO;
import vvpkassistant.User.model.DTO.UserLoginWithPhoneNumberDTO;
import vvpkassistant.User.model.DTO.UserModelDTO;
import vvpkassistant.User.model.DTO.UserPinToTopDTO;
import vvpkassistant.User.model.DTO.UserPkRecordDetailDTO;
import vvpkassistant.User.model.DTO.UserPointsDetailDTO;
import vvpkassistant.User.model.DTO.UserQueryMyAllPkDataDTO;
import vvpkassistant.User.model.UserModel;
import vvpkassistant.User.model.UserModelVO;
import vvpkassistant.User.service.UserService;
@@ -62,18 +70,18 @@ public class UserController {
// 配置用户信息
@PostMapping("inputUserInfo")
public ResponseData<Object> inputUserInfo(@RequestBody Map<String,Object> param) {
public ResponseData<Object> inputUserInfo(@RequestBody UserInputUserInfoDTO param) {
if (!param.containsKey("code")) {
if (param == null || param.getCode() == null) {
throw new BusinessException(ErrorCode.PARAMS_ERROR,"code不能为空");
}
if (!param.containsKey("id")) {
if (param.getId() == null) {
throw new BusinessException(ErrorCode.PARAMS_ERROR,"id不能为空");
}
//获取前端传递过来的code
String code = param.get("code").toString();
String code = param.getCode();
// 调用微信获取openid接口
Map<String, Object> wx_result = vvRequester.loginApp(code);
@@ -105,11 +113,10 @@ public class UserController {
//查询用户
String openId = wx_result.get("openid").toString();
String sessionKey = wx_result.get("session_key").toString();
// 创建一个临时model
UserModel tempModel = new UserModel();
tempModel.setId(Integer.valueOf(param.get("id").toString()));
tempModel.setId(param.getId());
tempModel.setUserChatId(openId);
int i = userDao.updateById(tempModel);
if (i == 1) {
@@ -133,13 +140,13 @@ public class UserController {
// 手机号登录 / 注册
@PostMapping("loginWithPhoneNumber")
public ResponseData<Object> loginWithPhoneNumber(@RequestBody Map<String,Object> param) {
public ResponseData<Object> loginWithPhoneNumber(@RequestBody UserLoginWithPhoneNumberDTO param) {
if (!param.containsKey("code")) {
if (param == null || param.getCode() == null) {
throw new BusinessException(ErrorCode.PARAMS_ERROR,"code不能为空");
}
String code = param.get("code").toString();
String code = param.getCode();
String phoneNumber = vvRequester.queryPhoneNumber(code);
if (phoneNumber.isEmpty()) {
throw new BusinessException(ErrorCode.PARAMS_ERROR,"手机号码无法查询");
@@ -165,8 +172,8 @@ public class UserController {
userDao.insert(tempModel);
// 判断用户是否为邀请用户
if (param.containsKey("inviterId")) {
int inviterId = (int) param.get("inviterId");
if (param.getInviterId() != null) {
int inviterId = param.getInviterId();
// 查询用户增加积分
UserModel oldUser = userDao.selectById(inviterId);
oldUser.setPoints(oldUser.getPoints() + 10);
@@ -211,10 +218,10 @@ public class UserController {
// 查询用户所有pk数据
@PostMapping("queryMyAllPkData")
public ResponseData<Object> queryMyAllPkData(@RequestBody Map<String,Integer> map) {
Integer userId = map.get("userId");
Integer page = map.get("page");
Integer size = map.get("size");
public ResponseData<Object> queryMyAllPkData(@RequestBody UserQueryMyAllPkDataDTO request) {
Integer userId = request.getUserId();
Integer page = request.getPage();
Integer size = request.getSize();
List<PkInfoModel> pkInfoModels = pkInfoDao.queryAllPkData(userId, page * size, size);
long currentTimeStamp = VVTools.currentTimeStamp();
// 查找置顶的数据
@@ -226,11 +233,11 @@ public class UserController {
// 查询我的pk记录 列表
@PostMapping("handlePkInfo")
public ResponseData<Object> handlePkInfo(@RequestBody Map<String,Integer> map) {
Integer type = map.get("type");
Integer id = map.get("userId");
Integer page = map.get("page");
Integer size = map.get("size");
public ResponseData<Object> handlePkInfo(@RequestBody UserHandlePkInfoDTO request) {
Integer type = request.getType();
Integer id = request.getUserId();
Integer page = request.getPage();
Integer size = request.getSize();
// 我发起的pk数据
if (type == 1) {
@@ -245,8 +252,8 @@ public class UserController {
// 查詢单条pk记录详情
@PostMapping("pkRecordDetail")
public ResponseData<Object> pkRecordDetail(@RequestBody Map<String,Integer> map) {
Integer id = map.get("id");
public ResponseData<Object> pkRecordDetail(@RequestBody UserPkRecordDetailDTO request) {
Integer id = request.getId();
List<PkRecordDetail> pkRecordDetails = detailDao.queryDetail(id);
return ResponseData.success(pkRecordDetails);
}
@@ -289,13 +296,13 @@ public class UserController {
// 置顶文章
@PostMapping("pinToTop")
public ResponseData<Object> pinToTop(@RequestBody Map<String,Integer> map) {
public ResponseData<Object> pinToTop(@RequestBody UserPinToTopDTO request) {
// 文章id
Integer articleId = map.get("articleId");
Integer articleId = request.getArticleId();
PkInfoModel pkInfoModel = pkInfoDao.selectById(articleId);
Integer userId = pkInfoModel.getSenderId();
// 到期时间戳
Integer pinExpireTime = map.get("pinExpireTime");
Integer pinExpireTime = request.getPinExpireTime();
long currentTimeStamp = VVTools.currentTimeStamp();
long hour = VVTools.calculateHoursRound(pinExpireTime, currentTimeStamp);
@@ -335,8 +342,8 @@ public class UserController {
// 取消置顶
@PostMapping("cancelPin")
public ResponseData<Object> cancelPin(@RequestBody Map<String,Integer> map) {
Integer articleId = map.get("articleId");
public ResponseData<Object> cancelPin(@RequestBody UserCancelPinDTO request) {
Integer articleId = request.getArticleId();
PkInfoModel pkInfoModel = pkInfoDao.selectById(articleId);
Integer pinExpireTime = pkInfoModel.getPinExpireTime();
long hour = VVTools.calculateHoursFloor(pinExpireTime, VVTools.currentTimeStamp());
@@ -371,10 +378,10 @@ public class UserController {
// 获取积分明细
@PostMapping("pointsDetail")
public ResponseData<Object> pointsDetail(@RequestBody Map<String,Integer> map) {
Integer userId = map.get("userId");
Integer page = map.get("page");
Integer size = map.get("size");
public ResponseData<Object> pointsDetail(@RequestBody UserPointsDetailDTO request) {
Integer userId = request.getUserId();
Integer page = request.getPage();
Integer size = request.getSize();
List<CoinRecords> coinRecords = coinRecordsDao.fetchMyPointsData(userId, page * size, size);
return ResponseData.success(coinRecords);
}