From 381bd9f6a9525b11d574b4a4f79925d99d3ad626 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 十二月 2024 22:05:59 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIndexMenuController.java | 116 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 87 insertions(+), 29 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIndexMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIndexMenuController.java
index 129ab75..888218f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIndexMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIndexMenuController.java
@@ -19,6 +19,7 @@
import oshi.driver.mac.net.NetStat;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.*;
@@ -127,10 +128,14 @@
@ApiOperation(value = "定制推荐-2政策3公示",tags = {"web-首页"})
@PostMapping(value = "/consultation/list")
- public R<List<TConsultation>> consultationlist(@RequestParam Integer type) {
- //获取当前登录人id
- Long userId = tokenService.getLoginUser().getUserId();
- TUserChange one = changeService.lambdaQuery().eq(TUserChange::getUserId, userId).orderByDesc(TUserChange::getCreateTime).last("limit 1").one();
+ public R<List<TConsultation>> consultationlist(@RequestParam Integer type, @RequestParam(required = false) Integer regionId, HttpServletRequest request) {
+ String token = request.getHeader("Authorization");
+ TUserChange one =null;
+ if(StringUtils.isNotEmpty(token)){
+ //获取当前登录人id
+ Long userId = tokenService.getLoginUser().getUserId();
+ one = changeService.lambdaQuery().eq(TUserChange::getUserId, userId).orderByDesc(TUserChange::getCreateTime).last("limit 1").one();
+ }
List<TConsultation> notices = new ArrayList<>();
if (type==1){
@@ -141,20 +146,27 @@
.eq(TConsultation::getRegionId,tUserChangeDetail.getRegionId())
.eq(TConsultation::getMajorId, tUserChangeDetail.getMajorId())
.eq(TConsultation::getLevel, tUserChangeDetail.getLevelId())
- .eq(TConsultation::getIsRecommend,1)
.orderByDesc(TConsultation::getClassificationSort,TConsultation::getCreateTime).list();
notices.addAll(list1);
}
notices.sort(Comparator.comparing(TConsultation::getCreateTime).reversed());
}else {
// 创建 LambdaQueryWrapper 并设置查询条件
-
+ TRegion region = regionService.getById(regionId);
+ List<TRegion> regions = regionService.list(Wrappers.lambdaQuery(TRegion.class)
+ .eq(TRegion::getProvinceName, region.getProvinceName()));
+ List<Integer> regionIds = regions.stream().map(TRegion::getId).collect(Collectors.toList());
+ List<TConsultation> list1 = consultationService.lambdaQuery().eq(TConsultation::getClassificationId,type)
+ .in(TConsultation::getRegionId,regionIds)
+ .orderByDesc(TConsultation::getCreateTime,TConsultation::getClassificationSort).list();
+ notices.addAll(list1);
+ notices.sort(Comparator.comparing(TConsultation::getCreateTime).reversed());
}
- List<TConsultation> list1 = consultationService.lambdaQuery().eq(TConsultation::getClassificationId,type).eq(TConsultation::getIsRecommend,1).last("ORDER BY RAND() LIMIT 16").list();
- notices.addAll(list1);
- if (notices.size() > 16) {
+// List<TConsultation> list1 = consultationService.lambdaQuery().eq(TConsultation::getClassificationId,type).eq(TConsultation::getIsRecommend,1).last("ORDER BY RAND() LIMIT 16").list();
+// notices.addAll(list1);
+ if (notices.size() > 2) {
// 只保留前 16 条记录
- notices = new ArrayList<>(notices.subList(0, 16));
+ notices = new ArrayList<>(notices.subList(0, 2));
}
}else {
if (one!=null){
@@ -169,13 +181,21 @@
notices.sort(Comparator.comparing(TConsultation::getCreateTime).reversed());
}else {
// 创建 LambdaQueryWrapper 并设置查询条件
-
+ TRegion region = regionService.getById(regionId);
+ List<TRegion> regions = regionService.list(Wrappers.lambdaQuery(TRegion.class)
+ .eq(TRegion::getProvinceName, region.getProvinceName()));
+ List<Integer> regionIds = regions.stream().map(TRegion::getId).collect(Collectors.toList());
+ List<TConsultation> list1 = consultationService.lambdaQuery().eq(TConsultation::getClassificationId,type)
+ .in(TConsultation::getRegionId,regionIds)
+ .orderByDesc(TConsultation::getCreateTime,TConsultation::getClassificationSort).list();
+ notices.addAll(list1);
+ notices.sort(Comparator.comparing(TConsultation::getCreateTime).reversed());
}
- List<TConsultation> list1 = consultationService.lambdaQuery().eq(TConsultation::getClassificationId,type).last("ORDER BY RAND() LIMIT 16").list();
- notices.addAll(list1);
- if (notices.size() > 16) {
+// List<TConsultation> list1 = consultationService.lambdaQuery().eq(TConsultation::getClassificationId,type).last("ORDER BY RAND() LIMIT 16").list();
+// notices.addAll(list1);
+ if (notices.size() > 2) {
// 只保留前 16 条记录
- notices = new ArrayList<>(notices.subList(0, 16));
+ notices = new ArrayList<>(notices.subList(0, 2));
}
}
return R.ok(notices);
@@ -215,12 +235,19 @@
Long userId = tokenService.getLoginUser().getUserId();
TAppUser byId = appUserService.getById(userId);
Long cacheObject = redisCache.getCacheObject("ALLERT:"+userId);
-
if (cacheObject!=null && byId.getIsSetPreference() == 1){
return R.ok(cacheObject == 1);
}else {
return R.ok(false);
}
+ }
+
+ @ApiOperation(value = "取消顶部提示",tags = {"web-取消顶部提示"})
+ @PostMapping(value = "/cancelAllert")
+ public R cancelAllert() {
+ Long userId = tokenService.getLoginUser().getUserId();
+ redisCache.deleteObject("ALLERT:"+userId);
+ return R.ok();
}
@@ -284,10 +311,17 @@
@ApiOperation(value = "推荐资料",tags = {"web-首页"})
@PostMapping(value = "/information/list")
- public R<List<TInformation>> information() {
- //获取当前登录人id
- Long userId = tokenService.getLoginUser().getUserId();
- TUserChange one = changeService.lambdaQuery().eq(TUserChange::getUserId, userId).orderByDesc(TUserChange::getCreateTime).last("limit 1").one();
+ public R<List<TInformation>> information(@RequestParam(required = false) Integer regionId, HttpServletRequest request) {
+ String token = request.getHeader("Authorization");
+ TUserChange one =null;
+ Long userId;
+ if(StringUtils.isNotEmpty(token)){
+ //获取当前登录人id
+ userId = tokenService.getLoginUser().getUserId();
+ one = changeService.lambdaQuery().eq(TUserChange::getUserId, userId).orderByDesc(TUserChange::getCreateTime).last("limit 1").one();
+ }else {
+ userId = -1L;
+ }
List<TInformation> notices = new ArrayList<>();
if (one!=null){
List<TUserChangeDetail> list = changeDetailService.lambdaQuery().eq(TUserChangeDetail::getChangeId, one.getId()).list();
@@ -296,10 +330,20 @@
notices.addAll(list1);
}
notices.sort(Comparator.comparing(TInformation::getCreateTime).reversed());
- }
+ }else {
// 创建 LambdaQueryWrapper 并设置查询条件
- List<TInformation> list1 = informationService.lambdaQuery().last("ORDER BY RAND() LIMIT 16").list();
+ TRegion region = regionService.getById(regionId);
+ List<TRegion> regions = regionService.list(Wrappers.lambdaQuery(TRegion.class)
+ .eq(TRegion::getProvinceName, region.getProvinceName()));
+ List<Integer> regionIds = regions.stream().map(TRegion::getId).collect(Collectors.toList());
+ List<TInformation> list1 = informationService.lambdaQuery()
+ .in(TInformation::getRegionId,regionIds).list();
notices.addAll(list1);
+ notices.sort(Comparator.comparing(TInformation::getCreateTime).reversed());
+ }
+ // 创建 LambdaQueryWrapper 并设置查询条件
+// List<TInformation> list1 = informationService.lambdaQuery().last("ORDER BY RAND() LIMIT 16").list();
+// notices.addAll(list1);
if (notices.size() > 16) {
// 只保留前 16 条记录
@@ -316,10 +360,18 @@
@ApiOperation(value = "推荐课程",tags = {"web-首页"})
@PostMapping(value = "/course/list")
- public R<List<TCourse>> course() {
- //获取当前登录人id
- Long userId = tokenService.getLoginUser().getUserId();
- TUserChange one = changeService.lambdaQuery().eq(TUserChange::getUserId, userId).orderByDesc(TUserChange::getCreateTime).last("limit 1").one();
+ public R<List<TCourse>> course(@RequestParam(required = false) Integer regionId, HttpServletRequest request) {
+ String token = request.getHeader("Authorization");
+ TUserChange one =null;
+ Long userId;
+ if(StringUtils.isNotEmpty(token)){
+ //获取当前登录人id
+ //获取当前登录人id
+ userId = tokenService.getLoginUser().getUserId();
+ one = changeService.lambdaQuery().eq(TUserChange::getUserId, userId).orderByDesc(TUserChange::getCreateTime).last("limit 1").one();
+ }else {
+ userId = -1L;
+ }
List<TCourse> notices = new ArrayList<>();
if (one!=null){
List<TUserChangeDetail> list = changeDetailService.lambdaQuery().eq(TUserChangeDetail::getChangeId, one.getId()).list();
@@ -330,10 +382,16 @@
notices.sort(Comparator.comparing(TCourse::getCreateTime).reversed());
}else {
// 创建 LambdaQueryWrapper 并设置查询条件
-
+ TRegion region = regionService.getById(regionId);
+ List<TRegion> regions = regionService.list(Wrappers.lambdaQuery(TRegion.class)
+ .eq(TRegion::getProvinceName, region.getProvinceName()));
+ List<Integer> regionIds = regions.stream().map(TRegion::getId).collect(Collectors.toList());
+ List<TCourse> list1 = courseService.lambdaQuery().in(TCourse::getRegionId,regionIds).list();
+ notices.addAll(list1);
+ notices.sort(Comparator.comparing(TCourse::getCreateTime).reversed());
}
- List<TCourse> list1 = courseService.lambdaQuery().last("ORDER BY RAND() LIMIT 16").list();
- notices.addAll(list1);
+// List<TCourse> list1 = courseService.lambdaQuery().last("ORDER BY RAND() LIMIT 16").list();
+// notices.addAll(list1);
if (notices.size() > 16) {
// 只保留前 16 条记录
notices = new ArrayList<>(notices.subList(0, 16));
--
Gitblit v1.7.1