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/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java index 5986628f..01535a29 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java @@ -9,6 +9,7 @@ import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretat import com.adc.da.sys.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -59,7 +60,17 @@ public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl getAllDatas(InterpretationEO sarInterpretationNationalStandard) { - return sarInterpretationNationalStandardDao.getAllDatas(sarInterpretationNationalStandard); + List list = sarInterpretationNationalStandardDao.getAllDatas(sarInterpretationNationalStandard); + + // 处理适用车型 ["N1","N2"] + for (SarInterpretationNationalStandard standard : list) { + if (StringUtils.isNotEmpty(standard.getApplyArctic()) && standard.getApplyArctic().startsWith("[") && standard.getApplyArctic().endsWith("]")) { + String applyArctics = standard.getApplyArctic().substring(1,standard.getApplyArctic().length()-1).replace("\"", ""); + standard.setApplyArctic(applyArctics); + } + } + + return list; } @Override 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 + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml index c5abdfdd..130001ef 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml @@ -79,9 +79,9 @@ AND sins.prc_num like concat(concat('%',#{prcNum}),'%') - ORDER BY sins.STAND_ID, sins.specific_item + ORDER BY sins.specific_item - ) c ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED) ,rows + ) c ORDER BY CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED) LIMIT ${(current-1)*size},${size}