From fcc10a5e34efae09c3c01b8e965b63657c6fdb15 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 02 七月 2024 10:57:53 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 272 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 175 insertions(+), 97 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
index 2d3f6df..d91d2f2 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
@@ -3,6 +3,7 @@
import com.alipay.api.AlipayApiException;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.constant.RedisConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
@@ -163,27 +164,8 @@
PayVO payVO = new PayVO();
payVO.setOrderId(tVipOrder.getId());
payVO.setId(id);
-
-
return R.ok(payVO);
-// switch (payType) {
-// case 1:
-// return payMoneyUtil.weixinpay
-// ("购买会员", "",
-// id + "_" + tVipOrder.getId() + "_" +
-// UUIDUtil.getRandomCode(8),
-// tVipOrder.getMoney().toString(),
-// "/base/wxPayBuyVip", "APP", "");
-// case 2:
-// return payMoneyUtil.alipay
-// ("购买会员",
-// "购买会员下单支付",
-// "",
-// id + "_" + tVipOrder.getId() + "_" +
-// UUIDUtil.getRandomCode(8),
-// tVipOrder.getMoney().toString(),
-// "/base/aliPayBuyVip");
-// }
+
}
@@ -191,7 +173,9 @@
@PostMapping("/aliPayBuyVip")
public void addVipPaymentAliCallback(HttpServletRequest request, HttpServletResponse response) {
try {
+ System.err.println("进入支付宝回调");
Map<String, String> map = payMoneyUtil.alipayCallback(request);
+ System.err.println("返回参数");
if (null != map) {
String out_trade_no = map.get("out_trade_no");
String trade_no = map.get("trade_no");
@@ -212,7 +196,6 @@
byId.setTransactionId(trade_no);
byId.setOutTradeNo(out_trade_no);
byId.setPayTime(new Date());
-
TUser byId1 = userService.getById(byId.getUserId());
if (byId1.getVipPayTime() == null) {
@@ -380,6 +363,18 @@
}
}
+ @PostMapping("/studyPage")
+ @ApiOperation(value = "学习端", tags = {"启动页"})
+ public R<String> studyPage() {
+ List<TPage> data = managementClient.getPage1().getData();
+ for (TPage datum : data) {
+ if (datum.getType() == 1) {
+ return R.ok(datum.getImg());
+ }
+ }
+ return R.ok();
+ }
+
@PostMapping("/parentPage")
@ApiOperation(value = "平板", tags = {"启动页"})
public R<String> parentPage() {
@@ -424,6 +419,7 @@
}
return R.ok(data);
}
+
@PostMapping("/useGuideGetInfo")
@ApiOperation(value = "查看详情", tags = {"家长端-使用指南"})
public R useGuideGetInfo(Integer id) {
@@ -432,7 +428,7 @@
useGuideQuery.setPageSize(300);
PageInfo<TUseGuide> data = managementClient.useGuide1(useGuideQuery).getData();
for (TUseGuide record : data.getRecords()) {
- if (record.getId() == id){
+ if (record.getId() == id) {
return R.ok(record.getAnswer());
}
}
@@ -491,10 +487,32 @@
loginUserParent.setName(tUser1.getName());
loginUserParent.setUserid(tUser1.getId());
loginUserParent.setPhone(tUser1.getPhone());
- loginUserParent.setLoginTime(new Date().getTime());
+ loginUserParent.setLoginTime(System.currentTimeMillis());
HashMap<String, Object> map = new HashMap<>();
- map.put("token", tokenService.createToken1(loginUserParent));
// 获取登录token
+ map.put("token", tokenService.createToken1(loginUserParent));
+ // 学习进度检查
+ TUserStudy userStudy = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, tUser1.getId())
+ .eq(TUserStudy::getDisabled, 0).one();
+ if (null == userStudy) {
+ TUserStudy study = new TUserStudy();
+ study.setUserId(tUser1.getId());
+ // 学习周目
+ TStudy tStudy = studyService.lambdaQuery().eq(TStudy::getQuarter, Constants.ONE)
+ .orderByAsc(TStudy::getWeek).last("limit 1").one();
+ study.setWeek(tStudy.getWeek());
+ study.setDay(Constants.ONE);
+ study.setTotalStudy(Constants.ZERO);
+ study.setTodayStudy(Constants.ZERO);
+ study.setWeekStudy(Constants.ZERO);
+ study.setMonthStudy(Constants.ZERO);
+ study.setListen(Constants.BURDEN_ONE);
+ study.setLook(Constants.BURDEN_ONE);
+ study.setInduction(Constants.BURDEN_ONE);
+ study.setAnswer(Constants.BURDEN_ONE);
+ study.setPair(Constants.BURDEN_ONE);
+ userStudyService.save(study);
+ }
return R.ok(map);
}
@@ -508,6 +526,21 @@
public R<Map<String, Object>> studyLogin(@RequestBody RegisterPhoneRequest phoneRequest) {
String phone = phoneRequest.getPhone();
String phoneCode = phoneRequest.getPhoneCode();
+ if (!"123456".equals(phoneCode)) {
+ // 验证码校验
+ Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
+ if (null == redisPhoneCode) {
+ return R.errorCode("登录失败，验证码无效!");
+ } else {
+ // redis 验证码的value 为 code:时间戳
+ String rCodeAndTime = String.valueOf(redisPhoneCode);
+ String rCode = rCodeAndTime.split(":")[0];
+ if (!rCode.equalsIgnoreCase(phoneCode)) {
+ return R.errorCode("登录失败，验证码无效!");
+ }
+ }
+ }
+ // 获取手机号所注册用户信息
TUser user = userService.getOne(new QueryWrapper<TUser>()
.ne("state", 3)
.eq("phone", phone));
@@ -516,26 +549,8 @@
return R.freeze("登录失败，您的账号已被冻结!");
}
} else {
- if (!phoneCode.equals("123456")) {
- // 手机验证码校验
- Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
- if (null == redisPhoneCode) {
- return R.errorCode("登录失败，验证码无效!");
- } else {
- // redis 验证码的value 为 code:时间戳
- String rCodeAndTime = String.valueOf(redisPhoneCode);
- String rCode = rCodeAndTime.split(":")[0];
- if (!rCode.equalsIgnoreCase(phoneCode)) {
- return R.errorCode("登录失败，验证码无效!");
- } else {
- user = getUser(phone);
- userService.save(user);
- }
- }
- } else {
- user = getUser(phone);
- userService.save(user);
- }
+ user = getUser(phone);
+ userService.save(user);
}
// 生成登录用户信息
LoginUserParent loginUserParent = new LoginUserParent();
@@ -544,8 +559,8 @@
loginUserParent.setPhone(user.getPhone());
loginUserParent.setLoginTime(System.currentTimeMillis());
HashMap<String, Object> map = new HashMap<>();
- map.put("token", tokenService.createTokenStudy(loginUserParent));
// 获取登录token
+ map.put("token", tokenService.createTokenStudy(loginUserParent));
return R.ok(map);
}
@@ -664,9 +679,62 @@
@GetMapping("/userInfo")
@ApiOperation(value = "用户详情", tags = {"学习端-用户详情"})
public R<UserPersonalCenterVO> userInfo() {
- TUser user = userService.lambdaQuery().eq(TUser::getId, tokenService.getLoginUserStudy().getUserid()).one();
+ LoginUserParent loginUserStudy = tokenService.getLoginUserStudy();
+ if (null == loginUserStudy) {
+ return R.tokenError("登录失效！");
+ }
+ TUser user = userService.lambdaQuery().eq(TUser::getId, loginUserStudy.getUserid()).one();
TUserStudy userStudy = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, user.getId()).eq(TUserStudy::getDisabled, 0).one();
+ if (null == userStudy) {
+ userStudy = createUserStudy(loginUserStudy.getUserid());
+ }
+ // 学习时长格式转换
+ Integer todayStudy = userStudy.getTodayStudy();
+ userStudy.setTodayStudy(Math.round((float) todayStudy / 3600));
+ Integer weekStudy = userStudy.getWeekStudy();
+ userStudy.setWeekStudy(Math.round((float) weekStudy / 3600));
+ Integer monthStudy = userStudy.getMonthStudy();
+ userStudy.setMonthStudy(Math.round((float) monthStudy / 3600));
+ // 总时长还需计算上游戏测试成绩时长
+ List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery()
+ .eq(TGameRecord::getUserId, loginUserStudy.getUserid())
+ .eq(TGameRecord::getDisabled, 0).list();
+ int sum = gameRecordList.stream().map(TGameRecord::getUseTime).mapToInt(Integer::intValue).sum();
+ Integer totalStudy = userStudy.getTotalStudy();
+ userStudy.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
return R.ok(new UserPersonalCenterVO(user, userStudy));
+ }
+
+ private TUserStudy createUserStudy(Integer userid) {
+ TUserStudy userStudy = new TUserStudy();
+ userStudy.setUserId(userid);
+ // 学习周目
+ TStudy tStudy = studyService.lambdaQuery().eq(TStudy::getQuarter, Constants.ONE)
+ .orderByAsc(TStudy::getWeek).last("limit 1").one();
+ userStudy.setWeek(tStudy.getWeek());
+ userStudy.setDay(Constants.ONE);
+ userStudy.setTotalStudy(Constants.ZERO);
+ userStudy.setTodayStudy(Constants.ZERO);
+ userStudy.setWeekStudy(Constants.ZERO);
+ userStudy.setMonthStudy(Constants.ZERO);
+ userStudy.setListen(Constants.BURDEN_ONE);
+ userStudy.setLook(Constants.BURDEN_ONE);
+ userStudy.setInduction(Constants.BURDEN_ONE);
+ userStudy.setAnswer(Constants.BURDEN_ONE);
+ userStudy.setPair(Constants.BURDEN_ONE);
+ userStudyService.save(userStudy);
+ return userStudy;
+ }
+
+ @GetMapping("/userInfoParent")
+ @ApiOperation(value = "用户详情", tags = {"家长端-用户详情"})
+ public R<TUser> userInfoParent() {
+ LoginUserParent loginUserStudy = tokenService.getLoginUser1();
+ if (null == loginUserStudy) {
+ return R.tokenError("登录失效！");
+ }
+ TUser byId = userService.getById(loginUserStudy.getUserid());
+ return R.ok(byId);
}
@PostMapping("/deleteUser")
@@ -736,16 +804,18 @@
byId.setPhone(phone);
}
// 手机验证码校验
- if (!phoneCode.equals("123456")) {
- Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
- if (null == redisPhoneCode) {
- return R.errorCode("手机验证码无效");
- } else {
- // redis 验证码的value 为 code:时间戳
- String rCodeAndTime = String.valueOf(redisPhoneCode);
- String rCode = rCodeAndTime.split(":")[0];
- if (!rCode.equalsIgnoreCase(phoneCode)) {
+ if (StringUtils.hasLength(phoneCode)) {
+ if (!phoneCode.equals("123456")) {
+ Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
+ if (null == redisPhoneCode) {
return R.errorCode("手机验证码无效");
+ } else {
+ // redis 验证码的value 为 code:时间戳
+ String rCodeAndTime = String.valueOf(redisPhoneCode);
+ String rCode = rCodeAndTime.split(":")[0];
+ if (!rCode.equalsIgnoreCase(phoneCode)) {
+ return R.errorCode("手机验证码无效");
+ }
}
}
}
@@ -899,9 +969,6 @@
public R<UserInfoVO> getUserInfo(@RequestBody UserInfoQuery dto) {
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd");
UserInfoVO res = new UserInfoVO();
- PageInfo<UserGameRecordVO> list = new PageInfo<>(dto.getPageNumber(), dto.getPageSize());
-
-
TUser byId = userService.getById(dto.getId());
String name = byId.getName();
String phone = byId.getPhone();
@@ -917,57 +984,68 @@
res.setIsVip(0);
}
}
- if (vipPayTime != null) {
+ if (vipEndTime!=null){
res.setVipPayTime(format.format(vipPayTime));
}
res.setState(byId.getState());
res.setName(name);
res.setPhone(phone);
- res.setInsertTime(format.format(insertTime));
+ if (insertTime!=null){
+ res.setInsertTime(format.format(insertTime));
+ }
res.setIntegral(byId.getIntegral());
+ // 学习记录
TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, dto.getId())
.eq(TUserStudy::getDisabled, 0).one();
- // 游戏测试成绩
+ // 查询剩余周目
+ if (studyRecord != null) {
+ int size = studyService.list(new QueryWrapper<TStudy>()
+ .eq("type", 1)).size();
+ studyRecord.setSurplus(size - studyRecord.getWeek());
+ } else {
+ TUserStudy tUserStudy = new TUserStudy();
+ tUserStudy.setSurplus(studyService.list(new QueryWrapper<TStudy>()
+ .eq("type", 1)).size());
+ tUserStudy.setWeek(1);
+ tUserStudy.setTodayStudy(Constants.ZERO);
+ tUserStudy.setTotalStudy(Constants.ZERO);
+ tUserStudy.setWeekStudy(Constants.ZERO);
+ tUserStudy.setMonthStudy(Constants.ZERO);
+ studyRecord = tUserStudy;
+ }
+ // 学习时长格式转换
+ Integer todayStudy = studyRecord.getTodayStudy();
+ studyRecord.setTodayStudy(Math.round((float) todayStudy / 3600));
+ Integer weekStudy = studyRecord.getWeekStudy();
+ studyRecord.setWeekStudy(Math.round((float) weekStudy / 3600));
+ Integer monthStudy = studyRecord.getMonthStudy();
+ studyRecord.setMonthStudy(Math.round((float) monthStudy / 3600));
+ // 总时长还需计算上游戏测试成绩时长
List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, dto.getId())
.eq(TGameRecord::getDisabled, 0).list();
- if (studyRecord != null) {
- res.setCurrent(studyRecord.getWeek());
- // 查询当前听的总周目
- List<TStudy> list1 = studyService.list(new QueryWrapper<>());
- res.setSurplus(list1.size() - studyRecord.getWeek());
- res.setTotalHours(studyRecord.getTotalStudy().doubleValue());
- res.setTodayHours(studyRecord.getTodayStudy().doubleValue());
- res.setWeekHours(studyRecord.getWeekStudy().doubleValue());
- res.setMonthHours(studyRecord.getMonthStudy().doubleValue());
- } else {
- res.setCurrent(0);
- res.setSurplus(0);
- res.setTotalHours(0.0);
- res.setTodayHours(0.0);
- res.setWeekHours(0.0);
- res.setMonthHours(0.0);
- }
-
- List<UserGameRecordVO> userGameRecordVOS = new ArrayList<>();
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm");
for (TGameRecord tGameRecord : gameRecordList) {
- UserGameRecordVO userGameRecordVO = new UserGameRecordVO();
- userGameRecordVO.setGameName(tGameRecord.getGameName());
- userGameRecordVO.setUseTime(tGameRecord.getUseTime().toString());
- if (tGameRecord.getGameDifficulty() == 0) {
- userGameRecordVO.setAccuracy("100%");
- } else {
- userGameRecordVO.setAccuracy(tGameRecord.getAccuracy() + "%");
- }
- if (tGameRecord.getGameDifficulty() == 0) {
- userGameRecordVO.setTime(tGameRecord.getUseTime());
- } else {
- userGameRecordVO.setTime(tGameRecord.getUseTime() / 2);
- }
- userGameRecordVOS.add(userGameRecordVO);
+ tGameRecord.setTime(simpleDateFormat.format(tGameRecord.getCreateTime()));
}
- list.setRecords(userGameRecordVOS);
- list.setTotal(userGameRecordVOS.size());
- res.setGameRecords(list);
+ int sum = gameRecordList.stream().map(TGameRecord::getUseTime).mapToInt(Integer::intValue).sum();
+ Integer totalStudy = studyRecord.getTotalStudy();
+ studyRecord.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
+ res.setCurrent(studyRecord.getWeek()+"");
+ // 剩余周目
+ List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0)
+ .eq(TStudy::getType, Constants.ONE)
+ .orderByAsc(TStudy::getWeek).list();
+ int size = studyService.residueWeek(studyRecord, studyList);
+ studyRecord.setSurplus(size);
+ res.setSurplus(studyRecord.getSurplus()+"");
+ res.setTotalHours(studyRecord.getTotalStudy().doubleValue());
+ res.setTodayHours(studyRecord.getTodayStudy().doubleValue());
+ res.setMonthHours(studyRecord.getMonthStudy().doubleValue());
+ res.setWeekHours(studyRecord.getWeekStudy().doubleValue());
+ PageInfo<TGameRecord> list1 = new PageInfo<>(dto.getPageNumber(), dto.getPageSize());
+ list1.setTotal(gameRecordList.size());
+ list1.setRecords(gameRecordList);
+ res.setGameRecords(list1);
return R.ok(res);
}
--
Gitblit v1.7.1