TASK:模块化;
This commit is contained in:
@@ -96,8 +96,8 @@ public class WorkspaceController {
|
||||
@GetMapping("/getMannequins")
|
||||
@ApiOperationSupport(order = 6)
|
||||
@ApiOperation(value = "获取模特")
|
||||
public Response<List<ModelsVO>> getMannequins(@RequestParam("sex") String sex, @RequestParam("style") String style) {
|
||||
List<ModelsVO> modelsVO = workspaceService.getMannequins(sex, style);
|
||||
public Response<List<ModelsVO>> getMannequins(@RequestParam("sex") String sex, @RequestParam("style") String style, @RequestParam("ageGroup") String ageGroup) {
|
||||
List<ModelsVO> modelsVO = workspaceService.getMannequins(sex, style, ageGroup);
|
||||
return Response.success(modelsVO);
|
||||
}
|
||||
|
||||
|
||||
@@ -44,6 +44,8 @@ public class Workspace implements Serializable {
|
||||
*/
|
||||
@ApiModelProperty(value = "用户ID")
|
||||
private Long accountId;
|
||||
|
||||
private String ageGroup;
|
||||
/**
|
||||
* 性别
|
||||
*/
|
||||
|
||||
@@ -45,7 +45,7 @@ public interface WorkspaceService extends IService<Workspace> {
|
||||
|
||||
WorkspaceVO getByIdForProject(Long id);
|
||||
|
||||
List<ModelsVO> getMannequins(String sex, String style);
|
||||
List<ModelsVO> getMannequins(String sex, String style, String ageGroup);
|
||||
|
||||
void systemFileCopy();
|
||||
|
||||
|
||||
@@ -397,13 +397,14 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ModelsVO> getMannequins(String sex, String style) {
|
||||
public List<ModelsVO> getMannequins(String sex, String style, String ageGroup) {
|
||||
AuthPrincipalVo userInfo = UserContext.getUserHolder();
|
||||
List<ModelsVO> result = new ArrayList<>();
|
||||
QueryWrapper<Library> libraryQueryWrapper = new QueryWrapper<>();
|
||||
libraryQueryWrapper.lambda().eq(Library::getAccountId, userInfo.getId());
|
||||
libraryQueryWrapper.lambda().eq(Library::getLevel1Type, LibraryLevel1TypeEnum.MODELS.getRealName());
|
||||
libraryQueryWrapper.lambda().eq(Library::getLevel2Type, sex);
|
||||
libraryQueryWrapper.lambda().eq(Library::getLevel3Type, ageGroup);
|
||||
List<Library> libraries = libraryMapper.selectList(libraryQueryWrapper);
|
||||
if (!CollectionUtils.isEmpty(libraries)) {
|
||||
List<ModelVO> modelVOList = new ArrayList<>();
|
||||
@@ -426,9 +427,11 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
|
||||
sysFileQueryWrapper.lambda().eq(SysFile::getLevel2Type, sex);
|
||||
if (!StringUtils.isEmpty(style)) {
|
||||
sysFileQueryWrapper.lambda().eq(SysFile::getLevel3Type, style);
|
||||
}else {
|
||||
sysFileQueryWrapper.lambda().isNull(SysFile::getLevel3Type);
|
||||
}
|
||||
// else {
|
||||
// sysFileQueryWrapper.lambda().eq(SysFile::getLevel3Type, style);
|
||||
// sysFileQueryWrapper.lambda().isNull(SysFile::getLevel3Type);
|
||||
// }
|
||||
List<SysFile> sysFileList = sysFileMapper.selectList(sysFileQueryWrapper);
|
||||
if (!CollectionUtils.isEmpty(sysFileList)) {
|
||||
List<ModelVO> modelVOList = new ArrayList<>();
|
||||
|
||||
Reference in New Issue
Block a user