diff --git a/spring-security/src/main/java/com/spring/config/DefaultSecurityConfig.java b/spring-security/src/main/java/com/spring/config/DefaultSecurityConfig.java index 083c039..4178ad4 100644 --- a/spring-security/src/main/java/com/spring/config/DefaultSecurityConfig.java +++ b/spring-security/src/main/java/com/spring/config/DefaultSecurityConfig.java @@ -5,16 +5,25 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationEventPublisher; +import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.DefaultAuthenticationEventPublisher; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.authentication.ProviderManager; +import org.springframework.security.authentication.dao.DaoAuthenticationProvider; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.factory.PasswordEncoderFactories; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.provisioning.InMemoryUserDetailsManager; -@EnableWebSecurity @Configuration public class DefaultSecurityConfig { + + /** + * 添加内存用户 + * + * @return {@link ConditionalOnMissingBean} + */ @Bean @ConditionalOnMissingBean(UserDetailsService.class) InMemoryUserDetailsManager inMemoryUserDetailsManager() { @@ -30,4 +39,17 @@ public class DefaultSecurityConfig { return new DefaultAuthenticationEventPublisher(delegate); } + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Bean + public AuthenticationManager authenticationManager(UserDetailsService userDetailsService, PasswordEncoder passwordEncoder) { + DaoAuthenticationProvider authenticationProvider = new DaoAuthenticationProvider(userDetailsService); + authenticationProvider.setPasswordEncoder(passwordEncoder); + + return new ProviderManager(authenticationProvider); + } + } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/config/SecurityConfiguration.java b/spring-security/src/main/java/com/spring/config/SecurityConfiguration.java new file mode 100644 index 0000000..506c937 --- /dev/null +++ b/spring-security/src/main/java/com/spring/config/SecurityConfiguration.java @@ -0,0 +1,25 @@ +package com.spring.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.Customizer; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.savedrequest.HttpSessionRequestCache; + +@EnableWebSecurity +@Configuration +public class SecurityConfiguration { + @Bean + SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + HttpSessionRequestCache requestCache = new HttpSessionRequestCache(); + http + .httpBasic(Customizer.withDefaults()) + .requestCache(cache -> cache.requestCache(requestCache)) + ; + + return http.build(); + } + +} diff --git a/spring-security/src/main/java/com/spring/controller/DeptController.java b/spring-security/src/main/java/com/spring/controller/system/DeptController.java similarity index 88% rename from spring-security/src/main/java/com/spring/controller/DeptController.java rename to spring-security/src/main/java/com/spring/controller/system/DeptController.java index a35b5d5..0614e6b 100644 --- a/spring-security/src/main/java/com/spring/controller/DeptController.java +++ b/spring-security/src/main/java/com/spring/controller/system/DeptController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.DeptDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.DeptDto; import com.spring.domain.entity.DeptEntity; import com.spring.domain.vo.DeptVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.DeptService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.DeptService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class DeptController { @Operation(summary = "添加部门表", description = "添加部门表") @PostMapping() public Result addDept(@Valid @RequestBody DeptDto dto) { - deptService.addDept(dto); + deptService.addDept(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新部门表", description = "更新部门表") @PutMapping() public Result updateDept(@Valid @RequestBody DeptDto dto) { - deptService.updateDept(dto); + deptService.updateDept(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除部门表", description = "删除部门表") @DeleteMapping() public Result deleteDept(@RequestBody List ids) { - deptService.deleteDept(ids); + deptService.deleteDept(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/EmailTemplateController.java b/spring-security/src/main/java/com/spring/controller/system/EmailTemplateController.java similarity index 87% rename from spring-security/src/main/java/com/spring/controller/EmailTemplateController.java rename to spring-security/src/main/java/com/spring/controller/system/EmailTemplateController.java index ded0b70..fb49baf 100644 --- a/spring-security/src/main/java/com/spring/controller/EmailTemplateController.java +++ b/spring-security/src/main/java/com/spring/controller/system/EmailTemplateController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.EmailTemplateDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.EmailTemplateDto; import com.spring.domain.entity.EmailTemplateEntity; import com.spring.domain.vo.EmailTemplateVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.EmailTemplateService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.EmailTemplateService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class EmailTemplateController { @Operation(summary = "添加邮件模板表", description = "添加邮件模板表") @PostMapping() public Result addEmailTemplate(@Valid @RequestBody EmailTemplateDto dto) { - emailTemplateService.addEmailTemplate(dto); + emailTemplateService.addEmailTemplate(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新邮件模板表", description = "更新邮件模板表") @PutMapping() public Result updateEmailTemplate(@Valid @RequestBody EmailTemplateDto dto) { - emailTemplateService.updateEmailTemplate(dto); + emailTemplateService.updateEmailTemplate(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除邮件模板表", description = "删除邮件模板表") @DeleteMapping() public Result deleteEmailTemplate(@RequestBody List ids) { - emailTemplateService.deleteEmailTemplate(ids); + emailTemplateService.deleteEmailTemplate(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/EmailUsersController.java b/spring-security/src/main/java/com/spring/controller/system/EmailUsersController.java similarity index 87% rename from spring-security/src/main/java/com/spring/controller/EmailUsersController.java rename to spring-security/src/main/java/com/spring/controller/system/EmailUsersController.java index 11aef13..4092c1b 100644 --- a/spring-security/src/main/java/com/spring/controller/EmailUsersController.java +++ b/spring-security/src/main/java/com/spring/controller/system/EmailUsersController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.EmailUsersDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.EmailUsersDto; import com.spring.domain.entity.EmailUsersEntity; import com.spring.domain.vo.EmailUsersVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.EmailUsersService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.EmailUsersService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class EmailUsersController { @Operation(summary = "添加邮箱发送表", description = "添加邮箱发送表") @PostMapping() public Result addEmailUsers(@Valid @RequestBody EmailUsersDto dto) { - emailUsersService.addEmailUsers(dto); + emailUsersService.addEmailUsers(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新邮箱发送表", description = "更新邮箱发送表") @PutMapping() public Result updateEmailUsers(@Valid @RequestBody EmailUsersDto dto) { - emailUsersService.updateEmailUsers(dto); + emailUsersService.updateEmailUsers(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除邮箱发送表", description = "删除邮箱发送表") @DeleteMapping() public Result deleteEmailUsers(@RequestBody List ids) { - emailUsersService.deleteEmailUsers(ids); + emailUsersService.deleteEmailUsers(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/FilesController.java b/spring-security/src/main/java/com/spring/controller/system/FilesController.java similarity index 88% rename from spring-security/src/main/java/com/spring/controller/FilesController.java rename to spring-security/src/main/java/com/spring/controller/system/FilesController.java index 3256d45..ea08d14 100644 --- a/spring-security/src/main/java/com/spring/controller/FilesController.java +++ b/spring-security/src/main/java/com/spring/controller/system/FilesController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.FilesDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.FilesDto; import com.spring.domain.entity.FilesEntity; import com.spring.domain.vo.FilesVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.FilesService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.FilesService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class FilesController { @Operation(summary = "添加文件记录", description = "添加文件记录") @PostMapping() public Result addFiles(@Valid @RequestBody FilesDto dto) { - filesService.addFiles(dto); + filesService.addFiles(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新文件记录", description = "更新文件记录") @PutMapping() public Result updateFiles(@Valid @RequestBody FilesDto dto) { - filesService.updateFiles(dto); + filesService.updateFiles(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除文件记录", description = "删除文件记录") @DeleteMapping() public Result deleteFiles(@RequestBody List ids) { - filesService.deleteFiles(ids); + filesService.deleteFiles(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/FilesPartDetailController.java b/spring-security/src/main/java/com/spring/controller/system/FilesPartDetailController.java similarity index 88% rename from spring-security/src/main/java/com/spring/controller/FilesPartDetailController.java rename to spring-security/src/main/java/com/spring/controller/system/FilesPartDetailController.java index 629cb18..cd128ba 100644 --- a/spring-security/src/main/java/com/spring/controller/FilesPartDetailController.java +++ b/spring-security/src/main/java/com/spring/controller/system/FilesPartDetailController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.FilesPartDetailDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.FilesPartDetailDto; import com.spring.domain.entity.FilesPartDetailEntity; import com.spring.domain.vo.FilesPartDetailVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.FilesPartDetailService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.FilesPartDetailService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class FilesPartDetailController { @Operation(summary = "添加文件分片信息表，仅在手动分片上传时使用", description = "添加文件分片信息表，仅在手动分片上传时使用") @PostMapping() public Result addFilesPartDetail(@Valid @RequestBody FilesPartDetailDto dto) { - filesPartDetailService.addFilesPartDetail(dto); + filesPartDetailService.addFilesPartDetail(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新文件分片信息表，仅在手动分片上传时使用", description = "更新文件分片信息表，仅在手动分片上传时使用") @PutMapping() public Result updateFilesPartDetail(@Valid @RequestBody FilesPartDetailDto dto) { - filesPartDetailService.updateFilesPartDetail(dto); + filesPartDetailService.updateFilesPartDetail(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除文件分片信息表，仅在手动分片上传时使用", description = "删除文件分片信息表，仅在手动分片上传时使用") @DeleteMapping() public Result deleteFilesPartDetail(@RequestBody List ids) { - filesPartDetailService.deleteFilesPartDetail(ids); + filesPartDetailService.deleteFilesPartDetail(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/I18nController.java b/spring-security/src/main/java/com/spring/controller/system/I18nController.java similarity index 88% rename from spring-security/src/main/java/com/spring/controller/I18nController.java rename to spring-security/src/main/java/com/spring/controller/system/I18nController.java index f087bb3..981a4d2 100644 --- a/spring-security/src/main/java/com/spring/controller/I18nController.java +++ b/spring-security/src/main/java/com/spring/controller/system/I18nController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.I18nDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.I18nDto; import com.spring.domain.entity.I18nEntity; import com.spring.domain.vo.I18nVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.I18nService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.I18nService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class I18nController { @Operation(summary = "添加多语言表", description = "添加多语言表") @PostMapping() public Result addI18n(@Valid @RequestBody I18nDto dto) { - i18nService.addI18n(dto); + i18nService.addI18n(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新多语言表", description = "更新多语言表") @PutMapping() public Result updateI18n(@Valid @RequestBody I18nDto dto) { - i18nService.updateI18n(dto); + i18nService.updateI18n(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除多语言表", description = "删除多语言表") @DeleteMapping() public Result deleteI18n(@RequestBody List ids) { - i18nService.deleteI18n(ids); + i18nService.deleteI18n(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/I18nTypeController.java b/spring-security/src/main/java/com/spring/controller/system/I18nTypeController.java similarity index 88% rename from spring-security/src/main/java/com/spring/controller/I18nTypeController.java rename to spring-security/src/main/java/com/spring/controller/system/I18nTypeController.java index 2dd3f2c..d7d0a01 100644 --- a/spring-security/src/main/java/com/spring/controller/I18nTypeController.java +++ b/spring-security/src/main/java/com/spring/controller/system/I18nTypeController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.I18nTypeDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.I18nTypeDto; import com.spring.domain.entity.I18nTypeEntity; import com.spring.domain.vo.I18nTypeVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.I18nTypeService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.I18nTypeService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class I18nTypeController { @Operation(summary = "添加多语言类型表", description = "添加多语言类型表") @PostMapping() public Result addI18nType(@Valid @RequestBody I18nTypeDto dto) { - i18nTypeService.addI18nType(dto); + i18nTypeService.addI18nType(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新多语言类型表", description = "更新多语言类型表") @PutMapping() public Result updateI18nType(@Valid @RequestBody I18nTypeDto dto) { - i18nTypeService.updateI18nType(dto); + i18nTypeService.updateI18nType(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除多语言类型表", description = "删除多语言类型表") @DeleteMapping() public Result deleteI18nType(@RequestBody List ids) { - i18nTypeService.deleteI18nType(ids); + i18nTypeService.deleteI18nType(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/MenuIconController.java b/spring-security/src/main/java/com/spring/controller/system/MenuIconController.java similarity index 88% rename from spring-security/src/main/java/com/spring/controller/MenuIconController.java rename to spring-security/src/main/java/com/spring/controller/system/MenuIconController.java index 5119b85..9111507 100644 --- a/spring-security/src/main/java/com/spring/controller/MenuIconController.java +++ b/spring-security/src/main/java/com/spring/controller/system/MenuIconController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.MenuIconDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.MenuIconDto; import com.spring.domain.entity.MenuIconEntity; import com.spring.domain.vo.MenuIconVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.MenuIconService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.MenuIconService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class MenuIconController { @Operation(summary = "添加图标code不能重复", description = "添加图标code不能重复") @PostMapping() public Result addMenuIcon(@Valid @RequestBody MenuIconDto dto) { - menuIconService.addMenuIcon(dto); + menuIconService.addMenuIcon(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新图标code不能重复", description = "更新图标code不能重复") @PutMapping() public Result updateMenuIcon(@Valid @RequestBody MenuIconDto dto) { - menuIconService.updateMenuIcon(dto); + menuIconService.updateMenuIcon(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除图标code不能重复", description = "删除图标code不能重复") @DeleteMapping() public Result deleteMenuIcon(@RequestBody List ids) { - menuIconService.deleteMenuIcon(ids); + menuIconService.deleteMenuIcon(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/MessageController.java b/spring-security/src/main/java/com/spring/controller/system/MessageController.java similarity index 88% rename from spring-security/src/main/java/com/spring/controller/MessageController.java rename to spring-security/src/main/java/com/spring/controller/system/MessageController.java index a246aae..7eea7b2 100644 --- a/spring-security/src/main/java/com/spring/controller/MessageController.java +++ b/spring-security/src/main/java/com/spring/controller/system/MessageController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.MessageDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.MessageDto; import com.spring.domain.entity.MessageEntity; import com.spring.domain.vo.MessageVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.MessageService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.MessageService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class MessageController { @Operation(summary = "添加系统消息", description = "添加系统消息") @PostMapping() public Result addMessage(@Valid @RequestBody MessageDto dto) { - messageService.addMessage(dto); + messageService.addMessage(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新系统消息", description = "更新系统消息") @PutMapping() public Result updateMessage(@Valid @RequestBody MessageDto dto) { - messageService.updateMessage(dto); + messageService.updateMessage(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除系统消息", description = "删除系统消息") @DeleteMapping() public Result deleteMessage(@RequestBody List ids) { - messageService.deleteMessage(ids); + messageService.deleteMessage(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/MessageReceivedController.java b/spring-security/src/main/java/com/spring/controller/system/MessageReceivedController.java similarity index 85% rename from spring-security/src/main/java/com/spring/controller/MessageReceivedController.java rename to spring-security/src/main/java/com/spring/controller/system/MessageReceivedController.java index b841399..f02a383 100644 --- a/spring-security/src/main/java/com/spring/controller/MessageReceivedController.java +++ b/spring-security/src/main/java/com/spring/controller/system/MessageReceivedController.java @@ -1,25 +1,25 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.MessageReceivedDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.MessageReceivedDto; import com.spring.domain.entity.MessageReceivedEntity; import com.spring.domain.vo.MessageReceivedVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.MessageReceivedService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.MessageReceivedService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** *

- * 前端控制器 + * 前端控制器 *

* * @author Bunny @@ -49,21 +49,21 @@ public class MessageReceivedController { @Operation(summary = "添加", description = "添加") @PostMapping() public Result addMessageReceived(@Valid @RequestBody MessageReceivedDto dto) { - messageReceivedService.addMessageReceived(dto); + messageReceivedService.addMessageReceived(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新", description = "更新") @PutMapping() public Result updateMessageReceived(@Valid @RequestBody MessageReceivedDto dto) { - messageReceivedService.updateMessageReceived(dto); + messageReceivedService.updateMessageReceived(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除", description = "删除") @DeleteMapping() public Result deleteMessageReceived(@RequestBody List ids) { - messageReceivedService.deleteMessageReceived(ids); + messageReceivedService.deleteMessageReceived(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/MessageTypeController.java b/spring-security/src/main/java/com/spring/controller/system/MessageTypeController.java similarity index 87% rename from spring-security/src/main/java/com/spring/controller/MessageTypeController.java rename to spring-security/src/main/java/com/spring/controller/system/MessageTypeController.java index e10da70..ece4af7 100644 --- a/spring-security/src/main/java/com/spring/controller/MessageTypeController.java +++ b/spring-security/src/main/java/com/spring/controller/system/MessageTypeController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.MessageTypeDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.MessageTypeDto; import com.spring.domain.entity.MessageTypeEntity; import com.spring.domain.vo.MessageTypeVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.MessageTypeService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.MessageTypeService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class MessageTypeController { @Operation(summary = "添加系统消息类型", description = "添加系统消息类型") @PostMapping() public Result addMessageType(@Valid @RequestBody MessageTypeDto dto) { - messageTypeService.addMessageType(dto); + messageTypeService.addMessageType(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新系统消息类型", description = "更新系统消息类型") @PutMapping() public Result updateMessageType(@Valid @RequestBody MessageTypeDto dto) { - messageTypeService.updateMessageType(dto); + messageTypeService.updateMessageType(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除系统消息类型", description = "删除系统消息类型") @DeleteMapping() public Result deleteMessageType(@RequestBody List ids) { - messageTypeService.deleteMessageType(ids); + messageTypeService.deleteMessageType(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/PermissionController.java b/spring-security/src/main/java/com/spring/controller/system/PermissionController.java similarity index 87% rename from spring-security/src/main/java/com/spring/controller/PermissionController.java rename to spring-security/src/main/java/com/spring/controller/system/PermissionController.java index 8fa5bcb..1072b3b 100644 --- a/spring-security/src/main/java/com/spring/controller/PermissionController.java +++ b/spring-security/src/main/java/com/spring/controller/system/PermissionController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.PermissionDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.PermissionDto; import com.spring.domain.entity.PermissionEntity; import com.spring.domain.vo.PermissionVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.PermissionService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.PermissionService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class PermissionController { @Operation(summary = "添加系统权限表", description = "添加系统权限表") @PostMapping() public Result addPermission(@Valid @RequestBody PermissionDto dto) { - permissionService.addPermission(dto); + permissionService.addPermission(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新系统权限表", description = "更新系统权限表") @PutMapping() public Result updatePermission(@Valid @RequestBody PermissionDto dto) { - permissionService.updatePermission(dto); + permissionService.updatePermission(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除系统权限表", description = "删除系统权限表") @DeleteMapping() public Result deletePermission(@RequestBody List ids) { - permissionService.deletePermission(ids); + permissionService.deletePermission(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/RoleController.java b/spring-security/src/main/java/com/spring/controller/system/RoleController.java similarity index 88% rename from spring-security/src/main/java/com/spring/controller/RoleController.java rename to spring-security/src/main/java/com/spring/controller/system/RoleController.java index 68aa1cd..4c0cb00 100644 --- a/spring-security/src/main/java/com/spring/controller/RoleController.java +++ b/spring-security/src/main/java/com/spring/controller/system/RoleController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.RoleDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.RoleDto; import com.spring.domain.entity.RoleEntity; import com.spring.domain.vo.RoleVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.RoleService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.RoleService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class RoleController { @Operation(summary = "添加系统角色表", description = "添加系统角色表") @PostMapping() public Result addRole(@Valid @RequestBody RoleDto dto) { - roleService.addRole(dto); + roleService.addRole(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新系统角色表", description = "更新系统角色表") @PutMapping() public Result updateRole(@Valid @RequestBody RoleDto dto) { - roleService.updateRole(dto); + roleService.updateRole(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除系统角色表", description = "删除系统角色表") @DeleteMapping() public Result deleteRole(@RequestBody List ids) { - roleService.deleteRole(ids); + roleService.deleteRole(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/RolePermissionController.java b/spring-security/src/main/java/com/spring/controller/system/RolePermissionController.java similarity index 87% rename from spring-security/src/main/java/com/spring/controller/RolePermissionController.java rename to spring-security/src/main/java/com/spring/controller/system/RolePermissionController.java index 1b6ae6a..a2e3623 100644 --- a/spring-security/src/main/java/com/spring/controller/RolePermissionController.java +++ b/spring-security/src/main/java/com/spring/controller/system/RolePermissionController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.RolePermissionDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.RolePermissionDto; import com.spring.domain.entity.RolePermissionEntity; import com.spring.domain.vo.RolePermissionVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.RolePermissionService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.RolePermissionService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class RolePermissionController { @Operation(summary = "添加系统角色权限表", description = "添加系统角色权限表") @PostMapping() public Result addRolePermission(@Valid @RequestBody RolePermissionDto dto) { - rolePermissionService.addRolePermission(dto); + rolePermissionService.addRolePermission(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新系统角色权限表", description = "更新系统角色权限表") @PutMapping() public Result updateRolePermission(@Valid @RequestBody RolePermissionDto dto) { - rolePermissionService.updateRolePermission(dto); + rolePermissionService.updateRolePermission(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除系统角色权限表", description = "删除系统角色权限表") @DeleteMapping() public Result deleteRolePermission(@RequestBody List ids) { - rolePermissionService.deleteRolePermission(ids); + rolePermissionService.deleteRolePermission(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/RouterController.java b/spring-security/src/main/java/com/spring/controller/system/RouterController.java similarity index 88% rename from spring-security/src/main/java/com/spring/controller/RouterController.java rename to spring-security/src/main/java/com/spring/controller/system/RouterController.java index 15bde25..876f995 100644 --- a/spring-security/src/main/java/com/spring/controller/RouterController.java +++ b/spring-security/src/main/java/com/spring/controller/system/RouterController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.RouterDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.RouterDto; import com.spring.domain.entity.RouterEntity; import com.spring.domain.vo.RouterVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.RouterService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.RouterService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class RouterController { @Operation(summary = "添加系统菜单表", description = "添加系统菜单表") @PostMapping() public Result addRouter(@Valid @RequestBody RouterDto dto) { - routerService.addRouter(dto); + routerService.addRouter(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新系统菜单表", description = "更新系统菜单表") @PutMapping() public Result updateRouter(@Valid @RequestBody RouterDto dto) { - routerService.updateRouter(dto); + routerService.updateRouter(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除系统菜单表", description = "删除系统菜单表") @DeleteMapping() public Result deleteRouter(@RequestBody List ids) { - routerService.deleteRouter(ids); + routerService.deleteRouter(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/RouterRoleController.java b/spring-security/src/main/java/com/spring/controller/system/RouterRoleController.java similarity index 88% rename from spring-security/src/main/java/com/spring/controller/RouterRoleController.java rename to spring-security/src/main/java/com/spring/controller/system/RouterRoleController.java index f928850..5177eae 100644 --- a/spring-security/src/main/java/com/spring/controller/RouterRoleController.java +++ b/spring-security/src/main/java/com/spring/controller/system/RouterRoleController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.RouterRoleDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.RouterRoleDto; import com.spring.domain.entity.RouterRoleEntity; import com.spring.domain.vo.RouterRoleVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.RouterRoleService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.RouterRoleService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class RouterRoleController { @Operation(summary = "添加系统路由角色关系表", description = "添加系统路由角色关系表") @PostMapping() public Result addRouterRole(@Valid @RequestBody RouterRoleDto dto) { - routerRoleService.addRouterRole(dto); + routerRoleService.addRouterRole(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新系统路由角色关系表", description = "更新系统路由角色关系表") @PutMapping() public Result updateRouterRole(@Valid @RequestBody RouterRoleDto dto) { - routerRoleService.updateRouterRole(dto); + routerRoleService.updateRouterRole(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除系统路由角色关系表", description = "删除系统路由角色关系表") @DeleteMapping() public Result deleteRouterRole(@RequestBody List ids) { - routerRoleService.deleteRouterRole(ids); + routerRoleService.deleteRouterRole(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/UserController.java b/spring-security/src/main/java/com/spring/controller/system/UserController.java similarity index 88% rename from spring-security/src/main/java/com/spring/controller/UserController.java rename to spring-security/src/main/java/com/spring/controller/system/UserController.java index 2ceab3a..e2880f4 100644 --- a/spring-security/src/main/java/com/spring/controller/UserController.java +++ b/spring-security/src/main/java/com/spring/controller/system/UserController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.UserDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.UserDto; import com.spring.domain.entity.UserEntity; import com.spring.domain.vo.UserVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.UserService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.UserService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class UserController { @Operation(summary = "添加用户信息", description = "添加用户信息") @PostMapping() public Result addUser(@Valid @RequestBody UserDto dto) { - userService.addUser(dto); + userService.addUser(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新用户信息", description = "更新用户信息") @PutMapping() public Result updateUser(@Valid @RequestBody UserDto dto) { - userService.updateUser(dto); + userService.updateUser(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除用户信息", description = "删除用户信息") @DeleteMapping() public Result deleteUser(@RequestBody List ids) { - userService.deleteUser(ids); + userService.deleteUser(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/UserDeptController.java b/spring-security/src/main/java/com/spring/controller/system/UserDeptController.java similarity index 88% rename from spring-security/src/main/java/com/spring/controller/UserDeptController.java rename to spring-security/src/main/java/com/spring/controller/system/UserDeptController.java index 3a487b5..3d77f64 100644 --- a/spring-security/src/main/java/com/spring/controller/UserDeptController.java +++ b/spring-security/src/main/java/com/spring/controller/system/UserDeptController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.UserDeptDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.UserDeptDto; import com.spring.domain.entity.UserDeptEntity; import com.spring.domain.vo.UserDeptVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.UserDeptService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.UserDeptService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class UserDeptController { @Operation(summary = "添加部门用户关系表", description = "添加部门用户关系表") @PostMapping() public Result addUserDept(@Valid @RequestBody UserDeptDto dto) { - userDeptService.addUserDept(dto); + userDeptService.addUserDept(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新部门用户关系表", description = "更新部门用户关系表") @PutMapping() public Result updateUserDept(@Valid @RequestBody UserDeptDto dto) { - userDeptService.updateUserDept(dto); + userDeptService.updateUserDept(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除部门用户关系表", description = "删除部门用户关系表") @DeleteMapping() public Result deleteUserDept(@RequestBody List ids) { - userDeptService.deleteUserDept(ids); + userDeptService.deleteUserDept(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/UserLoginController.java b/spring-security/src/main/java/com/spring/controller/system/UserLoginController.java similarity index 88% rename from spring-security/src/main/java/com/spring/controller/UserLoginController.java rename to spring-security/src/main/java/com/spring/controller/system/UserLoginController.java index d7d1eda..32bbd48 100644 --- a/spring-security/src/main/java/com/spring/controller/UserLoginController.java +++ b/spring-security/src/main/java/com/spring/controller/system/UserLoginController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.UserLoginDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.UserLoginDto; import com.spring.domain.entity.UserLoginEntity; import com.spring.domain.vo.UserLoginVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.UserLoginService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.UserLoginService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class UserLoginController { @Operation(summary = "添加用户登录日志", description = "添加用户登录日志") @PostMapping() public Result addUserLogin(@Valid @RequestBody UserLoginDto dto) { - userLoginService.addUserLogin(dto); + userLoginService.addUserLogin(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新用户登录日志", description = "更新用户登录日志") @PutMapping() public Result updateUserLogin(@Valid @RequestBody UserLoginDto dto) { - userLoginService.updateUserLogin(dto); + userLoginService.updateUserLogin(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除用户登录日志", description = "删除用户登录日志") @DeleteMapping() public Result deleteUserLogin(@RequestBody List ids) { - userLoginService.deleteUserLogin(ids); + userLoginService.deleteUserLogin(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/controller/UserRoleController.java b/spring-security/src/main/java/com/spring/controller/system/UserRoleController.java similarity index 88% rename from spring-security/src/main/java/com/spring/controller/UserRoleController.java rename to spring-security/src/main/java/com/spring/controller/system/UserRoleController.java index d0222b9..b5be635 100644 --- a/spring-security/src/main/java/com/spring/controller/UserRoleController.java +++ b/spring-security/src/main/java/com/spring/controller/system/UserRoleController.java @@ -1,20 +1,20 @@ -package com.spring.controller; +package com.spring.controller.system; -import com.spring.domain.dto.UserRoleDto; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.domain.dto.system.UserRoleDto; import com.spring.domain.entity.UserRoleEntity; import com.spring.domain.vo.UserRoleVo; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import com.spring.service.UserRoleService; import com.spring.domain.vo.result.PageResult; import com.spring.domain.vo.result.Result; import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.service.system.UserRoleService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -49,21 +49,21 @@ public class UserRoleController { @Operation(summary = "添加系统用户角色关系表", description = "添加系统用户角色关系表") @PostMapping() public Result addUserRole(@Valid @RequestBody UserRoleDto dto) { - userRoleService.addUserRole(dto); + userRoleService.addUserRole(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新系统用户角色关系表", description = "更新系统用户角色关系表") @PutMapping() public Result updateUserRole(@Valid @RequestBody UserRoleDto dto) { - userRoleService.updateUserRole(dto); + userRoleService.updateUserRole(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @Operation(summary = "删除系统用户角色关系表", description = "删除系统用户角色关系表") @DeleteMapping() public Result deleteUserRole(@RequestBody List ids) { - userRoleService.deleteUserRole(ids); + userRoleService.deleteUserRole(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } } \ No newline at end of file diff --git a/spring-security/src/main/java/com/spring/domain/dto/DeptDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/DeptDto.java similarity index 93% rename from spring-security/src/main/java/com/spring/domain/dto/DeptDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/DeptDto.java index 6ef0eb5..49658b6 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/DeptDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/DeptDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor diff --git a/spring-security/src/main/java/com/spring/domain/dto/EmailTemplateDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/EmailTemplateDto.java similarity index 94% rename from spring-security/src/main/java/com/spring/domain/dto/EmailTemplateDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/EmailTemplateDto.java index 5ebaa09..0e17de4 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/EmailTemplateDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/EmailTemplateDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor diff --git a/spring-security/src/main/java/com/spring/domain/dto/EmailUsersDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/EmailUsersDto.java similarity index 92% rename from spring-security/src/main/java/com/spring/domain/dto/EmailUsersDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/EmailUsersDto.java index ea1ab01..f4597d5 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/EmailUsersDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/EmailUsersDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor @@ -17,7 +15,7 @@ import java.util.Date; @Schema(name = "EmailUsersDTO对象", title = "邮箱发送表", description = "邮箱发送表的DTO对象") public class EmailUsersDto { - @Schema(name = "id", title = "") + @Schema(name = "id", title = "主键") private Long id; @Schema(name = "email", title = "邮箱") diff --git a/spring-security/src/main/java/com/spring/domain/dto/FilesDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/FilesDto.java similarity index 97% rename from spring-security/src/main/java/com/spring/domain/dto/FilesDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/FilesDto.java index 33e27b9..6a8cd3c 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/FilesDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/FilesDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor diff --git a/spring-security/src/main/java/com/spring/domain/dto/FilesPartDetailDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/FilesPartDetailDto.java similarity index 95% rename from spring-security/src/main/java/com/spring/domain/dto/FilesPartDetailDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/FilesPartDetailDto.java index 00f554e..692d6ce 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/FilesPartDetailDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/FilesPartDetailDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor diff --git a/spring-security/src/main/java/com/spring/domain/dto/I18nDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/I18nDto.java similarity index 93% rename from spring-security/src/main/java/com/spring/domain/dto/I18nDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/I18nDto.java index ee7241d..60d6cc0 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/I18nDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/I18nDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor diff --git a/spring-security/src/main/java/com/spring/domain/dto/I18nTypeDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/I18nTypeDto.java similarity index 93% rename from spring-security/src/main/java/com/spring/domain/dto/I18nTypeDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/I18nTypeDto.java index 1cf492f..5cc5f60 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/I18nTypeDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/I18nTypeDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor diff --git a/spring-security/src/main/java/com/spring/domain/dto/MenuIconDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/MenuIconDto.java similarity index 89% rename from spring-security/src/main/java/com/spring/domain/dto/MenuIconDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/MenuIconDto.java index 1132980..ce4018d 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/MenuIconDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/MenuIconDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor @@ -17,7 +15,7 @@ import java.util.Date; @Schema(name = "MenuIconDTO对象", title = "图标code不能重复", description = "图标code不能重复的DTO对象") public class MenuIconDto { - @Schema(name = "id", title = "") + @Schema(name = "id", title = "主键") private Long id; @Schema(name = "iconCode", title = "icon类名") diff --git a/spring-security/src/main/java/com/spring/domain/dto/MessageDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/MessageDto.java similarity index 95% rename from spring-security/src/main/java/com/spring/domain/dto/MessageDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/MessageDto.java index 1d276e2..5dc0928 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/MessageDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/MessageDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor diff --git a/spring-security/src/main/java/com/spring/domain/dto/MessageReceivedDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/MessageReceivedDto.java similarity index 86% rename from spring-security/src/main/java/com/spring/domain/dto/MessageReceivedDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/MessageReceivedDto.java index 11a40ae..71203b6 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/MessageReceivedDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/MessageReceivedDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,14 +7,12 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor @Builder -@Schema(name = "MessageReceivedDTO对象", title = "", description = "的DTO对象") +@Schema(name = "MessageReceivedDTO对象", title = "消息回复", description = "消息回复的DTO对象") public class MessageReceivedDto { @Schema(name = "id", title = "主键") diff --git a/spring-security/src/main/java/com/spring/domain/dto/MessageTypeDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/MessageTypeDto.java similarity index 93% rename from spring-security/src/main/java/com/spring/domain/dto/MessageTypeDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/MessageTypeDto.java index 6660a98..68ac9fa 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/MessageTypeDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/MessageTypeDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor diff --git a/spring-security/src/main/java/com/spring/domain/dto/PermissionDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/PermissionDto.java similarity index 94% rename from spring-security/src/main/java/com/spring/domain/dto/PermissionDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/PermissionDto.java index 207b6c1..d02098b 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/PermissionDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/PermissionDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor diff --git a/spring-security/src/main/java/com/spring/domain/dto/RoleDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/RoleDto.java similarity index 89% rename from spring-security/src/main/java/com/spring/domain/dto/RoleDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/RoleDto.java index e88cb51..d5dbfbf 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/RoleDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/RoleDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor @@ -17,7 +15,7 @@ import java.util.Date; @Schema(name = "RoleDTO对象", title = "系统角色表", description = "系统角色表的DTO对象") public class RoleDto { - @Schema(name = "id", title = "") + @Schema(name = "id", title = "主键") private Long id; @Schema(name = "roleCode", title = "角色代码") diff --git a/spring-security/src/main/java/com/spring/domain/dto/RolePermissionDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/RolePermissionDto.java similarity index 92% rename from spring-security/src/main/java/com/spring/domain/dto/RolePermissionDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/RolePermissionDto.java index 1a1b899..eaf7e87 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/RolePermissionDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/RolePermissionDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor diff --git a/spring-security/src/main/java/com/spring/domain/dto/RouterDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/RouterDto.java similarity index 94% rename from spring-security/src/main/java/com/spring/domain/dto/RouterDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/RouterDto.java index 8daf5ef..7abf946 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/RouterDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/RouterDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor diff --git a/spring-security/src/main/java/com/spring/domain/dto/RouterRoleDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/RouterRoleDto.java similarity index 92% rename from spring-security/src/main/java/com/spring/domain/dto/RouterRoleDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/RouterRoleDto.java index 0ca2301..ad0b8fe 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/RouterRoleDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/RouterRoleDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor diff --git a/spring-security/src/main/java/com/spring/domain/dto/UserDeptDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/UserDeptDto.java similarity index 92% rename from spring-security/src/main/java/com/spring/domain/dto/UserDeptDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/UserDeptDto.java index 945db28..b46f599 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/UserDeptDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/UserDeptDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor diff --git a/spring-security/src/main/java/com/spring/domain/dto/UserDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/UserDto.java similarity index 95% rename from spring-security/src/main/java/com/spring/domain/dto/UserDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/UserDto.java index 7e72171..44c03ea 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/UserDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/UserDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor diff --git a/spring-security/src/main/java/com/spring/domain/dto/UserLoginDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/UserLoginDto.java similarity index 95% rename from spring-security/src/main/java/com/spring/domain/dto/UserLoginDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/UserLoginDto.java index 7c8ac48..7ef5463 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/UserLoginDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/UserLoginDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor diff --git a/spring-security/src/main/java/com/spring/domain/dto/UserRoleDto.java b/spring-security/src/main/java/com/spring/domain/dto/system/UserRoleDto.java similarity index 92% rename from spring-security/src/main/java/com/spring/domain/dto/UserRoleDto.java rename to spring-security/src/main/java/com/spring/domain/dto/system/UserRoleDto.java index 431f6a6..581974f 100644 --- a/spring-security/src/main/java/com/spring/domain/dto/UserRoleDto.java +++ b/spring-security/src/main/java/com/spring/domain/dto/system/UserRoleDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto; +package com.spring.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Data @AllArgsConstructor diff --git a/spring-security/src/main/java/com/spring/domain/entity/EmailTemplateEntity.java b/spring-security/src/main/java/com/spring/domain/entity/EmailTemplateEntity.java index 6de203a..1dcdc85 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/EmailTemplateEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/EmailTemplateEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/EmailUsersEntity.java b/spring-security/src/main/java/com/spring/domain/entity/EmailUsersEntity.java index 8306ef6..10b9d94 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/EmailUsersEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/EmailUsersEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/FilesEntity.java b/spring-security/src/main/java/com/spring/domain/entity/FilesEntity.java index b502ac8..83cad16 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/FilesEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/FilesEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/FilesPartDetailEntity.java b/spring-security/src/main/java/com/spring/domain/entity/FilesPartDetailEntity.java index 6aa2ff7..699c373 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/FilesPartDetailEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/FilesPartDetailEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/I18nEntity.java b/spring-security/src/main/java/com/spring/domain/entity/I18nEntity.java index 0cc7580..d72507a 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/I18nEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/I18nEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/I18nTypeEntity.java b/spring-security/src/main/java/com/spring/domain/entity/I18nTypeEntity.java index d3376e4..471791a 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/I18nTypeEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/I18nTypeEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/MenuIconEntity.java b/spring-security/src/main/java/com/spring/domain/entity/MenuIconEntity.java index 2626bc8..725cd90 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/MenuIconEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/MenuIconEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/MessageEntity.java b/spring-security/src/main/java/com/spring/domain/entity/MessageEntity.java index 7ed3a32..da85048 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/MessageEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/MessageEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/MessageReceivedEntity.java b/spring-security/src/main/java/com/spring/domain/entity/MessageReceivedEntity.java index d595e9b..388783d 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/MessageReceivedEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/MessageReceivedEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/MessageTypeEntity.java b/spring-security/src/main/java/com/spring/domain/entity/MessageTypeEntity.java index c898d69..c4fb873 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/MessageTypeEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/MessageTypeEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/PermissionEntity.java b/spring-security/src/main/java/com/spring/domain/entity/PermissionEntity.java index 1dc4b4f..3e65088 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/PermissionEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/PermissionEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/RoleEntity.java b/spring-security/src/main/java/com/spring/domain/entity/RoleEntity.java index 222a6b1..640add0 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/RoleEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/RoleEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/RolePermissionEntity.java b/spring-security/src/main/java/com/spring/domain/entity/RolePermissionEntity.java index 12d5b5b..4774931 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/RolePermissionEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/RolePermissionEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/RouterEntity.java b/spring-security/src/main/java/com/spring/domain/entity/RouterEntity.java index 2203ec0..86e4a42 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/RouterEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/RouterEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/RouterRoleEntity.java b/spring-security/src/main/java/com/spring/domain/entity/RouterRoleEntity.java index ecc00e2..6b3a691 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/RouterRoleEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/RouterRoleEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/UserDeptEntity.java b/spring-security/src/main/java/com/spring/domain/entity/UserDeptEntity.java index 348e792..aef437e 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/UserDeptEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/UserDeptEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/UserEntity.java b/spring-security/src/main/java/com/spring/domain/entity/UserEntity.java index aee4b8d..4d3175f 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/UserEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/UserEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/UserLoginEntity.java b/spring-security/src/main/java/com/spring/domain/entity/UserLoginEntity.java index e1d1c67..6fde138 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/UserLoginEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/UserLoginEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/entity/UserRoleEntity.java b/spring-security/src/main/java/com/spring/domain/entity/UserRoleEntity.java index ce401de..d66f931 100644 --- a/spring-security/src/main/java/com/spring/domain/entity/UserRoleEntity.java +++ b/spring-security/src/main/java/com/spring/domain/entity/UserRoleEntity.java @@ -1,17 +1,14 @@ package com.spring.domain.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/src/main/java/com/spring/domain/vo/DeptVo.java b/spring-security/src/main/java/com/spring/domain/vo/DeptVo.java index 4c3d6ed..dafe312 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/DeptVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/DeptVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/EmailTemplateVo.java b/spring-security/src/main/java/com/spring/domain/vo/EmailTemplateVo.java index 3df4062..e006209 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/EmailTemplateVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/EmailTemplateVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/EmailUsersVo.java b/spring-security/src/main/java/com/spring/domain/vo/EmailUsersVo.java index b6fc656..fc1038f 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/EmailUsersVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/EmailUsersVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/FilesPartDetailVo.java b/spring-security/src/main/java/com/spring/domain/vo/FilesPartDetailVo.java index c80917d..e8368ea 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/FilesPartDetailVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/FilesPartDetailVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/FilesVo.java b/spring-security/src/main/java/com/spring/domain/vo/FilesVo.java index 27cb0d2..3e8faf6 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/FilesVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/FilesVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/I18nTypeVo.java b/spring-security/src/main/java/com/spring/domain/vo/I18nTypeVo.java index 30d6c8e..75ba159 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/I18nTypeVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/I18nTypeVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/I18nVo.java b/spring-security/src/main/java/com/spring/domain/vo/I18nVo.java index 5064b8a..dd42bdd 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/I18nVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/I18nVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/MenuIconVo.java b/spring-security/src/main/java/com/spring/domain/vo/MenuIconVo.java index 9cedf50..bdaa498 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/MenuIconVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/MenuIconVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/MessageReceivedVo.java b/spring-security/src/main/java/com/spring/domain/vo/MessageReceivedVo.java index abcff69..4ea6267 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/MessageReceivedVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/MessageReceivedVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/MessageTypeVo.java b/spring-security/src/main/java/com/spring/domain/vo/MessageTypeVo.java index 73006fb..7291755 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/MessageTypeVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/MessageTypeVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/MessageVo.java b/spring-security/src/main/java/com/spring/domain/vo/MessageVo.java index 5028a0e..ebe4f4e 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/MessageVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/MessageVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/PermissionVo.java b/spring-security/src/main/java/com/spring/domain/vo/PermissionVo.java index 0de995d..e468819 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/PermissionVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/PermissionVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/RolePermissionVo.java b/spring-security/src/main/java/com/spring/domain/vo/RolePermissionVo.java index 9792d82..fd8f610 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/RolePermissionVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/RolePermissionVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/RoleVo.java b/spring-security/src/main/java/com/spring/domain/vo/RoleVo.java index 4fce1e3..77a6198 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/RoleVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/RoleVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/RouterRoleVo.java b/spring-security/src/main/java/com/spring/domain/vo/RouterRoleVo.java index 19f0466..ab3dc81 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/RouterRoleVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/RouterRoleVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/RouterVo.java b/spring-security/src/main/java/com/spring/domain/vo/RouterVo.java index e050c14..50e2db4 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/RouterVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/RouterVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/UserDeptVo.java b/spring-security/src/main/java/com/spring/domain/vo/UserDeptVo.java index 7a18862..9938d1a 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/UserDeptVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/UserDeptVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/UserLoginVo.java b/spring-security/src/main/java/com/spring/domain/vo/UserLoginVo.java index dc160c4..c3a16a3 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/UserLoginVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/UserLoginVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/UserRoleVo.java b/spring-security/src/main/java/com/spring/domain/vo/UserRoleVo.java index 3add591..2b6b87a 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/UserRoleVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/UserRoleVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/domain/vo/UserVo.java b/spring-security/src/main/java/com/spring/domain/vo/UserVo.java index 2837b89..ae9570c 100644 --- a/spring-security/src/main/java/com/spring/domain/vo/UserVo.java +++ b/spring-security/src/main/java/com/spring/domain/vo/UserVo.java @@ -1,11 +1,7 @@ package com.spring.domain.vo; -import java.util.Date; -import java.math.BigDecimal; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/spring-security/src/main/java/com/spring/mapper/DeptMapper.java b/spring-security/src/main/java/com/spring/mapper/DeptMapper.java index ce8e19d..8bebd64 100644 --- a/spring-security/src/main/java/com/spring/mapper/DeptMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/DeptMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.DeptDto; +import com.spring.domain.dto.system.DeptDto; import com.spring.domain.entity.DeptEntity; import com.spring.domain.vo.DeptVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/EmailTemplateMapper.java b/spring-security/src/main/java/com/spring/mapper/EmailTemplateMapper.java index ae49488..aa65ff7 100644 --- a/spring-security/src/main/java/com/spring/mapper/EmailTemplateMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/EmailTemplateMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.EmailTemplateDto; +import com.spring.domain.dto.system.EmailTemplateDto; import com.spring.domain.entity.EmailTemplateEntity; import com.spring.domain.vo.EmailTemplateVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/EmailUsersMapper.java b/spring-security/src/main/java/com/spring/mapper/EmailUsersMapper.java index 57adb08..646f602 100644 --- a/spring-security/src/main/java/com/spring/mapper/EmailUsersMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/EmailUsersMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.EmailUsersDto; +import com.spring.domain.dto.system.EmailUsersDto; import com.spring.domain.entity.EmailUsersEntity; import com.spring.domain.vo.EmailUsersVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/FilesMapper.java b/spring-security/src/main/java/com/spring/mapper/FilesMapper.java index a1d41af..b1ee1f9 100644 --- a/spring-security/src/main/java/com/spring/mapper/FilesMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/FilesMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.FilesDto; +import com.spring.domain.dto.system.FilesDto; import com.spring.domain.entity.FilesEntity; import com.spring.domain.vo.FilesVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/FilesPartDetailMapper.java b/spring-security/src/main/java/com/spring/mapper/FilesPartDetailMapper.java index c94231a..d533b3d 100644 --- a/spring-security/src/main/java/com/spring/mapper/FilesPartDetailMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/FilesPartDetailMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.FilesPartDetailDto; +import com.spring.domain.dto.system.FilesPartDetailDto; import com.spring.domain.entity.FilesPartDetailEntity; import com.spring.domain.vo.FilesPartDetailVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/I18nMapper.java b/spring-security/src/main/java/com/spring/mapper/I18nMapper.java index bbeff00..e0bd3a9 100644 --- a/spring-security/src/main/java/com/spring/mapper/I18nMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/I18nMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.I18nDto; +import com.spring.domain.dto.system.I18nDto; import com.spring.domain.entity.I18nEntity; import com.spring.domain.vo.I18nVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/I18nTypeMapper.java b/spring-security/src/main/java/com/spring/mapper/I18nTypeMapper.java index 151c8cd..fd6a9fd 100644 --- a/spring-security/src/main/java/com/spring/mapper/I18nTypeMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/I18nTypeMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.I18nTypeDto; +import com.spring.domain.dto.system.I18nTypeDto; import com.spring.domain.entity.I18nTypeEntity; import com.spring.domain.vo.I18nTypeVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/MenuIconMapper.java b/spring-security/src/main/java/com/spring/mapper/MenuIconMapper.java index fa1640a..fe4d7be 100644 --- a/spring-security/src/main/java/com/spring/mapper/MenuIconMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/MenuIconMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.MenuIconDto; +import com.spring.domain.dto.system.MenuIconDto; import com.spring.domain.entity.MenuIconEntity; import com.spring.domain.vo.MenuIconVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/MessageMapper.java b/spring-security/src/main/java/com/spring/mapper/MessageMapper.java index d42927e..309362d 100644 --- a/spring-security/src/main/java/com/spring/mapper/MessageMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/MessageMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.MessageDto; +import com.spring.domain.dto.system.MessageDto; import com.spring.domain.entity.MessageEntity; import com.spring.domain.vo.MessageVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/MessageReceivedMapper.java b/spring-security/src/main/java/com/spring/mapper/MessageReceivedMapper.java index 1338864..2b563bc 100644 --- a/spring-security/src/main/java/com/spring/mapper/MessageReceivedMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/MessageReceivedMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.MessageReceivedDto; +import com.spring.domain.dto.system.MessageReceivedDto; import com.spring.domain.entity.MessageReceivedEntity; import com.spring.domain.vo.MessageReceivedVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/MessageTypeMapper.java b/spring-security/src/main/java/com/spring/mapper/MessageTypeMapper.java index be839f4..53d8180 100644 --- a/spring-security/src/main/java/com/spring/mapper/MessageTypeMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/MessageTypeMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.MessageTypeDto; +import com.spring.domain.dto.system.MessageTypeDto; import com.spring.domain.entity.MessageTypeEntity; import com.spring.domain.vo.MessageTypeVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/PermissionMapper.java b/spring-security/src/main/java/com/spring/mapper/PermissionMapper.java index 67c0bff..8d3ee4d 100644 --- a/spring-security/src/main/java/com/spring/mapper/PermissionMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/PermissionMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.PermissionDto; +import com.spring.domain.dto.system.PermissionDto; import com.spring.domain.entity.PermissionEntity; import com.spring.domain.vo.PermissionVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/RoleMapper.java b/spring-security/src/main/java/com/spring/mapper/RoleMapper.java index c27621c..b0f0602 100644 --- a/spring-security/src/main/java/com/spring/mapper/RoleMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/RoleMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.RoleDto; +import com.spring.domain.dto.system.RoleDto; import com.spring.domain.entity.RoleEntity; import com.spring.domain.vo.RoleVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/RolePermissionMapper.java b/spring-security/src/main/java/com/spring/mapper/RolePermissionMapper.java index 5a958e6..653cd97 100644 --- a/spring-security/src/main/java/com/spring/mapper/RolePermissionMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/RolePermissionMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.RolePermissionDto; +import com.spring.domain.dto.system.RolePermissionDto; import com.spring.domain.entity.RolePermissionEntity; import com.spring.domain.vo.RolePermissionVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/RouterMapper.java b/spring-security/src/main/java/com/spring/mapper/RouterMapper.java index 0604b8d..9272b87 100644 --- a/spring-security/src/main/java/com/spring/mapper/RouterMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/RouterMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.RouterDto; +import com.spring.domain.dto.system.RouterDto; import com.spring.domain.entity.RouterEntity; import com.spring.domain.vo.RouterVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/RouterRoleMapper.java b/spring-security/src/main/java/com/spring/mapper/RouterRoleMapper.java index 2659477..35a1d6e 100644 --- a/spring-security/src/main/java/com/spring/mapper/RouterRoleMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/RouterRoleMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.RouterRoleDto; +import com.spring.domain.dto.system.RouterRoleDto; import com.spring.domain.entity.RouterRoleEntity; import com.spring.domain.vo.RouterRoleVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/UserDeptMapper.java b/spring-security/src/main/java/com/spring/mapper/UserDeptMapper.java index f5d098f..2366d2f 100644 --- a/spring-security/src/main/java/com/spring/mapper/UserDeptMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/UserDeptMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.UserDeptDto; +import com.spring.domain.dto.system.UserDeptDto; import com.spring.domain.entity.UserDeptEntity; import com.spring.domain.vo.UserDeptVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/UserLoginMapper.java b/spring-security/src/main/java/com/spring/mapper/UserLoginMapper.java index 7adbb58..e43e0c7 100644 --- a/spring-security/src/main/java/com/spring/mapper/UserLoginMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/UserLoginMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.UserLoginDto; +import com.spring.domain.dto.system.UserLoginDto; import com.spring.domain.entity.UserLoginEntity; import com.spring.domain.vo.UserLoginVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/UserMapper.java b/spring-security/src/main/java/com/spring/mapper/UserMapper.java index fadfa9e..82f43ef 100644 --- a/spring-security/src/main/java/com/spring/mapper/UserMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/UserMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.UserDto; +import com.spring.domain.dto.system.UserDto; import com.spring.domain.entity.UserEntity; import com.spring.domain.vo.UserVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/mapper/UserRoleMapper.java b/spring-security/src/main/java/com/spring/mapper/UserRoleMapper.java index 0cbf408..184b03b 100644 --- a/spring-security/src/main/java/com/spring/mapper/UserRoleMapper.java +++ b/spring-security/src/main/java/com/spring/mapper/UserRoleMapper.java @@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.UserRoleDto; +import com.spring.domain.dto.system.UserRoleDto; import com.spring.domain.entity.UserRoleEntity; import com.spring.domain.vo.UserRoleVo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import java.util.List; /** *

diff --git a/spring-security/src/main/java/com/spring/service/DeptService.java b/spring-security/src/main/java/com/spring/service/system/DeptService.java similarity index 82% rename from spring-security/src/main/java/com/spring/service/DeptService.java rename to spring-security/src/main/java/com/spring/service/system/DeptService.java index 584869b..5f29aae 100644 --- a/spring-security/src/main/java/com/spring/service/DeptService.java +++ b/spring-security/src/main/java/com/spring/service/system/DeptService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.DeptDto; +import com.spring.domain.dto.system.DeptDto; import com.spring.domain.entity.DeptEntity; import com.spring.domain.vo.DeptVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/EmailTemplateService.java b/spring-security/src/main/java/com/spring/service/system/EmailTemplateService.java similarity index 83% rename from spring-security/src/main/java/com/spring/service/EmailTemplateService.java rename to spring-security/src/main/java/com/spring/service/system/EmailTemplateService.java index dc16177..ae5344f 100644 --- a/spring-security/src/main/java/com/spring/service/EmailTemplateService.java +++ b/spring-security/src/main/java/com/spring/service/system/EmailTemplateService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.EmailTemplateDto; +import com.spring.domain.dto.system.EmailTemplateDto; import com.spring.domain.entity.EmailTemplateEntity; import com.spring.domain.vo.EmailTemplateVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/EmailUsersService.java b/spring-security/src/main/java/com/spring/service/system/EmailUsersService.java similarity index 83% rename from spring-security/src/main/java/com/spring/service/EmailUsersService.java rename to spring-security/src/main/java/com/spring/service/system/EmailUsersService.java index e0650af..0564d96 100644 --- a/spring-security/src/main/java/com/spring/service/EmailUsersService.java +++ b/spring-security/src/main/java/com/spring/service/system/EmailUsersService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.EmailUsersDto; +import com.spring.domain.dto.system.EmailUsersDto; import com.spring.domain.entity.EmailUsersEntity; import com.spring.domain.vo.EmailUsersVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/FilesPartDetailService.java b/spring-security/src/main/java/com/spring/service/system/FilesPartDetailService.java similarity index 86% rename from spring-security/src/main/java/com/spring/service/FilesPartDetailService.java rename to spring-security/src/main/java/com/spring/service/system/FilesPartDetailService.java index 041d87b..dfa83a1 100644 --- a/spring-security/src/main/java/com/spring/service/FilesPartDetailService.java +++ b/spring-security/src/main/java/com/spring/service/system/FilesPartDetailService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.FilesPartDetailDto; +import com.spring.domain.dto.system.FilesPartDetailDto; import com.spring.domain.entity.FilesPartDetailEntity; import com.spring.domain.vo.FilesPartDetailVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/FilesService.java b/spring-security/src/main/java/com/spring/service/system/FilesService.java similarity index 82% rename from spring-security/src/main/java/com/spring/service/FilesService.java rename to spring-security/src/main/java/com/spring/service/system/FilesService.java index 9761e72..8ab8193 100644 --- a/spring-security/src/main/java/com/spring/service/FilesService.java +++ b/spring-security/src/main/java/com/spring/service/system/FilesService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.FilesDto; +import com.spring.domain.dto.system.FilesDto; import com.spring.domain.entity.FilesEntity; import com.spring.domain.vo.FilesVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/I18nService.java b/spring-security/src/main/java/com/spring/service/system/I18nService.java similarity index 82% rename from spring-security/src/main/java/com/spring/service/I18nService.java rename to spring-security/src/main/java/com/spring/service/system/I18nService.java index 107b7ca..79ef7f5 100644 --- a/spring-security/src/main/java/com/spring/service/I18nService.java +++ b/spring-security/src/main/java/com/spring/service/system/I18nService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.I18nDto; +import com.spring.domain.dto.system.I18nDto; import com.spring.domain.entity.I18nEntity; import com.spring.domain.vo.I18nVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/I18nTypeService.java b/spring-security/src/main/java/com/spring/service/system/I18nTypeService.java similarity index 83% rename from spring-security/src/main/java/com/spring/service/I18nTypeService.java rename to spring-security/src/main/java/com/spring/service/system/I18nTypeService.java index d8e6046..9491d8c 100644 --- a/spring-security/src/main/java/com/spring/service/I18nTypeService.java +++ b/spring-security/src/main/java/com/spring/service/system/I18nTypeService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.I18nTypeDto; +import com.spring.domain.dto.system.I18nTypeDto; import com.spring.domain.entity.I18nTypeEntity; import com.spring.domain.vo.I18nTypeVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/MenuIconService.java b/spring-security/src/main/java/com/spring/service/system/MenuIconService.java similarity index 83% rename from spring-security/src/main/java/com/spring/service/MenuIconService.java rename to spring-security/src/main/java/com/spring/service/system/MenuIconService.java index 9deaed6..1f89acb 100644 --- a/spring-security/src/main/java/com/spring/service/MenuIconService.java +++ b/spring-security/src/main/java/com/spring/service/system/MenuIconService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.MenuIconDto; +import com.spring.domain.dto.system.MenuIconDto; import com.spring.domain.entity.MenuIconEntity; import com.spring.domain.vo.MenuIconVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/MessageReceivedService.java b/spring-security/src/main/java/com/spring/service/system/MessageReceivedService.java similarity index 82% rename from spring-security/src/main/java/com/spring/service/MessageReceivedService.java rename to spring-security/src/main/java/com/spring/service/system/MessageReceivedService.java index afa4e00..4cd6161 100644 --- a/spring-security/src/main/java/com/spring/service/MessageReceivedService.java +++ b/spring-security/src/main/java/com/spring/service/system/MessageReceivedService.java @@ -1,19 +1,17 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.MessageReceivedDto; +import com.spring.domain.dto.system.MessageReceivedDto; import com.spring.domain.entity.MessageReceivedEntity; import com.spring.domain.vo.MessageReceivedVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** *

- * 服务类 + * 服务类 *

* * @author Bunny diff --git a/spring-security/src/main/java/com/spring/service/MessageService.java b/spring-security/src/main/java/com/spring/service/system/MessageService.java similarity index 82% rename from spring-security/src/main/java/com/spring/service/MessageService.java rename to spring-security/src/main/java/com/spring/service/system/MessageService.java index b14c5d1..2b24179 100644 --- a/spring-security/src/main/java/com/spring/service/MessageService.java +++ b/spring-security/src/main/java/com/spring/service/system/MessageService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.MessageDto; +import com.spring.domain.dto.system.MessageDto; import com.spring.domain.entity.MessageEntity; import com.spring.domain.vo.MessageVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/MessageTypeService.java b/spring-security/src/main/java/com/spring/service/system/MessageTypeService.java similarity index 83% rename from spring-security/src/main/java/com/spring/service/MessageTypeService.java rename to spring-security/src/main/java/com/spring/service/system/MessageTypeService.java index efd63f8..ad05096 100644 --- a/spring-security/src/main/java/com/spring/service/MessageTypeService.java +++ b/spring-security/src/main/java/com/spring/service/system/MessageTypeService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.MessageTypeDto; +import com.spring.domain.dto.system.MessageTypeDto; import com.spring.domain.entity.MessageTypeEntity; import com.spring.domain.vo.MessageTypeVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/PermissionService.java b/spring-security/src/main/java/com/spring/service/system/PermissionService.java similarity index 83% rename from spring-security/src/main/java/com/spring/service/PermissionService.java rename to spring-security/src/main/java/com/spring/service/system/PermissionService.java index 7e43e02..6872bf9 100644 --- a/spring-security/src/main/java/com/spring/service/PermissionService.java +++ b/spring-security/src/main/java/com/spring/service/system/PermissionService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.PermissionDto; +import com.spring.domain.dto.system.PermissionDto; import com.spring.domain.entity.PermissionEntity; import com.spring.domain.vo.PermissionVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/RolePermissionService.java b/spring-security/src/main/java/com/spring/service/system/RolePermissionService.java similarity index 84% rename from spring-security/src/main/java/com/spring/service/RolePermissionService.java rename to spring-security/src/main/java/com/spring/service/system/RolePermissionService.java index d1afbdd..13027e4 100644 --- a/spring-security/src/main/java/com/spring/service/RolePermissionService.java +++ b/spring-security/src/main/java/com/spring/service/system/RolePermissionService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.RolePermissionDto; +import com.spring.domain.dto.system.RolePermissionDto; import com.spring.domain.entity.RolePermissionEntity; import com.spring.domain.vo.RolePermissionVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/RoleService.java b/spring-security/src/main/java/com/spring/service/system/RoleService.java similarity index 82% rename from spring-security/src/main/java/com/spring/service/RoleService.java rename to spring-security/src/main/java/com/spring/service/system/RoleService.java index ea7477d..2c8fb2d 100644 --- a/spring-security/src/main/java/com/spring/service/RoleService.java +++ b/spring-security/src/main/java/com/spring/service/system/RoleService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.RoleDto; +import com.spring.domain.dto.system.RoleDto; import com.spring.domain.entity.RoleEntity; import com.spring.domain.vo.RoleVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/RouterRoleService.java b/spring-security/src/main/java/com/spring/service/system/RouterRoleService.java similarity index 84% rename from spring-security/src/main/java/com/spring/service/RouterRoleService.java rename to spring-security/src/main/java/com/spring/service/system/RouterRoleService.java index eadd880..605eec6 100644 --- a/spring-security/src/main/java/com/spring/service/RouterRoleService.java +++ b/spring-security/src/main/java/com/spring/service/system/RouterRoleService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.RouterRoleDto; +import com.spring.domain.dto.system.RouterRoleDto; import com.spring.domain.entity.RouterRoleEntity; import com.spring.domain.vo.RouterRoleVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/RouterService.java b/spring-security/src/main/java/com/spring/service/system/RouterService.java similarity index 82% rename from spring-security/src/main/java/com/spring/service/RouterService.java rename to spring-security/src/main/java/com/spring/service/system/RouterService.java index 4e76905..69d12d3 100644 --- a/spring-security/src/main/java/com/spring/service/RouterService.java +++ b/spring-security/src/main/java/com/spring/service/system/RouterService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.RouterDto; +import com.spring.domain.dto.system.RouterDto; import com.spring.domain.entity.RouterEntity; import com.spring.domain.vo.RouterVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/UserDeptService.java b/spring-security/src/main/java/com/spring/service/system/UserDeptService.java similarity index 83% rename from spring-security/src/main/java/com/spring/service/UserDeptService.java rename to spring-security/src/main/java/com/spring/service/system/UserDeptService.java index 7417450..9feca96 100644 --- a/spring-security/src/main/java/com/spring/service/UserDeptService.java +++ b/spring-security/src/main/java/com/spring/service/system/UserDeptService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.UserDeptDto; +import com.spring.domain.dto.system.UserDeptDto; import com.spring.domain.entity.UserDeptEntity; import com.spring.domain.vo.UserDeptVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/UserLoginService.java b/spring-security/src/main/java/com/spring/service/system/UserLoginService.java similarity index 83% rename from spring-security/src/main/java/com/spring/service/UserLoginService.java rename to spring-security/src/main/java/com/spring/service/system/UserLoginService.java index c81c7b7..fbe1d60 100644 --- a/spring-security/src/main/java/com/spring/service/UserLoginService.java +++ b/spring-security/src/main/java/com/spring/service/system/UserLoginService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.UserLoginDto; +import com.spring.domain.dto.system.UserLoginDto; import com.spring.domain.entity.UserLoginEntity; import com.spring.domain.vo.UserLoginVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/UserRoleService.java b/spring-security/src/main/java/com/spring/service/system/UserRoleService.java similarity index 84% rename from spring-security/src/main/java/com/spring/service/UserRoleService.java rename to spring-security/src/main/java/com/spring/service/system/UserRoleService.java index aa182b6..2cfdd13 100644 --- a/spring-security/src/main/java/com/spring/service/UserRoleService.java +++ b/spring-security/src/main/java/com/spring/service/system/UserRoleService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.UserRoleDto; +import com.spring.domain.dto.system.UserRoleDto; import com.spring.domain.entity.UserRoleEntity; import com.spring.domain.vo.UserRoleVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/UserService.java b/spring-security/src/main/java/com/spring/service/system/UserService.java similarity index 82% rename from spring-security/src/main/java/com/spring/service/UserService.java rename to spring-security/src/main/java/com/spring/service/system/UserService.java index 0abe10e..35939ae 100644 --- a/spring-security/src/main/java/com/spring/service/UserService.java +++ b/spring-security/src/main/java/com/spring/service/system/UserService.java @@ -1,14 +1,12 @@ -package com.spring.service; +package com.spring.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.UserDto; +import com.spring.domain.dto.system.UserDto; import com.spring.domain.entity.UserEntity; import com.spring.domain.vo.UserVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; + import java.util.List; /** diff --git a/spring-security/src/main/java/com/spring/service/impl/DeptServiceImpl.java b/spring-security/src/main/java/com/spring/service/system/impl/DeptServiceImpl.java similarity index 85% rename from spring-security/src/main/java/com/spring/service/impl/DeptServiceImpl.java rename to spring-security/src/main/java/com/spring/service/system/impl/DeptServiceImpl.java index 0dc87e9..1131a11 100644 --- a/spring-security/src/main/java/com/spring/service/impl/DeptServiceImpl.java +++ b/spring-security/src/main/java/com/spring/service/system/impl/DeptServiceImpl.java @@ -1,20 +1,18 @@ -package com.spring.service.impl; +package com.spring.service.system.impl; -import com.spring.mapper.DeptMapper; -import com.spring.service.DeptService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.spring.service.DeptService; -import com.spring.domain.dto.DeptDto; +import com.spring.domain.dto.system.DeptDto; import com.spring.domain.entity.DeptEntity; import com.spring.domain.vo.DeptVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.mapper.DeptMapper; +import com.spring.service.system.DeptService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.util.List; /** @@ -55,7 +53,7 @@ public class DeptServiceImpl extends ServiceImpl impleme */ @Override public void addDept(DeptDto dto) { - DeptEntity dept = new DeptEntity(); + DeptEntity dept = new DeptEntity(); BeanUtils.copyProperties(dto, dept); save(dept); } @@ -67,7 +65,7 @@ public class DeptServiceImpl extends ServiceImpl impleme */ @Override public void updateDept(DeptDto dto) { - DeptEntity dept = new DeptEntity(); + DeptEntity dept = new DeptEntity(); BeanUtils.copyProperties(dto, dept); updateById(dept); } diff --git a/spring-security/src/main/java/com/spring/service/impl/EmailTemplateServiceImpl.java b/spring-security/src/main/java/com/spring/service/system/impl/EmailTemplateServiceImpl.java similarity index 84% rename from spring-security/src/main/java/com/spring/service/impl/EmailTemplateServiceImpl.java rename to spring-security/src/main/java/com/spring/service/system/impl/EmailTemplateServiceImpl.java index ff372f5..0a92977 100644 --- a/spring-security/src/main/java/com/spring/service/impl/EmailTemplateServiceImpl.java +++ b/spring-security/src/main/java/com/spring/service/system/impl/EmailTemplateServiceImpl.java @@ -1,20 +1,18 @@ -package com.spring.service.impl; +package com.spring.service.system.impl; -import com.spring.mapper.EmailTemplateMapper; -import com.spring.service.EmailTemplateService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.spring.service.EmailTemplateService; -import com.spring.domain.dto.EmailTemplateDto; +import com.spring.domain.dto.system.EmailTemplateDto; import com.spring.domain.entity.EmailTemplateEntity; import com.spring.domain.vo.EmailTemplateVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.mapper.EmailTemplateMapper; +import com.spring.service.system.EmailTemplateService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.util.List; /** @@ -55,7 +53,7 @@ public class EmailTemplateServiceImpl extends ServiceImpl impl */ @Override public void addFiles(FilesDto dto) { - FilesEntity files = new FilesEntity(); + FilesEntity files = new FilesEntity(); BeanUtils.copyProperties(dto, files); save(files); } @@ -67,7 +65,7 @@ public class FilesServiceImpl extends ServiceImpl impl */ @Override public void updateFiles(FilesDto dto) { - FilesEntity files = new FilesEntity(); + FilesEntity files = new FilesEntity(); BeanUtils.copyProperties(dto, files); updateById(files); } diff --git a/spring-security/src/main/java/com/spring/service/impl/I18nServiceImpl.java b/spring-security/src/main/java/com/spring/service/system/impl/I18nServiceImpl.java similarity index 85% rename from spring-security/src/main/java/com/spring/service/impl/I18nServiceImpl.java rename to spring-security/src/main/java/com/spring/service/system/impl/I18nServiceImpl.java index 373f343..14a6095 100644 --- a/spring-security/src/main/java/com/spring/service/impl/I18nServiceImpl.java +++ b/spring-security/src/main/java/com/spring/service/system/impl/I18nServiceImpl.java @@ -1,20 +1,18 @@ -package com.spring.service.impl; +package com.spring.service.system.impl; -import com.spring.mapper.I18nMapper; -import com.spring.service.I18nService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.spring.service.I18nService; -import com.spring.domain.dto.I18nDto; +import com.spring.domain.dto.system.I18nDto; import com.spring.domain.entity.I18nEntity; import com.spring.domain.vo.I18nVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.mapper.I18nMapper; +import com.spring.service.system.I18nService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.util.List; /** @@ -55,7 +53,7 @@ public class I18nServiceImpl extends ServiceImpl impleme */ @Override public void addI18n(I18nDto dto) { - I18nEntity i18n = new I18nEntity(); + I18nEntity i18n = new I18nEntity(); BeanUtils.copyProperties(dto, i18n); save(i18n); } @@ -67,7 +65,7 @@ public class I18nServiceImpl extends ServiceImpl impleme */ @Override public void updateI18n(I18nDto dto) { - I18nEntity i18n = new I18nEntity(); + I18nEntity i18n = new I18nEntity(); BeanUtils.copyProperties(dto, i18n); updateById(i18n); } diff --git a/spring-security/src/main/java/com/spring/service/impl/I18nTypeServiceImpl.java b/spring-security/src/main/java/com/spring/service/system/impl/I18nTypeServiceImpl.java similarity index 85% rename from spring-security/src/main/java/com/spring/service/impl/I18nTypeServiceImpl.java rename to spring-security/src/main/java/com/spring/service/system/impl/I18nTypeServiceImpl.java index 9e2814d..755b7c9 100644 --- a/spring-security/src/main/java/com/spring/service/impl/I18nTypeServiceImpl.java +++ b/spring-security/src/main/java/com/spring/service/system/impl/I18nTypeServiceImpl.java @@ -1,20 +1,18 @@ -package com.spring.service.impl; +package com.spring.service.system.impl; -import com.spring.mapper.I18nTypeMapper; -import com.spring.service.I18nTypeService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.spring.service.I18nTypeService; -import com.spring.domain.dto.I18nTypeDto; +import com.spring.domain.dto.system.I18nTypeDto; import com.spring.domain.entity.I18nTypeEntity; import com.spring.domain.vo.I18nTypeVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.mapper.I18nTypeMapper; +import com.spring.service.system.I18nTypeService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.util.List; /** @@ -55,7 +53,7 @@ public class I18nTypeServiceImpl extends ServiceImpl - * 服务实现类 + * 服务实现类 *

* * @author Bunny @@ -55,7 +53,7 @@ public class MessageReceivedServiceImpl extends ServiceImpl impleme */ @Override public void addRole(RoleDto dto) { - RoleEntity role = new RoleEntity(); + RoleEntity role = new RoleEntity(); BeanUtils.copyProperties(dto, role); save(role); } @@ -67,7 +65,7 @@ public class RoleServiceImpl extends ServiceImpl impleme */ @Override public void updateRole(RoleDto dto) { - RoleEntity role = new RoleEntity(); + RoleEntity role = new RoleEntity(); BeanUtils.copyProperties(dto, role); updateById(role); } diff --git a/spring-security/src/main/java/com/spring/service/impl/RouterRoleServiceImpl.java b/spring-security/src/main/java/com/spring/service/system/impl/RouterRoleServiceImpl.java similarity index 85% rename from spring-security/src/main/java/com/spring/service/impl/RouterRoleServiceImpl.java rename to spring-security/src/main/java/com/spring/service/system/impl/RouterRoleServiceImpl.java index 5c1974b..36b2257 100644 --- a/spring-security/src/main/java/com/spring/service/impl/RouterRoleServiceImpl.java +++ b/spring-security/src/main/java/com/spring/service/system/impl/RouterRoleServiceImpl.java @@ -1,20 +1,18 @@ -package com.spring.service.impl; +package com.spring.service.system.impl; -import com.spring.mapper.RouterRoleMapper; -import com.spring.service.RouterRoleService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.spring.service.RouterRoleService; -import com.spring.domain.dto.RouterRoleDto; +import com.spring.domain.dto.system.RouterRoleDto; import com.spring.domain.entity.RouterRoleEntity; import com.spring.domain.vo.RouterRoleVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.mapper.RouterRoleMapper; +import com.spring.service.system.RouterRoleService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.util.List; /** @@ -55,7 +53,7 @@ public class RouterRoleServiceImpl extends ServiceImpl i */ @Override public void addRouter(RouterDto dto) { - RouterEntity router = new RouterEntity(); + RouterEntity router = new RouterEntity(); BeanUtils.copyProperties(dto, router); save(router); } @@ -67,7 +65,7 @@ public class RouterServiceImpl extends ServiceImpl i */ @Override public void updateRouter(RouterDto dto) { - RouterEntity router = new RouterEntity(); + RouterEntity router = new RouterEntity(); BeanUtils.copyProperties(dto, router); updateById(router); } diff --git a/spring-security/src/main/java/com/spring/service/impl/UserDeptServiceImpl.java b/spring-security/src/main/java/com/spring/service/system/impl/UserDeptServiceImpl.java similarity index 85% rename from spring-security/src/main/java/com/spring/service/impl/UserDeptServiceImpl.java rename to spring-security/src/main/java/com/spring/service/system/impl/UserDeptServiceImpl.java index 68df562..2a4296d 100644 --- a/spring-security/src/main/java/com/spring/service/impl/UserDeptServiceImpl.java +++ b/spring-security/src/main/java/com/spring/service/system/impl/UserDeptServiceImpl.java @@ -1,20 +1,18 @@ -package com.spring.service.impl; +package com.spring.service.system.impl; -import com.spring.mapper.UserDeptMapper; -import com.spring.service.UserDeptService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.spring.service.UserDeptService; -import com.spring.domain.dto.UserDeptDto; +import com.spring.domain.dto.system.UserDeptDto; import com.spring.domain.entity.UserDeptEntity; import com.spring.domain.vo.UserDeptVo; import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; +import com.spring.mapper.UserDeptMapper; +import com.spring.service.system.UserDeptService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.util.List; /** @@ -55,7 +53,7 @@ public class UserDeptServiceImpl extends ServiceImpl impleme */ @Override public void addUser(UserDto dto) { - UserEntity user = new UserEntity(); + UserEntity user = new UserEntity(); BeanUtils.copyProperties(dto, user); save(user); } @@ -67,7 +65,7 @@ public class UserServiceImpl extends ServiceImpl impleme */ @Override public void updateUser(UserDto dto) { - UserEntity user = new UserEntity(); + UserEntity user = new UserEntity(); BeanUtils.copyProperties(dto, user); updateById(user); }