From b5bab032e80f0233fdf06a4e8de2599bc6b65e47 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 十二月 2024 21:23:56 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTitleMajorServiceImpl.java | 12 ++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIndexMenuController.java | 31 ++++++++-------
ruoyi-system/src/main/java/com/ruoyi/system/domain/TRegion.java | 3 +
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TRegionMapper.java | 2 +
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 5 ++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTechnicalTitleServiceImpl.java | 12 ++++++
6 files changed, 49 insertions(+), 16 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 bb54fbd..3c5693b 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,@RequestParam(required = false) Integer regionId) {
- //获取当前登录人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,7 +146,6 @@
.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);
}
@@ -154,16 +158,15 @@
List<Integer> regionIds = regions.stream().map(TRegion::getId).collect(Collectors.toList());
List<TConsultation> list1 = consultationService.lambdaQuery().eq(TConsultation::getClassificationId,type)
.in(TConsultation::getRegionId,regionIds)
- .eq(TConsultation::getIsRecommend,1)
.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){
@@ -188,11 +191,11 @@
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);
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 40a7113..53e7a58 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -120,7 +120,10 @@
"/web/region/tree",
"/t-index-menu/getByProvinceName/count",
"/t-index-menu/list",
- "/t-order/export","/t-app-user/forget","/applet/forget","/applet/login","/applet/code/login","/t-app-user//regis","/common/send","/call-back/**","/login","/applet/queryProtocolConfigByType", "/register","/applet/getCode","/applet/loginCode","/applet/changepwd", "/captchaImage","/getCode","/loginCode","/operations/getBySingleNum/**",
+ "/t-order/export","/t-app-user/forget","/applet/forget","/applet/login","/applet/code/login","/t-app-user/regis",
+ "/common/send","/call-back/**","/login","/applet/queryProtocolConfigByType", "/register",
+ "/applet/getCode","/applet/loginCode","/applet/changepwd", "/captchaImage","/getCode","/loginCode",
+ "/operations/getBySingleNum/**","/t-index-menu/consultation/list",
"/user/getUserInfoByNumber/**").permitAll()
// 静态资源，可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TRegion.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TRegion.java
index c1613a1..16be8ca 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TRegion.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TRegion.java
@@ -56,7 +56,8 @@
private String provinceName;
@TableField(exist = false)
private Long count;
-
+ @TableField(exist = false)
+ private String address;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TRegionMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TRegionMapper.java
index 4ae60ea..3a24e1f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TRegionMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TRegionMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.TRegion;
import com.ruoyi.system.dto.RegionDto;
+import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -14,6 +15,7 @@
* @author luodangjia
* @since 2024-09-19
*/
+@Mapper
public interface TRegionMapper extends BaseMapper<TRegion> {
List<RegionDto> regionTree();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTechnicalTitleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTechnicalTitleServiceImpl.java
index c61d96e..37fc355 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTechnicalTitleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTechnicalTitleServiceImpl.java
@@ -4,13 +4,17 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BasePage;
+import com.ruoyi.system.domain.TRegion;
import com.ruoyi.system.domain.TTechnicalTitle;
import com.ruoyi.system.domain.TTitleMajor;
+import com.ruoyi.system.mapper.TRegionMapper;
import com.ruoyi.system.mapper.TTechnicalTitleMapper;
import com.ruoyi.system.query.RegionQuery;
import com.ruoyi.system.service.TTechnicalTitleService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.List;
/**
@@ -24,10 +28,18 @@
@Service
public class TTechnicalTitleServiceImpl extends ServiceImpl<TTechnicalTitleMapper, TTechnicalTitle> implements TTechnicalTitleService {
+ @Autowired
+ private TRegionMapper regionMapper;
+
@Override
public PageInfo<TTechnicalTitle> pageList(RegionQuery regionQuery) {
PageInfo<TTechnicalTitle> pageInfo = new PageInfo<>(regionQuery.getPageNum(), regionQuery.getPageSize());
List<TTechnicalTitle> list = this.baseMapper.pageList(regionQuery,pageInfo);
+ for (TTechnicalTitle tTechnicalTitle : list) {
+ List<TRegion> tRegions = regionMapper.selectBatchIds(Arrays.asList(tTechnicalTitle.getRegionIds().split(",")));
+ tRegions.stream().forEach(region -> region.setAddress(region.getProvinceName()+"-"+region.getName()));
+ tTechnicalTitle.setRegionNames(tRegions.stream().map(region -> region.getAddress()).reduce((a, b) -> a + "、" + b).get());
+ }
pageInfo.setRecords(list);
return pageInfo;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTitleMajorServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTitleMajorServiceImpl.java
index e852ff5..a5f1b4c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTitleMajorServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTitleMajorServiceImpl.java
@@ -4,12 +4,17 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BasePage;
+import com.ruoyi.system.domain.TRegion;
+import com.ruoyi.system.domain.TTechnicalTitle;
import com.ruoyi.system.domain.TTitleMajor;
+import com.ruoyi.system.mapper.TRegionMapper;
import com.ruoyi.system.mapper.TTitleMajorMapper;
import com.ruoyi.system.service.TTitleMajorService;
import com.ruoyi.system.vo.SysUserVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.List;
/**
@@ -23,10 +28,17 @@
@Service
public class TTitleMajorServiceImpl extends ServiceImpl<TTitleMajorMapper, TTitleMajor> implements TTitleMajorService {
+ @Autowired
+ private TRegionMapper regionMapper;
@Override
public PageInfo<TTitleMajor> pageList(BasePage basePage) {
PageInfo<TTitleMajor> pageInfo = new PageInfo<>(basePage.getPageNum(), basePage.getPageSize());
List<TTitleMajor> list = this.baseMapper.pageList(pageInfo);
+ for (TTitleMajor titleMajor : list) {
+ List<TRegion> tRegions = regionMapper.selectBatchIds(Arrays.asList(titleMajor.getRegionIds().split(",")));
+ tRegions.stream().forEach(region -> region.setAddress(region.getProvinceName()+"-"+region.getName()));
+ titleMajor.setRegionNames(tRegions.stream().map(region -> region.getAddress()).reduce((a, b) -> a + "、" + b).get());
+ }
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1