From 5bbf9113c85c36004d389e04735caca75834bd02 Mon Sep 17 00:00:00 2001 From: lensferno Date: Mon, 22 Aug 2022 17:03:02 +0800 Subject: [PATCH] reformat code --- .../java/net/lensfrex/dscape/ServerMain.java | 8 ++--- .../dscape/auth/StpInterfaceImpl.java | 4 --- .../dscape/configure/GlobalConstant.java | 2 +- .../lensfrex/dscape/dao/entity/BlackList.java | 13 ++++---- .../dscape/dao/entity/ComputeHistory.java | 10 +++--- .../dscape/dao/entity/PatientData.java | 11 ++++--- .../dscape/dao/entity/RegisterApplies.java | 11 ++++--- .../dscape/dao/entity/RolePermission.java | 11 ++++--- .../lensfrex/dscape/dao/entity/UserBasic.java | 11 ++++--- .../lensfrex/dscape/dao/entity/UserRole.java | 11 ++++--- .../dscape/dao/mapper/BlackListMapper.java | 8 ++--- .../dao/mapper/ComputeHistoryMapper.java | 2 +- .../dscape/dao/mapper/PatientDataMapper.java | 2 +- .../dao/mapper/RegisterAppliesMapper.java | 8 ++--- .../dao/mapper/RolePermissionMapper.java | 8 ++--- .../dscape/dao/mapper/UserBasicMapper.java | 8 ++--- .../dscape/dao/mapper/UserRoleMapper.java | 8 ++--- .../dscape/dao/service/BlackListService.java | 6 ++-- .../dao/service/ComputeHistoryService.java | 2 +- .../dao/service/PatientDataService.java | 2 +- .../dao/service/RegisterAppliesService.java | 6 ++-- .../dao/service/RolePermissionService.java | 6 ++-- .../dscape/dao/service/UserBasicService.java | 7 ++-- .../dscape/dao/service/UserRoleService.java | 5 +-- .../impl/ComputeHistoryServiceImpl.java | 2 +- .../impl/RolePermissionServiceImpl.java | 3 +- .../dao/service/impl/UserRoleServiceImpl.java | 2 -- .../dto/request/UserLoginRequestBody.java | 3 -- .../compute/ComputeHistoryResponseData.java | 10 +++--- .../data/user/RegisterResponseBody.java | 3 +- .../dscape/dto/response/general/Response.java | 32 +++++++++---------- .../dto/response/general/ResponseCode.java | 3 +- .../dscape/enums/user/BlackListTypeEnum.java | 3 +- .../dscape/enums/user/UserRoleEnum.java | 3 +- .../handler/GlobalExceptionHandler.java | 12 +++++++ .../dscape/utils/ObjectJsonSerializer.java | 5 --- .../dscape/utils/validate/TextCheckUtil.java | 2 ++ .../history/HistoryController.java | 2 +- .../web/controllers/user/UserController.java | 2 +- .../user/admin/AdminController.java | 2 +- .../web/service/data/HistoryService.java | 3 +- .../dscape/web/service/user/AdminService.java | 4 +-- .../dscape/web/service/user/UserService.java | 9 +++--- 43 files changed, 141 insertions(+), 134 deletions(-) diff --git a/src/main/java/net/lensfrex/dscape/ServerMain.java b/src/main/java/net/lensfrex/dscape/ServerMain.java index f38b681..0970567 100644 --- a/src/main/java/net/lensfrex/dscape/ServerMain.java +++ b/src/main/java/net/lensfrex/dscape/ServerMain.java @@ -4,14 +4,12 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.ComponentScans; @SpringBootApplication @MapperScan("net.lensfrex.dscape.dao.mapper") public class ServerMain extends SpringBootServletInitializer { - public static void main(String[] args) { - SpringApplication.run(ServerMain.class, args); - } + public static void main(String[] args) { + SpringApplication.run(ServerMain.class, args); + } } diff --git a/src/main/java/net/lensfrex/dscape/auth/StpInterfaceImpl.java b/src/main/java/net/lensfrex/dscape/auth/StpInterfaceImpl.java index 89d6623..b68b5c1 100644 --- a/src/main/java/net/lensfrex/dscape/auth/StpInterfaceImpl.java +++ b/src/main/java/net/lensfrex/dscape/auth/StpInterfaceImpl.java @@ -1,13 +1,9 @@ package net.lensfrex.dscape.auth; import cn.dev33.satoken.stp.StpInterface; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; -import net.lensfrex.dscape.dao.entity.RolePermission; -import net.lensfrex.dscape.dao.entity.UserRole; import net.lensfrex.dscape.dao.service.RolePermissionService; import net.lensfrex.dscape.dao.service.UserRoleService; -import net.lensfrex.dscape.dao.service.impl.UserRoleServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/lensfrex/dscape/configure/GlobalConstant.java b/src/main/java/net/lensfrex/dscape/configure/GlobalConstant.java index 32337fd..0333343 100644 --- a/src/main/java/net/lensfrex/dscape/configure/GlobalConstant.java +++ b/src/main/java/net/lensfrex/dscape/configure/GlobalConstant.java @@ -10,6 +10,6 @@ public class GlobalConstant { public static final String USERNAME_UID_CACHE_KEY = "dscape:user:uid"; public static final String REGISTER_INVITE_CODE_KEY = "dscape:user:inviteCodes"; - + public static final String ADMIN_INVITE_CODE_COUNTER_KEY = "dscape:admin:inviteCodeCounter:%s"; } diff --git a/src/main/java/net/lensfrex/dscape/dao/entity/BlackList.java b/src/main/java/net/lensfrex/dscape/dao/entity/BlackList.java index 7974d76..9fc24e0 100644 --- a/src/main/java/net/lensfrex/dscape/dao/entity/BlackList.java +++ b/src/main/java/net/lensfrex/dscape/dao/entity/BlackList.java @@ -1,16 +1,16 @@ package net.lensfrex.dscape.dao.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; -import java.util.Date; -import java.util.List; + import java.io.Serializable; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; +import java.util.Date; /** - * @description black_list * @author lensfrex + * @description black_list * @date 2022-08-19 */ @Data @@ -55,5 +55,6 @@ public class BlackList implements Serializable { @TableLogic private int isDeleted; - public BlackList() {} + public BlackList() { + } } \ No newline at end of file diff --git a/src/main/java/net/lensfrex/dscape/dao/entity/ComputeHistory.java b/src/main/java/net/lensfrex/dscape/dao/entity/ComputeHistory.java index f685db3..f95f3ac 100644 --- a/src/main/java/net/lensfrex/dscape/dao/entity/ComputeHistory.java +++ b/src/main/java/net/lensfrex/dscape/dao/entity/ComputeHistory.java @@ -1,13 +1,14 @@ package net.lensfrex.dscape.dao.entity; -import lombok.Data; -import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; /** - * @description compute_history * @author lensfrex + * @description compute_history * @date 2022-08-17 */ @Data @@ -31,5 +32,6 @@ public class ComputeHistory implements Serializable { */ private Long rid; - public ComputeHistory() {} + public ComputeHistory() { + } } \ No newline at end of file diff --git a/src/main/java/net/lensfrex/dscape/dao/entity/PatientData.java b/src/main/java/net/lensfrex/dscape/dao/entity/PatientData.java index da6f870..93399ad 100644 --- a/src/main/java/net/lensfrex/dscape/dao/entity/PatientData.java +++ b/src/main/java/net/lensfrex/dscape/dao/entity/PatientData.java @@ -1,16 +1,16 @@ package net.lensfrex.dscape.dao.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; + import java.io.Serializable; import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; - /** - * @description patient_data * @author lensfrex + * @description patient_data * @date 2022-08-17 */ @Data @@ -65,5 +65,6 @@ public class PatientData implements Serializable { @TableLogic private int isDeleted; - public PatientData() {} + public PatientData() { + } } \ No newline at end of file diff --git a/src/main/java/net/lensfrex/dscape/dao/entity/RegisterApplies.java b/src/main/java/net/lensfrex/dscape/dao/entity/RegisterApplies.java index bd8a924..30f43e8 100644 --- a/src/main/java/net/lensfrex/dscape/dao/entity/RegisterApplies.java +++ b/src/main/java/net/lensfrex/dscape/dao/entity/RegisterApplies.java @@ -1,16 +1,16 @@ package net.lensfrex.dscape.dao.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; -import java.time.LocalDateTime; import java.io.Serializable; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; /** - * @description register_applies * @author lensfrex + * @description register_applies * @date 2022-08-18 */ @Data @@ -55,5 +55,6 @@ public class RegisterApplies implements Serializable { @TableLogic private int isDeleted; - public RegisterApplies() {} + public RegisterApplies() { + } } \ No newline at end of file diff --git a/src/main/java/net/lensfrex/dscape/dao/entity/RolePermission.java b/src/main/java/net/lensfrex/dscape/dao/entity/RolePermission.java index 0b12f9e..8a8402c 100644 --- a/src/main/java/net/lensfrex/dscape/dao/entity/RolePermission.java +++ b/src/main/java/net/lensfrex/dscape/dao/entity/RolePermission.java @@ -1,16 +1,16 @@ package net.lensfrex.dscape.dao.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; -import java.time.LocalDateTime; import java.io.Serializable; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; /** - * @description role_permission * @author lensfrex + * @description role_permission * @date 2022-08-17 */ @Data @@ -50,5 +50,6 @@ public class RolePermission implements Serializable { @TableLogic private int isDeleted; - public RolePermission() {} + public RolePermission() { + } } \ No newline at end of file diff --git a/src/main/java/net/lensfrex/dscape/dao/entity/UserBasic.java b/src/main/java/net/lensfrex/dscape/dao/entity/UserBasic.java index 9cee60d..d9e0863 100644 --- a/src/main/java/net/lensfrex/dscape/dao/entity/UserBasic.java +++ b/src/main/java/net/lensfrex/dscape/dao/entity/UserBasic.java @@ -1,16 +1,16 @@ package net.lensfrex.dscape.dao.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; -import java.time.LocalDateTime; import java.io.Serializable; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; /** - * @description user_basic * @author lensfrex + * @description user_basic * @date 2022-08-18 */ @Data @@ -70,5 +70,6 @@ public class UserBasic implements Serializable { @TableLogic private int isDeleted; - public UserBasic() {} + public UserBasic() { + } } \ No newline at end of file diff --git a/src/main/java/net/lensfrex/dscape/dao/entity/UserRole.java b/src/main/java/net/lensfrex/dscape/dao/entity/UserRole.java index f08a604..5564ce7 100644 --- a/src/main/java/net/lensfrex/dscape/dao/entity/UserRole.java +++ b/src/main/java/net/lensfrex/dscape/dao/entity/UserRole.java @@ -1,16 +1,16 @@ package net.lensfrex.dscape.dao.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; + import java.io.Serializable; import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; - /** - * @description user_role * @author lensfrex + * @description user_role * @date 2022-08-17 */ @Data @@ -50,5 +50,6 @@ public class UserRole implements Serializable { @TableLogic private int isDeleted; - public UserRole() {} + public UserRole() { + } } \ No newline at end of file diff --git a/src/main/java/net/lensfrex/dscape/dao/mapper/BlackListMapper.java b/src/main/java/net/lensfrex/dscape/dao/mapper/BlackListMapper.java index 8061560..ff0a084 100644 --- a/src/main/java/net/lensfrex/dscape/dao/mapper/BlackListMapper.java +++ b/src/main/java/net/lensfrex/dscape/dao/mapper/BlackListMapper.java @@ -1,12 +1,12 @@ package net.lensfrex.dscape.dao.mapper; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; import net.lensfrex.dscape.dao.entity.BlackList; -import java.util.List; +import org.apache.ibatis.annotations.Mapper; + /** - * @description black_listMapper * @author lensfrex + * @description black_listMapper * @date 2022-08-19 */ @Mapper diff --git a/src/main/java/net/lensfrex/dscape/dao/mapper/ComputeHistoryMapper.java b/src/main/java/net/lensfrex/dscape/dao/mapper/ComputeHistoryMapper.java index 3fa585e..4c9aa5b 100644 --- a/src/main/java/net/lensfrex/dscape/dao/mapper/ComputeHistoryMapper.java +++ b/src/main/java/net/lensfrex/dscape/dao/mapper/ComputeHistoryMapper.java @@ -1,8 +1,8 @@ package net.lensfrex.dscape.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import net.lensfrex.dscape.dao.entity.ComputeHistory; +import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/net/lensfrex/dscape/dao/mapper/PatientDataMapper.java b/src/main/java/net/lensfrex/dscape/dao/mapper/PatientDataMapper.java index 3af0928..563fe5d 100644 --- a/src/main/java/net/lensfrex/dscape/dao/mapper/PatientDataMapper.java +++ b/src/main/java/net/lensfrex/dscape/dao/mapper/PatientDataMapper.java @@ -1,8 +1,8 @@ package net.lensfrex.dscape.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import net.lensfrex.dscape.dao.entity.PatientData; +import org.apache.ibatis.annotations.Mapper; /** * @author lensfrex diff --git a/src/main/java/net/lensfrex/dscape/dao/mapper/RegisterAppliesMapper.java b/src/main/java/net/lensfrex/dscape/dao/mapper/RegisterAppliesMapper.java index 9830ffd..a40b82c 100644 --- a/src/main/java/net/lensfrex/dscape/dao/mapper/RegisterAppliesMapper.java +++ b/src/main/java/net/lensfrex/dscape/dao/mapper/RegisterAppliesMapper.java @@ -1,12 +1,12 @@ package net.lensfrex.dscape.dao.mapper; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; import net.lensfrex.dscape.dao.entity.RegisterApplies; -import java.util.List; +import org.apache.ibatis.annotations.Mapper; + /** - * @description register_appliesMapper * @author lensfrex + * @description register_appliesMapper * @date 2022-08-18 */ @Mapper diff --git a/src/main/java/net/lensfrex/dscape/dao/mapper/RolePermissionMapper.java b/src/main/java/net/lensfrex/dscape/dao/mapper/RolePermissionMapper.java index 2bf3b05..e7b7f96 100644 --- a/src/main/java/net/lensfrex/dscape/dao/mapper/RolePermissionMapper.java +++ b/src/main/java/net/lensfrex/dscape/dao/mapper/RolePermissionMapper.java @@ -1,12 +1,12 @@ package net.lensfrex.dscape.dao.mapper; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; import net.lensfrex.dscape.dao.entity.RolePermission; -import java.util.List; +import org.apache.ibatis.annotations.Mapper; + /** - * @description role_permissionMapper * @author lensfrex + * @description role_permissionMapper * @date 2022-08-17 */ @Mapper diff --git a/src/main/java/net/lensfrex/dscape/dao/mapper/UserBasicMapper.java b/src/main/java/net/lensfrex/dscape/dao/mapper/UserBasicMapper.java index a1c2f2e..3838062 100644 --- a/src/main/java/net/lensfrex/dscape/dao/mapper/UserBasicMapper.java +++ b/src/main/java/net/lensfrex/dscape/dao/mapper/UserBasicMapper.java @@ -1,12 +1,12 @@ package net.lensfrex.dscape.dao.mapper; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; import net.lensfrex.dscape.dao.entity.UserBasic; -import java.util.List; +import org.apache.ibatis.annotations.Mapper; + /** - * @description user_basicMapper * @author lensfrex + * @description user_basicMapper * @date 2022-08-18 */ @Mapper diff --git a/src/main/java/net/lensfrex/dscape/dao/mapper/UserRoleMapper.java b/src/main/java/net/lensfrex/dscape/dao/mapper/UserRoleMapper.java index 69dd095..50edb3e 100644 --- a/src/main/java/net/lensfrex/dscape/dao/mapper/UserRoleMapper.java +++ b/src/main/java/net/lensfrex/dscape/dao/mapper/UserRoleMapper.java @@ -1,12 +1,12 @@ package net.lensfrex.dscape.dao.mapper; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; import net.lensfrex.dscape.dao.entity.UserRole; -import java.util.List; +import org.apache.ibatis.annotations.Mapper; + /** - * @description user_roleMapper * @author lensfrex + * @description user_roleMapper * @date 2022-08-17 */ @Mapper diff --git a/src/main/java/net/lensfrex/dscape/dao/service/BlackListService.java b/src/main/java/net/lensfrex/dscape/dao/service/BlackListService.java index 74d9840..5f56805 100644 --- a/src/main/java/net/lensfrex/dscape/dao/service/BlackListService.java +++ b/src/main/java/net/lensfrex/dscape/dao/service/BlackListService.java @@ -1,10 +1,12 @@ package net.lensfrex.dscape.dao.service; + +import com.baomidou.mybatisplus.extension.service.IService; import net.lensfrex.dscape.dao.entity.BlackList; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.IService; + /** - * @description black_list服务层 * @author lensfrex + * @description black_list服务层 * @date 2022-08-19 */ @Service diff --git a/src/main/java/net/lensfrex/dscape/dao/service/ComputeHistoryService.java b/src/main/java/net/lensfrex/dscape/dao/service/ComputeHistoryService.java index b93bae4..890379c 100644 --- a/src/main/java/net/lensfrex/dscape/dao/service/ComputeHistoryService.java +++ b/src/main/java/net/lensfrex/dscape/dao/service/ComputeHistoryService.java @@ -1,9 +1,9 @@ package net.lensfrex.dscape.dao.service; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import com.baomidou.mybatisplus.extension.service.IService; import net.lensfrex.dscape.dao.entity.ComputeHistory; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/src/main/java/net/lensfrex/dscape/dao/service/PatientDataService.java b/src/main/java/net/lensfrex/dscape/dao/service/PatientDataService.java index 40f656b..bc2118c 100644 --- a/src/main/java/net/lensfrex/dscape/dao/service/PatientDataService.java +++ b/src/main/java/net/lensfrex/dscape/dao/service/PatientDataService.java @@ -1,8 +1,8 @@ package net.lensfrex.dscape.dao.service; +import com.baomidou.mybatisplus.extension.service.IService; import net.lensfrex.dscape.dao.entity.PatientData; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/src/main/java/net/lensfrex/dscape/dao/service/RegisterAppliesService.java b/src/main/java/net/lensfrex/dscape/dao/service/RegisterAppliesService.java index 420e0ec..146aa4e 100644 --- a/src/main/java/net/lensfrex/dscape/dao/service/RegisterAppliesService.java +++ b/src/main/java/net/lensfrex/dscape/dao/service/RegisterAppliesService.java @@ -1,10 +1,12 @@ package net.lensfrex.dscape.dao.service; + +import com.baomidou.mybatisplus.extension.service.IService; import net.lensfrex.dscape.dao.entity.RegisterApplies; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.IService; + /** - * @description register_applies服务层 * @author lensfrex + * @description register_applies服务层 * @date 2022-08-18 */ @Service diff --git a/src/main/java/net/lensfrex/dscape/dao/service/RolePermissionService.java b/src/main/java/net/lensfrex/dscape/dao/service/RolePermissionService.java index cf89b08..5898f8e 100644 --- a/src/main/java/net/lensfrex/dscape/dao/service/RolePermissionService.java +++ b/src/main/java/net/lensfrex/dscape/dao/service/RolePermissionService.java @@ -1,15 +1,15 @@ package net.lensfrex.dscape.dao.service; + +import com.baomidou.mybatisplus.extension.service.IService; import net.lensfrex.dscape.dao.entity.RolePermission; import org.apache.ibatis.annotations.Select; -import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** - * @description role_permission服务层 * @author lensfrex + * @description role_permission服务层 * @date 2022-08-17 */ @Service diff --git a/src/main/java/net/lensfrex/dscape/dao/service/UserBasicService.java b/src/main/java/net/lensfrex/dscape/dao/service/UserBasicService.java index f36e17f..9112a09 100644 --- a/src/main/java/net/lensfrex/dscape/dao/service/UserBasicService.java +++ b/src/main/java/net/lensfrex/dscape/dao/service/UserBasicService.java @@ -1,16 +1,15 @@ package net.lensfrex.dscape.dao.service; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import com.baomidou.mybatisplus.extension.service.IService; import net.lensfrex.dscape.dao.entity.UserBasic; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.function.Function; /** - * @description user_basic服务层 * @author lensfrex + * @description user_basic服务层 * @date 2022-08-18 */ @Service diff --git a/src/main/java/net/lensfrex/dscape/dao/service/UserRoleService.java b/src/main/java/net/lensfrex/dscape/dao/service/UserRoleService.java index 349859a..e184adf 100644 --- a/src/main/java/net/lensfrex/dscape/dao/service/UserRoleService.java +++ b/src/main/java/net/lensfrex/dscape/dao/service/UserRoleService.java @@ -1,14 +1,15 @@ package net.lensfrex.dscape.dao.service; + +import com.baomidou.mybatisplus.extension.service.IService; import net.lensfrex.dscape.dao.entity.UserRole; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** - * @description user_role服务层 * @author lensfrex + * @description user_role服务层 * @date 2022-08-17 */ @Service diff --git a/src/main/java/net/lensfrex/dscape/dao/service/impl/ComputeHistoryServiceImpl.java b/src/main/java/net/lensfrex/dscape/dao/service/impl/ComputeHistoryServiceImpl.java index d653559..74e1a38 100644 --- a/src/main/java/net/lensfrex/dscape/dao/service/impl/ComputeHistoryServiceImpl.java +++ b/src/main/java/net/lensfrex/dscape/dao/service/impl/ComputeHistoryServiceImpl.java @@ -43,7 +43,7 @@ public class ComputeHistoryServiceImpl extends ServiceImpl results = this.page(new Page<>(page, limit), wrapper).getRecords(); + List results = this.page(new Page<>(page, limit), wrapper).getRecords(); List ids = new ArrayList<>(results.size()); results.forEach(result -> ids.add(result.getRid())); diff --git a/src/main/java/net/lensfrex/dscape/dao/service/impl/RolePermissionServiceImpl.java b/src/main/java/net/lensfrex/dscape/dao/service/impl/RolePermissionServiceImpl.java index 9d2ae2f..22b6fb8 100644 --- a/src/main/java/net/lensfrex/dscape/dao/service/impl/RolePermissionServiceImpl.java +++ b/src/main/java/net/lensfrex/dscape/dao/service/impl/RolePermissionServiceImpl.java @@ -5,7 +5,6 @@ package net.lensfrex.dscape.dao.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.lensfrex.dscape.dao.entity.RolePermission; import net.lensfrex.dscape.dao.mapper.RolePermissionMapper; @@ -44,7 +43,7 @@ public class RolePermissionServiceImpl extends ServiceImpl rolePermissionList = this.list(wrapper); - List permissions = new ArrayList<>(); + List permissions = new ArrayList<>(); rolePermissionList.forEach(rolePermission -> permissions.add(rolePermission.getPermission().toString())); return permissions; diff --git a/src/main/java/net/lensfrex/dscape/dao/service/impl/UserRoleServiceImpl.java b/src/main/java/net/lensfrex/dscape/dao/service/impl/UserRoleServiceImpl.java index 8a4c1ca..fd825f3 100644 --- a/src/main/java/net/lensfrex/dscape/dao/service/impl/UserRoleServiceImpl.java +++ b/src/main/java/net/lensfrex/dscape/dao/service/impl/UserRoleServiceImpl.java @@ -5,12 +5,10 @@ package net.lensfrex.dscape.dao.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.lensfrex.dscape.dao.entity.UserRole; import net.lensfrex.dscape.dao.mapper.UserRoleMapper; import net.lensfrex.dscape.dao.service.UserRoleService; -import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/src/main/java/net/lensfrex/dscape/dto/request/UserLoginRequestBody.java b/src/main/java/net/lensfrex/dscape/dto/request/UserLoginRequestBody.java index 4f54063..cbdf289 100644 --- a/src/main/java/net/lensfrex/dscape/dto/request/UserLoginRequestBody.java +++ b/src/main/java/net/lensfrex/dscape/dto/request/UserLoginRequestBody.java @@ -1,8 +1,5 @@ - package net.lensfrex.dscape.dto.request; -import javax.annotation.Generated; - import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/net/lensfrex/dscape/dto/response/data/compute/ComputeHistoryResponseData.java b/src/main/java/net/lensfrex/dscape/dto/response/data/compute/ComputeHistoryResponseData.java index f04db03..e6ae993 100644 --- a/src/main/java/net/lensfrex/dscape/dto/response/data/compute/ComputeHistoryResponseData.java +++ b/src/main/java/net/lensfrex/dscape/dto/response/data/compute/ComputeHistoryResponseData.java @@ -10,17 +10,17 @@ import lombok.Data; @Data public class ComputeHistoryResponseData { private long cpg; - + private long ctdna; - + private Boolean hcc; @JsonProperty("hcc_infer") private Boolean hccInfer; - + private long id; - + private long pid; - + private String time; } diff --git a/src/main/java/net/lensfrex/dscape/dto/response/data/user/RegisterResponseBody.java b/src/main/java/net/lensfrex/dscape/dto/response/data/user/RegisterResponseBody.java index 0400ac6..dfd0ec7 100644 --- a/src/main/java/net/lensfrex/dscape/dto/response/data/user/RegisterResponseBody.java +++ b/src/main/java/net/lensfrex/dscape/dto/response/data/user/RegisterResponseBody.java @@ -4,10 +4,9 @@ package net.lensfrex.dscape.dto.response.data.user; -import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; @Data public class RegisterResponseBody { - private String uid; + private String uid; } \ No newline at end of file diff --git a/src/main/java/net/lensfrex/dscape/dto/response/general/Response.java b/src/main/java/net/lensfrex/dscape/dto/response/general/Response.java index 94a5f89..e9abae4 100644 --- a/src/main/java/net/lensfrex/dscape/dto/response/general/Response.java +++ b/src/main/java/net/lensfrex/dscape/dto/response/general/Response.java @@ -16,35 +16,35 @@ public class Response { this.data = data; } - public int getCode() { - return code; + public static Response success(T data) { + return new Response<>(ResponseCode.SUCCESS.getCode(), "success", data); } - public String getMessage() { - return message; + public static Response success() { + return success(null); } - public T getData() { - return data; + public static Response error(int code, String message) { + return new Response<>(code, message, null); } - public static Response success(T data) { - return new Response<>(ResponseCode.SUCCESS.getCode(), "success", data); + public static Response error(ResponseCode code, String message) { + return error(code.getCode(), message); } - public static Response success() { - return success(null); + public static Response error(ResponseCode code) { + return error(code, code.getMessage()); } - public static Response error(int code, String message) { - return new Response<>(code, message, null); + public int getCode() { + return code; } - public static Response error(ResponseCode code, String message) { - return error(code.getCode(), message); + public String getMessage() { + return message; } - public static Response error(ResponseCode code) { - return error(code, code.getMessage()); + public T getData() { + return data; } } \ No newline at end of file diff --git a/src/main/java/net/lensfrex/dscape/dto/response/general/ResponseCode.java b/src/main/java/net/lensfrex/dscape/dto/response/general/ResponseCode.java index c61a2a1..c8b324f 100644 --- a/src/main/java/net/lensfrex/dscape/dto/response/general/ResponseCode.java +++ b/src/main/java/net/lensfrex/dscape/dto/response/general/ResponseCode.java @@ -22,8 +22,7 @@ public enum ResponseCode { USER_NAME_EXISTS(60204, "用户名已经被使用"), INVITE_CODE_WRONG(60202, "注册码不正确"), - INVITE_CODE_REACHED_LIMIT(60401, "注册码已达上限") - ; + INVITE_CODE_REACHED_LIMIT(60401, "注册码已达上限"); private final int code; diff --git a/src/main/java/net/lensfrex/dscape/enums/user/BlackListTypeEnum.java b/src/main/java/net/lensfrex/dscape/enums/user/BlackListTypeEnum.java index 68c1138..ed5b63f 100644 --- a/src/main/java/net/lensfrex/dscape/enums/user/BlackListTypeEnum.java +++ b/src/main/java/net/lensfrex/dscape/enums/user/BlackListTypeEnum.java @@ -7,7 +7,8 @@ import lombok.Getter; public enum BlackListTypeEnum { IP_ADDRESS(0, "IP地址"), - UID(1, "用户UID"),; + UID(1, "用户UID"), + ; @EnumValue private final int code; diff --git a/src/main/java/net/lensfrex/dscape/enums/user/UserRoleEnum.java b/src/main/java/net/lensfrex/dscape/enums/user/UserRoleEnum.java index 5f25ec2..42902fa 100644 --- a/src/main/java/net/lensfrex/dscape/enums/user/UserRoleEnum.java +++ b/src/main/java/net/lensfrex/dscape/enums/user/UserRoleEnum.java @@ -8,9 +8,9 @@ public enum UserRoleEnum { NORMAL_USER(0, "normal"), ADMIN(1, "admin"); + private final static UserRoleEnum[] allEnums = values(); @EnumValue private final int code; - private final String name; UserRoleEnum(int code, String name) { @@ -18,7 +18,6 @@ public enum UserRoleEnum { this.name = name; } - private final static UserRoleEnum[] allEnums = values(); public static UserRoleEnum getTypeEnumByCode(int code) { for (UserRoleEnum result : allEnums) { if (result.code == code) { diff --git a/src/main/java/net/lensfrex/dscape/exception/handler/GlobalExceptionHandler.java b/src/main/java/net/lensfrex/dscape/exception/handler/GlobalExceptionHandler.java index df05d27..7d0b4cc 100644 --- a/src/main/java/net/lensfrex/dscape/exception/handler/GlobalExceptionHandler.java +++ b/src/main/java/net/lensfrex/dscape/exception/handler/GlobalExceptionHandler.java @@ -26,6 +26,7 @@ public class GlobalExceptionHandler { /** * 负责处理各种自定义业务异常（权限不足，学号不存在等） + * * @param e 抛出的异常 * @return 统一响应 */ @@ -38,6 +39,7 @@ public class GlobalExceptionHandler { /** * 负责处理和响应其他部分都没有接收的异常（说白了就是剩下的都返回50000） * 这部分日志要特别关注，所以以error打出来 + * * @param e 异常 * @return 统一响应 */ @@ -51,6 +53,7 @@ public class GlobalExceptionHandler { /** * 处理参数不完整的请求异常 + * * @param e 异常 * @return 统一响应 */ @@ -62,6 +65,7 @@ public class GlobalExceptionHandler { /** * 处理参数类型错误的请求异常（请求参数类型错误） + * * @param e 异常 * @return 统一响应 */ @@ -73,6 +77,7 @@ public class GlobalExceptionHandler { /** * 处理参数类型错误的请求异常（请求参数类型错误） + * * @param e 异常 * @return 统一响应 */ @@ -84,6 +89,7 @@ public class GlobalExceptionHandler { /** * 处理参数类型错误的请求异常2（Json解析错误） + * * @param e 异常 * @return 统一响应 */ @@ -95,6 +101,7 @@ public class GlobalExceptionHandler { /** * 处理参数类型错误的请求异常3（字段映射错误） + * * @param e 异常 * @return 统一响应 */ @@ -106,6 +113,7 @@ public class GlobalExceptionHandler { /** * 处理请求头中“Content-Type”字段不正确的异常 + * * @param e 异常 * @return 统一响应 */ @@ -117,6 +125,7 @@ public class GlobalExceptionHandler { /** * 处理请求方法错误的情况 + * * @param e 异常 * @return 统一响应 */ @@ -128,6 +137,7 @@ public class GlobalExceptionHandler { /** * 处理上传文件时不是Multipart方式 + * * @param e 异常 * @return 统一响应 */ @@ -139,6 +149,7 @@ public class GlobalExceptionHandler { /** * 权限不足 + * * @param e 异常 * @return 统一响应 */ @@ -149,6 +160,7 @@ public class GlobalExceptionHandler { /** * 没登陆 + * * @param e 异常 * @return 统一响应 */ diff --git a/src/main/java/net/lensfrex/dscape/utils/ObjectJsonSerializer.java b/src/main/java/net/lensfrex/dscape/utils/ObjectJsonSerializer.java index bbc0433..1eebeb1 100644 --- a/src/main/java/net/lensfrex/dscape/utils/ObjectJsonSerializer.java +++ b/src/main/java/net/lensfrex/dscape/utils/ObjectJsonSerializer.java @@ -8,11 +8,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import org.springframework.stereotype.Component; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; - @Component public class ObjectJsonSerializer { /** diff --git a/src/main/java/net/lensfrex/dscape/utils/validate/TextCheckUtil.java b/src/main/java/net/lensfrex/dscape/utils/validate/TextCheckUtil.java index 7ec96e8..3f4e7e0 100644 --- a/src/main/java/net/lensfrex/dscape/utils/validate/TextCheckUtil.java +++ b/src/main/java/net/lensfrex/dscape/utils/validate/TextCheckUtil.java @@ -19,6 +19,7 @@ public class TextCheckUtil { /** * 检测非字母和中文符号（下划线"_"除外） + * * @param source 待检测字符串 * @return 是否含有非字母字符 */ @@ -28,6 +29,7 @@ public class TextCheckUtil { /** * 批量检测非字母和中文符号（下划线"_"除外） + * * @param source 待检测字符串 * @return 是否含有非字母字符 */ diff --git a/src/main/java/net/lensfrex/dscape/web/controllers/history/HistoryController.java b/src/main/java/net/lensfrex/dscape/web/controllers/history/HistoryController.java index 319726e..0c879c4 100644 --- a/src/main/java/net/lensfrex/dscape/web/controllers/history/HistoryController.java +++ b/src/main/java/net/lensfrex/dscape/web/controllers/history/HistoryController.java @@ -30,7 +30,7 @@ public class HistoryController { @GetMapping(value = "/list", produces = "application/json") public Response> list(@RequestParam(required = false, defaultValue = "1") int page, - @RequestParam(required = false, defaultValue = "10") int limit) { + @RequestParam(required = false, defaultValue = "10") int limit) { String uid = StpUtil.getLoginIdAsString(); diff --git a/src/main/java/net/lensfrex/dscape/web/controllers/user/UserController.java b/src/main/java/net/lensfrex/dscape/web/controllers/user/UserController.java index fbc40a6..8b9795f 100644 --- a/src/main/java/net/lensfrex/dscape/web/controllers/user/UserController.java +++ b/src/main/java/net/lensfrex/dscape/web/controllers/user/UserController.java @@ -11,9 +11,9 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import net.lensfrex.dscape.dto.request.UserLoginRequestBody; import net.lensfrex.dscape.dto.request.user.PasswordModifyRequestBody; import net.lensfrex.dscape.dto.request.user.RegisterRequestBody; +import net.lensfrex.dscape.dto.response.data.user.RegisterResponseBody; import net.lensfrex.dscape.dto.response.general.Response; import net.lensfrex.dscape.dto.response.general.ResponseCode; -import net.lensfrex.dscape.dto.response.data.user.RegisterResponseBody; import net.lensfrex.dscape.exception.GlobalException; import net.lensfrex.dscape.utils.NetworkUtil; import net.lensfrex.dscape.utils.validate.TextCheckUtil; diff --git a/src/main/java/net/lensfrex/dscape/web/controllers/user/admin/AdminController.java b/src/main/java/net/lensfrex/dscape/web/controllers/user/admin/AdminController.java index a59b803..3da72b9 100644 --- a/src/main/java/net/lensfrex/dscape/web/controllers/user/admin/AdminController.java +++ b/src/main/java/net/lensfrex/dscape/web/controllers/user/admin/AdminController.java @@ -8,9 +8,9 @@ import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.stp.StpUtil; import lombok.extern.slf4j.Slf4j; import net.lensfrex.dscape.dto.request.user.UserAddRequest; +import net.lensfrex.dscape.dto.response.data.user.RegisterResponseBody; import net.lensfrex.dscape.dto.response.general.Response; import net.lensfrex.dscape.dto.response.general.ResponseCode; -import net.lensfrex.dscape.dto.response.data.user.RegisterResponseBody; import net.lensfrex.dscape.enums.user.UserRoleEnum; import net.lensfrex.dscape.exception.GlobalException; import net.lensfrex.dscape.utils.NetworkUtil; diff --git a/src/main/java/net/lensfrex/dscape/web/service/data/HistoryService.java b/src/main/java/net/lensfrex/dscape/web/service/data/HistoryService.java index 69d2f64..bbabd1c 100644 --- a/src/main/java/net/lensfrex/dscape/web/service/data/HistoryService.java +++ b/src/main/java/net/lensfrex/dscape/web/service/data/HistoryService.java @@ -11,7 +11,6 @@ import net.lensfrex.dscape.dao.service.ComputeHistoryService; import net.lensfrex.dscape.dao.service.PatientDataService; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; @Slf4j @@ -24,8 +23,8 @@ public class HistoryService { public HistoryService(ComputeHistoryService computeHistoryService, PatientDataService patientDataService) { - this.computeHistoryService = computeHistoryService; + this.computeHistoryService = computeHistoryService; this.patientDataService = patientDataService; } diff --git a/src/main/java/net/lensfrex/dscape/web/service/user/AdminService.java b/src/main/java/net/lensfrex/dscape/web/service/user/AdminService.java index 83fe300..b9ca376 100644 --- a/src/main/java/net/lensfrex/dscape/web/service/user/AdminService.java +++ b/src/main/java/net/lensfrex/dscape/web/service/user/AdminService.java @@ -17,8 +17,8 @@ import net.lensfrex.dscape.dao.entity.UserBasic; import net.lensfrex.dscape.dao.service.BlackListService; import net.lensfrex.dscape.dao.service.UserBasicService; import net.lensfrex.dscape.dto.request.user.UserAddRequest; -import net.lensfrex.dscape.dto.response.general.ResponseCode; import net.lensfrex.dscape.dto.response.data.user.RegisterResponseBody; +import net.lensfrex.dscape.dto.response.general.ResponseCode; import net.lensfrex.dscape.enums.user.BlackListTypeEnum; import net.lensfrex.dscape.enums.user.UserRoleEnum; import net.lensfrex.dscape.exception.GlobalException; @@ -97,7 +97,7 @@ public class AdminService { String uid = userService.addUserToDatabase(requestBody.getUserName(), requestBody.getPassword(), StpUtil.getLoginIdAsString(), UserRoleEnum.getTypeEnumByCode(requestBody.getRole()), registerIp); - RegisterResponseBody registerResponseBody = new RegisterResponseBody (); + RegisterResponseBody registerResponseBody = new RegisterResponseBody(); registerResponseBody.setUid(uid); return registerResponseBody; diff --git a/src/main/java/net/lensfrex/dscape/web/service/user/UserService.java b/src/main/java/net/lensfrex/dscape/web/service/user/UserService.java index 4edca2f..0d73c2a 100644 --- a/src/main/java/net/lensfrex/dscape/web/service/user/UserService.java +++ b/src/main/java/net/lensfrex/dscape/web/service/user/UserService.java @@ -15,8 +15,8 @@ import net.lensfrex.dscape.dao.service.UserBasicService; import net.lensfrex.dscape.dao.service.UserRoleService; import net.lensfrex.dscape.dto.request.UserLoginRequestBody; import net.lensfrex.dscape.dto.request.user.RegisterRequestBody; -import net.lensfrex.dscape.dto.response.general.ResponseCode; import net.lensfrex.dscape.dto.response.data.user.RegisterResponseBody; +import net.lensfrex.dscape.dto.response.general.ResponseCode; import net.lensfrex.dscape.enums.user.UserRoleEnum; import net.lensfrex.dscape.enums.user.UserStatusEnum; import net.lensfrex.dscape.exception.GlobalException; @@ -140,9 +140,10 @@ public class UserService { /** * 添加一个用户到数据库 - * @param userName 用户名 - * @param password 密码（未用bcrypt加密的） - * @param superior 上级管理员，本身是管理员时可为空 + * + * @param userName 用户名 + * @param password 密码（未用bcrypt加密的） + * @param superior 上级管理员，本身是管理员时可为空 * @param userRoleEnum 用户角色 * @return 用户uid */