From 471426e93109e117d818702c2dbfa3696c7700be Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Fri, 19 Jan 2024 16:36:34 +0800 Subject: [PATCH] =?UTF-8?q?TASK:=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/da/common/config/DataSourceConfig.java | 27 --- .../ai/da/common/config/MyTaskScheduler.java | 5 +- .../{mybatis/plus => }/MybatisPlusConfig.java | 46 ++-- .../config/PrimaryDataSourceConfig.java | 53 +++++ .../config/SecondaryDataSourceConfig.java | 49 ++++ .../config/mybatis/plus/CommonMapper.java | 24 +- .../mybatis/plus/CommonServiceImpl.java | 96 ++++---- .../mybatis/plus/CustomerSqlInjector.java | 38 ++-- .../config/mybatis/plus/QueryCriteria.java | 170 +++++++------- .../config/mybatis/plus/SelectVoPage.java | 44 ++-- .../ai/da/common/utils/LocalCacheUtils.java | 4 - .../com/ai/da/common/utils/MinioUtil.java | 10 +- .../com/ai/da/common/utils/SendEmailUtil.java | 4 +- .../ai/da/controller/AccountController.java | 13 +- .../controller/ClassificationController.java | 8 - .../ai/da/controller/LibraryController.java | 7 +- .../ai/da/controller/PythonController.java | 2 +- .../controller/SavedCollectionController.java | 8 +- .../ai/da/controller/WorkspaceController.java | 6 +- .../{ => primary}/AccountLoginLogMapper.java | 31 ++- .../mapper/{ => primary}/AccountMapper.java | 64 +++--- .../mapper/{ => primary}/ChatRobotMapper.java | 6 +- .../{ => primary}/ClassificationMapper.java | 5 +- .../ClassificationRelLibraryMapper.java | 5 +- .../CollectionElementMapper.java | 30 ++- .../{ => primary}/CollectionMapper.java | 33 ++- .../{ => primary}/ColorLoopUpTableMapper.java | 28 +-- .../{ => primary}/DesignHistoryMapper.java | 29 ++- .../{ => primary}/DesignItemDetailMapper.java | 29 ++- .../DesignItemDetailPrintMapper.java | 4 +- .../{ => primary}/DesignItemMapper.java | 31 ++- .../da/mapper/{ => primary}/DesignMapper.java | 33 ++- .../{ => primary}/GenerateDetailMapper.java | 4 +- .../mapper/{ => primary}/GenerateMapper.java | 4 +- .../mapper/{ => primary}/LibraryMapper.java | 29 ++- .../LibraryModelPointMapper.java | 29 ++- .../mapper/{ => primary}/PanToneMapper.java | 39 ++-- .../{ => primary}/PythonTAllInfoMapper.java | 8 +- .../mapper/{ => primary}/SysFileMapper.java | 29 ++- .../TCollectionElementRelationMapper.java | 4 +- .../TDesignPythonOutfitDetailMapper.java | 4 +- .../TDesignPythonOutfitMapper.java | 4 +- .../{ => primary}/TrialOrderMapper.java | 7 +- .../{ => primary}/UserLikeGroupMapper.java | 31 ++- .../mapper/{ => primary}/UserLikeMapper.java | 28 +-- .../mapper/{ => primary}/WorkspaceMapper.java | 4 +- .../mapper/{ => primary}/entity/Account.java | 166 +++++++------- .../{ => primary}/entity/AccountLoginLog.java | 106 ++++----- .../{ => primary}/entity/ChatRobot.java | 3 +- .../{ => primary}/entity/Classification.java | 3 +- .../entity/ClassificationRelLibrary.java | 2 +- .../{ => primary}/entity/Collection.java | 105 +++++---- .../entity/CollectionElement.java | 174 +++++++------- .../entity/ColorLookupTable.java | 67 +++--- .../mapper/{ => primary}/entity/Design.java | 145 ++++++------ .../{ => primary}/entity/DesignHistory.java | 110 ++++----- .../{ => primary}/entity/DesignItem.java | 150 ++++++------- .../entity/DesignItemDetail.java | 212 +++++++++--------- .../entity/DesignItemDetailPrint.java | 2 +- .../mapper/{ => primary}/entity/Generate.java | 2 +- .../{ => primary}/entity/GenerateDetail.java | 2 +- .../mapper/{ => primary}/entity/Library.java | 167 +++++++------- .../entity/LibraryModelPoint.java | 162 ++++++------- .../{ => primary}/entity/ObjectItem.java | 2 +- .../mapper/{ => primary}/entity/PanTone.java | 142 ++++++------ .../{ => primary}/entity/PythonTAllInfo.java | 2 +- .../mapper/{ => primary}/entity/Sketches.java | 2 +- .../entity/SketchesBoundingBox.java | 2 +- .../mapper/{ => primary}/entity/SysFile.java | 162 ++++++------- .../entity/TCollectionElementRelation.java | 3 +- .../entity/TDesignPythonOutfit.java | 3 +- .../entity/TDesignPythonOutfitDetail.java | 3 +- .../{ => primary}/entity/TrialOrder.java | 4 +- .../mapper/{ => primary}/entity/UserLike.java | 124 +++++----- .../{ => primary}/entity/UserLikeGroup.java | 110 ++++----- .../{ => primary}/entity/Workspace.java | 5 +- .../mapper/secondary/FemaleDressMapper.java | 16 ++ .../mapper/secondary/entity/FemaleDress.java | 25 +++ .../com/ai/da/model/dto/AccountTrialDTO.java | 3 +- .../ai/da/model/dto/ClassificationDTO.java | 2 +- .../com/ai/da/model/dto/WorkspaceDTO.java | 1 - .../java/com/ai/da/model/vo/ChatRobotVO.java | 2 +- .../com/ai/da/model/vo/ClassificationVO.java | 2 +- .../model/vo/TDesignPythonOutfitDetailVO.java | 2 +- .../ai/da/model/vo/TDesignPythonOutfitVO.java | 2 +- .../com/ai/da/model/vo/ValidateElementVO.java | 2 +- .../java/com/ai/da/model/vo/WorkspaceVO.java | 6 +- .../java/com/ai/da/python/PythonService.java | 5 +- .../ai/da/python/vo/DesignPythonObjects.java | 2 +- .../ai/da/service/AccountLoginLogService.java | 4 +- .../com/ai/da/service/AccountService.java | 10 +- .../com/ai/da/service/ChatRobotService.java | 4 +- .../ai/da/service/ClassificationService.java | 8 +- .../da/service/CollectionElementService.java | 4 +- .../com/ai/da/service/CollectionService.java | 10 +- .../da/service/ColorLoopUpTableService.java | 3 +- .../ai/da/service/DesignHistoryService.java | 3 +- .../service/DesignItemDetailPrintService.java | 2 +- .../da/service/DesignItemDetailService.java | 3 +- .../com/ai/da/service/DesignItemService.java | 2 +- .../java/com/ai/da/service/DesignService.java | 3 +- .../com/ai/da/service/GenerateService.java | 4 +- .../ITDesignPythonOutfitDetailService.java | 2 +- .../service/ITDesignPythonOutfitService.java | 2 +- .../da/service/LibraryModelPointService.java | 5 +- .../com/ai/da/service/LibraryService.java | 6 +- .../com/ai/da/service/PanToneService.java | 2 +- .../ai/da/service/PythonTAllInfoService.java | 2 +- .../com/ai/da/service/SysFileService.java | 2 +- .../TCollectionElementRelationService.java | 2 +- .../ai/da/service/UserLikeGroupService.java | 7 +- .../com/ai/da/service/UserLikeService.java | 2 +- .../com/ai/da/service/WorkspaceService.java | 3 +- .../impl/AccountLoginLogServiceImpl.java | 4 +- .../da/service/impl/AccountServiceImpl.java | 23 +- .../da/service/impl/ChatRobotServiceImpl.java | 8 +- .../impl/ClassificationServiceImpl.java | 8 +- .../impl/CollectionElementServiceImpl.java | 6 +- .../service/impl/CollectionServiceImpl.java | 6 +- .../impl/ColorLoopUpTableServiceImpl.java | 4 +- .../impl/DesignHistoryServiceImpl.java | 4 +- .../DesignItemDetailPrintServiceImpl.java | 5 +- .../impl/DesignItemDetailServiceImpl.java | 4 +- .../service/impl/DesignItemServiceImpl.java | 4 +- .../ai/da/service/impl/DesignServiceImpl.java | 11 +- .../da/service/impl/GenerateServiceImpl.java | 8 +- .../impl/LibraryModelPointServiceImpl.java | 5 +- .../da/service/impl/LibraryServiceImpl.java | 6 +- .../da/service/impl/PanToneServiceImpl.java | 7 +- .../impl/PythonTAllInfoServiceImpl.java | 4 +- .../da/service/impl/SysFileServiceImpl.java | 4 +- ...TCollectionElementRelationServiceImpl.java | 6 +- .../TDesignPythonOutfitDetailServiceImpl.java | 5 +- .../impl/TDesignPythonOutfitServiceImpl.java | 4 +- .../impl/UserLikeGroupServiceImpl.java | 10 +- .../da/service/impl/UserLikeServiceImpl.java | 8 +- .../da/service/impl/WorkspaceServiceImpl.java | 18 +- .../resources/application-prod.properties | 7 +- .../mapper/{ => primary}/AccountMapper.xml | 54 ++--- .../mapper/{ => primary}/ChatRobotMapper.xml | 4 +- .../{ => primary}/ClassificationMapper.xml | 4 +- .../ClassificationRelLibraryMapper.xml | 4 +- .../mapper/{ => primary}/CollectionMapper.xml | 42 ++-- .../mapper/{ => primary}/DesignItemMapper.xml | 66 +++--- .../mapper/{ => primary}/DesignMapper.xml | 58 ++--- .../{ => primary}/GenerateDetailMapper.xml | 2 +- .../mapper/{ => primary}/PantoneMapper.xml | 56 ++--- .../{ => primary}/PythonTAllInfoMapper.xml | 4 +- .../TDesignPythonOutfitDetailMapper.xml | 4 +- .../TDesignPythonOutfitMapper.xml | 4 +- .../mapper/{ => primary}/TrialOrderMapper.xml | 4 +- .../{ => primary}/UserLikeGroupMapper.xml | 52 ++--- .../mapper/{ => primary}/WorkspaceMapper.xml | 4 +- .../mapper/secondary/FemaleDressMapper.xml | 8 + 154 files changed, 2016 insertions(+), 2006 deletions(-) delete mode 100644 src/main/java/com/ai/da/common/config/DataSourceConfig.java rename src/main/java/com/ai/da/common/config/{mybatis/plus => }/MybatisPlusConfig.java (56%) create mode 100644 src/main/java/com/ai/da/common/config/PrimaryDataSourceConfig.java create mode 100644 src/main/java/com/ai/da/common/config/SecondaryDataSourceConfig.java rename src/main/java/com/ai/da/mapper/{ => primary}/AccountLoginLogMapper.java (58%) rename src/main/java/com/ai/da/mapper/{ => primary}/AccountMapper.java (83%) rename src/main/java/com/ai/da/mapper/{ => primary}/ChatRobotMapper.java (68%) rename src/main/java/com/ai/da/mapper/{ => primary}/ClassificationMapper.java (64%) rename src/main/java/com/ai/da/mapper/{ => primary}/ClassificationRelLibraryMapper.java (63%) rename src/main/java/com/ai/da/mapper/{ => primary}/CollectionElementMapper.java (64%) rename src/main/java/com/ai/da/mapper/{ => primary}/CollectionMapper.java (66%) rename src/main/java/com/ai/da/mapper/{ => primary}/ColorLoopUpTableMapper.java (70%) rename src/main/java/com/ai/da/mapper/{ => primary}/DesignHistoryMapper.java (61%) rename src/main/java/com/ai/da/mapper/{ => primary}/DesignItemDetailMapper.java (62%) rename src/main/java/com/ai/da/mapper/{ => primary}/DesignItemDetailPrintMapper.java (61%) rename src/main/java/com/ai/da/mapper/{ => primary}/DesignItemMapper.java (67%) rename src/main/java/com/ai/da/mapper/{ => primary}/DesignMapper.java (69%) rename src/main/java/com/ai/da/mapper/{ => primary}/GenerateDetailMapper.java (83%) rename src/main/java/com/ai/da/mapper/{ => primary}/GenerateMapper.java (60%) rename src/main/java/com/ai/da/mapper/{ => primary}/LibraryMapper.java (62%) rename src/main/java/com/ai/da/mapper/{ => primary}/LibraryModelPointMapper.java (62%) rename src/main/java/com/ai/da/mapper/{ => primary}/PanToneMapper.java (75%) rename src/main/java/com/ai/da/mapper/{ => primary}/PythonTAllInfoMapper.java (56%) rename src/main/java/com/ai/da/mapper/{ => primary}/SysFileMapper.java (62%) rename src/main/java/com/ai/da/mapper/{ => primary}/TCollectionElementRelationMapper.java (76%) rename src/main/java/com/ai/da/mapper/{ => primary}/TDesignPythonOutfitDetailMapper.java (86%) rename src/main/java/com/ai/da/mapper/{ => primary}/TDesignPythonOutfitMapper.java (86%) rename src/main/java/com/ai/da/mapper/{ => primary}/TrialOrderMapper.java (61%) rename src/main/java/com/ai/da/mapper/{ => primary}/UserLikeGroupMapper.java (71%) rename src/main/java/com/ai/da/mapper/{ => primary}/UserLikeMapper.java (70%) rename src/main/java/com/ai/da/mapper/{ => primary}/WorkspaceMapper.java (85%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/Account.java (92%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/AccountLoginLog.java (91%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/ChatRobot.java (94%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/Classification.java (95%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/ClassificationRelLibrary.java (96%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/Collection.java (86%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/CollectionElement.java (92%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/ColorLookupTable.java (75%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/Design.java (89%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/DesignHistory.java (91%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/DesignItem.java (93%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/DesignItemDetail.java (93%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/DesignItemDetailPrint.java (96%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/Generate.java (96%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/GenerateDetail.java (96%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/Library.java (89%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/LibraryModelPoint.java (92%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/ObjectItem.java (73%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/PanTone.java (84%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/PythonTAllInfo.java (97%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/Sketches.java (78%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/SketchesBoundingBox.java (75%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/SysFile.java (93%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/TCollectionElementRelation.java (94%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/TDesignPythonOutfit.java (96%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/TDesignPythonOutfitDetail.java (97%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/TrialOrder.java (96%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/UserLike.java (92%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/UserLikeGroup.java (92%) rename src/main/java/com/ai/da/mapper/{ => primary}/entity/Workspace.java (92%) create mode 100644 src/main/java/com/ai/da/mapper/secondary/FemaleDressMapper.java create mode 100644 src/main/java/com/ai/da/mapper/secondary/entity/FemaleDress.java rename src/main/resources/mapper/{ => primary}/AccountMapper.xml (75%) rename src/main/resources/mapper/{ => primary}/ChatRobotMapper.xml (85%) rename src/main/resources/mapper/{ => primary}/ClassificationMapper.xml (81%) rename src/main/resources/mapper/{ => primary}/ClassificationRelLibraryMapper.xml (78%) rename src/main/resources/mapper/{ => primary}/CollectionMapper.xml (66%) rename src/main/resources/mapper/{ => primary}/DesignItemMapper.xml (79%) rename src/main/resources/mapper/{ => primary}/DesignMapper.xml (77%) rename src/main/resources/mapper/{ => primary}/GenerateDetailMapper.xml (87%) rename src/main/resources/mapper/{ => primary}/PantoneMapper.xml (81%) rename src/main/resources/mapper/{ => primary}/PythonTAllInfoMapper.xml (92%) rename src/main/resources/mapper/{ => primary}/TDesignPythonOutfitDetailMapper.xml (90%) rename src/main/resources/mapper/{ => primary}/TDesignPythonOutfitMapper.xml (89%) rename src/main/resources/mapper/{ => primary}/TrialOrderMapper.xml (84%) rename src/main/resources/mapper/{ => primary}/UserLikeGroupMapper.xml (71%) rename src/main/resources/mapper/{ => primary}/WorkspaceMapper.xml (87%) create mode 100644 src/main/resources/mapper/secondary/FemaleDressMapper.xml diff --git a/src/main/java/com/ai/da/common/config/DataSourceConfig.java b/src/main/java/com/ai/da/common/config/DataSourceConfig.java deleted file mode 100644 index 2d5b1a65..00000000 --- a/src/main/java/com/ai/da/common/config/DataSourceConfig.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.ai.da.common.config; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.jdbc.DataSourceBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; - -import javax.sql.DataSource; - -@Configuration -public class DataSourceConfig { - - @Primary - @Bean(name = "primaryDataSource") - @ConfigurationProperties(prefix = "spring.datasource.primary") - public DataSource dataSource() { - return DataSourceBuilder.create().build(); - } - - @Bean(name = "secondaryDataSource") - @ConfigurationProperties(prefix = "spring.datasource.secondary") - public DataSource dataSourceSecondary() { - return DataSourceBuilder.create().build(); - } -} - diff --git a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java index 00a3b0c8..893c3771 100644 --- a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java +++ b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java @@ -1,10 +1,9 @@ package com.ai.da.common.config; import com.ai.da.common.utils.SendEmailUtil; -import com.ai.da.mapper.AccountMapper; -import com.ai.da.mapper.entity.Account; +import com.ai.da.mapper.primary.AccountMapper; +import com.ai.da.mapper.primary.entity.Account; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/ai/da/common/config/mybatis/plus/MybatisPlusConfig.java b/src/main/java/com/ai/da/common/config/MybatisPlusConfig.java similarity index 56% rename from src/main/java/com/ai/da/common/config/mybatis/plus/MybatisPlusConfig.java rename to src/main/java/com/ai/da/common/config/MybatisPlusConfig.java index a0bdb29a..b49f7a65 100644 --- a/src/main/java/com/ai/da/common/config/mybatis/plus/MybatisPlusConfig.java +++ b/src/main/java/com/ai/da/common/config/MybatisPlusConfig.java @@ -1,20 +1,26 @@ -package com.ai.da.common.config.mybatis.plus; - -import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -@MapperScan("com.ai.da.mapper") -public class MybatisPlusConfig { - - @Bean - public MybatisPlusInterceptor mybatisPlusInterceptor() { - MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); - return interceptor; - } -} +package com.ai.da.common.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MybatisPlusConfig { + + @Bean(name = "primaryMybatisPlusInterceptor") + public MybatisPlusInterceptor primaryMybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + return interceptor; + } + + @Bean(name = "secondaryMybatisPlusInterceptor") + public MybatisPlusInterceptor secondaryMybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + return interceptor; + } +} diff --git a/src/main/java/com/ai/da/common/config/PrimaryDataSourceConfig.java b/src/main/java/com/ai/da/common/config/PrimaryDataSourceConfig.java new file mode 100644 index 00000000..c12182db --- /dev/null +++ b/src/main/java/com/ai/da/common/config/PrimaryDataSourceConfig.java @@ -0,0 +1,53 @@ +package com.ai.da.common.config; + +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.SqlSessionTemplate; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; + +import javax.sql.DataSource; + +@Configuration +@MapperScan(basePackages = "com.ai.da.mapper.primary", sqlSessionFactoryRef = "primarySqlSessionFactory") +public class PrimaryDataSourceConfig { + + @Primary + @Bean(name = "primaryDataSource") + @ConfigurationProperties(prefix = "spring.datasource.primary") + public DataSource dataSource() { + return DataSourceBuilder.create().build(); + } + + @Primary + @Bean(name = "primarySqlSessionFactory") + public SqlSessionFactory sqlSessionFactory( + @Qualifier("primaryDataSource") DataSource dataSource, + ApplicationContext applicationContext, + @Qualifier("primaryMybatisPlusInterceptor") MybatisPlusInterceptor mybatisPlusInterceptor) throws Exception { + MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean(); + bean.setDataSource(dataSource); + bean.setMapperLocations(applicationContext.getResources("classpath:mapper/primary/*.xml")); + bean.setPlugins(mybatisPlusInterceptor); + return bean.getObject(); + } + + @Primary + @Bean(name = "primarySqlSessionTemplate") + public SqlSessionTemplate sqlSessionTemplate( + @Qualifier("primarySqlSessionFactory") SqlSessionFactory sqlSessionFactory) { + return new SqlSessionTemplate(sqlSessionFactory); + } +} + + + + diff --git a/src/main/java/com/ai/da/common/config/SecondaryDataSourceConfig.java b/src/main/java/com/ai/da/common/config/SecondaryDataSourceConfig.java new file mode 100644 index 00000000..eb6f3db5 --- /dev/null +++ b/src/main/java/com/ai/da/common/config/SecondaryDataSourceConfig.java @@ -0,0 +1,49 @@ +package com.ai.da.common.config; + +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.SqlSessionTemplate; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import javax.sql.DataSource; + +@Configuration +@MapperScan(basePackages = "com.ai.da.mapper.secondary", sqlSessionFactoryRef = "secondarySqlSessionFactory") +public class SecondaryDataSourceConfig { + + @Bean(name = "secondaryDataSource") + @ConfigurationProperties(prefix = "spring.datasource.secondary") + public DataSource dataSource() { + return DataSourceBuilder.create().build(); + } + + @Bean(name = "secondarySqlSessionFactory") + public SqlSessionFactory sqlSessionFactory( + @Qualifier("secondaryDataSource") DataSource dataSource, + ApplicationContext applicationContext, + @Qualifier("secondaryMybatisPlusInterceptor") MybatisPlusInterceptor mybatisPlusInterceptor) throws Exception { + MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean(); +// SqlSessionFactoryBean bean = new SqlSessionFactoryBean(); + bean.setDataSource(dataSource); + bean.setMapperLocations(applicationContext.getResources("classpath:mapper/secondary/*.xml")); + bean.setPlugins(mybatisPlusInterceptor); + return bean.getObject(); + } + + @Bean(name = "secondarySqlSessionTemplate") + public SqlSessionTemplate sqlSessionTemplate( + @Qualifier("secondarySqlSessionFactory") SqlSessionFactory sqlSessionFactory) { + return new SqlSessionTemplate(sqlSessionFactory); + } +} + + + diff --git a/src/main/java/com/ai/da/common/config/mybatis/plus/CommonMapper.java b/src/main/java/com/ai/da/common/config/mybatis/plus/CommonMapper.java index f39599e3..aed7e897 100644 --- a/src/main/java/com/ai/da/common/config/mybatis/plus/CommonMapper.java +++ b/src/main/java/com/ai/da/common/config/mybatis/plus/CommonMapper.java @@ -1,12 +1,12 @@ -package com.ai.da.common.config.mybatis.plus; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Param; - -public interface CommonMapper extends BaseMapper { - - IPage voPage(IPage page, @Param(Constants.WRAPPER) Wrapper queryWrapper); -} +package com.ai.da.common.config.mybatis.plus; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Param; + +public interface CommonMapper extends BaseMapper { + + IPage voPage(IPage page, @Param(Constants.WRAPPER) Wrapper queryWrapper); +} diff --git a/src/main/java/com/ai/da/common/config/mybatis/plus/CommonServiceImpl.java b/src/main/java/com/ai/da/common/config/mybatis/plus/CommonServiceImpl.java index 795bd998..fc647498 100644 --- a/src/main/java/com/ai/da/common/config/mybatis/plus/CommonServiceImpl.java +++ b/src/main/java/com/ai/da/common/config/mybatis/plus/CommonServiceImpl.java @@ -1,48 +1,48 @@ -package com.ai.da.common.config.mybatis.plus; - -import cn.hutool.core.collection.CollUtil; -import com.ai.da.common.response.PageResponse; -import com.ai.da.common.response.Response; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import java.util.List; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.stream.Collectors; - - -public class CommonServiceImpl, T, E> extends ServiceImpl { - - public PageResponse voPage(QueryCriteria criteria) { - IPage tPage = baseMapper.voPage(new Page<>(criteria.getPage(), criteria.getLimit()), criteria.buildWrapper()); - if (criteria.getMapper() != null && tPage != null && CollUtil.isNotEmpty(tPage.getRecords())) { - List convert = convert(tPage, criteria.getMapper(), criteria); - Response> response = Response.success(convert); - PageResponse pageResponse = new PageResponse<>(response, tPage.getCurrent(), tPage.getSize(), tPage.getTotal(), tPage.getPages()); - if (criteria.getPeekAllAfter() != null) { - Consumer> peekAllAfter = criteria.getPeekAllAfter(); - peekAllAfter.accept(pageResponse.getData()); - } - return pageResponse; - } - PageResponse pageResponse = new PageResponse<>(null, criteria.getPage(), criteria.getLimit(), 0, 0); - if (criteria.getPeekAllAfter() != null) { - Consumer> peekAllAfter = criteria.getPeekAllAfter(); - peekAllAfter.accept(pageResponse.getData()); - } - return pageResponse; - } - - List convert(IPage page, Function mapper, QueryCriteria criteria) { - if (criteria.getPeekBefore() != null && criteria.getPeekAfter() != null) { - return page.getRecords().stream().peek(criteria.getPeekBefore()).map(mapper).peek(criteria.getPeekAfter()).collect(Collectors.toList()); - } else if (criteria.getPeekBefore() != null && criteria.getPeekAfter() == null) { - return page.getRecords().stream().peek(criteria.getPeekBefore()).map(mapper).collect(Collectors.toList()); - } else if (criteria.getPeekBefore() == null && criteria.getPeekAfter() != null) { - return page.getRecords().stream().map(mapper).peek(criteria.getPeekAfter()).collect(Collectors.toList()); - } - return page.getRecords().stream().map(mapper).collect(Collectors.toList()); - } -} +package com.ai.da.common.config.mybatis.plus; + +import cn.hutool.core.collection.CollUtil; +import com.ai.da.common.response.PageResponse; +import com.ai.da.common.response.Response; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.List; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.stream.Collectors; + + +public class CommonServiceImpl, T, E> extends ServiceImpl { + + public PageResponse voPage(QueryCriteria criteria) { + IPage tPage = baseMapper.voPage(new Page<>(criteria.getPage(), criteria.getLimit()), criteria.buildWrapper()); + if (criteria.getMapper() != null && tPage != null && CollUtil.isNotEmpty(tPage.getRecords())) { + List convert = convert(tPage, criteria.getMapper(), criteria); + Response> response = Response.success(convert); + PageResponse pageResponse = new PageResponse<>(response, tPage.getCurrent(), tPage.getSize(), tPage.getTotal(), tPage.getPages()); + if (criteria.getPeekAllAfter() != null) { + Consumer> peekAllAfter = criteria.getPeekAllAfter(); + peekAllAfter.accept(pageResponse.getData()); + } + return pageResponse; + } + PageResponse pageResponse = new PageResponse<>(null, criteria.getPage(), criteria.getLimit(), 0, 0); + if (criteria.getPeekAllAfter() != null) { + Consumer> peekAllAfter = criteria.getPeekAllAfter(); + peekAllAfter.accept(pageResponse.getData()); + } + return pageResponse; + } + + List convert(IPage page, Function mapper, QueryCriteria criteria) { + if (criteria.getPeekBefore() != null && criteria.getPeekAfter() != null) { + return page.getRecords().stream().peek(criteria.getPeekBefore()).map(mapper).peek(criteria.getPeekAfter()).collect(Collectors.toList()); + } else if (criteria.getPeekBefore() != null && criteria.getPeekAfter() == null) { + return page.getRecords().stream().peek(criteria.getPeekBefore()).map(mapper).collect(Collectors.toList()); + } else if (criteria.getPeekBefore() == null && criteria.getPeekAfter() != null) { + return page.getRecords().stream().map(mapper).peek(criteria.getPeekAfter()).collect(Collectors.toList()); + } + return page.getRecords().stream().map(mapper).collect(Collectors.toList()); + } +} diff --git a/src/main/java/com/ai/da/common/config/mybatis/plus/CustomerSqlInjector.java b/src/main/java/com/ai/da/common/config/mybatis/plus/CustomerSqlInjector.java index cf81a83a..047f2f00 100644 --- a/src/main/java/com/ai/da/common/config/mybatis/plus/CustomerSqlInjector.java +++ b/src/main/java/com/ai/da/common/config/mybatis/plus/CustomerSqlInjector.java @@ -1,19 +1,19 @@ -package com.ai.da.common.config.mybatis.plus; - -import com.baomidou.mybatisplus.core.injector.AbstractMethod; -import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector; -import com.baomidou.mybatisplus.core.metadata.TableInfo; -import org.springframework.context.annotation.Configuration; - -import java.util.List; - -@Configuration -public class CustomerSqlInjector extends DefaultSqlInjector { - - @Override - public List getMethodList(Class mapperClass, TableInfo tableInfo) { - List methodList = super.getMethodList(mapperClass, tableInfo); - methodList.add(new SelectVoPage()); - return methodList; - } -} +package com.ai.da.common.config.mybatis.plus; + +import com.baomidou.mybatisplus.core.injector.AbstractMethod; +import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector; +import com.baomidou.mybatisplus.core.metadata.TableInfo; +import org.springframework.context.annotation.Configuration; + +import java.util.List; + +@Configuration +public class CustomerSqlInjector extends DefaultSqlInjector { + + @Override + public List getMethodList(Class mapperClass, TableInfo tableInfo) { + List methodList = super.getMethodList(mapperClass, tableInfo); + methodList.add(new SelectVoPage()); + return methodList; + } +} 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 9942af90..13b674fa 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 @@ -1,85 +1,85 @@ -package com.ai.da.common.config.mybatis.plus; - -import cn.hutool.core.util.StrUtil; -import com.ai.da.common.annotation.Condition; -import com.ai.da.common.annotation.Order; -import com.ai.da.common.enums.ConditionType; -import com.ai.da.common.utils.ConvertUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; - -import java.lang.reflect.Field; -import java.util.Collection; -import java.util.List; -import java.util.function.Consumer; -import java.util.function.Function; - -/** - * @author: dangweijian - * @description: - * @create: 2020-09-14 15:47 - **/ -@Data -@Slf4j -public abstract class QueryCriteria { - - private long page = 1; - private long limit = 10; - private Function mapper; - private Consumer> appendWrapper; - private Consumer peekBefore; - private Consumer peekAfter; - private Consumer> peekAllAfter; - - public QueryCriteria(Function mapper) { - this.mapper = mapper; - } - - 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) { - field.setAccessible(true); - Object value = null; - try { - value = field.get(this); - } catch (IllegalAccessException e) { - log.warn("reflection anomaly!"); - } - 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)); - } - default: - } - } 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()) { - case DESC: - wrapper.orderByDesc(ConvertUtil.humpToLine2(field.getName())); - break; - case ASC: - wrapper.orderByAsc(ConvertUtil.humpToLine2(field.getName())); - } - } - } - } - wrapper.func(this.getAppendWrapper() != null, this.getAppendWrapper()); - return wrapper; - } -} +package com.ai.da.common.config.mybatis.plus; + +import cn.hutool.core.util.StrUtil; +import com.ai.da.common.annotation.Condition; +import com.ai.da.common.annotation.Order; +import com.ai.da.common.enums.ConditionType; +import com.ai.da.common.utils.ConvertUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; + +import java.lang.reflect.Field; +import java.util.Collection; +import java.util.List; +import java.util.function.Consumer; +import java.util.function.Function; + +/** + * @author: dangweijian + * @description: + * @create: 2020-09-14 15:47 + **/ +@Data +@Slf4j +public abstract class QueryCriteria { + + private long page = 1; + private long limit = 10; + private Function mapper; + private Consumer> appendWrapper; + private Consumer peekBefore; + private Consumer peekAfter; + private Consumer> peekAllAfter; + + public QueryCriteria(Function mapper) { + this.mapper = mapper; + } + + 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) { + field.setAccessible(true); + Object value = null; + try { + value = field.get(this); + } catch (IllegalAccessException e) { + log.warn("reflection anomaly!"); + } + 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)); + } + default: + } + } 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()) { + case DESC: + wrapper.orderByDesc(ConvertUtil.humpToLine2(field.getName())); + break; + case ASC: + wrapper.orderByAsc(ConvertUtil.humpToLine2(field.getName())); + } + } + } + } + wrapper.func(this.getAppendWrapper() != null, this.getAppendWrapper()); + return wrapper; + } +} diff --git a/src/main/java/com/ai/da/common/config/mybatis/plus/SelectVoPage.java b/src/main/java/com/ai/da/common/config/mybatis/plus/SelectVoPage.java index 968b0bc3..57449caa 100644 --- a/src/main/java/com/ai/da/common/config/mybatis/plus/SelectVoPage.java +++ b/src/main/java/com/ai/da/common/config/mybatis/plus/SelectVoPage.java @@ -1,22 +1,22 @@ -package com.ai.da.common.config.mybatis.plus; - -import com.baomidou.mybatisplus.core.enums.SqlMethod; -import com.baomidou.mybatisplus.core.injector.AbstractMethod; -import com.baomidou.mybatisplus.core.metadata.TableInfo; -import org.apache.ibatis.mapping.MappedStatement; -import org.apache.ibatis.mapping.SqlSource; - -public class SelectVoPage extends AbstractMethod { - - private static final String MAPPER_METHOD = "voPage"; - - public SelectVoPage() { - super(MAPPER_METHOD); - } - - public MappedStatement injectMappedStatement(Class mapperClass, Class modelClass, TableInfo tableInfo) { - String sql = String.format(SqlMethod.SELECT_PAGE.getSql(), this.sqlFirst(), this.sqlSelectColumns(tableInfo, true), tableInfo.getTableName(), this.sqlWhereEntityWrapper(true, tableInfo), this.sqlOrderBy(tableInfo), this.sqlComment()); - SqlSource sqlSource = this.languageDriver.createSqlSource(this.configuration, sql, modelClass); - return this.addSelectMappedStatementForTable(mapperClass, MAPPER_METHOD, sqlSource, tableInfo); - } -} +package com.ai.da.common.config.mybatis.plus; + +import com.baomidou.mybatisplus.core.enums.SqlMethod; +import com.baomidou.mybatisplus.core.injector.AbstractMethod; +import com.baomidou.mybatisplus.core.metadata.TableInfo; +import org.apache.ibatis.mapping.MappedStatement; +import org.apache.ibatis.mapping.SqlSource; + +public class SelectVoPage extends AbstractMethod { + + private static final String MAPPER_METHOD = "voPage"; + + public SelectVoPage() { + super(MAPPER_METHOD); + } + + public MappedStatement injectMappedStatement(Class mapperClass, Class modelClass, TableInfo tableInfo) { + String sql = String.format(SqlMethod.SELECT_PAGE.getSql(), this.sqlFirst(), this.sqlSelectColumns(tableInfo, true), tableInfo.getTableName(), this.sqlWhereEntityWrapper(true, tableInfo), this.sqlOrderBy(tableInfo), this.sqlComment()); + SqlSource sqlSource = this.languageDriver.createSqlSource(this.configuration, sql, modelClass); + return this.addSelectMappedStatementForTable(mapperClass, MAPPER_METHOD, sqlSource, tableInfo); + } +} 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 48291bb8..82235e8c 100644 --- a/src/main/java/com/ai/da/common/utils/LocalCacheUtils.java +++ b/src/main/java/com/ai/da/common/utils/LocalCacheUtils.java @@ -1,11 +1,7 @@ package com.ai.da.common.utils; -import com.ai.da.mapper.entity.Collection; -import com.ai.da.mapper.entity.SysFile; import com.ai.da.model.vo.SysFileVO; import com.google.common.cache.*; -import com.google.common.collect.Lists; -import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; import java.util.ArrayList; 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 5a8f90a1..5e98eecb 100644 --- a/src/main/java/com/ai/da/common/utils/MinioUtil.java +++ b/src/main/java/com/ai/da/common/utils/MinioUtil.java @@ -1,29 +1,21 @@ package com.ai.da.common.utils; import com.ai.da.common.config.exception.BusinessException; -import com.ai.da.mapper.entity.ObjectItem; +import com.ai.da.mapper.primary.entity.ObjectItem; import io.minio.*; import io.minio.errors.MinioException; import io.minio.http.Method; import io.minio.messages.DeleteError; import io.minio.messages.DeleteObject; import io.minio.messages.Item; -import org.apache.tomcat.util.http.fileupload.IOUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; import java.io.*; -import java.net.URLEncoder; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; 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 a14975a4..b4f7969c 100644 --- a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java +++ b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java @@ -1,7 +1,7 @@ package com.ai.da.common.utils; -import com.ai.da.mapper.entity.Account; -import com.ai.da.mapper.entity.TrialOrder; +import com.ai.da.mapper.primary.entity.Account; +import com.ai.da.mapper.primary.entity.TrialOrder; import com.alibaba.fastjson.JSONObject; import com.ai.da.common.config.exception.BusinessException; import com.tencentcloudapi.common.Credential; diff --git a/src/main/java/com/ai/da/controller/AccountController.java b/src/main/java/com/ai/da/controller/AccountController.java index 1a91a5e5..73aa3bc2 100644 --- a/src/main/java/com/ai/da/controller/AccountController.java +++ b/src/main/java/com/ai/da/controller/AccountController.java @@ -2,13 +2,11 @@ package com.ai.da.controller; import com.ai.da.common.response.PageBaseResponse; import com.ai.da.common.response.Response; -import com.ai.da.common.security.jwt.JWTTokenHelper; -import com.ai.da.mapper.entity.TrialOrder; +import com.ai.da.mapper.primary.entity.TrialOrder; +import com.ai.da.mapper.secondary.entity.FemaleDress; import com.ai.da.model.dto.*; -import com.ai.da.model.enums.Language; import com.ai.da.model.vo.AccountLoginVO; import com.ai.da.model.vo.AccountPreLoginVO; -import com.ai.da.model.vo.QueryLibraryPageVO; import com.ai.da.service.AccountService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -149,4 +147,11 @@ public class AccountController { public Response noLoginRequired(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request){ return Response.success(accountService.noLoginRequired(noLoginRequiredDTO, request)); } + + @ApiOperation(value = "免密登录") + @PostMapping("/test") + public Response test(){ + return Response.success(accountService.test()); + } + } diff --git a/src/main/java/com/ai/da/controller/ClassificationController.java b/src/main/java/com/ai/da/controller/ClassificationController.java index cbe95c14..75c4e556 100644 --- a/src/main/java/com/ai/da/controller/ClassificationController.java +++ b/src/main/java/com/ai/da/controller/ClassificationController.java @@ -1,27 +1,19 @@ package com.ai.da.controller; import com.ai.da.common.response.Response; -import com.ai.da.mapper.entity.Workspace; import com.ai.da.model.dto.ClassificationDTO; -import com.ai.da.model.dto.WorkspaceDTO; -import com.ai.da.model.enums.BizJson; import com.ai.da.model.vo.ClassificationVO; -import com.ai.da.model.vo.ModelsVO; -import com.ai.da.model.vo.WorkspaceVO; import com.ai.da.service.ClassificationService; -import com.ai.da.service.WorkspaceService; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; -import java.io.FileNotFoundException; import java.util.List; /** diff --git a/src/main/java/com/ai/da/controller/LibraryController.java b/src/main/java/com/ai/da/controller/LibraryController.java index 15c58b5d..09263d09 100644 --- a/src/main/java/com/ai/da/controller/LibraryController.java +++ b/src/main/java/com/ai/da/controller/LibraryController.java @@ -7,10 +7,9 @@ import com.ai.da.common.enums.LibraryLevel1TypeEnum; import com.ai.da.common.response.PageBaseResponse; import com.ai.da.common.response.Response; import com.ai.da.common.utils.*; -import com.ai.da.mapper.entity.Library; -import com.ai.da.mapper.entity.LibraryModelPoint; +import com.ai.da.mapper.primary.entity.Library; +import com.ai.da.mapper.primary.entity.LibraryModelPoint; import com.ai.da.model.dto.*; -import com.ai.da.model.enums.ModelType; import com.ai.da.model.vo.*; import com.ai.da.service.LibraryModelPointService; import com.ai.da.service.LibraryService; @@ -20,7 +19,6 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; -import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -29,7 +27,6 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.io.File; import java.util.Date; -import java.util.List; import java.util.Objects; import java.util.UUID; diff --git a/src/main/java/com/ai/da/controller/PythonController.java b/src/main/java/com/ai/da/controller/PythonController.java index da4a8d3f..ea33fe7f 100644 --- a/src/main/java/com/ai/da/controller/PythonController.java +++ b/src/main/java/com/ai/da/controller/PythonController.java @@ -3,7 +3,7 @@ package com.ai.da.controller; import com.ai.da.common.enums.CollectionLevel1TypeEnum; import com.ai.da.common.response.Response; import com.ai.da.common.utils.CopyUtil; -import com.ai.da.mapper.entity.Library; +import com.ai.da.mapper.primary.entity.Library; import com.ai.da.model.dto.ChatFlushDTO; import com.ai.da.model.dto.ChatRobotLibraryDTO; import com.ai.da.model.dto.ChatSendDTO; diff --git a/src/main/java/com/ai/da/controller/SavedCollectionController.java b/src/main/java/com/ai/da/controller/SavedCollectionController.java index 4373dc8b..95df703f 100644 --- a/src/main/java/com/ai/da/controller/SavedCollectionController.java +++ b/src/main/java/com/ai/da/controller/SavedCollectionController.java @@ -6,10 +6,10 @@ import com.ai.da.common.response.PageBaseResponse; import com.ai.da.common.response.Response; import com.ai.da.common.utils.CopyUtil; import com.ai.da.common.utils.MinioUtil; -import com.ai.da.mapper.TDesignPythonOutfitMapper; -import com.ai.da.mapper.entity.Account; -import com.ai.da.mapper.entity.TDesignPythonOutfit; -import com.ai.da.mapper.entity.UserLikeGroup; +import com.ai.da.mapper.primary.TDesignPythonOutfitMapper; +import com.ai.da.mapper.primary.entity.Account; +import com.ai.da.mapper.primary.entity.TDesignPythonOutfit; +import com.ai.da.mapper.primary.entity.UserLikeGroup; import com.ai.da.model.dto.*; import com.ai.da.model.vo.*; import com.ai.da.service.*; diff --git a/src/main/java/com/ai/da/controller/WorkspaceController.java b/src/main/java/com/ai/da/controller/WorkspaceController.java index 1de7008a..b0c089f0 100644 --- a/src/main/java/com/ai/da/controller/WorkspaceController.java +++ b/src/main/java/com/ai/da/controller/WorkspaceController.java @@ -1,9 +1,7 @@ package com.ai.da.controller; import com.ai.da.common.response.Response; -import com.ai.da.common.utils.MinioUtil; -import com.ai.da.mapper.entity.Workspace; -import com.ai.da.model.dto.ModelsDotDTO; +import com.ai.da.mapper.primary.entity.Workspace; import com.ai.da.model.dto.WorkspaceDTO; import com.ai.da.model.enums.BizJson; import com.ai.da.model.vo.ModelsVO; @@ -19,9 +17,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import lombok.NoArgsConstructor; -import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import java.io.FileNotFoundException; import java.util.List; diff --git a/src/main/java/com/ai/da/mapper/AccountLoginLogMapper.java b/src/main/java/com/ai/da/mapper/primary/AccountLoginLogMapper.java similarity index 58% rename from src/main/java/com/ai/da/mapper/AccountLoginLogMapper.java rename to src/main/java/com/ai/da/mapper/primary/AccountLoginLogMapper.java index 46d6e221..4d045456 100644 --- a/src/main/java/com/ai/da/mapper/AccountLoginLogMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/AccountLoginLogMapper.java @@ -1,17 +1,14 @@ -package com.ai.da.mapper; - -import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.Account; -import com.ai.da.mapper.entity.AccountLoginLog; - -import java.util.List; - -/** - * Mapper 接口 - * - * @author easy-generator - * @since 2022-06-13 - */ -public interface AccountLoginLogMapper extends CommonMapper { - -} +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.AccountLoginLog; + +/** + * Mapper 接口 + * + * @author easy-generator + * @since 2022-06-13 + */ +public interface AccountLoginLogMapper extends CommonMapper { + +} diff --git a/src/main/java/com/ai/da/mapper/AccountMapper.java b/src/main/java/com/ai/da/mapper/primary/AccountMapper.java similarity index 83% rename from src/main/java/com/ai/da/mapper/AccountMapper.java rename to src/main/java/com/ai/da/mapper/primary/AccountMapper.java index dc8cb900..d9afae89 100644 --- a/src/main/java/com/ai/da/mapper/AccountMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/AccountMapper.java @@ -1,32 +1,32 @@ -package com.ai.da.mapper; - -import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.Account; - -import java.util.List; - -/** - * Mapper 接口 - * - * @author easy-generator - * @since 2022-06-13 - */ -public interface AccountMapper extends CommonMapper { - - /** - * 手机号批量查询 - * - * @param phoneList - * @return - */ - List findByPhoneList(List phoneList); - - /** - * 主键查询 - * - * @param id - * @return - */ - Account findById(String id); - -} +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.Account; + +import java.util.List; + +/** + * Mapper 接口 + * + * @author easy-generator + * @since 2022-06-13 + */ +public interface AccountMapper extends CommonMapper { + + /** + * 手机号批量查询 + * + * @param phoneList + * @return + */ + List findByPhoneList(List phoneList); + + /** + * 主键查询 + * + * @param id + * @return + */ + Account findById(String id); + +} diff --git a/src/main/java/com/ai/da/mapper/ChatRobotMapper.java b/src/main/java/com/ai/da/mapper/primary/ChatRobotMapper.java similarity index 68% rename from src/main/java/com/ai/da/mapper/ChatRobotMapper.java rename to src/main/java/com/ai/da/mapper/primary/ChatRobotMapper.java index c404a90e..39b0690d 100644 --- a/src/main/java/com/ai/da/mapper/ChatRobotMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/ChatRobotMapper.java @@ -1,9 +1,7 @@ -package com.ai.da.mapper; +package com.ai.da.mapper.primary; import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.ChatRobot; - -import java.util.List; +import com.ai.da.mapper.primary.entity.ChatRobot; /** * Mapper 接口 diff --git a/src/main/java/com/ai/da/mapper/ClassificationMapper.java b/src/main/java/com/ai/da/mapper/primary/ClassificationMapper.java similarity index 64% rename from src/main/java/com/ai/da/mapper/ClassificationMapper.java rename to src/main/java/com/ai/da/mapper/primary/ClassificationMapper.java index fdc13893..16a692f7 100644 --- a/src/main/java/com/ai/da/mapper/ClassificationMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/ClassificationMapper.java @@ -1,8 +1,7 @@ -package com.ai.da.mapper; +package com.ai.da.mapper.primary; import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.ChatRobot; -import com.ai.da.mapper.entity.Classification; +import com.ai.da.mapper.primary.entity.Classification; /** * Mapper 接口 diff --git a/src/main/java/com/ai/da/mapper/ClassificationRelLibraryMapper.java b/src/main/java/com/ai/da/mapper/primary/ClassificationRelLibraryMapper.java similarity index 63% rename from src/main/java/com/ai/da/mapper/ClassificationRelLibraryMapper.java rename to src/main/java/com/ai/da/mapper/primary/ClassificationRelLibraryMapper.java index f9094830..a778a40f 100644 --- a/src/main/java/com/ai/da/mapper/ClassificationRelLibraryMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/ClassificationRelLibraryMapper.java @@ -1,8 +1,7 @@ -package com.ai.da.mapper; +package com.ai.da.mapper.primary; import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.Classification; -import com.ai.da.mapper.entity.ClassificationRelLibrary; +import com.ai.da.mapper.primary.entity.ClassificationRelLibrary; /** * Mapper 接口 diff --git a/src/main/java/com/ai/da/mapper/CollectionElementMapper.java b/src/main/java/com/ai/da/mapper/primary/CollectionElementMapper.java similarity index 64% rename from src/main/java/com/ai/da/mapper/CollectionElementMapper.java rename to src/main/java/com/ai/da/mapper/primary/CollectionElementMapper.java index 0c8a0613..55a3188a 100644 --- a/src/main/java/com/ai/da/mapper/CollectionElementMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/CollectionElementMapper.java @@ -1,16 +1,14 @@ -package com.ai.da.mapper; - -import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.CollectionElement; - -import java.util.List; - -/** - * Mapper 接口 - * - * @author yanglei - * @since 2022-10-13 - */ -public interface CollectionElementMapper extends CommonMapper { - -} +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.CollectionElement; + +/** + * Mapper 接口 + * + * @author yanglei + * @since 2022-10-13 + */ +public interface CollectionElementMapper extends CommonMapper { + +} diff --git a/src/main/java/com/ai/da/mapper/CollectionMapper.java b/src/main/java/com/ai/da/mapper/primary/CollectionMapper.java similarity index 66% rename from src/main/java/com/ai/da/mapper/CollectionMapper.java rename to src/main/java/com/ai/da/mapper/primary/CollectionMapper.java index 582de4ef..b9a7bd1e 100644 --- a/src/main/java/com/ai/da/mapper/CollectionMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/CollectionMapper.java @@ -1,18 +1,15 @@ -package com.ai.da.mapper; - -import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.Account; -import com.ai.da.mapper.entity.Collection; - -import java.util.List; - -/** - * Mapper 接口 - * - * @author easy-generator - * @since 2022-06-13 - */ -public interface CollectionMapper extends CommonMapper { - //返回插入数据后生成的主键 - Long insertCollection(Collection collection); -} +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.Collection; + +/** + * Mapper 接口 + * + * @author easy-generator + * @since 2022-06-13 + */ +public interface CollectionMapper extends CommonMapper { + //返回插入数据后生成的主键 + Long insertCollection(Collection collection); +} diff --git a/src/main/java/com/ai/da/mapper/ColorLoopUpTableMapper.java b/src/main/java/com/ai/da/mapper/primary/ColorLoopUpTableMapper.java similarity index 70% rename from src/main/java/com/ai/da/mapper/ColorLoopUpTableMapper.java rename to src/main/java/com/ai/da/mapper/primary/ColorLoopUpTableMapper.java index 9dcd8892..5accffbb 100644 --- a/src/main/java/com/ai/da/mapper/ColorLoopUpTableMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/ColorLoopUpTableMapper.java @@ -1,14 +1,14 @@ -package com.ai.da.mapper; - -import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.ColorLookupTable; - -/** - * Mapper 接口 - * - * @author easy-generator - * @since 2022-09-30 - */ -public interface ColorLoopUpTableMapper extends CommonMapper { - -} +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.ColorLookupTable; + +/** + * Mapper 接口 + * + * @author easy-generator + * @since 2022-09-30 + */ +public interface ColorLoopUpTableMapper extends CommonMapper { + +} diff --git a/src/main/java/com/ai/da/mapper/DesignHistoryMapper.java b/src/main/java/com/ai/da/mapper/primary/DesignHistoryMapper.java similarity index 61% rename from src/main/java/com/ai/da/mapper/DesignHistoryMapper.java rename to src/main/java/com/ai/da/mapper/primary/DesignHistoryMapper.java index 65ad15c2..c850e88a 100644 --- a/src/main/java/com/ai/da/mapper/DesignHistoryMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/DesignHistoryMapper.java @@ -1,15 +1,14 @@ -package com.ai.da.mapper; - -import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.AccountLoginLog; -import com.ai.da.mapper.entity.DesignHistory; - -/** - * Mapper 接口 - * - * @author easy-generator - * @since 2022-06-13 - */ -public interface DesignHistoryMapper extends CommonMapper { - -} +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.DesignHistory; + +/** + * Mapper 接口 + * + * @author easy-generator + * @since 2022-06-13 + */ +public interface DesignHistoryMapper extends CommonMapper { + +} diff --git a/src/main/java/com/ai/da/mapper/DesignItemDetailMapper.java b/src/main/java/com/ai/da/mapper/primary/DesignItemDetailMapper.java similarity index 62% rename from src/main/java/com/ai/da/mapper/DesignItemDetailMapper.java rename to src/main/java/com/ai/da/mapper/primary/DesignItemDetailMapper.java index 6d299294..69add05d 100644 --- a/src/main/java/com/ai/da/mapper/DesignItemDetailMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/DesignItemDetailMapper.java @@ -1,15 +1,14 @@ -package com.ai.da.mapper; - -import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.DesignItem; -import com.ai.da.mapper.entity.DesignItemDetail; - -/** - * Mapper 接口 - * - * @author easy-generator - * @since 2022-06-13 - */ -public interface DesignItemDetailMapper extends CommonMapper { - -} +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.DesignItemDetail; + +/** + * Mapper 接口 + * + * @author easy-generator + * @since 2022-06-13 + */ +public interface DesignItemDetailMapper extends CommonMapper { + +} diff --git a/src/main/java/com/ai/da/mapper/DesignItemDetailPrintMapper.java b/src/main/java/com/ai/da/mapper/primary/DesignItemDetailPrintMapper.java similarity index 61% rename from src/main/java/com/ai/da/mapper/DesignItemDetailPrintMapper.java rename to src/main/java/com/ai/da/mapper/primary/DesignItemDetailPrintMapper.java index 7f522fb1..5a1bdbb5 100644 --- a/src/main/java/com/ai/da/mapper/DesignItemDetailPrintMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/DesignItemDetailPrintMapper.java @@ -1,7 +1,7 @@ -package com.ai.da.mapper; +package com.ai.da.mapper.primary; import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.DesignItemDetailPrint; +import com.ai.da.mapper.primary.entity.DesignItemDetailPrint; public interface DesignItemDetailPrintMapper extends CommonMapper { diff --git a/src/main/java/com/ai/da/mapper/DesignItemMapper.java b/src/main/java/com/ai/da/mapper/primary/DesignItemMapper.java similarity index 67% rename from src/main/java/com/ai/da/mapper/DesignItemMapper.java rename to src/main/java/com/ai/da/mapper/primary/DesignItemMapper.java index 26222874..cdede99b 100644 --- a/src/main/java/com/ai/da/mapper/DesignItemMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/DesignItemMapper.java @@ -1,16 +1,15 @@ -package com.ai.da.mapper; - -import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.Design; -import com.ai.da.mapper.entity.DesignItem; - -/** - * Mapper 接口 - * - * @author easy-generator - * @since 2022-06-13 - */ -public interface DesignItemMapper extends CommonMapper { - - Long insertDesignItem(DesignItem designItem); -} +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.DesignItem; + +/** + * Mapper 接口 + * + * @author easy-generator + * @since 2022-06-13 + */ +public interface DesignItemMapper extends CommonMapper { + + Long insertDesignItem(DesignItem designItem); +} diff --git a/src/main/java/com/ai/da/mapper/DesignMapper.java b/src/main/java/com/ai/da/mapper/primary/DesignMapper.java similarity index 69% rename from src/main/java/com/ai/da/mapper/DesignMapper.java rename to src/main/java/com/ai/da/mapper/primary/DesignMapper.java index 31fc4a18..5a7e201d 100644 --- a/src/main/java/com/ai/da/mapper/DesignMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/DesignMapper.java @@ -1,17 +1,16 @@ -package com.ai.da.mapper; - -import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.Collection; -import com.ai.da.mapper.entity.Design; - -/** - * Mapper 接口 - * - * @author easy-generator - * @since 2022-06-13 - */ -public interface DesignMapper extends CommonMapper { - - //返回插入数据后生成的主键 - Long insertDesign(Design design); -} +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.Design; + +/** + * Mapper 接口 + * + * @author easy-generator + * @since 2022-06-13 + */ +public interface DesignMapper extends CommonMapper { + + //返回插入数据后生成的主键 + Long insertDesign(Design design); +} diff --git a/src/main/java/com/ai/da/mapper/GenerateDetailMapper.java b/src/main/java/com/ai/da/mapper/primary/GenerateDetailMapper.java similarity index 83% rename from src/main/java/com/ai/da/mapper/GenerateDetailMapper.java rename to src/main/java/com/ai/da/mapper/primary/GenerateDetailMapper.java index d4c0212d..6c0ed893 100644 --- a/src/main/java/com/ai/da/mapper/GenerateDetailMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/GenerateDetailMapper.java @@ -1,7 +1,7 @@ -package com.ai.da.mapper; +package com.ai.da.mapper.primary; import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.GenerateDetail; +import com.ai.da.mapper.primary.entity.GenerateDetail; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/ai/da/mapper/GenerateMapper.java b/src/main/java/com/ai/da/mapper/primary/GenerateMapper.java similarity index 60% rename from src/main/java/com/ai/da/mapper/GenerateMapper.java rename to src/main/java/com/ai/da/mapper/primary/GenerateMapper.java index 43436d81..9da22dbb 100644 --- a/src/main/java/com/ai/da/mapper/GenerateMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/GenerateMapper.java @@ -1,7 +1,7 @@ -package com.ai.da.mapper; +package com.ai.da.mapper.primary; import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.Generate; +import com.ai.da.mapper.primary.entity.Generate; public interface GenerateMapper extends CommonMapper { } diff --git a/src/main/java/com/ai/da/mapper/LibraryMapper.java b/src/main/java/com/ai/da/mapper/primary/LibraryMapper.java similarity index 62% rename from src/main/java/com/ai/da/mapper/LibraryMapper.java rename to src/main/java/com/ai/da/mapper/primary/LibraryMapper.java index 6e438d74..c78aa467 100644 --- a/src/main/java/com/ai/da/mapper/LibraryMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/LibraryMapper.java @@ -1,15 +1,14 @@ -package com.ai.da.mapper; - -import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.Design; -import com.ai.da.mapper.entity.Library; - -/** - * Mapper 接口 - * - * @author easy-generator - * @since 2022-06-13 - */ -public interface LibraryMapper extends CommonMapper { - -} +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.Library; + +/** + * Mapper 接口 + * + * @author easy-generator + * @since 2022-06-13 + */ +public interface LibraryMapper extends CommonMapper { + +} diff --git a/src/main/java/com/ai/da/mapper/LibraryModelPointMapper.java b/src/main/java/com/ai/da/mapper/primary/LibraryModelPointMapper.java similarity index 62% rename from src/main/java/com/ai/da/mapper/LibraryModelPointMapper.java rename to src/main/java/com/ai/da/mapper/primary/LibraryModelPointMapper.java index c1cfd1ba..ee79efad 100644 --- a/src/main/java/com/ai/da/mapper/LibraryModelPointMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/LibraryModelPointMapper.java @@ -1,15 +1,14 @@ -package com.ai.da.mapper; - -import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.LibraryModelPoint; -import com.ai.da.mapper.entity.SysFile; - -/** - * Mapper 接口 - * - * @author easy-generator - * @since 2022-11-11 - */ -public interface LibraryModelPointMapper extends CommonMapper { - -} +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.LibraryModelPoint; + +/** + * Mapper 接口 + * + * @author easy-generator + * @since 2022-11-11 + */ +public interface LibraryModelPointMapper extends CommonMapper { + +} diff --git a/src/main/java/com/ai/da/mapper/PanToneMapper.java b/src/main/java/com/ai/da/mapper/primary/PanToneMapper.java similarity index 75% rename from src/main/java/com/ai/da/mapper/PanToneMapper.java rename to src/main/java/com/ai/da/mapper/primary/PanToneMapper.java index a83be55a..81e47ed0 100644 --- a/src/main/java/com/ai/da/mapper/PanToneMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/PanToneMapper.java @@ -1,20 +1,19 @@ -package com.ai.da.mapper; - -import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.PanTone; -import com.ai.da.model.dto.GetRgbByHsvBatchDTO; -import io.swagger.v3.oas.annotations.Parameter; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * Mapper 接口 - * - * @author easy-generator - * @since 2022-06-13 - */ -public interface PanToneMapper extends CommonMapper { - - List getRgbByHsvBatch(@Param("rgbByHsvBatch") List rgbByHsvBatch); -} +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.PanTone; +import com.ai.da.model.dto.GetRgbByHsvBatchDTO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * Mapper 接口 + * + * @author easy-generator + * @since 2022-06-13 + */ +public interface PanToneMapper extends CommonMapper { + + List getRgbByHsvBatch(@Param("rgbByHsvBatch") List rgbByHsvBatch); +} diff --git a/src/main/java/com/ai/da/mapper/PythonTAllInfoMapper.java b/src/main/java/com/ai/da/mapper/primary/PythonTAllInfoMapper.java similarity index 56% rename from src/main/java/com/ai/da/mapper/PythonTAllInfoMapper.java rename to src/main/java/com/ai/da/mapper/primary/PythonTAllInfoMapper.java index 9b4bbd14..b5e7a49c 100644 --- a/src/main/java/com/ai/da/mapper/PythonTAllInfoMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/PythonTAllInfoMapper.java @@ -1,11 +1,7 @@ -package com.ai.da.mapper; +package com.ai.da.mapper.primary; import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.PythonTAllInfo; -import org.apache.ibatis.annotations.Param; -import org.springframework.data.domain.Pageable; - -import java.util.List; +import com.ai.da.mapper.primary.entity.PythonTAllInfo; /** * (PythonTAllInfo)表数据库访问层 diff --git a/src/main/java/com/ai/da/mapper/SysFileMapper.java b/src/main/java/com/ai/da/mapper/primary/SysFileMapper.java similarity index 62% rename from src/main/java/com/ai/da/mapper/SysFileMapper.java rename to src/main/java/com/ai/da/mapper/primary/SysFileMapper.java index ab4d995d..94842a00 100644 --- a/src/main/java/com/ai/da/mapper/SysFileMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/SysFileMapper.java @@ -1,15 +1,14 @@ -package com.ai.da.mapper; - -import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.Design; -import com.ai.da.mapper.entity.SysFile; - -/** - * Mapper 接口 - * - * @author easy-generator - * @since 2022-10-6 - */ -public interface SysFileMapper extends CommonMapper { - -} +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.SysFile; + +/** + * Mapper 接口 + * + * @author easy-generator + * @since 2022-10-6 + */ +public interface SysFileMapper extends CommonMapper { + +} diff --git a/src/main/java/com/ai/da/mapper/TCollectionElementRelationMapper.java b/src/main/java/com/ai/da/mapper/primary/TCollectionElementRelationMapper.java similarity index 76% rename from src/main/java/com/ai/da/mapper/TCollectionElementRelationMapper.java rename to src/main/java/com/ai/da/mapper/primary/TCollectionElementRelationMapper.java index a09b17bf..508a7533 100644 --- a/src/main/java/com/ai/da/mapper/TCollectionElementRelationMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/TCollectionElementRelationMapper.java @@ -1,7 +1,7 @@ -package com.ai.da.mapper; +package com.ai.da.mapper.primary; import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.TCollectionElementRelation; +import com.ai.da.mapper.primary.entity.TCollectionElementRelation; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/ai/da/mapper/TDesignPythonOutfitDetailMapper.java b/src/main/java/com/ai/da/mapper/primary/TDesignPythonOutfitDetailMapper.java similarity index 86% rename from src/main/java/com/ai/da/mapper/TDesignPythonOutfitDetailMapper.java rename to src/main/java/com/ai/da/mapper/primary/TDesignPythonOutfitDetailMapper.java index 68f42c82..ecdf8b45 100644 --- a/src/main/java/com/ai/da/mapper/TDesignPythonOutfitDetailMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/TDesignPythonOutfitDetailMapper.java @@ -1,7 +1,7 @@ -package com.ai.da.mapper; +package com.ai.da.mapper.primary; import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.TDesignPythonOutfitDetail; +import com.ai.da.mapper.primary.entity.TDesignPythonOutfitDetail; import com.ai.da.model.vo.TDesignPythonOutfitDetailVO; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/src/main/java/com/ai/da/mapper/TDesignPythonOutfitMapper.java b/src/main/java/com/ai/da/mapper/primary/TDesignPythonOutfitMapper.java similarity index 86% rename from src/main/java/com/ai/da/mapper/TDesignPythonOutfitMapper.java rename to src/main/java/com/ai/da/mapper/primary/TDesignPythonOutfitMapper.java index 1423c794..c3284391 100644 --- a/src/main/java/com/ai/da/mapper/TDesignPythonOutfitMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/TDesignPythonOutfitMapper.java @@ -1,8 +1,8 @@ -package com.ai.da.mapper; +package com.ai.da.mapper.primary; import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.TDesignPythonOutfit; +import com.ai.da.mapper.primary.entity.TDesignPythonOutfit; import com.ai.da.model.vo.TDesignPythonOutfitVO; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/src/main/java/com/ai/da/mapper/TrialOrderMapper.java b/src/main/java/com/ai/da/mapper/primary/TrialOrderMapper.java similarity index 61% rename from src/main/java/com/ai/da/mapper/TrialOrderMapper.java rename to src/main/java/com/ai/da/mapper/primary/TrialOrderMapper.java index 45a9a621..39def53f 100644 --- a/src/main/java/com/ai/da/mapper/TrialOrderMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/TrialOrderMapper.java @@ -1,10 +1,7 @@ -package com.ai.da.mapper; +package com.ai.da.mapper.primary; import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.Account; -import com.ai.da.mapper.entity.TrialOrder; - -import java.util.List; +import com.ai.da.mapper.primary.entity.TrialOrder; /** * Mapper 接口 diff --git a/src/main/java/com/ai/da/mapper/UserLikeGroupMapper.java b/src/main/java/com/ai/da/mapper/primary/UserLikeGroupMapper.java similarity index 71% rename from src/main/java/com/ai/da/mapper/UserLikeGroupMapper.java rename to src/main/java/com/ai/da/mapper/primary/UserLikeGroupMapper.java index df5f4629..4d71e0b2 100644 --- a/src/main/java/com/ai/da/mapper/UserLikeGroupMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/UserLikeGroupMapper.java @@ -1,16 +1,15 @@ -package com.ai.da.mapper; - -import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.Design; -import com.ai.da.mapper.entity.UserLikeGroup; - -/** - * Mapper 接口 - * - * @author easy-generator - * @since 2022-06-13 - */ -public interface UserLikeGroupMapper extends CommonMapper { - //返回插入数据后生成的主键 - Long insertUserLikeGroup(UserLikeGroup userLikeGroup); -} +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.UserLikeGroup; + +/** + * Mapper 接口 + * + * @author easy-generator + * @since 2022-06-13 + */ +public interface UserLikeGroupMapper extends CommonMapper { + //返回插入数据后生成的主键 + Long insertUserLikeGroup(UserLikeGroup userLikeGroup); +} diff --git a/src/main/java/com/ai/da/mapper/UserLikeMapper.java b/src/main/java/com/ai/da/mapper/primary/UserLikeMapper.java similarity index 70% rename from src/main/java/com/ai/da/mapper/UserLikeMapper.java rename to src/main/java/com/ai/da/mapper/primary/UserLikeMapper.java index 35ae30df..1d5e4761 100644 --- a/src/main/java/com/ai/da/mapper/UserLikeMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/UserLikeMapper.java @@ -1,14 +1,14 @@ -package com.ai.da.mapper; - -import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.UserLike; - -/** - * Mapper 接口 - * - * @author easy-generator - * @since 2022-06-13 - */ -public interface UserLikeMapper extends CommonMapper { - -} +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.UserLike; + +/** + * Mapper 接口 + * + * @author easy-generator + * @since 2022-06-13 + */ +public interface UserLikeMapper extends CommonMapper { + +} diff --git a/src/main/java/com/ai/da/mapper/WorkspaceMapper.java b/src/main/java/com/ai/da/mapper/primary/WorkspaceMapper.java similarity index 85% rename from src/main/java/com/ai/da/mapper/WorkspaceMapper.java rename to src/main/java/com/ai/da/mapper/primary/WorkspaceMapper.java index e1525d4a..214e97c0 100644 --- a/src/main/java/com/ai/da/mapper/WorkspaceMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/WorkspaceMapper.java @@ -1,7 +1,7 @@ -package com.ai.da.mapper; +package com.ai.da.mapper.primary; import com.ai.da.common.config.mybatis.plus.CommonMapper; -import com.ai.da.mapper.entity.Workspace; +import com.ai.da.mapper.primary.entity.Workspace; import com.ai.da.model.vo.WorkspaceVO; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/src/main/java/com/ai/da/mapper/entity/Account.java b/src/main/java/com/ai/da/mapper/primary/entity/Account.java similarity index 92% rename from src/main/java/com/ai/da/mapper/entity/Account.java rename to src/main/java/com/ai/da/mapper/primary/entity/Account.java index 3dd607b6..bca34dec 100644 --- a/src/main/java/com/ai/da/mapper/entity/Account.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Account.java @@ -1,83 +1,83 @@ -package com.ai.da.mapper.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -/** - * Attendance - * - * @author easy-generator - * @since 2022-06-13 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("t_account") -public class Account implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - /** - * 邮箱 - */ - private String userEmail; - - /** - * 用户名 - */ - private String userName; - - /** - * 密码 - */ - private String userPassword; - - /** - * 语言 - */ - private String language; - - /** - * 城市 - */ - private String country; - - /** - * 账户有效期开始时间 - */ - private Long validStartTime; - - /** - * 账户有效期结束时间 - */ - private Long validEndTime; - - /** - * 创建时间 - */ - private Date createDate; - - /** - * 更新时间 - */ - private Date updateDate; - - private Integer isTrial; - - private Integer isBeginner; - - private String browserIdentifiers; -} +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + * Attendance + * + * @author easy-generator + * @since 2022-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("t_account") +public class Account implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 邮箱 + */ + private String userEmail; + + /** + * 用户名 + */ + private String userName; + + /** + * 密码 + */ + private String userPassword; + + /** + * 语言 + */ + private String language; + + /** + * 城市 + */ + private String country; + + /** + * 账户有效期开始时间 + */ + private Long validStartTime; + + /** + * 账户有效期结束时间 + */ + private Long validEndTime; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新时间 + */ + private Date updateDate; + + private Integer isTrial; + + private Integer isBeginner; + + private String browserIdentifiers; +} diff --git a/src/main/java/com/ai/da/mapper/entity/AccountLoginLog.java b/src/main/java/com/ai/da/mapper/primary/entity/AccountLoginLog.java similarity index 91% rename from src/main/java/com/ai/da/mapper/entity/AccountLoginLog.java rename to src/main/java/com/ai/da/mapper/primary/entity/AccountLoginLog.java index 9218813e..1eb5fb30 100644 --- a/src/main/java/com/ai/da/mapper/entity/AccountLoginLog.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/AccountLoginLog.java @@ -1,53 +1,53 @@ -package com.ai.da.mapper.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -/** - * 账户登入日志 - * - * @author yl - * @since 2022-09-03 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("t_account_login_log") -public class AccountLoginLog implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - /** - * 账户id - */ - private Long accountId; - - /** - * ip - */ - private String ip; - - /** - * ip地址 - */ - private String ipAddr; - - /** - * 创建时间 - */ - private Date createDate; - -} +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + * 账户登入日志 + * + * @author yl + * @since 2022-09-03 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("t_account_login_log") +public class AccountLoginLog implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 账户id + */ + private Long accountId; + + /** + * ip + */ + private String ip; + + /** + * ip地址 + */ + private String ipAddr; + + /** + * 创建时间 + */ + private Date createDate; + +} diff --git a/src/main/java/com/ai/da/mapper/entity/ChatRobot.java b/src/main/java/com/ai/da/mapper/primary/entity/ChatRobot.java similarity index 94% rename from src/main/java/com/ai/da/mapper/entity/ChatRobot.java rename to src/main/java/com/ai/da/mapper/primary/entity/ChatRobot.java index dd470187..31397ada 100644 --- a/src/main/java/com/ai/da/mapper/entity/ChatRobot.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/ChatRobot.java @@ -1,4 +1,4 @@ -package com.ai.da.mapper.entity; +package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -11,7 +11,6 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/ai/da/mapper/entity/Classification.java b/src/main/java/com/ai/da/mapper/primary/entity/Classification.java similarity index 95% rename from src/main/java/com/ai/da/mapper/entity/Classification.java rename to src/main/java/com/ai/da/mapper/primary/entity/Classification.java index 65a8c238..b41a2b0f 100644 --- a/src/main/java/com/ai/da/mapper/entity/Classification.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Classification.java @@ -1,4 +1,4 @@ -package com.ai.da.mapper.entity; +package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -10,7 +10,6 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/ai/da/mapper/entity/ClassificationRelLibrary.java b/src/main/java/com/ai/da/mapper/primary/entity/ClassificationRelLibrary.java similarity index 96% rename from src/main/java/com/ai/da/mapper/entity/ClassificationRelLibrary.java rename to src/main/java/com/ai/da/mapper/primary/entity/ClassificationRelLibrary.java index c8449830..41649ab3 100644 --- a/src/main/java/com/ai/da/mapper/entity/ClassificationRelLibrary.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/ClassificationRelLibrary.java @@ -1,4 +1,4 @@ -package com.ai.da.mapper.entity; +package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/ai/da/mapper/entity/Collection.java b/src/main/java/com/ai/da/mapper/primary/entity/Collection.java similarity index 86% rename from src/main/java/com/ai/da/mapper/entity/Collection.java rename to src/main/java/com/ai/da/mapper/primary/entity/Collection.java index 1ff7cbb2..73f9a769 100644 --- a/src/main/java/com/ai/da/mapper/entity/Collection.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Collection.java @@ -1,53 +1,52 @@ -package com.ai.da.mapper.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -/** - * Attendance - * - * @author easy-generator - * @since 2022-06-13 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("t_collection") -public class Collection implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - /** - * 用户ID - */ - private Long accountId; - - /** - * mood模板id - */ - private String moodTemplateId; - - /** - * 创建时间 - */ - private Date createDate; - - /** - * 更新时间 - */ - private Date updateDate; -} +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + * Attendance + * + * @author easy-generator + * @since 2022-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("t_collection") +public class Collection implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 用户ID + */ + private Long accountId; + + /** + * mood模板id + */ + private String moodTemplateId; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新时间 + */ + private Date updateDate; +} diff --git a/src/main/java/com/ai/da/mapper/entity/CollectionElement.java b/src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java similarity index 92% rename from src/main/java/com/ai/da/mapper/entity/CollectionElement.java rename to src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java index 320a8ed7..b15b9418 100644 --- a/src/main/java/com/ai/da/mapper/entity/CollectionElement.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java @@ -1,87 +1,87 @@ -package com.ai.da.mapper.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -/** - * Attendance - * - * @author easy-generator - * @since 2022-06-13 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("t_collection_element") -public class CollectionElement implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - /** - * 用户ID - */ - private Long accountId; - /** - * collectionId - */ - private Long collectionId; - - private String type; - - /** - * 一级类型 - */ - private String level1Type; - - /** - * 二级类型 - */ - private String level2Type; - - /** - * 元素名(如果是颜色board 存潘通id+潘通名字 形式 ""11_mds") - */ - private String name; - - /** - * 元素存放地址 - */ - private String url; - /** - * 是否pin 1pin 0 不pin - */ - @TableField("is_pin") - private Byte hasPin; - /** - * 颜色的rgb值 空格分割 - */ - private String colorRgb; - /** - * md5值 - */ - private String md5; - - /** - * 创建时间 - */ - private Date createDate; - - /** - * 更新时间 - */ - private Date updateDate; -} +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + * Attendance + * + * @author easy-generator + * @since 2022-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("t_collection_element") +public class CollectionElement implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 用户ID + */ + private Long accountId; + /** + * collectionId + */ + private Long collectionId; + + private String type; + + /** + * 一级类型 + */ + private String level1Type; + + /** + * 二级类型 + */ + private String level2Type; + + /** + * 元素名(如果是颜色board 存潘通id+潘通名字 形式 ""11_mds") + */ + private String name; + + /** + * 元素存放地址 + */ + private String url; + /** + * 是否pin 1pin 0 不pin + */ + @TableField("is_pin") + private Byte hasPin; + /** + * 颜色的rgb值 空格分割 + */ + private String colorRgb; + /** + * md5值 + */ + private String md5; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新时间 + */ + private Date updateDate; +} diff --git a/src/main/java/com/ai/da/mapper/entity/ColorLookupTable.java b/src/main/java/com/ai/da/mapper/primary/entity/ColorLookupTable.java similarity index 75% rename from src/main/java/com/ai/da/mapper/entity/ColorLookupTable.java rename to src/main/java/com/ai/da/mapper/primary/entity/ColorLookupTable.java index b26cec78..04515738 100644 --- a/src/main/java/com/ai/da/mapper/entity/ColorLookupTable.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/ColorLookupTable.java @@ -1,35 +1,32 @@ -package com.ai.da.mapper.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -/** - * Attendance - * - * @author easy-generator - * @since 2022-09-30 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("color_lookup_table") -public class ColorLookupTable implements Serializable { - - private static final long serialVersionUID = 1L; - /** - * colorValue - */ - private Integer colorValue; - - /** - * color_index - */ - private Integer colorIndex; -} +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * Attendance + * + * @author easy-generator + * @since 2022-09-30 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("color_lookup_table") +public class ColorLookupTable implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * colorValue + */ + private Integer colorValue; + + /** + * color_index + */ + private Integer colorIndex; +} diff --git a/src/main/java/com/ai/da/mapper/entity/Design.java b/src/main/java/com/ai/da/mapper/primary/entity/Design.java similarity index 89% rename from src/main/java/com/ai/da/mapper/entity/Design.java rename to src/main/java/com/ai/da/mapper/primary/entity/Design.java index 8c990b6f..f891ab78 100644 --- a/src/main/java/com/ai/da/mapper/entity/Design.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Design.java @@ -1,73 +1,72 @@ -package com.ai.da.mapper.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * Attendance - * - * @author easy-generator - * @since 2022-06-13 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("t_design") -public class Design implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - /** - * 用户ID - */ - private Long accountId; - /** - * collectionId - */ - private Long collectionId; - /** - * 模特id - */ - private Long templateId; - - private String modelType; - - /** - * system scale值 - */ - private BigDecimal systemScale; - - /** - * 控制生成类型的参数，两个选项：“overall”或“single” - */ - private String singleOverall; - - /** - * single模式下的类别选择参数 选项有outwear,dress,blouse,skirt,trousers - */ - private String switchCategory; - - /** - * 创建时间 - */ - private Date createDate; - - /** - * 更新时间 - */ - private Date updateDate; -} +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * Attendance + * + * @author easy-generator + * @since 2022-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("t_design") +public class Design implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 用户ID + */ + private Long accountId; + /** + * collectionId + */ + private Long collectionId; + /** + * 模特id + */ + private Long templateId; + + private String modelType; + + /** + * system scale值 + */ + private BigDecimal systemScale; + + /** + * 控制生成类型的参数，两个选项：“overall”或“single” + */ + private String singleOverall; + + /** + * single模式下的类别选择参数 选项有outwear,dress,blouse,skirt,trousers + */ + private String switchCategory; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新时间 + */ + private Date updateDate; +} diff --git a/src/main/java/com/ai/da/mapper/entity/DesignHistory.java b/src/main/java/com/ai/da/mapper/primary/entity/DesignHistory.java similarity index 91% rename from src/main/java/com/ai/da/mapper/entity/DesignHistory.java rename to src/main/java/com/ai/da/mapper/primary/entity/DesignHistory.java index 87f11e7f..6d9af783 100644 --- a/src/main/java/com/ai/da/mapper/entity/DesignHistory.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/DesignHistory.java @@ -1,55 +1,55 @@ -package com.ai.da.mapper.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -/** - * Attendance - * - * @author easy-generator - * @since 2022-06-13 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("t_design_history") -public class DesignHistory implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - /** - * 用户ID - */ - private Long accountId; - - /** - * collectionId - */ - private Long collectionId; - - /** - * md5值 - */ - private String md5; - /** - * 创建时间 - */ - private Date createDate; - - /** - * 更新时间 - */ - private Date updateDate; -} +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + * Attendance + * + * @author easy-generator + * @since 2022-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("t_design_history") +public class DesignHistory implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 用户ID + */ + private Long accountId; + + /** + * collectionId + */ + private Long collectionId; + + /** + * md5值 + */ + private String md5; + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新时间 + */ + private Date updateDate; +} diff --git a/src/main/java/com/ai/da/mapper/entity/DesignItem.java b/src/main/java/com/ai/da/mapper/primary/entity/DesignItem.java similarity index 93% rename from src/main/java/com/ai/da/mapper/entity/DesignItem.java rename to src/main/java/com/ai/da/mapper/primary/entity/DesignItem.java index 7a47111b..f6532eea 100644 --- a/src/main/java/com/ai/da/mapper/entity/DesignItem.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/DesignItem.java @@ -1,75 +1,75 @@ -package com.ai.da.mapper.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -/** - * Attendance - * - * @author easy-generator - * @since 2022-06-13 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("t_design_item") -public class DesignItem implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - /** - * 用户ID - */ - private Long accountId; - /** - * collectionId - */ - private Long collectionId; - /** - * designId - */ - private Long designId; - - /** - * print scale值 - */ - private String printScale; - - /** - * design后的用户文件地址(python 返回) - */ - private String designUrl; - - /** - * 二次(高级,基础design的图再次design)design后的用户文件地址(python 返回) - */ - private String highDesignUrl; - /** - * 是否like 0 否 1是 - */ - @TableField("is_like") - private Byte hasLike; - - /** - * 创建时间 - */ - private Date createDate; - - /** - * 更新时间 - */ - private Date updateDate; -} +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + * Attendance + * + * @author easy-generator + * @since 2022-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("t_design_item") +public class DesignItem implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 用户ID + */ + private Long accountId; + /** + * collectionId + */ + private Long collectionId; + /** + * designId + */ + private Long designId; + + /** + * print scale值 + */ + private String printScale; + + /** + * design后的用户文件地址(python 返回) + */ + private String designUrl; + + /** + * 二次(高级,基础design的图再次design)design后的用户文件地址(python 返回) + */ + private String highDesignUrl; + /** + * 是否like 0 否 1是 + */ + @TableField("is_like") + private Byte hasLike; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新时间 + */ + private Date updateDate; +} diff --git a/src/main/java/com/ai/da/mapper/entity/DesignItemDetail.java b/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetail.java similarity index 93% rename from src/main/java/com/ai/da/mapper/entity/DesignItemDetail.java rename to src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetail.java index f3a866b9..437a9264 100644 --- a/src/main/java/com/ai/da/mapper/entity/DesignItemDetail.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetail.java @@ -1,106 +1,106 @@ -package com.ai.da.mapper.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -/** - * Attendance - * - * @author easy-generator - * @since 2022-06-13 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("t_design_item_detail") -public class DesignItemDetail implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - /** - * 用户ID - */ - private Long accountId; - - /** - * designId - */ - private Long designId; - - /** - * designItemId - */ - private Long designItemId; - - /** - * elemntId - */ - private Long collectionElementId; - - /** - * 生成item实际对应的类型 有:outwear,dress,blouse,skirt,trousers Shoes Hairstyle Earring Body - */ - private String type; - - /** - * 对应的图片的绝对路径 - */ - private String path; - - /** - * 颜色 存 RGB值 中间空格分隔 比如 "58 58 169" - */ - private String color; - - /** - * 对应的print图片的绝对路径 - */ - private String printPath; - - /** - * 对应的icon的绝对路径 - */ - private String iconPath; - - /** - * 对应上游业务id - */ - private Long businessId; - - /** - * 存储print打点的的参数json对象 - */ - private String printJson; - - /** - * item的优先级 - */ - private Integer priority; - - /** - * 创建时间 - */ - private Date createDate; - - /** - * 更新时间 - */ - private Date updateDate; - - /** - * 逻辑删除 1->删除 0->未删除 默认null - */ - private Byte isDeleted; -} +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + * Attendance + * + * @author easy-generator + * @since 2022-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("t_design_item_detail") +public class DesignItemDetail implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 用户ID + */ + private Long accountId; + + /** + * designId + */ + private Long designId; + + /** + * designItemId + */ + private Long designItemId; + + /** + * elemntId + */ + private Long collectionElementId; + + /** + * 生成item实际对应的类型 有:outwear,dress,blouse,skirt,trousers Shoes Hairstyle Earring Body + */ + private String type; + + /** + * 对应的图片的绝对路径 + */ + private String path; + + /** + * 颜色 存 RGB值 中间空格分隔 比如 "58 58 169" + */ + private String color; + + /** + * 对应的print图片的绝对路径 + */ + private String printPath; + + /** + * 对应的icon的绝对路径 + */ + private String iconPath; + + /** + * 对应上游业务id + */ + private Long businessId; + + /** + * 存储print打点的的参数json对象 + */ + private String printJson; + + /** + * item的优先级 + */ + private Integer priority; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新时间 + */ + private Date updateDate; + + /** + * 逻辑删除 1->删除 0->未删除 默认null + */ + private Byte isDeleted; +} diff --git a/src/main/java/com/ai/da/mapper/entity/DesignItemDetailPrint.java b/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetailPrint.java similarity index 96% rename from src/main/java/com/ai/da/mapper/entity/DesignItemDetailPrint.java rename to src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetailPrint.java index be009476..e6800e69 100644 --- a/src/main/java/com/ai/da/mapper/entity/DesignItemDetailPrint.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetailPrint.java @@ -1,4 +1,4 @@ -package com.ai.da.mapper.entity; +package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/ai/da/mapper/entity/Generate.java b/src/main/java/com/ai/da/mapper/primary/entity/Generate.java similarity index 96% rename from src/main/java/com/ai/da/mapper/entity/Generate.java rename to src/main/java/com/ai/da/mapper/primary/entity/Generate.java index fc1f4e33..009e7fe0 100644 --- a/src/main/java/com/ai/da/mapper/entity/Generate.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Generate.java @@ -1,4 +1,4 @@ -package com.ai.da.mapper.entity; +package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/com/ai/da/mapper/entity/GenerateDetail.java b/src/main/java/com/ai/da/mapper/primary/entity/GenerateDetail.java similarity index 96% rename from src/main/java/com/ai/da/mapper/entity/GenerateDetail.java rename to src/main/java/com/ai/da/mapper/primary/entity/GenerateDetail.java index cce89e29..b016e7fa 100644 --- a/src/main/java/com/ai/da/mapper/entity/GenerateDetail.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/GenerateDetail.java @@ -1,4 +1,4 @@ -package com.ai.da.mapper.entity; +package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/com/ai/da/mapper/entity/Library.java b/src/main/java/com/ai/da/mapper/primary/entity/Library.java similarity index 89% rename from src/main/java/com/ai/da/mapper/entity/Library.java rename to src/main/java/com/ai/da/mapper/primary/entity/Library.java index 5ed6f488..cc5250a4 100644 --- a/src/main/java/com/ai/da/mapper/entity/Library.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Library.java @@ -1,84 +1,83 @@ -package com.ai.da.mapper.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -/** - * Attendance - * - * @author easy-generator - * @since 2022-06-13 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("t_library") -public class Library implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - /** - * 用户ID - */ - private Long accountId; - - /** - * 一级类型 - */ - private String level1Type; - - /** - * 二级类型 - */ - private String level2Type; - - private String level3Type; - - /** - * 元素名 - */ - private String name; - - /** - * 元素存放地址 - */ - private String url; - /** - * md5值 - */ - private String md5; - /** - * 图片高度,目前只争对 models类型 - */ - private Integer high; - /** - * 图片宽度,目前只争对 models类型 - */ - private Integer width; - - /** - * 创建时间 - */ - private Date createDate; - - /** - * 更新时间 - */ - private Date updateDate; - -// private Integer isCopy; -} +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + * Attendance + * + * @author easy-generator + * @since 2022-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("t_library") +public class Library implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 用户ID + */ + private Long accountId; + + /** + * 一级类型 + */ + private String level1Type; + + /** + * 二级类型 + */ + private String level2Type; + + private String level3Type; + + /** + * 元素名 + */ + private String name; + + /** + * 元素存放地址 + */ + private String url; + /** + * md5值 + */ + private String md5; + /** + * 图片高度,目前只争对 models类型 + */ + private Integer high; + /** + * 图片宽度,目前只争对 models类型 + */ + private Integer width; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新时间 + */ + private Date updateDate; + +// private Integer isCopy; +} diff --git a/src/main/java/com/ai/da/mapper/entity/LibraryModelPoint.java b/src/main/java/com/ai/da/mapper/primary/entity/LibraryModelPoint.java similarity index 92% rename from src/main/java/com/ai/da/mapper/entity/LibraryModelPoint.java rename to src/main/java/com/ai/da/mapper/primary/entity/LibraryModelPoint.java index 01adf7b7..d3e1fbdf 100644 --- a/src/main/java/com/ai/da/mapper/entity/LibraryModelPoint.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/LibraryModelPoint.java @@ -1,81 +1,81 @@ -package com.ai.da.mapper.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -/** - * Attendance - * - * @author easy-generator - * @since 2022-11-13 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("t_library_model_point") -public class LibraryModelPoint implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - /** - * modelType - */ - private String modelType; - - /** - * 关联的 library或sys Id - */ - private Long relationId; - - /** - * 左肩 - */ - private String shoulderLeft; - - /** - * 右肩 - */ - private String shoulderRight; - - /** - * 左腰 - */ - private String waistbandLeft; - - /** - * 右腰 - */ - private String waistbandRight; - /** - * 左手 - */ - private String handLeft; - - /** - * 右手 - */ - private String handRight; - - /** - * 创建时间 - */ - private Date createDate; - - /** - * 更新时间 - */ - private Date updateDate; -} +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + * Attendance + * + * @author easy-generator + * @since 2022-11-13 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("t_library_model_point") +public class LibraryModelPoint implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * modelType + */ + private String modelType; + + /** + * 关联的 library或sys Id + */ + private Long relationId; + + /** + * 左肩 + */ + private String shoulderLeft; + + /** + * 右肩 + */ + private String shoulderRight; + + /** + * 左腰 + */ + private String waistbandLeft; + + /** + * 右腰 + */ + private String waistbandRight; + /** + * 左手 + */ + private String handLeft; + + /** + * 右手 + */ + private String handRight; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新时间 + */ + private Date updateDate; +} diff --git a/src/main/java/com/ai/da/mapper/entity/ObjectItem.java b/src/main/java/com/ai/da/mapper/primary/entity/ObjectItem.java similarity index 73% rename from src/main/java/com/ai/da/mapper/entity/ObjectItem.java rename to src/main/java/com/ai/da/mapper/primary/entity/ObjectItem.java index 80d33e2d..631d6db1 100644 --- a/src/main/java/com/ai/da/mapper/entity/ObjectItem.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/ObjectItem.java @@ -1,4 +1,4 @@ -package com.ai.da.mapper.entity; +package com.ai.da.mapper.primary.entity; import lombok.Data; diff --git a/src/main/java/com/ai/da/mapper/entity/PanTone.java b/src/main/java/com/ai/da/mapper/primary/entity/PanTone.java similarity index 84% rename from src/main/java/com/ai/da/mapper/entity/PanTone.java rename to src/main/java/com/ai/da/mapper/primary/entity/PanTone.java index dc14ae1a..bc854838 100644 --- a/src/main/java/com/ai/da/mapper/entity/PanTone.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/PanTone.java @@ -1,72 +1,70 @@ -package com.ai.da.mapper.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -/** - * Attendance - * - * @author easy-generator - * @since 2022-06-13 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("pantone") -public class PanTone implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * pantone_index - */ - @TableId("pantone_index") - private Integer pantoneIndex; - - /** - * name - */ - private String name; - - /** - * TCX - */ - private String tcx; - - /** - * R - */ - private Integer r; - - /** - * G - */ - private Integer g; - - /** - * B - */ - private Integer b; - - /** - * H - */ - private Integer h; - - /** - * S - */ - private Integer s; - - /** - * V - */ - private Integer v; -} +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * Attendance + * + * @author easy-generator + * @since 2022-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("pantone") +public class PanTone implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * pantone_index + */ + @TableId("pantone_index") + private Integer pantoneIndex; + + /** + * name + */ + private String name; + + /** + * TCX + */ + private String tcx; + + /** + * R + */ + private Integer r; + + /** + * G + */ + private Integer g; + + /** + * B + */ + private Integer b; + + /** + * H + */ + private Integer h; + + /** + * S + */ + private Integer s; + + /** + * V + */ + private Integer v; +} diff --git a/src/main/java/com/ai/da/mapper/entity/PythonTAllInfo.java b/src/main/java/com/ai/da/mapper/primary/entity/PythonTAllInfo.java similarity index 97% rename from src/main/java/com/ai/da/mapper/entity/PythonTAllInfo.java rename to src/main/java/com/ai/da/mapper/primary/entity/PythonTAllInfo.java index ae16fdd8..40f89ff2 100644 --- a/src/main/java/com/ai/da/mapper/entity/PythonTAllInfo.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/PythonTAllInfo.java @@ -1,4 +1,4 @@ -package com.ai.da.mapper.entity; +package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/ai/da/mapper/entity/Sketches.java b/src/main/java/com/ai/da/mapper/primary/entity/Sketches.java similarity index 78% rename from src/main/java/com/ai/da/mapper/entity/Sketches.java rename to src/main/java/com/ai/da/mapper/primary/entity/Sketches.java index a3fb57b4..a6bc9460 100644 --- a/src/main/java/com/ai/da/mapper/entity/Sketches.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Sketches.java @@ -1,4 +1,4 @@ -package com.ai.da.mapper.entity; +package com.ai.da.mapper.primary.entity; import lombok.Data; diff --git a/src/main/java/com/ai/da/mapper/entity/SketchesBoundingBox.java b/src/main/java/com/ai/da/mapper/primary/entity/SketchesBoundingBox.java similarity index 75% rename from src/main/java/com/ai/da/mapper/entity/SketchesBoundingBox.java rename to src/main/java/com/ai/da/mapper/primary/entity/SketchesBoundingBox.java index 24c5b1df..6c687e25 100644 --- a/src/main/java/com/ai/da/mapper/entity/SketchesBoundingBox.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/SketchesBoundingBox.java @@ -1,4 +1,4 @@ -package com.ai.da.mapper.entity; +package com.ai.da.mapper.primary.entity; import lombok.Data; diff --git a/src/main/java/com/ai/da/mapper/entity/SysFile.java b/src/main/java/com/ai/da/mapper/primary/entity/SysFile.java similarity index 93% rename from src/main/java/com/ai/da/mapper/entity/SysFile.java rename to src/main/java/com/ai/da/mapper/primary/entity/SysFile.java index f4977130..24466611 100644 --- a/src/main/java/com/ai/da/mapper/entity/SysFile.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/SysFile.java @@ -1,81 +1,81 @@ -package com.ai.da.mapper.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -/** - * Attendance - * - * @author easy-generator - * @since 2022-06-13 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("t_sys_file") -public class SysFile implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - /** - * 一级类型 accessories icon Images - */ - private String level1Type; - - /** - * 二级类型 目前有outwear,dress,blouse,skirt,trousers Shoes Hairstyle Earring - */ - private String level2Type; - - private String level3Type; - - /** - * 名字 - */ - private String name; - - /** - * md5值 - */ - private String md5; - - /** - * 路径 绝对路径 - */ - private String url; - - /** - * 创建时间 - */ - private Date createDate; - - /** - * 更新时间 - */ - private Date updateDate; - - public SysFile() { - } - - public SysFile(String level1Type, String level2Type, String name, String md5, String url, Date createDate) { - this.level1Type = level1Type; - this.level2Type = level2Type; - this.name = name; - this.md5 = md5; - this.url = url; - this.createDate = createDate; - } -} +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + * Attendance + * + * @author easy-generator + * @since 2022-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("t_sys_file") +public class SysFile implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 一级类型 accessories icon Images + */ + private String level1Type; + + /** + * 二级类型 目前有outwear,dress,blouse,skirt,trousers Shoes Hairstyle Earring + */ + private String level2Type; + + private String level3Type; + + /** + * 名字 + */ + private String name; + + /** + * md5值 + */ + private String md5; + + /** + * 路径 绝对路径 + */ + private String url; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新时间 + */ + private Date updateDate; + + public SysFile() { + } + + public SysFile(String level1Type, String level2Type, String name, String md5, String url, Date createDate) { + this.level1Type = level1Type; + this.level2Type = level2Type; + this.name = name; + this.md5 = md5; + this.url = url; + this.createDate = createDate; + } +} diff --git a/src/main/java/com/ai/da/mapper/entity/TCollectionElementRelation.java b/src/main/java/com/ai/da/mapper/primary/entity/TCollectionElementRelation.java similarity index 94% rename from src/main/java/com/ai/da/mapper/entity/TCollectionElementRelation.java rename to src/main/java/com/ai/da/mapper/primary/entity/TCollectionElementRelation.java index cb6dbbcd..dac90348 100644 --- a/src/main/java/com/ai/da/mapper/entity/TCollectionElementRelation.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/TCollectionElementRelation.java @@ -1,4 +1,4 @@ -package com.ai.da.mapper.entity; +package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -7,7 +7,6 @@ import lombok.*; import lombok.experimental.Accessors; import java.io.Serializable; -import java.time.LocalDateTime; import java.util.Date; diff --git a/src/main/java/com/ai/da/mapper/entity/TDesignPythonOutfit.java b/src/main/java/com/ai/da/mapper/primary/entity/TDesignPythonOutfit.java similarity index 96% rename from src/main/java/com/ai/da/mapper/entity/TDesignPythonOutfit.java rename to src/main/java/com/ai/da/mapper/primary/entity/TDesignPythonOutfit.java index 8fe281a6..e08f19bc 100644 --- a/src/main/java/com/ai/da/mapper/entity/TDesignPythonOutfit.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/TDesignPythonOutfit.java @@ -1,5 +1,5 @@ -package com.ai.da.mapper.entity; +package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -8,7 +8,6 @@ import java.time.LocalDateTime; import java.io.Serializable; import lombok.Data; -import lombok.EqualsAndHashCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/ai/da/mapper/entity/TDesignPythonOutfitDetail.java b/src/main/java/com/ai/da/mapper/primary/entity/TDesignPythonOutfitDetail.java similarity index 97% rename from src/main/java/com/ai/da/mapper/entity/TDesignPythonOutfitDetail.java rename to src/main/java/com/ai/da/mapper/primary/entity/TDesignPythonOutfitDetail.java index f49ea93e..3d69de8e 100644 --- a/src/main/java/com/ai/da/mapper/entity/TDesignPythonOutfitDetail.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/TDesignPythonOutfitDetail.java @@ -1,5 +1,5 @@ -package com.ai.da.mapper.entity; +package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -8,7 +8,6 @@ import java.time.LocalDateTime; import java.io.Serializable; import lombok.Data; -import lombok.EqualsAndHashCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/ai/da/mapper/entity/TrialOrder.java b/src/main/java/com/ai/da/mapper/primary/entity/TrialOrder.java similarity index 96% rename from src/main/java/com/ai/da/mapper/entity/TrialOrder.java rename to src/main/java/com/ai/da/mapper/primary/entity/TrialOrder.java index 904d1a75..cf37aeee 100644 --- a/src/main/java/com/ai/da/mapper/entity/TrialOrder.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/TrialOrder.java @@ -1,4 +1,4 @@ -package com.ai.da.mapper.entity; +package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; + @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) diff --git a/src/main/java/com/ai/da/mapper/entity/UserLike.java b/src/main/java/com/ai/da/mapper/primary/entity/UserLike.java similarity index 92% rename from src/main/java/com/ai/da/mapper/entity/UserLike.java rename to src/main/java/com/ai/da/mapper/primary/entity/UserLike.java index c35ed12f..61a4deee 100644 --- a/src/main/java/com/ai/da/mapper/entity/UserLike.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/UserLike.java @@ -1,62 +1,62 @@ -package com.ai.da.mapper.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -/** - * UserLikeGroup - * - * @author easy-generator - * @since 2022-06-13 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("t_user_like") -public class UserLike implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - /** - * 关联的用户收藏分组 ID - */ - private Long userLikeGroupId; - /** - * 关联的design ID - */ - private Long designId; - /** - * 关联的design_item ID - */ - private Long designItemId; - /** - * 关联的design_python_outfit ID - */ - private Long designOutfitId; - /** - * 图片地址 - */ - private String url; - - /** - * 创建时间 - */ - private Date createDate; - - /** - * 更新时间 - */ - private Date updateDate; -} +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + * UserLikeGroup + * + * @author easy-generator + * @since 2022-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("t_user_like") +public class UserLike implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 关联的用户收藏分组 ID + */ + private Long userLikeGroupId; + /** + * 关联的design ID + */ + private Long designId; + /** + * 关联的design_item ID + */ + private Long designItemId; + /** + * 关联的design_python_outfit ID + */ + private Long designOutfitId; + /** + * 图片地址 + */ + private String url; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新时间 + */ + private Date updateDate; +} diff --git a/src/main/java/com/ai/da/mapper/entity/UserLikeGroup.java b/src/main/java/com/ai/da/mapper/primary/entity/UserLikeGroup.java similarity index 92% rename from src/main/java/com/ai/da/mapper/entity/UserLikeGroup.java rename to src/main/java/com/ai/da/mapper/primary/entity/UserLikeGroup.java index 496cf9ab..2aa8cc0e 100644 --- a/src/main/java/com/ai/da/mapper/entity/UserLikeGroup.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/UserLikeGroup.java @@ -1,55 +1,55 @@ -package com.ai.da.mapper.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -/** - * UserLikeGroup - * - * @author easy-generator - * @since 2022-06-13 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("t_user_like_group") -public class UserLikeGroup implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - /** - * 用户ID - */ - private Long accountId; - /** - * collectionId - */ - private Long collectionId; - - /** - * 用户收藏分组表 - */ - private String name; - - /** - * 创建时间 - */ - private Date createDate; - - /** - * 更新时间 - */ - private Date updateDate; -} +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + * UserLikeGroup + * + * @author easy-generator + * @since 2022-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("t_user_like_group") +public class UserLikeGroup implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 用户ID + */ + private Long accountId; + /** + * collectionId + */ + private Long collectionId; + + /** + * 用户收藏分组表 + */ + private String name; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新时间 + */ + private Date updateDate; +} diff --git a/src/main/java/com/ai/da/mapper/entity/Workspace.java b/src/main/java/com/ai/da/mapper/primary/entity/Workspace.java similarity index 92% rename from src/main/java/com/ai/da/mapper/entity/Workspace.java rename to src/main/java/com/ai/da/mapper/primary/entity/Workspace.java index 16e520a1..5fcc49cc 100644 --- a/src/main/java/com/ai/da/mapper/entity/Workspace.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Workspace.java @@ -1,17 +1,14 @@ -package com.ai.da.mapper.entity; +package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.*; import java.time.LocalDateTime; import java.io.Serializable; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.springframework.format.annotation.DateTimeFormat; /** * 实体类 diff --git a/src/main/java/com/ai/da/mapper/secondary/FemaleDressMapper.java b/src/main/java/com/ai/da/mapper/secondary/FemaleDressMapper.java new file mode 100644 index 00000000..4f63c7a7 --- /dev/null +++ b/src/main/java/com/ai/da/mapper/secondary/FemaleDressMapper.java @@ -0,0 +1,16 @@ +package com.ai.da.mapper.secondary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.secondary.entity.FemaleDress; + +/** + * Mapper 接口 + * + * @author easy-generator + * @since 2022-06-13 + */ +public interface FemaleDressMapper extends CommonMapper { + + + +} diff --git a/src/main/java/com/ai/da/mapper/secondary/entity/FemaleDress.java b/src/main/java/com/ai/da/mapper/secondary/entity/FemaleDress.java new file mode 100644 index 00000000..7c64bd9f --- /dev/null +++ b/src/main/java/com/ai/da/mapper/secondary/entity/FemaleDress.java @@ -0,0 +1,25 @@ +package com.ai.da.mapper.secondary.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("female_dress") +public class FemaleDress implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + private String imgName; +} \ No newline at end of file diff --git a/src/main/java/com/ai/da/model/dto/AccountTrialDTO.java b/src/main/java/com/ai/da/model/dto/AccountTrialDTO.java index 49d59692..700426a2 100644 --- a/src/main/java/com/ai/da/model/dto/AccountTrialDTO.java +++ b/src/main/java/com/ai/da/model/dto/AccountTrialDTO.java @@ -1,8 +1,7 @@ package com.ai.da.model.dto; -import com.ai.da.mapper.entity.TrialOrder; +import com.ai.da.mapper.primary.entity.TrialOrder; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/ai/da/model/dto/ClassificationDTO.java b/src/main/java/com/ai/da/model/dto/ClassificationDTO.java index 22abc61d..8a24260c 100644 --- a/src/main/java/com/ai/da/model/dto/ClassificationDTO.java +++ b/src/main/java/com/ai/da/model/dto/ClassificationDTO.java @@ -1,6 +1,6 @@ package com.ai.da.model.dto; -import com.ai.da.mapper.entity.Classification; +import com.ai.da.mapper.primary.entity.Classification; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; 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 68c33673..4ffe191c 100644 --- a/src/main/java/com/ai/da/model/dto/WorkspaceDTO.java +++ b/src/main/java/com/ai/da/model/dto/WorkspaceDTO.java @@ -1,7 +1,6 @@ package com.ai.da.model.dto; -import com.ai.da.mapper.entity.Workspace; import com.ai.da.model.vo.PageQueryBaseVo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/ai/da/model/vo/ChatRobotVO.java b/src/main/java/com/ai/da/model/vo/ChatRobotVO.java index 9ef86aa7..05b2ee43 100644 --- a/src/main/java/com/ai/da/model/vo/ChatRobotVO.java +++ b/src/main/java/com/ai/da/model/vo/ChatRobotVO.java @@ -1,6 +1,6 @@ package com.ai.da.model.vo; -import com.ai.da.mapper.entity.ChatRobot; +import com.ai.da.mapper.primary.entity.ChatRobot; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/ai/da/model/vo/ClassificationVO.java b/src/main/java/com/ai/da/model/vo/ClassificationVO.java index 88506041..1bb7062a 100644 --- a/src/main/java/com/ai/da/model/vo/ClassificationVO.java +++ b/src/main/java/com/ai/da/model/vo/ClassificationVO.java @@ -1,6 +1,6 @@ package com.ai.da.model.vo; -import com.ai.da.mapper.entity.Classification; +import com.ai.da.mapper.primary.entity.Classification; import lombok.Data; import lombok.EqualsAndHashCode; 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 028e7ba8..72c28642 100644 --- a/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitDetailVO.java +++ b/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitDetailVO.java @@ -1,7 +1,7 @@ package com.ai.da.model.vo; -import com.ai.da.mapper.entity.TDesignPythonOutfitDetail; +import com.ai.da.mapper.primary.entity.TDesignPythonOutfitDetail; import lombok.Data; import lombok.EqualsAndHashCode; import io.swagger.annotations.ApiModel; 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 8afb8629..065d963b 100644 --- a/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitVO.java +++ b/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitVO.java @@ -2,7 +2,7 @@ package com.ai.da.model.vo; -import com.ai.da.mapper.entity.TDesignPythonOutfit; +import com.ai.da.mapper.primary.entity.TDesignPythonOutfit; import lombok.Data; import lombok.EqualsAndHashCode; import io.swagger.annotations.ApiModel; 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 cceef691..563c4ab1 100644 --- a/src/main/java/com/ai/da/model/vo/ValidateElementVO.java +++ b/src/main/java/com/ai/da/model/vo/ValidateElementVO.java @@ -1,6 +1,6 @@ package com.ai.da.model.vo; -import com.ai.da.mapper.entity.CollectionElement; +import com.ai.da.mapper.primary.entity.CollectionElement; import com.ai.da.model.dto.CollectionColorDTO; import com.ai.da.python.vo.DesignPythonItemPrint; import com.google.common.collect.Lists; diff --git a/src/main/java/com/ai/da/model/vo/WorkspaceVO.java b/src/main/java/com/ai/da/model/vo/WorkspaceVO.java index 209563f2..378014d9 100644 --- a/src/main/java/com/ai/da/model/vo/WorkspaceVO.java +++ b/src/main/java/com/ai/da/model/vo/WorkspaceVO.java @@ -2,12 +2,8 @@ package com.ai.da.model.vo; import com.ai.da.common.response.PageBaseResponse; -import com.ai.da.mapper.entity.Workspace; +import com.ai.da.mapper.primary.entity.Workspace; import com.ai.da.model.enums.BizJson; -import com.ai.da.model.enums.FemalePosition; -import com.ai.da.model.enums.Position; -import com.ai.da.model.enums.Sex; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 578de9ef..afe992a4 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -6,8 +6,8 @@ import com.ai.da.common.config.FileProperties; import com.ai.da.common.config.exception.BusinessException; import com.ai.da.common.enums.*; import com.ai.da.common.utils.*; -import com.ai.da.mapper.entity.CollectionElement; -import com.ai.da.mapper.entity.DesignHistory; +import com.ai.da.mapper.primary.entity.CollectionElement; +import com.ai.da.mapper.primary.entity.DesignHistory; import com.ai.da.model.dto.*; import com.ai.da.model.enums.MalePosition; import com.ai.da.model.enums.Sex; @@ -23,7 +23,6 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.netty.util.internal.StringUtil; import lombok.extern.slf4j.Slf4j; import okhttp3.*; import org.springframework.beans.factory.annotation.Value; 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 22563da6..af5fa3be 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonObjects.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonObjects.java @@ -1,6 +1,6 @@ package com.ai.da.python.vo; -import com.ai.da.mapper.entity.Library; +import com.ai.da.mapper.primary.entity.Library; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/ai/da/service/AccountLoginLogService.java b/src/main/java/com/ai/da/service/AccountLoginLogService.java index 773f49a5..575f5e69 100644 --- a/src/main/java/com/ai/da/service/AccountLoginLogService.java +++ b/src/main/java/com/ai/da/service/AccountLoginLogService.java @@ -1,8 +1,6 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.AccountLoginLog; -import com.ai.da.model.dto.EmailSendDTO; -import com.ai.da.model.dto.NoteSendDTO; +import com.ai.da.mapper.primary.entity.AccountLoginLog; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/src/main/java/com/ai/da/service/AccountService.java b/src/main/java/com/ai/da/service/AccountService.java index 86293174..8df6b601 100644 --- a/src/main/java/com/ai/da/service/AccountService.java +++ b/src/main/java/com/ai/da/service/AccountService.java @@ -1,17 +1,15 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.Account; -import com.ai.da.mapper.entity.TrialOrder; +import com.ai.da.mapper.primary.entity.Account; +import com.ai.da.mapper.primary.entity.TrialOrder; +import com.ai.da.mapper.secondary.entity.FemaleDress; import com.ai.da.model.dto.*; -import com.ai.da.model.enums.Language; import com.ai.da.model.vo.AccountLoginVO; import com.ai.da.model.vo.AccountPreLoginVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import org.springframework.web.bind.annotation.RequestBody; import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; import java.util.List; /** @@ -127,4 +125,6 @@ public interface AccountService extends IService { String addNoLoginRequiredNew(NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request); Boolean deleteNoLoginRequiredNew(NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request); + + FemaleDress test(); } diff --git a/src/main/java/com/ai/da/service/ChatRobotService.java b/src/main/java/com/ai/da/service/ChatRobotService.java index a48efc00..1deaa19d 100644 --- a/src/main/java/com/ai/da/service/ChatRobotService.java +++ b/src/main/java/com/ai/da/service/ChatRobotService.java @@ -1,12 +1,10 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.Library; +import com.ai.da.mapper.primary.entity.Library; import com.ai.da.model.dto.ChatFlushDTO; import com.ai.da.model.dto.ChatRobotLibraryDTO; import com.ai.da.model.dto.ChatSendDTO; -import com.ai.da.model.vo.ChatRobotLibraryVO; import com.ai.da.model.vo.ChatRobotVO; -import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; import java.math.BigDecimal; diff --git a/src/main/java/com/ai/da/service/ClassificationService.java b/src/main/java/com/ai/da/service/ClassificationService.java index 2cdbe5de..c68db66b 100644 --- a/src/main/java/com/ai/da/service/ClassificationService.java +++ b/src/main/java/com/ai/da/service/ClassificationService.java @@ -1,15 +1,9 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.Classification; -import com.ai.da.mapper.entity.Library; -import com.ai.da.model.dto.ChatFlushDTO; -import com.ai.da.model.dto.ChatRobotLibraryDTO; -import com.ai.da.model.dto.ChatSendDTO; +import com.ai.da.mapper.primary.entity.Classification; import com.ai.da.model.dto.ClassificationDTO; -import com.ai.da.model.vo.ChatRobotVO; import com.ai.da.model.vo.ClassificationVO; -import java.math.BigDecimal; import java.util.List; /** diff --git a/src/main/java/com/ai/da/service/CollectionElementService.java b/src/main/java/com/ai/da/service/CollectionElementService.java index a32b3b75..489e08f8 100644 --- a/src/main/java/com/ai/da/service/CollectionElementService.java +++ b/src/main/java/com/ai/da/service/CollectionElementService.java @@ -1,7 +1,7 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.CollectionElement; -import com.ai.da.mapper.entity.LibraryModelPoint; +import com.ai.da.mapper.primary.entity.CollectionElement; +import com.ai.da.mapper.primary.entity.LibraryModelPoint; import com.ai.da.model.dto.*; import com.ai.da.model.vo.*; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/src/main/java/com/ai/da/service/CollectionService.java b/src/main/java/com/ai/da/service/CollectionService.java index 5efe520d..919ebf4f 100644 --- a/src/main/java/com/ai/da/service/CollectionService.java +++ b/src/main/java/com/ai/da/service/CollectionService.java @@ -1,17 +1,9 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.Collection; -import com.ai.da.mapper.entity.CollectionElement; -import com.ai.da.model.dto.CollectionElementUploadDTO; -import com.ai.da.model.dto.CollectionGeneratePrintDTO; -import com.ai.da.model.dto.CollectionSavePrintDTO; -import com.ai.da.model.vo.CollectionElementVO; -import com.ai.da.model.vo.CollectionGeneratePrintVO; +import com.ai.da.mapper.primary.entity.Collection; import com.ai.da.model.vo.UserLikeCollectionVO; import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - /** * 服务类 * diff --git a/src/main/java/com/ai/da/service/ColorLoopUpTableService.java b/src/main/java/com/ai/da/service/ColorLoopUpTableService.java index 3d9721f4..833b93ed 100644 --- a/src/main/java/com/ai/da/service/ColorLoopUpTableService.java +++ b/src/main/java/com/ai/da/service/ColorLoopUpTableService.java @@ -1,7 +1,6 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.ColorLookupTable; -import com.ai.da.mapper.entity.PanTone; +import com.ai.da.mapper.primary.entity.ColorLookupTable; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/src/main/java/com/ai/da/service/DesignHistoryService.java b/src/main/java/com/ai/da/service/DesignHistoryService.java index 249bc2c2..80235cf3 100644 --- a/src/main/java/com/ai/da/service/DesignHistoryService.java +++ b/src/main/java/com/ai/da/service/DesignHistoryService.java @@ -1,7 +1,6 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.DesignHistory; -import com.ai.da.mapper.entity.Library; +import com.ai.da.mapper.primary.entity.DesignHistory; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/src/main/java/com/ai/da/service/DesignItemDetailPrintService.java b/src/main/java/com/ai/da/service/DesignItemDetailPrintService.java index a8a33cc4..9e8b0b3d 100644 --- a/src/main/java/com/ai/da/service/DesignItemDetailPrintService.java +++ b/src/main/java/com/ai/da/service/DesignItemDetailPrintService.java @@ -1,6 +1,6 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.DesignItemDetailPrint; +import com.ai.da.mapper.primary.entity.DesignItemDetailPrint; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/src/main/java/com/ai/da/service/DesignItemDetailService.java b/src/main/java/com/ai/da/service/DesignItemDetailService.java index 1f5663b5..77836af0 100644 --- a/src/main/java/com/ai/da/service/DesignItemDetailService.java +++ b/src/main/java/com/ai/da/service/DesignItemDetailService.java @@ -1,8 +1,7 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.DesignItemDetail; +import com.ai.da.mapper.primary.entity.DesignItemDetail; import com.baomidou.mybatisplus.extension.service.IService; -import sun.security.krb5.internal.crypto.Des; import java.util.List; diff --git a/src/main/java/com/ai/da/service/DesignItemService.java b/src/main/java/com/ai/da/service/DesignItemService.java index 26163bf1..26e87015 100644 --- a/src/main/java/com/ai/da/service/DesignItemService.java +++ b/src/main/java/com/ai/da/service/DesignItemService.java @@ -1,6 +1,6 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.DesignItem; +import com.ai.da.mapper.primary.entity.DesignItem; import com.ai.da.model.dto.DesignSingleDTO; import com.ai.da.model.dto.DesignSingleIncludeLayersDTO; import com.ai.da.model.vo.*; diff --git a/src/main/java/com/ai/da/service/DesignService.java b/src/main/java/com/ai/da/service/DesignService.java index bbca6f7f..839ce443 100644 --- a/src/main/java/com/ai/da/service/DesignService.java +++ b/src/main/java/com/ai/da/service/DesignService.java @@ -1,13 +1,12 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.Design; +import com.ai.da.mapper.primary.entity.Design; import com.ai.da.model.dto.*; import com.ai.da.model.vo.CollectionSketchVO; import com.ai.da.model.vo.DesignCollectionVO; import com.ai.da.model.vo.DesignItemDetailVO; import com.ai.da.model.vo.DesignLikeVO; import com.ai.da.python.vo.DesignPythonObjects; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; import java.math.BigDecimal; diff --git a/src/main/java/com/ai/da/service/GenerateService.java b/src/main/java/com/ai/da/service/GenerateService.java index 0d92a07f..762ffbe9 100644 --- a/src/main/java/com/ai/da/service/GenerateService.java +++ b/src/main/java/com/ai/da/service/GenerateService.java @@ -1,7 +1,7 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.Generate; -import com.ai.da.mapper.entity.GenerateDetail; +import com.ai.da.mapper.primary.entity.Generate; +import com.ai.da.mapper.primary.entity.GenerateDetail; import com.ai.da.model.dto.GenerateLikeDTO; import com.ai.da.model.dto.GenerateThroughImageTextDTO; import com.ai.da.model.vo.GenerateCaptionVO; diff --git a/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java b/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java index e5296840..c11bb759 100644 --- a/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java +++ b/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java @@ -1,7 +1,7 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.TDesignPythonOutfitDetail; +import com.ai.da.mapper.primary.entity.TDesignPythonOutfitDetail; import com.ai.da.model.vo.DesignPythonOutfitVO; import com.ai.da.model.vo.TDesignPythonOutfitDetailVO; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/src/main/java/com/ai/da/service/ITDesignPythonOutfitService.java b/src/main/java/com/ai/da/service/ITDesignPythonOutfitService.java index ab98f0ab..a6b5b749 100644 --- a/src/main/java/com/ai/da/service/ITDesignPythonOutfitService.java +++ b/src/main/java/com/ai/da/service/ITDesignPythonOutfitService.java @@ -1,6 +1,6 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.TDesignPythonOutfit; +import com.ai.da.mapper.primary.entity.TDesignPythonOutfit; import com.ai.da.model.vo.TDesignPythonOutfitVO; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/src/main/java/com/ai/da/service/LibraryModelPointService.java b/src/main/java/com/ai/da/service/LibraryModelPointService.java index 24dc3331..adeb61d5 100644 --- a/src/main/java/com/ai/da/service/LibraryModelPointService.java +++ b/src/main/java/com/ai/da/service/LibraryModelPointService.java @@ -1,13 +1,10 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.LibraryModelPoint; -import com.ai.da.model.dto.DesignSingleDTO; +import com.ai.da.mapper.primary.entity.LibraryModelPoint; import com.ai.da.model.dto.LibraryModelPointDTO; import com.ai.da.model.dto.ModelsDotDTO; import com.ai.da.model.vo.LibraryModelPointVO; -import com.ai.da.model.vo.LibraryUpdateVo; import com.baomidou.mybatisplus.extension.service.IService; -import org.springframework.web.bind.annotation.RequestBody; import java.util.List; diff --git a/src/main/java/com/ai/da/service/LibraryService.java b/src/main/java/com/ai/da/service/LibraryService.java index 7ae5fc4a..440a9577 100644 --- a/src/main/java/com/ai/da/service/LibraryService.java +++ b/src/main/java/com/ai/da/service/LibraryService.java @@ -1,17 +1,13 @@ package com.ai.da.service; import com.ai.da.common.response.PageBaseResponse; -import com.ai.da.mapper.entity.Library; -import com.ai.da.mapper.entity.UserLike; +import com.ai.da.mapper.primary.entity.Library; import com.ai.da.model.dto.*; -import com.ai.da.model.vo.CollectionElementVO; import com.ai.da.model.vo.LibraryUpdateVo; import com.ai.da.model.vo.LibraryVo; import com.ai.da.model.vo.QueryLibraryPageVO; import com.baomidou.mybatisplus.extension.service.IService; -import org.springframework.web.bind.annotation.RequestBody; -import javax.validation.Valid; import java.util.List; /** diff --git a/src/main/java/com/ai/da/service/PanToneService.java b/src/main/java/com/ai/da/service/PanToneService.java index 77effded..344ff885 100644 --- a/src/main/java/com/ai/da/service/PanToneService.java +++ b/src/main/java/com/ai/da/service/PanToneService.java @@ -1,6 +1,6 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.PanTone; +import com.ai.da.mapper.primary.entity.PanTone; import com.ai.da.model.dto.GetRgbByHsvBatchDTO; import com.ai.da.model.vo.PantoneVO; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/src/main/java/com/ai/da/service/PythonTAllInfoService.java b/src/main/java/com/ai/da/service/PythonTAllInfoService.java index 904aed88..8fd59225 100644 --- a/src/main/java/com/ai/da/service/PythonTAllInfoService.java +++ b/src/main/java/com/ai/da/service/PythonTAllInfoService.java @@ -1,7 +1,7 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.PythonTAllInfo; +import com.ai.da.mapper.primary.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 0cef4818..d7d1a454 100644 --- a/src/main/java/com/ai/da/service/SysFileService.java +++ b/src/main/java/com/ai/da/service/SysFileService.java @@ -1,6 +1,6 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.SysFile; +import com.ai.da.mapper.primary.entity.SysFile; import com.ai.da.model.vo.SysFileVO; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/src/main/java/com/ai/da/service/TCollectionElementRelationService.java b/src/main/java/com/ai/da/service/TCollectionElementRelationService.java index 860618ab..20bead1e 100644 --- a/src/main/java/com/ai/da/service/TCollectionElementRelationService.java +++ b/src/main/java/com/ai/da/service/TCollectionElementRelationService.java @@ -1,6 +1,6 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.TCollectionElementRelation; +import com.ai.da.mapper.primary.entity.TCollectionElementRelation; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/src/main/java/com/ai/da/service/UserLikeGroupService.java b/src/main/java/com/ai/da/service/UserLikeGroupService.java index 5ec308fd..dd4d7c86 100644 --- a/src/main/java/com/ai/da/service/UserLikeGroupService.java +++ b/src/main/java/com/ai/da/service/UserLikeGroupService.java @@ -1,14 +1,9 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.UserLikeGroup; +import com.ai.da.mapper.primary.entity.UserLikeGroup; import com.ai.da.model.vo.HistoryUpdateVO; import com.ai.da.model.vo.UserLikeChooseVO; -import com.ai.da.model.vo.UserLikeGroupVO; import com.baomidou.mybatisplus.extension.service.IService; -import io.swagger.annotations.ApiParam; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; /** * 服务类 diff --git a/src/main/java/com/ai/da/service/UserLikeService.java b/src/main/java/com/ai/da/service/UserLikeService.java index 6bb3bc01..510d1e0c 100644 --- a/src/main/java/com/ai/da/service/UserLikeService.java +++ b/src/main/java/com/ai/da/service/UserLikeService.java @@ -1,6 +1,6 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.UserLike; +import com.ai.da.mapper.primary.entity.UserLike; import com.ai.da.model.vo.UserLikeVO; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/src/main/java/com/ai/da/service/WorkspaceService.java b/src/main/java/com/ai/da/service/WorkspaceService.java index 324ceeed..17a66f29 100644 --- a/src/main/java/com/ai/da/service/WorkspaceService.java +++ b/src/main/java/com/ai/da/service/WorkspaceService.java @@ -1,7 +1,7 @@ package com.ai.da.service; -import com.ai.da.mapper.entity.Workspace; +import com.ai.da.mapper.primary.entity.Workspace; import com.ai.da.model.dto.WorkspaceDTO; import com.ai.da.model.enums.BizJson; import com.ai.da.model.vo.ModelsVO; @@ -9,7 +9,6 @@ import com.ai.da.model.vo.WorkspaceVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import javax.servlet.http.HttpServletRequest; import java.io.FileNotFoundException; import java.util.List; 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 f7b80773..e5c24f73 100644 --- a/src/main/java/com/ai/da/service/impl/AccountLoginLogServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountLoginLogServiceImpl.java @@ -1,7 +1,7 @@ package com.ai.da.service.impl; -import com.ai.da.mapper.AccountLoginLogMapper; -import com.ai.da.mapper.entity.AccountLoginLog; +import com.ai.da.mapper.primary.AccountLoginLogMapper; +import com.ai.da.mapper.primary.entity.AccountLoginLog; import com.ai.da.service.AccountLoginLogService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 97ad6bc6..446186c6 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -8,13 +8,13 @@ import com.ai.da.common.enums.AuthenticationOperationTypeEnum; import com.ai.da.common.response.ResultEnum; import com.ai.da.common.security.jwt.JWTTokenHelper; import com.ai.da.common.utils.*; -import com.ai.da.mapper.AccountMapper; -import com.ai.da.mapper.LibraryMapper; -import com.ai.da.mapper.TrialOrderMapper; -import com.ai.da.mapper.UserLikeGroupMapper; -import com.ai.da.mapper.entity.Account; -import com.ai.da.mapper.entity.AccountLoginLog; -import com.ai.da.mapper.entity.TrialOrder; +import com.ai.da.mapper.primary.AccountMapper; +import com.ai.da.mapper.primary.TrialOrderMapper; +import com.ai.da.mapper.primary.entity.Account; +import com.ai.da.mapper.primary.entity.AccountLoginLog; +import com.ai.da.mapper.primary.entity.TrialOrder; +import com.ai.da.mapper.secondary.FemaleDressMapper; +import com.ai.da.mapper.secondary.entity.FemaleDress; import com.ai.da.model.dto.*; import com.ai.da.model.enums.AutoApproved; import com.ai.da.model.enums.Language; @@ -32,7 +32,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.checkerframework.checker.units.qual.A; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; @@ -834,4 +834,11 @@ public class AccountServiceImpl extends ServiceImpl impl } return Boolean.TRUE; } + + @Resource + private FemaleDressMapper femaleDressMapper; + @Override + public FemaleDress test() { + return femaleDressMapper.selectById(33056); + } } 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 5f06a194..fb56d871 100644 --- a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java @@ -9,10 +9,10 @@ import com.ai.da.common.enums.LibraryLevel1TypeEnum; import com.ai.da.common.utils.CopyUtil; import com.ai.da.common.utils.MD5Utils; import com.ai.da.common.utils.MinioUtil; -import com.ai.da.mapper.LibraryMapper; -import com.ai.da.mapper.entity.ChatRobot; -import com.ai.da.mapper.ChatRobotMapper; -import com.ai.da.mapper.entity.Library; +import com.ai.da.mapper.primary.LibraryMapper; +import com.ai.da.mapper.primary.entity.ChatRobot; +import com.ai.da.mapper.primary.ChatRobotMapper; +import com.ai.da.mapper.primary.entity.Library; import com.ai.da.model.dto.ChatFlushDTO; import com.ai.da.model.dto.ChatRobotLibraryDTO; import com.ai.da.model.dto.ChatSendDTO; diff --git a/src/main/java/com/ai/da/service/impl/ClassificationServiceImpl.java b/src/main/java/com/ai/da/service/impl/ClassificationServiceImpl.java index 089052d1..1cd31f03 100644 --- a/src/main/java/com/ai/da/service/impl/ClassificationServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ClassificationServiceImpl.java @@ -8,10 +8,10 @@ import com.ai.da.common.config.exception.BusinessException; import com.ai.da.common.context.UserContext; import com.ai.da.common.response.ResultEnum; import com.ai.da.common.utils.CopyUtil; -import com.ai.da.mapper.ClassificationMapper; -import com.ai.da.mapper.ClassificationRelLibraryMapper; -import com.ai.da.mapper.entity.Classification; -import com.ai.da.mapper.entity.ClassificationRelLibrary; +import com.ai.da.mapper.primary.ClassificationMapper; +import com.ai.da.mapper.primary.ClassificationRelLibraryMapper; +import com.ai.da.mapper.primary.entity.Classification; +import com.ai.da.mapper.primary.entity.ClassificationRelLibrary; import com.ai.da.model.dto.ClassificationDTO; import com.ai.da.model.vo.AuthPrincipalVo; import com.ai.da.model.vo.ClassificationVO; 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 1c6307d9..5b9d3710 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -7,9 +7,9 @@ import com.ai.da.common.context.UserContext; import com.ai.da.common.enums.*; import com.ai.da.common.response.ResultEnum; import com.ai.da.common.utils.*; -import com.ai.da.mapper.CollectionElementMapper; -import com.ai.da.mapper.GenerateDetailMapper; -import com.ai.da.mapper.entity.*; +import com.ai.da.mapper.primary.CollectionElementMapper; +import com.ai.da.mapper.primary.GenerateDetailMapper; +import com.ai.da.mapper.primary.entity.*; import com.ai.da.model.dto.*; import com.ai.da.model.enums.ModelType; import com.ai.da.model.enums.Sex; diff --git a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java index 5a20b7de..6b911d49 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java @@ -6,9 +6,9 @@ import com.ai.da.common.enums.DesignTypeEnum; import com.ai.da.common.utils.CopyUtil; import com.ai.da.common.utils.DateUtil; import com.ai.da.common.utils.MinioUtil; -import com.ai.da.mapper.CollectionMapper; -import com.ai.da.mapper.entity.Collection; -import com.ai.da.mapper.entity.CollectionElement; +import com.ai.da.mapper.primary.CollectionMapper; +import com.ai.da.mapper.primary.entity.Collection; +import com.ai.da.mapper.primary.entity.CollectionElement; import com.ai.da.model.vo.CollectionColorVO; import com.ai.da.model.vo.CollectionElementVO; import com.ai.da.model.vo.UserLikeCollectionVO; diff --git a/src/main/java/com/ai/da/service/impl/ColorLoopUpTableServiceImpl.java b/src/main/java/com/ai/da/service/impl/ColorLoopUpTableServiceImpl.java index 74aa581d..171f5c08 100644 --- a/src/main/java/com/ai/da/service/impl/ColorLoopUpTableServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ColorLoopUpTableServiceImpl.java @@ -1,7 +1,7 @@ package com.ai.da.service.impl; -import com.ai.da.mapper.ColorLoopUpTableMapper; -import com.ai.da.mapper.entity.ColorLookupTable; +import com.ai.da.mapper.primary.ColorLoopUpTableMapper; +import com.ai.da.mapper.primary.entity.ColorLookupTable; import com.ai.da.service.ColorLoopUpTableService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/src/main/java/com/ai/da/service/impl/DesignHistoryServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignHistoryServiceImpl.java index 8532c905..8937556f 100644 --- a/src/main/java/com/ai/da/service/impl/DesignHistoryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignHistoryServiceImpl.java @@ -1,7 +1,7 @@ package com.ai.da.service.impl; -import com.ai.da.mapper.DesignHistoryMapper; -import com.ai.da.mapper.entity.DesignHistory; +import com.ai.da.mapper.primary.DesignHistoryMapper; +import com.ai.da.mapper.primary.entity.DesignHistory; import com.ai.da.service.DesignHistoryService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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 189bca2e..1489c11a 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemDetailPrintServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemDetailPrintServiceImpl.java @@ -1,8 +1,7 @@ package com.ai.da.service.impl; -import com.ai.da.mapper.DesignItemDetailPrintMapper; -import com.ai.da.mapper.entity.DesignItemDetailPrint; -import com.ai.da.mapper.entity.TDesignPythonOutfitDetail; +import com.ai.da.mapper.primary.DesignItemDetailPrintMapper; +import com.ai.da.mapper.primary.entity.DesignItemDetailPrint; import com.ai.da.service.DesignItemDetailPrintService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.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 30ff7c1b..e35c0ea3 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemDetailServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemDetailServiceImpl.java @@ -2,8 +2,8 @@ package com.ai.da.service.impl; import com.ai.da.common.config.exception.BusinessException; import com.ai.da.common.enums.LayersPriorityEnum; -import com.ai.da.mapper.DesignItemDetailMapper; -import com.ai.da.mapper.entity.DesignItemDetail; +import com.ai.da.mapper.primary.DesignItemDetailMapper; +import com.ai.da.mapper.primary.entity.DesignItemDetail; import com.ai.da.service.DesignItemDetailService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; 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 7b8853ca..64bc25d4 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -9,8 +9,8 @@ import com.ai.da.common.enums.SysFileLevel2TypeEnum; import com.ai.da.common.utils.CopyUtil; import com.ai.da.common.utils.DateUtil; import com.ai.da.common.utils.MinioUtil; -import com.ai.da.mapper.DesignItemMapper; -import com.ai.da.mapper.entity.*; +import com.ai.da.mapper.primary.DesignItemMapper; +import com.ai.da.mapper.primary.entity.*; import com.ai.da.model.dto.*; import com.ai.da.model.enums.ModelType; import com.ai.da.model.vo.*; 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 d24874c2..783b2038 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -7,11 +7,11 @@ import com.ai.da.common.config.exception.BusinessException; import com.ai.da.common.context.UserContext; import com.ai.da.common.enums.*; import com.ai.da.common.utils.*; -import com.ai.da.mapper.DesignMapper; -import com.ai.da.mapper.GenerateDetailMapper; -import com.ai.da.mapper.TDesignPythonOutfitMapper; -import com.ai.da.mapper.entity.*; -import com.ai.da.mapper.entity.Collection; +import com.ai.da.mapper.primary.DesignMapper; +import com.ai.da.mapper.primary.GenerateDetailMapper; +import com.ai.da.mapper.primary.TDesignPythonOutfitMapper; +import com.ai.da.mapper.primary.entity.*; +import com.ai.da.mapper.primary.entity.Collection; import com.ai.da.model.dto.*; import com.ai.da.model.vo.*; import com.ai.da.python.PythonService; @@ -43,7 +43,6 @@ import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.ai.da.common.enums.LayersPriorityEnum.BODY; import static com.ai.da.python.vo.DesignPythonItem.*; /** 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 1b10420f..05f59ef2 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -7,10 +7,10 @@ import com.ai.da.common.enums.ModelNameEnum; import com.ai.da.common.utils.DateUtil; import com.ai.da.common.utils.MD5Utils; import com.ai.da.common.utils.MinioUtil; -import com.ai.da.mapper.CollectionElementMapper; -import com.ai.da.mapper.GenerateDetailMapper; -import com.ai.da.mapper.GenerateMapper; -import com.ai.da.mapper.entity.*; +import com.ai.da.mapper.primary.CollectionElementMapper; +import com.ai.da.mapper.primary.GenerateDetailMapper; +import com.ai.da.mapper.primary.GenerateMapper; +import com.ai.da.mapper.primary.entity.*; import com.ai.da.model.dto.GenerateLikeDTO; import com.ai.da.model.dto.GenerateThroughImageTextDTO; import com.ai.da.model.vo.*; 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 f8a33ca1..2f643368 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java @@ -5,8 +5,8 @@ import com.ai.da.common.config.exception.BusinessException; import com.ai.da.common.enums.SingleOverallEnum; import com.ai.da.common.utils.CopyUtil; import com.ai.da.common.utils.DateUtil; -import com.ai.da.mapper.LibraryModelPointMapper; -import com.ai.da.mapper.entity.*; +import com.ai.da.mapper.primary.LibraryModelPointMapper; +import com.ai.da.mapper.primary.entity.*; import com.ai.da.model.dto.LibraryModelPointDTO; import com.ai.da.model.dto.ModelsDotDTO; import com.ai.da.model.enums.ModelType; @@ -22,7 +22,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; -import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; 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 bde22e96..dbe6bd31 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -11,9 +11,9 @@ import com.ai.da.common.response.ResultEnum; import com.ai.da.common.utils.CopyUtil; import com.ai.da.common.utils.DateUtil; import com.ai.da.common.utils.MinioUtil; -import com.ai.da.mapper.LibraryMapper; -import com.ai.da.mapper.SysFileMapper; -import com.ai.da.mapper.entity.*; +import com.ai.da.mapper.primary.LibraryMapper; +import com.ai.da.mapper.primary.SysFileMapper; +import com.ai.da.mapper.primary.entity.*; import com.ai.da.model.dto.*; import com.ai.da.model.enums.*; import com.ai.da.model.vo.*; 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 04b02eef..83c3c3f9 100644 --- a/src/main/java/com/ai/da/service/impl/PanToneServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PanToneServiceImpl.java @@ -5,9 +5,9 @@ import com.ai.da.common.config.exception.BusinessException; import com.ai.da.common.response.ResultEnum; import com.ai.da.common.utils.CopyUtil; import com.ai.da.common.utils.PantoneUtils; -import com.ai.da.mapper.entity.ColorLookupTable; -import com.ai.da.mapper.entity.PanTone; -import com.ai.da.mapper.PanToneMapper; +import com.ai.da.mapper.primary.entity.ColorLookupTable; +import com.ai.da.mapper.primary.entity.PanTone; +import com.ai.da.mapper.primary.PanToneMapper; import com.ai.da.model.dto.GetRgbByHsvBatchDTO; import com.ai.da.model.vo.PantoneVO; import com.ai.da.service.ColorLoopUpTableService; @@ -17,7 +17,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import io.netty.util.internal.StringUtil; -import org.checkerframework.checker.units.qual.A; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/ai/da/service/impl/PythonTAllInfoServiceImpl.java b/src/main/java/com/ai/da/service/impl/PythonTAllInfoServiceImpl.java index 9364ecb1..03d003c3 100644 --- a/src/main/java/com/ai/da/service/impl/PythonTAllInfoServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PythonTAllInfoServiceImpl.java @@ -2,8 +2,8 @@ package com.ai.da.service.impl; import com.ai.da.common.config.exception.BusinessException; -import com.ai.da.mapper.PythonTAllInfoMapper; -import com.ai.da.mapper.entity.PythonTAllInfo; +import com.ai.da.mapper.primary.PythonTAllInfoMapper; +import com.ai.da.mapper.primary.entity.PythonTAllInfo; import com.ai.da.service.PythonTAllInfoService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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 ea2a0de3..2872409f 100644 --- a/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java @@ -6,8 +6,8 @@ import com.ai.da.common.config.exception.BusinessException; import com.ai.da.common.enums.SysFileLevel1TypeEnum; import com.ai.da.common.enums.SysFileLevel2TypeEnum; import com.ai.da.common.utils.*; -import com.ai.da.mapper.SysFileMapper; -import com.ai.da.mapper.entity.SysFile; +import com.ai.da.mapper.primary.SysFileMapper; +import com.ai.da.mapper.primary.entity.SysFile; import com.ai.da.model.vo.SysFileVO; import com.ai.da.service.SysFileService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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 22c2e0e4..e15aac6b 100644 --- a/src/main/java/com/ai/da/service/impl/TCollectionElementRelationServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/TCollectionElementRelationServiceImpl.java @@ -1,9 +1,7 @@ package com.ai.da.service.impl; -import com.ai.da.mapper.TCollectionElementRelationMapper; -import com.ai.da.mapper.UserLikeMapper; -import com.ai.da.mapper.entity.TCollectionElementRelation; -import com.ai.da.mapper.entity.UserLike; +import com.ai.da.mapper.primary.TCollectionElementRelationMapper; +import com.ai.da.mapper.primary.entity.TCollectionElementRelation; import com.ai.da.service.TCollectionElementRelationService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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 b24ba13e..a83b84d8 100644 --- a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java @@ -1,11 +1,10 @@ package com.ai.da.service.impl; -import cn.hutool.core.collection.CollectionUtil; import com.ai.da.common.enums.LayersPriorityEnum; import com.ai.da.common.utils.CopyUtil; import com.ai.da.common.utils.MinioUtil; -import com.ai.da.mapper.TDesignPythonOutfitDetailMapper; -import com.ai.da.mapper.entity.TDesignPythonOutfitDetail; +import com.ai.da.mapper.primary.TDesignPythonOutfitDetailMapper; +import com.ai.da.mapper.primary.entity.TDesignPythonOutfitDetail; import com.ai.da.model.vo.DesignPythonOutfitVO; import com.ai.da.model.vo.TDesignPythonOutfitDetailVO; import com.ai.da.service.ITDesignPythonOutfitDetailService; 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 59ddda04..fad8e6e7 100644 --- a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitServiceImpl.java @@ -1,7 +1,7 @@ package com.ai.da.service.impl; -import com.ai.da.mapper.TDesignPythonOutfitMapper; -import com.ai.da.mapper.entity.TDesignPythonOutfit; +import com.ai.da.mapper.primary.TDesignPythonOutfitMapper; +import com.ai.da.mapper.primary.entity.TDesignPythonOutfit; import com.ai.da.model.vo.TDesignPythonOutfitVO; import com.ai.da.service.ITDesignPythonOutfitService; import com.baomidou.mybatisplus.core.conditions.query.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 6749de7a..29d70e13 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -4,12 +4,10 @@ import cn.hutool.core.collection.CollectionUtil; import com.ai.da.common.config.exception.BusinessException; import com.ai.da.common.utils.DateUtil; import com.ai.da.common.utils.MinioUtil; -import com.ai.da.mapper.*; -import com.ai.da.mapper.entity.Design; -import com.ai.da.mapper.entity.TDesignPythonOutfit; -import com.ai.da.mapper.entity.UserLike; -import com.ai.da.mapper.entity.UserLikeGroup; -import com.ai.da.model.enums.ModelType; +import com.ai.da.mapper.primary.*; +import com.ai.da.mapper.primary.entity.TDesignPythonOutfit; +import com.ai.da.mapper.primary.entity.UserLike; +import com.ai.da.mapper.primary.entity.UserLikeGroup; import com.ai.da.model.vo.*; import com.ai.da.service.AccountService; import com.ai.da.service.CollectionService; diff --git a/src/main/java/com/ai/da/service/impl/UserLikeServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeServiceImpl.java index 9006479a..29b53710 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeServiceImpl.java @@ -2,10 +2,8 @@ package com.ai.da.service.impl; import com.ai.da.common.utils.CopyUtil; import com.ai.da.common.utils.DateUtil; -import com.ai.da.mapper.UserLikeMapper; -import com.ai.da.mapper.entity.Collection; -import com.ai.da.mapper.entity.DesignItem; -import com.ai.da.mapper.entity.UserLike; +import com.ai.da.mapper.primary.UserLikeMapper; +import com.ai.da.mapper.primary.entity.UserLike; import com.ai.da.model.vo.UserLikeVO; import com.ai.da.service.UserLikeService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,8 +17,6 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * 服务实现类 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 01f2064a..69574b35 100644 --- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java @@ -3,22 +3,18 @@ package com.ai.da.service.impl; import com.ai.da.common.config.exception.BusinessException; import com.ai.da.common.context.UserContext; import com.ai.da.common.enums.LibraryLevel1TypeEnum; -import com.ai.da.common.enums.SysFileLevel1TypeEnum; -import com.ai.da.common.enums.SysFileLevel2TypeEnum; import com.ai.da.common.response.PageBaseResponse; import com.ai.da.common.response.ResultEnum; import com.ai.da.common.utils.CopyUtil; import com.ai.da.common.utils.FileUtil; import com.ai.da.common.utils.MD5Utils; import com.ai.da.common.utils.MinioUtil; -import com.ai.da.mapper.LibraryMapper; -import com.ai.da.mapper.SysFileMapper; -import com.ai.da.mapper.UserLikeMapper; -import com.ai.da.mapper.WorkspaceMapper; -import com.ai.da.mapper.entity.Library; -import com.ai.da.mapper.entity.SysFile; -import com.ai.da.mapper.entity.UserLike; -import com.ai.da.mapper.entity.Workspace; +import com.ai.da.mapper.primary.LibraryMapper; +import com.ai.da.mapper.primary.SysFileMapper; +import com.ai.da.mapper.primary.WorkspaceMapper; +import com.ai.da.mapper.primary.entity.Library; +import com.ai.da.mapper.primary.entity.SysFile; +import com.ai.da.mapper.primary.entity.Workspace; import com.ai.da.model.dto.WorkspaceDTO; import com.ai.da.model.enums.*; import com.ai.da.model.vo.AuthPrincipalVo; @@ -35,7 +31,6 @@ import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; @@ -47,7 +42,6 @@ import java.nio.file.Files; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 4c401b7d..4e2bb172 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -7,12 +7,12 @@ server.port=5567 #spring.datasource.password=123456 #spring.datasource.password=QWa998345 spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.primary.url=jdbc:mysql://18.167.251.121:33008/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +spring.datasource.primary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true spring.datasource.primary.username=aida_con spring.datasource.primary.password=123456 spring.datasource.secondary.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.secondary.url=jdbc:mysql://18.167.251.121:33008/attribute_retrieval?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +spring.datasource.secondary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/attribute_retrieval?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true spring.datasource.secondary.username=aida_con spring.datasource.secondary.password=123456 @@ -34,7 +34,8 @@ rsa.private_key=MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8 #mybatis mybatis-plus.global-config.banner=false -mybatis-plus.mapper-locations=classpath:mapper/*Mapper.xml +#mybatis-plus.mapper-locations=classpath:mapper/secondary/*.xml +mybatis-plus.mapper-locations=classpath:mapper/*/*.xml #mybatis-plus.configuration.log-impl= org.apache.ibatis.logging.stdout.StdOutImpl mybatis-plus.global-config.db-config.logic-delete-field=isDeleted mybatis-plus.global-config.db-config.logic-delete-value=1 diff --git a/src/main/resources/mapper/AccountMapper.xml b/src/main/resources/mapper/primary/AccountMapper.xml similarity index 75% rename from src/main/resources/mapper/AccountMapper.xml rename to src/main/resources/mapper/primary/AccountMapper.xml index 2e2bd6b6..d38f734a 100644 --- a/src/main/resources/mapper/AccountMapper.xml +++ b/src/main/resources/mapper/primary/AccountMapper.xml @@ -1,27 +1,27 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/ChatRobotMapper.xml b/src/main/resources/mapper/primary/ChatRobotMapper.xml similarity index 85% rename from src/main/resources/mapper/ChatRobotMapper.xml rename to src/main/resources/mapper/primary/ChatRobotMapper.xml index 5a379683..0dc78d00 100644 --- a/src/main/resources/mapper/ChatRobotMapper.xml +++ b/src/main/resources/mapper/primary/ChatRobotMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/main/resources/mapper/ClassificationMapper.xml b/src/main/resources/mapper/primary/ClassificationMapper.xml similarity index 81% rename from src/main/resources/mapper/ClassificationMapper.xml rename to src/main/resources/mapper/primary/ClassificationMapper.xml index 20ea5ce1..689bbc7a 100644 --- a/src/main/resources/mapper/ClassificationMapper.xml +++ b/src/main/resources/mapper/primary/ClassificationMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/main/resources/mapper/ClassificationRelLibraryMapper.xml b/src/main/resources/mapper/primary/ClassificationRelLibraryMapper.xml similarity index 78% rename from src/main/resources/mapper/ClassificationRelLibraryMapper.xml rename to src/main/resources/mapper/primary/ClassificationRelLibraryMapper.xml index 3db8b654..2ffa0dd4 100644 --- a/src/main/resources/mapper/ClassificationRelLibraryMapper.xml +++ b/src/main/resources/mapper/primary/ClassificationRelLibraryMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/main/resources/mapper/CollectionMapper.xml b/src/main/resources/mapper/primary/CollectionMapper.xml similarity index 66% rename from src/main/resources/mapper/CollectionMapper.xml rename to src/main/resources/mapper/primary/CollectionMapper.xml index 3dddf4ec..055fb4be 100644 --- a/src/main/resources/mapper/CollectionMapper.xml +++ b/src/main/resources/mapper/primary/CollectionMapper.xml @@ -1,21 +1,21 @@ - - - - - - - - - - - - - - insert into t_collection - (account_id,create_date) - values( - #{accountId}, - #{createDate}); - - - + + + + + + + + + + + + + + insert into t_collection + (account_id,create_date) + values( + #{accountId}, + #{createDate}); + + + diff --git a/src/main/resources/mapper/DesignItemMapper.xml b/src/main/resources/mapper/primary/DesignItemMapper.xml similarity index 79% rename from src/main/resources/mapper/DesignItemMapper.xml rename to src/main/resources/mapper/primary/DesignItemMapper.xml index b4a089d8..c6b9689d 100644 --- a/src/main/resources/mapper/DesignItemMapper.xml +++ b/src/main/resources/mapper/primary/DesignItemMapper.xml @@ -1,33 +1,33 @@ - - - - - - - - - - - - - - - - - - - - insert into t_design_item - (account_id,design_id,collection_id,print_scale,design_url,high_design_url,is_like,create_date) - values( - #{accountId}, - #{designId}, - #{collectionId}, - #{printScale}, - #{designUrl}, - #{highDesignUrl}, - #{hasLike}, - #{createDate}); - - - + + + + + + + + + + + + + + + + + + + + insert into t_design_item + (account_id,design_id,collection_id,print_scale,design_url,high_design_url,is_like,create_date) + values( + #{accountId}, + #{designId}, + #{collectionId}, + #{printScale}, + #{designUrl}, + #{highDesignUrl}, + #{hasLike}, + #{createDate}); + + + diff --git a/src/main/resources/mapper/DesignMapper.xml b/src/main/resources/mapper/primary/DesignMapper.xml similarity index 77% rename from src/main/resources/mapper/DesignMapper.xml rename to src/main/resources/mapper/primary/DesignMapper.xml index 4c4e029c..b71f0f60 100644 --- a/src/main/resources/mapper/DesignMapper.xml +++ b/src/main/resources/mapper/primary/DesignMapper.xml @@ -1,29 +1,29 @@ - - - - - - - - - - - - - - - - - - insert into t_design - (account_id,collection_id,system_scale,single_overall,switch_category,create_date) - values( - #{accountId}, - #{collectionId}, - #{systemScale}, - #{singleOverall}, - #{switchCategory}, - #{createDate}); - - - + + + + + + + + + + + + + + + + + + insert into t_design + (account_id,collection_id,system_scale,single_overall,switch_category,create_date) + values( + #{accountId}, + #{collectionId}, + #{systemScale}, + #{singleOverall}, + #{switchCategory}, + #{createDate}); + + + diff --git a/src/main/resources/mapper/GenerateDetailMapper.xml b/src/main/resources/mapper/primary/GenerateDetailMapper.xml similarity index 87% rename from src/main/resources/mapper/GenerateDetailMapper.xml rename to src/main/resources/mapper/primary/GenerateDetailMapper.xml index 3dd87411..b3c0e9e3 100644 --- a/src/main/resources/mapper/GenerateDetailMapper.xml +++ b/src/main/resources/mapper/primary/GenerateDetailMapper.xml @@ -1,6 +1,6 @@ - + - select * from pantone - - - - r = #{item.r} and g = #{item.g} and b = #{item.b} - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/PythonTAllInfoMapper.xml b/src/main/resources/mapper/primary/PythonTAllInfoMapper.xml similarity index 92% rename from src/main/resources/mapper/PythonTAllInfoMapper.xml rename to src/main/resources/mapper/primary/PythonTAllInfoMapper.xml index b661a036..0fdcd2b3 100644 --- a/src/main/resources/mapper/PythonTAllInfoMapper.xml +++ b/src/main/resources/mapper/primary/PythonTAllInfoMapper.xml @@ -1,8 +1,8 @@ - + - + diff --git a/src/main/resources/mapper/TDesignPythonOutfitDetailMapper.xml b/src/main/resources/mapper/primary/TDesignPythonOutfitDetailMapper.xml similarity index 90% rename from src/main/resources/mapper/TDesignPythonOutfitDetailMapper.xml rename to src/main/resources/mapper/primary/TDesignPythonOutfitDetailMapper.xml index b231cdcb..b7b9b67d 100644 --- a/src/main/resources/mapper/TDesignPythonOutfitDetailMapper.xml +++ b/src/main/resources/mapper/primary/TDesignPythonOutfitDetailMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/main/resources/mapper/TDesignPythonOutfitMapper.xml b/src/main/resources/mapper/primary/TDesignPythonOutfitMapper.xml similarity index 89% rename from src/main/resources/mapper/TDesignPythonOutfitMapper.xml rename to src/main/resources/mapper/primary/TDesignPythonOutfitMapper.xml index b739bdfe..9079c1b0 100644 --- a/src/main/resources/mapper/TDesignPythonOutfitMapper.xml +++ b/src/main/resources/mapper/primary/TDesignPythonOutfitMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/main/resources/mapper/TrialOrderMapper.xml b/src/main/resources/mapper/primary/TrialOrderMapper.xml similarity index 84% rename from src/main/resources/mapper/TrialOrderMapper.xml rename to src/main/resources/mapper/primary/TrialOrderMapper.xml index 71abbf01..30f62bf0 100644 --- a/src/main/resources/mapper/TrialOrderMapper.xml +++ b/src/main/resources/mapper/primary/TrialOrderMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/main/resources/mapper/UserLikeGroupMapper.xml b/src/main/resources/mapper/primary/UserLikeGroupMapper.xml similarity index 71% rename from src/main/resources/mapper/UserLikeGroupMapper.xml rename to src/main/resources/mapper/primary/UserLikeGroupMapper.xml index 66bbecc3..463fc854 100644 --- a/src/main/resources/mapper/UserLikeGroupMapper.xml +++ b/src/main/resources/mapper/primary/UserLikeGroupMapper.xml @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - insert into t_user_like_group - (account_id,collection_id,`name`,create_date,update_date) - values( - #{accountId}, - #{collectionId}, - #{name}, - #{createDate}, - #{updateDate}); - - - + + + + + + + + + + + + + + + + insert into t_user_like_group + (account_id,collection_id,`name`,create_date,update_date) + values( + #{accountId}, + #{collectionId}, + #{name}, + #{createDate}, + #{updateDate}); + + + diff --git a/src/main/resources/mapper/WorkspaceMapper.xml b/src/main/resources/mapper/primary/WorkspaceMapper.xml similarity index 87% rename from src/main/resources/mapper/WorkspaceMapper.xml rename to src/main/resources/mapper/primary/WorkspaceMapper.xml index 72ff882e..9f36d5f6 100644 --- a/src/main/resources/mapper/WorkspaceMapper.xml +++ b/src/main/resources/mapper/primary/WorkspaceMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/main/resources/mapper/secondary/FemaleDressMapper.xml b/src/main/resources/mapper/secondary/FemaleDressMapper.xml new file mode 100644 index 00000000..abaf4205 --- /dev/null +++ b/src/main/resources/mapper/secondary/FemaleDressMapper.xml @@ -0,0 +1,8 @@ + + + + + + + +