TASK:模块化;
This commit is contained in:
@@ -61,5 +61,5 @@ public interface SysFileService extends IService<SysFile> {
|
|||||||
|
|
||||||
List<SysFile> getByIds(List<Long> ids);
|
List<SysFile> getByIds(List<Long> ids);
|
||||||
|
|
||||||
SysFile getOneBySex(Long styleId, String sex);
|
SysFile getOneBySex(Long styleId, String sex, String ageGroup);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,9 +7,11 @@ import com.ai.da.common.enums.SysFileLevel1TypeEnum;
|
|||||||
import com.ai.da.common.enums.SysFileLevel2TypeEnum;
|
import com.ai.da.common.enums.SysFileLevel2TypeEnum;
|
||||||
import com.ai.da.common.utils.*;
|
import com.ai.da.common.utils.*;
|
||||||
import com.ai.da.mapper.primary.StyleMapper;
|
import com.ai.da.mapper.primary.StyleMapper;
|
||||||
|
import com.ai.da.mapper.primary.SysFileExtraMapper;
|
||||||
import com.ai.da.mapper.primary.SysFileMapper;
|
import com.ai.da.mapper.primary.SysFileMapper;
|
||||||
import com.ai.da.mapper.primary.entity.Style;
|
import com.ai.da.mapper.primary.entity.Style;
|
||||||
import com.ai.da.mapper.primary.entity.SysFile;
|
import com.ai.da.mapper.primary.entity.SysFile;
|
||||||
|
import com.ai.da.mapper.primary.entity.SysFileExtra;
|
||||||
import com.ai.da.model.vo.SysFileVO;
|
import com.ai.da.model.vo.SysFileVO;
|
||||||
import com.ai.da.service.SysFileService;
|
import com.ai.da.service.SysFileService;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
@@ -44,6 +46,8 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
|
|||||||
@Resource
|
@Resource
|
||||||
private SysFileMapper sysFileMapper;
|
private SysFileMapper sysFileMapper;
|
||||||
@Resource
|
@Resource
|
||||||
|
private SysFileExtraMapper sysFileExtraMapper;
|
||||||
|
@Resource
|
||||||
private FileProperties fileProperties;
|
private FileProperties fileProperties;
|
||||||
@Resource
|
@Resource
|
||||||
private StyleMapper styleMapper;
|
private StyleMapper styleMapper;
|
||||||
@@ -273,7 +277,7 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SysFile getOneBySex(Long styleId, String sex) {
|
public SysFile getOneBySex(Long styleId, String sex, String ageGroup) {
|
||||||
Style style = new Style();
|
Style style = new Style();
|
||||||
if (styleId != null) {
|
if (styleId != null) {
|
||||||
style = styleMapper.selectById(styleId);
|
style = styleMapper.selectById(styleId);
|
||||||
@@ -281,6 +285,14 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
|
|||||||
QueryWrapper<SysFile> qw = new QueryWrapper<>();
|
QueryWrapper<SysFile> qw = new QueryWrapper<>();
|
||||||
qw.lambda().eq(SysFile::getLevel1Type, "Models");
|
qw.lambda().eq(SysFile::getLevel1Type, "Models");
|
||||||
qw.lambda().eq(SysFile::getLevel2Type, sex);
|
qw.lambda().eq(SysFile::getLevel2Type, sex);
|
||||||
|
|
||||||
|
QueryWrapper<SysFileExtra> sysFileExtraQW = new QueryWrapper<>();
|
||||||
|
sysFileExtraQW.lambda().eq(SysFileExtra::getAgeGroup, ageGroup);
|
||||||
|
Set<Long> collect = sysFileExtraMapper.selectList(sysFileExtraQW).stream().map(SysFileExtra::getSysId).collect(Collectors.toSet());
|
||||||
|
if (!CollectionUtils.isEmpty(collect)) {
|
||||||
|
qw.lambda().in(SysFile::getId, collect);
|
||||||
|
}
|
||||||
|
|
||||||
if (style.getId() != null) {
|
if (style.getId() != null) {
|
||||||
qw.lambda().eq(SysFile::getLevel3Type, style.getName());
|
qw.lambda().eq(SysFile::getLevel3Type, style.getName());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -742,7 +742,7 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
|
|||||||
workspace.setUpdateTime(LocalDateTime.now());
|
workspace.setUpdateTime(LocalDateTime.now());
|
||||||
|
|
||||||
if (projectDTO.getProcess().equals(DesignProcess.SERIES_DESIGN.name()) || projectDTO.getProcess().equals(DesignProcess.SKETCH_COLLAGE_PROCESS.name())) {
|
if (projectDTO.getProcess().equals(DesignProcess.SERIES_DESIGN.name()) || projectDTO.getProcess().equals(DesignProcess.SKETCH_COLLAGE_PROCESS.name())) {
|
||||||
SysFile sysFile = sysFileService.getOneBySex(projectDTO.getStyleId(), projectDTO.getWorkspace().getSex());
|
SysFile sysFile = sysFileService.getOneBySex(projectDTO.getStyleId(), projectDTO.getWorkspace().getSex(), projectDTO.getWorkspace().getAgeGroup());
|
||||||
|
|
||||||
if (projectDTO.getWorkspace().getSex().equals(Sex.FEMALE.getValue())) {
|
if (projectDTO.getWorkspace().getSex().equals(Sex.FEMALE.getValue())) {
|
||||||
workspace.setMannequinFemaleId(sysFile.getId());
|
workspace.setMannequinFemaleId(sysFile.getId());
|
||||||
|
|||||||
Reference in New Issue
Block a user