From 402551005f4d56344d3e966c99d5b0df5e39a50f Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 14 Nov 2022 13:47:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E6=B7=BB=E5=8A=A0=E8=B5=84?= =?UTF-8?q?=E6=96=99=E4=B8=AD=E5=BF=83=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FileMaterialController.java | 8 +++++++ .../dao/FileMaterialDao.java | 4 ++++ .../service/IFileMaterialService.java | 7 +++++++ .../service/impl/FileMaterialServiceImpl.java | 20 ++++++++++++++++++ .../fileMaterialCenter/FileMaterialMapper.xml | 21 +++++++++++++++++++ 5 files changed, 60 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java index bf3768e7..c6f5fa2b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java @@ -94,6 +94,14 @@ public class FileMaterialController extends BaseController { return Result.success(fileMaterial); } + @GetMapping("/getFileMaterialIndex") + @ApiOperation("首页-查询前十条文件资料组") + public ResponseMessage> getFileMaterialIndex(String userId){ + List fileMaterial = iFileMaterialService.getFileMaterialIndex(userId); + + return Result.success(fileMaterial); + } + @PutMapping @ApiOperation("修改文件资料组") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java index e4b2bac8..657fbf44 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* Mapper 接口 @@ -22,4 +24,6 @@ public interface FileMaterialDao extends BaseMapper { IPage getFileMaterialPage(IPage page, @Param("flieM") FileMaterialPage fileMaterialPage); + + List getFileMaterialIndex(@Param("treeIdList") List treeIdList); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/IFileMaterialService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/IFileMaterialService.java index 2007711c..fbfbf27c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/IFileMaterialService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/IFileMaterialService.java @@ -26,6 +26,13 @@ public interface IFileMaterialService extends IService { */ IPage getFileMaterial(FileMaterialPage queryPage); + /** + * 首页-查询前十条文件资料组 + * @param userId + * @return + */ + List getFileMaterialIndex(String userId); + /** * 获取类型 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java index ef9d3e82..93f40f34 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java @@ -78,6 +78,26 @@ public class FileMaterialServiceImpl extends ServiceImpl getFileMaterialIndex(String userId) { + if (StringUtils.isBlank(userId)) { + // 获取当前登录人 + userId = LoginUserUtil.getUserId(); + } + + List positionIds = tsUserDao.selectPositionIds(userId); + List roleIds = tsPositionService.getRoleIdsByPositionIds(positionIds); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.in("ROLE_ID", roleIds); + List tsRoleMenuData = iTsRoleMenuDataService.list(wrapper); + List treeIdList = tsRoleMenuData.stream().map(TsRoleMenuData::getMenuId).distinct().collect(Collectors.toList()); + if (CollectionUtils.isEmpty(treeIdList)) { + return null; + } + + return fileMaterialDao.getFileMaterialIndex(treeIdList); + } + @Override public List getFileMaterialType() { QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml index 3c7f87e8..9642feb1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml @@ -53,4 +53,25 @@ group by fm.id order by fm.data_upload_time desc + +