From 9f32c0580bdfc1c4f2b9bcf3553a99f23e7e47b4 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Mon, 6 Jan 2025 18:40:56 +0800 Subject: [PATCH 01/14] =?UTF-8?q?sharding=20key=20=E6=8A=A5=E9=94=99=20Cas?= =?UTF-8?q?hOut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/pay/service/impl/CashOutServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java index b1e93966..4fe61ffb 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java @@ -693,7 +693,9 @@ public class CashOutServiceImpl extends ServiceImpl impleme if (isAgree == 0 && StrUtil.isBlank(cashOut.getRefund())) { throw new SqxException("请输入拒绝原因！"); } - CashOut entity = baseMapper.selectOne(new LambdaQueryWrapper().eq(CashOut::getUserId, cashOut.getUserId()).eq(CashOut::getId, cashOut.getId())); + CashOut entity = baseMapper.selectOne(new LambdaQueryWrapper() + .eq(CashOut::getUserId, Long.parseLong(cashOut.getUserId().toString())) + .eq(CashOut::getId, cashOut.getId())); if (entity == null) { throw new SqxException("提现申请不存在！"); } From 67fe5872334f751d8a57d133b835a6b46bb84cf7 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Jan 2025 15:58:51 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=89=A7=E9=9B=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/course/service/impl/CourseCollectServiceImpl.java | 3 +++ .../modules/course/service/impl/CourseDetailsServiceImpl.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java index 749d1665..017178eb 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java @@ -148,6 +148,9 @@ public class CourseCollectServiceImpl extends ServiceImpl courseDetailIds = new HashSet<>(); courses.forEach(s -> { + if (s==null) { + return; + } courseIdList.add(s.getCourseId()); courseDetailIds.add(s.getCourseDetailsId()); }); diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java index 4ad75762..b99edaad 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java @@ -163,6 +163,10 @@ public class CourseDetailsServiceImpl extends ServiceImpl Date: Tue, 7 Jan 2025 16:29:48 +0800 Subject: [PATCH 03/14] =?UTF-8?q?group=20by=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/course/CourseCollectDao.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/mapper/course/CourseCollectDao.xml b/src/main/resources/mapper/course/CourseCollectDao.xml index d4fcaac1..6c57db52 100644 --- a/src/main/resources/mapper/course/CourseCollectDao.xml +++ b/src/main/resources/mapper/course/CourseCollectDao.xml @@ -49,7 +49,6 @@ FROM `course_collect` c1 WHERE c1.classify = 3 AND c1.user_id = #{userId} - group by c1.course_id order by c1.create_time desc From bbde7e53f58b524f34c9a7dfb959ecfdd67075f3 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Jan 2025 16:36:53 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/course/service/impl/CourseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java index 30224325..f10785cb 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java @@ -226,7 +226,7 @@ public class CourseServiceImpl extends ServiceImpl implements map.put("dyEpisodeId", ""); map.put("wxCourseDetailsId", ""); map.putAll(countMap); - map.put("courseId", courseId + ""); + map.put("courseId", map.get("courseId").toString()); } PageUtils pageUtils = PageUtils.page(pageInfo); // setCache(cacheKey, JSONUtil.toJsonStr(pageUtils)); From b29d195664da8c67796e3517304eeeb0bd297239 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Jan 2025 16:38:39 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=9B=86=E6=95=B0=20?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../course/service/impl/CourseCollectServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java index e007b811..0aabb1d9 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java @@ -165,15 +165,15 @@ public class CourseCollectServiceImpl extends ServiceImpl courseDetails1 = courseIdList.isEmpty() ? new ArrayList<>() : courseDetailsService.list(new LambdaQueryWrapper().in(CourseDetails::getCourseDetailsId, courseDetailIds)); Map courseDetailsMap = courseDetails1.stream().collect(Collectors.toMap(CourseDetails::getCourseId, item -> item)); - List courseDetails2 = courseIdList.isEmpty() ? new ArrayList<>() : courseDetailsDao.countByCourseId(courseIdList); - Map countMap = courseDetails2.stream() - .collect(Collectors.toMap(CourseDetails::getCourseId, CourseDetails::getCourseDetailsCount)); +// List courseDetails2 = courseIdList.isEmpty() ? new ArrayList<>() : courseDetailsDao.countByCourseId(courseIdList); +// Map countMap = courseDetails2.stream() +// .collect(Collectors.toMap(CourseDetails::getCourseId, CourseDetails::getCourseDetailsCount)); if (CollectionUtil.isNotEmpty(courseList)) { for (Course course : courseList) { // course.setCourseClassification(courseClassificationDao.selectById(course.getClassifyId())); CourseDetails courseDetails = courseDetailsMap.getOrDefault(course.getCourseId(), null); - course.setCourseDetailsCount(countMap.getOrDefault(course.getCourseId(), 0)); + course.setCourseDetailsCount(courseDetailsDao.countCourseByCourseId(course.getCourseId())); if (courseDetails != null) { course.setCourseDetailsName(courseDetails.getCourseDetailsName()); course.setCourseDetailsId(courseDetails.getCourseDetailsId()); From 0eaa579b9850ec072caf1cea6d886f9c03ef5729 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Jan 2025 16:47:55 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/modules/app/entity/UserInfo.java | 4 ++++ .../sqx/modules/course/service/impl/CourseServiceImpl.java | 1 + 2 files changed, 5 insertions(+) diff --git a/src/main/java/com/sqx/modules/app/entity/UserInfo.java b/src/main/java/com/sqx/modules/app/entity/UserInfo.java index 89b13406..e6a56f51 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserInfo.java +++ b/src/main/java/com/sqx/modules/app/entity/UserInfo.java @@ -1,6 +1,8 @@ package com.sqx.modules.app.entity; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.io.Serializable; @@ -17,12 +19,14 @@ public class UserInfo implements Serializable { * */ @TableId(type = IdType.ID_WORKER) + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** * 用户id */ @TableField(updateStrategy = FieldStrategy.NEVER) + @JsonSerialize(using = ToStringSerializer.class) private Long userId; /** diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java index f10785cb..8c1e639c 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java @@ -203,6 +203,7 @@ public class CourseServiceImpl extends ServiceImpl implements m.put("courseDetailsName", ""); m.put("dyEpisodeId", ""); m.put("wxCourseDetailsId", ""); + m.put("courseId", m.get("courseId").toString()); } PageUtils pageUtils = PageUtils.page(pageInfo); setCache(cacheKey, JSONUtil.toJsonStr(pageUtils)); From 36157f10857d6f957b6479d6e1266005fb0d5ff1 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Jan 2025 16:54:39 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=89=A7=E9=9B=86=20Io?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CourseDetailsServiceImpl.java | 152 +++++++++--------- 1 file changed, 79 insertions(+), 73 deletions(-) diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java index b99edaad..eb256ae2 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java @@ -154,85 +154,91 @@ public class CourseDetailsServiceImpl extends ServiceImpl() - .eq("course_id", courseId).eq("user_id", userId) - .eq("classify", 3).last("limit 1")); - //是否追剧 - Integer collect = courseCollectDao.selectCount(new QueryWrapper() - .eq("user_id", userId).eq("course_id", courseId) - .eq("classify", 1).last("limit 1")); - Course bean = courseDao.selectById(courseId); - if(bean==null){ - log.error("未找到该剧集 用户id:{} 剧集:{}",userId,courseId); - return Result.error("未找到该剧集"); - } - //查询用户是否购买了整集 - CourseUser courseUser = courseUserDao.selectCourseUser(courseId, userId); - // 每天购买超过上限，获得免费时间段资格 - boolean freeWatch = checkFreeWatchPayCount(userId); - int startSort = 0; - int endSort = 5; - if (sort == null) { - if (courseCollect != null) { - CourseDetails courseDetails = baseMapper.selectOne(new QueryWrapper() - .eq("course_details_id", courseCollect.getCourseDetailsId()).eq("course_id", courseCollect.getCourseId()).last("limit 1")); - sort = courseDetails.getSort(); + try{ + //观看记录 + CourseCollect courseCollect = courseCollectDao.selectOne(new QueryWrapper() + .eq("course_id", courseId).eq("user_id", userId) + .eq("classify", 3).last("limit 1")); + //是否追剧 + Integer collect = courseCollectDao.selectCount(new QueryWrapper() + .eq("user_id", userId).eq("course_id", courseId) + .eq("classify", 1).last("limit 1")); + Course bean = courseDao.selectById(courseId); + if(bean==null){ + log.error("未找到该剧集 用户id:{} 剧集:{}",userId,courseId); + return Result.error("未找到该剧集"); } - } - List courseDetailsSetVos; - if (freeWatch || courseUser != null) { - courseDetailsSetVos = baseMapper.courseSets(courseId, 2, null); - } else { - courseDetailsSetVos = baseMapper.courseSets(courseId, 1, bean.getWholesalePrice()); - } - if (sort != null && sort > 2) { - startSort = sort - 3; - endSort = sort + 3; - if (courseDetailsSetVos.size() < endSort) { - startSort = courseDetailsSetVos.size() - 5; - endSort = courseDetailsSetVos.size() + 1; + //查询用户是否购买了整集 + CourseUser courseUser = courseUserDao.selectCourseUser(courseId, userId); + // 每天购买超过上限，获得免费时间段资格 + boolean freeWatch = checkFreeWatchPayCount(userId); + int startSort = 0; + int endSort = 5; + if (sort == null) { + if (courseCollect != null) { + CourseDetails courseDetails = baseMapper.selectOne(new QueryWrapper() + .eq("course_details_id", courseCollect.getCourseDetailsId()).eq("course_id", courseCollect.getCourseId()).last("limit 1")); + sort = courseDetails.getSort(); + } } - } - //已购买剧集 - Set detailsId = new HashSet<>(); - if ((!freeWatch)) { - detailsId = courseUserDao.selectUserCourseDetailsId(courseId, userId); - } - AtomicReference current = new AtomicReference<>(new CourseDetailsSetVo()); - Set finalDetailsId = detailsId; - int finalStartSort = startSort; - int finalEndSort = endSort; - courseDetailsSetVos.parallelStream().forEach(s -> { - //当前 - if (courseCollect != null && s.getCourseDetailsId().equals(courseCollect.getCourseDetailsId())) { - s.setCurrent(1); - current.set(s); + List courseDetailsSetVos; + if (freeWatch || courseUser != null) { + courseDetailsSetVos = baseMapper.courseSets(courseId, 2, null); + } else { + courseDetailsSetVos = baseMapper.courseSets(courseId, 1, bean.getWholesalePrice()); } - // 不免费 3集以后 (已买的不为空 并不在已买的包含) - if (!freeWatch && s.getSort() > 3 && (CollectionUtil.isEmpty(finalDetailsId) || !finalDetailsId.contains(s.getCourseDetailsId()))) { - s.setVideoUrl(null); + if (sort != null && sort > 2) { + startSort = sort - 3; + endSort = sort + 3; + if (courseDetailsSetVos.size() < endSort) { + startSort = courseDetailsSetVos.size() - 5; + endSort = courseDetailsSetVos.size() + 1; + } } - if (s.getSort() > finalStartSort && s.getSort() < finalEndSort) { - CourseCollect isGood = courseCollectDao.selectOne(new QueryWrapper() - .eq("user_id", userId).eq("course_details_id", s.getCourseDetailsId()).eq("classify", 2).last("limit 1")); - s.setIsGood(isGood == null ? 0 : 1); + //已购买剧集 + Set detailsId = new HashSet<>(); + if ((!freeWatch)) { + detailsId = courseUserDao.selectUserCourseDetailsId(courseId, userId); } - }); - if (courseCollect == null) { - courseDetailsSetVos.get(0).setCurrent(1); - current.set(courseDetailsSetVos.get(0)); + AtomicReference current = new AtomicReference<>(new CourseDetailsSetVo()); + Set finalDetailsId = detailsId; + int finalStartSort = startSort; + int finalEndSort = endSort; + courseDetailsSetVos.parallelStream().forEach(s -> { + //当前 + if (courseCollect != null && s.getCourseDetailsId().equals(courseCollect.getCourseDetailsId())) { + s.setCurrent(1); + current.set(s); + } + // 不免费 3集以后 (已买的不为空 并不在已买的包含) + if (!freeWatch && s.getSort() > 3 && (CollectionUtil.isEmpty(finalDetailsId) || !finalDetailsId.contains(s.getCourseDetailsId()))) { + s.setVideoUrl(null); + } + if (s.getSort() > finalStartSort && s.getSort() < finalEndSort) { + CourseCollect isGood = courseCollectDao.selectOne(new QueryWrapper() + .eq("user_id", userId).eq("course_details_id", s.getCourseDetailsId()).eq("classify", 2).last("limit 1")); + s.setIsGood(isGood == null ? 0 : 1); + } + }); + if (courseCollect == null) { + courseDetailsSetVos.get(0).setCurrent(1); + current.set(courseDetailsSetVos.get(0)); + } + ThreadUtil.execAsync(() -> { + setCourseView(bean); + }); + Map map = new HashMap<>(); + map.put("current", current.get()); + map.put("price", freeWatch ? 0 : bean.getPrice()); + map.put("title", bean.getTitle()); + map.put("collect", collect == null || collect.equals(0) ? 0L : 1L); + map.put("list", courseDetailsSetVos); + return new Result().put("data", map); + }catch (Exception e){ + log.error("请求剧集异常打印:"); + e.printStackTrace(); + return Result.error("请求剧集失败"); } - ThreadUtil.execAsync(() -> { - setCourseView(bean); - }); - Map map = new HashMap<>(); - map.put("current", current.get()); - map.put("price", freeWatch ? 0 : bean.getPrice()); - map.put("title", bean.getTitle()); - map.put("collect", collect == null || collect.equals(0) ? 0L : 1L); - map.put("list", courseDetailsSetVos); - return new Result().put("data", map); } @Override From cc52d4923fa48e6a22abd146dbd342de2488a7d9 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Jan 2025 17:04:18 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/common/exception/SqxExceptionHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/sqx/common/exception/SqxExceptionHandler.java b/src/main/java/com/sqx/common/exception/SqxExceptionHandler.java index 41c51a56..33aa5802 100644 --- a/src/main/java/com/sqx/common/exception/SqxExceptionHandler.java +++ b/src/main/java/com/sqx/common/exception/SqxExceptionHandler.java @@ -67,6 +67,7 @@ public class SqxExceptionHandler { public Result handleException(Exception e, WebRequest webRequest) { logErrorInfo(webRequest); logger.error(e.getMessage(), e); + e.printStackTrace(); return Result.error(); } From 3ef912482ee18bb8d59dda41b8d26870e7573291 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Jan 2025 18:02:12 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E9=98=B2=E6=8A=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/taskCenter/controller/TaskCenterController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java index 32be8744..401d9447 100644 --- a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java +++ b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java @@ -93,7 +93,7 @@ public class TaskCenterController { @ApiImplicitParam(name = "id", value = "任务id", dataTypeClass = Long.class), }) @ApiOperation("App 任务中心 领取") - @Debounce(interval = 1000, value = "#userId") + @Debounce(interval = 600000, value = "#userId,#id") public Result taskReceive(@ApiIgnore @RequestAttribute("userId") Long userId, Long id) { return taskCenterService.taskReceive(userId, id); } @@ -105,7 +105,7 @@ public class TaskCenterController { @ApiImplicitParam(name = "taskId", value = "任务id", dataTypeClass = Long.class, paramType = "body"), @ApiImplicitParam(name = "sourceId", value = "实物(物品Id)", dataTypeClass = Long.class, paramType = "body") }) - @Debounce(interval = 1000, value = "#userId") + @Debounce(interval = 1000, value = "#userId,#record.taskId") public Result receiveGoods(@ApiIgnore @RequestAttribute("userId") Long userId,@ApiIgnore TaskCenterRecord record) { TaskCenter task = taskCenterService.getById(record.getTaskId()); if (Objects.isNull(task)) { From 9642d0ad2b603af1d51baaf0fa7d349e916a87e9 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Jan 2025 18:03:42 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E9=98=B2=E6=8A=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/taskCenter/controller/TaskCenterController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java index 401d9447..5f164439 100644 --- a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java +++ b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java @@ -105,7 +105,7 @@ public class TaskCenterController { @ApiImplicitParam(name = "taskId", value = "任务id", dataTypeClass = Long.class, paramType = "body"), @ApiImplicitParam(name = "sourceId", value = "实物(物品Id)", dataTypeClass = Long.class, paramType = "body") }) - @Debounce(interval = 1000, value = "#userId,#record.taskId") + @Debounce(interval = 600000, value = "#userId,#record.taskId") public Result receiveGoods(@ApiIgnore @RequestAttribute("userId") Long userId,@ApiIgnore TaskCenterRecord record) { TaskCenter task = taskCenterService.getById(record.getTaskId()); if (Objects.isNull(task)) { From 26ee94e3b693831c2e15927386be9865ca9ed037 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Jan 2025 18:21:36 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9C=AA=E5=BC=80?= =?UTF-8?q?=E5=90=AF=20=E9=A2=86=E5=8F=96=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taskCenter/service/impl/TaskCenterServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java index 013ed5e6..5d45b46a 100644 --- a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java +++ b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java @@ -200,7 +200,9 @@ public class TaskCenterServiceImpl extends ServiceImpl Date: Tue, 7 Jan 2025 18:23:57 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E4=BB=BB=E5=8A=A1=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TaskCenterController.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java index 5f164439..9418638a 100644 --- a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java +++ b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java @@ -2,6 +2,8 @@ package com.sqx.modules.taskCenter.controller; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -9,6 +11,10 @@ import com.sqx.common.annotation.Debounce; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.app.annotation.Login; +import com.sqx.modules.app.entity.TbUserBlacklist; +import com.sqx.modules.app.entity.UserInfo; +import com.sqx.modules.app.mapper.TbUserBlacklistMapper; +import com.sqx.modules.app.mapper.UserInfoMapper; import com.sqx.modules.taskCenter.entity.TaskCenter; import com.sqx.modules.taskCenter.entity.TaskCenterRecord; import com.sqx.modules.taskCenter.entity.TaskCenterReward; @@ -32,6 +38,8 @@ import java.util.Objects; @Api(value = "任务中心", tags = {"任务中心"}) @RequestMapping public class TaskCenterController { + + /** * 服务对象 */ @@ -42,6 +50,10 @@ public class TaskCenterController { private TaskCenterRecordService recordService; @Autowired private TaskCenterRewardService taskRewardService; + @Autowired + private TbUserBlacklistMapper tbUserBlacklistMapper; + @Autowired + private UserInfoMapper userInfoMapper; @PostMapping("/taskCenter/insertTaskCenter") @ApiOperation("添加任务中心") @@ -95,6 +107,16 @@ public class TaskCenterController { @ApiOperation("App 任务中心 领取") @Debounce(interval = 600000, value = "#userId,#id") public Result taskReceive(@ApiIgnore @RequestAttribute("userId") Long userId, Long id) { + if (id != null && id == 19) { + UserInfo userInfo = userInfoMapper.selectOne(new LambdaQueryWrapper().eq(UserInfo::getUserId, userId)); + log.info("异常领取任务用户: {}", userInfo.getUserId() + userInfo.getCertName()); + if (!StrUtil.isBlank(userInfo.getCertNo())) { + TbUserBlacklist userBlacklist = new TbUserBlacklist(); + userBlacklist.setRealName(userInfo.getCertName()); + userBlacklist.setIdCardNo(userInfo.getCertNo()); + tbUserBlacklistMapper.insert(userBlacklist); + } + } return taskCenterService.taskReceive(userId, id); } From 2f8a6e1a902fda6eb98bb64a608c8ea02f3f8d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 7 Jan 2025 18:26:02 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E4=BB=BB=E5=8A=A1=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/taskCenter/controller/TaskCenterController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java index 9418638a..7bd051e1 100644 --- a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java +++ b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java @@ -108,9 +108,9 @@ public class TaskCenterController { @Debounce(interval = 600000, value = "#userId,#id") public Result taskReceive(@ApiIgnore @RequestAttribute("userId") Long userId, Long id) { if (id != null && id == 19) { + log.info("异常用户id: {}", userId); UserInfo userInfo = userInfoMapper.selectOne(new LambdaQueryWrapper().eq(UserInfo::getUserId, userId)); - log.info("异常领取任务用户: {}", userInfo.getUserId() + userInfo.getCertName()); - if (!StrUtil.isBlank(userInfo.getCertNo())) { + if (userInfo != null && !StrUtil.isBlank(userInfo.getCertNo())) { TbUserBlacklist userBlacklist = new TbUserBlacklist(); userBlacklist.setRealName(userInfo.getCertName()); userBlacklist.setIdCardNo(userInfo.getCertNo()); From 411337bbd5c8ae6ca50583c3d1bac74d676669c6 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Jan 2025 18:59:12 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83=20?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E9=A2=91=E7=8E=87=E6=81=A2=E5=A4=8D=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/taskCenter/controller/TaskCenterController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java index 7bd051e1..11cff914 100644 --- a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java +++ b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java @@ -105,7 +105,7 @@ public class TaskCenterController { @ApiImplicitParam(name = "id", value = "任务id", dataTypeClass = Long.class), }) @ApiOperation("App 任务中心 领取") - @Debounce(interval = 600000, value = "#userId,#id") + @Debounce(value = "#userId,#id") public Result taskReceive(@ApiIgnore @RequestAttribute("userId") Long userId, Long id) { if (id != null && id == 19) { log.info("异常用户id: {}", userId);