diff --git a/src/main/java/com/ai/da/mapper/primary/SysFileExtraMapper.java b/src/main/java/com/ai/da/mapper/primary/SysFileExtraMapper.java new file mode 100644 index 00000000..b8c9fa5d --- /dev/null +++ b/src/main/java/com/ai/da/mapper/primary/SysFileExtraMapper.java @@ -0,0 +1,7 @@ +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.SysFileExtra; + +public interface SysFileExtraMapper extends CommonMapper { +} diff --git a/src/main/java/com/ai/da/mapper/primary/entity/SysFileExtra.java b/src/main/java/com/ai/da/mapper/primary/entity/SysFileExtra.java new file mode 100644 index 00000000..7d9929d8 --- /dev/null +++ b/src/main/java/com/ai/da/mapper/primary/entity/SysFileExtra.java @@ -0,0 +1,29 @@ +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("sys_file_extra") +public class SysFileExtra implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + private Long sysId; + + private String ageGroup; +} diff --git a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java index 2a581a29..0b102d8e 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -68,6 +68,8 @@ public class LibraryServiceImpl extends ServiceImpl impl @Resource private SysFileMapper sysFileMapper; @Resource + private SysFileExtraMapper sysFileExtraMapper; + @Resource private FileProperties fileProperties; @Resource private LibraryModelPointService libraryModelPointService; @@ -755,6 +757,12 @@ public class LibraryServiceImpl extends ServiceImpl impl sysFile.setMd5(uploadDTO.getMd5()); sysFile.setCreateDate(new Date()); sysFileMapper.insert(sysFile); + + SysFileExtra extra = new SysFileExtra(); + extra.setSysId(sysFile.getId()); + extra.setAgeGroup(uploadDTO.getAgeGroup()); + sysFileExtraMapper.insert(extra); + Library library = new Library(); library.setId(sysFile.getId()); library.setUrl(sysFile.getUrl()); diff --git a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java index b48a28f4..19e17489 100644 --- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java @@ -65,6 +65,9 @@ public class WorkspaceServiceImpl extends ServiceImpl sysFileExtraQueryWrapper = new QueryWrapper<>(); + sysFileExtraQueryWrapper.lambda().eq(SysFileExtra::getAgeGroup, ageGroup); + List sysFileExtras = sysFileExtraMapper.selectList(sysFileExtraQueryWrapper); + if (!CollectionUtils.isEmpty(sysFileExtras)) { + Set collect = sysFileExtras.stream().map(SysFileExtra::getSysId).collect(Collectors.toSet()); + if (!CollectionUtils.isEmpty(collect)) { + sysFileQueryWrapper.lambda().in(SysFile::getId, collect); + } + } + if (!StringUtils.isEmpty(style)) { sysFileQueryWrapper.lambda().eq(SysFile::getLevel3Type, style); } @@ -432,6 +446,7 @@ public class WorkspaceServiceImpl extends ServiceImpl sysFileList = sysFileMapper.selectList(sysFileQueryWrapper); if (!CollectionUtils.isEmpty(sysFileList)) { List modelVOList = new ArrayList<>();