From 9fa605f83e95103d93e980902cfbc840f0d87df2 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Fri, 20 Oct 2023 14:47:18 +0800 Subject: [PATCH] BUGFIX: format; --- .../ai/da/common/config/FileProperties.java | 13 +- .../da/common/config/MinIoClientConfig.java | 3 +- .../config/exception/BusinessException.java | 2 +- .../config/exception/ExceptionCatch.java | 4 +- .../config/mybatis/plus/QueryCriteria.java | 22 +- .../config/swagger/AidaConfiguration.java | 4 +- .../com/ai/da/common/context/UserContext.java | 3 +- .../enums/CollectionLevel1TypeEnum.java | 4 +- .../com/ai/da/common/enums/ConditionType.java | 2 +- .../enums/CurrentDesignPictureTypeEnum.java | 17 +- .../CurrentDesignPrintPictureTypeEnum.java | 11 +- .../ai/da/common/enums/GenerateModeEnum.java | 6 +- .../common/enums/LibraryLevel1TypeEnum.java | 4 +- .../da/common/enums/LibraryTopTypeEnum.java | 5 +- .../com/ai/da/common/enums/LoginTypeEnum.java | 4 +- .../com/ai/da/common/enums/ModelNameEnum.java | 4 +- .../ai/da/common/enums/OperationTypeEnum.java | 6 +- .../com/ai/da/common/enums/OrderType.java | 2 +- .../PythonToJavaApiOperationTypeEnum.java | 4 +- .../ai/da/common/enums/SingleOverallEnum.java | 4 +- .../da/common/enums/SwitchCategoryEnum.java | 4 +- .../common/enums/SysFileLevel1TypeEnum.java | 10 +- .../common/enums/SysFileLevel2TypeEnum.java | 47 +-- .../da/common/httpdata/token/TokenQuery.java | 13 +- .../da/common/response/PageBaseResponse.java | 7 +- .../ai/da/common/response/PageResponse.java | 7 +- .../com/ai/da/common/response/Response.java | 13 +- .../com/ai/da/common/response/ResultEnum.java | 9 +- .../security/UserLoginFailureHandler.java | 2 +- .../security/filter/AuthenticationFilter.java | 24 +- .../common/security/jwt/JWTTokenHelper.java | 12 +- .../ai/da/common/utils/AccessLimitUtils.java | 19 +- .../com/ai/da/common/utils/ConvertUtil.java | 6 +- .../java/com/ai/da/common/utils/DateUtil.java | 18 +- .../java/com/ai/da/common/utils/FileUtil.java | 45 +-- .../com/ai/da/common/utils/ImageUtil.java | 13 +- .../ai/da/common/utils/LocalCacheUtils.java | 95 ++++-- .../java/com/ai/da/common/utils/MD5Utils.java | 1 + .../com/ai/da/common/utils/MinioUtil.java | 23 +- .../utils/MultiReadHttpServletRequest.java | 16 +- .../com/ai/da/common/utils/ObjectUtils.java | 1 + .../com/ai/da/common/utils/PantoneUtils.java | 6 +- .../com/ai/da/common/utils/RandomsUtil.java | 7 +- .../ai/da/common/utils/RedisCacheUtils.java | 18 +- .../ai/da/common/utils/RequestInfoUtil.java | 17 +- .../ai/da/common/utils/RsaDecryptUtils.java | 1 + .../da/common/utils/SecurityContextUtils.java | 8 +- .../com/ai/da/common/utils/SendEmailUtil.java | 27 +- .../com/ai/da/common/utils/SpringUtils.java | 8 +- .../ai/da/controller/AccountController.java | 7 +- .../ai/da/controller/DesignController.java | 1 + .../da/controller/DesignDetailController.java | 17 +- .../ai/da/controller/ElementController.java | 3 +- .../ai/da/controller/GenerateController.java | 8 +- .../ai/da/controller/LibraryController.java | 50 ++-- .../ai/da/controller/PythonController.java | 10 +- .../controller/SavedCollectionController.java | 26 +- .../da/controller/ThirdPartyController.java | 2 +- .../ai/da/controller/WorkspaceController.java | 156 +++++----- .../TDesignPythonOutfitDetailMapper.java | 16 +- .../da/mapper/TDesignPythonOutfitMapper.java | 17 +- .../com/ai/da/mapper/WorkspaceMapper.java | 18 +- .../com/ai/da/mapper/entity/Collection.java | 1 - .../da/mapper/entity/CollectionElement.java | 1 - .../ai/da/mapper/entity/DesignHistory.java | 1 - .../com/ai/da/mapper/entity/DesignItem.java | 2 +- .../ai/da/mapper/entity/GenerateDetail.java | 3 - .../java/com/ai/da/mapper/entity/Library.java | 1 - .../java/com/ai/da/mapper/entity/PanTone.java | 2 +- .../java/com/ai/da/mapper/entity/SysFile.java | 5 +- .../dto/DesignAttributeRetrievalDTO.java | 2 +- .../ai/da/model/dto/DesignCollectionDTO.java | 2 +- .../ai/da/model/dto/DesignSingleItemDTO.java | 2 +- .../com/ai/da/model/dto/EmailSendDTO.java | 2 +- .../com/ai/da/model/dto/LibraryDeleteDTO.java | 2 +- .../com/ai/da/model/dto/LibraryUpdateDTO.java | 2 +- .../com/ai/da/model/dto/WorkspaceDTO.java | 2 +- .../java/com/ai/da/model/enums/BizJson.java | 3 +- .../com/ai/da/model/enums/FemalePosition.java | 3 +- .../com/ai/da/model/enums/MalePosition.java | 3 +- .../com/ai/da/model/enums/MannequinType.java | 3 +- .../java/com/ai/da/model/enums/ModelType.java | 3 +- .../model/vo/DesignLibraryModelPointVO.java | 1 - .../com/ai/da/model/vo/DesignSinglePrint.java | 4 +- .../com/ai/da/model/vo/HistoryUpdateVO.java | 1 + .../com/ai/da/model/vo/LibraryUpdateVo.java | 2 +- .../java/com/ai/da/model/vo/LibraryVo.java | 1 - .../java/com/ai/da/model/vo/PantoneVO.java | 1 + .../java/com/ai/da/model/vo/SysFileVO.java | 1 - .../model/vo/TDesignPythonOutfitDetailVO.java | 2 +- .../ai/da/model/vo/TDesignPythonOutfitVO.java | 2 +- .../com/ai/da/model/vo/ValidateElementVO.java | 8 +- .../java/com/ai/da/python/PythonService.java | 160 +++++----- .../ai/da/python/vo/DesignPythonBasic.java | 2 +- .../com/ai/da/python/vo/DesignPythonItem.java | 6 +- .../da/python/vo/DesignPythonItemPrint.java | 2 +- .../ai/da/python/vo/DesignPythonObjects.java | 1 + .../ai/da/service/AccountLoginLogService.java | 2 +- .../com/ai/da/service/AccountService.java | 18 +- .../da/service/CollectionElementService.java | 23 +- .../com/ai/da/service/CollectionService.java | 4 +- .../da/service/ColorLoopUpTableService.java | 2 +- .../com/ai/da/service/DesignItemService.java | 7 +- .../java/com/ai/da/service/DesignService.java | 11 +- .../com/ai/da/service/GenerateService.java | 2 +- .../ITDesignPythonOutfitDetailService.java | 33 ++- .../service/ITDesignPythonOutfitService.java | 18 +- .../da/service/LibraryModelPointService.java | 9 +- .../com/ai/da/service/LibraryService.java | 8 +- .../com/ai/da/service/PanToneService.java | 9 +- .../ai/da/service/PythonTAllInfoService.java | 1 - .../com/ai/da/service/SysFileService.java | 5 + .../TCollectionElementRelationService.java | 3 +- .../ai/da/service/UserLikeGroupService.java | 3 +- .../com/ai/da/service/WorkspaceService.java | 36 +-- .../impl/AccountLoginLogServiceImpl.java | 4 +- .../da/service/impl/ChatRobotServiceImpl.java | 26 +- .../impl/CollectionElementServiceImpl.java | 276 +++++++++--------- .../service/impl/CollectionServiceImpl.java | 33 ++- .../DesignItemDetailPrintServiceImpl.java | 10 +- .../impl/DesignItemDetailServiceImpl.java | 4 +- .../service/impl/DesignItemServiceImpl.java | 221 +++++++------- .../ai/da/service/impl/DesignServiceImpl.java | 53 ++-- .../da/service/impl/GenerateServiceImpl.java | 48 +-- .../impl/LibraryModelPointServiceImpl.java | 40 +-- .../da/service/impl/LibraryServiceImpl.java | 94 +++--- .../da/service/impl/PanToneServiceImpl.java | 89 +++--- .../da/service/impl/SysFileServiceImpl.java | 135 +++++---- ...TCollectionElementRelationServiceImpl.java | 2 +- .../TDesignPythonOutfitDetailServiceImpl.java | 73 ++--- .../impl/TDesignPythonOutfitServiceImpl.java | 20 +- .../impl/UserLikeGroupServiceImpl.java | 18 +- .../da/service/impl/UserLikeServiceImpl.java | 6 +- .../da/service/impl/WorkspaceServiceImpl.java | 31 +- 134 files changed, 1345 insertions(+), 1203 deletions(-) diff --git a/src/main/java/com/ai/da/common/config/FileProperties.java b/src/main/java/com/ai/da/common/config/FileProperties.java index fc962d22..300cd10c 100644 --- a/src/main/java/com/ai/da/common/config/FileProperties.java +++ b/src/main/java/com/ai/da/common/config/FileProperties.java @@ -20,25 +20,26 @@ public class FileProperties { private String linuxDomain; - public ElPath getSys(){ + public ElPath getSys() { String os = System.getProperty("os.name"); - if(os.toLowerCase().startsWith("win")) { + if (os.toLowerCase().startsWith("win")) { return windows; - } else if(os.toLowerCase().startsWith("mac")){ + } else if (os.toLowerCase().startsWith("mac")) { return mac; } return linux; } - public String getLinuxDomain(){ + + public String getLinuxDomain() { String os = System.getProperty("os.name"); - if((!os.toLowerCase().startsWith("win") )&& (!os.toLowerCase().startsWith("mac"))) { + if ((!os.toLowerCase().startsWith("win")) && (!os.toLowerCase().startsWith("mac"))) { return linuxDomain; } return null; } @Data - public static class ElPath{ + public static class ElPath { private String path; } } diff --git a/src/main/java/com/ai/da/common/config/MinIoClientConfig.java b/src/main/java/com/ai/da/common/config/MinIoClientConfig.java index b3370372..43aab470 100644 --- a/src/main/java/com/ai/da/common/config/MinIoClientConfig.java +++ b/src/main/java/com/ai/da/common/config/MinIoClientConfig.java @@ -18,10 +18,11 @@ public class MinIoClientConfig { /** * 注入minio 客户端 + * * @return */ @Bean - public MinioClient minioClient(){ + public MinioClient minioClient() { return MinioClient.builder() .endpoint(endpoint) diff --git a/src/main/java/com/ai/da/common/config/exception/BusinessException.java b/src/main/java/com/ai/da/common/config/exception/BusinessException.java index 2737f2d2..8359b0f2 100644 --- a/src/main/java/com/ai/da/common/config/exception/BusinessException.java +++ b/src/main/java/com/ai/da/common/config/exception/BusinessException.java @@ -14,7 +14,7 @@ public class BusinessException extends RuntimeException { private Integer code; private String msg; - public BusinessException(ResultEnum resultEnum){ + public BusinessException(ResultEnum resultEnum) { super(resultEnum.getMsg()); this.code = resultEnum.getCode(); this.msg = resultEnum.getMsg(); diff --git a/src/main/java/com/ai/da/common/config/exception/ExceptionCatch.java b/src/main/java/com/ai/da/common/config/exception/ExceptionCatch.java index 2e68084f..2f3407e8 100644 --- a/src/main/java/com/ai/da/common/config/exception/ExceptionCatch.java +++ b/src/main/java/com/ai/da/common/config/exception/ExceptionCatch.java @@ -51,11 +51,12 @@ public class ExceptionCatch { return Response.error(resultEnum.getCode(), resultEnum.getMsg()); } } - return Response.error(ResultEnum.ERROR.getCode(), e.getMessage()==null?ResultEnum.ERROR.getMsg():e.getMessage()); + return Response.error(ResultEnum.ERROR.getCode(), e.getMessage() == null ? ResultEnum.ERROR.getMsg() : e.getMessage()); } /** * 处理参数校验异常 + * * @param e * @return ResponseData */ @@ -68,6 +69,7 @@ public class ExceptionCatch { /** * 处理参数校验异常 + * * @param e * @return ResponseData */ diff --git a/src/main/java/com/ai/da/common/config/mybatis/plus/QueryCriteria.java b/src/main/java/com/ai/da/common/config/mybatis/plus/QueryCriteria.java index 3c49c405..9942af90 100644 --- a/src/main/java/com/ai/da/common/config/mybatis/plus/QueryCriteria.java +++ b/src/main/java/com/ai/da/common/config/mybatis/plus/QueryCriteria.java @@ -22,7 +22,7 @@ import java.util.function.Function; **/ @Data @Slf4j -public abstract class QueryCriteria { +public abstract class QueryCriteria { private long page = 1; private long limit = 10; @@ -36,12 +36,12 @@ public abstract class QueryCriteria { this.mapper = mapper; } - public QueryWrapper buildWrapper(){ + public QueryWrapper buildWrapper() { QueryWrapper wrapper = new QueryWrapper<>(); Field[] fields = this.getClass().getDeclaredFields(); for (Field field : fields) { Condition condition = field.getAnnotation(Condition.class); - if(condition != null){ + if (condition != null) { field.setAccessible(true); Object value = null; try { @@ -49,27 +49,27 @@ public abstract class QueryCriteria { } catch (IllegalAccessException e) { log.warn("reflection anomaly!"); } - if(!StrUtil.isEmptyIfStr(value)){ - switch (condition.type()){ + if (!StrUtil.isEmptyIfStr(value)) { + switch (condition.type()) { case EQ: wrapper.eq(ConvertUtil.humpToLine2(field.getName()), value); break; case LIKE: wrapper.like(ConvertUtil.humpToLine2(field.getName()), value); case BETWEEN: - if(value instanceof Collection && ((List) value).size() >= 2){ - wrapper.between(ConvertUtil.humpToLine2(field.getName()), ((List)value).get(0), ((List)value).get(1)); + if (value instanceof Collection && ((List) value).size() >= 2) { + wrapper.between(ConvertUtil.humpToLine2(field.getName()), ((List) value).get(0), ((List) value).get(1)); } default: } - }else if(condition.isNull()){ + } else if (condition.isNull()) { wrapper.isNull(ConvertUtil.humpToLine2(field.getName())); } } Order order = field.getAnnotation(Order.class); - if(order != null){ - if(!StrUtil.isEmptyIfStr(order.order())){ - switch (order.order()){ + if (order != null) { + if (!StrUtil.isEmptyIfStr(order.order())) { + switch (order.order()) { case DESC: wrapper.orderByDesc(ConvertUtil.humpToLine2(field.getName())); break; diff --git a/src/main/java/com/ai/da/common/config/swagger/AidaConfiguration.java b/src/main/java/com/ai/da/common/config/swagger/AidaConfiguration.java index 87f7444d..083b4670 100644 --- a/src/main/java/com/ai/da/common/config/swagger/AidaConfiguration.java +++ b/src/main/java/com/ai/da/common/config/swagger/AidaConfiguration.java @@ -16,9 +16,9 @@ public class AidaConfiguration { @Bean(value = "IntelligentCurtainApis") public Docket gxyd5aThemeApis() { - Contact contact = new Contact("Mr.Y","","136"); + Contact contact = new Contact("Mr.Y", "", "136"); - Docket docket=new Docket(DocumentationType.SWAGGER_2) + Docket docket = new Docket(DocumentationType.SWAGGER_2) .apiInfo(new ApiInfoBuilder() .description("aida接口文档") .contact(contact) diff --git a/src/main/java/com/ai/da/common/context/UserContext.java b/src/main/java/com/ai/da/common/context/UserContext.java index e273077b..71a0a36e 100644 --- a/src/main/java/com/ai/da/common/context/UserContext.java +++ b/src/main/java/com/ai/da/common/context/UserContext.java @@ -3,11 +3,12 @@ package com.ai.da.common.context; import com.ai.da.model.vo.AuthPrincipalVo; public class UserContext { - private static ThreadLocal userHolder= new ThreadLocal(); + private static ThreadLocal userHolder = new ThreadLocal(); public static AuthPrincipalVo getUserHolder() { return userHolder.get(); } + public static void delete() { userHolder.remove(); } diff --git a/src/main/java/com/ai/da/common/enums/CollectionLevel1TypeEnum.java b/src/main/java/com/ai/da/common/enums/CollectionLevel1TypeEnum.java index 65ee5737..c16b5b51 100644 --- a/src/main/java/com/ai/da/common/enums/CollectionLevel1TypeEnum.java +++ b/src/main/java/com/ai/da/common/enums/CollectionLevel1TypeEnum.java @@ -39,8 +39,8 @@ public enum CollectionLevel1TypeEnum { return realName; } - public static CollectionLevel1TypeEnum uploadOf(String realName){ + public static CollectionLevel1TypeEnum uploadOf(String realName) { return Stream.of(CollectionLevel1TypeEnum.values()) - .filter(v ->v.getRealName().equals(realName)).findFirst().orElse(null); + .filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null); } } diff --git a/src/main/java/com/ai/da/common/enums/ConditionType.java b/src/main/java/com/ai/da/common/enums/ConditionType.java index 379cc4e6..654eb3e4 100644 --- a/src/main/java/com/ai/da/common/enums/ConditionType.java +++ b/src/main/java/com/ai/da/common/enums/ConditionType.java @@ -6,5 +6,5 @@ package com.ai.da.common.enums; * @create: 2020-01-14 17:33 **/ public enum ConditionType { - EQ,LIKE,BETWEEN; + EQ, LIKE, BETWEEN; } diff --git a/src/main/java/com/ai/da/common/enums/CurrentDesignPictureTypeEnum.java b/src/main/java/com/ai/da/common/enums/CurrentDesignPictureTypeEnum.java index 9353e4f9..d254997d 100644 --- a/src/main/java/com/ai/da/common/enums/CurrentDesignPictureTypeEnum.java +++ b/src/main/java/com/ai/da/common/enums/CurrentDesignPictureTypeEnum.java @@ -16,19 +16,19 @@ public enum CurrentDesignPictureTypeEnum { /** * PIN */ - PIN(1,"PIN"), + PIN(1, "PIN"), /** * USER_LIBRARY */ - USER_LIBRARY(2,"userLibrary"), + USER_LIBRARY(2, "userLibrary"), /** * SYS_FILE */ - SYS_FILE(3,"sysFile"), + SYS_FILE(3, "sysFile"), /** * noPIN */ - NO_PIN(4,"noPIN"); + NO_PIN(4, "noPIN"); private Integer code; private String desc; @@ -38,10 +38,11 @@ public enum CurrentDesignPictureTypeEnum { this.desc = desc; } - public static CurrentDesignPictureTypeEnum of(String name){ - return Stream.of(CurrentDesignPictureTypeEnum.values()).filter(v ->v.name().equals(name)).findFirst().orElse(null); + public static CurrentDesignPictureTypeEnum of(String name) { + return Stream.of(CurrentDesignPictureTypeEnum.values()).filter(v -> v.name().equals(name)).findFirst().orElse(null); } - public static List ofList(List codes){ - return Stream.of(CurrentDesignPictureTypeEnum.values()).filter(v ->codes.contains(v.code)).collect(Collectors.toList()); + + public static List ofList(List codes) { + return Stream.of(CurrentDesignPictureTypeEnum.values()).filter(v -> codes.contains(v.code)).collect(Collectors.toList()); } } diff --git a/src/main/java/com/ai/da/common/enums/CurrentDesignPrintPictureTypeEnum.java b/src/main/java/com/ai/da/common/enums/CurrentDesignPrintPictureTypeEnum.java index 4b64a8ad..605f8465 100644 --- a/src/main/java/com/ai/da/common/enums/CurrentDesignPrintPictureTypeEnum.java +++ b/src/main/java/com/ai/da/common/enums/CurrentDesignPrintPictureTypeEnum.java @@ -16,15 +16,15 @@ public enum CurrentDesignPrintPictureTypeEnum { /** * 空白 */ - NO(1,"空白"), + NO(1, "空白"), /** * PIN */ - PIN(2,"PIN"), + PIN(2, "PIN"), /** * noPIN */ - NO_PIN(3,"noPIN"); + NO_PIN(3, "noPIN"); private Integer code; private String desc; @@ -33,7 +33,8 @@ public enum CurrentDesignPrintPictureTypeEnum { this.code = code; this.desc = desc; } - public static List ofList(List codes){ - return Stream.of(CurrentDesignPrintPictureTypeEnum.values()).filter(v ->codes.contains(v.code)).collect(Collectors.toList()); + + public static List ofList(List codes) { + return Stream.of(CurrentDesignPrintPictureTypeEnum.values()).filter(v -> codes.contains(v.code)).collect(Collectors.toList()); } } diff --git a/src/main/java/com/ai/da/common/enums/GenerateModeEnum.java b/src/main/java/com/ai/da/common/enums/GenerateModeEnum.java index 0c46e986..bffcc79d 100644 --- a/src/main/java/com/ai/da/common/enums/GenerateModeEnum.java +++ b/src/main/java/com/ai/da/common/enums/GenerateModeEnum.java @@ -8,17 +8,17 @@ public enum GenerateModeEnum { /** * 通过文本生成 */ - TEXT(1,"text"), + TEXT(1, "text"), /** * 通过图片生成 */ - IMAGE(2,"image"), + IMAGE(2, "image"), /** * 通过文本和图片生成 */ - TEXT_IMAGE(2,"text-image"); + TEXT_IMAGE(2, "text-image"); private Integer code; private String value; diff --git a/src/main/java/com/ai/da/common/enums/LibraryLevel1TypeEnum.java b/src/main/java/com/ai/da/common/enums/LibraryLevel1TypeEnum.java index 2fe61cd6..bed5a60c 100644 --- a/src/main/java/com/ai/da/common/enums/LibraryLevel1TypeEnum.java +++ b/src/main/java/com/ai/da/common/enums/LibraryLevel1TypeEnum.java @@ -39,8 +39,8 @@ public enum LibraryLevel1TypeEnum { return realName; } - public static LibraryLevel1TypeEnum uploadOf(String realName){ + public static LibraryLevel1TypeEnum uploadOf(String realName) { return Stream.of(LibraryLevel1TypeEnum.values()) - .filter(v ->v.getRealName().equals(realName)).findFirst().orElse(null); + .filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null); } } diff --git a/src/main/java/com/ai/da/common/enums/LibraryTopTypeEnum.java b/src/main/java/com/ai/da/common/enums/LibraryTopTypeEnum.java index 20cc9747..57e490f7 100644 --- a/src/main/java/com/ai/da/common/enums/LibraryTopTypeEnum.java +++ b/src/main/java/com/ai/da/common/enums/LibraryTopTypeEnum.java @@ -30,9 +30,10 @@ public enum LibraryTopTypeEnum { public String getRealName() { return realName; } - public static LibraryTopTypeEnum uploadOf(String realName){ + + public static LibraryTopTypeEnum uploadOf(String realName) { return Stream.of(LibraryTopTypeEnum.values()) - .filter(v ->v.getRealName().equals(realName)).findFirst().orElse(null); + .filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null); } } diff --git a/src/main/java/com/ai/da/common/enums/LoginTypeEnum.java b/src/main/java/com/ai/da/common/enums/LoginTypeEnum.java index 6fe72e58..a308a700 100644 --- a/src/main/java/com/ai/da/common/enums/LoginTypeEnum.java +++ b/src/main/java/com/ai/da/common/enums/LoginTypeEnum.java @@ -17,7 +17,7 @@ public enum LoginTypeEnum { */ PASSWORD; - public static LoginTypeEnum of(String name){ - return Stream.of(LoginTypeEnum.values()).filter(v ->v.name().equals(name)).findFirst().orElse(null); + public static LoginTypeEnum of(String name) { + return Stream.of(LoginTypeEnum.values()).filter(v -> v.name().equals(name)).findFirst().orElse(null); } } diff --git a/src/main/java/com/ai/da/common/enums/ModelNameEnum.java b/src/main/java/com/ai/da/common/enums/ModelNameEnum.java index e8c2e122..0f4ab5f9 100644 --- a/src/main/java/com/ai/da/common/enums/ModelNameEnum.java +++ b/src/main/java/com/ai/da/common/enums/ModelNameEnum.java @@ -8,14 +8,14 @@ public enum ModelNameEnum { /** * 使用模型0 */ - MODEL_0("0","model_0"); + MODEL_0("0", "model_0"); private String code; private String modelName; - ModelNameEnum(String code,String modelName) { + ModelNameEnum(String code, String modelName) { this.code = code; this.modelName = modelName; } diff --git a/src/main/java/com/ai/da/common/enums/OperationTypeEnum.java b/src/main/java/com/ai/da/common/enums/OperationTypeEnum.java index f7d02865..9278bd48 100644 --- a/src/main/java/com/ai/da/common/enums/OperationTypeEnum.java +++ b/src/main/java/com/ai/da/common/enums/OperationTypeEnum.java @@ -9,7 +9,7 @@ import java.util.stream.Stream; **/ public enum OperationTypeEnum { /** - *登入 + * 登入 */ LOGIN, /** @@ -25,7 +25,7 @@ public enum OperationTypeEnum { */ FORGET_PWD; - public static OperationTypeEnum of(String name){ - return Stream.of(OperationTypeEnum.values()).filter(v ->v.name().equals(name)).findFirst().orElse(null); + public static OperationTypeEnum of(String name) { + return Stream.of(OperationTypeEnum.values()).filter(v -> v.name().equals(name)).findFirst().orElse(null); } } diff --git a/src/main/java/com/ai/da/common/enums/OrderType.java b/src/main/java/com/ai/da/common/enums/OrderType.java index 6fd8008a..5714f913 100644 --- a/src/main/java/com/ai/da/common/enums/OrderType.java +++ b/src/main/java/com/ai/da/common/enums/OrderType.java @@ -6,5 +6,5 @@ package com.ai.da.common.enums; * @create: 2020-01-14 17:33 **/ public enum OrderType { - DESC,ASC; + DESC, ASC; } diff --git a/src/main/java/com/ai/da/common/enums/PythonToJavaApiOperationTypeEnum.java b/src/main/java/com/ai/da/common/enums/PythonToJavaApiOperationTypeEnum.java index dbef6022..58783805 100644 --- a/src/main/java/com/ai/da/common/enums/PythonToJavaApiOperationTypeEnum.java +++ b/src/main/java/com/ai/da/common/enums/PythonToJavaApiOperationTypeEnum.java @@ -36,7 +36,7 @@ public enum PythonToJavaApiOperationTypeEnum { return realName; } - public static PythonToJavaApiOperationTypeEnum uploadOf(String realName){ - return Stream.of(PythonToJavaApiOperationTypeEnum.values()).filter(v ->v.getRealName().equals(realName)).findFirst().orElse(null); + public static PythonToJavaApiOperationTypeEnum uploadOf(String realName) { + return Stream.of(PythonToJavaApiOperationTypeEnum.values()).filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null); } } diff --git a/src/main/java/com/ai/da/common/enums/SingleOverallEnum.java b/src/main/java/com/ai/da/common/enums/SingleOverallEnum.java index ce049216..cbcc34e0 100644 --- a/src/main/java/com/ai/da/common/enums/SingleOverallEnum.java +++ b/src/main/java/com/ai/da/common/enums/SingleOverallEnum.java @@ -27,7 +27,7 @@ public enum SingleOverallEnum { return realName; } - public static SingleOverallEnum of(String realName){ - return Stream.of(SingleOverallEnum.values()).filter(v ->v.getRealName().equals(realName)).findFirst().orElse(null); + public static SingleOverallEnum of(String realName) { + return Stream.of(SingleOverallEnum.values()).filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null); } } diff --git a/src/main/java/com/ai/da/common/enums/SwitchCategoryEnum.java b/src/main/java/com/ai/da/common/enums/SwitchCategoryEnum.java index 2a90492e..367592a2 100644 --- a/src/main/java/com/ai/da/common/enums/SwitchCategoryEnum.java +++ b/src/main/java/com/ai/da/common/enums/SwitchCategoryEnum.java @@ -40,7 +40,7 @@ public enum SwitchCategoryEnum { return realName; } - public static SwitchCategoryEnum of(String realName){ - return Stream.of(SwitchCategoryEnum.values()).filter(v ->v.getRealName().equals(realName)).findFirst().orElse(null); + public static SwitchCategoryEnum of(String realName) { + return Stream.of(SwitchCategoryEnum.values()).filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null); } } diff --git a/src/main/java/com/ai/da/common/enums/SysFileLevel1TypeEnum.java b/src/main/java/com/ai/da/common/enums/SysFileLevel1TypeEnum.java index bcc15710..98eee765 100644 --- a/src/main/java/com/ai/da/common/enums/SysFileLevel1TypeEnum.java +++ b/src/main/java/com/ai/da/common/enums/SysFileLevel1TypeEnum.java @@ -9,11 +9,11 @@ import java.util.stream.Stream; **/ public enum SysFileLevel1TypeEnum { - IMAGES("Images","images"), + IMAGES("Images", "images"), - ICON_C("Iconc","iconc"), + ICON_C("Iconc", "iconc"), - ACCESSORIES("Accessories","accessories"); + ACCESSORIES("Accessories", "accessories"); private String realName; /** @@ -34,7 +34,7 @@ public enum SysFileLevel1TypeEnum { return uploadPathName; } - public static SysFileLevel1TypeEnum uploadOf(String uploadPathName){ - return Stream.of(SysFileLevel1TypeEnum.values()).filter(v ->v.getUploadPathName().equals(uploadPathName)).findFirst().orElse(null); + public static SysFileLevel1TypeEnum uploadOf(String uploadPathName) { + return Stream.of(SysFileLevel1TypeEnum.values()).filter(v -> v.getUploadPathName().equals(uploadPathName)).findFirst().orElse(null); } } diff --git a/src/main/java/com/ai/da/common/enums/SysFileLevel2TypeEnum.java b/src/main/java/com/ai/da/common/enums/SysFileLevel2TypeEnum.java index 47d30518..bf736ce1 100644 --- a/src/main/java/com/ai/da/common/enums/SysFileLevel2TypeEnum.java +++ b/src/main/java/com/ai/da/common/enums/SysFileLevel2TypeEnum.java @@ -14,27 +14,27 @@ public enum SysFileLevel2TypeEnum { /** * ICON */ - ICON("Icon","icon"), + ICON("Icon", "icon"), - BAG("Bag","bag"), + BAG("Bag", "bag"), - EARRINGS("Earring","earring"), + EARRINGS("Earring", "earring"), - HAIRSTYLE("Hairstyle","hairstyle"), + HAIRSTYLE("Hairstyle", "hairstyle"), - SHOES("Shoes","shoes"), + SHOES("Shoes", "shoes"), - BODY("Body","body"), + BODY("Body", "body"), - BLOUSE("Blouse","blouse"), + BLOUSE("Blouse", "blouse"), - DRESS("Dress","dress"), + DRESS("Dress", "dress"), - OUTWEAR("Outwear","outwear"), + OUTWEAR("Outwear", "outwear"), - SKIRT("Skirt","skirt"), + SKIRT("Skirt", "skirt"), - TROUSERS("Trousers","trousers"); + TROUSERS("Trousers", "trousers"); private String realName; /** @@ -55,21 +55,24 @@ public enum SysFileLevel2TypeEnum { return uploadPathName; } - public static SysFileLevel2TypeEnum uploadOf(String uploadPathName){ - return Stream.of(SysFileLevel2TypeEnum.values()).filter(v ->v.getUploadPathName().equals(uploadPathName)).findFirst().orElse(null); - } - public static SysFileLevel2TypeEnum realNameOf(String realName){ - return Stream.of(SysFileLevel2TypeEnum.values()).filter(v ->v.getRealName().equals(realName)).findFirst().orElse(null); + public static SysFileLevel2TypeEnum uploadOf(String uploadPathName) { + return Stream.of(SysFileLevel2TypeEnum.values()).filter(v -> v.getUploadPathName().equals(uploadPathName)).findFirst().orElse(null); } - public static SysFileLevel2TypeEnum realNameOfPython(String realName){ - return Stream.of(BLOUSE,DRESS,OUTWEAR,SKIRT,TROUSERS).filter(v ->v.getRealName().equals(realName)).findFirst().orElse(null); + public static SysFileLevel2TypeEnum realNameOf(String realName) { + return Stream.of(SysFileLevel2TypeEnum.values()).filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null); } - public static List ofPython(){ - return Stream.of(BLOUSE,DRESS,OUTWEAR,SKIRT,TROUSERS).map(SysFileLevel2TypeEnum::getRealName).collect(Collectors.toList()); + + public static SysFileLevel2TypeEnum realNameOfPython(String realName) { + return Stream.of(BLOUSE, DRESS, OUTWEAR, SKIRT, TROUSERS).filter(v -> v.getRealName().equals(realName)).findFirst().orElse(null); } - public static List ofPythonPath(){ - return Stream.of(BLOUSE,DRESS,OUTWEAR,SKIRT,TROUSERS).map(SysFileLevel2TypeEnum::getUploadPathName).collect(Collectors.toList()); + + public static List ofPython() { + return Stream.of(BLOUSE, DRESS, OUTWEAR, SKIRT, TROUSERS).map(SysFileLevel2TypeEnum::getRealName).collect(Collectors.toList()); + } + + public static List ofPythonPath() { + return Stream.of(BLOUSE, DRESS, OUTWEAR, SKIRT, TROUSERS).map(SysFileLevel2TypeEnum::getUploadPathName).collect(Collectors.toList()); } public static final List ACCESSORIES_LIST = Arrays.asList( diff --git a/src/main/java/com/ai/da/common/httpdata/token/TokenQuery.java b/src/main/java/com/ai/da/common/httpdata/token/TokenQuery.java index f712666d..34a7a8be 100644 --- a/src/main/java/com/ai/da/common/httpdata/token/TokenQuery.java +++ b/src/main/java/com/ai/da/common/httpdata/token/TokenQuery.java @@ -16,23 +16,24 @@ public class TokenQuery { private static final String GENERATE_USER_DOMAIN = "https://www.szsige.com"; public static JSONObject getToken(String session) { - String url = GET_TOKEN_DOMAIN + TokenApis.GET_TOKEN.getUrl()+ session; + String url = GET_TOKEN_DOMAIN + TokenApis.GET_TOKEN.getUrl() + session; log.info("获取用户token接口请求url:" + url); HttpResponse httpResponse = HttpUtil.createPost(url).execute(); log.info("获取用户token接口响应：" + httpResponse); - if(httpResponse.isOk() && StrUtil.isNotEmpty(httpResponse.body())){ + if (httpResponse.isOk() && StrUtil.isNotEmpty(httpResponse.body())) { return JSONObject.parseObject(httpResponse.body()); } return null; } - public static JSONObject generateUser(Map param,String token) { + + public static JSONObject generateUser(Map param, String token) { HttpResponse httpResponse = HttpUtil.createPost(GENERATE_USER_DOMAIN + TokenApis.GENERATE_USER.getUrl()) - .body(JSONObject.toJSONString(param!=null?param:new HashMap<>())) - .header("Authorization", "Bearer "+token) + .body(JSONObject.toJSONString(param != null ? param : new HashMap<>())) + .header("Authorization", "Bearer " + token) .header("X-Promiss", "9672233956") .execute(); log.info("生成用户信息接口响应：" + httpResponse); - if(httpResponse.isOk() && StrUtil.isNotEmpty(httpResponse.body())){ + if (httpResponse.isOk() && StrUtil.isNotEmpty(httpResponse.body())) { return JSONObject.parseObject(httpResponse.body()); } return null; diff --git a/src/main/java/com/ai/da/common/response/PageBaseResponse.java b/src/main/java/com/ai/da/common/response/PageBaseResponse.java index 2cbcedf0..6a0a2e83 100644 --- a/src/main/java/com/ai/da/common/response/PageBaseResponse.java +++ b/src/main/java/com/ai/da/common/response/PageBaseResponse.java @@ -17,7 +17,7 @@ import java.util.List; @Data @NoArgsConstructor @ApiModel("分页响应结果") -public class PageBaseResponse{ +public class PageBaseResponse { @ApiModelProperty("页码") private long page; @ApiModelProperty("每页数量") @@ -30,7 +30,6 @@ public class PageBaseResponse{ private List content; - public PageBaseResponse(List list, long page, long size, long total, long pages) { this.page = page; this.size = size; @@ -39,7 +38,7 @@ public class PageBaseResponse{ this.content = list; } - public static PageBaseResponse success(IPage page){ - return new PageBaseResponse<>(page.getRecords() , page.getCurrent(), page.getSize(), page.getTotal(), page.getPages()); + public static PageBaseResponse success(IPage page) { + return new PageBaseResponse<>(page.getRecords(), page.getCurrent(), page.getSize(), page.getTotal(), page.getPages()); } } diff --git a/src/main/java/com/ai/da/common/response/PageResponse.java b/src/main/java/com/ai/da/common/response/PageResponse.java index 00e9fc8b..3aa1929d 100644 --- a/src/main/java/com/ai/da/common/response/PageResponse.java +++ b/src/main/java/com/ai/da/common/response/PageResponse.java @@ -31,9 +31,8 @@ public class PageResponse extends Response> { private List content; - public PageResponse(Response> response, long page, long size, long total, long pages) { - if(response != null) { + if (response != null) { this.setData(response.getData()); this.setErrCode(response.getErrCode()); this.setErrMsg(response.getErrMsg()); @@ -45,8 +44,8 @@ public class PageResponse extends Response> { this.content = response.getData(); } - public static PageResponse success(IPage page){ + public static PageResponse success(IPage page) { Response> response = success(page.getRecords()); - return new PageResponse<>(response , page.getCurrent(), page.getSize(), page.getTotal(), page.getPages()); + return new PageResponse<>(response, page.getCurrent(), page.getSize(), page.getTotal(), page.getPages()); } } diff --git a/src/main/java/com/ai/da/common/response/Response.java b/src/main/java/com/ai/da/common/response/Response.java index ad672dbe..608cf440 100644 --- a/src/main/java/com/ai/da/common/response/Response.java +++ b/src/main/java/com/ai/da/common/response/Response.java @@ -27,28 +27,27 @@ public class Response implements Serializable { @ApiModelProperty("数据结果") private T data; - public static Response success(){ + public static Response success() { return success(ResultEnum.SUCCESS.getCode(), ResultEnum.SUCCESS.getMsg(), null); } - public static Response success(String msg){ + public static Response success(String msg) { return success(ResultEnum.SUCCESS.getCode(), msg, null); } - public static Response success(T data){ + public static Response success(T data) { return success(ResultEnum.SUCCESS.getCode(), ResultEnum.SUCCESS.getMsg(), data); } - public static Response success(int code, T data){ + public static Response success(int code, T data) { return success(code, ResultEnum.SUCCESS.getMsg(), data); } - public static Response success(int code, String msg, T data){ + public static Response success(int code, String msg, T data) { return getResponse(code, msg, data); } - public static Response fail(String msg) { return fail(ResultEnum.FAIL.getCode(), msg); } @@ -85,7 +84,7 @@ public class Response implements Serializable { return getResponse(code, msg, data); } - private static Response getResponse(int code, String msg, T data){ + private static Response getResponse(int code, String msg, T data) { return new Response<>(code, msg, data); } diff --git a/src/main/java/com/ai/da/common/response/ResultEnum.java b/src/main/java/com/ai/da/common/response/ResultEnum.java index 7aba4732..f9badf99 100644 --- a/src/main/java/com/ai/da/common/response/ResultEnum.java +++ b/src/main/java/com/ai/da/common/response/ResultEnum.java @@ -13,17 +13,16 @@ public enum ResultEnum { ERROR(false, -1, "system error!"), PARAMETER_ERROR(false, -2, "parameter error!"), - NO_LOGIN(false,-100,"User not logged in"), - NO_PERMISSION(false,-200,"No access"), - ACCOUNT_LOCK(false,-300,"Account frozen"); + NO_LOGIN(false, -100, "User not logged in"), + NO_PERMISSION(false, -200, "No access"), + ACCOUNT_LOCK(false, -300, "Account frozen"); private int code; private String msg; private boolean isOK; - - ResultEnum(boolean isOK, int code, String msg){ + ResultEnum(boolean isOK, int code, String msg) { this.isOK = isOK; this.code = code; this.msg = msg; diff --git a/src/main/java/com/ai/da/common/security/UserLoginFailureHandler.java b/src/main/java/com/ai/da/common/security/UserLoginFailureHandler.java index a9bb7e4e..137ff88c 100644 --- a/src/main/java/com/ai/da/common/security/UserLoginFailureHandler.java +++ b/src/main/java/com/ai/da/common/security/UserLoginFailureHandler.java @@ -43,6 +43,6 @@ public class UserLoginFailureHandler implements AuthenticationFailureHandler { log.error("登录失败：", e); response = Response.fail("登录失败!"); } - JSONResponseUtils.build(httpServletResponse,response); + JSONResponseUtils.build(httpServletResponse, response); } } diff --git a/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java b/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java index 473bb71f..c6d1a484 100644 --- a/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java +++ b/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java @@ -41,10 +41,10 @@ public class AuthenticationFilter extends OncePerRequestFilter { private SecurityProperties properties; private static final List FILTER_URL = - Arrays.asList("/favicon.ico","/doc.html","api/account/login","api/account/preLogin","api/account/sendEmail", - "/webjars/","/swagger-resources","/v2/api-docs","api/account/resetPwd", + Arrays.asList("/favicon.ico", "/doc.html", "api/account/login", "api/account/preLogin", "api/account/sendEmail", + "/webjars/", "/swagger-resources", "/v2/api-docs", "api/account/resetPwd", "/api/python/saveGeneratePicture", "/api/python/getLibraryByUserId", - "/api/third/party/addUser","/api/third/party/editUser","/api/element/initDefaultSysFile", + "/api/third/party/addUser", "/api/third/party/editUser", "/api/element/initDefaultSysFile", "/api/python/chatStream", "/api/python/flush" ); @@ -53,16 +53,16 @@ public class AuthenticationFilter extends OncePerRequestFilter { protected void doFilterInternal(HttpServletRequest httpServletRequest, @NonNull HttpServletResponse httpServletResponse, @NonNull FilterChain filterChain) throws ServletException, IOException { String requestURI = httpServletRequest.getRequestURI(); - if(calculateUrl(requestURI)){ + if (calculateUrl(requestURI)) { StopWatch stopWatch = new StopWatch(); HttpServletRequest wrappedRequest = httpServletRequest; HttpServletResponse wrappedResponse = httpServletResponse; - try{ + try { stopWatch.start(); if ((httpServletRequest.getContentType() == null && httpServletRequest.getContentLength() > 0) || (httpServletRequest.getContentType() != null && !httpServletRequest.getContentType().contains("application/json"))) { extracted(wrappedRequest); filterChain.doFilter(wrappedRequest, wrappedResponse); - }else { + } else { wrappedRequest = new MultiReadHttpServletRequest(httpServletRequest); wrappedResponse = new MultiReadHttpServletResponse(httpServletResponse); extracted(wrappedRequest); @@ -74,14 +74,16 @@ public class AuthenticationFilter extends OncePerRequestFilter { } finally { stopWatch.stop(); } - }else { + } else { filterChain.doFilter(httpServletRequest, httpServletResponse); } } - private Boolean calculateUrl(String requestURI ){ - String filterUrl = FILTER_URL.stream().filter(url ->requestURI.contains(url)).findFirst().orElse(null); - return null == filterUrl ? Boolean.TRUE :Boolean.FALSE; + + private Boolean calculateUrl(String requestURI) { + String filterUrl = FILTER_URL.stream().filter(url -> requestURI.contains(url)).findFirst().orElse(null); + return null == filterUrl ? Boolean.TRUE : Boolean.FALSE; } + private void extracted(HttpServletRequest request) throws AuthenticationException { String jwtToken = request.getHeader(properties.getJwtTokenHeader()); log.debug("后台检查令牌:{}", jwtToken); @@ -91,7 +93,7 @@ public class AuthenticationFilter extends OncePerRequestFilter { } // 检查token boolean validate = jwtTokenHelper.validateToken(jwtToken); - if(validate){ + if (validate) { AuthPrincipalVo principal = jwtTokenHelper.parserToUser(jwtToken); if (principal == null) { throw new RuntimeException("TOKEN已过期，请重新登录！"); diff --git a/src/main/java/com/ai/da/common/security/jwt/JWTTokenHelper.java b/src/main/java/com/ai/da/common/security/jwt/JWTTokenHelper.java index d2be0912..a43a21f0 100644 --- a/src/main/java/com/ai/da/common/security/jwt/JWTTokenHelper.java +++ b/src/main/java/com/ai/da/common/security/jwt/JWTTokenHelper.java @@ -31,7 +31,7 @@ public class JWTTokenHelper { private static final String ISSUER = "DWJ"; private static final String AUTHORITIES = "authorities"; - public String createToken(AuthPrincipalVo principal){ + public String createToken(AuthPrincipalVo principal) { String token = Jwts.builder() .setId(String.valueOf(principal.getId())) .setSubject(JSONObject.toJSONString(principal)) @@ -45,24 +45,24 @@ public class JWTTokenHelper { return token; } - public boolean validateToken(String token){ + public boolean validateToken(String token) { Claims claims = parser(token); - if (MapUtil.isEmpty(claims)){ + if (MapUtil.isEmpty(claims)) { return false; } return true; } - public AuthPrincipalVo parserToUser(String token){ + public AuthPrincipalVo parserToUser(String token) { String subject = parser(token).getSubject(); - if(StrUtil.isNotEmpty(subject)){ + if (StrUtil.isNotEmpty(subject)) { return JSONObject.parseObject(subject, AuthPrincipalVo.class); } return null; } public Claims parser(String token) { - token = token.replaceAll(securityProperties.getJwtTokenPrefix(),""); + token = token.replaceAll(securityProperties.getJwtTokenPrefix(), ""); return Jwts.parser().setSigningKey(securityProperties.getJwtSecret()).parseClaimsJws(token).getBody(); } } diff --git a/src/main/java/com/ai/da/common/utils/AccessLimitUtils.java b/src/main/java/com/ai/da/common/utils/AccessLimitUtils.java index 57f91d31..c7d0532b 100644 --- a/src/main/java/com/ai/da/common/utils/AccessLimitUtils.java +++ b/src/main/java/com/ai/da/common/utils/AccessLimitUtils.java @@ -23,16 +23,17 @@ public class AccessLimitUtils { * @param interfaceName * @return */ - public static void validate(String interfaceName,Integer count) { - Integer useCount= LocalCacheUtils.getAidaInterfaceCurrentLimitingCache(interfaceName); - if(useCount >count){ + public static void validate(String interfaceName, Integer count) { + Integer useCount = LocalCacheUtils.getAidaInterfaceCurrentLimitingCache(interfaceName); + if (useCount > count) { //系统繁忙 throw new BusinessException("system busy !"); - }else{ - useCount ++; - LocalCacheUtils.setAidaInterfaceCurrentLimitingCache(interfaceName,useCount); + } else { + useCount++; + LocalCacheUtils.setAidaInterfaceCurrentLimitingCache(interfaceName, useCount); } } + /** * 校验过后 接口完毕 去掉限流 * @@ -40,9 +41,9 @@ public class AccessLimitUtils { * @return */ public static void validateOut(String interfaceName) { - Integer useCount= LocalCacheUtils.getAidaInterfaceCurrentLimitingCache(interfaceName); - useCount --; - LocalCacheUtils.setAidaInterfaceCurrentLimitingCache(interfaceName,useCount); + Integer useCount = LocalCacheUtils.getAidaInterfaceCurrentLimitingCache(interfaceName); + useCount--; + LocalCacheUtils.setAidaInterfaceCurrentLimitingCache(interfaceName, useCount); } } diff --git a/src/main/java/com/ai/da/common/utils/ConvertUtil.java b/src/main/java/com/ai/da/common/utils/ConvertUtil.java index 5ab39a35..9047913e 100644 --- a/src/main/java/com/ai/da/common/utils/ConvertUtil.java +++ b/src/main/java/com/ai/da/common/utils/ConvertUtil.java @@ -54,11 +54,11 @@ public class ConvertUtil { return sb.toString(); } - public static String lowerCaseFirstLetter(String str){ - if(StrUtil.isNotBlank(str)){ + public static String lowerCaseFirstLetter(String str) { + if (StrUtil.isNotBlank(str)) { str = str.trim(); String result = str.substring(0, 1).toLowerCase(); - if(str.length() > 1){ + if (str.length() > 1) { result += str.substring(1); } return result; diff --git a/src/main/java/com/ai/da/common/utils/DateUtil.java b/src/main/java/com/ai/da/common/utils/DateUtil.java index c491d2c9..e15ffb24 100644 --- a/src/main/java/com/ai/da/common/utils/DateUtil.java +++ b/src/main/java/com/ai/da/common/utils/DateUtil.java @@ -12,11 +12,13 @@ import java.time.format.DateTimeFormatter; import java.util.Calendar; import java.util.Date; import java.util.TimeZone; + @Slf4j public class DateUtil { 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 YYYY_MM_DD = "yyyyMMdd"; + /** * LocalDate -> Date */ @@ -25,13 +27,15 @@ public class DateUtil { } /** - * LocalDateTime -> Date + * LocalDateTime -> Date */ public static Date asDate(LocalDateTime localDateTime) { return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); } + /** * date 装 String + * * @param date * @param formatter * @return @@ -43,21 +47,23 @@ public class DateUtil { LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zoneId); return dateTimeFormatter.format(localDateTime); } + /** * 根据时区获取时间 + * * @param timeZone "Asia/Tokyo" * @return */ public static Date getByTimeZone(String timeZone) { - String dateStr = dateToStr(new Date(),YYYY_MM_DD_HH_MM_SS); + String dateStr = dateToStr(new Date(), YYYY_MM_DD_HH_MM_SS); SimpleDateFormat sdf = new SimpleDateFormat(YYYY_MM_DD_HH_MM_SS); // 设置时区 sdf.setTimeZone(TimeZone.getTimeZone(timeZone)); - Date date = null; - try{ + Date date = null; + try { date = sdf.parse(dateStr); - }catch (ParseException parseException){ - log.error("时间转换异常!",parseException); + } catch (ParseException parseException) { + log.error("时间转换异常!", parseException); } return date; } diff --git a/src/main/java/com/ai/da/common/utils/FileUtil.java b/src/main/java/com/ai/da/common/utils/FileUtil.java index 0b67bea6..2ae0cb5b 100644 --- a/src/main/java/com/ai/da/common/utils/FileUtil.java +++ b/src/main/java/com/ai/da/common/utils/FileUtil.java @@ -129,53 +129,56 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { /** * 获取文件尺寸 */ - public static FileVO getFileSize(MultipartFile file) { + public static FileVO getFileSize(MultipartFile file) { int width = 0; int height = 0; - try{ + try { // 图片对象 BufferedImage bufferedImage = ImageIO.read(file.getInputStream()); // 宽度 - width = bufferedImage.getWidth(); + width = bufferedImage.getWidth(); // 高度 - height = bufferedImage.getHeight(); - }catch (IOException ioException){ + height = bufferedImage.getHeight(); + } catch (IOException ioException) { log.error("获取文件尺寸异常###{}", ExceptionUtil.stacktraceToString(ioException)); } - return new FileVO(height,width); + return new FileVO(height, width); } + /** * 获取文件尺寸 */ - public static FileVO getFileSize(InputStream inputStream) { + public static FileVO getFileSize(InputStream inputStream) { int width = 0; int height = 0; - try{ + try { // 图片对象 BufferedImage bufferedImage = ImageIO.read(inputStream); // 宽度 width = bufferedImage.getWidth(); // 高度 height = bufferedImage.getHeight(); - }catch (IOException ioException){ + } catch (IOException ioException) { log.error("获取文件尺寸异常###{}", ExceptionUtil.stacktraceToString(ioException)); } - return new FileVO(height,width); + return new FileVO(height, width); } + /** * 获取远程文件流 */ - public static InputStream getOriginFile(String path) { + public static InputStream getOriginFile(String path) { - try{ + try { //远程 URL url = new URL(path); return url.openStream(); - }catch (IOException ioException){ - log.error("获取文件尺寸异常###{}###path##{}", ExceptionUtil.stacktraceToString(ioException),path); + } catch (IOException ioException) { + log.error("获取文件尺寸异常###{}###path##{}", ExceptionUtil.stacktraceToString(ioException), path); throw new BusinessException("get file is failed!"); } } + /** * 将文件名解析成文件的上传路径 */ @@ -183,7 +186,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { Date date = new Date(); SimpleDateFormat format = new SimpleDateFormat("yyyyMMddhhmmssS"); String suffix = getExtensionName(file.getOriginalFilename()); - String nowStr = format.format(date)+"-" ; + String nowStr = format.format(date) + "-"; try { String fileName = file.getOriginalFilename(); String fileSuffix = fileName.substring(fileName.lastIndexOf(".")); @@ -204,6 +207,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { } return null; } + /** * 将文件名解析成文件的上传路径 */ @@ -211,7 +215,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { Date date = new Date(); SimpleDateFormat format = new SimpleDateFormat("yyyyMMddhhmmssS"); String suffix = getExtensionName(file.getOriginalFilename()); - String nowStr = format.format(date)+"-" ; + String nowStr = format.format(date) + "-"; try { String fileName = file.getOriginalFilename(); String path = filePath + fileName; @@ -242,6 +246,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { } return false; } + /** * 获取指定文件夹下所有文件，不含文件夹里的文件 * @@ -249,7 +254,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { * @return */ public static List getAllFile(String dirFilePath) { - if (StrUtil.isBlank(dirFilePath)){ + if (StrUtil.isBlank(dirFilePath)) { return null; } return getAllFile(new File(dirFilePath)); @@ -263,11 +268,11 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { */ public static List getAllFile(File dirFile) { // 如果文件夹不存在或着不是文件夹，则返回 null - if (Objects.isNull(dirFile) || !dirFile.exists() || dirFile.isFile()){ + if (Objects.isNull(dirFile) || !dirFile.exists() || dirFile.isFile()) { return null; } File[] childrenFiles = dirFile.listFiles(); - if (Objects.isNull(childrenFiles) || childrenFiles.length == 0){ + if (Objects.isNull(childrenFiles) || childrenFiles.length == 0) { return null; } List files = new ArrayList<>(); @@ -280,7 +285,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { else { // 如果是文件夹，则将其内部文件添加进结果集合 List cFiles = getAllFile(childFile); - if (Objects.isNull(cFiles) || cFiles.isEmpty()){ + if (Objects.isNull(cFiles) || cFiles.isEmpty()) { continue; } files.addAll(cFiles); diff --git a/src/main/java/com/ai/da/common/utils/ImageUtil.java b/src/main/java/com/ai/da/common/utils/ImageUtil.java index 5cc737c4..699a6243 100644 --- a/src/main/java/com/ai/da/common/utils/ImageUtil.java +++ b/src/main/java/com/ai/da/common/utils/ImageUtil.java @@ -14,10 +14,11 @@ import java.io.IOException; @Slf4j public class ImageUtil { static BufferedImage bufferedImage; - static int r,g,b; // 分别用来存放获取的RGB值 - static int heigth,width; + static int r, g, b; // 分别用来存放获取的RGB值 + static int heigth, width; static int id = 0; - public static void find(){ + + public static void find() { // 读取要操作的图片，这里的图片路径请改成自己要处理的图片 try { bufferedImage = ImageIO.read(new File("D:\\programManager\\private\\curtain\\curtain\\WechatIMG170.png")); @@ -27,16 +28,16 @@ public class ImageUtil { // 获取图片的宽和高； heigth = bufferedImage.getHeight(); width = bufferedImage.getHeight(); - System.out.println("heigth = "+heigth +", width ="+width); + System.out.println("heigth = " + heigth + ", width =" + width); // 采用行优先遍历，先遍历宽 for (int y = 0; y < heigth; y++) { for (int x = 0; x < width; x++) { id++; - Color color = new Color(bufferedImage.getRGB(x,y)); + Color color = new Color(bufferedImage.getRGB(x, y)); r = color.getRed(); g = color.getGreen(); b = color.getBlue(); - System.out.println("此时的id为： "+ id+ " R = "+ r + ", G = "+g+", B ="+b); + System.out.println("此时的id为： " + id + " R = " + r + ", G = " + g + ", B =" + b); } } } diff --git a/src/main/java/com/ai/da/common/utils/LocalCacheUtils.java b/src/main/java/com/ai/da/common/utils/LocalCacheUtils.java index 28242107..48291bb8 100644 --- a/src/main/java/com/ai/da/common/utils/LocalCacheUtils.java +++ b/src/main/java/com/ai/da/common/utils/LocalCacheUtils.java @@ -25,25 +25,26 @@ public final class LocalCacheUtils { * token */ private static LoadingCache tokenCache = loadTokenCache(); + /** - * - *缓存接口这里是LoadingCache，LoadingCache在缓存项不存在时可以自动加载缓存 + * 缓存接口这里是LoadingCache，LoadingCache在缓存项不存在时可以自动加载缓存 */ - private static LoadingCache loadTokenCache(){ - LoadingCache tokenCache = CacheBuilder.newBuilder() + private static LoadingCache loadTokenCache() { + LoadingCache tokenCache = CacheBuilder.newBuilder() .concurrencyLevel(10) - .expireAfterWrite(24*100, TimeUnit.HOURS) + .expireAfterWrite(24 * 100, TimeUnit.HOURS) .initialCapacity(100) .maximumSize(10000) .recordStats() .build(new CacheLoader() { - @Override - public String load(String key) throws Exception { - return "null"; - } + @Override + public String load(String key) throws Exception { + return "null"; + } }); return tokenCache; } + /** * 邮箱,短信验证码 */ @@ -51,7 +52,7 @@ public final class LocalCacheUtils { //设置并发级别为5，并发级别是指可以同时写缓存的线程数 .concurrencyLevel(10) //设置写缓存后10分钟过期,防止跨洲发送慢失效问题 - .expireAfterWrite(60*30, TimeUnit.SECONDS) + .expireAfterWrite(60 * 30, TimeUnit.SECONDS) //刷新机制 每隔一定时间刷新缓存loader 只有调用get具体的操作才生效(懒加载) 不设置则不刷新 // .refreshAfterWrite(60, TimeUnit.SECONDS) //设置缓存容器的初始容量为100 @@ -75,7 +76,7 @@ public final class LocalCacheUtils { //设置并发级别为5，并发级别是指可以同时写缓存的线程数 .concurrencyLevel(10) //设置写缓存后一天过期 - .expireAfterWrite(60*60*24, TimeUnit.SECONDS) + .expireAfterWrite(60 * 60 * 24, TimeUnit.SECONDS) //设置缓存容器的初始容量为100 .initialCapacity(100) //设置缓存最大容量50000，超过50000之后就会按照LRU最近虽少使用算法来移除缓存项 @@ -96,7 +97,7 @@ public final class LocalCacheUtils { //设置并发级别为5，并发级别是指可以同时写缓存的线程数 .concurrencyLevel(10) //设置写缓存后一天过期 - .expireAfterWrite(60*60*24, TimeUnit.SECONDS) + .expireAfterWrite(60 * 60 * 24, TimeUnit.SECONDS) //设置缓存容器的初始容量为100 .initialCapacity(100) //设置缓存最大容量50000，超过50000之后就会按照LRU最近虽少使用算法来移除缓存项 @@ -118,7 +119,7 @@ public final class LocalCacheUtils { //设置并发级别为5，并发级别是指可以同时写缓存的线程数 .concurrencyLevel(10) //设置写缓存后一天过期 - .expireAfterWrite(60*60*24, TimeUnit.SECONDS) + .expireAfterWrite(60 * 60 * 24, TimeUnit.SECONDS) //设置缓存容器的初始容量为15000 .initialCapacity(15000) //设置缓存最大容量50000，超过50000之后就会按照LRU最近虽少使用算法来移除缓存项 @@ -133,27 +134,27 @@ public final class LocalCacheUtils { } }); - /** + /** * design文件进度统计 */ private static LoadingCache> designProcessCache = CacheBuilder.newBuilder() - //设置并发级别为10，并发级别是指可以同时写缓存的线程数 - .concurrencyLevel(10) - //设置写缓存后5分钟过期 - .expireAfterWrite(60*5, TimeUnit.SECONDS) - //设置缓存容器的初始容量为100 - .initialCapacity(5) - //设置缓存最大容量50000，超过50000之后就会按照LRU最近虽少使用算法来移除缓存项 - .maximumSize(100) - //设置要统计缓存的命中率 - .recordStats() - //build方法中可以指定CacheLoader，在缓存不存在时通过CacheLoader的实现自动加载缓存 - .build(new CacheLoader>() { - @Override - public List load(Long key) throws Exception { - return Collections.EMPTY_LIST; - } - }); + //设置并发级别为10，并发级别是指可以同时写缓存的线程数 + .concurrencyLevel(10) + //设置写缓存后5分钟过期 + .expireAfterWrite(60 * 5, TimeUnit.SECONDS) + //设置缓存容器的初始容量为100 + .initialCapacity(5) + //设置缓存最大容量50000，超过50000之后就会按照LRU最近虽少使用算法来移除缓存项 + .maximumSize(100) + //设置要统计缓存的命中率 + .recordStats() + //build方法中可以指定CacheLoader，在缓存不存在时通过CacheLoader的实现自动加载缓存 + .build(new CacheLoader>() { + @Override + public List load(Long key) throws Exception { + return Collections.EMPTY_LIST; + } + }); /** * aida 接口限流(先粗暴做) @@ -162,7 +163,7 @@ public final class LocalCacheUtils { //设置并发级别为5，并发级别是指可以同时写缓存的线程数 .concurrencyLevel(20) //设置写缓存后30天过期 - .expireAfterWrite(60*60*24*30, TimeUnit.SECONDS) + .expireAfterWrite(60 * 60 * 24 * 30, TimeUnit.SECONDS) //设置缓存容器的初始容量为100 .initialCapacity(5) //设置缓存最大容量50000，超过50000之后就会按照LRU最近虽少使用算法来移除缓存项 @@ -176,8 +177,10 @@ public final class LocalCacheUtils { return 0; } }); + /** * 添加token本地缓存 + * * @param key * @param value */ @@ -187,6 +190,7 @@ public final class LocalCacheUtils { /** * 获取token本地缓存 + * * @param key * @return */ @@ -202,8 +206,10 @@ public final class LocalCacheUtils { } return null; } + /** * 删除token本地缓存(登出) + * * @param key * @return */ @@ -214,8 +220,10 @@ public final class LocalCacheUtils { log.error("delTokenCache方法错误", e); } } + /** * 添加验证码本地缓存 + * * @param key * @param value */ @@ -225,6 +233,7 @@ public final class LocalCacheUtils { /** * 获取验证码本地缓存 + * * @param key * @return */ @@ -240,8 +249,10 @@ public final class LocalCacheUtils { } return null; } + /** * 添加系统文本地缓存 + * * @param key * @param sysFile */ @@ -251,6 +262,7 @@ public final class LocalCacheUtils { /** * 获取系统文件本地缓存 + * * @param key * @return */ @@ -263,8 +275,10 @@ public final class LocalCacheUtils { } return null; } + /** * 清除所有系统文件本地缓存 + * * @return */ public static void clearAllSysFileCache() { @@ -274,8 +288,10 @@ public final class LocalCacheUtils { log.error("clearAllSysFileCache方法错误", e); } } + /** * 添加系统文本地缓存,通过类型 + * * @param level1Type * @param sysFileList */ @@ -285,6 +301,7 @@ public final class LocalCacheUtils { /** * 获取系统文件本地缓存 + * * @param level2Type * @return */ @@ -296,8 +313,10 @@ public final class LocalCacheUtils { } return null; } + /** * 清除所有系统文件本地缓存 + * * @return */ public static void clearAllSysFileCacheByLevel2Type() { @@ -307,8 +326,10 @@ public final class LocalCacheUtils { log.error("clearAllSysFileCacheByLevel2Type方法错误", e); } } + /** * 添加系统文件范围最大最小值本地缓存 + * * @param key * @param value */ @@ -318,6 +339,7 @@ public final class LocalCacheUtils { /** * 获取系统文件范围最大最小值本地缓存 + * * @param key * @return */ @@ -333,8 +355,10 @@ public final class LocalCacheUtils { } return null; } + /** * 清除所有系统文件范围最大最小值本地缓存 + * * @return */ public static void clearAllMaxMinValueCache() { @@ -344,8 +368,10 @@ public final class LocalCacheUtils { log.error("clearAllMaxMinValueCache方法错误", e); } } + /** * 添加系design文件进度统计 + * * @param key * @param value */ @@ -355,6 +381,7 @@ public final class LocalCacheUtils { /** * 获取design文件进度统计 + * * @param key * @return */ @@ -367,8 +394,10 @@ public final class LocalCacheUtils { } return null; } + /** * 进度统计完后 删除进度 + * * @param key * @return */ @@ -382,6 +411,7 @@ public final class LocalCacheUtils { /** * 设置本次接口流量数 + * * @param key * @param value */ @@ -391,6 +421,7 @@ public final class LocalCacheUtils { /** * 获取本次接口流量数 + * * @param key * @return */ diff --git a/src/main/java/com/ai/da/common/utils/MD5Utils.java b/src/main/java/com/ai/da/common/utils/MD5Utils.java index c15686ed..cb320557 100644 --- a/src/main/java/com/ai/da/common/utils/MD5Utils.java +++ b/src/main/java/com/ai/da/common/utils/MD5Utils.java @@ -58,6 +58,7 @@ public class MD5Utils { } return md5; } + /** * MD5加密文件 * diff --git a/src/main/java/com/ai/da/common/utils/MinioUtil.java b/src/main/java/com/ai/da/common/utils/MinioUtil.java index 10edb32f..5e9d2568 100644 --- a/src/main/java/com/ai/da/common/utils/MinioUtil.java +++ b/src/main/java/com/ai/da/common/utils/MinioUtil.java @@ -37,6 +37,7 @@ import java.util.stream.Collectors; public class MinioUtil { @Autowired private MinioClient minioClient; + /** * description: 判断bucket是否存在，不存在则创建 * @@ -55,6 +56,7 @@ public class MinioUtil { /** * 创建存储bucket + * * @param bucketName 存储bucket名称 * @return Boolean */ @@ -72,6 +74,7 @@ public class MinioUtil { /** * 删除存储bucket + * * @param bucketName 存储bucket名称 * @return Boolean */ @@ -86,6 +89,7 @@ public class MinioUtil { } return true; } + /** * description: 上传文件 * @@ -93,7 +97,6 @@ public class MinioUtil { * @param path * @param multipartFile * @return: java.lang.String - */ public List uploadBatch(String bucketName, String path, MultipartFile[] multipartFile) { List names = new ArrayList<>(multipartFile.length); @@ -138,7 +141,6 @@ public class MinioUtil { * @param path * @param file * @return: java.lang.String - */ public String upload(String bucketName, String path, MultipartFile file) { String fileName = file.getOriginalFilename(); @@ -292,6 +294,7 @@ public class MinioUtil { /** * 查看文件对象 + * * @param bucketName 存储bucket名称 * @return 存储bucket内文件对象信息 */ @@ -316,8 +319,9 @@ public class MinioUtil { /** * 批量删除文件对象 + * * @param bucketName 存储bucket名称 - * @param objects 对象名称集合 + * @param objects 对象名称集合 */ public Iterable> removeObjects(String bucketName, List objects) { List dos = objects.stream().map(e -> new DeleteObject(e)).collect(Collectors.toList()); @@ -372,7 +376,7 @@ public class MinioUtil { public String getPresignedUrl(String path, int expiry) { if (LocalCacheUtils.getPresignedUrlCache(path) != null) { return LocalCacheUtils.getPresignedUrlCache(path); - }else { + } else { if (!path.contains("/")) { throw new BusinessException("The path is error!"); } @@ -387,21 +391,22 @@ public class MinioUtil { /** * 将桶名、文件名从url中分离出来 - * @param url 带桶名、文件名的url + * + * @param url 带桶名、文件名的url * @param expiry 图片过期时间 * @return 可以直接访问的minio图片地址 */ - public String splitThenGetPreviewUrl(String url,int expiry){ + public String splitThenGetPreviewUrl(String url, int expiry) { String[] parts = url.split("/"); String bucketName = parts[0]; StringBuilder fileName = new StringBuilder(); - for (int i = 1; i < parts.length; i++){ + for (int i = 1; i < parts.length; i++) { fileName.append(parts[i]); - if (i != parts.length -1){ + if (i != parts.length - 1) { fileName.append("/"); } } - return getPresignedUrl(bucketName, String.valueOf(fileName),expiry); + return getPresignedUrl(bucketName, String.valueOf(fileName), expiry); } public boolean doesObjectExist(String bucketName, String objectName) { diff --git a/src/main/java/com/ai/da/common/utils/MultiReadHttpServletRequest.java b/src/main/java/com/ai/da/common/utils/MultiReadHttpServletRequest.java index 7935ae27..f9c49cc8 100644 --- a/src/main/java/com/ai/da/common/utils/MultiReadHttpServletRequest.java +++ b/src/main/java/com/ai/da/common/utils/MultiReadHttpServletRequest.java @@ -45,24 +45,20 @@ public class MultiReadHttpServletRequest extends HttpServletRequestWrapper { while ((line = reader.readLine()) != null) { sb.append(line); } - } - catch (IOException e) { + } catch (IOException e) { e.printStackTrace(); - } - finally { + } finally { if (inputStream != null) { try { inputStream.close(); - } - catch (IOException e) { + } catch (IOException e) { e.printStackTrace(); } } if (reader != null) { try { reader.close(); - } - catch (IOException e) { + } catch (IOException e) { e.printStackTrace(); } } @@ -72,6 +68,7 @@ public class MultiReadHttpServletRequest extends HttpServletRequestWrapper { /** * 复制输入流 + * * @param inputStream 请求输入流 * @return 复制出来的输入流 */ @@ -84,8 +81,7 @@ public class MultiReadHttpServletRequest extends HttpServletRequestWrapper { byteArrayOutputStream.write(buffer, 0, len); } byteArrayOutputStream.flush(); - } - catch (IOException e) { + } catch (IOException e) { e.printStackTrace(); } return new ByteArrayInputStream(byteArrayOutputStream.toByteArray()); diff --git a/src/main/java/com/ai/da/common/utils/ObjectUtils.java b/src/main/java/com/ai/da/common/utils/ObjectUtils.java index b70bc4c0..956c7a27 100644 --- a/src/main/java/com/ai/da/common/utils/ObjectUtils.java +++ b/src/main/java/com/ai/da/common/utils/ObjectUtils.java @@ -1,4 +1,5 @@ package com.ai.da.common.utils; + import java.util.*; import java.lang.reflect.Field; diff --git a/src/main/java/com/ai/da/common/utils/PantoneUtils.java b/src/main/java/com/ai/da/common/utils/PantoneUtils.java index 60cea63f..153b3be0 100644 --- a/src/main/java/com/ai/da/common/utils/PantoneUtils.java +++ b/src/main/java/com/ai/da/common/utils/PantoneUtils.java @@ -5,10 +5,10 @@ public class PantoneUtils { public static int[] rgbToHsv(int[] rgb) { //切割rgb数组 int red = rgb[0]; - int green= rgb[1]; + int green = rgb[1]; int blue = rgb[2]; - float r = (float) red / 255; + float r = (float) red / 255; float g = (float) green / 255; float b = (float) blue / 255; @@ -21,7 +21,7 @@ public class PantoneUtils { hsv[0] = 60 * ( (hsv[2] == min) ? Float.NaN : (hsv[2] == r) ? (g - b) / (hsv[2] - min) + ((g < b) ? 6 : 0) : - (hsv[2] == g) ? (b - r) / (hsv[2] - min) + 2: + (hsv[2] == g) ? (b - r) / (hsv[2] - min) + 2 : (r - g) / (hsv[2] - min) + 4 ); diff --git a/src/main/java/com/ai/da/common/utils/RandomsUtil.java b/src/main/java/com/ai/da/common/utils/RandomsUtil.java index 19af8494..fd4b352f 100644 --- a/src/main/java/com/ai/da/common/utils/RandomsUtil.java +++ b/src/main/java/com/ai/da/common/utils/RandomsUtil.java @@ -35,16 +35,17 @@ public class RandomsUtil { * @param randomEnd */ public static String generateVerifyCode(Long randomStart, Long randomEnd) { - return String.valueOf(RandomUtil.randomLong(randomStart,randomEnd)); + return String.valueOf(RandomUtil.randomLong(randomStart, randomEnd)); } + /** * 生成随机系统图片 * * @param randomStart 可以等于 - * @param randomEnd 小于最大值 + * @param randomEnd 小于最大值 */ public static Long randomSysFile(Long randomStart, Long randomEnd) { - return RandomUtil.randomLong(randomStart,randomEnd); + return RandomUtil.randomLong(randomStart, randomEnd); } diff --git a/src/main/java/com/ai/da/common/utils/RedisCacheUtils.java b/src/main/java/com/ai/da/common/utils/RedisCacheUtils.java index ea96a4eb..3eed939e 100644 --- a/src/main/java/com/ai/da/common/utils/RedisCacheUtils.java +++ b/src/main/java/com/ai/da/common/utils/RedisCacheUtils.java @@ -13,36 +13,36 @@ import java.util.concurrent.TimeUnit; **/ public final class RedisCacheUtils { - private static RedisTemplate getRedisTemplate(){ + private static RedisTemplate getRedisTemplate() { return SpringUtils.getBean("redisTemplate"); } - private static RedisTemplate getRedisTemplate(Class clazz){ + private static RedisTemplate getRedisTemplate(Class clazz) { return SpringUtils.getBean("redisTemplate"); } - private static RedisTemplate> getListRedisTemplate(Class clazz){ + private static RedisTemplate> getListRedisTemplate(Class clazz) { return SpringUtils.getBean("redisTemplate"); } - public static T get(String key, Class clazz){ + public static T get(String key, Class clazz) { return getRedisTemplate(clazz).opsForValue().get(key); } - public static List getList(String key, Class clazz){ + public static List getList(String key, Class clazz) { return getListRedisTemplate(clazz).opsForValue().get(key); } - public static void set(String key, Object value){ + public static void set(String key, Object value) { getRedisTemplate().opsForValue().set(key, value); } - public static void set(String key, Object value, long time, TimeUnit unit){ + public static void set(String key, Object value, long time, TimeUnit unit) { getRedisTemplate().opsForValue().set(key, value, time, unit); } - public static boolean delete(String key){ - if(StrUtil.isNotEmpty(key)){ + public static boolean delete(String key) { + if (StrUtil.isNotEmpty(key)) { return Boolean.TRUE.equals(getRedisTemplate().delete(key)); } return false; diff --git a/src/main/java/com/ai/da/common/utils/RequestInfoUtil.java b/src/main/java/com/ai/da/common/utils/RequestInfoUtil.java index 1e3d12dd..5f87110e 100644 --- a/src/main/java/com/ai/da/common/utils/RequestInfoUtil.java +++ b/src/main/java/com/ai/da/common/utils/RequestInfoUtil.java @@ -10,17 +10,16 @@ public class RequestInfoUtil { * @param request * @return java.lang.String * @version 1.0 - * - * + *

+ *

* 使用了ng等代理服务器要在ng加以下配置 * location / { - * proxy_pass http://127.0.0.1:10678; - * proxy_set_header Host $host; - * proxy_set_header X-Real-IP $remote_addr; - * proxy_set_header REMOTE-HOST $remote_addr; - * proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - * } - + * proxy_pass http://127.0.0.1:10678; + * proxy_set_header Host $host; + * proxy_set_header X-Real-IP $remote_addr; + * proxy_set_header REMOTE-HOST $remote_addr; + * proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + * } */ public static String getIpAddress(HttpServletRequest request) { String ip = request.getHeader("x-forwarded-for"); diff --git a/src/main/java/com/ai/da/common/utils/RsaDecryptUtils.java b/src/main/java/com/ai/da/common/utils/RsaDecryptUtils.java index 83962f69..7c79837e 100644 --- a/src/main/java/com/ai/da/common/utils/RsaDecryptUtils.java +++ b/src/main/java/com/ai/da/common/utils/RsaDecryptUtils.java @@ -59,6 +59,7 @@ public class RsaDecryptUtils { /** * 解密 + * * @param args * @throws NoSuchAlgorithmException */ diff --git a/src/main/java/com/ai/da/common/utils/SecurityContextUtils.java b/src/main/java/com/ai/da/common/utils/SecurityContextUtils.java index 34a82627..9d4b03b7 100644 --- a/src/main/java/com/ai/da/common/utils/SecurityContextUtils.java +++ b/src/main/java/com/ai/da/common/utils/SecurityContextUtils.java @@ -8,15 +8,15 @@ public class SecurityContextUtils { public static AuthPrincipalVo getCurrentUser() { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if(authentication != null && authentication.getPrincipal() != null){ - return (AuthPrincipalVo) authentication.getPrincipal(); + if (authentication != null && authentication.getPrincipal() != null) { + return (AuthPrincipalVo) authentication.getPrincipal(); } return null; } public static Long getCurrentUserId() { AuthPrincipalVo currentUser = getCurrentUser(); - if(currentUser != null){ + if (currentUser != null) { return currentUser.getId(); } return null; @@ -24,7 +24,7 @@ public class SecurityContextUtils { public static String getCurrentUsername() { AuthPrincipalVo currentUser = getCurrentUser(); - if(currentUser != null){ + if (currentUser != null) { return currentUser.getUsername(); } return null; diff --git a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java index eaa3873f..0b0077e2 100644 --- a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java +++ b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java @@ -65,8 +65,8 @@ public class SendEmailUtil { public static Long BIND_MAILBOX_TEMPLATE_ID = 45619L; - public static Boolean send(String receiverAddress,String ip,Long templateId,String verifyCode) { - try{ + public static Boolean send(String receiverAddress, String ip, Long templateId, String verifyCode) { + try { // 实例化一个认证对象，入参需要传入腾讯云账户secretId，secretKey,此处还需注意密钥对的保密 // 密钥可前往https://console.cloud.tencent.com/cam/capi网站进行获取 Credential cred = new Credential(SECRET_ID, SECRET_KEy); @@ -85,30 +85,31 @@ public class SendEmailUtil { req.setDestination(new String[]{receiverAddress}); String subject = templateId == LOGIN_TEMPLATE_ID ? LOGIN_SUBJECT : templateId == UPDATE_PWD_TEMPLATE_ID ? FORGET_PWD_SUBJECT : - templateId == EXCEPTION_ID_TEMPLATE_ID ? EXCEPTION_ID_SUBJECT :BIND_MAILBOX_SUBJECT; + templateId == EXCEPTION_ID_TEMPLATE_ID ? EXCEPTION_ID_SUBJECT : BIND_MAILBOX_SUBJECT; req.setSubject(subject); - req.setTemplate(contractTemplate(templateId, verifyCode,ip)); + req.setTemplate(contractTemplate(templateId, verifyCode, ip)); // 返回的resp是一个SendEmailResponse的实例，与请求对象对应 SendEmailResponse resp = client.SendEmail(req); // 输出json格式的字符串回包 - log.info("短信发送结果res###{}",SendEmailResponse.toJsonString(resp)); - return Boolean.TRUE; + log.info("短信发送结果res###{}", SendEmailResponse.toJsonString(resp)); + return Boolean.TRUE; } catch (TencentCloudSDKException e) { - log.info("邮件发送失败###{}",e.toString()); + log.info("邮件发送失败###{}", e.toString()); 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.setTemplateID(templateId); JSONObject jsonObject = new JSONObject(); - if(templateId == EXCEPTION_ID_TEMPLATE_ID ){ - jsonObject.put("exceptionIp",ip); - jsonObject.put("loginTime",DateUtil.dateToStr(new Date(),DateUtil.YYYY_MM_DD_HH_MM_SS)); - }else{ - jsonObject.put("code",verifyCode); + if (templateId == EXCEPTION_ID_TEMPLATE_ID) { + jsonObject.put("exceptionIp", ip); + jsonObject.put("loginTime", DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD_HH_MM_SS)); + } else { + jsonObject.put("code", verifyCode); } template.setTemplateData(jsonObject.toJSONString()); return template; diff --git a/src/main/java/com/ai/da/common/utils/SpringUtils.java b/src/main/java/com/ai/da/common/utils/SpringUtils.java index 99f15050..e46402b9 100644 --- a/src/main/java/com/ai/da/common/utils/SpringUtils.java +++ b/src/main/java/com/ai/da/common/utils/SpringUtils.java @@ -27,18 +27,18 @@ public class SpringUtils implements ApplicationContextAware { } public static T getBean(String beanName) { - if(applicationContext.containsBean(beanName)){ + if (applicationContext.containsBean(beanName)) { return (T) applicationContext.getBean(beanName); - }else{ + } else { return null; } } - public static Map getBeansOfType(Class baseType){ + public static Map getBeansOfType(Class baseType) { return applicationContext.getBeansOfType(baseType); } - public static ApplicationContext getApplicationContext(){ + public static ApplicationContext getApplicationContext() { return applicationContext; } } diff --git a/src/main/java/com/ai/da/controller/AccountController.java b/src/main/java/com/ai/da/controller/AccountController.java index 8b2376cb..86258bec 100644 --- a/src/main/java/com/ai/da/controller/AccountController.java +++ b/src/main/java/com/ai/da/controller/AccountController.java @@ -30,10 +30,11 @@ public class AccountController { public Response preLogin(@Valid @RequestBody AccountPreLoginDTO accountDTO) { return Response.success(accountService.preLogin(accountDTO)); } + @ApiOperation(value = "登入") @PostMapping("/login") public Response login(@Valid @RequestBody AccountLoginDTO accountDTO, HttpServletRequest request) { - return Response.success(accountService.login(accountDTO,request)); + return Response.success(accountService.login(accountDTO, request)); } @ApiOperation(value = "绑定邮箱") @@ -57,13 +58,13 @@ public class AccountController { @ApiOperation(value = "登出") @PostMapping("/logout") public Response logout(@Valid @RequestBody AccountLogoutDTO accountLogoutDTO) { - return Response.success( accountService.logout(accountLogoutDTO)); + return Response.success(accountService.logout(accountLogoutDTO)); } @ApiOperation(value = "是否登入") @PostMapping("/isLogin") public Response isLogin(@Valid @RequestBody AccountLogoutDTO accountLogoutDTO) { - return Response.success( accountService.isLogin(accountLogoutDTO)); + return Response.success(accountService.isLogin(accountLogoutDTO)); } } diff --git a/src/main/java/com/ai/da/controller/DesignController.java b/src/main/java/com/ai/da/controller/DesignController.java index 9b365fd9..993d50a8 100644 --- a/src/main/java/com/ai/da/controller/DesignController.java +++ b/src/main/java/com/ai/da/controller/DesignController.java @@ -42,6 +42,7 @@ public class DesignController { public Response reDesignCollection(@Valid @RequestBody ReDesignCollectionDTO reDesignDTO) { return Response.success(designService.reDesignCollection(reDesignDTO)); } + @ApiOperation(value = "designItem list,刷新用") @GetMapping("/designItemList") public Response designItemList(@ApiParam("designId") @RequestParam("designId") Long designId) { diff --git a/src/main/java/com/ai/da/controller/DesignDetailController.java b/src/main/java/com/ai/da/controller/DesignDetailController.java index 679de905..c8a103c8 100644 --- a/src/main/java/com/ai/da/controller/DesignDetailController.java +++ b/src/main/java/com/ai/da/controller/DesignDetailController.java @@ -30,9 +30,10 @@ public class DesignDetailController { @PostMapping("/generateHighDesign") public Response generateHighDesign(@Valid @RequestBody GenerateHighDesignDTO generateHighDesignDTO) { Response response = new Response(); - response.setData(designService. generateHighDesign(generateHighDesignDTO)); + response.setData(designService.generateHighDesign(generateHighDesignDTO)); return response; } + @ApiOperation(value = "删除高级design图片") @PostMapping("/deleteHighDesign") public Response deleteHighDesign(@Valid @RequestBody GenerateHighDesignDTO generateHighDesignDTO) { @@ -40,11 +41,12 @@ public class DesignDetailController { response.setData(designService.deleteHighDesign(generateHighDesignDTO)); return response; } + @ApiOperation(value = "查询design详情") @GetMapping("/getDetail") public Response getDetail(@ApiParam("designItemId") @RequestParam("designItemId") Long designItemId, - @ApiParam("designPythonOutfitId") @RequestParam(value = "designPythonOutfitId",required = false) Long designPythonOutfitId) { - return Response.success(designService.detail(designPythonOutfitId,designItemId)); + @ApiParam("designPythonOutfitId") @RequestParam(value = "designPythonOutfitId", required = false) Long designPythonOutfitId) { + return Response.success(designService.detail(designPythonOutfitId, designItemId)); } @ApiOperation(value = "切换系统的element") @@ -52,18 +54,19 @@ public class DesignDetailController { public Response getNextSysElement(@ApiParam("要切换的系统element 类型") @RequestParam("type") String type, @ApiParam("要切换的系统element id") @RequestParam("id") Long id, @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") @PostMapping("/designSingle") - public Response designSingle(@Valid @RequestBody DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO ) { + public Response designSingle(@Valid @RequestBody DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO) { return Response.success(designItemService.designSingleIncludeLayers(designSingleIncludeLayersDTO)); } @ApiOperation(value = "print打点") @PostMapping("/printDot") - public Response printDot(@Valid @RequestBody DesignSingleDTO designSingleDTO ) { - Response response =new Response(); + public Response printDot(@Valid @RequestBody DesignSingleDTO designSingleDTO) { + Response response = new Response(); String url = designItemService.printDot(designSingleDTO); response.setData(url); return response; diff --git a/src/main/java/com/ai/da/controller/ElementController.java b/src/main/java/com/ai/da/controller/ElementController.java index 9e3ae68d..ace1959a 100644 --- a/src/main/java/com/ai/da/controller/ElementController.java +++ b/src/main/java/com/ai/da/controller/ElementController.java @@ -53,7 +53,7 @@ public class ElementController { @RequestParam(value = "level1Type") String level1Type, @ApiParam("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") @RequestParam(value = "timeZone") String timeZone) { - Assert.isTrue(!StringUtils.isEmpty(file.getOriginalFilename()),"Please select a file!"); + Assert.isTrue(!StringUtils.isEmpty(file.getOriginalFilename()), "Please select a file!"); return Response.success(collectionElementService.upload( new CollectionElementUploadDTO(file, level1Type, timeZone, MD5Utils.encryptFile(file)))); } @@ -95,6 +95,7 @@ public class ElementController { public Response> getRgbByHsvBatch(@RequestBody @Valid List rgbByHsvBatch) { return Response.success(panToneService.getRgbByHsvBatch(rgbByHsvBatch)); } + @ApiOperation(value = "刷新历史数据") @PostMapping("/refreshHistoryData") public Response refreshHistoryData() { diff --git a/src/main/java/com/ai/da/controller/GenerateController.java b/src/main/java/com/ai/da/controller/GenerateController.java index 275c153d..9749a826 100644 --- a/src/main/java/com/ai/da/controller/GenerateController.java +++ b/src/main/java/com/ai/da/controller/GenerateController.java @@ -30,20 +30,20 @@ public class GenerateController { @ApiOperation("自动识别sketch的caption") @PostMapping("/caption") - public Response generateCaption(@RequestParam Long sketchElementId){ + public Response generateCaption(@RequestParam Long sketchElementId) { return Response.success(generateService.generateCaption(sketchElementId)); } @ApiOperation("通过文字、图片生成图片") @PostMapping("/sketchAndPrint") - public Response generateThroughImageText(@Valid @RequestBody GenerateThroughImageTextDTO generateThroughImageTextDTO){ + public Response generateThroughImageText(@Valid @RequestBody GenerateThroughImageTextDTO generateThroughImageTextDTO) { return Response.success(generateService.generateThroughImageText(generateThroughImageTextDTO)); } @ApiOperation("喜欢生成的图片") @PostMapping("/like") - public Response like(@Valid @RequestBody GenerateLikeDTO generateLikeDTO){ + public Response like(@Valid @RequestBody GenerateLikeDTO generateLikeDTO) { return Response.success(generateService.generateLike(generateLikeDTO)); } @@ -51,7 +51,7 @@ public class GenerateController { @GetMapping("/dislike") public Response dislike(@ApiParam("generateDetailId") @RequestParam Long generateDetailId, @ApiParam("timeZone") @RequestParam String timeZone) { - return Response.success(generateService.generateDislike(generateDetailId,timeZone)); + return Response.success(generateService.generateDislike(generateDetailId, timeZone)); } } diff --git a/src/main/java/com/ai/da/controller/LibraryController.java b/src/main/java/com/ai/da/controller/LibraryController.java index 24d563f1..5699811a 100644 --- a/src/main/java/com/ai/da/controller/LibraryController.java +++ b/src/main/java/com/ai/da/controller/LibraryController.java @@ -57,31 +57,31 @@ public class LibraryController { @ApiOperation(value = "Library分页列表") @PostMapping("/queryLibraryPage") public Response> queryLibraryPage(@Valid @RequestBody QueryLibraryPageDTO query) { - return Response.success(libraryService.queryLibraryPage(CopyUtil.copyObject(query,QueryLibraryPageServiceDTO.class))); + return Response.success(libraryService.queryLibraryPage(CopyUtil.copyObject(query, QueryLibraryPageServiceDTO.class))); } @ApiOperation(value = "Library分页列表(查询top和bottom)") @PostMapping("/queryLibraryTopAndBottomPage") public Response> queryLibraryTopAndBottomPage(@Valid @RequestBody QueryLibraryTopPageDTO query) { - return Response.success(libraryService.queryLibraryPage(CopyUtil.copyObject(query,QueryLibraryPageServiceDTO.class))); + return Response.success(libraryService.queryLibraryPage(CopyUtil.copyObject(query, QueryLibraryPageServiceDTO.class))); } @ApiOperation(value = "Library文件上传") @PostMapping("/upload") public Response upload(@RequestParam("file") MultipartFile file, @ApiParam("一级类型 Moodboard Printboard Sketchboard MarketingSketch Models") - @RequestParam(value = "level1Type") String level1Type, + @RequestParam(value = "level1Type") String level1Type, @ApiParam("二级类型 争对 Sketchboard; 有 Outwear Dress Blouse Skirt Trousers") - @RequestParam(value = "level2Type",required = false) String level2Type, + @RequestParam(value = "level2Type", required = false) String level2Type, @ApiParam("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") - @RequestParam(value = "timeZone") String timeZone, + @RequestParam(value = "timeZone") String timeZone, @RequestParam(value = "modelType") String modelType, @RequestParam(value = "sex") String sex, @RequestParam(value = "checkMd5") Integer checkMd5) { - Assert.isTrue(!StringUtils.isEmpty(file.getOriginalFilename()),"Please select a file!"); - Integer high =null; - Integer width =null; - if(level1Type.equals(LibraryLevel1TypeEnum.MODELS.getRealName())){ + Assert.isTrue(!StringUtils.isEmpty(file.getOriginalFilename()), "Please select a file!"); + Integer high = null; + Integer width = null; + if (level1Type.equals(LibraryLevel1TypeEnum.MODELS.getRealName())) { if (StringUtils.isEmpty(modelType)) { throw new BusinessException("modelType can't be null"); } @@ -100,14 +100,16 @@ public class LibraryController { return Response.success(libraryUpdateVo); } } - return Response.success(libraryService.upload(new LibraryUploadDTO(file, level1Type,level2Type, - timeZone, md5,high,width,modelType,sex))); + return Response.success(libraryService.upload(new LibraryUploadDTO(file, level1Type, level2Type, + timeZone, md5, high, width, modelType, sex))); } + @ApiOperation(value = "保存或者编辑template打点") @PostMapping("/saveOrEditTemplatePoint") public Response saveOrEditTemplatePoint(@Valid @RequestBody LibraryModelPointDTO libraryModelPoint) { return Response.success(libraryModelPointService.saveOrEditTemplatePoint(libraryModelPoint)); } + @ApiOperation(value = "批量Library修改用户文件名") @PostMapping("/batchUpdateLibraryName") public Response batchUpdateLibraryName(@Valid @RequestBody LibraryUpdateDTO libraryUpdateDTO) { @@ -119,7 +121,7 @@ public class LibraryController { @PostMapping("/batchDeleteLibrary") public Response batchDeleteLibrary(@Valid @RequestBody LibraryDeleteDTO deleteDTO) { List librarys = libraryService.getByIds(deleteDTO.getLibraryIds()); - Assert.notEmpty(librarys,"librarys does not exist!"); + Assert.notEmpty(librarys, "librarys does not exist!"); libraryService.removeBatchByIds(deleteDTO.getLibraryIds()); for (Library library : librarys) { if (library.getUrl().startsWith(sysImage)) { @@ -133,10 +135,10 @@ public class LibraryController { @ApiOperation(value = "Models打点预览") @PostMapping("/modelsDot") - public Response modelsDot(@ApiParam("file") @RequestPart(value = "file",required = false) MultipartFile file, - @ApiParam("models对象")@RequestPart("models") ModelsDotDTO modelsDotDTO) { - if(Objects.nonNull(file)){ - Assert.isTrue(!StringUtils.isEmpty(file.getOriginalFilename()),"Please select a file!"); + public Response modelsDot(@ApiParam("file") @RequestPart(value = "file", required = false) MultipartFile file, + @ApiParam("models对象") @RequestPart("models") ModelsDotDTO modelsDotDTO) { + if (Objects.nonNull(file)) { + Assert.isTrue(!StringUtils.isEmpty(file.getOriginalFilename()), "Please select a file!"); AuthPrincipalVo userInfo = UserContext.getUserHolder(); //需要宽高和地址参数design FileVO fileVO = FileUtil.getFileSize(file); @@ -147,18 +149,18 @@ public class LibraryController { String uploadPath = minioUtil.upload("aida-tmp", path, file); String minioPath = libraryService.processMannequins(uploadPath); modelsDotDTO.setTemplateUrl(minioPath); - }else{ - Assert.notNull(modelsDotDTO.getLibraryId(),"libraryId cannot be empty!"); - Assert.notNull(modelsDotDTO.getTemplateId(),"templateId cannot be empty!"); + } else { + Assert.notNull(modelsDotDTO.getLibraryId(), "libraryId cannot be empty!"); + Assert.notNull(modelsDotDTO.getTemplateId(), "templateId cannot be empty!"); LibraryModelPoint modelPoint = libraryModelPointService.getById(modelsDotDTO.getTemplateId()); - Assert.notNull(modelPoint,"template does not exist!"); + Assert.notNull(modelPoint, "template does not exist!"); Library library = libraryService.getById(modelsDotDTO.getLibraryId()); - Assert.notNull(library,"library does not exist!"); + Assert.notNull(library, "library does not exist!"); modelsDotDTO.setHigh(library.getHigh()); modelsDotDTO.setWidth(library.getWidth()); modelsDotDTO.setTemplateUrl(library.getUrl()); } - Response response =new Response(); + Response response = new Response(); log.info("Models打点预览入参####{}", JSON.toJSONString(modelsDotDTO)); String url = libraryModelPointService.modelsDot(modelsDotDTO); response.setData(minioUtil.getPresignedUrl(url, 24 * 60)); @@ -174,14 +176,14 @@ public class LibraryController { private String calculateTempFileUrl(Long userId) { String rootPath = fileProperties.getSys().getPath(); String day = DateUtil.dateToStr(new Date(), DateUtil.YYYYMM); - return rootPath + day + File.separator + "tmp" + File.separator + userId + File.separator+ UUID.randomUUID().toString(); + return rootPath + day + File.separator + "tmp" + File.separator + userId + File.separator + UUID.randomUUID().toString(); } private String calculateTempFileUrlNew(Long userId) { return userId.toString(); } - private String calculateTemplateUrl(File uploadFile){ + private String calculateTemplateUrl(File uploadFile) { String linuxDomain = fileProperties.getLinuxDomain(); if (!StringUtils.isEmpty(linuxDomain)) { //linux 系统 diff --git a/src/main/java/com/ai/da/controller/PythonController.java b/src/main/java/com/ai/da/controller/PythonController.java index bdad9634..7819a49c 100644 --- a/src/main/java/com/ai/da/controller/PythonController.java +++ b/src/main/java/com/ai/da/controller/PythonController.java @@ -51,7 +51,7 @@ public class PythonController { @PostMapping("/saveGeneratePicture") public Response upload(@RequestParam("file") MultipartFile file, @ApiParam("操作类型 generatePrint ->生成印花 " + - "designCollection ->设计collection generateAdvancedDesign ->生成高级design"+ + "designCollection ->设计collection generateAdvancedDesign ->生成高级design" + "generateSketch -> 生成草图") @RequestParam(value = "operateType") String operateType) { return Response.success(pythonService.upload(file, operateType)); @@ -60,10 +60,10 @@ public class PythonController { @ApiOperation(value = "python服务保存多张图片到java服务") @PostMapping("/saveMultiGeneratePicture") public Response> uploadMultiple(@RequestParam("files") MultipartFile[] files, - @ApiParam("操作类型 generatePrint ->生成印花 " + - "designCollection ->设计collection generateAdvancedDesign ->生成高级design"+ - "generateSketch -> 生成草图") - @RequestParam(value = "operateType") String operateType) { + @ApiParam("操作类型 generatePrint ->生成印花 " + + "designCollection ->设计collection generateAdvancedDesign ->生成高级design" + + "generateSketch -> 生成草图") + @RequestParam(value = "operateType") String operateType) { return Response.success(pythonService.upload(files, operateType)); } diff --git a/src/main/java/com/ai/da/controller/SavedCollectionController.java b/src/main/java/com/ai/da/controller/SavedCollectionController.java index b5723837..9a2e8570 100644 --- a/src/main/java/com/ai/da/controller/SavedCollectionController.java +++ b/src/main/java/com/ai/da/controller/SavedCollectionController.java @@ -58,32 +58,32 @@ public class SavedCollectionController { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("account_id", authPrincipalVo.getId()); - if(!StringUtils.isEmpty(query.getCollectionName())){ + if (!StringUtils.isEmpty(query.getCollectionName())) { queryWrapper.like("name", query.getCollectionName()); } - if(Objects.nonNull(query.getStartDate())){ + if (Objects.nonNull(query.getStartDate())) { queryWrapper.ge("update_date", new Date(query.getStartDate())); } - if(Objects.nonNull(query.getEndDate())){ + if (Objects.nonNull(query.getEndDate())) { queryWrapper.le("update_date", new Date(query.getEndDate())); } queryWrapper.orderByDesc("id"); IPage page = userLikeGroupService.getBaseMapper().selectPage( new Page<>(query.getPage(), query.getSize()), queryWrapper); - if(CollectionUtils.isEmpty(page.getRecords())){ + if (CollectionUtils.isEmpty(page.getRecords())) { return Response.success(PageBaseResponse.success(new Page<>())); } List groupIds = page.getRecords().stream().map(UserLikeGroup::getId).collect(Collectors.toList()); List groupDetails = userLikeService.getGroupDetails(groupIds); - Assert.notEmpty(groupDetails,"History detail does not exist!"); - Map> groupDetailMap = groupDetails.stream() + Assert.notEmpty(groupDetails, "History detail does not exist!"); + Map> groupDetailMap = groupDetails.stream() .collect(Collectors.groupingBy(UserLikeVO::getUserLikeGroupId)); - Account account = accountService.getById(authPrincipalVo.getId()); + Account account = accountService.getById(authPrincipalVo.getId()); IPage convert = page.convert((Function) group -> { - if(group != null){ - UserLikeGroupVO userLikeGroupVO = CopyUtil.copyObject(group,UserLikeGroupVO.class); - userLikeGroupVO.setUpdateDate(group.getUpdateDate().getTime()); + if (group != null) { + UserLikeGroupVO userLikeGroupVO = CopyUtil.copyObject(group, UserLikeGroupVO.class); + userLikeGroupVO.setUpdateDate(group.getUpdateDate().getTime()); userLikeGroupVO.setAuthor(account.getUserName()); //count 和detail List details = groupDetailMap.get(group.getId()); @@ -91,7 +91,7 @@ public class SavedCollectionController { detail.setUrl(minioUtil.getPresignedUrl(detail.getUrl(), 24 * 60)); } userLikeGroupVO.setGroupDetails(details); - userLikeGroupVO.setSketchCount(CollectionUtils.isEmpty(details) ? 0 :details.size()); + userLikeGroupVO.setSketchCount(CollectionUtils.isEmpty(details) ? 0 : details.size()); return userLikeGroupVO; } return null; @@ -110,7 +110,7 @@ public class SavedCollectionController { @PostMapping("/updateUserGroupName") public Response updateUserGroupName(@Valid @RequestBody HistoryUpdateDTO historyUpdateDTO) { return Response.success(userLikeGroupService.updateUserGroupName(historyUpdateDTO.getUserGroupId() - ,historyUpdateDTO.getUserGroupName(),historyUpdateDTO.getTimeZone())); + , historyUpdateDTO.getUserGroupName(), historyUpdateDTO.getTimeZone())); } @ApiOperation(value = "History删除用户分组") @@ -124,7 +124,7 @@ public class SavedCollectionController { @ApiOperation(value = "History choose") @GetMapping("/choose") public Response choose( - @ApiParam("用户分组id") @RequestParam("userGroupId") Long userGroupId) { + @ApiParam("用户分组id") @RequestParam("userGroupId") Long userGroupId) { return Response.success(userLikeGroupService.choose(userGroupId)); } diff --git a/src/main/java/com/ai/da/controller/ThirdPartyController.java b/src/main/java/com/ai/da/controller/ThirdPartyController.java index f9541e6b..0843c2ed 100644 --- a/src/main/java/com/ai/da/controller/ThirdPartyController.java +++ b/src/main/java/com/ai/da/controller/ThirdPartyController.java @@ -34,7 +34,7 @@ public class ThirdPartyController { @ApiOperation(value = "Edit user information") @PostMapping("/editUser") - public Response editUser( @RequestBody AccountEditDTO accountEditDTO) { + public Response editUser(@RequestBody AccountEditDTO accountEditDTO) { return Response.success(accountService.editUser(accountEditDTO)); } diff --git a/src/main/java/com/ai/da/controller/WorkspaceController.java b/src/main/java/com/ai/da/controller/WorkspaceController.java index b4847fe4..12da0b1d 100644 --- a/src/main/java/com/ai/da/controller/WorkspaceController.java +++ b/src/main/java/com/ai/da/controller/WorkspaceController.java @@ -27,7 +27,7 @@ import java.io.FileNotFoundException; import java.util.List; /** - * 控制器 + * 控制器 * * @author SHAHAIBO * @since 2023-08-01 @@ -39,90 +39,90 @@ import java.util.List; @Api(value = "", tags = "接口") public class WorkspaceController { - @Resource - private WorkspaceService workspaceService; + @Resource + private WorkspaceService workspaceService; - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 1) - @ApiOperation(value = "详情", notes = "传入workspace") - public Response detail(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) { - Workspace detail = workspaceService.getByIdNew(id); - return Response.success(detail); - } + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入workspace") + public Response detail(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) { + Workspace detail = workspaceService.getByIdNew(id); + return Response.success(detail); + } - /** - * 分页 - */ - @PostMapping("/list") - @ApiOperationSupport(order = 2) - @ApiOperation(value = "分页", notes = "传入workspace") - public Response list(@Valid @RequestBody WorkspaceDTO query) { - WorkspaceVO response = workspaceService.getPage(query); - return Response.success(response); - } + /** + * 分页 + */ + @PostMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入workspace") + public Response list(@Valid @RequestBody WorkspaceDTO query) { + WorkspaceVO response = workspaceService.getPage(query); + return Response.success(response); + } - /** - * 新增或编辑 - */ - @PostMapping("/saveOrUpdate") - @ApiOperationSupport(order = 3) - @ApiOperation(value = "新增或编辑", notes = "传入workspace") - public Response saveOrUpdate(@Valid @RequestBody Workspace workspace) { - return Response.success(workspaceService.saveOrUpdate(workspace)); - } - - - /** - * 删除 - */ - @DeleteMapping("/remove") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "删除", notes = "传入id") - public Response> remove(@Valid @RequestBody List workspaceList) { - return Response.success(workspaceService.delete(workspaceList)); - } - - @GetMapping("/enumValues") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "获取枚举类值") - public Response> enumValues(@RequestParam("enumName") String enumName) { - List bizJsonList = workspaceService.getEnumValues(enumName); - return Response.success(bizJsonList); - } - - @GetMapping("/getMannequins") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "获取模特") - public Response> getMannequins(@RequestParam("sex") String sex) { - List modelsVO = workspaceService.getMannequins(sex); - return Response.success(modelsVO); - } + /** + * 新增或编辑 + */ + @PostMapping("/saveOrUpdate") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "新增或编辑", notes = "传入workspace") + public Response saveOrUpdate(@Valid @RequestBody Workspace workspace) { + return Response.success(workspaceService.saveOrUpdate(workspace)); + } - @PostMapping("system_file_copy") - @ApiOperationSupport(order = 7) + /** + * 删除 + */ + @DeleteMapping("/remove") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "删除", notes = "传入id") + public Response> remove(@Valid @RequestBody List workspaceList) { + return Response.success(workspaceService.delete(workspaceList)); + } + + @GetMapping("/enumValues") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "获取枚举类值") + public Response> enumValues(@RequestParam("enumName") String enumName) { + List bizJsonList = workspaceService.getEnumValues(enumName); + return Response.success(bizJsonList); + } + + @GetMapping("/getMannequins") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "获取模特") + public Response> getMannequins(@RequestParam("sex") String sex) { + List modelsVO = workspaceService.getMannequins(sex); + return Response.success(modelsVO); + } + + + @PostMapping("system_file_copy") + @ApiOperationSupport(order = 7) @ApiOperation(value = "minio数据迁移") public Response systemFileCopy() { - workspaceService.systemFileCopy(); - return Response.success(true); - } + workspaceService.systemFileCopy(); + return Response.success(true); + } - @PostMapping("moveFile") - @ApiOperationSupport(order = 7) - @ApiOperation(value = "增加一级性别路径") - public Response moveFile() { - workspaceService.moveFile(); - return Response.success(true); - } + @PostMapping("moveFile") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "增加一级性别路径") + public Response moveFile() { + workspaceService.moveFile(); + return Response.success(true); + } - @PostMapping("maleDataInsert") - @ApiOperationSupport(order = 7) - @ApiOperation(value = "男装数据入库入minio") - public Response maleDataInsert() throws FileNotFoundException { - workspaceService.maleDataInsert(); - return Response.success(true); - } + @PostMapping("maleDataInsert") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "男装数据入库入minio") + public Response maleDataInsert() throws FileNotFoundException { + workspaceService.maleDataInsert(); + return Response.success(true); + } } diff --git a/src/main/java/com/ai/da/mapper/TDesignPythonOutfitDetailMapper.java b/src/main/java/com/ai/da/mapper/TDesignPythonOutfitDetailMapper.java index aead9623..68f42c82 100644 --- a/src/main/java/com/ai/da/mapper/TDesignPythonOutfitDetailMapper.java +++ b/src/main/java/com/ai/da/mapper/TDesignPythonOutfitDetailMapper.java @@ -15,13 +15,13 @@ import java.util.List; */ public interface TDesignPythonOutfitDetailMapper extends CommonMapper { - /** - * 自定义分页 - * - * @param page - * @param tDesignPythonOutfitDetail - * @return - */ - List selectTDesignPythonOutfitDetailPage(IPage page, TDesignPythonOutfitDetailVO tDesignPythonOutfitDetail); + /** + * 自定义分页 + * + * @param page + * @param tDesignPythonOutfitDetail + * @return + */ + List selectTDesignPythonOutfitDetailPage(IPage page, TDesignPythonOutfitDetailVO tDesignPythonOutfitDetail); } diff --git a/src/main/java/com/ai/da/mapper/TDesignPythonOutfitMapper.java b/src/main/java/com/ai/da/mapper/TDesignPythonOutfitMapper.java index 62dfc5a8..1423c794 100644 --- a/src/main/java/com/ai/da/mapper/TDesignPythonOutfitMapper.java +++ b/src/main/java/com/ai/da/mapper/TDesignPythonOutfitMapper.java @@ -5,6 +5,7 @@ import com.ai.da.common.config.mybatis.plus.CommonMapper; import com.ai.da.mapper.entity.TDesignPythonOutfit; import com.ai.da.model.vo.TDesignPythonOutfitVO; import com.baomidou.mybatisplus.core.metadata.IPage; + import java.util.List; /** @@ -15,13 +16,13 @@ import java.util.List; */ public interface TDesignPythonOutfitMapper extends CommonMapper { - /** - * 自定义分页 - * - * @param page - * @param tDesignPythonOutfit - * @return - */ - List selectTDesignPythonOutfitPage(IPage page, TDesignPythonOutfitVO tDesignPythonOutfit); + /** + * 自定义分页 + * + * @param page + * @param tDesignPythonOutfit + * @return + */ + List selectTDesignPythonOutfitPage(IPage page, TDesignPythonOutfitVO tDesignPythonOutfit); } diff --git a/src/main/java/com/ai/da/mapper/WorkspaceMapper.java b/src/main/java/com/ai/da/mapper/WorkspaceMapper.java index 8b761ae3..e1525d4a 100644 --- a/src/main/java/com/ai/da/mapper/WorkspaceMapper.java +++ b/src/main/java/com/ai/da/mapper/WorkspaceMapper.java @@ -8,20 +8,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; /** - * Mapper 接口 + * Mapper 接口 * * @author SHAHAIBO * @since 2023-08-01 */ public interface WorkspaceMapper extends CommonMapper { - /** - * 自定义分页 - * - * @param page - * @param workspace - * @return - */ - List selectWorkspacePage(IPage page, WorkspaceVO workspace); + /** + * 自定义分页 + * + * @param page + * @param workspace + * @return + */ + List selectWorkspacePage(IPage page, WorkspaceVO workspace); } diff --git a/src/main/java/com/ai/da/mapper/entity/Collection.java b/src/main/java/com/ai/da/mapper/entity/Collection.java index 544068c6..1ff7cbb2 100644 --- a/src/main/java/com/ai/da/mapper/entity/Collection.java +++ b/src/main/java/com/ai/da/mapper/entity/Collection.java @@ -33,7 +33,6 @@ public class Collection implements Serializable { /** * 用户ID - * */ private Long accountId; diff --git a/src/main/java/com/ai/da/mapper/entity/CollectionElement.java b/src/main/java/com/ai/da/mapper/entity/CollectionElement.java index 68fdc5c3..320a8ed7 100644 --- a/src/main/java/com/ai/da/mapper/entity/CollectionElement.java +++ b/src/main/java/com/ai/da/mapper/entity/CollectionElement.java @@ -33,7 +33,6 @@ public class CollectionElement implements Serializable { /** * 用户ID - * */ private Long accountId; /** diff --git a/src/main/java/com/ai/da/mapper/entity/DesignHistory.java b/src/main/java/com/ai/da/mapper/entity/DesignHistory.java index 2d959f74..87f11e7f 100644 --- a/src/main/java/com/ai/da/mapper/entity/DesignHistory.java +++ b/src/main/java/com/ai/da/mapper/entity/DesignHistory.java @@ -31,7 +31,6 @@ public class DesignHistory implements Serializable { private Long id; /** * 用户ID - * */ private Long accountId; diff --git a/src/main/java/com/ai/da/mapper/entity/DesignItem.java b/src/main/java/com/ai/da/mapper/entity/DesignItem.java index 5e0465e0..7a47111b 100644 --- a/src/main/java/com/ai/da/mapper/entity/DesignItem.java +++ b/src/main/java/com/ai/da/mapper/entity/DesignItem.java @@ -58,7 +58,7 @@ public class DesignItem implements Serializable { */ private String highDesignUrl; /** - * 是否like 0 否 1是 + * 是否like 0 否 1是 */ @TableField("is_like") private Byte hasLike; diff --git a/src/main/java/com/ai/da/mapper/entity/GenerateDetail.java b/src/main/java/com/ai/da/mapper/entity/GenerateDetail.java index dcdf3a58..ba81827c 100644 --- a/src/main/java/com/ai/da/mapper/entity/GenerateDetail.java +++ b/src/main/java/com/ai/da/mapper/entity/GenerateDetail.java @@ -53,7 +53,4 @@ public class GenerateDetail { private Date updateDate; - - - } diff --git a/src/main/java/com/ai/da/mapper/entity/Library.java b/src/main/java/com/ai/da/mapper/entity/Library.java index e47ea66d..5ed6f488 100644 --- a/src/main/java/com/ai/da/mapper/entity/Library.java +++ b/src/main/java/com/ai/da/mapper/entity/Library.java @@ -33,7 +33,6 @@ public class Library implements Serializable { /** * 用户ID - * */ private Long accountId; diff --git a/src/main/java/com/ai/da/mapper/entity/PanTone.java b/src/main/java/com/ai/da/mapper/entity/PanTone.java index 971ef445..dc14ae1a 100644 --- a/src/main/java/com/ai/da/mapper/entity/PanTone.java +++ b/src/main/java/com/ai/da/mapper/entity/PanTone.java @@ -66,7 +66,7 @@ public class PanTone implements Serializable { private Integer s; /** - *V + * V */ private Integer v; } diff --git a/src/main/java/com/ai/da/mapper/entity/SysFile.java b/src/main/java/com/ai/da/mapper/entity/SysFile.java index 1b34350e..f4977130 100644 --- a/src/main/java/com/ai/da/mapper/entity/SysFile.java +++ b/src/main/java/com/ai/da/mapper/entity/SysFile.java @@ -44,19 +44,16 @@ public class SysFile implements Serializable { /** * 名字 - * */ private String name; /** * md5值 - * */ private String md5; /** * 路径 绝对路径 - * */ private String url; @@ -73,7 +70,7 @@ public class SysFile implements Serializable { public SysFile() { } - public SysFile(String level1Type, String level2Type, String name, String md5, String url,Date createDate) { + public SysFile(String level1Type, String level2Type, String name, String md5, String url, Date createDate) { this.level1Type = level1Type; this.level2Type = level2Type; this.name = name; diff --git a/src/main/java/com/ai/da/model/dto/DesignAttributeRetrievalDTO.java b/src/main/java/com/ai/da/model/dto/DesignAttributeRetrievalDTO.java index a54ee557..71a92ff0 100644 --- a/src/main/java/com/ai/da/model/dto/DesignAttributeRetrievalDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignAttributeRetrievalDTO.java @@ -19,5 +19,5 @@ public class DesignAttributeRetrievalDTO { private List libraryUrls = Lists.newArrayList(); @ApiModelProperty("sysFile图片 数组") - private List sysFileUrlS= Lists.newArrayList(); + private List sysFileUrlS = Lists.newArrayList(); } diff --git a/src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java b/src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java index 68518ec3..142c3490 100644 --- a/src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java @@ -57,4 +57,4 @@ public class DesignCollectionDTO { private String processId; - } +} diff --git a/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java b/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java index 1b2f0e50..03282322 100644 --- a/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank; import java.util.List; @Data -public class DesignSingleItemDTO { +public class DesignSingleItemDTO { @NotBlank(message = "id cannot be empty!") @ApiModelProperty("切换图片对应的id") diff --git a/src/main/java/com/ai/da/model/dto/EmailSendDTO.java b/src/main/java/com/ai/da/model/dto/EmailSendDTO.java index 50cfc680..38ce0092 100644 --- a/src/main/java/com/ai/da/model/dto/EmailSendDTO.java +++ b/src/main/java/com/ai/da/model/dto/EmailSendDTO.java @@ -17,7 +17,7 @@ public class EmailSendDTO { @NotBlank(message = "operationType cannot be empty") @ApiModelProperty("操作类型 LOGIN 注册 FORGET_PWD 忘记密码 BIND_MAILBOX 绑定邮箱") private String operationType; - + @ApiModelProperty("异常ip") private String ip; diff --git a/src/main/java/com/ai/da/model/dto/LibraryDeleteDTO.java b/src/main/java/com/ai/da/model/dto/LibraryDeleteDTO.java index efff278d..d749e227 100644 --- a/src/main/java/com/ai/da/model/dto/LibraryDeleteDTO.java +++ b/src/main/java/com/ai/da/model/dto/LibraryDeleteDTO.java @@ -15,7 +15,7 @@ public class LibraryDeleteDTO { @NotEmpty(message = "libraryIds cannot be empty!") - @Size(max = 100,min = 1) + @Size(max = 100, min = 1) @ApiModelProperty("libraryId数组") private List libraryIds; diff --git a/src/main/java/com/ai/da/model/dto/LibraryUpdateDTO.java b/src/main/java/com/ai/da/model/dto/LibraryUpdateDTO.java index f7a852fd..82cc2c5b 100644 --- a/src/main/java/com/ai/da/model/dto/LibraryUpdateDTO.java +++ b/src/main/java/com/ai/da/model/dto/LibraryUpdateDTO.java @@ -15,7 +15,7 @@ import java.util.List; public class LibraryUpdateDTO { @NotEmpty(message = "libraryIds cannot be empty!") - @Size(max = 100,min = 1) + @Size(max = 100, min = 1) @ApiModelProperty("libraryId数组") private List libraryIds; diff --git a/src/main/java/com/ai/da/model/dto/WorkspaceDTO.java b/src/main/java/com/ai/da/model/dto/WorkspaceDTO.java index 1e5a15cf..68c33673 100644 --- a/src/main/java/com/ai/da/model/dto/WorkspaceDTO.java +++ b/src/main/java/com/ai/da/model/dto/WorkspaceDTO.java @@ -15,6 +15,6 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) public class WorkspaceDTO extends PageQueryBaseVo { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/ai/da/model/enums/BizJson.java b/src/main/java/com/ai/da/model/enums/BizJson.java index a96b30e8..9b9092e8 100644 --- a/src/main/java/com/ai/da/model/enums/BizJson.java +++ b/src/main/java/com/ai/da/model/enums/BizJson.java @@ -11,7 +11,8 @@ public class BizJson implements Serializable { private static final long serialVersionUID = 1L; - public BizJson() {} + public BizJson() { + } public BizJson(String name, String key, String value) { this.name = name; diff --git a/src/main/java/com/ai/da/model/enums/FemalePosition.java b/src/main/java/com/ai/da/model/enums/FemalePosition.java index 21335aa2..0ff8f3a9 100644 --- a/src/main/java/com/ai/da/model/enums/FemalePosition.java +++ b/src/main/java/com/ai/da/model/enums/FemalePosition.java @@ -13,8 +13,7 @@ public enum FemalePosition implements IEnumDisplay { BLOUSE("Blouse"), DRESS("Dress"), TROUSERS("Trousers"), - SKIRT("Skirt") - ; + SKIRT("Skirt"); private String value; diff --git a/src/main/java/com/ai/da/model/enums/MalePosition.java b/src/main/java/com/ai/da/model/enums/MalePosition.java index b5128404..3c5611d9 100644 --- a/src/main/java/com/ai/da/model/enums/MalePosition.java +++ b/src/main/java/com/ai/da/model/enums/MalePosition.java @@ -11,8 +11,7 @@ public enum MalePosition implements IEnumDisplay { TOPS("Tops"), BOTTOMS("Bottoms"), - OUTWEAR("Outwear") - ; + OUTWEAR("Outwear"); private String value; diff --git a/src/main/java/com/ai/da/model/enums/MannequinType.java b/src/main/java/com/ai/da/model/enums/MannequinType.java index a0207657..19e5e7e1 100644 --- a/src/main/java/com/ai/da/model/enums/MannequinType.java +++ b/src/main/java/com/ai/da/model/enums/MannequinType.java @@ -10,8 +10,7 @@ import com.fasterxml.jackson.annotation.JsonValue; public enum MannequinType implements IEnumDisplay { SYSTEM("System"), - LIBRARY("Library") - ; + LIBRARY("Library"); private String value; diff --git a/src/main/java/com/ai/da/model/enums/ModelType.java b/src/main/java/com/ai/da/model/enums/ModelType.java index ebffb760..5846db7b 100644 --- a/src/main/java/com/ai/da/model/enums/ModelType.java +++ b/src/main/java/com/ai/da/model/enums/ModelType.java @@ -11,8 +11,7 @@ public enum ModelType implements IEnumDisplay { SYSTEM("System"), - LIBRARY("Library") - ; + LIBRARY("Library"); private String value; diff --git a/src/main/java/com/ai/da/model/vo/DesignLibraryModelPointVO.java b/src/main/java/com/ai/da/model/vo/DesignLibraryModelPointVO.java index 49a41996..1360ab7e 100644 --- a/src/main/java/com/ai/da/model/vo/DesignLibraryModelPointVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignLibraryModelPointVO.java @@ -41,5 +41,4 @@ public class DesignLibraryModelPointVO implements Serializable { private String templateUrl; - } diff --git a/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java b/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java index d945fc4f..94575022 100644 --- a/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java +++ b/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java @@ -22,10 +22,10 @@ public class DesignSinglePrint { private List location; @ApiModelProperty("印花大小") - @Range(max = 1,message = "印花缩放值需用大于等于0小于等于1的数表示") + @Range(max = 1, message = "印花缩放值需用大于等于0小于等于1的数表示") private Double scale; - @Range(min = -360,max = 360,message = "印花旋转角度范围为-360° ~ 360°") + @Range(min = -360, max = 360, message = "印花旋转角度范围为-360° ~ 360°") @ApiModelProperty("印花角度") private Double angle; diff --git a/src/main/java/com/ai/da/model/vo/HistoryUpdateVO.java b/src/main/java/com/ai/da/model/vo/HistoryUpdateVO.java index cb21ce04..93d50a73 100644 --- a/src/main/java/com/ai/da/model/vo/HistoryUpdateVO.java +++ b/src/main/java/com/ai/da/model/vo/HistoryUpdateVO.java @@ -6,6 +6,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import java.util.List; + @AllArgsConstructor @Data @ApiModel("HistoryUpdateVO-响应") diff --git a/src/main/java/com/ai/da/model/vo/LibraryUpdateVo.java b/src/main/java/com/ai/da/model/vo/LibraryUpdateVo.java index f83556e1..ba378a97 100644 --- a/src/main/java/com/ai/da/model/vo/LibraryUpdateVo.java +++ b/src/main/java/com/ai/da/model/vo/LibraryUpdateVo.java @@ -46,5 +46,5 @@ public class LibraryUpdateVo implements Serializable { @ApiModelProperty("校验md5") private Boolean checkMd5; - + } diff --git a/src/main/java/com/ai/da/model/vo/LibraryVo.java b/src/main/java/com/ai/da/model/vo/LibraryVo.java index efe33c3c..59e184ed 100644 --- a/src/main/java/com/ai/da/model/vo/LibraryVo.java +++ b/src/main/java/com/ai/da/model/vo/LibraryVo.java @@ -28,7 +28,6 @@ public class LibraryVo implements Serializable { /** * 用户ID - * */ private Long accountId; /** diff --git a/src/main/java/com/ai/da/model/vo/PantoneVO.java b/src/main/java/com/ai/da/model/vo/PantoneVO.java index f45b1f9a..cbf09aac 100644 --- a/src/main/java/com/ai/da/model/vo/PantoneVO.java +++ b/src/main/java/com/ai/da/model/vo/PantoneVO.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import javax.validation.constraints.NotBlank; + @NoArgsConstructor @Data @ApiModel("潘通-响应") diff --git a/src/main/java/com/ai/da/model/vo/SysFileVO.java b/src/main/java/com/ai/da/model/vo/SysFileVO.java index 3f99d2c6..339d2902 100644 --- a/src/main/java/com/ai/da/model/vo/SysFileVO.java +++ b/src/main/java/com/ai/da/model/vo/SysFileVO.java @@ -30,7 +30,6 @@ public class SysFileVO implements Serializable { /** * md5值 - * */ private String md5; diff --git a/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitDetailVO.java b/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitDetailVO.java index 9737218e..028e7ba8 100644 --- a/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitDetailVO.java +++ b/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitDetailVO.java @@ -16,6 +16,6 @@ import io.swagger.annotations.ApiModel; @EqualsAndHashCode(callSuper = true) @ApiModel(value = "TDesignPythonOutfitDetailVO对象", description = "design item详情表") public class TDesignPythonOutfitDetailVO extends TDesignPythonOutfitDetail { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitVO.java b/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitVO.java index b391c9d6..8afb8629 100644 --- a/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitVO.java +++ b/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitVO.java @@ -17,6 +17,6 @@ import io.swagger.annotations.ApiModel; @EqualsAndHashCode(callSuper = true) @ApiModel(value = "TDesignPythonOutfitVO对象", description = "design item表 存对应design的8张图片") public class TDesignPythonOutfitVO extends TDesignPythonOutfit { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/ai/da/model/vo/ValidateElementVO.java b/src/main/java/com/ai/da/model/vo/ValidateElementVO.java index 6c22d170..cceef691 100644 --- a/src/main/java/com/ai/da/model/vo/ValidateElementVO.java +++ b/src/main/java/com/ai/da/model/vo/ValidateElementVO.java @@ -31,13 +31,13 @@ public class ValidateElementVO { //用于存储generate 生成collection List generateCollectionElements = Lists.newArrayList(); //存储template打点数据 - DesignLibraryModelPointVO designLibraryModelPoint =null; + DesignLibraryModelPointVO designLibraryModelPoint = null; //存储本次design已经使用的上衣和下衣的的MD5list 去重用 - List hasUseMd5List = Lists.newArrayList() ; + List hasUseMd5List = Lists.newArrayList(); //存储本次design已经使用的系统上衣下衣的id - List sysFileIds = Lists.newArrayList() ; + List sysFileIds = Lists.newArrayList(); //存储本次design剩余的没有Pin的print - Long noPinPrintNum ; + Long noPinPrintNum; //透传print参数用,存储本地Print对象 DesignPythonItemPrint designPythonItemPrint; //透传print参数用 diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 73c11f10..e40f25ff 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -62,7 +62,7 @@ public class PythonService { */ public String generatePrint(List printPath) { //限流校验 - AccessLimitUtils.validate("generatePrint",2); + AccessLimitUtils.validate("generatePrint", 2); OkHttpClient client = new OkHttpClient().newBuilder() .connectTimeout(30, TimeUnit.SECONDS) .pingInterval(5, TimeUnit.SECONDS)//websocket轮训间隔(单位:秒) @@ -156,7 +156,7 @@ public class PythonService { String path = calculateFileUrl(operationType); for (MultipartFile file : files) { File generateFile = FileUtil.upload2(file, path); - Assert.notNull(generateFile,"An error occurred while processing the file, please try again later"); + Assert.notNull(generateFile, "An error occurred while processing the file, please try again later"); String linuxDomain = fileProperties.getLinuxDomain(); if (!StringUtils.isEmpty(linuxDomain)) { @@ -409,7 +409,7 @@ public class PythonService { if (Objects.nonNull(skirt)) { items.add(skirt); } - }else { + } else { // 男装逻辑 DesignPythonItem top = calculatePythonItemTop(pinData, elementVO, designPictureType); if (Objects.nonNull(top)) { @@ -494,7 +494,7 @@ public class PythonService { } } else { //系统获取 - SysFileVO sysFileVO = getRandomSysFileMaleBottoms(elementVO.getSysFileVo(),elementVO.getSysFileIds(), elementVO.getModelSex()); + SysFileVO sysFileVO = getRandomSysFileMaleBottoms(elementVO.getSysFileVo(), elementVO.getSysFileIds(), elementVO.getModelSex()); bottom = coverToDesignPythonItem(null, sysFileVO.getLevel2Type(), sysFileVO.getUrl(), elementVO); bottom.setBusinessId(sysFileVO.getId()); //添加已使用的md5 @@ -524,7 +524,7 @@ public class PythonService { DesignPythonItem.BOTTOMS, elementVO.getHasUseMd5List()); if (StringUtils.isEmpty(libraryVo)) { //系统获取 - SysFileVO sysFileVO = getRandomSysFileMaleBottoms(elementVO.getSysFileVo(),elementVO.getSysFileIds(), elementVO.getModelSex()); + SysFileVO sysFileVO = getRandomSysFileMaleBottoms(elementVO.getSysFileVo(), elementVO.getSysFileIds(), elementVO.getModelSex()); bottom = coverToDesignPythonItem(null, sysFileVO.getLevel2Type(), sysFileVO.getUrl(), elementVO); bottom.setBusinessId(sysFileVO.getId()); //添加已使用的md5 @@ -547,7 +547,7 @@ public class PythonService { } } else { //系统获取 - SysFileVO sysFileVO = getRandomSysFileMaleBottoms(elementVO.getSysFileVo(),elementVO.getSysFileIds(), elementVO.getModelSex()); + SysFileVO sysFileVO = getRandomSysFileMaleBottoms(elementVO.getSysFileVo(), elementVO.getSysFileIds(), elementVO.getModelSex()); bottom = coverToDesignPythonItem(null, sysFileVO.getLevel2Type(), sysFileVO.getUrl(), elementVO); bottom.setBusinessId(sysFileVO.getId()); //添加已使用的md5 @@ -578,7 +578,7 @@ public class PythonService { CollectionElement collectionElement = getRandomSketchLibrary(noPinData, elementVO.getHasUseMd5List()); if (Objects.isNull(collectionElement)) { //系统获取 - SysFileVO sysFileVO = getRandomSysFileMaleBottoms(elementVO.getSysFileVo(),elementVO.getSysFileIds(), elementVO.getModelSex()); + SysFileVO sysFileVO = getRandomSysFileMaleBottoms(elementVO.getSysFileVo(), elementVO.getSysFileIds(), elementVO.getModelSex()); bottom = coverToDesignPythonItem(null, sysFileVO.getLevel2Type(), sysFileVO.getUrl(), elementVO); bottom.setBusinessId(sysFileVO.getId()); } else { @@ -661,7 +661,7 @@ public class PythonService { } } else { //系统获取 - SysFileVO sysFileVO = getRandomSysFileMaleTops(elementVO.getSysFileVo(),elementVO.getSysFileIds(), elementVO.getModelSex()); + SysFileVO sysFileVO = getRandomSysFileMaleTops(elementVO.getSysFileVo(), elementVO.getSysFileIds(), elementVO.getModelSex()); top = coverToDesignPythonItem(null, sysFileVO.getLevel2Type(), sysFileVO.getUrl(), elementVO); top.setBusinessId(sysFileVO.getId()); //添加已使用的md5 @@ -691,7 +691,7 @@ public class PythonService { DesignPythonItem.TOPS, elementVO.getHasUseMd5List()); if (StringUtils.isEmpty(libraryVo)) { //系统获取 - SysFileVO sysFileVO = getRandomSysFileMaleTops(elementVO.getSysFileVo(),elementVO.getSysFileIds(), elementVO.getModelSex()); + SysFileVO sysFileVO = getRandomSysFileMaleTops(elementVO.getSysFileVo(), elementVO.getSysFileIds(), elementVO.getModelSex()); top = coverToDesignPythonItem(null, sysFileVO.getLevel2Type(), sysFileVO.getUrl(), elementVO); top.setBusinessId(sysFileVO.getId()); //添加已使用的md5 @@ -714,7 +714,7 @@ public class PythonService { } } else { //系统获取 - SysFileVO sysFileVO = getRandomSysFileMaleTops(elementVO.getSysFileVo(),elementVO.getSysFileIds(), elementVO.getModelSex()); + SysFileVO sysFileVO = getRandomSysFileMaleTops(elementVO.getSysFileVo(), elementVO.getSysFileIds(), elementVO.getModelSex()); top = coverToDesignPythonItem(null, sysFileVO.getLevel2Type(), sysFileVO.getUrl(), elementVO); top.setBusinessId(sysFileVO.getId()); //添加已使用的md5 @@ -745,7 +745,7 @@ public class PythonService { CollectionElement collectionElement = getRandomSketchLibrary(noPinData, elementVO.getHasUseMd5List()); if (Objects.isNull(collectionElement)) { //系统获取 - SysFileVO sysFileVO = getRandomSysFileMaleTops(elementVO.getSysFileVo(),elementVO.getSysFileIds(), elementVO.getModelSex()); + SysFileVO sysFileVO = getRandomSysFileMaleTops(elementVO.getSysFileVo(), elementVO.getSysFileIds(), elementVO.getModelSex()); top = coverToDesignPythonItem(null, sysFileVO.getLevel2Type(), sysFileVO.getUrl(), elementVO); top.setBusinessId(sysFileVO.getId()); } else { @@ -864,7 +864,7 @@ public class PythonService { } } else { //系统获取 - SysFileVO sysFileVO = getRandomSysFileSkirt(elementVO.getSysFileVo(),elementVO.getSysFileIds(), elementVO.getModelSex()); + SysFileVO sysFileVO = getRandomSysFileSkirt(elementVO.getSysFileVo(), elementVO.getSysFileIds(), elementVO.getModelSex()); skirt = coverToDesignPythonItem(null, sysFileVO.getLevel2Type(), sysFileVO.getUrl(), elementVO); skirt.setBusinessId(sysFileVO.getId()); //添加已使用的md5 @@ -894,7 +894,7 @@ public class PythonService { DesignPythonItem.SKIRT_TROUSERS, elementVO.getHasUseMd5List()); if (StringUtils.isEmpty(libraryVo)) { //系统获取 - SysFileVO sysFileVO = getRandomSysFileSkirt(elementVO.getSysFileVo(),elementVO.getSysFileIds(), elementVO.getModelSex()); + SysFileVO sysFileVO = getRandomSysFileSkirt(elementVO.getSysFileVo(), elementVO.getSysFileIds(), elementVO.getModelSex()); skirt = coverToDesignPythonItem(null, sysFileVO.getLevel2Type(), sysFileVO.getUrl(), elementVO); skirt.setBusinessId(sysFileVO.getId()); //添加已使用的md5 @@ -917,7 +917,7 @@ public class PythonService { } } else { //系统获取 - SysFileVO sysFileVO = getRandomSysFileSkirt(elementVO.getSysFileVo(),elementVO.getSysFileIds(), elementVO.getModelSex()); + SysFileVO sysFileVO = getRandomSysFileSkirt(elementVO.getSysFileVo(), elementVO.getSysFileIds(), elementVO.getModelSex()); skirt = coverToDesignPythonItem(null, sysFileVO.getLevel2Type(), sysFileVO.getUrl(), elementVO); skirt.setBusinessId(sysFileVO.getId()); //添加已使用的md5 @@ -948,7 +948,7 @@ public class PythonService { CollectionElement collectionElement = getRandomSketchLibrary(noPinData, elementVO.getHasUseMd5List()); if (Objects.isNull(collectionElement)) { //系统获取 - SysFileVO sysFileVO = getRandomSysFileSkirt(elementVO.getSysFileVo(),elementVO.getSysFileIds(), elementVO.getModelSex()); + SysFileVO sysFileVO = getRandomSysFileSkirt(elementVO.getSysFileVo(), elementVO.getSysFileIds(), elementVO.getModelSex()); skirt = coverToDesignPythonItem(null, sysFileVO.getLevel2Type(), sysFileVO.getUrl(), elementVO); skirt.setBusinessId(sysFileVO.getId()); } else { @@ -1033,7 +1033,7 @@ public class PythonService { } } else { //系统获取 - SysFileVO sysFileVO = getRandomSysFileOutwear(elementVO.getSysFileVo(),elementVO.getSysFileIds(), elementVO.getModelSex()); + SysFileVO sysFileVO = getRandomSysFileOutwear(elementVO.getSysFileVo(), elementVO.getSysFileIds(), elementVO.getModelSex()); DesignPythonItem item = coverToDesignPythonItem(null, sysFileVO.getLevel2Type(), sysFileVO.getUrl(), elementVO); item.setBusinessId(sysFileVO.getId()); items.add(item); @@ -1065,7 +1065,7 @@ public class PythonService { DesignPythonItem.OUTWEAR_DRESS_BLOUSE, elementVO.getHasUseMd5List()); if (StringUtils.isEmpty(libraryVo)) { //系统获取 - SysFileVO sysFileVO = getRandomSysFileOutwear(elementVO.getSysFileVo(),elementVO.getSysFileIds(), elementVO.getModelSex()); + SysFileVO sysFileVO = getRandomSysFileOutwear(elementVO.getSysFileVo(), elementVO.getSysFileIds(), elementVO.getModelSex()); DesignPythonItem item = coverToDesignPythonItem(null, sysFileVO.getLevel2Type(), sysFileVO.getUrl(), elementVO); item.setBusinessId(sysFileVO.getId()); items.add(item); @@ -1090,7 +1090,7 @@ public class PythonService { } } else { //系统获取 - SysFileVO sysFileVO = getRandomSysFileOutwear(elementVO.getSysFileVo(),elementVO.getSysFileIds(), elementVO.getModelSex()); + SysFileVO sysFileVO = getRandomSysFileOutwear(elementVO.getSysFileVo(), elementVO.getSysFileIds(), elementVO.getModelSex()); DesignPythonItem item = coverToDesignPythonItem(null, sysFileVO.getLevel2Type(), sysFileVO.getUrl(), elementVO); item.setBusinessId(sysFileVO.getId()); items.add(item); @@ -1122,7 +1122,7 @@ public class PythonService { CollectionElement collectionElement = getRandomSketchLibrary(noPinData, elementVO.getHasUseMd5List()); if (Objects.isNull(collectionElement)) { //系统获取 - SysFileVO sysFileVO = getRandomSysFileOutwear(elementVO.getSysFileVo(),elementVO.getSysFileIds(), elementVO.getModelSex()); + SysFileVO sysFileVO = getRandomSysFileOutwear(elementVO.getSysFileVo(), elementVO.getSysFileIds(), elementVO.getModelSex()); DesignPythonItem item = coverToDesignPythonItem(null, sysFileVO.getLevel2Type(), sysFileVO.getUrl(), elementVO); item.setBusinessId(sysFileVO.getId()); items.add(item); @@ -1194,7 +1194,7 @@ public class PythonService { Map> body_point = Maps.newHashMap(); if (Objects.nonNull(designLibraryModelPointOld)) { DesignLibraryModelPointVO designLibraryModelPoint = - CopyUtil.copyObject(designLibraryModelPointOld,DesignLibraryModelPointVO.class); + CopyUtil.copyObject(designLibraryModelPointOld, DesignLibraryModelPointVO.class); //自己的template是6个点 body_point.put("shoulder_left", resolve(designLibraryModelPoint.getShoulderLeft())); body_point.put("shoulder_right", resolve(designLibraryModelPoint.getShoulderRight())); @@ -1224,7 +1224,7 @@ public class PythonService { private List resolve(List list) { List integerList = Lists.newArrayList(); - list.forEach(l ->{ + list.forEach(l -> { integerList.add(new Integer(l.intValue())); }); return integerList; @@ -1283,41 +1283,41 @@ public class PythonService { private SysFileVO getRandomSysFileOutwear(List sysFileVo, List sysFileIds, String modelSex) { Long randomIndex = RandomsUtil.randomSysFile(0L, 3L); - if(CollectionUtils.isEmpty(sysFileVo)){ + if (CollectionUtils.isEmpty(sysFileVo)) { return getRandomSysFileByLevel2Type(DesignPythonItem.OUTWEAR_DRESS_BLOUSE.get(randomIndex.intValue()), sysFileIds, modelSex); - }else{ + } else { //attribute_retrieval 算法,满足blouse + outwear+dress>8,以及 skirt+trousers>8 - return getRandomSysFileByAttributeRetrieval(DesignPythonItem.OUTWEAR_DRESS_BLOUSE,sysFileVo, sysFileIds); + return getRandomSysFileByAttributeRetrieval(DesignPythonItem.OUTWEAR_DRESS_BLOUSE, sysFileVo, sysFileIds); } } private SysFileVO getRandomSysFileMaleTops(List sysFileVo, List sysFileIds, String modelSex) { Long randomIndex = RandomsUtil.randomSysFile(0L, 1L); - if(CollectionUtils.isEmpty(sysFileVo)){ + if (CollectionUtils.isEmpty(sysFileVo)) { return getRandomSysFileByLevel2Type(DesignPythonItem.TOPS.get(randomIndex.intValue()), sysFileIds, modelSex); - }else{ + } else { //attribute_retrieval 算法,满足blouse + outwear+dress>8,以及 skirt+trousers>8 - return getRandomSysFileByAttributeRetrieval(DesignPythonItem.TOPS,sysFileVo, sysFileIds); + return getRandomSysFileByAttributeRetrieval(DesignPythonItem.TOPS, sysFileVo, sysFileIds); } } private SysFileVO getRandomSysFileMaleBottoms(List sysFileVo, List sysFileIds, String modelSex) { Long randomIndex = RandomsUtil.randomSysFile(0L, 1L); - if(CollectionUtils.isEmpty(sysFileVo)){ + if (CollectionUtils.isEmpty(sysFileVo)) { return getRandomSysFileByLevel2Type(DesignPythonItem.BOTTOMS.get(randomIndex.intValue()), sysFileIds, modelSex); - }else{ + } else { //attribute_retrieval 算法,满足blouse + outwear+dress>8,以及 skirt+trousers>8 - return getRandomSysFileByAttributeRetrieval(DesignPythonItem.BOTTOMS,sysFileVo, sysFileIds); + return getRandomSysFileByAttributeRetrieval(DesignPythonItem.BOTTOMS, sysFileVo, sysFileIds); } } private SysFileVO getRandomSysFileSkirt(List sysFileVo, List sysFileIds, String modelSex) { Long randomIndex = RandomsUtil.randomSysFile(0L, 2L); - if(CollectionUtils.isEmpty(sysFileVo)){ + if (CollectionUtils.isEmpty(sysFileVo)) { return getRandomSysFileByLevel2Type(DesignPythonItem.SKIRT_TROUSERS.get(randomIndex.intValue()), sysFileIds, modelSex); - }else{ + } else { //attribute_retrieval 算法,满足blouse + outwear+dress>8,以及 skirt+trousers>8 - return getRandomSysFileByAttributeRetrieval(DesignPythonItem.SKIRT_TROUSERS,sysFileVo, sysFileIds); + return getRandomSysFileByAttributeRetrieval(DesignPythonItem.SKIRT_TROUSERS, sysFileVo, sysFileIds); } } @@ -1331,9 +1331,10 @@ public class PythonService { sysFileIds.add(sysFileId); return sysFileService.getById(sysFileId); } - private SysFileVO getRandomSysFileByAttributeRetrieval(List level2TypeList,List sysFileVo,List sysFileIds) { + + private SysFileVO getRandomSysFileByAttributeRetrieval(List level2TypeList, List sysFileVo, List sysFileIds) { sysFileVo = sysFileVo.stream().filter( - f ->level2TypeList.contains(f.getLevel2Type()) && ( !sysFileIds.contains(f.getId())) ) + f -> level2TypeList.contains(f.getLevel2Type()) && (!sysFileIds.contains(f.getId()))) .collect(Collectors.toList()); Long maxId = (long) sysFileVo.size(); Long minId = 0L; @@ -1456,7 +1457,7 @@ public class PythonService { */ public Boolean design(DesignPythonObjects designPythonObjects) { //限流校验 - AccessLimitUtils.validate("design",5); + AccessLimitUtils.validate("design", 5); OkHttpClient client = new OkHttpClient().newBuilder() .connectTimeout(30, TimeUnit.SECONDS) .pingInterval(5, TimeUnit.SECONDS)//websocket轮训间隔(单位:秒) @@ -1509,7 +1510,7 @@ public class PythonService { */ public String generateHighDesign(String designPath) { //限流校验 - AccessLimitUtils.validate("generateHighDesign",2); + AccessLimitUtils.validate("generateHighDesign", 2); OkHttpClient client = new OkHttpClient().newBuilder() .connectTimeout(30, TimeUnit.SECONDS) .pingInterval(5, TimeUnit.SECONDS)//websocket轮训间隔(单位:秒) @@ -1550,6 +1551,7 @@ public class PythonService { //生成失败 throw new BusinessException("system error!"); } + /** * 生成 attribute_retrieval * @@ -1557,9 +1559,9 @@ public class PythonService { * @param modelSex * @return */ - public DesignAttributeRetrievalDTO generateAttributeRetrieval(List sketchUrlList, Long userId, String modelSex) { + public DesignAttributeRetrievalDTO generateAttributeRetrieval(List sketchUrlList, Long userId, String modelSex) { //限流校验 - AccessLimitUtils.validate("generateAttributeRetrieval",4); + AccessLimitUtils.validate("generateAttributeRetrieval", 4); OkHttpClient client = new OkHttpClient().newBuilder() .connectTimeout(30, TimeUnit.SECONDS) .pingInterval(5, TimeUnit.SECONDS)//websocket轮训间隔(单位:秒) @@ -1603,34 +1605,35 @@ public class PythonService { //生成失败 throw new BusinessException("system error!"); } - private static DesignAttributeRetrievalDTO resolveDesignAttributeRetrievalDTO(String bodyStr){ + + private static DesignAttributeRetrievalDTO resolveDesignAttributeRetrievalDTO(String bodyStr) { DesignAttributeRetrievalDTO response = new DesignAttributeRetrievalDTO(); JSONObject jsonObject = JSON.parseObject(bodyStr); JSONObject data = jsonObject.getJSONObject("data"); if (data != null) { JSONObject jsonObjectSys = data.getJSONObject("sys_lib_dict"); - if(null == jsonObjectSys || jsonObjectSys.size() == 0){ + if (null == jsonObjectSys || jsonObjectSys.size() == 0) { log.error("generateAttributeRetrieval异常###{}", "jsonObjectSys is empty!"); throw new BusinessException("system error!"); } - setUrls(jsonObjectSys,response.getSysFileUrlS()); + setUrls(jsonObjectSys, response.getSysFileUrlS()); JSONObject jsonObjectLibrary = data.getJSONObject("user_lib_dict"); - if(null == jsonObjectLibrary || jsonObjectLibrary.size() == 0){ + if (null == jsonObjectLibrary || jsonObjectLibrary.size() == 0) { log.error("generateAttributeRetrieval异常###{}", "jsonObjectLibrary is empty!"); throw new BusinessException("system error!"); } - setUrls(jsonObjectLibrary,response.getLibraryUrls()); + setUrls(jsonObjectLibrary, response.getLibraryUrls()); return response; } throw new BusinessException("AttributeRetrieval response data is null"); } - private static void setUrls(JSONObject jsonObjectSys,List urls){ + private static void setUrls(JSONObject jsonObjectSys, List urls) { List finalUrls = urls; - SysFileLevel2TypeEnum.ofPythonPath().forEach(path ->{ + SysFileLevel2TypeEnum.ofPythonPath().forEach(path -> { JSONArray array = jsonObjectSys.getJSONArray(path); - List urlList = JSONObject.parseArray(JSON.toJSONString(array),String.class); - if(CollectionUtil.isNotEmpty(urlList)){ + List urlList = JSONObject.parseArray(JSON.toJSONString(array), String.class); + if (CollectionUtil.isNotEmpty(urlList)) { finalUrls.addAll(urlList); } }); @@ -1658,6 +1661,7 @@ public class PythonService { /** * 组装和计算设计包括图层的单品的参数，不需要priority + * * @param designSingleDTO * @param singleOverall * @param switchCategory @@ -1702,6 +1706,7 @@ public class PythonService { /** * 设计包括图层的单品，每次只针对一个单品 + * * @param designSingleIncludeLayersDTO * @param designLibraryModelPoint * @return @@ -1731,16 +1736,15 @@ public class PythonService { // bodyPath = "/workspace/python_code/Multi-layer-Virtual-Try-on/dataset_for_test/Img_model.png"; bodyPath = "aida-mannequins/model_1693218345.2714432.png"; } - response.add(new DesignPythonItem(SysFileLevel2TypeEnum.BODY.getRealName(),bodyPath,pythonTAllInfoService.getImageIdByPath(bodyPath))); + response.add(new DesignPythonItem(SysFileLevel2TypeEnum.BODY.getRealName(), bodyPath, pythonTAllInfoService.getImageIdByPath(bodyPath))); return response; } - private DesignPythonItemPrint resolveDesignSinglePrint(DesignSinglePrintDTO printObject, String clothesPath) { // 没有印花时的参数设置 if (printObject.getIfSingle().equals(Boolean.FALSE) && CollectionUtil.isEmpty(printObject.getPrints())) { - return new DesignPythonItemPrint(new ArrayList<>(),false); + return new DesignPythonItemPrint(new ArrayList<>(), false); } DesignPythonItemPrint print = CopyUtil.copyObject(printObject, DesignPythonItemPrint.class); // if(StringUtils.isEmpty(printObject.getPath())){ @@ -1769,13 +1773,13 @@ public class PythonService { // 设置印花的位置、大小、旋转角度 List prints = printObject.getPrints(); prints.forEach(p -> { - p.getLocation().set(0,p.getLocation().get(0)); - p.getLocation().set(1,p.getLocation().get(1)); + p.getLocation().set(0, p.getLocation().get(0)); + p.getLocation().set(1, p.getLocation().get(1)); Integer priority = p.getPriority(); location.add(priority - 1, p.getLocation()); - scale.add(priority - 1,p.getScale()); - angle.add(priority - 1,p.getAngle()); - paths.add(priority - 1,p.getMinIOPath()); + scale.add(priority - 1, p.getScale()); + angle.add(priority - 1, p.getAngle()); + paths.add(priority - 1, p.getMinIOPath()); // log.info("本次print打点locations###{}###fileVO{}", p.getLocation(), JSON.toJSONString(fileVO)); }); print.setLocation(location); @@ -1808,6 +1812,7 @@ public class PythonService { /** * 设计包括图层的单品，不用指定save_name和priority + * * @param singleOverall * @param switchCategory * @param designLibraryModelPoint @@ -1939,7 +1944,7 @@ public class PythonService { // log.info("PythonService##responseBodyStr###{}", response.body().string()); // log.info("PythonService##responseBodyJson###{}", JSON.toJSONString(response.body())); String responseBody = response.body().string(); - JSONObject responseObject = JSON.parseObject(responseBody); + JSONObject responseObject = JSON.parseObject(responseBody); return responseObject; } catch (IOException ioException) { log.error("PythonService##design异常###{}", ExceptionUtil.getThrowableList(ioException)); @@ -1956,9 +1961,9 @@ public class PythonService { if (response.isSuccessful()) { try { String responseBody = response.body().string(); - JSONObject responseObject = JSON.parseObject(responseBody); + JSONObject responseObject = JSON.parseObject(responseBody); return responseObject; - }catch (IOException e) { + } catch (IOException e) { throw new RuntimeException(e); } } @@ -1968,10 +1973,9 @@ public class PythonService { } - - public String generateSketchCaption(String url) { + public String generateSketchCaption(String url) { //限流校验 - AccessLimitUtils.validate("generateSketchCaption",5); + AccessLimitUtils.validate("generateSketchCaption", 5); OkHttpClient client = new OkHttpClient().newBuilder() .connectTimeout(30, TimeUnit.SECONDS) .pingInterval(5, TimeUnit.SECONDS)//websocket轮训间隔(单位:秒) @@ -1981,7 +1985,7 @@ public class PythonService { MediaType mediaType = MediaType.parse("application/json"); RequestBody body = RequestBody.create(mediaType, url); Request request = new Request.Builder() - .url(accessPythonIp+":2828/aida/interrogator") + .url(accessPythonIp + ":2828/aida/interrogator") .method("POST", body) .addHeader("Authorization", "Basic YWlkbGFiOjEyMw==") .addHeader("Content-Type", "application/json") @@ -2011,9 +2015,9 @@ public class PythonService { throw new BusinessException("system error!"); } - public List generateSketchOrPrint(Long userId,String url,String category, String text, int mode, String modelName) { + public List generateSketchOrPrint(Long userId, String url, String category, String text, int mode, String modelName) { //限流校验 - AccessLimitUtils.validate("generateSketchOrPrint",5); + AccessLimitUtils.validate("generateSketchOrPrint", 5); OkHttpClient client = new OkHttpClient().newBuilder() .connectTimeout(30, TimeUnit.SECONDS) .pingInterval(5, TimeUnit.SECONDS)//websocket轮训间隔(单位:秒) @@ -2025,10 +2029,10 @@ public class PythonService { content.put("user_id", userId); content.put("image_url", url); content.put("category", category); - content.put("mode",mode); + content.put("mode", mode); content.put("str", text); - content.put("version",modelName); - RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(content,SerializerFeature.WriteMapNullValue)); + content.put("version", modelName); + RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(content, SerializerFeature.WriteMapNullValue)); Request request = new Request.Builder() // .url(accessPythonIp + ":2828/aida/diffusion") // .url("http://18.167.251.121:9992") @@ -2040,7 +2044,7 @@ public class PythonService { Response response = null; String bodyString = null; try { - log.info("generateSketchOrPrint请求入参content###{}", JSON.toJSONString(content,SerializerFeature.WriteMapNullValue)); + log.info("generateSketchOrPrint请求入参content###{}", JSON.toJSONString(content, SerializerFeature.WriteMapNullValue)); response = client.newCall(request).execute(); bodyString = response.body().string(); // bodyString = "{\n" + @@ -2073,7 +2077,7 @@ public class PythonService { throw new BusinessException("Generate Exception! Code : " + jsonObject.get("code")); } - public Response sendPostToModel(String content,String portAndRoute,String functionName){ + public Response sendPostToModel(String content, String portAndRoute, String functionName) { OkHttpClient client = new OkHttpClient().newBuilder() .connectTimeout(30, TimeUnit.SECONDS) @@ -2096,15 +2100,15 @@ public class PythonService { response = client.newCall(request).execute(); // bodyString = response.body().string(); } catch (IOException ioException) { - log.error("PythonService##"+ functionName +"异常###{}", ExceptionUtil.getThrowableList(ioException)); + log.error("PythonService##" + functionName + "异常###{}", ExceptionUtil.getThrowableList(ioException)); } return response; } - private List setGenerateImageList(JSONObject jsonObject){ - List imageUrlList = JSONObject.parseArray(jsonObject.get("list").toString(),String.class); - if (imageUrlList.isEmpty()){ - log.error("PythonService##generateSketchOrPrint异常###{}","diffusion response list is null"); + private List setGenerateImageList(JSONObject jsonObject) { + List imageUrlList = JSONObject.parseArray(jsonObject.get("list").toString(), String.class); + if (imageUrlList.isEmpty()) { + log.error("PythonService##generateSketchOrPrint异常###{}", "diffusion response list is null"); // todo 如果这里返回为空，是判断出错还是返回给前端空 throw new BusinessException("The data returned on the python side is empty"); } @@ -2116,7 +2120,7 @@ public class PythonService { HashMap> layers = new HashMap<>(); HashMap>> content = new HashMap<>(); layers.put("layers", layersDetail); - content.put("0",layers); + content.put("0", layers); String jsonString = JSON.toJSONString(content, SerializerFeature.WriteNullStringAsEmpty); // todo 添加限流 @@ -2128,7 +2132,7 @@ public class PythonService { if (Objects.isNull(response) || Objects.isNull(response.body())) { log.error("PythonService##composeLayers异常###{}", "response or body is empty!"); throw new BusinessException("generate exception!"); - }else { + } else { bodyString = response.body().string(); } JSONObject jsonObject = JSON.parseObject(bodyString); @@ -2141,7 +2145,7 @@ public class PythonService { throw new BusinessException("composeLayers Exception!"); } - private String getCompositeImage(JSONObject jsonObject){ + private String getCompositeImage(JSONObject jsonObject) { JSONObject item0 = jsonObject.getJSONObject("0"); return item0.getString("synthesis_url"); } diff --git a/src/main/java/com/ai/da/python/vo/DesignPythonBasic.java b/src/main/java/com/ai/da/python/vo/DesignPythonBasic.java index 8cc1765c..ef4c96c2 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonBasic.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonBasic.java @@ -34,6 +34,6 @@ public class DesignPythonBasic { private Double scale_earrings; - private Map> body_point_test = Maps.newHashMap(); + private Map> body_point_test = Maps.newHashMap(); } diff --git a/src/main/java/com/ai/da/python/vo/DesignPythonItem.java b/src/main/java/com/ai/da/python/vo/DesignPythonItem.java index b2107016..02d37b7b 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonItem.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonItem.java @@ -53,7 +53,7 @@ public class DesignPythonItem { */ private String body_mask_path; /** - * python_t_all_info image_id + * python_t_all_info image_id */ private Long imageId; @@ -72,7 +72,7 @@ public class DesignPythonItem { public static List OUTWEAR_DRESS_BLOUSE = Arrays.asList(CollectionLevel2TypeEnum.OUTWEAR.getRealName(), - CollectionLevel2TypeEnum.DRESS.getRealName(),CollectionLevel2TypeEnum.BLOUSE.getRealName()); + CollectionLevel2TypeEnum.DRESS.getRealName(), CollectionLevel2TypeEnum.BLOUSE.getRealName()); public static List SKIRT_TROUSERS = Arrays.asList( CollectionLevel2TypeEnum.SKIRT.getRealName(), CollectionLevel2TypeEnum.TROUSERS.getRealName()); @@ -85,7 +85,7 @@ public class DesignPythonItem { public static List SYS_HAIRSTYLE_SHOES_BODY = Arrays.asList( SysFileLevel2TypeEnum.HAIRSTYLE.getRealName(), SysFileLevel2TypeEnum.SHOES.getRealName(), - SysFileLevel2TypeEnum.EARRINGS.getRealName(),SysFileLevel2TypeEnum.BODY.getRealName()); + SysFileLevel2TypeEnum.EARRINGS.getRealName(), SysFileLevel2TypeEnum.BODY.getRealName()); public static List SYS_HAIRSTYLE_SHOES = Arrays.asList( SysFileLevel2TypeEnum.HAIRSTYLE.getRealName(), SysFileLevel2TypeEnum.SHOES.getRealName(), diff --git a/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java b/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java index dc4cb05e..7650429c 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java @@ -41,7 +41,7 @@ public class DesignPythonItemPrint { @ApiModelProperty("print的旋转角度 传 [0.2, 0.2]") private List print_angle_list; - @JSONField(name="IfSingle") + @JSONField(name = "IfSingle") public Boolean getIfSingle() { return IfSingle; } diff --git a/src/main/java/com/ai/da/python/vo/DesignPythonObjects.java b/src/main/java/com/ai/da/python/vo/DesignPythonObjects.java index 7412048b..22563da6 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonObjects.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonObjects.java @@ -4,6 +4,7 @@ import com.ai.da.mapper.entity.Library; import lombok.Data; import java.util.List; + @Data public class DesignPythonObjects { private String process_id; diff --git a/src/main/java/com/ai/da/service/AccountLoginLogService.java b/src/main/java/com/ai/da/service/AccountLoginLogService.java index 6068f215..773f49a5 100644 --- a/src/main/java/com/ai/da/service/AccountLoginLogService.java +++ b/src/main/java/com/ai/da/service/AccountLoginLogService.java @@ -22,7 +22,7 @@ public interface AccountLoginLogService extends IService { * @param accountId * @return */ - Boolean saveLoginLog(String ip ,Long accountId); + Boolean saveLoginLog(String ip, Long accountId); /** * 根据账户查询 diff --git a/src/main/java/com/ai/da/service/AccountService.java b/src/main/java/com/ai/da/service/AccountService.java index 794478c9..4cbd9ed3 100644 --- a/src/main/java/com/ai/da/service/AccountService.java +++ b/src/main/java/com/ai/da/service/AccountService.java @@ -20,18 +20,23 @@ public interface AccountService extends IService { /** * 账户预先登入 + * * @param accountDTO * @return */ AccountPreLoginVO preLogin(AccountPreLoginDTO accountDTO); + /** * 账户登入 + * * @param accountLoginDTO * @return */ AccountLoginVO login(AccountLoginDTO accountLoginDTO, HttpServletRequest request); + /** * 绑定邮箱 + * * @param accountBindEmailDTO * @return */ @@ -39,38 +44,49 @@ public interface AccountService extends IService { /** * 忘记密码 + * * @param accountDTO * @return */ Boolean forgetPwd(AccountRegisterDTO accountDTO); + /** * 发送邮件 + * * @param emailSendDTO * @return */ Boolean sendEmail(EmailSendDTO emailSendDTO); + /** * 登出 + * * @param accountLogoutDTO * @return */ Boolean logout(AccountLogoutDTO accountLogoutDTO); + /** * 判断是否登出 Boolean为登入 + * * @param accountLogoutDTO * @return */ Boolean isLogin(AccountLogoutDTO accountLogoutDTO); + /** * 添加用户信息 + * * @param accountAddDTO * @return */ Boolean addUser(AccountAddDTO accountAddDTO); + /** * 编辑用户信息 + * * @param accountEditDTO * @return */ - Boolean editUser(AccountEditDTO accountEditDTO) ; + Boolean editUser(AccountEditDTO accountEditDTO); } diff --git a/src/main/java/com/ai/da/service/CollectionElementService.java b/src/main/java/com/ai/da/service/CollectionElementService.java index 22fd9dbd..8a7dd1e1 100644 --- a/src/main/java/com/ai/da/service/CollectionElementService.java +++ b/src/main/java/com/ai/da/service/CollectionElementService.java @@ -31,6 +31,7 @@ public interface CollectionElementService extends IService { * @return */ void delete(Long id); + /** * 删除元素图片 * @@ -38,6 +39,7 @@ public interface CollectionElementService extends IService { * @return */ void batchDelete(List ids); + /** * 生产印花图片 * @@ -45,6 +47,7 @@ public interface CollectionElementService extends IService { * @return */ CollectionGeneratePrintVO generatePrint(CollectionGeneratePrintDTO generatePrintDTO); + /** * 保存印花图片 * @@ -52,14 +55,17 @@ public interface CollectionElementService extends IService { * @return */ Boolean savePrint(CollectionSavePrintDTO savePrintDTO); + /** * 通过element保存library * * @param elements * @return */ - Boolean saveLibraryByCollectionElement(List elements,String timeZone); - Boolean saveLibraryByCollectionElement(List elements,String timeZone, String modelSex); + Boolean saveLibraryByCollectionElement(List elements, String timeZone); + + Boolean saveLibraryByCollectionElement(List elements, String timeZone, String modelSex); + /** * 校验element * @@ -67,6 +73,7 @@ public interface CollectionElementService extends IService { * @return */ ValidateElementVO validateElement(DesignCollectionDTO designDTO); + /** * 编辑 * @@ -74,6 +81,7 @@ public interface CollectionElementService extends IService { * @return */ void editSketchBoardsElement(ValidateElementVO elementVO, List sketchBoards); + /** * 编辑 * @@ -81,6 +89,7 @@ public interface CollectionElementService extends IService { * @return */ void editPrintBoardsElement(ValidateElementVO elementVO, List printBoards); + /** * 关联element和collection * @@ -88,7 +97,7 @@ public interface CollectionElementService extends IService { * @param collectionId * @return */ - void relationCollection(List elementIds,Long collectionId); + void relationCollection(List elementIds, Long collectionId); /** * 保存颜色板 @@ -107,22 +116,24 @@ public interface CollectionElementService extends IService { */ List getByCollectionId(Long collectionId); - List getByOnlyCollectionId(Long collectionId); + List getByOnlyCollectionId(Long collectionId); DesignLibraryModelPointVO calculateTemplatePoint(LibraryModelPoint modelPoint, Integer high, Integer width, String templateUrl); + DesignLibraryModelPointVO calculateTemplatePointTemplate(LibraryModelPoint modelPoint, Integer high, Integer width, String templateUrl); /** * 刷新历史数据 */ - void refreshHistoryData() ; + void refreshHistoryData(); /** * 当level2Type发生改变时，修改levelType + * * @param elementId * @param level2Type * @return */ - CollectionElement editLevel2Type(Long elementId,String level2Type); + CollectionElement editLevel2Type(Long elementId, String level2Type); } diff --git a/src/main/java/com/ai/da/service/CollectionService.java b/src/main/java/com/ai/da/service/CollectionService.java index 207663f8..5efe520d 100644 --- a/src/main/java/com/ai/da/service/CollectionService.java +++ b/src/main/java/com/ai/da/service/CollectionService.java @@ -22,11 +22,13 @@ public interface CollectionService extends IService { /** * 保存collection */ - Long saveCollection(Long accountId,String timeZone,String moodTemplateId); + Long saveCollection(Long accountId, String timeZone, String moodTemplateId); + /** * 根据主键查询 */ Collection findById(Long id); + /** * 查询choose关联的collection */ diff --git a/src/main/java/com/ai/da/service/ColorLoopUpTableService.java b/src/main/java/com/ai/da/service/ColorLoopUpTableService.java index adfc9533..3d9721f4 100644 --- a/src/main/java/com/ai/da/service/ColorLoopUpTableService.java +++ b/src/main/java/com/ai/da/service/ColorLoopUpTableService.java @@ -28,6 +28,6 @@ public interface ColorLoopUpTableService extends IService { * @param colorValues * @return */ - List getByColorValueList(List colorValues); + List getByColorValueList(List colorValues); } diff --git a/src/main/java/com/ai/da/service/DesignItemService.java b/src/main/java/com/ai/da/service/DesignItemService.java index 5b511adb..e4ae3573 100644 --- a/src/main/java/com/ai/da/service/DesignItemService.java +++ b/src/main/java/com/ai/da/service/DesignItemService.java @@ -23,12 +23,13 @@ public interface DesignItemService extends IService { List getByDesignId(Long designId); - void updateLikeStatus(Long designItemId,Byte hasLike); + void updateLikeStatus(Long designItemId, Byte hasLike); - void updateDesignHighUrl(Long designItemId,String highUrl,String timeZone); + void updateDesignHighUrl(Long designItemId, String highUrl, String timeZone); /** * 切换系统elemnt + * * @param id * @param type */ @@ -36,12 +37,14 @@ public interface DesignItemService extends IService { /** * 单个design + * * @param designSingleDTO */ DesignCollectionItemVO designSingle(DesignSingleDTO designSingleDTO); /** * print打点 + * * @param designSingleDTO */ String printDot(DesignSingleDTO designSingleDTO); diff --git a/src/main/java/com/ai/da/service/DesignService.java b/src/main/java/com/ai/da/service/DesignService.java index 712b1159..67f02db1 100644 --- a/src/main/java/com/ai/da/service/DesignService.java +++ b/src/main/java/com/ai/da/service/DesignService.java @@ -20,6 +20,7 @@ import java.math.BigDecimal; public interface DesignService extends IService { /** * design + * * @param designDTO * @return */ @@ -27,12 +28,15 @@ public interface DesignService extends IService { /** * redesign + * * @param reDesignDTO * @return */ DesignCollectionVO reDesignCollection(ReDesignCollectionDTO reDesignDTO); + /** * redesign + * * @param designId * @return */ @@ -45,6 +49,7 @@ public interface DesignService extends IService { /** * like + * * @param designLikeDTO * @return */ @@ -52,6 +57,7 @@ public interface DesignService extends IService { /** * dislike + * * @param disDesignLikeDTO * @return */ @@ -59,6 +65,7 @@ public interface DesignService extends IService { /** * generateHighDesign + * * @param generateHighDesignDTO * @return */ @@ -66,6 +73,7 @@ public interface DesignService extends IService { /** * deleteHighDesign + * * @param generateHighDesignDTO * @return */ @@ -73,10 +81,11 @@ public interface DesignService extends IService { /** * detail + * * @param designItemId * @return */ - DesignItemDetailVO detail(Long designPythonOutfitId,Long designItemId); + DesignItemDetailVO detail(Long designPythonOutfitId, Long designItemId); Integer designProcess(String processId); diff --git a/src/main/java/com/ai/da/service/GenerateService.java b/src/main/java/com/ai/da/service/GenerateService.java index 86e8dfc1..382ec8c8 100644 --- a/src/main/java/com/ai/da/service/GenerateService.java +++ b/src/main/java/com/ai/da/service/GenerateService.java @@ -17,5 +17,5 @@ public interface GenerateService extends IService { GenerateLikeVO generateLike(GenerateLikeDTO generateLikeDTO); - Boolean generateDislike(Long generateDetailId,String timeZone); + Boolean generateDislike(Long generateDetailId, String timeZone); } diff --git a/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java b/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java index 5b2e9eda..56040bd2 100644 --- a/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java +++ b/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java @@ -17,24 +17,25 @@ import java.util.List; */ public interface ITDesignPythonOutfitDetailService extends IService { - /** - * 自定义分页 - * - * @param page - * @param tDesignPythonOutfitDetail - * @return - */ - IPage selectTDesignPythonOutfitDetailPage(IPage page, TDesignPythonOutfitDetailVO tDesignPythonOutfitDetail); + /** + * 自定义分页 + * + * @param page + * @param tDesignPythonOutfitDetail + * @return + */ + IPage selectTDesignPythonOutfitDetailPage(IPage page, TDesignPythonOutfitDetailVO tDesignPythonOutfitDetail); - /** - * 通过DesignPythonOutfitId获取designPythonOutfitDetail - * @param designPythonOutfitId - * @return - */ - List getDetailByDesignPythonOutfitId(Long designPythonOutfitId); + /** + * 通过DesignPythonOutfitId获取designPythonOutfitDetail + * + * @param designPythonOutfitId + * @return + */ + List getDetailByDesignPythonOutfitId(Long designPythonOutfitId); - DesignPythonOutfitVO convertToDesignPythonOutfitVO(TDesignPythonOutfitDetail detail,List offset); + DesignPythonOutfitVO convertToDesignPythonOutfitVO(TDesignPythonOutfitDetail detail, List offset); - void deleteByDesignPythonOutfitId(Long designPythonOutfitId); + void deleteByDesignPythonOutfitId(Long designPythonOutfitId); } diff --git a/src/main/java/com/ai/da/service/ITDesignPythonOutfitService.java b/src/main/java/com/ai/da/service/ITDesignPythonOutfitService.java index a82a0d86..ab98f0ab 100644 --- a/src/main/java/com/ai/da/service/ITDesignPythonOutfitService.java +++ b/src/main/java/com/ai/da/service/ITDesignPythonOutfitService.java @@ -13,14 +13,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; */ public interface ITDesignPythonOutfitService extends IService { - /** - * 自定义分页 - * - * @param page - * @param tDesignPythonOutfit - * @return - */ - IPage selectTDesignPythonOutfitPage(IPage page, TDesignPythonOutfitVO tDesignPythonOutfit); + /** + * 自定义分页 + * + * @param page + * @param tDesignPythonOutfit + * @return + */ + IPage selectTDesignPythonOutfitPage(IPage page, TDesignPythonOutfitVO tDesignPythonOutfit); - TDesignPythonOutfit getByDesignItemId(Long designItemId); + TDesignPythonOutfit getByDesignItemId(Long designItemId); } diff --git a/src/main/java/com/ai/da/service/LibraryModelPointService.java b/src/main/java/com/ai/da/service/LibraryModelPointService.java index 95f83719..24dc3331 100644 --- a/src/main/java/com/ai/da/service/LibraryModelPointService.java +++ b/src/main/java/com/ai/da/service/LibraryModelPointService.java @@ -19,17 +19,18 @@ import java.util.List; */ public interface LibraryModelPointService extends IService { - LibraryModelPointVO saveOrEditTemplatePoint (LibraryModelPointDTO libraryModelPoint); + LibraryModelPointVO saveOrEditTemplatePoint(LibraryModelPointDTO libraryModelPoint); - List selectByLibraryIds (List libraryIds); + List selectByLibraryIds(List libraryIds); /** * 模特打点 + * * @param modelsDotDTO * @return */ - String modelsDot( ModelsDotDTO modelsDotDTO ); + String modelsDot(ModelsDotDTO modelsDotDTO); - LibraryModelPoint getByRelationId(Long relationId,String modelType); + LibraryModelPoint getByRelationId(Long relationId, String modelType); } diff --git a/src/main/java/com/ai/da/service/LibraryService.java b/src/main/java/com/ai/da/service/LibraryService.java index 5536fa30..57f31578 100644 --- a/src/main/java/com/ai/da/service/LibraryService.java +++ b/src/main/java/com/ai/da/service/LibraryService.java @@ -23,6 +23,7 @@ import java.util.List; public interface LibraryService extends IService { /** * 根据用户id和一等级查询 + * * @param accountId * @param level1Types * @return @@ -31,6 +32,7 @@ public interface LibraryService extends IService { /** * 分页查询library + * * @param query * @return */ @@ -46,27 +48,31 @@ public interface LibraryService extends IService { /** * 编辑library 文件名 + * * @param libraryUpdateDTO */ void updateLibraryName(LibraryUpdateDTO libraryUpdateDTO); /** * 跟进ids批量查询 + * * @param ids */ List getByIds(List ids); /** * 根据md5集合查询 + * * @param md5List */ List getByMD5List(List md5List); /** * 根据集合url查询 + * * @param urlList */ - List getByUrlList(List urlList,Long userId); + List getByUrlList(List urlList, Long userId); Boolean updateLibraryLevel2Type(LibraryLevel2TypeUpdateDTO libraryLevel2TypeUpdateDTO); diff --git a/src/main/java/com/ai/da/service/PanToneService.java b/src/main/java/com/ai/da/service/PanToneService.java index 7f2af8e8..77effded 100644 --- a/src/main/java/com/ai/da/service/PanToneService.java +++ b/src/main/java/com/ai/da/service/PanToneService.java @@ -25,6 +25,7 @@ public interface PanToneService extends IService { * @return */ PantoneVO getByHSV(Integer h, Integer s, Integer v); + /** * 根据TCX值查询 * @@ -35,22 +36,24 @@ public interface PanToneService extends IService { /** * 根据TRGB值查询 + * * @param r * @param g * @param b * @return */ - PantoneVO getByRGB(Integer r,Integer g,Integer b); + PantoneVO getByRGB(Integer r, Integer g, Integer b); - Map getPantoneByRgbBatch(List colors); + Map getPantoneByRgbBatch(List colors); PantoneVO getPantoneByRgb(String color); /** * 根据hsv批量查询 + * * @param rgbByHsvBatch * @return */ - List getRgbByHsvBatch(List rgbByHsvBatch); + List getRgbByHsvBatch(List rgbByHsvBatch); } diff --git a/src/main/java/com/ai/da/service/PythonTAllInfoService.java b/src/main/java/com/ai/da/service/PythonTAllInfoService.java index 9b329cfc..904aed88 100644 --- a/src/main/java/com/ai/da/service/PythonTAllInfoService.java +++ b/src/main/java/com/ai/da/service/PythonTAllInfoService.java @@ -1,7 +1,6 @@ package com.ai.da.service; - import com.ai.da.mapper.entity.PythonTAllInfo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/src/main/java/com/ai/da/service/SysFileService.java b/src/main/java/com/ai/da/service/SysFileService.java index d419346d..8d7a05e3 100644 --- a/src/main/java/com/ai/da/service/SysFileService.java +++ b/src/main/java/com/ai/da/service/SysFileService.java @@ -38,18 +38,23 @@ public interface SysFileService extends IService { /** * 根据id获取系统文件 + * * @param id * @return */ SysFileVO getById(Long id); + /** * 根据level1Type获取系统文件 + * * @param level2Type * @return */ List getByLevel2Type(String level2Type); + /** * 根据集合url查询 + * * @param urlList */ List getByUrlList(List urlList); diff --git a/src/main/java/com/ai/da/service/TCollectionElementRelationService.java b/src/main/java/com/ai/da/service/TCollectionElementRelationService.java index d557d90f..860618ab 100644 --- a/src/main/java/com/ai/da/service/TCollectionElementRelationService.java +++ b/src/main/java/com/ai/da/service/TCollectionElementRelationService.java @@ -16,5 +16,6 @@ import java.util.List; */ public interface TCollectionElementRelationService extends IService { void deleteByCollectionId(Long collectionId); - List getByCollectionId(Long collectionId); + + List getByCollectionId(Long collectionId); } diff --git a/src/main/java/com/ai/da/service/UserLikeGroupService.java b/src/main/java/com/ai/da/service/UserLikeGroupService.java index f5cfb93a..551263f1 100644 --- a/src/main/java/com/ai/da/service/UserLikeGroupService.java +++ b/src/main/java/com/ai/da/service/UserLikeGroupService.java @@ -22,10 +22,11 @@ public interface UserLikeGroupService extends IService { HistoryUpdateVO updateUserGroupName(Long userGroupId, String userGroupName, String timeZone); - Long insertUserGroup(Long userId,Long collectionId,String timeZone); + Long insertUserGroup(Long userId, Long collectionId, String timeZone); /** * choose + * * @param userGroupId * @return */ diff --git a/src/main/java/com/ai/da/service/WorkspaceService.java b/src/main/java/com/ai/da/service/WorkspaceService.java index f0f931ac..324ceeed 100644 --- a/src/main/java/com/ai/da/service/WorkspaceService.java +++ b/src/main/java/com/ai/da/service/WorkspaceService.java @@ -14,37 +14,37 @@ import java.io.FileNotFoundException; import java.util.List; /** - * 服务类 + * 服务类 * * @author SHAHAIBO * @since 2023-08-01 */ public interface WorkspaceService extends IService { - /** - * 自定义分页 - * - * @param page - * @param workspace - * @return - */ - IPage selectWorkspacePage(IPage page, WorkspaceVO workspace); + /** + * 自定义分页 + * + * @param page + * @param workspace + * @return + */ + IPage selectWorkspacePage(IPage page, WorkspaceVO workspace); - boolean saveOrUpdate(Workspace workspace); + boolean saveOrUpdate(Workspace workspace); - WorkspaceVO getPage(WorkspaceDTO query); + WorkspaceVO getPage(WorkspaceDTO query); - List getEnumValues(String enumName); + List getEnumValues(String enumName); - Workspace getByIdNew(Long id); + Workspace getByIdNew(Long id); - List getMannequins(String sex); + List getMannequins(String sex); - void systemFileCopy(); + void systemFileCopy(); - void moveFile(); + void moveFile(); - void maleDataInsert() throws FileNotFoundException; + void maleDataInsert() throws FileNotFoundException; - List delete(List workspaceList); + List delete(List workspaceList); } diff --git a/src/main/java/com/ai/da/service/impl/AccountLoginLogServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountLoginLogServiceImpl.java index 72916ee5..4671fba1 100644 --- a/src/main/java/com/ai/da/service/impl/AccountLoginLogServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountLoginLogServiceImpl.java @@ -28,12 +28,12 @@ public class AccountLoginLogServiceImpl extends ServiceImpl0; + return accountLoginLogMapper.insert(accountLoginLog) > 0; } @Override diff --git a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java index d190aaa7..32a38db6 100644 --- a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java @@ -167,7 +167,7 @@ public class ChatRobotServiceImpl implements ChatRobotService { if (response.isSuccessful()) { try { String responseBody = response.body().string(); - JSONObject responseObject = JSON.parseObject(responseBody); + JSONObject responseObject = JSON.parseObject(responseBody); JSONObject data = responseObject.getJSONObject("data"); if (null != data) { ChatRobot chatRobot = new ChatRobot(); @@ -180,7 +180,7 @@ public class ChatRobotServiceImpl implements ChatRobotService { chatRobot.setSessionId(data.getString("session_id")); BigDecimal totalCost = data.getBigDecimal("total_cost"); // 校验本次余额够不够 - checkBalance(totalCost,chatSendDTO.getUser_id()); + checkBalance(totalCost, chatSendDTO.getUser_id()); chatRobot.setTotalCost(totalCost); chatRobot.setTotalTokens(data.getLong("total_tokens")); chatRobot.setUserId(chatSendDTO.getUser_id()); @@ -194,7 +194,7 @@ public class ChatRobotServiceImpl implements ChatRobotService { chatRobot.setSuccessful(0); chatRobotMapper.insert(chatRobot); chatRobotVO.setOutput("I'm sorry, but I can't process your current request. Please rephrase it differently."); - }else { + } else { chatRobot.setSuccessful(1); chatRobotMapper.insert(chatRobot); for (int i = 0; i < array.size(); i++) { @@ -219,19 +219,19 @@ public class ChatRobotServiceImpl implements ChatRobotService { } chatRobotVO.setChatRobotLibraryList(chatRobotLibraryVOList); } - }else { + } else { chatRobot.setSuccessful(0); chatRobotMapper.insert(chatRobot); chatRobotVO.setOutput("I'm sorry, but I can't process your current request. Please rephrase it differently."); } - }else { + } else { chatRobot.setSuccessful(1); chatRobotMapper.insert(chatRobot); } return chatRobotVO; } throw new BusinessException("ChatRobot response data is null!"); - }catch (IOException e) { + } catch (IOException e) { throw new RuntimeException(e); } } @@ -245,9 +245,9 @@ public class ChatRobotServiceImpl implements ChatRobotService { queryWrapper.select("user_id", "SUM(total_cost) as total_cost"); queryWrapper.groupBy("user_id"); List chatRobots = chatRobotMapper.selectList(queryWrapper); - if(!CollectionUtils.isEmpty(chatRobots)) { + if (!CollectionUtils.isEmpty(chatRobots)) { BigDecimal totalCostUsed = chatRobots.get(0).getTotalCost(); - if(totalCostUsed.add(totalCost).compareTo(BigDecimal.valueOf(5)) > 0) { + if (totalCostUsed.add(totalCost).compareTo(BigDecimal.valueOf(5)) > 0) { throw new BusinessException("Your balance is insufficient"); } } @@ -279,10 +279,10 @@ public class ChatRobotServiceImpl implements ChatRobotService { String name = split[4]; if (name.contains(".")) { library.setName(name.split("\\.")[0]); - }else { + } else { library.setName(name); } - }else { + } else { throw new BusinessException("error url"); } @@ -296,7 +296,7 @@ public class ChatRobotServiceImpl implements ChatRobotService { library.setCreateDate(new Date()); libraryMapper.insert(library); return library; - }else { + } else { libraryMapper.deleteById(chatRobotLibraryDTO.getId()); return null; } @@ -310,9 +310,9 @@ public class ChatRobotServiceImpl implements ChatRobotService { queryWrapper.select("user_id", "SUM(total_cost) as total_cost"); queryWrapper.groupBy("user_id"); List chatRobots = chatRobotMapper.selectList(queryWrapper); - if(CollectionUtils.isEmpty(chatRobots)) { + if (CollectionUtils.isEmpty(chatRobots)) { return BigDecimal.ONE; - }else { + } else { BigDecimal totalCost = BigDecimal.valueOf(5).subtract(chatRobots.get(0).getTotalCost()); BigDecimal result = totalCost.divide(BigDecimal.valueOf(5), 4, RoundingMode.HALF_UP); return result; diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java index 2f19ecbd..c04bc60d 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -113,7 +113,7 @@ public class CollectionElementServiceImpl extends ServiceImpl ids) { - if(CollectionUtils.isEmpty(ids)){ + if (CollectionUtils.isEmpty(ids)) { return; } QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id",ids); + queryWrapper.in("id", ids); CollectionElement collectionElement = new CollectionElement(); collectionElement.setCollectionId(0L); - collectionElementMapper.update(collectionElement,queryWrapper); + collectionElementMapper.update(collectionElement, queryWrapper); } @Override @@ -177,19 +177,19 @@ public class CollectionElementServiceImpl extends ServiceImpl printPath = Arrays.asList(url1, url2); @@ -198,11 +198,11 @@ public class CollectionElementServiceImpl extends ServiceImpl elements = listByIds(savePrintDTO.getPrintId()); - Assert.notEmpty(elements,"print file does not exist!"); - return saveLibraryByCollectionElement(elements,savePrintDTO.getTimeZone()); + Assert.notEmpty(elements, "print file does not exist!"); + return saveLibraryByCollectionElement(elements, savePrintDTO.getTimeZone()); } @Override - public Boolean saveLibraryByCollectionElement(List elements,String timeZone){ - if(CollectionUtils.isEmpty(elements)){ + public Boolean saveLibraryByCollectionElement(List elements, String timeZone) { + if (CollectionUtils.isEmpty(elements)) { return Boolean.TRUE; } //获取已存在相同的library List md5List = elements.stream().map(CollectionElement::getMd5).collect(Collectors.toList()); List existsLibrarys = libraryService.getByMD5List(md5List); - if(!CollectionUtils.isEmpty(existsLibrarys)){ + if (!CollectionUtils.isEmpty(existsLibrarys)) { //去重 List existsMd5Lists = existsLibrarys.stream().map(Library::getMd5).collect(Collectors.toList()); - elements = elements.stream().filter(element ->!existsMd5Lists.contains(element.getMd5())).collect(Collectors.toList()); + elements = elements.stream().filter(element -> !existsMd5Lists.contains(element.getMd5())).collect(Collectors.toList()); } - if(CollectionUtils.isEmpty(elements)){ + if (CollectionUtils.isEmpty(elements)) { //都是重复的 return Boolean.TRUE; } - String name = DateUtil.dateToStr(new Date(),DateUtil.YYYY_MM_DD); - List libraryList = CopyUtil.copyList(elements, Library.class,(o,d) ->{ + String name = DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD); + List libraryList = CopyUtil.copyList(elements, Library.class, (o, d) -> { d.setCreateDate(DateUtil.getByTimeZone(timeZone)); d.setName(name); d.setId(null); @@ -245,24 +245,24 @@ public class CollectionElementServiceImpl extends ServiceImpl elements,String timeZone, String modelSex){ - if(CollectionUtils.isEmpty(elements)){ + public Boolean saveLibraryByCollectionElement(List elements, String timeZone, String modelSex) { + if (CollectionUtils.isEmpty(elements)) { return Boolean.TRUE; } //获取已存在相同的library List md5List = elements.stream().map(CollectionElement::getMd5).collect(Collectors.toList()); List existsLibrarys = libraryService.getByMD5List(md5List); - if(!CollectionUtils.isEmpty(existsLibrarys)){ + if (!CollectionUtils.isEmpty(existsLibrarys)) { //去重 List existsMd5Lists = existsLibrarys.stream().map(Library::getMd5).collect(Collectors.toList()); - elements = elements.stream().filter(element ->!existsMd5Lists.contains(element.getMd5())).collect(Collectors.toList()); + elements = elements.stream().filter(element -> !existsMd5Lists.contains(element.getMd5())).collect(Collectors.toList()); } - if(CollectionUtils.isEmpty(elements)){ + if (CollectionUtils.isEmpty(elements)) { //都是重复的 return Boolean.TRUE; } - String name = DateUtil.dateToStr(new Date(),DateUtil.YYYY_MM_DD); - List libraryList = CopyUtil.copyList(elements, Library.class,(o,d) ->{ + String name = DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD); + List libraryList = CopyUtil.copyList(elements, Library.class, (o, d) -> { if (d.getLevel1Type().equals(LibraryLevel1TypeEnum.SKETCH_BOARD.getRealName())) { d.setLevel3Type(modelSex); } @@ -276,7 +276,7 @@ public class CollectionElementServiceImpl extends ServiceImpl usedElementIds = elementVO.getUsedElementIds(); - List libraryCollectionElements = elementVO.getLibraryCollectionElements(); - List generateCollectionElements = elementVO.getGenerateCollectionElements(); + List libraryCollectionElements = elementVO.getLibraryCollectionElements(); + List generateCollectionElements = elementVO.getGenerateCollectionElements(); //校验moodboard if (CollectionUtil.isNotEmpty(designDTO.getMoodBoards())) { //校验designType - validateDesignType(designDTO.getMoodBoards(),"moodBoards"); + validateDesignType(designDTO.getMoodBoards(), "moodBoards"); List moodBoardIds = designDTO.getMoodBoards().stream() - .filter(f ->f.getDesignType().equals(DesignTypeEnum.COLLECTION.getRealName())) + .filter(f -> f.getDesignType().equals(DesignTypeEnum.COLLECTION.getRealName())) .map(DesignCollectionElementDTO::getId) .collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(moodBoardIds)){ + if (!CollectionUtils.isEmpty(moodBoardIds)) { List MoodBoardElements = collectionElementMapper.selectBatchIds(moodBoardIds); Assert.isTrue(CollectionUtil.isNotEmpty(MoodBoardElements) && MoodBoardElements.size() == moodBoardIds.size(), "get moodboard data is mismatch"); @@ -315,14 +315,14 @@ public class CollectionElementServiceImpl extends ServiceImpl libraryIds = designDTO.getMoodBoards().stream() - .filter(f ->f.getDesignType().equals(DesignTypeEnum.LIBRARY.getRealName())) + .filter(f -> f.getDesignType().equals(DesignTypeEnum.LIBRARY.getRealName())) .map(DesignCollectionElementDTO::getId) .collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(libraryIds)){ + if (!CollectionUtils.isEmpty(libraryIds)) { List librarys = libraryService.getByIds(libraryIds); //不校验了防止用户在library删除 对应不上 - if(CollectionUtil.isNotEmpty(librarys)){ - libraryCollectionElements.addAll(covertLibrarysToCollections(librarys,null)); + if (CollectionUtil.isNotEmpty(librarys)) { + libraryCollectionElements.addAll(covertLibrarysToCollections(librarys, null)); } } // generate @@ -330,21 +330,21 @@ public class CollectionElementServiceImpl extends ServiceImpl o.getDesignType().equals((DesignTypeEnum.GENERATE.getRealName()))) .map(DesignCollectionElementDTO::getId) .collect((Collectors.toList())); - if(CollectionUtil.isNotEmpty(generateIds)) { + if (CollectionUtil.isNotEmpty(generateIds)) { List generateList = generateService.listByIds(generateIds); - if(CollectionUtil.isNotEmpty(generateList)){ - generateCollectionElements.addAll(covertGeneratesToCollections(generateList,null)); + if (CollectionUtil.isNotEmpty(generateList)) { + generateCollectionElements.addAll(covertGeneratesToCollections(generateList, null)); } } } if (CollectionUtil.isNotEmpty(designDTO.getPrintBoards())) { //校验designType - validateDesignType(CopyUtil.copyList(designDTO.getPrintBoards(),DesignCollectionElementDTO.class),"printBoards"); + validateDesignType(CopyUtil.copyList(designDTO.getPrintBoards(), DesignCollectionElementDTO.class), "printBoards"); List printBoardIds = designDTO.getPrintBoards().stream() - .filter(f ->f.getDesignType().equals(DesignTypeEnum.COLLECTION.getRealName())) + .filter(f -> f.getDesignType().equals(DesignTypeEnum.COLLECTION.getRealName())) .map(DesignCollectionPrintElementDTO::getId) .collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(printBoardIds)){ + if (!CollectionUtils.isEmpty(printBoardIds)) { //校验printboard List printBoardElements = collectionElementMapper.selectBatchIds(printBoardIds); Assert.isTrue(CollectionUtil.isNotEmpty(printBoardElements) @@ -354,17 +354,17 @@ public class CollectionElementServiceImpl extends ServiceImpl libraryIds = designDTO.getPrintBoards().stream() - .filter(f ->f.getDesignType().equals(DesignTypeEnum.LIBRARY.getRealName())) + .filter(f -> f.getDesignType().equals(DesignTypeEnum.LIBRARY.getRealName())) .map(DesignCollectionPrintElementDTO::getId) .collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(libraryIds)){ + if (!CollectionUtils.isEmpty(libraryIds)) { List librarys = libraryService.getByIds(libraryIds); //不校验了防止用户在library删除 对应不上 - if(CollectionUtil.isNotEmpty(librarys)){ - Map idToMap = designDTO.getPrintBoards() + if (CollectionUtil.isNotEmpty(librarys)) { + Map idToMap = designDTO.getPrintBoards() .stream() - .collect(Collectors.toMap(DesignCollectionPrintElementDTO::getId,v ->v)); - libraryCollectionElements.addAll(covertLibrarysToPrintCollections(librarys,idToMap)); + .collect(Collectors.toMap(DesignCollectionPrintElementDTO::getId, v -> v)); + libraryCollectionElements.addAll(covertLibrarysToPrintCollections(librarys, idToMap)); } } // generate @@ -372,39 +372,39 @@ public class CollectionElementServiceImpl extends ServiceImpl o.getDesignType().equals((DesignTypeEnum.GENERATE.getRealName()))) .map(DesignCollectionPrintElementDTO::getId) .collect((Collectors.toList())); - if(CollectionUtil.isNotEmpty(generateIds)) { + if (CollectionUtil.isNotEmpty(generateIds)) { List generateList = generateService.listByIds(generateIds); - if(CollectionUtil.isNotEmpty(generateList)){ - Map idToMap = designDTO.getPrintBoards() + if (CollectionUtil.isNotEmpty(generateList)) { + Map idToMap = designDTO.getPrintBoards() .stream() - .collect(Collectors.toMap(DesignCollectionPrintElementDTO::getId,v ->v)); - generateCollectionElements.addAll(covertGeneratesToPrintCollections(generateList,idToMap)); + .collect(Collectors.toMap(DesignCollectionPrintElementDTO::getId, v -> v)); + generateCollectionElements.addAll(covertGeneratesToPrintCollections(generateList, idToMap)); } } } if (CollectionUtil.isNotEmpty(designDTO.getSketchBoards())) { //校验PIN是否满足 上衣或者下衣必须不超过8 - long topNum= designDTO.getSketchBoards().stream() - .filter(skecth ->skecth.getIsPin() ==1 + long topNum = designDTO.getSketchBoards().stream() + .filter(skecth -> skecth.getIsPin() == 1 && DesignPythonItem.OUTWEAR_DRESS_BLOUSE.contains(skecth.getLevel2Type())).count(); - Assert.isTrue(topNum<=8,"The number of PIN sketch cannot be greater than 8!"); - long bottomNum= designDTO.getSketchBoards().stream() - .filter(skecth ->skecth.getIsPin() ==1 + Assert.isTrue(topNum <= 8, "The number of PIN sketch cannot be greater than 8!"); + long bottomNum = designDTO.getSketchBoards().stream() + .filter(skecth -> skecth.getIsPin() == 1 && DesignPythonItem.SKIRT_TROUSERS.contains(skecth.getLevel2Type())).count(); - Assert.isTrue(bottomNum<=8,"The number of PIN sketch cannot be greater than 8!"); + Assert.isTrue(bottomNum <= 8, "The number of PIN sketch cannot be greater than 8!"); //校验designType Boolean result = designDTO.getSketchBoards().stream() - .filter(mood ->StringUtils.isEmpty(mood.getDesignType())) + .filter(mood -> StringUtils.isEmpty(mood.getDesignType())) .findFirst().isPresent(); - if(result){ + if (result) { throw new BusinessException("sketchBoards designType cannot be empty!"); } List sketchBoardIds = designDTO.getSketchBoards().stream() - .filter(f ->f.getDesignType().equals(DesignTypeEnum.COLLECTION.getRealName())) + .filter(f -> f.getDesignType().equals(DesignTypeEnum.COLLECTION.getRealName())) .map(CollectionSketchDTO::getSketchBoardId) .collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(sketchBoardIds)){ + if (!CollectionUtils.isEmpty(sketchBoardIds)) { //校验sketchBoard List sketchBoardElements = collectionElementMapper.selectBatchIds(sketchBoardIds); Assert.isTrue(CollectionUtil.isNotEmpty(sketchBoardElements) @@ -414,17 +414,17 @@ public class CollectionElementServiceImpl extends ServiceImpl libraryIds = designDTO.getSketchBoards().stream() - .filter(f ->f.getDesignType().equals(DesignTypeEnum.LIBRARY.getRealName())) + .filter(f -> f.getDesignType().equals(DesignTypeEnum.LIBRARY.getRealName())) .map(CollectionSketchDTO::getSketchBoardId) .collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(libraryIds)){ + if (!CollectionUtils.isEmpty(libraryIds)) { List librarys = libraryService.getByIds(libraryIds); //不校验了防止用户在library删除 对应不上 - if(CollectionUtil.isNotEmpty(librarys)){ - Map idToMap = designDTO.getSketchBoards() + if (CollectionUtil.isNotEmpty(librarys)) { + Map idToMap = designDTO.getSketchBoards() .stream() - .collect(Collectors.toMap(CollectionSketchDTO::getSketchBoardId,v ->v)); - libraryCollectionElements.addAll(covertLibrarysToCollections(librarys,idToMap)); + .collect(Collectors.toMap(CollectionSketchDTO::getSketchBoardId, v -> v)); + libraryCollectionElements.addAll(covertLibrarysToCollections(librarys, idToMap)); } } // generate @@ -432,13 +432,13 @@ public class CollectionElementServiceImpl extends ServiceImpl o.getDesignType().equals((DesignTypeEnum.GENERATE.getRealName()))) .map(CollectionSketchDTO::getSketchBoardId) .collect((Collectors.toList())); - if(CollectionUtil.isNotEmpty(generateIds)) { + if (CollectionUtil.isNotEmpty(generateIds)) { List generateList = generateService.listByIds(generateIds); - if(CollectionUtil.isNotEmpty(generateList)){ - Map idToMap = designDTO.getSketchBoards() + if (CollectionUtil.isNotEmpty(generateList)) { + Map idToMap = designDTO.getSketchBoards() .stream() - .collect(Collectors.toMap(CollectionSketchDTO::getSketchBoardId,v ->v)); - generateCollectionElements.addAll(covertGeneratesToCollections(generateList,idToMap)); + .collect(Collectors.toMap(CollectionSketchDTO::getSketchBoardId, v -> v)); + generateCollectionElements.addAll(covertGeneratesToCollections(generateList, idToMap)); } } } @@ -479,7 +479,7 @@ public class CollectionElementServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.lambda().eq(LibraryModelPoint::getModelType, ModelType.SYSTEM.getValue()); @@ -503,9 +503,9 @@ public class CollectionElementServiceImpl extends ServiceImpl calculateTemplatePointOne(String template,Integer high,Integer width){ - List originRatioList = JSON.parseObject(template,List.class); - originRatioList.set(0,originRatioList.get(0).multiply(BigDecimal.valueOf(width))); - originRatioList.set(1,originRatioList.get(1).multiply(BigDecimal.valueOf(high))); + + private List calculateTemplatePointOne(String template, Integer high, Integer width) { + List originRatioList = JSON.parseObject(template, List.class); + originRatioList.set(0, originRatioList.get(0).multiply(BigDecimal.valueOf(width))); + originRatioList.set(1, originRatioList.get(1).multiply(BigDecimal.valueOf(high))); return originRatioList; } - private List covertLibrarysToCollections(List libraries, Map idToMap){ - return CopyUtil.copyList(libraries,CollectionElement.class,(o,d) ->{ - if(null != idToMap){ + private List covertLibrarysToCollections(List libraries, Map idToMap) { + return CopyUtil.copyList(libraries, CollectionElement.class, (o, d) -> { + if (null != idToMap) { CollectionSketchDTO sketchDTO = idToMap.get(o.getId()); d.setLevel2Type(sketchDTO.getLevel2Type()); d.setHasPin(sketchDTO.getIsPin()); @@ -564,9 +566,9 @@ public class CollectionElementServiceImpl extends ServiceImpl covertGeneratesToCollections(List generates, Map idToMap){ - return CopyUtil.copyList(generates,CollectionElement.class,(o,d) ->{ - if(null != idToMap){ + private List covertGeneratesToCollections(List generates, Map idToMap) { + return CopyUtil.copyList(generates, CollectionElement.class, (o, d) -> { + if (null != idToMap) { CollectionSketchDTO sketchDTO = idToMap.get(o.getId()); d.setLevel2Type(sketchDTO.getLevel2Type()); d.setHasPin(sketchDTO.getIsPin()); @@ -574,35 +576,36 @@ public class CollectionElementServiceImpl extends ServiceImpl covertLibrarysToPrintCollections(List libraries, Map idToMap){ - return CopyUtil.copyList(libraries,CollectionElement.class,(o,d) ->{ - if(null != idToMap){ + private List covertLibrarysToPrintCollections(List libraries, Map idToMap) { + return CopyUtil.copyList(libraries, CollectionElement.class, (o, d) -> { + if (null != idToMap) { DesignCollectionPrintElementDTO printDTO = idToMap.get(o.getId()); d.setHasPin(printDTO.getIsPin()); } }); } - private List covertGeneratesToPrintCollections(List generates, Map idToMap){ - return CopyUtil.copyList(generates,CollectionElement.class,(o,d) ->{ - if(null != idToMap){ + private List covertGeneratesToPrintCollections(List generates, Map idToMap) { + return CopyUtil.copyList(generates, CollectionElement.class, (o, d) -> { + if (null != idToMap) { DesignCollectionPrintElementDTO printDTO = idToMap.get(o.getId()); d.setHasPin(printDTO.getIsPin()); } }); } - private void validateDesignType(List collectionElements,String msg){ - Boolean result = collectionElements.stream().filter(mood ->StringUtils.isEmpty(mood.getDesignType())).findFirst().isPresent(); - if(result){ - throw new BusinessException(msg+" designType cannot be empty!"); + + private void validateDesignType(List collectionElements, String msg) { + Boolean result = collectionElements.stream().filter(mood -> StringUtils.isEmpty(mood.getDesignType())).findFirst().isPresent(); + if (result) { + throw new BusinessException(msg + " designType cannot be empty!"); } } @Override public void editSketchBoardsElement(ValidateElementVO elementVO, List sketchBoards) { - if(CollectionUtil.isNotEmpty(sketchBoards)){ - sketchBoards.forEach(sketchBoard ->{ - CollectionElement collectionElement = CopyUtil.copyObject(sketchBoard,CollectionElement.class); + if (CollectionUtil.isNotEmpty(sketchBoards)) { + sketchBoards.forEach(sketchBoard -> { + CollectionElement collectionElement = CopyUtil.copyObject(sketchBoard, CollectionElement.class); collectionElement.setHasPin(sketchBoard.getIsPin()); collectionElement.setId(sketchBoard.getSketchBoardId()); collectionElementMapper.updateById(collectionElement); @@ -612,12 +615,13 @@ public class CollectionElementServiceImpl extends ServiceImpl printBoards) { - if(CollectionUtil.isNotEmpty(printBoards)){ - printBoards.forEach(printBoard ->{ - CollectionElement collectionElement = CopyUtil.copyObject(printBoard,CollectionElement.class); - collectionElement.setHasPin(Objects.isNull(printBoard.getIsPin()) ? 0 :printBoard.getIsPin()); + if (CollectionUtil.isNotEmpty(printBoards)) { + printBoards.forEach(printBoard -> { + CollectionElement collectionElement = CopyUtil.copyObject(printBoard, CollectionElement.class); + collectionElement.setHasPin(Objects.isNull(printBoard.getIsPin()) ? 0 : printBoard.getIsPin()); collectionElement.setId(printBoard.getId()); collectionElementMapper.updateById(collectionElement); }); @@ -630,7 +634,7 @@ public class CollectionElementServiceImpl extends ServiceImpl elementIds, Long collectionId) { - if (CollectionUtils.isEmpty(elementIds) || null == collectionId){ + if (CollectionUtils.isEmpty(elementIds) || null == collectionId) { return; } QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -652,34 +656,35 @@ public class CollectionElementServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.orderByAsc("id"); - PageQueryBaseVo pageQuery = new PageQueryBaseVo(); + PageQueryBaseVo pageQuery = new PageQueryBaseVo(); pageQuery.setPage(1); pageQuery.setSize(200); - while(true){ + while (true) { IPage page = getBaseMapper().selectPage( new Page<>(pageQuery.getPage(), pageQuery.getSize()), queryWrapper); List list = page.getRecords(); - if(CollectionUtils.isEmpty(list)){ + if (CollectionUtils.isEmpty(list)) { break; } //保存 - List relations = list.stream().map(element-> - TCollectionElementRelation.builder().elementId(element.getId()) - .collectionId(element.getCollectionId()).createDate(new Date()).build()) + List relations = list.stream().map(element -> + TCollectionElementRelation.builder().elementId(element.getId()) + .collectionId(element.getCollectionId()).createDate(new Date()).build()) .collect(Collectors.toList()); tCollectionElementRelationService.saveBatch(relations); - pageQuery.setPage(pageQuery.getPage()+1); - log.info("refreshHistoryData###process###page###"+pageQuery.getPage()); + pageQuery.setPage(pageQuery.getPage() + 1); + log.info("refreshHistoryData###process###page###" + pageQuery.getPage()); } } @@ -694,7 +699,7 @@ public class CollectionElementServiceImpl extends ServiceImpl getByCollectionId(Long collectionId) { List elementIds = tCollectionElementRelationService.getByCollectionId(collectionId); - if (CollectionUtils.isEmpty(elementIds)){ + if (CollectionUtils.isEmpty(elementIds)) { return null; } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("id", elementIds); return collectionElementMapper.selectList(queryWrapper); } + @Override public List getByOnlyCollectionId(Long collectionId) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -745,11 +751,11 @@ public class CollectionElementServiceImpl extends ServiceImpl collectionElements = collectionElementService.getByCollectionId(id); - Assert.notEmpty(collectionElements,"collection element does not exist!"); + Assert.notEmpty(collectionElements, "collection element does not exist!"); response.setCollectionId(id); response.setMoodTemplateId(collection.getMoodTemplateId()); if (collection.getMoodTemplateId() != null) { @@ -83,28 +83,28 @@ public class CollectionServiceImpl extends ServiceImpl> maps = collectionElements + Map> maps = collectionElements .stream() .collect(Collectors.groupingBy(CollectionElement::getLevel1Type)); - maps.forEach((k,v)->{ + maps.forEach((k, v) -> { CollectionLevel1TypeEnum level1TypeEnum = CollectionLevel1TypeEnum.uploadOf(k); - Assert.notNull(level1TypeEnum,"unknown level1TypeEnum!"); - switch (level1TypeEnum){ + Assert.notNull(level1TypeEnum, "unknown level1TypeEnum!"); + switch (level1TypeEnum) { case MOOD_BOARD: - response.setMoodBoards(CopyUtil.copyList(v,CollectionElementVO.class,(o,d)->{ + response.setMoodBoards(CopyUtil.copyList(v, CollectionElementVO.class, (o, d) -> { d.setDesignType(DesignTypeEnum.COLLECTION.getRealName()); d.setUrl(minioUtil.getPresignedUrl(o.getUrl(), 24 * 60)); })); break; case PRINT_BOARD: - response.setPrintBoards(CopyUtil.copyList(v,CollectionElementVO.class,(o,d)->{ + response.setPrintBoards(CopyUtil.copyList(v, CollectionElementVO.class, (o, d) -> { d.setIsPin(o.getHasPin()); d.setDesignType(DesignTypeEnum.COLLECTION.getRealName()); d.setUrl(minioUtil.getPresignedUrl(o.getUrl(), 24 * 60)); })); break; case SKETCH_BOARD: - response.setSketchBoards(CopyUtil.copyList(v,CollectionElementVO.class,(o,d) ->{ + response.setSketchBoards(CopyUtil.copyList(v, CollectionElementVO.class, (o, d) -> { d.setIsPin(o.getHasPin()); d.setDesignType(DesignTypeEnum.COLLECTION.getRealName()); d.setUrl(minioUtil.getPresignedUrl(o.getUrl(), 24 * 60)); @@ -114,7 +114,7 @@ public class CollectionServiceImpl extends ServiceImpl{ + response.setMarketingSketchs(CopyUtil.copyList(v, CollectionElementVO.class, (o, d) -> { d.setDesignType(DesignTypeEnum.COLLECTION.getRealName()); })); break; @@ -123,15 +123,16 @@ public class CollectionServiceImpl extends ServiceImpl resolveColorBoard(List collectionElements){ - return CopyUtil.copyList(collectionElements,CollectionColorVO.class,(o,d) ->{ + + private List resolveColorBoard(List collectionElements) { + return CopyUtil.copyList(collectionElements, CollectionColorVO.class, (o, d) -> { String name = o.getName(); - if (StringUtils.isBlank(name)){ + if (StringUtils.isBlank(name)) { d.setId(null); d.setName(null); - }else { + } else { String[] idName = name.split("_"); - if (idName.length >1){ + if (idName.length > 1) { d.setId(StringUtil.isNullOrEmpty(idName[0]) ? null : Integer.valueOf(idName[0])); d.setName(idName[1]); d.setTcx(idName[2]); diff --git a/src/main/java/com/ai/da/service/impl/DesignItemDetailPrintServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemDetailPrintServiceImpl.java index 709d79cc..189bca2e 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemDetailPrintServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemDetailPrintServiceImpl.java @@ -16,20 +16,20 @@ public class DesignItemDetailPrintServiceImpl extends ServiceImpl getByDesignItemDetailId(Long designItemDetailId){ + public List getByDesignItemDetailId(Long designItemDetailId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("design_item_detail_id",designItemDetailId); + queryWrapper.eq("design_item_detail_id", designItemDetailId); return baseMapper.selectList(queryWrapper); } @Override - public void deleteByDesignItemDetailId(Long designItemDetailId){ + public void deleteByDesignItemDetailId(Long designItemDetailId) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("design_item_detail_id", designItemDetailId); - updateWrapper.set("is_deleted",(byte)1); + updateWrapper.set("is_deleted", (byte) 1); - baseMapper.update(null,updateWrapper); + baseMapper.update(null, updateWrapper); } } diff --git a/src/main/java/com/ai/da/service/impl/DesignItemDetailServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemDetailServiceImpl.java index 24d0bde9..ef5b410d 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemDetailServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemDetailServiceImpl.java @@ -47,8 +47,8 @@ public class DesignItemDetailServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("design_item_id", designItemId); - updateWrapper.set("is_deleted",(byte)1); - return designItemDetailMapper.update(null,updateWrapper); + updateWrapper.set("is_deleted", (byte) 1); + return designItemDetailMapper.update(null, updateWrapper); } @Override diff --git a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java index 8cd0c49f..bc373373 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -72,7 +72,7 @@ public class DesignItemServiceImpl extends ServiceImpl getByDesignId(Long designId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("design_id", designId); - queryWrapper.eq("is_like", (byte)0); + queryWrapper.eq("is_like", (byte) 0); return designItemMapper.selectList(queryWrapper); } @Override - public void updateLikeStatus(Long designItemId,Byte hasLike) { + public void updateLikeStatus(Long designItemId, Byte hasLike) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("id", designItemId); - DesignItem designItem =new DesignItem(); + DesignItem designItem = new DesignItem(); designItem.setHasLike(hasLike); - designItemMapper.update(designItem,queryWrapper); + designItemMapper.update(designItem, queryWrapper); } @Override - public void updateDesignHighUrl(Long designItemId, String highUrl,String timeZone) { + public void updateDesignHighUrl(Long designItemId, String highUrl, String timeZone) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("id", designItemId); - DesignItem designItem =new DesignItem(); + DesignItem designItem = new DesignItem(); designItem.setHighDesignUrl(highUrl); designItem.setUpdateDate(DateUtil.getByTimeZone(timeZone)); - designItemMapper.update(designItem,queryWrapper); + designItemMapper.update(designItem, queryWrapper); } @Override public GetNextSysElementVO getNextSysElement(Long id, String level2Type, String operateType) { //校验 - if(! DesignPythonItem.SYS_HAIRSTYLE_SHOES_BODY.contains(level2Type)){ + if (!DesignPythonItem.SYS_HAIRSTYLE_SHOES_BODY.contains(level2Type)) { throw new BusinessException("unknown type! "); } - List operateTypes = Arrays.asList("PREV","NEXT"); - if(! operateTypes.contains(operateType)){ + List operateTypes = Arrays.asList("PREV", "NEXT"); + if (!operateTypes.contains(operateType)) { throw new BusinessException("unknown operateType! "); } - Assert.notNull(id,"id cannot be empty!"); + Assert.notNull(id, "id cannot be empty!"); Long maxId = sysFileService.getMaxIdByLevel2Type(level2Type, null); Long minId = sysFileService.getMinIdByLevel2Type(level2Type, null); - if(id > maxId || id maxId || id < minId) { throw new BusinessException("The id value is out of range!"); } Long idValue = null; - if("PREV".equals(operateType)){ - if(minId.equals(id)){ + if ("PREV".equals(operateType)) { + if (minId.equals(id)) { idValue = minId; - }else{ - idValue = id -1; + } else { + idValue = id - 1; } } - if("NEXT".equals(operateType)){ - if(maxId.equals(id)){ + if ("NEXT".equals(operateType)) { + if (maxId.equals(id)) { idValue = maxId; - }else{ - idValue = id +1; + } else { + idValue = id + 1; } } SysFileVO sysFileVO = sysFileService.getById(idValue); - return new GetNextSysElementVO(sysFileVO.getId(),level2Type,sysFileVO.getUrl()); + return new GetNextSysElementVO(sysFileVO.getId(), level2Type, sysFileVO.getUrl()); } @Override public DesignCollectionItemVO designSingle(DesignSingleDTO designSingleDTO) { AuthPrincipalVo userInfo = UserContext.getUserHolder(); DesignItem designItem = selectById(designSingleDTO.getDesignItemId()); - Assert.notNull(designItem,"design item does not exists!"); + Assert.notNull(designItem, "design item does not exists!"); Design design = designService.getById(designItem.getDesignId()); - Assert.notNull(design,"design does not exists!"); + Assert.notNull(design, "design does not exists!"); DesignLibraryModelPointVO designLibraryModelPointVO = null; - if (Objects.nonNull(design.getTemplateId())){ + if (Objects.nonNull(design.getTemplateId())) { LibraryModelPoint modelPoint = libraryModelPointService.getById(design.getTemplateId()); - Assert.notNull(modelPoint,"template does not exists!"); + Assert.notNull(modelPoint, "template does not exists!"); Library library = libraryService.getById(modelPoint.getRelationId()); // ??和上面重复 - Assert.notNull(modelPoint,"template does not exists!"); - designLibraryModelPointVO = collectionElementService.calculateTemplatePoint(modelPoint,library.getHigh(),library.getWidth(),library.getUrl()); + Assert.notNull(modelPoint, "template does not exists!"); + designLibraryModelPointVO = collectionElementService.calculateTemplatePoint(modelPoint, library.getHigh(), library.getWidth(), library.getUrl()); } Set newTypes = designSingleDTO.getClothes().stream().map(DesignSingleItemDTO::getType).collect(Collectors.toSet()); //校验category - validateCategory(newTypes,design.getSingleOverall(),design.getSwitchCategory()); - DesignPythonObjects objects =pythonService.covertDesignSingleParam( - designSingleDTO,design.getSingleOverall(),design.getSwitchCategory(),designLibraryModelPointVO); + validateCategory(newTypes, design.getSingleOverall(), design.getSwitchCategory()); + DesignPythonObjects objects = pythonService.covertDesignSingleParam( + designSingleDTO, design.getSingleOverall(), design.getSwitchCategory(), designLibraryModelPointVO); pythonService.design(objects); //designSingle - DesignCollectionItemVO response = saveSingleDesignItemAndDetail(objects,design.getId(),designSingleDTO.getDesignItemId(), - design.getCollectionId(),userInfo,designSingleDTO.getTimeZone()); + DesignCollectionItemVO response = saveSingleDesignItemAndDetail(objects, design.getId(), designSingleDTO.getDesignItemId(), + design.getCollectionId(), userInfo, designSingleDTO.getTimeZone()); // ?? designItem.setDesignUrl(response.getDesignItemUrl()); return response; } - private LibraryModelPointVO resloveVoByModelPoint(LibraryModelPoint modelPoint,Library library){ - LibraryModelPointVO libraryModelPointVO = CopyUtil.copyObject(modelPoint,LibraryModelPointVO.class); + + private LibraryModelPointVO resloveVoByModelPoint(LibraryModelPoint modelPoint, Library library) { + LibraryModelPointVO libraryModelPointVO = CopyUtil.copyObject(modelPoint, LibraryModelPointVO.class); libraryModelPointVO.setTemplateId(modelPoint.getId()); - libraryModelPointVO.setHandLeft(JSON.parseObject(modelPoint.getHandLeft(),List.class)); - libraryModelPointVO.setHandRight(JSON.parseObject(modelPoint.getHandRight(),List.class)); - libraryModelPointVO.setShoulderRight(JSON.parseObject(modelPoint.getShoulderRight(),List.class)); - libraryModelPointVO.setShoulderLeft(JSON.parseObject(modelPoint.getShoulderLeft(),List.class)); - libraryModelPointVO.setWaistbandRight(JSON.parseObject(modelPoint.getWaistbandRight(),List.class)); - libraryModelPointVO.setWaistbandLeft(JSON.parseObject(modelPoint.getWaistbandLeft(),List.class)); + libraryModelPointVO.setHandLeft(JSON.parseObject(modelPoint.getHandLeft(), List.class)); + libraryModelPointVO.setHandRight(JSON.parseObject(modelPoint.getHandRight(), List.class)); + libraryModelPointVO.setShoulderRight(JSON.parseObject(modelPoint.getShoulderRight(), List.class)); + libraryModelPointVO.setShoulderLeft(JSON.parseObject(modelPoint.getShoulderLeft(), List.class)); + libraryModelPointVO.setWaistbandRight(JSON.parseObject(modelPoint.getWaistbandRight(), List.class)); + libraryModelPointVO.setWaistbandLeft(JSON.parseObject(modelPoint.getWaistbandLeft(), List.class)); return libraryModelPointVO; } @Override public String printDot(DesignSingleDTO designSingleDTO) { DesignItem designItem = selectById(designSingleDTO.getDesignItemId()); - Assert.notNull(designItem,"design item does not exists!"); + Assert.notNull(designItem, "design item does not exists!"); Design design = designService.getById(designItem.getDesignId()); - Assert.notNull(design,"design does not exists!"); + Assert.notNull(design, "design does not exists!"); DesignLibraryModelPointVO designLibraryModelPointVO = null; - if (Objects.nonNull(design.getTemplateId())){ + if (Objects.nonNull(design.getTemplateId())) { LibraryModelPoint modelPoint = libraryModelPointService.getById(design.getTemplateId()); - Assert.notNull(modelPoint,"template does not exists!"); + Assert.notNull(modelPoint, "template does not exists!"); Library library = libraryService.getById(modelPoint.getRelationId()); - Assert.notNull(modelPoint,"template does not exists!"); - designLibraryModelPointVO = collectionElementService.calculateTemplatePoint(modelPoint,library.getHigh(),library.getWidth(),library.getUrl()); + Assert.notNull(modelPoint, "template does not exists!"); + designLibraryModelPointVO = collectionElementService.calculateTemplatePoint(modelPoint, library.getHigh(), library.getWidth(), library.getUrl()); } Set newTypes = designSingleDTO.getClothes().stream().map(DesignSingleItemDTO::getType).collect(Collectors.toSet()); //校验category - validateCategory(newTypes,design.getSingleOverall(),design.getSwitchCategory()); - DesignPythonObjects objects =pythonService.covertDesignSingleParam( - designSingleDTO,design.getSingleOverall(),design.getSwitchCategory(),designLibraryModelPointVO); + validateCategory(newTypes, design.getSingleOverall(), design.getSwitchCategory()); + DesignPythonObjects objects = pythonService.covertDesignSingleParam( + designSingleDTO, design.getSingleOverall(), design.getSwitchCategory(), designLibraryModelPointVO); pythonService.design(objects); return objects.getObjects().get(0).getBasic().getSave_name(); } private void validateCategory(Set newTypes, String singleOverall, String switchCategory) { - if(SingleOverallEnum.SINGLE.getRealName().equals(singleOverall) ){ - if(newTypes.size() >1){ + if (SingleOverallEnum.SINGLE.getRealName().equals(singleOverall)) { + if (newTypes.size() > 1) { throw new BusinessException("Wrong clothes type !"); } //一个的时候 - if(!switchCategory.equals(CollectionUtil.newArrayList(newTypes).get(0))){ + if (!switchCategory.equals(CollectionUtil.newArrayList(newTypes).get(0))) { throw new BusinessException("Wrong clothes type !"); } } } + 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(); response.setDesignItemId(designItemId); @@ -247,40 +249,40 @@ public class DesignItemServiceImpl extends ServiceImpl designItemDetails = Lists.newArrayList(); - pythonObjects.getObjects().get(0).getItems().forEach(detail ->{ - if(null == detail){ + pythonObjects.getObjects().get(0).getItems().forEach(detail -> { + if (null == detail) { return; } - DesignItemDetail designItemDetail = CopyUtil.copyObject(detail,DesignItemDetail.class); + DesignItemDetail designItemDetail = CopyUtil.copyObject(detail, DesignItemDetail.class); designItemDetail.setAccountId(userInfo.getId()); designItemDetail.setDesignId(designId); designItemDetail.setDesignItemId(designItemId); designItemDetail.setCollectionElementId(detail.getElementId()); designItemDetail.setCreateDate(DateUtil.getByTimeZone(timeZone)); - if(SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())){ + if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) { designItemDetail.setPath(detail.getBody_path()); //BODY不关联businessId designItemDetail.setBusinessId(0L); } designItemDetail.setIconPath(detail.getIcon()); DesignPythonItemPrint printObject = detail.getPrint(); - designItemDetail.setPrintPath(Objects.isNull(printObject)? "" :printObject.getPath()); + designItemDetail.setPrintPath(Objects.isNull(printObject) ? "" : printObject.getPath()); designItemDetail.setPrintJson(JSON.toJSONString(printObject)); designItemDetails.add(designItemDetail); }); designItemDetailService.saveBatch(designItemDetails); //封装item信息 List designCollectionItems = CopyUtil.copyList(getByDesignId(designId) - ,DesignCollectionItemVO.class,(o,d) ->{ - d.setDesignItemId(o.getId()); - d.setDesignItemUrl(o.getDesignUrl()); + , DesignCollectionItemVO.class, (o, d) -> { + d.setDesignItemId(o.getId()); + d.setDesignItemUrl(o.getDesignUrl()); }); return response; } private List saveDesignSingleItemDetailAndLayers(DesignPythonObjects pythonObjects - , Long designId,Long designItemId, AuthPrincipalVo userInfo - , JSONObject outfit, String timeZone,List designSingleItemDTOList){ + , Long designId, Long designItemId, AuthPrincipalVo userInfo + , JSONObject outfit, String timeZone, List designSingleItemDTOList) { DesignItem designItem = new DesignItem(); // String url = pythonObjects.getObjects().get(0).getBasic().getSave_name(); @@ -293,24 +295,24 @@ public class DesignItemServiceImpl extends ServiceImpl designItemDetails = Lists.newArrayList(); // 3、保存新的designItemDetail - pythonObjects.getObjects().get(0).getItems().forEach(detail ->{ - if(null == detail){ + pythonObjects.getObjects().get(0).getItems().forEach(detail -> { + if (null == detail) { return; } - DesignItemDetail designItemDetail = CopyUtil.copyObject(detail,DesignItemDetail.class); + DesignItemDetail designItemDetail = CopyUtil.copyObject(detail, DesignItemDetail.class); designItemDetail.setAccountId(userInfo.getId()); designItemDetail.setDesignId(designId); designItemDetail.setDesignItemId(designItemId); designItemDetail.setCollectionElementId(detail.getElementId()); designItemDetail.setCreateDate(DateUtil.getByTimeZone(timeZone)); - if(SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())){ + if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) { designItemDetail.setPath(detail.getBody_path()); //BODY不关联businessId designItemDetail.setBusinessId(0L); } designItemDetail.setIconPath(detail.getIcon()); DesignPythonItemPrint printObject = detail.getPrint(); - designItemDetail.setPrintPath(Objects.isNull(printObject)? "" :printObject.getPath()); + designItemDetail.setPrintPath(Objects.isNull(printObject) ? "" : printObject.getPath()); // 当有多个印花后，返回的printObject太长，导致存储到数据库时报错 // designItemDetail.setPrintJson(JSON.toJSONString(printObject)); designItemDetails.add(designItemDetail); @@ -337,7 +339,7 @@ public class DesignItemServiceImpl extends ServiceImpl> typeOffset = designSingleItemDTOList.stream() .collect(Collectors.toMap(d -> d.getType().toLowerCase(), DesignSingleItemDTO::getOffset)); - List list = setTDesignPythonOutfitDetailList(layers, designId, designPythonOutfit.getId(), userInfo.getId(),typeOffset); + List list = setTDesignPythonOutfitDetailList(layers, designId, designPythonOutfit.getId(), userInfo.getId(), typeOffset); designPythonOutfitDetailService.saveBatch(list); @@ -346,7 +348,7 @@ public class DesignItemServiceImpl extends ServiceImpl setTDesignPythonOutfitDetailList(JSONArray layers, Long designId, Long designPythonOutfitId, Long userId, - Map> typeOffset){ + Map> typeOffset) { // 设置图层信息; List list = new ArrayList<>(); for (int i = 0; i < layers.size(); i++) { @@ -383,13 +385,13 @@ public class DesignItemServiceImpl extends ServiceImpl 不存数据库 submit -> 存数据库 @@ -431,27 +433,27 @@ public class DesignItemServiceImpl extends ServiceImpl> typeOffset = designSingleIncludeLayersDTO.getDesignSingleItemDTOList().stream() .collect(Collectors.toMap(d -> d.getType().toLowerCase(), DesignSingleItemDTO::getOffset)); - if (!designSingleIncludeLayersDTO.getIsPreview()){ + if (!designSingleIncludeLayersDTO.getIsPreview()) { // 更新及保存图层信息 tDesignPythonOutfitDetails = saveDesignSingleItemDetailAndLayers(objects, design.getId(), designSingleIncludeLayersDTO.getDesignItemId(), - userInfo, outfit, designSingleIncludeLayersDTO.getTimeZone(),designSingleIncludeLayersDTO.getDesignSingleItemDTOList()); - }else { + userInfo, outfit, designSingleIncludeLayersDTO.getTimeZone(), designSingleIncludeLayersDTO.getDesignSingleItemDTOList()); + } else { JSONArray layers = outfit.getJSONArray("layers"); - tDesignPythonOutfitDetails = setTDesignPythonOutfitDetailList(layers,designItem.getDesignId(),null,userInfo.getId(),typeOffset); + tDesignPythonOutfitDetails = setTDesignPythonOutfitDetailList(layers, designItem.getDesignId(), null, userInfo.getId(), typeOffset); } List detailsVO = new ArrayList<>(); tDesignPythonOutfitDetails.forEach(detail -> { String type = detail.getImageCategory().split("_")[0]; - detailsVO.add(designPythonOutfitDetailService.convertToDesignPythonOutfitVO(detail,typeOffset.get(type))); + detailsVO.add(designPythonOutfitDetailService.convertToDesignPythonOutfitVO(detail, typeOffset.get(type))); }); TDesignPythonOutfit designPythonOutfit = designPythonOutfitService.getByDesignItemId(designSingleIncludeLayersDTO.getDesignItemId()); - Assert.notNull(designItem,"design item detail layers does not exists!"); + Assert.notNull(designItem, "design item detail layers does not exists!"); return assembleDesignSingleResponse(designItem.getId(), - minioUtil.getPresignedUrl(designPythonOutfit.getDesignUrl(),24 * 60), + minioUtil.getPresignedUrl(designPythonOutfit.getDesignUrl(), 24 * 60), outfit.getString("synthesis_url"), designSingleIncludeLayersDTO.getDesignSingleItemDTOList(), detailsVO); @@ -462,14 +464,14 @@ public class DesignItemServiceImpl extends ServiceImpl { TDesignPythonOutfitDetail detail = designPythonOutfitDetailService.getById(layer.getId()); - Assert.notNull(detail,layer.getImageCategory() + " layer does not exists!"); + Assert.notNull(detail, layer.getImageCategory() + " layer does not exists!"); /*layer.setImageUrl(detail.getImageUrl()); layer.setMaskUrl(detail.getMaskUrl());*/ @@ -480,7 +482,7 @@ public class DesignItemServiceImpl extends ServiceImpl designSingleItemDTOList, - List layersObject){ + List layersObject) { DesignSingleVO designSingleVO = new DesignSingleVO(); ArrayList clothes = new ArrayList<>(); @@ -536,14 +538,15 @@ public class DesignItemServiceImpl extends ServiceImpl { DesignItemClothesDetailVO designItemClothesDetailVO = new DesignItemClothesDetailVO(); designItemClothesDetailVO.setId(singleItem.getId()); designItemClothesDetailVO.setType(singleItem.getType()); - designItemClothesDetailVO.setPath(minioUtil.getPresignedUrl(singleItem.getPath(),24 * 60)); + designItemClothesDetailVO.setPath(minioUtil.getPresignedUrl(singleItem.getPath(), 24 * 60)); designItemClothesDetailVO.setMinIOPath(singleItem.getPath()); designItemClothesDetailVO.setColor(panToneService.getPantoneByRgb(singleItem.getColor())); // designItemClothesDetailVO.setPrintObject(new DesignPythonItemPrint(singleItem.getPrintObject().getPath())); @@ -562,7 +565,7 @@ public class DesignItemServiceImpl extends ServiceImpl setDesignItemDetailPrintList(List designItemDetails, List designSingleItemDTOList, - String timeZone){ + String timeZone) { Map designItemDetailTypeIdMap = designItemDetails.stream().collect(Collectors.toMap(DesignItemDetail::getType, DesignItemDetail::getId)); ArrayList designItemDetailPrints = new ArrayList<>(); @@ -571,14 +574,14 @@ public class DesignItemServiceImpl extends ServiceImpl { // 2.1 判断是否第一次添加印花，是：直接添加 List designItemDetailPrintList = designItemDetailPrintService.getByDesignItemDetailId(designItemDetailTypeIdMap.get(designSingleItem.getType())); - if (!designItemDetailPrintList.isEmpty()){ + if (!designItemDetailPrintList.isEmpty()) { // 2.2 否：先删除原始印花，再添加新印花信息 designItemDetailPrintService.deleteByDesignItemDetailId(designItemDetailTypeIdMap.get(designSingleItem.getType())); } @@ -599,10 +602,10 @@ public class DesignItemServiceImpl extends ServiceImpl convertToOutfitDetailPythonItemList(List layers){ + private List convertToOutfitDetailPythonItemList(List layers) { List composeLayerPythonItem = Arrays.asList(new OutfitDetailPythonItem[layers.size()]); layers.forEach(layer -> { - composeLayerPythonItem.set(layer.getPriority() - 1,new OutfitDetailPythonItem(layer.getImageCategory(), + composeLayerPythonItem.set(layer.getPriority() - 1, new OutfitDetailPythonItem(layer.getImageCategory(), layer.getPosition(), layer.getImageSize(), layer.getScale(), diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java index 5554cb8a..6595af41 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -457,7 +457,7 @@ public class DesignServiceImpl extends ServiceImpl impleme String synthesisUrl = outfit.getString("synthesis_url"); if (!StringUtils.isEmpty(synthesisUrl)) { designPythonOutfit.setDesignUrl(synthesisUrl); - }else { + } else { throw new BusinessException("design python response synthesis_url is null"); } designPythonOutfitService.save(designPythonOutfit); @@ -487,7 +487,7 @@ public class DesignServiceImpl extends ServiceImpl impleme String designUrl = designPythonOutfit.getDesignUrl(); if (!StringUtils.isEmpty(designUrl) && designUrl.contains("/")) { int firstIndex = designUrl.indexOf("/"); - designCollectionItemVO.setDesignOutfitUrl(minIoUtil.getPresignedUrl(designUrl.substring(0,firstIndex) + "/" + designUrl.substring(firstIndex+1), 24 * 60)); + designCollectionItemVO.setDesignOutfitUrl(minIoUtil.getPresignedUrl(designUrl.substring(0, firstIndex) + "/" + designUrl.substring(firstIndex + 1), 24 * 60)); } //response designCollectionItems.add(designCollectionItemVO); @@ -688,7 +688,7 @@ public class DesignServiceImpl extends ServiceImpl impleme qw.lambda().eq(TDesignPythonOutfit::getDesignItemId, designLikeDTO.getDesignItemId()); List tDesignPythonOutfits = designPythonOutfitMapper.selectList(qw); if (CollectionUtils.isEmpty(tDesignPythonOutfits)) { - throw new BusinessException("DesignItemId not found elements for ax elements to like! ["+designLikeDTO.getDesignItemId()); + throw new BusinessException("DesignItemId not found elements for ax elements to like! [" + designLikeDTO.getDesignItemId()); } userLike = resolveUserLike(designLikeDTO.getUserGroupId(), designItem.getDesignId(), designLikeDTO.getDesignItemId(), designLikeDTO.getDesignPythonOutfitId(), tDesignPythonOutfits.get(0).getDesignUrl(), designLikeDTO.getTimeZone()); @@ -700,7 +700,7 @@ public class DesignServiceImpl extends ServiceImpl impleme qw.lambda().eq(TDesignPythonOutfit::getDesignItemId, designLikeDTO.getDesignItemId()); List tDesignPythonOutfits = designPythonOutfitMapper.selectList(qw); if (CollectionUtils.isEmpty(tDesignPythonOutfits)) { - throw new BusinessException("DesignItemId not found elements for ax elements to like! ["+designLikeDTO.getDesignItemId()); + throw new BusinessException("DesignItemId not found elements for ax elements to like! [" + designLikeDTO.getDesignItemId()); } userLike = resolveUserLike(userGroupId, designItem.getDesignId(), designLikeDTO.getDesignItemId(), designLikeDTO.getDesignPythonOutfitId(), tDesignPythonOutfits.get(0).getDesignUrl(), designLikeDTO.getTimeZone()); @@ -843,15 +843,15 @@ public class DesignServiceImpl extends ServiceImpl impleme .filter(f -> OUTWEAR_DRESS_BLOUSE.contains(f.getType()) || SKIRT_TROUSERS.contains(f.getType()) || TOPS.contains(f.getType()) || BOTTOMS.contains(f.getType())) .collect(Collectors.toList()); - response.setClothes(CopyUtil.copyList(filterDetail,DesignItemClothesDetailVO.class,(o,d)->{ + response.setClothes(CopyUtil.copyList(filterDetail, DesignItemClothesDetailVO.class, (o, d) -> { d.setId(o.getId()); - d.setPath(minIoUtil.getPresignedUrl(o.getPath(),24 * 60)); + d.setPath(minIoUtil.getPresignedUrl(o.getPath(), 24 * 60)); d.setMinIOPath(o.getPath()); d.setLevel1Type(converTypeToLevel1(o.getType())); // 根据designItemDetailId获取印花 List prints = designItemDetailPrintService.getByDesignItemDetailId(o.getId()); // 判断有无印花 - if (CollectionUtil.isNotEmpty(prints)){ + if (CollectionUtil.isNotEmpty(prints)) { // 有印花 d.setPrintObject(convertToDesignSinglePrintDTO(prints)); } @@ -870,13 +870,13 @@ public class DesignServiceImpl extends ServiceImpl impleme .collect(Collectors.toList()); response.setOthers(CopyUtil.copyList(filterDetail2, DesignItemOthersDetailVO.class, (o, d) -> { d.setId(o.getBusinessId()); - d.setPath(minIoUtil.getPresignedUrl(o.getPath(),24 * 60)); + d.setPath(minIoUtil.getPresignedUrl(o.getPath(), 24 * 60)); d.setMinIOPath(o.getPath()); d.setPrintObject(new DesignPythonItemPrint()); })); - return editDesignItemLayer(flag,designPythonOutfit, - minIoUtil.getPresignedUrl(designPythonOutfit.getDesignUrl(),24 * 60), - editResponseColor(designItemDetails,response)); + return editDesignItemLayer(flag, designPythonOutfit, + minIoUtil.getPresignedUrl(designPythonOutfit.getDesignUrl(), 24 * 60), + editResponseColor(designItemDetails, response)); } @Override @@ -916,10 +916,10 @@ public class DesignServiceImpl extends ServiceImpl impleme if (response.isSuccessful()) { try { String responseBody = response.body().string(); - JSONObject responseObject = JSON.parseObject(responseBody); + JSONObject responseObject = JSON.parseObject(responseBody); String num = responseObject.getString("data"); return Integer.valueOf(num); - }catch (IOException e) { + } catch (IOException e) { throw new RuntimeException(e); } } @@ -967,6 +967,7 @@ public class DesignServiceImpl extends ServiceImpl impleme /** * 避免多次连接数据，所这里一次查多条颜色并利用designItemDetailId保持颜色与vo的对应关系 + * * @param designItemDetails * @param designItemDetailVO * @return @@ -1004,16 +1005,16 @@ public class DesignServiceImpl extends ServiceImpl impleme Assert.notEmpty(details, "Some errors occurred, please restart the design"); details.forEach(detail -> { List offset = new ArrayList<>(); - if (StringUtil.isNullOrEmpty(detail.getOffset()) || detail.getOffset().equals("null")){ - offset = Arrays.asList(0L,0L); - }else { + if (StringUtil.isNullOrEmpty(detail.getOffset()) || detail.getOffset().equals("null")) { + offset = Arrays.asList(0L, 0L); + } else { offset = Arrays.stream(detail.getOffset().replaceAll("\\[|\\]", "").split(",")).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); } - detailsVO.add(designPythonOutfitDetailService.convertToDesignPythonOutfitVO(detail,offset)); + detailsVO.add(designPythonOutfitDetailService.convertToDesignPythonOutfitVO(detail, offset)); }); // 2、将查询出的图层信息填充到designItemDetailVO中 - designItemDetailVO.setDesignItemUrl(minIoUtil.getPresignedUrl(designPythonOutfit.getDesignUrl(),24 * 60)); + designItemDetailVO.setDesignItemUrl(minIoUtil.getPresignedUrl(designPythonOutfit.getDesignUrl(), 24 * 60)); // 2.1 填充clothes designItemDetailVO.getClothes().forEach(c -> { String type = c.getType().toLowerCase(); @@ -1039,31 +1040,31 @@ public class DesignServiceImpl extends ServiceImpl impleme return designItemDetailVO; } - private DesignSinglePrintDTO convertToDesignSinglePrintDTO(List designItemDetailPrints){ + private DesignSinglePrintDTO convertToDesignSinglePrintDTO(List designItemDetailPrints) { DesignSinglePrintDTO designSinglePrintDTO = new DesignSinglePrintDTO(); List prints = new ArrayList<>(); // 只有一个印花 - if (designItemDetailPrints.size() == 1){ + if (designItemDetailPrints.size() == 1) { DesignItemDetailPrint detailPrint = designItemDetailPrints.get(0); DesignSinglePrint designSinglePrint = new DesignSinglePrint(); designSinglePrintDTO.setIfSingle(detailPrint.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE); - designSinglePrint.setLocation(JSONArray.parseArray(detailPrint.getPosition(),Double.class)); + designSinglePrint.setLocation(JSONArray.parseArray(detailPrint.getPosition(), Double.class)); designSinglePrint.setAngle(detailPrint.getAngle()); designSinglePrint.setPriority(detailPrint.getPriority()); - designSinglePrint.setPath(minIoUtil.getPresignedUrl(detailPrint.getPath(),24 * 60)); + designSinglePrint.setPath(minIoUtil.getPresignedUrl(detailPrint.getPath(), 24 * 60)); designSinglePrint.setMinIOPath(detailPrint.getPath()); designSinglePrint.setScale(detailPrint.getScale()); prints.add(designSinglePrint); - }else { + } else { // single模式下多个印花 designSinglePrintDTO.setIfSingle(Boolean.TRUE); designItemDetailPrints.forEach(print -> { - if (print.getSingleOrOverall().equals("single")){ + if (print.getSingleOrOverall().equals("single")) { prints.add(new DesignSinglePrint( - minIoUtil.getPresignedUrl(print.getPath(),24 * 60), + minIoUtil.getPresignedUrl(print.getPath(), 24 * 60), print.getPath(), - JSONArray.parseArray(print.getPosition(),Double.class), + JSONArray.parseArray(print.getPosition(), Double.class), print.getScale(), print.getAngle(), print.getPriority())); diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index 6190352b..dcdcc7e1 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -31,7 +31,7 @@ import java.io.IOException; import java.util.*; @Service -public class GenerateServiceImpl extends ServiceImpl implements GenerateService { +public class GenerateServiceImpl extends ServiceImpl implements GenerateService { @Resource private CollectionElementMapper collectionElementMapper; @@ -54,9 +54,9 @@ public class GenerateServiceImpl extends ServiceImpl im @Override public GenerateCaptionVO generateCaption(Long sketchElementId) { CollectionElement collectionElement = collectionElementMapper.selectById(sketchElementId); - Assert.notNull(collectionElement,"System error!Please reselect the sketch"); + Assert.notNull(collectionElement, "System error!Please reselect the sketch"); Assert.isTrue("Sketchboard".equals(collectionElement.getLevel1Type()) && !StringUtil.isNullOrEmpty(collectionElement.getUrl()) - ,"System error!Please reselect the sketch"); + , "System error!Please reselect the sketch"); String url = collectionElement.getUrl(); // String caption = pythonService.generateSketchCaption(url); GenerateCaptionVO recognized_caption = new GenerateCaptionVO("recognized caption"); @@ -80,7 +80,7 @@ public class GenerateServiceImpl extends ServiceImpl im String text = generateThroughImageTextDTO.getText(); Long elementId = generateThroughImageTextDTO.getCollectionElementId(); - validateGeneraType(generate,text,elementId); + validateGeneraType(generate, text, elementId); // 3、将请求信息落库 // 3.1 sketch或print在t_collection_element表中的信息是否需要更新 如 level2Type @@ -93,8 +93,8 @@ public class GenerateServiceImpl extends ServiceImpl im int mode = GenerateModeEnum.TEXT.getValue().equals(generate.getGenerateType()) ? GenerateModeEnum.TEXT.getCode() : GenerateModeEnum.TEXT_IMAGE.getCode(); String category = generateThroughImageTextDTO.getLevel1Type().equals(CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName()) ? "sketch" : generateThroughImageTextDTO.getLevel1Type().equals(CollectionLevel1TypeEnum.PRINT_BOARD.getRealName()) ? "print" : "moodboard"; - List generatedSketchUrl = pythonService.generateSketchOrPrint(accountId,Objects.isNull(elementId) ? null : collectionElement.getUrl(), - category,text,mode,generateThroughImageTextDTO.getVersion()); + List generatedSketchUrl = pythonService.generateSketchOrPrint(accountId, Objects.isNull(elementId) ? null : collectionElement.getUrl(), + category, text, mode, generateThroughImageTextDTO.getVersion()); // List generatedSketchUrl = Arrays.asList("testUrl1","testUrl2","testUrl3","testUrl4"); @@ -110,23 +110,23 @@ public class GenerateServiceImpl extends ServiceImpl im GenerateCollectionItemVO generateCollectionItemVO = new GenerateCollectionItemVO(); generateCollectionItemVO.setGenerateItemId(generateDetail.getId()); - generateCollectionItemVO.setGenerateItemUrl(minioUtil.getPresignedUrl(item,24 * 60)); + generateCollectionItemVO.setGenerateItemUrl(minioUtil.getPresignedUrl(item, 24 * 60)); generatedCollectionItems.add(generateCollectionItemVO); }); // 6、将模型返回的图片地址返回给前端 Long collectionId = Objects.isNull(collectionElement) ? null : collectionElement.getCollectionId(); - return new GenerateCollectionVO(generate.getId(),collectionId,generatedCollectionItems); + return new GenerateCollectionVO(generate.getId(), collectionId, generatedCollectionItems); } - private void validateGeneraType(Generate generate,String text,Long elementId){ - switch(generate.getGenerateType()){ + private void validateGeneraType(Generate generate, String text, Long elementId) { + switch (generate.getGenerateType()) { case "text": - Assert.notNull(text,"Please input the caption"); + Assert.notNull(text, "Please input the caption"); generate.setText(text); break; case "image": - Assert.notNull(elementId,"Please choose a image"); + Assert.notNull(elementId, "Please choose a image"); generate.setCollectionElementId(elementId); break; case "text-image": @@ -142,15 +142,15 @@ public class GenerateServiceImpl extends ServiceImpl im public GenerateLikeVO generateLike(GenerateLikeDTO generateLikeDTO) { // 1、判断参数是否正确 // 1.1 必须参数是否非空 - if(CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName().equals(generateLikeDTO.getLevel1Type()) ){ - Assert.isTrue(!StringUtil.isNullOrEmpty(generateLikeDTO.getLevel2Type()),"level2Type cannot be empty"); + if (CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName().equals(generateLikeDTO.getLevel1Type())) { + Assert.isTrue(!StringUtil.isNullOrEmpty(generateLikeDTO.getLevel2Type()), "level2Type cannot be empty"); } // 1.2 判断参数是否真实有效 Long generateDetailId = generateLikeDTO.getGenerateDetailId(); GenerateDetail generateDetail = generateDetailMapper.selectById(generateDetailId); - Assert.notNull(generateDetail,"generateItem does not exist"); + Assert.notNull(generateDetail, "generateItem does not exist"); Generate generate = getById(generateDetail.getGenerateId()); - Assert.isTrue(generateLikeDTO.getLevel1Type().equals(generate.getLevel1Type()),"level1Type does not match"); + Assert.isTrue(generateLikeDTO.getLevel1Type().equals(generate.getLevel1Type()), "level1Type does not match"); // 2、将like的图片信息存入library // 2.1、不能重复喜欢 @@ -164,7 +164,7 @@ public class GenerateServiceImpl extends ServiceImpl im libraryService.save(library); // 3、更新generateDetail表的isLike列和libraryId列 - updateLikeStatus(generateLikeDTO.getGenerateDetailId(),(byte)1,library.getId(),generateLikeDTO.getTimeZone()); + updateLikeStatus(generateLikeDTO.getGenerateDetailId(), (byte) 1, library.getId(), generateLikeDTO.getTimeZone()); return new GenerateLikeVO(library.getId()); } @@ -173,14 +173,14 @@ public class GenerateServiceImpl extends ServiceImpl im public Boolean generateDislike(Long generateDetailId, String timeZone) { // 1、确定generateDetail中是否有这条记录 GenerateDetail generateDetail = generateDetailMapper.selectById(generateDetailId); - Assert.notNull(generateDetail,"generateItem does not exist"); + Assert.notNull(generateDetail, "generateItem does not exist"); // 2、修改generateDetail表中的isLike、libraryId字段 - updateLikeStatus(generateDetailId,(byte)0,0L,timeZone); + updateLikeStatus(generateDetailId, (byte) 0, 0L, timeZone); // 3、确定library中是否添加该条记录 Library libraryDetail = libraryService.getById(generateDetail.getLibraryId()); - if (Objects.isNull(libraryDetail)){ + if (Objects.isNull(libraryDetail)) { return Boolean.TRUE; } @@ -191,12 +191,12 @@ public class GenerateServiceImpl extends ServiceImpl im return Boolean.TRUE; } - public Library setLibrary(Long accountId,GenerateLikeDTO generateLikeDTO,String imageUrl){ + public Library setLibrary(Long accountId, GenerateLikeDTO generateLikeDTO, String imageUrl) { Library library = new Library(); library.setAccountId(accountId); library.setLevel1Type(generateLikeDTO.getLevel1Type()); library.setLevel2Type(StringUtil.isNullOrEmpty(generateLikeDTO.getLevel2Type()) ? null : generateLikeDTO.getLevel2Type()); - library.setName(DateUtil.dateToStr(new Date(),DateUtil.YYYY_MM_DD)); + library.setName(DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD)); library.setUrl(imageUrl); try { library.setMd5(MD5Utils.encryptFile(minioUtil.download(imageUrl))); @@ -209,7 +209,7 @@ public class GenerateServiceImpl extends ServiceImpl im return library; } - public void updateLikeStatus(Long generateDetailId,Byte hasLike,Long libraryId,String timeZone){ + public void updateLikeStatus(Long generateDetailId, Byte hasLike, Long libraryId, String timeZone) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("id", generateDetailId); @@ -217,6 +217,6 @@ public class GenerateServiceImpl extends ServiceImpl im generateDetail.setIsLike(hasLike); generateDetail.setLibraryId(libraryId); generateDetail.setUpdateDate(DateUtil.getByTimeZone(timeZone)); - generateDetailMapper.update(generateDetail,queryWrapper); + generateDetailMapper.update(generateDetail, queryWrapper); } } diff --git a/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java b/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java index f58f8af0..bb249baf 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java @@ -60,17 +60,17 @@ public class LibraryModelPointServiceImpl extends ServiceImpl libraryModelPoints = libraryModelPointMapper.selectList(queryWrapper); - if(CollectionUtils.isEmpty(libraryModelPoints)){ + if (CollectionUtils.isEmpty(libraryModelPoints)) { return null; } - return CopyUtil.copyList(libraryModelPoints,LibraryModelPointVO.class,(o,d) ->{ + return CopyUtil.copyList(libraryModelPoints, LibraryModelPointVO.class, (o, d) -> { d.setTemplateId(o.getId()); - d.setHandLeft(JSON.parseObject(o.getHandLeft(),List.class)); - d.setHandRight(JSON.parseObject(o.getHandRight(),List.class)); - d.setShoulderRight(JSON.parseObject(o.getShoulderRight(),List.class)); - d.setShoulderLeft(JSON.parseObject(o.getShoulderLeft(),List.class)); - d.setWaistbandRight(JSON.parseObject(o.getWaistbandRight(),List.class)); - d.setWaistbandLeft(JSON.parseObject(o.getWaistbandLeft(),List.class)); + d.setHandLeft(JSON.parseObject(o.getHandLeft(), List.class)); + d.setHandRight(JSON.parseObject(o.getHandRight(), List.class)); + d.setShoulderRight(JSON.parseObject(o.getShoulderRight(), List.class)); + d.setShoulderLeft(JSON.parseObject(o.getShoulderLeft(), List.class)); + d.setWaistbandRight(JSON.parseObject(o.getWaistbandRight(), List.class)); + d.setWaistbandLeft(JSON.parseObject(o.getWaistbandLeft(), List.class)); }); } + @Override - public String modelsDot( ModelsDotDTO modelsDotDTO) { - DesignPythonObjects objects =pythonService.covertModelsDotParam( - modelsDotDTO, SingleOverallEnum.OVERALL.getRealName(),""); + public String modelsDot(ModelsDotDTO modelsDotDTO) { + DesignPythonObjects objects = pythonService.covertModelsDotParam( + modelsDotDTO, SingleOverallEnum.OVERALL.getRealName(), ""); designService.relationImageId(objects); JSONObject jsonObject = pythonService.designNew(objects); JSONObject data = jsonObject.getJSONObject("data"); @@ -133,10 +135,10 @@ public class LibraryModelPointServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("relation_id", relationId) - .eq("model_type",modelType); + .eq("model_type", modelType); return baseMapper.selectOne(queryWrapper); } 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 59bf2fa5..7785f464 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -68,7 +68,7 @@ public class LibraryServiceImpl extends ServiceImpl impl private String sysImage; private static List top = Arrays.asList(CollectionLevel2TypeEnum.DRESS.getRealName(), - CollectionLevel2TypeEnum.OUTWEAR.getRealName(),CollectionLevel2TypeEnum.BLOUSE.getRealName()); + CollectionLevel2TypeEnum.OUTWEAR.getRealName(), CollectionLevel2TypeEnum.BLOUSE.getRealName()); private static List bottom = Arrays.asList(CollectionLevel2TypeEnum.SKIRT.getRealName(), CollectionLevel2TypeEnum.TROUSERS.getRealName()); @@ -77,7 +77,7 @@ public class LibraryServiceImpl extends ServiceImpl impl QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("account_id", accountId); queryWrapper.in("level1_type", level1Types); - return CopyUtil.copyList(libraryMapper.selectList(queryWrapper),LibraryVo.class); + return CopyUtil.copyList(libraryMapper.selectList(queryWrapper), LibraryVo.class); } @Override @@ -87,66 +87,66 @@ public class LibraryServiceImpl extends ServiceImpl impl QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("account_id", authPrincipalVo.getId()); - if(!StringUtils.isEmpty(query.getLevel1Type())){ + if (!StringUtils.isEmpty(query.getLevel1Type())) { LibraryLevel1TypeEnum level1TypeEnum = LibraryLevel1TypeEnum.uploadOf(query.getLevel1Type()); - Assert.notNull(level1TypeEnum,"unknown level1Type " +query.getLevel1Type()); + Assert.notNull(level1TypeEnum, "unknown level1Type " + query.getLevel1Type()); queryWrapper.eq("level1_type", query.getLevel1Type()); } if (!StringUtils.isEmpty(query.getModelSex()) && query.getLevel1Type().equals(LibraryLevel1TypeEnum.SKETCH_BOARD.getRealName())) { queryWrapper.eq("level3_type", query.getModelSex()); } - if(!StringUtils.isEmpty(query.getLevel2Type())){ + if (!StringUtils.isEmpty(query.getLevel2Type())) { CollectionLevel2TypeEnum level2TypeEnum = CollectionLevel2TypeEnum.of(query.getLevel2Type()); - Assert.notNull(level2TypeEnum,"unknown level2Type " +query.getLevel2Type()); + Assert.notNull(level2TypeEnum, "unknown level2Type " + query.getLevel2Type()); queryWrapper.eq("level2_type", query.getLevel2Type()); } - if(!StringUtils.isEmpty(query.getType())){ + if (!StringUtils.isEmpty(query.getType())) { LibraryTopTypeEnum libraryTopTypeEnum = LibraryTopTypeEnum.uploadOf(query.getType()); - Assert.notNull(libraryTopTypeEnum,"unknown type " +query.getType()); - if(libraryTopTypeEnum.equals(LibraryTopTypeEnum.PRINT)){ + Assert.notNull(libraryTopTypeEnum, "unknown type " + query.getType()); + if (libraryTopTypeEnum.equals(LibraryTopTypeEnum.PRINT)) { queryWrapper.eq("level1_type", LibraryLevel1TypeEnum.PRINT_BOARD.getRealName()); - }else{ + } else { queryWrapper.eq("level1_type", LibraryLevel1TypeEnum.SKETCH_BOARD.getRealName()); - if(LibraryTopTypeEnum.TOP.equals(libraryTopTypeEnum)){ + if (LibraryTopTypeEnum.TOP.equals(libraryTopTypeEnum)) { queryWrapper.in("level2_type", top); - }else{ + } else { queryWrapper.in("level2_type", bottom); } } } - if(!StringUtils.isEmpty(query.getPictureName())){ + if (!StringUtils.isEmpty(query.getPictureName())) { queryWrapper.like("name", query.getPictureName()); } queryWrapper.orderByDesc("id"); IPage page = getBaseMapper().selectPage( new Page<>(query.getPage(), query.getSize()), queryWrapper); - if(CollectionUtils.isEmpty(page.getRecords())){ + if (CollectionUtils.isEmpty(page.getRecords())) { return PageBaseResponse.success(new Page<>()); } - Map map = null; + Map map = null; //封装打点内容 Boolean isExist = page.getRecords().stream() .anyMatch(library -> library.getLevel1Type().equals(LibraryLevel1TypeEnum.MODELS.getRealName())); - if(isExist){ + if (isExist) { List libarayIds = page.getRecords().stream() .filter(library -> library.getLevel1Type().equals(LibraryLevel1TypeEnum.MODELS.getRealName())) .map(Library::getId) .collect(Collectors.toList()); List libraryModelPointVOS = libraryModelPointService.selectByLibraryIds(libarayIds); - if(!CollectionUtils.isEmpty(libraryModelPointVOS)){ - map = libraryModelPointVOS.stream().collect(Collectors.toMap(LibraryModelPointVO::getRelationId,v ->v)); + if (!CollectionUtils.isEmpty(libraryModelPointVOS)) { + map = libraryModelPointVOS.stream().collect(Collectors.toMap(LibraryModelPointVO::getRelationId, v -> v)); } } Map finalMap = map; IPage convert = page.convert((Function) library -> { - QueryLibraryPageVO libraryPageVO = CopyUtil.copyObject(library,QueryLibraryPageVO.class); - libraryPageVO.setDesignType(DesignTypeEnum.LIBRARY.getRealName()); - libraryPageVO.setMinIOPath(library.getUrl()); - libraryPageVO.setUrl(minioUtil.getPresignedUrl(library.getUrl(),24 * 60)); - if(finalMap != null && finalMap.containsKey(library.getId())){ - libraryPageVO.setLibraryModelPoint(finalMap.get(library.getId())); - } - return libraryPageVO; + QueryLibraryPageVO libraryPageVO = CopyUtil.copyObject(library, QueryLibraryPageVO.class); + libraryPageVO.setDesignType(DesignTypeEnum.LIBRARY.getRealName()); + libraryPageVO.setMinIOPath(library.getUrl()); + libraryPageVO.setUrl(minioUtil.getPresignedUrl(library.getUrl(), 24 * 60)); + if (finalMap != null && finalMap.containsKey(library.getId())) { + libraryPageVO.setLibraryModelPoint(finalMap.get(library.getId())); + } + return libraryPageVO; }); return PageBaseResponse.success(convert); } @@ -157,12 +157,12 @@ public class LibraryServiceImpl extends ServiceImpl impl AuthPrincipalVo userInfo = UserContext.getUserHolder(); LibraryLevel1TypeEnum level1TypeEnum = LibraryLevel1TypeEnum.uploadOf(libraryUploadDTO.getLevel1Type()); Assert.notNull(level1TypeEnum, "unknown parameter level1Type!"); - if(!StringUtils.isEmpty(libraryUploadDTO.getLevel2Type())){ + if (!StringUtils.isEmpty(libraryUploadDTO.getLevel2Type())) { CollectionLevel2TypeEnum level2TypeEnum = CollectionLevel2TypeEnum.of(libraryUploadDTO.getLevel2Type()); Assert.notNull(level2TypeEnum, "unknown parameter level2Type!"); } - Assert.isTrue(!( level1TypeEnum.equals(LibraryLevel1TypeEnum.SKETCH_BOARD) - && StringUtils.isEmpty(libraryUploadDTO.getLevel2Type()) ),"level2Type cannot be empty!"); + Assert.isTrue(!(level1TypeEnum.equals(LibraryLevel1TypeEnum.SKETCH_BOARD) + && StringUtils.isEmpty(libraryUploadDTO.getLevel2Type())), "level2Type cannot be empty!"); String path = calculateFileUrl(level1TypeEnum, libraryUploadDTO.getLevel2Type(), libraryUploadDTO.getModelSex(), userInfo.getId()); String bucketName = null; switch (level1TypeEnum) { @@ -188,7 +188,7 @@ public class LibraryServiceImpl extends ServiceImpl impl libraryUpdateVo.setUrl(minioUtil.getPresignedUrl(newFilePath, 24 * 60)); libraryUpdateVo.setCheckMd5(Boolean.TRUE); return libraryUpdateVo; - }else if (libraryUploadDTO.getModelType().equals(ModelType.SYSTEM.getValue())) { + } else if (libraryUploadDTO.getModelType().equals(ModelType.SYSTEM.getValue())) { bucketName = sysImage; path = "models/" + libraryUploadDTO.getModelSex().toLowerCase(); String filePath = minioUtil.upload(bucketName, path, libraryUploadDTO.getFile()); @@ -199,10 +199,10 @@ public class LibraryServiceImpl extends ServiceImpl impl libraryUpdateVo.setUrl(minioUtil.getPresignedUrl(newFilePath, 24 * 60)); libraryUpdateVo.setCheckMd5(Boolean.TRUE); return libraryUpdateVo; - }else { + } else { throw new BusinessException("unknown modelType"); } - }else { + } else { String filePath = minioUtil.upload(bucketName, path, libraryUploadDTO.getFile()); //保存element元素 Library library = resolveData(libraryUploadDTO, userInfo, filePath); @@ -251,10 +251,10 @@ public class LibraryServiceImpl extends ServiceImpl impl if (response.isSuccessful()) { try { String responseBody = response.body().string(); - JSONObject responseObject = JSON.parseObject(responseBody); + JSONObject responseObject = JSON.parseObject(responseBody); String newMinioPath = responseObject.getString("data"); return newMinioPath; - }catch (IOException e) { + } catch (IOException e) { throw new RuntimeException(e); } } @@ -272,7 +272,7 @@ public class LibraryServiceImpl extends ServiceImpl impl if (level1Type.equals(LibraryLevel1TypeEnum.SKETCH_BOARD)) { qw.lambda().eq(Library::getLevel2Type, level2Type); qw.lambda().eq(Library::getLevel3Type, sex); - }else { + } else { qw.lambda().eq(Library::getLevel2Type, sex); } } @@ -281,7 +281,7 @@ public class LibraryServiceImpl extends ServiceImpl impl if (!CollectionUtils.isEmpty(libraryList)) { // throw new BusinessException("Your library already contains the images you uploaded, Are you sure to upload them"); return Boolean.FALSE; - }else { + } else { return Boolean.TRUE; } } @@ -290,20 +290,20 @@ public class LibraryServiceImpl extends ServiceImpl impl if (StringUtils.isEmpty(uploadDTO.getModelType()) || uploadDTO.getModelType().equals(ModelType.LIBRARY.getValue())) { Library library = CopyUtil.copyObject(uploadDTO, Library.class); library.setAccountId(userInfo.getId()); - library.setName(DateUtil.dateToStr(new Date(),DateUtil.YYYY_MM_DD)); + library.setName(DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD)); library.setUrl(filePath); //按时区计算 library.setCreateDate(DateUtil.getByTimeZone(uploadDTO.getTimeZone())); if (uploadDTO.getModelType().equals(ModelType.LIBRARY.getValue())) { library.setLevel2Type(uploadDTO.getModelSex()); - }else { + } else { library.setLevel3Type(uploadDTO.getModelSex()); } libraryMapper.insert(library); return library; - }else if (uploadDTO.getModelType().equals(ModelType.SYSTEM.getValue())) { + } else if (uploadDTO.getModelType().equals(ModelType.SYSTEM.getValue())) { SysFile sysFile = new SysFile(); - sysFile.setName(DateUtil.dateToStr(new Date(),DateUtil.YYYY_MM_DD)); + sysFile.setName(DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD)); sysFile.setLevel1Type("Models"); sysFile.setLevel2Type(uploadDTO.getModelSex()); sysFile.setUrl(filePath); @@ -314,7 +314,7 @@ public class LibraryServiceImpl extends ServiceImpl impl library.setId(sysFile.getId()); library.setUrl(sysFile.getUrl()); return library; - }else { + } else { throw new BusinessException("system error!"); } } @@ -322,7 +322,7 @@ public class LibraryServiceImpl extends ServiceImpl impl private String calculateFileUrl(LibraryLevel1TypeEnum level1TypeEnum, String level2Type, String modelSex, Long userId) { if (StringUtils.isEmpty(modelSex)) { return StringUtils.isEmpty(level2Type) ? userId + "/" + level1TypeEnum.getRealName().toLowerCase() : userId + "/" + level1TypeEnum.getRealName().toLowerCase() + "/" + level2Type; - }else { + } else { return StringUtils.isEmpty(level2Type) ? userId + "/" + level1TypeEnum.getRealName().toLowerCase() + "/" + modelSex.toLowerCase() : userId + "/" + level1TypeEnum.getRealName().toLowerCase() + "/" + modelSex.toLowerCase() + "/" + level2Type; } } @@ -330,13 +330,13 @@ public class LibraryServiceImpl extends ServiceImpl impl @Override public void updateLibraryName(LibraryUpdateDTO libraryUpdateDTO) { List librarys = getByIds(libraryUpdateDTO.getLibraryIds()); - Assert.notEmpty(librarys,"Librarys does not exist!"); + Assert.notEmpty(librarys, "Librarys does not exist!"); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("id", libraryUpdateDTO.getLibraryIds()); - Library library1= new Library(); + Library library1 = new Library(); library1.setName(libraryUpdateDTO.getLibraryName()); library1.setUpdateDate(DateUtil.getByTimeZone(libraryUpdateDTO.getTimeZone())); - libraryMapper.update(library1,queryWrapper); + libraryMapper.update(library1, queryWrapper); } @Override @@ -354,11 +354,11 @@ public class LibraryServiceImpl extends ServiceImpl impl } @Override - public List getByUrlList(List urlList,Long userId) { + public List getByUrlList(List urlList, Long userId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("url", urlList); queryWrapper.in("account_id", userId); - return CopyUtil.copyList(libraryMapper.selectList(queryWrapper),LibraryVo.class); + return CopyUtil.copyList(libraryMapper.selectList(queryWrapper), LibraryVo.class); } @Override diff --git a/src/main/java/com/ai/da/service/impl/PanToneServiceImpl.java b/src/main/java/com/ai/da/service/impl/PanToneServiceImpl.java index edf31d4f..d0f6b5eb 100644 --- a/src/main/java/com/ai/da/service/impl/PanToneServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PanToneServiceImpl.java @@ -36,15 +36,15 @@ public class PanToneServiceImpl extends ServiceImpl impl @Override public PantoneVO getByHSV(Integer h, Integer s, Integer v) { - int value = (h * 101 *101)+ (s*101) +v; + int value = (h * 101 * 101) + (s * 101) + v; ColorLookupTable colorLookupTable = colorLoopUpTableService.getByColorValue(value); - if(Objects.isNull(colorLookupTable)){ + if (Objects.isNull(colorLookupTable)) { return new PantoneVO(); } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("pantone_index", colorLookupTable.getColorIndex()); PanTone panTone = panToneMapper.selectOne(queryWrapper); - if(Objects.isNull(panTone)){ + if (Objects.isNull(panTone)) { throw new BusinessException("Pantone value does not exist !"); } return coverPanToneToVo(panTone); @@ -55,14 +55,14 @@ public class PanToneServiceImpl extends ServiceImpl impl QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("tcx", txc); List panTones = panToneMapper.selectList(queryWrapper); - if(CollectionUtil.isEmpty(panTones)){ + if (CollectionUtil.isEmpty(panTones)) { throw new BusinessException("Pantone value does not exist !"); } return coverPanToneToVo(panTones.get(0)); } @Override - public PantoneVO getByRGB(Integer r,Integer g,Integer b) { + public PantoneVO getByRGB(Integer r, Integer g, Integer b) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("r", r); queryWrapper.eq("g", g); @@ -72,23 +72,23 @@ public class PanToneServiceImpl extends ServiceImpl impl } @Override - public Map getPantoneByRgbBatch(List colors){ + public Map getPantoneByRgbBatch(List colors) { - HashMap colorValueRgb = new HashMap<>(); - HashMap colorIndexRgb = new HashMap<>(); + HashMap colorValueRgb = new HashMap<>(); + HashMap colorIndexRgb = new HashMap<>(); ArrayList values = new ArrayList<>(); colors.forEach(color -> { int[] rgb = Arrays.stream(color.split("\\s+")).mapToInt(Integer::parseInt).toArray(); int[] hsv = PantoneUtils.rgbToHsv(rgb); - int value = (hsv[0] * 101 *101)+ (hsv[1]*101) +hsv[2]; - colorValueRgb.put(value,color); + int value = (hsv[0] * 101 * 101) + (hsv[1] * 101) + hsv[2]; + colorValueRgb.put(value, color); values.add(value); }); List colorValueList = colorLoopUpTableService.getByColorValueList(values); - colorValueList.forEach(colorValue ->{ + colorValueList.forEach(colorValue -> { // 不同的colorValue可能会有相同的colorIndex - colorIndexRgb.put(colorValue.getColorIndex(),colorValueRgb.get(colorValue.getColorValue())); + colorIndexRgb.put(colorValue.getColorIndex(), colorValueRgb.get(colorValue.getColorValue())); }); List panTones = panToneService.listByIds(colorIndexRgb.keySet()); @@ -101,12 +101,12 @@ public class PanToneServiceImpl extends ServiceImpl impl pantoneVOS.forEach(pantoneVO -> { int colorIndex = pantoneVO.getId(); List collect = colorValueList.stream().filter(colorValue -> colorValue.getColorIndex().equals(colorIndex)).collect(Collectors.toList()); - if (collect.size() > 1){ + if (collect.size() > 1) { for (ColorLookupTable colorLookupTable : collect) { colorPantoneVO.put(colorValueRgb.get(colorLookupTable.getColorValue()), pantoneVO); } - }else if (collect.size() == 1){ - colorPantoneVO.put(colorIndexRgb.get(pantoneVO.getId()),pantoneVO); + } else if (collect.size() == 1) { + colorPantoneVO.put(colorIndexRgb.get(pantoneVO.getId()), pantoneVO); } }); @@ -123,9 +123,9 @@ public class PanToneServiceImpl extends ServiceImpl impl @Override - public PantoneVO getPantoneByRgb(String color){ + public PantoneVO getPantoneByRgb(String color) { GetRgbByHsvBatchDTO getRgbByHsvBatchDTO = new GetRgbByHsvBatchDTO(); - if (!StringUtil.isNullOrEmpty(color)){ + if (!StringUtil.isNullOrEmpty(color)) { int[] rgb = Arrays.stream(color.split("\\s+")).mapToInt(Integer::parseInt).toArray(); int[] hsv = PantoneUtils.rgbToHsv(rgb); @@ -134,79 +134,80 @@ public class PanToneServiceImpl extends ServiceImpl impl getRgbByHsvBatchDTO.setV(hsv[2]); } - return getByHSV(getRgbByHsvBatchDTO.getH(),getRgbByHsvBatchDTO.getS(),getRgbByHsvBatchDTO.getV()); + return getByHSV(getRgbByHsvBatchDTO.getH(), getRgbByHsvBatchDTO.getS(), getRgbByHsvBatchDTO.getV()); } @Override public List getRgbByHsvBatch(List hsvBatch) { - if(hsvBatch.size() >8){ + if (hsvBatch.size() > 8) { throw new BusinessException("hsv value cannot exceed the maximum of 8"); } List colorValues = Lists.newArrayList(); - Map valueToHsv = Maps.newHashMap(); - hsvBatch.forEach( hsv->{ + Map valueToHsv = Maps.newHashMap(); + hsvBatch.forEach(hsv -> { if (Objects.isNull(hsv)) { return; } Integer h = hsv.getH(); Integer s = hsv.getS(); Integer v = hsv.getV(); - int value = (h * 101 *101)+ (s*101) +v; + int value = (h * 101 * 101) + (s * 101) + v; colorValues.add(value); - valueToHsv.put(value,hsv); + valueToHsv.put(value, hsv); }); List colorLookupTables = colorLoopUpTableService.getByColorValueList(colorValues); - if(Objects.isNull(colorLookupTables)){ + if (Objects.isNull(colorLookupTables)) { return Lists.newArrayList(); } - Map IndexToValue = colorLookupTables.stream() - .collect(Collectors.toMap(v->v.getColorIndex(),v ->v.getColorValue(),(V1,V2) ->V1)); + Map IndexToValue = colorLookupTables.stream() + .collect(Collectors.toMap(v -> v.getColorIndex(), v -> v.getColorValue(), (V1, V2) -> V1)); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("pantone_index", colorLookupTables.stream() .map(ColorLookupTable::getColorIndex).collect(Collectors.toList())); - return coverPanToneToVoList(panToneMapper.selectList(queryWrapper),IndexToValue,valueToHsv,hsvBatch); + return coverPanToneToVoList(panToneMapper.selectList(queryWrapper), IndexToValue, valueToHsv, hsvBatch); } - private PantoneVO coverPanToneToVo(PanTone panTone){ - if(Objects.isNull(panTone)){ + private PantoneVO coverPanToneToVo(PanTone panTone) { + if (Objects.isNull(panTone)) { return null; } - PantoneVO pantoneVO = CopyUtil.copyObject(panTone,PantoneVO.class); + PantoneVO pantoneVO = CopyUtil.copyObject(panTone, PantoneVO.class); // pantoneVO.setR(panTone.getR()); // pantoneVO.setG(panTone.getG()); // pantoneVO.setB(panTone.getB()); pantoneVO.setId(panTone.getPantoneIndex()); return pantoneVO; } + private List coverPanToneToVoList(List panTones - ,Map indexToValue, Map valueToHsv, - List hsvBatch){ - if(Objects.isNull(panTones)){ + , Map indexToValue, Map valueToHsv, + List hsvBatch) { + if (Objects.isNull(panTones)) { throw new BusinessException("Pantone value does not exist !"); } - List templateResposne = CopyUtil.copyList(panTones,PantoneVO.class,(o,d)->{ + List templateResposne = CopyUtil.copyList(panTones, PantoneVO.class, (o, d) -> { d.setId(o.getPantoneIndex()); - GetRgbByHsvBatchDTO getRgbByHsvBatchDTO = valueToHsv.get(indexToValue.get(o.getPantoneIndex())); - if(Objects.nonNull(getRgbByHsvBatchDTO)){ + GetRgbByHsvBatchDTO getRgbByHsvBatchDTO = valueToHsv.get(indexToValue.get(o.getPantoneIndex())); + if (Objects.nonNull(getRgbByHsvBatchDTO)) { d.setH(getRgbByHsvBatchDTO.getH()); d.setS(getRgbByHsvBatchDTO.getS()); d.setV(getRgbByHsvBatchDTO.getV()); } }); - Map valueToPantoneVo = templateResposne.stream().collect(Collectors.toMap( - v -> (v.getH() * 101 *101)+ (v.getS()*101) +v.getV(), Function.identity(),(value1,value2)-> value1 + Map valueToPantoneVo = templateResposne.stream().collect(Collectors.toMap( + v -> (v.getH() * 101 * 101) + (v.getS() * 101) + v.getV(), Function.identity(), (value1, value2) -> value1 )); - List response =Lists.newArrayList(); + List response = Lists.newArrayList(); //排序给前端 - hsvBatch.forEach( hsv->{ + hsvBatch.forEach(hsv -> { if (Objects.isNull(hsv)) { return; } - int value = (hsv.getH() * 101 *101)+ (hsv.getS()*101) +hsv.getV(); + int value = (hsv.getH() * 101 * 101) + (hsv.getS() * 101) + hsv.getV(); PantoneVO pantoneVO = valueToPantoneVo.get(value); - if(Objects.isNull(pantoneVO)){ - response.add(new PantoneVO("None","11-1111")); - }else{ + if (Objects.isNull(pantoneVO)) { + response.add(new PantoneVO("None", "11-1111")); + } else { response.add(pantoneVO); } }); diff --git a/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java b/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java index c18db346..8cdee34a 100644 --- a/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java @@ -52,144 +52,151 @@ public class SysFileServiceImpl extends ServiceImpl impl //删除缓存 clearCacheSysFileData(); //读取linux环境系统图片地址 - List allFile= FileUtil.getAllFile("/workspace/home/aida/file/sys"); - if(CollectionUtils.isEmpty(allFile)){ + List allFile = FileUtil.getAllFile("/workspace/home/aida/file/sys"); + if (CollectionUtils.isEmpty(allFile)) { return; } - Map idMap = initIdValueByLevel2Type(); - if (allFile.size() >500){ + Map idMap = initIdValueByLevel2Type(); + if (allFile.size() > 500) { AtomicInteger process = new AtomicInteger(); //批量保存mysql 500条一次 - List> fileList = Lists.partition(allFile,500); - fileList.forEach(list ->{ - log.info("初始化系统文件进度###次数###{}",process.getAndAdd(1)); - if(saveMany(initSysFile(list,idMap))){ + List> fileList = Lists.partition(allFile, 500); + fileList.forEach(list -> { + log.info("初始化系统文件进度###次数###{}", process.getAndAdd(1)); + if (saveMany(initSysFile(list, idMap))) { return; } }); return; } - saveMany(initSysFile(allFile,idMap)); + saveMany(initSysFile(allFile, idMap)); } - private void clearCacheSysFileData(){ + + private void clearCacheSysFileData() { LocalCacheUtils.clearAllMaxMinValueCache(); LocalCacheUtils.clearAllSysFileCache(); LocalCacheUtils.clearAllSysFileCacheByLevel2Type(); log.info("初始化系统文件删除删除系统文件缓存完毕#####"); } - private void deleteAllSysFileData(){ + + private void deleteAllSysFileData() { AtomicInteger process = new AtomicInteger(); - while(true){ + while (true) { // 分页数据 QueryWrapper queryWrapper = new QueryWrapper<>(); IPage page = this.getBaseMapper().selectPage( new Page<>(1, 500), queryWrapper); - if(CollectionUtils.isEmpty(page.getRecords())){ - break ; - }else{ + if (CollectionUtils.isEmpty(page.getRecords())) { + break; + } else { List ids = page.getRecords().stream().map(SysFile::getId).collect(Collectors.toList()); this.removeByIds(ids); - log.info("初始化系统文件删除mysql数据进度###次数###{}",process.getAndAdd(1)); + log.info("初始化系统文件删除mysql数据进度###次数###{}", process.getAndAdd(1)); } } } - private List initSysFile(List files,Map idMap){ - List sysFiles =Lists.newArrayList(); + + private List initSysFile(List files, Map idMap) { + List sysFiles = Lists.newArrayList(); files.forEach(file -> { SysFile sysFile = new SysFile(); sysFile.setCreateDate(new Date()); String filePath = file.getAbsolutePath(); sysFile.setLevel1Type(calculateLevel1Type(filePath)); sysFile.setLevel2Type(calculateLevel2Type(filePath)); - sysFile.setId(getIdByLevel2Type(sysFile.getLevel2Type(),idMap)); + sysFile.setId(getIdByLevel2Type(sysFile.getLevel2Type(), idMap)); sysFile.setName(file.getName()); - try{ + try { FileInputStream inputStream = new FileInputStream(file); sysFile.setMd5(MD5Utils.encryptFile(inputStream)); - }catch(IOException ioException){ + } catch (IOException ioException) { log.info("initSysFile 文件异常###{}", ExceptionUtil.getThrowableList(ioException)); throw new BusinessException("initSysFile ioException"); } String linuxDomain = fileProperties.getLinuxDomain(); - if(!StringUtils.isEmpty(linuxDomain)){ + if (!StringUtils.isEmpty(linuxDomain)) { //linux 系统 String oldPath = fileProperties.getSys().getPath(); - sysFile.setUrl(filePath.replace(oldPath,linuxDomain)); + sysFile.setUrl(filePath.replace(oldPath, linuxDomain)); } sysFiles.add(sysFile); }); return sysFiles; } - private String calculateLevel1Type(String filePath){ + + private String calculateLevel1Type(String filePath) { String[] split = filePath.split("/"); //一级目录 - SysFileLevel1TypeEnum sysFileLevel1Type = SysFileLevel1TypeEnum.uploadOf(split[split.length-3]); - if(Objects.nonNull(sysFileLevel1Type)){ + SysFileLevel1TypeEnum sysFileLevel1Type = SysFileLevel1TypeEnum.uploadOf(split[split.length - 3]); + if (Objects.nonNull(sysFileLevel1Type)) { return sysFileLevel1Type.getRealName(); } return ""; } - private String calculateLevel2Type(String filePath){ + + private String calculateLevel2Type(String filePath) { String[] split = filePath.split("/"); //一级目录 - SysFileLevel2TypeEnum sysFileLevel2Type = SysFileLevel2TypeEnum.uploadOf(split[split.length-2]); - if(Objects.nonNull(sysFileLevel2Type)){ + SysFileLevel2TypeEnum sysFileLevel2Type = SysFileLevel2TypeEnum.uploadOf(split[split.length - 2]); + if (Objects.nonNull(sysFileLevel2Type)) { return sysFileLevel2Type.getRealName(); } return ""; } - private Long getIdByLevel2Type(String level2Type ,Map IdMp){ + + private Long getIdByLevel2Type(String level2Type, Map IdMp) { Long id = IdMp.get(level2Type); - Long newId = id +1; - IdMp.put(level2Type,newId); + Long newId = id + 1; + IdMp.put(level2Type, newId); return newId; } - private Map initIdValueByLevel2Type(){ + + private Map initIdValueByLevel2Type() { //每个类型分配100000 十万个位置 - Map idMap = Maps.newHashMap(); + Map idMap = Maps.newHashMap(); // 0 到 100000 - idMap.put(SysFileLevel2TypeEnum.EARRINGS.getRealName(),0L); + idMap.put(SysFileLevel2TypeEnum.EARRINGS.getRealName(), 0L); // 100001 到 200000 - idMap.put(SysFileLevel2TypeEnum.HAIRSTYLE.getRealName(),100000L); + idMap.put(SysFileLevel2TypeEnum.HAIRSTYLE.getRealName(), 100000L); // 200001 到 300000 - idMap.put(SysFileLevel2TypeEnum.SHOES.getRealName(),200000L); + idMap.put(SysFileLevel2TypeEnum.SHOES.getRealName(), 200000L); // 300001 到 400000 - idMap.put(SysFileLevel2TypeEnum.BLOUSE.getRealName(),300000L); + idMap.put(SysFileLevel2TypeEnum.BLOUSE.getRealName(), 300000L); // 400001 到 500000 - idMap.put(SysFileLevel2TypeEnum.DRESS.getRealName(),400000L); + idMap.put(SysFileLevel2TypeEnum.DRESS.getRealName(), 400000L); // 500001 到 600000 - idMap.put(SysFileLevel2TypeEnum.OUTWEAR.getRealName(),500000L); + idMap.put(SysFileLevel2TypeEnum.OUTWEAR.getRealName(), 500000L); // 600001 到 700000 - idMap.put(SysFileLevel2TypeEnum.SKIRT.getRealName(),600000L); + idMap.put(SysFileLevel2TypeEnum.SKIRT.getRealName(), 600000L); // 700001 到 800000 - idMap.put(SysFileLevel2TypeEnum.TROUSERS.getRealName(),700000L); + idMap.put(SysFileLevel2TypeEnum.TROUSERS.getRealName(), 700000L); // 800001 到 900000 - idMap.put(SysFileLevel2TypeEnum.ICON.getRealName(),800000L); + idMap.put(SysFileLevel2TypeEnum.ICON.getRealName(), 800000L); // 900001 到 1000000 - idMap.put(SysFileLevel2TypeEnum.BAG.getRealName(),900000L); + idMap.put(SysFileLevel2TypeEnum.BAG.getRealName(), 900000L); // 1000001 到 1100000 - idMap.put(SysFileLevel2TypeEnum.BODY.getRealName(),1000000L); + idMap.put(SysFileLevel2TypeEnum.BODY.getRealName(), 1000000L); return idMap; } @Override public Long getMaxIdByLevel2Type(String level2Type, String modelSex) { - String key = "MAX_"+level2Type; + String key = "MAX_" + level2Type; Long maxId = LocalCacheUtils.getFileMaxMinValueCache(key); - if(null == maxId){ - maxId =maxId(level2Type, modelSex); - LocalCacheUtils.setFileMaxMinValueCache(key,maxId); + if (null == maxId) { + maxId = maxId(level2Type, modelSex); + LocalCacheUtils.setFileMaxMinValueCache(key, maxId); } return maxId; } @Override public Long getMinIdByLevel2Type(String level2Type, String modelSex) { - String key = "MIN_"+level2Type; + String key = "MIN_" + level2Type; Long minId = LocalCacheUtils.getFileMaxMinValueCache(key); - if(null == minId || minId == 0L){ + if (null == minId || minId == 0L) { minId = minId(level2Type, modelSex); - LocalCacheUtils.setFileMaxMinValueCache(key,minId); + LocalCacheUtils.setFileMaxMinValueCache(key, minId); } return minId; } @@ -197,9 +204,9 @@ public class SysFileServiceImpl extends ServiceImpl impl @Override public SysFileVO getById(Long id) { SysFileVO sysFile = LocalCacheUtils.getSysFileCache(id); - if(Objects.isNull(sysFile) || Objects.isNull(sysFile.getId())){ - sysFile = CopyUtil.copyObject(sysFileMapper.selectById(id),SysFileVO.class); - LocalCacheUtils.setSysFileCache(id,sysFile); + if (Objects.isNull(sysFile) || Objects.isNull(sysFile.getId())) { + sysFile = CopyUtil.copyObject(sysFileMapper.selectById(id), SysFileVO.class); + LocalCacheUtils.setSysFileCache(id, sysFile); } return sysFile; } @@ -212,32 +219,34 @@ public class SysFileServiceImpl extends ServiceImpl impl // throw new BusinessException("unknown level2Type "+level2Type); // } List cacheSysFileList = LocalCacheUtils.getSysFileCacheByLevel2Type(level2Type); - if(CollectionUtils.isEmpty(cacheSysFileList)){ + if (CollectionUtils.isEmpty(cacheSysFileList)) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("level2_type", SysFileLevel2TypeEnum.ofPython()); - List sysFiles = CopyUtil.copyList(sysFileMapper.selectList(queryWrapper),SysFileVO.class); - LocalCacheUtils.setSysFileCacheByLevel2Type(level2Type,sysFiles); + List sysFiles = CopyUtil.copyList(sysFileMapper.selectList(queryWrapper), SysFileVO.class); + LocalCacheUtils.setSysFileCacheByLevel2Type(level2Type, sysFiles); return sysFiles; } return cacheSysFileList; } - private Long maxId(String level2Type, String modelSex){ + private Long maxId(String level2Type, String modelSex) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("level2_type", level2Type); queryWrapper.eq(!StringUtils.isEmpty(modelSex), "level3_type", modelSex); - queryWrapper.select("max(id) as id " ); + queryWrapper.select("max(id) as id "); SysFile sysFile = sysFileMapper.selectOne(queryWrapper); return sysFile.getId(); } - private Long minId(String level2Type, String modelSex){ + + private Long minId(String level2Type, String modelSex) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("level2_type", level2Type); queryWrapper.eq(!StringUtils.isEmpty(modelSex), "level3_type", modelSex); - queryWrapper.select("min(id) as id " ); + queryWrapper.select("min(id) as id "); SysFile sysFile = sysFileMapper.selectOne(queryWrapper); return sysFile.getId(); } + private boolean saveMany(List sysFiles) { if (!this.saveBatch(sysFiles)) { throw new BusinessException("save system file failed!"); @@ -249,6 +258,6 @@ public class SysFileServiceImpl extends ServiceImpl impl public List getByUrlList(List urlList) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("url", urlList); - return CopyUtil.copyList(sysFileMapper.selectList(queryWrapper),SysFileVO.class); + return CopyUtil.copyList(sysFileMapper.selectList(queryWrapper), SysFileVO.class); } } diff --git a/src/main/java/com/ai/da/service/impl/TCollectionElementRelationServiceImpl.java b/src/main/java/com/ai/da/service/impl/TCollectionElementRelationServiceImpl.java index 460c0e76..22c2e0e4 100644 --- a/src/main/java/com/ai/da/service/impl/TCollectionElementRelationServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/TCollectionElementRelationServiceImpl.java @@ -37,7 +37,7 @@ public class TCollectionElementRelationServiceImpl extends ServiceImpl getByCollectionId(Long collectionId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("collection_id", collectionId); - List tCollectionElementRelations = tCollectionElementRelationMapper.selectList(queryWrapper); + List tCollectionElementRelations = tCollectionElementRelationMapper.selectList(queryWrapper); return CollectionUtils.isEmpty(tCollectionElementRelations) ? null : tCollectionElementRelations.stream().map(TCollectionElementRelation::getElementId).collect(Collectors.toList()); } diff --git a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java index 7f3aa0dc..af42e80d 100644 --- a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java @@ -30,36 +30,37 @@ import java.util.Objects; @Service public class TDesignPythonOutfitDetailServiceImpl extends ServiceImpl implements ITDesignPythonOutfitDetailService { - @Resource - private MinioUtil minIoUtil; - @Override - public IPage selectTDesignPythonOutfitDetailPage(IPage page, TDesignPythonOutfitDetailVO tDesignPythonOutfitDetail) { - return page.setRecords(baseMapper.selectTDesignPythonOutfitDetailPage(page, tDesignPythonOutfitDetail)); - } - - @Override - public List getDetailByDesignPythonOutfitId(Long designPythonOutfitId){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("design_python_outfit_id",designPythonOutfitId); - - return baseMapper.selectList(queryWrapper); - } + @Resource + private MinioUtil minIoUtil; @Override - public DesignPythonOutfitVO convertToDesignPythonOutfitVO(TDesignPythonOutfitDetail detail,List offset){ - if (Objects.isNull(detail)) { - return null; - } + public IPage selectTDesignPythonOutfitDetailPage(IPage page, TDesignPythonOutfitDetailVO tDesignPythonOutfitDetail) { + return page.setRecords(baseMapper.selectTDesignPythonOutfitDetailPage(page, tDesignPythonOutfitDetail)); + } - DesignPythonOutfitVO designPythonOutfitVO = CopyUtil.copyObject(detail,DesignPythonOutfitVO.class); - designPythonOutfitVO.setPosition(StringUtil.isNullOrEmpty(detail.getPosition()) ? null : (List) JSON.parse(detail.getPosition())); - designPythonOutfitVO.setImageSize(StringUtil.isNullOrEmpty(detail.getImageSize()) ? null : (List) JSON.parse(detail.getImageSize())); - designPythonOutfitVO.setImageUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : minIoUtil.getPresignedUrl(detail.getImageUrl(),24 * 60)); - designPythonOutfitVO.setImageMinioUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : detail.getImageUrl()); - designPythonOutfitVO.setMaskUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : minIoUtil.getPresignedUrl(detail.getMaskUrl(),24 * 60)); - designPythonOutfitVO.setMaskMinioUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : detail.getMaskUrl()); - designPythonOutfitVO.setScale(Float.parseFloat(detail.getScale())); - designPythonOutfitVO.setOffset(CollectionUtil.isEmpty(offset) ? Arrays.asList(0L,0L) : offset); + @Override + public List getDetailByDesignPythonOutfitId(Long designPythonOutfitId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("design_python_outfit_id", designPythonOutfitId); + + return baseMapper.selectList(queryWrapper); + } + + @Override + public DesignPythonOutfitVO convertToDesignPythonOutfitVO(TDesignPythonOutfitDetail detail, List offset) { + if (Objects.isNull(detail)) { + return null; + } + + DesignPythonOutfitVO designPythonOutfitVO = CopyUtil.copyObject(detail, DesignPythonOutfitVO.class); + designPythonOutfitVO.setPosition(StringUtil.isNullOrEmpty(detail.getPosition()) ? null : (List) JSON.parse(detail.getPosition())); + designPythonOutfitVO.setImageSize(StringUtil.isNullOrEmpty(detail.getImageSize()) ? null : (List) JSON.parse(detail.getImageSize())); + designPythonOutfitVO.setImageUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : minIoUtil.getPresignedUrl(detail.getImageUrl(), 24 * 60)); + designPythonOutfitVO.setImageMinioUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : detail.getImageUrl()); + designPythonOutfitVO.setMaskUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : minIoUtil.getPresignedUrl(detail.getMaskUrl(), 24 * 60)); + designPythonOutfitVO.setMaskMinioUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : detail.getMaskUrl()); + designPythonOutfitVO.setScale(Float.parseFloat(detail.getScale())); + designPythonOutfitVO.setOffset(CollectionUtil.isEmpty(offset) ? Arrays.asList(0L, 0L) : offset); /*if (!StringUtil.isNullOrEmpty(detail.getImageSize())){ List size = Arrays.stream(detail.getImageSize().replaceAll("\\[|\\]", "").split(",")).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); @@ -69,20 +70,20 @@ public class TDesignPythonOutfitDetailServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); // queryWrapper.eq("design_python_outfit_id",designPythonOutfitId); // TDesignPythonOutfitDetail tDesignPythonOutfitDetail = new TDesignPythonOutfitDetail(); // tDesignPythonOutfitDetail.setIsDeleted(1); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("design_python_outfit_id", designPythonOutfitId); - updateWrapper.set("is_deleted",(byte)1); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("design_python_outfit_id", designPythonOutfitId); + updateWrapper.set("is_deleted", (byte) 1); - baseMapper.update(null,updateWrapper); - } + baseMapper.update(null, updateWrapper); + } } diff --git a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitServiceImpl.java b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitServiceImpl.java index 5e91acf2..59ddda04 100644 --- a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitServiceImpl.java @@ -18,17 +18,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage; @Service public class TDesignPythonOutfitServiceImpl extends ServiceImpl implements ITDesignPythonOutfitService { - @Override - public IPage selectTDesignPythonOutfitPage(IPage page, TDesignPythonOutfitVO tDesignPythonOutfit) { - return page.setRecords(baseMapper.selectTDesignPythonOutfitPage(page, tDesignPythonOutfit)); - } + @Override + public IPage selectTDesignPythonOutfitPage(IPage page, TDesignPythonOutfitVO tDesignPythonOutfit) { + return page.setRecords(baseMapper.selectTDesignPythonOutfitPage(page, tDesignPythonOutfit)); + } - @Override - public TDesignPythonOutfit getByDesignItemId(Long designItemId){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("design_item_id",designItemId); + @Override + public TDesignPythonOutfit getByDesignItemId(Long designItemId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("design_item_id", designItemId); - return getOne(queryWrapper); - } + return getOne(queryWrapper); + } } diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index 06ccc5ed..25fd4b2b 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -53,22 +53,22 @@ public class UserLikeGroupServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("id", userGroupId); UserLikeGroup userLikeGroup = new UserLikeGroup(); userLikeGroup.setName(userGroupName); userLikeGroup.setUpdateDate(DateUtil.getByTimeZone(timeZone)); - log.info("跟新group名字###{}###时间是###{}",userLikeGroup.getUpdateDate(),TimeZone.getDefault()); - userLikeGroupMapper.update(userLikeGroup,queryWrapper); - return new HistoryUpdateVO(userLikeGroup.getName(),userLikeGroup.getUpdateDate().getTime()); + log.info("跟新group名字###{}###时间是###{}", userLikeGroup.getUpdateDate(), TimeZone.getDefault()); + userLikeGroupMapper.update(userLikeGroup, queryWrapper); + return new HistoryUpdateVO(userLikeGroup.getName(), userLikeGroup.getUpdateDate().getTime()); } // public static void main(String[] args) { @@ -92,7 +92,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl userLikeVOS = userLikeService.getGroupDetail(userGroupId); userLikeVOS.forEach(o -> { TDesignPythonOutfit tDesignPythonOutfit1 = designPythonOutfitMapper.selectById(o.getDesignOutfitId()); @@ -123,6 +123,6 @@ public class UserLikeGroupServiceImpl extends ServiceImpl i QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("user_like_group_id", userGroupId); List userLikes = userLikeMapper.selectList(queryWrapper); - if(CollectionUtils.isEmpty(userLikes)){ + if (CollectionUtils.isEmpty(userLikes)) { return Lists.newArrayList(); } - return CopyUtil.copyList(userLikes,UserLikeVO.class); + return CopyUtil.copyList(userLikes, UserLikeVO.class); // List designItemIds = userLikes.stream().map(UserLike::getDesignItemId).collect(Collectors.toList()); // List designItems = designItemService.listByIds(designItemIds); // Map idToUrlMap = designItems.stream().collect(Collectors.toMap(DesignItem::getId,DesignItem::getDesignUrl)); @@ -54,7 +54,7 @@ public class UserLikeServiceImpl extends ServiceImpl i public List getGroupDetails(List userGroupIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("user_like_group_id", userGroupIds); - return CopyUtil.copyList(userLikeMapper.selectList(queryWrapper),UserLikeVO.class); + return CopyUtil.copyList(userLikeMapper.selectList(queryWrapper), UserLikeVO.class); } public void deleteByUserGroupId(Long userGroupId) { 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 94886de9..0758f2c9 100644 --- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java @@ -81,6 +81,7 @@ public class WorkspaceServiceImpl extends ServiceImpl selectWorkspacePage(IPage page, WorkspaceVO workspace) { return page.setRecords(baseMapper.selectWorkspacePage(page, workspace)); } + private final static String WORKSPACE_NAME = "Default workspace name"; private final static Integer SYSTEM_DESIGNER_PERCENTAGE = 30; @@ -180,14 +181,14 @@ public class WorkspaceServiceImpl extends ServiceImpl