TASK:男装;
This commit is contained in:
@@ -20,17 +20,21 @@ public interface SysFileService extends IService<SysFile> {
|
||||
|
||||
/**
|
||||
* 根据类型获取系统文件最大id
|
||||
*
|
||||
* @param level2Type
|
||||
* @param modelSex
|
||||
* @return
|
||||
*/
|
||||
Long getMaxIdByLevel2Type(String level2Type);
|
||||
Long getMaxIdByLevel2Type(String level2Type, String modelSex);
|
||||
|
||||
/**
|
||||
* 根据类型获取系统文件最小id
|
||||
*
|
||||
* @param level2Type
|
||||
* @param modelSex
|
||||
* @return
|
||||
*/
|
||||
Long getMinIdByLevel2Type(String level2Type);
|
||||
Long getMinIdByLevel2Type(String level2Type, String modelSex);
|
||||
|
||||
/**
|
||||
* 根据id获取系统文件
|
||||
|
||||
@@ -472,6 +472,7 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
|
||||
}else {
|
||||
throw new BusinessException("templateId or modelType can't be null");
|
||||
}
|
||||
elementVO.setModelSex(designDTO.getModelSex());
|
||||
return elementVO;
|
||||
}
|
||||
@Override
|
||||
|
||||
@@ -128,8 +128,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
|
||||
throw new BusinessException("unknown operateType! ");
|
||||
}
|
||||
Assert.notNull(id,"id cannot be empty!");
|
||||
Long maxId = sysFileService.getMaxIdByLevel2Type(level2Type);
|
||||
Long minId = sysFileService.getMinIdByLevel2Type(level2Type);
|
||||
Long maxId = sysFileService.getMaxIdByLevel2Type(level2Type, null);
|
||||
Long minId = sysFileService.getMinIdByLevel2Type(level2Type, null);
|
||||
|
||||
if(id > maxId || id <minId){
|
||||
throw new BusinessException("The id value is out of range!");
|
||||
|
||||
@@ -9,7 +9,6 @@ import com.ai.da.common.utils.*;
|
||||
import com.ai.da.mapper.SysFileMapper;
|
||||
import com.ai.da.mapper.entity.SysFile;
|
||||
import com.ai.da.model.vo.SysFileVO;
|
||||
import com.ai.da.service.PythonTAllInfoService;
|
||||
import com.ai.da.service.SysFileService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
@@ -27,7 +26,6 @@ import javax.annotation.Resource;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.stream.Collectors;
|
||||
@@ -175,22 +173,22 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
|
||||
}
|
||||
|
||||
@Override
|
||||
public Long getMaxIdByLevel2Type(String level2Type) {
|
||||
public Long getMaxIdByLevel2Type(String level2Type, String modelSex) {
|
||||
String key = "MAX_"+level2Type;
|
||||
Long maxId = LocalCacheUtils.getFileMaxMinValueCache(key);
|
||||
if(null == maxId){
|
||||
maxId =maxId(level2Type);
|
||||
maxId =maxId(level2Type, modelSex);
|
||||
LocalCacheUtils.setFileMaxMinValueCache(key,maxId);
|
||||
}
|
||||
return maxId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Long getMinIdByLevel2Type(String level2Type) {
|
||||
public Long getMinIdByLevel2Type(String level2Type, String modelSex) {
|
||||
String key = "MIN_"+level2Type;
|
||||
Long minId = LocalCacheUtils.getFileMaxMinValueCache(key);
|
||||
if(null == minId || minId == 0L){
|
||||
minId = minId(level2Type);
|
||||
minId = minId(level2Type, modelSex);
|
||||
LocalCacheUtils.setFileMaxMinValueCache(key,minId);
|
||||
}
|
||||
return minId;
|
||||
@@ -224,16 +222,18 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
|
||||
return cacheSysFileList;
|
||||
}
|
||||
|
||||
private Long maxId(String level2Type){
|
||||
private Long maxId(String level2Type, String modelSex){
|
||||
QueryWrapper<SysFile> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("level2_type", level2Type);
|
||||
queryWrapper.eq(!StringUtils.isEmpty(modelSex), "level3_type", modelSex);
|
||||
queryWrapper.select("max(id) as id " );
|
||||
SysFile sysFile = sysFileMapper.selectOne(queryWrapper);
|
||||
return sysFile.getId();
|
||||
}
|
||||
private Long minId(String level2Type){
|
||||
private Long minId(String level2Type, String modelSex){
|
||||
QueryWrapper<SysFile> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("level2_type", level2Type);
|
||||
queryWrapper.eq(!StringUtils.isEmpty(modelSex), "level3_type", modelSex);
|
||||
queryWrapper.select("min(id) as id " );
|
||||
SysFile sysFile = sysFileMapper.selectOne(queryWrapper);
|
||||
return sysFile.getId();
|
||||
|
||||
Reference in New Issue
Block a user