BUGFIX: format;
This commit is contained in:
@@ -29,6 +29,7 @@ public class FileProperties {
|
|||||||
}
|
}
|
||||||
return linux;
|
return linux;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getLinuxDomain() {
|
public String getLinuxDomain() {
|
||||||
String os = System.getProperty("os.name");
|
String os = System.getProperty("os.name");
|
||||||
if ((!os.toLowerCase().startsWith("win")) && (!os.toLowerCase().startsWith("mac"))) {
|
if ((!os.toLowerCase().startsWith("win")) && (!os.toLowerCase().startsWith("mac"))) {
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ public class MinIoClientConfig {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 注入minio 客户端
|
* 注入minio 客户端
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Bean
|
@Bean
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ public class ExceptionCatch {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 处理参数校验异常
|
* 处理参数校验异常
|
||||||
|
*
|
||||||
* @param e
|
* @param e
|
||||||
* @return ResponseData
|
* @return ResponseData
|
||||||
*/
|
*/
|
||||||
@@ -68,6 +69,7 @@ public class ExceptionCatch {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 处理参数校验异常
|
* 处理参数校验异常
|
||||||
|
*
|
||||||
* @param e
|
* @param e
|
||||||
* @return ResponseData
|
* @return ResponseData
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ public class UserContext {
|
|||||||
public static AuthPrincipalVo getUserHolder() {
|
public static AuthPrincipalVo getUserHolder() {
|
||||||
return userHolder.get();
|
return userHolder.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void delete() {
|
public static void delete() {
|
||||||
userHolder.remove();
|
userHolder.remove();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ public enum CurrentDesignPictureTypeEnum {
|
|||||||
public static CurrentDesignPictureTypeEnum of(String name) {
|
public static CurrentDesignPictureTypeEnum of(String name) {
|
||||||
return Stream.of(CurrentDesignPictureTypeEnum.values()).filter(v -> v.name().equals(name)).findFirst().orElse(null);
|
return Stream.of(CurrentDesignPictureTypeEnum.values()).filter(v -> v.name().equals(name)).findFirst().orElse(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<CurrentDesignPictureTypeEnum> ofList(List<Integer> codes) {
|
public static List<CurrentDesignPictureTypeEnum> ofList(List<Integer> codes) {
|
||||||
return Stream.of(CurrentDesignPictureTypeEnum.values()).filter(v -> codes.contains(v.code)).collect(Collectors.toList());
|
return Stream.of(CurrentDesignPictureTypeEnum.values()).filter(v -> codes.contains(v.code)).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ public enum CurrentDesignPrintPictureTypeEnum {
|
|||||||
this.code = code;
|
this.code = code;
|
||||||
this.desc = desc;
|
this.desc = desc;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<CurrentDesignPrintPictureTypeEnum> ofList(List<Integer> codes) {
|
public static List<CurrentDesignPrintPictureTypeEnum> ofList(List<Integer> codes) {
|
||||||
return Stream.of(CurrentDesignPrintPictureTypeEnum.values()).filter(v -> codes.contains(v.code)).collect(Collectors.toList());
|
return Stream.of(CurrentDesignPrintPictureTypeEnum.values()).filter(v -> codes.contains(v.code)).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ public enum LibraryTopTypeEnum {
|
|||||||
public String getRealName() {
|
public String getRealName() {
|
||||||
return realName;
|
return realName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LibraryTopTypeEnum uploadOf(String realName) {
|
public static LibraryTopTypeEnum uploadOf(String realName) {
|
||||||
return Stream.of(LibraryTopTypeEnum.values())
|
return Stream.of(LibraryTopTypeEnum.values())
|
||||||
.filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null);
|
.filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null);
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ public enum SysFileLevel2TypeEnum {
|
|||||||
public static SysFileLevel2TypeEnum uploadOf(String uploadPathName) {
|
public static SysFileLevel2TypeEnum uploadOf(String uploadPathName) {
|
||||||
return Stream.of(SysFileLevel2TypeEnum.values()).filter(v -> v.getUploadPathName().equals(uploadPathName)).findFirst().orElse(null);
|
return Stream.of(SysFileLevel2TypeEnum.values()).filter(v -> v.getUploadPathName().equals(uploadPathName)).findFirst().orElse(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static SysFileLevel2TypeEnum realNameOf(String realName) {
|
public static SysFileLevel2TypeEnum realNameOf(String realName) {
|
||||||
return Stream.of(SysFileLevel2TypeEnum.values()).filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null);
|
return Stream.of(SysFileLevel2TypeEnum.values()).filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null);
|
||||||
}
|
}
|
||||||
@@ -65,9 +66,11 @@ public enum SysFileLevel2TypeEnum {
|
|||||||
public static SysFileLevel2TypeEnum realNameOfPython(String realName) {
|
public static SysFileLevel2TypeEnum realNameOfPython(String realName) {
|
||||||
return Stream.of(BLOUSE, DRESS, OUTWEAR, SKIRT, TROUSERS).filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null);
|
return Stream.of(BLOUSE, DRESS, OUTWEAR, SKIRT, TROUSERS).filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<String> ofPython() {
|
public static List<String> ofPython() {
|
||||||
return Stream.of(BLOUSE, DRESS, OUTWEAR, SKIRT, TROUSERS).map(SysFileLevel2TypeEnum::getRealName).collect(Collectors.toList());
|
return Stream.of(BLOUSE, DRESS, OUTWEAR, SKIRT, TROUSERS).map(SysFileLevel2TypeEnum::getRealName).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<String> ofPythonPath() {
|
public static List<String> ofPythonPath() {
|
||||||
return Stream.of(BLOUSE, DRESS, OUTWEAR, SKIRT, TROUSERS).map(SysFileLevel2TypeEnum::getUploadPathName).collect(Collectors.toList());
|
return Stream.of(BLOUSE, DRESS, OUTWEAR, SKIRT, TROUSERS).map(SysFileLevel2TypeEnum::getUploadPathName).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ public class TokenQuery {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static JSONObject generateUser(Map<String, Object> param, String token) {
|
public static JSONObject generateUser(Map<String, Object> param, String token) {
|
||||||
HttpResponse httpResponse = HttpUtil.createPost(GENERATE_USER_DOMAIN + TokenApis.GENERATE_USER.getUrl())
|
HttpResponse httpResponse = HttpUtil.createPost(GENERATE_USER_DOMAIN + TokenApis.GENERATE_USER.getUrl())
|
||||||
.body(JSONObject.toJSONString(param != null ? param : new HashMap<>()))
|
.body(JSONObject.toJSONString(param != null ? param : new HashMap<>()))
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ public class PageBaseResponse<T>{
|
|||||||
private List<T> content;
|
private List<T> content;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public PageBaseResponse(List<T> list, long page, long size, long total, long pages) {
|
public PageBaseResponse(List<T> list, long page, long size, long total, long pages) {
|
||||||
this.page = page;
|
this.page = page;
|
||||||
this.size = size;
|
this.size = size;
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ public class PageResponse<T> extends Response<List<T>> {
|
|||||||
private List<T> content;
|
private List<T> content;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public PageResponse(Response<List<T>> response, long page, long size, long total, long pages) {
|
public PageResponse(Response<List<T>> response, long page, long size, long total, long pages) {
|
||||||
if (response != null) {
|
if (response != null) {
|
||||||
this.setData(response.getData());
|
this.setData(response.getData());
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ public class Response<T> implements Serializable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static <T> Response<T> fail(String msg) {
|
public static <T> Response<T> fail(String msg) {
|
||||||
return fail(ResultEnum.FAIL.getCode(), msg);
|
return fail(ResultEnum.FAIL.getCode(), msg);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ public enum ResultEnum {
|
|||||||
private boolean isOK;
|
private boolean isOK;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ResultEnum(boolean isOK, int code, String msg) {
|
ResultEnum(boolean isOK, int code, String msg) {
|
||||||
this.isOK = isOK;
|
this.isOK = isOK;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
|
|||||||
@@ -78,10 +78,12 @@ public class AuthenticationFilter extends OncePerRequestFilter {
|
|||||||
filterChain.doFilter(httpServletRequest, httpServletResponse);
|
filterChain.doFilter(httpServletRequest, httpServletResponse);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private Boolean calculateUrl(String requestURI) {
|
private Boolean calculateUrl(String requestURI) {
|
||||||
String filterUrl = FILTER_URL.stream().filter(url -> requestURI.contains(url)).findFirst().orElse(null);
|
String filterUrl = FILTER_URL.stream().filter(url -> requestURI.contains(url)).findFirst().orElse(null);
|
||||||
return null == filterUrl ? Boolean.TRUE : Boolean.FALSE;
|
return null == filterUrl ? Boolean.TRUE : Boolean.FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void extracted(HttpServletRequest request) throws AuthenticationException {
|
private void extracted(HttpServletRequest request) throws AuthenticationException {
|
||||||
String jwtToken = request.getHeader(properties.getJwtTokenHeader());
|
String jwtToken = request.getHeader(properties.getJwtTokenHeader());
|
||||||
log.debug("后台检查令牌:{}", jwtToken);
|
log.debug("后台检查令牌:{}", jwtToken);
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ public class AccessLimitUtils {
|
|||||||
LocalCacheUtils.setAidaInterfaceCurrentLimitingCache(interfaceName, useCount);
|
LocalCacheUtils.setAidaInterfaceCurrentLimitingCache(interfaceName, useCount);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验过后 接口完毕 去掉限流
|
* 校验过后 接口完毕 去掉限流
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -12,11 +12,13 @@ import java.time.format.DateTimeFormatter;
|
|||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.TimeZone;
|
import java.util.TimeZone;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
public class DateUtil {
|
public class DateUtil {
|
||||||
public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
|
public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
|
||||||
public static final String YYYYMM = "yyyyMM";
|
public static final String YYYYMM = "yyyyMM";
|
||||||
public static final String YYYY_MM_DD = "yyyyMMdd";
|
public static final String YYYY_MM_DD = "yyyyMMdd";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* LocalDate -> Date
|
* LocalDate -> Date
|
||||||
*/
|
*/
|
||||||
@@ -30,8 +32,10 @@ public class DateUtil {
|
|||||||
public static Date asDate(LocalDateTime localDateTime) {
|
public static Date asDate(LocalDateTime localDateTime) {
|
||||||
return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
|
return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* date 装 String
|
* date 装 String
|
||||||
|
*
|
||||||
* @param date
|
* @param date
|
||||||
* @param formatter
|
* @param formatter
|
||||||
* @return
|
* @return
|
||||||
@@ -43,8 +47,10 @@ public class DateUtil {
|
|||||||
LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zoneId);
|
LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zoneId);
|
||||||
return dateTimeFormatter.format(localDateTime);
|
return dateTimeFormatter.format(localDateTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据时区获取时间
|
* 根据时区获取时间
|
||||||
|
*
|
||||||
* @param timeZone "Asia/Tokyo"
|
* @param timeZone "Asia/Tokyo"
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -144,6 +144,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
|
|||||||
}
|
}
|
||||||
return new FileVO(height, width);
|
return new FileVO(height, width);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取文件尺寸
|
* 获取文件尺寸
|
||||||
*/
|
*/
|
||||||
@@ -162,6 +163,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
|
|||||||
}
|
}
|
||||||
return new FileVO(height, width);
|
return new FileVO(height, width);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取远程文件流
|
* 获取远程文件流
|
||||||
*/
|
*/
|
||||||
@@ -176,6 +178,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
|
|||||||
throw new BusinessException("get file is failed!");
|
throw new BusinessException("get file is failed!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 将文件名解析成文件的上传路径
|
* 将文件名解析成文件的上传路径
|
||||||
*/
|
*/
|
||||||
@@ -204,6 +207,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 将文件名解析成文件的上传路径
|
* 将文件名解析成文件的上传路径
|
||||||
*/
|
*/
|
||||||
@@ -242,6 +246,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取指定文件夹下所有文件,不含文件夹里的文件
|
* 获取指定文件夹下所有文件,不含文件夹里的文件
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ public class ImageUtil {
|
|||||||
static int r, g, b; // 分别用来存放获取的RGB值
|
static int r, g, b; // 分别用来存放获取的RGB值
|
||||||
static int heigth, width;
|
static int heigth, width;
|
||||||
static int id = 0;
|
static int id = 0;
|
||||||
|
|
||||||
public static void find() {
|
public static void find() {
|
||||||
// 读取要操作的图片,这里的图片路径请改成自己要处理的图片
|
// 读取要操作的图片,这里的图片路径请改成自己要处理的图片
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -25,8 +25,8 @@ public final class LocalCacheUtils {
|
|||||||
* token
|
* token
|
||||||
*/
|
*/
|
||||||
private static LoadingCache<String, String> tokenCache = loadTokenCache();
|
private static LoadingCache<String, String> tokenCache = loadTokenCache();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
|
||||||
* 缓存接口这里是LoadingCache,LoadingCache在缓存项不存在时可以自动加载缓存
|
* 缓存接口这里是LoadingCache,LoadingCache在缓存项不存在时可以自动加载缓存
|
||||||
*/
|
*/
|
||||||
private static LoadingCache<String, String> loadTokenCache() {
|
private static LoadingCache<String, String> loadTokenCache() {
|
||||||
@@ -44,6 +44,7 @@ public final class LocalCacheUtils {
|
|||||||
});
|
});
|
||||||
return tokenCache;
|
return tokenCache;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 邮箱,短信验证码
|
* 邮箱,短信验证码
|
||||||
*/
|
*/
|
||||||
@@ -176,8 +177,10 @@ public final class LocalCacheUtils {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加token本地缓存
|
* 添加token本地缓存
|
||||||
|
*
|
||||||
* @param key
|
* @param key
|
||||||
* @param value
|
* @param value
|
||||||
*/
|
*/
|
||||||
@@ -187,6 +190,7 @@ public final class LocalCacheUtils {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取token本地缓存
|
* 获取token本地缓存
|
||||||
|
*
|
||||||
* @param key
|
* @param key
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -202,8 +206,10 @@ public final class LocalCacheUtils {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除token本地缓存(登出)
|
* 删除token本地缓存(登出)
|
||||||
|
*
|
||||||
* @param key
|
* @param key
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -214,8 +220,10 @@ public final class LocalCacheUtils {
|
|||||||
log.error("delTokenCache方法错误", e);
|
log.error("delTokenCache方法错误", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加验证码本地缓存
|
* 添加验证码本地缓存
|
||||||
|
*
|
||||||
* @param key
|
* @param key
|
||||||
* @param value
|
* @param value
|
||||||
*/
|
*/
|
||||||
@@ -225,6 +233,7 @@ public final class LocalCacheUtils {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取验证码本地缓存
|
* 获取验证码本地缓存
|
||||||
|
*
|
||||||
* @param key
|
* @param key
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -240,8 +249,10 @@ public final class LocalCacheUtils {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加系统文本地缓存
|
* 添加系统文本地缓存
|
||||||
|
*
|
||||||
* @param key
|
* @param key
|
||||||
* @param sysFile
|
* @param sysFile
|
||||||
*/
|
*/
|
||||||
@@ -251,6 +262,7 @@ public final class LocalCacheUtils {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取系统文件本地缓存
|
* 获取系统文件本地缓存
|
||||||
|
*
|
||||||
* @param key
|
* @param key
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -263,8 +275,10 @@ public final class LocalCacheUtils {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 清除所有系统文件本地缓存
|
* 清除所有系统文件本地缓存
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static void clearAllSysFileCache() {
|
public static void clearAllSysFileCache() {
|
||||||
@@ -274,8 +288,10 @@ public final class LocalCacheUtils {
|
|||||||
log.error("clearAllSysFileCache方法错误", e);
|
log.error("clearAllSysFileCache方法错误", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加系统文本地缓存,通过类型
|
* 添加系统文本地缓存,通过类型
|
||||||
|
*
|
||||||
* @param level1Type
|
* @param level1Type
|
||||||
* @param sysFileList
|
* @param sysFileList
|
||||||
*/
|
*/
|
||||||
@@ -285,6 +301,7 @@ public final class LocalCacheUtils {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取系统文件本地缓存
|
* 获取系统文件本地缓存
|
||||||
|
*
|
||||||
* @param level2Type
|
* @param level2Type
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -296,8 +313,10 @@ public final class LocalCacheUtils {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 清除所有系统文件本地缓存
|
* 清除所有系统文件本地缓存
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static void clearAllSysFileCacheByLevel2Type() {
|
public static void clearAllSysFileCacheByLevel2Type() {
|
||||||
@@ -307,8 +326,10 @@ public final class LocalCacheUtils {
|
|||||||
log.error("clearAllSysFileCacheByLevel2Type方法错误", e);
|
log.error("clearAllSysFileCacheByLevel2Type方法错误", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加系统文件范围最大最小值本地缓存
|
* 添加系统文件范围最大最小值本地缓存
|
||||||
|
*
|
||||||
* @param key
|
* @param key
|
||||||
* @param value
|
* @param value
|
||||||
*/
|
*/
|
||||||
@@ -318,6 +339,7 @@ public final class LocalCacheUtils {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取系统文件范围最大最小值本地缓存
|
* 获取系统文件范围最大最小值本地缓存
|
||||||
|
*
|
||||||
* @param key
|
* @param key
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -333,8 +355,10 @@ public final class LocalCacheUtils {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 清除所有系统文件范围最大最小值本地缓存
|
* 清除所有系统文件范围最大最小值本地缓存
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static void clearAllMaxMinValueCache() {
|
public static void clearAllMaxMinValueCache() {
|
||||||
@@ -344,8 +368,10 @@ public final class LocalCacheUtils {
|
|||||||
log.error("clearAllMaxMinValueCache方法错误", e);
|
log.error("clearAllMaxMinValueCache方法错误", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加系design文件进度统计
|
* 添加系design文件进度统计
|
||||||
|
*
|
||||||
* @param key
|
* @param key
|
||||||
* @param value
|
* @param value
|
||||||
*/
|
*/
|
||||||
@@ -355,6 +381,7 @@ public final class LocalCacheUtils {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取design文件进度统计
|
* 获取design文件进度统计
|
||||||
|
*
|
||||||
* @param key
|
* @param key
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -367,8 +394,10 @@ public final class LocalCacheUtils {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 进度统计完后 删除进度
|
* 进度统计完后 删除进度
|
||||||
|
*
|
||||||
* @param key
|
* @param key
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -382,6 +411,7 @@ public final class LocalCacheUtils {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 设置本次接口流量数
|
* 设置本次接口流量数
|
||||||
|
*
|
||||||
* @param key
|
* @param key
|
||||||
* @param value
|
* @param value
|
||||||
*/
|
*/
|
||||||
@@ -391,6 +421,7 @@ public final class LocalCacheUtils {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取本次接口流量数
|
* 获取本次接口流量数
|
||||||
|
*
|
||||||
* @param key
|
* @param key
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ public class MD5Utils {
|
|||||||
}
|
}
|
||||||
return md5;
|
return md5;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* MD5加密文件
|
* MD5加密文件
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ import java.util.stream.Collectors;
|
|||||||
public class MinioUtil {
|
public class MinioUtil {
|
||||||
@Autowired
|
@Autowired
|
||||||
private MinioClient minioClient;
|
private MinioClient minioClient;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* description: 判断bucket是否存在,不存在则创建
|
* description: 判断bucket是否存在,不存在则创建
|
||||||
*
|
*
|
||||||
@@ -55,6 +56,7 @@ public class MinioUtil {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建存储bucket
|
* 创建存储bucket
|
||||||
|
*
|
||||||
* @param bucketName 存储bucket名称
|
* @param bucketName 存储bucket名称
|
||||||
* @return Boolean
|
* @return Boolean
|
||||||
*/
|
*/
|
||||||
@@ -72,6 +74,7 @@ public class MinioUtil {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除存储bucket
|
* 删除存储bucket
|
||||||
|
*
|
||||||
* @param bucketName 存储bucket名称
|
* @param bucketName 存储bucket名称
|
||||||
* @return Boolean
|
* @return Boolean
|
||||||
*/
|
*/
|
||||||
@@ -86,6 +89,7 @@ public class MinioUtil {
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* description: 上传文件
|
* description: 上传文件
|
||||||
*
|
*
|
||||||
@@ -93,7 +97,6 @@ public class MinioUtil {
|
|||||||
* @param path
|
* @param path
|
||||||
* @param multipartFile
|
* @param multipartFile
|
||||||
* @return: java.lang.String
|
* @return: java.lang.String
|
||||||
|
|
||||||
*/
|
*/
|
||||||
public List<String> uploadBatch(String bucketName, String path, MultipartFile[] multipartFile) {
|
public List<String> uploadBatch(String bucketName, String path, MultipartFile[] multipartFile) {
|
||||||
List<String> names = new ArrayList<>(multipartFile.length);
|
List<String> names = new ArrayList<>(multipartFile.length);
|
||||||
@@ -138,7 +141,6 @@ public class MinioUtil {
|
|||||||
* @param path
|
* @param path
|
||||||
* @param file
|
* @param file
|
||||||
* @return: java.lang.String
|
* @return: java.lang.String
|
||||||
|
|
||||||
*/
|
*/
|
||||||
public String upload(String bucketName, String path, MultipartFile file) {
|
public String upload(String bucketName, String path, MultipartFile file) {
|
||||||
String fileName = file.getOriginalFilename();
|
String fileName = file.getOriginalFilename();
|
||||||
@@ -292,6 +294,7 @@ public class MinioUtil {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查看文件对象
|
* 查看文件对象
|
||||||
|
*
|
||||||
* @param bucketName 存储bucket名称
|
* @param bucketName 存储bucket名称
|
||||||
* @return 存储bucket内文件对象信息
|
* @return 存储bucket内文件对象信息
|
||||||
*/
|
*/
|
||||||
@@ -316,6 +319,7 @@ public class MinioUtil {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除文件对象
|
* 批量删除文件对象
|
||||||
|
*
|
||||||
* @param bucketName 存储bucket名称
|
* @param bucketName 存储bucket名称
|
||||||
* @param objects 对象名称集合
|
* @param objects 对象名称集合
|
||||||
*/
|
*/
|
||||||
@@ -387,6 +391,7 @@ public class MinioUtil {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 将桶名、文件名从url中分离出来
|
* 将桶名、文件名从url中分离出来
|
||||||
|
*
|
||||||
* @param url 带桶名、文件名的url
|
* @param url 带桶名、文件名的url
|
||||||
* @param expiry 图片过期时间
|
* @param expiry 图片过期时间
|
||||||
* @return 可以直接访问的minio图片地址
|
* @return 可以直接访问的minio图片地址
|
||||||
|
|||||||
@@ -45,24 +45,20 @@ public class MultiReadHttpServletRequest extends HttpServletRequestWrapper {
|
|||||||
while ((line = reader.readLine()) != null) {
|
while ((line = reader.readLine()) != null) {
|
||||||
sb.append(line);
|
sb.append(line);
|
||||||
}
|
}
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
} finally {
|
||||||
finally {
|
|
||||||
if (inputStream != null) {
|
if (inputStream != null) {
|
||||||
try {
|
try {
|
||||||
inputStream.close();
|
inputStream.close();
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (reader != null) {
|
if (reader != null) {
|
||||||
try {
|
try {
|
||||||
reader.close();
|
reader.close();
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -72,6 +68,7 @@ public class MultiReadHttpServletRequest extends HttpServletRequestWrapper {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 复制输入流
|
* 复制输入流
|
||||||
|
*
|
||||||
* @param inputStream 请求输入流
|
* @param inputStream 请求输入流
|
||||||
* @return 复制出来的输入流
|
* @return 复制出来的输入流
|
||||||
*/
|
*/
|
||||||
@@ -84,8 +81,7 @@ public class MultiReadHttpServletRequest extends HttpServletRequestWrapper {
|
|||||||
byteArrayOutputStream.write(buffer, 0, len);
|
byteArrayOutputStream.write(buffer, 0, len);
|
||||||
}
|
}
|
||||||
byteArrayOutputStream.flush();
|
byteArrayOutputStream.flush();
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
return new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
|
return new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
package com.ai.da.common.utils;
|
package com.ai.da.common.utils;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
|
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ public class RandomsUtil {
|
|||||||
public static String generateVerifyCode(Long randomStart, Long randomEnd) {
|
public static String generateVerifyCode(Long randomStart, Long randomEnd) {
|
||||||
return String.valueOf(RandomUtil.randomLong(randomStart, randomEnd));
|
return String.valueOf(RandomUtil.randomLong(randomStart, randomEnd));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 生成随机系统图片
|
* 生成随机系统图片
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ public class RequestInfoUtil {
|
|||||||
* @param request
|
* @param request
|
||||||
* @return java.lang.String
|
* @return java.lang.String
|
||||||
* @version 1.0
|
* @version 1.0
|
||||||
*
|
* <p>
|
||||||
*
|
* <p>
|
||||||
* 使用了ng等代理服务器要在ng加以下配置
|
* 使用了ng等代理服务器要在ng加以下配置
|
||||||
* location / {
|
* location / {
|
||||||
* proxy_pass http://127.0.0.1:10678;
|
* proxy_pass http://127.0.0.1:10678;
|
||||||
@@ -20,7 +20,6 @@ public class RequestInfoUtil {
|
|||||||
* proxy_set_header REMOTE-HOST $remote_addr;
|
* proxy_set_header REMOTE-HOST $remote_addr;
|
||||||
* proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
* proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
* }
|
* }
|
||||||
|
|
||||||
*/
|
*/
|
||||||
public static String getIpAddress(HttpServletRequest request) {
|
public static String getIpAddress(HttpServletRequest request) {
|
||||||
String ip = request.getHeader("x-forwarded-for");
|
String ip = request.getHeader("x-forwarded-for");
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ public class RsaDecryptUtils {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 解密
|
* 解密
|
||||||
|
*
|
||||||
* @param args
|
* @param args
|
||||||
* @throws NoSuchAlgorithmException
|
* @throws NoSuchAlgorithmException
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -99,6 +99,7 @@ public class SendEmailUtil {
|
|||||||
throw new BusinessException(e.getMessage());
|
throw new BusinessException(e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Template contractTemplate(Long templateId, String verifyCode, String ip) {
|
private static Template contractTemplate(Long templateId, String verifyCode, String ip) {
|
||||||
Template template = new Template();
|
Template template = new Template();
|
||||||
template.setTemplateID(templateId);
|
template.setTemplateID(templateId);
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ public class AccountController {
|
|||||||
public Response<AccountPreLoginVO> preLogin(@Valid @RequestBody AccountPreLoginDTO accountDTO) {
|
public Response<AccountPreLoginVO> preLogin(@Valid @RequestBody AccountPreLoginDTO accountDTO) {
|
||||||
return Response.success(accountService.preLogin(accountDTO));
|
return Response.success(accountService.preLogin(accountDTO));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "登入")
|
@ApiOperation(value = "登入")
|
||||||
@PostMapping("/login")
|
@PostMapping("/login")
|
||||||
public Response<AccountLoginVO> login(@Valid @RequestBody AccountLoginDTO accountDTO, HttpServletRequest request) {
|
public Response<AccountLoginVO> login(@Valid @RequestBody AccountLoginDTO accountDTO, HttpServletRequest request) {
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ public class DesignController {
|
|||||||
public Response<DesignCollectionVO> reDesignCollection(@Valid @RequestBody ReDesignCollectionDTO reDesignDTO) {
|
public Response<DesignCollectionVO> reDesignCollection(@Valid @RequestBody ReDesignCollectionDTO reDesignDTO) {
|
||||||
return Response.success(designService.reDesignCollection(reDesignDTO));
|
return Response.success(designService.reDesignCollection(reDesignDTO));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "designItem list,刷新用")
|
@ApiOperation(value = "designItem list,刷新用")
|
||||||
@GetMapping("/designItemList")
|
@GetMapping("/designItemList")
|
||||||
public Response<DesignCollectionVO> designItemList(@ApiParam("designId") @RequestParam("designId") Long designId) {
|
public Response<DesignCollectionVO> designItemList(@ApiParam("designId") @RequestParam("designId") Long designId) {
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ public class DesignDetailController {
|
|||||||
response.setData(designService.generateHighDesign(generateHighDesignDTO));
|
response.setData(designService.generateHighDesign(generateHighDesignDTO));
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "删除高级design图片")
|
@ApiOperation(value = "删除高级design图片")
|
||||||
@PostMapping("/deleteHighDesign")
|
@PostMapping("/deleteHighDesign")
|
||||||
public Response<Boolean> deleteHighDesign(@Valid @RequestBody GenerateHighDesignDTO generateHighDesignDTO) {
|
public Response<Boolean> deleteHighDesign(@Valid @RequestBody GenerateHighDesignDTO generateHighDesignDTO) {
|
||||||
@@ -40,6 +41,7 @@ public class DesignDetailController {
|
|||||||
response.setData(designService.deleteHighDesign(generateHighDesignDTO));
|
response.setData(designService.deleteHighDesign(generateHighDesignDTO));
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "查询design详情")
|
@ApiOperation(value = "查询design详情")
|
||||||
@GetMapping("/getDetail")
|
@GetMapping("/getDetail")
|
||||||
public Response<DesignItemDetailVO> getDetail(@ApiParam("designItemId") @RequestParam("designItemId") Long designItemId,
|
public Response<DesignItemDetailVO> getDetail(@ApiParam("designItemId") @RequestParam("designItemId") Long designItemId,
|
||||||
@@ -54,6 +56,7 @@ public class DesignDetailController {
|
|||||||
@ApiParam("操作类型 PREV 上一步 NEXT 下一步") @RequestParam("operateType") String operateType) {
|
@ApiParam("操作类型 PREV 上一步 NEXT 下一步") @RequestParam("operateType") String operateType) {
|
||||||
return Response.success(designItemService.getNextSysElement(id, type, operateType));
|
return Response.success(designItemService.getNextSysElement(id, type, operateType));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "单个design")
|
@ApiOperation(value = "单个design")
|
||||||
@PostMapping("/designSingle")
|
@PostMapping("/designSingle")
|
||||||
public Response<DesignSingleVO> designSingle(@Valid @RequestBody DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO) {
|
public Response<DesignSingleVO> designSingle(@Valid @RequestBody DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO) {
|
||||||
|
|||||||
@@ -95,6 +95,7 @@ public class ElementController {
|
|||||||
public Response<List<PantoneVO>> getRgbByHsvBatch(@RequestBody @Valid List<GetRgbByHsvBatchDTO> rgbByHsvBatch) {
|
public Response<List<PantoneVO>> getRgbByHsvBatch(@RequestBody @Valid List<GetRgbByHsvBatchDTO> rgbByHsvBatch) {
|
||||||
return Response.success(panToneService.getRgbByHsvBatch(rgbByHsvBatch));
|
return Response.success(panToneService.getRgbByHsvBatch(rgbByHsvBatch));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "刷新历史数据")
|
@ApiOperation(value = "刷新历史数据")
|
||||||
@PostMapping("/refreshHistoryData")
|
@PostMapping("/refreshHistoryData")
|
||||||
public Response<Boolean> refreshHistoryData() {
|
public Response<Boolean> refreshHistoryData() {
|
||||||
|
|||||||
@@ -103,11 +103,13 @@ public class LibraryController {
|
|||||||
return Response.success(libraryService.upload(new LibraryUploadDTO(file, level1Type, level2Type,
|
return Response.success(libraryService.upload(new LibraryUploadDTO(file, level1Type, level2Type,
|
||||||
timeZone, md5, high, width, modelType, sex)));
|
timeZone, md5, high, width, modelType, sex)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "保存或者编辑template打点")
|
@ApiOperation(value = "保存或者编辑template打点")
|
||||||
@PostMapping("/saveOrEditTemplatePoint")
|
@PostMapping("/saveOrEditTemplatePoint")
|
||||||
public Response<LibraryModelPointVO> saveOrEditTemplatePoint(@Valid @RequestBody LibraryModelPointDTO libraryModelPoint) {
|
public Response<LibraryModelPointVO> saveOrEditTemplatePoint(@Valid @RequestBody LibraryModelPointDTO libraryModelPoint) {
|
||||||
return Response.success(libraryModelPointService.saveOrEditTemplatePoint(libraryModelPoint));
|
return Response.success(libraryModelPointService.saveOrEditTemplatePoint(libraryModelPoint));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "批量Library修改用户文件名")
|
@ApiOperation(value = "批量Library修改用户文件名")
|
||||||
@PostMapping("/batchUpdateLibraryName")
|
@PostMapping("/batchUpdateLibraryName")
|
||||||
public Response<Boolean> batchUpdateLibraryName(@Valid @RequestBody LibraryUpdateDTO libraryUpdateDTO) {
|
public Response<Boolean> batchUpdateLibraryName(@Valid @RequestBody LibraryUpdateDTO libraryUpdateDTO) {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.ai.da.common.config.mybatis.plus.CommonMapper;
|
|||||||
import com.ai.da.mapper.entity.TDesignPythonOutfit;
|
import com.ai.da.mapper.entity.TDesignPythonOutfit;
|
||||||
import com.ai.da.model.vo.TDesignPythonOutfitVO;
|
import com.ai.da.model.vo.TDesignPythonOutfitVO;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ public class Collection implements Serializable {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户ID
|
* 用户ID
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
private Long accountId;
|
private Long accountId;
|
||||||
|
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ public class CollectionElement implements Serializable {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户ID
|
* 用户ID
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
private Long accountId;
|
private Long accountId;
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ public class DesignHistory implements Serializable {
|
|||||||
private Long id;
|
private Long id;
|
||||||
/**
|
/**
|
||||||
* 用户ID
|
* 用户ID
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
private Long accountId;
|
private Long accountId;
|
||||||
|
|
||||||
|
|||||||
@@ -53,7 +53,4 @@ public class GenerateDetail {
|
|||||||
private Date updateDate;
|
private Date updateDate;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ public class Library implements Serializable {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户ID
|
* 用户ID
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
private Long accountId;
|
private Long accountId;
|
||||||
|
|
||||||
|
|||||||
@@ -44,19 +44,16 @@ public class SysFile implements Serializable {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 名字
|
* 名字
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* md5值
|
* md5值
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
private String md5;
|
private String md5;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 路径 绝对路径
|
* 路径 绝对路径
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
private String url;
|
private String url;
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,8 @@ public class BizJson implements Serializable {
|
|||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
public BizJson() {}
|
public BizJson() {
|
||||||
|
}
|
||||||
|
|
||||||
public BizJson(String name, String key, String value) {
|
public BizJson(String name, String key, String value) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
|
|||||||
@@ -13,8 +13,7 @@ public enum FemalePosition implements IEnumDisplay {
|
|||||||
BLOUSE("Blouse"),
|
BLOUSE("Blouse"),
|
||||||
DRESS("Dress"),
|
DRESS("Dress"),
|
||||||
TROUSERS("Trousers"),
|
TROUSERS("Trousers"),
|
||||||
SKIRT("Skirt")
|
SKIRT("Skirt");
|
||||||
;
|
|
||||||
|
|
||||||
private String value;
|
private String value;
|
||||||
|
|
||||||
|
|||||||
@@ -11,8 +11,7 @@ public enum MalePosition implements IEnumDisplay {
|
|||||||
|
|
||||||
TOPS("Tops"),
|
TOPS("Tops"),
|
||||||
BOTTOMS("Bottoms"),
|
BOTTOMS("Bottoms"),
|
||||||
OUTWEAR("Outwear")
|
OUTWEAR("Outwear");
|
||||||
;
|
|
||||||
|
|
||||||
private String value;
|
private String value;
|
||||||
|
|
||||||
|
|||||||
@@ -10,8 +10,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
|
|||||||
public enum MannequinType implements IEnumDisplay {
|
public enum MannequinType implements IEnumDisplay {
|
||||||
|
|
||||||
SYSTEM("System"),
|
SYSTEM("System"),
|
||||||
LIBRARY("Library")
|
LIBRARY("Library");
|
||||||
;
|
|
||||||
|
|
||||||
private String value;
|
private String value;
|
||||||
|
|
||||||
|
|||||||
@@ -11,8 +11,7 @@ public enum ModelType implements IEnumDisplay {
|
|||||||
|
|
||||||
SYSTEM("System"),
|
SYSTEM("System"),
|
||||||
|
|
||||||
LIBRARY("Library")
|
LIBRARY("Library");
|
||||||
;
|
|
||||||
|
|
||||||
private String value;
|
private String value;
|
||||||
|
|
||||||
|
|||||||
@@ -41,5 +41,4 @@ public class DesignLibraryModelPointVO implements Serializable {
|
|||||||
private String templateUrl;
|
private String templateUrl;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import lombok.AllArgsConstructor;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@Data
|
@Data
|
||||||
@ApiModel("HistoryUpdateVO-响应")
|
@ApiModel("HistoryUpdateVO-响应")
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ public class LibraryVo implements Serializable {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户ID
|
* 用户ID
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
private Long accountId;
|
private Long accountId;
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import lombok.Data;
|
|||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
import javax.validation.constraints.NotBlank;
|
import javax.validation.constraints.NotBlank;
|
||||||
|
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@Data
|
@Data
|
||||||
@ApiModel("潘通-响应")
|
@ApiModel("潘通-响应")
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ public class SysFileVO implements Serializable {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* md5值
|
* md5值
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
private String md5;
|
private String md5;
|
||||||
|
|
||||||
|
|||||||
@@ -1331,6 +1331,7 @@ public class PythonService {
|
|||||||
sysFileIds.add(sysFileId);
|
sysFileIds.add(sysFileId);
|
||||||
return sysFileService.getById(sysFileId);
|
return sysFileService.getById(sysFileId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private SysFileVO getRandomSysFileByAttributeRetrieval(List<String> level2TypeList, List<SysFileVO> sysFileVo, List<Long> sysFileIds) {
|
private SysFileVO getRandomSysFileByAttributeRetrieval(List<String> level2TypeList, List<SysFileVO> sysFileVo, List<Long> sysFileIds) {
|
||||||
sysFileVo = sysFileVo.stream().filter(
|
sysFileVo = sysFileVo.stream().filter(
|
||||||
f -> level2TypeList.contains(f.getLevel2Type()) && (!sysFileIds.contains(f.getId())))
|
f -> level2TypeList.contains(f.getLevel2Type()) && (!sysFileIds.contains(f.getId())))
|
||||||
@@ -1550,6 +1551,7 @@ public class PythonService {
|
|||||||
//生成失败
|
//生成失败
|
||||||
throw new BusinessException("system error!");
|
throw new BusinessException("system error!");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 生成 attribute_retrieval
|
* 生成 attribute_retrieval
|
||||||
*
|
*
|
||||||
@@ -1603,6 +1605,7 @@ public class PythonService {
|
|||||||
//生成失败
|
//生成失败
|
||||||
throw new BusinessException("system error!");
|
throw new BusinessException("system error!");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static DesignAttributeRetrievalDTO resolveDesignAttributeRetrievalDTO(String bodyStr) {
|
private static DesignAttributeRetrievalDTO resolveDesignAttributeRetrievalDTO(String bodyStr) {
|
||||||
DesignAttributeRetrievalDTO response = new DesignAttributeRetrievalDTO();
|
DesignAttributeRetrievalDTO response = new DesignAttributeRetrievalDTO();
|
||||||
JSONObject jsonObject = JSON.parseObject(bodyStr);
|
JSONObject jsonObject = JSON.parseObject(bodyStr);
|
||||||
@@ -1658,6 +1661,7 @@ public class PythonService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 组装和计算设计包括图层的单品的参数,不需要priority
|
* 组装和计算设计包括图层的单品的参数,不需要priority
|
||||||
|
*
|
||||||
* @param designSingleDTO
|
* @param designSingleDTO
|
||||||
* @param singleOverall
|
* @param singleOverall
|
||||||
* @param switchCategory
|
* @param switchCategory
|
||||||
@@ -1702,6 +1706,7 @@ public class PythonService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 设计包括图层的单品,每次只针对一个单品
|
* 设计包括图层的单品,每次只针对一个单品
|
||||||
|
*
|
||||||
* @param designSingleIncludeLayersDTO
|
* @param designSingleIncludeLayersDTO
|
||||||
* @param designLibraryModelPoint
|
* @param designLibraryModelPoint
|
||||||
* @return
|
* @return
|
||||||
@@ -1736,7 +1741,6 @@ public class PythonService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private DesignPythonItemPrint resolveDesignSinglePrint(DesignSinglePrintDTO printObject, String clothesPath) {
|
private DesignPythonItemPrint resolveDesignSinglePrint(DesignSinglePrintDTO printObject, String clothesPath) {
|
||||||
// 没有印花时的参数设置
|
// 没有印花时的参数设置
|
||||||
if (printObject.getIfSingle().equals(Boolean.FALSE) && CollectionUtil.isEmpty(printObject.getPrints())) {
|
if (printObject.getIfSingle().equals(Boolean.FALSE) && CollectionUtil.isEmpty(printObject.getPrints())) {
|
||||||
@@ -1808,6 +1812,7 @@ public class PythonService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 设计包括图层的单品,不用指定save_name和priority
|
* 设计包括图层的单品,不用指定save_name和priority
|
||||||
|
*
|
||||||
* @param singleOverall
|
* @param singleOverall
|
||||||
* @param switchCategory
|
* @param switchCategory
|
||||||
* @param designLibraryModelPoint
|
* @param designLibraryModelPoint
|
||||||
@@ -1968,7 +1973,6 @@ public class PythonService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public String generateSketchCaption(String url) {
|
public String generateSketchCaption(String url) {
|
||||||
//限流校验
|
//限流校验
|
||||||
AccessLimitUtils.validate("generateSketchCaption", 5);
|
AccessLimitUtils.validate("generateSketchCaption", 5);
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.ai.da.mapper.entity.Library;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class DesignPythonObjects {
|
public class DesignPythonObjects {
|
||||||
private String process_id;
|
private String process_id;
|
||||||
|
|||||||
@@ -20,18 +20,23 @@ public interface AccountService extends IService<Account> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 账户预先登入
|
* 账户预先登入
|
||||||
|
*
|
||||||
* @param accountDTO
|
* @param accountDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
AccountPreLoginVO preLogin(AccountPreLoginDTO accountDTO);
|
AccountPreLoginVO preLogin(AccountPreLoginDTO accountDTO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 账户登入
|
* 账户登入
|
||||||
|
*
|
||||||
* @param accountLoginDTO
|
* @param accountLoginDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
AccountLoginVO login(AccountLoginDTO accountLoginDTO, HttpServletRequest request);
|
AccountLoginVO login(AccountLoginDTO accountLoginDTO, HttpServletRequest request);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 绑定邮箱
|
* 绑定邮箱
|
||||||
|
*
|
||||||
* @param accountBindEmailDTO
|
* @param accountBindEmailDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -39,36 +44,47 @@ public interface AccountService extends IService<Account> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 忘记密码
|
* 忘记密码
|
||||||
|
*
|
||||||
* @param accountDTO
|
* @param accountDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Boolean forgetPwd(AccountRegisterDTO accountDTO);
|
Boolean forgetPwd(AccountRegisterDTO accountDTO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 发送邮件
|
* 发送邮件
|
||||||
|
*
|
||||||
* @param emailSendDTO
|
* @param emailSendDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Boolean sendEmail(EmailSendDTO emailSendDTO);
|
Boolean sendEmail(EmailSendDTO emailSendDTO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 登出
|
* 登出
|
||||||
|
*
|
||||||
* @param accountLogoutDTO
|
* @param accountLogoutDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Boolean logout(AccountLogoutDTO accountLogoutDTO);
|
Boolean logout(AccountLogoutDTO accountLogoutDTO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 判断是否登出 Boolean为登入
|
* 判断是否登出 Boolean为登入
|
||||||
|
*
|
||||||
* @param accountLogoutDTO
|
* @param accountLogoutDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Boolean isLogin(AccountLogoutDTO accountLogoutDTO);
|
Boolean isLogin(AccountLogoutDTO accountLogoutDTO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加用户信息
|
* 添加用户信息
|
||||||
|
*
|
||||||
* @param accountAddDTO
|
* @param accountAddDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Boolean addUser(AccountAddDTO accountAddDTO);
|
Boolean addUser(AccountAddDTO accountAddDTO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 编辑用户信息
|
* 编辑用户信息
|
||||||
|
*
|
||||||
* @param accountEditDTO
|
* @param accountEditDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ public interface CollectionElementService extends IService<CollectionElement> {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
void delete(Long id);
|
void delete(Long id);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除元素图片
|
* 删除元素图片
|
||||||
*
|
*
|
||||||
@@ -38,6 +39,7 @@ public interface CollectionElementService extends IService<CollectionElement> {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
void batchDelete(List<Long> ids);
|
void batchDelete(List<Long> ids);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 生产印花图片
|
* 生产印花图片
|
||||||
*
|
*
|
||||||
@@ -45,6 +47,7 @@ public interface CollectionElementService extends IService<CollectionElement> {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
CollectionGeneratePrintVO generatePrint(CollectionGeneratePrintDTO generatePrintDTO);
|
CollectionGeneratePrintVO generatePrint(CollectionGeneratePrintDTO generatePrintDTO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 保存印花图片
|
* 保存印花图片
|
||||||
*
|
*
|
||||||
@@ -52,6 +55,7 @@ public interface CollectionElementService extends IService<CollectionElement> {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Boolean savePrint(CollectionSavePrintDTO savePrintDTO);
|
Boolean savePrint(CollectionSavePrintDTO savePrintDTO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过element保存library
|
* 通过element保存library
|
||||||
*
|
*
|
||||||
@@ -59,7 +63,9 @@ public interface CollectionElementService extends IService<CollectionElement> {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Boolean saveLibraryByCollectionElement(List<CollectionElement> elements, String timeZone);
|
Boolean saveLibraryByCollectionElement(List<CollectionElement> elements, String timeZone);
|
||||||
|
|
||||||
Boolean saveLibraryByCollectionElement(List<CollectionElement> elements, String timeZone, String modelSex);
|
Boolean saveLibraryByCollectionElement(List<CollectionElement> elements, String timeZone, String modelSex);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验element
|
* 校验element
|
||||||
*
|
*
|
||||||
@@ -67,6 +73,7 @@ public interface CollectionElementService extends IService<CollectionElement> {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
ValidateElementVO validateElement(DesignCollectionDTO designDTO);
|
ValidateElementVO validateElement(DesignCollectionDTO designDTO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 编辑
|
* 编辑
|
||||||
*
|
*
|
||||||
@@ -74,6 +81,7 @@ public interface CollectionElementService extends IService<CollectionElement> {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
void editSketchBoardsElement(ValidateElementVO elementVO, List<CollectionSketchDTO> sketchBoards);
|
void editSketchBoardsElement(ValidateElementVO elementVO, List<CollectionSketchDTO> sketchBoards);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 编辑
|
* 编辑
|
||||||
*
|
*
|
||||||
@@ -81,6 +89,7 @@ public interface CollectionElementService extends IService<CollectionElement> {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
void editPrintBoardsElement(ValidateElementVO elementVO, List<DesignCollectionPrintElementDTO> printBoards);
|
void editPrintBoardsElement(ValidateElementVO elementVO, List<DesignCollectionPrintElementDTO> printBoards);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 关联element和collection
|
* 关联element和collection
|
||||||
*
|
*
|
||||||
@@ -110,6 +119,7 @@ public interface CollectionElementService extends IService<CollectionElement> {
|
|||||||
List<CollectionElement> getByOnlyCollectionId(Long collectionId);
|
List<CollectionElement> getByOnlyCollectionId(Long collectionId);
|
||||||
|
|
||||||
DesignLibraryModelPointVO calculateTemplatePoint(LibraryModelPoint modelPoint, Integer high, Integer width, String templateUrl);
|
DesignLibraryModelPointVO calculateTemplatePoint(LibraryModelPoint modelPoint, Integer high, Integer width, String templateUrl);
|
||||||
|
|
||||||
DesignLibraryModelPointVO calculateTemplatePointTemplate(LibraryModelPoint modelPoint, Integer high, Integer width, String templateUrl);
|
DesignLibraryModelPointVO calculateTemplatePointTemplate(LibraryModelPoint modelPoint, Integer high, Integer width, String templateUrl);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -119,6 +129,7 @@ public interface CollectionElementService extends IService<CollectionElement> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 当level2Type发生改变时,修改levelType
|
* 当level2Type发生改变时,修改levelType
|
||||||
|
*
|
||||||
* @param elementId
|
* @param elementId
|
||||||
* @param level2Type
|
* @param level2Type
|
||||||
* @return
|
* @return
|
||||||
|
|||||||
@@ -23,10 +23,12 @@ public interface CollectionService extends IService<Collection> {
|
|||||||
* 保存collection
|
* 保存collection
|
||||||
*/
|
*/
|
||||||
Long saveCollection(Long accountId, String timeZone, String moodTemplateId);
|
Long saveCollection(Long accountId, String timeZone, String moodTemplateId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据主键查询
|
* 根据主键查询
|
||||||
*/
|
*/
|
||||||
Collection findById(Long id);
|
Collection findById(Long id);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询choose关联的collection
|
* 查询choose关联的collection
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ public interface DesignItemService extends IService<DesignItem> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 切换系统elemnt
|
* 切换系统elemnt
|
||||||
|
*
|
||||||
* @param id
|
* @param id
|
||||||
* @param type
|
* @param type
|
||||||
*/
|
*/
|
||||||
@@ -36,12 +37,14 @@ public interface DesignItemService extends IService<DesignItem> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 单个design
|
* 单个design
|
||||||
|
*
|
||||||
* @param designSingleDTO
|
* @param designSingleDTO
|
||||||
*/
|
*/
|
||||||
DesignCollectionItemVO designSingle(DesignSingleDTO designSingleDTO);
|
DesignCollectionItemVO designSingle(DesignSingleDTO designSingleDTO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* print打点
|
* print打点
|
||||||
|
*
|
||||||
* @param designSingleDTO
|
* @param designSingleDTO
|
||||||
*/
|
*/
|
||||||
String printDot(DesignSingleDTO designSingleDTO);
|
String printDot(DesignSingleDTO designSingleDTO);
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import java.math.BigDecimal;
|
|||||||
public interface DesignService extends IService<Design> {
|
public interface DesignService extends IService<Design> {
|
||||||
/**
|
/**
|
||||||
* design
|
* design
|
||||||
|
*
|
||||||
* @param designDTO
|
* @param designDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -27,12 +28,15 @@ public interface DesignService extends IService<Design> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* redesign
|
* redesign
|
||||||
|
*
|
||||||
* @param reDesignDTO
|
* @param reDesignDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
DesignCollectionVO reDesignCollection(ReDesignCollectionDTO reDesignDTO);
|
DesignCollectionVO reDesignCollection(ReDesignCollectionDTO reDesignDTO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* redesign
|
* redesign
|
||||||
|
*
|
||||||
* @param designId
|
* @param designId
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -45,6 +49,7 @@ public interface DesignService extends IService<Design> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* like
|
* like
|
||||||
|
*
|
||||||
* @param designLikeDTO
|
* @param designLikeDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -52,6 +57,7 @@ public interface DesignService extends IService<Design> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* dislike
|
* dislike
|
||||||
|
*
|
||||||
* @param disDesignLikeDTO
|
* @param disDesignLikeDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -59,6 +65,7 @@ public interface DesignService extends IService<Design> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* generateHighDesign
|
* generateHighDesign
|
||||||
|
*
|
||||||
* @param generateHighDesignDTO
|
* @param generateHighDesignDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -66,6 +73,7 @@ public interface DesignService extends IService<Design> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* deleteHighDesign
|
* deleteHighDesign
|
||||||
|
*
|
||||||
* @param generateHighDesignDTO
|
* @param generateHighDesignDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -73,6 +81,7 @@ public interface DesignService extends IService<Design> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* detail
|
* detail
|
||||||
|
*
|
||||||
* @param designItemId
|
* @param designItemId
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ public interface ITDesignPythonOutfitDetailService extends IService<TDesignPytho
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过DesignPythonOutfitId获取designPythonOutfitDetail
|
* 通过DesignPythonOutfitId获取designPythonOutfitDetail
|
||||||
|
*
|
||||||
* @param designPythonOutfitId
|
* @param designPythonOutfitId
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ public interface LibraryModelPointService extends IService<LibraryModelPoint> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 模特打点
|
* 模特打点
|
||||||
|
*
|
||||||
* @param modelsDotDTO
|
* @param modelsDotDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import java.util.List;
|
|||||||
public interface LibraryService extends IService<Library> {
|
public interface LibraryService extends IService<Library> {
|
||||||
/**
|
/**
|
||||||
* 根据用户id和一等级查询
|
* 根据用户id和一等级查询
|
||||||
|
*
|
||||||
* @param accountId
|
* @param accountId
|
||||||
* @param level1Types
|
* @param level1Types
|
||||||
* @return
|
* @return
|
||||||
@@ -31,6 +32,7 @@ public interface LibraryService extends IService<Library> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页查询library
|
* 分页查询library
|
||||||
|
*
|
||||||
* @param query
|
* @param query
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -46,24 +48,28 @@ public interface LibraryService extends IService<Library> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 编辑library 文件名
|
* 编辑library 文件名
|
||||||
|
*
|
||||||
* @param libraryUpdateDTO
|
* @param libraryUpdateDTO
|
||||||
*/
|
*/
|
||||||
void updateLibraryName(LibraryUpdateDTO libraryUpdateDTO);
|
void updateLibraryName(LibraryUpdateDTO libraryUpdateDTO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 跟进ids批量查询
|
* 跟进ids批量查询
|
||||||
|
*
|
||||||
* @param ids
|
* @param ids
|
||||||
*/
|
*/
|
||||||
List<Library> getByIds(List<Long> ids);
|
List<Library> getByIds(List<Long> ids);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据md5集合查询
|
* 根据md5集合查询
|
||||||
|
*
|
||||||
* @param md5List
|
* @param md5List
|
||||||
*/
|
*/
|
||||||
List<Library> getByMD5List(List<String> md5List);
|
List<Library> getByMD5List(List<String> md5List);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据集合url查询
|
* 根据集合url查询
|
||||||
|
*
|
||||||
* @param urlList
|
* @param urlList
|
||||||
*/
|
*/
|
||||||
List<LibraryVo> getByUrlList(List<String> urlList, Long userId);
|
List<LibraryVo> getByUrlList(List<String> urlList, Long userId);
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ public interface PanToneService extends IService<PanTone> {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
PantoneVO getByHSV(Integer h, Integer s, Integer v);
|
PantoneVO getByHSV(Integer h, Integer s, Integer v);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据TCX值查询
|
* 根据TCX值查询
|
||||||
*
|
*
|
||||||
@@ -35,6 +36,7 @@ public interface PanToneService extends IService<PanTone> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据TRGB值查询
|
* 根据TRGB值查询
|
||||||
|
*
|
||||||
* @param r
|
* @param r
|
||||||
* @param g
|
* @param g
|
||||||
* @param b
|
* @param b
|
||||||
@@ -48,6 +50,7 @@ public interface PanToneService extends IService<PanTone> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据hsv批量查询
|
* 根据hsv批量查询
|
||||||
|
*
|
||||||
* @param rgbByHsvBatch
|
* @param rgbByHsvBatch
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package com.ai.da.service;
|
package com.ai.da.service;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import com.ai.da.mapper.entity.PythonTAllInfo;
|
import com.ai.da.mapper.entity.PythonTAllInfo;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
|
||||||
|
|||||||
@@ -38,18 +38,23 @@ public interface SysFileService extends IService<SysFile> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据id获取系统文件
|
* 根据id获取系统文件
|
||||||
|
*
|
||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
SysFileVO getById(Long id);
|
SysFileVO getById(Long id);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据level1Type获取系统文件
|
* 根据level1Type获取系统文件
|
||||||
|
*
|
||||||
* @param level2Type
|
* @param level2Type
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
List<SysFileVO> getByLevel2Type(String level2Type);
|
List<SysFileVO> getByLevel2Type(String level2Type);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据集合url查询
|
* 根据集合url查询
|
||||||
|
*
|
||||||
* @param urlList
|
* @param urlList
|
||||||
*/
|
*/
|
||||||
List<SysFileVO> getByUrlList(List<String> urlList);
|
List<SysFileVO> getByUrlList(List<String> urlList);
|
||||||
|
|||||||
@@ -16,5 +16,6 @@ import java.util.List;
|
|||||||
*/
|
*/
|
||||||
public interface TCollectionElementRelationService extends IService<TCollectionElementRelation> {
|
public interface TCollectionElementRelationService extends IService<TCollectionElementRelation> {
|
||||||
void deleteByCollectionId(Long collectionId);
|
void deleteByCollectionId(Long collectionId);
|
||||||
|
|
||||||
List<Long> getByCollectionId(Long collectionId);
|
List<Long> getByCollectionId(Long collectionId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ public interface UserLikeGroupService extends IService<UserLikeGroup> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* choose
|
* choose
|
||||||
|
*
|
||||||
* @param userGroupId
|
* @param userGroupId
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -514,6 +514,7 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
|
|||||||
elementVO.setModelSex(designDTO.getModelSex());
|
elementVO.setModelSex(designDTO.getModelSex());
|
||||||
return elementVO;
|
return elementVO;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DesignLibraryModelPointVO calculateTemplatePoint(LibraryModelPoint modelPoint, Integer high, Integer width, String templateUrl) {
|
public DesignLibraryModelPointVO calculateTemplatePoint(LibraryModelPoint modelPoint, Integer high, Integer width, String templateUrl) {
|
||||||
DesignLibraryModelPointVO libraryModelPoint = new DesignLibraryModelPointVO();
|
DesignLibraryModelPointVO libraryModelPoint = new DesignLibraryModelPointVO();
|
||||||
@@ -547,6 +548,7 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
|
|||||||
libraryModelPoint.setTemplateUrl(templateUrl);
|
libraryModelPoint.setTemplateUrl(templateUrl);
|
||||||
return libraryModelPoint;
|
return libraryModelPoint;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<BigDecimal> calculateTemplatePointOne(String template, Integer high, Integer width) {
|
private List<BigDecimal> calculateTemplatePointOne(String template, Integer high, Integer width) {
|
||||||
List<BigDecimal> originRatioList = JSON.parseObject(template, List.class);
|
List<BigDecimal> originRatioList = JSON.parseObject(template, List.class);
|
||||||
originRatioList.set(0, originRatioList.get(0).multiply(BigDecimal.valueOf(width)));
|
originRatioList.set(0, originRatioList.get(0).multiply(BigDecimal.valueOf(width)));
|
||||||
@@ -591,6 +593,7 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void validateDesignType(List<DesignCollectionElementDTO> collectionElements, String msg) {
|
private void validateDesignType(List<DesignCollectionElementDTO> collectionElements, String msg) {
|
||||||
Boolean result = collectionElements.stream().filter(mood -> StringUtils.isEmpty(mood.getDesignType())).findFirst().isPresent();
|
Boolean result = collectionElements.stream().filter(mood -> StringUtils.isEmpty(mood.getDesignType())).findFirst().isPresent();
|
||||||
if (result) {
|
if (result) {
|
||||||
@@ -612,6 +615,7 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
|
|||||||
elementVO.setSketchBoardElements(sketchBoardElements);
|
elementVO.setSketchBoardElements(sketchBoardElements);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void editPrintBoardsElement(ValidateElementVO elementVO, List<DesignCollectionPrintElementDTO> printBoards) {
|
public void editPrintBoardsElement(ValidateElementVO elementVO, List<DesignCollectionPrintElementDTO> printBoards) {
|
||||||
if (CollectionUtil.isNotEmpty(printBoards)) {
|
if (CollectionUtil.isNotEmpty(printBoards)) {
|
||||||
@@ -652,6 +656,7 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
|
|||||||
}
|
}
|
||||||
return CopyUtil.copyList(colorElements, CollectionElementVO.class);
|
return CopyUtil.copyList(colorElements, CollectionElementVO.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void refreshHistoryData() {
|
public void refreshHistoryData() {
|
||||||
//幂等
|
//幂等
|
||||||
@@ -718,6 +723,7 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
|
|||||||
queryWrapper.in("id", elementIds);
|
queryWrapper.in("id", elementIds);
|
||||||
return collectionElementMapper.selectList(queryWrapper);
|
return collectionElementMapper.selectList(queryWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<CollectionElement> getByOnlyCollectionId(Long collectionId) {
|
public List<CollectionElement> getByOnlyCollectionId(Long collectionId) {
|
||||||
QueryWrapper<CollectionElement> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<CollectionElement> queryWrapper = new QueryWrapper<>();
|
||||||
|
|||||||
@@ -123,6 +123,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
|
|||||||
});
|
});
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<CollectionColorVO> resolveColorBoard(List<CollectionElement> collectionElements) {
|
private List<CollectionColorVO> resolveColorBoard(List<CollectionElement> collectionElements) {
|
||||||
return CopyUtil.copyList(collectionElements, CollectionColorVO.class, (o, d) -> {
|
return CopyUtil.copyList(collectionElements, CollectionColorVO.class, (o, d) -> {
|
||||||
String name = o.getName();
|
String name = o.getName();
|
||||||
|
|||||||
@@ -183,6 +183,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
|
|||||||
designItem.setDesignUrl(response.getDesignItemUrl());
|
designItem.setDesignUrl(response.getDesignItemUrl());
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
private LibraryModelPointVO resloveVoByModelPoint(LibraryModelPoint modelPoint, Library library) {
|
private LibraryModelPointVO resloveVoByModelPoint(LibraryModelPoint modelPoint, Library library) {
|
||||||
LibraryModelPointVO libraryModelPointVO = CopyUtil.copyObject(modelPoint, LibraryModelPointVO.class);
|
LibraryModelPointVO libraryModelPointVO = CopyUtil.copyObject(modelPoint, LibraryModelPointVO.class);
|
||||||
libraryModelPointVO.setTemplateId(modelPoint.getId());
|
libraryModelPointVO.setTemplateId(modelPoint.getId());
|
||||||
@@ -230,6 +231,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private DesignCollectionItemVO saveSingleDesignItemAndDetail(DesignPythonObjects pythonObjects
|
private DesignCollectionItemVO saveSingleDesignItemAndDetail(DesignPythonObjects pythonObjects
|
||||||
, Long designId, Long designItemId, Long collectionId, AuthPrincipalVo userInfo, String timeZone) {
|
, Long designId, Long designItemId, Long collectionId, AuthPrincipalVo userInfo, String timeZone) {
|
||||||
DesignCollectionItemVO response = new DesignCollectionItemVO();
|
DesignCollectionItemVO response = new DesignCollectionItemVO();
|
||||||
@@ -536,7 +538,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
|
|||||||
// 图片用于修改前后的一键对比
|
// 图片用于修改前后的一键对比
|
||||||
designSingleVO.setDesignItemUrl(designItemUrl);
|
designSingleVO.setDesignItemUrl(designItemUrl);
|
||||||
// 当前全身图
|
// 当前全身图
|
||||||
designSingleVO.setCurrentFullBodyView(minioUtil.getPresignedUrl(currentFullBodyView,24 * 60));;
|
designSingleVO.setCurrentFullBodyView(minioUtil.getPresignedUrl(currentFullBodyView, 24 * 60));
|
||||||
|
;
|
||||||
designSingleVO.setClothes(clothes);
|
designSingleVO.setClothes(clothes);
|
||||||
|
|
||||||
designSingleItemDTOList.forEach(singleItem -> {
|
designSingleItemDTOList.forEach(singleItem -> {
|
||||||
|
|||||||
@@ -967,6 +967,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 避免多次连接数据,所这里一次查多条颜色并利用designItemDetailId保持颜色与vo的对应关系
|
* 避免多次连接数据,所这里一次查多条颜色并利用designItemDetailId保持颜色与vo的对应关系
|
||||||
|
*
|
||||||
* @param designItemDetails
|
* @param designItemDetails
|
||||||
* @param designItemDetailVO
|
* @param designItemDetailVO
|
||||||
* @return
|
* @return
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ public class LibraryModelPointServiceImpl extends ServiceImpl<LibraryModelPointM
|
|||||||
}
|
}
|
||||||
return libraryModelPointVO;
|
return libraryModelPointVO;
|
||||||
}
|
}
|
||||||
|
|
||||||
private LibraryModelPoint resolvePoint(LibraryModelPointDTO libraryModelPointDTO) {
|
private LibraryModelPoint resolvePoint(LibraryModelPointDTO libraryModelPointDTO) {
|
||||||
LibraryModelPoint libraryModelPoint = CopyUtil.copyObject(libraryModelPointDTO, LibraryModelPoint.class);
|
LibraryModelPoint libraryModelPoint = CopyUtil.copyObject(libraryModelPointDTO, LibraryModelPoint.class);
|
||||||
libraryModelPoint.setRelationId(libraryModelPointDTO.getLibraryId());
|
libraryModelPoint.setRelationId(libraryModelPointDTO.getLibraryId());
|
||||||
@@ -111,6 +112,7 @@ public class LibraryModelPointServiceImpl extends ServiceImpl<LibraryModelPointM
|
|||||||
d.setWaistbandLeft(JSON.parseObject(o.getWaistbandLeft(), List.class));
|
d.setWaistbandLeft(JSON.parseObject(o.getWaistbandLeft(), List.class));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String modelsDot(ModelsDotDTO modelsDotDTO) {
|
public String modelsDot(ModelsDotDTO modelsDotDTO) {
|
||||||
DesignPythonObjects objects = pythonService.covertModelsDotParam(
|
DesignPythonObjects objects = pythonService.covertModelsDotParam(
|
||||||
|
|||||||
@@ -178,6 +178,7 @@ public class PanToneServiceImpl extends ServiceImpl<PanToneMapper, PanTone> impl
|
|||||||
pantoneVO.setId(panTone.getPantoneIndex());
|
pantoneVO.setId(panTone.getPantoneIndex());
|
||||||
return pantoneVO;
|
return pantoneVO;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<PantoneVO> coverPanToneToVoList(List<PanTone> panTones
|
private List<PantoneVO> coverPanToneToVoList(List<PanTone> panTones
|
||||||
, Map<Integer, Integer> indexToValue, Map<Integer, GetRgbByHsvBatchDTO> valueToHsv,
|
, Map<Integer, Integer> indexToValue, Map<Integer, GetRgbByHsvBatchDTO> valueToHsv,
|
||||||
List<GetRgbByHsvBatchDTO> hsvBatch) {
|
List<GetRgbByHsvBatchDTO> hsvBatch) {
|
||||||
|
|||||||
@@ -71,12 +71,14 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
|
|||||||
}
|
}
|
||||||
saveMany(initSysFile(allFile, idMap));
|
saveMany(initSysFile(allFile, idMap));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void clearCacheSysFileData() {
|
private void clearCacheSysFileData() {
|
||||||
LocalCacheUtils.clearAllMaxMinValueCache();
|
LocalCacheUtils.clearAllMaxMinValueCache();
|
||||||
LocalCacheUtils.clearAllSysFileCache();
|
LocalCacheUtils.clearAllSysFileCache();
|
||||||
LocalCacheUtils.clearAllSysFileCacheByLevel2Type();
|
LocalCacheUtils.clearAllSysFileCacheByLevel2Type();
|
||||||
log.info("初始化系统文件删除删除系统文件缓存完毕#####");
|
log.info("初始化系统文件删除删除系统文件缓存完毕#####");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void deleteAllSysFileData() {
|
private void deleteAllSysFileData() {
|
||||||
AtomicInteger process = new AtomicInteger();
|
AtomicInteger process = new AtomicInteger();
|
||||||
while (true) {
|
while (true) {
|
||||||
@@ -93,6 +95,7 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<SysFile> initSysFile(List<File> files, Map<String, Long> idMap) {
|
private List<SysFile> initSysFile(List<File> files, Map<String, Long> idMap) {
|
||||||
List<SysFile> sysFiles = Lists.newArrayList();
|
List<SysFile> sysFiles = Lists.newArrayList();
|
||||||
files.forEach(file -> {
|
files.forEach(file -> {
|
||||||
@@ -120,6 +123,7 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
|
|||||||
});
|
});
|
||||||
return sysFiles;
|
return sysFiles;
|
||||||
}
|
}
|
||||||
|
|
||||||
private String calculateLevel1Type(String filePath) {
|
private String calculateLevel1Type(String filePath) {
|
||||||
String[] split = filePath.split("/");
|
String[] split = filePath.split("/");
|
||||||
//一级目录
|
//一级目录
|
||||||
@@ -129,6 +133,7 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
|
|||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
private String calculateLevel2Type(String filePath) {
|
private String calculateLevel2Type(String filePath) {
|
||||||
String[] split = filePath.split("/");
|
String[] split = filePath.split("/");
|
||||||
//一级目录
|
//一级目录
|
||||||
@@ -138,12 +143,14 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
|
|||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
private Long getIdByLevel2Type(String level2Type, Map<String, Long> IdMp) {
|
private Long getIdByLevel2Type(String level2Type, Map<String, Long> IdMp) {
|
||||||
Long id = IdMp.get(level2Type);
|
Long id = IdMp.get(level2Type);
|
||||||
Long newId = id + 1;
|
Long newId = id + 1;
|
||||||
IdMp.put(level2Type, newId);
|
IdMp.put(level2Type, newId);
|
||||||
return newId;
|
return newId;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, Long> initIdValueByLevel2Type() {
|
private Map<String, Long> initIdValueByLevel2Type() {
|
||||||
//每个类型分配100000 十万个位置
|
//每个类型分配100000 十万个位置
|
||||||
Map<String, Long> idMap = Maps.newHashMap();
|
Map<String, Long> idMap = Maps.newHashMap();
|
||||||
@@ -230,6 +237,7 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
|
|||||||
SysFile sysFile = sysFileMapper.selectOne(queryWrapper);
|
SysFile sysFile = sysFileMapper.selectOne(queryWrapper);
|
||||||
return sysFile.getId();
|
return sysFile.getId();
|
||||||
}
|
}
|
||||||
|
|
||||||
private Long minId(String level2Type, String modelSex) {
|
private Long minId(String level2Type, String modelSex) {
|
||||||
QueryWrapper<SysFile> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<SysFile> queryWrapper = new QueryWrapper<>();
|
||||||
queryWrapper.eq("level2_type", level2Type);
|
queryWrapper.eq("level2_type", level2Type);
|
||||||
@@ -238,6 +246,7 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
|
|||||||
SysFile sysFile = sysFileMapper.selectOne(queryWrapper);
|
SysFile sysFile = sysFileMapper.selectOne(queryWrapper);
|
||||||
return sysFile.getId();
|
return sysFile.getId();
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean saveMany(List<SysFile> sysFiles) {
|
private boolean saveMany(List<SysFile> sysFiles) {
|
||||||
if (!this.saveBatch(sysFiles)) {
|
if (!this.saveBatch(sysFiles)) {
|
||||||
throw new BusinessException("save system file failed!");
|
throw new BusinessException("save system file failed!");
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ public class TDesignPythonOutfitDetailServiceImpl extends ServiceImpl<TDesignPyt
|
|||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private MinioUtil minIoUtil;
|
private MinioUtil minIoUtil;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IPage<TDesignPythonOutfitDetailVO> selectTDesignPythonOutfitDetailPage(IPage<TDesignPythonOutfitDetailVO> page, TDesignPythonOutfitDetailVO tDesignPythonOutfitDetail) {
|
public IPage<TDesignPythonOutfitDetailVO> selectTDesignPythonOutfitDetailPage(IPage<TDesignPythonOutfitDetailVO> page, TDesignPythonOutfitDetailVO tDesignPythonOutfitDetail) {
|
||||||
return page.setRecords(baseMapper.selectTDesignPythonOutfitDetailPage(page, tDesignPythonOutfitDetail));
|
return page.setRecords(baseMapper.selectTDesignPythonOutfitDetailPage(page, tDesignPythonOutfitDetail));
|
||||||
|
|||||||
@@ -81,6 +81,7 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
|
|||||||
public IPage<WorkspaceVO> selectWorkspacePage(IPage<WorkspaceVO> page, WorkspaceVO workspace) {
|
public IPage<WorkspaceVO> selectWorkspacePage(IPage<WorkspaceVO> page, WorkspaceVO workspace) {
|
||||||
return page.setRecords(baseMapper.selectWorkspacePage(page, workspace));
|
return page.setRecords(baseMapper.selectWorkspacePage(page, workspace));
|
||||||
}
|
}
|
||||||
|
|
||||||
private final static String WORKSPACE_NAME = "Default workspace name";
|
private final static String WORKSPACE_NAME = "Default workspace name";
|
||||||
private final static Integer SYSTEM_DESIGNER_PERCENTAGE = 30;
|
private final static Integer SYSTEM_DESIGNER_PERCENTAGE = 30;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user