diff --git a/README.md b/README.md index 5b153a3..d5dd317 100644 --- a/README.md +++ b/README.md @@ -97,8 +97,10 @@ mvn spring-boot:run 项目集成了 Spotless 和 Checkstyle 插件: #### Spotless (代码格式化) -- 使用 Google Java Format 自动格式化代码 -- 支持 Java、XML、JSON、YAML 等文件格式 +- 基于空格的缩进 (4个空格) +- 自动清理尾随空白字符 +- 文件末尾添加换行符 +- 基本的导入组织 常用命令: ```bash @@ -110,8 +112,9 @@ mvn spotless:apply ``` #### Checkstyle (代码规范检查) -- 使用 Google Java 编码规范 +- 使用 Sun Java 编码规范 (比 Google 规范更宽松) - 在编译时自动检查代码规范 +- 与 Java 11 和 Lombok 兼容 常用命令: ```bash diff --git a/play-admin/src/main/java/com/starry/admin/common/aspect/ClerkUserLogin.java b/play-admin/src/main/java/com/starry/admin/common/aspect/ClerkUserLogin.java index bc16c0a..3180af9 100644 --- a/play-admin/src/main/java/com/starry/admin/common/aspect/ClerkUserLogin.java +++ b/play-admin/src/main/java/com/starry/admin/common/aspect/ClerkUserLogin.java @@ -12,6 +12,5 @@ import java.lang.annotation.*; @Documented public @interface ClerkUserLogin { - boolean manage() default false; } diff --git a/play-admin/src/main/java/com/starry/admin/common/aspect/ClerkUserLoginAspect.java b/play-admin/src/main/java/com/starry/admin/common/aspect/ClerkUserLoginAspect.java index 329b053..0c493ef 100644 --- a/play-admin/src/main/java/com/starry/admin/common/aspect/ClerkUserLoginAspect.java +++ b/play-admin/src/main/java/com/starry/admin/common/aspect/ClerkUserLoginAspect.java @@ -8,16 +8,15 @@ import com.starry.admin.modules.weichat.service.WxTokenService; import com.starry.common.constant.Constants; import com.starry.common.constant.HttpStatus; import com.starry.common.utils.StringUtils; +import java.util.Objects; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.springframework.stereotype.Component; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.Objects; - /** * 限流处理 * @@ -28,7 +27,6 @@ import java.util.Objects; @Component public class ClerkUserLoginAspect { - @Resource private PlayClerkUserInfoServiceImpl clerkUserInfoService; @@ -37,7 +35,6 @@ public class ClerkUserLoginAspect { @Resource private HttpServletRequest request; - @Before("@annotation(clerkUserLogin)") public void doBefore(JoinPoint point, ClerkUserLogin clerkUserLogin) { String userToken = request.getHeader(Constants.CLERK_USER_LOGIN_TOKEN); diff --git a/play-admin/src/main/java/com/starry/admin/common/aspect/CustomUserLogin.java b/play-admin/src/main/java/com/starry/admin/common/aspect/CustomUserLogin.java index e1f9977..955afe9 100644 --- a/play-admin/src/main/java/com/starry/admin/common/aspect/CustomUserLogin.java +++ b/play-admin/src/main/java/com/starry/admin/common/aspect/CustomUserLogin.java @@ -12,6 +12,5 @@ import java.lang.annotation.*; @Documented public @interface CustomUserLogin { - boolean manage() default false; } diff --git a/play-admin/src/main/java/com/starry/admin/common/aspect/CustomUserLoginAspect.java b/play-admin/src/main/java/com/starry/admin/common/aspect/CustomUserLoginAspect.java index f329528..8863495 100644 --- a/play-admin/src/main/java/com/starry/admin/common/aspect/CustomUserLoginAspect.java +++ b/play-admin/src/main/java/com/starry/admin/common/aspect/CustomUserLoginAspect.java @@ -8,16 +8,15 @@ import com.starry.admin.modules.weichat.service.WxTokenService; import com.starry.common.constant.Constants; import com.starry.common.constant.HttpStatus; import com.starry.common.utils.StringUtils; +import java.util.Objects; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.springframework.stereotype.Component; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.Objects; - /** * 限流处理 * @@ -36,7 +35,6 @@ public class CustomUserLoginAspect { @Resource private HttpServletRequest request; - @Before("@annotation(customUserLogin)") public void doBefore(JoinPoint point, CustomUserLogin customUserLogin) { String userToken = request.getHeader(Constants.CUSTOM_USER_LOGIN_TOKEN); diff --git a/play-admin/src/main/java/com/starry/admin/common/aspect/DataScopeAspect.java b/play-admin/src/main/java/com/starry/admin/common/aspect/DataScopeAspect.java index 5ee6c3d..30dca2d 100644 --- a/play-admin/src/main/java/com/starry/admin/common/aspect/DataScopeAspect.java +++ b/play-admin/src/main/java/com/starry/admin/common/aspect/DataScopeAspect.java @@ -10,14 +10,13 @@ import com.starry.common.annotation.DataScope; import com.starry.common.context.CustomSecurityContextHolder; import com.starry.common.domain.BaseEntity; import com.starry.common.utils.StringUtils; +import java.util.ArrayList; +import java.util.List; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.List; - /** * 数据过滤处理 * @@ -59,13 +58,19 @@ public class DataScopeAspect { /** * 数据范围过滤 * - * @param joinPoint 切点 - * @param user 用户 - * @param deptAlias 部门别名 - * @param userAlias 用户别名 - * @param permission 权限字符 + * @param joinPoint + * 切点 + * @param user + * 用户 + * @param deptAlias + * 部门别名 + * @param userAlias + * 用户别名 + * @param permission + * 权限字符 */ - public static void dataScopeFilter(JoinPoint joinPoint, SysUserEntity user, String deptAlias, String userAlias, String permission) { + public static void dataScopeFilter(JoinPoint joinPoint, SysUserEntity user, String deptAlias, String userAlias, + String permission) { StringBuilder sqlString = new StringBuilder(); List conditions = new ArrayList<>(); for (SysRoleEntity role : user.getRoles()) { @@ -126,7 +131,8 @@ public class DataScopeAspect { SysUserEntity currentUser = loginUser.getUser(); // 如果是超级管理员，则不过滤数据 if (StringUtils.isNotNull(currentUser) && SysUserEntity.isAdmin(currentUser)) { - String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), CustomSecurityContextHolder.getPermission()); + String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), + CustomSecurityContextHolder.getPermission()); dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), controllerDataScope.userAlias(), permission); } diff --git a/play-admin/src/main/java/com/starry/admin/common/aspect/LogAspect.java b/play-admin/src/main/java/com/starry/admin/common/aspect/LogAspect.java index acbcaba..524cbca 100644 --- a/play-admin/src/main/java/com/starry/admin/common/aspect/LogAspect.java +++ b/play-admin/src/main/java/com/starry/admin/common/aspect/LogAspect.java @@ -9,6 +9,12 @@ import com.starry.admin.utils.SecurityUtils; import com.starry.common.annotation.Log; import com.starry.common.utils.ServletUtils; import com.starry.common.utils.StringUtils; +import java.util.Collection; +import java.util.Date; +import java.util.Map; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; @@ -19,13 +25,6 @@ import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.HandlerMapping; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Collection; -import java.util.Date; -import java.util.Map; - /** * @author admin */ @@ -40,7 +39,8 @@ public class LogAspect { /** * 处理完请求后执行 * - * @param joinPoint 切点 + * @param joinPoint + * 切点 */ @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult") public void doAfterReturn(JoinPoint joinPoint, Log controllerLog, Object jsonResult) { @@ -88,10 +88,13 @@ public class LogAspect { /** * 获取注解中对方法的描述信息 用于Controller层注解 * - * @param log 日志 - * @param operLog 操作日志 + * @param log + * 日志 + * @param operLog + * 操作日志 */ - public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperationLogEntity operLog, Object jsonResult) { + public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperationLogEntity operLog, + Object jsonResult) { // 设置操作业务类型 operLog.setBusinessType(log.businessType().ordinal()); // 设置标题 @@ -110,7 +113,8 @@ public class LogAspect { /** * 获取请求的参数，放到log中 * - * @param operLog 操作日志 + * @param operLog + * 操作日志 */ private void setRequestValue(JoinPoint joinPoint, SysOperationLogEntity operLog) { String requsetMethod = operLog.getRequestMethod(); @@ -118,7 +122,8 @@ public class LogAspect { String params = argsArrayToString(joinPoint.getArgs()); operLog.setOperParam(StringUtils.substring(params, 0, 2000)); } else { - Map paramsMap = (Map) ServletUtils.getRequest().getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE); + Map paramsMap = (Map) ServletUtils.getRequest() + .getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE); operLog.setOperParam(StringUtils.substring(paramsMap.toString(), 0, 2000)); } } @@ -143,7 +148,8 @@ public class LogAspect { /** * 判断是否需要过滤的对象。 * - * @param object 对象信息。 + * @param object + * 对象信息。 * @return 如果是需要过滤的对象，则返回true；否则返回false。 */ @SuppressWarnings("rawtypes") @@ -163,6 +169,7 @@ public class LogAspect { return entry.getValue() instanceof MultipartFile; } } - return object instanceof MultipartFile || object instanceof HttpServletRequest || object instanceof HttpServletResponse || object instanceof BindingResult; + return object instanceof MultipartFile || object instanceof HttpServletRequest + || object instanceof HttpServletResponse || object instanceof BindingResult; } } diff --git a/play-admin/src/main/java/com/starry/admin/common/component/JwtToken.java b/play-admin/src/main/java/com/starry/admin/common/component/JwtToken.java index 274df18..766194c 100644 --- a/play-admin/src/main/java/com/starry/admin/common/component/JwtToken.java +++ b/play-admin/src/main/java/com/starry/admin/common/component/JwtToken.java @@ -18,21 +18,19 @@ import com.starry.common.utils.ip.IpUtils; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Component; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.TimeUnit; - /** - * @author admin - * token 组件 + * @author admin token 组件 * @since 2021/9/6 */ @Slf4j @@ -55,7 +53,6 @@ public class JwtToken { @Resource private RedisCache redisCache; - /** * 从token中获取登录用户名 */ @@ -91,7 +88,8 @@ public class JwtToken { /** * 创建令牌 * - * @param jwtUser 用户信息 + * @param jwtUser + * 用户信息 * @return 令牌 */ public String createToken(JwtUser jwtUser) { @@ -108,7 +106,8 @@ public class JwtToken { /** * 从数据声明生成令牌 * - * @param claims 数据声明 + * @param claims + * 数据声明 * @return 令牌 */ private String createToken(Map claims) { @@ -140,7 +139,8 @@ public class JwtToken { /** * 从令牌中获取数据声明 * - * @param token 令牌 + * @param token + * 令牌 * @return 数据声明 */ private Claims getClaimsFromToken(String token) { @@ -156,7 +156,8 @@ public class JwtToken { /** * 设置用户代理信息 * - * @param jwtUser 登录信息 + * @param jwtUser + * 登录信息 */ public void setUserAgent(JwtUser jwtUser) { UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent")); @@ -274,7 +275,8 @@ public class JwtToken { /** * 设置用户代理信息 * - * @param loginUser 登录信息 + * @param loginUser + * 登录信息 */ public void setUserAgent(LoginUser loginUser) { UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent")); @@ -288,7 +290,8 @@ public class JwtToken { /** * 刷新令牌有效期 * - * @param loginUser 登录信息 + * @param loginUser + * 登录信息 * @return */ public String refreshToken(LoginUser loginUser) { diff --git a/play-admin/src/main/java/com/starry/admin/common/component/PermissionService.java b/play-admin/src/main/java/com/starry/admin/common/component/PermissionService.java index 0249e40..7addb6f 100644 --- a/play-admin/src/main/java/com/starry/admin/common/component/PermissionService.java +++ b/play-admin/src/main/java/com/starry/admin/common/component/PermissionService.java @@ -1,15 +1,13 @@ package com.starry.admin.common.component; - import com.starry.admin.common.domain.LoginUser; import com.starry.admin.modules.system.module.entity.SysRoleEntity; import com.starry.admin.utils.SecurityUtils; +import java.util.Set; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.Set; - /** * 自定义权限实现，ss取自SpringSecurity首字母 * @@ -34,7 +32,8 @@ public class PermissionService { /** * 验证用户是否具备某权限 * - * @param permission 权限字符串 + * @param permission + * 权限字符串 * @return 用户是否具备某权限 */ public boolean hasPermission(String permission) { @@ -51,7 +50,8 @@ public class PermissionService { /** * 验证用户是否不具备某权限，与 hasPermission逻辑相反 * - * @param permission 权限字符串 + * @param permission + * 权限字符串 * @return 用户是否不具备某权限 */ public boolean lacksPermission(String permission) { @@ -61,7 +61,8 @@ public class PermissionService { /** * 验证用户是否具有以下任意一个权限 * - * @param permissions 以 PERMISSION_NAMES_DELIMETER 为分隔符的权限列表 + * @param permissions + * 以 PERMISSION_NAMES_DELIMETER 为分隔符的权限列表 * @return 用户是否具有以下任意一个权限 */ public boolean hasAnyPermission(String permissions) { @@ -84,7 +85,8 @@ public class PermissionService { /** * 判断用户是否拥有某个角色 * - * @param role 角色字符串 + * @param role + * 角色字符串 * @return 用户是否具备某角色 */ public boolean hasRole(String role) { @@ -107,7 +109,8 @@ public class PermissionService { /** * 验证用户是否不具备某角色，与 isRole逻辑相反。 * - * @param role 角色名称 + * @param role + * 角色名称 * @return 用户是否不具备某角色 */ public boolean lacksRole(String role) { @@ -117,7 +120,8 @@ public class PermissionService { /** * 验证用户是否具有以下任意一个角色 * - * @param roles 以 ROLE_NAMES_DELIMITER 为分隔符的角色列表 + * @param roles + * 以 ROLE_NAMES_DELIMITER 为分隔符的角色列表 * @return 用户是否具有以下任意一个角色 */ public boolean hasAnyRoles(String roles) { @@ -139,8 +143,10 @@ public class PermissionService { /** * 判断是否包含权限 * - * @param permissions 权限列表 - * @param permission 权限字符串 + * @param permissions + * 权限列表 + * @param permission + * 权限字符串 * @return 用户是否具备某权限 */ private boolean hasPermissions(Set permissions, String permission) { diff --git a/play-admin/src/main/java/com/starry/admin/common/conf/AbstractListTypeHandler.java b/play-admin/src/main/java/com/starry/admin/common/conf/AbstractListTypeHandler.java index 3aca90d..46c0104 100644 --- a/play-admin/src/main/java/com/starry/admin/common/conf/AbstractListTypeHandler.java +++ b/play-admin/src/main/java/com/starry/admin/common/conf/AbstractListTypeHandler.java @@ -3,21 +3,20 @@ package com.starry.admin.common.conf; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.TypeReference; -import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.type.BaseTypeHandler; -import org.apache.ibatis.type.JdbcType; -import org.apache.ibatis.type.MappedJdbcTypes; -import org.apache.ibatis.type.MappedTypes; - import java.sql.CallableStatement; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.type.BaseTypeHandler; +import org.apache.ibatis.type.JdbcType; +import org.apache.ibatis.type.MappedJdbcTypes; +import org.apache.ibatis.type.MappedTypes; /** - * 数据库数据-String 和 List 自动转换 + * 数据库数据-String 和 List 自动转换 * * @author admin */ @@ -26,7 +25,8 @@ import java.util.List; @MappedTypes({List.class}) public abstract class AbstractListTypeHandler extends BaseTypeHandler> { @Override - public void setNonNullParameter(PreparedStatement ps, int i, List parameter, JdbcType jdbcType) throws SQLException { + public void setNonNullParameter(PreparedStatement ps, int i, List parameter, JdbcType jdbcType) + throws SQLException { String content = StrUtil.isEmptyIfStr(parameter) ? null : JSON.toJSONString(parameter); ps.setString(i, content); } diff --git a/play-admin/src/main/java/com/starry/admin/common/conf/DataSourceConfig.java b/play-admin/src/main/java/com/starry/admin/common/conf/DataSourceConfig.java index fc125e7..8b59276 100644 --- a/play-admin/src/main/java/com/starry/admin/common/conf/DataSourceConfig.java +++ b/play-admin/src/main/java/com/starry/admin/common/conf/DataSourceConfig.java @@ -1,12 +1,11 @@ package com.starry.admin.common.conf; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; +import javax.sql.DataSource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; -import javax.sql.DataSource; - @Configuration public class DataSourceConfig { @@ -17,4 +16,4 @@ public class DataSourceConfig { return DruidDataSourceBuilder.create().build(); } -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/common/conf/StringTypeHandler.java b/play-admin/src/main/java/com/starry/admin/common/conf/StringTypeHandler.java index 428405f..55c2a87 100644 --- a/play-admin/src/main/java/com/starry/admin/common/conf/StringTypeHandler.java +++ b/play-admin/src/main/java/com/starry/admin/common/conf/StringTypeHandler.java @@ -1,7 +1,6 @@ package com.starry.admin.common.conf; import com.alibaba.fastjson2.TypeReference; - import java.util.List; /** @@ -13,4 +12,4 @@ public class StringTypeHandler extends AbstractListTypeHandler { return new TypeReference>() { }; } -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/common/domain/LoginUser.java b/play-admin/src/main/java/com/starry/admin/common/domain/LoginUser.java index b729eeb..39092f3 100644 --- a/play-admin/src/main/java/com/starry/admin/common/domain/LoginUser.java +++ b/play-admin/src/main/java/com/starry/admin/common/domain/LoginUser.java @@ -1,13 +1,12 @@ package com.starry.admin.common.domain; import com.starry.admin.modules.system.module.entity.SysUserEntity; -import lombok.Data; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; - import java.util.Collection; import java.util.Date; import java.util.Set; +import lombok.Data; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; /** * @author admin diff --git a/play-admin/src/main/java/com/starry/admin/common/domain/TreeSelect.java b/play-admin/src/main/java/com/starry/admin/common/domain/TreeSelect.java index 062f11c..134d719 100644 --- a/play-admin/src/main/java/com/starry/admin/common/domain/TreeSelect.java +++ b/play-admin/src/main/java/com/starry/admin/common/domain/TreeSelect.java @@ -3,11 +3,10 @@ package com.starry.admin.common.domain; import com.fasterxml.jackson.annotation.JsonInclude; import com.starry.admin.modules.system.module.entity.SysDeptEntity; import com.starry.admin.modules.system.module.entity.SysMenuEntity; -import lombok.Data; - import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; +import lombok.Data; /** * @author Treeselect树结构实体类 diff --git a/play-admin/src/main/java/com/starry/admin/common/exception/ServiceException.java b/play-admin/src/main/java/com/starry/admin/common/exception/ServiceException.java index 5095708..9937bce 100644 --- a/play-admin/src/main/java/com/starry/admin/common/exception/ServiceException.java +++ b/play-admin/src/main/java/com/starry/admin/common/exception/ServiceException.java @@ -43,7 +43,6 @@ public class ServiceException extends RuntimeException { this.code = code; } - public ServiceException setDetailMessage(String detailMessage) { this.detailMessage = detailMessage; return this; diff --git a/play-admin/src/main/java/com/starry/admin/common/exception/handler/GlobalExceptionHandler.java b/play-admin/src/main/java/com/starry/admin/common/exception/handler/GlobalExceptionHandler.java index 118a884..48d0941 100644 --- a/play-admin/src/main/java/com/starry/admin/common/exception/handler/GlobalExceptionHandler.java +++ b/play-admin/src/main/java/com/starry/admin/common/exception/handler/GlobalExceptionHandler.java @@ -1,11 +1,11 @@ package com.starry.admin.common.exception.handler; - import com.fasterxml.jackson.databind.exc.MismatchedInputException; import com.starry.admin.common.exception.CustomException; import com.starry.admin.common.exception.ServiceException; import com.starry.common.result.R; import com.starry.common.utils.StringUtils; +import javax.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.converter.HttpMessageNotReadableException; @@ -17,8 +17,6 @@ import org.springframework.web.bind.MissingServletRequestParameterException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -import javax.servlet.http.HttpServletRequest; - /** * @author 全局异常处理 * @since 2023/3/9 @@ -27,7 +25,6 @@ import javax.servlet.http.HttpServletRequest; public class GlobalExceptionHandler { private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class); - /** * 业务异常 */ @@ -62,7 +59,6 @@ public class GlobalExceptionHandler { return R.error("系统出现内部错误，请联系管理员"); } - /** * 请求方法异常 */ @@ -74,7 +70,8 @@ public class GlobalExceptionHandler { /** * 请求参数异常 * - * @param e HttpRequestMethodNotSupportedException + * @param e + * HttpRequestMethodNotSupportedException */ @ExceptionHandler(MethodArgumentNotValidException.class) public R methodArgumentNotValidException(MethodArgumentNotValidException e) { @@ -101,11 +98,11 @@ public class GlobalExceptionHandler { return R.error("请求参数格式异常"); } - /** * 自定义异常 * - * @param e CustomException + * @param e + * CustomException */ @ExceptionHandler(CustomException.class) public R customException(CustomException e) { diff --git a/play-admin/src/main/java/com/starry/admin/common/mybatis/config/MybatisPlusConfig.java b/play-admin/src/main/java/com/starry/admin/common/mybatis/config/MybatisPlusConfig.java index 0d3c5c7..b5cd0fd 100644 --- a/play-admin/src/main/java/com/starry/admin/common/mybatis/config/MybatisPlusConfig.java +++ b/play-admin/src/main/java/com/starry/admin/common/mybatis/config/MybatisPlusConfig.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInt import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; import com.starry.admin.common.mybatis.handler.MyTenantLineHandler; +import javax.sql.DataSource; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -15,9 +16,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; -import javax.sql.DataSource; - - /** * @author admin */ diff --git a/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java b/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java index 720417a..6cccfdc 100644 --- a/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java +++ b/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java @@ -5,26 +5,23 @@ import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.starry.admin.modules.weichat.service.WxTokenService; import com.starry.admin.utils.SecurityUtils; import com.starry.common.constant.Constants; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.Date; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Component; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.Date; - /** - * @author admin - * 字段默认值处理类 + * @author admin 字段默认值处理类 * @since 2021/9/1 */ @Slf4j @Component public class MyMetaObjectHandler implements MetaObjectHandler { - @Resource private HttpServletRequest request; @@ -58,7 +55,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler { LocalDateTime localDateTime = LocalDateTime.now(); return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); -// return Date.from(localDateTime.toInstant(ZoneOffset.ofHours(8))); + // return Date.from(localDateTime.toInstant(ZoneOffset.ofHours(8))); } public String getOperatorId() { diff --git a/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyTenantLineHandler.java b/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyTenantLineHandler.java index b3b0d01..56fdfc8 100644 --- a/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyTenantLineHandler.java +++ b/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyTenantLineHandler.java @@ -3,16 +3,14 @@ package com.starry.admin.common.mybatis.handler; import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler; import com.starry.admin.utils.SecurityUtils; import com.starry.common.utils.StringUtils; +import java.util.Arrays; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.StringValue; import org.springframework.stereotype.Component; -import java.util.Arrays; - /** - * @author admin - * 多租户处理器 + * @author admin 多租户处理器 * @since 2023/3/7 */ @Slf4j @@ -22,7 +20,8 @@ public class MyTenantLineHandler implements TenantLineHandler { /** * 排除过滤的表 */ - private static final String[] TABLE_FILTER = {"sys_login_log", "sys_menu", "sys_tenant_package", "sys_tenant", "sys_dict", "sys_dict_data", "sys_administrative_area_dict_info"}; + private static final String[] TABLE_FILTER = {"sys_login_log", "sys_menu", "sys_tenant_package", "sys_tenant", + "sys_dict", "sys_dict_data", "sys_administrative_area_dict_info"}; /** * 排除过滤的表前缀 @@ -33,9 +32,9 @@ public class MyTenantLineHandler implements TenantLineHandler { public Expression getTenantId() { // 取出当前请求的服务商ID，通过解析器注入到SQL中。 String tenantId = SecurityUtils.getTenantId(); -// if (!StrUtil.isBlankIfStr(tenantId)) { -// throw new CustomException("租户信息获取异常"); -// } + // if (!StrUtil.isBlankIfStr(tenantId)) { + // throw new CustomException("租户信息获取异常"); + // } return new StringValue(tenantId); } diff --git a/play-admin/src/main/java/com/starry/admin/common/oss/controller/CosController.java b/play-admin/src/main/java/com/starry/admin/common/oss/controller/CosController.java index 645895d..14df981 100644 --- a/play-admin/src/main/java/com/starry/admin/common/oss/controller/CosController.java +++ b/play-admin/src/main/java/com/starry/admin/common/oss/controller/CosController.java @@ -3,17 +3,15 @@ package com.starry.admin.common.oss.controller; import com.starry.admin.common.oss.service.IOssFileService; import com.starry.common.result.R; import io.swagger.annotations.ApiOperation; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; - /** - * @author admin - * cos存储前端控制器 + * @author admin cos存储前端控制器 * @since 2022/11/13 17:51 */ @Slf4j @@ -24,7 +22,6 @@ public class CosController { @Resource IOssFileService ossFileService; - @ApiOperation(value = "照片上传") @PostMapping("/upload/image") public R uploadImage(MultipartFile file) throws Exception { diff --git a/play-admin/src/main/java/com/starry/admin/common/oss/service/IOssFileService.java b/play-admin/src/main/java/com/starry/admin/common/oss/service/IOssFileService.java index 8b64cfb..8bc3688 100644 --- a/play-admin/src/main/java/com/starry/admin/common/oss/service/IOssFileService.java +++ b/play-admin/src/main/java/com/starry/admin/common/oss/service/IOssFileService.java @@ -7,9 +7,12 @@ public interface IOssFileService { /** * 文件上传只阿里云OSS * - * @param inputStream 文件流 - * @param module 文件保存模块地址 - * @param originalFilename 原始文件名 + * @param inputStream + * 文件流 + * @param module + * 文件保存模块地址 + * @param originalFilename + * 原始文件名 * @return String * @author admin * @since 2024/4/11 10:24 @@ -19,7 +22,8 @@ public interface IOssFileService { /** * 删除文件 * - * @param url 文件地址 + * @param url + * 文件地址 */ void remove(String url); diff --git a/play-admin/src/main/java/com/starry/admin/common/oss/service/impl/OssFileServiceImpl.java b/play-admin/src/main/java/com/starry/admin/common/oss/service/impl/OssFileServiceImpl.java index 2708af5..22f9653 100644 --- a/play-admin/src/main/java/com/starry/admin/common/oss/service/impl/OssFileServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/common/oss/service/impl/OssFileServiceImpl.java @@ -1,6 +1,5 @@ package com.starry.admin.common.oss.service.impl; - import cn.hutool.core.date.DateTime; import cn.hutool.core.io.FileTypeUtil; import com.aliyun.oss.ClientException; @@ -13,13 +12,12 @@ import com.starry.admin.common.exception.CustomException; import com.starry.admin.common.oss.OssProperties; import com.starry.admin.common.oss.service.IOssFileService; import com.starry.common.utils.IdUtils; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.springframework.stereotype.Service; - import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.exception.ExceptionUtils; +import org.springframework.stereotype.Service; /** * @author admin @@ -28,7 +26,6 @@ import java.io.InputStream; @Slf4j public class OssFileServiceImpl implements IOssFileService { - @Override public String upload(InputStream inputStream, String module, String filename) { @@ -41,7 +38,8 @@ public class OssFileServiceImpl implements IOssFileService { throw new CustomException("文件上传到OSS失败"); } // 创建OSSClient实例。 - OSS ossClient = new OSSClientBuilder().build(OssProperties.ENDPOINT, OssProperties.KEY_ID, OssProperties.KEY_SECRET); + OSS ossClient = new OSSClientBuilder().build(OssProperties.ENDPOINT, OssProperties.KEY_ID, + OssProperties.KEY_SECRET); log.info("OSSClient实例创建成功"); try { // 判断oss实例是否存在：如果不存在则创建，如果存在则获取 @@ -57,12 +55,12 @@ public class OssFileServiceImpl implements IOssFileService { String folder = new DateTime().toString("yyyy/MM/dd"); // 文件名：uuid.扩展名 - filename = IdUtils.getUuid() + "." + fileType; // 文件根路径 String key = module + "/" + folder + "/" + filename; // 创建PutObjectRequest对象。 - PutObjectRequest putObjectRequest = new PutObjectRequest(OssProperties.BUCKET_NAME, key, bufferedInputStream); + PutObjectRequest putObjectRequest = new PutObjectRequest(OssProperties.BUCKET_NAME, key, + bufferedInputStream); // 创建PutObject请求。 ossClient.putObject(putObjectRequest); log.info("oss文件上传成功"); @@ -89,7 +87,8 @@ public class OssFileServiceImpl implements IOssFileService { @Override public void remove(String url) { - OSS ossClient = new OSSClientBuilder().build(OssProperties.ENDPOINT, OssProperties.KEY_ID, OssProperties.KEY_SECRET); + OSS ossClient = new OSSClientBuilder().build(OssProperties.ENDPOINT, OssProperties.KEY_ID, + OssProperties.KEY_SECRET); log.info("OSSClient实例创建成功"); try { String endpoint = OssProperties.ENDPOINT.substring(OssProperties.ENDPOINT.lastIndexOf("//") + 2); diff --git a/play-admin/src/main/java/com/starry/admin/common/security/config/SpringSecurityConfig.java b/play-admin/src/main/java/com/starry/admin/common/security/config/SpringSecurityConfig.java index 59f69e1..a7798e9 100644 --- a/play-admin/src/main/java/com/starry/admin/common/security/config/SpringSecurityConfig.java +++ b/play-admin/src/main/java/com/starry/admin/common/security/config/SpringSecurityConfig.java @@ -1,6 +1,5 @@ package com.starry.admin.common.security.config; - import com.starry.admin.common.security.entity.JwtUser; import com.starry.admin.common.security.filter.JwtAuthenticationTokenFilter; import com.starry.admin.common.security.handler.CustomAccessDeniedHandler; @@ -9,6 +8,8 @@ import com.starry.admin.common.security.handler.CustomLogoutSuccessHandler; import com.starry.admin.modules.system.module.entity.SysUserEntity; import com.starry.admin.modules.system.service.SysMenuService; import com.starry.admin.modules.system.service.SysUserService; +import java.util.Set; +import javax.annotation.Resource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; @@ -27,9 +28,6 @@ import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import javax.annotation.Resource; -import java.util.Set; - /** * @author admin */ @@ -49,14 +47,15 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter { @Resource private CustomLogoutSuccessHandler customLogoutSuccessHandler; - @Override protected void configure(HttpSecurity httpSecurity) throws Exception { httpSecurity.csrf().disable()// 由于使用的是JWT，我们这里不需要csrf .sessionManagement()// 基于token，所以不需要session .sessionCreationPolicy(SessionCreationPolicy.STATELESS).and().authorizeRequests() // 允许对于网站静态资源的无授权访问 - .antMatchers(HttpMethod.GET, "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.css", "/**/*.js", "/swagger-resources/**", "/v2/api-docs/**").permitAll() + .antMatchers(HttpMethod.GET, "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.css", "/**/*.js", + "/swagger-resources/**", "/v2/api-docs/**") + .permitAll() // 对登录注册要允许匿名访问 .antMatchers("/login", "/captcha/get-captcha", "/wx/**").permitAll() // 允许健康检查接口匿名访问 @@ -71,10 +70,11 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter { // 添加JWT filter httpSecurity.addFilterBefore(jwtAuthenticationTokenFilter(), UsernamePasswordAuthenticationFilter.class); // 添加自定义未授权和未登录结果返回 - httpSecurity.exceptionHandling().accessDeniedHandler(customAccessDeniedHandler).authenticationEntryPoint(customAuthenticationEntryPoint); + httpSecurity.exceptionHandling().accessDeniedHandler(customAccessDeniedHandler) + .authenticationEntryPoint(customAuthenticationEntryPoint); } - private CorsConfigurationSource corsConfigurationSource(){ + private CorsConfigurationSource corsConfigurationSource() { CorsConfiguration corsConfiguration = new CorsConfiguration(); corsConfiguration.setAllowCredentials(true); corsConfiguration.addAllowedHeader("*"); // 这个得加上，一些复杂的请求方式会带有header，不加上跨域会失效。 @@ -82,7 +82,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter { corsConfiguration.addExposedHeader("*"); corsConfiguration.addAllowedOriginPattern("*"); UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - source.registerCorsConfiguration("/**",corsConfiguration); + source.registerCorsConfiguration("/**", corsConfiguration); return source; } diff --git a/play-admin/src/main/java/com/starry/admin/common/security/entity/JwtUser.java b/play-admin/src/main/java/com/starry/admin/common/security/entity/JwtUser.java index 36b4aed..561cf55 100644 --- a/play-admin/src/main/java/com/starry/admin/common/security/entity/JwtUser.java +++ b/play-admin/src/main/java/com/starry/admin/common/security/entity/JwtUser.java @@ -1,11 +1,10 @@ package com.starry.admin.common.security.entity; import com.starry.admin.modules.system.module.entity.SysUserEntity; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; - import java.util.Collection; import java.util.Set; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; /** * @author admin @@ -61,7 +60,6 @@ public class JwtUser implements UserDetails { */ private Set permissions; - public JwtUser(SysUserEntity user, Set permissions) { this.user = user; this.permissions = permissions; diff --git a/play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java b/play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java index e3ff1db..9c1f630 100644 --- a/play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java +++ b/play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java @@ -1,6 +1,5 @@ package com.starry.admin.common.security.filter; - import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; @@ -20,6 +19,17 @@ import com.starry.common.constant.Constants; import com.starry.common.redis.RedisCache; import com.starry.common.result.R; import com.starry.common.result.ResultCodeEnum; +import java.io.IOException; +import java.util.Arrays; +import java.util.Date; +import java.util.HashSet; +import java.util.Set; +import javax.annotation.Resource; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotNull; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -28,21 +38,8 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.servlet.HandlerExceptionResolver; -import javax.annotation.Resource; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.constraints.NotNull; -import java.io.IOException; -import java.util.Arrays; -import java.util.Date; -import java.util.HashSet; -import java.util.Set; - /** - * @author admin - * JWT登录授权过滤器 + * @author admin JWT登录授权过滤器 * @since 2021/9/6 */ @Slf4j @@ -72,100 +69,112 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { @Resource private SysUserService userService; - /** * 不需要登录的的路径 */ - Set noLoginPathRequired = new HashSet<>(Arrays.asList("/wx/common/area/tree", "/wx/common/file/upload", "/wx/common/audio/upload", "/wx/oauth2/getConfigAddress", "/wx/clerk/user/queryByPage", "wx/clerk/user/queryGiftById", "/wx/clerk/user/queryPriceById", "/wx/clerk/user/queryTrendsById", "wx/clerk/user/queryEvaluateById")); + Set noLoginPathRequired = new HashSet<>(Arrays.asList("/wx/common/area/tree", "/wx/common/file/upload", + "/wx/common/audio/upload", "/wx/oauth2/getConfigAddress", "/wx/clerk/user/queryByPage", + "wx/clerk/user/queryGiftById", "/wx/clerk/user/queryPriceById", "/wx/clerk/user/queryTrendsById", + "wx/clerk/user/queryEvaluateById")); @Override - protected void doFilterInternal(@NotNull HttpServletRequest httpServletRequest, @NotNull HttpServletResponse httpServletResponse, @NotNull FilterChain filterChain) throws ServletException, IOException { + protected void doFilterInternal(@NotNull HttpServletRequest httpServletRequest, + @NotNull HttpServletResponse httpServletResponse, @NotNull FilterChain filterChain) + throws ServletException, IOException { log.info("url = {}", httpServletRequest.getRequestURI()); - //微信支付回调接口,不需要验证 + // 微信支付回调接口,不需要验证 if ("/wx/pay/jsCallback".equals(httpServletRequest.getServletPath())) { log.info("微信支付回调,不需要验证"); filterChain.doFilter(httpServletRequest, httpServletResponse); } else {// 微信公众号的请求，必须存在tenantkey，否则抛出异常 - if (httpServletRequest.getServletPath().startsWith("/wx/")) { + if (httpServletRequest.getServletPath().startsWith("/wx/")) { - String tenantKey = httpServletRequest.getHeader("tenantkey"); - if (StrUtil.isBlank(tenantKey)) { - resolver.resolveException(httpServletRequest, httpServletResponse, null, new CustomException("tenantkey不能为空")); - return; - } - if (noLoginPathRequired.contains(httpServletRequest.getServletPath())) { - //非必须登录的请求，验证租户信息是否正常 - String tenantId; - try { - tenantId = getTenantId(null, null, tenantKey); - } catch (Exception e) { - httpServletResponse.setCharacterEncoding("UTF-8"); - httpServletResponse.setContentType("application/json"); - httpServletResponse.getWriter().println(JSONUtil.parse(R.error(ResultCodeEnum.UNAUTHORIZED.getCode(), ResultCodeEnum.UNAUTHORIZED.getMessage()))); - httpServletResponse.getWriter().flush(); - return; - //返回401‘ - // -// return; -// throw new RuntimeException("token验证失败,需要重新登录"); - } - if (!checkTenantId(tenantId)) { - //返回500 - resolver.resolveException(httpServletRequest, httpServletResponse, null, new CustomException("租户信息异常")); + String tenantKey = httpServletRequest.getHeader("tenantkey"); + if (StrUtil.isBlank(tenantKey)) { + resolver.resolveException(httpServletRequest, httpServletResponse, null, + new CustomException("tenantkey不能为空")); return; } - SecurityUtils.setTenantId(tenantId); + if (noLoginPathRequired.contains(httpServletRequest.getServletPath())) { + // 非必须登录的请求，验证租户信息是否正常 + String tenantId; + try { + tenantId = getTenantId(null, null, tenantKey); + } catch (Exception e) { + httpServletResponse.setCharacterEncoding("UTF-8"); + httpServletResponse.setContentType("application/json"); + httpServletResponse.getWriter() + .println(JSONUtil.parse(R.error(ResultCodeEnum.UNAUTHORIZED.getCode(), + ResultCodeEnum.UNAUTHORIZED.getMessage()))); + httpServletResponse.getWriter().flush(); + return; + // 返回401‘ + // + // return; + // throw new RuntimeException("token验证失败,需要重新登录"); + } + if (!checkTenantId(tenantId)) { + // 返回500 + resolver.resolveException(httpServletRequest, httpServletResponse, null, + new CustomException("租户信息异常")); + return; + } + SecurityUtils.setTenantId(tenantId); + } else { + String clerkToken = httpServletRequest.getHeader(Constants.CLERK_USER_LOGIN_TOKEN); + String customToken = httpServletRequest.getHeader(Constants.CUSTOM_USER_LOGIN_TOKEN); + String tenantId; + try { + tenantId = getTenantId(clerkToken, customToken, tenantKey); + } catch (Exception e) { + httpServletResponse.setCharacterEncoding("UTF-8"); + httpServletResponse.setContentType("application/json"); + httpServletResponse.getWriter() + .println(JSONUtil.parse(R.error(ResultCodeEnum.UNAUTHORIZED.getCode(), + ResultCodeEnum.UNAUTHORIZED.getMessage()))); + httpServletResponse.getWriter().flush(); + // 返回401 + return; + // throw new CustomException("token验证失败,需要重新登录"); + } + if (!checkTenantId(tenantId)) { + // 返回500 + resolver.resolveException(httpServletRequest, httpServletResponse, null, + new CustomException("租户信息异常")); + return; + } + SecurityUtils.setTenantId(tenantId); + } } else { - String clerkToken = httpServletRequest.getHeader(Constants.CLERK_USER_LOGIN_TOKEN); - String customToken = httpServletRequest.getHeader(Constants.CUSTOM_USER_LOGIN_TOKEN); - String tenantId; - try { - tenantId = getTenantId(clerkToken, customToken, tenantKey); - } catch (Exception e) { - httpServletResponse.setCharacterEncoding("UTF-8"); - httpServletResponse.setContentType("application/json"); - httpServletResponse.getWriter().println(JSONUtil.parse(R.error(ResultCodeEnum.UNAUTHORIZED.getCode(), ResultCodeEnum.UNAUTHORIZED.getMessage()))); - httpServletResponse.getWriter().flush(); - //返回401 - return; -// throw new CustomException("token验证失败,需要重新登录"); + // 管理端的请求 + LoginUser jwtUser = jwtToken.getNewLoginUser(httpServletRequest); + if (null != jwtUser && null == SecurityContextHolder.getContext().getAuthentication()) { + jwtToken.verifyToken(jwtUser); + userService.selectUserById(jwtUser.getUserId()); + UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken( + jwtUser, null, jwtUser.getAuthorities()); + authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(httpServletRequest)); + SecurityContextHolder.getContext().setAuthentication(authentication); } - if (!checkTenantId(tenantId)) { - //返回500 - resolver.resolveException(httpServletRequest, httpServletResponse, null, new CustomException("租户信息异常")); - return; - } - SecurityUtils.setTenantId(tenantId); } - } else { - // 管理端的请求 - LoginUser jwtUser = jwtToken.getNewLoginUser(httpServletRequest); - if (null != jwtUser && null == SecurityContextHolder.getContext().getAuthentication()) { - jwtToken.verifyToken(jwtUser); - userService.selectUserById(jwtUser.getUserId()); - UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(jwtUser, null, jwtUser.getAuthorities()); - authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(httpServletRequest)); - SecurityContextHolder.getContext().setAuthentication(authentication); - } - } - filterChain.doFilter(httpServletRequest, httpServletResponse); + filterChain.doFilter(httpServletRequest, httpServletResponse); } } - /** - * 微信公众号端访问时，获取当前用户租户ID - * 如果用户（陪聊或客户）已登录，从token中获取租户ID - * 如果用户未登录，从tenantKey中获取租户ID + * 微信公众号端访问时，获取当前用户租户ID 如果用户（陪聊或客户）已登录，从token中获取租户ID 如果用户未登录，从tenantKey中获取租户ID * - * @param clerkToken 陪聊登录Key - * @param customToken 客户登录key - * @param tenantKey 租户标识 + * @param clerkToken + * 陪聊登录Key + * @param customToken + * 客户登录key + * @param tenantKey + * 租户标识 */ public String getTenantId(String clerkToken, String customToken, String tenantKey) { String tenantId = ""; - //如果用户（陪聊或客户）已登录，从token中获取租户ID + // 如果用户（陪聊或客户）已登录，从token中获取租户ID if (StrUtil.isNotBlank(clerkToken) || StrUtil.isNotBlank(customToken)) { String userId = tokenService.getWxUserIdByToken(StrUtil.isNotBlank(clerkToken) ? clerkToken : customToken); String redisKey = "TENANT_INFO:" + userId; @@ -198,7 +207,8 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { /** * 校验租户是否正常 * - * @param tenantId 租户ID + * @param tenantId + * 租户ID * @return true:租户正常，false:租户不正常 */ public boolean checkTenantId(String tenantId) { @@ -212,12 +222,12 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { if (entity == null) { return false; } - //判断租户是否过期 + // 判断租户是否过期 if (DateUtil.compare(entity.getTenantTime(), new Date()) < 0) { return false; } - //... - //校验通过 + // ... + // 校验通过 return true; } } diff --git a/play-admin/src/main/java/com/starry/admin/common/security/handler/CustomAccessDeniedHandler.java b/play-admin/src/main/java/com/starry/admin/common/security/handler/CustomAccessDeniedHandler.java index e838468..d889418 100644 --- a/play-admin/src/main/java/com/starry/admin/common/security/handler/CustomAccessDeniedHandler.java +++ b/play-admin/src/main/java/com/starry/admin/common/security/handler/CustomAccessDeniedHandler.java @@ -3,28 +3,28 @@ package com.starry.admin.common.security.handler; import cn.hutool.json.JSONUtil; import com.starry.common.result.R; import com.starry.common.result.ResultCodeEnum; +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; import org.springframework.stereotype.Component; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - /** - * @author admin - * 当访问接口没有权限时，自定义的返回结果 + * @author admin 当访问接口没有权限时，自定义的返回结果 * @since 2021/9/6 */ @Component public class CustomAccessDeniedHandler implements AccessDeniedHandler { @Override - public void handle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, AccessDeniedException e) throws IOException, ServletException { + public void handle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, + AccessDeniedException e) throws IOException, ServletException { httpServletResponse.setCharacterEncoding("UTF-8"); httpServletResponse.setContentType("application/json"); - httpServletResponse.getWriter().println(JSONUtil.parse(R.error(ResultCodeEnum.FORBIDDEN.getCode(), ResultCodeEnum.FORBIDDEN.getMessage()))); + httpServletResponse.getWriter().println( + JSONUtil.parse(R.error(ResultCodeEnum.FORBIDDEN.getCode(), ResultCodeEnum.FORBIDDEN.getMessage()))); httpServletResponse.getWriter().flush(); } } diff --git a/play-admin/src/main/java/com/starry/admin/common/security/handler/CustomAuthenticationEntryPoint.java b/play-admin/src/main/java/com/starry/admin/common/security/handler/CustomAuthenticationEntryPoint.java index 637b4f3..3a1b3d7 100644 --- a/play-admin/src/main/java/com/starry/admin/common/security/handler/CustomAuthenticationEntryPoint.java +++ b/play-admin/src/main/java/com/starry/admin/common/security/handler/CustomAuthenticationEntryPoint.java @@ -3,27 +3,27 @@ package com.starry.admin.common.security.handler; import cn.hutool.json.JSONUtil; import com.starry.common.result.R; import com.starry.common.result.ResultCodeEnum; +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - /** - * @author admin - * 当未登录或者token失效访问接口时，自定义的返回结果 + * @author admin 当未登录或者token失效访问接口时，自定义的返回结果 * @since 2021/9/6 */ @Component public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint { @Override - public void commence(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, AuthenticationException e) throws IOException, ServletException { + public void commence(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, + AuthenticationException e) throws IOException, ServletException { httpServletResponse.setCharacterEncoding("UTF-8"); httpServletResponse.setContentType("application/json"); - httpServletResponse.getWriter().println(JSONUtil.parse(R.error(ResultCodeEnum.UNAUTHORIZED.getCode(), ResultCodeEnum.UNAUTHORIZED.getMessage()))); + httpServletResponse.getWriter().println(JSONUtil + .parse(R.error(ResultCodeEnum.UNAUTHORIZED.getCode(), ResultCodeEnum.UNAUTHORIZED.getMessage()))); httpServletResponse.getWriter().flush(); } } diff --git a/play-admin/src/main/java/com/starry/admin/common/security/handler/CustomLogoutSuccessHandler.java b/play-admin/src/main/java/com/starry/admin/common/security/handler/CustomLogoutSuccessHandler.java index 8922c94..4493d2e 100644 --- a/play-admin/src/main/java/com/starry/admin/common/security/handler/CustomLogoutSuccessHandler.java +++ b/play-admin/src/main/java/com/starry/admin/common/security/handler/CustomLogoutSuccessHandler.java @@ -8,17 +8,15 @@ import com.starry.admin.manager.factory.AsyncFactory; import com.starry.common.constant.Constants; import com.starry.common.result.R; import com.starry.common.utils.ServletUtils; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; import org.springframework.stereotype.Component; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** - * @author admin - * 自定义退出处理类 返回成功 + * @author admin 自定义退出处理类 返回成功 * @since 2022/7/8 */ @Component @@ -28,7 +26,8 @@ public class CustomLogoutSuccessHandler implements LogoutSuccessHandler { private JwtToken jwtToken; @Override - public void onLogoutSuccess(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Authentication authentication) { + public void onLogoutSuccess(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, + Authentication authentication) { JwtUser jwtUser = jwtToken.getLoginUser(httpServletRequest); if (null != jwtUser) { // 删除用户缓存记录 diff --git a/play-admin/src/main/java/com/starry/admin/common/task/ClerkPkJob.java b/play-admin/src/main/java/com/starry/admin/common/task/ClerkPkJob.java index 285547c..0bb226b 100644 --- a/play-admin/src/main/java/com/starry/admin/common/task/ClerkPkJob.java +++ b/play-admin/src/main/java/com/starry/admin/common/task/ClerkPkJob.java @@ -4,12 +4,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.starry.admin.modules.clerk.module.entity.ClerkPkEnum; import com.starry.admin.modules.clerk.module.entity.PlayClerkPkEntity; import com.starry.admin.modules.clerk.service.IPlayClerkPkService; +import java.util.Date; +import javax.annotation.Resource; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import javax.annotation.Resource; -import java.util.Date; - /** * @Author: huchuansai * @Date: 2024/8/2 4:31 PM @@ -24,11 +23,13 @@ public class ClerkPkJob { @Scheduled(fixedRate = 60000) public void pkJobStatus() { // 更新状态将待开始的状态改为进行中 - playClerkPkService.update(Wrappers.lambdaUpdate(PlayClerkPkEntity.class).eq(PlayClerkPkEntity::getStatus, ClerkPkEnum.TO_BE_STARTED.name()) + playClerkPkService.update(Wrappers.lambdaUpdate(PlayClerkPkEntity.class) + .eq(PlayClerkPkEntity::getStatus, ClerkPkEnum.TO_BE_STARTED.name()) .le(PlayClerkPkEntity::getPkBeginTime, new Date()) .set(PlayClerkPkEntity::getStatus, ClerkPkEnum.IN_PROGRESS.name())); - playClerkPkService.update(Wrappers.lambdaUpdate(PlayClerkPkEntity.class).eq(PlayClerkPkEntity::getStatus, ClerkPkEnum.IN_PROGRESS.name()) + playClerkPkService.update(Wrappers.lambdaUpdate(PlayClerkPkEntity.class) + .eq(PlayClerkPkEntity::getStatus, ClerkPkEnum.IN_PROGRESS.name()) .le(PlayClerkPkEntity::getPkEndTime, new Date()) .set(PlayClerkPkEntity::getStatus, ClerkPkEnum.FINISHED.name())); } diff --git a/play-admin/src/main/java/com/starry/admin/common/task/ClerkWagesSettlementTask.java b/play-admin/src/main/java/com/starry/admin/common/task/ClerkWagesSettlementTask.java index e9e7093..01592e6 100644 --- a/play-admin/src/main/java/com/starry/admin/common/task/ClerkWagesSettlementTask.java +++ b/play-admin/src/main/java/com/starry/admin/common/task/ClerkWagesSettlementTask.java @@ -12,14 +12,13 @@ import com.starry.admin.modules.system.module.entity.SysTenantEntity; import com.starry.admin.modules.system.service.ISysTenantService; import com.starry.admin.utils.SecurityUtils; import com.starry.common.utils.IdUtils; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; import java.util.List; +import javax.annotation.Resource; +import org.springframework.stereotype.Component; /** * 订单工资结算 @@ -39,7 +38,6 @@ public class ClerkWagesSettlementTask { @Resource private IPlayOrderInfoService playOrderInfoService; - @Resource private IPlayClerkWagesInfoService playClerkWagesInfoService; @@ -47,10 +45,9 @@ public class ClerkWagesSettlementTask { private IPlayClerkWagesDetailsInfoService playClerkWagesDetailsInfoService; /** - * 每分钟查询未结算订单 - * 如果订单完成时间超过24小时，可进行结算，生成工资 + * 每分钟查询未结算订单 如果订单完成时间超过24小时，可进行结算，生成工资 */ -// @Scheduled(cron = "0 0/1 * * * ?") + // @Scheduled(cron = "0 0/1 * * * ?") public void dailyRanking() { // 1、查询所有的租户信息 List tenantEntities = sysTenantService.listAll(); @@ -64,11 +61,11 @@ public class ClerkWagesSettlementTask { } } - /** * 活动24小时前完成的订单，对订单进行结算 * - * @param clerkId 店员ID + * @param clerkId + * 店员ID */ public void updateClerkWagesInfo(String clerkId) { // 获得24小时前完成,并且未结算的订单 @@ -80,12 +77,11 @@ public class ClerkWagesSettlementTask { updateClerkWagesInfo(clerkId, entity == null ? IdUtils.getUuid() : entity.getId(), orderInfoEntities); } - /** - * 更新最新一次工资统计信息 - * 更新订单记录 + * 更新最新一次工资统计信息 更新订单记录 * - * @param orderInfoEntities 订单列表 + * @param orderInfoEntities + * 订单列表 */ public void updateClerkWagesInfo(String clerkId, String wagesId, List orderInfoEntities) { // 修改订单状态并且新增订单结算详情 @@ -95,7 +91,8 @@ public class ClerkWagesSettlementTask { orderInfo.setOrderSettlementTime(LocalDateTime.now()); playOrderInfoService.update(orderInfo); - PlayClerkWagesDetailsInfoEntity wagesDetailsInfo = playClerkWagesDetailsInfoService.selectByOrderId(orderInfo.getId()); + PlayClerkWagesDetailsInfoEntity wagesDetailsInfo = playClerkWagesDetailsInfoService + .selectByOrderId(orderInfo.getId()); if (wagesDetailsInfo == null) { wagesDetailsInfo = new PlayClerkWagesDetailsInfoEntity(); wagesDetailsInfo.setId(IdUtils.getUuid()); diff --git a/play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java b/play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java index 48c60db..7af6e72 100644 --- a/play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java +++ b/play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java @@ -10,10 +10,6 @@ import com.starry.admin.modules.system.module.entity.SysTenantEntity; import com.starry.admin.modules.system.service.ISysTenantService; import com.starry.admin.utils.SecurityUtils; import com.starry.common.utils.IdUtils; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; @@ -24,6 +20,9 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; +import javax.annotation.Resource; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; /** * 订单排名结算信息 @@ -49,8 +48,7 @@ public class OrderRankingSettlementTask { DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); /** - * 当日订单结算，查询前一日的订单信息，生成订单排名数据 - * 每天凌晨0点5分0秒时触发执行 + * 当日订单结算，查询前一日的订单信息，生成订单排名数据 每天凌晨0点5分0秒时触发执行 */ @Scheduled(cron = "0 5 0 * * ?") public void dailyRanking() { @@ -61,8 +59,7 @@ public class OrderRankingSettlementTask { } /** - * 每周订单结算，周一凌晨30分执行，查询上一周的订单，然后生成订单排行数据 - * 每周一凌晨0点30分0秒时触发执行 + * 每周订单结算，周一凌晨30分执行，查询上一周的订单，然后生成订单排行数据 每周一凌晨0点30分0秒时触发执行 */ @Scheduled(cron = "0 30 0 ? * MON") public void weeklyRankingSettlement() { @@ -73,14 +70,14 @@ public class OrderRankingSettlementTask { } /** - * 生产排行信息 - * 1、查询所有的租户信息 - * 2、查询每个租户的用户，以及他们在对应时间段的订单 - * 3、根据订单生产排行信息 + * 生产排行信息 1、查询所有的租户信息 2、查询每个租户的用户，以及他们在对应时间段的订单 3、根据订单生产排行信息 * - * @param startTime 接单开始时间 - * @param endTime 接单截至时间 - * @param weeklyRanking weeklyRanking 日排名还是周排名（0:每日排名;1:每周排名） + * @param startTime + * 接单开始时间 + * @param endTime + * 接单截至时间 + * @param weeklyRanking + * weeklyRanking 日排名还是周排名（0:每日排名;1:每周排名） * @author admin * @since 2024/6/12 15:21 **/ @@ -98,7 +95,8 @@ public class OrderRankingSettlementTask { // 生成每个人的订单排行信息 for (PlayClerkUserInfoEntity clerkUserInfo : clerkUserReturnVos) { // 生成订单排行数据 - clerkRankingInfoEntities.add(getClerkRanking(clerkUserInfo.getId(), startTime, endTime, weeklyRanking, newSerialNumber)); + clerkRankingInfoEntities.add( + getClerkRanking(clerkUserInfo.getId(), startTime, endTime, weeklyRanking, newSerialNumber)); } // 更新排行名次 clerkRankingInfoEntities.sort((p1, p2) -> p2.getOrderNumber() - p1.getOrderNumber()); @@ -106,7 +104,8 @@ public class OrderRankingSettlementTask { PlayClerkRankingInfoEntity item = clerkRankingInfoEntities.get(i); item.setRankingIndex(i + 1); if (i > 0) { - item.setPreviousMoney(clerkRankingInfoEntities.get(i - 1).getOrderMoney().subtract(item.getOrderMoney())); + item.setPreviousMoney( + clerkRankingInfoEntities.get(i - 1).getOrderMoney().subtract(item.getOrderMoney())); } } // 排名数据生成后，将以往排名状态标记为历史排名 @@ -119,16 +118,22 @@ public class OrderRankingSettlementTask { /** * 生产当前排行信息 * - * @param clerkId 店员ID - * @param startTime 排行开始统计日期 yyyy-mm-dd 00:00:00 - * @param endTime 排行结束统计日期 yyyy-mm-dd 23:59:59 - * @param weeklyRanking 日排名还是周排名（0:每日排名;1:每周排名） - * @param serialNumber 查询当前租户、当前排行、的最后一次统计编号 + * @param clerkId + * 店员ID + * @param startTime + * 排行开始统计日期 yyyy-mm-dd 00:00:00 + * @param endTime + * 排行结束统计日期 yyyy-mm-dd 23:59:59 + * @param weeklyRanking + * 日排名还是周排名（0:每日排名;1:每周排名） + * @param serialNumber + * 查询当前租户、当前排行、的最后一次统计编号 * @author admin * @since 2024/6/7 11:43 **/ - public PlayClerkRankingInfoEntity getClerkRanking(String clerkId, String startTime, String endTime, String weeklyRanking, Integer serialNumber) { - List orderInfoEntities = orderInfoService.listByTime(clerkId, startTime, endTime,null); + public PlayClerkRankingInfoEntity getClerkRanking(String clerkId, String startTime, String endTime, + String weeklyRanking, Integer serialNumber) { + List orderInfoEntities = orderInfoService.listByTime(clerkId, startTime, endTime, null); int orderNumber = orderInfoEntities.size(); BigDecimal orderMoney = BigDecimal.ZERO; Integer orderContinueNumber = 0; @@ -146,8 +151,13 @@ public class OrderRankingSettlementTask { ordersExpiredNumber++; } } - BigDecimal orderContinueProportion = orderNumber == 0 ? BigDecimal.ZERO : new BigDecimal(ordersExpiredNumber).divide(new BigDecimal(orderNumber), 4, RoundingMode.HALF_UP).add(new BigDecimal(100)); - BigDecimal averageUnitPrice = customIds.isEmpty() ? BigDecimal.ZERO : orderMoney.divide(new BigDecimal(customIds.size()), 4, RoundingMode.HALF_UP); + BigDecimal orderContinueProportion = orderNumber == 0 + ? BigDecimal.ZERO + : new BigDecimal(ordersExpiredNumber).divide(new BigDecimal(orderNumber), 4, RoundingMode.HALF_UP) + .add(new BigDecimal(100)); + BigDecimal averageUnitPrice = customIds.isEmpty() + ? BigDecimal.ZERO + : orderMoney.divide(new BigDecimal(customIds.size()), 4, RoundingMode.HALF_UP); PlayClerkRankingInfoEntity rankingInfo = new PlayClerkRankingInfoEntity(); rankingInfo.setId(IdUtils.getUuid()); rankingInfo.setClerkId(clerkId); @@ -174,5 +184,4 @@ public class OrderRankingSettlementTask { return rankingInfo; } - } diff --git a/play-admin/src/main/java/com/starry/admin/common/task/OverdueOrderHandlerTask.java b/play-admin/src/main/java/com/starry/admin/common/task/OverdueOrderHandlerTask.java index 3d66a94..8324564 100644 --- a/play-admin/src/main/java/com/starry/admin/common/task/OverdueOrderHandlerTask.java +++ b/play-admin/src/main/java/com/starry/admin/common/task/OverdueOrderHandlerTask.java @@ -3,15 +3,14 @@ package com.starry.admin.common.task; import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity; import com.starry.admin.modules.order.service.IPlayOrderInfoService; import com.starry.admin.utils.SecurityUtils; +import java.util.ArrayList; +import java.util.Set; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Set; - /** * 超时未接单的订单退款处理任务 * @@ -26,7 +25,6 @@ public class OverdueOrderHandlerTask { private static final int MAX_TIME = 24 * 60 * 40; - @Resource private StringRedisTemplate stringRedisTemplate; @@ -76,7 +74,7 @@ public class OverdueOrderHandlerTask { if ("0".equals(orderInfo.getOrderStatus())) { try { playOrderInfoService.updateStateTo4("2", "admin", orderInfo.getId(), "订单长时间未接单", new ArrayList<>()); - }catch (Exception e){ + } catch (Exception e) { log.error("订单退款失败", e); } diff --git a/play-admin/src/main/java/com/starry/admin/manager/AsyncManager.java b/play-admin/src/main/java/com/starry/admin/manager/AsyncManager.java index 7852f90..c9cb6e4 100644 --- a/play-admin/src/main/java/com/starry/admin/manager/AsyncManager.java +++ b/play-admin/src/main/java/com/starry/admin/manager/AsyncManager.java @@ -1,16 +1,13 @@ package com.starry.admin.manager; - import com.starry.common.utils.SpringUtils; import com.starry.common.utils.ThreadsUtils; - import java.util.TimerTask; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; /** - * @author admin - * 异步任务管理器 + * @author admin 异步任务管理器 * @since 2022/7/25 */ public class AsyncManager { @@ -38,7 +35,8 @@ public class AsyncManager { /** * 执行任务 * - * @param task 任务 + * @param task + * 任务 */ public void execute(TimerTask task) { executor.schedule(task, OPERATE_DELAY_TIME, TimeUnit.MILLISECONDS); diff --git a/play-admin/src/main/java/com/starry/admin/manager/ShutdownManager.java b/play-admin/src/main/java/com/starry/admin/manager/ShutdownManager.java index adc96a8..5f9b2a7 100644 --- a/play-admin/src/main/java/com/starry/admin/manager/ShutdownManager.java +++ b/play-admin/src/main/java/com/starry/admin/manager/ShutdownManager.java @@ -1,11 +1,10 @@ package com.starry.admin.manager; +import javax.annotation.PreDestroy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import javax.annotation.PreDestroy; - /** * 确保应用退出时能关闭后台线程 * diff --git a/play-admin/src/main/java/com/starry/admin/manager/factory/AsyncFactory.java b/play-admin/src/main/java/com/starry/admin/manager/factory/AsyncFactory.java index d60ca55..1acd1cf 100644 --- a/play-admin/src/main/java/com/starry/admin/manager/factory/AsyncFactory.java +++ b/play-admin/src/main/java/com/starry/admin/manager/factory/AsyncFactory.java @@ -9,10 +9,9 @@ import com.starry.common.constant.Constants; import com.starry.common.utils.ServletUtils; import com.starry.common.utils.SpringUtils; import com.starry.common.utils.ip.AddressUtils; -import lombok.extern.slf4j.Slf4j; - import java.util.Date; import java.util.TimerTask; +import lombok.extern.slf4j.Slf4j; /** * @author admin @@ -23,13 +22,18 @@ public class AsyncFactory { /** * 记录登录信息 * - * @param username 用户名 - * @param status 状态 - * @param message 消息 - * @param args 列表 + * @param username + * 用户名 + * @param status + * 状态 + * @param message + * 消息 + * @param args + * 列表 * @return 任务task */ - public static TimerTask recordLoginLog(final String username, final String status, final String message, final Object... args) { + public static TimerTask recordLoginLog(final String username, final String status, final String message, + final Object... args) { // 客户端操作系统、浏览器等信息 final UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent")); // 请求的IP地址 @@ -64,4 +68,3 @@ public class AsyncFactory { } } - diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayAvatarFrameInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayAvatarFrameInfoController.java index 351bb29..d5ee89b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayAvatarFrameInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayAvatarFrameInfoController.java @@ -13,18 +13,16 @@ import com.starry.common.result.R; import com.starry.common.utils.ConvertUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.io.IOException; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; -import java.io.IOException; - /** * 店员头像框Controller * @@ -38,17 +36,15 @@ public class PlayAvatarFrameInfoController { @Resource private IPlayAvatarFrameInfoService playAvatarFrameInfoService; - @Resource private IOssFileService ossFileService; - @ApiOperation(value = "分页查询头像框", notes = "分页查询店员头像框信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayAvatarFrameInfoEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayAvatarFrameInfoEntity.class, responseContainer = "Page")}) @PostMapping("/listByPage") - public R listByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayAvatarFrameInfoQueryVo vo) { + public R listByPage( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayAvatarFrameInfoQueryVo vo) { return R.ok(playAvatarFrameInfoService.selectByPage(vo)); } @@ -57,37 +53,32 @@ public class PlayAvatarFrameInfoController { */ @ApiOperation(value = "查询所有头像框", notes = "获取所有店员头像框信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayAvatarFrameInfoEntity.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayAvatarFrameInfoEntity.class, responseContainer = "List")}) @GetMapping("/listAll") public R listAll() { return R.ok(playAvatarFrameInfoService.selectAll()); } - @ApiOperation(value = "上传头像框图片", notes = "上传店员头像框图片文件") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = String.class, responseContainer = "R") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = String.class, responseContainer = "R")}) @PostMapping("/uploadFile") - public R uploadFile(@ApiParam(value = "图片文件", required = true) @RequestParam("file") MultipartFile file) throws IOException { - String fileAddress = ossFileService.upload(file.getInputStream(), SecurityUtils.getTenantId(), file.getOriginalFilename()); + public R uploadFile(@ApiParam(value = "图片文件", required = true) @RequestParam("file") MultipartFile file) + throws IOException { + String fileAddress = ossFileService.upload(file.getInputStream(), SecurityUtils.getTenantId(), + file.getOriginalFilename()); return R.ok(fileAddress); } - /** * 新增店员头像框 */ @ApiOperation(value = "新增头像框", notes = "创建新的店员头像框信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @Log(title = "店员头像框", businessType = BusinessType.INSERT) @PostMapping("/create") public R create(@ApiParam(value = "头像框信息", required = true) @Validated @RequestBody PlayAvatarFrameInfoAddVo vo) { - boolean success = playAvatarFrameInfoService.create(ConvertUtil.entityToVo(vo, PlayAvatarFrameInfoEntity.class)); + boolean success = playAvatarFrameInfoService + .create(ConvertUtil.entityToVo(vo, PlayAvatarFrameInfoEntity.class)); if (success) { return R.ok(); } @@ -99,13 +90,11 @@ public class PlayAvatarFrameInfoController { */ @ApiOperation(value = "修改头像框", notes = "根据ID修改店员头像框信息") @ApiImplicitParam(name = "id", value = "头像框ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @Log(title = "店员头像框", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "头像框信息", required = true) @RequestBody PlayAvatarFrameInfoEntity playAvatarFrameInfo) { + public R update(@PathVariable String id, + @ApiParam(value = "头像框信息", required = true) @RequestBody PlayAvatarFrameInfoEntity playAvatarFrameInfo) { playAvatarFrameInfo.setId(id); boolean success = playAvatarFrameInfoService.update(playAvatarFrameInfo); if (success) { @@ -119,9 +108,7 @@ public class PlayAvatarFrameInfoController { */ @ApiOperation(value = "删除头像框", notes = "根据ID批量删除店员头像框信息") @ApiImplicitParam(name = "ids", value = "头像框ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) @Log(title = "店员头像框", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { @@ -132,13 +119,11 @@ public class PlayAvatarFrameInfoController { * 新增店员头像框 */ @ApiOperation(value = "赠送头像框", notes = "赠送头像框给指定店员") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @Log(title = "赠送店员头像框", businessType = BusinessType.INSERT) @PostMapping("/sendAvatarFrame") - public R sendAvatarFrame(@ApiParam(value = "赠送信息", required = true) @Validated @RequestBody PlayAvatarFrameSendVo vo) { + public R sendAvatarFrame( + @ApiParam(value = "赠送信息", required = true) @Validated @RequestBody PlayAvatarFrameSendVo vo) { return R.error("添加失败"); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkArticleInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkArticleInfoController.java index 250de66..d30825d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkArticleInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkArticleInfoController.java @@ -13,16 +13,14 @@ import com.starry.common.result.R; import com.starry.common.utils.ConvertUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; - /** * 店员动态信息Controller * @@ -38,30 +36,24 @@ public class PlayClerkArticleInfoController { @Resource private IPlayCustomArticleInfoService playCustomArticleInfoService; - /** * 查询店员动态信息列表 */ @ApiOperation(value = "分页查询动态列表", notes = "分页查询店员动态信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkArticleReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkArticleReturnVo.class, responseContainer = "Page")}) @PostMapping("/listByPage") public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkArticleQueryVo vo) { - IPage list = playClerkArticleInfoService.selectByPage(vo,false); + IPage list = playClerkArticleInfoService.selectByPage(vo, false); return R.ok(list); } - /** * 修改店员动态信息 */ @ApiOperation(value = "修改动态审核状态", notes = "更新店员动态审核状态，通过或拒绝") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) - //@PreAuthorize("@customSs.hasPermission('clerk:article:update')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) + // @PreAuthorize("@customSs.hasPermission('clerk:article:update')") @Log(title = "店员动态信息", businessType = BusinessType.UPDATE) @PostMapping(value = "/update") public R update(@ApiParam(value = "审核状态信息", required = true) @RequestBody PlayClerkArticleReviewStateEditVo vo) { @@ -78,10 +70,8 @@ public class PlayClerkArticleInfoController { */ @ApiOperation(value = "删除动态", notes = "根据ID批量删除店员动态信息") @ApiImplicitParam(name = "ids", value = "动态ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) - //@PreAuthorize("@customSs.hasPermission('clerk:article:delete')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) + // @PreAuthorize("@customSs.hasPermission('clerk:article:delete')") @Log(title = "店员动态信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkClassificationInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkClassificationInfoController.java index e0ae785..3383641 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkClassificationInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkClassificationInfoController.java @@ -8,15 +8,13 @@ import com.starry.common.enums.BusinessType; import com.starry.common.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; import java.util.List; +import javax.annotation.Resource; +import org.springframework.web.bind.annotation.*; /** * 店员分类Controller @@ -36,25 +34,23 @@ public class PlayClerkClassificationInfoController { */ @ApiOperation(value = "查询所有分类", notes = "获取所有店员分类信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkClassificationInfoEntity.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkClassificationInfoEntity.class, responseContainer = "List")}) @GetMapping("/listAll") public R listAll() { List list = playClerkClassificationInfoService.selectAll(); return R.ok(list); } - /** * 查询店员分类列表 */ @ApiOperation(value = "分页查询分类", notes = "分页查询店员分类信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkClassificationInfoEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkClassificationInfoEntity.class, responseContainer = "Page")}) @GetMapping("/list") public R list(@ApiParam(value = "查询条件") PlayClerkClassificationInfoEntity playClerkClassificationInfo) { - IPage list = playClerkClassificationInfoService.selectPlayClerkClassificationInfoByPage(playClerkClassificationInfo); + IPage list = playClerkClassificationInfoService + .selectPlayClerkClassificationInfoByPage(playClerkClassificationInfo); return R.ok(list); } @@ -63,9 +59,7 @@ public class PlayClerkClassificationInfoController { */ @ApiOperation(value = "获取分类详情", notes = "根据ID获取店员分类详细信息") @ApiImplicitParam(name = "id", value = "分类ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkClassificationInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkClassificationInfoEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(playClerkClassificationInfoService.selectPlayClerkClassificationInfoById(id)); @@ -75,13 +69,11 @@ public class PlayClerkClassificationInfoController { * 新增店员分类 */ @ApiOperation(value = "新增分类", notes = "创建新的店员分类信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @Log(title = "店员分类", businessType = BusinessType.INSERT) @PostMapping("/create") - public R create(@ApiParam(value = "分类信息", required = true) @RequestBody PlayClerkClassificationInfoEntity playClerkClassificationInfo) { + public R create( + @ApiParam(value = "分类信息", required = true) @RequestBody PlayClerkClassificationInfoEntity playClerkClassificationInfo) { boolean success = playClerkClassificationInfoService.create(playClerkClassificationInfo); if (success) { return R.ok(); @@ -94,13 +86,11 @@ public class PlayClerkClassificationInfoController { */ @ApiOperation(value = "修改分类", notes = "根据ID修改店员分类信息") @ApiImplicitParam(name = "id", value = "分类ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @Log(title = "店员分类", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "分类信息", required = true) @RequestBody PlayClerkClassificationInfoEntity playClerkClassificationInfo) { + public R update(@PathVariable String id, + @ApiParam(value = "分类信息", required = true) @RequestBody PlayClerkClassificationInfoEntity playClerkClassificationInfo) { playClerkClassificationInfo.setId(id); boolean success = playClerkClassificationInfoService.update(playClerkClassificationInfo); if (success) { @@ -114,9 +104,7 @@ public class PlayClerkClassificationInfoController { */ @ApiOperation(value = "删除分类", notes = "根据ID批量删除店员分类信息") @ApiImplicitParam(name = "ids", value = "分类ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) @Log(title = "店员分类", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkCommodityController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkCommodityController.java index 81f3576..99392c7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkCommodityController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkCommodityController.java @@ -10,15 +10,13 @@ import com.starry.common.result.R; import com.starry.common.utils.ConvertUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; import java.util.List; +import javax.annotation.Resource; +import org.springframework.web.bind.annotation.*; /** * 陪聊服务项目Controller @@ -38,25 +36,23 @@ public class PlayClerkCommodityController { */ @ApiOperation(value = "查询所有服务项目", notes = "获取所有陪聊服务项目列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkCommodityQueryVo.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkCommodityQueryVo.class, responseContainer = "List")}) @GetMapping("/listAllCommodity") public R listAllCommodity() { List list = playClerkCommodityService.selectAll(); return R.ok(ConvertUtil.entityToVoList(list, PlayClerkCommodityQueryVo.class)); } - /** * 查询陪聊服务项目列表 */ @ApiOperation(value = "分页查询服务项目", notes = "分页查询陪聊服务项目列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkCommodityEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkCommodityEntity.class, responseContainer = "Page")}) @GetMapping("/list") public R list(@ApiParam(value = "查询条件") PlayClerkCommodityEntity playClerkCommodity) { - IPage list = playClerkCommodityService.selectPlayClerkCommodityByPage(playClerkCommodity); + IPage list = playClerkCommodityService + .selectPlayClerkCommodityByPage(playClerkCommodity); return R.ok(list); } @@ -65,9 +61,7 @@ public class PlayClerkCommodityController { */ @ApiOperation(value = "获取服务项目详情", notes = "根据ID获取陪聊服务项目详细信息") @ApiImplicitParam(name = "id", value = "服务项目ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkCommodityEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkCommodityEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(playClerkCommodityService.selectPlayClerkCommodityById(id)); @@ -77,13 +71,11 @@ public class PlayClerkCommodityController { * 新增陪聊服务项目 */ @ApiOperation(value = "新增服务项目", notes = "创建新的陪聊服务项目") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @Log(title = "陪聊服务项目", businessType = BusinessType.INSERT) @PostMapping("/create") - public R create(@ApiParam(value = "服务项目信息", required = true) @RequestBody PlayClerkCommodityEntity playClerkCommodity) { + public R create( + @ApiParam(value = "服务项目信息", required = true) @RequestBody PlayClerkCommodityEntity playClerkCommodity) { boolean success = playClerkCommodityService.create(playClerkCommodity); if (success) { return R.ok(); @@ -91,19 +83,16 @@ public class PlayClerkCommodityController { return R.error("添加失败"); } - /** * 修改陪聊服务项目 */ @ApiOperation(value = "修改服务项目", notes = "根据ID修改陪聊服务项目信息") @ApiImplicitParam(name = "id", value = "服务项目ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @Log(title = "陪聊服务项目", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "服务项目信息", required = true) @RequestBody PlayClerkCommodityEntity playClerkCommodity) { + public R update(@PathVariable String id, + @ApiParam(value = "服务项目信息", required = true) @RequestBody PlayClerkCommodityEntity playClerkCommodity) { playClerkCommodity.setId(id); boolean success = playClerkCommodityService.update(playClerkCommodity); if (success) { @@ -117,9 +106,7 @@ public class PlayClerkCommodityController { */ @ApiOperation(value = "删除服务项目", notes = "根据ID批量删除陪聊服务项目") @ApiImplicitParam(name = "ids", value = "服务项目ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) @Log(title = "陪聊服务项目", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkDataReviewInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkDataReviewInfoController.java index b35e2b6..b0f43a3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkDataReviewInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkDataReviewInfoController.java @@ -10,16 +10,14 @@ import com.starry.common.enums.BusinessType; import com.starry.common.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; - /** * 店员资料审核Controller * @@ -34,14 +32,12 @@ public class PlayClerkDataReviewInfoController { @Resource private IPlayClerkDataReviewInfoService playClerkDataReviewInfoService; - /** * 查询店员资料审核列表 */ @ApiOperation(value = "查询资料审核列表", notes = "分页查询店员资料审核列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkDataReviewReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkDataReviewReturnVo.class, responseContainer = "Page")}) @PostMapping("/listByPage") public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkDataReviewQueryVo vo) { IPage list = playClerkDataReviewInfoService.selectByPage(vo); @@ -52,13 +48,12 @@ public class PlayClerkDataReviewInfoController { * 修改店员资料审核 */ @ApiOperation(value = "修改资料审核状态", notes = "更新店员资料审核状态，通过或拒绝") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) - //@PreAuthorize("@customSs.hasPermission('clerk:dataReview:update')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) + // @PreAuthorize("@customSs.hasPermission('clerk:dataReview:update')") @Log(title = "店员资料审核", businessType = BusinessType.UPDATE) @PostMapping(value = "/update") - public R update(@ApiParam(value = "审核状态信息", required = true) @Validated @RequestBody PlayClerkDataReviewStateEditVo vo) { + public R update( + @ApiParam(value = "审核状态信息", required = true) @Validated @RequestBody PlayClerkDataReviewStateEditVo vo) { playClerkDataReviewInfoService.updateDataReviewState(vo); return R.ok(); } @@ -68,10 +63,8 @@ public class PlayClerkDataReviewInfoController { */ @ApiOperation(value = "删除资料审核记录", notes = "根据ID批量删除店员资料审核记录") @ApiImplicitParam(name = "ids", value = "审核记录ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) - //@PreAuthorize("@customSs.hasPermission('clerk:dataReview:delete')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) + // @PreAuthorize("@customSs.hasPermission('clerk:dataReview:delete')") @Log(title = "店员资料审核", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkLevelInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkLevelInfoController.java index c20b985..4efd189 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkLevelInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkLevelInfoController.java @@ -11,16 +11,14 @@ import com.starry.common.result.R; import com.starry.common.utils.ConvertUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; - /** * 店员等级Controller * @@ -39,8 +37,7 @@ public class PlayClerkLevelInfoController { */ @ApiOperation(value = "查询所有等级", notes = "获取所有店员等级信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkLevelInfoEntity.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkLevelInfoEntity.class, responseContainer = "List")}) @GetMapping("/listAll") public R listAll() { return R.ok(playClerkLevelInfoService.selectAll()); @@ -51,9 +48,7 @@ public class PlayClerkLevelInfoController { */ @ApiOperation(value = "获取等级详情", notes = "根据ID获取店员等级详细信息") @ApiImplicitParam(name = "id", value = "等级ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkLevelInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkLevelInfoEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(playClerkLevelInfoService.selectPlayClerkLevelInfoById(id)); @@ -63,10 +58,7 @@ public class PlayClerkLevelInfoController { * 新增店员等级 */ @ApiOperation(value = "新增等级", notes = "创建新的店员等级信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @Log(title = "店员等级", businessType = BusinessType.INSERT) @PostMapping("/create") public R create(@ApiParam(value = "等级信息", required = true) @RequestBody PlayClerkLevelAddVo vo) { @@ -84,10 +76,7 @@ public class PlayClerkLevelInfoController { * 修改店员等级 */ @ApiOperation(value = "修改等级", notes = "修改店员等级信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @Log(title = "店员等级", businessType = BusinessType.UPDATE) @PostMapping(value = "/update") public R update(@ApiParam(value = "等级信息", required = true) @Validated @RequestBody PlayClerkLevelEditVo vo) { @@ -103,10 +92,7 @@ public class PlayClerkLevelInfoController { * 删除店员等级 */ @ApiOperation(value = "删除最高等级", notes = "删除系统中最高的店员等级") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "最后一级,不允许删除") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "最后一级,不允许删除")}) @Log(title = "店员等级", businessType = BusinessType.DELETE) @DeleteMapping("delMaxLevel") public R remove() { diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkPkController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkPkController.java index cc40d0e..aa063b8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkPkController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkPkController.java @@ -12,9 +12,8 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.web.bind.annotation.*; - import javax.annotation.Resource; +import org.springframework.web.bind.annotation.*; /** * 店员pkController @@ -34,8 +33,7 @@ public class PlayClerkPkController { */ @ApiOperation(value = "分页查询PK列表", notes = "分页查询店员PK信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkPkEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkPkEntity.class, responseContainer = "Page")}) @GetMapping("/list") public R list(@ApiParam(value = "查询条件") PlayClerkPkEntity playClerkPk) { IPage list = playClerkPkService.selectPlayClerkPkByPage(playClerkPk); @@ -47,9 +45,7 @@ public class PlayClerkPkController { */ @ApiOperation(value = "获取PK详情", notes = "根据ID获取店员PK详细信息") @ApiImplicitParam(name = "id", value = "PK记录ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkPkEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkPkEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(playClerkPkService.selectPlayClerkPkById(id)); @@ -59,10 +55,7 @@ public class PlayClerkPkController { * 新增店员pk */ @ApiOperation(value = "新增PK记录", notes = "创建新的店员PK信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @Log(title = "店员pk", businessType = BusinessType.INSERT) @PostMapping("/create") public R create(@ApiParam(value = "PK信息", required = true) @RequestBody PlayClerkPkEntity playClerkPk) { @@ -78,13 +71,11 @@ public class PlayClerkPkController { */ @ApiOperation(value = "修改PK记录", notes = "根据ID修改店员PK信息") @ApiImplicitParam(name = "id", value = "PK记录ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @Log(title = "店员pk", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "PK信息", required = true) @RequestBody PlayClerkPkEntity playClerkPk) { + public R update(@PathVariable String id, + @ApiParam(value = "PK信息", required = true) @RequestBody PlayClerkPkEntity playClerkPk) { playClerkPk.setId(id); boolean success = playClerkPkService.update(playClerkPk); if (success) { @@ -98,9 +89,7 @@ public class PlayClerkPkController { */ @ApiOperation(value = "删除PK记录", notes = "根据ID批量删除店员PK信息") @ApiImplicitParam(name = "ids", value = "PK记录ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) @Log(title = "店员pk", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkRankingInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkRankingInfoController.java index 105b85d..87b0252 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkRankingInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkRankingInfoController.java @@ -10,16 +10,14 @@ import com.starry.common.enums.BusinessType; import com.starry.common.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; - /** * 店员排行Controller * @@ -38,8 +36,7 @@ public class PlayClerkRankingInfoController { */ @ApiOperation(value = "查询排行列表", notes = "分页查询店员排行信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = IPlayClerkRankingInfoReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = IPlayClerkRankingInfoReturnVo.class, responseContainer = "Page")}) @PostMapping("/listByPage") public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody IPlayClerkRankingInfoQueryVo vo) { IPage list = playClerkRankingInfoService.selectByPage(vo); @@ -51,9 +48,7 @@ public class PlayClerkRankingInfoController { */ @ApiOperation(value = "获取排行详情", notes = "根据ID获取店员排行详细信息") @ApiImplicitParam(name = "id", value = "排行ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkRankingInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkRankingInfoEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(playClerkRankingInfoService.selectPlayClerkRankingInfoById(id)); @@ -63,14 +58,12 @@ public class PlayClerkRankingInfoController { * 新增店员排行 */ @ApiOperation(value = "新增排行", notes = "创建新的店员排行记录") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) - //@PreAuthorize("@customSs.hasPermission('clerk:ranking:add')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) + // @PreAuthorize("@customSs.hasPermission('clerk:ranking:add')") @Log(title = "店员排行", businessType = BusinessType.INSERT) @PostMapping("/create") - public R create(@ApiParam(value = "排行信息", required = true) @RequestBody PlayClerkRankingInfoEntity playClerkRankingInfo) { + public R create( + @ApiParam(value = "排行信息", required = true) @RequestBody PlayClerkRankingInfoEntity playClerkRankingInfo) { boolean success = playClerkRankingInfoService.create(playClerkRankingInfo); if (success) { return R.ok(); @@ -83,14 +76,12 @@ public class PlayClerkRankingInfoController { */ @ApiOperation(value = "修改排行", notes = "根据ID修改店员排行信息") @ApiImplicitParam(name = "id", value = "排行ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) - //@PreAuthorize("@customSs.hasPermission('clerk:ranking:update')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) + // @PreAuthorize("@customSs.hasPermission('clerk:ranking:update')") @Log(title = "店员排行", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "排行信息", required = true) @RequestBody PlayClerkRankingInfoEntity playClerkRankingInfo) { + public R update(@PathVariable String id, + @ApiParam(value = "排行信息", required = true) @RequestBody PlayClerkRankingInfoEntity playClerkRankingInfo) { playClerkRankingInfo.setId(id); boolean success = playClerkRankingInfoService.update(playClerkRankingInfo); if (success) { @@ -104,10 +95,8 @@ public class PlayClerkRankingInfoController { */ @ApiOperation(value = "删除排行", notes = "根据ID批量删除店员排行信息") @ApiImplicitParam(name = "ids", value = "排行ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) - //@PreAuthorize("@customSs.hasPermission('clerk:ranking:delete')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) + // @PreAuthorize("@customSs.hasPermission('clerk:ranking:delete')") @Log(title = "店员排行", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkTypeInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkTypeInfoController.java index 0f5dbc3..78074ec 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkTypeInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkTypeInfoController.java @@ -10,16 +10,14 @@ import com.starry.common.result.R; import com.starry.common.utils.ConvertUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; - /** * 店员分类信息Controller * @@ -38,8 +36,7 @@ public class PlayClerkTypeInfoController { */ @ApiOperation(value = "查询所有分类", notes = "获取所有店员分类信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkTypeInfoEntity.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkTypeInfoEntity.class, responseContainer = "List")}) @GetMapping("/listByAll") public R listByAll() { return R.ok(playClerkTypeInfoService.selectByAll()); @@ -47,24 +44,19 @@ public class PlayClerkTypeInfoController { @ApiOperation(value = "分页查询分类", notes = "分页查询店员分类信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkTypeInfoEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkTypeInfoEntity.class, responseContainer = "Page")}) @PostMapping("/listByPage") - public R listByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkTypeInfoQueryVo vo) { + public R listByPage( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkTypeInfoQueryVo vo) { return R.ok(playClerkTypeInfoService.selectByPage(vo)); } - /** - - /** - * 新增店员分类信息 + * + * /** 新增店员分类信息 */ @ApiOperation(value = "新增分类", notes = "创建新的店员分类信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @Log(title = "店员分类信息", businessType = BusinessType.INSERT) @PostMapping("/create") public R create(@ApiParam(value = "分类信息", required = true) @Validated @RequestBody PlayClerkTypeInfoAddVo vo) { @@ -80,13 +72,11 @@ public class PlayClerkTypeInfoController { */ @ApiOperation(value = "修改分类", notes = "根据ID修改店员分类信息") @ApiImplicitParam(name = "id", value = "分类ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @Log(title = "店员分类信息", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "分类信息", required = true) @RequestBody PlayClerkTypeInfoEntity playClerkTypeInfo) { + public R update(@PathVariable String id, + @ApiParam(value = "分类信息", required = true) @RequestBody PlayClerkTypeInfoEntity playClerkTypeInfo) { playClerkTypeInfo.setId(id); boolean success = playClerkTypeInfoService.update(playClerkTypeInfo); if (success) { @@ -100,9 +90,7 @@ public class PlayClerkTypeInfoController { */ @ApiOperation(value = "删除分类", notes = "根据ID批量删除店员分类信息") @ApiImplicitParam(name = "ids", value = "分类ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) @Log(title = "店员分类信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserInfoController.java index 59f7e1a..6526304 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserInfoController.java @@ -19,17 +19,15 @@ import com.starry.common.result.R; import com.starry.common.utils.ConvertUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.List; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import java.util.List; - /** * 店员Controller * @@ -51,8 +49,7 @@ public class PlayClerkUserInfoController { */ @ApiOperation(value = "分页查询店员列表", notes = "根据条件分页查询店员列表信息，支持多种筛选条件") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserReturnVo.class, responseContainer = "Page")}) @PostMapping("listByPage") public R listByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkUserQueryVo vo) { IPage list = playClerkUserInfoService.selectByPage(vo); @@ -65,8 +62,7 @@ public class PlayClerkUserInfoController { @ApiOperation(value = "按分类查询店员列表", notes = "根据店员分类ID查询所有属于该分类的店员列表") @ApiImplicitParam(name = "id", value = "店员分类ID", required = true, paramType = "query", dataType = "String", example = "1") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoEntity.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoEntity.class, responseContainer = "List")}) @GetMapping("listAllByTypeId") public R listAllByTypeId(@RequestParam("id") String id) { List list = playClerkUserInfoService.listAllByTypeId(id); @@ -79,8 +75,7 @@ public class PlayClerkUserInfoController { @ApiOperation(value = "按分组查询店员列表", notes = "根据店员分组ID查询所有属于该分组的店员列表") @ApiImplicitParam(name = "id", value = "店员分组ID", required = true, paramType = "query", dataType = "String", example = "1") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoEntity.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoEntity.class, responseContainer = "List")}) @GetMapping("listAllByGroupId") public R listAllByGroupId(@RequestParam("id") String id) { List list = playClerkUserInfoService.listAllByGroupId(id); @@ -91,12 +86,11 @@ public class PlayClerkUserInfoController { * 修改店员分类 */ @ApiOperation(value = "修改店员分类", notes = "将指定店员分配到指定分类中，会先清空该分类下所有店员，再重新分配") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = String.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = String.class)}) @PostMapping("editClerkType") - public R listByPage(@ApiParam(value = "店员分类修改参数", required = true) @Validated @RequestBody PlayClerkUserTypeEditVo vo) { - //先清空当前分类下店员 + public R listByPage( + @ApiParam(value = "店员分类修改参数", required = true) @Validated @RequestBody PlayClerkUserTypeEditVo vo) { + // 先清空当前分类下店员 List list = playClerkUserInfoService.listAllByTypeId(vo.getTypeId()); for (PlayClerkUserInfoEntity clerkUserInfo : list) { PlayClerkUserInfoEntity entity = new PlayClerkUserInfoEntity(); @@ -114,18 +108,15 @@ public class PlayClerkUserInfoController { return R.ok("成功"); } - /** - * 1、修改店员分组 - * 2、将对应账号角色ID设为组长 + * 1、修改店员分组 2、将对应账号角色ID设为组长 */ @ApiOperation(value = "修改店员分组", notes = "将指定店员分配到指定分组中，会先清空该分组下所有店员，再重新分配，并可设置组长") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = String.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = String.class)}) @PostMapping("editClerkGroup") - public R editClerkGroup(@ApiParam(value = "店员分组修改参数", required = true) @Validated @RequestBody PlayClerkUserTypeEditVo vo) { - //先清空当前分类下店员 + public R editClerkGroup( + @ApiParam(value = "店员分组修改参数", required = true) @Validated @RequestBody PlayClerkUserTypeEditVo vo) { + // 先清空当前分类下店员 List list = playClerkUserInfoService.listAllByGroupId(vo.getTypeId()); for (PlayClerkUserInfoEntity clerkUserInfo : list) { PlayClerkUserInfoEntity entity = new PlayClerkUserInfoEntity(); @@ -140,14 +131,11 @@ public class PlayClerkUserInfoController { playClerkUserInfoService.update(entity); } - return R.ok("成功"); } @ApiOperation(value = "获取简单列表", notes = "获取店员和客户的简单列表信息，用于下拉选择等场景") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = JSONObject.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = JSONObject.class)}) @GetMapping("/simple/list") public R simpleList() { List clerkList = playClerkUserInfoService.simpleList(); @@ -155,14 +143,12 @@ public class PlayClerkUserInfoController { return R.ok(new JSONObject().fluentPut("clerkList", clerkList).fluentPut("customerList", customerList)); } - /** * 查询店员列表 */ @ApiOperation(value = "查询店员列表", notes = "分页查询店员信息列表，支持多种条件筛选，返回详细的店员信息") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoResultVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoResultVo.class, responseContainer = "Page")}) @GetMapping("/list") public R list(@ApiParam(value = "查询条件") PlayClerkUserInfoQueryVo vo) { IPage list = playClerkUserInfoService.selectPlayClerkUserInfoByPage(vo); @@ -174,62 +160,59 @@ public class PlayClerkUserInfoController { */ @ApiOperation(value = "获取店员详情", notes = "根据店员ID获取店员的详细信息") @ApiImplicitParam(name = "id", value = "店员ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(playClerkUserInfoService.selectById(id)); } -// -// /** -// * 微信端口新增店员 -// */ -// @Log(title = "店员", businessType = BusinessType.INSERT) -// @PostMapping("/wx/add") -// public R add(@Validated @RequestBody PlayClerkUserAddToWxVo vo) { -// //微信申请成为店员，需要先创建账户。 -// PlayUserInfoEntity userInfoEntity = ConvertUtil.entityToVo(vo, PlayUserInfoEntity.class); -// userInfoEntity.setId(IdUtils.getUuid()); -// playUserInfoService.create(userInfoEntity); -// //账号创建完成后，创建店员 -// PlayClerkUserInfoEntity clerkUserInfoEntity = ConvertUtil.entityToVo(vo, PlayClerkUserInfoEntity.class); -// clerkUserInfoEntity.setPlayUserId(userInfoEntity.getId()); -// boolean success = playClerkUserInfoService.create(clerkUserInfoEntity); -// if (success) { -// clerkCommodityService.initClerkCommodity(userInfoEntity.getId()); -// return R.ok(); -// } -// return R.error("添加失败"); -// } + // + // /** + // * 微信端口新增店员 + // */ + // @Log(title = "店员", businessType = BusinessType.INSERT) + // @PostMapping("/wx/add") + // public R add(@Validated @RequestBody PlayClerkUserAddToWxVo vo) { + // //微信申请成为店员，需要先创建账户。 + // PlayUserInfoEntity userInfoEntity = ConvertUtil.entityToVo(vo, + // PlayUserInfoEntity.class); + // userInfoEntity.setId(IdUtils.getUuid()); + // playUserInfoService.create(userInfoEntity); + // //账号创建完成后，创建店员 + // PlayClerkUserInfoEntity clerkUserInfoEntity = ConvertUtil.entityToVo(vo, + // PlayClerkUserInfoEntity.class); + // clerkUserInfoEntity.setPlayUserId(userInfoEntity.getId()); + // boolean success = playClerkUserInfoService.create(clerkUserInfoEntity); + // if (success) { + // clerkCommodityService.initClerkCommodity(userInfoEntity.getId()); + // return R.ok(); + // } + // return R.error("添加失败"); + // } - -// /** -// * 新增店员 -// */ -// @Log(title = "店员", businessType = BusinessType.INSERT) -// @PostMapping("/create") -// public R create(@Validated @RequestBody PlayClerkUserAddVo vo) { -// PlayClerkUserInfoEntity entity = ConvertUtil.entityToVo(vo, PlayClerkUserInfoEntity.class); -// boolean success = playClerkUserInfoService.create(entity); -// if (success) { -// clerkCommodityService.initClerkCommodity(vo.getPlayUserId()); -// return R.ok(); -// } -// return R.error("添加失败"); -// } + // /** + // * 新增店员 + // */ + // @Log(title = "店员", businessType = BusinessType.INSERT) + // @PostMapping("/create") + // public R create(@Validated @RequestBody PlayClerkUserAddVo vo) { + // PlayClerkUserInfoEntity entity = ConvertUtil.entityToVo(vo, + // PlayClerkUserInfoEntity.class); + // boolean success = playClerkUserInfoService.create(entity); + // if (success) { + // clerkCommodityService.initClerkCommodity(vo.getPlayUserId()); + // return R.ok(); + // } + // return R.error("添加失败"); + // } /** * 修改店员 */ - //@PreAuthorize("@customSs.hasPermission('clerk:user:update')") + // @PreAuthorize("@customSs.hasPermission('clerk:user:update')") @Log(title = "店员", businessType = BusinessType.UPDATE) @ApiOperation(value = "修改店员信息", notes = "修改店员的基本信息，如昵称、头像、签名等") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @PostMapping(value = "/update") public R update(@ApiParam(value = "店员信息", required = true) @Validated @RequestBody PlayClerkUserEditVo vo) { PlayClerkUserInfoEntity entity = ConvertUtil.entityToVo(vo, PlayClerkUserInfoEntity.class); @@ -240,19 +223,16 @@ public class PlayClerkUserInfoController { return R.error("修改失败"); } - /** * 修改店员状态 */ - //@PreAuthorize("@customSs.hasPermission('clerk:user:update')") + // @PreAuthorize("@customSs.hasPermission('clerk:user:update')") @Log(title = "店员", businessType = BusinessType.UPDATE) @ApiOperation(value = "修改店员状态", notes = "修改店员的状态信息，如上下架状态、推荐状态、在线状态等") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @PostMapping(value = "/updateState") - public R updateState(@ApiParam(value = "店员状态信息", required = true) @Validated @RequestBody PlayClerkUserStateEditVo vo) { + public R updateState( + @ApiParam(value = "店员状态信息", required = true) @Validated @RequestBody PlayClerkUserStateEditVo vo) { PlayClerkUserInfoEntity entity = ConvertUtil.entityToVo(vo, PlayClerkUserInfoEntity.class); boolean success = playClerkUserInfoService.update(entity); if (success) { @@ -264,13 +244,11 @@ public class PlayClerkUserInfoController { /** * 删除店员 */ - //@PreAuthorize("@customSs.hasPermission('clerk:user:remove')") + // @PreAuthorize("@customSs.hasPermission('clerk:user:remove')") @Log(title = "店员", businessType = BusinessType.DELETE) @ApiOperation(value = "删除店员", notes = "根据ID批量删除店员信息") @ApiImplicitParam(name = "ids", value = "店员ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { return R.ok(playClerkUserInfoService.deletePlayClerkUserInfoByIds(ids)); diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserReviewInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserReviewInfoController.java index fd401b3..47e3c9c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserReviewInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserReviewInfoController.java @@ -10,16 +10,14 @@ import com.starry.common.enums.BusinessType; import com.starry.common.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; - /** * 店员资料审核Controller * @@ -38,10 +36,10 @@ public class PlayClerkUserReviewInfoController { */ @ApiOperation(value = "查询审核列表", notes = "分页查询店员资料审核列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserReviewReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserReviewReturnVo.class, responseContainer = "Page")}) @PostMapping("/listByPage") - public R listByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkUserReviewQueryVo vo) { + public R listByPage( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkUserReviewQueryVo vo) { IPage list = playClerkUserReviewInfoService.selectByPage(vo); return R.ok(list); } @@ -50,13 +48,12 @@ public class PlayClerkUserReviewInfoController { * 修改店员资料审核 */ @ApiOperation(value = "修改审核状态", notes = "更新店员资料审核状态，通过或拒绝") - @ApiResponses({ - @ApiResponse(code = 200, message = "修改成功") - }) - //@PreAuthorize("@customSs.hasPermission('clerk:userReview:update')") + @ApiResponses({@ApiResponse(code = 200, message = "修改成功")}) + // @PreAuthorize("@customSs.hasPermission('clerk:userReview:update')") @Log(title = "店员资料审核", businessType = BusinessType.UPDATE) @PostMapping(value = "/update") - public R update(@ApiParam(value = "审核状态信息", required = true) @Validated @RequestBody PlayClerkUserReviewStateEditVo vo) { + public R update( + @ApiParam(value = "审核状态信息", required = true) @Validated @RequestBody PlayClerkUserReviewStateEditVo vo) { playClerkUserReviewInfoService.updateDataReviewState(vo); return R.ok("修改成功"); } @@ -66,10 +63,8 @@ public class PlayClerkUserReviewInfoController { */ @ApiOperation(value = "删除审核记录", notes = "根据ID批量删除店员资料审核记录") @ApiImplicitParam(name = "ids", value = "审核记录ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) - //@PreAuthorize("@customSs.hasPermission('clerk:userReview:delete')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) + // @PreAuthorize("@customSs.hasPermission('clerk:userReview:delete')") @Log(title = "店员资料审核", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesDetailsInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesDetailsInfoController.java index db7605f..4b8ab26 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesDetailsInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesDetailsInfoController.java @@ -8,14 +8,12 @@ import com.starry.common.enums.BusinessType; import com.starry.common.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.web.bind.annotation.*; - import javax.annotation.Resource; +import org.springframework.web.bind.annotation.*; /** * 店员工资明细信息Controller @@ -35,11 +33,11 @@ public class PlayClerkWagesDetailsInfoController { */ @ApiOperation(value = "查询工资明细列表", notes = "分页查询店员工资明细信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkWagesDetailsInfoEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkWagesDetailsInfoEntity.class, responseContainer = "Page")}) @GetMapping("/list") public R list(@ApiParam(value = "查询条件") PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) { - IPage list = playClerkWagesDetailsInfoService.selectPlayClerkWagesDetailsInfoByPage(playClerkWagesDetailsInfo); + IPage list = playClerkWagesDetailsInfoService + .selectPlayClerkWagesDetailsInfoByPage(playClerkWagesDetailsInfo); return R.ok(list); } @@ -48,9 +46,7 @@ public class PlayClerkWagesDetailsInfoController { */ @ApiOperation(value = "获取工资明细详情", notes = "根据ID获取店员工资明细详细信息") @ApiImplicitParam(name = "id", value = "工资明细ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkWagesDetailsInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkWagesDetailsInfoEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(playClerkWagesDetailsInfoService.selectPlayClerkWagesDetailsInfoById(id)); @@ -60,13 +56,11 @@ public class PlayClerkWagesDetailsInfoController { * 新增店员工资明细信息 */ @ApiOperation(value = "新增工资明细", notes = "创建新的店员工资明细记录") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @Log(title = "店员工资明细信息", businessType = BusinessType.INSERT) @PostMapping("/create") - public R create(@ApiParam(value = "工资明细信息", required = true) @RequestBody PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) { + public R create( + @ApiParam(value = "工资明细信息", required = true) @RequestBody PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) { boolean success = playClerkWagesDetailsInfoService.create(playClerkWagesDetailsInfo); if (success) { return R.ok(); @@ -79,13 +73,11 @@ public class PlayClerkWagesDetailsInfoController { */ @ApiOperation(value = "修改工资明细", notes = "根据ID修改店员工资明细信息") @ApiImplicitParam(name = "id", value = "工资明细ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @Log(title = "店员工资明细信息", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "工资明细信息", required = true) @RequestBody PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) { + public R update(@PathVariable String id, + @ApiParam(value = "工资明细信息", required = true) @RequestBody PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) { playClerkWagesDetailsInfo.setId(id); boolean success = playClerkWagesDetailsInfoService.update(playClerkWagesDetailsInfo); if (success) { @@ -99,9 +91,7 @@ public class PlayClerkWagesDetailsInfoController { */ @ApiOperation(value = "删除工资明细", notes = "根据ID批量删除店员工资明细信息") @ApiImplicitParam(name = "ids", value = "工资明细ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) @Log(title = "店员工资明细信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesInfoController.java index 5f36606..0683a9d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesInfoController.java @@ -16,18 +16,16 @@ import com.starry.common.result.R; import com.starry.common.utils.ConvertUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; /** * 店员工资结算信息Controller @@ -52,9 +50,7 @@ public class PlayClerkWagesInfoController { * 查询店员工资结算信息列表 */ @ApiOperation(value = "查询历史工资列表", notes = "分页查询店员历史工资结算信息列表") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Object.class, responseContainer = "Page") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Object.class, responseContainer = "Page")}) @PostMapping("/listByPage") public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkWagesInfoQueryVo vo) { return R.ok(playClerkWagesInfoService.selectHistoricalByPage(vo)); @@ -65,10 +61,10 @@ public class PlayClerkWagesInfoController { */ @ApiOperation(value = "查询未结算工资", notes = "分页查询店员未结算工资信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkUnsettledWagesInfoReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkUnsettledWagesInfoReturnVo.class, responseContainer = "Page")}) @PostMapping("/listUnsettledWagesByPage") - public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkUnsettledWagesInfoQueryVo vo) { + public R list( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkUnsettledWagesInfoQueryVo vo) { IPage page = playClerkUserInfoService.listUnsettledWagesByPage(vo); for (PlayClerkUnsettledWagesInfoReturnVo record : page.getRecords()) { Integer orderState1Number = 0; @@ -105,13 +101,11 @@ public class PlayClerkWagesInfoController { return R.ok(page); } - @ApiOperation(value = "查询工资明细", notes = "根据工资结算ID查询工资明细信息") @ApiImplicitParam(name = "id", value = "工资结算ID", required = true, paramType = "query", dataType = "String", example = "1") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = ClerkWagesDetailsReturnVo.class, responseContainer = "List"), - @ApiResponse(code = 500, message = "ID不能为空") - }) + @ApiResponse(code = 200, message = "操作成功", response = ClerkWagesDetailsReturnVo.class, responseContainer = "List"), + @ApiResponse(code = 500, message = "ID不能为空")}) @GetMapping("queryWagesDetailsById") public R clerkQueryWagesDetails(@RequestParam("id") String id) { if (StrUtil.isBlankIfStr(id)) { @@ -125,5 +119,4 @@ public class PlayClerkWagesInfoController { return R.ok(returnVos); } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayCustomArticleInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayCustomArticleInfoController.java index 1f63e03..4032e1a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayCustomArticleInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayCustomArticleInfoController.java @@ -8,16 +8,14 @@ import com.starry.common.enums.BusinessType; import com.starry.common.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; - /** * 陪聊点赞动态信息Controller * @@ -36,11 +34,11 @@ public class PlayCustomArticleInfoController { */ @ApiOperation(value = "查询动态列表", notes = "分页查询陪聊点赞动态信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCustomArticleInfoEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayCustomArticleInfoEntity.class, responseContainer = "Page")}) @GetMapping("/list") public R list(@ApiParam(value = "查询条件") PlayCustomArticleInfoEntity playCustomArticleInfo) { - IPage list = playCustomArticleInfoService.selectPlayCustomArticleInfoByPage(playCustomArticleInfo); + IPage list = playCustomArticleInfoService + .selectPlayCustomArticleInfoByPage(playCustomArticleInfo); return R.ok(list); } @@ -49,9 +47,7 @@ public class PlayCustomArticleInfoController { */ @ApiOperation(value = "获取动态详情", notes = "根据ID获取陪聊点赞动态详细信息") @ApiImplicitParam(name = "id", value = "动态ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCustomArticleInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayCustomArticleInfoEntity.class)}) @PreAuthorize("@customSs.hasPermission('play:info:query')") @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { @@ -62,14 +58,12 @@ public class PlayCustomArticleInfoController { * 新增陪聊点赞动态信息 */ @ApiOperation(value = "新增动态", notes = "创建新的陪聊点赞动态信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @PreAuthorize("@customSs.hasPermission('play:info:create')") @Log(title = "陪聊点赞动态信息", businessType = BusinessType.INSERT) @PostMapping("/create") - public R create(@ApiParam(value = "动态信息", required = true) @RequestBody PlayCustomArticleInfoEntity playCustomArticleInfo) { + public R create( + @ApiParam(value = "动态信息", required = true) @RequestBody PlayCustomArticleInfoEntity playCustomArticleInfo) { boolean success = playCustomArticleInfoService.create(playCustomArticleInfo); if (success) { return R.ok(); @@ -82,14 +76,12 @@ public class PlayCustomArticleInfoController { */ @ApiOperation(value = "修改动态", notes = "根据ID修改陪聊点赞动态信息") @ApiImplicitParam(name = "id", value = "动态ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @PreAuthorize("@customSs.hasPermission('play:info:edit')") @Log(title = "陪聊点赞动态信息", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "动态信息", required = true) @RequestBody PlayCustomArticleInfoEntity playCustomArticleInfo) { + public R update(@PathVariable String id, + @ApiParam(value = "动态信息", required = true) @RequestBody PlayCustomArticleInfoEntity playCustomArticleInfo) { playCustomArticleInfo.setId(id); boolean success = playCustomArticleInfoService.update(playCustomArticleInfo); if (success) { @@ -103,9 +95,7 @@ public class PlayCustomArticleInfoController { */ @ApiOperation(value = "删除动态", notes = "根据ID批量删除陪聊点赞动态信息") @ApiImplicitParam(name = "ids", value = "动态ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) @PreAuthorize("@customSs.hasPermission('play:info:remove')") @Log(title = "陪聊点赞动态信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayAvatarFrameInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayAvatarFrameInfoMapper.java index e62d1e5..b4748f6 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayAvatarFrameInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayAvatarFrameInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.clerk.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.clerk.module.entity.PlayAvatarFrameInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayAvatarFrameInfoEntity; */ public interface PlayAvatarFrameInfoMapper extends BaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkArticleInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkArticleInfoMapper.java index fdd01e6..10ee230 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkArticleInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkArticleInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.clerk.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.clerk.module.entity.PlayClerkArticleInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkArticleInfoEntity; */ public interface PlayClerkArticleInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkClassificationInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkClassificationInfoMapper.java index b009d31..c29577f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkClassificationInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkClassificationInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.clerk.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.clerk.module.entity.PlayClerkClassificationInfoEntity; @@ -8,9 +7,8 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkClassificationInfoE * 店员分类Mapper接口 * * @author admin - * @since 2024-04-06 + * @since 2024-04-06 */ public interface PlayClerkClassificationInfoMapper extends BaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkCommodityMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkCommodityMapper.java index d8870c9..a3e4dce 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkCommodityMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkCommodityMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.clerk.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.clerk.module.entity.PlayClerkCommodityEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkCommodityEntity; */ public interface PlayClerkCommodityMapper extends BaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkDataReviewInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkDataReviewInfoMapper.java index cc132d4..28c8ab9 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkDataReviewInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkDataReviewInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.clerk.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.clerk.module.entity.PlayClerkDataReviewInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkDataReviewInfoEntit */ public interface PlayClerkDataReviewInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkLevelInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkLevelInfoMapper.java index df570d4..f2de5cc 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkLevelInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkLevelInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.clerk.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity; @@ -8,9 +7,8 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity; * 店员等级Mapper接口 * * @author admin - * @since 2024-03-30 + * @since 2024-03-30 */ public interface PlayClerkLevelInfoMapper extends BaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkPkMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkPkMapper.java index ab82af2..f612c7f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkPkMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkPkMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.clerk.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.clerk.module.entity.PlayClerkPkEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkPkEntity; */ public interface PlayClerkPkMapper extends BaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkRankingInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkRankingInfoMapper.java index 6ceb053..f505ba7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkRankingInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkRankingInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.clerk.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.clerk.module.entity.PlayClerkRankingInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkRankingInfoEntity; */ public interface PlayClerkRankingInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeInfoMapper.java index 8743c94..f8fe3df 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.clerk.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeInfoEntity; */ public interface PlayClerkTypeInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeUserInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeUserInfoMapper.java index e4901a8..6c49cab 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeUserInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeUserInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.clerk.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeUserInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeUserInfoEntity; */ public interface PlayClerkTypeUserInfoMapper extends BaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkUserInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkUserInfoMapper.java index 0ab9e71..82e7d74 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkUserInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkUserInfoMapper.java @@ -1,17 +1,14 @@ package com.starry.admin.modules.clerk.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity; - /** * 店员Mapper接口 * * @author admin - * @since 2024-03-30 + * @since 2024-03-30 */ public interface PlayClerkUserInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkUserReviewInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkUserReviewInfoMapper.java index 1d636e8..8146c59 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkUserReviewInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkUserReviewInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.clerk.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.clerk.module.entity.PlayClerkUserReviewInfoEntity; @@ -8,9 +7,8 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkUserReviewInfoEntit * 店员资料审核Mapper接口 * * @author admin - * @since 2024-05-19 + * @since 2024-05-19 */ public interface PlayClerkUserReviewInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesDetailsInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesDetailsInfoMapper.java index 5b2028d..972b795 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesDetailsInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesDetailsInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.clerk.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesDetailsInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesDetailsInfoEnt */ public interface PlayClerkWagesDetailsInfoMapper extends BaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesInfoMapper.java index fa1ce81..7460c5a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.clerk.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesInfoEntity; */ public interface PlayClerkWagesInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayCustomArticleInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayCustomArticleInfoMapper.java index 88064f7..dbced7b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayCustomArticleInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayCustomArticleInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.clerk.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.clerk.module.entity.PlayCustomArticleInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayCustomArticleInfoEntity; */ public interface PlayCustomArticleInfoMapper extends BaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/ClerkPkEnum.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/ClerkPkEnum.java index fe7fedd..29b8b2a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/ClerkPkEnum.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/ClerkPkEnum.java @@ -11,10 +11,7 @@ import lombok.Getter; @AllArgsConstructor public enum ClerkPkEnum { - TO_BE_STARTED("TO_BE_STARTED", "待开始"), - IN_PROGRESS("IN_PROGRESS", "进行中"), - FINISHED("FINISHED", "已完成"), - ; + TO_BE_STARTED("TO_BE_STARTED", "待开始"), IN_PROGRESS("IN_PROGRESS", "进行中"), FINISHED("FINISHED", "已完成"),; @Getter private String value; diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/IPlayClerkRankingInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/IPlayClerkRankingInfoQueryVo.java index 0e4fc86..6e259a1 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/IPlayClerkRankingInfoQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/IPlayClerkRankingInfoQueryVo.java @@ -2,12 +2,11 @@ package com.starry.admin.modules.clerk.module.entity; import com.fasterxml.jackson.annotation.JsonFormat; import com.starry.common.domain.BasePageEntity; +import java.time.LocalDate; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDate; - /** * @author admin * @since 2024/6/7 上午9:49 @@ -26,19 +25,16 @@ public class IPlayClerkRankingInfoQueryVo extends BasePageEntity { */ private String historicalStatistics; - /** * 店员ID */ private String clerkId; - /** * 店员性别 */ private String sex; - /** * 统计时间 */ @@ -46,5 +42,4 @@ public class IPlayClerkRankingInfoQueryVo extends BasePageEntity { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDate settlementDate; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/IPlayClerkRankingInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/IPlayClerkRankingInfoReturnVo.java index ae51ec1..493b3d5 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/IPlayClerkRankingInfoReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/IPlayClerkRankingInfoReturnVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.clerk.module.entity; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - import java.math.BigDecimal; import java.time.LocalDate; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * @author admin @@ -34,7 +33,6 @@ public class IPlayClerkRankingInfoReturnVo { */ private String clerkSex; - /** * 店员昵称 */ @@ -45,7 +43,6 @@ public class IPlayClerkRankingInfoReturnVo { */ private String clerkGroupName; - /** * 排序名次 */ @@ -95,7 +92,6 @@ public class IPlayClerkRankingInfoReturnVo { */ private BigDecimal orderContinueProportion = BigDecimal.ZERO; - /** * 用户数 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayAvatarFrameInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayAvatarFrameInfoEntity.java index 4eee1fd..3181ef6 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayAvatarFrameInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayAvatarFrameInfoEntity.java @@ -2,11 +2,10 @@ package com.starry.admin.modules.clerk.module.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.starry.common.domain.BaseEntity; +import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; -import java.time.LocalDateTime; - /** * 店员头像框对象 play_avatar_frame_info * @@ -18,7 +17,6 @@ import java.time.LocalDateTime; @TableName("play_avatar_frame_info") public class PlayAvatarFrameInfoEntity extends BaseEntity { - /** * UUID */ @@ -64,5 +62,4 @@ public class PlayAvatarFrameInfoEntity extends BaseEntity { - /** * UUID */ @@ -42,7 +40,6 @@ public class PlayClerkArticleInfoEntity extends BaseEntity annexCon; - /** * 发布时间 */ @@ -75,5 +71,4 @@ public class PlayClerkArticleInfoEntity extends BaseEntity { - /** * UUID */ @@ -37,5 +36,4 @@ public class PlayClerkClassificationInfoEntity extends BaseEntity { - /** * UUID */ @@ -37,7 +36,6 @@ public class PlayClerkCommodityEntity extends BaseEntity { - /** * UUID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkDataReviewInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkDataReviewInfoQueryVo.java index 7cc22d9..44deca8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkDataReviewInfoQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkDataReviewInfoQueryVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.clerk.module.entity; import com.starry.common.domain.BasePageEntity; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 店员申请对象 play_clerk_data_review_info * @@ -16,13 +15,11 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) public class PlayClerkDataReviewInfoQueryVo extends BasePageEntity { - /** * UUID */ private String id; - /** * 资料类型[0:店员申请,1:头像;2:相册;3:录音] */ @@ -34,10 +31,7 @@ public class PlayClerkDataReviewInfoQueryVo extends BasePageEntity { private String content; /** - * 审核状态 - * 0：未审核 - * 1：审核通过 - * 2：审核未通过 + * 审核状态 0：未审核 1：审核通过 2：审核未通过 */ private String state = "0"; @@ -61,5 +55,4 @@ public class PlayClerkDataReviewInfoQueryVo extends BasePageEntity { */ private String remark; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkLevelInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkLevelInfoEntity.java index 1286d0d..ffeda10 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkLevelInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkLevelInfoEntity.java @@ -16,7 +16,6 @@ import lombok.EqualsAndHashCode; @TableName("play_clerk_level_info") public class PlayClerkLevelInfoEntity extends BaseEntity { - /** * UUID */ @@ -69,5 +68,5 @@ public class PlayClerkLevelInfoEntity extends BaseEntity { - /** * UUID */ @@ -49,7 +47,6 @@ public class PlayClerkPkEntity extends BaseEntity { */ private Date updatedTime; - /** * 数据版本 */ @@ -90,5 +87,4 @@ public class PlayClerkPkEntity extends BaseEntity { */ private String status; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkRankingInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkRankingInfoEntity.java index dada1a5..6108f52 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkRankingInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkRankingInfoEntity.java @@ -3,13 +3,12 @@ package com.starry.admin.modules.clerk.module.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.starry.common.domain.BaseEntity; +import java.math.BigDecimal; +import java.time.LocalDate; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; -import java.math.BigDecimal; -import java.time.LocalDate; - /** * 店员排行对象 play_clerk_ranking_info * @@ -21,7 +20,6 @@ import java.time.LocalDate; @TableName("play_clerk_ranking_info") public class PlayClerkRankingInfoEntity extends BaseEntity { - /** * UUID */ @@ -37,7 +35,6 @@ public class PlayClerkRankingInfoEntity extends BaseEntity { - /** * UUID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkTypeUserInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkTypeUserInfoEntity.java index e4db33e..00a4523 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkTypeUserInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkTypeUserInfoEntity.java @@ -16,7 +16,6 @@ import lombok.EqualsAndHashCode; @TableName("play_clerk_type_user_info") public class PlayClerkTypeUserInfoEntity extends BaseEntity { - /** * UUID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserDetailResultVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserDetailResultVo.java index 827e925..1e417eb 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserDetailResultVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserDetailResultVo.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.clerk.module.entity; -import lombok.Data; - import java.util.List; +import lombok.Data; /** * @author admin diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserEvaluateInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserEvaluateInfoEntity.java index f0ac7cd..d02c23b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserEvaluateInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserEvaluateInfoEntity.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.clerk.module.entity; -import lombok.Data; - import java.util.Date; +import lombok.Data; /** * 店员评价信息 @@ -14,13 +13,11 @@ public class PlayClerkUserEvaluateInfoEntity { private String id; - /** * 评价人ID */ private String evaluatorId; - /** * 评价人昵称 */ @@ -41,7 +38,6 @@ public class PlayClerkUserEvaluateInfoEntity { */ private Date evaluateTime; - /** * 订单ID */ @@ -72,8 +68,9 @@ public class PlayClerkUserEvaluateInfoEntity { */ public Integer likeCount; - - public PlayClerkUserEvaluateInfoEntity(String id, String evaluatorId, String evaluatorUsername, String evaluatorAvatar, String con, Date evaluateTime, String orderId, String clerkUsername, String commodityId, String commodityName, String commodityUnit) { + public PlayClerkUserEvaluateInfoEntity(String id, String evaluatorId, String evaluatorUsername, + String evaluatorAvatar, String con, Date evaluateTime, String orderId, String clerkUsername, + String commodityId, String commodityName, String commodityUnit) { this.id = id; this.evaluatorId = evaluatorId; this.evaluatorUsername = evaluatorUsername; @@ -87,7 +84,9 @@ public class PlayClerkUserEvaluateInfoEntity { this.commodityUnit = commodityUnit; } - public PlayClerkUserEvaluateInfoEntity(String id, String evaluatorId, String evaluatorUsername, String evaluatorAvatar, String con, Date evaluateTime, String orderId, String clerkUsername, String commodityId, String commodityName, String commodityUnit, int likeCount) { + public PlayClerkUserEvaluateInfoEntity(String id, String evaluatorId, String evaluatorUsername, + String evaluatorAvatar, String con, Date evaluateTime, String orderId, String clerkUsername, + String commodityId, String commodityName, String commodityUnit, int likeCount) { this.id = id; this.evaluatorId = evaluatorId; this.evaluatorUsername = evaluatorUsername; diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java index 6e68660..e647fae 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java @@ -6,13 +6,12 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.starry.admin.common.conf.StringTypeHandler; import com.starry.common.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; - import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; /** * 店员对象 play_clerk_user_info @@ -25,7 +24,6 @@ import java.util.List; @TableName(value = "play_clerk_user_info", autoResultMap = true) public class PlayClerkUserInfoEntity extends BaseEntity { - /** * UUID */ @@ -158,7 +156,6 @@ public class PlayClerkUserInfoEntity extends BaseEntity */ private String onboardingState; - /** * 入职时间 */ @@ -178,7 +175,6 @@ public class PlayClerkUserInfoEntity extends BaseEntity */ private Integer workingHours = 0; - /** * 是否推荐状态（1：已推荐，0：未推荐） */ @@ -243,7 +239,6 @@ public class PlayClerkUserInfoEntity extends BaseEntity **/ private String alipayImage; - /** * 创建时间 **/ diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserQueryVo.java index 3835a19..b0410c1 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserQueryVo.java @@ -3,11 +3,10 @@ package com.starry.admin.modules.clerk.module.entity; import com.starry.common.domain.BasePageEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** * 店员对象 play_clerk_user_info * @@ -43,14 +42,12 @@ public class PlayClerkUserQueryVo extends BasePageEntity { @ApiModelProperty(value = "分组ID") private String groupId; - /** * 性别[0:未知;1:男;2:女] */ @ApiModelProperty(value = "性别", notes = "0:未知;1:男;2:女") private String sex; - /** * 是否固定等级(0:固定等级，1:不固定) */ @@ -87,7 +84,6 @@ public class PlayClerkUserQueryVo extends BasePageEntity { @ApiModelProperty(value = "所在城市", example = "深圳市") private String city; - /** * 在职状态（1：在职，0：离职） */ @@ -154,5 +150,4 @@ public class PlayClerkUserQueryVo extends BasePageEntity { @ApiModelProperty(value = "身份证号") private String code; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java index 65e4c79..cf543d3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java @@ -5,13 +5,12 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 店员分页查询对象 @@ -23,7 +22,6 @@ import java.util.List; @ApiModel(value = "店员详细信息返回对象", description = "分页查询店员详细信息的返回结果") public class PlayClerkUserReturnVo { - /** * UUID */ @@ -48,21 +46,18 @@ public class PlayClerkUserReturnVo { @ApiModelProperty(value = "店员等级名称") private String levelName; - /** * 分组ID */ @ApiModelProperty(value = "分组ID") private String groupId; - /** * 分组ID */ @ApiModelProperty(value = "分组名称") private String groupName; - /** * 性别[0:未知;1:男;2:女] */ @@ -195,7 +190,6 @@ public class PlayClerkUserReturnVo { @ApiModelProperty(value = "添加时间", example = "2024-01-01 12:00:00") private LocalDateTime addTime; - /** * 入职时间 */ @@ -236,19 +230,16 @@ public class PlayClerkUserReturnVo { @ApiModelProperty(value = "是否固定等级", notes = "0:固定等级，1:不固定") private String fixingLevel; - /** * 在职状态（1：在职，0：离职） */ @ApiModelProperty(value = "在职状态", notes = "1：在职，0：离职") private String onboardingState; - /** * 在职天数 */ @ApiModelProperty(value = "在职天数", example = "365") private Integer workingHours = 0; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReviewInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReviewInfoEntity.java index 4b50247..293ea1c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReviewInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReviewInfoEntity.java @@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.starry.admin.common.conf.StringTypeHandler; import com.starry.common.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - import java.time.LocalDateTime; import java.util.List; +import lombok.Data; +import lombok.EqualsAndHashCode; /** * 店员申请对象 play_clerk_user_review_info @@ -92,7 +91,6 @@ public class PlayClerkUserReviewInfoEntity extends BaseEntity clerkUserIds; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkWagesDetailsInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkWagesDetailsInfoEntity.java index f8a5d2b..f6fca06 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkWagesDetailsInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkWagesDetailsInfoEntity.java @@ -2,11 +2,10 @@ package com.starry.admin.modules.clerk.module.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.starry.common.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - import java.math.BigDecimal; import java.time.LocalDateTime; +import lombok.Data; +import lombok.EqualsAndHashCode; /** * 店员工资明细信息对象 play_clerk_wages_details_info @@ -19,7 +18,6 @@ import java.time.LocalDateTime; @TableName("play_clerk_wages_details_info") public class PlayClerkWagesDetailsInfoEntity extends BaseEntity { - /** * UUID */ @@ -65,5 +63,4 @@ public class PlayClerkWagesDetailsInfoEntity extends BaseEntity { - /** * UUID */ @@ -37,7 +35,6 @@ public class PlayClerkWagesInfoEntity extends BaseEntity { - /** * UUID */ @@ -54,11 +52,9 @@ public class PlayCustomArticleInfoEntity extends BaseEntity releaseTime; - /** * 顾客ID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReturnVo.java index 1d28af2..1262417 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReturnVo.java @@ -5,15 +5,13 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.starry.admin.modules.clerk.module.entity.PlayCustomArticleInfoEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDateTime; +import java.util.List; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import java.util.List; - /** - * @author admin - * 动态信息查询返回对象 + * @author admin 动态信息查询返回对象 */ @Data @ApiModel(value = "店员动态返回数据", description = "店员动态信息的返回数据") @@ -48,7 +46,6 @@ public class PlayClerkArticleReturnVo { @ApiModelProperty(value = "动态内容", example = "今天天气真好，感谢大家的支持！") private String articleCon; - /** * 动态附件类型（0:图片;1:视频;2:音频） */ @@ -61,7 +58,6 @@ public class PlayClerkArticleReturnVo { @ApiModelProperty(value = "附件内容", example = "[\"https://example.com/photo1.jpg\"]", notes = "附件内容，根据附件类型有不同格式") private List annexCon; - /** * 发布时间 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReviewStateEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReviewStateEditVo.java index 51d215c..0c53d8a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReviewStateEditVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReviewStateEditVo.java @@ -2,21 +2,18 @@ package com.starry.admin.modules.clerk.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - +import java.time.LocalDateTime; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; -import java.time.LocalDateTime; +import lombok.Data; /** - * @author admin - * 动态审核 + * @author admin 动态审核 */ @Data @ApiModel(value = "店员动态审核状态修改参数", description = "修改店员动态审核状态的请求参数") public class PlayClerkArticleReviewStateEditVo { - @NotBlank(message = "ID不能为空") @ApiModelProperty(value = "动态ID", required = true, example = "1", notes = "店员动态的ID") private String id; diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkCommodityEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkCommodityEditVo.java index 3416418..0d288cf 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkCommodityEditVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkCommodityEditVo.java @@ -1,9 +1,8 @@ package com.starry.admin.modules.clerk.module.vo; -import lombok.Data; - import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; +import lombok.Data; /** * @author admin @@ -17,11 +16,8 @@ public class PlayClerkCommodityEditVo { @NotNull(message = "项目类型名称不能为空") private String commodityType; - /** - * 服务启动状态 - * 0:停用 - * 1:启用 + * 服务启动状态 0:停用 1:启用 */ @NotNull(message = "服务状态不能为空") @Pattern(regexp = "[01]", message = "服务状态必须为0或1") diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkCommodityQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkCommodityQueryVo.java index bd6ca95..af97973 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkCommodityQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkCommodityQueryVo.java @@ -17,11 +17,8 @@ public class PlayClerkCommodityQueryVo { @ApiModelProperty(value = "项目类型", example = "1", notes = "服务项目的类型") private String commodityType; - /** - * 服务启动状态 - * 0:停用 - * 1:启用 + * 服务启动状态 0:停用 1:启用 */ @ApiModelProperty(value = "启用状态", example = "1", notes = "0:停用,1:启用") private String enablingState; diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewQueryVo.java index d18cfd4..6cae312 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewQueryVo.java @@ -3,11 +3,10 @@ package com.starry.admin.modules.clerk.module.vo; import com.starry.common.domain.BasePageEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** * 店员资料审核对象 play_clerk_data_review_info * diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewReturnVo.java index 00b9e49..289edc8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewReturnVo.java @@ -2,10 +2,9 @@ package com.starry.admin.modules.clerk.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.time.LocalDateTime; import java.util.List; +import lombok.Data; /** * 店员资料审核对象 play_clerk_data_review_info @@ -17,14 +16,12 @@ import java.util.List; @ApiModel(value = "店员资料内容审核返回数据", description = "店员资料内容审核信息的返回数据") public class PlayClerkDataReviewReturnVo { - /** * UUID */ @ApiModelProperty(value = "审核记录ID", example = "1") private String id; - /** * 店员ID */ @@ -43,7 +40,6 @@ public class PlayClerkDataReviewReturnVo { @ApiModelProperty(value = "店员头像", example = "https://example.com/avatar.jpg") private String clerkAvatar; - /** * 资料类型[0:昵称;1:头像;2:相册;3:录音] */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewStateEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewStateEditVo.java index afe93a7..ecc15e2 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewStateEditVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewStateEditVo.java @@ -2,21 +2,18 @@ package com.starry.admin.modules.clerk.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - +import java.time.LocalDateTime; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; -import java.time.LocalDateTime; +import lombok.Data; /** - * @author admin - * 动态审核 + * @author admin 动态审核 */ @Data @ApiModel(value = "店员资料审核状态修改参数", description = "修改店员资料审核状态的请求参数") public class PlayClerkDataReviewStateEditVo { - @NotBlank(message = "ID不能为空") @ApiModelProperty(value = "审核记录ID", required = true, example = "1", notes = "店员资料审核记录的ID") private String id; diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkLevelAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkLevelAddVo.java index b709b82..3ccda50 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkLevelAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkLevelAddVo.java @@ -2,9 +2,8 @@ package com.starry.admin.modules.clerk.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import javax.validation.constraints.NotBlank; +import lombok.Data; /** * @author admin diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkLevelEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkLevelEditVo.java index c801421..08a2dc9 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkLevelEditVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkLevelEditVo.java @@ -2,9 +2,8 @@ package com.starry.admin.modules.clerk.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import javax.validation.constraints.NotBlank; +import lombok.Data; /** * @author admin @@ -63,7 +62,6 @@ public class PlayClerkLevelEditVo { @ApiModelProperty(value = "非首次随机单比例", example = "65", notes = "非首次随机单提成比例，范围0-100%") private Integer notFirstRandomRadio; - @ApiModelProperty(value = "样式类型", example = "1", notes = "等级样式类型") private Integer styleType; diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkLevelQueryReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkLevelQueryReturnVo.java index 2ac12df..0a87ff0 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkLevelQueryReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkLevelQueryReturnVo.java @@ -4,6 +4,7 @@ import lombok.Data; /** * 店员等级查询接口 + * * @author admin */ @Data @@ -14,5 +15,4 @@ public class PlayClerkLevelQueryReturnVo { */ private String name; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoAddVo.java index 85093de..ffec78c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoAddVo.java @@ -2,9 +2,8 @@ package com.starry.admin.modules.clerk.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import javax.validation.constraints.NotNull; +import lombok.Data; /** * @author admin @@ -14,7 +13,6 @@ import javax.validation.constraints.NotNull; @ApiModel(value = "店员分类添加参数", description = "新增店员分类信息的请求参数") public class PlayClerkTypeInfoAddVo { - /** * 分类名称 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoQueryVo.java index 91a0f26..4f7ef46 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoQueryVo.java @@ -15,7 +15,6 @@ import lombok.EqualsAndHashCode; @ApiModel(value = "店员分类查询参数", description = "查询店员分类信息的条件参数") public class PlayClerkTypeInfoQueryVo extends BasePageEntity { - @ApiModelProperty(value = "分类ID", example = "1", notes = "店员分类的ID") private String id; } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoReturnVo.java index c103760..1093621 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoReturnVo.java @@ -25,11 +25,9 @@ public class PlayClerkTypeInfoReturnVo { */ private Integer sort; - /** * 店员数 */ private Integer clerkNumber; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUnsettledWagesInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUnsettledWagesInfoReturnVo.java index 23b6532..0d847d3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUnsettledWagesInfoReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUnsettledWagesInfoReturnVo.java @@ -2,10 +2,9 @@ package com.starry.admin.modules.clerk.module.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity; -import lombok.Data; - import java.math.BigDecimal; import java.util.List; +import lombok.Data; /** * @author admin @@ -16,58 +15,48 @@ public class PlayClerkUnsettledWagesInfoReturnVo { private String clerkId; - private String clerkNickname; @JsonIgnore private List orderInfoEntities; - /** * 待开始订单-数量 */ private Integer orderState1Number; - /** * 待开始订单-金额 */ private BigDecimal orderState1Money; - /** * 服务中订单-数量 */ private Integer orderState2Number; - /** * 服务中订单-金额 */ private BigDecimal orderState2Money; - - /** - * 服务中订单-店员收入 + * 服务中订单-店员收入 */ private BigDecimal orderState2Revenue; - - /** * 已完成未结算订单-数量 */ private Integer orderState3Number; - /** * 已完成未结算订单-金额 */ private BigDecimal orderState3Money; /** - * 已完成未结算订单-店员收入 + * 已完成未结算订单-店员收入 */ private BigDecimal orderState3Revenue; diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddToWxVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddToWxVo.java index 1e60188..2803794 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddToWxVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddToWxVo.java @@ -1,10 +1,8 @@ package com.starry.admin.modules.clerk.module.vo; -import lombok.Data; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; - +import lombok.Data; /** * @author admin @@ -18,7 +16,6 @@ public class PlayClerkUserAddToWxVo { @NotBlank(message = "昵称不能为空") private String nickname; - /** * 性别[0:未知;1:男;2:女] */ @@ -31,14 +28,12 @@ public class PlayClerkUserAddToWxVo { @NotNull(message = "年龄不能为空") private int age; - /** * 微信号 */ @NotBlank(message = "微信号不能为空") private String weChat; - /** * 手机号码区号 */ @@ -57,7 +52,6 @@ public class PlayClerkUserAddToWxVo { @NotBlank(message = "音频不能为空") private String audioFrequency; - /** * 所在国家 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddVo.java index aba162f..e5d4fbb 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddVo.java @@ -1,10 +1,8 @@ package com.starry.admin.modules.clerk.module.vo; -import lombok.Data; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; - +import lombok.Data; /** * @author admin @@ -94,11 +92,9 @@ public class PlayClerkUserAddVo { @NotBlank(message = "城市不能为空") private String city; - /** * 备注 */ private String remark; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserEditVo.java index 70e44fe..716facf 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserEditVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserEditVo.java @@ -2,11 +2,9 @@ package com.starry.admin.modules.clerk.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; - +import lombok.Data; /** * @author admin @@ -118,7 +116,6 @@ public class PlayClerkUserEditVo { @ApiModelProperty(value = "所在城市", required = true, example = "深圳市") private String city; - /** * 备注 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewQueryVo.java index 3ade193..2dc731e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewQueryVo.java @@ -3,11 +3,10 @@ package com.starry.admin.modules.clerk.module.vo; import com.starry.common.domain.BasePageEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** * 店员申请审核 * @@ -25,28 +24,24 @@ public class PlayClerkUserReviewQueryVo extends BasePageEntity { @ApiModelProperty(value = "店员ID", example = "1", notes = "特定店员的ID") private String clerkId; - /** * 店员昵称 */ @ApiModelProperty(value = "店员昵称", example = "小明", notes = "店员的昵称，支持模糊查询") private String nickname; - /** * 性别[0:未知;1:男;2:女] */ @ApiModelProperty(value = "性别", example = "1", notes = "0:未知;1:男;2:女") private String sex; - /** * 手机号码 */ @ApiModelProperty(value = "手机号码", example = "13800138000", notes = "店员的手机号码") private String phone; - /** * 微信号 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewReturnVo.java index cb3cee9..21f112d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewReturnVo.java @@ -5,12 +5,11 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.starry.admin.common.conf.StringTypeHandler; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 店员申请审核 diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewStateEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewStateEditVo.java index b7727f3..aa7697f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewStateEditVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewStateEditVo.java @@ -2,21 +2,18 @@ package com.starry.admin.modules.clerk.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - +import java.time.LocalDateTime; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; -import java.time.LocalDateTime; +import lombok.Data; /** - * @author admin - * 动态审核 + * @author admin 动态审核 */ @Data @ApiModel(value = "店员资料审核状态修改参数", description = "修改店员资料审核状态的请求参数") public class PlayClerkUserReviewStateEditVo { - @NotBlank(message = "ID不能为空") @ApiModelProperty(value = "审核记录ID", required = true, example = "1", notes = "店员资料审核记录的ID") private String id; diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserStateEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserStateEditVo.java index f8e3f81..4908b01 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserStateEditVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserStateEditVo.java @@ -2,10 +2,8 @@ package com.starry.admin.modules.clerk.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import javax.validation.constraints.NotBlank; - +import lombok.Data; /** * @author admin @@ -77,21 +75,18 @@ public class PlayClerkUserStateEditVo { @ApiModelProperty(value = "是否固定等级", notes = "0:固定等级，1:不固定") private String fixingLevel; - /** * 在职状态（1：在职，0：离职） */ @ApiModelProperty(value = "在职状态", notes = "1：在职，0：离职", example = "1") private String onboardingState = "1"; - /** * 在职状态（1：在职，0：离职） */ @ApiModelProperty(value = "店员等级ID") private String levelId; - @ApiModelProperty(value = "备注", notes = "店员状态的备注信息") private String remark; diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoReturnVo.java index 5d165d9..afa90ab 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoReturnVo.java @@ -1,12 +1,11 @@ package com.starry.admin.modules.clerk.module.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * @author admin @@ -30,13 +29,11 @@ public class PlayClerkWagesInfoReturnVo { */ private String clerkId; - /** * 店员昵称 */ private String clerkNickname; - /** * 是否为往期统计(1:是;0:不是) **/ @@ -66,7 +63,6 @@ public class PlayClerkWagesInfoReturnVo { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDate endCountDate; - /** * 结算时间 */ @@ -74,7 +70,6 @@ public class PlayClerkWagesInfoReturnVo { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDateTime settlementDate; - /** * 订单总数 */ @@ -100,7 +95,6 @@ public class PlayClerkWagesInfoReturnVo { */ private Integer ordersExpiredNumber; - /** * 店员收入 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayAvatarFrameInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayAvatarFrameInfoService.java index 8f8b533..9212e22 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayAvatarFrameInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayAvatarFrameInfoService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.clerk.module.entity.PlayAvatarFrameInfoEntity; import com.starry.admin.modules.clerk.module.vo.PlayAvatarFrameInfoQueryVo; - import java.util.List; /** @@ -17,12 +16,12 @@ public interface IPlayAvatarFrameInfoService extends IService selectAll(); - /** * 查询店员头像框列表 * - * @param vo 店员头像框 + * @param vo + * 店员头像框 * @return 店员头像框集合 */ IPage selectByPage(PlayAvatarFrameInfoQueryVo vo); @@ -42,7 +41,8 @@ public interface IPlayAvatarFrameInfoService extends IService selectPlayAvatarFrameInfoByPage(PlayAvatarFrameInfoEntity playAvatarFrameInfo); @@ -50,7 +50,8 @@ public interface IPlayAvatarFrameInfoService extends IService selectByPage(PlayClerkArticleQueryVo vo, boolean searchByYourself); - /** * 顾客查询动态列表 * - * @param customId 顾客ID - * @param customId 动态查询对象 + * @param customId + * 顾客ID + * @param customId + * 动态查询对象 * @return PlayClerkArticleCustomReturnVo */ IPage customSelectByPage(PlayClerkArticleCustomQueryVo vo, String customId); - /** * 新增店员动态信息 * - * @param playClerkArticleInfo 店员动态信息 + * @param playClerkArticleInfo + * 店员动态信息 * @return 结果 */ boolean create(PlayClerkArticleInfoEntity playClerkArticleInfo); @@ -57,7 +59,8 @@ public interface IPlayClerkArticleInfoService extends IService selectAll(); - /** * 查询店员分类列表 * - * @param playClerkClassificationInfo 店员分类 + * @param playClerkClassificationInfo + * 店员分类 * @return 店员分类集合 */ - IPage selectPlayClerkClassificationInfoByPage(PlayClerkClassificationInfoEntity playClerkClassificationInfo); + IPage selectPlayClerkClassificationInfoByPage( + PlayClerkClassificationInfoEntity playClerkClassificationInfo); /** * 新增店员分类 * - * @param playClerkClassificationInfo 店员分类 + * @param playClerkClassificationInfo + * 店员分类 * @return 结果 */ boolean create(PlayClerkClassificationInfoEntity playClerkClassificationInfo); @@ -48,7 +50,8 @@ public interface IPlayClerkClassificationInfoService extends IService { - /** * 初始化当前陪聊服务项目 * - * @param playUserId 账号ID + * @param playUserId + * 账号ID */ void initClerkCommodity(String playUserId); - /** * 根据用户ID，查询当前用户的服务项目类型 * - * @param userId 用户ID - * @param enablingState 服务启动状态[0:停用;1:启用] + * @param userId + * 用户ID + * @param enablingState + * 服务启动状态[0:停用;1:启用] * @return 服务项目类型 */ - List getClerkCommodityList(String userId,String enablingState); + List getClerkCommodityList(String userId, String enablingState); /** * 根据用户ID，查询当前店员所有服务项目 * - * @param userId 用户ID - * @param enablingState 服务启动状态[0:停用;1:启用] + * @param userId + * 用户ID + * @param enablingState + * 服务启动状态[0:停用;1:启用] * @return List */ List selectCommodityTypeByUser(String userId, String enablingState); @@ -44,11 +46,12 @@ public interface IPlayClerkCommodityService extends IService */ List selectByUser(String playUserId); - + /** * 查询当前陪聊所有服务项目 * @@ -56,21 +59,23 @@ public interface IPlayClerkCommodityService extends IService selectAll(); - /** * 启停当前陪聊服务项目 * - * @param type 项目名称 - * @param enablingState 启停状态 - * @param clerkUserId 陪聊ID + * @param type + * 项目名称 + * @param enablingState + * 启停状态 + * @param clerkUserId + * 陪聊ID */ void startStopClerkItem(String type, String enablingState, String clerkUserId); - /** * 查询陪聊服务项目 * - * @param id 陪聊服务项目主键 + * @param id + * 陪聊服务项目主键 * @return 陪聊服务项目 */ PlayClerkCommodityEntity selectPlayClerkCommodityById(String id); @@ -78,7 +83,8 @@ public interface IPlayClerkCommodityService extends IService selectPlayClerkCommodityByPage(PlayClerkCommodityEntity playClerkCommodity); @@ -86,7 +92,8 @@ public interface IPlayClerkCommodityService extends IService { /** * 查询店员资料审核 - * @param id 店员资料审核主键 + * + * @param id + * 店员资料审核主键 * @return 店员资料审核 */ PlayClerkDataReviewInfoEntity selectPlayClerkDataReviewInfoById(String id); @@ -26,31 +27,41 @@ public interface IPlayClerkDataReviewInfoService extends IService queryByClerkId(String clerkId, String reviewState); /** * 查询店员资料申请 - * @param clerkId 店员ID - * @param dataType 资料类型[0:昵称;1:头像;2:相册;3:录音] - * @param reviewState 审核状态（0：未审核:1：审核通过，2：审核不通过） + * + * @param clerkId + * 店员ID + * @param dataType + * 资料类型[0:昵称;1:头像;2:相册;3:录音] + * @param reviewState + * 审核状态（0：未审核:1：审核通过，2：审核不通过） * @return PlayClerkDataReviewInfoEntity */ PlayClerkDataReviewInfoEntity queryByClerkId(String clerkId, String dataType, String reviewState); /** * 查询店员资料审核列表 - * @param vo 店员资料审核 + * + * @param vo + * 店员资料审核 * @return 店员资料审核集合 */ IPage selectByPage(PlayClerkDataReviewQueryVo vo); /** * 新增店员资料审核 - * @param playClerkDataReviewInfo 店员资料审核 + * + * @param playClerkDataReviewInfo + * 店员资料审核 * @return 结果 */ boolean create(PlayClerkDataReviewInfoEntity playClerkDataReviewInfo); @@ -58,12 +69,15 @@ public interface IPlayClerkDataReviewInfoService extends IService selectPlayClerkLevelInfoByPage(PlayClerkLevelInfoEntity playClerkLevelInfo); @@ -57,7 +59,8 @@ public interface IPlayClerkLevelInfoService extends IService { /** * 查询店员pk - * @param id 店员pk主键 + * + * @param id + * 店员pk主键 * @return 店员pk */ - PlayClerkPkEntity selectPlayClerkPkById(String id); + PlayClerkPkEntity selectPlayClerkPkById(String id); /** * 查询店员pk列表 - * @param playClerkPk 店员pk + * + * @param playClerkPk + * 店员pk * @return 店员pk集合 */ IPage selectPlayClerkPkByPage(PlayClerkPkEntity playClerkPk); /** * 新增店员pk - * @param playClerkPk 店员pk + * + * @param playClerkPk + * 店员pk * @return 结果 */ boolean create(PlayClerkPkEntity playClerkPk); /** * 修改店员pk - * @param playClerkPk 店员pk + * + * @param playClerkPk + * 店员pk * @return 结果 */ boolean update(PlayClerkPkEntity playClerkPk); @@ -42,7 +50,8 @@ public interface IPlayClerkPkService extends IService { /** * 批量删除店员pk * - * @param ids 需要删除的店员pk主键集合 + * @param ids + * 需要删除的店员pk主键集合 * @return 结果 */ int deletePlayClerkPkByIds(String[] ids); @@ -50,7 +59,8 @@ public interface IPlayClerkPkService extends IService { /** * 删除店员pk信息 * - * @param id 店员pk主键 + * @param id + * 店员pk主键 * @return 结果 */ int deletePlayClerkPkById(String id); diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkRankingInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkRankingInfoService.java index c193e27..f391229 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkRankingInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkRankingInfoService.java @@ -7,7 +7,6 @@ import com.starry.admin.modules.clerk.module.entity.IPlayClerkRankingInfoReturnV import com.starry.admin.modules.clerk.module.entity.PlayClerkRankingInfoEntity; import com.starry.admin.modules.weichat.entity.order.PlayOrderHistoryRankingReturnVo; import com.starry.admin.modules.weichat.entity.order.PlayOrderRankingReturnVo; - import java.time.LocalDate; import java.util.List; @@ -19,11 +18,11 @@ import java.util.List; */ public interface IPlayClerkRankingInfoService extends IService { - /** * 分页查询店员排行 * - * @param vo 店员排行查询对象 + * @param vo + * 店员排行查询对象 * @return 店员排查询对象 */ IPage selectByPage(IPlayClerkRankingInfoQueryVo vo); @@ -31,7 +30,8 @@ public interface IPlayClerkRankingInfoService extends IService selectPlayClerkRankingInfoByPage(PlayClerkRankingInfoEntity playClerkRankingInfo); - /** * 根据统计批次更新排名数据 * - * @param weeklyRanking 日排名还是周排名（0:每日排名;1:每周排名） - * @param serialNumber 统计批次 + * @param weeklyRanking + * 日排名还是周排名（0:每日排名;1:每周排名） + * @param serialNumber + * 统计批次 * @author admin * @since 2024/6/12 15:47 **/ @@ -58,18 +60,19 @@ public interface IPlayClerkRankingInfoService extends IService * @author admin * @since 2024/6/7 11:55 @@ -79,18 +82,21 @@ public interface IPlayClerkRankingInfoService extends IService selectHistoryRanking(String clerkId); - /** * 新增店员排行 * - * @param playClerkRankingInfo 店员排行 + * @param playClerkRankingInfo + * 店员排行 * @return 结果 */ boolean create(PlayClerkRankingInfoEntity playClerkRankingInfo); @@ -115,7 +122,8 @@ public interface IPlayClerkRankingInfoService extends IService selectByAll(); - /** * 查询店员分类信息列表 - * @param vo 店员分类信息 + * + * @param vo + * 店员分类信息 * @return 店员分类信息集合 */ IPage selectByPage(PlayClerkTypeInfoQueryVo vo); - /** * 新增店员分类信息 * - * @param playClerkTypeInfo 店员分类信息 + * @param playClerkTypeInfo + * 店员分类信息 * @return 结果 */ boolean create(PlayClerkTypeInfoEntity playClerkTypeInfo); @@ -50,7 +51,8 @@ public interface IPlayClerkTypeInfoService extends IService selectPlayClerkTypeUserInfoByPage(PlayClerkTypeUserInfoEntity playClerkTypeUserInfo); + IPage selectPlayClerkTypeUserInfoByPage( + PlayClerkTypeUserInfoEntity playClerkTypeUserInfo); /** * 新增店员和分类关系 * - * @param playClerkTypeUserInfo 店员和分类关系 + * @param playClerkTypeUserInfo + * 店员和分类关系 * @return 结果 */ boolean create(PlayClerkTypeUserInfoEntity playClerkTypeUserInfo); @@ -38,7 +42,8 @@ public interface IPlayClerkTypeUserInfoService extends IService { - /** * 根据分组ID查询店员列表 * - * @param typeId 分类ID + * @param typeId + * 分类ID * @return 店员列表 */ List listAllByTypeId(String typeId); @@ -38,7 +36,8 @@ public interface IPlayClerkUserInfoService extends IService listAllByGroupId(String groupId); @@ -46,7 +45,8 @@ public interface IPlayClerkUserInfoService extends IService listUnsettledWagesByPage(PlayClerkUnsettledWagesInfoQueryVo vo); - /** * 管理端分页查询店员信息 * - * @param vo 店员查询实体 + * @param vo + * 店员查询实体 * @return 店员列表 */ IPage selectByPage(PlayClerkPerformanceInfoQueryVo vo); - /** * 管理端分页查询店员信息 * - * @param vo 店员查询实体 + * @param vo + * 店员查询实体 * @return 店员列表 */ @@ -157,8 +173,10 @@ public interface IPlayClerkUserInfoService extends IService selectByPage(PlayClerkUserInfoQueryVo vo, String customUserId); @@ -166,7 +184,8 @@ public interface IPlayClerkUserInfoService extends IService selectPlayClerkUserInfoByPage(PlayClerkUserInfoQueryVo vo); @@ -174,7 +193,8 @@ public interface IPlayClerkUserInfoService extends IService selectByPage(PlayClerkUserReviewQueryVo vo); @@ -44,15 +46,18 @@ public interface IPlayClerkUserReviewInfoService extends IService selectPlayClerkUserReviewInfoByPage(PlayClerkUserReviewInfoEntity playClerkUserReviewInfo); + IPage selectPlayClerkUserReviewInfoByPage( + PlayClerkUserReviewInfoEntity playClerkUserReviewInfo); /** * 新增店员资料审核 * - * @param playClerkUserReviewInfo 店员资料审核 + * @param playClerkUserReviewInfo + * 店员资料审核 * @return 结果 */ boolean create(PlayClerkUserReviewInfoEntity playClerkUserReviewInfo); @@ -62,14 +67,16 @@ public interface IPlayClerkUserReviewInfoService extends IService selectByWagesId(String wagesId); - /** * 根据订单ID * - * @param orderId 订单ID + * @param orderId + * 订单ID * @return 工资详情 */ PlayClerkWagesDetailsInfoEntity selectByOrderId(String orderId); @@ -34,15 +34,18 @@ public interface IPlayClerkWagesDetailsInfoService extends IService selectPlayClerkWagesDetailsInfoByPage(PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo); + IPage selectPlayClerkWagesDetailsInfoByPage( + PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo); /** * 新增店员工资明细信息 * - * @param playClerkWagesDetailsInfo 店员工资明细信息 + * @param playClerkWagesDetailsInfo + * 店员工资明细信息 * @return 结果 */ boolean create(PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo); @@ -66,7 +72,8 @@ public interface IPlayClerkWagesDetailsInfoService extends IService selectHistoricalWagesByClerkId(String clerkId); - /** * 获取最后一次统计 * - * @param clerkId 店员ID + * @param clerkId + * 店员ID * @return 上次结算时间 */ PlayClerkWagesInfoEntity getLastSettlement(String clerkId); @@ -45,16 +46,17 @@ public interface IPlayClerkWagesInfoService extends IService selectHistoricalByPage(PlayClerkWagesInfoQueryVo vo); - - /** * 查询店员工资结算信息列表 * - * @param playClerkWagesInfo 店员工资结算信息 + * @param playClerkWagesInfo + * 店员工资结算信息 * @return 店员工资结算信息集合 */ IPage selectPlayClerkWagesInfoByPage(PlayClerkWagesInfoEntity playClerkWagesInfo); @@ -80,7 +82,8 @@ public interface IPlayClerkWagesInfoService extends IService { - /** * 查询顾客操作动态数据 - * @param articleId 动态ID - * @param customId 客户ID - * @param endorseType 操作类型(1:点赞;0:收藏) + * + * @param articleId + * 动态ID + * @param customId + * 客户ID + * @param endorseType + * 操作类型(1:点赞;0:收藏) * @return PlayCustomArticleInfoEntity */ PlayCustomArticleInfoEntity selectByArticleId(String articleId, String customId, String endorseType); @@ -25,7 +28,8 @@ public interface IPlayCustomArticleInfoService extends IService selectPlayCustomArticleInfoByPage(PlayCustomArticleInfoEntity playCustomArticleInfo); + IPage selectPlayCustomArticleInfoByPage( + PlayCustomArticleInfoEntity playCustomArticleInfo); /** * 新增陪聊点赞动态信息 * - * @param playCustomArticleInfo 陪聊点赞动态信息 + * @param playCustomArticleInfo + * 陪聊点赞动态信息 * @return 结果 */ boolean create(PlayCustomArticleInfoEntity playCustomArticleInfo); @@ -49,7 +56,8 @@ public interface IPlayCustomArticleInfoService extends IService implements IPlayAvatarFrameInfoService { +public class PlayAvatarFrameInfoServiceImpl extends ServiceImpl + implements + IPlayAvatarFrameInfoService { @Resource private PlayAvatarFrameInfoMapper playAvatarFrameInfoMapper; /** * 查询店员头像框 * - * @param id 店员头像框主键 + * @param id + * 店员头像框主键 * @return 店员头像框 */ @Override @@ -38,13 +40,11 @@ public class PlayAvatarFrameInfoServiceImpl extends ServiceImpl selectAll() { return this.baseMapper.selectList(new LambdaQueryWrapper<>()); } - @Override public IPage selectByPage(PlayAvatarFrameInfoQueryVo vo) { return this.baseMapper.selectPage(new Page<>(vo.getPageNum(), vo.getPageSize()), new LambdaQueryWrapper<>()); @@ -53,11 +53,13 @@ public class PlayAvatarFrameInfoServiceImpl extends ServiceImpl selectPlayAvatarFrameInfoByPage(PlayAvatarFrameInfoEntity playAvatarFrameInfo) { + public IPage selectPlayAvatarFrameInfoByPage( + PlayAvatarFrameInfoEntity playAvatarFrameInfo) { Page page = new Page<>(1, 10); return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>()); } @@ -65,7 +67,8 @@ public class PlayAvatarFrameInfoServiceImpl extends ServiceImpl implements IPlayClerkArticleInfoService { +public class PlayClerkArticleInfoServiceImpl extends ServiceImpl + implements + IPlayClerkArticleInfoService { @Resource private PlayClerkArticleInfoMapper playClerkArticleInfoMapper; @@ -42,7 +43,8 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl selectByPage(PlayClerkArticleQueryVo vo, boolean searchByYourself) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); - //查询主表全部字段 + // 查询主表全部字段 lambdaQueryWrapper.selectAll(PlayClerkArticleInfoEntity.class); - //陪聊用户表全部字段 - lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar"); - //陪聊动态表 - lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkArticleInfoEntity::getClerkId); - //动态点赞表 - lambdaQueryWrapper.selectCollection(PlayCustomArticleInfoEntity.class, PlayClerkArticleReturnVo::getArticleInfoEntities).leftJoin(PlayCustomArticleInfoEntity.class, PlayCustomArticleInfoEntity::getArticleId, PlayCustomArticleInfoEntity::getId); + // 陪聊用户表全部字段 + lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId") + .selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname") + .selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar"); + // 陪聊动态表 + lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, + PlayClerkArticleInfoEntity::getClerkId); + // 动态点赞表 + lambdaQueryWrapper + .selectCollection(PlayCustomArticleInfoEntity.class, PlayClerkArticleReturnVo::getArticleInfoEntities) + .leftJoin(PlayCustomArticleInfoEntity.class, PlayCustomArticleInfoEntity::getArticleId, + PlayCustomArticleInfoEntity::getId); if (StrUtil.isNotBlank(vo.getClerkId())) { lambdaQueryWrapper.eq(PlayClerkArticleInfoEntity::getClerkId, vo.getClerkId()); @@ -79,14 +88,17 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), null); + List clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), + null); lambdaQueryWrapper.in(PlayClerkArticleInfoEntity::getClerkId, clerkIdList); } - IPage page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleReturnVo.class, lambdaQueryWrapper); + IPage page = this.baseMapper.selectJoinPage( + new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleReturnVo.class, lambdaQueryWrapper); for (PlayClerkArticleReturnVo record : page.getRecords()) { int index = 0; for (PlayCustomArticleInfoEntity articleInfoEntity : record.getArticleInfoEntities()) { @@ -97,46 +109,55 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleReturnVo.class, lambdaQueryWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayClerkArticleReturnVo.class, lambdaQueryWrapper); } - @Override public IPage customSelectByPage(PlayClerkArticleCustomQueryVo vo, String customId) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); - //查询主表全部字段 + // 查询主表全部字段 lambdaQueryWrapper.selectAll(PlayClerkArticleInfoEntity.class); - //陪聊用户表全部字段 - lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex"); - //陪聊用户表全部字段 + // 陪聊用户表全部字段 + lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId") + .selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname") + .selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar") + .selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex"); + // 陪聊用户表全部字段 lambdaQueryWrapper.selectAs(PlayCustomArticleInfoEntity::getId, "id"); - //陪聊动态表 - lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkArticleInfoEntity::getClerkId); + // 陪聊动态表 + lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, + PlayClerkArticleInfoEntity::getClerkId); if (StrUtil.isNotBlank(vo.getFollowState()) && "1".equals(vo.getFollowState())) { - //查询本人收藏的动态列表 - lambdaQueryWrapper.innerJoin(PlayCustomArticleInfoEntity.class, PlayCustomArticleInfoEntity::getArticleId, PlayClerkArticleInfoEntity::getId); + // 查询本人收藏的动态列表 + lambdaQueryWrapper.innerJoin(PlayCustomArticleInfoEntity.class, PlayCustomArticleInfoEntity::getArticleId, + PlayClerkArticleInfoEntity::getId); lambdaQueryWrapper.eq(PlayCustomArticleInfoEntity::getCustomId, customId); lambdaQueryWrapper.eq(PlayCustomArticleInfoEntity::getEndorseType, "0"); lambdaQueryWrapper.eq(PlayCustomArticleInfoEntity::getEndorseState, "1"); } - //查询指定店员动态 + // 查询指定店员动态 if (StrUtil.isNotBlank(vo.getClerkId())) { lambdaQueryWrapper.eq(PlayClerkArticleInfoEntity::getClerkId, vo.getClerkId()); } - //动态点赞表 - lambdaQueryWrapper.selectCollection(PlayCustomArticleInfoEntity.class, PlayClerkArticleReturnVo::getArticleInfoEntities).leftJoin(PlayCustomArticleInfoEntity.class, PlayCustomArticleInfoEntity::getArticleId, PlayCustomArticleInfoEntity::getId); + // 动态点赞表 + lambdaQueryWrapper + .selectCollection(PlayCustomArticleInfoEntity.class, PlayClerkArticleReturnVo::getArticleInfoEntities) + .leftJoin(PlayCustomArticleInfoEntity.class, PlayCustomArticleInfoEntity::getArticleId, + PlayCustomArticleInfoEntity::getId); lambdaQueryWrapper.eq(PlayClerkArticleInfoEntity::getReviewState, "1"); - - IPage page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleCustomReturnVo.class, lambdaQueryWrapper); + IPage page = this.baseMapper.selectJoinPage( + new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleCustomReturnVo.class, + lambdaQueryWrapper); for (PlayClerkArticleCustomReturnVo record : page.getRecords()) { int index = 0; for (PlayCustomArticleInfoEntity articleInfoEntity : record.getArticleInfoEntities()) { - //动态操作信息为空 + // 动态操作信息为空 if (articleInfoEntity.getId() == null) { continue; } - //点赞或者动态处于激活状态 + // 点赞或者动态处于激活状态 if ("1".equals(articleInfoEntity.getEndorseState())) { if ("1".equals(articleInfoEntity.getEndorseType())) { index++; @@ -153,7 +174,8 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl queryClerkUnauditedArticleInfo(String clerkId) { @@ -185,7 +207,8 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl implements IPlayClerkClassificationInfoService { +public class PlayClerkClassificationInfoServiceImpl + extends + ServiceImpl + implements + IPlayClerkClassificationInfoService { @Resource private PlayClerkClassificationInfoMapper playClerkClassificationInfoMapper; /** * 查询店员分类 * - * @param id 店员分类主键 + * @param id + * 店员分类主键 * @return 店员分类 */ @Override @@ -37,7 +41,6 @@ public class PlayClerkClassificationInfoServiceImpl extends ServiceImpl()); } - /** * 查询店员分类列表 * - * @param playClerkClassificationInfo 店员分类 + * @param playClerkClassificationInfo + * 店员分类 * @return 店员分类 */ @Override - public IPage selectPlayClerkClassificationInfoByPage(PlayClerkClassificationInfoEntity playClerkClassificationInfo) { + public IPage selectPlayClerkClassificationInfoByPage( + PlayClerkClassificationInfoEntity playClerkClassificationInfo) { Page page = new Page<>(1, 10); return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>()); } @@ -64,7 +68,8 @@ public class PlayClerkClassificationInfoServiceImpl extends ServiceImpl implements IPlayClerkCommodityService { +public class PlayClerkCommodityServiceImpl extends ServiceImpl + implements + IPlayClerkCommodityService { @Resource private PlayClerkCommodityMapper playClerkCommodityMapper; - @Resource private IPlayCommodityInfoService playCommodityInfoService; - @Override public void initClerkCommodity(String userId) { // 查询当前陪聊的所有服务项目 @@ -54,7 +53,6 @@ public class PlayClerkCommodityServiceImpl extends ServiceImpl getClerkCommodityList(String userId, String enablingState) { List list = this.selectCommodityTypeByUser(userId, enablingState); @@ -84,7 +82,6 @@ public class PlayClerkCommodityServiceImpl extends ServiceImpl()); } - @Override public void startStopClerkItem(String commodityName, String enablingState, String clerkId) { PlayClerkCommodityEntity entity = new PlayClerkCommodityEntity(); @@ -98,7 +95,8 @@ public class PlayClerkCommodityServiceImpl extends ServiceImpl implements IPlayClerkDataReviewInfoService { +public class PlayClerkDataReviewInfoServiceImpl + extends + ServiceImpl + implements + IPlayClerkDataReviewInfoService { @Resource private PlayClerkDataReviewInfoMapper playClerkDataReviewInfoMapper; @Resource private IPlayClerkUserInfoService playClerkUserInfoService; - /** * 查询店员资料审核 - * @param id 店员资料审核主键 + * + * @param id + * 店员资料审核主键 * @return 店员资料审核 */ @Override @@ -57,14 +61,13 @@ public class PlayClerkDataReviewInfoServiceImpl extends ServiceImpl queryByClerkId(String clerkId,String reviewState) { + public List queryByClerkId(String clerkId, String reviewState) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(PlayClerkDataReviewInfoEntity::getClerkId, clerkId); queryWrapper.eq(PlayClerkDataReviewInfoEntity::getReviewState, reviewState); return this.baseMapper.selectList(queryWrapper); } - @Override public PlayClerkDataReviewInfoEntity queryByClerkId(String clerkId, String dataType, String reviewState) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -76,7 +79,9 @@ public class PlayClerkDataReviewInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new MPJLambdaWrapper<>(); lambdaQueryWrapper.orderByDesc(PlayClerkDataReviewInfoEntity::getAddTime); lambdaQueryWrapper.selectAll(PlayClerkDataReviewInfoEntity.class); - //店员表 - lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname"); - lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkUserReviewInfoEntity::getClerkId); + // 店员表 + lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar") + .selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname"); + lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, + PlayClerkUserReviewInfoEntity::getClerkId); if (StrUtil.isNotBlank(vo.getClerkId())) { lambdaQueryWrapper.eq(PlayClerkDataReviewInfoEntity::getClerkId, vo.getClerkId()); } @@ -97,14 +104,18 @@ public class PlayClerkDataReviewInfoServiceImpl extends ServiceImpl(vo.getPageNum(), vo.getPageSize()), PlayClerkDataReviewReturnVo.class, lambdaQueryWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayClerkDataReviewReturnVo.class, lambdaQueryWrapper); } /** * 新增店员资料审核 - * @param playClerkDataReviewInfo 店员资料审核 + * + * @param playClerkDataReviewInfo + * 店员资料审核 * @return 结果 */ @Override @@ -141,7 +152,9 @@ public class PlayClerkDataReviewInfoServiceImpl extends ServiceImpl implements IPlayClerkLevelInfoService { +public class PlayClerkLevelInfoServiceImpl extends ServiceImpl + implements + IPlayClerkLevelInfoService { @Resource private PlayClerkLevelInfoMapper playClerkLevelInfoMapper; - @Override public void initDefaultLevel(SysTenantEntity sysTenantEntity) { List list = this.selectAll(); @@ -73,7 +73,8 @@ public class PlayClerkLevelInfoServiceImpl extends ServiceImpl selectAll() { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -92,7 +92,8 @@ public class PlayClerkLevelInfoServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkPkServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkPkServiceImpl.java index 8197adf..e3fa550 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkPkServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkPkServiceImpl.java @@ -14,11 +14,10 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity; import com.starry.admin.modules.clerk.service.IPlayClerkPkService; import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService; import com.starry.common.utils.IdUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; import java.util.Arrays; import java.util.Date; +import javax.annotation.Resource; +import org.springframework.stereotype.Service; /** * 店员pkService业务层处理 @@ -27,7 +26,9 @@ import java.util.Date; * @since 2024-08-02 */ @Service -public class PlayClerkPkServiceImpl extends ServiceImpl implements IPlayClerkPkService { +public class PlayClerkPkServiceImpl extends ServiceImpl + implements + IPlayClerkPkService { @Resource private PlayClerkPkMapper playClerkPkMapper; @Resource @@ -36,7 +37,8 @@ public class PlayClerkPkServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaQuery(PlayClerkPkEntity.class).in(PlayClerkPkEntity::getClerkA, Arrays.asList(playClerkPk.getClerkA(), playClerkPk.getClerkB())) - .in(PlayClerkPkEntity::getStatus, Arrays.asList(ClerkPkEnum.TO_BE_STARTED.name(), ClerkPkEnum.IN_PROGRESS.name())); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(PlayClerkPkEntity.class) + .in(PlayClerkPkEntity::getClerkA, Arrays.asList(playClerkPk.getClerkA(), playClerkPk.getClerkB())) + .in(PlayClerkPkEntity::getStatus, + Arrays.asList(ClerkPkEnum.TO_BE_STARTED.name(), ClerkPkEnum.IN_PROGRESS.name())); long count = this.count(wrapper); if (count > 0) { PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.selectById(playClerkPk.getClerkA()); throw new RuntimeException("店员【" + clerkUserInfo.getNickname() + "】还有未完成的PK，无法继续添加"); } wrapper.clear(); - wrapper = Wrappers.lambdaQuery(PlayClerkPkEntity.class).in(PlayClerkPkEntity::getClerkB, Arrays.asList(playClerkPk.getClerkA(), playClerkPk.getClerkB())) - .in(PlayClerkPkEntity::getStatus, Arrays.asList(ClerkPkEnum.TO_BE_STARTED.name(), ClerkPkEnum.IN_PROGRESS.name())); + wrapper = Wrappers.lambdaQuery(PlayClerkPkEntity.class) + .in(PlayClerkPkEntity::getClerkB, Arrays.asList(playClerkPk.getClerkA(), playClerkPk.getClerkB())) + .in(PlayClerkPkEntity::getStatus, + Arrays.asList(ClerkPkEnum.TO_BE_STARTED.name(), ClerkPkEnum.IN_PROGRESS.name())); count = this.count(wrapper); if (count > 0) { PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.selectById(playClerkPk.getClerkB()); @@ -96,7 +104,8 @@ public class PlayClerkPkServiceImpl extends ServiceImpl implements IPlayClerkRankingInfoService { +public class PlayClerkRankingInfoServiceImpl extends ServiceImpl + implements + IPlayClerkRankingInfoService { @Resource private PlayClerkRankingInfoMapper playClerkRankingInfoMapper; @Resource private IPlayPersonnelGroupInfoService playClerkGroupInfoService; - @Override public IPage selectByPage(IPlayClerkRankingInfoQueryVo vo) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); lambdaQueryWrapper.selectAll(PlayClerkRankingInfoEntity.class); // 拼接店员表 - lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex"); - lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkRankingInfoEntity::getClerkId); + lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname") + .selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex"); + lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, + PlayClerkRankingInfoEntity::getClerkId); if (StrUtil.isNotBlank(vo.getClerkId())) { lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getClerkId, vo.getClerkId()); } @@ -65,13 +67,15 @@ public class PlayClerkRankingInfoServiceImpl extends ServiceImpl(vo.getPageNum(), vo.getPageSize()), IPlayClerkRankingInfoReturnVo.class, lambdaQueryWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + IPlayClerkRankingInfoReturnVo.class, lambdaQueryWrapper); } /** * 查询店员排行 * - * @param id 店员排行主键 + * @param id + * 店员排行主键 * @return 店员排行 */ @Override @@ -79,7 +83,6 @@ public class PlayClerkRankingInfoServiceImpl extends ServiceImpl selectHistoryRanking(String clerkId) { long serialNumber = selectSerialNumber("1"); @@ -96,16 +99,23 @@ public class PlayClerkRankingInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new MPJLambdaWrapper<>(); lambdaQueryWrapper.selectAll(PlayClerkRankingInfoEntity.class); // 店员信息 - lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex"); - lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkRankingInfoEntity::getClerkId); + lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId") + .selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname") + .selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar") + .selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex"); + lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, + PlayClerkRankingInfoEntity::getClerkId); // 店员等级 - lambdaQueryWrapper.selectAs(PlayClerkLevelInfoEntity::getId, "levelId").selectAs(PlayClerkLevelInfoEntity::getName, "levelName"); - lambdaQueryWrapper.leftJoin(PlayClerkLevelInfoEntity.class, PlayClerkLevelInfoEntity::getId, PlayClerkUserInfoEntity::getLevelId); + lambdaQueryWrapper.selectAs(PlayClerkLevelInfoEntity::getId, "levelId") + .selectAs(PlayClerkLevelInfoEntity::getName, "levelName"); + lambdaQueryWrapper.leftJoin(PlayClerkLevelInfoEntity.class, PlayClerkLevelInfoEntity::getId, + PlayClerkUserInfoEntity::getLevelId); // 根据排行序号和用户ID查询 lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getSerialNumber, serialNumber); lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getClerkId, clerkId); lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getHistoricalStatistics, "0"); - PlayOrderRankingReturnVo returnVo = this.baseMapper.selectJoinOne(PlayOrderRankingReturnVo.class, lambdaQueryWrapper); + PlayOrderRankingReturnVo returnVo = this.baseMapper.selectJoinOne(PlayOrderRankingReturnVo.class, + lambdaQueryWrapper); if (returnVo == null) { returnVo = new PlayOrderRankingReturnVo(); } @@ -113,7 +123,6 @@ public class PlayClerkRankingInfoServiceImpl extends ServiceImpl selectMaxSerialNumber(String weeklyRanking) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); @@ -121,7 +130,6 @@ public class PlayClerkRankingInfoServiceImpl extends ServiceImpl lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); @@ -148,18 +156,23 @@ public class PlayClerkRankingInfoServiceImpl extends ServiceImpl selectBySerialNumber(long serialNumber) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getSerialNumber, serialNumber); lambdaQueryWrapper.orderByDesc(PlayClerkRankingInfoEntity::getRankingIndex); lambdaQueryWrapper.selectAll(PlayClerkRankingInfoEntity.class); // 店员信息 - lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex"); - lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkRankingInfoEntity::getClerkId); + lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId") + .selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname") + .selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar") + .selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex"); + lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, + PlayClerkRankingInfoEntity::getClerkId); // 店员等级 - lambdaQueryWrapper.selectAs(PlayClerkLevelInfoEntity::getId, "levelId").selectAs(PlayClerkLevelInfoEntity::getName, "levelName"); - lambdaQueryWrapper.leftJoin(PlayClerkLevelInfoEntity.class, PlayClerkLevelInfoEntity::getId, PlayClerkUserInfoEntity::getLevelId); + lambdaQueryWrapper.selectAs(PlayClerkLevelInfoEntity::getId, "levelId") + .selectAs(PlayClerkLevelInfoEntity::getName, "levelName"); + lambdaQueryWrapper.leftJoin(PlayClerkLevelInfoEntity.class, PlayClerkLevelInfoEntity::getId, + PlayClerkUserInfoEntity::getLevelId); return this.baseMapper.selectJoinList(PlayOrderRankingListVo.class, lambdaQueryWrapper); } @@ -175,11 +188,13 @@ public class PlayClerkRankingInfoServiceImpl extends ServiceImpl selectPlayClerkRankingInfoByPage(PlayClerkRankingInfoEntity playClerkRankingInfo) { + public IPage selectPlayClerkRankingInfoByPage( + PlayClerkRankingInfoEntity playClerkRankingInfo) { Page page = new Page<>(1, 10); return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>()); } @@ -187,7 +202,8 @@ public class PlayClerkRankingInfoServiceImpl extends ServiceImpl implements IPlayClerkTypeInfoService { +public class PlayClerkTypeInfoServiceImpl extends ServiceImpl + implements + IPlayClerkTypeInfoService { @Resource private PlayClerkTypeInfoMapper playClerkTypeInfoMapper; @@ -37,7 +38,8 @@ public class PlayClerkTypeInfoServiceImpl extends ServiceImpl selectByAll() { return this.baseMapper.selectList(new LambdaQueryWrapper<>()); @@ -54,14 +55,16 @@ public class PlayClerkTypeInfoServiceImpl extends ServiceImpl selectByPage(PlayClerkTypeInfoQueryVo vo) { MPJLambdaWrapper lambdaWrapper = new MPJLambdaWrapper<>(); lambdaWrapper.orderByAsc(PlayClerkTypeInfoEntity::getSort); - IPage page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkTypeInfoReturnVo.class, lambdaWrapper); + IPage page = this.baseMapper.selectJoinPage( + new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkTypeInfoReturnVo.class, lambdaWrapper); for (PlayClerkTypeInfoReturnVo record : page.getRecords()) { record.setClerkNumber(playClerkUserInfoService.listAllByTypeId(record.getId()).size()); } @@ -71,7 +74,8 @@ public class PlayClerkTypeInfoServiceImpl extends ServiceImpl implements IPlayClerkTypeUserInfoService { +public class PlayClerkTypeUserInfoServiceImpl + extends + ServiceImpl + implements + IPlayClerkTypeUserInfoService { @Resource private PlayClerkTypeUserInfoMapper playClerkTypeUserInfoMapper; /** * 查询店员和分类关系 * - * @param id 店员和分类关系主键 + * @param id + * 店员和分类关系主键 * @return 店员和分类关系 */ @Override @@ -39,11 +43,13 @@ public class PlayClerkTypeUserInfoServiceImpl extends ServiceImpl selectPlayClerkTypeUserInfoByPage(PlayClerkTypeUserInfoEntity playClerkTypeUserInfo) { + public IPage selectPlayClerkTypeUserInfoByPage( + PlayClerkTypeUserInfoEntity playClerkTypeUserInfo) { Page page = new Page<>(1, 10); return this.baseMapper.selectPage(page, new LambdaQueryWrapper()); } @@ -51,7 +57,8 @@ public class PlayClerkTypeUserInfoServiceImpl extends ServiceImpl implements IPlayClerkUserInfoService { +public class PlayClerkUserInfoServiceImpl extends ServiceImpl + implements + IPlayClerkUserInfoService { @Resource private PlayClerkUserInfoMapper playClerkUserInfoMapper; @Resource @@ -87,7 +87,6 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl listAllByGroupId(String groupId) { MPJLambdaWrapper lambdaWrapper = new MPJLambdaWrapper<>(); @@ -108,7 +107,8 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl lambdaWrapper = new MPJLambdaWrapper<>(); lambdaWrapper.selectAll(PlayClerkLevelInfoEntity.class); lambdaWrapper.selectAs(PlayClerkUserInfoEntity::getLevelId, "levelId"); - lambdaWrapper.leftJoin(PlayClerkLevelInfoEntity.class, PlayClerkLevelInfoEntity::getId, PlayClerkUserInfoEntity::getLevelId); + lambdaWrapper.leftJoin(PlayClerkLevelInfoEntity.class, PlayClerkLevelInfoEntity::getId, + PlayClerkUserInfoEntity::getLevelId); lambdaWrapper.eq(PlayClerkUserInfoEntity::getId, clerkId); return this.baseMapper.selectJoinOne(PlayClerkLevelInfoEntity.class, lambdaWrapper); @@ -124,7 +124,8 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl list = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(),"0"); -// // 判断头像、音频、相册是否可以编辑，如果存在未审核的数据，则不允许编辑 -// Map map = list.stream().collect(Collectors.toMap(PlayClerkDataReviewInfoEntity::getDataType, account -> account, (entity1, entity2) -> entity1)); -// if (map.containsKey("1")) { -// result.setAvatarAllowEdit(false); -// } -// if (map.containsKey("2")) { -// result.setAlbumAllowEdit(false); -// } -// if (map.containsKey("3")) { -// result.setAudioAllowEdit(false); -// } + // List list = + // playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(),"0"); + // // 判断头像、音频、相册是否可以编辑，如果存在未审核的数据，则不允许编辑 + // Map map = + // list.stream().collect(Collectors.toMap(PlayClerkDataReviewInfoEntity::getDataType, + // account -> account, (entity1, entity2) -> entity1)); + // if (map.containsKey("1")) { + // result.setAvatarAllowEdit(false); + // } + // if (map.containsKey("2")) { + // result.setAlbumAllowEdit(false); + // } + // if (map.containsKey("3")) { + // result.setAudioAllowEdit(false); + // } // 是店员之后，判断是否可以登录 if ("1".equals(result.getClerkState())) { // 设置店员是否运行登录 @@ -165,7 +169,6 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl clerkCommodityEntities = playClerkCommodityService.selectCommodityTypeByUser(userInfo.getId(), ""); + List clerkCommodityEntities = playClerkCommodityService + .selectCommodityTypeByUser(userInfo.getId(), ""); List playClerkCommodityQueryVos = new ArrayList<>(); for (PlayClerkCommodityEntity clerkCommodityEntity : clerkCommodityEntities) { - playClerkCommodityQueryVos.add(new PlayClerkCommodityQueryVo(clerkCommodityEntity.getCommodityName(), clerkCommodityEntity.getEnablingState())); + playClerkCommodityQueryVos.add(new PlayClerkCommodityQueryVo(clerkCommodityEntity.getCommodityName(), + clerkCommodityEntity.getEnablingState())); } result.setCommodity(playClerkCommodityQueryVos); result.setArea(userInfo.getProvince() + "-" + userInfo.getCity()); @@ -186,7 +191,6 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl listUnsettledWagesByPage(PlayClerkUnsettledWagesInfoQueryVo vo) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); // 查询所有店员 - lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getId, "clerkId"); + lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname") + .selectAs(PlayClerkUserInfoEntity::getId, "clerkId"); lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getClerkState, "1"); // 加入组员的筛选 List clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), null); @@ -283,12 +291,14 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl(vo.getPageNum(), vo.getPageSize()), PlayClerkUnsettledWagesInfoReturnVo.class, lambdaQueryWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayClerkUnsettledWagesInfoReturnVo.class, lambdaQueryWrapper); } @Override @@ -297,9 +307,9 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), null); lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList); lambdaQueryWrapper.orderByDesc(PlayClerkUserInfoEntity::getCreatedTime); - IPage page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkUserReturnVo.class, lambdaQueryWrapper); + IPage page = this.baseMapper.selectJoinPage( + new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkUserReturnVo.class, lambdaQueryWrapper); for (PlayClerkUserReturnVo record : page.getRecords()) { BigDecimal orderTotalAmount = new BigDecimal("0"); @@ -411,8 +422,10 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PlayCustomFollowInfoEntity::getCustomId, customUserId); - List customFollowInfoEntities = customFollowInfoService.list(lambdaQueryWrapper); - customFollows = customFollowInfoEntities.stream().collect(Collectors.toMap(PlayCustomFollowInfoEntity::getClerkId, PlayCustomFollowInfoEntity::getFollowState)); + List customFollowInfoEntities = customFollowInfoService + .list(lambdaQueryWrapper); + customFollows = customFollowInfoEntities.stream().collect(Collectors + .toMap(PlayCustomFollowInfoEntity::getClerkId, PlayCustomFollowInfoEntity::getFollowState)); } for (PlayClerkUserInfoResultVo record : voPage.getRecords()) { record.setFollowState(customFollows.containsKey(record.getId()) ? "1" : "0"); @@ -427,7 +440,8 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getDeleted, 0); lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList); - lambdaQueryWrapper.select(PlayClerkUserInfoEntity::getId, PlayClerkUserInfoEntity::getNickname, PlayClerkUserInfoEntity::getAvatar, PlayClerkUserInfoEntity::getTypeId, PlayClerkUserInfoEntity::getGroupId, PlayClerkUserInfoEntity::getPhone); + lambdaQueryWrapper.select(PlayClerkUserInfoEntity::getId, PlayClerkUserInfoEntity::getNickname, + PlayClerkUserInfoEntity::getAvatar, PlayClerkUserInfoEntity::getTypeId, + PlayClerkUserInfoEntity::getGroupId, PlayClerkUserInfoEntity::getPhone); lambdaQueryWrapper.orderByDesc(PlayClerkUserInfoEntity::getId); return this.baseMapper.selectList(lambdaQueryWrapper); } @@ -493,7 +512,8 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl tokenMap = jwtToken.createToken(loginUserInfo); data.fluentPut("token", tokenMap.get("token")); - PlayPersonnelAdminInfoEntity adminInfoEntity = playPersonnelAdminInfoService.selectByUserId(entity.getSysUserId()); + PlayPersonnelAdminInfoEntity adminInfoEntity = playPersonnelAdminInfoService + .selectByUserId(entity.getSysUserId()); if (Objects.nonNull(adminInfoEntity)) { data.fluentPut("role", "operator"); return data; @@ -503,7 +523,8 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl implements IPlayClerkUserReviewInfoService { +public class PlayClerkUserReviewInfoServiceImpl + extends + ServiceImpl + implements + IPlayClerkUserReviewInfoService { @Resource private PlayClerkUserReviewInfoMapper playClerkUserReviewInfoMapper; @@ -42,7 +45,6 @@ public class PlayClerkUserReviewInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); @@ -54,7 +56,8 @@ public class PlayClerkUserReviewInfoServiceImpl extends ServiceImpl selectByPage(PlayClerkUserReviewQueryVo vo) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); lambdaQueryWrapper.selectAll(PlayClerkUserReviewInfoEntity.class); - //店员表 - lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getSignature, "signature"); - lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkUserReviewInfoEntity::getClerkId); + // 店员表 + lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar") + .selectAs(PlayClerkUserInfoEntity::getSignature, "signature"); + lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, + PlayClerkUserReviewInfoEntity::getClerkId); if (StrUtil.isNotBlank(vo.getClerkId())) { lambdaQueryWrapper.eq(PlayClerkUserReviewInfoEntity::getClerkId, vo.getClerkId()); } @@ -93,21 +97,26 @@ public class PlayClerkUserReviewInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), null); - //lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList); + // List clerkIdList = + // playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), + // null); + // lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList); lambdaQueryWrapper.orderByDesc(PlayClerkUserReviewInfoEntity::getAddTime); lambdaQueryWrapper.orderByDesc(PlayClerkUserReviewInfoEntity::getClerkId); - return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkUserReviewReturnVo.class, lambdaQueryWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayClerkUserReviewReturnVo.class, lambdaQueryWrapper); } /** * 查询店员资料审核列表 * - * @param playClerkUserReviewInfo 店员资料审核 + * @param playClerkUserReviewInfo + * 店员资料审核 * @return 店员资料审核 */ @Override - public IPage selectPlayClerkUserReviewInfoByPage(PlayClerkUserReviewInfoEntity playClerkUserReviewInfo) { + public IPage selectPlayClerkUserReviewInfoByPage( + PlayClerkUserReviewInfoEntity playClerkUserReviewInfo) { Page page = new Page<>(1, 10); return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>()); } @@ -115,7 +124,8 @@ public class PlayClerkUserReviewInfoServiceImpl extends ServiceImpl implements IPlayClerkWagesDetailsInfoService { +public class PlayClerkWagesDetailsInfoServiceImpl + extends + ServiceImpl + implements + IPlayClerkWagesDetailsInfoService { @Resource private PlayClerkWagesDetailsInfoMapper playClerkWagesDetailsInfoMapper; - @Override public PlayClerkWagesDetailsInfoEntity selectByClerkIdAndWagesId(String wagesId, String clerkId) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -36,7 +37,6 @@ public class PlayClerkWagesDetailsInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -47,7 +47,8 @@ public class PlayClerkWagesDetailsInfoServiceImpl extends ServiceImpl selectPlayClerkWagesDetailsInfoByPage(PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) { + public IPage selectPlayClerkWagesDetailsInfoByPage( + PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) { Page page = new Page<>(1, 10); return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>()); } @@ -77,7 +80,8 @@ public class PlayClerkWagesDetailsInfoServiceImpl extends ServiceImpl implements IPlayClerkWagesInfoService { +public class PlayClerkWagesInfoServiceImpl extends ServiceImpl + implements + IPlayClerkWagesInfoService { @Resource private PlayClerkWagesInfoMapper playClerkWagesInfoMapper; - @Resource private IPlayPersonnelGroupInfoService playClerkGroupInfoService; - @Override public PlayClerkWagesInfoEntity selectCurrentPeriodWagesByClerkId(String clerkId) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -65,7 +63,6 @@ public class PlayClerkWagesInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -79,14 +76,14 @@ public class PlayClerkWagesInfoServiceImpl extends ServiceImpl selectHistoricalByPage(PlayClerkWagesInfoQueryVo vo) { MPJLambdaWrapper lambdaWrapper = new MPJLambdaWrapper<>(); lambdaWrapper.selectAll(PlayClerkWagesInfoEntity.class); - //拼接店员表 + // 拼接店员表 lambdaWrapper.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname"); - lambdaWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkWagesInfoEntity::getClerkId); + lambdaWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, + PlayClerkWagesInfoEntity::getClerkId); if (StrUtil.isNotBlank(vo.getGroupId())) { lambdaWrapper.eq(PlayClerkUserInfoEntity::getGroupId, vo.getGroupId()); } @@ -100,19 +97,22 @@ public class PlayClerkWagesInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), null); lambdaWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList); - return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkWagesInfoReturnVo.class, lambdaWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayClerkWagesInfoReturnVo.class, lambdaWrapper); } /** * 查询店员工资结算信息 * - * @param id 店员工资结算信息主键 + * @param id + * 店员工资结算信息主键 * @return 店员工资结算信息 */ @Override @@ -123,7 +123,8 @@ public class PlayClerkWagesInfoServiceImpl extends ServiceImpl()); } - /** * 新增店员工资结算信息 * - * @param playClerkWagesInfo 店员工资结算信息 + * @param playClerkWagesInfo + * 店员工资结算信息 * @return 结果 */ @Override @@ -150,7 +151,8 @@ public class PlayClerkWagesInfoServiceImpl extends ServiceImpl implements IPlayCustomArticleInfoService { +public class PlayCustomArticleInfoServiceImpl + extends + ServiceImpl + implements + IPlayCustomArticleInfoService { @Resource private PlayCustomArticleInfoMapper playCustomArticleInfoMapper; - @Override public PlayCustomArticleInfoEntity selectByArticleId(String articleId, String customId, String endorseType) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -36,11 +37,11 @@ public class PlayCustomArticleInfoServiceImpl extends ServiceImpl selectPlayCustomArticleInfoByPage(PlayCustomArticleInfoEntity playCustomArticleInfo) { + public IPage selectPlayCustomArticleInfoByPage( + PlayCustomArticleInfoEntity playCustomArticleInfo) { Page page = new Page<>(1, 10); return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>()); } @@ -63,7 +66,8 @@ public class PlayCustomArticleInfoServiceImpl extends ServiceImpl list = playCustomFollowInfoService.selectPlayCustomFollowInfoByPage(playCustomFollowInfo); + IPage list = playCustomFollowInfoService + .selectPlayCustomFollowInfoByPage(playCustomFollowInfo); return R.ok(list); } @@ -50,9 +48,7 @@ public class PlayCustomFollowInfoController { */ @ApiOperation(value = "获取关注详情", notes = "根据ID获取顾客关注店员详细信息") @ApiImplicitParam(name = "id", value = "关注记录ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCustomFollowInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayCustomFollowInfoEntity.class)}) @PreAuthorize("@customSs.hasPermission('play:info:query')") @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { @@ -63,14 +59,12 @@ public class PlayCustomFollowInfoController { * 新增顾客关注陪聊信息 */ @ApiOperation(value = "新增关注记录", notes = "创建新的顾客关注店员信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @PreAuthorize("@customSs.hasPermission('play:info:create')") @Log(title = "顾客关注陪聊信息", businessType = BusinessType.INSERT) @PostMapping("/create") - public R create(@ApiParam(value = "关注信息", required = true) @RequestBody PlayCustomFollowInfoEntity playCustomFollowInfo) { + public R create( + @ApiParam(value = "关注信息", required = true) @RequestBody PlayCustomFollowInfoEntity playCustomFollowInfo) { boolean success = playCustomFollowInfoService.create(playCustomFollowInfo); if (success) { return R.ok(); @@ -83,14 +77,12 @@ public class PlayCustomFollowInfoController { */ @ApiOperation(value = "修改关注记录", notes = "根据ID修改顾客关注店员信息") @ApiImplicitParam(name = "id", value = "关注记录ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @PreAuthorize("@customSs.hasPermission('play:info:edit')") @Log(title = "顾客关注陪聊信息", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "关注信息", required = true) @RequestBody PlayCustomFollowInfoEntity playCustomFollowInfo) { + public R update(@PathVariable String id, + @ApiParam(value = "关注信息", required = true) @RequestBody PlayCustomFollowInfoEntity playCustomFollowInfo) { playCustomFollowInfo.setId(id); boolean success = playCustomFollowInfoService.update(playCustomFollowInfo); if (success) { @@ -104,9 +96,7 @@ public class PlayCustomFollowInfoController { */ @ApiOperation(value = "删除关注记录", notes = "根据ID批量删除顾客关注店员信息") @ApiImplicitParam(name = "ids", value = "关注记录ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) @PreAuthorize("@customSs.hasPermission('play:info:remove')") @Log(title = "顾客关注陪聊信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomGiftInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomGiftInfoController.java index fd07cd2..47b9887 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomGiftInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomGiftInfoController.java @@ -8,14 +8,12 @@ import com.starry.common.enums.BusinessType; import com.starry.common.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.web.bind.annotation.*; - import javax.annotation.Resource; +import org.springframework.web.bind.annotation.*; /** * 顾客和礼物关系Controller @@ -35,11 +33,11 @@ public class PlayCustomGiftInfoController { */ @ApiOperation(value = "分页查询礼物列表", notes = "分页查询顾客与礼物关系列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCustomGiftInfoEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayCustomGiftInfoEntity.class, responseContainer = "Page")}) @GetMapping("/list") public R list(@ApiParam(value = "查询条件") PlayCustomGiftInfoEntity playCustomGiftInfo) { - IPage list = playCustomGiftInfoService.selectPlayCustomGiftInfoByPage(playCustomGiftInfo); + IPage list = playCustomGiftInfoService + .selectPlayCustomGiftInfoByPage(playCustomGiftInfo); return R.ok(list); } @@ -48,9 +46,7 @@ public class PlayCustomGiftInfoController { */ @ApiOperation(value = "获取礼物详情", notes = "根据ID获取顾客与礼物关系详细信息") @ApiImplicitParam(name = "id", value = "礼物关系ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCustomGiftInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayCustomGiftInfoEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(playCustomGiftInfoService.selectPlayCustomGiftInfoById(id)); @@ -60,13 +56,11 @@ public class PlayCustomGiftInfoController { * 新增顾客和礼物关系 */ @ApiOperation(value = "新增礼物关系", notes = "创建新的顾客与礼物关系信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @Log(title = "顾客和礼物关系", businessType = BusinessType.INSERT) @PostMapping("/create") - public R create(@ApiParam(value = "礼物关系信息", required = true) @RequestBody PlayCustomGiftInfoEntity playCustomGiftInfo) { + public R create( + @ApiParam(value = "礼物关系信息", required = true) @RequestBody PlayCustomGiftInfoEntity playCustomGiftInfo) { boolean success = playCustomGiftInfoService.create(playCustomGiftInfo); if (success) { return R.ok(); @@ -79,13 +73,11 @@ public class PlayCustomGiftInfoController { */ @ApiOperation(value = "修改礼物关系", notes = "根据ID修改顾客与礼物关系信息") @ApiImplicitParam(name = "id", value = "礼物关系ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @Log(title = "顾客和礼物关系", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "礼物关系信息", required = true) @RequestBody PlayCustomGiftInfoEntity playCustomGiftInfo) { + public R update(@PathVariable String id, + @ApiParam(value = "礼物关系信息", required = true) @RequestBody PlayCustomGiftInfoEntity playCustomGiftInfo) { playCustomGiftInfo.setId(id); boolean success = playCustomGiftInfoService.update(playCustomGiftInfo); if (success) { @@ -99,9 +91,7 @@ public class PlayCustomGiftInfoController { */ @ApiOperation(value = "删除礼物关系", notes = "根据ID批量删除顾客与礼物关系信息") @ApiImplicitParam(name = "ids", value = "礼物关系ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) @Log(title = "顾客和礼物关系", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomLeaveMsgController.java b/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomLeaveMsgController.java index 19f8625..3974aa0 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomLeaveMsgController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomLeaveMsgController.java @@ -10,16 +10,14 @@ import com.starry.common.enums.BusinessType; import com.starry.common.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; - /** * 顾客留言Controller * @@ -38,8 +36,7 @@ public class PlayCustomLeaveMsgController { */ @ApiOperation(value = "分页查询留言列表", notes = "分页查询顾客留言信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCustomLeaveMsgReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayCustomLeaveMsgReturnVo.class, responseContainer = "Page")}) @PostMapping("/listByPage") public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayCustomLeaveMsgQueryVo vo) { IPage list = playCustomLeaveMsgService.selectByPage(vo); @@ -51,9 +48,7 @@ public class PlayCustomLeaveMsgController { */ @ApiOperation(value = "获取留言详情", notes = "根据ID获取顾客留言详细信息") @ApiImplicitParam(name = "id", value = "留言ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCustomLeaveMsgEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayCustomLeaveMsgEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(playCustomLeaveMsgService.selectPlayCustomLeaveMsgById(id)); @@ -63,14 +58,12 @@ public class PlayCustomLeaveMsgController { * 新增顾客留言 */ @ApiOperation(value = "新增留言", notes = "创建新的顾客留言信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) - //@PreAuthorize("@customSs.hasPermission('custom:leave:add')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) + // @PreAuthorize("@customSs.hasPermission('custom:leave:add')") @Log(title = "顾客留言", businessType = BusinessType.INSERT) @PostMapping("/create") - public R create(@ApiParam(value = "留言信息", required = true) @RequestBody PlayCustomLeaveMsgEntity playCustomLeaveMsg) { + public R create( + @ApiParam(value = "留言信息", required = true) @RequestBody PlayCustomLeaveMsgEntity playCustomLeaveMsg) { boolean success = playCustomLeaveMsgService.create(playCustomLeaveMsg); if (success) { return R.ok(); @@ -83,14 +76,12 @@ public class PlayCustomLeaveMsgController { */ @ApiOperation(value = "修改留言", notes = "根据ID修改顾客留言信息") @ApiImplicitParam(name = "id", value = "留言ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) - //@PreAuthorize("@customSs.hasPermission('custom:leave:update')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) + // @PreAuthorize("@customSs.hasPermission('custom:leave:update')") @Log(title = "顾客留言", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "留言信息", required = true) @RequestBody PlayCustomLeaveMsgEntity playCustomLeaveMsg) { + public R update(@PathVariable String id, + @ApiParam(value = "留言信息", required = true) @RequestBody PlayCustomLeaveMsgEntity playCustomLeaveMsg) { playCustomLeaveMsg.setId(id); boolean success = playCustomLeaveMsgService.update(playCustomLeaveMsg); if (success) { @@ -104,10 +95,8 @@ public class PlayCustomLeaveMsgController { */ @ApiOperation(value = "删除留言", notes = "根据ID批量删除顾客留言信息") @ApiImplicitParam(name = "ids", value = "留言ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) - //@PreAuthorize("@customSs.hasPermission('custom:leave:delete')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) + // @PreAuthorize("@customSs.hasPermission('custom:leave:delete')") @Log(title = "顾客留言", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomLevelInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomLevelInfoController.java index 47770f5..7db7ded 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomLevelInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomLevelInfoController.java @@ -16,10 +16,9 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; import java.util.List; +import javax.annotation.Resource; +import org.springframework.web.bind.annotation.*; /** * 顾客等级Controller @@ -40,8 +39,7 @@ public class PlayCustomLevelInfoController { @PostMapping("/listAll") @ApiOperation(value = "查询等级列表", notes = "获取所有顾客等级信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCustomLevelReturnVo.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayCustomLevelReturnVo.class, responseContainer = "List")}) public R listAll() { List list = playCustomLevelInfoService.selectPlayCustomLevelInfoByPage(); return R.ok(ConvertUtil.entityToVoList(list, PlayCustomLevelReturnVo.class)); @@ -53,25 +51,19 @@ public class PlayCustomLevelInfoController { @GetMapping(value = "/{id}") @ApiOperation(value = "获取等级详情", notes = "根据ID获取顾客等级详细信息") @ApiImplicitParam(name = "id", value = "等级ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCustomLevelInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayCustomLevelInfoEntity.class)}) public R getInfo(@PathVariable("id") String id) { return R.ok(playCustomLevelInfoService.selectPlayCustomLevelInfoById(id)); } - /** * 新增顾客等级 */ - //@PreAuthorize("@customSs.hasPermission('custom:level:add')") + // @PreAuthorize("@customSs.hasPermission('custom:level:add')") @Log(title = "店员等级", businessType = BusinessType.INSERT) @PostMapping("/create") @ApiOperation(value = "新增等级", notes = "创建新的顾客等级信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) public R create(@ApiParam(value = "等级信息", required = true) @RequestBody PlayCustomLevelAddVo vo) { PlayCustomLevelInfoEntity entity = ConvertUtil.entityToVo(vo, PlayCustomLevelInfoEntity.class); int level = playCustomLevelInfoService.selectMaxLevel(); @@ -83,19 +75,15 @@ public class PlayCustomLevelInfoController { return R.error("添加失败"); } - /** * 修改顾客等级 */ - //@PreAuthorize("@customSs.hasPermission('custom:level:update')") + // @PreAuthorize("@customSs.hasPermission('custom:level:update')") @Log(title = "顾客等级", businessType = BusinessType.UPDATE) @PostMapping(value = "/update") @ApiOperation(value = "修改等级", notes = "修改顾客等级信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败"), - @ApiResponse(code = 400, message = "对象不存在") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败"), + @ApiResponse(code = 400, message = "对象不存在")}) public R update(@ApiParam(value = "等级信息", required = true) @RequestBody PlayCustomLevelEditVo vo) { if (playCustomLevelInfoService.selectPlayCustomLevelInfoById(vo.getId()) == null) { throw new CustomException("对象不存在"); @@ -114,10 +102,7 @@ public class PlayCustomLevelInfoController { @Log(title = "店员等级", businessType = BusinessType.DELETE) @DeleteMapping("delMaxLevel") @ApiOperation(value = "删除最高等级", notes = "删除系统中的最高等级") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 400, message = "最后一级,不允许删除") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 400, message = "最后一级,不允许删除")}) public R remove() { int level = playCustomLevelInfoService.selectMaxLevel(); if (level <= 1) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomRankingController.java b/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomRankingController.java index 98d8f2e..50ebe07 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomRankingController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomRankingController.java @@ -10,14 +10,13 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; - /** * 顾客Controller * @@ -36,8 +35,7 @@ public class PlayCustomRankingController { */ @ApiOperation(value = "分页查询排名列表", notes = "分页查询顾客消费排名信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCustomRankingReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayCustomRankingReturnVo.class, responseContainer = "Page")}) @PostMapping("/listByPage") public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayCustomRankingQueryVo vo) { IPage list = playCustomUserInfoService.selectRankingByPage(vo); diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomUserInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomUserInfoController.java index 9e6d5d0..63f263f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomUserInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomUserInfoController.java @@ -12,16 +12,14 @@ import com.starry.common.result.R; import com.starry.common.utils.ConvertUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; - /** * 顾客Controller * @@ -40,8 +38,7 @@ public class PlayCustomUserInfoController { */ @ApiOperation(value = "分页查询顾客列表", notes = "分页查询顾客信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCustomUserReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayCustomUserReturnVo.class, responseContainer = "Page")}) @PostMapping("/listByPage") public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayCustomUserQueryVo vo) { IPage list = playCustomUserInfoService.selectByPage(vo); @@ -53,9 +50,7 @@ public class PlayCustomUserInfoController { */ @ApiOperation(value = "获取顾客详情", notes = "根据ID获取顾客详细信息") @ApiImplicitParam(name = "id", value = "顾客ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCustomUserInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayCustomUserInfoEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(playCustomUserInfoService.selectById(id)); @@ -65,13 +60,11 @@ public class PlayCustomUserInfoController { * 新增顾客 */ @ApiOperation(value = "新增顾客", notes = "创建新的顾客信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @Log(title = "顾客", businessType = BusinessType.INSERT) @PostMapping("/create") - public R create(@ApiParam(value = "顾客信息", required = true) @RequestBody PlayCustomUserInfoEntity playCustomUserInfo) { + public R create( + @ApiParam(value = "顾客信息", required = true) @RequestBody PlayCustomUserInfoEntity playCustomUserInfo) { boolean success = playCustomUserInfoService.create(playCustomUserInfo); if (success) { return R.ok(); @@ -83,13 +76,11 @@ public class PlayCustomUserInfoController { * 修改顾客状态 */ @ApiOperation(value = "修改顾客状态", notes = "修改顾客的状态信息，如黑名单状态、关注状态等") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @Log(title = "顾客", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateState") - public R updateState(@ApiParam(value = "顾客状态信息", required = true) @Validated @RequestBody PlayCustomUserStateEditVo vo) { + public R updateState( + @ApiParam(value = "顾客状态信息", required = true) @Validated @RequestBody PlayCustomUserStateEditVo vo) { PlayCustomUserInfoEntity entity = ConvertUtil.entityToVo(vo, PlayCustomUserInfoEntity.class); boolean success = playCustomUserInfoService.update(entity); if (success) { @@ -103,13 +94,11 @@ public class PlayCustomUserInfoController { */ @ApiOperation(value = "修改顾客信息", notes = "根据ID修改顾客基本信息") @ApiImplicitParam(name = "id", value = "顾客ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @Log(title = "顾客", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "顾客信息", required = true) @RequestBody PlayCustomUserInfoEntity playCustomUserInfo) { + public R update(@PathVariable String id, + @ApiParam(value = "顾客信息", required = true) @RequestBody PlayCustomUserInfoEntity playCustomUserInfo) { playCustomUserInfo.setId(id); boolean success = playCustomUserInfoService.update(playCustomUserInfo); if (success) { @@ -123,9 +112,7 @@ public class PlayCustomUserInfoController { */ @ApiOperation(value = "删除顾客", notes = "根据ID批量删除顾客信息") @ApiImplicitParam(name = "ids", value = "顾客ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) @Log(title = "顾客", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/entity/PlayCustomFollowInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/custom/entity/PlayCustomFollowInfoEntity.java index 10d6f8e..889e205 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/entity/PlayCustomFollowInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/entity/PlayCustomFollowInfoEntity.java @@ -2,11 +2,10 @@ package com.starry.admin.modules.custom.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.starry.common.domain.BaseEntity; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 顾客关注陪聊信息对象 play_custom_follow_info * @@ -18,7 +17,6 @@ import java.util.Date; @TableName("play_custom_follow_info") public class PlayCustomFollowInfoEntity extends BaseEntity { - /** * UUID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomFollowInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomFollowInfoMapper.java index d555b6c..7e37128 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomFollowInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomFollowInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.custom.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.custom.entity.PlayCustomFollowInfoEntity; @@ -8,9 +7,8 @@ import com.starry.admin.modules.custom.entity.PlayCustomFollowInfoEntity; * 顾客关注陪聊信息Mapper接口 * * @author admin - * @since 2024-04-30 + * @since 2024-04-30 */ public interface PlayCustomFollowInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomGiftInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomGiftInfoMapper.java index 25f4ec8..28520be 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomGiftInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomGiftInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.custom.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.custom.module.entity.PlayCustomGiftInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.custom.module.entity.PlayCustomGiftInfoEntity; */ public interface PlayCustomGiftInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomLeaveMsgMapper.java b/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomLeaveMsgMapper.java index 21631f2..3db62ac 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomLeaveMsgMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomLeaveMsgMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.custom.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.custom.module.entity.PlayCustomLeaveMsgEntity; @@ -8,9 +7,8 @@ import com.starry.admin.modules.custom.module.entity.PlayCustomLeaveMsgEntity; * 顾客留言Mapper接口 * * @author admin - * @since 2024-05-07 + * @since 2024-05-07 */ public interface PlayCustomLeaveMsgMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomLevelInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomLevelInfoMapper.java index 9199484..9e20cd4 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomLevelInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomLevelInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.custom.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.custom.module.entity.PlayCustomLevelInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.custom.module.entity.PlayCustomLevelInfoEntity; */ public interface PlayCustomLevelInfoMapper extends BaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomUserInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomUserInfoMapper.java index 9c53132..3b1da7a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomUserInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomUserInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.custom.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity; */ public interface PlayCustomUserInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/module/entity/PlayCustomGiftInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/custom/module/entity/PlayCustomGiftInfoEntity.java index 87d46cb..fc4182a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/module/entity/PlayCustomGiftInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/module/entity/PlayCustomGiftInfoEntity.java @@ -16,7 +16,6 @@ import lombok.EqualsAndHashCode; @TableName("play_custom_gift_info") public class PlayCustomGiftInfoEntity extends BaseEntity { - /** * UUID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/module/entity/PlayCustomLeaveMsgEntity.java b/play-admin/src/main/java/com/starry/admin/modules/custom/module/entity/PlayCustomLeaveMsgEntity.java index 9842532..30c53f7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/module/entity/PlayCustomLeaveMsgEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/module/entity/PlayCustomLeaveMsgEntity.java @@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.starry.admin.common.conf.StringTypeHandler; import com.starry.common.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - import java.util.Date; import java.util.List; +import lombok.Data; +import lombok.EqualsAndHashCode; /** * 顾客留言对象 play_custom_leave_msg @@ -21,7 +20,6 @@ import java.util.List; @TableName(value = "play_custom_leave_msg", autoResultMap = true) public class PlayCustomLeaveMsgEntity extends BaseEntity { - /** * UUID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/module/entity/PlayCustomLevelInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/custom/module/entity/PlayCustomLevelInfoEntity.java index 7279504..7751d1b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/module/entity/PlayCustomLevelInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/module/entity/PlayCustomLevelInfoEntity.java @@ -16,7 +16,6 @@ import lombok.EqualsAndHashCode; @TableName("play_custom_level_info") public class PlayCustomLevelInfoEntity extends BaseEntity { - /** * UUID */ @@ -52,5 +51,4 @@ public class PlayCustomLevelInfoEntity extends BaseEntity { - /** * UUID */ @@ -66,7 +64,6 @@ public class PlayCustomUserInfoEntity extends BaseEntity registrationTime; - /** * 首次下单时间 */ @@ -130,5 +122,4 @@ public class PlayCustomUserQueryVo extends BasePageEntity { @ApiModelProperty(value = "排序字段", example = "registrationTime", notes = "排序的字段名称") private String sort; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/module/vo/PlayCustomUserReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/custom/module/vo/PlayCustomUserReturnVo.java index f7be0f4..7f11d83 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/module/vo/PlayCustomUserReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/module/vo/PlayCustomUserReturnVo.java @@ -3,11 +3,10 @@ package com.starry.admin.modules.custom.module.vo; import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.math.BigDecimal; import java.util.Date; import java.util.List; +import lombok.Data; /** * 顾客分页查询返回对象 diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/module/vo/PlayCustomUserStateEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/custom/module/vo/PlayCustomUserStateEditVo.java index 2418267..d54b3c4 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/module/vo/PlayCustomUserStateEditVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/module/vo/PlayCustomUserStateEditVo.java @@ -2,10 +2,8 @@ package com.starry.admin.modules.custom.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import javax.validation.constraints.NotBlank; - +import lombok.Data; /** * @author admin @@ -21,7 +19,6 @@ public class PlayCustomUserStateEditVo { @ApiModelProperty(value = "顾客ID", required = true, example = "1", notes = "顾客的ID") private String id; - /** * 余额状态[0:不存在余额，1:存在余额] */ @@ -73,5 +70,4 @@ public class PlayCustomUserStateEditVo { @ApiModelProperty(value = "备注", example = "重要客户", notes = "顾客相关备注信息") private String remark; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomFollowInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomFollowInfoService.java index a2ee126..e23dc94 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomFollowInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomFollowInfoService.java @@ -16,7 +16,8 @@ public interface IPlayCustomFollowInfoService extends IService selectPlayCustomFollowInfoByPage(PlayCustomFollowInfoEntity playCustomFollowInfo); @@ -61,7 +68,8 @@ public interface IPlayCustomFollowInfoService extends IService { - /** * 根据顾客ID和礼物ID，查询当前礼物活点亮情况 - * @param giftId 礼物ID - * @param customId 顾客ID + * + * @param giftId + * 礼物ID + * @param customId + * 顾客ID * @return 物活点亮情况 */ - PlayCustomGiftInfoEntity selectByGiftIdAndCustomId(String giftId,String customId); + PlayCustomGiftInfoEntity selectByGiftIdAndCustomId(String giftId, String customId); /** * 查询顾客已点亮礼物 * - * @param customId 顾客IF + * @param customId + * 顾客IF * @return 顾客已点亮礼物列表 */ List selectBtyCustomId(String customId); @@ -34,16 +36,17 @@ public interface IPlayCustomGiftInfoService extends IService selectPlayCustomGiftInfoByPage(PlayCustomGiftInfoEntity playCustomGiftInfo); @@ -51,7 +54,8 @@ public interface IPlayCustomGiftInfoService extends IService selectByPage(PlayCustomLeaveMsgQueryVo vo); @@ -42,7 +43,8 @@ public interface IPlayCustomLeaveMsgService extends IService selectPlayCustomLeaveMsgByPage(PlayCustomLeaveMsgEntity playCustomLeaveMsg); @@ -50,7 +52,8 @@ public interface IPlayCustomLeaveMsgService extends IService { - /** * 查询顾客 * - * @param openId 顾客主键 + * @param openId + * 顾客主键 * @return 顾客 */ PlayCustomUserInfoEntity selectByOpenid(String openId); @@ -32,26 +31,31 @@ public interface IPlayCustomUserInfoService extends IService selectByPage(PlayCustomUserQueryVo vo); - /** * 分页查询顾客排名列表 * - * @param vo 顾客查询对象 + * @param vo + * 顾客查询对象 * @return 顾客集合 */ IPage selectRankingByPage(PlayCustomRankingQueryVo vo); - /** * 新增顾客 * - * @param playCustomUserInfo 顾客 + * @param playCustomUserInfo + * 顾客 * @return 结果 */ boolean create(PlayCustomUserInfoEntity playCustomUserInfo); @@ -85,8 +90,10 @@ public interface IPlayCustomUserInfoService extends IService simpleList(); - /** - * 保存订单信息 + * 保存订单信息 * - * @param entity 订单实体 * @since 2024/7/18 17:13 + * @param entity + * 订单实体 * @since 2024/7/18 17:13 * @author admin **/ void saveOrderInfo(PlayOrderInfoEntity entity); diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomFollowInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomFollowInfoServiceImpl.java index a862227..8fd91d3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomFollowInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomFollowInfoServiceImpl.java @@ -13,11 +13,10 @@ import com.starry.admin.modules.custom.service.IPlayCustomFollowInfoService; import com.starry.admin.modules.weichat.entity.PlayClerkFollowQueryVo; import com.starry.admin.modules.weichat.entity.PlayClerkFollowReturnVo; import com.starry.common.utils.IdUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; import java.util.Arrays; import java.util.Date; +import javax.annotation.Resource; +import org.springframework.stereotype.Service; /** * 顾客关注陪聊信息Service业务层处理 @@ -26,14 +25,17 @@ import java.util.Date; * @since 2024-04-30 */ @Service -public class PlayCustomFollowInfoServiceImpl extends ServiceImpl implements IPlayCustomFollowInfoService { +public class PlayCustomFollowInfoServiceImpl extends ServiceImpl + implements + IPlayCustomFollowInfoService { @Resource private PlayCustomFollowInfoMapper playCustomFollowInfoMapper; /** * 查询顾客关注陪聊信息 * - * @param id 顾客关注陪聊信息主键 + * @param id + * 顾客关注陪聊信息主键 * @return 顾客关注陪聊信息 */ @Override @@ -41,7 +43,6 @@ public class PlayCustomFollowInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -78,17 +79,19 @@ public class PlayCustomFollowInfoServiceImpl extends ServiceImpl iPage = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkFollowReturnVo.class, lambdaQueryWrapper); + IPage iPage = this.baseMapper.selectJoinPage( + new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkFollowReturnVo.class, lambdaQueryWrapper); for (PlayClerkFollowReturnVo record : iPage.getRecords()) { LambdaQueryWrapper lambdaQueryWrapper1 = new LambdaQueryWrapper<>(); - lambdaQueryWrapper1.eq(PlayCustomFollowInfoEntity::getClerkId,record.getClerkId()); + lambdaQueryWrapper1.eq(PlayCustomFollowInfoEntity::getClerkId, record.getClerkId()); record.setFollowNumber(this.baseMapper.selectList(lambdaQueryWrapper1).size()); } return iPage; @@ -97,11 +100,13 @@ public class PlayCustomFollowInfoServiceImpl extends ServiceImpl selectPlayCustomFollowInfoByPage(PlayCustomFollowInfoEntity playCustomFollowInfo) { + public IPage selectPlayCustomFollowInfoByPage( + PlayCustomFollowInfoEntity playCustomFollowInfo) { Page page = new Page<>(1, 10); return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>()); } @@ -109,7 +114,8 @@ public class PlayCustomFollowInfoServiceImpl extends ServiceImpl implements IPlayCustomGiftInfoService { +public class PlayCustomGiftInfoServiceImpl extends ServiceImpl + implements + IPlayCustomGiftInfoService { @Resource private PlayCustomGiftInfoMapper playCustomGiftInfoMapper; - @Override public PlayCustomGiftInfoEntity selectByGiftIdAndCustomId(String giftId, String customId) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -38,7 +38,8 @@ public class PlayCustomGiftInfoServiceImpl extends ServiceImpl implements IPlayCustomLeaveMsgService { +public class PlayCustomLeaveMsgServiceImpl extends ServiceImpl + implements + IPlayCustomLeaveMsgService { @Resource private PlayCustomLeaveMsgMapper playCustomLeaveMsgMapper; @@ -40,16 +41,21 @@ public class PlayCustomLeaveMsgServiceImpl extends ServiceImpl(vo.getPageNum(), vo.getPageSize()), PlayCustomLeaveMsgReturnVo.class, lambdaQueryWrapper); + .leftJoin(PlayCustomUserInfoEntity.class, PlayCustomUserInfoEntity::getId, + PlayCustomLeaveMsgEntity::getCustomId); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayCustomLeaveMsgReturnVo.class, lambdaQueryWrapper); } /** * 查询顾客留言 * - * @param id 顾客留言主键 + * @param id + * 顾客留言主键 * @return 顾客留言 */ @Override @@ -60,7 +66,8 @@ public class PlayCustomLeaveMsgServiceImpl extends ServiceImpl implements IPlayCustomLevelInfoService { +public class PlayCustomLevelInfoServiceImpl extends ServiceImpl + implements + IPlayCustomLevelInfoService { @Resource private PlayCustomLevelInfoMapper playCustomLevelInfoMapper; - @Override public void initDefaultLevel(SysTenantEntity sysTenantEntity) { List list = this.selectAll(); @@ -64,11 +64,11 @@ public class PlayCustomLevelInfoServiceImpl extends ServiceImpl implements IPlayCustomUserInfoService { +public class PlayCustomUserInfoServiceImpl extends ServiceImpl + implements + IPlayCustomUserInfoService { @Resource private PlayCustomUserInfoMapper playCustomUserInfoMapper; @@ -48,7 +49,6 @@ public class PlayCustomUserInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -56,21 +56,23 @@ public class PlayCustomUserInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new MPJLambdaWrapper<>(); lambdaQueryWrapper.selectAll(PlayCustomLevelInfoEntity.class); - lambdaQueryWrapper.leftJoin(PlayCustomLevelInfoEntity.class, PlayCustomLevelInfoEntity::getId, PlayCustomUserInfoEntity::getLevelId); + lambdaQueryWrapper.leftJoin(PlayCustomLevelInfoEntity.class, PlayCustomLevelInfoEntity::getId, + PlayCustomUserInfoEntity::getLevelId); lambdaQueryWrapper.eq(PlayCustomUserInfoEntity::getId, customId); - PlayCustomLevelInfoEntity entity = this.baseMapper.selectJoinOne(PlayCustomLevelInfoEntity.class, lambdaQueryWrapper); + PlayCustomLevelInfoEntity entity = this.baseMapper.selectJoinOne(PlayCustomLevelInfoEntity.class, + lambdaQueryWrapper); if (entity == null) { log.error("未查询当前顾客的充值优惠金额，支付金额等于充值金额,rechargeAmount={},customId={}", rechargeAmount, customId); return rechargeAmount; } try { - BigDecimal paymentAmount = BigDecimal.valueOf(entity.getDiscount()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).multiply(rechargeAmount); + BigDecimal paymentAmount = BigDecimal.valueOf(entity.getDiscount()) + .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).multiply(rechargeAmount); log.info("等级为{}的顾客{},充值{}元，实际应该支付{}元", entity.getName(), customId, rechargeAmount, paymentAmount); return paymentAmount; } catch (Exception e) { @@ -82,15 +84,17 @@ public class PlayCustomUserInfoServiceImpl extends ServiceImpl= 0) { giftAmount = new BigDecimal(5); @@ -113,11 +117,11 @@ public class PlayCustomUserInfoServiceImpl extends ServiceImpl selectRankingByPage(PlayCustomRankingQueryVo vo) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); - lambdaQueryWrapper.selectCollection(PlayOrderInfoEntity.class, PlayCustomRankingReturnVo::getOrderInfos).leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getPurchaserBy, PlayCustomUserInfoEntity::getId); + lambdaQueryWrapper.selectCollection(PlayOrderInfoEntity.class, PlayCustomRankingReturnVo::getOrderInfos) + .leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getPurchaserBy, + PlayCustomUserInfoEntity::getId); if (StrUtil.isNotBlank(vo.getId())) { lambdaQueryWrapper.eq(PlayCustomUserInfoEntity::getId, vo.getId()); } if (vo.getPurchaserTime() != null && vo.getPurchaserTime().size() == 2) { - lambdaQueryWrapper.between(PlayOrderInfoEntity::getPurchaserTime, vo.getPurchaserTime().get(0), vo.getPurchaserTime().get(1)); + lambdaQueryWrapper.between(PlayOrderInfoEntity::getPurchaserTime, vo.getPurchaserTime().get(0), + vo.getPurchaserTime().get(1)); } - IPage page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayCustomRankingReturnVo.class, lambdaQueryWrapper); + IPage page = this.baseMapper.selectJoinPage( + new Page<>(vo.getPageNum(), vo.getPageSize()), PlayCustomRankingReturnVo.class, lambdaQueryWrapper); int index = 1; for (PlayCustomRankingReturnVo record : page.getRecords()) { record.setRankingIndex((vo.getPageNum() - 1) * vo.getPageSize() + index); @@ -168,14 +175,17 @@ public class PlayCustomUserInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new MPJLambdaWrapper<>(); lambdaQueryWrapper.selectAll(PlayCustomUserInfoEntity.class); lambdaQueryWrapper.selectAs(PlayCustomLevelInfoEntity::getName, "levelName"); - lambdaQueryWrapper.leftJoin(PlayCustomLevelInfoEntity.class, PlayCustomLevelInfoEntity::getId, PlayCustomUserInfoEntity::getLevelId); + lambdaQueryWrapper.leftJoin(PlayCustomLevelInfoEntity.class, PlayCustomLevelInfoEntity::getId, + PlayCustomUserInfoEntity::getLevelId); if (StrUtil.isNotBlank(vo.getId())) { lambdaQueryWrapper.eq(PlayCustomUserInfoEntity::getId, vo.getId()); } @@ -222,13 +233,16 @@ public class PlayCustomUserInfoServiceImpl extends ServiceImpl page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayCustomUserReturnVo.class, lambdaQueryWrapper); + IPage page = this.baseMapper.selectJoinPage( + new Page<>(vo.getPageNum(), vo.getPageSize()), PlayCustomUserReturnVo.class, lambdaQueryWrapper); for (PlayCustomUserReturnVo record : page.getRecords()) { - List orderInfoEntities = playOrderInfoService.list(Wrappers.lambdaQuery(PlayOrderInfoEntity.class).eq(PlayOrderInfoEntity::getPurchaserBy, record.getId()).in(PlayOrderInfoEntity::getPlaceType, "0", "2")); + List orderInfoEntities = playOrderInfoService.list(Wrappers + .lambdaQuery(PlayOrderInfoEntity.class).eq(PlayOrderInfoEntity::getPurchaserBy, record.getId()) + .in(PlayOrderInfoEntity::getPlaceType, "0", "2")); BigDecimal orderTotalAmount = new BigDecimal("0"); for (PlayOrderInfoEntity orderInfoEntity : orderInfoEntities) { orderTotalAmount = orderTotalAmount.add(orderInfoEntity.getFinalAmount()); @@ -253,7 +269,8 @@ public class PlayCustomUserInfoServiceImpl extends ServiceImpl 0 ? "1" : "0"); this.baseMapper.updateById(entity); - //记录余额变更记录 - playBalanceDetailsInfoService.insertBalanceDetailsInfo("1", userId, balanceBeforeOperation, balanceAfterOperation, operationType, operationAction, balanceMoney, giftAmount, orderId); + // 记录余额变更记录 + playBalanceDetailsInfoService.insertBalanceDetailsInfo("1", userId, balanceBeforeOperation, + balanceAfterOperation, operationType, operationAction, balanceMoney, giftAmount, orderId); } /** * 修改顾客 * - * @param playCustomUserInfo 顾客 + * @param playCustomUserInfo + * 顾客 * @return 结果 */ @Override @@ -320,7 +339,8 @@ public class PlayCustomUserInfoServiceImpl extends ServiceImpl simpleList() { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(PlayCustomUserInfoEntity.class); - wrapper.orderByDesc(PlayCustomUserInfoEntity::getId).eq(PlayCustomUserInfoEntity::getDeleted, 0).select(PlayCustomUserInfoEntity::getAvatar, PlayCustomUserInfoEntity::getId, PlayCustomUserInfoEntity::getNickname, PlayCustomUserInfoEntity::getAvatar); + wrapper.orderByDesc(PlayCustomUserInfoEntity::getId).eq(PlayCustomUserInfoEntity::getDeleted, 0).select( + PlayCustomUserInfoEntity::getAvatar, PlayCustomUserInfoEntity::getId, + PlayCustomUserInfoEntity::getNickname, PlayCustomUserInfoEntity::getAvatar); return baseMapper.selectList(wrapper); } @Override public void saveOrderInfo(PlayOrderInfoEntity entity) { String id = entity.getPurchaserBy(); - LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(PlayCustomUserInfoEntity.class).eq(PlayCustomUserInfoEntity::getId, id).set(PlayCustomUserInfoEntity::getLastPurchaseTime, new Date()); + LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(PlayCustomUserInfoEntity.class) + .eq(PlayCustomUserInfoEntity::getId, id).set(PlayCustomUserInfoEntity::getLastPurchaseTime, new Date()); PlayCustomUserInfoEntity userInfoEntity = selectById(id); if (Objects.isNull(userInfoEntity.getFirstPurchaseTime())) { wrapper.set(PlayCustomUserInfoEntity::getFirstPurchaseTime, new Date()); diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderComplaintInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderComplaintInfoController.java index 902c8ca..bb046f6 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderComplaintInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderComplaintInfoController.java @@ -14,11 +14,10 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; - /** * 订单投诉信息Controller * @@ -37,8 +36,7 @@ public class PlayOrderComplaintInfoController { */ @ApiOperation(value = "分页查询投诉列表", notes = "分页查询订单投诉信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayOrderComplaintReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayOrderComplaintReturnVo.class, responseContainer = "Page")}) @PostMapping("/listByPage") public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayOrderComplaintQueryVo vo) { IPage list = playOrderComplaintInfoService.selectByPage(vo); @@ -50,9 +48,7 @@ public class PlayOrderComplaintInfoController { */ @ApiOperation(value = "获取投诉详情", notes = "根据ID获取订单投诉详细信息") @ApiImplicitParam(name = "id", value = "投诉记录ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayOrderComplaintInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayOrderComplaintInfoEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(playOrderComplaintInfoService.selectPlayOrderComplaintInfoById(id)); @@ -62,14 +58,12 @@ public class PlayOrderComplaintInfoController { * 新增订单投诉信息 */ @ApiOperation(value = "新增投诉记录", notes = "创建新的订单投诉信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) - //@PreAuthorize("@customSs.hasPermission('order:complaint:add')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) + // @PreAuthorize("@customSs.hasPermission('order:complaint:add')") @Log(title = "订单投诉信息", businessType = BusinessType.INSERT) @PostMapping("/create") - public R create(@ApiParam(value = "投诉信息", required = true) @RequestBody PlayOrderComplaintInfoEntity playOrderComplaintInfo) { + public R create( + @ApiParam(value = "投诉信息", required = true) @RequestBody PlayOrderComplaintInfoEntity playOrderComplaintInfo) { boolean success = playOrderComplaintInfoService.create(playOrderComplaintInfo); if (success) { return R.ok(); @@ -82,14 +76,12 @@ public class PlayOrderComplaintInfoController { */ @ApiOperation(value = "修改投诉记录", notes = "根据ID修改订单投诉信息") @ApiImplicitParam(name = "id", value = "投诉记录ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) - //@PreAuthorize("@customSs.hasPermission('order:complaint:update')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) + // @PreAuthorize("@customSs.hasPermission('order:complaint:update')") @Log(title = "订单投诉信息", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "投诉信息", required = true) @RequestBody PlayOrderComplaintInfoEntity playOrderComplaintInfo) { + public R update(@PathVariable String id, + @ApiParam(value = "投诉信息", required = true) @RequestBody PlayOrderComplaintInfoEntity playOrderComplaintInfo) { playOrderComplaintInfo.setId(id); boolean success = playOrderComplaintInfoService.update(playOrderComplaintInfo); if (success) { @@ -103,10 +95,8 @@ public class PlayOrderComplaintInfoController { */ @ApiOperation(value = "删除投诉记录", notes = "根据ID批量删除订单投诉信息") @ApiImplicitParam(name = "ids", value = "投诉记录ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) - //@PreAuthorize("@customSs.hasPermission('order:complaint:delete')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) + // @PreAuthorize("@customSs.hasPermission('order:complaint:delete')") @Log(title = "订单投诉信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderContinueInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderContinueInfoController.java index 4ff21ed..00f5a6a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderContinueInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderContinueInfoController.java @@ -11,14 +11,13 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; - /** * 订单续单信息Controller * @@ -37,8 +36,7 @@ public class PlayOrderContinueInfoController { */ @ApiOperation(value = "分页查询续单列表", notes = "分页查询订单续单信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayOrderContinueReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayOrderContinueReturnVo.class, responseContainer = "Page")}) @PostMapping("/listByPage") public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayOrderContinueQueryVo vo) { IPage list = playOrderContinueInfoService.selectPlayByPage(vo); @@ -49,13 +47,11 @@ public class PlayOrderContinueInfoController { * 审批续单申申请 */ @ApiOperation(value = "审批续单申请", notes = "审核店员的续单申请") - @ApiResponses({ - @ApiResponse(code = 200, message = "审批成功"), - @ApiResponse(code = 500, message = "审批失败") - }) - //@PreAuthorize("@customSs.hasPermission('order:continue:update')") + @ApiResponses({@ApiResponse(code = 200, message = "审批成功"), @ApiResponse(code = 500, message = "审批失败")}) + // @PreAuthorize("@customSs.hasPermission('order:continue:update')") @PostMapping("/updateReviewState") - public R updateReviewState(@ApiParam(value = "审批信息", required = true) @Validated @RequestBody PlayOrderReviewStateEditVo vo) { + public R updateReviewState( + @ApiParam(value = "审批信息", required = true) @Validated @RequestBody PlayOrderReviewStateEditVo vo) { playOrderContinueInfoService.updateReviewState(vo); return R.ok("成功"); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderEvaluateInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderEvaluateInfoController.java index 672db49..4d08419 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderEvaluateInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderEvaluateInfoController.java @@ -16,11 +16,10 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; - /** * 订单评价信息Controller * @@ -39,28 +38,23 @@ public class PlayOrderEvaluateInfoController { */ @ApiOperation(value = "分页查询评价列表", notes = "分页查询订单评价信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayOrderEvaluateReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayOrderEvaluateReturnVo.class, responseContainer = "Page")}) @PostMapping("/listByPage") public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayOrderEvaluateQueryVo vo) { IPage list = playOrderEvaluateInfoService.selectByPage(vo); return R.ok(list); } - - /** * 修改订单评价信息 */ @ApiOperation(value = "修改评价状态", notes = "修改订单评价的显示状态") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) - //@PreAuthorize("@customSs.hasPermission('order:evaluate:update')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) + // @PreAuthorize("@customSs.hasPermission('order:evaluate:update')") @Log(title = "修改订单评价状态", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateStatus") - public R update(@ApiParam(value = "评价状态信息", required = true) @Validated @RequestBody PlayOrderEvaluateEditStateVo vo) { + public R update( + @ApiParam(value = "评价状态信息", required = true) @Validated @RequestBody PlayOrderEvaluateEditStateVo vo) { PlayOrderEvaluateInfoEntity entity = ConvertUtil.entityToVo(vo, PlayOrderEvaluateInfoEntity.class); boolean success = playOrderEvaluateInfoService.update(entity); if (success) { @@ -74,10 +68,8 @@ public class PlayOrderEvaluateInfoController { */ @ApiOperation(value = "删除评价记录", notes = "根据ID批量删除订单评价信息") @ApiImplicitParam(name = "ids", value = "评价记录ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) - //@PreAuthorize("@customSs.hasPermission('order:evaluate:delete')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) + // @PreAuthorize("@customSs.hasPermission('order:evaluate:delete')") @Log(title = "订单评价信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java index f55ef71..829f6ad 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java @@ -23,13 +23,11 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.math.BigDecimal; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import java.math.BigDecimal; - - /** * 订单管理 * @@ -57,29 +55,23 @@ public class PlayOrderInfoController { @Resource private IPlayCustomUserInfoService customUserInfoService; - /** * 分页查询订单列表 */ @ApiOperation(value = "分页查询订单列表", notes = "分页查询订单信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayOrderInfoEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayOrderInfoEntity.class, responseContainer = "Page")}) @PostMapping("/listByPage") public R listByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayOrderInfoQueryVo vo) { return R.ok(orderInfoService.selectOrderInfoPage(vo)); } - /** * 订单退款 */ @ApiOperation(value = "订单退款", notes = "处理订单退款操作") - @ApiResponses({ - @ApiResponse(code = 200, message = "退款成功"), - @ApiResponse(code = 500, message = "退款失败，包含详细错误信息") - }) - //@PreAuthorize("@customSs.hasPermission('order:order:update')") + @ApiResponses({@ApiResponse(code = 200, message = "退款成功"), @ApiResponse(code = 500, message = "退款失败，包含详细错误信息")}) + // @PreAuthorize("@customSs.hasPermission('order:order:update')") @PostMapping("/orderRefund") public R orderRefund(@ApiParam(value = "退款信息", required = true) @Validated @RequestBody PlayOrderRefundAddVo vo) { PlayOrderInfoEntity orderInfo = orderInfoService.selectOrderInfoById(vo.getOrderId()); @@ -107,44 +99,46 @@ public class PlayOrderInfoController { String refundType = orderInfo.getFinalAmount().compareTo(vo.getRefundAmount()) == 0 ? "0" : "1"; PlayCustomUserInfoEntity customUserInfo = customUserInfoService.getById(orderInfo.getPurchaserBy()); - customUserInfoService.updateAccountBalanceById(customUserInfo.getId(), customUserInfo.getAccountBalance(), customUserInfo.getAccountBalance().add(orderInfo.getOrderMoney()), "3", "订单退款", orderInfo.getOrderMoney(), BigDecimal.ZERO, vo.getOrderId()); + customUserInfoService.updateAccountBalanceById(customUserInfo.getId(), customUserInfo.getAccountBalance(), + customUserInfo.getAccountBalance().add(orderInfo.getOrderMoney()), "3", "订单退款", + orderInfo.getOrderMoney(), BigDecimal.ZERO, vo.getOrderId()); - playOrderRefundInfoService.add(orderInfo.getId(), orderInfo.getPurchaserBy(), orderInfo.getAcceptBy(), orderInfo.getPayMethod(), refundType, vo.getRefundAmount(), vo.getRefundReason(), "2", SecurityUtils.getUserId(), "0", "0"); + playOrderRefundInfoService.add(orderInfo.getId(), orderInfo.getPurchaserBy(), orderInfo.getAcceptBy(), + orderInfo.getPayMethod(), refundType, vo.getRefundAmount(), vo.getRefundReason(), "2", + SecurityUtils.getUserId(), "0", "0"); return R.ok("退款成功"); } - /** * 更换店员 */ @ApiOperation(value = "更换店员", notes = "修改订单的接单店员") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "操作失败") - }) - //@PreAuthorize("@customSs.hasPermission('order:order:update')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "操作失败")}) + // @PreAuthorize("@customSs.hasPermission('order:order:update')") @PostMapping("/orderEditAcceptBy") - public R orderEditAcceptBy(@ApiParam(value = "更换店员信息", required = true) @Validated @RequestBody PlayOrderEditAcceptByVo vo) { - orderInfoService.updateStateTo1("2", CustomSecurityContextHolder.getUserId(), vo.getAcceptBy(), vo.getOrderId()); + public R orderEditAcceptBy( + @ApiParam(value = "更换店员信息", required = true) @Validated @RequestBody PlayOrderEditAcceptByVo vo) { + orderInfoService.updateStateTo1("2", CustomSecurityContextHolder.getUserId(), vo.getAcceptBy(), + vo.getOrderId()); PlayClerkUserInfoEntity clerkUserInfo = playClerkUserInfoService.selectById(vo.getAcceptBy()); PlayOrderInfoEntity orderInfo = orderInfoService.selectOrderInfoById(vo.getOrderId()); - PlayCommodityInfoVo commodityInfo = playCommodityInfoService.queryCommodityInfo(orderInfo.getCommodityId(), clerkUserInfo.getLevelId()); - wxCustomMpService.sendCreateOrderMessage(clerkUserInfo.getTenantId(), clerkUserInfo.getOpenid(), orderInfo.getOrderNo(), orderInfo.getOrderMoney().toString(), commodityInfo.getCommodityName()); + PlayCommodityInfoVo commodityInfo = playCommodityInfoService.queryCommodityInfo(orderInfo.getCommodityId(), + clerkUserInfo.getLevelId()); + wxCustomMpService.sendCreateOrderMessage(clerkUserInfo.getTenantId(), clerkUserInfo.getOpenid(), + orderInfo.getOrderNo(), orderInfo.getOrderMoney().toString(), commodityInfo.getCommodityName()); return R.ok("操作成功"); } - /** * 后台备注 */ @ApiOperation(value = "修改后台备注", notes = "修改订单的后台备注信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Boolean.class), - @ApiResponse(code = 500, message = "操作失败") - }) - //@PreAuthorize("@customSs.hasPermission('order:order:update')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Boolean.class), + @ApiResponse(code = 500, message = "操作失败")}) + // @PreAuthorize("@customSs.hasPermission('order:order:update')") @PostMapping("/orderEditBackendRemark") - public R orderEditBackendRemark(@ApiParam(value = "后台备注信息", required = true) @Validated @RequestBody PlayOrderEditBackendRemarkByVo vo) { + public R orderEditBackendRemark( + @ApiParam(value = "后台备注信息", required = true) @Validated @RequestBody PlayOrderEditBackendRemarkByVo vo) { PlayOrderInfoEntity orderInfo = orderInfoService.selectOrderInfoById(vo.getOrderId()); PlayOrderInfoEntity updateOrderInfo = new PlayOrderInfoEntity(); updateOrderInfo.setId(orderInfo.getId()); @@ -152,18 +146,16 @@ public class PlayOrderInfoController { return R.ok(orderInfoService.update(updateOrderInfo)); } - /** * 重新抢单 */ @ApiOperation(value = "重新抢单", notes = "将订单重新设置为抢单状态") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Boolean.class), - @ApiResponse(code = 500, message = "操作失败，包含详细错误信息") - }) - //@PreAuthorize("@customSs.hasPermission('order:order:update')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Boolean.class), + @ApiResponse(code = 500, message = "操作失败，包含详细错误信息")}) + // @PreAuthorize("@customSs.hasPermission('order:order:update')") @PostMapping("/orderEditRandomSingle") - public R orderEditRandomSingle(@ApiParam(value = "重新抢单信息", required = true) @Validated @RequestBody PlayOrderEditRandomSingleVo vo) { + public R orderEditRandomSingle( + @ApiParam(value = "重新抢单信息", required = true) @Validated @RequestBody PlayOrderEditRandomSingleVo vo) { PlayOrderInfoEntity orderInfo = orderInfoService.selectOrderInfoById(vo.getOrderId()); if (!"1".equals(orderInfo.getPlaceType())) { throw new CustomException("订单类型错误，无法重新抢单"); @@ -182,34 +174,28 @@ public class PlayOrderInfoController { return R.ok(orderInfoService.update(updateOrderInfo)); } - /** * 根据ID查询订单 */ @ApiOperation(value = "获取订单详情", notes = "根据ID获取订单详细信息") @ApiImplicitParam(name = "id", value = "订单ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayOrderInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayOrderInfoEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(orderInfoService.selectById(id)); } - /** * 根据ID修改订单信息 */ @ApiOperation(value = "修改订单信息", notes = "根据ID修改订单基本信息") @ApiImplicitParam(name = "id", value = "订单ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) - //@PreAuthorize("@customSs.hasPermission('order:order:update')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) + // @PreAuthorize("@customSs.hasPermission('order:order:update')") @Log(title = "修改普通订单", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "订单信息", required = true) @RequestBody PlayOrderInfoEntity orderInfoEntity) { + public R update(@PathVariable String id, + @ApiParam(value = "订单信息", required = true) @RequestBody PlayOrderInfoEntity orderInfoEntity) { orderInfoEntity.setId(id); boolean success = orderInfoService.update(orderInfoEntity); if (success) { @@ -218,16 +204,13 @@ public class PlayOrderInfoController { return R.error("修改失败"); } - /** * 删除订单 */ @ApiOperation(value = "删除订单", notes = "根据ID批量删除订单信息") @ApiImplicitParam(name = "ids", value = "订单ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) - //@PreAuthorize("@customSs.hasPermission('order:order:delete')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) + // @PreAuthorize("@customSs.hasPermission('order:order:delete')") @Log(title = "删除订单", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderRefundInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderRefundInfoController.java index d76627c..c026c79 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderRefundInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderRefundInfoController.java @@ -14,11 +14,10 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; - /** * 订单退款信息Controller * @@ -37,8 +36,7 @@ public class PlayOrderRefundInfoController { */ @ApiOperation(value = "分页查询退款列表", notes = "分页查询订单退款信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayOrderRefundReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayOrderRefundReturnVo.class, responseContainer = "Page")}) @PostMapping("/list") public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayOrderRefundQueryVo vo) { IPage list = playOrderRefundInfoService.selectByPage(vo); @@ -50,9 +48,7 @@ public class PlayOrderRefundInfoController { */ @ApiOperation(value = "获取退款详情", notes = "根据ID获取订单退款详细信息") @ApiImplicitParam(name = "id", value = "退款记录ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayOrderRefundInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayOrderRefundInfoEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(playOrderRefundInfoService.selectPlayOrderRefundInfoById(id)); @@ -62,13 +58,11 @@ public class PlayOrderRefundInfoController { * 新增订单退款信息 */ @ApiOperation(value = "新增退款记录", notes = "创建新的订单退款信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @Log(title = "订单退款信息", businessType = BusinessType.INSERT) @PostMapping("/create") - public R create(@ApiParam(value = "退款信息", required = true) @RequestBody PlayOrderRefundInfoEntity playOrderRefundInfo) { + public R create( + @ApiParam(value = "退款信息", required = true) @RequestBody PlayOrderRefundInfoEntity playOrderRefundInfo) { boolean success = playOrderRefundInfoService.create(playOrderRefundInfo); if (success) { return R.ok(); @@ -81,13 +75,11 @@ public class PlayOrderRefundInfoController { */ @ApiOperation(value = "修改退款记录", notes = "根据ID修改订单退款信息") @ApiImplicitParam(name = "id", value = "退款记录ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @Log(title = "订单退款信息", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "退款信息", required = true) @RequestBody PlayOrderRefundInfoEntity playOrderRefundInfo) { + public R update(@PathVariable String id, + @ApiParam(value = "退款信息", required = true) @RequestBody PlayOrderRefundInfoEntity playOrderRefundInfo) { playOrderRefundInfo.setId(id); boolean success = playOrderRefundInfoService.update(playOrderRefundInfo); if (success) { @@ -101,9 +93,7 @@ public class PlayOrderRefundInfoController { */ @ApiOperation(value = "删除退款记录", notes = "根据ID批量删除订单退款信息") @ApiImplicitParam(name = "ids", value = "退款记录ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Integer.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)}) @Log(title = "订单退款信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderRewardInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderRewardInfoController.java index 7c03eb3..00c1f80 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderRewardInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderRewardInfoController.java @@ -12,15 +12,13 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; - - /** * 打赏订单 * @@ -32,26 +30,22 @@ import javax.annotation.Resource; @RequestMapping("/order/reward/") public class PlayOrderRewardInfoController { - - @Resource private IPlayOrderInfoService orderInfoService; - /** * 分页查询打赏订单列表 */ @ApiOperation(value = "分页查询打赏订单", notes = "分页查询打赏订单信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayOrderRewardReturnVo.class, responseContainer = "Page") - }) - //@PreAuthorize("@customSs.hasPermission('order:reward:list')") + @ApiResponse(code = 200, message = "操作成功", response = PlayOrderRewardReturnVo.class, responseContainer = "Page")}) + // @PreAuthorize("@customSs.hasPermission('order:reward:list')") @Log(title = "查询打赏订单", businessType = BusinessType.INSERT) @PostMapping("/listByPage") - public R queryRewardOrder(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayOrderRewardQueryVo vo) { + public R queryRewardOrder( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayOrderRewardQueryVo vo) { IPage page = orderInfoService.selectRewardOrderInfoByPage(vo); return R.ok(page); } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderComplaintInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderComplaintInfoMapper.java index 5729ced..8e4a501 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderComplaintInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderComplaintInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.order.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.order.module.entity.PlayOrderComplaintInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.order.module.entity.PlayOrderComplaintInfoEntity */ public interface PlayOrderComplaintInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderContinueInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderContinueInfoMapper.java index d470aaa..2328e7f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderContinueInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderContinueInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.order.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.order.module.entity.PlayOrderContinueInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.order.module.entity.PlayOrderContinueInfoEntity; */ public interface PlayOrderContinueInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderEvaluateInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderEvaluateInfoMapper.java index 872200b..a165e42 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderEvaluateInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderEvaluateInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.order.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.order.module.entity.PlayOrderEvaluateInfoEntity; @@ -8,9 +7,8 @@ import com.starry.admin.modules.order.module.entity.PlayOrderEvaluateInfoEntity; * 订单评价信息Mapper接口 * * @author admin - * @since 2024-05-07 + * @since 2024-05-07 */ public interface PlayOrderEvaluateInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderRefundInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderRefundInfoMapper.java index 5e27c50..6363cb5 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderRefundInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderRefundInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.order.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.order.module.entity.PlayOrderRefundInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.order.module.entity.PlayOrderRefundInfoEntity; */ public interface PlayOrderRefundInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderComplaintInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderComplaintInfoEntity.java index 65d723b..795f076 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderComplaintInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderComplaintInfoEntity.java @@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.starry.admin.common.conf.StringTypeHandler; import com.starry.common.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - import java.util.Date; import java.util.List; +import lombok.Data; +import lombok.EqualsAndHashCode; /** * 订单投诉信息对象 play_order_complaint_info @@ -21,7 +20,6 @@ import java.util.List; @TableName(value = "play_order_complaint_info", autoResultMap = true) public class PlayOrderComplaintInfoEntity extends BaseEntity { - /** * uuid */ @@ -78,5 +76,4 @@ public class PlayOrderComplaintInfoEntity extends BaseEntity { - /** * uuid */ @@ -115,5 +113,4 @@ public class PlayOrderContinueInfoEntity extends BaseEntity { - /** * uuid */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderInfoEntity.java index 994d620..1b72979 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderInfoEntity.java @@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.starry.admin.common.conf.StringTypeHandler; import com.starry.common.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; - import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; /** * 订单对象 order_info @@ -25,13 +24,11 @@ import java.util.List; @TableName(value = "play_order_info", autoResultMap = true) public class PlayOrderInfoEntity extends BaseEntity { - /** * uuid */ private String id; - /** * 订单编号 */ @@ -42,14 +39,8 @@ public class PlayOrderInfoEntity extends BaseEntity { */ private String tenantId; - /** - * 订单状态【0:1:2:3:4】 - * 0：已下单（待接单） - * 1：已接单（待开始） - * 2：已开始（服务中） - * 3：已完成 - * 4：已取消 + * 订单状态【0:1:2:3:4】 0：已下单（待接单） 1：已接单（待开始） 2：已开始（服务中） 3：已完成 4：已取消 */ private String orderStatus; @@ -117,14 +108,12 @@ public class PlayOrderInfoEntity extends BaseEntity { */ private String commodityNumber; - /** * 订单要求 */ @TableField(typeHandler = StringTypeHandler.class) private List labels; - /** * 是否使用优惠券[0:未使用,1:已使用] */ @@ -161,7 +150,6 @@ public class PlayOrderInfoEntity extends BaseEntity { */ private BigDecimal orderMoney; - /** * 订单最终金额（支付金额） */ @@ -177,7 +165,6 @@ public class PlayOrderInfoEntity extends BaseEntity { */ private Integer estimatedRevenueRatio; - /** * 优惠金额 * @@ -267,19 +254,16 @@ public class PlayOrderInfoEntity extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime orderCancelTime; - /** * 订单备注 */ private String remark; - /** * 后台备注 */ private String backendRemark; - /** * 订单结算状态(0:未结算;1:已结算) */ @@ -297,7 +281,6 @@ public class PlayOrderInfoEntity extends BaseEntity { */ private String ordersExpiredState; - /** * 随机单要求-店员性别（0:未知;1:男;2:女） */ @@ -315,10 +298,8 @@ public class PlayOrderInfoEntity extends BaseEntity { private BigDecimal profitSharingAmount; - public PlayOrderInfoEntity() { - } public PlayOrderInfoEntity(String id, String orderStatus) { @@ -332,4 +313,4 @@ public class PlayOrderInfoEntity extends BaseEntity { this.orderType = orderType; this.placeType = placeType; } -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderRefundInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderRefundInfoEntity.java index 99c8f83..9ba1ba8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderRefundInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderRefundInfoEntity.java @@ -2,11 +2,10 @@ package com.starry.admin.modules.order.module.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.starry.common.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - import java.math.BigDecimal; import java.util.Date; +import lombok.Data; +import lombok.EqualsAndHashCode; /** * 订单退款信息对象 play_order_refund_info @@ -19,7 +18,6 @@ import java.util.Date; @TableName("play_order_refund_info") public class PlayOrderRefundInfoEntity extends BaseEntity { - /** * uuid */ @@ -115,5 +113,4 @@ public class PlayOrderRefundInfoEntity extends BaseEntity { private String tenantId; /** - * 订单状态【0:1:2:3:4】 - * 0：已下单 - * 1：已接单 - * 2：已开始 - * 3：已完成 - * 4：已取消 + * 订单状态【0:1:2:3:4】 0：已下单 1：已接单 2：已开始 3：已完成 4：已取消 */ private String orderStatus = String.valueOf(0); - /** * 订单类型【0：充值订单；1：提现订单；2：普通订单】 */ @@ -61,5 +54,4 @@ public class OrderInfoAddVo extends BaseEntity { */ private List couponIds; - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/OrderInfoCancellationVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/OrderInfoCancellationVo.java index 077d1a8..e6cc827 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/OrderInfoCancellationVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/OrderInfoCancellationVo.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.order.module.vo; -import lombok.Data; - import javax.validation.constraints.NotNull; +import lombok.Data; /** * 取消订单对象 order_info @@ -13,7 +12,6 @@ import javax.validation.constraints.NotNull; @Data public class OrderInfoCancellationVo { - /** * uuid */ @@ -26,12 +24,10 @@ public class OrderInfoCancellationVo { @NotNull(message = "租户ID不能为空") private String tenantId; - /** * 操作人ID */ @NotNull(message = "操作人不能为空") private String operatorBy; - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/OrderInfoRefundVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/OrderInfoRefundVo.java index d493f65..8366cca 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/OrderInfoRefundVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/OrderInfoRefundVo.java @@ -1,9 +1,8 @@ package com.starry.admin.modules.order.module.vo; import com.starry.common.annotation.EnumValue; -import lombok.Data; - import javax.validation.constraints.NotNull; +import lombok.Data; /** * 订单信息对象 order_info @@ -14,7 +13,6 @@ import javax.validation.constraints.NotNull; @Data public class OrderInfoRefundVo { - /** * uuid */ @@ -24,10 +22,9 @@ public class OrderInfoRefundVo { /** * 租户ID */ -// @NotNull(message = "租户ID不能为空") + // @NotNull(message = "租户ID不能为空") private String tenantId; - /** * 退款类型【1：部分退款，2：全部退款】 */ @@ -40,5 +37,4 @@ public class OrderInfoRefundVo { */ private String refundMoney; - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderComplaintQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderComplaintQueryVo.java index 1a11e99..58cc778 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderComplaintQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderComplaintQueryVo.java @@ -1,14 +1,12 @@ package com.starry.admin.modules.order.module.vo; - import com.starry.common.domain.BasePageEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** * 订单投诉查询对象 * @@ -60,5 +58,4 @@ public class PlayOrderComplaintQueryVo extends BasePageEntity { @ApiModelProperty(value = "投诉时间范围", example = "['2024-01-01 00:00:00','2024-12-31 23:59:59']", notes = "投诉提交时间范围，包含开始和结束时间") private List complaintTime; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderComplaintReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderComplaintReturnVo.java index 9305b62..b66940a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderComplaintReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderComplaintReturnVo.java @@ -1,15 +1,13 @@ package com.starry.admin.modules.order.module.vo; - import com.baomidou.mybatisplus.annotation.TableField; import com.starry.admin.common.conf.StringTypeHandler; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.math.BigDecimal; import java.util.Date; import java.util.List; +import lombok.Data; /** * 订单投诉查询返回对象 @@ -20,7 +18,6 @@ import java.util.List; @ApiModel(value = "订单投诉返回数据", description = "订单投诉信息的返回数据") public class PlayOrderComplaintReturnVo { - /** * uuid */ @@ -112,14 +109,12 @@ public class PlayOrderComplaintReturnVo { @ApiModelProperty(value = "下单类型", example = "0", notes = "0：指定单，1：随机单，2：打赏单") private String placeType; - /** * 订单最终金额（支付金额） */ @ApiModelProperty(value = "支付金额", example = "100.00") private BigDecimal finalAmount; - /** * 服务项目ID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueQueryVo.java index f204382..1df3287 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueQueryVo.java @@ -3,11 +3,10 @@ package com.starry.admin.modules.order.module.vo; import com.starry.common.domain.BasePageEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** * 续单分页查询对象 * @@ -22,21 +21,18 @@ public class PlayOrderContinueQueryVo extends BasePageEntity { @ApiModelProperty(value = "昵称", example = "小明", notes = "店员或顾客昵称，支持模糊查询") private String nickname; - /** * 店员ID */ @ApiModelProperty(value = "店员ID", example = "1", notes = "申请续单的店员ID") private String clerkId; - /** * 顾客ID */ @ApiModelProperty(value = "顾客ID", example = "1", notes = "相关顾客的ID") private String customId; - /** * 订单编号 */ @@ -55,5 +51,4 @@ public class PlayOrderContinueQueryVo extends BasePageEntity { @ApiModelProperty(value = "申请时间范围", example = "['2024-01-01 00:00:00','2024-12-31 23:59:59']", notes = "续单申请时间范围，包含开始和结束时间") private List continueTime; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueReturnVo.java index 9f8d3e1..83aee74 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueReturnVo.java @@ -3,12 +3,11 @@ package com.starry.admin.modules.order.module.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 续单查询返回对象 @@ -23,7 +22,6 @@ public class PlayOrderContinueReturnVo { @ApiModelProperty(value = "续单ID", example = "1") private String id; - /** * 店员ID */ @@ -54,7 +52,6 @@ public class PlayOrderContinueReturnVo { @ApiModelProperty(value = "顾客ID", example = "1") private String customerId; - /** * 用户等级名称 */ @@ -98,7 +95,6 @@ public class PlayOrderContinueReturnVo { @ApiModelProperty(value = "商品数量", example = "1") private int commodityNumber; - /** * 下单金额 */ @@ -141,7 +137,6 @@ public class PlayOrderContinueReturnVo { @ApiModelProperty(value = "审核备注", example = "审核通过，可以继续服务") private String reviewedRemark; - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty(value = "申请时间", example = "2024-01-01 12:00:00") diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderDetailsReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderDetailsReturnVo.java index ee98c91..7867e55 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderDetailsReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderDetailsReturnVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.order.module.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - import java.math.BigDecimal; import java.util.Date; import java.util.List; +import lombok.Data; /** * 订单查询返回对象 @@ -16,7 +15,6 @@ import java.util.List; @Data public class PlayOrderDetailsReturnVo { - private String id; private String orderNo; @@ -31,13 +29,11 @@ public class PlayOrderDetailsReturnVo { */ private String customNickname; - /** * 用户头像 */ private String customAvatar; - /** * 店员ID */ @@ -53,14 +49,12 @@ public class PlayOrderDetailsReturnVo { */ private String clerkAvatar; - /** * 下单时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date purchaserTime; - /** * 接单时间 */ @@ -84,13 +78,11 @@ public class PlayOrderDetailsReturnVo { */ private BigDecimal orderMoney; - /** * 订单最终金额 */ private BigDecimal finalAmount; - /** * 商品ID */ @@ -123,12 +115,7 @@ public class PlayOrderDetailsReturnVo { private int commodityNumber; /** - * 订单状态【0:1:2:3:4】 - * 0：已下单（待接单） - * 1：已接单（待开始） - * 2：已开始（服务中） - * 3：已完成 - * 4：已取消 + * 订单状态【0:1:2:3:4】 0：已下单（待接单） 1：已接单（待开始） 2：已开始（服务中） 3：已完成 4：已取消 */ private String orderStatus; @@ -147,7 +134,6 @@ public class PlayOrderDetailsReturnVo { */ private String payMethod; - /** * 订单备注 */ @@ -158,7 +144,6 @@ public class PlayOrderDetailsReturnVo { */ private List labels; - /** * 是否是首单【0：不是，1：是】 */ @@ -167,7 +152,7 @@ public class PlayOrderDetailsReturnVo { /** * 是否评价（1：已评价;0:未评价） */ - private String evaluate = "0"; + private String evaluate = "0"; /** * 是否投诉（1：已投诉;0:未投诉） @@ -189,7 +174,4 @@ public class PlayOrderDetailsReturnVo { */ private BigDecimal discountAmount; - - - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEditAcceptByVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEditAcceptByVo.java index 3652cea..17861a1 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEditAcceptByVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEditAcceptByVo.java @@ -2,9 +2,8 @@ package com.starry.admin.modules.order.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import javax.validation.constraints.NotNull; +import lombok.Data; /** * 订单查询对象 @@ -16,7 +15,6 @@ import javax.validation.constraints.NotNull; @ApiModel(value = "更换店员参数", description = "更换订单接单店员的请求参数") public class PlayOrderEditAcceptByVo { - /** * uuid */ @@ -24,7 +22,6 @@ public class PlayOrderEditAcceptByVo { @ApiModelProperty(value = "订单ID", required = true, example = "1", notes = "需要更换店员的订单ID") private String orderId; - /** * 店员ID */ @@ -38,5 +35,4 @@ public class PlayOrderEditAcceptByVo { @ApiModelProperty(value = "备注", example = "店员请假，需要更换", notes = "更换店员的原因说明") private String remark; - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEditBackendRemarkByVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEditBackendRemarkByVo.java index d4b187c..cc1ba79 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEditBackendRemarkByVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEditBackendRemarkByVo.java @@ -2,11 +2,10 @@ package com.starry.admin.modules.order.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotNull; import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotNull; - /** * 订单查询对象 * @@ -17,7 +16,6 @@ import javax.validation.constraints.NotNull; @ApiModel(value = "修改后台备注参数", description = "修改订单后台备注的请求参数") public class PlayOrderEditBackendRemarkByVo { - /** * uuid */ @@ -25,7 +23,6 @@ public class PlayOrderEditBackendRemarkByVo { @ApiModelProperty(value = "订单ID", required = true, example = "1", notes = "需要修改备注的订单ID") private String orderId; - /** * 后台备注不能为空 */ @@ -34,5 +31,4 @@ public class PlayOrderEditBackendRemarkByVo { @ApiModelProperty(value = "后台备注", required = true, example = "顾客要求特殊服务", notes = "订单的后台备注内容，1-100字符") private String backendRemark; - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEditRandomSingleVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEditRandomSingleVo.java index b988881..3901222 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEditRandomSingleVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEditRandomSingleVo.java @@ -2,9 +2,8 @@ package com.starry.admin.modules.order.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import javax.validation.constraints.NotNull; +import lombok.Data; /** * 重新抢单对象 @@ -16,7 +15,6 @@ import javax.validation.constraints.NotNull; @ApiModel(value = "重新抢单参数", description = "设置订单重新抢单的请求参数") public class PlayOrderEditRandomSingleVo { - /** * uuid */ @@ -24,7 +22,6 @@ public class PlayOrderEditRandomSingleVo { @ApiModelProperty(value = "订单ID", required = true, example = "1", notes = "需要重新抢单的订单ID") private String orderId; - /** * 陪聊性别（0:未知;1:男;2:女） * @@ -49,7 +46,6 @@ public class PlayOrderEditRandomSingleVo { @ApiModelProperty(value = "是否排除历史", required = true, example = "1", notes = "是否排除下单过的成员，0:不排除;1:排除") private String excludeHistory; - /** * 订单备注 * @@ -58,5 +54,4 @@ public class PlayOrderEditRandomSingleVo { @ApiModelProperty(value = "订单备注", example = "需要擅长聊天的店员", notes = "订单的备注信息") private String remark; - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateEditStateVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateEditStateVo.java index 423cc18..d209960 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateEditStateVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateEditStateVo.java @@ -1,12 +1,10 @@ package com.starry.admin.modules.order.module.vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; +import lombok.Data; /** * 订单评价状态修改对象 diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateQueryVo.java index 0f347fe..8324450 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateQueryVo.java @@ -1,14 +1,12 @@ package com.starry.admin.modules.order.module.vo; - import com.starry.common.domain.BasePageEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** * 订单评价查询对象 * diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateReturnVo.java index 38f3257..987365a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateReturnVo.java @@ -1,13 +1,11 @@ package com.starry.admin.modules.order.module.vo; - import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.math.BigDecimal; import java.util.Date; +import lombok.Data; /** * 订单评价查询返回对象 @@ -108,7 +106,6 @@ public class PlayOrderEvaluateReturnVo { @ApiModelProperty(value = "点赞数", example = "10") private int likeCount = 10; - /** * 订单号 */ @@ -121,14 +118,12 @@ public class PlayOrderEvaluateReturnVo { @ApiModelProperty(value = "下单类型", example = "0", notes = "0：指定单，1：随机单，2：打赏单") private String placeType; - /** * 订单最终金额（支付金额） */ @ApiModelProperty(value = "支付金额", example = "100.00") private BigDecimal finalAmount; - /** * 服务项目ID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoQueryVo.java index ba704d3..2df3e80 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoQueryVo.java @@ -3,11 +3,10 @@ package com.starry.admin.modules.order.module.vo; import com.starry.common.domain.BasePageEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** * 订单查询对象 * @@ -32,12 +31,7 @@ public class PlayOrderInfoQueryVo extends BasePageEntity { private String orderNo; /** - * 订单状态【0:1:2:3:4】 - * 0：已下单（待接单） - * 1：已接单（待开始） - * 2：已开始（服务中） - * 3：已完成 - * 4：已取消 + * 订单状态【0:1:2:3:4】 0：已下单（待接单） 1：已接单（待开始） 2：已开始（服务中） 3：已完成 4：已取消 */ @ApiModelProperty(value = "订单状态", example = "0", notes = "0：已下单（待接单）;1：已接单（待开始）;2：已开始（服务中）;3：已完成;4：已取消") private String orderStatus; @@ -72,21 +66,18 @@ public class PlayOrderInfoQueryVo extends BasePageEntity { @ApiModelProperty(value = "是否客服录入", example = "0", notes = "0:不是,1:是") private String backendEntry; - /** * 支付方式，0：余额支付,1:微信支付,2:支付宝支付 */ @ApiModelProperty(value = "支付方式", example = "0", notes = "0：余额支付,1:微信支付,2:支付宝支付") private String payMethod; - /** * 微信号码 */ @ApiModelProperty(value = "微信号码", example = "wx123456", notes = "顾客的微信号码") private String weiChatCode; - /** * 下单人 */ @@ -111,7 +102,6 @@ public class PlayOrderInfoQueryVo extends BasePageEntity { @ApiModelProperty(value = "接单时间范围", example = "['2024-01-01 00:00:00','2024-12-31 23:59:59']", notes = "接单时间范围，包含开始和结束时间") private List acceptTime; - /** * 开始订单时间（开始服务时间） */ @@ -133,5 +123,4 @@ public class PlayOrderInfoQueryVo extends BasePageEntity { @ApiModelProperty(value = "店员昵称", example = "小明", notes = "接单店员的昵称，支持模糊查询") private String clerkNickName; - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoReturnVo.java index 5c382cb..ce163b3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoReturnVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.order.module.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - import java.math.BigDecimal; import java.util.Date; import java.util.List; +import lombok.Data; /** * 订单查询返回对象 @@ -16,7 +15,6 @@ import java.util.List; @Data public class PlayOrderInfoReturnVo { - private String id; /** @@ -34,7 +32,6 @@ public class PlayOrderInfoReturnVo { */ private String customAvatar; - private String orderNo; /** @@ -52,7 +49,6 @@ public class PlayOrderInfoReturnVo { */ private String clerkAvatar; - /** * 下单时间 */ @@ -93,7 +89,6 @@ public class PlayOrderInfoReturnVo { */ private String refundType; - /** * 商品ID */ @@ -126,12 +121,7 @@ public class PlayOrderInfoReturnVo { private int commodityNumber; /** - * 订单状态【0:1:2:3:4】 - * 0：已下单（待接单） - * 1：已接单（待开始） - * 2：已开始（服务中） - * 3：已完成 - * 4：已取消 + * 订单状态【0:1:2:3:4】 0：已下单（待接单） 1：已接单（待开始） 2：已开始（服务中） 3：已完成 4：已取消 */ private String orderStatus; @@ -165,13 +155,11 @@ public class PlayOrderInfoReturnVo { */ private Integer estimatedRevenueRatio; - /** * 微信号码 */ private String weiChatCode; - /** * 订单备注 */ @@ -184,6 +172,4 @@ public class PlayOrderInfoReturnVo { private List labels; - - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundAddVo.java index 0059edb..9cfdad5 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundAddVo.java @@ -3,13 +3,12 @@ package com.starry.admin.modules.order.module.vo; import com.starry.common.domain.BasePageEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import javax.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotNull; -import java.math.BigDecimal; - /** * 订单查询对象 * @@ -21,7 +20,6 @@ import java.math.BigDecimal; @ApiModel(value = "订单退款参数", description = "订单退款操作的请求参数") public class PlayOrderRefundAddVo extends BasePageEntity { - /** * uuid */ @@ -29,7 +27,6 @@ public class PlayOrderRefundAddVo extends BasePageEntity { @ApiModelProperty(value = "订单ID", required = true, example = "1", notes = "需要退款的订单ID") private String orderId; - /** * 退款金额 */ @@ -45,5 +42,4 @@ public class PlayOrderRefundAddVo extends BasePageEntity { @ApiModelProperty(value = "退款原因", required = true, example = "顾客要求退款", notes = "退款的原因说明，1-100字符") private String refundReason; - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundQueryVo.java index a3714dc..a0565b8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundQueryVo.java @@ -14,13 +14,13 @@ import lombok.EqualsAndHashCode; @Data @ApiModel(value = "订单退款查询参数", description = "查询订单退款信息的条件参数") public class PlayOrderRefundQueryVo extends BasePageEntity { - + @ApiModelProperty(value = "订单ID", example = "1", notes = "特定订单的ID") private String orderId; - + @ApiModelProperty(value = "退款类型", example = "0", notes = "0:全额退款,1:部分退款") private String refundType; - + @ApiModelProperty(value = "退款状态", example = "1", notes = "退款处理状态") private String refundStatus; } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundReturnVo.java index 429a89a..89e4ebe 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundReturnVo.java @@ -2,10 +2,9 @@ package com.starry.admin.modules.order.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.math.BigDecimal; import java.util.Date; +import lombok.Data; /** * @author admin @@ -14,37 +13,37 @@ import java.util.Date; @Data @ApiModel(value = "订单退款返回数据", description = "订单退款信息的返回数据") public class PlayOrderRefundReturnVo { - + @ApiModelProperty(value = "退款ID", example = "1") private String id; - + @ApiModelProperty(value = "订单ID", example = "1") private String orderId; - + @ApiModelProperty(value = "订单编号", example = "ORDER20240320001") private String orderNo; - + @ApiModelProperty(value = "退款金额", example = "100.00") private BigDecimal refundAmount; - + @ApiModelProperty(value = "退款原因", example = "顾客要求退款") private String refundReason; - + @ApiModelProperty(value = "退款类型", example = "0", notes = "0:全额退款,1:部分退款") private String refundType; - + @ApiModelProperty(value = "退款状态", example = "1", notes = "退款处理状态") private String refundStatus; - + @ApiModelProperty(value = "退款时间", example = "2024-01-01 12:00:00") private Date refundTime; - + @ApiModelProperty(value = "支付方式", example = "0", notes = "0：余额支付,1:微信支付,2:支付宝支付") private String payMethod; - + @ApiModelProperty(value = "操作人ID", example = "1") private String operatorId; - + @ApiModelProperty(value = "操作人名称", example = "管理员") private String operatorName; } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderReviewStateEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderReviewStateEditVo.java index e8bbb14..d7ed1eb 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderReviewStateEditVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderReviewStateEditVo.java @@ -2,10 +2,9 @@ package com.starry.admin.modules.order.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; +import lombok.Data; /** * 续单申请审批状态修改对象 @@ -17,7 +16,6 @@ import javax.validation.constraints.Pattern; @ApiModel(value = "审批状态修改参数", description = "续单申请审批状态修改的请求参数") public class PlayOrderReviewStateEditVo { - @NotBlank(message = "ID不能为空") @ApiModelProperty(value = "续单ID", required = true, example = "1", notes = "需要审批的续单ID") private String id; @@ -30,7 +28,6 @@ public class PlayOrderReviewStateEditVo { @ApiModelProperty(value = "审核状态", required = true, example = "1", notes = "1:已通过，2:不通过") private String reviewState; - @ApiModelProperty(value = "审核备注", example = "审核通过，可以继续服务", notes = "审核意见或备注信息") private String remark; } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRewardQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRewardQueryVo.java index 4581085..d7c60c5 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRewardQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRewardQueryVo.java @@ -1,16 +1,15 @@ package com.starry.admin.modules.order.module.vo; - import com.starry.common.domain.BasePageEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** * 打赏订单查询对象 + * * @author admin */ @EqualsAndHashCode(callSuper = true) @@ -65,5 +64,4 @@ public class PlayOrderRewardQueryVo extends BasePageEntity { @ApiModelProperty(value = "是否隐藏", example = "0", notes = "数据是否隐藏，0:显示，1:隐藏") private String hidden; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRewardReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRewardReturnVo.java index a3d82f3..fb077ea 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRewardReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRewardReturnVo.java @@ -1,17 +1,16 @@ package com.starry.admin.modules.order.module.vo; - import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import java.time.LocalDateTime; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import java.math.BigDecimal; -import java.time.LocalDateTime; - /** * 打赏订单查询返回信息 + * * @author admin */ @Data @@ -36,14 +35,12 @@ public class PlayOrderRewardReturnVo { @ApiModelProperty(value = "顾客昵称", example = "张三") private String customNickname; - /** * 用户头像 */ @ApiModelProperty(value = "顾客头像", example = "https://example.com/avatar.jpg") private String customAvatar; - /** * 店员ID */ @@ -62,21 +59,18 @@ public class PlayOrderRewardReturnVo { @ApiModelProperty(value = "店员头像", example = "https://example.com/clerk_avatar.jpg") private String clerkAvatar; - /** * 打赏类型 */ @ApiModelProperty(value = "打赏类型", example = "0", notes = "0:打赏礼物,1:自定义金额") private String rewardType; - /** * 订单金额 */ @ApiModelProperty(value = "订单金额", example = "100.00") private String orderMoney; - /** * 支付金额 */ @@ -114,8 +108,6 @@ public class PlayOrderRewardReturnVo { @ApiModelProperty(value = "服务时长", example = "30", notes = "服务的时长，单位分钟") private String serviceDuration; - - /** * 打赏留言 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderStateEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderStateEditVo.java index c14aa7f..4bd91a0 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderStateEditVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderStateEditVo.java @@ -1,10 +1,9 @@ package com.starry.admin.modules.order.module.vo; -import lombok.Data; - -import javax.validation.constraints.NotBlank; import java.util.ArrayList; import java.util.List; +import javax.validation.constraints.NotBlank; +import lombok.Data; /** * 订单状态修改对象 @@ -15,7 +14,6 @@ import java.util.List; @Data public class PlayOrderStateEditVo { - /** * 订单ID */ @@ -30,5 +28,4 @@ public class PlayOrderStateEditVo { private List images = new ArrayList<>(); - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderComplaintInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderComplaintInfoService.java index 3a46738..4f0e3d6 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderComplaintInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderComplaintInfoService.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.order.module.entity.PlayOrderComplaintInfoEntity; import com.starry.admin.modules.order.module.vo.PlayOrderComplaintQueryVo; import com.starry.admin.modules.order.module.vo.PlayOrderComplaintReturnVo; - import java.util.List; /** @@ -18,55 +17,57 @@ public interface IPlayOrderComplaintInfoService extends IService selectByList(PlayOrderComplaintInfoEntity entity); - /** * 分页查询订单投诉列表 * - * @param vo 订单投诉查询对象 + * @param vo + * 订单投诉查询对象 * @return 订单投诉列表 */ IPage selectByPage(PlayOrderComplaintQueryVo vo); - /** * 查询订单投诉信息列表 * - * @param playOrderComplaintInfo 订单投诉信息 + * @param playOrderComplaintInfo + * 订单投诉信息 * @return 订单投诉信息集合 */ - IPage selectPlayOrderComplaintInfoByPage(PlayOrderComplaintInfoEntity playOrderComplaintInfo); + IPage selectPlayOrderComplaintInfoByPage( + PlayOrderComplaintInfoEntity playOrderComplaintInfo); /** * 新增订单投诉信息 * - * @param playOrderComplaintInfo 订单投诉信息 + * @param playOrderComplaintInfo + * 订单投诉信息 * @return 结果 */ boolean create(PlayOrderComplaintInfoEntity playOrderComplaintInfo); @@ -74,7 +75,8 @@ public interface IPlayOrderComplaintInfoService extends IService { - /** * 根据订单ID查询订单续单信息 * - * @param orderId 订单ID + * @param orderId + * 订单ID * @return 订单续单信息 */ PlayOrderContinueInfoEntity selectPlayOrderId(String orderId); @@ -27,7 +27,8 @@ public interface IPlayOrderContinueInfoService extends IService selectPlayByPage(PlayOrderContinueQueryVo vo); - /** * 修改续单审核状态 - * @param vo 续单审核申请对象 + * + * @param vo + * 续单审核申请对象 */ void updateReviewState(PlayOrderReviewStateEditVo vo); - /** * 查询订单续单信息列表 * - * @param playOrderContinueInfo 订单续单信息 + * @param playOrderContinueInfo + * 订单续单信息 * @return 订单续单信息集合 */ - IPage selectPlayOrderContinueInfoByPage(PlayOrderContinueInfoEntity playOrderContinueInfo); + IPage selectPlayOrderContinueInfoByPage( + PlayOrderContinueInfoEntity playOrderContinueInfo); /** * 新增订单续单信息 * - * @param playOrderContinueInfo 订单续单信息 + * @param playOrderContinueInfo + * 订单续单信息 * @return 结果 */ boolean create(PlayOrderContinueInfoEntity playOrderContinueInfo); @@ -67,7 +72,8 @@ public interface IPlayOrderContinueInfoService extends IService { - /** * 查询订单评价信息 * - * @param id 订单评价信息主键 + * @param id + * 订单评价信息主键 * @return 订单评价信息 */ PlayOrderEvaluateInfoEntity selectPlayOrderEvaluateInfoById(String id); - /** * 查询顾客对订单的评价内容 * - * @param customId 顾客ID - * @param orderId 订单ID + * @param customId + * 顾客ID + * @param orderId + * 订单ID * @return boolean true:已评价，false:未评价 **/ PlayOrderEvaluateInfoEntity queryCustomToOrderEvaluateInfo(String customId, String orderId); - - /** * 查询订单评价列表 * - * @param entity 订单评价对象 + * @param entity + * 订单评价对象 * @return 订单评价列表 */ List selectByList(PlayOrderEvaluateInfoEntity entity); - /** * 分页查询订单评价列表 * - * @param vo 订单评价查询对象 + * @param vo + * 订单评价查询对象 * @return 订单评价列表 */ IPage selectByPage(PlayOrderEvaluateQueryVo vo); - /** * 查询订单评价信息列表 * - * @param playOrderEvaluateInfo 订单评价信息 + * @param playOrderEvaluateInfo + * 订单评价信息 * @return 订单评价信息集合 */ - IPage selectPlayOrderEvaluateInfoByPage(PlayOrderEvaluateInfoEntity playOrderEvaluateInfo); + IPage selectPlayOrderEvaluateInfoByPage( + PlayOrderEvaluateInfoEntity playOrderEvaluateInfo); /** * 新增订单评价信息 * - * @param playOrderEvaluateInfo 订单评价信息 + * @param playOrderEvaluateInfo + * 订单评价信息 * @return 结果 */ boolean create(PlayOrderEvaluateInfoEntity playOrderEvaluateInfo); @@ -74,7 +75,8 @@ public interface IPlayOrderEvaluateInfoService extends IService { - /** * 查询当前租户店员总数 * - * @param tenantId 租户ID + * @param tenantId + * 租户ID * @return 店员总数 */ List getTotalOrderInfo(String tenantId); @@ -32,81 +31,123 @@ public interface IPlayOrderInfoService extends IService { /** * 新增充值单 * - * @param orderNo 订单编号 - * @param orderMoney 订单金额 - * @param finalAmount 订单最终金额（支付金额） - * @param purchaserBy 下单人ID + * @param orderNo + * 订单编号 + * @param orderMoney + * 订单金额 + * @param finalAmount + * 订单最终金额（支付金额） + * @param purchaserBy + * 下单人ID */ void createRechargeOrder(String orderNo, BigDecimal orderMoney, BigDecimal finalAmount, String purchaserBy); - /** * 新增订单信息 * - * @param orderId 订单ID - * @param orderNo 订单编号 - * @param orderState 订单状态【0:已下单（待接单）;1:已接单（待开始）;2:已开始（服务中）;3;已完成:4:已取消】 - * @param orderType 订单类型【-1:退款订单;0:充值订单；1:提现订单；2:普通订单】 - * @param placeType 下单类型（-1:其他类型;0:指定单;1:随机单;2:打赏单） - * @param rewardType （0:余额;1:礼物） - * @param firstOrder 是否是首单【0：不是，1：是】 - * @param commodityId 商品ID - * @param commodityType 商品类型[0:礼物，1：服务] - * @param commodityPrice 商品属性-商品单价 - * @param serviceDuration 商品属性-服务时长 - * @param commodityName 商品名称 - * @param commodityNumber 商品数量 - * @param orderMoney 订单金额 - * @param finalAmount 订单最终金额（支付金额） - * @param discountAmount 优惠金额 - * @param purchaserBy 下单人 - * @param acceptBy 接单人 - * @param weiChatCode 订单微信号码 - * @param couponIds 优惠券ID列表 - * @param remark 订单备注 - * @param clerkSex 随机单要求-店员性别（0:未知;1:男;2:女） - * @param clerkLevelId 随机单要求-店员等级ID - * @param excludeHistory 随机单要求-是否排除下单过的成员（0:不排除;1:排除） + * @param orderId + * 订单ID + * @param orderNo + * 订单编号 + * @param orderState + * 订单状态【0:已下单（待接单）;1:已接单（待开始）;2:已开始（服务中）;3;已完成:4:已取消】 + * @param orderType + * 订单类型【-1:退款订单;0:充值订单；1:提现订单；2:普通订单】 + * @param placeType + * 下单类型（-1:其他类型;0:指定单;1:随机单;2:打赏单） + * @param rewardType + * （0:余额;1:礼物） + * @param firstOrder + * 是否是首单【0：不是，1：是】 + * @param commodityId + * 商品ID + * @param commodityType + * 商品类型[0:礼物，1：服务] + * @param commodityPrice + * 商品属性-商品单价 + * @param serviceDuration + * 商品属性-服务时长 + * @param commodityName + * 商品名称 + * @param commodityNumber + * 商品数量 + * @param orderMoney + * 订单金额 + * @param finalAmount + * 订单最终金额（支付金额） + * @param discountAmount + * 优惠金额 + * @param purchaserBy + * 下单人 + * @param acceptBy + * 接单人 + * @param weiChatCode + * 订单微信号码 + * @param couponIds + * 优惠券ID列表 + * @param remark + * 订单备注 + * @param clerkSex + * 随机单要求-店员性别（0:未知;1:男;2:女） + * @param clerkLevelId + * 随机单要求-店员等级ID + * @param excludeHistory + * 随机单要求-是否排除下单过的成员（0:不排除;1:排除） * @author admin * @since 2024/6/3 10:53 **/ - void createOrderInfo(String orderId, String orderNo, String orderState, String orderType, String placeType, String rewardType, String firstOrder, String commodityId, String commodityType, BigDecimal commodityPrice, String serviceDuration, String commodityName, String commodityNumber, BigDecimal orderMoney, BigDecimal finalAmount, BigDecimal discountAmount, String purchaserBy, String acceptBy, String weiChatCode, List couponIds, String remark, String clerkSex, String clerkLevelId, String excludeHistory); - + void createOrderInfo(String orderId, String orderNo, String orderState, String orderType, String placeType, + String rewardType, String firstOrder, String commodityId, String commodityType, BigDecimal commodityPrice, + String serviceDuration, String commodityName, String commodityNumber, BigDecimal orderMoney, + BigDecimal finalAmount, BigDecimal discountAmount, String purchaserBy, String acceptBy, String weiChatCode, + List couponIds, String remark, String clerkSex, String clerkLevelId, String excludeHistory); /** * 据店员等级和订单金额，获取店员预计收入 * - * @param clerkId 店员ID - * @param croupIds 优惠券ID列表 - * @param placeType 下单类型（-1:其他类型;0:指定单;1:随机单;2:打赏单） - * @param firstOrder 是否是首单【0：不是，1：是】 - * @param finalAmount 订单支付金额 + * @param clerkId + * 店员ID + * @param croupIds + * 优惠券ID列表 + * @param placeType + * 下单类型（-1:其他类型;0:指定单;1:随机单;2:打赏单） + * @param firstOrder + * 是否是首单【0：不是，1：是】 + * @param finalAmount + * 订单支付金额 * @return com.starry.admin.modules.order.module.vo.ClerkEstimatedRevenueVo * @author admin * @since 2024/7/18 16:39 **/ - ClerkEstimatedRevenueVo getClerkEstimatedRevenue(String clerkId, List croupIds, String placeType, String firstOrder, BigDecimal finalAmount); + ClerkEstimatedRevenueVo getClerkEstimatedRevenue(String clerkId, List croupIds, String placeType, + String firstOrder, BigDecimal finalAmount); /** * 根据店员等级和订单金额，获取店员预计收入 * - * @param clerkId 店员ID - * @param placeType 下单类型（-1:其他类型;0:指定单;1:随机单;2:打赏单） - * @param firstOrder 是否是首单【0：不是，1：是】 - * @param finalAmount 订单支付金额 + * @param clerkId + * 店员ID + * @param placeType + * 下单类型（-1:其他类型;0:指定单;1:随机单;2:打赏单） + * @param firstOrder + * 是否是首单【0：不是，1：是】 + * @param finalAmount + * 订单支付金额 * @return math.BigDecimal 店员预计收入 * @author admin * @since 2024/6/3 11:12 **/ BigDecimal getEstimatedRevenue(String clerkId, String placeType, String firstOrder, BigDecimal finalAmount); - /** * 根据店员等级，获取店员提成比例 * - * @param clerkId 店员ID - * @param placeType 下单类型（-1:其他类型;0:指定单;1:随机单;2:打赏单） - * @param firstOrder 是否是首单【0：不是，1：是】 + * @param clerkId + * 店员ID + * @param placeType + * 下单类型（-1:其他类型;0:指定单;1:随机单;2:打赏单） + * @param firstOrder + * 是否是首单【0：不是，1：是】 * @return math.BigDecimal 店员预计收入 * @author admin * @since 2024/6/3 11:12 @@ -116,18 +157,21 @@ public interface IPlayOrderInfoService extends IService { /** * 根据订单结算状态查询订单 * - * @param clerkId 店员ID - * @param orderSettlementState 订单结算状态(0:未结算;1:已结算) + * @param clerkId + * 店员ID + * @param orderSettlementState + * 订单结算状态(0:未结算;1:已结算) * @return List */ List queryBySettlementOrder(String clerkId, String orderSettlementState); - /** * 查询指定店员在指定时间前完成，并且未结算工资的订单 * - * @param clerkId 店员ID - * @param endTime 结束时间 + * @param clerkId + * 店员ID + * @param endTime + * 结束时间 * @return List */ List listByEndTime(String clerkId, LocalDateTime endTime); @@ -135,10 +179,14 @@ public interface IPlayOrderInfoService extends IService { /** * 查询指定店员在一定时间内的订单 * - * @param clerkId 店员ID - * @param startTime 开始时间 - * @param endTime 结束时间 - * @param orderStatus 店员状态列表 + * @param clerkId + * 店员ID + * @param startTime + * 开始时间 + * @param endTime + * 结束时间 + * @param orderStatus + * 店员状态列表 * @return List */ List listByTime(String clerkId, String startTime, String endTime, List orderStatus); @@ -146,16 +194,17 @@ public interface IPlayOrderInfoService extends IService { /** * 分页查询打赏订单 * - * @param vo 打赏订单查询对象 + * @param vo + * 打赏订单查询对象 * @return 打赏订单 */ IPage selectRewardOrderInfoByPage(PlayOrderRewardQueryVo vo); - /** * 根据订单ID查询订单信息 * - * @param orderId 订单ID + * @param orderId + * 订单ID * @return 订单信息 */ PlayOrderDetailsReturnVo selectById(String orderId); @@ -163,26 +212,28 @@ public interface IPlayOrderInfoService extends IService { /** * 查询订单 * - * @param id 订单主键 + * @param id + * 订单主键 * @return 订单 */ PlayOrderInfoEntity selectOrderInfoById(String id); - /** * 查询订单列表 * - * @param orderInfoEntity 订单 + * @param orderInfoEntity + * 订单 * @return 订单集合 */ IPage selectOrderInfoPage(PlayOrderInfoQueryVo orderInfoEntity); - /** * 店员查询本人订单详情 * - * @param clerkId 店员ID - * @param id 订单ID + * @param clerkId + * 店员ID + * @param id + * 订单ID * @return 订单详情 */ @@ -191,7 +242,8 @@ public interface IPlayOrderInfoService extends IService { /** * 店员分页查询订单本人列表 * - * @param vo 订单列表查询对象 + * @param vo + * 订单列表查询对象 * @return 订单集合 */ IPage clerkSelectOrderInfoByPage(PlayClerkOrderInfoQueryVo vo); @@ -199,9 +251,12 @@ public interface IPlayOrderInfoService extends IService { /** * 店员查询自己一段时间内的订单 * - * @param clerkId 店员ID - * @param startTime 开始时间 - * @param endTime 结束时间 + * @param clerkId + * 店员ID + * @param startTime + * 开始时间 + * @param endTime + * 结束时间 * @return 订单列表 */ List clerkSelectOrderInfoList(String clerkId, String startTime, String endTime); @@ -209,8 +264,10 @@ public interface IPlayOrderInfoService extends IService { /** * 顾客查询订单详情 * - * @param customId 顾客ID - * @param orderId 订单ID + * @param customId + * 顾客ID + * @param orderId + * 订单ID * @return 订单详情 */ PlayCustomOrderDetailsReturnVo customSelectOrderDetails(String customId, String orderId); @@ -218,7 +275,8 @@ public interface IPlayOrderInfoService extends IService { /** * 顾客分页查询订单列表 * - * @param vo 订单列表查询对象 + * @param vo + * 订单列表查询对象 * @return 订单集合 */ IPage customSelectOrderInfoByPage(PlayCustomOrderInfoQueryVo vo); @@ -226,50 +284,62 @@ public interface IPlayOrderInfoService extends IService { /** * 顾客查询本人订单列表 * - * @param customId 顾客ID + * @param customId + * 顾客ID * @return 订单集合 */ List customSelectOrderInfoByList(String customId); - /** - * 修改订单状态为接单 - * 只有管理员或者店员本人才能操作 + * 修改订单状态为接单 只有管理员或者店员本人才能操作 * - * @param operatorByType 操作人类型（0:顾客;1:店员;2:管理员） - * @param operatorBy 操作人ID - * @param acceptBy 接单人ID - * @param orderId 订单Id + * @param operatorByType + * 操作人类型（0:顾客;1:店员;2:管理员） + * @param operatorBy + * 操作人ID + * @param acceptBy + * 接单人ID + * @param orderId + * 订单Id **/ void updateStateTo1(String operatorByType, String operatorBy, String acceptBy, String orderId); /** - * 修改订单状态为开始订单或者完成订单 - * 只有管理员或者店员本人才能操作 + * 修改订单状态为开始订单或者完成订单 只有管理员或者店员本人才能操作 * - * @param operatorByType 操作人类型（0:顾客;1:店员;2:管理员） - * @param operatorBy 操作人ID - * @param orderState 订单状态 - * @param orderId 订单Id + * @param operatorByType + * 操作人类型（0:顾客;1:店员;2:管理员） + * @param operatorBy + * 操作人ID + * @param orderState + * 订单状态 + * @param orderId + * 订单Id **/ void updateStateTo23(String operatorByType, String operatorBy, String orderState, String orderId); /** - * 修改订单状态为取消订单 - * 管理员、店员、顾客均可操作 + * 修改订单状态为取消订单 管理员、店员、顾客均可操作 * - * @param operatorByType 操作人类型（0:顾客;1:店员;2:管理员） - * @param operatorBy 操作人ID - * @param orderId 订单Id - * @param refundReason 订单取消原因 - * @param images 证据图片列表 + * @param operatorByType + * 操作人类型（0:顾客;1:店员;2:管理员） + * @param operatorBy + * 操作人ID + * @param orderId + * 订单Id + * @param refundReason + * 订单取消原因 + * @param images + * 证据图片列表 **/ - void updateStateTo4(String operatorByType, String operatorBy, String orderId, String refundReason, List images); + void updateStateTo4(String operatorByType, String operatorBy, String orderId, String refundReason, + List images); /** * 修改订单 * - * @param orderInfoEntity 订单 + * @param orderInfoEntity + * 订单 * @return 结果 */ boolean update(PlayOrderInfoEntity orderInfoEntity); @@ -277,7 +347,8 @@ public interface IPlayOrderInfoService extends IService { /** * 批量删除订单 * - * @param ids 需要删除的订单主键集合 + * @param ids + * 需要删除的订单主键集合 * @return 结果 */ int deleteOrderInfoByIds(String[] ids); @@ -285,7 +356,8 @@ public interface IPlayOrderInfoService extends IService { /** * 根据订单编号查询订单信息 * - * @param orderNo 订单编号 + * @param orderNo + * 订单编号 * @return 订单信息 */ PlayOrderInfoEntity queryByOrderNo(String orderNo); @@ -293,26 +365,26 @@ public interface IPlayOrderInfoService extends IService { /** * 删除订单信息 * - * @param id 订单主键 + * @param id + * 订单主键 * @return 结果 */ int deleteOrderInfoById(String id); - /** - * 获得订单编号 - * 订单编号组成规则为 YYYYMMHH+4位随机数字+当日的订单顺序 + * 获得订单编号 订单编号组成规则为 YYYYMMHH+4位随机数字+当日的订单顺序 * * @return 订单编号 */ String getOrderNo(); - /** * 查询未接单的订单 * - * @param vo 查询对象 - * @param clerkId 店员ID + * @param vo + * 查询对象 + * @param clerkId + * 店员ID * @return 订单列表 */ IPage selectRandomOrderByPage(PlayOrderInfoRandomQueryVo vo, String clerkId); @@ -320,10 +392,10 @@ public interface IPlayOrderInfoService extends IService { /** * 分页获取打赏动态 * - * @param vo 查询对象 + * @param vo + * 查询对象 * @return 打赏动态列表 */ IPage selectRewardByPage(PlayRewardOrderQueryVo vo); - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderRefundInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderRefundInfoService.java index 70ab689..28a6698 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderRefundInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderRefundInfoService.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.order.module.entity.PlayOrderRefundInfoEntity; import com.starry.admin.modules.order.module.vo.PlayOrderRefundQueryVo; import com.starry.admin.modules.order.module.vo.PlayOrderRefundReturnVo; - import java.math.BigDecimal; /** @@ -18,7 +17,8 @@ public interface IPlayOrderRefundInfoService extends IService selectByPage(PlayOrderRefundQueryVo vo); @@ -43,35 +44,49 @@ public interface IPlayOrderRefundInfoService extends IService selectPlayOrderRefundInfoByPage(PlayOrderRefundInfoEntity playOrderRefundInfo); - /** * 新增退款信息 * - * @param orderId 订单ID - * @param customId 顾客ID - * @param clerkId 店员ID - * @param payMethod 支付方式，[0:余额支付;1:微信支付,2:支付宝支付] - * @param refundType 退款类型【0:部分退款;1:全部退款】 - * @param refundAmount 退款金额 - * @param refundReason 退款原因 - * @param refundByType 退款人类型[0:顾客;1:店员;2:管理员] - * @param refundById 退款人ID - * @param refundState 退款状态[-1:异常;0:处理中;1:成功;2:关闭] - * @param reviewedRequired 是否需要审核，0:不需要，1:需要 + * @param orderId + * 订单ID + * @param customId + * 顾客ID + * @param clerkId + * 店员ID + * @param payMethod + * 支付方式，[0:余额支付;1:微信支付,2:支付宝支付] + * @param refundType + * 退款类型【0:部分退款;1:全部退款】 + * @param refundAmount + * 退款金额 + * @param refundReason + * 退款原因 + * @param refundByType + * 退款人类型[0:顾客;1:店员;2:管理员] + * @param refundById + * 退款人ID + * @param refundState + * 退款状态[-1:异常;0:处理中;1:成功;2:关闭] + * @param reviewedRequired + * 是否需要审核，0:不需要，1:需要 * @author xuhq * @since 2024/8/23 17:10 **/ - void add(String orderId, String customId, String clerkId, String payMethod, String refundType, BigDecimal refundAmount, String refundReason, String refundByType, String refundById, String refundState, String reviewedRequired); + void add(String orderId, String customId, String clerkId, String payMethod, String refundType, + BigDecimal refundAmount, String refundReason, String refundByType, String refundById, String refundState, + String reviewedRequired); /** * 新增订单退款信息 * - * @param playOrderRefundInfo 订单退款信息 + * @param playOrderRefundInfo + * 订单退款信息 * @return 结果 */ boolean create(PlayOrderRefundInfoEntity playOrderRefundInfo); @@ -79,7 +94,8 @@ public interface IPlayOrderRefundInfoService extends IService implements IPlayOrderComplaintInfoService { +public class PlayOrderComplaintInfoServiceImpl + extends + ServiceImpl + implements + IPlayOrderComplaintInfoService { @Resource private PlayOrderComplaintInfoMapper playOrderComplaintInfoMapper; @@ -45,11 +48,11 @@ public class PlayOrderComplaintInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -86,15 +88,30 @@ public class PlayOrderComplaintInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new MPJLambdaWrapper(); // 查询主表全部字段 lambdaQueryWrapper.selectAll(PlayOrderComplaintInfoEntity.class); - //查询订单表 - lambdaQueryWrapper.selectAs(PlayOrderInfoEntity::getOrderNo, "orderNo").selectAs(PlayOrderInfoEntity::getPlaceType, "placeType").selectAs(PlayOrderInfoEntity::getFinalAmount, "finalAmount").selectAs(PlayOrderInfoEntity::getCommodityPrice, "commodityPrice").selectAs(PlayOrderInfoEntity::getServiceDuration, "serviceDuration").selectAs(PlayOrderInfoEntity::getCommodityName, "commodityName").selectAs(PlayOrderInfoEntity::getCommodityType, "commodityType").selectAs(PlayOrderInfoEntity::getCommodityId, "commodityId").selectAs(PlayOrderInfoEntity::getCommodityNumber, "commodityNumber"); - lambdaQueryWrapper.leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getId, PlayOrderEvaluateInfoEntity::getOrderId); + // 查询订单表 + lambdaQueryWrapper.selectAs(PlayOrderInfoEntity::getOrderNo, "orderNo") + .selectAs(PlayOrderInfoEntity::getPlaceType, "placeType") + .selectAs(PlayOrderInfoEntity::getFinalAmount, "finalAmount") + .selectAs(PlayOrderInfoEntity::getCommodityPrice, "commodityPrice") + .selectAs(PlayOrderInfoEntity::getServiceDuration, "serviceDuration") + .selectAs(PlayOrderInfoEntity::getCommodityName, "commodityName") + .selectAs(PlayOrderInfoEntity::getCommodityType, "commodityType") + .selectAs(PlayOrderInfoEntity::getCommodityId, "commodityId") + .selectAs(PlayOrderInfoEntity::getCommodityNumber, "commodityNumber"); + lambdaQueryWrapper.leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getId, + PlayOrderEvaluateInfoEntity::getOrderId); // 查询顾客表字段 - lambdaQueryWrapper.selectAs(PlayCustomUserInfoEntity::getId, "customId").selectAs(PlayCustomUserInfoEntity::getAvatar, "customAvatar").selectAs(PlayCustomUserInfoEntity::getNickname, "customNickname"); - lambdaQueryWrapper.leftJoin(PlayCustomUserInfoEntity.class, PlayCustomUserInfoEntity::getId, PlayOrderComplaintInfoEntity::getCustomId); + lambdaQueryWrapper.selectAs(PlayCustomUserInfoEntity::getId, "customId") + .selectAs(PlayCustomUserInfoEntity::getAvatar, "customAvatar") + .selectAs(PlayCustomUserInfoEntity::getNickname, "customNickname"); + lambdaQueryWrapper.leftJoin(PlayCustomUserInfoEntity.class, PlayCustomUserInfoEntity::getId, + PlayOrderComplaintInfoEntity::getCustomId); // 查询陪聊表 - lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname"); - lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayOrderComplaintInfoEntity::getClerkId); + lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId") + .selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar") + .selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname"); + lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, + PlayOrderComplaintInfoEntity::getClerkId); if (StrUtil.isNotBlank(vo.getClerkId())) { lambdaQueryWrapper.eq(PlayOrderComplaintInfoEntity::getClerkId, vo.getClerkId()); } @@ -108,23 +125,27 @@ public class PlayOrderComplaintInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), null); lambdaQueryWrapper.in(PlayOrderComplaintInfoEntity::getClerkId, clerkIdList); - return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderComplaintReturnVo.class, lambdaQueryWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayOrderComplaintReturnVo.class, lambdaQueryWrapper); } /** * 查询订单投诉信息列表 * - * @param playOrderComplaintInfo 订单投诉信息 + * @param playOrderComplaintInfo + * 订单投诉信息 * @return 订单投诉信息 */ @Override - public IPage selectPlayOrderComplaintInfoByPage(PlayOrderComplaintInfoEntity playOrderComplaintInfo) { + public IPage selectPlayOrderComplaintInfoByPage( + PlayOrderComplaintInfoEntity playOrderComplaintInfo) { Page page = new Page<>(1, 10); return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>()); } @@ -132,7 +153,8 @@ public class PlayOrderComplaintInfoServiceImpl extends ServiceImpl implements IPlayOrderContinueInfoService { +public class PlayOrderContinueInfoServiceImpl + extends + ServiceImpl + implements + IPlayOrderContinueInfoService { @Resource private PlayOrderContinueInfoMapper playOrderContinueInfoMapper; @Resource private IPlayPersonnelGroupInfoService playClerkGroupInfoService; - @Override public PlayOrderContinueInfoEntity selectPlayOrderId(String orderId) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); @@ -51,7 +53,8 @@ public class PlayOrderContinueInfoServiceImpl extends ServiceImpl selectPlayByPage(PlayOrderContinueQueryVo vo) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); - //主表 + // 主表 lambdaQueryWrapper.selectAll(PlayOrderContinueInfoEntity.class); - lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex"); - lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayOrderContinueInfoEntity::getClerkId); - lambdaQueryWrapper.leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getId, PlayOrderContinueInfoEntity::getOrderId); + lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId") + .selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar") + .selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname") + .selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex"); + lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, + PlayOrderContinueInfoEntity::getClerkId); + lambdaQueryWrapper.leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getId, + PlayOrderContinueInfoEntity::getOrderId); if (StrUtil.isNotBlank(vo.getCustomId())) { lambdaQueryWrapper.like(PlayOrderContinueInfoEntity::getCustomId, vo.getCustomId()); } @@ -99,26 +106,31 @@ public class PlayOrderContinueInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), null); lambdaQueryWrapper.in(PlayOrderContinueInfoEntity::getClerkId, clerkIdList); - return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderContinueReturnVo.class, lambdaQueryWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayOrderContinueReturnVo.class, lambdaQueryWrapper); } /** * 查询订单续单信息列表 * - * @param playOrderContinueInfo 订单续单信息 + * @param playOrderContinueInfo + * 订单续单信息 * @return 订单续单信息 */ @Override - public IPage selectPlayOrderContinueInfoByPage(PlayOrderContinueInfoEntity playOrderContinueInfo) { + public IPage selectPlayOrderContinueInfoByPage( + PlayOrderContinueInfoEntity playOrderContinueInfo) { Page page = new Page<>(1, 10); return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>()); } @@ -126,7 +138,8 @@ public class PlayOrderContinueInfoServiceImpl extends ServiceImpl implements IPlayOrderEvaluateInfoService { +public class PlayOrderEvaluateInfoServiceImpl + extends + ServiceImpl + implements + IPlayOrderEvaluateInfoService { @Resource private PlayOrderEvaluateInfoMapper playOrderEvaluateInfoMapper; @@ -42,7 +45,6 @@ public class PlayOrderEvaluateInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -54,7 +56,8 @@ public class PlayOrderEvaluateInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), null); + List clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), + null); lambdaQueryWrapper.in(PlayOrderEvaluateInfoEntity::getClerkId, clerkIdList); } - - return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderEvaluateReturnVo.class, lambdaQueryWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayOrderEvaluateReturnVo.class, lambdaQueryWrapper); } /** * 查询订单评价信息列表 * - * @param playOrderEvaluateInfo 订单评价信息 + * @param playOrderEvaluateInfo + * 订单评价信息 * @return 订单评价信息 */ @Override - public IPage selectPlayOrderEvaluateInfoByPage(PlayOrderEvaluateInfoEntity playOrderEvaluateInfo) { + public IPage selectPlayOrderEvaluateInfoByPage( + PlayOrderEvaluateInfoEntity playOrderEvaluateInfo) { Page page = new Page<>(1, 10); return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>()); } @@ -144,7 +165,8 @@ public class PlayOrderEvaluateInfoServiceImpl extends ServiceImpl implements IPlayOrderInfoService { +public class PlayOrderInfoServiceImpl extends ServiceImpl + implements + IPlayOrderInfoService { @Resource private PlayOrderInfoMapper orderInfoMapper; @Resource @@ -90,7 +91,6 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl getTotalOrderInfo(String tenantId) { MPJLambdaWrapper lambdaWrapper = new MPJLambdaWrapper<>(); @@ -99,7 +99,11 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl couponIds, String remark, String clerkSex, String clerkLevelId, String excludeHistory) { + public void createOrderInfo(String orderId, String orderNo, String orderState, String orderType, String placeType, + String rewardType, String firstOrder, String commodityId, String commodityType, BigDecimal commodityPrice, + String serviceDuration, String commodityName, String commodityNumber, BigDecimal orderMoney, + BigDecimal finalAmount, BigDecimal discountAmount, String purchaserBy, String acceptBy, String weiChatCode, + List couponIds, String remark, String clerkSex, String clerkLevelId, String excludeHistory) { PlayOrderInfoEntity entity = new PlayOrderInfoEntity(); entity.setId(orderId); entity.setOrderNo(orderNo); @@ -135,7 +139,8 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl croupIds, String placeType, String firstOrder, BigDecimal finalAmount) { + public ClerkEstimatedRevenueVo getClerkEstimatedRevenue(String clerkId, List croupIds, String placeType, + String firstOrder, BigDecimal finalAmount) { PlayClerkLevelInfoEntity entity = playClerkUserInfoService.queryLevelCommission(clerkId); ClerkEstimatedRevenueVo estimatedRevenueVo = new ClerkEstimatedRevenueVo(); switch (placeType) { - case "0": { + case "0" : { if ("1".equals(firstOrder)) { estimatedRevenueVo.setRevenueRatio(entity.getFirstRegularRatio()); - estimatedRevenueVo.setRevenueAmount(finalAmount.multiply(new BigDecimal(entity.getFirstRegularRatio()).divide(new BigDecimal(100), 4, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP)); + estimatedRevenueVo + .setRevenueAmount( + finalAmount + .multiply(new BigDecimal(entity.getFirstRegularRatio()) + .divide(new BigDecimal(100), 4, RoundingMode.HALF_UP)) + .setScale(2, RoundingMode.HALF_UP)); } else { estimatedRevenueVo.setRevenueRatio(entity.getNotFirstRegularRatio()); - estimatedRevenueVo.setRevenueAmount(finalAmount.multiply(new BigDecimal(entity.getNotFirstRegularRatio()).divide(new BigDecimal(100), 4, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP)); + estimatedRevenueVo + .setRevenueAmount(finalAmount + .multiply(new BigDecimal(entity.getNotFirstRegularRatio()) + .divide(new BigDecimal(100), 4, RoundingMode.HALF_UP)) + .setScale(2, RoundingMode.HALF_UP)); } break; } - case "1": { + case "1" : { if ("1".equals(firstOrder)) { estimatedRevenueVo.setRevenueRatio(entity.getFirstRandomRadio()); - estimatedRevenueVo.setRevenueAmount(finalAmount.multiply(new BigDecimal(entity.getFirstRandomRadio()).divide(new BigDecimal(100), 4, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP)); + estimatedRevenueVo + .setRevenueAmount( + finalAmount + .multiply(new BigDecimal(entity.getFirstRandomRadio()) + .divide(new BigDecimal(100), 4, RoundingMode.HALF_UP)) + .setScale(2, RoundingMode.HALF_UP)); } else { estimatedRevenueVo.setRevenueRatio(entity.getNotFirstRandomRadio()); - estimatedRevenueVo.setRevenueAmount(finalAmount.multiply(new BigDecimal(entity.getNotFirstRandomRadio()).divide(new BigDecimal(100), 4, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP)); + estimatedRevenueVo + .setRevenueAmount(finalAmount + .multiply(new BigDecimal(entity.getNotFirstRandomRadio()) + .divide(new BigDecimal(100), 4, RoundingMode.HALF_UP)) + .setScale(2, RoundingMode.HALF_UP)); } break; } - case "2": { + case "2" : { if ("1".equals(firstOrder)) { estimatedRevenueVo.setRevenueRatio(entity.getFirstRewardRatio()); - estimatedRevenueVo.setRevenueAmount(finalAmount.multiply(new BigDecimal(entity.getFirstRewardRatio()).divide(new BigDecimal(100), 4, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP)); + estimatedRevenueVo + .setRevenueAmount( + finalAmount + .multiply(new BigDecimal(entity.getFirstRewardRatio()) + .divide(new BigDecimal(100), 4, RoundingMode.HALF_UP)) + .setScale(2, RoundingMode.HALF_UP)); } else { estimatedRevenueVo.setRevenueRatio(entity.getNotFirstRewardRatio()); - estimatedRevenueVo.setRevenueAmount(finalAmount.multiply(new BigDecimal(entity.getNotFirstRewardRatio()).divide(new BigDecimal(100), 4, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP)); + estimatedRevenueVo + .setRevenueAmount(finalAmount + .multiply(new BigDecimal(entity.getNotFirstRewardRatio()) + .divide(new BigDecimal(100), 4, RoundingMode.HALF_UP)) + .setScale(2, RoundingMode.HALF_UP)); } break; } - case "-1": { + case "-1" : { log.error("下单类型异常，placeType={}", placeType); estimatedRevenueVo.setRevenueAmount(finalAmount); estimatedRevenueVo.setRevenueRatio(100); break; } - default: { + default : { log.error("下单类型错误，placeType={}", placeType); estimatedRevenueVo.setRevenueAmount(finalAmount); estimatedRevenueVo.setRevenueRatio(100); @@ -213,7 +245,8 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl listByTime(String clerkId, String startTime, String endTime, List orderStatus) { + public List listByTime(String clerkId, String startTime, String endTime, + List orderStatus) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); if (StrUtil.isNotEmpty(clerkId)) { lambdaQueryWrapper.eq(PlayOrderInfoEntity::getAcceptBy, clerkId); @@ -373,17 +419,22 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl selectRewardOrderInfoByPage(PlayOrderRewardQueryVo vo) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); // 查询主表全部字段 lambdaQueryWrapper.selectAll(PlayOrderInfoEntity.class); // 查询顾客表 - lambdaQueryWrapper.selectAs(PlayCustomUserInfoEntity::getId, "customId").selectAs(PlayCustomUserInfoEntity::getAvatar, "customAvatar").selectAs(PlayCustomUserInfoEntity::getNickname, "customNickname"); - lambdaQueryWrapper.leftJoin(PlayCustomUserInfoEntity.class, PlayCustomUserInfoEntity::getId, PlayOrderInfoEntity::getPurchaserBy).leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayOrderInfoEntity::getAcceptBy); + lambdaQueryWrapper.selectAs(PlayCustomUserInfoEntity::getId, "customId") + .selectAs(PlayCustomUserInfoEntity::getAvatar, "customAvatar") + .selectAs(PlayCustomUserInfoEntity::getNickname, "customNickname"); + lambdaQueryWrapper.leftJoin(PlayCustomUserInfoEntity.class, PlayCustomUserInfoEntity::getId, + PlayOrderInfoEntity::getPurchaserBy).leftJoin(PlayClerkUserInfoEntity.class, + PlayClerkUserInfoEntity::getId, PlayOrderInfoEntity::getAcceptBy); // 查询陪聊表 - lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname"); + lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId") + .selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar") + .selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname"); lambdaQueryWrapper.eq(PlayOrderInfoEntity::getPlaceType, "2"); if (StrUtil.isNotBlank(vo.getRewardType())) { @@ -396,18 +447,19 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), null); lambdaQueryWrapper.in(PlayOrderInfoEntity::getAcceptBy, clerkIdList); - return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderRewardReturnVo.class, lambdaQueryWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayOrderRewardReturnVo.class, lambdaQueryWrapper); } - @Override public IPage selectRandomOrderByPage(PlayOrderInfoRandomQueryVo vo, String clerkId) { PlayClerkUserInfoEntity entity = playClerkUserInfoService.getById(clerkId); @@ -416,7 +468,9 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl wrapper1.ne(PlayOrderInfoEntity::getAcceptBy, clerkId).and(wrapper2 -> wrapper2.eq(PlayOrderInfoEntity::getExcludeHistory, 1))); + lambdaQueryWrapper.eq(PlayOrderInfoEntity::getExcludeHistory, "0") + .or(wrapper1 -> wrapper1.ne(PlayOrderInfoEntity::getAcceptBy, clerkId) + .and(wrapper2 -> wrapper2.eq(PlayOrderInfoEntity::getExcludeHistory, 1))); return this.baseMapper.selectPage(new Page<>(vo.getPageNum(), vo.getPageSize()), lambdaQueryWrapper); } @@ -428,17 +482,23 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl(vo.getPageNum(), vo.getPageSize()), PlayRewardInfoReturnVo.class, lambdaQueryWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayRewardInfoReturnVo.class, lambdaQueryWrapper); } /** * 查询订单 * - * @param id 订单主键 + * @param id + * 订单主键 * @return 订单 */ @Override @@ -450,34 +510,40 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new MPJLambdaWrapper<>(); // 查询主表全部字段 lambdaQueryWrapper.selectAll(PlayOrderInfoEntity.class); // 查询顾客表 - lambdaQueryWrapper.selectAs(PlayCustomUserInfoEntity::getId, "customId").selectAs(PlayCustomUserInfoEntity::getAvatar, "customAvatar").selectAs(PlayCustomUserInfoEntity::getNickname, "customNickname"); + lambdaQueryWrapper.selectAs(PlayCustomUserInfoEntity::getId, "customId") + .selectAs(PlayCustomUserInfoEntity::getAvatar, "customAvatar") + .selectAs(PlayCustomUserInfoEntity::getNickname, "customNickname"); // 查询陪聊表 - lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname"); + lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId") + .selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar") + .selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname"); // 子表 - lambdaQueryWrapper.leftJoin(PlayCustomUserInfoEntity.class, PlayCustomUserInfoEntity::getId, PlayOrderInfoEntity::getPurchaserBy).leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayOrderInfoEntity::getAcceptBy); + lambdaQueryWrapper.leftJoin(PlayCustomUserInfoEntity.class, PlayCustomUserInfoEntity::getId, + PlayOrderInfoEntity::getPurchaserBy).leftJoin(PlayClerkUserInfoEntity.class, + PlayClerkUserInfoEntity::getId, PlayOrderInfoEntity::getAcceptBy); lambdaQueryWrapper.eq(PlayOrderInfoEntity::getId, orderId); lambdaQueryWrapper.orderByDesc(PlayOrderInfoEntity::getPurchaserTime); return this.baseMapper.selectJoinOne(PlayOrderDetailsReturnVo.class, lambdaQueryWrapper); } - /** * 分页查询订单信息 * - * @param vo 订单分页查询对象 + * @param vo + * 订单分页查询对象 * @return 订单分页查询结果 */ @Override public IPage selectOrderInfoPage(PlayOrderInfoQueryVo vo) { - MPJLambdaWrapper lambdaQueryWrapper = getCommonOrderQueryVo(ConvertUtil.entityToVo(vo, PlayOrderInfoEntity.class)); + MPJLambdaWrapper lambdaQueryWrapper = getCommonOrderQueryVo( + ConvertUtil.entityToVo(vo, PlayOrderInfoEntity.class)); if (StringUtils.isNotBlank(vo.getGroupId())) { lambdaQueryWrapper.eq(PlayOrderInfoEntity::getGroupId, vo.getGroupId()); } @@ -497,12 +563,14 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), vo.getClerkNickName()); - lambdaQueryWrapper.and(i -> i.isNull(PlayOrderInfoEntity::getAcceptBy).or().in(PlayOrderInfoEntity::getAcceptBy, clerkIdList)); - return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderInfoReturnVo.class, lambdaQueryWrapper); + List clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), + vo.getClerkNickName()); + lambdaQueryWrapper.and( + i -> i.isNull(PlayOrderInfoEntity::getAcceptBy).or().in(PlayOrderInfoEntity::getAcceptBy, clerkIdList)); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayOrderInfoReturnVo.class, lambdaQueryWrapper); } - @Override public PlayClerkOrderDetailsReturnVo clerkSelectOrderDetails(String clerkId, String orderId) { PlayOrderInfoEntity entity = new PlayOrderInfoEntity(); @@ -510,12 +578,16 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = getCommonOrderQueryVo(entity); // 拼接用户等级 - lambdaQueryWrapper.selectAs(PlayCustomLevelInfoEntity::getId, "customLevelId").selectAs(PlayCustomLevelInfoEntity::getName, "customLevelName"); - lambdaQueryWrapper.leftJoin(PlayCustomLevelInfoEntity.class, PlayCustomLevelInfoEntity::getId, PlayCustomUserInfoEntity::getLevelId); - PlayClerkOrderDetailsReturnVo returnVo = this.baseMapper.selectJoinOne(PlayClerkOrderDetailsReturnVo.class, lambdaQueryWrapper); + lambdaQueryWrapper.selectAs(PlayCustomLevelInfoEntity::getId, "customLevelId") + .selectAs(PlayCustomLevelInfoEntity::getName, "customLevelName"); + lambdaQueryWrapper.leftJoin(PlayCustomLevelInfoEntity.class, PlayCustomLevelInfoEntity::getId, + PlayCustomUserInfoEntity::getLevelId); + PlayClerkOrderDetailsReturnVo returnVo = this.baseMapper.selectJoinOne(PlayClerkOrderDetailsReturnVo.class, + lambdaQueryWrapper); // 如果订单状态为退款，查询订单退款原因 if (returnVo.getOrderStatus().equals(OrderConstant.ORDER_STATUS_4)) { - PlayOrderRefundInfoEntity orderRefundInfoEntity = playOrderRefundInfoService.selectPlayOrderRefundInfoByOrderId(returnVo.getId()); + PlayOrderRefundInfoEntity orderRefundInfoEntity = playOrderRefundInfoService + .selectPlayOrderRefundInfoByOrderId(returnVo.getId()); returnVo.setRefundByType(orderRefundInfoEntity.getRefundByType()); returnVo.setRefundById(orderRefundInfoEntity.getRefundById()); returnVo.setRefundReason(orderRefundInfoEntity.getRefundReason()); @@ -524,7 +596,6 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl clerkSelectOrderInfoList(String clerkId, String startTime, String endTime) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -535,11 +606,15 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl clerkSelectOrderInfoByPage(PlayClerkOrderInfoQueryVo vo) { - MPJLambdaWrapper lambdaQueryWrapper = getCommonOrderQueryVo(ConvertUtil.entityToVo(vo, PlayOrderInfoEntity.class)); + MPJLambdaWrapper lambdaQueryWrapper = getCommonOrderQueryVo( + ConvertUtil.entityToVo(vo, PlayOrderInfoEntity.class)); // 拼接用户等级 - lambdaQueryWrapper.selectAs(PlayCustomLevelInfoEntity::getId, "customLevelId").selectAs(PlayCustomLevelInfoEntity::getName, "customLevelName"); - lambdaQueryWrapper.leftJoin(PlayCustomLevelInfoEntity.class, PlayCustomLevelInfoEntity::getId, PlayCustomUserInfoEntity::getLevelId); - return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkOrderListReturnVo.class, lambdaQueryWrapper); + lambdaQueryWrapper.selectAs(PlayCustomLevelInfoEntity::getId, "customLevelId") + .selectAs(PlayCustomLevelInfoEntity::getName, "customLevelName"); + lambdaQueryWrapper.leftJoin(PlayCustomLevelInfoEntity.class, PlayCustomLevelInfoEntity::getId, + PlayCustomUserInfoEntity::getLevelId); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayClerkOrderListReturnVo.class, lambdaQueryWrapper); } @Override @@ -548,18 +623,22 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = getCommonOrderQueryVo(entity); - PlayCustomOrderDetailsReturnVo returnVo = this.baseMapper.selectJoinOne(PlayCustomOrderDetailsReturnVo.class, lambdaQueryWrapper); + PlayCustomOrderDetailsReturnVo returnVo = this.baseMapper.selectJoinOne(PlayCustomOrderDetailsReturnVo.class, + lambdaQueryWrapper); // 如果订单状态为退款，查询订单退款原因 if (returnVo.getOrderStatus().equals(OrderConstant.ORDER_STATUS_4)) { - PlayOrderRefundInfoEntity orderRefundInfoEntity = playOrderRefundInfoService.selectPlayOrderRefundInfoByOrderId(returnVo.getId()); + PlayOrderRefundInfoEntity orderRefundInfoEntity = playOrderRefundInfoService + .selectPlayOrderRefundInfoByOrderId(returnVo.getId()); returnVo.setRefundByType(orderRefundInfoEntity.getRefundByType()); returnVo.setRefundById(orderRefundInfoEntity.getRefundById()); returnVo.setRefundReason(orderRefundInfoEntity.getRefundReason()); } // 查询订单是否评价 - PlayOrderEvaluateInfoEntity orderEvaluateInfoEntity = playOrderEvaluateInfoService.queryCustomToOrderEvaluateInfo(customId, orderId); + PlayOrderEvaluateInfoEntity orderEvaluateInfoEntity = playOrderEvaluateInfoService + .queryCustomToOrderEvaluateInfo(customId, orderId); returnVo.setEvaluate(orderEvaluateInfoEntity != null ? "1" : "0"); - PlayOrderComplaintInfoEntity orderComplaintInfoEntity = playOrderComplaintInfoService.queryCustomToOrderOrderComplaintInfo(customId, orderId); + PlayOrderComplaintInfoEntity orderComplaintInfoEntity = playOrderComplaintInfoService + .queryCustomToOrderOrderComplaintInfo(customId, orderId); // 查询订单是否投诉 returnVo.setComplaint(orderComplaintInfoEntity != null ? "1" : "0"); @@ -568,19 +647,25 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl customSelectOrderInfoByPage(PlayCustomOrderInfoQueryVo vo) { - MPJLambdaWrapper lambdaQueryWrapper = getCommonOrderQueryVo(ConvertUtil.entityToVo(vo, PlayOrderInfoEntity.class)); - IPage page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayCustomOrderListReturnVo.class, lambdaQueryWrapper); + MPJLambdaWrapper lambdaQueryWrapper = getCommonOrderQueryVo( + ConvertUtil.entityToVo(vo, PlayOrderInfoEntity.class)); + IPage page = this.baseMapper.selectJoinPage( + new Page<>(vo.getPageNum(), vo.getPageSize()), PlayCustomOrderListReturnVo.class, lambdaQueryWrapper); // 获取当前顾客所有订单评价信息，将订单评价信息转化为 map<订单ID，订单ID>的结构 PlayOrderEvaluateInfoEntity orderEvaluateInfoEntity = new PlayOrderEvaluateInfoEntity(); orderEvaluateInfoEntity.setCustomId(vo.getPurchaserBy()); - Map evaluateInfos = playOrderEvaluateInfoService.selectByList(orderEvaluateInfoEntity).stream().collect(Collectors.toMap(PlayOrderEvaluateInfoEntity::getOrderId, PlayOrderEvaluateInfoEntity::getOrderId)); + Map evaluateInfos = playOrderEvaluateInfoService.selectByList(orderEvaluateInfoEntity).stream() + .collect(Collectors.toMap(PlayOrderEvaluateInfoEntity::getOrderId, + PlayOrderEvaluateInfoEntity::getOrderId)); for (PlayCustomOrderListReturnVo record : page.getRecords()) { record.setEvaluate(evaluateInfos.containsKey(record.getId()) ? "1" : "0"); } // 获取当前顾客所有订单投诉信息，将订单评价信息转化为 map<订单ID，订单ID>的结构 PlayOrderComplaintInfoEntity orderComplaintInfoEntity = new PlayOrderComplaintInfoEntity(); orderComplaintInfoEntity.setCustomId(vo.getPurchaserBy()); - Map complaintInfos = playOrderComplaintInfoService.selectByList(orderComplaintInfoEntity).stream().collect(Collectors.toMap(PlayOrderComplaintInfoEntity::getOrderId, PlayOrderComplaintInfoEntity::getOrderId)); + Map complaintInfos = playOrderComplaintInfoService.selectByList(orderComplaintInfoEntity) + .stream().collect(Collectors.toMap(PlayOrderComplaintInfoEntity::getOrderId, + PlayOrderComplaintInfoEntity::getOrderId)); for (PlayCustomOrderListReturnVo record : page.getRecords()) { record.setComplaint(complaintInfos.containsKey(record.getId()) ? "1" : "0"); } @@ -595,9 +680,7 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl */ @@ -606,13 +689,19 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PlayOrderInfoEntity::getAcceptBy, acceptBy); if ("1".equals(orderInfo.getExcludeHistory()) && this.baseMapper.selectOne(lambdaQueryWrapper) != null) { @@ -675,7 +767,8 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl images) { + public void updateStateTo4(String operatorByType, String operatorBy, String orderId, String refundReason, + List images) { PlayOrderInfoEntity orderInfo = this.selectOrderInfoById(orderId); if ("0".equals(operatorByType) && !operatorBy.equals(orderInfo.getPurchaserBy())) { throw new CustomException("只能操作本人订单"); @@ -763,16 +862,21 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl implements IPlayOrderRefundInfoService { +public class PlayOrderRefundInfoServiceImpl extends ServiceImpl + implements + IPlayOrderRefundInfoService { @Resource private PlayOrderRefundInfoMapper playOrderRefundInfoMapper; - @Override public PlayOrderRefundInfoEntity selectPlayOrderRefundInfoByOrderId(String orderId) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -40,7 +40,8 @@ public class PlayOrderRefundInfoServiceImpl extends ServiceImpl selectByPage(PlayOrderRefundQueryVo vo) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); - return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderRefundReturnVo.class, lambdaQueryWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayOrderRefundReturnVo.class, lambdaQueryWrapper); } /** * 查询订单退款信息列表 * - * @param playOrderRefundInfo 订单退款信息 + * @param playOrderRefundInfo + * 订单退款信息 * @return 订单退款信息 */ @Override - public IPage selectPlayOrderRefundInfoByPage(PlayOrderRefundInfoEntity playOrderRefundInfo) { + public IPage selectPlayOrderRefundInfoByPage( + PlayOrderRefundInfoEntity playOrderRefundInfo) { Page page = new Page<>(1, 10); return this.baseMapper.selectPage(page, new LambdaQueryWrapper()); } @Override - public void add(String orderId, String customId, String clerkId, String payMethod, String refundType, BigDecimal refundAmount, String refundReason, String refundByType, String refundById, String refundState, String reviewedRequired) { + public void add(String orderId, String customId, String clerkId, String payMethod, String refundType, + BigDecimal refundAmount, String refundReason, String refundByType, String refundById, String refundState, + String reviewedRequired) { PlayOrderRefundInfoEntity orderRefundInfo = new PlayOrderRefundInfoEntity(); orderRefundInfo.setOrderId(orderId); orderRefundInfo.setCustomId(customId); @@ -86,7 +92,8 @@ public class PlayOrderRefundInfoServiceImpl extends ServiceImpl list = playPersonnelAdminInfoService.selectByPage(vo); return R.ok(list); } - /** * 获取管理员管理详细信息 */ @ApiOperation(value = "获取管理员详情", notes = "根据ID获取管理员详细信息") @ApiImplicitParam(name = "id", value = "管理员ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayPersonnelAdminInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayPersonnelAdminInfoEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(playPersonnelAdminInfoService.selectPlayPersonnelAdminInfoById(id)); @@ -84,27 +78,25 @@ public class PlayPersonnelAdminInfoController { * 新增管理员管理信息 */ @ApiOperation(value = "新增管理员信息", notes = "创建新的管理员信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败，包含详细错误信息")}) @Log(title = "管理员管理信息", businessType = BusinessType.INSERT) @PostMapping("/createBaseInfo") - public R createBaseInfo(@ApiParam(value = "管理员信息", required = true) @Validated @RequestBody PlayPersonnelAdminInfoEditAddInfoVo vo) { - //校验对应用户是否存在 + public R createBaseInfo( + @ApiParam(value = "管理员信息", required = true) @Validated @RequestBody PlayPersonnelAdminInfoEditAddInfoVo vo) { + // 校验对应用户是否存在 SysUserEntity sysUserEntity = sysUserService.selectUserById(vo.getSysUserId()); - //校验当前用户是否已经是组长 + // 校验当前用户是否已经是组长 PlayPersonnelAdminInfoEntity groupInfoEntity = playPersonnelAdminInfoService.selectByUserId(vo.getSysUserId()); if (groupInfoEntity != null) { throw new CustomException("当前账号已经是管理员,无法重复添加"); } - //添加管理员 + // 添加管理员 PlayPersonnelAdminInfoEntity entity = ConvertUtil.entityToVo(vo, PlayPersonnelAdminInfoEntity.class); entity.setSysUserCode(sysUserEntity.getUserCode()); entity.setAddTime(LocalDateTime.now()); boolean success = playPersonnelAdminInfoService.create(entity); if (success) { - //新建管理员后，添加对应的用户角色权限 + // 新建管理员后，添加对应的用户角色权限 userRoleService.addUserRole(vo.getSysUserId(), sysRoleService.selectByRoleKey("operator").getRoleId()); return R.ok(); } @@ -115,17 +107,15 @@ public class PlayPersonnelAdminInfoController { * 修改管理员管理信息 */ @ApiOperation(value = "修改管理员信息", notes = "修改管理员基本信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败，包含详细错误信息")}) @Log(title = "管理员管理信息", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateBaseInfo") - public R updateBaseInfo(@ApiParam(value = "管理员信息", required = true) @Validated @RequestBody PlayPersonnelAdminInfoEditBaseInfoVo vo) { + public R updateBaseInfo( + @ApiParam(value = "管理员信息", required = true) @Validated @RequestBody PlayPersonnelAdminInfoEditBaseInfoVo vo) { - //校验对应用户是否存在 + // 校验对应用户是否存在 SysUserEntity sysUserEntity = sysUserService.selectUserById(vo.getSysUserId()); - //校验当前用户是否已经是组长 + // 校验当前用户是否已经是组长 PlayPersonnelAdminInfoEntity adminInfoEntity = playPersonnelAdminInfoService.selectByUserId(vo.getSysUserId()); if (adminInfoEntity != null && !adminInfoEntity.getId().equals(vo.getId())) { throw new CustomException("当前账号已经是管理员,无法重复添加"); @@ -134,7 +124,7 @@ public class PlayPersonnelAdminInfoController { entity.setSysUserCode(sysUserEntity.getUserCode()); boolean success = playPersonnelAdminInfoService.update(entity); if (success) { - //新建管理员后，添加对应的用户角色权限 + // 新建管理员后，添加对应的用户角色权限 userRoleService.addUserRole(vo.getSysUserId(), sysRoleService.selectByRoleKey("operator").getRoleId()); } return R.error("修改失败"); @@ -145,9 +135,7 @@ public class PlayPersonnelAdminInfoController { */ @ApiOperation(value = "删除管理员信息", notes = "根据ID批量删除管理员信息") @ApiImplicitParam(name = "ids", value = "管理员ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PreAuthorize("@customSs.hasPermission('play:info:remove')") @Log(title = "管理员管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") @@ -156,9 +144,9 @@ public class PlayPersonnelAdminInfoController { for (String id : ids) { // 判断数据是否存在 PlayPersonnelAdminInfoEntity entity = playPersonnelAdminInfoService.selectPlayPersonnelAdminInfoById(id); - //删除管理员 + // 删除管理员 playPersonnelAdminInfoService.deletePlayPersonnelAdminInfoById(id); - //删除对应的权限信息 + // 删除对应的权限信息 userRoleService.delUserRole(entity.getSysUserId(), ruleId); } return R.ok(); diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelGroupInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelGroupInfoController.java index 2c96d79..c97a42b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelGroupInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelGroupInfoController.java @@ -25,12 +25,11 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.List; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; /** * 店员分组信息Controller @@ -46,33 +45,31 @@ public class PlayPersonnelGroupInfoController { @Resource private IPlayPersonnelGroupInfoService playClerkGroupInfoService; - @Resource private IPlayClerkUserInfoService playClerkUserInfoService; @Resource private SysUserService sysUserService; - @Resource private SysRoleService sysRoleService; @Resource private SysUserRoleService userRoleService; - /** * 查询店员分类信息列表 */ @ApiOperation(value = "分页查询分组列表", notes = "分页查询店员分组信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayPersonnelGroupInfoReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayPersonnelGroupInfoReturnVo.class, responseContainer = "Page")}) @PostMapping("/listByPage") - public R listByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayPersonnelGroupInfoQueryVo vo) { + public R listByPage( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayPersonnelGroupInfoQueryVo vo) { IPage list = playClerkGroupInfoService.selectByPage(vo); for (PlayPersonnelGroupInfoReturnVo record : list.getRecords()) { - List clerkUserInfoEntities = playClerkUserInfoService.listAllByGroupId(record.getId()); + List clerkUserInfoEntities = playClerkUserInfoService + .listAllByGroupId(record.getId()); record.setTotalEmployeesNumber(clerkUserInfoEntities.size()); Integer listingEmployeesNumber = 0; for (PlayClerkUserInfoEntity clerkUserInfoEntity : clerkUserInfoEntities) { @@ -85,33 +82,30 @@ public class PlayPersonnelGroupInfoController { return R.ok(list); } - /** * 新增店员分组信息 */ @ApiOperation(value = "新增分组信息", notes = "创建新的店员分组信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败，包含详细错误信息")}) @Log(title = "店员分组信息", businessType = BusinessType.INSERT) @PostMapping("/createBaseInfo") - public R createBaseInfo(@ApiParam(value = "分组信息", required = true) @Validated @RequestBody PlayPersonnelGroupInfoEditAddInfoVo vo) { - //校验对应用户是否存在 + public R createBaseInfo( + @ApiParam(value = "分组信息", required = true) @Validated @RequestBody PlayPersonnelGroupInfoEditAddInfoVo vo) { + // 校验对应用户是否存在 SysUserEntity sysUserEntity = sysUserService.selectUserById(vo.getSysUserId()); - //校验当前用户是否已经是组长 + // 校验当前用户是否已经是组长 PlayPersonnelGroupInfoEntity groupInfoEntity = playClerkGroupInfoService.selectByUserId(vo.getSysUserId()); if (groupInfoEntity != null) { throw new CustomException("当前账号已经是组长,无法重复添加"); } - //添加组长配置 + // 添加组长配置 PlayPersonnelGroupInfoEntity entity = ConvertUtil.entityToVo(vo, PlayPersonnelGroupInfoEntity.class); entity.setId(IdUtils.getUuid()); entity.setSysUserCode(sysUserEntity.getUserCode()); entity.setAddTime(LocalDateTime.now()); boolean success = playClerkGroupInfoService.create(entity); if (success) { - //新建组长后，添加对应的用户角色权限 + // 新建组长后，添加对应的用户角色权限 userRoleService.addUserRole(vo.getSysUserId(), sysRoleService.selectByRoleKey("leader").getRoleId()); return R.ok("成功"); } @@ -122,17 +116,15 @@ public class PlayPersonnelGroupInfoController { * 修改店员分组信息 */ @ApiOperation(value = "修改分组信息", notes = "修改店员分组基本信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败，包含详细错误信息")}) @Log(title = "店员分组信息", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateBaseInfo") - public R updateBaseInfo(@ApiParam(value = "分组信息", required = true) @Validated @RequestBody PlayPersonnelGroupInfoEditBaseInfoVo vo) { + public R updateBaseInfo( + @ApiParam(value = "分组信息", required = true) @Validated @RequestBody PlayPersonnelGroupInfoEditBaseInfoVo vo) { SysUserEntity sysUserEntity = sysUserService.selectUserById(vo.getSysUserId()); - //校验当前用户是否已经是组长 + // 校验当前用户是否已经是组长 PlayPersonnelGroupInfoEntity groupInfoEntity = playClerkGroupInfoService.selectByUserId(vo.getSysUserId()); - //校验当前用户是否已经是组长，只有当前用户不为组长时 + // 校验当前用户是否已经是组长，只有当前用户不为组长时 if (groupInfoEntity != null && !groupInfoEntity.getId().equals(vo.getId())) { throw new CustomException("当前账号已经是组长,无法重复添加"); } @@ -140,23 +132,19 @@ public class PlayPersonnelGroupInfoController { entity.setSysUserCode(sysUserEntity.getUserCode()); boolean success = playClerkGroupInfoService.update(entity); if (success) { - //新建组长后，添加对应的用户角色权限 + // 新建组长后，添加对应的用户角色权限 userRoleService.addUserRole(vo.getSysUserId(), sysRoleService.selectByRoleKey("leader").getRoleId()); return R.ok("成功"); } return R.error("修改失败"); } - /** * 删除店员分组信息 */ @ApiOperation(value = "删除分组信息", notes = "根据ID批量删除店员分组信息") @ApiImplicitParam(name = "ids", value = "分组ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "删除失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "删除失败，包含详细错误信息")}) @Log(title = "店员分组信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { @@ -170,9 +158,9 @@ public class PlayPersonnelGroupInfoController { for (String id : ids) { // 判断数据是否存在 PlayPersonnelGroupInfoEntity entity = playClerkGroupInfoService.selectPlayClerkGroupInfoById(id); - //删除组长 + // 删除组长 playClerkGroupInfoService.deletePlayClerkGroupInfoById(id); - //删除对应的权限信息 + // 删除对应的权限信息 userRoleService.delUserRole(entity.getSysUserId(), ruleId); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelUserInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelUserInfoController.java index d804175..a8b219e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelUserInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelUserInfoController.java @@ -11,12 +11,11 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.List; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import java.util.List; - /** * 管理员管理Controller * @@ -31,33 +30,29 @@ public class PlayPersonnelUserInfoController { @Resource private SysUserService sysUserService; - /** * 分页查询账户信息列表 */ @ApiOperation(value = "分页查询用户列表", notes = "分页查询系统用户信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayPersonnelUserInfoReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayPersonnelUserInfoReturnVo.class, responseContainer = "Page")}) @PostMapping("/listByPage") - public R listByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayPersonnelUserInfoQueryVo vo) { + public R listByPage( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayPersonnelUserInfoQueryVo vo) { IPage list = sysUserService.selectByPage(vo); return R.ok(list); } - /** * 查询所有账户信息列表 */ @ApiOperation(value = "查询所有用户", notes = "查询所有系统用户信息") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysUserEntity.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = SysUserEntity.class, responseContainer = "List")}) @GetMapping("/listAll") public R listAll() { List list = sysUserService.selectAll(); return R.ok(list); } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelWaiterInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelWaiterInfoController.java index 7daa137..902e592 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelWaiterInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelWaiterInfoController.java @@ -22,12 +22,11 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.time.LocalDateTime; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import java.time.LocalDateTime; - /** * 客服信息Controller * @@ -44,23 +43,21 @@ public class PlayPersonnelWaiterInfoController { @Resource private SysUserService sysUserService; - @Resource private SysRoleService sysRoleService; @Resource private SysUserRoleService userRoleService; - /** * 查询客服信息列表 */ @ApiOperation(value = "分页查询客服列表", notes = "分页查询客服信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayPersonnelWaiterInfoReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayPersonnelWaiterInfoReturnVo.class, responseContainer = "Page")}) @PostMapping("/listByPage") - public R listByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayPersonnelWaiterInfoQueryVo vo) { + public R listByPage( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayPersonnelWaiterInfoQueryVo vo) { IPage list = playClerkWaiterInfoService.selectByPage(vo); return R.ok(list); } @@ -69,16 +66,14 @@ public class PlayPersonnelWaiterInfoController { * 新增客服信息列表 */ @ApiOperation(value = "新增客服信息", notes = "创建新的客服信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败，包含详细错误信息")}) @Log(title = "客服管理信息", businessType = BusinessType.INSERT) @PostMapping("/createBaseInfo") - public R createBaseInfo(@ApiParam(value = "客服信息", required = true) @Validated @RequestBody PlayPersonnelWaiterInfoEditAddInfoVo vo) { - //校验对应用户是否存在 + public R createBaseInfo( + @ApiParam(value = "客服信息", required = true) @Validated @RequestBody PlayPersonnelWaiterInfoEditAddInfoVo vo) { + // 校验对应用户是否存在 SysUserEntity sysUserEntity = sysUserService.selectUserById(vo.getSysUserId()); - //校验当前用户是否已经是组长 + // 校验当前用户是否已经是组长 PlayPersonnelWaiterInfoEntity waiterInfoEntity = playClerkWaiterInfoService.selectByUserId(vo.getSysUserId()); if (waiterInfoEntity != null) { throw new CustomException("当前账号已经是客服,无法重复添加"); @@ -89,7 +84,7 @@ public class PlayPersonnelWaiterInfoController { entity.setAddTime(LocalDateTime.now()); boolean success = playClerkWaiterInfoService.create(entity); if (success) { - //新建客服后，添加对应的用户角色权限 + // 新建客服后，添加对应的用户角色权限 userRoleService.addUserRole(vo.getSysUserId(), sysRoleService.selectByRoleKey("waiter").getRoleId()); return R.ok(); } @@ -100,44 +95,37 @@ public class PlayPersonnelWaiterInfoController { * 修改客服信息列表 */ @ApiOperation(value = "修改客服信息", notes = "修改客服基本信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败，包含详细错误信息")}) @Log(title = "客服管理信息", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateBaseInfo") - public R updateBaseInfo(@ApiParam(value = "客服信息", required = true) @Validated @RequestBody PlayPersonnelWaiterInfoEditBaseInfoVo vo) { + public R updateBaseInfo( + @ApiParam(value = "客服信息", required = true) @Validated @RequestBody PlayPersonnelWaiterInfoEditBaseInfoVo vo) { - //校验对应用户是否存在 + // 校验对应用户是否存在 SysUserEntity sysUserEntity = sysUserService.selectUserById(vo.getSysUserId()); - //校验当前用户是否已经是组长 + // 校验当前用户是否已经是组长 PlayPersonnelWaiterInfoEntity waiterInfoEntity = playClerkWaiterInfoService.selectByUserId(vo.getSysUserId()); if (waiterInfoEntity != null && !waiterInfoEntity.getId().equals(vo.getId())) { throw new CustomException("当前账号已经是客服,无法重复添加"); } - PlayPersonnelWaiterInfoEntity entity = ConvertUtil.entityToVo(vo, PlayPersonnelWaiterInfoEntity.class); entity.setSysUserCode(sysUserEntity.getUserCode()); boolean success = playClerkWaiterInfoService.update(entity); if (success) { - //新建客服后，添加对应的用户角色权限 + // 新建客服后，添加对应的用户角色权限 userRoleService.addUserRole(vo.getSysUserId(), sysRoleService.selectByRoleKey("waiter").getRoleId()); return R.ok(); } return R.error("修改失败"); } - /** * 删除客服信息 */ @ApiOperation(value = "删除客服信息", notes = "根据ID批量删除客服信息") @ApiImplicitParam(name = "ids", value = "客服ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "删除失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "删除失败，包含详细错误信息")}) @Log(title = "客服信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { @@ -145,9 +133,9 @@ public class PlayPersonnelWaiterInfoController { for (String id : ids) { // 判断数据是否存在 PlayPersonnelWaiterInfoEntity entity = playClerkWaiterInfoService.selectPlayClerkWaiterInfoById(id); - //删除客服 + // 删除客服 playClerkWaiterInfoService.deletePlayClerkWaiterInfoById(id); - //删除对应的权限信息 + // 删除对应的权限信息 userRoleService.delUserRole(entity.getSysUserId(), ruleId); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayBalanceDetailsInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayBalanceDetailsInfoMapper.java index 2bd4c1f..a5398e2 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayBalanceDetailsInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayBalanceDetailsInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.personnel.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.personnel.module.entity.PlayBalanceDetailsInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.personnel.module.entity.PlayBalanceDetailsInfoEn */ public interface PlayBalanceDetailsInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayPersonnelAdminInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayPersonnelAdminInfoMapper.java index e9a50ad..2d3a774 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayPersonnelAdminInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayPersonnelAdminInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.personnel.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.personnel.module.entity.PlayPersonnelAdminInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.personnel.module.entity.PlayPersonnelAdminInfoEn */ public interface PlayPersonnelAdminInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayPersonnelGroupInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayPersonnelGroupInfoMapper.java index ee669cc..350f592 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayPersonnelGroupInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayPersonnelGroupInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.personnel.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.personnel.module.entity.PlayPersonnelGroupInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.personnel.module.entity.PlayPersonnelGroupInfoEn */ public interface PlayPersonnelGroupInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayPersonnelWaiterInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayPersonnelWaiterInfoMapper.java index d192157..e4b71cb 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayPersonnelWaiterInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayPersonnelWaiterInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.personnel.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.personnel.module.entity.PlayPersonnelWaiterInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.personnel.module.entity.PlayPersonnelWaiterInfoE */ public interface PlayPersonnelWaiterInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/module/entity/PlayBalanceDetailsInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/module/entity/PlayBalanceDetailsInfoEntity.java index 7a4805a..4786e9d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/module/entity/PlayBalanceDetailsInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/module/entity/PlayBalanceDetailsInfoEntity.java @@ -3,13 +3,12 @@ package com.starry.admin.modules.personnel.module.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.starry.common.domain.BaseEntity; +import java.math.BigDecimal; +import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; -import java.math.BigDecimal; -import java.time.LocalDateTime; - /** * 余额明细对象 play_balance_details_info * @@ -21,7 +20,6 @@ import java.time.LocalDateTime; @TableName("play_balance_details_info") public class PlayBalanceDetailsInfoEntity extends BaseEntity { - /** * UUID */ @@ -52,7 +50,6 @@ public class PlayBalanceDetailsInfoEntity extends BaseEntity { - /** * UUID */ @@ -55,5 +53,4 @@ public class PlayPersonnelAdminInfoEntity extends BaseEntity { - /** * UUID */ private String id; - /** * 租户ID */ @@ -47,16 +44,13 @@ public class PlayPersonnelGroupInfoEntity extends BaseEntity { - /** * UUID */ @@ -46,10 +44,8 @@ public class PlayPersonnelWaiterInfoEntity extends BaseEntity addTime; } diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayPersonnelWaiterInfoEditAddInfoVo.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayPersonnelWaiterInfoEditAddInfoVo.java index a1a788e..86f53d7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayPersonnelWaiterInfoEditAddInfoVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayPersonnelWaiterInfoEditAddInfoVo.java @@ -2,11 +2,10 @@ package com.starry.admin.modules.personnel.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotBlank; import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; - /** * 客户基本信息修改 * @@ -24,7 +23,6 @@ public class PlayPersonnelWaiterInfoEditAddInfoVo { @ApiModelProperty(value = "用户ID", required = true, example = "1", notes = "系统用户ID") private String sysUserId; - /** * 客服名称 */ @@ -33,5 +31,4 @@ public class PlayPersonnelWaiterInfoEditAddInfoVo { @ApiModelProperty(value = "客服名称", required = true, example = "张三", notes = "客服的名称，1-100字符") private String waiterName; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayPersonnelWaiterInfoEditBaseInfoVo.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayPersonnelWaiterInfoEditBaseInfoVo.java index 9e896b6..07cac9a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayPersonnelWaiterInfoEditBaseInfoVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayPersonnelWaiterInfoEditBaseInfoVo.java @@ -2,11 +2,10 @@ package com.starry.admin.modules.personnel.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotBlank; import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; - /** * 客户基本信息修改 * @@ -25,7 +24,6 @@ public class PlayPersonnelWaiterInfoEditBaseInfoVo { @ApiModelProperty(value = "客服ID", required = true, example = "1", notes = "需要修改的客服ID") private String id; - /** * 分组名称 */ @@ -41,6 +39,4 @@ public class PlayPersonnelWaiterInfoEditBaseInfoVo { @ApiModelProperty(value = "客服名称", required = true, example = "张三", notes = "客服的名称，1-100字符") private String waiterName; - - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayPersonnelWaiterInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayPersonnelWaiterInfoQueryVo.java index 0199bd2..781cb3c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayPersonnelWaiterInfoQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayPersonnelWaiterInfoQueryVo.java @@ -23,5 +23,4 @@ public class PlayPersonnelWaiterInfoQueryVo extends BasePageEntity { @ApiModelProperty(value = "客服名称", example = "张三", notes = "客服的名称，支持模糊查询") private String waiterName; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayPersonnelWaiterInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayPersonnelWaiterInfoReturnVo.java index a37f996..4ac1c4b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayPersonnelWaiterInfoReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayPersonnelWaiterInfoReturnVo.java @@ -3,11 +3,10 @@ package com.starry.admin.modules.personnel.module.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDateTime; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - /** * 客户管理信息 * @@ -18,14 +17,12 @@ import java.time.LocalDateTime; @ApiModel(value = "客服返回数据", description = "客服信息的返回数据") public class PlayPersonnelWaiterInfoReturnVo { - /** * UUID */ @ApiModelProperty(value = "客服ID", example = "1") private String id; - /** * 租户ID */ @@ -50,11 +47,9 @@ public class PlayPersonnelWaiterInfoReturnVo { @ApiModelProperty(value = "客服名称", example = "张三") private String waiterName; - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty(value = "添加时间", example = "2024-01-01 12:00:00") private LocalDateTime addTime; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/service/IPlayBalanceDetailsInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/service/IPlayBalanceDetailsInfoService.java index 30c7aae..f0ed76f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/service/IPlayBalanceDetailsInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/service/IPlayBalanceDetailsInfoService.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.personnel.module.entity.PlayBalanceDetailsInfoEntity; import com.starry.admin.modules.personnel.module.vo.PlayBalanceDetailsQueryVo; import com.starry.admin.modules.personnel.module.vo.PlayBalanceDetailsReturnVo; - import java.math.BigDecimal; /** @@ -16,53 +15,65 @@ import java.math.BigDecimal; */ public interface IPlayBalanceDetailsInfoService extends IService { - /** * 查询余额明细 * - * @param id 余额明细主键 + * @param id + * 余额明细主键 * @return 余额明细 */ PlayBalanceDetailsInfoEntity selectPlayBalanceDetailsInfoById(String id); - /** * 查询余额明细列表 * - * @param vo 余额明细查询对象 + * @param vo + * 余额明细查询对象 * @return 余额明细集合 */ IPage selectByPage(PlayBalanceDetailsQueryVo vo); - /** * 查询余额明细列表 * - * @param playBalanceDetailsInfo 余额明细 + * @param playBalanceDetailsInfo + * 余额明细 * @return 余额明细集合 */ - IPage selectPlayBalanceDetailsInfoByPage(PlayBalanceDetailsInfoEntity playBalanceDetailsInfo); - + IPage selectPlayBalanceDetailsInfoByPage( + PlayBalanceDetailsInfoEntity playBalanceDetailsInfo); /** * 新增余额明细信息 * - * @param userType 用户类型[0:陪聊;1:顾客] - * @param userId 用户ID - * @param balanceBeforeOperation 操作前余额 - * @param balanceAfterOperation 操作后余额 - * @param operationType 操作类型（0:充值;1:消费,2:服务;3:退款） - * @param operationAction 操作动作 - * @param balanceMoney 操作金额 - * @param giftAmount 赠送金额 - * @param orderId 订单ID + * @param userType + * 用户类型[0:陪聊;1:顾客] + * @param userId + * 用户ID + * @param balanceBeforeOperation + * 操作前余额 + * @param balanceAfterOperation + * 操作后余额 + * @param operationType + * 操作类型（0:充值;1:消费,2:服务;3:退款） + * @param operationAction + * 操作动作 + * @param balanceMoney + * 操作金额 + * @param giftAmount + * 赠送金额 + * @param orderId + * 订单ID */ - void insertBalanceDetailsInfo(String userType, String userId, BigDecimal balanceBeforeOperation, BigDecimal balanceAfterOperation, String operationType, String operationAction, BigDecimal balanceMoney, BigDecimal giftAmount, String orderId); + void insertBalanceDetailsInfo(String userType, String userId, BigDecimal balanceBeforeOperation, + BigDecimal balanceAfterOperation, String operationType, String operationAction, BigDecimal balanceMoney, + BigDecimal giftAmount, String orderId); /** * 新增余额明细 * - * @param playBalanceDetailsInfo 余额明细 + * @param playBalanceDetailsInfo + * 余额明细 * @return 结果 */ boolean create(PlayBalanceDetailsInfoEntity playBalanceDetailsInfo); @@ -70,7 +81,8 @@ public interface IPlayBalanceDetailsInfoService extends IService { - /** * 查询店员分组信息 * - * @param userId 用户ID + * @param userId + * 用户ID * @return 店员分组信息 */ PlayPersonnelAdminInfoEntity selectByUserId(String userId); - - /** * 查询管理员管理 * - * @param id 管理员管理主键 + * @param id + * 管理员管理主键 * @return 管理员管理 */ PlayPersonnelAdminInfoEntity selectPlayPersonnelAdminInfoById(String id); - /** * 查询管理员管理列表 * - * @param vo 管理员管理 + * @param vo + * 管理员管理 * @return 管理员管理集合 */ IPage selectByPage(PlayPersonnelAdminInfoQueryVo vo); @@ -45,7 +44,8 @@ public interface IPlayPersonnelAdminInfoService extends IService selectByPage(PlayPersonnelWaiterInfoQueryVo vo); @@ -42,7 +44,8 @@ public interface IPlayPersonnelWaiterInfoService extends IService implements IPlayBalanceDetailsInfoService { +public class PlayBalanceDetailsInfoServiceImpl + extends + ServiceImpl + implements + IPlayBalanceDetailsInfoService { @Resource private PlayBalanceDetailsInfoMapper playBalanceDetailsInfoMapper; @@ -39,7 +42,8 @@ public class PlayBalanceDetailsInfoServiceImpl extends ServiceImpl selectByPage(PlayBalanceDetailsQueryVo vo) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper() - //查询主表全部字段 + // 查询主表全部字段 .selectAll(PlayBalanceDetailsInfoEntity.class) - //查询顾客表 - .selectAs(PlayCustomUserInfoEntity::getId, "customId").selectAs(PlayCustomUserInfoEntity::getNickname, "customNickname").selectAs(PlayCustomUserInfoEntity::getAvatar, "customAvatar") - //查询订单表 -// .selectAs(PlayOrderInfoEntity::getId, "orderId").selectAs(PlayOrderInfoEntity::getOrderNo, "orderNo").selectAs(PlayOrderInfoEntity::getPayMethod,"payMethod") + // 查询顾客表 + .selectAs(PlayCustomUserInfoEntity::getId, "customId") + .selectAs(PlayCustomUserInfoEntity::getNickname, "customNickname") + .selectAs(PlayCustomUserInfoEntity::getAvatar, "customAvatar") + // 查询订单表 + // .selectAs(PlayOrderInfoEntity::getId, + // "orderId").selectAs(PlayOrderInfoEntity::getOrderNo, + // "orderNo").selectAs(PlayOrderInfoEntity::getPayMethod,"payMethod") .selectAll(PlayOrderInfoEntity.class) - .leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getId, PlayBalanceDetailsInfoEntity::getOrderId) - .leftJoin(PlayCustomUserInfoEntity.class, PlayCustomUserInfoEntity::getId, PlayBalanceDetailsInfoEntity::getUserId); - + .leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getId, + PlayBalanceDetailsInfoEntity::getOrderId) + .leftJoin(PlayCustomUserInfoEntity.class, PlayCustomUserInfoEntity::getId, + PlayBalanceDetailsInfoEntity::getUserId); if (StrUtil.isNotBlank(vo.getPayMethod())) { lambdaQueryWrapper.eq(PlayOrderInfoEntity::getPayMethod, vo.getPayMethod()); @@ -79,28 +87,33 @@ public class PlayBalanceDetailsInfoServiceImpl extends ServiceImpl(vo.getPageNum(), vo.getPageSize()), PlayBalanceDetailsReturnVo.class, lambdaQueryWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayBalanceDetailsReturnVo.class, lambdaQueryWrapper); } /** * 查询余额明细列表 * - * @param playBalanceDetailsInfo 余额明细 + * @param playBalanceDetailsInfo + * 余额明细 * @return 余额明细 */ @Override - public IPage selectPlayBalanceDetailsInfoByPage(PlayBalanceDetailsInfoEntity playBalanceDetailsInfo) { + public IPage selectPlayBalanceDetailsInfoByPage( + PlayBalanceDetailsInfoEntity playBalanceDetailsInfo) { Page page = new Page<>(1, 10); return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>()); } - @Override - public void insertBalanceDetailsInfo(String userType, String userId, BigDecimal balanceBeforeOperation, BigDecimal balanceAfterOperation, String operationType, String operationAction, BigDecimal balanceMoney, BigDecimal giftAmount, String orderId) { + public void insertBalanceDetailsInfo(String userType, String userId, BigDecimal balanceBeforeOperation, + BigDecimal balanceAfterOperation, String operationType, String operationAction, BigDecimal balanceMoney, + BigDecimal giftAmount, String orderId) { PlayOrderInfoEntity orderInfo = playOrderInfoService.selectOrderInfoById(orderId); PlayBalanceDetailsInfoEntity entity = new PlayBalanceDetailsInfoEntity(); entity.setId(IdUtils.getUuid()); @@ -120,7 +133,8 @@ public class PlayBalanceDetailsInfoServiceImpl extends ServiceImpl implements IPlayPersonnelAdminInfoService { +public class PlayPersonnelAdminInfoServiceImpl + extends + ServiceImpl + implements + IPlayPersonnelAdminInfoService { @Resource private PlayPersonnelAdminInfoMapper playPersonnelAdminInfoMapper; - @Override public PlayPersonnelAdminInfoEntity selectByUserId(String userId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -39,7 +41,8 @@ public class PlayPersonnelAdminInfoServiceImpl extends ServiceImpl selectByPage(PlayPersonnelAdminInfoQueryVo vo) { MPJLambdaWrapper lambdaWrapper = new MPJLambdaWrapper<>(); if (StrUtil.isNotBlank(vo.getAdminName())) { lambdaWrapper.eq(PlayPersonnelAdminInfoEntity::getAdminName, vo.getAdminName()); } - return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayPersonnelAdminInfoReturnVo.class, lambdaWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayPersonnelAdminInfoReturnVo.class, lambdaWrapper); } /** * 新增管理员管理 * - * @param playPersonnelAdminInfo 管理员管理 + * @param playPersonnelAdminInfo + * 管理员管理 * @return 结果 */ @Override @@ -74,7 +78,8 @@ public class PlayPersonnelAdminInfoServiceImpl extends ServiceImpl implements IPlayPersonnelGroupInfoService { +public class PlayPersonnelGroupInfoServiceImpl + extends + ServiceImpl + implements + IPlayPersonnelGroupInfoService { @Resource private PlayPersonnelGroupInfoMapper playClerkGroupInfoMapper; @Resource @@ -43,7 +46,8 @@ public class PlayPersonnelGroupInfoServiceImpl extends ServiceImpl(vo.getPageNum(), vo.getPageSize()), PlayPersonnelGroupInfoReturnVo.class, lambdaQueryWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayPersonnelGroupInfoReturnVo.class, lambdaQueryWrapper); } - /** * 新增店员分组信息 * - * @param playClerkGroupInfo 店员分组信息 + * @param playClerkGroupInfo + * 店员分组信息 * @return 结果 */ @Override @@ -90,7 +95,8 @@ public class PlayPersonnelGroupInfoServiceImpl extends ServiceImpl idList; PlayPersonnelGroupInfoEntity groupInfoEntity = this.selectByUserId(loginUser.getUserId()); if (Objects.nonNull(groupInfoEntity)) { - List list = clerkUserInfoService.list(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).eq(PlayClerkUserInfoEntity::getGroupId, groupInfoEntity.getId()).select(PlayClerkUserInfoEntity::getId)); + List list = clerkUserInfoService + .list(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class) + .eq(PlayClerkUserInfoEntity::getGroupId, groupInfoEntity.getId()) + .select(PlayClerkUserInfoEntity::getId)); idList = list.stream().map(PlayClerkUserInfoEntity::getId).collect(Collectors.toList()); - PlayClerkUserInfoEntity entity = clerkUserInfoService.getOne(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).eq(PlayClerkUserInfoEntity::getSysUserId, loginUser.getUserId()), false); + PlayClerkUserInfoEntity entity = clerkUserInfoService + .getOne(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class) + .eq(PlayClerkUserInfoEntity::getSysUserId, loginUser.getUserId()), false); if (Objects.nonNull(entity)) { idList.add(entity.getId()); } } else { // 返回所有的clerkId - idList = clerkUserInfoService.list(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).select(PlayClerkUserInfoEntity::getId).eq(PlayClerkUserInfoEntity::getClerkState, "1")).stream().map(PlayClerkUserInfoEntity::getId).collect(Collectors.toList()); + idList = clerkUserInfoService + .list(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).select(PlayClerkUserInfoEntity::getId) + .eq(PlayClerkUserInfoEntity::getClerkState, "1")) + .stream().map(PlayClerkUserInfoEntity::getId).collect(Collectors.toList()); } if (CollectionUtil.isEmpty(idList)) { idList = Collections.singletonList("-999"); } // 加入nickName的筛选 - if(StringUtils.isNotEmpty(clerkNickName)){ - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).in(PlayClerkUserInfoEntity::getId, idList).like(PlayClerkUserInfoEntity::getNickname, clerkNickName).select(PlayClerkUserInfoEntity::getId); - idList = clerkUserInfoService.list(wrapper).stream().map(PlayClerkUserInfoEntity::getId).collect(Collectors.toList()); + if (StringUtils.isNotEmpty(clerkNickName)) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class) + .in(PlayClerkUserInfoEntity::getId, idList) + .like(PlayClerkUserInfoEntity::getNickname, clerkNickName).select(PlayClerkUserInfoEntity::getId); + idList = clerkUserInfoService.list(wrapper).stream().map(PlayClerkUserInfoEntity::getId) + .collect(Collectors.toList()); } if (CollectionUtil.isEmpty(idList)) { idList = Collections.singletonList("-999"); diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/service/impl/PlayPersonnelWaiterInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/service/impl/PlayPersonnelWaiterInfoServiceImpl.java index 1d51b4b..921cfb1 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/service/impl/PlayPersonnelWaiterInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/service/impl/PlayPersonnelWaiterInfoServiceImpl.java @@ -12,10 +12,9 @@ import com.starry.admin.modules.personnel.module.vo.PlayPersonnelWaiterInfoQuery import com.starry.admin.modules.personnel.module.vo.PlayPersonnelWaiterInfoReturnVo; import com.starry.admin.modules.personnel.service.IPlayPersonnelWaiterInfoService; import com.starry.common.utils.IdUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; import java.util.Arrays; +import javax.annotation.Resource; +import org.springframework.stereotype.Service; /** * 客服信息Service业务层处理 @@ -24,11 +23,14 @@ import java.util.Arrays; * @since 2024-06-14 */ @Service -public class PlayPersonnelWaiterInfoServiceImpl extends ServiceImpl implements IPlayPersonnelWaiterInfoService { +public class PlayPersonnelWaiterInfoServiceImpl + extends + ServiceImpl + implements + IPlayPersonnelWaiterInfoService { @Resource private PlayPersonnelWaiterInfoMapper playClerkWaiterInfoMapper; - @Override public PlayPersonnelWaiterInfoEntity selectByUserId(String userId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -39,7 +41,8 @@ public class PlayPersonnelWaiterInfoServiceImpl extends ServiceImpl selectByPage(PlayPersonnelWaiterInfoQueryVo vo) { MPJLambdaWrapper lambdaWrapper = new MPJLambdaWrapper<>(); if (StrUtil.isNotBlank(vo.getWaiterName())) { lambdaWrapper.eq(PlayPersonnelWaiterInfoEntity::getWaiterName, vo.getWaiterName()); } - return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayPersonnelWaiterInfoReturnVo.class, lambdaWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayPersonnelWaiterInfoReturnVo.class, lambdaWrapper); } - /** * 新增客服信息 * - * @param playClerkWaiterInfo 客服信息 + * @param playClerkWaiterInfo + * 客服信息 * @return 结果 */ @Override @@ -75,7 +78,8 @@ public class PlayPersonnelWaiterInfoServiceImpl extends ServiceImpl list = playClerkGiftInfoService.selectPlayClerkGiftInfoByPage(playClerkGiftInfo); @@ -47,9 +45,7 @@ public class PlayClerkGiftInfoController { */ @ApiOperation(value = "获取关联详情", notes = "根据ID获取店员和礼物关系详细信息") @ApiImplicitParam(name = "id", value = "关联ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkGiftInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkGiftInfoEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(playClerkGiftInfoService.selectPlayClerkGiftInfoById(id)); @@ -59,10 +55,7 @@ public class PlayClerkGiftInfoController { * 新增店员和礼物关系 */ @ApiOperation(value = "新增关联信息", notes = "新增店员和礼物关系信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败，包含详细错误信息")}) @Log(title = "店员和礼物关系", businessType = BusinessType.INSERT) @PostMapping("/create") public R create(@ApiParam(value = "关联信息", required = true) @RequestBody PlayClerkGiftInfoEntity playClerkGiftInfo) { @@ -78,13 +71,11 @@ public class PlayClerkGiftInfoController { */ @ApiOperation(value = "修改关联信息", notes = "修改店员和礼物关系信息") @ApiImplicitParam(name = "id", value = "关联ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败，包含详细错误信息")}) @Log(title = "店员和礼物关系", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "关联信息", required = true) @RequestBody PlayClerkGiftInfoEntity playClerkGiftInfo) { + public R update(@PathVariable String id, + @ApiParam(value = "关联信息", required = true) @RequestBody PlayClerkGiftInfoEntity playClerkGiftInfo) { playClerkGiftInfo.setId(id); boolean success = playClerkGiftInfoService.update(playClerkGiftInfo); if (success) { @@ -98,9 +89,7 @@ public class PlayClerkGiftInfoController { */ @ApiOperation(value = "删除关联信息", notes = "根据ID批量删除店员和礼物关系信息") @ApiImplicitParam(name = "ids", value = "关联ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @Log(title = "店员和礼物关系", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayCommodityInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayCommodityInfoController.java index 5eb9f2f..fd985cc 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayCommodityInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayCommodityInfoController.java @@ -22,14 +22,13 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.Resource; +import org.springframework.web.bind.annotation.*; /** * 服务项目Controller @@ -51,9 +50,7 @@ public class PlayCommodityInfoController { private IPlayCommodityAndLevelInfoService playCommodityAndLevelInfoService; @ApiOperation(value = "获取表头信息", notes = "获取店员等级表头信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @GetMapping("/getTableName") public R getTableName() { List> result = new ArrayList<>(); @@ -67,14 +64,11 @@ public class PlayCommodityInfoController { return R.ok(result); } - /** * 查询服务项目类型 */ @ApiOperation(value = "查询所有服务项目", notes = "查询所有服务项目类型及其子项目") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @GetMapping("/listAll") public R queryCommodityType() { List> result = new ArrayList<>(); @@ -82,11 +76,13 @@ public class PlayCommodityInfoController { for (PlayCommodityInfoEntity entity : list) { List> itemCommodityInfo = new ArrayList<>(); Map map = BeanUtil.beanToMap(entity); - List commodityInfoEntities = ConvertUtil.entityToVoList(playCommodityInfoService.selectByPId(entity.getId()), PlayCommodityInfoReturnVo.class); + List commodityInfoEntities = ConvertUtil.entityToVoList( + playCommodityInfoService.selectByPId(entity.getId()), PlayCommodityInfoReturnVo.class); for (PlayCommodityInfoReturnVo commodityInfoEntity : commodityInfoEntities) { Map item = BeanUtil.beanToMap(commodityInfoEntity); for (PlayClerkLevelInfoEntity playClerkLevelInfoEntity : playClerkLevelInfoService.selectAll()) { - PlayCommodityAndLevelInfoEntity entity1 = playCommodityAndLevelInfoService.queryById(commodityInfoEntity.getId(), playClerkLevelInfoEntity.getId()); + PlayCommodityAndLevelInfoEntity entity1 = playCommodityAndLevelInfoService + .queryById(commodityInfoEntity.getId(), playClerkLevelInfoEntity.getId()); item.put(playClerkLevelInfoEntity.getId(), entity1 == null ? "未设置价格" : entity1.getPrice()); } itemCommodityInfo.add(item); @@ -101,10 +97,7 @@ public class PlayCommodityInfoController { * 修改服务项目类型 */ @ApiOperation(value = "更新服务项目价格", notes = "根据不同店员等级修改服务项目价格") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "更新失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "更新失败，包含详细错误信息")}) @PostMapping("/updateInfo") public R updateInfo(@ApiParam(value = "价格信息JSON", required = true) @RequestBody String s) { JSONObject jsonObject = JSON.parseObject(s); @@ -122,7 +115,8 @@ public class PlayCommodityInfoController { } catch (RuntimeException e) { throw new CustomException("请求参数错误,价格格式为空"); } - PlayCommodityAndLevelInfoEntity entity = playCommodityAndLevelInfoService.queryById(jsonObject.getString("id"), playClerkLevelInfoEntity.getId()); + PlayCommodityAndLevelInfoEntity entity = playCommodityAndLevelInfoService + .queryById(jsonObject.getString("id"), playClerkLevelInfoEntity.getId()); if (entity == null) { entity = new PlayCommodityAndLevelInfoEntity(); entity.setCommodityId(jsonObject.getString("id")); @@ -134,15 +128,12 @@ public class PlayCommodityInfoController { return R.ok("成功"); } - /** * 获取服务项目详细信息 */ @ApiOperation(value = "获取服务项目详情", notes = "根据ID获取服务项目详细信息") @ApiImplicitParam(name = "id", value = "服务项目ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCommodityInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayCommodityInfoEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(playCommodityInfoService.selectPlayCommodityInfoById(id)); @@ -152,10 +143,7 @@ public class PlayCommodityInfoController { * 新增服务项目 */ @ApiOperation(value = "新增服务项目", notes = "新增服务项目信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败，包含详细错误信息")}) @Log(title = "服务项目", businessType = BusinessType.INSERT) @PostMapping("/create") public R create(@ApiParam(value = "服务项目信息", required = true) @RequestBody PlayCommodityInfoAddVo vo) { @@ -172,13 +160,11 @@ public class PlayCommodityInfoController { */ @ApiOperation(value = "修改服务项目", notes = "修改服务项目信息") @ApiImplicitParam(name = "id", value = "服务项目ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败，包含详细错误信息")}) @Log(title = "服务项目", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "服务项目信息", required = true) @RequestBody PlayCommodityInfoEntity playCommodityInfo) { + public R update(@PathVariable String id, + @ApiParam(value = "服务项目信息", required = true) @RequestBody PlayCommodityInfoEntity playCommodityInfo) { playCommodityInfo.setId(id); boolean success = playCommodityInfoService.update(playCommodityInfo); if (success) { @@ -192,9 +178,7 @@ public class PlayCommodityInfoController { */ @ApiOperation(value = "删除服务项目", notes = "根据ID批量删除服务项目信息") @ApiImplicitParam(name = "ids", value = "服务项目ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @Log(title = "服务项目", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayCouponDetailsController.java b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayCouponDetailsController.java index 43797bd..16d38b7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayCouponDetailsController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayCouponDetailsController.java @@ -15,11 +15,10 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; - /** * 优惠券详情Controller * @@ -39,11 +38,11 @@ public class PlayCouponDetailsController { */ @ApiOperation(value = "分页查询优惠券记录", notes = "分页查询优惠券使用记录列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCouponDetailsReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayCouponDetailsReturnVo.class, responseContainer = "Page")}) // @PreAuthorize("@customSs.hasPermission('shop:couponDetails:list')") @PostMapping("/listByPage") - public R listByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayCouponDetailsQueryVo vo) { + public R listByPage( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayCouponDetailsQueryVo vo) { IPage list = playCouponDetailsService.selectByPage(vo); return R.ok(list); } @@ -53,9 +52,7 @@ public class PlayCouponDetailsController { */ @ApiOperation(value = "获取优惠券记录详情", notes = "根据ID获取优惠券使用记录详细信息") @ApiImplicitParam(name = "id", value = "记录ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCouponDetailsEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayCouponDetailsEntity.class)}) // @PreAuthorize("@customSs.hasPermission('shop:couponDetails:query')") @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { @@ -66,14 +63,12 @@ public class PlayCouponDetailsController { * 新增优惠券详情 */ @ApiOperation(value = "新增优惠券记录", notes = "新增优惠券使用记录") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败，包含详细错误信息")}) // @PreAuthorize("@customSs.hasPermission('shop:couponDetails:create')") @Log(title = "优惠券详情", businessType = BusinessType.INSERT) @PostMapping("/create") - public R create(@ApiParam(value = "优惠券记录信息", required = true) @RequestBody PlayCouponDetailsEntity playCouponDetails) { + public R create( + @ApiParam(value = "优惠券记录信息", required = true) @RequestBody PlayCouponDetailsEntity playCouponDetails) { boolean success = playCouponDetailsService.create(playCouponDetails); if (success) { return R.ok(); @@ -84,14 +79,12 @@ public class PlayCouponDetailsController { /** * 更新优惠券使用状态 * - * @param vo 优惠券实体信息 + * @param vo + * 优惠券实体信息 * @since 2024/7/4 17:15 **/ @ApiOperation(value = "更新优惠券使用状态", notes = "批量更新优惠券使用状态") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "更新失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "更新失败，包含详细错误信息")}) @PostMapping("/updateUseState") public R update(@ApiParam(value = "更新状态信息", required = true) PlayCouponDetailsUpdateUseStateVo vo) { for (String couponId : vo.getCouponIds()) { @@ -109,14 +102,12 @@ public class PlayCouponDetailsController { */ @ApiOperation(value = "修改优惠券记录", notes = "修改优惠券使用记录信息") @ApiImplicitParam(name = "id", value = "记录ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败，包含详细错误信息")}) // @PreAuthorize("@customSs.hasPermission('shop:couponDetails:edit')") @Log(title = "优惠券详情", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "优惠券记录信息", required = true) @RequestBody PlayCouponDetailsEntity playCouponDetails) { + public R update(@PathVariable String id, + @ApiParam(value = "优惠券记录信息", required = true) @RequestBody PlayCouponDetailsEntity playCouponDetails) { playCouponDetails.setId(id); boolean success = playCouponDetailsService.update(playCouponDetails); if (success) { @@ -130,9 +121,7 @@ public class PlayCouponDetailsController { */ @ApiOperation(value = "删除优惠券记录", notes = "批量删除优惠券使用记录（逻辑删除）") @ApiImplicitParam(name = "ids", value = "记录ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) // @PreAuthorize("@customSs.hasPermission('shop:couponDetails:remove')") @Log(title = "优惠券详情", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayCouponInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayCouponInfoController.java index 908b180..8307dfb 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayCouponInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayCouponInfoController.java @@ -18,13 +18,12 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; /** * 优惠券信息Controller @@ -50,8 +49,7 @@ public class PlayCouponInfoController { */ @ApiOperation(value = "分页查询优惠券列表", notes = "分页查询优惠券信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCouponInfoReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayCouponInfoReturnVo.class, responseContainer = "Page")}) // @PreAuthorize("@customSs.hasPermission('shop:coupon:list')") @PostMapping("/listByPage") public R list(@ApiParam(value = "查询条件") PlayCouponInfoQueryVo vo) { @@ -62,15 +60,14 @@ public class PlayCouponInfoController { /** * 修改优惠券上下架状态 * - * @param vo 优惠券上下架对象 + * @param vo + * 优惠券上下架对象 */ @ApiOperation(value = "更新优惠券上下架状态", notes = "修改优惠券上下架状态") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "更新失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "更新失败，包含详细错误信息")}) @PostMapping("/updateOnLineState") - public R updateOnLineState(@ApiParam(value = "状态更新信息", required = true) @Validated @RequestBody PlayCouponInfoOnLineStateUpdateVo vo) { + public R updateOnLineState( + @ApiParam(value = "状态更新信息", required = true) @Validated @RequestBody PlayCouponInfoOnLineStateUpdateVo vo) { playCouponInfoService.selectPlayCouponInfoById(vo.getId()); PlayCouponInfoEntity entity = new PlayCouponInfoEntity(); entity.setId(vo.getId()); @@ -79,33 +76,28 @@ public class PlayCouponInfoController { return R.ok(); } - /** * 发放优惠券 * - * @param vo 优惠券发放对象 + * @param vo + * 优惠券发放对象 */ @ApiOperation(value = "发放优惠券", notes = "向指定用户发放优惠券") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "发放失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "发放失败，包含详细错误信息")}) @PostMapping("/sendCoupon") public R sendCoupon(@ApiParam(value = "优惠券发放信息", required = true) @Validated @RequestBody PlayCouponInfoSendVo vo) { PlayCustomUserInfoEntity customUserInfo = playCustomUserInfoService.selectById(vo.getCustomId()); - playCouponDetailsService.create(customUserInfo.getId(), customUserInfo.getNickname(), customUserInfo.getLevelId(), vo.getId(), "2", "1"); + playCouponDetailsService.create(customUserInfo.getId(), customUserInfo.getNickname(), + customUserInfo.getLevelId(), vo.getId(), "2", "1"); return R.ok(); } - /** * 获取优惠券信息详细信息 */ @ApiOperation(value = "获取优惠券详情", notes = "根据ID获取优惠券详细信息") @ApiImplicitParam(name = "id", value = "优惠券ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCouponInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayCouponInfoEntity.class)}) // @PreAuthorize("@customSs.hasPermission('shop:coupon:query')") @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { @@ -116,10 +108,7 @@ public class PlayCouponInfoController { * 新增优惠券信息 */ @ApiOperation(value = "新增优惠券", notes = "新增优惠券信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败，包含详细错误信息")}) // @PreAuthorize("@customSs.hasPermission('shop:coupon:create')") @Log(title = "优惠券信息", businessType = BusinessType.INSERT) @PostMapping("/create") @@ -129,8 +118,10 @@ public class PlayCouponInfoController { if (vo.getProductiveTime() == null || vo.getProductiveTime().size() != 2) { throw new CustomException("用券时间输入错误"); } - LocalDateTime startTime = LocalDateTime.parse(vo.getProductiveTime().get(0), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - LocalDateTime endTime = LocalDateTime.parse(vo.getProductiveTime().get(1), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + LocalDateTime startTime = LocalDateTime.parse(vo.getProductiveTime().get(0), + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + LocalDateTime endTime = LocalDateTime.parse(vo.getProductiveTime().get(1), + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); if (endTime.isBefore(startTime)) { throw new CustomException("用券时间输入错误，结束时间大于开始时间"); } @@ -165,14 +156,12 @@ public class PlayCouponInfoController { */ @ApiOperation(value = "修改优惠券", notes = "修改优惠券信息") @ApiImplicitParam(name = "id", value = "优惠券ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败，包含详细错误信息")}) // @PreAuthorize("@customSs.hasPermission('shop:coupon:edit')") @Log(title = "优惠券信息", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "优惠券信息", required = true) @RequestBody PlayCouponInfoEntity playCouponInfo) { + public R update(@PathVariable String id, + @ApiParam(value = "优惠券信息", required = true) @RequestBody PlayCouponInfoEntity playCouponInfo) { playCouponInfo.setId(id); boolean success = playCouponInfoService.update(playCouponInfo); if (success) { @@ -186,9 +175,7 @@ public class PlayCouponInfoController { */ @ApiOperation(value = "删除优惠券", notes = "根据ID批量删除优惠券信息") @ApiImplicitParam(name = "ids", value = "优惠券ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) // @PreAuthorize("@customSs.hasPermission('shop:coupon:remove')") @Log(title = "优惠券信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayGiftInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayGiftInfoController.java index 70f8ddf..68db3f1 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayGiftInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayGiftInfoController.java @@ -8,14 +8,12 @@ import com.starry.common.enums.BusinessType; import com.starry.common.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.web.bind.annotation.*; - import javax.annotation.Resource; +import org.springframework.web.bind.annotation.*; /** * 礼物Controller @@ -35,8 +33,7 @@ public class PlayGiftInfoController { */ @ApiOperation(value = "查询礼物列表", notes = "分页查询礼物信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayGiftInfoEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayGiftInfoEntity.class, responseContainer = "Page")}) @GetMapping("/list") public R list(@ApiParam(value = "查询条件") PlayGiftInfoEntity playGiftInfo) { IPage list = playGiftInfoService.selectPlayGiftInfoByPage(playGiftInfo); @@ -48,9 +45,7 @@ public class PlayGiftInfoController { */ @ApiOperation(value = "获取礼物详情", notes = "根据ID获取礼物详细信息") @ApiImplicitParam(name = "id", value = "礼物ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayGiftInfoEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayGiftInfoEntity.class)}) @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(playGiftInfoService.selectPlayGiftInfoById(id)); @@ -60,10 +55,7 @@ public class PlayGiftInfoController { * 新增礼物 */ @ApiOperation(value = "新增礼物", notes = "新增礼物信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败，包含详细错误信息")}) @Log(title = "礼物", businessType = BusinessType.INSERT) @PostMapping("/create") public R create(@ApiParam(value = "礼物信息", required = true) @RequestBody PlayGiftInfoEntity playGiftInfo) { @@ -79,13 +71,11 @@ public class PlayGiftInfoController { */ @ApiOperation(value = "修改礼物", notes = "修改礼物信息") @ApiImplicitParam(name = "id", value = "礼物ID", required = true, paramType = "path", dataType = "String", example = "1") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败，包含详细错误信息")}) @Log(title = "礼物", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "礼物信息", required = true) @RequestBody PlayGiftInfoEntity playGiftInfo) { + public R update(@PathVariable String id, + @ApiParam(value = "礼物信息", required = true) @RequestBody PlayGiftInfoEntity playGiftInfo) { playGiftInfo.setId(id); boolean success = playGiftInfoService.update(playGiftInfo); if (success) { @@ -99,9 +89,7 @@ public class PlayGiftInfoController { */ @ApiOperation(value = "删除礼物", notes = "根据ID批量删除礼物信息") @ApiImplicitParam(name = "ids", value = "礼物ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @Log(title = "礼物", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopArticleInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopArticleInfoController.java index 9302991..04866d8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopArticleInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopArticleInfoController.java @@ -17,12 +17,11 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.Date; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import java.util.Date; - /** * 店铺文章信息Controller * @@ -42,25 +41,21 @@ public class PlayShopArticleInfoController { */ @ApiOperation(value = "分页查询文章列表", notes = "分页查询店铺文章信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayShopArticleInfoEntity.class, responseContainer = "Page") - }) - //@PreAuthorize("@customSs.hasPermission('shop:articleInfo:list')") + @ApiResponse(code = 200, message = "操作成功", response = PlayShopArticleInfoEntity.class, responseContainer = "Page")}) + // @PreAuthorize("@customSs.hasPermission('shop:articleInfo:list')") @PostMapping("/listByPage") - public R listByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayShopArticleInfoQueryVo vo) { + public R listByPage( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayShopArticleInfoQueryVo vo) { IPage list = playShopArticleInfoService.selectByPage(vo); return R.ok(list); } - /** * 新增店铺文章信息 */ @ApiOperation(value = "新增或修改文章", notes = "新增或修改店铺文章信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败，包含详细错误信息") - }) - //@PreAuthorize("@customSs.hasPermission('shop:articleInfo:add')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败，包含详细错误信息")}) + // @PreAuthorize("@customSs.hasPermission('shop:articleInfo:add')") @PostMapping("/create") public R create(@ApiParam(value = "文章信息", required = true) @Validated @RequestBody PlayShopArticleInfoAddVo vo) { PlayShopArticleInfoEntity entity = ConvertUtil.entityToVo(vo, PlayShopArticleInfoEntity.class); @@ -81,18 +76,15 @@ public class PlayShopArticleInfoController { return R.ok(); } - /** * 修改店铺文章信息 */ @ApiOperation(value = "更新文章状态", notes = "修改店铺文章状态") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败，包含详细错误信息") - }) - //@PreAuthorize("@customSs.hasPermission('shop:articleInfo:update')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败，包含详细错误信息")}) + // @PreAuthorize("@customSs.hasPermission('shop:articleInfo:update')") @PostMapping("/handleUpdateState") - public R listByPage(@ApiParam(value = "更新信息", required = true) @Validated @RequestBody PlayShopArticleInfoUpdateVo vo) { + public R listByPage( + @ApiParam(value = "更新信息", required = true) @Validated @RequestBody PlayShopArticleInfoUpdateVo vo) { PlayShopArticleInfoEntity entity = ConvertUtil.entityToVo(vo, PlayShopArticleInfoEntity.class); playShopArticleInfoService.update(entity); return R.ok(); @@ -103,15 +95,12 @@ public class PlayShopArticleInfoController { */ @ApiOperation(value = "删除文章", notes = "根据ID批量删除店铺文章信息") @ApiImplicitParam(name = "ids", value = "文章ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) - //@PreAuthorize("@customSs.hasPermission('shop:articleInfo:delete')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) + // @PreAuthorize("@customSs.hasPermission('shop:articleInfo:delete')") @Log(title = "店铺文章信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { return R.ok(playShopArticleInfoService.deleteByIds(ids)); } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopCarouselInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopCarouselInfoController.java index c3e9a9e..e88f44a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopCarouselInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopCarouselInfoController.java @@ -18,13 +18,12 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.io.IOException; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; -import java.io.IOException; - /** * 店铺首页轮播Controller * @@ -46,37 +45,33 @@ public class PlayShopCarouselInfoController { */ @ApiOperation(value = "分页查询轮播图列表", notes = "分页查询店铺首页轮播图信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayShopCarouselInfoEntity.class, responseContainer = "Page") - }) - //@PreAuthorize("@customSs.hasPermission('shop:carousel:list')") + @ApiResponse(code = 200, message = "操作成功", response = PlayShopCarouselInfoEntity.class, responseContainer = "Page")}) + // @PreAuthorize("@customSs.hasPermission('shop:carousel:list')") @PostMapping("/listByPage") - public R listByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayShopCarouselInfoQueryVo vo) { + public R listByPage( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayShopCarouselInfoQueryVo vo) { IPage list = playCarouselInfoService.selectByPage(vo); return R.ok(list); } @ApiOperation(value = "上传轮播图文件", notes = "上传店铺首页轮播图文件") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功，返回文件地址"), - @ApiResponse(code = 500, message = "上传失败，包含详细错误信息") - }) - //@PreAuthorize("@customSs.hasPermission('shop:carousel:add')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功，返回文件地址"), + @ApiResponse(code = 500, message = "上传失败，包含详细错误信息")}) + // @PreAuthorize("@customSs.hasPermission('shop:carousel:add')") @PostMapping("/uploadFile") - public R uploadFile(@ApiParam(value = "轮播图文件", required = true) @RequestParam("file") MultipartFile file) throws IOException { - String fileAddress = ossFileService.upload(file.getInputStream(), SecurityUtils.getTenantId(), file.getOriginalFilename()); + public R uploadFile(@ApiParam(value = "轮播图文件", required = true) @RequestParam("file") MultipartFile file) + throws IOException { + String fileAddress = ossFileService.upload(file.getInputStream(), SecurityUtils.getTenantId(), + file.getOriginalFilename()); return R.ok(fileAddress); } - /** * 新增页轮播列表 */ @ApiOperation(value = "新增轮播图", notes = "新增店铺首页轮播图信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败，包含详细错误信息") - }) - //@PreAuthorize("@customSs.hasPermission('shop:carousel:add')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败，包含详细错误信息")}) + // @PreAuthorize("@customSs.hasPermission('shop:carousel:add')") @PostMapping("/create") public R create(@ApiParam(value = "轮播图信息", required = true) @Validated @RequestBody PlayShopCarouselInfoAddVo vo) { PlayShopCarouselInfoEntity entity = ConvertUtil.entityToVo(vo, PlayShopCarouselInfoEntity.class); @@ -84,18 +79,15 @@ public class PlayShopCarouselInfoController { return R.ok(); } - /** * 修改页轮播状态 */ @ApiOperation(value = "更新轮播图状态", notes = "修改店铺首页轮播图状态") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败，包含详细错误信息") - }) - //@PreAuthorize("@customSs.hasPermission('shop:carousel:update')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败，包含详细错误信息")}) + // @PreAuthorize("@customSs.hasPermission('shop:carousel:update')") @PostMapping("/handleUpdateState") - public R listByPage(@ApiParam(value = "更新信息", required = true) @Validated @RequestBody PlayShopCarouselInfoUpdateStateVo vo) { + public R listByPage( + @ApiParam(value = "更新信息", required = true) @Validated @RequestBody PlayShopCarouselInfoUpdateStateVo vo) { PlayShopCarouselInfoEntity entity = ConvertUtil.entityToVo(vo, PlayShopCarouselInfoEntity.class); playCarouselInfoService.update(entity); return R.ok(); @@ -106,15 +98,12 @@ public class PlayShopCarouselInfoController { */ @ApiOperation(value = "删除轮播图", notes = "根据ID批量删除店铺首页轮播图信息") @ApiImplicitParam(name = "ids", value = "轮播图ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) - //@PreAuthorize("@customSs.hasPermission('shop:carousel:delete')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) + // @PreAuthorize("@customSs.hasPermission('shop:carousel:delete')") @Log(title = "店铺首页轮播", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { return R.ok(playCarouselInfoService.deletePlayCarouselInfoByIds(ids)); } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/ShopUiSettingController.java b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/ShopUiSettingController.java index e9a512e..f791fa0 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/ShopUiSettingController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/ShopUiSettingController.java @@ -8,12 +8,9 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; - import javax.annotation.Resource; - import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -31,14 +28,11 @@ public class ShopUiSettingController { @Resource private IShopUiSettingService shopUiSettingService; - /** * 获取店铺设置详细信息 */ @ApiOperation(value = "获取店铺设置信息", notes = "获取店铺UI设置详细信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = ShopUiSettingEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = ShopUiSettingEntity.class)}) @GetMapping(value = "/info") public R getInfo() { return R.ok(shopUiSettingService.selectShopUiSettingInfo()); @@ -48,10 +42,7 @@ public class ShopUiSettingController { * 修改店铺设置 */ @ApiOperation(value = "修改店铺设置", notes = "修改店铺UI设置信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败，包含详细错误信息") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败，包含详细错误信息")}) @PostMapping(value = "/update") public R update(@ApiParam(value = "店铺UI设置信息", required = true) @RequestBody ShopUiSettingEntity shopUiSetting) { boolean success = shopUiSettingService.update(shopUiSetting); diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayClerkGiftInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayClerkGiftInfoMapper.java index b1ec508..57dd4ad 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayClerkGiftInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayClerkGiftInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.shop.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.shop.module.entity.PlayClerkGiftInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.shop.module.entity.PlayClerkGiftInfoEntity; */ public interface PlayClerkGiftInfoMapper extends BaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCommodityAndLevelInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCommodityAndLevelInfoMapper.java index 0ba3f8d..4d4d5e4 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCommodityAndLevelInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCommodityAndLevelInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.shop.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.shop.module.entity.PlayCommodityAndLevelInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.shop.module.entity.PlayCommodityAndLevelInfoEnti */ public interface PlayCommodityAndLevelInfoMapper extends BaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCommodityInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCommodityInfoMapper.java index 1a25b0c..85fb31b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCommodityInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCommodityInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.shop.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.shop.module.entity.PlayCommodityInfoEntity; import com.starry.admin.modules.shop.module.vo.PlayCommodityInfoVo; @@ -14,25 +13,25 @@ import org.apache.ibatis.annotations.Select; */ public interface PlayCommodityInfoMapper extends MPJBaseMapper { - -// /** -// * 查询服务项目信息 -// * -// * @param id UUID -// * @return 项目信息 -// */ -// @Select("select t.id as commodityId,t.price as commodityPrice,t.item_name as serviceDuration,t1.item_name as commodityName from play_commodity_info t left join play_commodity_info t1 on t.p_id = t1.id where t.id = #{id} limit 1") -// PlayCommodityInfoVo queryCommodityInfo(String id); - + // /** + // * 查询服务项目信息 + // * + // * @param id UUID + // * @return 项目信息 + // */ + // @Select("select t.id as commodityId,t.price as commodityPrice,t.item_name as + // serviceDuration,t1.item_name as commodityName from play_commodity_info t left + // join play_commodity_info t1 on t.p_id = t1.id where t.id = #{id} limit 1") + // PlayCommodityInfoVo queryCommodityInfo(String id); /** * 查询服务项目信息 * - * @param id UUID + * @param id + * UUID * @return 项目信息 */ @Select("select t.id as commodityId,t3.price as commodityPrice,t.item_name as serviceDuration,t1.item_name as commodityName from play_commodity_info t left join play_commodity_info t1 on t.p_id = t1.id left join play_commodity_and_level_info t3 ON t3.commodity_id = t.id where t3.price is not null and t.id = #{id} and t3.level_id = #{levelId} limit 1") PlayCommodityInfoVo queryCommodityInfo(String id, String levelId); - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCouponDetailsMapper.java b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCouponDetailsMapper.java index e8dea6c..52e3acd 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCouponDetailsMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCouponDetailsMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.shop.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.shop.module.entity.PlayCouponDetailsEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.shop.module.entity.PlayCouponDetailsEntity; */ public interface PlayCouponDetailsMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCouponInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCouponInfoMapper.java index ed71a24..667786f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCouponInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCouponInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.shop.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.shop.module.entity.PlayCouponInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.shop.module.entity.PlayCouponInfoEntity; */ public interface PlayCouponInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayGiftInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayGiftInfoMapper.java index 2025ae6..195b57f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayGiftInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayGiftInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.shop.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.shop.module.entity.PlayGiftInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.shop.module.entity.PlayGiftInfoEntity; */ public interface PlayGiftInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayShopArticleInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayShopArticleInfoMapper.java index 2984d5d..7dbe4fc 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayShopArticleInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayShopArticleInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.shop.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.shop.module.entity.PlayShopArticleInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.shop.module.entity.PlayShopArticleInfoEntity; */ public interface PlayShopArticleInfoMapper extends BaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayShopCarouselInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayShopCarouselInfoMapper.java index f98d8a0..eab4092 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayShopCarouselInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayShopCarouselInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.shop.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.shop.module.entity.PlayShopCarouselInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.shop.module.entity.PlayShopCarouselInfoEntity; */ public interface PlayShopCarouselInfoMapper extends BaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/ShopUiSettingMapper.java b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/ShopUiSettingMapper.java index 0ed3091..bb3d789 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/ShopUiSettingMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/ShopUiSettingMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.shop.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.shop.module.entity.ShopUiSettingEntity; @@ -8,9 +7,8 @@ import com.starry.admin.modules.shop.module.entity.ShopUiSettingEntity; * 店铺设置Mapper接口 * * @author admin - * @since 2025-06-11 + * @since 2025-06-11 */ public interface ShopUiSettingMapper extends BaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayClerkGiftInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayClerkGiftInfoEntity.java index b170810..eb5bdbf 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayClerkGiftInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayClerkGiftInfoEntity.java @@ -16,7 +16,6 @@ import lombok.EqualsAndHashCode; @TableName("play_clerk_gift_info") public class PlayClerkGiftInfoEntity extends BaseEntity { - /** * UUID */ @@ -42,5 +41,4 @@ public class PlayClerkGiftInfoEntity extends BaseEntity */ private Long giffNumber; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayCommodityAndLevelInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayCommodityAndLevelInfoEntity.java index 3ad5d64..36e7d47 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayCommodityAndLevelInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayCommodityAndLevelInfoEntity.java @@ -2,11 +2,10 @@ package com.starry.admin.modules.shop.module.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.starry.common.domain.BaseEntity; +import java.math.BigDecimal; import lombok.Data; import lombok.EqualsAndHashCode; -import java.math.BigDecimal; - /** * 服务项目和店员等级数据对象 play_commodity_and_level_info * @@ -18,7 +17,6 @@ import java.math.BigDecimal; @TableName("play_commodity_and_level_info") public class PlayCommodityAndLevelInfoEntity extends BaseEntity { - /** * UUID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayCouponDetailsEntity.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayCouponDetailsEntity.java index 50affb4..ec59204 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayCouponDetailsEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayCouponDetailsEntity.java @@ -3,12 +3,11 @@ package com.starry.admin.modules.shop.module.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.starry.common.domain.BaseEntity; +import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - /** * 优惠券详情对象 play_coupon_details * @@ -20,7 +19,6 @@ import java.time.LocalDateTime; @TableName("play_coupon_details") public class PlayCouponDetailsEntity extends BaseEntity { - /** * UUID */ @@ -62,9 +60,8 @@ public class PlayCouponDetailsEntity extends BaseEntity private String useState; /** - - /** - * 获得时间 + * + * /** 获得时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -77,5 +74,4 @@ public class PlayCouponDetailsEntity extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime useTime; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayCouponInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayCouponInfoEntity.java index 3fb2455..f22e149 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayCouponInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayCouponInfoEntity.java @@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.starry.admin.common.conf.StringTypeHandler; import com.starry.common.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; - import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; /** * 优惠券信息对象 play_coupon_info @@ -32,7 +31,7 @@ public class PlayCouponInfoEntity extends BaseEntity { /** * 优惠券名称 **/ - private String couponName ="测试券"; + private String couponName = "测试券"; /** * 租户ID */ @@ -164,5 +163,4 @@ public class PlayCouponInfoEntity extends BaseEntity { */ private String couponOnLineState; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayGiftInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayGiftInfoEntity.java index 3cff570..6dc087d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayGiftInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayGiftInfoEntity.java @@ -3,13 +3,12 @@ package com.starry.admin.modules.shop.module.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.starry.common.domain.BaseEntity; +import java.math.BigDecimal; +import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; -import java.math.BigDecimal; -import java.time.LocalDateTime; - /** * 礼物对象 play_gift_info * @@ -21,7 +20,6 @@ import java.time.LocalDateTime; @TableName("play_gift_info") public class PlayGiftInfoEntity extends BaseEntity { - /** * UUID */ @@ -32,7 +30,6 @@ public class PlayGiftInfoEntity extends BaseEntity { */ private String tenantId; - /** * 是否是历史礼物(0:不是,1:是) */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayShopArticleInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayShopArticleInfoEntity.java index 92b9fe1..8f0da55 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayShopArticleInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayShopArticleInfoEntity.java @@ -31,7 +31,6 @@ public class PlayShopArticleInfoEntity extends BaseEntity { - /** * UUID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/ShopUiSettingEntity.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/ShopUiSettingEntity.java index 7b67627..4a8414d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/ShopUiSettingEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/ShopUiSettingEntity.java @@ -1,14 +1,10 @@ package com.starry.admin.modules.shop.module.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.starry.common.domain.BaseEntity; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import cn.hutool.core.util.StrUtil; - -import java.util.Date; - -import com.starry.common.domain.BaseEntity; /** * 店铺设置对象 shop_ui_setting @@ -21,7 +17,6 @@ import com.starry.common.domain.BaseEntity; @TableName("shop_ui_setting") public class ShopUiSettingEntity extends BaseEntity { - /** * UUID */ @@ -62,5 +57,4 @@ public class ShopUiSettingEntity extends BaseEntity { */ private String settingConfig; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoAddVo.java index be76328..27dfc4c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoAddVo.java @@ -1,10 +1,9 @@ package com.starry.admin.modules.shop.module.vo; +import javax.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotNull; - /** * 服务项目对象 play_commodity_info * @@ -15,7 +14,6 @@ import javax.validation.constraints.NotNull; @EqualsAndHashCode(callSuper = false) public class PlayCommodityInfoAddVo { - /** * 项目类型 */ @@ -40,5 +38,4 @@ public class PlayCommodityInfoAddVo { @NotNull(message = "单价不能为空") private String price; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoReturnVo.java index fe31772..1d2962c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoReturnVo.java @@ -39,7 +39,6 @@ public class PlayCommodityInfoReturnVo { */ private String serviceDuration; - /** * 启用状态(0:停用,1:启用) */ @@ -50,6 +49,4 @@ public class PlayCommodityInfoReturnVo { **/ private Integer sort; - - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoUpdateVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoUpdateVo.java index 7b202d1..5976f03 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoUpdateVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoUpdateVo.java @@ -1,10 +1,9 @@ package com.starry.admin.modules.shop.module.vo; +import javax.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotNull; - /** * 服务项目对象 play_commodity_info * @@ -30,5 +29,4 @@ public class PlayCommodityInfoUpdateVo { @NotNull(message = "单价不能为空") private String price; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoVo.java index d10993a..28d8dac 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoVo.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.shop.module.vo; -import lombok.Data; - import java.math.BigDecimal; +import lombok.Data; /** * 商品信息查询返回对象 diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponDetailsQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponDetailsQueryVo.java index 26b344f..1b10c29 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponDetailsQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponDetailsQueryVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.shop.module.vo; import com.starry.common.domain.BasePageEntity; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** * 优惠券详情查询接口 * diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponDetailsReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponDetailsReturnVo.java index 54c0c80..3e901e0 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponDetailsReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponDetailsReturnVo.java @@ -3,12 +3,11 @@ package com.starry.admin.modules.shop.module.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.starry.admin.common.conf.StringTypeHandler; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 优惠券详细信息返回列表 @@ -24,7 +23,6 @@ public class PlayCouponDetailsReturnVo { */ private String id; - /** * 顾客ID */ @@ -93,7 +91,6 @@ public class PlayCouponDetailsReturnVo { */ private String validityPeriodType; - /** * 生效时长,validityPeriodType=2时有效 **/ @@ -201,5 +198,4 @@ public class PlayCouponDetailsReturnVo { */ private String couponOnLineState; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponDetailsUpdateUseStateVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponDetailsUpdateUseStateVo.java index fab2b34..057b977 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponDetailsUpdateUseStateVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponDetailsUpdateUseStateVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.shop.module.vo; -import lombok.Data; - +import java.util.List; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; -import java.util.List; +import lombok.Data; /** * 更新优惠券使用状态 @@ -23,7 +22,6 @@ public class PlayCouponDetailsUpdateUseStateVo { @Size(min = 1, message = "优惠券ID不能为空") private List couponIds; - /** * 优惠券使用状态(1:未使用;2:已使用;3:已回收) */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoAddVo.java index 99bbfe3..972dbd4 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoAddVo.java @@ -1,12 +1,11 @@ package com.starry.admin.modules.shop.module.vo; -import lombok.Data; - +import java.math.BigDecimal; +import java.util.List; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; -import java.math.BigDecimal; -import java.util.List; +import lombok.Data; /** * 优惠券信息新增实体 @@ -127,7 +126,6 @@ public class PlayCouponInfoAddVo { @Pattern(regexp = "[0|1]", message = "店员范围只能为0或者1") private String claimConditionType; - /** * 顾客等级选择状态(0:未选择,1:选择) */ @@ -138,13 +136,11 @@ public class PlayCouponInfoAddVo { */ private List customLevel; - /** * 用户关注公众号选择状态(0:未选择,1:选择) */ private String customFollowStatusCheckType; - /** * 顾客关注公众号状态(0:未关注,1:已关注) */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoOnLineStateUpdateVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoOnLineStateUpdateVo.java index 69ba376..f0d3e37 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoOnLineStateUpdateVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoOnLineStateUpdateVo.java @@ -1,9 +1,8 @@ package com.starry.admin.modules.shop.module.vo; -import lombok.Data; - import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; +import lombok.Data; /** * 优惠券信息上架信息查询 @@ -20,7 +19,6 @@ public class PlayCouponInfoOnLineStateUpdateVo { @NotNull(message = "优惠券ID不能为空") private String id; - /** * 上下架状态不能为空 */ @@ -28,5 +26,4 @@ public class PlayCouponInfoOnLineStateUpdateVo { @Pattern(regexp = "[0|1]", message = "上下架状态不能必须为0或1") private String couponOnLineState; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoQueryVo.java index 76192ac..0728627 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoQueryVo.java @@ -14,5 +14,4 @@ import lombok.EqualsAndHashCode; @Data public class PlayCouponInfoQueryVo extends BasePageEntity { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoReturnVo.java index 8e6b01b..8e00e02 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoReturnVo.java @@ -3,12 +3,11 @@ package com.starry.admin.modules.shop.module.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.starry.admin.common.conf.StringTypeHandler; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 优惠券信息查询返回 @@ -19,7 +18,6 @@ import java.util.List; @Data public class PlayCouponInfoReturnVo { - /** * UUID */ @@ -156,5 +154,4 @@ public class PlayCouponInfoReturnVo { */ private String couponOnLineState; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoSendVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoSendVo.java index dcd24b1..6e1dc36 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoSendVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCouponInfoSendVo.java @@ -1,10 +1,9 @@ package com.starry.admin.modules.shop.module.vo; -import lombok.Data; - import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; +import lombok.Data; /** * 优惠券信息上架信息查询 @@ -21,7 +20,6 @@ public class PlayCouponInfoSendVo { @NotNull(message = "优惠券ID不能为空") private String id; - /** * 用户ID */ @@ -31,9 +29,8 @@ public class PlayCouponInfoSendVo { /** * 优惠券数量不能为空 */ - @Max(value = 1,message = "优惠券数量必须小于1") - @Min(value = 1,message = "优惠券数量必须大于1") + @Max(value = 1, message = "优惠券数量必须小于1") + @Min(value = 1, message = "优惠券数量必须大于1") private Integer sendNumber; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopArticleInfoAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopArticleInfoAddVo.java index 450f43f..37dbbe8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopArticleInfoAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopArticleInfoAddVo.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.shop.module.vo; -import lombok.Data; - import javax.validation.constraints.NotNull; +import lombok.Data; /** * 店铺文章信息新增 @@ -13,7 +12,6 @@ import javax.validation.constraints.NotNull; @Data public class PlayShopArticleInfoAddVo { - private String id; /** * 文章类型 diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopArticleInfoUpdateVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopArticleInfoUpdateVo.java index 0118eaa..0ca891f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopArticleInfoUpdateVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopArticleInfoUpdateVo.java @@ -1,11 +1,11 @@ package com.starry.admin.modules.shop.module.vo; -import lombok.Data; - import javax.validation.constraints.NotNull; +import lombok.Data; /** * 店铺文章修改实体 + * * @author admin * @since 2024/6/5 上午10:36 **/ diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoAddVo.java index 960d3fd..445712b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoAddVo.java @@ -1,12 +1,11 @@ package com.starry.admin.modules.shop.module.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import java.time.LocalDateTime; +import javax.validation.constraints.NotNull; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; - /** * @author admin * @since 2024/6/5 上午10:36 @@ -14,7 +13,6 @@ import java.time.LocalDateTime; @Data public class PlayShopCarouselInfoAddVo { - /** * 轮播图位置(0:首页) */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoQueryVo.java index 08d28e3..8dfc220 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoQueryVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.shop.module.vo; import com.starry.common.domain.BasePageEntity; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** * @author admin * @since 2024/6/5 上午10:36 @@ -24,7 +23,6 @@ public class PlayShopCarouselInfoQueryVo extends BasePageEntity { */ private String enableState; - /** * 创建时间 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoUpdateStateVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoUpdateStateVo.java index 4f7adf0..7606de7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoUpdateStateVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoUpdateStateVo.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.shop.module.vo; -import lombok.Data; - import javax.validation.constraints.NotNull; +import lombok.Data; /** * @author admin diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayClerkGiftInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayClerkGiftInfoService.java index 4c4708e..cea5719 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayClerkGiftInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayClerkGiftInfoService.java @@ -3,7 +3,6 @@ package com.starry.admin.modules.shop.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.shop.module.entity.PlayClerkGiftInfoEntity; - import java.util.List; /** @@ -14,18 +13,22 @@ import java.util.List; */ public interface IPlayClerkGiftInfoService extends IService { - /** * 根据顾客ID和礼物ID，查询当前礼物活点亮情况 - * @param giftId 礼物ID - * @param clerkId 店员ID + * + * @param giftId + * 礼物ID + * @param clerkId + * 店员ID * @return 物活点亮情况 */ PlayClerkGiftInfoEntity selectByGiftIdAndClerkId(String giftId, String clerkId); /** * 根据店员ID查询店员活动礼物列表 - * @param clerkId 店员ID + * + * @param clerkId + * 店员ID * @return 店员活动礼物列表 */ @@ -34,7 +37,8 @@ public interface IPlayClerkGiftInfoService extends IService selectPlayClerkGiftInfoByPage(PlayClerkGiftInfoEntity playClerkGiftInfo); @@ -50,7 +55,8 @@ public interface IPlayClerkGiftInfoService extends IService { - - PlayCommodityAndLevelInfoEntity queryById(String commodityId,String levelId); + PlayCommodityAndLevelInfoEntity queryById(String commodityId, String levelId); /** * 查询服务项目和店员等级数据 * @@ -26,7 +24,8 @@ public interface IPlayCommodityAndLevelInfoService extends IService selectPlayCommodityAndLevelInfoByPage(PlayCommodityAndLevelInfoEntity playCommodityAndLevelInfo); + IPage selectPlayCommodityAndLevelInfoByPage( + PlayCommodityAndLevelInfoEntity playCommodityAndLevelInfo); /** * 新增服务项目和店员等级数据 * - * @param playCommodityAndLevelInfo 服务项目和店员等级数据 + * @param playCommodityAndLevelInfo + * 服务项目和店员等级数据 * @return 结果 */ boolean create(PlayCommodityAndLevelInfoEntity playCommodityAndLevelInfo); @@ -50,7 +52,8 @@ public interface IPlayCommodityAndLevelInfoService extends IService { - /** - * * 新增租户时 - * * 初始化租户服务项目 + * * 新增租户时 * 初始化租户服务项目 * - * @param tenantId 租户ID + * @param tenantId + * 租户ID */ void initPlayCommodityInfo(String tenantId); /** * 查询服务项目 * - * @param id 服务项目ID - * @param levelId 店员等级ID + * @param id + * 服务项目ID + * @param levelId + * 店员等级ID * @return PlayCommodityInfoVo * @author admin **/ PlayCommodityInfoVo queryCommodityInfo(String id, String levelId); -// /** -// * 查询服务项目 -// * -// * @param id UUID -// * @return 服务项目 -// */ -// PlayCommodityInfoVo queryCommodityInfo(String id); + // /** + // * 查询服务项目 + // * + // * @param id UUID + // * @return 服务项目 + // */ + // PlayCommodityInfoVo queryCommodityInfo(String id); /** * 查询服务项目 * - * @param id 服务项目主键 + * @param id + * 服务项目主键 * @return 服务项目 */ PlayCommodityInfoEntity selectPlayCommodityInfoById(String id); @@ -65,7 +66,6 @@ public interface IPlayCommodityInfoService extends IService selectByType(); - /** * 查询当前租户所有服务项目列表 * @@ -73,7 +73,6 @@ public interface IPlayCommodityInfoService extends IService selectAll(); - /** * 查询当前租户所有服务项目列表 * @@ -84,7 +83,8 @@ public interface IPlayCommodityInfoService extends IService selectPlayCommodityInfoByPage(PlayCommodityInfoEntity playCommodityInfo); @@ -92,7 +92,8 @@ public interface IPlayCommodityInfoService extends IService selectByPage(PlayCouponDetailsQueryVo vo); @@ -34,41 +35,49 @@ public interface IPlayCouponDetailsService extends IService selectPlayCouponDetailsByPage(PlayCouponDetailsEntity playCouponDetails); - /** * 根据顾客ID，查询当前顾客优惠券列表 * - * @param customId 顾客ID + * @param customId + * 顾客ID * @return List * @author admin * @since 2024/7/5 11:37 **/ List selectByCustomId(String customId); - /** * 新建优惠券使用详情 * - * @param customId 用户ID - * @param customNickName 用户昵称 - * @param customLevel 用户等级 - * @param couponId 优惠券ID - * @param obtainingChannels 获得渠道（1:自主领取;2:后台发放;3:退款返还;4:分享领取;5:抽奖获得） - * @param useState 优惠券使用状态(1:未使用;2:已使用;3:已回收) + * @param customId + * 用户ID + * @param customNickName + * 用户昵称 + * @param customLevel + * 用户等级 + * @param couponId + * 优惠券ID + * @param obtainingChannels + * 获得渠道（1:自主领取;2:后台发放;3:退款返还;4:分享领取;5:抽奖获得） + * @param useState + * 优惠券使用状态(1:未使用;2:已使用;3:已回收) * @author admin * @since 2024/7/8 16:21 **/ - void create(String customId, String customNickName, String customLevel, String couponId, String obtainingChannels, String useState); + void create(String customId, String customNickName, String customLevel, String couponId, String obtainingChannels, + String useState); /** * 新增优惠券详情 * - * @param playCouponDetails 优惠券详情 + * @param playCouponDetails + * 优惠券详情 * @return 结果 */ boolean create(PlayCouponDetailsEntity playCouponDetails); @@ -76,24 +85,27 @@ public interface IPlayCouponDetailsService extends IService ids, String useState); /** * 批量删除优惠券详情 * - * @param ids 需要删除的优惠券详情主键集合 + * @param ids + * 需要删除的优惠券详情主键集合 * @return 结果 */ int deletePlayCouponDetailsByIds(String[] ids); @@ -101,7 +113,8 @@ public interface IPlayCouponDetailsService extends IService { - /** * 获取优惠券不可用的原因 * - * @param couponInfo 优惠券信息 - * @param placeType 下单类型 - * @param commodityId 商品ID - * @param commodityQuantity 商品数量 - * @param price 商品单价 + * @param couponInfo + * 优惠券信息 + * @param placeType + * 下单类型 + * @param commodityId + * 商品ID + * @param commodityQuantity + * 商品数量 + * @param price + * 商品单价 * @return 不可用原因 */ - String getCouponReasonForUnavailableUse(PlayCouponInfoEntity couponInfo, String placeType, String commodityId, Integer commodityQuantity, BigDecimal price); + String getCouponReasonForUnavailableUse(PlayCouponInfoEntity couponInfo, String placeType, String commodityId, + Integer commodityQuantity, BigDecimal price); /** * 获取优惠券不可领取的原因 * - * @param entity 优惠券实体 - * @param customUserInfo 顾客实体 + * @param entity + * 优惠券实体 + * @param customUserInfo + * 顾客实体 * @return String * @author admin * @since 2024/7/8 14:44 @@ -45,21 +51,21 @@ public interface IPlayCouponInfoService extends IService { /** * 查询优惠券信息 * - * @param id 优惠券信息主键 + * @param id + * 优惠券信息主键 * @return 优惠券信息 */ PlayCouponInfoEntity selectPlayCouponInfoById(String id); - /** * 查询优惠券信息列表 * - * @param vo 优惠券分页查询实体 + * @param vo + * 优惠券分页查询实体 * @return 优惠券信息集合 */ IPage selectByPage(PlayCouponInfoQueryVo vo); - /** * 查询优惠券信息列表 * @@ -70,7 +76,8 @@ public interface IPlayCouponInfoService extends IService { /** * 查询优惠券信息列表 * - * @param playCouponInfo 优惠券信息 + * @param playCouponInfo + * 优惠券信息 * @return 优惠券信息集合 */ IPage selectPlayCouponInfoByPage(PlayCouponInfoEntity playCouponInfo); @@ -78,7 +85,8 @@ public interface IPlayCouponInfoService extends IService { /** * 新增优惠券信息 * - * @param playCouponInfo 优惠券信息 + * @param playCouponInfo + * 优惠券信息 * @return 结果 */ boolean create(PlayCouponInfoEntity playCouponInfo); @@ -86,7 +94,8 @@ public interface IPlayCouponInfoService extends IService { /** * 修改优惠券信息 * - * @param playCouponInfo 优惠券信息 + * @param playCouponInfo + * 优惠券信息 * @return 结果 */ boolean update(PlayCouponInfoEntity playCouponInfo); @@ -94,7 +103,8 @@ public interface IPlayCouponInfoService extends IService { /** * 批量删除优惠券信息 * - * @param ids 需要删除的优惠券信息主键集合 + * @param ids + * 需要删除的优惠券信息主键集合 * @return 结果 */ int deletePlayCouponInfoByIds(String[] ids); @@ -102,7 +112,8 @@ public interface IPlayCouponInfoService extends IService { /** * 删除优惠券信息信息 * - * @param id 优惠券信息主键 + * @param id + * 优惠券信息主键 * @return 结果 */ int deletePlayCouponInfoById(String id); diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayGiftInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayGiftInfoService.java index 8f22a9d..cbe4fc0 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayGiftInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayGiftInfoService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.shop.module.entity.PlayGiftInfoEntity; import com.starry.admin.modules.weichat.entity.gift.PlayClerkGiftReturnVo; - import java.util.List; /** @@ -17,12 +16,12 @@ public interface IPlayGiftInfoService extends IService { /** * 查询礼物 * - * @param id 礼物主键 + * @param id + * 礼物主键 * @return 礼物 */ PlayGiftInfoEntity selectPlayGiftInfoById(String id); - /** * 查询所有礼物 * @@ -32,12 +31,13 @@ public interface IPlayGiftInfoService extends IService { **/ List listByAll(); - /** * 店员查询所有礼物 * - * @param clerkId 店员ID - * @param obtained 店员获得礼物状态,[0:未获得,1:已获得] + * @param clerkId + * 店员ID + * @param obtained + * 店员获得礼物状态,[0:未获得,1:已获得] * @return List * @author admin * @since 2024/4/25 15:56 @@ -47,19 +47,23 @@ public interface IPlayGiftInfoService extends IService { /** * 店员查询所有礼物 * - * @param customId 顾客ID - * @param obtained 礼物状态,[0:未获得,1:已获得] - * @param history 是否是历史礼物(0:不是,1:是) + * @param customId + * 顾客ID + * @param obtained + * 礼物状态,[0:未获得,1:已获得] + * @param history + * 是否是历史礼物(0:不是,1:是) * @return List * @author admin * @since 2024/4/25 15:56 **/ - List customListByAll(String customId,String obtained); + List customListByAll(String customId, String obtained); /** * 查询礼物列表 * - * @param playGiftInfo 礼物 + * @param playGiftInfo + * 礼物 * @return 礼物集合 */ IPage selectPlayGiftInfoByPage(PlayGiftInfoEntity playGiftInfo); @@ -67,7 +71,8 @@ public interface IPlayGiftInfoService extends IService { /** * 新增礼物 * - * @param playGiftInfo 礼物 + * @param playGiftInfo + * 礼物 * @return 结果 */ boolean create(PlayGiftInfoEntity playGiftInfo); @@ -75,7 +80,8 @@ public interface IPlayGiftInfoService extends IService { /** * 修改礼物 * - * @param playGiftInfo 礼物 + * @param playGiftInfo + * 礼物 * @return 结果 */ boolean update(PlayGiftInfoEntity playGiftInfo); @@ -83,7 +89,8 @@ public interface IPlayGiftInfoService extends IService { /** * 批量删除礼物 * - * @param ids 需要删除的礼物主键集合 + * @param ids + * 需要删除的礼物主键集合 * @return 结果 */ int deletePlayGiftInfoByIds(String[] ids); diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayShopArticleInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayShopArticleInfoService.java index dd20cfa..a1701bf 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayShopArticleInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayShopArticleInfoService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.shop.module.entity.PlayShopArticleInfoEntity; import com.starry.admin.modules.shop.module.vo.PlayShopArticleInfoQueryVo; - import java.util.List; /** @@ -17,7 +16,8 @@ public interface IPlayShopArticleInfoService extends IService selectByPage(PlayShopArticleInfoQueryVo vo); - /** * 查询店铺文章信息列表 * @@ -45,11 +46,11 @@ public interface IPlayShopArticleInfoService extends IService selectByList(); - /** * 新增店铺文章信息 * - * @param articleInfoEntity 店铺文章信息 + * @param articleInfoEntity + * 店铺文章信息 * @return 结果 */ boolean create(PlayShopArticleInfoEntity articleInfoEntity); @@ -57,7 +58,8 @@ public interface IPlayShopArticleInfoService extends IService selectByPage(PlayShopCarouselInfoQueryVo vo); - /** * 查询店铺首页轮播列表 * @@ -42,7 +41,8 @@ public interface IPlayShopCarouselInfoService extends IService { /** * 修改店铺设置 * - * @param shopUiSetting 店铺设置 + * @param shopUiSetting + * 店铺设置 * @return 结果 */ boolean update(ShopUiSettingEntity shopUiSetting); diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayClerkGiftInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayClerkGiftInfoServiceImpl.java index 1874179..6d896b0 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayClerkGiftInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayClerkGiftInfoServiceImpl.java @@ -9,11 +9,10 @@ import com.starry.admin.modules.shop.mapper.PlayClerkGiftInfoMapper; import com.starry.admin.modules.shop.module.entity.PlayClerkGiftInfoEntity; import com.starry.admin.modules.shop.service.IPlayClerkGiftInfoService; import com.starry.common.utils.IdUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; import java.util.Arrays; import java.util.List; +import javax.annotation.Resource; +import org.springframework.stereotype.Service; /** * 店员和礼物关系Service业务层处理 @@ -22,11 +21,12 @@ import java.util.List; * @since 2024-05-25 */ @Service -public class PlayClerkGiftInfoServiceImpl extends ServiceImpl implements IPlayClerkGiftInfoService { +public class PlayClerkGiftInfoServiceImpl extends ServiceImpl + implements + IPlayClerkGiftInfoService { @Resource private PlayClerkGiftInfoMapper playClerkGiftInfoMapper; - @Override public PlayClerkGiftInfoEntity selectByGiftIdAndClerkId(String giftId, String clerkId) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -38,7 +38,8 @@ public class PlayClerkGiftInfoServiceImpl extends ServiceImpl implements IPlayCommodityAndLevelInfoService { +public class PlayCommodityAndLevelInfoServiceImpl + extends + ServiceImpl + implements + IPlayCommodityAndLevelInfoService { @Resource private PlayCommodityAndLevelInfoMapper playCommodityAndLevelInfoMapper; - @Override public PlayCommodityAndLevelInfoEntity queryById(String commodityId, String levelId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -43,7 +45,8 @@ public class PlayCommodityAndLevelInfoServiceImpl extends ServiceImpl selectPlayCommodityAndLevelInfoByPage(PlayCommodityAndLevelInfoEntity playCommodityAndLevelInfo) { + public IPage selectPlayCommodityAndLevelInfoByPage( + PlayCommodityAndLevelInfoEntity playCommodityAndLevelInfo) { Page page = new Page<>(1, 10); return this.baseMapper.selectPage(page, new LambdaQueryWrapper()); } @@ -66,7 +71,8 @@ public class PlayCommodityAndLevelInfoServiceImpl extends ServiceImpl implements IPlayCommodityInfoService { +public class PlayCommodityInfoServiceImpl extends ServiceImpl + implements + IPlayCommodityInfoService { @Resource private PlayCommodityInfoMapper playCommodityInfoMapper; - @Override public void initPlayCommodityInfo(String tenantId) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PlayCommodityInfoEntity::getTenantId, tenantId); List list = playCommodityInfoMapper.selectList(lambdaQueryWrapper); if (list == null || list.isEmpty()) { - //查询默认租户的服务信息，然后复制其属性 + // 查询默认租户的服务信息，然后复制其属性 SecurityUtils.setTenantId("default"); LambdaQueryWrapper lambdaQueryWrapper1 = new LambdaQueryWrapper<>(); lambdaQueryWrapper1.eq(PlayCommodityInfoEntity::getPId, "00"); @@ -65,27 +65,31 @@ public class PlayCommodityInfoServiceImpl extends ServiceImpl selectTree() { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); lambdaQueryWrapper.selectAll(PlayCommodityInfoEntity.class); lambdaQueryWrapper.orderByDesc(PlayCommodityInfoEntity::getSort); - List list = this.baseMapper.selectJoinList(PlayCommodityInfoEntity.class, lambdaQueryWrapper); - Map> collect = list.stream().filter(a -> a != null && a.getId() != null).collect(Collectors.groupingBy(PlayCommodityInfoEntity::getPId)); + List list = this.baseMapper.selectJoinList(PlayCommodityInfoEntity.class, + lambdaQueryWrapper); + Map> collect = list.stream().filter(a -> a != null && a.getId() != null) + .collect(Collectors.groupingBy(PlayCommodityInfoEntity::getPId)); return this.assembleTree(collect, collect.get("00")); } /** * 组装数据 * - * @param data 数据，key=区域编码,value=区域列表 - * @param list 区域略表 + * @param data + * 数据，key=区域编码,value=区域列表 + * @param list + * 区域略表 * @return List * @author admin * @since 2024/4/10 15:14 **/ - public List assembleTree(Map> data, List list) { + public List assembleTree(Map> data, + List list) { if (list == null) { return new ArrayList<>(); } @@ -111,18 +115,18 @@ public class PlayCommodityInfoServiceImpl extends ServiceImpl implements IPlayCouponDetailsService { +public class PlayCouponDetailsServiceImpl extends ServiceImpl + implements + IPlayCouponDetailsService { @Resource private PlayCouponDetailsMapper playCouponDetailsMapper; /** * 查询优惠券详情 * - * @param id 优惠券详情主键 + * @param id + * 优惠券详情主键 * @return 优惠券详情 */ @Override public PlayCouponDetailsReturnVo selectPlayCouponDetailsById(String id) { MPJLambdaWrapper lambdaWrapper = new MPJLambdaWrapper<>(); lambdaWrapper.selectAll(PlayCouponDetailsEntity.class); - lambdaWrapper.leftJoin(PlayCouponInfoEntity.class, PlayCouponInfoEntity::getId, PlayCouponDetailsEntity::getCouponId); + lambdaWrapper.leftJoin(PlayCouponInfoEntity.class, PlayCouponInfoEntity::getId, + PlayCouponDetailsEntity::getCouponId); lambdaWrapper.eq(PlayCouponDetailsEntity::getId, id); return this.baseMapper.selectJoinOne(PlayCouponDetailsReturnVo.class, lambdaWrapper); } - @Override public IPage selectByPage(PlayCouponDetailsQueryVo vo) { MPJLambdaWrapper lambdaWrapper = new MPJLambdaWrapper<>(); lambdaWrapper.selectAll(PlayCouponDetailsEntity.class); lambdaWrapper.selectAll(PlayCouponInfoEntity.class); - lambdaWrapper.leftJoin(PlayCouponInfoEntity.class, PlayCouponInfoEntity::getId, PlayCouponDetailsEntity::getCouponId); + lambdaWrapper.leftJoin(PlayCouponInfoEntity.class, PlayCouponInfoEntity::getId, + PlayCouponDetailsEntity::getCouponId); if (StrUtil.isNotBlank(vo.getCouponId())) { lambdaWrapper.eq(PlayCouponDetailsEntity::getCouponId, vo.getCouponId()); } @@ -66,20 +69,22 @@ public class PlayCouponDetailsServiceImpl extends ServiceImpl(vo.getPageNum(), vo.getPageSize()), PlayCouponDetailsReturnVo.class, lambdaWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayCouponDetailsReturnVo.class, lambdaWrapper); } /** * 查询优惠券详情列表 * - * @param playCouponDetails 优惠券详情 + * @param playCouponDetails + * 优惠券详情 * @return 优惠券详情 */ @Override @@ -88,9 +93,9 @@ public class PlayCouponDetailsServiceImpl extends ServiceImpl()); } - @Override - public void create(String customId, String customNickName, String customLevel, String couponId, String obtainingChannels, String useState) { + public void create(String customId, String customNickName, String customLevel, String couponId, + String obtainingChannels, String useState) { PlayCouponDetailsEntity couponDetails = new PlayCouponDetailsEntity(); couponDetails.setId(IdUtils.getUuid()); couponDetails.setCustomId(customId); @@ -106,7 +111,8 @@ public class PlayCouponDetailsServiceImpl extends ServiceImpl ids, String useState) { for (String id : ids) { @@ -153,7 +160,8 @@ public class PlayCouponDetailsServiceImpl extends ServiceImpl implements IPlayCouponInfoService { +public class PlayCouponInfoServiceImpl extends ServiceImpl + implements + IPlayCouponInfoService { @Resource private PlayCouponInfoMapper playCouponInfoMapper; - /** * 获取优惠券不可用的原因 * - * @param couponInfo 优惠券信息 - * @param placeType 下单类型 - * @param commodityId 商品ID - * @param commodityQuantity 商品数量 + * @param couponInfo + * 优惠券信息 + * @param placeType + * 下单类型 + * @param commodityId + * 商品ID + * @param commodityQuantity + * 商品数量 * @return 不可用原因 */ @Override - public String getCouponReasonForUnavailableUse(PlayCouponInfoEntity couponInfo, String placeType, String commodityId, Integer commodityQuantity, BigDecimal price) { + public String getCouponReasonForUnavailableUse(PlayCouponInfoEntity couponInfo, String placeType, + String commodityId, Integer commodityQuantity, BigDecimal price) { if (StrUtil.isEmpty(commodityId) || commodityQuantity <= 0) { return "订单满1船票余额时可用"; } @@ -57,8 +62,9 @@ public class PlayCouponInfoServiceImpl extends ServiceImpl attributes, String attribute, String type) { + public String reasonForNotObtainingCoupons(String checkStatus, List attributes, String attribute, + String type) { if ("0".equals(checkStatus)) { return ""; } @@ -125,12 +140,11 @@ public class PlayCouponInfoServiceImpl extends ServiceImpl selectByPage(PlayCouponInfoQueryVo vo) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); lambdaQueryWrapper.selectAll(PlayCouponInfoEntity.class); lambdaQueryWrapper.orderByDesc(PlayCouponInfoEntity::getCreatedTime); - return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayCouponInfoReturnVo.class, lambdaQueryWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayCouponInfoReturnVo.class, lambdaQueryWrapper); } @Override @@ -162,7 +176,8 @@ public class PlayCouponInfoServiceImpl extends ServiceImpl implements IPlayGiftInfoService { +public class PlayGiftInfoServiceImpl extends ServiceImpl + implements + IPlayGiftInfoService { @Resource private PlayGiftInfoMapper playGiftInfoMapper; @@ -43,7 +44,8 @@ public class PlayGiftInfoServiceImpl extends ServiceImpl customListByAll(String customId, String obtained) { if ("0".equals(obtained)) { - //查询所有礼物，然后减去已获得礼物 + // 查询所有礼物，然后减去已获得礼物 MPJLambdaWrapper lambdaWrapper = new MPJLambdaWrapper<>(); lambdaWrapper.selectAll(PlayGiftInfoEntity.class); - List list = this.baseMapper.selectJoinList(PlayClerkGiftReturnVo.class, lambdaWrapper); + List list = this.baseMapper.selectJoinList(PlayClerkGiftReturnVo.class, + lambdaWrapper); List giftInfoEntities = customGiftInfoService.selectBtyCustomId(customId); // 使用迭代器安全地移除元素 Iterator iterator = list.iterator(); @@ -83,7 +85,8 @@ public class PlayGiftInfoServiceImpl extends ServiceImpl clerkListByAll(String clerkId, String obtained) { if ("0".equals(obtained)) { - //查询所有礼物，然后减去已获得礼物 + // 查询所有礼物，然后减去已获得礼物 MPJLambdaWrapper lambdaWrapper = new MPJLambdaWrapper<>(); lambdaWrapper.selectAll(PlayGiftInfoEntity.class); - List list = this.baseMapper.selectJoinList(PlayClerkGiftReturnVo.class, lambdaWrapper); + List list = this.baseMapper.selectJoinList(PlayClerkGiftReturnVo.class, + lambdaWrapper); List clerkGiftInfoEntities = clerkGiftInfoService.selectBtyClerkId(clerkId); // 使用迭代器安全地移除元素 Iterator iterator = list.iterator(); @@ -118,7 +122,8 @@ public class PlayGiftInfoServiceImpl extends ServiceImpl implements IPlayShopArticleInfoService { - +public class PlayShopArticleInfoServiceImpl extends ServiceImpl + implements + IPlayShopArticleInfoService { @Override public PlayShopArticleInfoEntity selectByType(String type) { @@ -36,7 +36,8 @@ public class PlayShopArticleInfoServiceImpl extends ServiceImpl selectByList() { return this.baseMapper.selectList(new LambdaQueryWrapper<>()); @@ -70,11 +70,11 @@ public class PlayShopArticleInfoServiceImpl extends ServiceImpl(vo.getPageNum(), vo.getPageSize()), lambdaWrapper); } - /** * 新增店铺首页轮播 * - * @param articleInfoEntity 店铺首页轮播 + * @param articleInfoEntity + * 店铺首页轮播 * @return 结果 */ @Override @@ -88,7 +88,8 @@ public class PlayShopArticleInfoServiceImpl extends ServiceImpl implements IPlayShopCarouselInfoService { +public class PlayShopCarouselInfoServiceImpl extends ServiceImpl + implements + IPlayShopCarouselInfoService { @Resource private PlayShopCarouselInfoMapper playCarouselInfoMapper; /** * 查询店铺首页轮播 * - * @param id 店铺首页轮播主键 + * @param id + * 店铺首页轮播主键 * @return 店铺首页轮播 */ @Override @@ -38,7 +40,6 @@ public class PlayShopCarouselInfoServiceImpl extends ServiceImpl selectHomeCarouselInfo() { LambdaQueryWrapper lambdaWrapper = new LambdaQueryWrapper<>(); @@ -57,17 +58,18 @@ public class PlayShopCarouselInfoServiceImpl extends ServiceImpl(vo.getPageNum(), vo.getPageSize()), lambdaWrapper); } - /** * 新增店铺首页轮播 * - * @param playCarouselInfo 店铺首页轮播 + * @param playCarouselInfo + * 店铺首页轮播 * @return 结果 */ @Override @@ -81,7 +83,8 @@ public class PlayShopCarouselInfoServiceImpl extends ServiceImpl implements IShopUiSettingService { +public class ShopUiSettingServiceImpl extends ServiceImpl + implements + IShopUiSettingService { @Resource private ShopUiSettingMapper shopUiSettingMapper; /** * 查询店铺设置 + * * @return 店铺设置 */ @Override @@ -48,11 +42,11 @@ public class ShopUiSettingServiceImpl extends ServiceImpl page = clerkUserInfoService.selectByPage(vo); IPage voPage = page.convert(u -> { List clerkLevelInfoEntity = playClerkLevelInfoService.selectAll(); String startTime = vo.getEndOrderTime() != null ? vo.getEndOrderTime().get(0) : ""; String endTime = vo.getEndOrderTime() != null ? vo.getEndOrderTime().get(1) : ""; - List orderInfoEntities = playOrderInfoService.clerkSelectOrderInfoList(u.getId(), startTime, endTime); + List orderInfoEntities = playOrderInfoService.clerkSelectOrderInfoList(u.getId(), + startTime, endTime); List groupInfoEntities = playPersonnelGroupInfoService.selectAll(); - return playClerkPerformanceService.getClerkPerformanceInfo(u, orderInfoEntities, clerkLevelInfoEntity, groupInfoEntities); + return playClerkPerformanceService.getClerkPerformanceInfo(u, orderInfoEntities, clerkLevelInfoEntity, + groupInfoEntities); }); - voPage.setRecords(voPage.getRecords().stream().sorted(Comparator.comparing(PlayClerkPerformanceInfoReturnVo::getOrderNumber).reversed()).collect(Collectors.toList())); + voPage.setRecords(voPage.getRecords().stream() + .sorted(Comparator.comparing(PlayClerkPerformanceInfoReturnVo::getOrderNumber).reversed()) + .collect(Collectors.toList())); return R.ok(voPage); } - @ApiOperation(value = "按日查询业绩", notes = "按日期查询店员业绩统计信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PostMapping("/listByTime") - public R listByTime(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkPerformanceInfoQueryVo vo) { - //时间范围 + public R listByTime( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkPerformanceInfoQueryVo vo) { + // 时间范围 List dates = getDateRangeByDay(vo.getEndOrderTime().get(0), vo.getEndOrderTime().get(1)); - //指定时间内所有订单 -// List orderInfoEntities = playOrderInfoService.listByTime("", vo.getEndOrderTime().get(0), vo.getEndOrderTime().get(1), Stream.of("2", "3").collect(Collectors.toList())); - List orderInfoEntities = playOrderInfoService.listByTime("", vo.getEndOrderTime().get(0), vo.getEndOrderTime().get(1), new ArrayList<>()); + // 指定时间内所有订单 + // List orderInfoEntities = + // playOrderInfoService.listByTime("", vo.getEndOrderTime().get(0), + // vo.getEndOrderTime().get(1), Stream.of("2", + // "3").collect(Collectors.toList())); + List orderInfoEntities = playOrderInfoService.listByTime("", vo.getEndOrderTime().get(0), + vo.getEndOrderTime().get(1), new ArrayList<>()); List orders = new ArrayList<>(dates.size()); for (String date : dates) { orders.add(getPerformanceInfo(date, orderInfoEntities)); @@ -102,22 +106,24 @@ public class PlayClerkPerformanceController { return R.ok(resultMap); } - @ApiOperation(value = "按月查询业绩", notes = "按月份查询店员业绩统计信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PostMapping("/listByMonth") - public R listByMonth(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkPerformanceInfoQueryVo vo) { - String startTime = LocalDate.of(Integer.parseInt(vo.getEndOrderTime().get(0).split("-")[0]), Integer.parseInt(vo.getEndOrderTime().get(0).split("-")[1]), 1).toString() + " 00:00:00"; - LocalDate endDate = LocalDate.of(Integer.parseInt(vo.getEndOrderTime().get(1).split("-")[0]), Integer.parseInt(vo.getEndOrderTime().get(1).split("-")[1]), 1); + public R listByMonth( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkPerformanceInfoQueryVo vo) { + String startTime = LocalDate.of(Integer.parseInt(vo.getEndOrderTime().get(0).split("-")[0]), + Integer.parseInt(vo.getEndOrderTime().get(0).split("-")[1]), 1).toString() + " 00:00:00"; + LocalDate endDate = LocalDate.of(Integer.parseInt(vo.getEndOrderTime().get(1).split("-")[0]), + Integer.parseInt(vo.getEndOrderTime().get(1).split("-")[1]), 1); String endTime = endDate.with(TemporalAdjusters.lastDayOfMonth()) + " 23:59:59"; - List dates = getDateRangeByMonth(startTime, endTime); - //指定时间内所有订单 -// List orderInfoEntities = playOrderInfoService.listByTime("", startTime, endTime, Stream.of("4").collect(Collectors.toList())); - List orderInfoEntities = playOrderInfoService.listByTime("", startTime, endTime, new ArrayList<>()); + // 指定时间内所有订单 + // List orderInfoEntities = + // playOrderInfoService.listByTime("", startTime, endTime, + // Stream.of("4").collect(Collectors.toList())); + List orderInfoEntities = playOrderInfoService.listByTime("", startTime, endTime, + new ArrayList<>()); List orders = new ArrayList<>(dates.size()); for (String date : dates) { orders.add(getPerformanceInfo(date, orderInfoEntities)); @@ -129,12 +135,13 @@ public class PlayClerkPerformanceController { return R.ok(resultMap); } - /** * 根据订单开始时间和结束时间，组装订单统计信息的查询时间范围 * - * @param startTime 开始时间 - * @param endTime 结束时间 + * @param startTime + * 开始时间 + * @param endTime + * 结束时间 * @return 时间范围 */ public List getDateRangeByDay(String startTime, String endTime) { @@ -152,8 +159,10 @@ public class PlayClerkPerformanceController { /** * 根据订单开始时间和结束时间，组装订单统计信息的查询时间范围 * - * @param startTime 开始时间 - * @param endTime 结束时间 + * @param startTime + * 开始时间 + * @param endTime + * 结束时间 * @return 时间范围 */ public List getDateRangeByMonth(String startTime, String endTime) { @@ -168,7 +177,6 @@ public class PlayClerkPerformanceController { return dates; } - public PlayClerkPerformanceInfoReturnVo getTotalInfo(List orderInfoEntities) { Set customIds = new HashSet<>(); int orderContinueNumber = 0; @@ -220,24 +228,28 @@ public class PlayClerkPerformanceController { /** * 组装统计数据 * - * @param performanceDate 统计时间 - * @param orderInfoEntities 订单列表 + * @param performanceDate + * 统计时间 + * @param orderInfoEntities + * 订单列表 * @return 统计数据 */ - public PlayClerkPerformanceInfoReturnVo getPerformanceInfo(String performanceDate, List orderInfoEntities) { - - + public PlayClerkPerformanceInfoReturnVo getPerformanceInfo(String performanceDate, + List orderInfoEntities) { List itemOrderInfo = new ArrayList<>(); for (PlayOrderInfoEntity orderInfoEntity : orderInfoEntities) { - //接单时间，在指定日期的 00:00:00点到23:59：59之间 - if (orderInfoEntity.getPurchaserTime().isAfter(LocalDateTime.parse(performanceDate + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))) && orderInfoEntity.getPurchaserTime().isBefore(LocalDateTime.parse(performanceDate + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))) { + // 接单时间，在指定日期的 00:00:00点到23:59：59之间 + if (orderInfoEntity.getPurchaserTime() + .isAfter(LocalDateTime.parse(performanceDate + " 00:00:00", + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))) + && orderInfoEntity.getPurchaserTime().isBefore(LocalDateTime.parse(performanceDate + " 23:59:59", + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))) { itemOrderInfo.add(orderInfoEntity); } } - Set customIds = new HashSet<>(); int orderContinueNumber = 0; int orderRefundNumber = 0; diff --git a/play-admin/src/main/java/com/starry/admin/modules/statistics/module/vo/PlayClerkPerformanceInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/statistics/module/vo/PlayClerkPerformanceInfoQueryVo.java index 367f267..904af8d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/statistics/module/vo/PlayClerkPerformanceInfoQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/statistics/module/vo/PlayClerkPerformanceInfoQueryVo.java @@ -3,11 +3,10 @@ package com.starry.admin.modules.statistics.module.vo; import com.starry.common.domain.BasePageEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** * @author admin * @since 2024/6/10 下午8:58 @@ -15,7 +14,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Data @ApiModel(value = "店员业绩查询参数", description = "查询店员业绩统计信息的条件参数") -public class PlayClerkPerformanceInfoQueryVo extends BasePageEntity { +public class PlayClerkPerformanceInfoQueryVo extends BasePageEntity { /** * 分组ID @@ -23,21 +22,18 @@ public class PlayClerkPerformanceInfoQueryVo extends BasePageEntity { @ApiModelProperty(value = "分组ID", example = "1", notes = "店员所属分组ID") private String groupId; - /** * 店员ID */ @ApiModelProperty(value = "店员ID", example = "1", notes = "店员ID") private String clerkId; - /** * 店员性别 */ @ApiModelProperty(value = "店员性别", example = "1", notes = "店员性别，1男2女") private String sex; - /** * 店员上架状态 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/statistics/module/vo/PlayClerkPerformanceInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/statistics/module/vo/PlayClerkPerformanceInfoReturnVo.java index 22bae1e..6bff598 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/statistics/module/vo/PlayClerkPerformanceInfoReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/statistics/module/vo/PlayClerkPerformanceInfoReturnVo.java @@ -2,9 +2,8 @@ package com.starry.admin.modules.statistics.module.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.math.BigDecimal; +import lombok.Data; /** * @author admin @@ -14,7 +13,6 @@ import java.math.BigDecimal; @ApiModel(value = "店员业绩返回数据", description = "店员业绩统计信息的返回数据") public class PlayClerkPerformanceInfoReturnVo { - /** * 店员ID */ @@ -159,5 +157,4 @@ public class PlayClerkPerformanceInfoReturnVo { @ApiModelProperty(value = "统计时间", example = "2024-06-01") private String performanceDate; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/statistics/service/IPlayClerkPerformanceService.java b/play-admin/src/main/java/com/starry/admin/modules/statistics/service/IPlayClerkPerformanceService.java index 4ca7355..155904a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/statistics/service/IPlayClerkPerformanceService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/statistics/service/IPlayClerkPerformanceService.java @@ -5,7 +5,6 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity; import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity; import com.starry.admin.modules.personnel.module.entity.PlayPersonnelGroupInfoEntity; import com.starry.admin.modules.statistics.module.vo.PlayClerkPerformanceInfoReturnVo; - import java.util.List; /** @@ -14,15 +13,20 @@ import java.util.List; **/ public interface IPlayClerkPerformanceService { - /** * 根据店员订单ID，生成店员业绩信息 * - * @param userInfo 店员信息 - * @param orderInfoEntities 店员订单列表 - * @param clerkLevelInfoEntity 店员等级信息 - * @param groupInfoEntities 店员分组信息 + * @param userInfo + * 店员信息 + * @param orderInfoEntities + * 店员订单列表 + * @param clerkLevelInfoEntity + * 店员等级信息 + * @param groupInfoEntities + * 店员分组信息 * @return 业绩信息 */ - PlayClerkPerformanceInfoReturnVo getClerkPerformanceInfo(PlayClerkUserInfoEntity userInfo, List orderInfoEntities, List clerkLevelInfoEntity, List groupInfoEntities); + PlayClerkPerformanceInfoReturnVo getClerkPerformanceInfo(PlayClerkUserInfoEntity userInfo, + List orderInfoEntities, List clerkLevelInfoEntity, + List groupInfoEntities); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/statistics/service/impl/PlayClerkPerformanceServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/statistics/service/impl/PlayClerkPerformanceServiceImpl.java index 7de703d..9808d12 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/statistics/service/impl/PlayClerkPerformanceServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/statistics/service/impl/PlayClerkPerformanceServiceImpl.java @@ -6,12 +6,11 @@ import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity; import com.starry.admin.modules.personnel.module.entity.PlayPersonnelGroupInfoEntity; import com.starry.admin.modules.statistics.module.vo.PlayClerkPerformanceInfoReturnVo; import com.starry.admin.modules.statistics.service.IPlayClerkPerformanceService; -import org.springframework.stereotype.Service; - import java.math.BigDecimal; import java.util.HashSet; import java.util.List; import java.util.Set; +import org.springframework.stereotype.Service; /** * @author admin @@ -21,7 +20,9 @@ import java.util.Set; public class PlayClerkPerformanceServiceImpl implements IPlayClerkPerformanceService { @Override - public PlayClerkPerformanceInfoReturnVo getClerkPerformanceInfo(PlayClerkUserInfoEntity userInfo, List orderInfoEntities, List clerkLevelInfoEntities, List groupInfoEntities) { + public PlayClerkPerformanceInfoReturnVo getClerkPerformanceInfo(PlayClerkUserInfoEntity userInfo, + List orderInfoEntities, List clerkLevelInfoEntities, + List groupInfoEntities) { Set customIds = new HashSet<>(); int orderContinueNumber = 0; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/AdministrativeAreaDictInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/AdministrativeAreaDictInfoController.java index 280ee1e..9e200c8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/AdministrativeAreaDictInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/AdministrativeAreaDictInfoController.java @@ -6,13 +6,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; - /** * 行政区域字典信息Controller * @@ -30,9 +29,7 @@ public class AdministrativeAreaDictInfoController { * 查询省/市行政区域代码 */ @ApiOperation(value = "获取行政区域树", notes = "查询省/市行政区域代码的树形结构") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PreAuthorize("@customSs.hasPermission('play:info:list')") @GetMapping("/tree") public R list() throws Exception { diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/CacheController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/CacheController.java index f4d1240..607c485 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/CacheController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/CacheController.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.controller; - import com.starry.admin.modules.system.module.entity.Cache; import com.starry.common.constant.CacheConstants; import com.starry.common.result.R; @@ -10,18 +9,16 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.*; +import javax.annotation.Resource; import org.springframework.data.redis.connection.RedisServerCommands; import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import java.util.*; - /** - * @author huoqiang - * 缓存监控 + * @author huoqiang 缓存监控 * @since 2022/10/17 */ @Api(tags = "缓存监控", description = "系统缓存监控相关接口") @@ -40,14 +37,13 @@ public class CacheController { } @ApiOperation(value = "获取缓存信息", notes = "获取Redis服务器信息和命令统计") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Map.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Map.class)}) @PreAuthorize("@customSs.hasPermission('monitor:cache:list')") @GetMapping() public R getInfo() throws Exception { Properties info = (Properties) redisTemplate.execute((RedisCallback) RedisServerCommands::info); - Properties commandStats = (Properties) redisTemplate.execute((RedisCallback) connection -> connection.info("commandstats")); + Properties commandStats = (Properties) redisTemplate + .execute((RedisCallback) connection -> connection.info("commandstats")); Object dbSize = redisTemplate.execute((RedisCallback) RedisServerCommands::dbSize); Map result = new HashMap<>(3); @@ -66,9 +62,7 @@ public class CacheController { } @ApiOperation(value = "获取缓存名称", notes = "获取系统中所有缓存分类名称") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Cache.class, responseContainer = "List") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Cache.class, responseContainer = "List")}) @PreAuthorize("@customSs.hasPermission('monitor:cache:list')") @GetMapping("/getNames") public R cache() { @@ -77,9 +71,7 @@ public class CacheController { @ApiOperation(value = "获取缓存键名", notes = "根据缓存名称获取对应的所有缓存键") @ApiImplicitParam(name = "cacheName", value = "缓存名称", required = true, dataType = "String", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = String.class, responseContainer = "Set") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = String.class, responseContainer = "Set")}) @PreAuthorize("@customSs.hasPermission('monitor:cache:list')") @GetMapping("/getKeys/{cacheName}") public R getCacheKeys(@PathVariable String cacheName) { @@ -88,9 +80,7 @@ public class CacheController { } @ApiOperation(value = "获取缓存值", notes = "根据缓存名称和键名获取缓存值") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Cache.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Cache.class)}) @PreAuthorize("@customSs.hasPermission('monitor:cache:list')") @GetMapping("/getValue/{cacheName}/{cacheKey}") public R getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey) { @@ -101,9 +91,7 @@ public class CacheController { @ApiOperation(value = "清除缓存名称", notes = "清除指定缓存名称下的所有缓存") @ApiImplicitParam(name = "cacheName", value = "缓存名称", required = true, dataType = "String", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PreAuthorize("@customSs.hasPermission('monitor:cache:list')") @DeleteMapping("/clearCacheName/{cacheName}") public R clearCacheName(@PathVariable String cacheName) { @@ -114,9 +102,7 @@ public class CacheController { @ApiOperation(value = "清除缓存键", notes = "清除指定的缓存键") @ApiImplicitParam(name = "cacheKey", value = "缓存键", required = true, dataType = "String", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PreAuthorize("@customSs.hasPermission('monitor:cache:list')") @DeleteMapping("/clearCacheKey/{cacheKey}") public R clearCacheKey(@PathVariable String cacheKey) { @@ -125,9 +111,7 @@ public class CacheController { } @ApiOperation(value = "清除所有缓存", notes = "清除系统中所有缓存数据") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PreAuthorize("@customSs.hasPermission('monitor:cache:list')") @DeleteMapping("/clearCacheAll") public R clearCacheAll() { diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/HealthController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/HealthController.java index a7d7b74..ec5f3b9 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/HealthController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/HealthController.java @@ -5,17 +5,17 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.Map; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * Health Check Controller + * * @author admin * @since 2025/08/30 */ @@ -25,9 +25,7 @@ import java.util.Map; public class HealthController { @ApiOperation(value = "健康检查", notes = "检查服务是否正常运行") - @ApiResponses({ - @ApiResponse(code = 200, message = "服务正常运行") - }) + @ApiResponses({@ApiResponse(code = 200, message = "服务正常运行")}) @GetMapping public R health() { Map data = new HashMap<>(); @@ -39,11 +37,9 @@ public class HealthController { } @ApiOperation(value = "简单检查", notes = "最简单的存活检查") - @ApiResponses({ - @ApiResponse(code = 200, message = "服务正常") - }) + @ApiResponses({@ApiResponse(code = 200, message = "服务正常")}) @GetMapping("/ping") public R ping() { return R.ok("pong"); } -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/LoginController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/LoginController.java index c35b6b4..d6aeb53 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/LoginController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/LoginController.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.controller; - import com.starry.admin.common.component.JwtToken; import com.starry.admin.common.domain.LoginUser; import com.starry.admin.modules.system.module.entity.SysMenuEntity; @@ -17,6 +16,11 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; @@ -24,12 +28,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * @author admin */ @@ -51,10 +49,8 @@ public class LoginController { private JwtToken jwtToken; @ApiOperation(value = "旧版登录", notes = "用户登录接口，返回Token") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Map.class), - @ApiResponse(code = 500, message = "登录失败，用户名或密码错误") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Map.class), + @ApiResponse(code = 500, message = "登录失败，用户名或密码错误")}) @PostMapping(value = "old-login") public R login(@ApiParam(value = "登录信息", required = true) @RequestBody LoginVo loginVo) { // 只有开启了验证码功能才需要验证 @@ -75,10 +71,8 @@ public class LoginController { } @ApiOperation(value = "获取用户信息", notes = "登录后获取当前用户的详细信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Map.class), - @ApiResponse(code = 401, message = "未授权") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Map.class), + @ApiResponse(code = 401, message = "未授权")}) @GetMapping("get-info") public R getInfo() { SysUserEntity user = SecurityUtils.getLoginUser().getUser(); @@ -99,9 +93,7 @@ public class LoginController { } @ApiOperation(value = "获取路由信息", notes = "登录后获取当前用户的菜单路由信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = RouterVo.class, responseContainer = "List") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = RouterVo.class, responseContainer = "List")}) @GetMapping("get-routers") public R getRoutes() { List menus = menuService.selectMenuTreeByUserId(SecurityUtils.getUserId()); @@ -110,10 +102,8 @@ public class LoginController { } @ApiOperation(value = "新版登录", notes = "新版用户登录接口，支持租户") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Map.class), - @ApiResponse(code = 500, message = "登录失败，验证码错误或用户名密码错误") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Map.class), + @ApiResponse(code = 500, message = "登录失败，验证码错误或用户名密码错误")}) @PostMapping(value = "login") public R newLogin(@ApiParam(value = "登录信息", required = true) @RequestBody LoginVo loginVo) { // 只有开启了验证码功能才需要验证 @@ -124,25 +114,27 @@ public class LoginController { } } // 用户登录 - LoginUser userInfo = loginService.newLogin(loginVo.getUserName(), loginVo.getPassWord(), loginVo.getTenantKey()); + LoginUser userInfo = loginService.newLogin(loginVo.getUserName(), loginVo.getPassWord(), + loginVo.getTenantKey()); Map tokenMap = jwtToken.createToken(userInfo); return R.ok(tokenMap); } - - //@ApiOperation(value = "租户登录") - //@PostMapping(value = "tenant/login") - //public R TenantLoginVo(@RequestBody TenantLoginVo loginVo) { - // // 只有开启了验证码功能才需要验证 - // if (needAuthCode) { - // String msg = captchaService.checkImageCode(loginVo.getNonceStr(), loginVo.getValue()); - // if (StringUtils.isNotBlank(msg)) { - // return R.error(msg); - // } - // } - // // 用户登录 - // LoginUser userInfo = loginService.tenantLogin(loginVo.getTenantkey(), loginVo.getUserName(), loginVo.getPassWord()); - // Map tokenMap = jwtToken.createToken(userInfo); - // return R.ok(tokenMap); - //} + // @ApiOperation(value = "租户登录") + // @PostMapping(value = "tenant/login") + // public R TenantLoginVo(@RequestBody TenantLoginVo loginVo) { + // // 只有开启了验证码功能才需要验证 + // if (needAuthCode) { + // String msg = captchaService.checkImageCode(loginVo.getNonceStr(), + // loginVo.getValue()); + // if (StringUtils.isNotBlank(msg)) { + // return R.error(msg); + // } + // } + // // 用户登录 + // LoginUser userInfo = loginService.tenantLogin(loginVo.getTenantkey(), + // loginVo.getUserName(), loginVo.getPassWord()); + // Map tokenMap = jwtToken.createToken(userInfo); + // return R.ok(tokenMap); + // } } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/ServerController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/ServerController.java index e05a0dd..63cd0b9 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/ServerController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/ServerController.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.controller; - import com.starry.admin.modules.system.module.entity.Server; import com.starry.common.result.R; import io.swagger.annotations.Api; @@ -13,8 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * @author huoqiang - * 服务器监控 + * @author huoqiang 服务器监控 * @since 2022/10/17 */ @Api(tags = "服务器监控", description = "服务器状态监控相关接口") @@ -23,9 +21,7 @@ import org.springframework.web.bind.annotation.RestController; public class ServerController { @ApiOperation(value = "获取服务器信息", notes = "获取服务器运行状态、CPU、内存等信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Server.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Server.class)}) @PreAuthorize("@customSs.hasPermission('monitor:server:list')") @GetMapping() public R getInfo() throws Exception { diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDeptController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDeptController.java index ffa66c6..e1263c5 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDeptController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDeptController.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.controller; - import com.starry.admin.common.domain.TreeSelect; import com.starry.admin.modules.system.module.entity.SysDeptEntity; import com.starry.admin.modules.system.service.SysDeptService; @@ -12,12 +11,11 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; import java.util.Collections; import java.util.List; +import javax.annotation.Resource; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; /** *

@@ -37,8 +35,7 @@ public class SysDeptController { @ApiOperation(value = "获取部门列表", notes = "根据条件查询部门列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysDeptEntity.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = SysDeptEntity.class, responseContainer = "List")}) @PreAuthorize("@customSs.hasPermission('system:dept:list')") @GetMapping("/list") public R list(@ApiParam(value = "查询条件") SysDeptEntity dept) { @@ -47,10 +44,7 @@ public class SysDeptController { } @ApiOperation(value = "添加部门", notes = "创建新的部门") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败，部门名称已存在") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败，部门名称已存在")}) @PreAuthorize("@customSs.hasPermission('system:dept:create')") @PostMapping("/create") public R creat(@ApiParam(value = "部门信息", required = true) @RequestBody SysDeptEntity dept) { @@ -66,10 +60,8 @@ public class SysDeptController { @ApiOperation(value = "修改部门", notes = "根据ID修改部门信息") @ApiImplicitParam(name = "id", value = "部门ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败，部门名称已存在或上级部门不能是自己") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), + @ApiResponse(code = 500, message = "修改失败，部门名称已存在或上级部门不能是自己")}) @PreAuthorize("@customSs.hasPermission('system:dept:edit')") @PostMapping("/update/{id}") public R update(@PathVariable Long id, @ApiParam(value = "部门信息", required = true) @RequestBody SysDeptEntity dept) { @@ -88,10 +80,7 @@ public class SysDeptController { @ApiOperation(value = "删除部门", notes = "根据ID删除部门") @ApiImplicitParam(name = "id", value = "部门ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "删除失败，存在下级部门") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "删除失败，存在下级部门")}) @PreAuthorize("@customSs.hasPermission('system:dept:delete')") @PostMapping(value = "/delete/{id}") public R delete(@PathVariable("id") Long deptId) { @@ -106,9 +95,7 @@ public class SysDeptController { } @ApiOperation(value = "获取部门下拉树列表", notes = "获取部门的树形结构数据") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = TreeSelect.class, responseContainer = "List") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = TreeSelect.class, responseContainer = "List")}) @GetMapping("/treeselect") public R treeselect(@ApiParam(value = "查询条件") SysDeptEntity dept) { List list = deptService.selectDeptList(dept); @@ -118,13 +105,10 @@ public class SysDeptController { @ApiOperation(value = "获取部门详情", notes = "根据部门ID获取详细信息") @ApiImplicitParam(name = "deptId", value = "部门ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysDeptEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = SysDeptEntity.class)}) @GetMapping(value = "/{deptId}") public R getInfo(@PathVariable Long deptId) { return R.ok(deptService.getById(deptId)); } } - diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDictController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDictController.java index cd4a6d8..351dc51 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDictController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDictController.java @@ -9,18 +9,15 @@ import com.starry.common.enums.BusinessType; import com.starry.common.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.List; +import javax.annotation.Resource; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import java.util.List; - - /** * 字典表Controller * @@ -38,8 +35,7 @@ public class SysDictController { */ @ApiOperation(value = "查询字典类型列表", notes = "分页查询字典类型列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysDictEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = SysDictEntity.class, responseContainer = "Page")}) @PreAuthorize("@customSs.hasPermission('system:dict:list')") @GetMapping("/list") public R list(@ApiParam(value = "查询条件") SysDictVo dictVo) { @@ -47,15 +43,12 @@ public class SysDictController { return R.ok(list); } - /** * 获取字典表详细信息 */ @ApiOperation(value = "获取字典类型详情", notes = "根据ID获取字典类型详细信息") @ApiImplicitParam(name = "dictId", value = "字典ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysDictEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = SysDictEntity.class)}) @PreAuthorize("@customSs.hasPermission('system:dict:query')") @GetMapping(value = "/{dictId}") public R getInfo(@PathVariable("dictId") Long dictId) { @@ -66,10 +59,7 @@ public class SysDictController { * 新增字典表 */ @ApiOperation(value = "新增字典类型", notes = "创建新的字典类型") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @PreAuthorize("@customSs.hasPermission('system:dict:create')") @Log(title = "字典表", businessType = BusinessType.INSERT) @PostMapping("/create") @@ -86,14 +76,12 @@ public class SysDictController { */ @ApiOperation(value = "修改字典类型", notes = "根据ID修改字典类型") @ApiImplicitParam(name = "dictId", value = "字典ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @PreAuthorize("@customSs.hasPermission('system:dict:edit')") @Log(title = "字典表", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{dictId}") - public R update(@PathVariable Long dictId, @ApiParam(value = "字典类型信息", required = true) @RequestBody SysDictEntity sysDictEntity) { + public R update(@PathVariable Long dictId, + @ApiParam(value = "字典类型信息", required = true) @RequestBody SysDictEntity sysDictEntity) { sysDictEntity.setDictId(dictId); boolean success = xlDictService.update(sysDictEntity); if (success) { @@ -107,9 +95,7 @@ public class SysDictController { */ @ApiOperation(value = "删除字典类型", notes = "根据ID批量删除字典类型") @ApiImplicitParam(name = "dictIds", value = "字典ID数组", required = true, dataType = "Long[]", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Boolean.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Boolean.class)}) @PreAuthorize("@customSs.hasPermission('system:dict:remove')") @Log(title = "字典表", businessType = BusinessType.DELETE) @DeleteMapping("/{dictIds}") @@ -119,8 +105,7 @@ public class SysDictController { @ApiOperation(value = "获取字典选择列表", notes = "获取所有字典类型的下拉选择数据") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysDictEntity.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = SysDictEntity.class, responseContainer = "List")}) @GetMapping("/optionselect") public R optionselect() { List list = xlDictService.selectDictTypeAll(); @@ -131,9 +116,7 @@ public class SysDictController { * 刷新字典缓存 */ @ApiOperation(value = "刷新字典缓存", notes = "清除并重新加载字典缓存") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PreAuthorize("@customSs.hasPermission('system:dict:remove')") @Log(title = "字典类型", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDictDataController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDictDataController.java index a00e96e..86ad4dd 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDictDataController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDictDataController.java @@ -13,13 +13,11 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; - +import javax.annotation.Resource; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; /** * 字典数据表Controller @@ -38,23 +36,19 @@ public class SysDictDataController { */ @ApiOperation(value = "查询字典数据列表", notes = "根据条件查询字典数据项列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysDictDataEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = SysDictDataEntity.class, responseContainer = "Page")}) @PreAuthorize("@customSs.hasPermission('system:dict:list')") @GetMapping("/list") public R list(@ApiParam(value = "查询条件") SysDictDataVo sysDictDataEntity) { return R.ok(xlDictDataService.selectXlDictDataList(sysDictDataEntity)); } - /** * 获取字典数据表详细信息 */ @ApiOperation(value = "获取字典数据详情", notes = "根据ID获取字典数据项详细信息") @ApiImplicitParam(name = "dictDataId", value = "字典数据ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysDictDataEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = SysDictDataEntity.class)}) @PreAuthorize("@customSs.hasPermission('system:dict:query')") @GetMapping(value = "/{dictDataId}") public R getInfo(@PathVariable("dictDataId") Long dictDataId) { @@ -65,10 +59,7 @@ public class SysDictDataController { * 新增字典数据表 */ @ApiOperation(value = "新增字典数据", notes = "创建新的字典数据项") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @PreAuthorize("@customSs.hasPermission('system:dict:create')") @Log(title = "字典数据表", businessType = BusinessType.INSERT) @PostMapping("/create") @@ -85,14 +76,12 @@ public class SysDictDataController { */ @ApiOperation(value = "修改字典数据", notes = "根据ID修改字典数据项") @ApiImplicitParam(name = "dictDataId", value = "字典数据ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @PreAuthorize("@customSs.hasPermission('system:dict:edit')") @Log(title = "字典数据表", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{dictDataId}") - public R update(@PathVariable Long dictDataId, @ApiParam(value = "字典数据信息", required = true) @RequestBody SysDictDataEntity sysDictDataEntity) { + public R update(@PathVariable Long dictDataId, + @ApiParam(value = "字典数据信息", required = true) @RequestBody SysDictDataEntity sysDictDataEntity) { sysDictDataEntity.setDictDataId(dictDataId); boolean success = xlDictDataService.update(sysDictDataEntity); if (success) { @@ -106,9 +95,7 @@ public class SysDictDataController { */ @ApiOperation(value = "删除字典数据", notes = "根据ID批量删除字典数据项") @ApiImplicitParam(name = "dictDataIds", value = "字典数据ID数组", required = true, dataType = "Long[]", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Boolean.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Boolean.class)}) @PreAuthorize("@customSs.hasPermission('system:dict:remove')") @Log(title = "字典数据表", businessType = BusinessType.DELETE) @DeleteMapping("/{dictDataIds}") @@ -122,8 +109,7 @@ public class SysDictDataController { @ApiOperation(value = "根据类型查询字典数据", notes = "根据字典类型查询对应的字典数据项列表") @ApiImplicitParam(name = "dictType", value = "字典类型", required = true, dataType = "String", paramType = "path") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysDictDataEntity.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = SysDictDataEntity.class, responseContainer = "List")}) @GetMapping(value = "/type/{dictType}") public R getDictDataByType(@PathVariable String dictType) { List list = xlDictDataService.selectDictDataByType(dictType); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysLoginLogController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysLoginLogController.java index 1e70046..b06979b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysLoginLogController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysLoginLogController.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.controller; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.starry.admin.modules.system.module.entity.SysLoginLogEntity; import com.starry.admin.modules.system.module.entity.SysLoginLogVo; @@ -11,17 +10,14 @@ import com.starry.common.enums.BusinessType; import com.starry.common.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; - +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; /** * 系统访问日志表Controller @@ -40,8 +36,7 @@ public class SysLoginLogController { */ @ApiOperation(value = "查询日志列表", notes = "分页查询系统访问日志列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysLoginLogEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = SysLoginLogEntity.class, responseContainer = "Page")}) @PreAuthorize("@customSs.hasPermission('system:loginlog:list')") @GetMapping("/list") public R list(@ApiParam(value = "查询条件") SysLoginLogVo vo) { @@ -53,9 +48,7 @@ public class SysLoginLogController { * 导出系统访问日志表列表 */ @ApiOperation(value = "导出日志", notes = "导出系统访问日志表列表") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PreAuthorize("@customSs.hasPermission('system:loginlog:export')") @Log(title = "登录日志", businessType = BusinessType.EXPORT) @PostMapping("/export") @@ -69,9 +62,7 @@ public class SysLoginLogController { */ @ApiOperation(value = "获取日志详情", notes = "根据ID获取系统访问日志详细信息") @ApiImplicitParam(name = "loginId", value = "日志ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysLoginLogEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = SysLoginLogEntity.class)}) @PreAuthorize("@customSs.hasPermission('system:log:query')") @GetMapping(value = "/{loginId}") public R getInfo(@PathVariable("loginId") Long loginId) { @@ -83,9 +74,7 @@ public class SysLoginLogController { */ @ApiOperation(value = "删除日志", notes = "根据ID批量删除系统访问日志") @ApiImplicitParam(name = "loginIds", value = "日志ID数组", required = true, dataType = "Long[]", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Boolean.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Boolean.class)}) @PreAuthorize("@customSs.hasPermission('system:loginlog:remove')") @Log(title = "登录日志", businessType = BusinessType.DELETE) @DeleteMapping("/{loginIds}") @@ -94,9 +83,7 @@ public class SysLoginLogController { } @ApiOperation(value = "清空日志", notes = "清空所有系统访问日志") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PreAuthorize("@customSs.hasPermission('monitor:logininfor:clean')") @Log(title = "登录日志", businessType = BusinessType.CLEAN) @DeleteMapping("/clean") diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysMenuController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysMenuController.java index 92105bb..f8ea691 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysMenuController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysMenuController.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.controller; - import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.starry.admin.common.domain.TreeSelect; @@ -17,12 +16,11 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; +import javax.annotation.Resource; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; /** *

@@ -40,11 +38,9 @@ public class SysMenuController { @Resource private SysMenuService menuService; - @ApiOperation(value = "获取菜单列表", notes = "获取系统所有菜单列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysMenuEntity.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = SysMenuEntity.class, responseContainer = "List")}) @PreAuthorize("@customSs.hasPermission('system:menu:list')") @GetMapping("/list") public R list(@ApiParam(value = "菜单查询条件") SysMenuEntity menu) { @@ -56,31 +52,28 @@ public class SysMenuController { @ApiOperation(value = "分页获取菜单列表", notes = "分页查询系统菜单列表") @ApiImplicitParams({ - @ApiImplicitParam(name = "pageSize", value = "每页记录数", defaultValue = "5", dataType = "Integer", paramType = "query"), - @ApiImplicitParam(name = "pageNum", value = "页码", defaultValue = "1", dataType = "Integer", paramType = "query") - }) + @ApiImplicitParam(name = "pageSize", value = "每页记录数", defaultValue = "5", dataType = "Integer", paramType = "query"), + @ApiImplicitParam(name = "pageNum", value = "页码", defaultValue = "1", dataType = "Integer", paramType = "query")}) @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysMenuEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = SysMenuEntity.class, responseContainer = "Page")}) @GetMapping("/list-page") public R listPage(@ApiParam(value = "菜单查询条件") @RequestParam(value = "menu", required = false) SysMenuEntity menu, - @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize, - @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) { + @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize, + @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) { Page pageMenu = menuService.listPage(menu, SecurityUtils.getUserId(), pageSize, pageNum); return R.ok(pageMenu); } @ApiOperation(value = "添加菜单", notes = "创建新的系统菜单") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败，菜单名称已存在或地址格式错误") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), + @ApiResponse(code = 500, message = "添加失败，菜单名称已存在或地址格式错误")}) @PreAuthorize("@customSs.hasPermission('system:menu:create')") @PostMapping("/create") public R create(@ApiParam(value = "菜单信息", required = true) @RequestBody SysMenuEntity menu) { if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { return R.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); - } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StrUtil.startWithAny(menu.getPath(), "http://", "https://")) { + } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) + && !StrUtil.startWithAny(menu.getPath(), "http://", "https://")) { return R.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); } boolean success = menuService.create(menu); @@ -92,17 +85,16 @@ public class SysMenuController { @ApiOperation(value = "修改菜单", notes = "根据ID修改菜单信息") @ApiImplicitParam(name = "id", value = "菜单ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败，菜单名称已存在或地址格式错误") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), + @ApiResponse(code = 500, message = "修改失败，菜单名称已存在或地址格式错误")}) @PreAuthorize("@customSs.hasPermission('system:menu:edit')") @PostMapping("/update/{id}") public R update(@PathVariable Long id, @ApiParam(value = "菜单信息", required = true) @RequestBody SysMenuEntity menu) { menu.setMenuId(id); if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { return R.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); - } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StrUtil.startWithAny(menu.getPath(), "http://", "https://")) { + } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) + && !StrUtil.startWithAny(menu.getPath(), "http://", "https://")) { return R.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); } else if (menu.getMenuId().equals(menu.getParentId())) { return R.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己"); @@ -114,13 +106,9 @@ public class SysMenuController { return R.error("修改失败"); } - @ApiOperation(value = "删除菜单", notes = "根据ID删除菜单") @ApiImplicitParam(name = "id", value = "菜单ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "删除失败，存在子菜单") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "删除失败，存在子菜单")}) @PreAuthorize("@customSs.hasPermission('system:menu:delete')") @PostMapping(value = "/delete/{id}") public R delete(@PathVariable("id") Long menuId) { @@ -135,9 +123,7 @@ public class SysMenuController { } @ApiOperation(value = "获取菜单下拉树列表", notes = "获取菜单的树形结构") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = TreeSelect.class, responseContainer = "List") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = TreeSelect.class, responseContainer = "List")}) @GetMapping("/treeselect") public R treeselect(@ApiParam(value = "菜单查询条件") SysMenuEntity menu) { List menus = menuService.selectMenuList(menu, SecurityUtils.getUserId()); @@ -147,9 +133,7 @@ public class SysMenuController { @ApiOperation(value = "获取菜单详情", notes = "根据菜单ID获取菜单详细信息") @ApiImplicitParam(name = "menuId", value = "菜单ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysMenuEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = SysMenuEntity.class)}) @PreAuthorize("@customSs.hasPermission('system:menu:query')") @GetMapping(value = "/{menuId}") public R getInfo(@PathVariable Long menuId) { @@ -158,9 +142,7 @@ public class SysMenuController { @ApiOperation(value = "获取角色菜单树", notes = "获取指定角色的菜单树形结构") @ApiImplicitParam(name = "roleId", value = "角色ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Map.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Map.class)}) @GetMapping(value = "/roleMenuTreeselect/{roleId}") public R roleMenuTreeselect(@PathVariable("roleId") Long roleId) { List menus = menuService.selectMenuList(SecurityUtils.getUserId()); @@ -171,17 +153,16 @@ public class SysMenuController { } @ApiOperation(value = "获取菜单精简信息列表", notes = "只包含被开启的菜单，用于【角色分配菜单】功能的选项。在多租户的场景下，会只返回租户所在套餐有的菜单") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SimpleMenu.class, responseContainer = "List") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = SimpleMenu.class, responseContainer = "List")}) @GetMapping("/list-all-simple") public R getSimpleMenus() { // 获得菜单列表，只要开启状态的 List menus = menuService.selectSimpleMenuList(); // TODO 移除公共模块 List forbidList = Arrays.asList(26L, 48L, 47L, 19L); - List menuList = menus.stream().filter(ca -> !forbidList.contains(ca.getId()) || !forbidList.contains(ca.getParentId())).collect(Collectors.toList()); + List menuList = menus.stream() + .filter(ca -> !forbidList.contains(ca.getId()) || !forbidList.contains(ca.getParentId())) + .collect(Collectors.toList()); return R.ok(menus); } } - diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysOperationLogController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysOperationLogController.java index a90133a..db93991 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysOperationLogController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysOperationLogController.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.controller; - import com.starry.admin.modules.system.module.entity.SysOperationLogEntity; import com.starry.admin.modules.system.service.ISysOperationLogService; import com.starry.admin.modules.system.vo.SysOperationLogVo; @@ -10,17 +9,14 @@ import com.starry.common.enums.BusinessType; import com.starry.common.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; - +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; /** * 操作日志表Controller @@ -40,8 +36,7 @@ public class SysOperationLogController { */ @ApiOperation(value = "查询操作日志列表", notes = "分页查询系统操作日志列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysOperationLogEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = SysOperationLogEntity.class, responseContainer = "Page")}) @PreAuthorize("@customSs.hasPermission('system:operlog:list')") @GetMapping("/list") public R list(@ApiParam(value = "查询条件") SysOperationLogVo sysOperationLogEntity) { @@ -53,9 +48,7 @@ public class SysOperationLogController { */ @ApiOperation(value = "获取操作日志详情", notes = "根据ID获取操作日志详细信息") @ApiImplicitParam(name = "operId", value = "日志ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysOperationLogEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = SysOperationLogEntity.class)}) @PreAuthorize("@customSs.hasPermission('system:operlog:query')") @GetMapping(value = "/{operId}") public R getInfo(@PathVariable("operId") Long operId) { @@ -66,14 +59,12 @@ public class SysOperationLogController { * 新增操作日志表 */ @ApiOperation(value = "新增操作日志", notes = "手动创建系统操作日志记录") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @PreAuthorize("@customSs.hasPermission('system:operlog:create')") @Log(title = "操作日志表", businessType = BusinessType.INSERT) @PostMapping - public R create(@ApiParam(value = "操作日志信息", required = true) @RequestBody SysOperationLogEntity sysOperationLogEntity) { + public R create( + @ApiParam(value = "操作日志信息", required = true) @RequestBody SysOperationLogEntity sysOperationLogEntity) { boolean success = xlOperLogService.create(sysOperationLogEntity); if (success) { return R.ok(); @@ -86,14 +77,12 @@ public class SysOperationLogController { */ @ApiOperation(value = "修改操作日志", notes = "根据ID修改操作日志信息") @ApiImplicitParam(name = "operId", value = "日志ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @PreAuthorize("@customSs.hasPermission('system:operlog:edit')") @Log(title = "操作日志表", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{operId}") - public R update(@PathVariable Long operId, @ApiParam(value = "操作日志信息", required = true) @RequestBody SysOperationLogEntity sysOperationLogEntity) { + public R update(@PathVariable Long operId, + @ApiParam(value = "操作日志信息", required = true) @RequestBody SysOperationLogEntity sysOperationLogEntity) { sysOperationLogEntity.setOperId(operId); boolean success = xlOperLogService.updateXlOperLog(sysOperationLogEntity); if (success) { @@ -107,9 +96,7 @@ public class SysOperationLogController { */ @ApiOperation(value = "删除操作日志", notes = "根据ID批量删除操作日志") @ApiImplicitParam(name = "operIds", value = "日志ID数组", required = true, dataType = "Long[]", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Boolean.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Boolean.class)}) @PreAuthorize("@customSs.hasPermission('system:operlog:remove')") @Log(title = "操作日志表", businessType = BusinessType.DELETE) @DeleteMapping("/{operIds}") @@ -121,13 +108,13 @@ public class SysOperationLogController { * 导出操作日志表 */ @ApiOperation(value = "导出操作日志", notes = "导出系统操作日志表数据") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PreAuthorize("@customSs.hasPermission('system:operlog:export')") @Log(title = "操作日志", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, @ApiParam(value = "查询条件") SysOperationLogVo sysOperationLogEntity) { - ExcelUtils.exportEasyExcel(response, SysOperationLogEntity.class, xlOperLogService.selectXlOperLogList(sysOperationLogEntity).getRecords(), "系统操作日志表数据"); + public void export(HttpServletResponse response, + @ApiParam(value = "查询条件") SysOperationLogVo sysOperationLogEntity) { + ExcelUtils.exportEasyExcel(response, SysOperationLogEntity.class, + xlOperLogService.selectXlOperLogList(sysOperationLogEntity).getRecords(), "系统操作日志表数据"); } } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysRoleController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysRoleController.java index a624d34..01c697e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysRoleController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysRoleController.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.controller; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.starry.admin.modules.system.module.entity.SysDeptEntity; @@ -23,16 +22,15 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** *

* 角色表 前端控制器 @@ -54,10 +52,7 @@ public class SysRoleController { private SysUserService userService; @ApiOperation(value = "添加角色", notes = "创建新的系统角色") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "操作失败，角色名称或权限已存在") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "操作失败，角色名称或权限已存在")}) @PreAuthorize("@customSs.hasPermission('system:role:create')") @PostMapping("/create") public R create(@ApiParam(value = "角色信息", required = true) @Validated @RequestBody SysRoleAddVo roleAddVo) { @@ -77,10 +72,7 @@ public class SysRoleController { @ApiOperation(value = "修改角色", notes = "根据ID修改角色信息") @ApiImplicitParam(name = "id", value = "角色ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败，角色名称或权限已存在") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败，角色名称或权限已存在")}) @PreAuthorize("@customSs.hasPermission('system:role:edit')") @PostMapping("/update/{id}") public R update(@PathVariable Long id, @ApiParam(value = "角色信息", required = true) @RequestBody SysRoleEntity role) { @@ -101,10 +93,7 @@ public class SysRoleController { @ApiOperation(value = "批量删除角色", notes = "根据ID批量删除角色") @ApiImplicitParam(name = "roleIds", value = "角色ID数组", required = true, dataType = "Long[]", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "删除失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "删除失败")}) @PreAuthorize("@customSs.hasPermission('system:role:remove')") @DeleteMapping("/{roleIds}") public R delete(@PathVariable Long[] roleIds) { @@ -117,8 +106,7 @@ public class SysRoleController { @ApiOperation(value = "获取所有角色", notes = "获取系统中所有角色列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysRoleEntity.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = SysRoleEntity.class, responseContainer = "List")}) @GetMapping("/list-all") public R listAll() { List list = roleService.list(); @@ -126,29 +114,24 @@ public class SysRoleController { } @ApiOperation(value = "分页获取角色列表", notes = "根据角色名称分页获取角色列表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "keyword", value = "搜索关键词", dataType = "String", paramType = "query"), - @ApiImplicitParam(name = "pageSize", value = "每页记录数", defaultValue = "5", dataType = "Integer", paramType = "query"), - @ApiImplicitParam(name = "pageNum", value = "页码", defaultValue = "1", dataType = "Integer", paramType = "query") - }) + @ApiImplicitParams({@ApiImplicitParam(name = "keyword", value = "搜索关键词", dataType = "String", paramType = "query"), + @ApiImplicitParam(name = "pageSize", value = "每页记录数", defaultValue = "5", dataType = "Integer", paramType = "query"), + @ApiImplicitParam(name = "pageNum", value = "页码", defaultValue = "1", dataType = "Integer", paramType = "query")}) @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysRoleEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = SysRoleEntity.class, responseContainer = "Page")}) @GetMapping("/list-page") - public R listPage(@RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize, @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) { + public R listPage(@RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize, + @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) { Page rolePage = roleService.list(keyword, pageSize, pageNum); return R.ok(rolePage); } @ApiOperation(value = "修改角色状态", notes = "启用或禁用角色") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "角色ID", required = true, dataType = "Long", paramType = "path"), - @ApiImplicitParam(name = "status", value = "状态(0-正常,1-停用)", required = true, dataType = "Integer", paramType = "query") - }) - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiImplicitParam(name = "id", value = "角色ID", required = true, dataType = "Long", paramType = "path"), + @ApiImplicitParam(name = "status", value = "状态(0-正常,1-停用)", required = true, dataType = "Integer", paramType = "query")}) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @PreAuthorize("@customSs.hasPermission('system:role:edit')") @PostMapping("/update-status/{id}") public R updateStatus(@PathVariable Long id, @RequestParam(value = "status") Integer status) { @@ -163,10 +146,7 @@ public class SysRoleController { } @ApiOperation(value = "分配菜单权限", notes = "为角色分配菜单权限") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "分配失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "分配失败")}) @PreAuthorize("@customSs.hasPermission('system:role:auth')") @PostMapping("/auth-role-menu") public R authRoleMenu(@ApiParam(value = "角色信息", required = true) @RequestBody SysRoleEntity role) { @@ -182,9 +162,7 @@ public class SysRoleController { */ @ApiOperation(value = "获取角色详情", notes = "根据角色ID获取角色详细信息") @ApiImplicitParam(name = "roleId", value = "角色ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysRoleEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = SysRoleEntity.class)}) @GetMapping(value = "/{roleId}") public R getInfo(@PathVariable Long roleId) { roleService.checkRoleDataScope(roleId); @@ -196,9 +174,7 @@ public class SysRoleController { */ @ApiOperation(value = "获取角色部门树列表", notes = "获取角色关联的部门树结构") @ApiImplicitParam(name = "roleId", value = "角色ID", required = true, dataType = "Long", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Map.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Map.class)}) @GetMapping(value = "/deptTree/{roleId}") public R deptTree(@PathVariable("roleId") Long roleId) { Map resultMap = new HashMap<>(8); @@ -211,9 +187,7 @@ public class SysRoleController { * 修改保存数据权限 */ @ApiOperation(value = "保存数据权限", notes = "修改角色的数据权限范围") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Boolean.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Boolean.class)}) @Log(title = "角色管理-保存数据权限", businessType = BusinessType.UPDATE) @PostMapping("/dataScope") public R dataScope(@ApiParam(value = "角色信息", required = true) @RequestBody SysRoleEntity role) { @@ -227,8 +201,7 @@ public class SysRoleController { */ @ApiOperation(value = "查询已分配用户角色列表", notes = "获取已经分配给指定角色的用户列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = RoleUserResultVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = RoleUserResultVo.class, responseContainer = "Page")}) @PreAuthorize("@customSs.hasPermission('system:role:list')") @GetMapping("/authUser/allocatedList") public R allocatedList(SysUserQueryVo user) { @@ -241,8 +214,7 @@ public class SysRoleController { */ @ApiOperation(value = "查询未分配用户角色列表", notes = "获取尚未分配给指定角色的用户列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = RoleUserResultVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = RoleUserResultVo.class, responseContainer = "Page")}) @PreAuthorize("@customSs.hasPermission('system:role:list')") @GetMapping("/authUser/unallocatedList") public R unallocatedList(SysUserQueryVo user) { @@ -253,9 +225,7 @@ public class SysRoleController { * 取消授权用户 */ @ApiOperation(value = "取消授权用户", notes = "取消指定用户的角色授权") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Boolean.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Boolean.class)}) @PreAuthorize("@customSs.hasPermission('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancel") @@ -268,12 +238,9 @@ public class SysRoleController { */ @ApiOperation(value = "批量取消授权用户", notes = "批量取消多个用户的角色授权") @ApiImplicitParams({ - @ApiImplicitParam(name = "roleId", value = "角色ID", required = true, dataType = "Long", paramType = "query"), - @ApiImplicitParam(name = "userIds", value = "用户ID数组", required = true, dataType = "String[]", paramType = "query") - }) - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Boolean.class) - }) + @ApiImplicitParam(name = "roleId", value = "角色ID", required = true, dataType = "Long", paramType = "query"), + @ApiImplicitParam(name = "userIds", value = "用户ID数组", required = true, dataType = "String[]", paramType = "query")}) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Boolean.class)}) @PreAuthorize("@customSs.hasPermission('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancelAll") @@ -286,12 +253,9 @@ public class SysRoleController { */ @ApiOperation(value = "批量选择用户授权", notes = "为角色批量添加用户授权") @ApiImplicitParams({ - @ApiImplicitParam(name = "roleId", value = "角色ID", required = true, dataType = "Long", paramType = "query"), - @ApiImplicitParam(name = "userIds", value = "用户ID数组", required = true, dataType = "String[]", paramType = "query") - }) - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Boolean.class) - }) + @ApiImplicitParam(name = "roleId", value = "角色ID", required = true, dataType = "Long", paramType = "query"), + @ApiImplicitParam(name = "userIds", value = "用户ID数组", required = true, dataType = "String[]", paramType = "query")}) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Boolean.class)}) @PreAuthorize("@customSs.hasPermission('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/selectAll") @@ -300,5 +264,3 @@ public class SysRoleController { return R.ok(roleService.insertAuthUsers(roleId, userIds)); } } - - \ No newline at end of file diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysSmsController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysSmsController.java index 664c902..82dad4a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysSmsController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysSmsController.java @@ -9,14 +9,13 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; - /** * 动态接口 * @@ -35,9 +34,7 @@ public class SysSmsController { @ApiOperation(value = "发送短信", notes = "向指定手机号发送短信验证码") @ApiImplicitParam(name = "phone", value = "手机号码", required = true, dataType = "String", paramType = "query") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @GetMapping("/send") public R sendSms(@RequestParam("phone") String phone) { smsUtils.sendSmsApi(phone); @@ -45,9 +42,7 @@ public class SysSmsController { } @ApiOperation(value = "测试接口", notes = "测试租户角色初始化") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Boolean.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Boolean.class)}) @GetMapping("/test") public R test() { SysTenantEntity sysTenantEntity = tenantService.selectSysTenantByTenantId("y5PNjqco"); @@ -55,5 +50,4 @@ public class SysSmsController { return R.ok(true); } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantController.java index a5fbba8..970cc46 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantController.java @@ -19,16 +19,14 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.math.BigDecimal; +import java.util.List; +import javax.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.List; - - /** * 租户表Controller * @@ -47,16 +45,12 @@ public class SysTenantController { @Resource private IPlayOrderInfoService playOrderInfoService; - /** * 新增租户表 */ @ApiOperation(value = "新增租户", notes = "创建新的系统租户") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) - //@PreAuthorize("@customSs.hasPermission('platform:tenant:create')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) + // @PreAuthorize("@customSs.hasPermission('platform:tenant:create')") @Log(title = "租户表", businessType = BusinessType.INSERT) @PostMapping("/create") public R create(@ApiParam(value = "租户信息", required = true) @Validated @RequestBody SysTenantAddVo vo) { @@ -64,14 +58,12 @@ public class SysTenantController { return sysTenantService.addTenant(entity); } - /** * 查询租户表列表 */ @ApiOperation(value = "分页查询租户列表", notes = "根据条件分页查询租户列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysTenantReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = SysTenantReturnVo.class, responseContainer = "Page")}) @PreAuthorize("@customSs.hasPermission('platform:tenant:list')") @PostMapping("/listByPage") public R listByPage(@ApiParam(value = "查询条件", required = true) @RequestBody SysTenantQueryVo vo) { @@ -93,7 +85,6 @@ public class SysTenantController { return returnVo; }); - return R.ok(voPage); } @@ -102,29 +93,24 @@ public class SysTenantController { */ @ApiOperation(value = "获取租户详情", notes = "根据租户ID获取租户详细信息") @ApiImplicitParam(name = "tenantId", value = "租户ID", required = true, dataType = "String", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysTenantEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = SysTenantEntity.class)}) @PreAuthorize("@customSs.hasPermission('platform:tenant:query')") @GetMapping(value = "/{tenantId}") public R getInfo(@PathVariable("tenantId") String tenantId) { return R.ok(sysTenantService.selectSysTenantByTenantId(tenantId)); } - /** * 修改租户表 */ @ApiOperation(value = "修改租户", notes = "根据租户ID修改租户信息") @ApiImplicitParam(name = "tenantId", value = "租户ID", required = true, dataType = "String", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @PreAuthorize("@customSs.hasPermission('platform:tenant:edit')") @Log(title = "租户表", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{tenantId}") - public R update(@PathVariable String tenantId, @ApiParam(value = "租户信息", required = true) @RequestBody SysTenantEntity sysTenantEntity) { + public R update(@PathVariable String tenantId, + @ApiParam(value = "租户信息", required = true) @RequestBody SysTenantEntity sysTenantEntity) { return sysTenantService.updateTenant(sysTenantEntity); } @@ -133,9 +119,7 @@ public class SysTenantController { */ @ApiOperation(value = "删除租户", notes = "根据租户ID批量删除租户") @ApiImplicitParam(name = "tenantIds", value = "租户ID数组", required = true, dataType = "String[]", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Boolean.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Boolean.class)}) @PreAuthorize("@customSs.hasPermission('platform:tenant:remove')") @Log(title = "租户表", businessType = BusinessType.DELETE) @DeleteMapping("/{tenantIds}") diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantPackageController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantPackageController.java index 0b74099..f25745d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantPackageController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantPackageController.java @@ -15,13 +15,11 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - +import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.util.List; - +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; /** * 租户套餐表Controller @@ -40,8 +38,7 @@ public class SysTenantPackageController { */ @ApiOperation(value = "查询租户套餐列表", notes = "分页查询租户套餐列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysTenantPackageEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = SysTenantPackageEntity.class, responseContainer = "Page")}) @PreAuthorize("@customSs.hasPermission('platform:package:list')") @GetMapping("/list") public R list(@ApiParam(value = "查询条件") SysTenantPackageVo sysTenantPackageEntity) { @@ -52,14 +49,14 @@ public class SysTenantPackageController { * 导出租户套餐表列表 */ @ApiOperation(value = "导出租户套餐", notes = "导出租户套餐表数据到Excel") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PreAuthorize("@customSs.hasPermission('platform:package:export')") @Log(title = "租户套餐表", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, @ApiParam(value = "查询条件") SysTenantPackageVo sysTenantPackageEntity) { - ExcelUtils.exportEasyExcel(response, SysTenantPackageEntity.class, SysTenantPackageService.selectSysTenantPackageList(sysTenantPackageEntity).getRecords(), "租户套餐表数据"); + public void export(HttpServletResponse response, + @ApiParam(value = "查询条件") SysTenantPackageVo sysTenantPackageEntity) { + ExcelUtils.exportEasyExcel(response, SysTenantPackageEntity.class, + SysTenantPackageService.selectSysTenantPackageList(sysTenantPackageEntity).getRecords(), "租户套餐表数据"); } /** @@ -67,9 +64,7 @@ public class SysTenantPackageController { */ @ApiOperation(value = "获取租户套餐详情", notes = "根据ID获取租户套餐详细信息") @ApiImplicitParam(name = "packageId", value = "套餐ID", required = true, dataType = "String", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysTenantPackageEntity.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = SysTenantPackageEntity.class)}) @PreAuthorize("@customSs.hasPermission('platform:package:query')") @GetMapping(value = "/{packageId}") public R getInfo(@PathVariable("packageId") String packageId) { @@ -80,10 +75,7 @@ public class SysTenantPackageController { * 新增租户套餐表 */ @ApiOperation(value = "新增租户套餐", notes = "创建新的租户套餐") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) @PreAuthorize("@customSs.hasPermission('platform:package:create')") @Log(title = "租户套餐表", businessType = BusinessType.INSERT) @PostMapping("/create") @@ -101,14 +93,12 @@ public class SysTenantPackageController { */ @ApiOperation(value = "修改租户套餐", notes = "根据ID修改租户套餐信息") @ApiImplicitParam(name = "packageId", value = "套餐ID", required = true, dataType = "String", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @PreAuthorize("@customSs.hasPermission('platform:package:edit')") @Log(title = "租户套餐表", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{packageId}") - public R update(@PathVariable String packageId, @ApiParam(value = "套餐信息", required = true) @RequestBody SysTenantPackageEntity sysTenantPackageEntity) { + public R update(@PathVariable String packageId, + @ApiParam(value = "套餐信息", required = true) @RequestBody SysTenantPackageEntity sysTenantPackageEntity) { sysTenantPackageEntity.setPackageId(packageId); boolean success = SysTenantPackageService.update(sysTenantPackageEntity); @@ -123,9 +113,7 @@ public class SysTenantPackageController { */ @ApiOperation(value = "删除租户套餐", notes = "根据ID批量删除租户套餐") @ApiImplicitParam(name = "packageIds", value = "套餐ID数组", required = true, dataType = "String[]", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Boolean.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Boolean.class)}) @PreAuthorize("@customSs.hasPermission('platform:package:remove')") @Log(title = "租户套餐表", businessType = BusinessType.DELETE) @DeleteMapping("/{packageIds}") @@ -138,8 +126,7 @@ public class SysTenantPackageController { */ @ApiOperation(value = "查询套餐精简列表", notes = "获取租户套餐的精简信息列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SimplePackage.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = SimplePackage.class, responseContainer = "List")}) @GetMapping("/get-simple-list") public R getSimpleList() { List list = SysTenantPackageService.getSimpleList(); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantRechargeInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantRechargeInfoController.java index b8c4e1d..568cdf0 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantRechargeInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantRechargeInfoController.java @@ -13,13 +13,12 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; - /** * 租户充值信息Controller * @@ -38,9 +37,8 @@ public class SysTenantRechargeInfoController { */ @ApiOperation(value = "查询充值记录", notes = "分页查询租户充值记录列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysTenantRechargeInfoEntity.class, responseContainer = "Page") - }) -// @PreAuthorize("@customSs.hasPermission('play:info:list')") + @ApiResponse(code = 200, message = "操作成功", response = SysTenantRechargeInfoEntity.class, responseContainer = "Page")}) + // @PreAuthorize("@customSs.hasPermission('play:info:list')") @PostMapping("/listByPage") public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody SysTenantRechargeInfoQueryVo vo) { return R.ok(sysTenantRechargeInfoService.selectByPage(vo)); @@ -51,10 +49,8 @@ public class SysTenantRechargeInfoController { */ @ApiOperation(value = "获取充值详情", notes = "根据ID获取租户充值记录详细信息") @ApiImplicitParam(name = "id", value = "充值记录ID", required = true, dataType = "String", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysTenantRechargeInfoEntity.class) - }) -// @PreAuthorize("@customSs.hasPermission('play:info:query')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = SysTenantRechargeInfoEntity.class)}) + // @PreAuthorize("@customSs.hasPermission('play:info:query')") @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") String id) { return R.ok(sysTenantRechargeInfoService.selectSysTenantRechargeInfoById(id)); @@ -64,14 +60,12 @@ public class SysTenantRechargeInfoController { * 新增租户充值信息 */ @ApiOperation(value = "新增充值记录", notes = "创建租户充值记录") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "添加失败") - }) -// @PreAuthorize("@customSs.hasPermission('play:info:create')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")}) + // @PreAuthorize("@customSs.hasPermission('play:info:create')") @Log(title = "租户充值信息", businessType = BusinessType.INSERT) @PostMapping("/create") - public R create(@ApiParam(value = "充值信息", required = true) @Validated @RequestBody SysTenantRechargeInfoAddVo addVo) { + public R create( + @ApiParam(value = "充值信息", required = true) @Validated @RequestBody SysTenantRechargeInfoAddVo addVo) { SysTenantRechargeInfoEntity entity = new SysTenantRechargeInfoEntity(); BeanUtils.copyProperties(addVo, entity); boolean success = sysTenantRechargeInfoService.create(entity); @@ -86,14 +80,12 @@ public class SysTenantRechargeInfoController { */ @ApiOperation(value = "修改充值记录", notes = "根据ID修改租户充值记录") @ApiImplicitParam(name = "id", value = "充值记录ID", required = true, dataType = "String", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @PreAuthorize("@customSs.hasPermission('play:info:edit')") @Log(title = "租户充值信息", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @ApiParam(value = "充值信息", required = true) @RequestBody SysTenantRechargeInfoEntity sysTenantRechargeInfo) { + public R update(@PathVariable String id, + @ApiParam(value = "充值信息", required = true) @RequestBody SysTenantRechargeInfoEntity sysTenantRechargeInfo) { sysTenantRechargeInfo.setId(id); boolean success = sysTenantRechargeInfoService.update(sysTenantRechargeInfo); if (success) { @@ -107,10 +99,8 @@ public class SysTenantRechargeInfoController { */ @ApiOperation(value = "删除充值记录", notes = "根据ID批量删除租户充值记录") @ApiImplicitParam(name = "ids", value = "充值记录ID数组", required = true, dataType = "String[]", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Boolean.class) - }) -// @PreAuthorize("@customSs.hasPermission('play:info:remove')") + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Boolean.class)}) + // @PreAuthorize("@customSs.hasPermission('play:info:remove')") @Log(title = "租户充值信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysUserController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysUserController.java index 782c22f..2f3531b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysUserController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysUserController.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.controller; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.starry.admin.common.component.JwtToken; @@ -18,21 +17,19 @@ import com.starry.common.enums.BusinessType; import com.starry.common.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.Resource; -import javax.validation.Valid; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import javax.annotation.Resource; +import javax.validation.Valid; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; /** *

@@ -58,10 +55,8 @@ public class SysUserController { private IOssFileService ossFileService; @ApiOperation(value = "注册用户", notes = "新用户注册接口") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysUserEntity.class), - @ApiResponse(code = 500, message = "操作失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = SysUserEntity.class), + @ApiResponse(code = 500, message = "操作失败")}) @PostMapping(value = "register") public R register(@ApiParam(value = "用户信息", required = true) @RequestBody SysUserEntity user) { SysUserEntity sysUserEntity = userService.register(user); @@ -73,8 +68,7 @@ public class SysUserController { @ApiOperation(value = "分页用户列表", notes = "分页查询用户列表信息") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysUserEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = SysUserEntity.class, responseContainer = "Page")}) @GetMapping(value = "/list-page") public R listPage(UserQueryVo queryVo) { IPage page = userService.listMemberPage(queryVo); @@ -83,8 +77,7 @@ public class SysUserController { @ApiOperation(value = "分页用户列表(V1)", notes = "分页查询用户列表信息，返回格式化后的结果") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = SysUserEntityListVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = SysUserEntityListVo.class, responseContainer = "Page")}) @GetMapping(value = "/list-page/v1") public R listPageV1(UserQueryVo queryVo) { IPage page = userService.listMemberPage(queryVo); @@ -97,10 +90,7 @@ public class SysUserController { } @ApiOperation(value = "添加用户", notes = "创建新的系统用户") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "操作失败，登录账号已存在") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "操作失败，登录账号已存在")}) @PostMapping(value = "add") public R add(@ApiParam(value = "用户信息", required = true) @RequestBody SysUserEntity user) { if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserCode()))) { @@ -114,9 +104,7 @@ public class SysUserController { } @ApiOperation(value = "添加用户(V1)", notes = "创建新的系统用户，使用参数对象") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PostMapping(value = "add/v1") public R addV1(@ApiParam(value = "用户添加参数", required = true) @Valid @RequestBody UserAddParam param) { boolean success = userService.addV1(param); @@ -125,12 +113,10 @@ public class SysUserController { @ApiOperation(value = "修改用户", notes = "根据ID修改用户信息") @ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "String", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "修改失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")}) @PostMapping(value = "/update/{id}") - public R update(@PathVariable("id") String id, @ApiParam(value = "用户信息", required = true) @RequestBody SysUserEntity user) { + public R update(@PathVariable("id") String id, + @ApiParam(value = "用户信息", required = true) @RequestBody SysUserEntity user) { user.setUserId(id); boolean flag = userService.update(user); if (flag) { @@ -140,42 +126,35 @@ public class SysUserController { } @ApiOperation(value = "修改用户密码", notes = "修改当前用户的密码") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PostMapping(value = "/update/password") - public R updatePassword(@ApiParam(value = "密码修改参数", required = true) @Valid @RequestBody UpdateUserPasswordParam param) { + public R updatePassword( + @ApiParam(value = "密码修改参数", required = true) @Valid @RequestBody UpdateUserPasswordParam param) { userService.updatePassword(param); return R.ok(); } @ApiOperation(value = "修改用户密码", notes = "修改当前用户的密码") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PostMapping(value = "/profile/updatePwd") - public R updatePasswordV2(@ApiParam(value = "密码修改参数", required = true) @Valid @RequestBody UpdateUserPasswordParamV2 param) { + public R updatePasswordV2( + @ApiParam(value = "密码修改参数", required = true) @Valid @RequestBody UpdateUserPasswordParamV2 param) { userService.updatePasswordV2(param); return R.ok(); } - @ApiOperation(value = "修改用户手机号", notes = "修改当前用户的手机号") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PostMapping(value = "/update/mobile") - public R updateMobile(@ApiParam(value = "手机号修改参数", required = true) @Valid @RequestBody UpdateUserMobileParam param) { + public R updateMobile( + @ApiParam(value = "手机号修改参数", required = true) @Valid @RequestBody UpdateUserMobileParam param) { userService.updateMobile(param); return R.ok(); } @ApiOperation(value = "删除用户", notes = "根据ID删除用户") @ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "String", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "操作失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "操作失败")}) @PostMapping(value = "/delete/{id}") public R delete(@PathVariable("id") String id) { boolean flag = userService.delete(Collections.singletonList(id)); @@ -186,9 +165,7 @@ public class SysUserController { } @ApiOperation(value = "登出功能", notes = "用户登出系统") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PostMapping(value = "logout") public R logout() { return R.ok(); @@ -196,24 +173,23 @@ public class SysUserController { @ApiOperation(value = "获取用户详情", notes = "根据用户ID获取用户详细信息，不传ID则获取当前用户") @ApiImplicitParam(name = "userId", value = "用户ID", required = false, dataType = "String", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Map.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Map.class)}) @GetMapping(value = {"/", "/{userId}"}) public R getInfo(@PathVariable(value = "userId", required = false) String userId) { SysUserEntity user = userService.selectUserById(userId); Map map = new HashMap<>(8); List roles = roleService.selectRoleList(new SysRoleEntity()); - map.put("roles", SysUserEntity.isAdmin(user) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); + map.put("roles", + SysUserEntity.isAdmin(user) + ? roles + : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); map.put("roleIds", user.getRoles().stream().map(SysRoleEntity::getRoleId).collect(Collectors.toList())); map.put("user", user); return R.ok(map); } @ApiOperation(value = "获取个人信息", notes = "获取当前登录用户的个人信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Map.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Map.class)}) @GetMapping(value = "/profile") public R getProfile() { Map map = new HashMap<>(8); @@ -224,13 +200,12 @@ public class SysUserController { } @ApiOperation(value = "用户头像上传", notes = "上传用户头像图片") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = String.class), - @ApiResponse(code = 500, message = "上传头像异常") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = String.class), + @ApiResponse(code = 500, message = "上传头像异常")}) @Log(title = "用户头像上传", businessType = BusinessType.UPDATE) @PostMapping("/profile/avatar") - public R uploadAvatar(@ApiParam(value = "头像文件", required = true) @RequestParam("avatarfile") MultipartFile file) throws Exception { + public R uploadAvatar(@ApiParam(value = "头像文件", required = true) @RequestParam("avatarfile") MultipartFile file) + throws Exception { if (!file.isEmpty()) { String avatar = ossFileService.upload(file.getInputStream(), "avatar", file.getOriginalFilename()); if (userService.updateUserAvatar(SecurityUtils.getUserId(), avatar)) { @@ -244,4 +219,3 @@ public class SysUserController { return R.error("上传头像异常，请联系管理员"); } } - diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/UserOnlineController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/UserOnlineController.java index 4bc272c..56ce7c2 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/UserOnlineController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/UserOnlineController.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.controller; - import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -17,20 +16,17 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import javax.annotation.Resource; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; /** - * @author huoqiang - * 在线用户监控 + * @author huoqiang 在线用户监控 * @since 2022/10/18 */ @Api(tags = "在线用户监控", description = "系统在线用户监控相关接口") @@ -44,13 +40,9 @@ public class UserOnlineController { private UserOnlineService userOnlineService; @ApiOperation(value = "查询在线用户列表", notes = "根据IP地址和用户名查询在线用户") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ipaddr", value = "IP地址", dataType = "String", paramType = "query"), - @ApiImplicitParam(name = "userName", value = "用户名", dataType = "String", paramType = "query") - }) - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = UserOnline.class, responseContainer = "Page") - }) + @ApiImplicitParams({@ApiImplicitParam(name = "ipaddr", value = "IP地址", dataType = "String", paramType = "query"), + @ApiImplicitParam(name = "userName", value = "用户名", dataType = "String", paramType = "query")}) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = UserOnline.class, responseContainer = "Page")}) @PreAuthorize("@customSs.hasPermission('monitor:online:list')") @GetMapping("/list") public R list(String ipaddr, String userName) { @@ -85,9 +77,7 @@ public class UserOnlineController { */ @ApiOperation(value = "强制退出用户", notes = "强制指定token的用户下线") @ApiImplicitParam(name = "tokenId", value = "用户token", required = true, dataType = "String", paramType = "path") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PreAuthorize("@customSs.hasPermission('monitor:online:forceLogout')") @Log(title = "在线用户", businessType = BusinessType.FORCE) @DeleteMapping("/{tokenId}") diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysAdministrativeAreaDictInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysAdministrativeAreaDictInfoMapper.java index c2b8f84..33aef8d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysAdministrativeAreaDictInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysAdministrativeAreaDictInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.system.module.entity.SysAdministrativeAreaDictInfoEntity; import org.apache.ibatis.annotations.Mapper; @@ -16,5 +15,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SysAdministrativeAreaDictInfoMapper extends BaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDeptMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDeptMapper.java index fa9b707..6b1faee 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDeptMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDeptMapper.java @@ -3,11 +3,10 @@ package com.starry.admin.modules.system.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.system.module.entity.SysDeptEntity; +import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** *

* 部门表 Mapper 接口 @@ -22,7 +21,8 @@ public interface SysDeptMapper extends BaseMapper { /** * 查询部门管理数据 * - * @param dept 部门信息 + * @param dept + * 部门信息 * @return 部门信息集合 */ List selectDeptList(@Param(value = "dept") SysDeptEntity dept); @@ -30,7 +30,8 @@ public interface SysDeptMapper extends BaseMapper { /** * 根据ID查询所有子部门 * - * @param deptId 部门ID + * @param deptId + * 部门ID * @return 部门列表 */ List selectChildrenDeptById(Long deptId); @@ -38,7 +39,8 @@ public interface SysDeptMapper extends BaseMapper { /** * 删除部门信息-根据租户ID * - * @param ids 租户id + * @param ids + * 租户id * @return 结果 */ @InterceptorIgnore(tenantLine = "1") @@ -47,9 +49,12 @@ public interface SysDeptMapper extends BaseMapper { /** * 根据角色ID查询部门树信息 * - * @param roleId 角色ID - * @param deptCheckStrictly 部门树选择项是否关联显示 + * @param roleId + * 角色ID + * @param deptCheckStrictly + * 部门树选择项是否关联显示 * @return 选中部门列表 */ - List selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); + List selectDeptListByRoleId(@Param("roleId") Long roleId, + @Param("deptCheckStrictly") boolean deptCheckStrictly); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDictDataMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDictDataMapper.java index e0b00c2..5ba9a28 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDictDataMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDictDataMapper.java @@ -5,11 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.starry.admin.modules.system.module.entity.SysDictDataEntity; import com.starry.admin.modules.system.vo.SysDictDataVo; +import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** * 字典数据表Mapper接口 * @@ -20,7 +19,8 @@ public interface SysDictDataMapper extends BaseMapper { /** * 查询字典数据表 * - * @param dictDataId 字典数据表主键 + * @param dictDataId + * 字典数据表主键 * @return 字典数据表 */ SysDictDataEntity selectXlDictDataByDictDataId(Long dictDataId); @@ -28,15 +28,18 @@ public interface SysDictDataMapper extends BaseMapper { /** * 查询字典数据表列表 * - * @param sysDictDataEntity 字典数据表 + * @param sysDictDataEntity + * 字典数据表 * @return 字典数据表集合 */ - IPage selectXlDictDataList(Page page, @Param("vo") SysDictDataVo sysDictDataEntity); + IPage selectXlDictDataList(Page page, + @Param("vo") SysDictDataVo sysDictDataEntity); /** * 根据字典类型查询字典数据 * - * @param dictType 字典类型 + * @param dictType + * 字典类型 * @return 字典数据集合信息 */ List selectDictDataByType(String dictType); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDictMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDictMapper.java index 1b85c65..de348e6 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDictMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDictMapper.java @@ -18,7 +18,8 @@ public interface SysDictMapper extends BaseMapper { /** * 查询字典表 * - * @param dictId 字典表主键 + * @param dictId + * 字典表主键 * @return 字典表 */ SysDictEntity selectXlDictByDictId(Long dictId); @@ -26,9 +27,11 @@ public interface SysDictMapper extends BaseMapper { /** * 查询字典表列表 * - * @param sysDictEntity 字典表 + * @param sysDictEntity + * 字典表 * @return 字典表集合 */ - Page selectXlDictList(IPage page, @Param(value = "sysDictVo") SysDictVo sysDictEntity); + Page selectXlDictList(IPage page, + @Param(value = "sysDictVo") SysDictVo sysDictEntity); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysLoginLogMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysLoginLogMapper.java index b3cd1d4..0c5c0ac 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysLoginLogMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysLoginLogMapper.java @@ -18,7 +18,8 @@ public interface SysLoginLogMapper extends BaseMapper { /** * 查询系统访问日志表 * - * @param loginId 系统访问日志表主键 + * @param loginId + * 系统访问日志表主键 * @return 系统访问日志表 */ SysLoginLogEntity selectXlLoginLogByLoginId(Long loginId); @@ -26,10 +27,12 @@ public interface SysLoginLogMapper extends BaseMapper { /** * 查询系统访问日志表列表 * - * @param sysLoginLogEntity 系统访问日志表 + * @param sysLoginLogEntity + * 系统访问日志表 * @return 系统访问日志表集合 */ - IPage selectXlLoginLogList(Page page, @Param("vo") SysLoginLogVo sysLoginLogEntity); + IPage selectXlLoginLogList(Page page, + @Param("vo") SysLoginLogVo sysLoginLogEntity); /** * 清空系统登录日志 diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysMenuMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysMenuMapper.java index 125e2db..4fe5693 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysMenuMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysMenuMapper.java @@ -5,11 +5,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.starry.admin.modules.system.module.entity.SysMenuEntity; import com.starry.admin.modules.system.vo.SimpleMenu; +import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** *

* 菜单表 Mapper 接口 @@ -21,31 +20,38 @@ import java.util.List; @Mapper public interface SysMenuMapper extends BaseMapper { - List selectMenuListByUserId(@Param(value = "menu") SysMenuEntity menu, @Param(value = "userId") String userId, Page page); + List selectMenuListByUserId(@Param(value = "menu") SysMenuEntity menu, + @Param(value = "userId") String userId, Page page); /** * 查询系统菜单列表 * - * @param menu 菜单信息 + * @param menu + * 菜单信息 * @return 菜单列表 */ List selectMenuList(SysMenuEntity menu); - List selectMenuListByUserId(@Param(value = "menu") SysMenuEntity menu, @Param(value = "userId") String userId); + List selectMenuListByUserId(@Param(value = "menu") SysMenuEntity menu, + @Param(value = "userId") String userId); /** * 根据角色ID查询菜单树信息 * - * @param roleId 角色ID - * @param menuCheckStrictly 菜单树选择项是否关联显示 + * @param roleId + * 角色ID + * @param menuCheckStrictly + * 菜单树选择项是否关联显示 * @return 选中菜单列表 */ - List selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly); + List selectMenuListByRoleId(@Param("roleId") Long roleId, + @Param("menuCheckStrictly") boolean menuCheckStrictly); /** * 根据用户ID查询权限 * - * @param userId 用户ID + * @param userId + * 用户ID * @return 权限列表 */ @InterceptorIgnore(tenantLine = "1") @@ -61,7 +67,8 @@ public interface SysMenuMapper extends BaseMapper { /** * 根据用户ID查询菜单 * - * @param userId 用户ID + * @param userId + * 用户ID * @return 菜单列表 */ List selectMenuTreeByUserId(String userId); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysOperationLogMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysOperationLogMapper.java index 725af50..e6eacb6 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysOperationLogMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysOperationLogMapper.java @@ -18,7 +18,8 @@ public interface SysOperationLogMapper extends BaseMapper /** * 查询操作日志表 * - * @param operId 操作日志表主键 + * @param operId + * 操作日志表主键 * @return 操作日志表 */ SysOperationLogEntity selectXlOperLogByOperId(Long operId); @@ -26,9 +27,11 @@ public interface SysOperationLogMapper extends BaseMapper /** * 查询操作日志表列表 * - * @param sysOperationLogEntity 操作日志表 + * @param sysOperationLogEntity + * 操作日志表 * @return 操作日志表集合 */ - IPage selectXlOperLogList(Page page, @Param("vo") SysOperationLogVo sysOperationLogEntity); + IPage selectXlOperLogList(Page page, + @Param("vo") SysOperationLogVo sysOperationLogEntity); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleDeptMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleDeptMapper.java index 3e01a0a..f5b6ef5 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleDeptMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleDeptMapper.java @@ -3,10 +3,8 @@ package com.starry.admin.modules.system.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.system.module.entity.SysRoleDeptEntity; -import org.apache.ibatis.annotations.Mapper; - import java.util.List; - +import org.apache.ibatis.annotations.Mapper; /** *

@@ -22,7 +20,8 @@ public interface SysRoleDeptMapper extends BaseMapper { /** * 通过租户ID删除角色和部门关联 * - * @param tenantId 租户ID + * @param tenantId + * 租户ID * @return 结果 */ @InterceptorIgnore(tenantLine = "1") @@ -31,7 +30,8 @@ public interface SysRoleDeptMapper extends BaseMapper { /** * 通过角色ID删除角色和部门关联 * - * @param roleId 角色ID + * @param roleId + * 角色ID * @return 结果 */ int deleteRoleDeptByRoleId(Long roleId); @@ -39,7 +39,8 @@ public interface SysRoleDeptMapper extends BaseMapper { /** * 批量新增角色部门信息 * - * @param roleDeptList 角色部门列表 + * @param roleDeptList + * 角色部门列表 * @return 结果 */ int batchRoleDept(List roleDeptList); @@ -47,7 +48,8 @@ public interface SysRoleDeptMapper extends BaseMapper { /** * 批量删除角色部门关联信息 * - * @param ids 需要删除的数据ID + * @param ids + * 需要删除的数据ID * @return 结果 */ int deleteRoleDept(Long[] ids); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleMapper.java index 3a9bebb..6322528 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleMapper.java @@ -3,10 +3,8 @@ package com.starry.admin.modules.system.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.system.module.entity.SysRoleEntity; -import org.apache.ibatis.annotations.Mapper; - import java.util.List; - +import org.apache.ibatis.annotations.Mapper; /** *

@@ -22,7 +20,8 @@ public interface SysRoleMapper extends BaseMapper { /** * 通过角色ID查询角色 * - * @param roleId 角色ID + * @param roleId + * 角色ID * @return 角色对象信息 */ SysRoleEntity selectRoleById(Long roleId); @@ -30,7 +29,8 @@ public interface SysRoleMapper extends BaseMapper { /** * 校验角色名称是否唯一 * - * @param roleName 角色名称 + * @param roleName + * 角色名称 * @return 角色信息 */ SysRoleEntity checkRoleNameUnique(String roleName); @@ -38,7 +38,8 @@ public interface SysRoleMapper extends BaseMapper { /** * 校验角色权限是否唯一 * - * @param roleKey 角色权限 + * @param roleKey + * 角色权限 * @return 角色信息 */ SysRoleEntity checkRoleKeyUnique(String roleKey); @@ -46,7 +47,8 @@ public interface SysRoleMapper extends BaseMapper { /** * 根据用户ID查询角色 * - * @param userId 用户ID + * @param userId + * 用户ID * @return 角色列表 */ List selectRolePermissionByUserId(String userId); @@ -54,7 +56,8 @@ public interface SysRoleMapper extends BaseMapper { /** * 根据条件分页查询角色数据 * - * @param role 角色信息 + * @param role + * 角色信息 * @return 角色数据集合信息 */ List selectRoleList(SysRoleEntity role); @@ -62,7 +65,8 @@ public interface SysRoleMapper extends BaseMapper { /** * 根据租户ID查询默认管理员角色 * - * @param tenantId 租户ID + * @param tenantId + * 租户ID * @return 角色 */ @InterceptorIgnore(tenantLine = "1") @@ -71,7 +75,8 @@ public interface SysRoleMapper extends BaseMapper { /** * 批量删除角色信息-根据租户 * - * @param ids 需要删除的租户id + * @param ids + * 需要删除的租户id * @return 结果 */ @InterceptorIgnore(tenantLine = "1") @@ -80,7 +85,8 @@ public interface SysRoleMapper extends BaseMapper { /** * 通过角色ID查询角色使用数量 * - * @param roleId 角色ID + * @param roleId + * 角色ID * @return 结果 */ int countUserRoleByRoleId(Long roleId); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleMenuMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleMenuMapper.java index 8daab4a..9d2f23b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleMenuMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleMenuMapper.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.system.module.entity.SysRoleMenuEntity; import org.apache.ibatis.annotations.Mapper; - /** *

* 角色和菜单关联表 Mapper 接口 @@ -20,7 +19,8 @@ public interface SysRoleMenuMapper extends BaseMapper { /** * 通过租户ID删除角色和菜单关联 * - * @param tenantId 租户ID + * @param tenantId + * 租户ID * @return 结果 */ @InterceptorIgnore(tenantLine = "1") @@ -29,7 +29,8 @@ public interface SysRoleMenuMapper extends BaseMapper { /** * 通过租户ID删除角色和菜单关联 * - * @param ids 租户ID + * @param ids + * 租户ID * @return 结果 */ @InterceptorIgnore(tenantLine = "1") @@ -38,7 +39,8 @@ public interface SysRoleMenuMapper extends BaseMapper { /** * 批量删除角色菜单关联信息 * - * @param ids 需要删除的数据ID + * @param ids + * 需要删除的数据ID * @return 结果 */ int deleteRoleMenu(Long[] ids); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantMapper.java index 41051d8..b386194 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantMapper.java @@ -18,7 +18,8 @@ public interface SysTenantMapper extends BaseMapper { /** * 查询租户表 * - * @param tenantId 租户表主键 + * @param tenantId + * 租户表主键 * @return 租户表 */ SysTenantEntity selectSysTenantByTenantId(String tenantId); @@ -26,8 +27,10 @@ public interface SysTenantMapper extends BaseMapper { /** * 查询租户表列表 * - * @param page 分页参数 - * @param sysTenantEntity 租户表 + * @param page + * 分页参数 + * @param sysTenantEntity + * 租户表 * @return 租户表集合 */ IPage selectSysTenantList(Page page, @Param("vo") SysTenantQueryVo sysTenantEntity); @@ -35,7 +38,8 @@ public interface SysTenantMapper extends BaseMapper { /** * 批量删除租户管理 * - * @param ids 需要删除的数据主键集合 + * @param ids + * 需要删除的数据主键集合 * @return 结果 */ int deleteTenantByIds(String[] ids); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantPackageMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantPackageMapper.java index 734f14e..497e229 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantPackageMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantPackageMapper.java @@ -6,9 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.starry.admin.modules.system.module.entity.SysTenantPackageEntity; import com.starry.admin.modules.system.vo.SimplePackage; import com.starry.admin.modules.system.vo.SysTenantPackageVo; -import org.apache.ibatis.annotations.Param; - import java.util.List; +import org.apache.ibatis.annotations.Param; /** * 租户套餐表Mapper接口 @@ -19,7 +18,8 @@ public interface SysTenantPackageMapper extends BaseMapper selectSysTenantPackageList(Page page, @Param("vo") SysTenantPackageVo sysTenantPackageEntity); + IPage selectSysTenantPackageList(Page page, + @Param("vo") SysTenantPackageVo sysTenantPackageEntity); /** * 查询租户套餐 diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantRechargeInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantRechargeInfoMapper.java index 7a8728a..e2d8500 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantRechargeInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantRechargeInfoMapper.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.mapper; - import com.github.yulichang.base.MPJBaseMapper; import com.starry.admin.modules.system.module.entity.SysTenantRechargeInfoEntity; @@ -12,5 +11,4 @@ import com.starry.admin.modules.system.module.entity.SysTenantRechargeInfoEntity */ public interface SysTenantRechargeInfoMapper extends MPJBaseMapper { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysUserMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysUserMapper.java index 30c1932..a5b29fc 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysUserMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysUserMapper.java @@ -22,11 +22,11 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface SysUserMapper extends MPJBaseMapper { - /** * 通过用户ID查询用户 * - * @param userId 用户ID + * @param userId + * 用户ID * @return 用户对象信息 */ SysUserEntity selectUserById(String userId); @@ -34,8 +34,10 @@ public interface SysUserMapper extends MPJBaseMapper { /** * 根据条件分页查询用户列表 * - * @param queryVo 条件信息 - * @param page 分页信息 + * @param queryVo + * 条件信息 + * @param page + * 分页信息 * @return 用户信息集合信息 */ IPage selectUserList(IPage page, @Param("user") UserQueryVo queryVo); @@ -43,7 +45,8 @@ public interface SysUserMapper extends MPJBaseMapper { /** * 通过用户名查询用户 * - * @param userName 用户名 + * @param userName + * 用户名 * @return 用户对象信息 */ @InterceptorIgnore(tenantLine = "1") @@ -52,7 +55,8 @@ public interface SysUserMapper extends MPJBaseMapper { /** * 校验用户名称是否唯一 * - * @param userName 用户名称 + * @param userName + * 用户名称 * @return 结果 */ @InterceptorIgnore(tenantLine = "1") @@ -61,7 +65,8 @@ public interface SysUserMapper extends MPJBaseMapper { /** * 批量删除用户信息-根据租户 * - * @param ids 需要删除的租户ID + * @param ids + * 需要删除的租户ID * @return 结果 */ @InterceptorIgnore(tenantLine = "1") @@ -70,7 +75,8 @@ public interface SysUserMapper extends MPJBaseMapper { /** * 根据条件分页查询已配用户角色列表 * - * @param user 用户信息 + * @param user + * 用户信息 * @return 用户信息集合信息 */ IPage selectAllocatedList(Page page, @Param("query") SysUserQueryVo user); @@ -78,11 +84,13 @@ public interface SysUserMapper extends MPJBaseMapper { /** * 根据条件分页查询未配用户角色列表 * - * @param user 用户信息 + * @param user + * 用户信息 * @return 用户信息集合信息 */ IPage selectUnallocatedList(Page page, @Param("query") SysUserQueryVo user); @InterceptorIgnore(tenantLine = "1") - SysUserEntity selectUserByUserNameAndTenantId(@Param("userName") String userName, @Param("tenantId")String tenantId); + SysUserEntity selectUserByUserNameAndTenantId(@Param("userName") String userName, + @Param("tenantId") String tenantId); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysUserRoleMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysUserRoleMapper.java index da12e34..ae29fe2 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysUserRoleMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysUserRoleMapper.java @@ -6,7 +6,6 @@ import com.starry.admin.modules.system.module.entity.SysUserRoleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; - /** *

* 用户角色关联表 Mapper 接口 @@ -21,7 +20,8 @@ public interface SysUserRoleMapper extends BaseMapper { /** * 批量删除用户和角色关联-根据租户 * - * @param ids 需要删除的用户租户id + * @param ids + * 需要删除的用户租户id * @return 结果 */ @InterceptorIgnore(tenantLine = "1") @@ -30,7 +30,8 @@ public interface SysUserRoleMapper extends BaseMapper { /** * 删除用户和角色关联信息 * - * @param userRole 用户和角色关联信息 + * @param userRole + * 用户和角色关联信息 * @return 结果 */ int deleteUserRoleInfo(SysUserRoleEntity userRole); @@ -38,8 +39,10 @@ public interface SysUserRoleMapper extends BaseMapper { /** * 批量取消授权用户角色 * - * @param roleId 角色ID - * @param userIds 需要删除的用户数据ID + * @param roleId + * 角色ID + * @param userIds + * 需要删除的用户数据ID * @return 结果 */ int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") String[] userIds); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Cache.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Cache.java index fa6ad90..115f908 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Cache.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Cache.java @@ -1,12 +1,10 @@ package com.starry.admin.modules.system.module.entity; - import com.starry.common.utils.StringUtils; import lombok.Data; /** - * @author admin - * 缓存信息 + * @author admin 缓存信息 * @since 2022/10/18 */ @Data diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Cpu.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Cpu.java index 6df20c7..2661b03 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Cpu.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Cpu.java @@ -4,8 +4,7 @@ import com.starry.common.utils.Arith; import lombok.Data; /** - * @author admin - * cpu相关信息 + * @author admin cpu相关信息 * @since 2022/10/17 */ @Data diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Jvm.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Jvm.java index b25cac9..e49104e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Jvm.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Jvm.java @@ -2,13 +2,11 @@ package com.starry.admin.modules.system.module.entity; import cn.hutool.core.date.DateUtil; import com.starry.common.utils.Arith; - import java.lang.management.ManagementFactory; import java.util.Date; /** - * @author admin - * 虚拟机相关信息 + * @author admin 虚拟机相关信息 * @since 2022/10/17 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Mem.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Mem.java index c725885..2382ea3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Mem.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Mem.java @@ -4,8 +4,7 @@ import com.starry.common.utils.Arith; import lombok.Data; /** - * @author admin - * 内存相关信息 + * @author admin 内存相关信息 * @since 2022/10/17 */ @Data diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Server.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Server.java index 6a6d15b..de024ae 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Server.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Server.java @@ -1,8 +1,11 @@ package com.starry.admin.modules.system.module.entity; - import com.starry.common.utils.Arith; import com.starry.common.utils.ip.IpUtils; +import java.net.UnknownHostException; +import java.util.LinkedList; +import java.util.List; +import java.util.Properties; import lombok.Data; import oshi.SystemInfo; import oshi.hardware.CentralProcessor; @@ -13,14 +16,8 @@ import oshi.software.os.OSFileStore; import oshi.software.os.OperatingSystem; import oshi.util.Util; -import java.net.UnknownHostException; -import java.util.LinkedList; -import java.util.List; -import java.util.Properties; - /** - * @author admin - * 服务器相关信息 + * @author admin 服务器相关信息 * @since 2022/10/17 */ @Data @@ -71,14 +68,22 @@ public class Server { long[] prevTicks = processor.getSystemCpuLoadTicks(); Util.sleep(1000); long[] ticks = processor.getSystemCpuLoadTicks(); - long nice = ticks[CentralProcessor.TickType.NICE.getIndex()] - prevTicks[CentralProcessor.TickType.NICE.getIndex()]; - long irq = ticks[CentralProcessor.TickType.IRQ.getIndex()] - prevTicks[CentralProcessor.TickType.IRQ.getIndex()]; - long softirq = ticks[CentralProcessor.TickType.SOFTIRQ.getIndex()] - prevTicks[CentralProcessor.TickType.SOFTIRQ.getIndex()]; - long steal = ticks[CentralProcessor.TickType.STEAL.getIndex()] - prevTicks[CentralProcessor.TickType.STEAL.getIndex()]; - long cSys = ticks[CentralProcessor.TickType.SYSTEM.getIndex()] - prevTicks[CentralProcessor.TickType.SYSTEM.getIndex()]; - long user = ticks[CentralProcessor.TickType.USER.getIndex()] - prevTicks[CentralProcessor.TickType.USER.getIndex()]; - long iowait = ticks[CentralProcessor.TickType.IOWAIT.getIndex()] - prevTicks[CentralProcessor.TickType.IOWAIT.getIndex()]; - long idle = ticks[CentralProcessor.TickType.IDLE.getIndex()] - prevTicks[CentralProcessor.TickType.IDLE.getIndex()]; + long nice = ticks[CentralProcessor.TickType.NICE.getIndex()] + - prevTicks[CentralProcessor.TickType.NICE.getIndex()]; + long irq = ticks[CentralProcessor.TickType.IRQ.getIndex()] + - prevTicks[CentralProcessor.TickType.IRQ.getIndex()]; + long softirq = ticks[CentralProcessor.TickType.SOFTIRQ.getIndex()] + - prevTicks[CentralProcessor.TickType.SOFTIRQ.getIndex()]; + long steal = ticks[CentralProcessor.TickType.STEAL.getIndex()] + - prevTicks[CentralProcessor.TickType.STEAL.getIndex()]; + long cSys = ticks[CentralProcessor.TickType.SYSTEM.getIndex()] + - prevTicks[CentralProcessor.TickType.SYSTEM.getIndex()]; + long user = ticks[CentralProcessor.TickType.USER.getIndex()] + - prevTicks[CentralProcessor.TickType.USER.getIndex()]; + long iowait = ticks[CentralProcessor.TickType.IOWAIT.getIndex()] + - prevTicks[CentralProcessor.TickType.IOWAIT.getIndex()]; + long idle = ticks[CentralProcessor.TickType.IDLE.getIndex()] + - prevTicks[CentralProcessor.TickType.IDLE.getIndex()]; long totalCpu = user + nice + cSys + idle + iowait + irq + softirq + steal; cpu.setCpuNum(processor.getLogicalProcessorCount()); cpu.setTotal(totalCpu); @@ -146,7 +151,8 @@ public class Server { /** * 字节转换 * - * @param size 字节大小 + * @param size + * 字节大小 * @return 转换后值 */ public String convertFileSize(long size) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Sys.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Sys.java index 1b2416b..7b3476c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Sys.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Sys.java @@ -3,8 +3,7 @@ package com.starry.admin.modules.system.module.entity; import lombok.Data; /** - * @author admin - * 系统相关信息 + * @author admin 系统相关信息 * @since 2022/10/17 */ @Data diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysAdministrativeAreaDictInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysAdministrativeAreaDictInfoEntity.java index 41ad6e8..b276001 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysAdministrativeAreaDictInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysAdministrativeAreaDictInfoEntity.java @@ -3,11 +3,10 @@ package com.starry.admin.modules.system.module.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.starry.common.domain.BaseEntity; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** * 行政区域字典信息对象 play_administrative_area_dict_info * @@ -19,7 +18,6 @@ import java.util.List; @TableName("sys_administrative_area_dict_info") public class SysAdministrativeAreaDictInfoEntity extends BaseEntity { - /** * UUID */ @@ -45,7 +43,6 @@ public class SysAdministrativeAreaDictInfoEntity extends BaseEntity child; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysDeptEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysDeptEntity.java index b6fa096..096ad5a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysDeptEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysDeptEntity.java @@ -7,11 +7,10 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.starry.common.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - import java.util.ArrayList; import java.util.List; +import lombok.Data; +import lombok.EqualsAndHashCode; /** *

diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysFile.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysFile.java index 8497474..40ddee9 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysFile.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysFile.java @@ -3,8 +3,7 @@ package com.starry.admin.modules.system.module.entity; import lombok.Data; /** - * @author admin - * 系统文件相关信息 + * @author admin 系统文件相关信息 */ @Data public class SysFile { diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysLoginLogEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysLoginLogEntity.java index 295975b..1daba46 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysLoginLogEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysLoginLogEntity.java @@ -9,12 +9,10 @@ import com.starry.admin.modules.system.vo.StatusConverter; import com.starry.common.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - - /** * 系统访问日志表对象 sys_login_log * @@ -82,5 +80,4 @@ public class SysLoginLogEntity extends BaseEntity { */ private Date loginTime; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysLoginLogVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysLoginLogVo.java index f6b0fbd..e4c1526 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysLoginLogVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysLoginLogVo.java @@ -7,12 +7,10 @@ import com.starry.admin.modules.system.vo.StatusConverter; import com.starry.common.domain.BasePageEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - - /** * 系统访问日志表对象 sys_login_log * @@ -86,5 +84,4 @@ public class SysLoginLogVo extends BasePageEntity { @ApiModelProperty(value = "登录时间", example = "2023-01-01 00:00:00", notes = "用户登录的时间") private Date loginTime; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysMenuEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysMenuEntity.java index 53ddd15..520e5f8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysMenuEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysMenuEntity.java @@ -7,11 +7,10 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.starry.common.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; - import java.util.ArrayList; import java.util.List; +import lombok.Getter; +import lombok.Setter; /** *

diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysOperationLogEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysOperationLogEntity.java index 1387f31..71f5206 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysOperationLogEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysOperationLogEntity.java @@ -9,12 +9,10 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.starry.common.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - - /** * 操作日志表对象 sys_operation_log * diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleEntity.java index d8113e5..cf97fc6 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleEntity.java @@ -7,12 +7,11 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.starry.common.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Set; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import java.util.Set; - /** *

* 角色表 diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleMenuEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleMenuEntity.java index d23bd81..9c96ff3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleMenuEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleMenuEntity.java @@ -38,5 +38,4 @@ public class SysRoleMenuEntity extends BaseEntity { @ApiModelProperty("租户ID") private String tenantId; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysTenantEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysTenantEntity.java index c32e661..0d63ff3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysTenantEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysTenantEntity.java @@ -5,12 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.starry.common.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.util.Date; - /** * 租户表对象 sys_tenant * @@ -116,13 +115,11 @@ public class SysTenantEntity extends BaseEntity { */ private String appId; - /** * 微信公众号的app secret */ private String secret; - /** * 微信商户ID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysTenantRechargeInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysTenantRechargeInfoEntity.java index a48db5b..9ac1c90 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysTenantRechargeInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysTenantRechargeInfoEntity.java @@ -3,12 +3,11 @@ package com.starry.admin.modules.system.module.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.starry.common.domain.BaseEntity; +import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - /** * 租户充值信息对象 sys_tenant_recharge_info * @@ -62,5 +61,4 @@ public class SysTenantRechargeInfoEntity extends BaseEntity * 用户表 @@ -85,7 +84,6 @@ public class SysUserEntity extends BaseEntity { @ApiModelProperty(value = "租户id") private String tenantId; - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime addTime; @@ -116,10 +114,8 @@ public class SysUserEntity extends BaseEntity { @TableField(exist = false) private Long roleId; - public static boolean isAdmin(SysUserEntity user) { return user.getSuperAdmin(); } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/UserOnline.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/UserOnline.java index cc7a491..3bd6e22 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/UserOnline.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/UserOnline.java @@ -3,8 +3,7 @@ package com.starry.admin.modules.system.module.entity; import lombok.Data; /** - * @author admin - * 当前在线会话 + * @author admin 当前在线会话 */ @Data public class UserOnline { diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/vo/SysTenantRechargeInfoAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/vo/SysTenantRechargeInfoAddVo.java index 146c784..f0e639f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/vo/SysTenantRechargeInfoAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/vo/SysTenantRechargeInfoAddVo.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.system.module.vo; -import lombok.Data; - import java.time.LocalDateTime; +import lombok.Data; /** * @author admin diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/vo/SysTenantRechargeInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/vo/SysTenantRechargeInfoQueryVo.java index 0a5e47b..86c6c49 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/vo/SysTenantRechargeInfoQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/vo/SysTenantRechargeInfoQueryVo.java @@ -12,5 +12,4 @@ import lombok.EqualsAndHashCode; @Data public class SysTenantRechargeInfoQueryVo extends BasePageEntity { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/module/vo/SysTenantRechargeInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/vo/SysTenantRechargeInfoReturnVo.java index 90ac543..6683524 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/module/vo/SysTenantRechargeInfoReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/vo/SysTenantRechargeInfoReturnVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.system.module.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import java.time.LocalDateTime; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - /** * @author admin * @since 2024/9/5 下午3:44 diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysAdministrativeAreaDictInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysAdministrativeAreaDictInfoService.java index 7951bad..745093d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysAdministrativeAreaDictInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysAdministrativeAreaDictInfoService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.system.module.entity.SysAdministrativeAreaDictInfoEntity; import com.starry.admin.modules.system.vo.AdministrativeAreaQueryReturnVo; - import java.util.List; /** @@ -18,16 +17,17 @@ public interface ISysAdministrativeAreaDictInfoService extends IService * @author admin * @since 2024/4/10 14:47 @@ -44,15 +44,18 @@ public interface ISysAdministrativeAreaDictInfoService extends IService selectPlayAdministrativeAreaDictInfoByPage(SysAdministrativeAreaDictInfoEntity playAdministrativeAreaDictInfo); + IPage selectPlayAdministrativeAreaDictInfoByPage( + SysAdministrativeAreaDictInfoEntity playAdministrativeAreaDictInfo); /** * 新增行政区域字典信息 * - * @param playAdministrativeAreaDictInfo 行政区域字典信息 + * @param playAdministrativeAreaDictInfo + * 行政区域字典信息 * @return 结果 */ boolean create(SysAdministrativeAreaDictInfoEntity playAdministrativeAreaDictInfo); @@ -62,7 +65,8 @@ public interface ISysAdministrativeAreaDictInfoService extends IService { /** * 查询字典数据表 * - * @param dictDataId 字典数据表主键 + * @param dictDataId + * 字典数据表主键 * @return 字典数据表 */ SysDictDataEntity selectXlDictDataByDictDataId(Long dictDataId); @@ -24,7 +24,8 @@ public interface ISysDictDataService extends IService { /** * 查询字典数据表列表 * - * @param sysDictDataEntity 字典数据表 + * @param sysDictDataEntity + * 字典数据表 * @return 字典数据表集合 */ IPage selectXlDictDataList(SysDictDataVo sysDictDataEntity); @@ -32,7 +33,8 @@ public interface ISysDictDataService extends IService { /** * 新增字典数据表 * - * @param sysDictDataEntity 字典数据表 + * @param sysDictDataEntity + * 字典数据表 * @return 结果 */ boolean create(SysDictDataEntity sysDictDataEntity); @@ -40,7 +42,8 @@ public interface ISysDictDataService extends IService { /** * 修改字典数据表 * - * @param sysDictDataEntity 字典数据表 + * @param sysDictDataEntity + * 字典数据表 * @return 结果 */ boolean update(SysDictDataEntity sysDictDataEntity); @@ -48,7 +51,8 @@ public interface ISysDictDataService extends IService { /** * 批量删除字典数据表 * - * @param dictDataIds 需要删除的字典数据表主键集合 + * @param dictDataIds + * 需要删除的字典数据表主键集合 * @return 结果 */ int deleteXlDictDataByDictDataIds(Long[] dictDataIds); @@ -56,7 +60,8 @@ public interface ISysDictDataService extends IService { /** * 删除字典数据表信息 * - * @param dictDataId 字典数据表主键 + * @param dictDataId + * 字典数据表主键 * @return 结果 */ int deleteXlDictDataByDictDataId(Long dictDataId); @@ -64,7 +69,8 @@ public interface ISysDictDataService extends IService { /** * 根据字典类型查询字典数据 * - * @param dictType 字典类型 + * @param dictType + * 字典类型 * @return 字典数据集合信息 */ List selectDictDataByType(String dictType); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysDictService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysDictService.java index 1be6428..0c36a2e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysDictService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysDictService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.system.module.entity.SysDictEntity; import com.starry.admin.modules.system.vo.SysDictVo; - import java.util.List; /** @@ -17,7 +16,8 @@ public interface ISysDictService extends IService { /** * 查询字典表 * - * @param dictId 字典表主键 + * @param dictId + * 字典表主键 * @return 字典表 */ SysDictEntity selectXlDictByDictId(Long dictId); @@ -25,7 +25,8 @@ public interface ISysDictService extends IService { /** * 查询字典表列表 * - * @param sysDictVo 字典表 + * @param sysDictVo + * 字典表 * @return 字典表集合 */ Page selectXlDictList(SysDictVo sysDictVo); @@ -33,7 +34,8 @@ public interface ISysDictService extends IService { /** * 新增字典表 * - * @param sysDictEntity 字典表 + * @param sysDictEntity + * 字典表 * @return 结果 */ boolean create(SysDictEntity sysDictEntity); @@ -41,7 +43,8 @@ public interface ISysDictService extends IService { /** * 修改字典表 * - * @param sysDictEntity 字典表 + * @param sysDictEntity + * 字典表 * @return 结果 */ boolean update(SysDictEntity sysDictEntity); @@ -49,7 +52,8 @@ public interface ISysDictService extends IService { /** * 批量删除字典表 * - * @param dictIds 需要删除的字典表主键集合 + * @param dictIds + * 需要删除的字典表主键集合 * @return 结果 */ int deleteXlDictByDictIds(Long[] dictIds); @@ -57,7 +61,8 @@ public interface ISysDictService extends IService { /** * 删除字典表信息 * - * @param dictId 字典表主键 + * @param dictId + * 字典表主键 * @return 结果 */ int deleteXlDictByDictId(Long dictId); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysLoginLogService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysLoginLogService.java index 49b331e..4e80a33 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysLoginLogService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysLoginLogService.java @@ -14,7 +14,8 @@ public interface ISysLoginLogService extends IService { /** * 查询系统访问日志表 * - * @param loginId 系统访问日志表主键 + * @param loginId + * 系统访问日志表主键 * @return 系统访问日志表 */ SysLoginLogEntity selectXlLoginLogByLoginId(Long loginId); @@ -22,7 +23,8 @@ public interface ISysLoginLogService extends IService { /** * 查询系统访问日志表列表 * - * @param sysLoginLogEntity 系统访问日志表 + * @param sysLoginLogEntity + * 系统访问日志表 * @return 系统访问日志表集合 */ IPage selectXlLoginLogList(SysLoginLogVo sysLoginLogEntity); @@ -30,7 +32,8 @@ public interface ISysLoginLogService extends IService { /** * 新增系统访问日志表 * - * @param sysLoginLogEntity 系统访问日志表 + * @param sysLoginLogEntity + * 系统访问日志表 * @return 结果 */ boolean create(SysLoginLogEntity sysLoginLogEntity); @@ -38,7 +41,8 @@ public interface ISysLoginLogService extends IService { /** * 修改系统访问日志表 * - * @param sysLoginLogEntity 系统访问日志表 + * @param sysLoginLogEntity + * 系统访问日志表 * @return 结果 */ boolean update(SysLoginLogEntity sysLoginLogEntity); @@ -46,7 +50,8 @@ public interface ISysLoginLogService extends IService { /** * 批量删除系统访问日志表 * - * @param loginIds 需要删除的系统访问日志表主键集合 + * @param loginIds + * 需要删除的系统访问日志表主键集合 * @return 结果 */ int deleteXlLoginLogByLoginIds(Long[] loginIds); @@ -54,7 +59,8 @@ public interface ISysLoginLogService extends IService { /** * 删除系统访问日志表信息 * - * @param loginId 系统访问日志表主键 + * @param loginId + * 系统访问日志表主键 * @return 结果 */ int deleteXlLoginLogByLoginId(Long loginId); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysOperationLogService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysOperationLogService.java index 8477ad9..b139a95 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysOperationLogService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysOperationLogService.java @@ -14,7 +14,8 @@ public interface ISysOperationLogService extends IService /** * 查询操作日志表 * - * @param operId 操作日志表主键 + * @param operId + * 操作日志表主键 * @return 操作日志表 */ SysOperationLogEntity selectXlOperLogByOperId(Long operId); @@ -22,7 +23,8 @@ public interface ISysOperationLogService extends IService /** * 查询操作日志表列表 * - * @param sysOperationLogEntity 操作日志表 + * @param sysOperationLogEntity + * 操作日志表 * @return 操作日志表集合 */ IPage selectXlOperLogList(SysOperationLogVo sysOperationLogEntity); @@ -30,7 +32,8 @@ public interface ISysOperationLogService extends IService /** * 新增操作日志表 * - * @param sysOperationLogEntity 操作日志表 + * @param sysOperationLogEntity + * 操作日志表 * @return 结果 */ boolean create(SysOperationLogEntity sysOperationLogEntity); @@ -38,7 +41,8 @@ public interface ISysOperationLogService extends IService /** * 修改操作日志表 * - * @param sysOperationLogEntity 操作日志表 + * @param sysOperationLogEntity + * 操作日志表 * @return 结果 */ boolean updateXlOperLog(SysOperationLogEntity sysOperationLogEntity); @@ -46,7 +50,8 @@ public interface ISysOperationLogService extends IService /** * 批量删除操作日志表 * - * @param operIds 需要删除的操作日志表主键集合 + * @param operIds + * 需要删除的操作日志表主键集合 * @return 结果 */ int deleteXlOperLogByOperIds(Long[] operIds); @@ -54,7 +59,8 @@ public interface ISysOperationLogService extends IService /** * 删除操作日志表信息 * - * @param operId 操作日志表主键 + * @param operId + * 操作日志表主键 * @return 结果 */ int deleteXlOperLogByOperId(Long operId); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantPackageService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantPackageService.java index fb68571..f3cab91 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantPackageService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantPackageService.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.system.module.entity.SysTenantPackageEntity; import com.starry.admin.modules.system.vo.SimplePackage; import com.starry.admin.modules.system.vo.SysTenantPackageVo; - import java.util.List; /** @@ -17,7 +16,8 @@ public interface ISysTenantPackageService extends IService selectSysTenantPackageList(SysTenantPackageVo sysTenantPackageEntity); @@ -33,7 +34,8 @@ public interface ISysTenantPackageService extends IService getSimpleList(); - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantRechargeInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantRechargeInfoService.java index 2997bef..e7a2059 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantRechargeInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantRechargeInfoService.java @@ -16,7 +16,8 @@ public interface ISysTenantRechargeInfoService extends IService selectByPage(SysTenantRechargeInfoQueryVo queryVo); @@ -32,7 +34,8 @@ public interface ISysTenantRechargeInfoService extends IService { - /** * 获得所有的租户信息 * @@ -26,7 +24,8 @@ public interface ISysTenantService extends IService { /** * 根据租户权限标识查询租户 * - * @param tenantKey 租户权限标识 + * @param tenantKey + * 租户权限标识 * @return 租户表 */ SysTenantEntity selectByTenantKey(String tenantKey); @@ -34,7 +33,8 @@ public interface ISysTenantService extends IService { /** * 查询租户表 * - * @param tenantId 租户表主键 + * @param tenantId + * 租户表主键 * @return 租户表 */ SysTenantEntity selectSysTenantByTenantId(String tenantId); @@ -42,7 +42,8 @@ public interface ISysTenantService extends IService { /** * 查询租户表列表 * - * @param sysTenantEntity 租户表 + * @param sysTenantEntity + * 租户表 * @return 租户表集合 */ IPage selectSysTenantList(SysTenantQueryVo sysTenantEntity); @@ -50,7 +51,8 @@ public interface ISysTenantService extends IService { /** * 新增租户表 * - * @param sysTenantEntity 租户表 + * @param sysTenantEntity + * 租户表 * @return 结果 */ boolean create(SysTenantEntity sysTenantEntity); @@ -58,7 +60,8 @@ public interface ISysTenantService extends IService { /** * 修改租户表 * - * @param sysTenantEntity 租户表 + * @param sysTenantEntity + * 租户表 * @return 结果 */ boolean update(SysTenantEntity sysTenantEntity); @@ -66,7 +69,8 @@ public interface ISysTenantService extends IService { /** * 批量删除租户表 * - * @param tenantIds 需要删除的租户表主键集合 + * @param tenantIds + * 需要删除的租户表主键集合 * @return 结果 */ int deleteSysTenantByTenantIds(String[] tenantIds); @@ -74,7 +78,8 @@ public interface ISysTenantService extends IService { /** * 删除租户表信息 * - * @param tenantId 租户表主键 + * @param tenantId + * 租户表主键 * @return 结果 */ int deleteSysTenantByTenantId(Long tenantId); @@ -82,7 +87,8 @@ public interface ISysTenantService extends IService { /** * 新增租户 * - * @param sysTenantEntity 租户表 + * @param sysTenantEntity + * 租户表 * @return 结果 */ R addTenant(SysTenantEntity sysTenantEntity); @@ -90,16 +96,17 @@ public interface ISysTenantService extends IService { /** * 修改租户 * - * @param sysTenantEntity 租户表 + * @param sysTenantEntity + * 租户表 * @return 结果 */ R updateTenant(SysTenantEntity sysTenantEntity); - /** * 根据套餐ID查询租户 * - * @param packageId 套餐ID + * @param packageId + * 套餐ID * @return */ List queryByPackage(String packageId); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/LoginService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/LoginService.java index 45a9208..fac5ce3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/LoginService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/LoginService.java @@ -1,9 +1,7 @@ package com.starry.admin.modules.system.service; - import com.starry.admin.common.domain.LoginUser; import com.starry.admin.modules.system.module.entity.SysUserEntity; - import java.util.Set; /** @@ -14,8 +12,10 @@ public interface LoginService { /** * 登录功能 * - * @param username 用户名 - * @param password 密码 + * @param username + * 用户名 + * @param password + * 密码 * @return 生成的JWT的token */ String login(String username, String password); @@ -23,7 +23,8 @@ public interface LoginService { /** * 获取菜单数据权限 * - * @param user 用户信息 + * @param user + * 用户信息 * @return 菜单权限信息 */ Set getMenuPermission(SysUserEntity user); @@ -31,18 +32,21 @@ public interface LoginService { /** * 获取角色数据权限 * - * @param user 用户信息 + * @param user + * 用户信息 * @return 角色权限信息 */ Set getRolePermission(SysUserEntity user); - /** * 租户登录功能 * - * @param tenantkey 租户标识 - * @param username 用户名 - * @param password 密码 + * @param tenantkey + * 租户标识 + * @param username + * 用户名 + * @param password + * 密码 * @return 生成的JWT的token */ LoginUser tenantLogin(String tenantkey, String username, String password); @@ -50,8 +54,10 @@ public interface LoginService { /** * 登录功能 * - * @param username 用户名 - * @param password 密码 + * @param username + * 用户名 + * @param password + * 密码 * @param tenantKey * @return 生成的JWT的token */ @@ -60,7 +66,8 @@ public interface LoginService { /** * 新登录功能，增加租户相关 * - * @param userName 用户名 + * @param userName + * 用户名 * @param tenantId * @return 获取信息 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysDeptService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysDeptService.java index 62cd9db..309137d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysDeptService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysDeptService.java @@ -3,7 +3,6 @@ package com.starry.admin.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.common.domain.TreeSelect; import com.starry.admin.modules.system.module.entity.SysDeptEntity; - import java.util.List; /** @@ -19,7 +18,8 @@ public interface SysDeptService extends IService { /** * 查询部门管理数据 * - * @param dept 部门信息 + * @param dept + * 部门信息 * @return 部门信息集合 */ List selectDeptList(SysDeptEntity dept); @@ -27,7 +27,8 @@ public interface SysDeptService extends IService { /** * 校验部门名称是否唯一 * - * @param dept 部门信息 + * @param dept + * 部门信息 * @return 结果 */ String checkDeptNameUnique(SysDeptEntity dept); @@ -59,7 +60,8 @@ public interface SysDeptService extends IService { /** * 是否存在部门子节点 * - * @param deptId 部门ID + * @param deptId + * 部门ID * @return 结果 */ boolean hasChildByDeptId(Long deptId); @@ -67,7 +69,8 @@ public interface SysDeptService extends IService { /** * 构建前端所需要树结构 * - * @param depts 部门列表 + * @param depts + * 部门列表 * @return 树结构列表 */ List buildDeptTreeSelect(List depts); @@ -75,7 +78,8 @@ public interface SysDeptService extends IService { /** * 根据角色ID查询部门树信息 * - * @param roleId 角色ID + * @param roleId + * 角色ID * @return 选中部门列表 */ List selectDeptListByRoleId(Long roleId); @@ -83,7 +87,8 @@ public interface SysDeptService extends IService { /** * 查询部门树结构信息 * - * @param dept 部门信息 + * @param dept + * 部门信息 * @return 部门树信息集合 */ List selectDeptTreeList(SysDeptEntity dept); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysMenuService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysMenuService.java index fd41514..aaae045 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysMenuService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysMenuService.java @@ -6,7 +6,6 @@ import com.starry.admin.common.domain.TreeSelect; import com.starry.admin.modules.system.module.entity.SysMenuEntity; import com.starry.admin.modules.system.vo.RouterVo; import com.starry.admin.modules.system.vo.SimpleMenu; - import java.util.List; import java.util.Set; @@ -31,10 +30,14 @@ public interface SysMenuService extends IService { /** * 根据用户查询系统菜单列表 * - * @param menu 菜单 - * @param userId 用户ID - * @param pageSize 页大小 - * @param pageNum 页数 + * @param menu + * 菜单 + * @param userId + * 用户ID + * @param pageSize + * 页大小 + * @param pageNum + * 页数 * @return 分页菜单列表 */ Page listPage(SysMenuEntity menu, String userId, Integer pageSize, Integer pageNum); @@ -42,8 +45,10 @@ public interface SysMenuService extends IService { /** * 根据用户查询系统菜单列表 * - * @param menu 菜单 - * @param userId 用户ID + * @param menu + * 菜单 + * @param userId + * 用户ID * @return 菜单列表 */ List selectMenuList(SysMenuEntity menu, String userId); @@ -51,7 +56,8 @@ public interface SysMenuService extends IService { /** * 根据用户查询系统菜单列表 * - * @param userId 用户ID + * @param userId + * 用户ID * @return 菜单列表 */ List selectMenuList(String userId); @@ -59,7 +65,8 @@ public interface SysMenuService extends IService { /** * 校验菜单名称是否唯一 * - * @param menu 菜单信息 + * @param menu + * 菜单信息 * @return 结果 */ String checkMenuNameUnique(SysMenuEntity menu); @@ -67,7 +74,8 @@ public interface SysMenuService extends IService { /** * 是否存在菜单子节点 * - * @param menuId 菜单ID + * @param menuId + * 菜单ID * @return 结果 true 存在 false 不存在 */ boolean hasChildByMenuId(Long menuId); @@ -75,7 +83,8 @@ public interface SysMenuService extends IService { /** * 构建前端所需要下拉树结构 * - * @param menus 菜单列表 + * @param menus + * 菜单列表 * @return 下拉树结构列表 */ List buildMenuTreeSelect(List menus); @@ -83,7 +92,8 @@ public interface SysMenuService extends IService { /** * 根据菜单ID查询信息 * - * @param menuId 菜单ID + * @param menuId + * 菜单ID * @return 菜单信息 */ SysMenuEntity selectMenuById(Long menuId); @@ -91,7 +101,8 @@ public interface SysMenuService extends IService { /** * 根据角色ID查询菜单树信息 * - * @param roleId 角色ID + * @param roleId + * 角色ID * @return 选中菜单列表 */ List selectMenuListByRoleId(Long roleId); @@ -99,7 +110,8 @@ public interface SysMenuService extends IService { /** * 根据用户ID查询权限 * - * @param userId 用户ID + * @param userId + * 用户ID * @return 权限列表 */ Set selectMenuPermsByUserId(String userId); @@ -107,7 +119,8 @@ public interface SysMenuService extends IService { /** * 根据用户ID查询菜单树信息 * - * @param userId 用户ID + * @param userId + * 用户ID * @return 菜单列表 */ List selectMenuTreeByUserId(String userId); @@ -115,7 +128,8 @@ public interface SysMenuService extends IService { /** * 构建前端路由所需要的菜单 * - * @param menus 菜单列表 + * @param menus + * 菜单列表 * @return 路由列表 */ List buildMenus(List menus); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleMenuService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleMenuService.java index 45b19a7..1106d8f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleMenuService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleMenuService.java @@ -3,7 +3,6 @@ package com.starry.admin.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.system.module.entity.SysRoleMenuEntity; - /** *

* 角色和菜单关联表 服务类 diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java index 0d17d3e..4fadc65 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java @@ -4,11 +4,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.system.module.entity.SysRoleEntity; import com.starry.admin.modules.system.module.entity.SysUserRoleEntity; - import java.util.List; import java.util.Set; - /** *

* 角色表 服务类 @@ -21,22 +19,26 @@ public interface SysRoleService extends IService { /** * 根据roleId 查询角色 - * @param roleId 角色ID + * + * @param roleId + * 角色ID * @return 角色 */ SysRoleEntity selectByRoleId(String roleId); - /** * 根据roleKey 查询角色 - * @param roleKey 角色标识 + * + * @param roleKey + * 角色标识 * @return 角色 */ SysRoleEntity selectByRoleKey(String roleKey); /** * 校验角色名称是否唯一 * - * @param role 角色信息 + * @param role + * 角色信息 * @return 结果 */ String checkRoleNameUnique(SysRoleEntity role); @@ -44,7 +46,8 @@ public interface SysRoleService extends IService { /** * 校验角色权限是否唯一 * - * @param role 角色信息 + * @param role + * 角色信息 * @return 结果 */ String checkRoleKeyUnique(SysRoleEntity role); @@ -68,7 +71,8 @@ public interface SysRoleService extends IService { /** * 通过角色ID查询角色使用数量 * - * @param roleId 角色ID + * @param roleId + * 角色ID * @return 结果 */ int countUserRoleByRoleId(Long roleId); @@ -94,7 +98,8 @@ public interface SysRoleService extends IService { /** * 分配菜单权限信息 * - * @param role 角色信息 + * @param role + * 角色信息 * @return 结果 */ boolean authRoleMenu(SysRoleEntity role); @@ -102,7 +107,8 @@ public interface SysRoleService extends IService { /** * 根据用户ID查询角色权限 * - * @param userId 用户ID + * @param userId + * 用户ID * @return 权限列表 */ Set selectRolePermissionByUserId(String userId); @@ -110,7 +116,8 @@ public interface SysRoleService extends IService { /** * 根据条件分页查询角色数据 * - * @param role 角色信息 + * @param role + * 角色信息 * @return 角色数据集合信息 */ List selectRoleList(SysRoleEntity role); @@ -118,21 +125,24 @@ public interface SysRoleService extends IService { /** * 校验角色是否允许操作 * - * @param role 角色信息 + * @param role + * 角色信息 */ void checkRoleAllowed(SysRoleEntity role); /** * 校验角色是否有数据权限 * - * @param roleId 角色id + * @param roleId + * 角色id */ void checkRoleDataScope(Long roleId); /** * 修改数据权限信息 * - * @param role 角色信息 + * @param role + * 角色信息 * @return 结果 */ int authDataScope(SysRoleEntity role); @@ -140,7 +150,8 @@ public interface SysRoleService extends IService { /** * 取消授权用户角色 * - * @param userRole 用户和角色关联信息 + * @param userRole + * 用户和角色关联信息 * @return 结果 */ int deleteAuthUser(SysUserRoleEntity userRole); @@ -148,8 +159,10 @@ public interface SysRoleService extends IService { /** * 批量取消授权用户角色 * - * @param roleId 角色ID - * @param userIds 需要取消授权的用户数据ID + * @param roleId + * 角色ID + * @param userIds + * 需要取消授权的用户数据ID * @return 结果 */ int deleteAuthUsers(Long roleId, String[] userIds); @@ -157,8 +170,10 @@ public interface SysRoleService extends IService { /** * 批量选择授权用户角色 * - * @param roleId 角色ID - * @param userIds 需要删除的用户数据ID + * @param roleId + * 角色ID + * @param userIds + * 需要删除的用户数据ID * @return 结果 */ int insertAuthUsers(Long roleId, String[] userIds); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserRoleService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserRoleService.java index b735d1f..8c1a15e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserRoleService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserRoleService.java @@ -3,7 +3,6 @@ package com.starry.admin.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.system.module.entity.SysUserRoleEntity; - /** *

* 用户角色关联表 服务类 @@ -14,21 +13,23 @@ import com.starry.admin.modules.system.module.entity.SysUserRoleEntity; */ public interface SysUserRoleService extends IService { - /** * 删除用户角色信息 * - * @param userId 用户ID - * @param roleId 角色ID + * @param userId + * 用户ID + * @param roleId + * 角色ID */ void delUserRole(String userId, Long roleId); - /** * 新增用户角色信息 * - * @param userId 用户ID - * @param roleId 角色ID + * @param userId + * 用户ID + * @param roleId + * 角色ID */ void addUserRole(String userId, Long roleId); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserService.java index 4f68ad2..0f88a8a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserService.java @@ -6,7 +6,6 @@ import com.starry.admin.modules.personnel.module.vo.PlayPersonnelUserInfoQueryVo import com.starry.admin.modules.personnel.module.vo.PlayPersonnelUserInfoReturnVo; import com.starry.admin.modules.system.module.entity.SysUserEntity; import com.starry.admin.modules.system.vo.*; - import java.util.List; /** @@ -38,14 +37,14 @@ public interface SysUserService extends IService { /** * 通过用户名查询用户 * - * @param userName 用户名 + * @param userName + * 用户名 * @return 用户对象信息 */ SysUserEntity selectUserByUserName(String userName); SysUserEntity selectUserByUserNameAndTenantId(String userName, String tenantId); - /** * 查询所有账户 * @@ -56,7 +55,8 @@ public interface SysUserService extends IService { /** * 分页查询用户 * - * @param vo 查询参数 + * @param vo + * 查询参数 * @return page */ IPage selectByPage(PlayPersonnelUserInfoQueryVo vo); @@ -64,7 +64,8 @@ public interface SysUserService extends IService { /** * 获取列表。分页 * - * @param queryVo 查询参数 + * @param queryVo + * 查询参数 * @return page */ IPage listMemberPage(UserQueryVo queryVo); @@ -72,7 +73,8 @@ public interface SysUserService extends IService { /** * 校验用户名称是否唯一 * - * @param userName 用户名称 + * @param userName + * 用户名称 * @return 结果 */ String checkUserNameUnique(String userName); @@ -104,7 +106,8 @@ public interface SysUserService extends IService { /** * 通过用户ID查询用户 * - * @param userId 用户ID + * @param userId + * 用户ID * @return 用户对象信息 */ SysUserEntity selectUserById(String userId); @@ -112,7 +115,8 @@ public interface SysUserService extends IService { /** * 根据用户ID查询用户所属角色组 * - * @param userId 用户id + * @param userId + * 用户id * @return 结果 */ String selectUserRoleGroup(String userId); @@ -120,8 +124,10 @@ public interface SysUserService extends IService { /** * 修改用户头像 * - * @param userId 用户id - * @param avatar 头像地址 + * @param userId + * 用户id + * @param avatar + * 头像地址 * @return 结果 */ boolean updateUserAvatar(String userId, String avatar); @@ -129,7 +135,8 @@ public interface SysUserService extends IService { /** * 根据条件分页查询已配用户角色列表 * - * @param user 用户信息 + * @param user + * 用户信息 * @return 用户信息集合信息 */ IPage selectAllocatedList(SysUserQueryVo user); @@ -137,7 +144,8 @@ public interface SysUserService extends IService { /** * 根据条件分页查询已配用户角色列表 * - * @param user 用户信息 + * @param user + * 用户信息 * @return 用户信息集合信息 */ IPage selectUnallocatedList(SysUserQueryVo user); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/UserOnlineService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/UserOnlineService.java index dce527e..a8f7594 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/UserOnlineService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/UserOnlineService.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.service; - import com.starry.admin.common.domain.LoginUser; import com.starry.admin.modules.system.module.entity.UserOnline; @@ -13,9 +12,12 @@ public interface UserOnlineService { /** * 通过登录地址/用户名称查询信息 * - * @param ipaddr 登录地址 - * @param userName 用户名称 - * @param user 用户信息 + * @param ipaddr + * 登录地址 + * @param userName + * 用户名称 + * @param user + * 用户信息 * @return 在线用户信息 */ UserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user); @@ -23,8 +25,10 @@ public interface UserOnlineService { /** * 通过登录地址查询信息 * - * @param ipaddr 登录地址 - * @param user 用户信息 + * @param ipaddr + * 登录地址 + * @param user + * 用户信息 * @return 在线用户信息 */ UserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user); @@ -32,8 +36,10 @@ public interface UserOnlineService { /** * 通过用户名称查询信息 * - * @param userName 用户名称 - * @param user 用户信息 + * @param userName + * 用户名称 + * @param user + * 用户信息 * @return 在线用户信息 */ UserOnline selectOnlineByUserName(String userName, LoginUser user); @@ -41,7 +47,8 @@ public interface UserOnlineService { /** * 设置在线用户信息 * - * @param user 用户信息 + * @param user + * 用户信息 * @return 在线用户 */ UserOnline setUserOnline(LoginUser user); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/LoginServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/LoginServiceImpl.java index c47ca3b..ab6046c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/LoginServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/LoginServiceImpl.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.service.impl; - import cn.hutool.core.convert.Convert; import com.starry.admin.common.component.JwtToken; import com.starry.admin.common.domain.LoginUser; @@ -15,6 +14,10 @@ import com.starry.admin.utils.SecurityUtils; import com.starry.common.constant.Constants; import com.starry.common.constant.UserConstants; import com.starry.common.utils.StringUtils; +import java.util.Date; +import java.util.HashSet; +import java.util.Set; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -25,11 +28,6 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.Date; -import java.util.HashSet; -import java.util.Set; - /** * @author admin */ @@ -52,7 +50,6 @@ public class LoginServiceImpl implements LoginService { @Resource private ISysTenantService SysTenantService; - @Override public String login(String username, String password) { String token = null; @@ -61,7 +58,8 @@ public class LoginServiceImpl implements LoginService { if (!passwordEncoder.matches(password, userDetails.getPassword())) { throw new BadCredentialsException("密码不正确"); } - UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, + null, userDetails.getAuthorities()); SecurityContextHolder.getContext().setAuthentication(authentication); // 登录成功记录日志 AsyncManager.me().execute(AsyncFactory.recordLoginLog(username, Constants.LOGIN_SUCCESS, "登录成功")); @@ -101,7 +99,7 @@ public class LoginServiceImpl implements LoginService { @Override public LoginUser tenantLogin(String tenantId, String username, String password) { - //LoginUser userInfo = this.getLoginUserInfo(username); + // LoginUser userInfo = this.getLoginUserInfo(username); return null; } @@ -114,13 +112,15 @@ public class LoginServiceImpl implements LoginService { throw new ServiceException("用户/密码必须填写"); } // 密码如果不在指定范围内 错误 - if (password.length() < UserConstants.PASSWORD_MIN_LENGTH || password.length() > UserConstants.PASSWORD_MAX_LENGTH) { + if (password.length() < UserConstants.PASSWORD_MIN_LENGTH + || password.length() > UserConstants.PASSWORD_MAX_LENGTH) { // 登录记录日志 AsyncManager.me().execute(AsyncFactory.recordLoginLog(username, Constants.LOGIN_FAIL, "用户密码不在指定范围")); throw new ServiceException("用户密码不在指定范围"); } // 用户名不在指定范围内 错误 - if (username.length() < UserConstants.USERNAME_MIN_LENGTH || username.length() > UserConstants.USERNAME_MAX_LENGTH) { + if (username.length() < UserConstants.USERNAME_MIN_LENGTH + || username.length() > UserConstants.USERNAME_MAX_LENGTH) { // 登录记录日志 AsyncManager.me().execute(AsyncFactory.recordLoginLog(username, Constants.LOGIN_FAIL, "用户名不在指定范围")); throw new ServiceException("用户名不在指定范围"); @@ -153,7 +153,8 @@ public class LoginServiceImpl implements LoginService { } if (userInfo.getTenantEndDate() != null && userInfo.getTenantEndDate().compareTo(new Date()) < 0) { // 登录记录日志 - AsyncManager.me().execute(AsyncFactory.recordLoginLog(username, Constants.LOGIN_FAIL, "当前租户已超过租赁日期，请联系管理员")); + AsyncManager.me() + .execute(AsyncFactory.recordLoginLog(username, Constants.LOGIN_FAIL, "当前租户已超过租赁日期，请联系管理员")); throw new ServiceException("当前租户已超过租赁日期，请联系管理员"); } AsyncManager.me().execute(AsyncFactory.recordLoginLog(username, Constants.LOGIN_SUCCESS, "登录成功")); @@ -170,7 +171,7 @@ public class LoginServiceImpl implements LoginService { } if (StringUtils.isNotNull(sysUser)) { -// SecurityUtils.setTenantId(sysUser.getTenantId()); + // SecurityUtils.setTenantId(sysUser.getTenantId()); // 角色集合 Set roles = this.getRolePermission(sysUser); // 权限集合 diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysAdministrativeAreaDictInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysAdministrativeAreaDictInfoServiceImpl.java index 166f0a1..9c74b1c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysAdministrativeAreaDictInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysAdministrativeAreaDictInfoServiceImpl.java @@ -5,20 +5,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.starry.admin.modules.system.module.entity.SysAdministrativeAreaDictInfoEntity; import com.starry.admin.modules.system.mapper.SysAdministrativeAreaDictInfoMapper; +import com.starry.admin.modules.system.module.entity.SysAdministrativeAreaDictInfoEntity; import com.starry.admin.modules.system.service.ISysAdministrativeAreaDictInfoService; import com.starry.admin.modules.system.vo.AdministrativeAreaQueryReturnVo; import com.starry.common.utils.ConvertUtil; import com.starry.common.utils.IdUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import javax.annotation.Resource; +import org.springframework.stereotype.Service; /** * 行政区域字典信息Service业务层处理 @@ -27,14 +26,19 @@ import java.util.stream.Collectors; * @since 2024-04-03 */ @Service -public class SysAdministrativeAreaDictInfoServiceImpl extends ServiceImpl implements ISysAdministrativeAreaDictInfoService { +public class SysAdministrativeAreaDictInfoServiceImpl + extends + ServiceImpl + implements + ISysAdministrativeAreaDictInfoService { @Resource private SysAdministrativeAreaDictInfoMapper sysAdministrativeAreaDictInfoMapper; /** * 查询行政区域字典信息 * - * @param id 行政区域字典信息主键 + * @param id + * 行政区域字典信息主键 * @return 行政区域字典信息 */ @Override @@ -47,24 +51,31 @@ public class SysAdministrativeAreaDictInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.le(SysAdministrativeAreaDictInfoEntity::getLevel, level); List list = this.baseMapper.selectList(lambdaQueryWrapper); - Map> collect = list.stream().filter(a -> a != null && a.getPCode() != null).collect(Collectors.groupingBy(SysAdministrativeAreaDictInfoEntity::getPCode)); + Map> collect = list.stream() + .filter(a -> a != null && a.getPCode() != null) + .collect(Collectors.groupingBy(SysAdministrativeAreaDictInfoEntity::getPCode)); return this.assembleTree(collect, collect.get("00")); } /** * 组装数据 * - * @param data 数据，key=区域编码,value=区域列表 - * @param list 区域略表 + * @param data + * 数据，key=区域编码,value=区域列表 + * @param list + * 区域略表 * @return List * @author admin * @since 2024/4/10 15:14 **/ - public List assembleTree(Map> data, List list) { + public List assembleTree( + Map> data, + List list) { if (list == null) { return new ArrayList<>(); } - List result = ConvertUtil.entityToVoList(list, AdministrativeAreaQueryReturnVo.class); + List result = ConvertUtil.entityToVoList(list, + AdministrativeAreaQueryReturnVo.class); for (AdministrativeAreaQueryReturnVo entity : result) { entity.setChild(assembleTree(data, data.get(entity.getCode()))); } @@ -79,11 +90,13 @@ public class SysAdministrativeAreaDictInfoServiceImpl extends ServiceImpl selectPlayAdministrativeAreaDictInfoByPage(SysAdministrativeAreaDictInfoEntity playAdministrativeAreaDictInfo) { + public IPage selectPlayAdministrativeAreaDictInfoByPage( + SysAdministrativeAreaDictInfoEntity playAdministrativeAreaDictInfo) { Page page = new Page<>(1, 10); return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>()); } @@ -91,7 +104,8 @@ public class SysAdministrativeAreaDictInfoServiceImpl extends ServiceImpl @@ -42,8 +41,7 @@ public class SysDeptServiceImpl extends ServiceImpl infos = list(new LambdaQueryWrapper() - .eq(SysDeptEntity::getDeptName, dept.getDeptName()) - .eq(SysDeptEntity::getParentId, dept.getParentId())); + .eq(SysDeptEntity::getDeptName, dept.getDeptName()).eq(SysDeptEntity::getParentId, dept.getParentId())); // 查出有数据 并且不是自己，则不唯一 if (CollectionUtil.isNotEmpty(infos) && infos.get(0).getDeptId().longValue() != deptId.longValue()) { return UserConstants.NOT_UNIQUE; @@ -85,7 +83,8 @@ public class SysDeptServiceImpl extends ServiceImpl list = baseMapper.selectList(new LambdaQueryWrapper().eq(SysDeptEntity::getParentId, deptId)); + List list = baseMapper + .selectList(new LambdaQueryWrapper().eq(SysDeptEntity::getParentId, deptId)); if (CollectionUtil.isNotEmpty(list)) { return true; } @@ -122,9 +121,12 @@ public class SysDeptServiceImpl extends ServiceImpl childrens = baseMapper.selectChildrenDeptById(deptId); @@ -172,7 +174,8 @@ public class SysDeptServiceImpl extends ServiceImpl implements ISysDictDataService { +public class SysDictDataServiceImpl extends ServiceImpl + implements + ISysDictDataService { @Resource private SysDictDataMapper sysDictDataMapper; /** * 查询字典数据表 * - * @param dictDataId 字典数据表主键 + * @param dictDataId + * 字典数据表主键 * @return 字典数据表 */ @Override @@ -39,18 +41,21 @@ public class SysDictDataServiceImpl extends ServiceImpl selectXlDictDataList(SysDictDataVo sysDictDataEntity) { - return sysDictDataMapper.selectXlDictDataList(new Page<>(sysDictDataEntity.getPageNum(), sysDictDataEntity.getPageSize()), sysDictDataEntity); + return sysDictDataMapper.selectXlDictDataList( + new Page<>(sysDictDataEntity.getPageNum(), sysDictDataEntity.getPageSize()), sysDictDataEntity); } /** * 新增字典数据表 * - * @param sysDictDataEntity 字典数据表 + * @param sysDictDataEntity + * 字典数据表 * @return 结果 */ @Override @@ -61,7 +66,8 @@ public class SysDictDataServiceImpl extends ServiceImpl iPage = sysDictDataMapper.selectXlDictDataList(new Page<>(1, -1), dictData); - Map> dictDataMap = iPage.getRecords().stream().collect(Collectors.groupingBy(SysDictDataEntity::getDictType)); + Map> dictDataMap = iPage.getRecords().stream() + .collect(Collectors.groupingBy(SysDictDataEntity::getDictType)); for (Map.Entry> entry : dictDataMap.entrySet()) { - DictUtils.setDictCache(entry.getKey(), entry.getValue().stream().sorted(Comparator.comparing(SysDictDataEntity::getSort)).collect(Collectors.toList())); + DictUtils.setDictCache(entry.getKey(), entry.getValue().stream() + .sorted(Comparator.comparing(SysDictDataEntity::getSort)).collect(Collectors.toList())); } } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysLoginLogServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysLoginLogServiceImpl.java index 2787751..739da63 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysLoginLogServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysLoginLogServiceImpl.java @@ -3,14 +3,13 @@ package com.starry.admin.modules.system.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.starry.admin.modules.system.mapper.SysLoginLogMapper; import com.starry.admin.modules.system.module.entity.SysLoginLogEntity; import com.starry.admin.modules.system.module.entity.SysLoginLogVo; -import com.starry.admin.modules.system.mapper.SysLoginLogMapper; import com.starry.admin.modules.system.service.ISysLoginLogService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; import java.util.Arrays; +import javax.annotation.Resource; +import org.springframework.stereotype.Service; /** * 系统访问日志表Service业务层处理 @@ -18,14 +17,17 @@ import java.util.Arrays; * @author admin */ @Service -public class SysLoginLogServiceImpl extends ServiceImpl implements ISysLoginLogService { +public class SysLoginLogServiceImpl extends ServiceImpl + implements + ISysLoginLogService { @Resource private SysLoginLogMapper xlLoginLogMapper; /** * 查询系统访问日志表 * - * @param loginId 系统访问日志表主键 + * @param loginId + * 系统访问日志表主键 * @return 系统访问日志表 */ @Override @@ -36,7 +38,8 @@ public class SysLoginLogServiceImpl extends ServiceImpl @@ -48,7 +47,6 @@ public class SysMenuServiceImpl extends ServiceImpl listPage(SysMenuEntity menu, String userId, Integer pageSize, Integer pageNum) { Page page = new Page<>(pageNum, pageSize); @@ -93,8 +91,7 @@ public class SysMenuServiceImpl extends ServiceImpl menus = baseMapper.selectList(new LambdaQueryWrapper() - .eq(SysMenuEntity::getMenuName, menu.getMenuName()) - .eq(SysMenuEntity::getParentId, menu.getParentId())); + .eq(SysMenuEntity::getMenuName, menu.getMenuName()).eq(SysMenuEntity::getParentId, menu.getParentId())); if (CollectionUtil.isNotEmpty(menus) && menus.get(0).getMenuId() != menuId) { return UserConstants.NOT_UNIQUE; } @@ -103,7 +100,8 @@ public class SysMenuServiceImpl extends ServiceImpl().eq(SysMenuEntity::getParentId, menuId)); + Long result = baseMapper + .selectCount(new LambdaQueryWrapper().eq(SysMenuEntity::getParentId, menuId)); return result > 0; } @@ -184,7 +182,8 @@ public class SysMenuServiceImpl extends ServiceImpl cMenus = menu.getChildren(); // 有子路由 - if (CollectionUtil.isNotEmpty(cMenus) && UserConstants.TYPE_DIR.equals(String.valueOf(menu.getMenuType()))) { + if (CollectionUtil.isNotEmpty(cMenus) + && UserConstants.TYPE_DIR.equals(String.valueOf(menu.getMenuType()))) { router.setAlwaysShow(true); router.setRedirect("noRedirect"); router.setChildren(buildMenus(cMenus)); @@ -306,7 +305,8 @@ public class SysMenuServiceImpl extends ServiceImpl getChildPerms(List list, int parentId) { @@ -338,14 +337,16 @@ public class SysMenuServiceImpl extends ServiceImpl implements ISysOperationLogService { +public class SysOperationLogServiceImpl extends ServiceImpl + implements + ISysOperationLogService { @Resource private SysOperationLogMapper sysOperationLogMapper; @@ -26,7 +27,8 @@ public class SysOperationLogServiceImpl extends ServiceImpl selectXlOperLogList(SysOperationLogVo sysOperationLogEntity) { - return sysOperationLogMapper.selectXlOperLogList(new Page<>(sysOperationLogEntity.getPageNum(), sysOperationLogEntity.getPageSize()), sysOperationLogEntity); + return sysOperationLogMapper.selectXlOperLogList( + new Page<>(sysOperationLogEntity.getPageNum(), sysOperationLogEntity.getPageSize()), + sysOperationLogEntity); } /** * 新增操作日志表 * - * @param sysOperationLogEntity 操作日志表 + * @param sysOperationLogEntity + * 操作日志表 * @return 结果 */ @Override @@ -59,7 +65,8 @@ public class SysOperationLogServiceImpl extends ServiceImpl implements SysRoleMenuService { +public class SysRoleMenuServiceImpl extends ServiceImpl + implements + SysRoleMenuService { } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java index e384004..5c37116 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java @@ -18,12 +18,11 @@ import com.starry.admin.modules.system.service.SysUserService; import com.starry.admin.utils.SecurityUtils; import com.starry.common.constant.UserConstants; import com.starry.common.utils.StringUtils; +import java.util.*; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import java.util.*; - /** *

* 角色表 服务实现类 @@ -48,7 +47,6 @@ public class SysRoleServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -66,7 +64,8 @@ public class SysRoleServiceImpl extends ServiceImpl().eq(SysRoleMenuEntity::getRoleId, role.getRoleId())); + roleMenuService + .remove(new LambdaQueryWrapper().eq(SysRoleMenuEntity::getRoleId, role.getRoleId())); // 再新增 return insertRoleMenu(role); } @@ -150,7 +151,8 @@ public class SysRoleServiceImpl extends ServiceImpl().eq(SysRoleMenuEntity::getRoleId, role.getRoleId())); + roleMenuService + .remove(new LambdaQueryWrapper().eq(SysRoleMenuEntity::getRoleId, role.getRoleId())); // 在新增 return insertRoleMenu(role); } @@ -175,7 +177,8 @@ public class SysRoleServiceImpl extends ServiceImpl implements ISysTenantPackageService { +public class SysTenantPackageServiceImpl extends ServiceImpl + implements + ISysTenantPackageService { @Resource private SysTenantPackageMapper sysTenantPackageMapper; @@ -34,7 +35,8 @@ public class SysTenantPackageServiceImpl extends ServiceImpl selectSysTenantPackageList(SysTenantPackageVo sysTenantPackageEntity) { - return sysTenantPackageMapper.selectSysTenantPackageList(new Page<>(sysTenantPackageEntity.getPageNum(), sysTenantPackageEntity.getPageSize()), sysTenantPackageEntity); + return sysTenantPackageMapper.selectSysTenantPackageList( + new Page<>(sysTenantPackageEntity.getPageNum(), sysTenantPackageEntity.getPageSize()), + sysTenantPackageEntity); } /** * 新增租户套餐表 * - * @param entity 租户套餐表 + * @param entity + * 租户套餐表 * @return 结果 */ @Override @@ -70,7 +76,8 @@ public class SysTenantPackageServiceImpl extends ServiceImpl implements ISysTenantRechargeInfoService { +public class SysTenantRechargeInfoServiceImpl + extends + ServiceImpl + implements + ISysTenantRechargeInfoService { @Resource private SysTenantRechargeInfoMapper sysTenantRechargeInfoMapper; /** * 查询租户充值信息 * - * @param id 租户充值信息主键 + * @param id + * 租户充值信息主键 * @return 租户充值信息 */ @Override @@ -42,7 +46,8 @@ public class SysTenantRechargeInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new MPJLambdaWrapper<>(); lambdaQueryWrapper.selectAll(SysTenantRechargeInfoEntity.class); lambdaQueryWrapper.selectAs(SysTenantEntity::getTenantName, "rechargeName"); - lambdaQueryWrapper.leftJoin(SysTenantEntity.class, SysTenantEntity::getTenantId, SysTenantRechargeInfoEntity::getRechargeUser); - return this.baseMapper.selectJoinPage(new Page<>(queryVo.getPageNum(), queryVo.getPageSize()), SysTenantRechargeInfoReturnVo.class, lambdaQueryWrapper); + lambdaQueryWrapper.leftJoin(SysTenantEntity.class, SysTenantEntity::getTenantId, + SysTenantRechargeInfoEntity::getRechargeUser); + return this.baseMapper.selectJoinPage(new Page<>(queryVo.getPageNum(), queryVo.getPageSize()), + SysTenantRechargeInfoReturnVo.class, lambdaQueryWrapper); } /** * 新增租户充值信息 * - * @param sysTenantRechargeInfo 租户充值信息 + * @param sysTenantRechargeInfo + * 租户充值信息 * @return 结果 */ @Override @@ -71,7 +79,8 @@ public class SysTenantRechargeInfoServiceImpl extends ServiceImpl listAll() { return this.baseMapper.selectList(new LambdaQueryWrapper<>()); @@ -100,7 +98,8 @@ public class SysTenantServiceImpl extends ServiceImpl(vo.getPageNum(), vo.getPageSize()), wrapper); } /** * 新增租户表 * - * @param sysTenantEntity 租户表 + * @param sysTenantEntity + * 租户表 * @return 结果 */ @Override @@ -149,7 +150,8 @@ public class SysTenantServiceImpl extends ServiceImpl roleList = roleMapper.queryAdminRole(sysTenantEntity.getTenantId()); // 正常逻辑下每个租户只有一个二级管理员账号 SysRoleEntity tRole = roleList.get(0); @@ -296,7 +299,8 @@ public class SysTenantServiceImpl extends ServiceImpl queryByPackage(String packageId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -346,7 +349,6 @@ public class SysTenantServiceImpl extends ServiceImpl subMeuns = new ArrayList<>(Arrays.asList(sysTenantPackage.getMenuIds().split(","))); if (CollectionUtil.isEmpty(subMeuns)) { @@ -393,7 +395,8 @@ public class SysTenantServiceImpl extends ServiceImpl leaderMenuIdList = Arrays.asList(101, 102, 1000, 2095, 2096, 2097, 2087, 1001, 1100, 1101, 105, 2094); + List leaderMenuIdList = Arrays.asList(101, 102, 1000, 2095, 2096, 2097, 2087, 1001, 1100, 1101, 105, + 2094); List leaderMenuList = leaderMenuIdList.stream().map(menu -> { SysRoleMenuEntity rm = new SysRoleMenuEntity(); rm.setRoleId(leader.getRoleId()); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserRoleServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserRoleServiceImpl.java index d3d9354..51dae8c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserRoleServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserRoleServiceImpl.java @@ -2,13 +2,12 @@ package com.starry.admin.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.starry.admin.modules.system.module.entity.SysUserRoleEntity; import com.starry.admin.modules.system.mapper.SysUserRoleMapper; +import com.starry.admin.modules.system.module.entity.SysUserRoleEntity; import com.starry.admin.modules.system.service.SysUserRoleService; import com.starry.admin.modules.system.service.SysUserService; -import org.springframework.stereotype.Service; - import javax.annotation.Resource; +import org.springframework.stereotype.Service; /** *

@@ -19,7 +18,9 @@ import javax.annotation.Resource; * @since 2022-07-08 */ @Service -public class SysUserRoleServiceImpl extends ServiceImpl implements SysUserRoleService { +public class SysUserRoleServiceImpl extends ServiceImpl + implements + SysUserRoleService { @Resource private SysUserService userService; @@ -34,7 +35,6 @@ public class SysUserRoleServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserServiceImpl.java index 7872815..7f56236 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserServiceImpl.java @@ -20,11 +20,11 @@ import com.starry.admin.modules.personnel.module.vo.PlayPersonnelUserInfoReturnV import com.starry.admin.modules.personnel.service.IPlayPersonnelAdminInfoService; import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; import com.starry.admin.modules.personnel.service.IPlayPersonnelWaiterInfoService; +import com.starry.admin.modules.system.mapper.SysRoleMapper; +import com.starry.admin.modules.system.mapper.SysUserMapper; import com.starry.admin.modules.system.module.entity.SysRoleEntity; import com.starry.admin.modules.system.module.entity.SysUserEntity; import com.starry.admin.modules.system.module.entity.SysUserRoleEntity; -import com.starry.admin.modules.system.mapper.SysRoleMapper; -import com.starry.admin.modules.system.mapper.SysUserMapper; import com.starry.admin.modules.system.service.SysUserRoleService; import com.starry.admin.modules.system.service.SysUserService; import com.starry.admin.modules.system.vo.*; @@ -36,6 +36,11 @@ import com.starry.common.constant.UserConstants; import com.starry.common.redis.RedisCache; import com.starry.common.utils.IdUtils; import com.starry.common.utils.StringUtils; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.security.authentication.BadCredentialsException; @@ -43,12 +48,6 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - /** *

* 后台用户表 服务实现类 @@ -80,7 +79,6 @@ public class SysUserServiceImpl extends ServiceImpl selectAll() { LambdaQueryWrapper lambdaWrapper = new LambdaQueryWrapper<>(); @@ -93,8 +91,10 @@ public class SysUserServiceImpl extends ServiceImpl selectByPage(PlayPersonnelUserInfoQueryVo vo) { MPJLambdaWrapper lambdaWrapper = new MPJLambdaWrapper<>(); lambdaWrapper.selectAll(SysUserEntity.class); - //店员表 - lambdaWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname"); + // 店员表 + lambdaWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId") + .selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar") + .selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname"); lambdaWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, SysUserEntity::getUserId); if (StrUtil.isNotBlank(vo.getSysUserId())) { lambdaWrapper.eq(SysUserEntity::getUserId, vo.getSysUserId()); @@ -104,19 +104,22 @@ public class SysUserServiceImpl extends ServiceImpl(vo.getPageNum(), vo.getPageSize()), PlayPersonnelUserInfoReturnVo.class, lambdaWrapper); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), + PlayPersonnelUserInfoReturnVo.class, lambdaWrapper); } @Override @@ -124,7 +127,8 @@ public class SysUserServiceImpl extends ServiceImpl sysUserEntities = this.baseMapper.selectList(new LambdaQueryWrapper().eq(SysUserEntity::getUserCode, newSysUserEntity.getUserCode())); + List sysUserEntities = this.baseMapper.selectList( + new LambdaQueryWrapper().eq(SysUserEntity::getUserCode, newSysUserEntity.getUserCode())); if (CollectionUtil.isNotEmpty(sysUserEntities)) { return null; } @@ -137,7 +141,8 @@ public class SysUserServiceImpl extends ServiceImpl users = baseMapper.selectList(new LambdaQueryWrapper().eq(SysUserEntity::getUserCode, userCode)); + List users = baseMapper + .selectList(new LambdaQueryWrapper().eq(SysUserEntity::getUserCode, userCode)); if (CollectionUtil.isNotEmpty(users)) { return users.get(0); } @@ -163,7 +168,8 @@ public class SysUserServiceImpl extends ServiceImpl userList = this.baseMapper.selectList(new LambdaQueryWrapper().eq(SysUserEntity::getUserCode, userCode)); + List userList = this.baseMapper + .selectList(new LambdaQueryWrapper().eq(SysUserEntity::getUserCode, userCode)); if (CollectionUtil.isNotEmpty(userList)) { return UserConstants.NOT_UNIQUE; } @@ -193,7 +199,8 @@ public class SysUserServiceImpl extends ServiceImpl().eq(SysUserRoleEntity::getUserId, user.getUserId())); + userRoleService.remove( + new LambdaQueryWrapper().eq(SysUserRoleEntity::getUserId, user.getUserId())); // 新增用户角色信息 flag = insertUserRole(user); } @@ -208,7 +215,8 @@ public class SysUserServiceImpl extends ServiceImpl().in(SysUserRoleEntity::getUserId, ids)); + userRoleService + .remove(new LambdaQueryWrapper().in(SysUserRoleEntity::getUserId, ids)); } } return true; @@ -249,7 +257,8 @@ public class SysUserServiceImpl extends ServiceImpl 0) { @@ -269,19 +278,22 @@ public class SysUserServiceImpl extends ServiceImpl selectAllocatedList(SysUserQueryVo userQueryVo) { - return baseMapper.selectAllocatedList(new Page<>(userQueryVo.getPageNum(), userQueryVo.getPageSize()), userQueryVo); + return baseMapper.selectAllocatedList(new Page<>(userQueryVo.getPageNum(), userQueryVo.getPageSize()), + userQueryVo); } /** * 根据条件分页查询未分配用户角色列表 * - * @param user 用户信息 + * @param user + * 用户信息 * @return 用户信息集合信息 */ @Override @@ -292,17 +304,23 @@ public class SysUserServiceImpl extends ServiceImpl 0) { throw new RuntimeException("该店员已经成为员工了，无法再次添加~"); } smsUtils.checkSmsCode(param.getMobile(), param.getSmsCode()); PlayClerkUserInfoEntity clerk = clerkUserInfoService.selectById(param.getClerkId()); - SysUserEntity user = new SysUserEntity().setClerkId(param.getClerkId()).setMobile(param.getMobile()).setPassWord(SecurityUtils.encryptPassword(param.getMobile())).setUserCode(param.getMobile()).setUserNickname(clerk.getNickname()).setRealName(clerk.getNickname()); + SysUserEntity user = new SysUserEntity().setClerkId(param.getClerkId()).setMobile(param.getMobile()) + .setPassWord(SecurityUtils.encryptPassword(param.getMobile())).setUserCode(param.getMobile()) + .setUserNickname(clerk.getNickname()).setRealName(clerk.getNickname()); user.setUserId(IdUtils.getUuid()); user.setSuperAdmin(false); this.save(user); - clerkUserInfoService.update(null, Wrappers.lambdaUpdate(PlayClerkUserInfoEntity.class).eq(PlayClerkUserInfoEntity::getId, param.getClerkId()).set(PlayClerkUserInfoEntity::getSysUserId, user.getUserId())); + clerkUserInfoService.update(null, + Wrappers.lambdaUpdate(PlayClerkUserInfoEntity.class) + .eq(PlayClerkUserInfoEntity::getId, param.getClerkId()) + .set(PlayClerkUserInfoEntity::getSysUserId, user.getUserId())); return true; } @@ -337,7 +355,8 @@ public class SysUserServiceImpl extends ServiceImpl 0) { throw new RuntimeException("系统中已有该手机号，无法录入~"); } - this.update(Wrappers.lambdaUpdate(SysUserEntity.class).eq(SysUserEntity::getUserId, param.getUserId()).set(SysUserEntity::getUserCode, param.getMobile()).set(SysUserEntity::getMobile, param.getMobile())); + this.update(Wrappers.lambdaUpdate(SysUserEntity.class).eq(SysUserEntity::getUserId, param.getUserId()) + .set(SysUserEntity::getUserCode, param.getMobile()).set(SysUserEntity::getMobile, param.getMobile())); } @Override public void logoutUser(String uid) { String key = "login:resource:" + uid; Object object = redisCache.getCacheObject(key); - if (Objects.isNull(object)) return; + if (Objects.isNull(object)) + return; String key2 = object.toString(); redisCache.deleteObject(key2); @@ -371,7 +393,8 @@ public class SysUserServiceImpl extends ServiceImpl child = new ArrayList<>(); - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/LoginVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/LoginVo.java index 2d73099..bbc4b09 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/LoginVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/LoginVo.java @@ -2,9 +2,8 @@ package com.starry.admin.modules.system.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.io.Serializable; +import lombok.Data; /** * @author huoqiang diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/MemberQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/MemberQueryVo.java index d7e3ba4..7731d35 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/MemberQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/MemberQueryVo.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.vo; - import com.starry.common.domain.BasePageEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/MetaVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/MetaVo.java index d39c351..fedee57 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/MetaVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/MetaVo.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.vo; - import com.starry.common.constant.Constants; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -8,8 +7,7 @@ import lombok.Data; import org.apache.commons.lang3.StringUtils; /** - * @author admin - * 路由显示信息 + * @author admin 路由显示信息 * @since 2022/7/6 */ @Data @@ -51,7 +49,6 @@ public class MetaVo { this.link = link; } - public MetaVo(String title, String icon, boolean noCache, String link) { this.title = title; this.icon = icon; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/RoleUserResultVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/RoleUserResultVo.java index 77622d6..3d2b06a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/RoleUserResultVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/RoleUserResultVo.java @@ -2,14 +2,12 @@ package com.starry.admin.modules.system.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import java.util.Date; - /** - * @author admin - * 角色分配用户精简信息Vo + * @author admin 角色分配用户精简信息Vo * @since 2023/3/10 */ @ApiModel("管理后台 - 角色分配用户返回信息") diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/RouterVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/RouterVo.java index f749ff2..6f8893f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/RouterVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/RouterVo.java @@ -2,13 +2,11 @@ package com.starry.admin.modules.system.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.List; import lombok.Data; -import java.util.List; - /** - * @author admin - * 路由配置信息 + * @author admin 路由配置信息 * @since 2022/7/6 */ @Data diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SimpleMenu.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SimpleMenu.java index e495ff5..8588eeb 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SimpleMenu.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SimpleMenu.java @@ -2,12 +2,11 @@ package com.starry.admin.modules.system.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; - /** * @author admin */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/StatusConverter.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/StatusConverter.java index 4c06bb1..cd4a7e7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/StatusConverter.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/StatusConverter.java @@ -7,8 +7,7 @@ import com.alibaba.excel.metadata.GlobalConfiguration; import com.alibaba.excel.metadata.property.ExcelContentProperty; /** - * @author huoqiang - * 状态字符串处理 + * @author huoqiang 状态字符串处理 * @since 2022/10/25 */ public class StatusConverter implements Converter { @@ -24,12 +23,14 @@ public class StatusConverter implements Converter { } @Override - public Integer convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception { + public Integer convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, + GlobalConfiguration globalConfiguration) throws Exception { return "失败".equals(cellData.getStringValue()) ? 1 : 0; } @Override - public CellData convertToExcelData(Integer value, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception { + public CellData convertToExcelData(Integer value, ExcelContentProperty excelContentProperty, + GlobalConfiguration globalConfiguration) throws Exception { return new CellData(0 == value ? "成功" : "失败"); } } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysOperationLogVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysOperationLogVo.java index 58fa7c9..0e59874 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysOperationLogVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysOperationLogVo.java @@ -7,12 +7,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.starry.common.domain.BasePageEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - - /** * 操作日志表对象 sys_operation_log * diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysRoleAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysRoleAddVo.java index 21b5766..b0b3434 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysRoleAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysRoleAddVo.java @@ -4,12 +4,11 @@ import com.starry.admin.modules.system.module.entity.SysRoleEntity; import com.starry.common.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Set; +import javax.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotBlank; -import java.util.Set; - /** * @author admin */ @@ -20,7 +19,6 @@ public class SysRoleAddVo extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "角色ID", hidden = true, notes = "新增时无需填写，系统自动生成") private Long roleId; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantAddVo.java index d7914ed..9ba8b45 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantAddVo.java @@ -1,12 +1,11 @@ package com.starry.admin.modules.system.vo; import com.starry.common.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - +import java.util.Date; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.util.Date; +import lombok.Data; +import lombok.EqualsAndHashCode; /** * 租户表对象 sys_tenant @@ -102,7 +101,6 @@ public class SysTenantAddVo extends BaseEntity { @NotBlank(message = "微信公众号ID不能为空") private String appId; - /** * 微信公众号的app secret */ @@ -121,7 +119,6 @@ public class SysTenantAddVo extends BaseEntity { @NotBlank(message = "微信商户秘钥不能为空") private String mchId; - /** * 证书路径 */ @@ -132,5 +129,4 @@ public class SysTenantAddVo extends BaseEntity { */ private String remarks; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantPackageAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantPackageAddVo.java index f698c5d..a73686a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantPackageAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantPackageAddVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.system.vo; import com.starry.common.domain.BaseEntity; +import javax.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotBlank; - /** * 租户套餐表对象 sys_tenant_package * @@ -17,7 +16,6 @@ public class SysTenantPackageAddVo extends BaseEntity { private static final long serialVersionUID = 1L; - /** * 名称 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantQueryVo.java index 5e7ce56..f2465d2 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantQueryVo.java @@ -15,13 +15,11 @@ public class SysTenantQueryVo extends BasePageEntity { private static final long serialVersionUID = 1L; - /** * 名称 */ private String tenantName; - /** * 用户状态;0:正常,1:停用 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantReturnVo.java index a979744..0dfabbf 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantReturnVo.java @@ -1,9 +1,8 @@ package com.starry.admin.modules.system.vo; -import lombok.Data; - import java.math.BigDecimal; import java.util.Date; +import lombok.Data; /** * 租户表对象 sys_tenant @@ -13,7 +12,6 @@ import java.util.Date; @Data public class SysTenantReturnVo { - private String tenantId; /** @@ -103,13 +101,11 @@ public class SysTenantReturnVo { */ private String appId; - /** * 微信公众号的app secret */ private String secret; - /** * 微信商户ID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserEntityListVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserEntityListVo.java index ede4c0a..76215a2 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserEntityListVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserEntityListVo.java @@ -4,12 +4,11 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity; import com.starry.admin.modules.system.module.entity.SysUserEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** * @Author: huchuansai * @Date: 2024/6/14 2:49 PM @@ -39,5 +38,4 @@ public class SysUserEntityListVo extends SysUserEntity { } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserQueryVo.java index b0c4fa3..3daa9db 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserQueryVo.java @@ -5,11 +5,10 @@ import com.starry.admin.modules.system.module.entity.SysRoleEntity; import com.starry.common.domain.BasePageEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - import java.util.Date; import java.util.List; +import lombok.Data; +import lombok.EqualsAndHashCode; /** * 用户查询对象 diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/TenantLoginVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/TenantLoginVo.java index d197ae4..03fe595 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/TenantLoginVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/TenantLoginVo.java @@ -1,10 +1,9 @@ package com.starry.admin.modules.system.vo; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; import java.io.Serializable; +import javax.validation.constraints.NotNull; +import lombok.Data; /** * @author huoqiang @@ -13,7 +12,6 @@ import java.io.Serializable; @Data public class TenantLoginVo implements Serializable { - /** * 租户ID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/TenantResultVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/TenantResultVo.java index 1f8ecfd..672e552 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/TenantResultVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/TenantResultVo.java @@ -1,9 +1,8 @@ package com.starry.admin.modules.system.vo; import io.swagger.annotations.ApiModel; -import lombok.Data; - import java.util.Date; +import lombok.Data; /** * @author 租户列表返回结果VO diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/UpdateUserMobileParam.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/UpdateUserMobileParam.java index 518d86a..336f9a4 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/UpdateUserMobileParam.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/UpdateUserMobileParam.java @@ -2,10 +2,9 @@ package com.starry.admin.modules.system.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; +import lombok.Data; /** * @Author: huchuansai diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/UpdateUserPasswordParam.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/UpdateUserPasswordParam.java index 5d4e40f..50eafe4 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/UpdateUserPasswordParam.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/UpdateUserPasswordParam.java @@ -2,9 +2,8 @@ package com.starry.admin.modules.system.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import javax.validation.constraints.NotBlank; +import lombok.Data; /** * @Author: huchuansai diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/UpdateUserPasswordParamV2.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/UpdateUserPasswordParamV2.java index 423d40b..2ba723b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/UpdateUserPasswordParamV2.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/UpdateUserPasswordParamV2.java @@ -1,10 +1,8 @@ package com.starry.admin.modules.system.vo; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import javax.validation.constraints.NotBlank; +import lombok.Data; /** * @Author: huchuansai diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/UserAddParam.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/UserAddParam.java index ffc5d13..7c24439 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/UserAddParam.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/UserAddParam.java @@ -2,10 +2,9 @@ package com.starry.admin.modules.system.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Pattern; +import lombok.Data; /** * @Author: huchuansai diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/UserQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/UserQueryVo.java index 33cc262..6a21e55 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/UserQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/UserQueryVo.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.system.vo; - import com.starry.common.domain.BasePageEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/ConfigConstant.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/ConfigConstant.java index 3d75aa1..750dc63 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/ConfigConstant.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/ConfigConstant.java @@ -3,8 +3,7 @@ package com.starry.admin.modules.weichat.constant; /** * 全局常量 * - * @author admin - * 2019年1月21日 + * @author admin 2019年1月21日 */ public interface ConfigConstant { diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/MyReturnCode.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/MyReturnCode.java index 40f0ced..5a38100 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/MyReturnCode.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/MyReturnCode.java @@ -1,26 +1,33 @@ package com.starry.admin.modules.weichat.constant; /** - * 全局返回码 - * 微信用6开头，例60001 + * 全局返回码 微信用6开头，例60001 * - * @author admin - * 2019年7月25日 + * @author admin 2019年7月25日 */ public enum MyReturnCode { // 其它错误 - ERR_60000(60000, "系统错误，请稍候再试") {}, - ERR_60001(60001, "登录超时，请重新登录") {}, - ERR_60002(60002, "session不能为空") {}, + ERR_60000(60000, "系统错误，请稍候再试") { + }, + ERR_60001(60001, "登录超时，请重新登录") { + }, + ERR_60002(60002, "session不能为空") { + }, - ERR_70001(70001, "该状态订单不允许操作") {}, - ERR_70002(70002, "请选择付款方式") {}, - ERR_70003(70003, "没有符合下单条件的规格商品，商品已下架或库存不足") {}, - ERR_70004(70004, "只有未支付的详单能发起支付") {}, - ERR_70005(70005, "无效订单") {}, + ERR_70001(70001, "该状态订单不允许操作") { + }, + ERR_70002(70002, "请选择付款方式") { + }, + ERR_70003(70003, "没有符合下单条件的规格商品，商品已下架或库存不足") { + }, + ERR_70004(70004, "只有未支付的详单能发起支付") { + }, + ERR_70005(70005, "无效订单") { + }, - ERR_80004(80004, "该商品已删除") {}, + ERR_80004(80004, "该商品已删除") { + }, ; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/WxReturnCode.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/WxReturnCode.java index 797e9bf..1cc503e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/WxReturnCode.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/WxReturnCode.java @@ -9,7 +9,376 @@ package com.starry.admin.modules.weichat.constant; @SuppressWarnings("") public enum WxReturnCode { - SUC_0("0", "请求成功") {}, ERR_1("-1", "系统繁忙，此时请开发者稍候再试") {}, ERR_10001("10001", "涉嫌广告 ") {}, ERR_20001("20001", "涉嫌政治 ") {}, ERR_20002("20002", "涉嫌色情 ") {}, ERR_20004("20004", "涉嫌社会 ") {}, ERR_20006("20006", "涉嫌违法犯罪 ") {}, ERR_20008("20008", "涉嫌欺诈 ") {}, ERR_20013("20013", "涉嫌版权 ") {}, ERR_21000("21000", "涉嫌其他 ") {}, ERR_22000("22000", "涉嫌互推(互相宣传) ") {}, ERR_30001("30001", "原创校验出现系统错误且用户选择了被判为转载就不群发 ") {}, ERR_30002("30002", "原创校验被判定为不能群发 ") {}, ERR_30003("30003", "原创校验被判定为转载文且用户选择了被判为转载就不群发 ") {}, ERR_40001("40001", "获取access_token时AppSecret错误，或者access_token无效。请开发者认真比对AppSecret的正确性，或查看是否正在为恰当的公众号调用接口") {}, ERR_40002("40002", "不合法的凭证类型") {}, ERR_40003("40003", "不合法的OpenID，请开发者确认OpenID（该用户）是否已关注公众号，或是否是其他公众号的OpenID") {}, ERR_40004("40004", "不合法的媒体文件类型") {}, ERR_40005("40005", "不合法的文件类型") {}, ERR_40006("40006", "不合法的文件大小") {}, ERR_40007("40007", "不合法的媒体文件id") {}, ERR_40008("40008", "不合法的消息类型") {}, ERR_40009("40009", "不合法的图片文件大小") {}, ERR_40010("40010", "不合法的语音文件大小") {}, ERR_40011("40011", "不合法的视频文件大小") {}, ERR_40012("40012", "不合法的缩略图文件大小") {}, ERR_40013("40013", "不合法的AppID，请开发者检查AppID的正确性，避免异常字符，注意大小写") {}, ERR_40014("40014", "不合法的access_token，请开发者认真比对access_token的有效性（如是否过期），或查看是否正在为恰当的公众号调用接口") {}, ERR_40015("40015", "不合法的菜单类型") {}, ERR_40016("40016", "不合法的按钮个数") {}, ERR_40017("40017", "不合法的按钮个数") {}, ERR_40018("40018", "不合法的按钮名字长度") {}, ERR_40019("40019", "不合法的按钮KEY长度") {}, ERR_40020("40020", "不合法的按钮URL长度") {}, ERR_40021("40021", "不合法的菜单版本号") {}, ERR_40022("40022", "不合法的子菜单级数") {}, ERR_40023("40023", "不合法的子菜单按钮个数") {}, ERR_40024("40024", "不合法的子菜单按钮类型") {}, ERR_40025("40025", "不合法的子菜单按钮名字长度") {}, ERR_40026("40026", "不合法的子菜单按钮KEY长度") {}, ERR_40027("40027", "不合法的子菜单按钮URL长度") {}, ERR_40028("40028", "不合法的自定义菜单使用用户") {}, ERR_40029("40029", "不合法的oauth_code") {}, ERR_40030("40030", "不合法的refresh_token") {}, ERR_40031("40031", "不合法的openid列表") {}, ERR_40032("40032", "不合法的openid列表个数") {}, ERR_40033("40033", "不合法的请求字符，不能包含xxxx格式的字符") {}, ERR_40035("40035", "不合法的参数") {}, ERR_40055("40055", "不完整的url，前面要加http://") {}, ERR_40037("40037", "template_id不正确") {}, ERR_40038("40038", "不合法的请求格式") {}, ERR_40039("40039", "不合法的URL长度") {}, ERR_40050("40050", "不合法的分组id") {}, ERR_40051("40051", "分组名字不合法") {}, ERR_40062("40062", "标题长度不合法") {}, ERR_40097("40097", "参数不合法") {}, ERR_40113("40113", "文件名称不合法，需包含正确后缀") {}, ERR_40117("40117", "分组名字不合法") {}, ERR_40118("40118", "media_id大小不合法") {}, ERR_40119("40119", "button类型错误") {}, ERR_40120("40120", "button类型错误") {}, ERR_40121("40121", "不合法的media_id类型") {}, ERR_40125("40125", "不合法的AppSecret，请开发者检查AppSecret的正确性，避免异常字符，注意大小写") {}, ERR_40130("40130", "至少需要同时发送两个用户") {}, ERR_40132("40132", "微信号不合法") {}, ERR_40137("40137", "不支持的图片格式") {}, ERR_40164("40164", "调用接口的IP地址不在白名单中，请在接口IP白名单中进行设置") {}, ERR_41001("41001", "缺少access_token参数") {}, ERR_41002("41002", "缺少appid参数") {}, ERR_41003("41003", "缺少refresh_token参数") {}, ERR_41004("41004", "缺少secret参数") {}, ERR_41005("41005", "缺少多媒体文件数据") {}, ERR_41006("41006", "缺少media_id参数") {}, ERR_41007("41007", "缺少子菜单数据") {}, ERR_41008("41008", "缺少oauth code") {}, ERR_41009("41009", "缺少openid") {}, ERR_41028("41028", "form_id不正确，或者过期") {}, ERR_41029("41029", "form_id已被使用") {}, ERR_41030("41030", "page不正确") {}, ERR_42001("42001", "access_token超时，请检查access_token的有效期，请参考基础支持-获取access_token中，对access_token的详细机制说明") {}, ERR_42002("42002", "refresh_token超时") {}, ERR_42003("42003", "oauth_code超时") {}, ERR_43001("43001", "需要GET请求") {}, ERR_43002("43002", "需要POST请求") {}, ERR_43003("43003", "需要HTTPS请求") {}, ERR_43004("43004", "需要接收者关注") {}, ERR_43005("43005", "需要好友关系") {}, ERR_44001("44001", "多媒体文件为空") {}, ERR_44002("44002", "POST的数据包为空") {}, ERR_44003("44003", "图文消息内容为空") {}, ERR_44004("44004", "文本消息内容为空") {}, ERR_45001("45001", "多媒体文件大小超过限制") {}, ERR_45002("45002", "消息内容超过限制") {}, ERR_45003("45003", "标题字段超过限制") {}, ERR_45004("45004", "描述字段超过限制") {}, ERR_45005("45005", "链接字段超过限制") {}, ERR_45006("45006", "图片链接字段超过限制") {}, ERR_45007("45007", "语音播放时间超过限制") {}, ERR_45008("45008", "图文消息超过限制") {}, ERR_45009("45009", "接口调用超过限制") {}, ERR_45010("45010", "创建菜单个数超过限制") {}, ERR_45015("45015", "回复时间超过限制") {}, ERR_45016("45016", "系统分组，不允许修改") {}, ERR_45017("45017", "分组名字过长") {}, ERR_45018("45018", "分组数量超过上限") {}, ERR_45028("45028", "没有群发的配额，配额已经用完") {}, ERR_45047("45047", "客服下行消息超过上限") {}, ERR_45157("45157", "标签名非法，请注意不能和其他标签重名") {}, ERR_45158("45158", "标签名长度超过30个字节") {}, ERR_45056("45056", "创建的标签数过多，请注意不能超过100个") {}, ERR_45058("45058", "不能修改0/1/2这三个系统默认保留的标签") {}, ERR_45057("45057", "该标签下粉丝数超过10w，不允许直接删除") {}, ERR_45059("45059", "有粉丝身上的标签数已经超过限制") {}, ERR_45159("45159", "非法的tag_id") {}, ERR_46001("46001", "不存在媒体数据") {}, ERR_46002("46002", "不存在的菜单版本") {}, ERR_46003("46003", "不存在的菜单数据") {}, ERR_46004("46004", "不存在的用户") {}, ERR_47001("47001", "解析JSON/XML内容错误") {}, ERR_48001("48001", "api功能未授权，请确认公众号已获得该接口，可以在公众平台官网-开发者中心页中查看接口权限") {}, ERR_48002("48002", "粉丝拒收消息（粉丝在公众号选项中，关闭了 “ 接收消息 ” ）") {}, ERR_48004("48004", "api 接口被封禁，请登录 admin.weixin.qq.com 查看详情") {}, ERR_48005("48005", "api 禁止删除被自动回复和自定义菜单引用的素材") {}, ERR_48006("48006", "api 禁止清零调用次数，因为清零次数达到上限") {}, ERR_48008("48008", "没有该类型消息的发送权限") {}, ERR_49003("49003", "传入的openid不属于此AppID") {}, ERR_50001("50001", "用户未授权该api") {}, ERR_50002("50002", "用户受限，可能是违规后接口被封禁") {}, ERR_50005("50005", "用户未关注公众号") {}, ERR_61003("61003", "请确认是否取消授权（第三方平台授权）") {}, ERR_61004("61004", "当前ip未在白名单中，直接获取本地ip添加") {}, ERR_61005("61005", " 组件 ticket已失效，重新接受授权url反馈的ticket") {}, ERR_61006("61006", "获取componentTicket为null") {}, ERR_61007("61007", "当前公众号或者微信已在公众平台解绑") {}, ERR_61009("61009", "授权码失效，重新授权") {}, ERR_61451("61451", "参数错误(invalid parameter)") {}, ERR_61452("61452", "无效客服账号(invalid kf_account)") {}, ERR_61453("61453", "客服帐号已存在(kf_account exsited)") {}, ERR_61454("61454", "客服帐号名长度超过限制(仅允许10个英文字符，不包括@及@后的公众号的微信号)(invalid kf_acount length)") {}, ERR_61455("61455", "客服帐号名包含非法字符(仅允许英文+数字)(illegal character in kf_account)") {}, ERR_61456("61456", "客服帐号个数超过限制(10个客服账号)(kf_account count exceeded)") {}, ERR_61457("61457", "无效头像文件类型(invalid file type)") {}, ERR_61450("61450", "系统错误(system error)") {}, ERR_61500("61500", "日期格式错误") {}, ERR_61501("61501", "日期范围错误") {}, ERR_65400("65400", "API不可用，即没有开通/升级到新版客服功能") {}, ERR_65401("65401", "无效客服帐号") {}, ERR_65403("65403", "客服昵称不合法") {}, ERR_65404("65404", "客服帐号不合法") {}, ERR_65405("65405", "帐号数目已达到上限，不能继续添加") {}, ERR_65406("65406", "已经存在的客服帐号") {}, ERR_65407("65407", "邀请对象已经是该公众号客服") {}, ERR_65408("65408", "本公众号已经有一个邀请给该微信") {}, ERR_65409("65409", "无效的微信号") {}, ERR_65410("65410", "邀请对象绑定公众号客服数达到上限（目前每个微信号可以绑定5个公众号客服帐号）") {}, ERR_65411("65411", "该帐号已经有一个等待确认的邀请，不能重复邀请") {}, ERR_65412("65412", "该帐号已经绑定微信号，不能进行邀请") {}, ERR_99999("99999", "无法获取到文件名") {}, ERR_9001001("9001001", "POST数据参数不合法") {}, ERR_9001002("9001002", "远端服务不可用") {}, ERR_9001003("9001003", "Ticket不合法") {}, ERR_9001004("9001004", "获取摇周边用户信息失败") {}, ERR_9001005("9001005", "获取商户信息失败") {}, ERR_9001006("9001006", "获取OpenID失败") {}, ERR_9001007("9001007", "上传文件缺失") {}, ERR_9001008("9001008", "上传素材的文件类型不合法") {}, ERR_9001009("9001009", "上传素材的文件尺寸不合法") {}, ERR_9001010("9001010", "上传失败") {}, ERR_9001020("9001020", "帐号不合法") {}, ERR_9001021("9001021", "已有设备激活率低于50%，不能新增设备") {}, ERR_9001022("9001022", "设备申请数不合法，必须为大于0的数字") {}, ERR_9001023("9001023", "已存在审核中的设备ID申请") {}, ERR_9001024("9001024", "一次查询设备ID数量不能超过50") {}, ERR_9001025("9001025", "设备ID不合法") {}, ERR_9001026("9001026", "页面ID不合法") {}, ERR_9001027("9001027", "页面参数不合法") {}, ERR_9001028("9001028", "一次删除页面ID数量不能超过10") {}, ERR_9001029("9001029", "页面已应用在设备中，请先解除应用关系再删除") {}, ERR_9001030("9001030", "一次查询页面ID数量不能超过50") {}, ERR_9001031("9001031", "时间区间不合法") {}, ERR_9001032("9001032", "保存设备与页面的绑定关系参数错误") {}, ERR_9001033("9001033", "门店ID不合法") {}, ERR_9001034("9001034", "设备备注信息过长") {}, ERR_9001035("9001035", "设备申请参数不合法") {}, ERR_9001036("9001036", "查询起始值begin不合法") {}; + SUC_0("0", "请求成功") { + }, + ERR_1("-1", "系统繁忙，此时请开发者稍候再试") { + }, + ERR_10001("10001", "涉嫌广告 ") { + }, + ERR_20001("20001", "涉嫌政治 ") { + }, + ERR_20002("20002", "涉嫌色情 ") { + }, + ERR_20004("20004", "涉嫌社会 ") { + }, + ERR_20006("20006", "涉嫌违法犯罪 ") { + }, + ERR_20008("20008", "涉嫌欺诈 ") { + }, + ERR_20013("20013", "涉嫌版权 ") { + }, + ERR_21000("21000", "涉嫌其他 ") { + }, + ERR_22000("22000", "涉嫌互推(互相宣传) ") { + }, + ERR_30001("30001", "原创校验出现系统错误且用户选择了被判为转载就不群发 ") { + }, + ERR_30002("30002", "原创校验被判定为不能群发 ") { + }, + ERR_30003("30003", "原创校验被判定为转载文且用户选择了被判为转载就不群发 ") { + }, + ERR_40001("40001", "获取access_token时AppSecret错误，或者access_token无效。请开发者认真比对AppSecret的正确性，或查看是否正在为恰当的公众号调用接口") { + }, + ERR_40002("40002", "不合法的凭证类型") { + }, + ERR_40003("40003", "不合法的OpenID，请开发者确认OpenID（该用户）是否已关注公众号，或是否是其他公众号的OpenID") { + }, + ERR_40004("40004", "不合法的媒体文件类型") { + }, + ERR_40005("40005", "不合法的文件类型") { + }, + ERR_40006("40006", "不合法的文件大小") { + }, + ERR_40007("40007", "不合法的媒体文件id") { + }, + ERR_40008("40008", "不合法的消息类型") { + }, + ERR_40009("40009", "不合法的图片文件大小") { + }, + ERR_40010("40010", "不合法的语音文件大小") { + }, + ERR_40011("40011", "不合法的视频文件大小") { + }, + ERR_40012("40012", "不合法的缩略图文件大小") { + }, + ERR_40013("40013", "不合法的AppID，请开发者检查AppID的正确性，避免异常字符，注意大小写") { + }, + ERR_40014("40014", "不合法的access_token，请开发者认真比对access_token的有效性（如是否过期），或查看是否正在为恰当的公众号调用接口") { + }, + ERR_40015("40015", "不合法的菜单类型") { + }, + ERR_40016("40016", "不合法的按钮个数") { + }, + ERR_40017("40017", "不合法的按钮个数") { + }, + ERR_40018("40018", "不合法的按钮名字长度") { + }, + ERR_40019("40019", "不合法的按钮KEY长度") { + }, + ERR_40020("40020", "不合法的按钮URL长度") { + }, + ERR_40021("40021", "不合法的菜单版本号") { + }, + ERR_40022("40022", "不合法的子菜单级数") { + }, + ERR_40023("40023", "不合法的子菜单按钮个数") { + }, + ERR_40024("40024", "不合法的子菜单按钮类型") { + }, + ERR_40025("40025", "不合法的子菜单按钮名字长度") { + }, + ERR_40026("40026", "不合法的子菜单按钮KEY长度") { + }, + ERR_40027("40027", "不合法的子菜单按钮URL长度") { + }, + ERR_40028("40028", "不合法的自定义菜单使用用户") { + }, + ERR_40029("40029", "不合法的oauth_code") { + }, + ERR_40030("40030", "不合法的refresh_token") { + }, + ERR_40031("40031", "不合法的openid列表") { + }, + ERR_40032("40032", "不合法的openid列表个数") { + }, + ERR_40033("40033", "不合法的请求字符，不能包含xxxx格式的字符") { + }, + ERR_40035("40035", "不合法的参数") { + }, + ERR_40055("40055", "不完整的url，前面要加http://") { + }, + ERR_40037("40037", "template_id不正确") { + }, + ERR_40038("40038", "不合法的请求格式") { + }, + ERR_40039("40039", "不合法的URL长度") { + }, + ERR_40050("40050", "不合法的分组id") { + }, + ERR_40051("40051", "分组名字不合法") { + }, + ERR_40062("40062", "标题长度不合法") { + }, + ERR_40097("40097", "参数不合法") { + }, + ERR_40113("40113", "文件名称不合法，需包含正确后缀") { + }, + ERR_40117("40117", "分组名字不合法") { + }, + ERR_40118("40118", "media_id大小不合法") { + }, + ERR_40119("40119", "button类型错误") { + }, + ERR_40120("40120", "button类型错误") { + }, + ERR_40121("40121", "不合法的media_id类型") { + }, + ERR_40125("40125", "不合法的AppSecret，请开发者检查AppSecret的正确性，避免异常字符，注意大小写") { + }, + ERR_40130("40130", "至少需要同时发送两个用户") { + }, + ERR_40132("40132", "微信号不合法") { + }, + ERR_40137("40137", "不支持的图片格式") { + }, + ERR_40164("40164", "调用接口的IP地址不在白名单中，请在接口IP白名单中进行设置") { + }, + ERR_41001("41001", "缺少access_token参数") { + }, + ERR_41002("41002", "缺少appid参数") { + }, + ERR_41003("41003", "缺少refresh_token参数") { + }, + ERR_41004("41004", "缺少secret参数") { + }, + ERR_41005("41005", "缺少多媒体文件数据") { + }, + ERR_41006("41006", "缺少media_id参数") { + }, + ERR_41007("41007", "缺少子菜单数据") { + }, + ERR_41008("41008", "缺少oauth code") { + }, + ERR_41009("41009", "缺少openid") { + }, + ERR_41028("41028", "form_id不正确，或者过期") { + }, + ERR_41029("41029", "form_id已被使用") { + }, + ERR_41030("41030", "page不正确") { + }, + ERR_42001("42001", "access_token超时，请检查access_token的有效期，请参考基础支持-获取access_token中，对access_token的详细机制说明") { + }, + ERR_42002("42002", "refresh_token超时") { + }, + ERR_42003("42003", "oauth_code超时") { + }, + ERR_43001("43001", "需要GET请求") { + }, + ERR_43002("43002", "需要POST请求") { + }, + ERR_43003("43003", "需要HTTPS请求") { + }, + ERR_43004("43004", "需要接收者关注") { + }, + ERR_43005("43005", "需要好友关系") { + }, + ERR_44001("44001", "多媒体文件为空") { + }, + ERR_44002("44002", "POST的数据包为空") { + }, + ERR_44003("44003", "图文消息内容为空") { + }, + ERR_44004("44004", "文本消息内容为空") { + }, + ERR_45001("45001", "多媒体文件大小超过限制") { + }, + ERR_45002("45002", "消息内容超过限制") { + }, + ERR_45003("45003", "标题字段超过限制") { + }, + ERR_45004("45004", "描述字段超过限制") { + }, + ERR_45005("45005", "链接字段超过限制") { + }, + ERR_45006("45006", "图片链接字段超过限制") { + }, + ERR_45007("45007", "语音播放时间超过限制") { + }, + ERR_45008("45008", "图文消息超过限制") { + }, + ERR_45009("45009", "接口调用超过限制") { + }, + ERR_45010("45010", "创建菜单个数超过限制") { + }, + ERR_45015("45015", "回复时间超过限制") { + }, + ERR_45016("45016", "系统分组，不允许修改") { + }, + ERR_45017("45017", "分组名字过长") { + }, + ERR_45018("45018", "分组数量超过上限") { + }, + ERR_45028("45028", "没有群发的配额，配额已经用完") { + }, + ERR_45047("45047", "客服下行消息超过上限") { + }, + ERR_45157("45157", "标签名非法，请注意不能和其他标签重名") { + }, + ERR_45158("45158", "标签名长度超过30个字节") { + }, + ERR_45056("45056", "创建的标签数过多，请注意不能超过100个") { + }, + ERR_45058("45058", "不能修改0/1/2这三个系统默认保留的标签") { + }, + ERR_45057("45057", "该标签下粉丝数超过10w，不允许直接删除") { + }, + ERR_45059("45059", "有粉丝身上的标签数已经超过限制") { + }, + ERR_45159("45159", "非法的tag_id") { + }, + ERR_46001("46001", "不存在媒体数据") { + }, + ERR_46002("46002", "不存在的菜单版本") { + }, + ERR_46003("46003", "不存在的菜单数据") { + }, + ERR_46004("46004", "不存在的用户") { + }, + ERR_47001("47001", "解析JSON/XML内容错误") { + }, + ERR_48001("48001", "api功能未授权，请确认公众号已获得该接口，可以在公众平台官网-开发者中心页中查看接口权限") { + }, + ERR_48002("48002", "粉丝拒收消息（粉丝在公众号选项中，关闭了 “ 接收消息 ” ）") { + }, + ERR_48004("48004", "api 接口被封禁，请登录 admin.weixin.qq.com 查看详情") { + }, + ERR_48005("48005", "api 禁止删除被自动回复和自定义菜单引用的素材") { + }, + ERR_48006("48006", "api 禁止清零调用次数，因为清零次数达到上限") { + }, + ERR_48008("48008", "没有该类型消息的发送权限") { + }, + ERR_49003("49003", "传入的openid不属于此AppID") { + }, + ERR_50001("50001", "用户未授权该api") { + }, + ERR_50002("50002", "用户受限，可能是违规后接口被封禁") { + }, + ERR_50005("50005", "用户未关注公众号") { + }, + ERR_61003("61003", "请确认是否取消授权（第三方平台授权）") { + }, + ERR_61004("61004", "当前ip未在白名单中，直接获取本地ip添加") { + }, + ERR_61005("61005", " 组件 ticket已失效，重新接受授权url反馈的ticket") { + }, + ERR_61006("61006", "获取componentTicket为null") { + }, + ERR_61007("61007", "当前公众号或者微信已在公众平台解绑") { + }, + ERR_61009("61009", "授权码失效，重新授权") { + }, + ERR_61451("61451", "参数错误(invalid parameter)") { + }, + ERR_61452("61452", "无效客服账号(invalid kf_account)") { + }, + ERR_61453("61453", "客服帐号已存在(kf_account exsited)") { + }, + ERR_61454("61454", "客服帐号名长度超过限制(仅允许10个英文字符，不包括@及@后的公众号的微信号)(invalid kf_acount length)") { + }, + ERR_61455("61455", "客服帐号名包含非法字符(仅允许英文+数字)(illegal character in kf_account)") { + }, + ERR_61456("61456", "客服帐号个数超过限制(10个客服账号)(kf_account count exceeded)") { + }, + ERR_61457("61457", "无效头像文件类型(invalid file type)") { + }, + ERR_61450("61450", "系统错误(system error)") { + }, + ERR_61500("61500", "日期格式错误") { + }, + ERR_61501("61501", "日期范围错误") { + }, + ERR_65400("65400", "API不可用，即没有开通/升级到新版客服功能") { + }, + ERR_65401("65401", "无效客服帐号") { + }, + ERR_65403("65403", "客服昵称不合法") { + }, + ERR_65404("65404", "客服帐号不合法") { + }, + ERR_65405("65405", "帐号数目已达到上限，不能继续添加") { + }, + ERR_65406("65406", "已经存在的客服帐号") { + }, + ERR_65407("65407", "邀请对象已经是该公众号客服") { + }, + ERR_65408("65408", "本公众号已经有一个邀请给该微信") { + }, + ERR_65409("65409", "无效的微信号") { + }, + ERR_65410("65410", "邀请对象绑定公众号客服数达到上限（目前每个微信号可以绑定5个公众号客服帐号）") { + }, + ERR_65411("65411", "该帐号已经有一个等待确认的邀请，不能重复邀请") { + }, + ERR_65412("65412", "该帐号已经绑定微信号，不能进行邀请") { + }, + ERR_99999("99999", "无法获取到文件名") { + }, + ERR_9001001("9001001", "POST数据参数不合法") { + }, + ERR_9001002("9001002", "远端服务不可用") { + }, + ERR_9001003("9001003", "Ticket不合法") { + }, + ERR_9001004("9001004", "获取摇周边用户信息失败") { + }, + ERR_9001005("9001005", "获取商户信息失败") { + }, + ERR_9001006("9001006", "获取OpenID失败") { + }, + ERR_9001007("9001007", "上传文件缺失") { + }, + ERR_9001008("9001008", "上传素材的文件类型不合法") { + }, + ERR_9001009("9001009", "上传素材的文件尺寸不合法") { + }, + ERR_9001010("9001010", "上传失败") { + }, + ERR_9001020("9001020", "帐号不合法") { + }, + ERR_9001021("9001021", "已有设备激活率低于50%，不能新增设备") { + }, + ERR_9001022("9001022", "设备申请数不合法，必须为大于0的数字") { + }, + ERR_9001023("9001023", "已存在审核中的设备ID申请") { + }, + ERR_9001024("9001024", "一次查询设备ID数量不能超过50") { + }, + ERR_9001025("9001025", "设备ID不合法") { + }, + ERR_9001026("9001026", "页面ID不合法") { + }, + ERR_9001027("9001027", "页面参数不合法") { + }, + ERR_9001028("9001028", "一次删除页面ID数量不能超过10") { + }, + ERR_9001029("9001029", "页面已应用在设备中，请先解除应用关系再删除") { + }, + ERR_9001030("9001030", "一次查询页面ID数量不能超过50") { + }, + ERR_9001031("9001031", "时间区间不合法") { + }, + ERR_9001032("9001032", "保存设备与页面的绑定关系参数错误") { + }, + ERR_9001033("9001033", "门店ID不合法") { + }, + ERR_9001034("9001034", "设备备注信息过长") { + }, + ERR_9001035("9001035", "设备申请参数不合法") { + }, + ERR_9001036("9001036", "查询起始值begin不合法") { + }; private String code; private String msg; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxArticleController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxArticleController.java index c631bc5..839f33e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxArticleController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxArticleController.java @@ -23,13 +23,12 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.time.LocalDateTime; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import java.time.LocalDateTime; - /** * 动态接口 * @@ -42,7 +41,6 @@ import java.time.LocalDateTime; @RequestMapping("/wx/article") public class WxArticleController { - @Resource private PlayClerkArticleInfoServiceImpl playClerkArticleInfoService; @@ -55,14 +53,11 @@ public class WxArticleController { @Resource private WxCustomUserService customUserService; - /** * 店员新增动态 */ @ApiOperation(value = "店员新增动态", notes = "店员发布新的动态文章") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @ClerkUserLogin @PostMapping("/clerk/add") public R clerkAdd(@ApiParam(value = "动态信息", required = true) @Validated @RequestBody PlayClerkAddArticleVo vo) { @@ -71,15 +66,12 @@ public class WxArticleController { return R.ok("成功"); } - /** * 店员删除 */ @ApiOperation(value = "店员删除动态", notes = "店员删除自己发布的动态") @ApiImplicitParam(name = "id", value = "动态ID", required = true, dataType = "String", paramType = "query") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @ClerkUserLogin @GetMapping("/clerk/deleteById") public R clerkDeleteById(@RequestParam("id") String id) { @@ -93,27 +85,26 @@ public class WxArticleController { */ @ApiOperation(value = "店员查询动态", notes = "店员分页查询自己的动态列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkArticleInfoEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkArticleInfoEntity.class, responseContainer = "Page")}) @ClerkUserLogin @PostMapping("/clerk/listByPage") - public R clerkListByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkArticleQueryVo vo) { + public R clerkListByPage( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkArticleQueryVo vo) { vo.setClerkId(ThreadLocalRequestDetail.getClerkUserInfo().getId()); - return R.ok(playClerkArticleInfoService.selectByPage(vo,true)); + return R.ok(playClerkArticleInfoService.selectByPage(vo, true)); } - /** * 顾客查询动态列表 */ @ApiOperation(value = "顾客查询动态列表", notes = "顾客分页查询所有动态列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkArticleInfoEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkArticleInfoEntity.class, responseContainer = "Page")}) @PostMapping("/custom/listByPage") - public R customListByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkArticleCustomQueryVo vo) { + public R customListByPage( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkArticleCustomQueryVo vo) { vo.setFollowState("0"); - return R.ok(playClerkArticleInfoService.customSelectByPage(vo,customUserService.getLoginUserId())); + return R.ok(playClerkArticleInfoService.customSelectByPage(vo, customUserService.getLoginUserId())); } /** @@ -121,11 +112,11 @@ public class WxArticleController { */ @ApiOperation(value = "查询收藏动态", notes = "顾客查询已收藏的动态列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkArticleInfoEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkArticleInfoEntity.class, responseContainer = "Page")}) @CustomUserLogin @PostMapping("/custom/listFollowByPage") - public R customListFollowByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkArticleCustomQueryVo vo) { + public R customListFollowByPage( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkArticleCustomQueryVo vo) { vo.setFollowState("1"); return R.ok(playClerkArticleInfoService.customSelectByPage(vo, customUserService.getLoginUserId())); } @@ -133,14 +124,14 @@ public class WxArticleController { /** * 分页获取店员动态 * - * @param id 店员ID + * @param id + * 店员ID * @return 店员动态 */ @ApiOperation(value = "获取店员动态", notes = "根据店员ID查询该店员的动态") @ApiImplicitParam(name = "id", value = "店员ID", required = true, dataType = "String", paramType = "query") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkArticleInfoEntity.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkArticleInfoEntity.class, responseContainer = "Page")}) @GetMapping("/custom/queryByClerkId") public R queryTrendsById(@RequestParam("id") String id) { PlayClerkUserInfoEntity entity = playClerkUserInfoService.selectById(id); @@ -149,19 +140,19 @@ public class WxArticleController { return R.ok(playClerkArticleInfoService.customSelectByPage(vo, customUserService.getLoginUserId())); } - /** * 顾客查询已收藏动态列表 */ @ApiOperation(value = "更新点赞状态", notes = "顾客更新对动态的点赞状态") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @CustomUserLogin @PostMapping("/custom/updateGreedState") - public R customUpdateGreedState(@ApiParam(value = "点赞信息", required = true) @Validated @RequestBody PlayClerkArticleFollowCustomGreedStateEditStateVo vo) { - PlayClerkArticleInfoEntity articleInfoEntity = playClerkArticleInfoService.selectPlayClerkArticleInfoById(vo.getId()); - PlayCustomArticleInfoEntity entity = playCustomArticleInfoService.selectByArticleId(articleInfoEntity.getId(), ThreadLocalRequestDetail.getCustomUserInfo().getId(), "0"); + public R customUpdateGreedState( + @ApiParam(value = "点赞信息", required = true) @Validated @RequestBody PlayClerkArticleFollowCustomGreedStateEditStateVo vo) { + PlayClerkArticleInfoEntity articleInfoEntity = playClerkArticleInfoService + .selectPlayClerkArticleInfoById(vo.getId()); + PlayCustomArticleInfoEntity entity = playCustomArticleInfoService.selectByArticleId(articleInfoEntity.getId(), + ThreadLocalRequestDetail.getCustomUserInfo().getId(), "0"); if (entity == null) { entity = new PlayCustomArticleInfoEntity(); entity.setArticleId(articleInfoEntity.getId()); @@ -176,14 +167,15 @@ public class WxArticleController { } @ApiOperation(value = "更新收藏状态", notes = "顾客更新对动态的收藏状态") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @CustomUserLogin @PostMapping("/custom/updateFollowState") - public R customUpdateFollowState(@ApiParam(value = "收藏信息", required = true) @Validated @RequestBody PlayClerkArticleFollowCustomFollowStateEditStateVo vo) { - PlayClerkArticleInfoEntity articleInfoEntity = playClerkArticleInfoService.selectPlayClerkArticleInfoById(vo.getId()); - PlayCustomArticleInfoEntity entity = playCustomArticleInfoService.selectByArticleId(articleInfoEntity.getId(), ThreadLocalRequestDetail.getCustomUserInfo().getId(), "1"); + public R customUpdateFollowState( + @ApiParam(value = "收藏信息", required = true) @Validated @RequestBody PlayClerkArticleFollowCustomFollowStateEditStateVo vo) { + PlayClerkArticleInfoEntity articleInfoEntity = playClerkArticleInfoService + .selectPlayClerkArticleInfoById(vo.getId()); + PlayCustomArticleInfoEntity entity = playCustomArticleInfoService.selectByArticleId(articleInfoEntity.getId(), + ThreadLocalRequestDetail.getCustomUserInfo().getId(), "1"); if (entity == null) { entity = new PlayCustomArticleInfoEntity(); entity.setArticleId(articleInfoEntity.getId()); @@ -197,5 +189,4 @@ public class WxArticleController { return R.ok("成功"); } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkCommodityController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkCommodityController.java index 8b1e94a..5adbd61 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkCommodityController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkCommodityController.java @@ -17,18 +17,17 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - /** * 店员等级 * @@ -53,12 +52,10 @@ public class WxClerkCommodityController { @Resource IPlayClerkCommodityService playClerkCommodityService; - @ApiOperation(value = "根据等级查询商品", notes = "根据等级ID查询对应等级的所有商品") @ApiImplicitParam(name = "id", value = "等级ID", dataType = "String", paramType = "query") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCommodityReturnVo.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayCommodityReturnVo.class, responseContainer = "List")}) @GetMapping("/custom/queryClerkAllCommodityByLevel") public R queryClerkAllCommodityByLevel(@RequestParam("id") String levelId) { List levelInfoEntities = iPlayCommodityAndLevelInfoService.selectAll(); @@ -71,7 +68,6 @@ public class WxClerkCommodityController { return R.ok(tree); } - /** * 顾客查询当前店员所有服务项目 * @@ -80,16 +76,17 @@ public class WxClerkCommodityController { @ApiOperation(value = "查询店员商品", notes = "根据店员ID查询该店员提供的所有商品服务") @ApiImplicitParam(name = "id", value = "店员ID", required = true, dataType = "String", paramType = "query") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCommodityReturnVo.class, responseContainer = "List"), - @ApiResponse(code = 500, message = "请求参数异常,id不能为空") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayCommodityReturnVo.class, responseContainer = "List"), + @ApiResponse(code = 500, message = "请求参数异常,id不能为空")}) @GetMapping("/custom/queryClerkAllCommodity") public R customQueryClerkAllCommodity(@RequestParam("id") String clerkId) { if (clerkId == null || clerkId.isEmpty()) { throw new CustomException("请求参数异常,id不能为空"); } PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.selectById(clerkId); - Map> clerkCommodityEntities = playClerkCommodityService.selectCommodityTypeByUser(clerkId, "1").stream().collect(Collectors.groupingBy(PlayClerkCommodityEntity::getCommodityId)); + Map> clerkCommodityEntities = playClerkCommodityService + .selectCommodityTypeByUser(clerkId, "1").stream() + .collect(Collectors.groupingBy(PlayClerkCommodityEntity::getCommodityId)); List levelInfoEntities = iPlayCommodityAndLevelInfoService.selectAll(); List tree = playCommodityInfoService.selectTree(); tree = formatPlayCommodityReturnVoTree(tree, levelInfoEntities, clerkUserInfo.getLevelId()); @@ -97,8 +94,6 @@ public class WxClerkCommodityController { return R.ok(tree); } - - /** * 店员查询自己的服务项目 * @@ -106,14 +101,15 @@ public class WxClerkCommodityController { */ @ApiOperation(value = "店员查询自己的商品", notes = "当前登录店员查询自己提供的所有商品服务") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCommodityReturnVo.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayCommodityReturnVo.class, responseContainer = "List")}) @ClerkUserLogin @GetMapping("/clerk/queryAllCommodity") public R clerkQueryAllCommodity() { String levelId = ThreadLocalRequestDetail.getClerkUserInfo().getLevelId(); List levelInfoEntities = iPlayCommodityAndLevelInfoService.selectAll(); - Map> clerkCommodityEntities = playClerkCommodityService.selectCommodityTypeByUser(ThreadLocalRequestDetail.getClerkUserInfo().getId(), "1").stream().collect(Collectors.groupingBy(PlayClerkCommodityEntity::getCommodityId)); + Map> clerkCommodityEntities = playClerkCommodityService + .selectCommodityTypeByUser(ThreadLocalRequestDetail.getClerkUserInfo().getId(), "1").stream() + .collect(Collectors.groupingBy(PlayClerkCommodityEntity::getCommodityId)); List tree = playCommodityInfoService.selectTree(); tree = formatPlayCommodityReturnVoTree(tree, levelInfoEntities, levelId); @@ -121,18 +117,19 @@ public class WxClerkCommodityController { return R.ok(tree); } - - public List formatPlayCommodityReturnVoTree(List tree, List levelInfoEntities, String levelId) { + public List formatPlayCommodityReturnVoTree(List tree, + List levelInfoEntities, String levelId) { Iterator it = tree.iterator(); while (it.hasNext()) { PlayCommodityReturnVo item = it.next(); - //查找当前服务项目对应的价格 + // 查找当前服务项目对应的价格 for (PlayCommodityAndLevelInfoEntity levelInfoEntity : levelInfoEntities) { - if (item.getId().equals(levelInfoEntity.getCommodityId()) && levelId.equals(levelInfoEntity.getLevelId())) { + if (item.getId().equals(levelInfoEntity.getCommodityId()) + && levelId.equals(levelInfoEntity.getLevelId())) { item.setPrice(levelInfoEntity.getPrice()); } } - //如果未设置价格,删除元素 + // 如果未设置价格,删除元素 if (!"00".equals(item.getPId()) && item.getPrice() == null) { it.remove(); } @@ -141,13 +138,15 @@ public class WxClerkCommodityController { return tree; } - public List formatPlayCommodityReturnVoTree(List tree, Map> clerkCommodityEntities) { + public List formatPlayCommodityReturnVoTree(List tree, + Map> clerkCommodityEntities) { Iterator it = tree.iterator(); while (it.hasNext()) { PlayCommodityReturnVo item = it.next(); if ("00".equals(item.getPId()) && item.getChild().isEmpty()) { it.remove(); - } else if (clerkCommodityEntities != null && "00".equals(item.getPId()) && !clerkCommodityEntities.containsKey(item.getId())) { + } else if (clerkCommodityEntities != null && "00".equals(item.getPId()) + && !clerkCommodityEntities.containsKey(item.getId())) { it.remove(); } formatPlayCommodityReturnVoTree(item.getChild(), clerkCommodityEntities); @@ -155,5 +154,4 @@ public class WxClerkCommodityController { return tree; } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java index bd6c876..b99e1dc 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.weichat.controller; - import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.starry.admin.common.aspect.ClerkUserLogin; @@ -44,18 +43,17 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import lombok.extern.slf4j.Slf4j; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import javax.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; /** * @author admin @@ -66,7 +64,6 @@ import java.util.concurrent.TimeUnit; @RequestMapping("/wx/clerk/") public class WxClerkController { - @Resource RedisCache redisCache; @@ -97,7 +94,6 @@ public class WxClerkController { @Resource private IPlayClerkDataReviewInfoService playClerkDataReviewInfoService; - @Resource private IPlayClerkClassificationInfoService playClerkClassificationInfoService; @@ -114,36 +110,35 @@ public class WxClerkController { @Resource private WxCustomMpService wxCustomMpService; - /** * 店员获取个人业绩信息 */ @ApiOperation(value = "查询店员业绩", notes = "店员获取个人业绩信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @ClerkUserLogin @PostMapping("/user/queryPerformanceInfo") - public R queryPerformanceInfo(@ApiParam(value = "业绩查询条件", required = true) @Validated @RequestBody PlayClerkWxPerformanceInfoQueryVo vo) { - PlayClerkUserInfoEntity entity = clerkUserInfoService.selectById(ThreadLocalRequestDetail.getClerkUserInfo().getId()); + public R queryPerformanceInfo( + @ApiParam(value = "业绩查询条件", required = true) @Validated @RequestBody PlayClerkWxPerformanceInfoQueryVo vo) { + PlayClerkUserInfoEntity entity = clerkUserInfoService + .selectById(ThreadLocalRequestDetail.getClerkUserInfo().getId()); List clerkLevelInfoEntity = playClerkLevelInfoService.selectAll(); - List orderInfoEntities = playOrderInfoService.clerkSelectOrderInfoList(entity.getId(), vo.getStartTime(), vo.getEndTime()); + List orderInfoEntities = playOrderInfoService.clerkSelectOrderInfoList(entity.getId(), + vo.getStartTime(), vo.getEndTime()); List groupInfoEntities = playPersonnelGroupInfoService.selectAll(); - return R.ok(playClerkPerformanceService.getClerkPerformanceInfo(entity, orderInfoEntities, clerkLevelInfoEntity, groupInfoEntities)); + return R.ok(playClerkPerformanceService.getClerkPerformanceInfo(entity, orderInfoEntities, clerkLevelInfoEntity, + groupInfoEntities)); } - /** * 店员获取个人等级信息 */ @ApiOperation(value = "查询店员等级", notes = "店员获取个人等级信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkLevelInfoReturnVo.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkLevelInfoReturnVo.class)}) @ClerkUserLogin @GetMapping("/user/queryLevelInfo") public R queryLevelInfo() { - PlayClerkUserInfoEntity entity = clerkUserInfoService.selectById(ThreadLocalRequestDetail.getClerkUserInfo().getId()); + PlayClerkUserInfoEntity entity = clerkUserInfoService + .selectById(ThreadLocalRequestDetail.getClerkUserInfo().getId()); PlayClerkLevelInfoEntity level = playClerkLevelInfoService.selectPlayClerkLevelInfoById(entity.getLevelId()); PlayClerkLevelInfoReturnVo returnVo = new PlayClerkLevelInfoReturnVo(); returnVo.setLevelName(level.getName()); @@ -159,34 +154,31 @@ public class WxClerkController { return R.ok(returnVo); } - /** * 店员获取个人信息 */ @ApiOperation(value = "查询店员信息", notes = "店员获取个人详细信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoResultVo.class), - @ApiResponse(code = 500, message = "用户不存在") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoResultVo.class), + @ApiResponse(code = 500, message = "用户不存在")}) @ClerkUserLogin @GetMapping("/user/queryById") public R queryById() { - PlayClerkUserInfoEntity entity = clerkUserInfoService.selectById(ThreadLocalRequestDetail.getClerkUserInfo().getId()); + PlayClerkUserInfoEntity entity = clerkUserInfoService + .selectById(ThreadLocalRequestDetail.getClerkUserInfo().getId()); if (entity == null) { throw new CustomException("用户不存在"); } return R.ok(clerkUserInfoService.getVo(entity)); } - @ApiOperation(value = "发送验证码", notes = "店员绑定手机号发送验证码") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = String.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = String.class)}) @ClerkUserLogin @PostMapping("/user/sendCode") - public R sendCode(@ApiParam(value = "发送验证码信息", required = true) @Validated @RequestBody PlayClerkUserSendCodeVo vo) { - String codeKey = "login_codes:" + SecurityUtils.getTenantId() + "_" + SecureUtil.md5(vo.getAreaCode() + vo.getPhone()); + public R sendCode( + @ApiParam(value = "发送验证码信息", required = true) @Validated @RequestBody PlayClerkUserSendCodeVo vo) { + String codeKey = "login_codes:" + SecurityUtils.getTenantId() + "_" + + SecureUtil.md5(vo.getAreaCode() + vo.getPhone()); String code = VerificationCodeUtils.getVerificationCode(4); redisCache.setCacheObject(codeKey, code, 5L, TimeUnit.MINUTES); // 发送验证码, @@ -194,14 +186,13 @@ public class WxClerkController { } @ApiOperation(value = "绑定手机号", notes = "店员绑定手机号") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "验证码错误") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "验证码错误")}) @ClerkUserLogin @PostMapping("/user/bindCode") - public R bindCode(@ApiParam(value = "绑定验证码信息", required = true) @Validated @RequestBody PlayClerkUserBindCodeVo vo) { - String codeKey = "login_codes:" + SecurityUtils.getTenantId() + "_" + SecureUtil.md5(vo.getAreaCode() + vo.getPhone()); + public R bindCode( + @ApiParam(value = "绑定验证码信息", required = true) @Validated @RequestBody PlayClerkUserBindCodeVo vo) { + String codeKey = "login_codes:" + SecurityUtils.getTenantId() + "_" + + SecureUtil.md5(vo.getAreaCode() + vo.getPhone()); String code = redisCache.getCacheObject(codeKey); if (code == null || !code.equals(vo.getCode())) { throw new CustomException("验证码错误"); @@ -219,12 +210,8 @@ public class WxClerkController { } @ApiOperation(value = "店员申请", notes = "用户申请成为店员") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "系统错误，用户不存在"), - @ApiResponse(code = 500, message = "当前用户已经是店员"), - @ApiResponse(code = 500, message = "已有申请未审核") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "系统错误，用户不存在"), + @ApiResponse(code = 500, message = "当前用户已经是店员"), @ApiResponse(code = 500, message = "已有申请未审核")}) @ClerkUserLogin @PostMapping("/user/add") @Transactional(rollbackFor = Exception.class) @@ -252,19 +239,17 @@ public class WxClerkController { return R.ok("申请成功"); } - @ApiOperation(value = "更新头像", notes = "店员更新头像") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @ClerkUserLogin @PostMapping("/user/updateAvatar") public R updateAvatar(@ApiParam(value = "头像信息", required = true) @Validated @RequestBody PlayClerkUserAvatarVo vo) { PlayClerkUserInfoEntity userInfo = ThreadLocalRequestDetail.getClerkUserInfo(); -// PlayClerkDataReviewInfoEntity entity = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(), "1", "0"); -// if (entity != null) { -// throw new CustomException("已有申请未审核"); -// } + // PlayClerkDataReviewInfoEntity entity = + // playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(), "1", "0"); + // if (entity != null) { + // throw new CustomException("已有申请未审核"); + // } PlayClerkDataReviewInfoEntity entity = new PlayClerkDataReviewInfoEntity(); entity.setClerkId(userInfo.getId()); entity.setDataType("1"); @@ -280,10 +265,11 @@ public class WxClerkController { @PostMapping("/user/updateAlbum") public R updateAlbum(@Validated @RequestBody PlayClerkUserAlbumVo vo) { PlayClerkUserInfoEntity userInfo = ThreadLocalRequestDetail.getClerkUserInfo(); -// PlayClerkDataReviewInfoEntity entity = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(), "2", "0"); -// if (entity != null) { -// throw new CustomException("已有申请未审核"); -// } + // PlayClerkDataReviewInfoEntity entity = + // playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(), "2", "0"); + // if (entity != null) { + // throw new CustomException("已有申请未审核"); + // } PlayClerkDataReviewInfoEntity entity = new PlayClerkDataReviewInfoEntity(); entity.setClerkId(userInfo.getId()); entity.setDataType("2"); @@ -297,10 +283,11 @@ public class WxClerkController { @PostMapping("/user/updateAudio") public R updateAudio(@Validated @RequestBody PlayClerkUserAudioVo vo) { PlayClerkUserInfoEntity userInfo = ThreadLocalRequestDetail.getClerkUserInfo(); -// PlayClerkDataReviewInfoEntity entity = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(), "3", "0"); -// if (entity != null) { -// throw new CustomException("已有申请未审核"); -// } + // PlayClerkDataReviewInfoEntity entity = + // playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(), "3", "0"); + // if (entity != null) { + // throw new CustomException("已有申请未审核"); + // } PlayClerkDataReviewInfoEntity entity = new PlayClerkDataReviewInfoEntity(); entity.setClerkId(userInfo.getId()); entity.setDataType("3"); @@ -312,7 +299,6 @@ public class WxClerkController { return R.ok("提交成功，等待审核~"); } - @ClerkUserLogin @PostMapping("/user/updateOnlineState") public R updateAudio(@Validated @RequestBody PlayClerkUserOnlineStateVo vo) { @@ -327,11 +313,11 @@ public class WxClerkController { @ClerkUserLogin @PostMapping("/user/updateCommodity") public R updateAudio(@Validated @RequestBody PlayClerkCommodityEditVo vo) { - playClerkCommodityService.startStopClerkItem(vo.getCommodityType(), vo.getEnablingState(), ThreadLocalRequestDetail.getClerkUserInfo().getId()); + playClerkCommodityService.startStopClerkItem(vo.getCommodityType(), vo.getEnablingState(), + ThreadLocalRequestDetail.getClerkUserInfo().getId()); return R.ok("成功"); } - @ClerkUserLogin @PostMapping("/user/updateOther") public R updateOther(@Validated @RequestBody PlayClerkUserOtherVo vo) { @@ -341,7 +327,6 @@ public class WxClerkController { return R.ok("申请成功"); } - /** * 查询陪聊服务项目列表 */ @@ -354,16 +339,17 @@ public class WxClerkController { /** * 分页获取店员列表 * - * @param vo PlayClerkUserInfoQueryVo + * @param vo + * PlayClerkUserInfoQueryVo * @return 店员列表 */ @PostMapping("/user/queryByPage") public R queryByPage(@RequestBody PlayClerkUserInfoQueryVo vo) { - IPage page = playClerkUserInfoService.selectByPage(vo, customUserService.getLoginUserId()); + IPage page = playClerkUserInfoService.selectByPage(vo, + customUserService.getLoginUserId()); return R.ok(page); } - /** * 获取推荐用户列表 * @@ -379,11 +365,11 @@ public class WxClerkController { return R.ok(page); } - /** * 获取店员礼物信息 * - * @param id 店员ID + * @param id + * 店员ID * @return 店员礼物 */ @@ -393,11 +379,11 @@ public class WxClerkController { if (entity == null) { throw new CustomException("用户不存在"); } - //获取所有礼物列表 + // 获取所有礼物列表 List giftInfoEntities = giftInfoService.listByAll(); - //获取已点亮礼物 + // 获取已点亮礼物 List clerkListByAll = giftInfoService.clerkListByAll(id, "1"); - //组装数据 + // 组装数据 List result = new ArrayList<>(); for (PlayGiftInfoEntity giftInfoEntity : giftInfoEntities) { PlayClerkGiftReturnVo item = ConvertUtil.entityToVo(giftInfoEntity, PlayClerkGiftReturnVo.class); @@ -415,11 +401,11 @@ public class WxClerkController { return R.ok(resuleMap); } - /** * 获取店员价格 * - * @param id 店员ID + * @param id + * 店员ID * @return 店员价格 */ @GetMapping("/user/queryPriceById") @@ -427,11 +413,11 @@ public class WxClerkController { return R.ok(); } - /** * 店员分页查询本人订单列表 * - * @param vo 订单列表分页查询对象 + * @param vo + * 订单列表分页查询对象 * @return com.starry.common.result.R * @author admin * @since 2024/5/8 15:57 @@ -447,7 +433,8 @@ public class WxClerkController { /** * 店员查询本人订单详情 * - * @param id 订单ID + * @param id + * 订单ID * @return com.starry.common.result.R * @author admin * @since 2024/5/8 15:57 @@ -455,15 +442,16 @@ public class WxClerkController { @ClerkUserLogin @GetMapping("/order/queryById") public R queryById(@RequestParam("id") String id) { - PlayClerkOrderDetailsReturnVo orderInfo = playOrderInfoService.clerkSelectOrderDetails(ThreadLocalRequestDetail.getClerkUserInfo().getId(), id); + PlayClerkOrderDetailsReturnVo orderInfo = playOrderInfoService + .clerkSelectOrderDetails(ThreadLocalRequestDetail.getClerkUserInfo().getId(), id); return R.ok(orderInfo); } - /** * 店员-接单 * - * @param id 订单ID + * @param id + * 订单ID * @return com.starry.common.result.R * @author admin * @since 2024/5/8 15:57 @@ -471,14 +459,16 @@ public class WxClerkController { @ClerkUserLogin @GetMapping("/order/accept") public R acceptOrder(@RequestParam("id") String id) { - playOrderInfoService.updateStateTo1("1", ThreadLocalRequestDetail.getClerkUserInfo().getId(), ThreadLocalRequestDetail.getClerkUserInfo().getId(), id); + playOrderInfoService.updateStateTo1("1", ThreadLocalRequestDetail.getClerkUserInfo().getId(), + ThreadLocalRequestDetail.getClerkUserInfo().getId(), id); return R.ok("成功"); } /** * 店员-开始订单 * - * @param id 订单ID + * @param id + * 订单ID * @return com.starry.common.result.R * @author admin * @since 2024/5/8 15:57 @@ -493,7 +483,8 @@ public class WxClerkController { /** * 店员-取消订单 * - * @param vo 取消订单传参 + * @param vo + * 取消订单传参 * @return com.starry.common.result.R * @author admin * @since 2024/5/8 15:57 @@ -501,15 +492,16 @@ public class WxClerkController { @ClerkUserLogin @PostMapping("/order/cancellation") public R endOrder(@Validated @RequestBody PlayOrderStateEditVo vo) { - playOrderInfoService.updateStateTo4("1", ThreadLocalRequestDetail.getClerkUserInfo().getId(), vo.getOrderId(), vo.getRefundReason(), vo.getImages()); + playOrderInfoService.updateStateTo4("1", ThreadLocalRequestDetail.getClerkUserInfo().getId(), vo.getOrderId(), + vo.getRefundReason(), vo.getImages()); return R.ok("成功"); } - /** * 分页获取店员评价（订单评价） * - * @param vo 店员评价查询对象 + * @param vo + * 店员评价查询对象 * @return 店员评价 */ @PostMapping("/user/queryEvaluateByPage") @@ -518,7 +510,6 @@ public class WxClerkController { return R.ok(playOrderEvaluateInfoService.selectByPage(vo)); } - @GetMapping("/level/queryAll") public R userAdd() { return R.ok(playClerkLevelInfoService.selectAll()); diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkLeveController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkLeveController.java index 468e0e3..b44db3a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkLeveController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkLeveController.java @@ -8,15 +8,14 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.ArrayList; +import java.util.List; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - /** * 店员等级 * @@ -32,7 +31,6 @@ public class WxClerkLeveController { @Resource private IPlayClerkLevelInfoService playClerkLevelInfoService; - /** * 顾客查询所有店员所有等级列表 * @@ -40,8 +38,7 @@ public class WxClerkLeveController { */ @ApiOperation(value = "查询店员等级列表", notes = "顾客查询所有店员等级列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkLevelReturnVo.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkLevelReturnVo.class, responseContainer = "List")}) @GetMapping("/custom/queryClerkAllLevel") public R customQueryClerkAllLevel() { List list = playClerkLevelInfoService.selectAll(); @@ -55,5 +52,4 @@ public class WxClerkLeveController { return R.ok(returnVoList); } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkTypeController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkTypeController.java index 5204312..4178815 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkTypeController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkTypeController.java @@ -8,14 +8,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.List; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import java.util.List; - /** * 店员等级 * @@ -31,7 +30,6 @@ public class WxClerkTypeController { @Resource private IPlayClerkTypeInfoService clerkTypeInfoService; - /** * 顾客查询所有店员所有等级列表 * @@ -39,13 +37,13 @@ public class WxClerkTypeController { */ @ApiOperation(value = "查询店员类型列表", notes = "查询所有店员类型列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkTypeInfoEntity.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkTypeInfoEntity.class, responseContainer = "List")}) @GetMapping("/list") public R clerkTypeList() { - List list = clerkTypeInfoService.list(Wrappers.lambdaQuery(PlayClerkTypeInfoEntity.class).eq(PlayClerkTypeInfoEntity::getHomeDisplayed,1).orderByDesc(PlayClerkTypeInfoEntity::getSort)); + List list = clerkTypeInfoService.list( + Wrappers.lambdaQuery(PlayClerkTypeInfoEntity.class).eq(PlayClerkTypeInfoEntity::getHomeDisplayed, 1) + .orderByDesc(PlayClerkTypeInfoEntity::getSort)); return R.ok(list); } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkWagesController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkWagesController.java index 7ca5835..8ecb498 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkWagesController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkWagesController.java @@ -21,14 +21,13 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDate; import java.util.ArrayList; import java.util.List; +import javax.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; /** * 店员工资接口 @@ -50,22 +49,19 @@ public class WxClerkWagesController { @Resource private IPlayOrderInfoService playOrderInfoService; - /** - * 店员查询本人未结算工资 - * 订单完成之后，24小时之后进行订单结算，并且一旦订单结算了，就无法进行退款。想要退款，只能在24小时之内进行。 + * 店员查询本人未结算工资 订单完成之后，24小时之后进行订单结算，并且一旦订单结算了，就无法进行退款。想要退款，只能在24小时之内进行。 * * @author admin * @since 2024/5/31 16:20 **/ @ApiOperation(value = "查询未结算工资", notes = "店员查询本人未结算工资") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = ClerkUnsettledWagesReturnVo.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = ClerkUnsettledWagesReturnVo.class)}) @ClerkUserLogin @GetMapping("clerk/queryUnsettledWages") public R clerkQueryUnsettledWages() { - List list = playOrderInfoService.queryBySettlementOrder(ThreadLocalRequestDetail.getClerkUserInfo().getId(),"0"); + List list = playOrderInfoService + .queryBySettlementOrder(ThreadLocalRequestDetail.getClerkUserInfo().getId(), "0"); BigDecimal orderMoney = BigDecimal.ZERO; BigDecimal estimatedRevenue = BigDecimal.ZERO; for (PlayOrderInfoEntity entity : list) { @@ -83,13 +79,12 @@ public class WxClerkWagesController { * @since 2024/5/31 16:20 **/ @ApiOperation(value = "查询当期工资", notes = "店员查询本人当期工资") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = ClerkCurrentPeriodWagesReturnVo.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = ClerkCurrentPeriodWagesReturnVo.class)}) @ClerkUserLogin @GetMapping("clerk/queryCurrentPeriodWages") public R clerkQueryCurrentPeriodWages() { - PlayClerkWagesInfoEntity entity = playClerkWagesInfoService.selectCurrentPeriodWagesByClerkId(ThreadLocalRequestDetail.getClerkUserInfo().getId()); + PlayClerkWagesInfoEntity entity = playClerkWagesInfoService + .selectCurrentPeriodWagesByClerkId(ThreadLocalRequestDetail.getClerkUserInfo().getId()); if (entity == null) { entity = new PlayClerkWagesInfoEntity(); entity.setClerkId(ThreadLocalRequestDetail.getClerkUserInfo().getId()); @@ -103,7 +98,8 @@ public class WxClerkWagesController { entity.setOrderContinueProportion(0); entity.setOrderContinueMoney(BigDecimal.ZERO); } - ClerkCurrentPeriodWagesReturnVo returnVo = ConvertUtil.entityToVo(entity, ClerkCurrentPeriodWagesReturnVo.class); + ClerkCurrentPeriodWagesReturnVo returnVo = ConvertUtil.entityToVo(entity, + ClerkCurrentPeriodWagesReturnVo.class); returnVo.setTotalMoney(entity.getFinalAmount()); returnVo.setOrderWages(ConvertUtil.entityToVo(entity, OrderWagesReturnVo.class)); return R.ok(returnVo); @@ -117,12 +113,12 @@ public class WxClerkWagesController { **/ @ApiOperation(value = "查询历史工资", notes = "店员查询本人历史工资") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = ClerkHistoricalWagesReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = ClerkHistoricalWagesReturnVo.class, responseContainer = "Page")}) @ClerkUserLogin @PostMapping("clerk/queryHistoricalWages") public R clerkQueryHistoricalWages() { - List list = playClerkWagesInfoService.selectHistoricalWagesByClerkId(ThreadLocalRequestDetail.getClerkUserInfo().getId()); + List list = playClerkWagesInfoService + .selectHistoricalWagesByClerkId(ThreadLocalRequestDetail.getClerkUserInfo().getId()); List returnVoList = new ArrayList<>(list.size()); for (PlayClerkWagesInfoEntity entity : list) { returnVoList.add(ConvertUtil.entityToVo(entity, ClerkHistoricalWagesReturnVo.class)); @@ -145,9 +141,8 @@ public class WxClerkWagesController { @ApiOperation(value = "查询工资详情", notes = "店员查询本人工资详情") @ApiImplicitParam(name = "id", value = "工资ID", required = true, dataType = "String", paramType = "query") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = ClerkWagesDetailsReturnVo.class, responseContainer = "List"), - @ApiResponse(code = 500, message = "ID不能为空") - }) + @ApiResponse(code = 200, message = "操作成功", response = ClerkWagesDetailsReturnVo.class, responseContainer = "List"), + @ApiResponse(code = 500, message = "ID不能为空")}) @ClerkUserLogin @GetMapping("clerk/queryWagesDetails") public R clerkQueryWagesDetails(@RequestParam("id") String id) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCommodityController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCommodityController.java index e4d847c..05202a9 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCommodityController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCommodityController.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.weichat.controller; - import com.starry.admin.modules.clerk.module.entity.PlayClerkCommodityEntity; import com.starry.admin.modules.clerk.service.IPlayClerkCommodityService; import com.starry.admin.modules.weichat.entity.PlayClerkCommodityTreeData; @@ -10,18 +9,17 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - /** * @author admin */ @@ -36,16 +34,16 @@ public class WxCommodityController { @ApiOperation(value = "获取商品树", notes = "根据用户ID获取商品树形结构") @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "String", paramType = "query") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkCommodityTreeData.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkCommodityTreeData.class, responseContainer = "List")}) @GetMapping("/getTree") public R getTree(@RequestParam("userId") String userId) { List commodityEntities = clerkCommodityService.selectByUser(userId); - Map> item = commodityEntities.stream().collect(Collectors.groupingBy(PlayClerkCommodityEntity::getCommodityName)); + Map> item = commodityEntities.stream() + .collect(Collectors.groupingBy(PlayClerkCommodityEntity::getCommodityName)); List result = new ArrayList<>(); for (Map.Entry> entry : item.entrySet()) { - PlayClerkCommodityTreeData treeData = new PlayClerkCommodityTreeData(entry.getKey(),entry.getValue()); + PlayClerkCommodityTreeData treeData = new PlayClerkCommodityTreeData(entry.getKey(), entry.getValue()); result.add(treeData); } return R.ok(result); diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCommonController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCommonController.java index 4d42f83..bfe02f4 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCommonController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCommonController.java @@ -17,17 +17,16 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import lombok.extern.slf4j.Slf4j; -import me.chanjar.weixin.common.error.WxErrorException; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.Resource; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; +import javax.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import me.chanjar.weixin.common.error.WxErrorException; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; /** * @author admin @@ -49,41 +48,34 @@ public class WxCommonController { @Resource private IShopUiSettingService shopUiSettingService; - @ApiOperation(value = "获取行政区域树", notes = "获取省市区县的树形结构数据") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @GetMapping("area/tree") public R areaTree() { return R.ok(areaDictInfoService.selectTree("2")); } @ApiOperation(value = "获取店铺UI设置", notes = "获取当前店铺的UI配置信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @GetMapping("setting/info") public R selectShopUiSettingInfo() { return R.ok(shopUiSettingService.selectShopUiSettingInfo()); } @ApiOperation(value = "上传文件", notes = "上传文件到OSS存储") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功，返回文件访问地址") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功，返回文件访问地址")}) @PostMapping("file/upload") - public R fileUpload(@ApiParam(value = "上传的文件", required = true) @RequestParam("file") MultipartFile file) throws IOException { - String fileAddress = ossFileService.upload(file.getInputStream(), SecurityUtils.getTenantId(), file.getOriginalFilename()); + public R fileUpload(@ApiParam(value = "上传的文件", required = true) @RequestParam("file") MultipartFile file) + throws IOException { + String fileAddress = ossFileService.upload(file.getInputStream(), SecurityUtils.getTenantId(), + file.getOriginalFilename()); return R.ok(fileAddress); } @ApiOperation(value = "上传音频", notes = "通过微信媒体ID上传音频文件，自动转换为MP3格式") @ApiImplicitParam(name = "mediaId", value = "微信媒体ID", required = true, dataType = "String", paramType = "query") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功，返回文件访问地址"), - @ApiResponse(code = 500, message = "上传失败，mediaId为空或文件不存在") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功，返回文件访问地址"), + @ApiResponse(code = 500, message = "上传失败，mediaId为空或文件不存在")}) @GetMapping("audio/upload") public R audioUpload(@RequestParam("mediaId") String mediaId) throws IOException, WxErrorException { if (StrUtil.isBlankIfStr(mediaId)) { @@ -92,7 +84,8 @@ public class WxCommonController { String accessToken = wxAccessTokenService.getAccessToken(); // 下载录音文件，并转化为InputStream InputStream inputStream = WxFileUtils.getTemporaryMaterial(accessToken, mediaId); - File tempFile = FileUtil.createTempFile("wx_" + SecurityUtils.getTenantId(), IdUtils.getUuid() + ".amr", null).toFile(); + File tempFile = FileUtil.createTempFile("wx_" + SecurityUtils.getTenantId(), IdUtils.getUuid() + ".amr", null) + .toFile(); // 可以在这里对临时文件进行操作 log.error("tempFile = {}", tempFile.getPath()); try (FileOutputStream fileOutputStream = new FileOutputStream(tempFile)) { @@ -106,13 +99,15 @@ public class WxCommonController { if (FileUtil.size(tempFile) <= 0) { throw new CustomException("音频文件上传失败,文件不存在"); } - //将下载的微信素材文件，转化为MP3文件 - File targetFile = FileUtil.createTempFile("wx_" + SecurityUtils.getTenantId(), IdUtils.getUuid() + ".mp3", null).toFile(); + // 将下载的微信素材文件，转化为MP3文件 + File targetFile = FileUtil.createTempFile("wx_" + SecurityUtils.getTenantId(), IdUtils.getUuid() + ".mp3", null) + .toFile(); log.error("targetFile = {}", targetFile.getPath()); WxFileUtils.audioConvert2Mp3(tempFile, targetFile); - //将MP3文件上传到OSS - String fileAddress = ossFileService.upload(Files.newInputStream(targetFile.toPath()), SecurityUtils.getTenantId(), IdUtils.getUuid() + ".mp3"); - //删除临时文件 + // 将MP3文件上传到OSS + String fileAddress = ossFileService.upload(Files.newInputStream(targetFile.toPath()), + SecurityUtils.getTenantId(), IdUtils.getUuid() + ".mp3"); + // 删除临时文件 FileUtil.del(tempFile); FileUtil.del(targetFile); return R.ok(fileAddress); diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCouponController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCouponController.java index cabacaf..b08b98d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCouponController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCouponController.java @@ -25,15 +25,14 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; /** * @author admin @@ -45,7 +44,6 @@ import java.util.Map; @RequestMapping("/wx/coupon/") public class WxCouponController { - @Resource IPlayCouponDetailsService couponDetailsService; @@ -58,13 +56,10 @@ public class WxCouponController { @Resource private IPlayCommodityInfoService playCommodityInfoService; - @ApiOperation(value = "领取优惠券", notes = "顾客领取指定ID的优惠券") @ApiImplicitParam(name = "id", value = "优惠券ID", required = true, dataType = "String", paramType = "query") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = Map.class), - @ApiResponse(code = 500, message = "请求参数异常,优惠券ID不能为空") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Map.class), + @ApiResponse(code = 500, message = "请求参数异常,优惠券ID不能为空")}) @CustomUserLogin @GetMapping("/custom/obtainCoupon") public R queryAll(@RequestParam("id") String id) { @@ -77,7 +72,8 @@ public class WxCouponController { boolean success = StrUtil.isBlank(msg); // 优惠券领取验证通过，发放优惠券 if (success) { - couponDetailsService.create(customUserInfo.getId(), customUserInfo.getNickname(), customUserInfo.getLevelId(), entity.getId(), "1", "1"); + couponDetailsService.create(customUserInfo.getId(), customUserInfo.getNickname(), + customUserInfo.getLevelId(), entity.getId(), "1", "1"); } Map result = new HashMap<>(); result.put("success", success); @@ -85,7 +81,6 @@ public class WxCouponController { return R.ok(result); } - /** * 查询所有优惠券，以及本人是否可领取 * @@ -95,12 +90,12 @@ public class WxCouponController { **/ @ApiOperation(value = "查询所有优惠券", notes = "查询所有优惠券并标记用户是否已领取") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = WxCouponReceiveReturnVo.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = WxCouponReceiveReturnVo.class, responseContainer = "List")}) @CustomUserLogin @PostMapping("/custom/queryAll") public R queryAll() { - List obtainedCoupons = couponDetailsService.selectByCustomId(ThreadLocalRequestDetail.getCustomUserInfo().getId()); + List obtainedCoupons = couponDetailsService + .selectByCustomId(ThreadLocalRequestDetail.getCustomUserInfo().getId()); List couponInfoEntities = couponInfoService.queryAll(); List returnVos = new ArrayList<>(couponInfoEntities.size()); for (PlayCouponInfoEntity couponInfoEntity : couponInfoEntities) { @@ -118,18 +113,17 @@ public class WxCouponController { return R.ok(returnVos); } - /** * 顾客查询订单可使用优惠券 */ @ApiOperation(value = "查询订单可用优惠券", notes = "查询当前订单可使用的优惠券列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = WxCouponOrderReturnVo.class, responseContainer = "List"), - @ApiResponse(code = 500, message = "请求参数异常,店员ID不能为空,等级ID不能为空") - }) + @ApiResponse(code = 200, message = "操作成功", response = WxCouponOrderReturnVo.class, responseContainer = "List"), + @ApiResponse(code = 500, message = "请求参数异常,店员ID不能为空,等级ID不能为空")}) @CustomUserLogin @PostMapping("/custom/queryByOrder") - public R queryByOrder(@ApiParam(value = "订单查询条件", required = true) @Validated @RequestBody WxCouponOrderQueryVo vo) { + public R queryByOrder( + @ApiParam(value = "订单查询条件", required = true) @Validated @RequestBody WxCouponOrderQueryVo vo) { if (vo.getLevelId().isEmpty() && vo.getClerkId().isEmpty()) { throw new CustomException("请求参数异常,店员ID不能为空,等级ID不能为空"); } @@ -139,14 +133,17 @@ public class WxCouponController { levelId = clerkUserInfo.getLevelId(); } log.info(JSON.toJSONString(vo)); - List list = couponDetailsService.selectByCustomId(ThreadLocalRequestDetail.getCustomUserInfo().getId()); + List list = couponDetailsService + .selectByCustomId(ThreadLocalRequestDetail.getCustomUserInfo().getId()); PlayCommodityInfoVo commodityInfo = playCommodityInfoService.queryCommodityInfo(vo.getCommodityId(), levelId); // 优惠券列表 List couponReturnVos = new ArrayList<>(); for (PlayCouponDetailsReturnVo couponDetails : list) { PlayCouponInfoEntity couponInfo = couponInfoService.selectPlayCouponInfoById(couponDetails.getCouponId()); WxCouponOrderReturnVo wxCouponReturnVo = ConvertUtil.entityToVo(couponDetails, WxCouponOrderReturnVo.class); - String couponReasonForUnavailableUse = couponInfoService.getCouponReasonForUnavailableUse(couponInfo, vo.getPlaceType(), vo.getCommodityId(), vo.getCommodityQuantity(), commodityInfo.getCommodityPrice()); + String couponReasonForUnavailableUse = couponInfoService.getCouponReasonForUnavailableUse(couponInfo, + vo.getPlaceType(), vo.getCommodityId(), vo.getCommodityQuantity(), + commodityInfo.getCommodityPrice()); if (StrUtil.isEmpty(couponReasonForUnavailableUse)) { wxCouponReturnVo.setAvailable("1"); } else { @@ -158,6 +155,4 @@ public class WxCouponController { return R.ok(couponReturnVos); } - - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCustomController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCustomController.java index c747f62..20c4e79 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCustomController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCustomController.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.weichat.controller; - import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -55,16 +54,15 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.Objects; +import javax.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; /** * @author admin @@ -108,7 +106,6 @@ public class WxCustomController { @Resource private IPlayOrderEvaluateInfoService playOrderEvaluateInfoService; - @Resource private IPlayCustomGiftInfoService playCustomGiftInfoService; @@ -126,18 +123,16 @@ public class WxCustomController { @Resource OverdueOrderHandlerTask overdueOrderHandlerTask; - /** * 根据店员ID查询店员详细信息 * - * @param id 店员ID + * @param id + * 店员ID * @return 店员详细信息 */ @ApiOperation(value = "查询店员详细信息", notes = "根据店员ID查询店员的详细信息") @ApiImplicitParam(name = "id", value = "店员ID", required = true, dataType = "String", paramType = "query") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoResultVo.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoResultVo.class)}) @GetMapping("/queryClerkDetailedById") public R queryClerkDetailedById(@RequestParam("id") String id) { PlayClerkUserInfoEntity entity = clerkUserInfoService.selectById(id); @@ -157,9 +152,7 @@ public class WxCustomController { * 顾客本人刷新头像 */ @ApiOperation(value = "刷新顾客头像", notes = "刷新当前登录顾客的头像信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @CustomUserLogin @GetMapping("/refreshAvatar") public R refreshAvatar() { @@ -170,9 +163,7 @@ public class WxCustomController { * 根据顾客ID查询当前顾客详细信息 */ @ApiOperation(value = "查询顾客详细信息", notes = "查询当前登录顾客的详细信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCustomUserReturnDetailVo.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayCustomUserReturnDetailVo.class)}) @CustomUserLogin @GetMapping("/queryById") public R queryById() { @@ -190,12 +181,11 @@ public class WxCustomController { * 顾客本人修改隐藏等级状态 */ @ApiOperation(value = "修改隐藏等级状态", notes = "顾客修改自己的隐藏等级状态") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @CustomUserLogin @PostMapping("/updateHideLevelState") - public R updateHideLevelState(@ApiParam(value = "隐藏等级状态信息", required = true) @Validated @RequestBody PlayCustomHideLevelStateEditVo vo) { + public R updateHideLevelState( + @ApiParam(value = "隐藏等级状态信息", required = true) @Validated @RequestBody PlayCustomHideLevelStateEditVo vo) { vo.setId(ThreadLocalRequestDetail.getCustomUserInfo().getId()); PlayCustomUserInfoEntity entity = new PlayCustomUserInfoEntity(); BeanUtils.copyProperties(vo, entity); @@ -207,12 +197,11 @@ public class WxCustomController { * 顾客本人修改隐藏排名状态 */ @ApiOperation(value = "修改隐藏排名状态", notes = "顾客修改自己的隐藏排名状态") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @CustomUserLogin @PostMapping("/updateHideRankingState") - public R updateHideRankingState(@ApiParam(value = "隐藏排名状态信息", required = true) @Validated @RequestBody PlayCustomHideRankingStateEditVo vo) { + public R updateHideRankingState( + @ApiParam(value = "隐藏排名状态信息", required = true) @Validated @RequestBody PlayCustomHideRankingStateEditVo vo) { vo.setId(ThreadLocalRequestDetail.getCustomUserInfo().getId()); PlayCustomUserInfoEntity entity = new PlayCustomUserInfoEntity(); BeanUtils.copyProperties(vo, entity); @@ -220,18 +209,15 @@ public class WxCustomController { return R.ok("成功"); } - /** * 打赏店员-打赏余额 */ @ApiOperation(value = "打赏店员", notes = "使用余额打赏店员") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 998, message = "余额不足") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 998, message = "余额不足")}) @CustomUserLogin @PostMapping("/order/reward") - public R rewardToOrder(@ApiParam(value = "打赏信息", required = true) @Validated @RequestBody PlayOrderInfoRewardAdd vo) { + public R rewardToOrder( + @ApiParam(value = "打赏信息", required = true) @Validated @RequestBody PlayOrderInfoRewardAdd vo) { MoneyUtils.verificationTypeIsNormal(vo.getMoney()); String userId = ThreadLocalRequestDetail.getCustomUserInfo().getId(); PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(userId); @@ -240,21 +226,22 @@ public class WxCustomController { } String orderId = IdUtils.getUuid(); // 记录订单信息 - playOrderInfoService.createOrderInfo(orderId, playOrderInfoService.getOrderNo(), "3", "2", "2", "0", "1", "", "0", BigDecimal.ZERO, "", "", "0", new BigDecimal(vo.getMoney()), new BigDecimal(vo.getMoney()), BigDecimal.ZERO, userId, vo.getClerkId(), vo.getWeiChatCode(), new ArrayList<>(), vo.getRemark(), "", "", ""); + playOrderInfoService.createOrderInfo(orderId, playOrderInfoService.getOrderNo(), "3", "2", "2", "0", "1", "", + "0", BigDecimal.ZERO, "", "", "0", new BigDecimal(vo.getMoney()), new BigDecimal(vo.getMoney()), + BigDecimal.ZERO, userId, vo.getClerkId(), vo.getWeiChatCode(), new ArrayList<>(), vo.getRemark(), "", + "", ""); // 顾客减少余额 - customUserInfoService.updateAccountBalanceById(customUserInfo.getId(), customUserInfo.getAccountBalance(), customUserInfo.getAccountBalance().subtract(new BigDecimal(vo.getMoney())), "1", "打赏", new BigDecimal(vo.getMoney()), BigDecimal.ZERO, orderId); + customUserInfoService.updateAccountBalanceById(customUserInfo.getId(), customUserInfo.getAccountBalance(), + customUserInfo.getAccountBalance().subtract(new BigDecimal(vo.getMoney())), "1", "打赏", + new BigDecimal(vo.getMoney()), BigDecimal.ZERO, orderId); return R.ok("成功"); } - /** * 顾客下单-赠送礼物 **/ @ApiOperation(value = "赠送礼物", notes = "顾客向店员赠送礼物") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 998, message = "余额不足") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 998, message = "余额不足")}) @CustomUserLogin @PostMapping("/order/gift") public R giftToOdder(@ApiParam(value = "礼物信息", required = true) @Validated @RequestBody PlayOrderInfoGiftAdd vo) { @@ -267,12 +254,17 @@ public class WxCustomController { } String orderId = IdUtils.getUuid(); // 记录订单信息 - playOrderInfoService.createOrderInfo(orderId, playOrderInfoService.getOrderNo(), "3", "2", "2", "1", "1", giftInfo.getId(), "0", giftInfo.getPrice(), "", giftInfo.getName(), String.valueOf(vo.getGiftQuantity()), money, money, BigDecimal.ZERO, userId, vo.getClerkId(), vo.getWeiChatCode(), new ArrayList<>(), vo.getRemark(), "", "", ""); + playOrderInfoService.createOrderInfo(orderId, playOrderInfoService.getOrderNo(), "3", "2", "2", "1", "1", + giftInfo.getId(), "0", giftInfo.getPrice(), "", giftInfo.getName(), + String.valueOf(vo.getGiftQuantity()), money, money, BigDecimal.ZERO, userId, vo.getClerkId(), + vo.getWeiChatCode(), new ArrayList<>(), vo.getRemark(), "", "", ""); // 顾客减少余额 - customUserInfoService.updateAccountBalanceById(customUserInfo.getId(), customUserInfo.getAccountBalance(), customUserInfo.getAccountBalance().subtract(money), "1", "赠送礼物", money, BigDecimal.ZERO, orderId); + customUserInfoService.updateAccountBalanceById(customUserInfo.getId(), customUserInfo.getAccountBalance(), + customUserInfo.getAccountBalance().subtract(money), "1", "赠送礼物", money, BigDecimal.ZERO, orderId); // 陪聊增加余额 // 修改顾客和礼物消息 - PlayCustomGiftInfoEntity customGiftInfoEntity = playCustomGiftInfoService.selectByGiftIdAndCustomId(vo.getGiftId(), userId); + PlayCustomGiftInfoEntity customGiftInfoEntity = playCustomGiftInfoService + .selectByGiftIdAndCustomId(vo.getGiftId(), userId); if (customGiftInfoEntity == null) { customGiftInfoEntity = new PlayCustomGiftInfoEntity(); customGiftInfoEntity.setGiffId(vo.getGiftId()); @@ -285,7 +277,8 @@ public class WxCustomController { } // 修改陪玩和礼物数据 - PlayClerkGiftInfoEntity clerkGiftInfoEntity = playClerkGiftInfoService.selectByGiftIdAndClerkId(vo.getGiftId(), vo.getClerkId()); + PlayClerkGiftInfoEntity clerkGiftInfoEntity = playClerkGiftInfoService.selectByGiftIdAndClerkId(vo.getGiftId(), + vo.getClerkId()); if (clerkGiftInfoEntity == null) { clerkGiftInfoEntity = new PlayClerkGiftInfoEntity(); clerkGiftInfoEntity.setGiffId(vo.getGiftId()); @@ -300,28 +293,27 @@ public class WxCustomController { return R.ok("成功"); } - /** * 新增指定订单 * - * @param vo 指定订单查询对象 + * @param vo + * 指定订单查询对象 * @return com.starry.common.result.R * @author admin * @since 2024/5/8 16:31 **/ @ApiOperation(value = "商品下单", notes = "顾客购买店员服务商品") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 998, message = "余额不足"), - @ApiResponse(code = 500, message = "请求参数异常") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 998, message = "余额不足"), + @ApiResponse(code = 500, message = "请求参数异常")}) @CustomUserLogin @PostMapping("/order/commodity") - public R commodityToOrdder(@ApiParam(value = "商品订单信息", required = true) @Validated @RequestBody PlayOrderInfoCommodityAdd vo) { + public R commodityToOrdder( + @ApiParam(value = "商品订单信息", required = true) @Validated @RequestBody PlayOrderInfoCommodityAdd vo) { String customId = ThreadLocalRequestDetail.getCustomUserInfo().getId(); PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.selectById(vo.getClerkId()); - PlayCommodityInfoVo commodityInfo = playCommodityInfoService.queryCommodityInfo(vo.getCommodityId(), clerkUserInfo.getLevelId()); + PlayCommodityInfoVo commodityInfo = playCommodityInfoService.queryCommodityInfo(vo.getCommodityId(), + clerkUserInfo.getLevelId()); BigDecimal couponMoney = BigDecimal.ZERO; for (String couponId : vo.getCouponIds()) { @@ -329,8 +321,10 @@ public class WxCustomController { if (Objects.isNull(couponDetailsEntity)) { throw new CustomException("优惠券不存在"); } - PlayCouponInfoEntity couponInfo = playCouponInfoService.selectPlayCouponInfoById(couponDetailsEntity.getCouponId()); - String couponReasonForUnavailableUse = playCouponInfoService.getCouponReasonForUnavailableUse(couponInfo, "0", vo.getCommodityId(), vo.getCommodityQuantity(), commodityInfo.getCommodityPrice()); + PlayCouponInfoEntity couponInfo = playCouponInfoService + .selectPlayCouponInfoById(couponDetailsEntity.getCouponId()); + String couponReasonForUnavailableUse = playCouponInfoService.getCouponReasonForUnavailableUse(couponInfo, + "0", vo.getCommodityId(), vo.getCommodityQuantity(), commodityInfo.getCommodityPrice()); if (StrUtil.isNotBlank(couponReasonForUnavailableUse)) { throw new CustomException("优惠券不可用"); } @@ -339,7 +333,6 @@ public class WxCustomController { } } - PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(customId); BigDecimal money = commodityInfo.getCommodityPrice().multiply(new BigDecimal(vo.getCommodityQuantity())); @@ -355,19 +348,25 @@ public class WxCustomController { String orderId = IdUtils.getUuid(); String orderNo = playOrderInfoService.getOrderNo(); // 记录订单信息 - playOrderInfoService.createOrderInfo(orderId, orderNo, "0", "2", "0", "", "1", commodityInfo.getCommodityId(), "1", commodityInfo.getCommodityPrice(), commodityInfo.getServiceDuration(), commodityInfo.getCommodityName(), String.valueOf(vo.getCommodityQuantity()), money, money, BigDecimal.ZERO, customId, clerkUserInfo.getId(), vo.getWeiChatCode(), vo.getCouponIds(), vo.getRemark(), "", "", ""); + playOrderInfoService.createOrderInfo(orderId, orderNo, "0", "2", "0", "", "1", commodityInfo.getCommodityId(), + "1", commodityInfo.getCommodityPrice(), commodityInfo.getServiceDuration(), + commodityInfo.getCommodityName(), String.valueOf(vo.getCommodityQuantity()), money, money, + BigDecimal.ZERO, customId, clerkUserInfo.getId(), vo.getWeiChatCode(), vo.getCouponIds(), + vo.getRemark(), "", "", ""); // 顾客减少余额 - customUserInfoService.updateAccountBalanceById(customUserInfo.getId(), customUserInfo.getAccountBalance(), customUserInfo.getAccountBalance().subtract(money), "1", "下单-指定单", money, BigDecimal.ZERO, orderId); + customUserInfoService.updateAccountBalanceById(customUserInfo.getId(), customUserInfo.getAccountBalance(), + customUserInfo.getAccountBalance().subtract(money), "1", "下单-指定单", money, BigDecimal.ZERO, orderId); // 发送通知给店员 - wxCustomMpService.sendCreateOrderMessage(clerkUserInfo.getTenantId(), clerkUserInfo.getOpenid(), orderNo, money.toString(), commodityInfo.getCommodityName()); + wxCustomMpService.sendCreateOrderMessage(clerkUserInfo.getTenantId(), clerkUserInfo.getOpenid(), orderNo, + money.toString(), commodityInfo.getCommodityName()); return R.ok("成功"); } - /** * 新增随机订单 * - * @param vo 随机单创建对象 + * @param vo + * 随机单创建对象 * @return R */ @CustomUserLogin @@ -376,27 +375,34 @@ public class WxCustomController { // 验证当前顾客余额是否充足 String customId = ThreadLocalRequestDetail.getCustomUserInfo().getId(); PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(customId); - PlayCommodityInfoVo commodityInfo = playCommodityInfoService.queryCommodityInfo(vo.getCommodityId(), vo.getLevelId()); + PlayCommodityInfoVo commodityInfo = playCommodityInfoService.queryCommodityInfo(vo.getCommodityId(), + vo.getLevelId()); BigDecimal money = commodityInfo.getCommodityPrice().multiply(new BigDecimal(vo.getCommodityQuantity())); if (money.compareTo(customUserInfo.getAccountBalance()) > 0) { throw new ServiceException("余额不足", 998); } String orderId = IdUtils.getUuid(); // 记录订单信息 - playOrderInfoService.createOrderInfo(orderId, playOrderInfoService.getOrderNo(), "0", "2", "1", "", "1", commodityInfo.getCommodityId(), "1", commodityInfo.getCommodityPrice(), commodityInfo.getServiceDuration(), commodityInfo.getCommodityName(), String.valueOf(vo.getCommodityQuantity()), money, money, BigDecimal.ZERO, customId, "", vo.getWeiChatCode(), vo.getCouponIds(), vo.getRemark(), vo.getSex(), vo.getLevelId(), vo.getExcludeHistory()); + playOrderInfoService.createOrderInfo(orderId, playOrderInfoService.getOrderNo(), "0", "2", "1", "", "1", + commodityInfo.getCommodityId(), "1", commodityInfo.getCommodityPrice(), + commodityInfo.getServiceDuration(), commodityInfo.getCommodityName(), + String.valueOf(vo.getCommodityQuantity()), money, money, BigDecimal.ZERO, customId, "", + vo.getWeiChatCode(), vo.getCouponIds(), vo.getRemark(), vo.getSex(), vo.getLevelId(), + vo.getExcludeHistory()); // 顾客减少余额 - customUserInfoService.updateAccountBalanceById(customUserInfo.getId(), customUserInfo.getAccountBalance(), customUserInfo.getAccountBalance().subtract(money), "1", "下单-随机单", money, BigDecimal.ZERO, orderId); + customUserInfoService.updateAccountBalanceById(customUserInfo.getId(), customUserInfo.getAccountBalance(), + customUserInfo.getAccountBalance().subtract(money), "1", "下单-随机单", money, BigDecimal.ZERO, orderId); // 记录订单，指定指定未接单后，进行退款处理 overdueOrderHandlerTask.enqueue(orderId + "_" + SecurityUtils.getTenantId()); // 下单成功后，先根据用户条件进行随机分配 return R.ok("下单成功"); } - /** * 顾客分页查询本人订单列表 * - * @param vo 订单列表分页查询对象 + * @param vo + * 订单列表分页查询对象 * @return com.starry.common.result.R * @author admin * @since 2024/5/8 15:57 @@ -412,7 +418,8 @@ public class WxCustomController { /** * 顾客分页查询本人订单详细信息 * - * @param id 订单ID + * @param id + * 订单ID * @return com.starry.common.result.R * @author admin * @since 2024/5/8 15:57 @@ -420,15 +427,16 @@ public class WxCustomController { @CustomUserLogin @GetMapping("/order/queryById") public R queryById(@RequestParam("id") String id) { - PlayCustomOrderDetailsReturnVo vo = playOrderInfoService.customSelectOrderDetails(ThreadLocalRequestDetail.getCustomUserInfo().getId(), id); + PlayCustomOrderDetailsReturnVo vo = playOrderInfoService + .customSelectOrderDetails(ThreadLocalRequestDetail.getCustomUserInfo().getId(), id); return R.ok(vo); } - /** * 顾客-完成订单 * - * @param id 订单ID + * @param id + * 订单ID * @return com.starry.common.result.R * @author admin * @since 2024/5/8 15:57 @@ -440,11 +448,11 @@ public class WxCustomController { return R.ok("成功"); } - /** * 顾客取消订单 * - * @param vo 订单取消对象 + * @param vo + * 订单取消对象 * @return com.starry.common.result.R * @author admin * @since 2024/5/8 15:57 @@ -452,14 +460,16 @@ public class WxCustomController { @CustomUserLogin @PostMapping("/order/cancellation") public R cancellationOrder(@Validated @RequestBody PlayOrderCancellationVo vo) { - playOrderInfoService.updateStateTo4("0", ThreadLocalRequestDetail.getCustomUserInfo().getId(), vo.getOrderId(), vo.getRefundReason(), vo.getImages()); + playOrderInfoService.updateStateTo4("0", ThreadLocalRequestDetail.getCustomUserInfo().getId(), vo.getOrderId(), + vo.getRefundReason(), vo.getImages()); return R.ok("取消成功"); } /** * 新增订单评价信息 * - * @param vo 订单评价信息实体 + * @param vo + * 订单评价信息实体 * @return com.starry.common.result.R * @author admin * @since 2024/5/8 15:57 @@ -480,7 +490,8 @@ public class WxCustomController { /** * 根据订单ID查询当前顾客对当前人的评价 * - * @param orderId 订单ID + * @param orderId + * 订单ID * @return com.starry.common.result.R * @author admin * @since 2024/5/8 15:57 @@ -488,18 +499,19 @@ public class WxCustomController { @CustomUserLogin @GetMapping("/order/evaluate/queryByOrderId") public R addOrderEvaluateByOrderId(@RequestParam("id") String orderId) { - PlayOrderEvaluateInfoEntity orderEvaluateInfo = playOrderEvaluateInfoService.queryCustomToOrderEvaluateInfo(ThreadLocalRequestDetail.getCustomUserInfo().getId(), orderId); + PlayOrderEvaluateInfoEntity orderEvaluateInfo = playOrderEvaluateInfoService + .queryCustomToOrderEvaluateInfo(ThreadLocalRequestDetail.getCustomUserInfo().getId(), orderId); if (orderEvaluateInfo == null) { throw new CustomException("当前订单未评价"); } return R.ok(ConvertUtil.entityToVo(orderEvaluateInfo, PlayCustomOrderEvaluateReturnVo.class)); } - /** * 新增订单投诉信息 * - * @param vo 订单评价信息实体 + * @param vo + * 订单评价信息实体 * @return com.starry.common.result.R * @author admin * @since 2024/5/8 15:57 @@ -517,11 +529,11 @@ public class WxCustomController { return R.ok("新增成功"); } - /** * 顾客新增留言 * - * @param vo 顾客新增留言对象 + * @param vo + * 顾客新增留言对象 * @return com.starry.common.result.R * @author admin * @since 2024/5/8 15:57 @@ -547,7 +559,8 @@ public class WxCustomController { @GetMapping("/leave/queryPermission") public R queryLeavePermission() { // 不允许留言的原因，如果原因为空，说明允许留言 - String noMessagesAllowedReason = playCustomLeaveMsgService.queryNoMessagesAllowedReason(ThreadLocalRequestDetail.getCustomUserInfo().getId()); + String noMessagesAllowedReason = playCustomLeaveMsgService + .queryNoMessagesAllowedReason(ThreadLocalRequestDetail.getCustomUserInfo().getId()); if (StringUtils.isEmpty(noMessagesAllowedReason)) { JSONObject jsonObject = new JSONObject(); jsonObject.put("permission", true); @@ -561,11 +574,11 @@ public class WxCustomController { } } - /** * 顾客修改对陪玩的关注状态 * - * @param vo 陪玩的关注状态对象 + * @param vo + * 陪玩的关注状态对象 * @return com.starry.common.result.R * @author admin * @since 2024/5/8 15:57 @@ -574,14 +587,16 @@ public class WxCustomController { @PostMapping("/followState/update") public R followStateUpdate(@Validated @RequestBody PlayClerkFollowStateUpdate vo) { PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.selectById(vo.getClerkId()); - playCustomFollowInfoService.updateFollowState(ThreadLocalRequestDetail.getCustomUserInfo().getId(), clerkUserInfo.getId(), vo.getFollowState()); + playCustomFollowInfoService.updateFollowState(ThreadLocalRequestDetail.getCustomUserInfo().getId(), + clerkUserInfo.getId(), vo.getFollowState()); return R.ok("修改成功"); } /** * 顾客查询已关注陪聊列表 * - * @param vo 陪玩的关注状态对象 + * @param vo + * 陪玩的关注状态对象 * @return com.starry.common.result.R * @author admin * @since 2024/5/8 15:57 @@ -594,5 +609,4 @@ public class WxCustomController { return R.ok(iPage); } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxGiftController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxGiftController.java index 5ee507d..4321a9c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxGiftController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxGiftController.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.weichat.controller; - import cn.hutool.core.util.StrUtil; import com.starry.admin.common.aspect.ClerkUserLogin; import com.starry.admin.common.aspect.CustomUserLogin; @@ -16,15 +15,14 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.List; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import java.util.List; - /** * @author admin */ @@ -43,26 +41,24 @@ public class WxGiftController { */ @ApiOperation(value = "查询所有礼物", notes = "查询系统中所有礼物列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayGiftInfoDto.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayGiftInfoDto.class, responseContainer = "List")}) @GetMapping("/listByAll") public R customListByAll() { - return R.ok(ConvertUtil.entityToVoList(giftInfoService.listByAll(),PlayGiftInfoDto.class)); + return R.ok(ConvertUtil.entityToVoList(giftInfoService.listByAll(), PlayGiftInfoDto.class)); } - /** * 顾客查询礼物列表 * - * @param obtained 店员获得礼物状态,[0:未获得,1:已获得] + * @param obtained + * 店员获得礼物状态,[0:未获得,1:已获得] * @return 礼物列表 */ @ApiOperation(value = "店员查询礼物", notes = "根据获得状态查询店员礼物列表") @ApiImplicitParam(name = "obtained", value = "获得状态[0:未获得,1:已获得]", required = true, dataType = "String", paramType = "query", allowableValues = "0,1") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkGiftReturnVo.class, responseContainer = "List"), - @ApiResponse(code = 500, message = "obtained参数异常") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkGiftReturnVo.class, responseContainer = "List"), + @ApiResponse(code = 500, message = "obtained参数异常")}) @ClerkUserLogin @GetMapping("/clerk/listByAll") public R clerkListByAll(@RequestParam("obtained") String obtained) { @@ -72,23 +68,23 @@ public class WxGiftController { if (!"0".equals(obtained) && !"1".equals(obtained)) { throw new CustomException("obtained参数异常"); } - List list = giftInfoService.clerkListByAll(ThreadLocalRequestDetail.getClerkUserInfo().getId(), obtained); + List list = giftInfoService + .clerkListByAll(ThreadLocalRequestDetail.getClerkUserInfo().getId(), obtained); return R.ok(list); } - /** * 顾客获取礼物图鉴信息 * - * @param vo 顾客获得礼物查询对象 + * @param vo + * 顾客获得礼物查询对象 * @return 礼物列表 */ @ApiOperation(value = "顾客查询礼物", notes = "根据获得状态查询顾客礼物列表") @ApiImplicitParam(name = "obtained", value = "获得状态[0:未获得,1:已获得]", required = true, dataType = "String", paramType = "query", allowableValues = "0,1") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayClerkGiftReturnVo.class, responseContainer = "List"), - @ApiResponse(code = 500, message = "obtained参数异常") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayClerkGiftReturnVo.class, responseContainer = "List"), + @ApiResponse(code = 500, message = "obtained参数异常")}) @CustomUserLogin @GetMapping("/custom/listByAll") public R customListByAll(@RequestParam("obtained") String obtained) { @@ -98,9 +94,9 @@ public class WxGiftController { if (!"0".equals(obtained) && !"1".equals(obtained)) { throw new CustomException("obtained参数异常"); } - List list = giftInfoService.customListByAll(ThreadLocalRequestDetail.getCustomUserInfo().getId(), obtained); + List list = giftInfoService + .customListByAll(ThreadLocalRequestDetail.getCustomUserInfo().getId(), obtained); return R.ok(list); } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxLevelController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxLevelController.java index 778dce3..3a1f386 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxLevelController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxLevelController.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.weichat.controller; - import com.starry.admin.common.aspect.CustomUserLogin; import com.starry.admin.modules.custom.module.entity.PlayCustomLevelInfoEntity; import com.starry.admin.modules.custom.service.IPlayCustomLevelInfoService; @@ -10,16 +9,15 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.ArrayList; +import java.util.List; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - /** * @author admin */ @@ -32,14 +30,12 @@ public class WxLevelController { @Resource private IPlayCustomLevelInfoService levelInfoService; - /** * 顾客查询登记列表 */ @ApiOperation(value = "查询等级列表", notes = "查询所有顾客等级列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayCustomLevelInfoReturnVo.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayCustomLevelInfoReturnVo.class, responseContainer = "List")}) @CustomUserLogin @GetMapping("/custom/queryAll") public R queryById() { @@ -53,5 +49,4 @@ public class WxLevelController { return R.ok(result); } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOauthController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOauthController.java index 6326f3a..b23e523 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOauthController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOauthController.java @@ -1,5 +1,7 @@ package com.starry.admin.modules.weichat.controller; +import static com.starry.common.constant.Constants.*; + import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; @@ -24,17 +26,14 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.Date; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.bean.WxJsapiSignature; import me.chanjar.weixin.common.error.WxErrorException; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import java.util.Date; - -import static com.starry.common.constant.Constants.*; - /** * 微信用户 * @@ -47,7 +46,6 @@ import static com.starry.common.constant.Constants.*; @RequestMapping("/wx/oauth2") public class WxOauthController { - @Resource private WxCustomMpService wxCustomMpService; @Resource @@ -61,13 +59,11 @@ public class WxOauthController { @Resource private RedisCache redisCache; - @ApiOperation(value = "获取配置地址", notes = "获取微信JSAPI配置签名") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = WxJsapiSignature.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = WxJsapiSignature.class)}) @PostMapping("/getConfigAddress") - public R getConfigAddress(@ApiParam(value = "地址查询信息", required = true) @RequestBody WxUserQueryAddressVo vo) throws WxErrorException { + public R getConfigAddress(@ApiParam(value = "地址查询信息", required = true) @RequestBody WxUserQueryAddressVo vo) + throws WxErrorException { // 默认回调地址 String defaultAddress = "https://julyharbor.com/api/wx/oauth2/clerkLoginCallback"; if (!StrUtil.isBlankIfStr(vo.getUrl())) { @@ -78,9 +74,7 @@ public class WxOauthController { } @ApiOperation(value = "获取店员登录地址", notes = "获取微信店员授权登录地址") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = String.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = String.class)}) @PostMapping("/getClerkLoginAddress") public R getClerkLoginAddress(@ApiParam(value = "地址查询信息", required = true) @RequestBody WxUserQueryAddressVo vo) { // 默认回调地址 @@ -88,24 +82,20 @@ public class WxOauthController { if (!StrUtil.isBlankIfStr(vo.getUrl())) { defaultAddress = vo.getUrl(); } - String url = wxCustomMpService.proxyWxMpService().getOAuth2Service().buildAuthorizationUrl(defaultAddress, "snsapi_userinfo", "STATE"); + String url = wxCustomMpService.proxyWxMpService().getOAuth2Service().buildAuthorizationUrl(defaultAddress, + "snsapi_userinfo", "STATE"); return R.ok(url); } - @ApiOperation(value = "店员登录回调", notes = "微信店员授权登录回调处理") @ApiImplicitParam(name = "code", value = "授权码", required = true, dataType = "String", paramType = "query") @GetMapping("/clerkLoginCallback") public void clerkLoginCallback(@RequestParam("code") String code) { } - @ApiOperation(value = "店员登录", notes = "微信店员授权登录") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = JSONObject.class), - @ApiResponse(code = 401, message = "登录失败"), - @ApiResponse(code = 500, message = "用户不存在") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = JSONObject.class), + @ApiResponse(code = 401, message = "登录失败"), @ApiResponse(code = 500, message = "用户不存在")}) @PostMapping("/clerk/login") public R clerkLogin(@ApiParam(value = "登录信息", required = true) @Validated @RequestBody WxUserLoginVo vo) { try { @@ -132,11 +122,8 @@ public class WxOauthController { } @ApiOperation(value = "店员开发登录", notes = "微信店员开发环境登录（固定用户）") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = JSONObject.class), - @ApiResponse(code = 401, message = "登录失败"), - @ApiResponse(code = 500, message = "用户不存在") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = JSONObject.class), + @ApiResponse(code = 401, message = "登录失败"), @ApiResponse(code = 500, message = "用户不存在")}) @PostMapping("/clerk/login/dev") public R clerkLoginDev(@ApiParam(value = "登录信息", required = true) @Validated @RequestBody WxUserLoginVo vo) { try { @@ -163,10 +150,8 @@ public class WxOauthController { } @ApiOperation(value = "店员ID登录", notes = "根据店员ID直接登录") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = JSONObject.class), - @ApiResponse(code = 500, message = "用户不存在") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = JSONObject.class), + @ApiResponse(code = 500, message = "用户不存在")}) @PostMapping("/clerk/loginById") public R loginById(@ApiParam(value = "登录信息", required = true) @Validated @RequestBody WxUserLoginVo vo) { PlayClerkUserInfoEntity entity = clerkUserInfoService.selectById(vo.getCode()); @@ -186,9 +171,7 @@ public class WxOauthController { } @ApiOperation(value = "店员登出", notes = "店员退出登录") - @ApiResponses({ - @ApiResponse(code = 200, message = "登出成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "登出成功")}) @ClerkUserLogin @GetMapping("/clerk/logout") public R clerkLogout() { @@ -196,11 +179,8 @@ public class WxOauthController { return R.ok("登出成功"); } - @ApiOperation(value = "获取顾客登录地址", notes = "获取微信顾客授权登录地址") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = String.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = String.class)}) @PostMapping("/getCustomLoginAddress") public R getCustomLoginAddress(@ApiParam(value = "地址查询信息", required = true) @RequestBody WxUserQueryAddressVo vo) { // 默认回调地址 @@ -208,7 +188,8 @@ public class WxOauthController { if (!StrUtil.isBlankIfStr(vo.getUrl())) { defaultAddress = vo.getUrl(); } - String url = wxCustomMpService.proxyWxMpService().getOAuth2Service().buildAuthorizationUrl(defaultAddress, "snsapi_userinfo", "STATE"); + String url = wxCustomMpService.proxyWxMpService().getOAuth2Service().buildAuthorizationUrl(defaultAddress, + "snsapi_userinfo", "STATE"); return R.ok(url); } @@ -219,13 +200,9 @@ public class WxOauthController { } - @ApiOperation(value = "顾客登录", notes = "微信顾客授权登录") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = JSONObject.class), - @ApiResponse(code = 401, message = "登录失败"), - @ApiResponse(code = 500, message = "用户不存在") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = JSONObject.class), + @ApiResponse(code = 401, message = "登录失败"), @ApiResponse(code = 500, message = "用户不存在")}) @PostMapping("/custom/login") public R customLogin(@ApiParam(value = "登录信息", required = true) @Validated @RequestBody WxUserLoginVo vo) { log.info("顾客登录接口调用，code = {}", vo.getCode()); @@ -252,10 +229,8 @@ public class WxOauthController { } @ApiOperation(value = "顾客ID登录", notes = "根据顾客ID直接登录") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = JSONObject.class), - @ApiResponse(code = 500, message = "用户不存在") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = JSONObject.class), + @ApiResponse(code = 500, message = "用户不存在")}) @PostMapping("/custom/loginById") public R loginById1(@ApiParam(value = "登录信息", required = true) @Validated @RequestBody WxUserLoginVo vo) { PlayCustomUserInfoEntity entity = customUserInfoService.selectById(vo.getCode()); @@ -274,11 +249,8 @@ public class WxOauthController { return R.ok(jsonObject); } - @ApiOperation(value = "顾客登出", notes = "顾客退出登录") - @ApiResponses({ - @ApiResponse(code = 200, message = "登出成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "登出成功")}) @GetMapping("/custom/logout") @CustomUserLogin public R customLogout() { diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOrderInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOrderInfoController.java index 5befacf..00c0da1 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOrderInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOrderInfoController.java @@ -24,14 +24,13 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.time.LocalDateTime; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import java.time.LocalDateTime; - /** * 订单处理 * @@ -50,21 +49,19 @@ public class WxOrderInfoController { @Resource private IPlayOrderContinueInfoService playOrderContinueInfoService; - /** * 续单申请-店员发起 * - * @param vo 续单申请提交对象 + * @param vo + * 续单申请提交对象 */ @ApiOperation(value = "店员申请续单", notes = "店员为当前订单发起续单申请") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "非本人订单;无法续单"), - @ApiResponse(code = 500, message = "同一场订单只能续单一次") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "非本人订单;无法续单"), + @ApiResponse(code = 500, message = "同一场订单只能续单一次")}) @ClerkUserLogin @PostMapping("/clerk/continue") - public R continueToOrdder(@ApiParam(value = "续单信息", required = true) @Validated @RequestBody PlayOrderInfoContinueAdd vo) { + public R continueToOrdder( + @ApiParam(value = "续单信息", required = true) @Validated @RequestBody PlayOrderInfoContinueAdd vo) { PlayOrderInfoEntity entity = playOrderInfoService.selectOrderInfoById(vo.getOrderId()); if (!entity.getAcceptBy().equals(ThreadLocalRequestDetail.getClerkUserInfo().getId())) { throw new CustomException("非本人订单;无法续单"); @@ -91,35 +88,34 @@ public class WxOrderInfoController { return R.ok("下单成功"); } - /** * 店员查询随机单列表 * - * @param vo 随机单列表查询对象 + * @param vo + * 随机单列表查询对象 * @return 订单列表 */ @ApiOperation(value = "查询随机单列表", notes = "店员查询可接的随机订单列表") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @ClerkUserLogin @PostMapping("/clerk/selectRandomOrderByPage") - public R selectUnacceptedOrderByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayOrderInfoRandomQueryVo vo) { - return R.ok(playOrderInfoService.selectRandomOrderByPage(vo,ThreadLocalRequestDetail.getClerkUserInfo().getId())); + public R selectUnacceptedOrderByPage( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayOrderInfoRandomQueryVo vo) { + return R.ok( + playOrderInfoService.selectRandomOrderByPage(vo, ThreadLocalRequestDetail.getClerkUserInfo().getId())); } /** * 店员查询随机单详情 * - * @param id 订单ID + * @param id + * 订单ID * @return 订单列表 */ @ApiOperation(value = "查询随机单详情", notes = "店员查询随机订单的详细信息") @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "String", paramType = "query") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayOrderDetailsReturnVo.class), - @ApiResponse(code = 500, message = "订单不存在") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayOrderDetailsReturnVo.class), + @ApiResponse(code = 500, message = "订单不存在")}) @ClerkUserLogin @GetMapping("/clerk/selectRandomOrderById") public R selectUnacceptedOrderByPage(@RequestParam("id") String id) { @@ -133,15 +129,15 @@ public class WxOrderInfoController { /** * 店员查询打赏动态 * - * @param vo 打赏动态查询列表 + * @param vo + * 打赏动态查询列表 * @return 打赏动态列表 */ @ApiOperation(value = "店员查询打赏动态", notes = "店员查询打赏订单动态") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PostMapping("/clerk/selectRewardByPage") - public R clerkSelectRewardByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayRewardOrderQueryVo vo) { + public R clerkSelectRewardByPage( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayRewardOrderQueryVo vo) { return R.ok(playOrderInfoService.selectRewardByPage(vo)); } @@ -151,29 +147,27 @@ public class WxOrderInfoController { * @return 打赏动态列表 */ @ApiOperation(value = "顾客查询打赏动态", notes = "顾客查询最新打赏订单动态") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @GetMapping("/custom/selectRewardByPage") public R customSelectReward() { PlayRewardOrderQueryVo vo = new PlayRewardOrderQueryVo(); return R.ok(playOrderInfoService.selectRewardByPage(vo)); } - /** * 顾客-分页查询续单列表 * - * @param vo PlayOrderInfoContinueQueryVo + * @param vo + * PlayOrderInfoContinueQueryVo * @return 续单历史 */ @ApiOperation(value = "查询续单列表", notes = "顾客分页查询续单申请列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayOrderContinueReturnVo.class, responseContainer = "Page") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayOrderContinueReturnVo.class, responseContainer = "Page")}) @CustomUserLogin @PostMapping("/custom/continueListByPage") - public R continueListByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayOrderInfoContinueQueryVo vo) { + public R continueListByPage( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayOrderInfoContinueQueryVo vo) { PlayOrderContinueQueryVo queryVo = new PlayOrderContinueQueryVo(); BeanUtils.copyProperties(vo, queryVo); queryVo.setCustomId(ThreadLocalRequestDetail.getCustomUserInfo().getId()); @@ -181,18 +175,15 @@ public class WxOrderInfoController { return R.ok(page); } - /** * 审批续单申申请 */ @ApiOperation(value = "审批续单申请", notes = "顾客审批店员发起的续单申请") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "续单已处理") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "续单已处理")}) @CustomUserLogin @PostMapping("/custom/updateReviewState") - public R updateReviewState(@ApiParam(value = "审批信息", required = true) @Validated @RequestBody PlayOrderReviewStateEditVo vo) { + public R updateReviewState( + @ApiParam(value = "审批信息", required = true) @Validated @RequestBody PlayOrderReviewStateEditVo vo) { PlayOrderContinueInfoEntity entity = playOrderContinueInfoService.selectPlayOrderContinueInfoById(vo.getId()); if (!"0".equals(entity.getReviewedState())) { throw new CustomException("续单已处理"); diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPersonnelGroupInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPersonnelGroupInfoController.java index f8b7fb7..7d4a432 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPersonnelGroupInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPersonnelGroupInfoController.java @@ -11,6 +11,9 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.ArrayList; +import java.util.List; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; @@ -18,10 +21,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - /** * 微信查询组长工资 * @@ -34,21 +33,19 @@ import java.util.List; @RequestMapping("/wx/group") public class WxPersonnelGroupInfoController { - @Resource private IPlayPersonnelGroupInfoService playClerkGroupInfoService; - /** * 查询组长公工资 */ @ApiOperation(value = "查询分组工资", notes = "获取所有店员分组的工资信息") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayGroupWagesReturnVo.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayGroupWagesReturnVo.class, responseContainer = "List")}) @ClerkUserLogin @PostMapping("/wages/listAll") - public R listGroupWagesAll(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayGroupWagesQueryVo vo) { + public R listGroupWagesAll( + @ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayGroupWagesQueryVo vo) { List list = playClerkGroupInfoService.selectAll(); List data = new ArrayList<>(); for (PlayPersonnelGroupInfoEntity entity : list) { @@ -59,5 +56,4 @@ public class WxPersonnelGroupInfoController { return R.ok(data); } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayController.java index 5a72cd7..a2b62dd 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayController.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.weichat.controller; - import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; @@ -34,6 +33,15 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.dom4j.Document; import org.dom4j.DocumentHelper; @@ -43,16 +51,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - /** * @author admin */ @@ -74,7 +72,6 @@ public class WxPlayController { @Resource private WxCustomMpService mpService; - /** * 微信支付-微信回调地址（https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=9_7&index=8） * @@ -82,12 +79,11 @@ public class WxPlayController { * @since 2024/5/8 11:25 **/ @ApiOperation(value = "微信支付回调", notes = "微信支付后的回调接口") - @ApiResponses({ - @ApiResponse(code = 200, message = "成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "成功")}) @RequestMapping("/jsCallback") public String wxPayNotify(HttpServletRequest request) { - try (InputStream inStream = request.getInputStream(); ByteArrayOutputStream outSteam = new ByteArrayOutputStream()) { + try (InputStream inStream = request.getInputStream(); + ByteArrayOutputStream outSteam = new ByteArrayOutputStream()) { byte[] buffer = new byte[1024]; int len; while ((len = inStream.read(buffer)) != -1) { @@ -104,7 +100,6 @@ public class WxPlayController { return WxPayNotifyResponse.success("成功"); } - public void dealNotify(String xmlData) { try { Map orderMap = readStringXmlOut(xmlData); @@ -124,26 +119,26 @@ public class WxPlayController { log.error("支付对应业务处理异常-支付记录状态异常，支付记录：xmlData={}", xmlData); return; } - //修养订单状态 + // 修养订单状态 orderInfoEntity.setPayState("1"); orderInfoService.updateById(orderInfoEntity); - //修改账户余额 - customUserInfoService.customAccountBalanceRecharge(orderInfoEntity.getOrderMoney(), orderInfoEntity.getPurchaserBy(), orderInfoEntity.getId()); + // 修改账户余额 + customUserInfoService.customAccountBalanceRecharge(orderInfoEntity.getOrderMoney(), + orderInfoEntity.getPurchaserBy(), orderInfoEntity.getId()); log.info("*********支付处理完成"); // 推送通知 mpService.sendBalanceMessage(orderInfoEntity); // 请求分账 WxPayService wxPayService = mpService.getWxPay(); - this.profitSharing(wxPayService, orderMap, orderInfoEntity, tenantService.selectSysTenantByTenantId(orderInfoEntity.getTenantId())); + this.profitSharing(wxPayService, orderMap, orderInfoEntity, + tenantService.selectSysTenantByTenantId(orderInfoEntity.getTenantId())); } catch (Exception e) { log.error("订单回调业务处理异常,xmlData={}", xmlData); } } @ApiOperation(value = "测试消息推送", notes = "测试充值消息推送功能") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @GetMapping("/test") public R test() { PlayOrderInfoEntity orderInfo = playOrderInfoService.getById("0e3e7d7ec69a"); @@ -151,31 +146,24 @@ public class WxPlayController { return R.ok(true); } - @ApiOperation(value = "获取支付金额", notes = "根据充值金额获取实际支付金额") @ApiImplicitParam(name = "money", value = "充值金额", required = true, dataType = "String", paramType = "query") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "请求参数错误,money不能为空") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "请求参数错误,money不能为空")}) @CustomUserLogin @GetMapping("/custom/getCustomPaymentAmount") public R getCustomPaymentAmount(@RequestParam("money") String money) { if (StringUtils.isEmpty(money)) { throw new CustomException("请求参数错误,money不能为空"); } - BigDecimal paymentAmount = customUserInfoService.getCustomPaymentAmount(new BigDecimal(money), ThreadLocalRequestDetail.getCustomUserInfo().getId()); + BigDecimal paymentAmount = customUserInfoService.getCustomPaymentAmount(new BigDecimal(money), + ThreadLocalRequestDetail.getCustomUserInfo().getId()); return R.ok(paymentAmount); } @ApiOperation(value = "创建充值订单", notes = "创建微信支付充值订单") @ApiImplicitParam(name = "money", value = "充值金额", required = true, dataType = "String", paramType = "query") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功"), - @ApiResponse(code = 500, message = "请求参数错误,money不能为空"), - @ApiResponse(code = 500, message = "充值金额不能小于10元"), - @ApiResponse(code = 500, message = "系统错误,租户ID获取失败") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "请求参数错误,money不能为空"), + @ApiResponse(code = 500, message = "充值金额不能小于10元"), @ApiResponse(code = 500, message = "系统错误,租户ID获取失败")}) @CustomUserLogin @GetMapping("/custom/createOrder") public R createOrder(@RequestParam("money") String money) { @@ -190,7 +178,8 @@ public class WxPlayController { throw new CustomException("系统错误,租户ID获取失败"); } // 用户信息 - PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(ThreadLocalRequestDetail.getCustomUserInfo().getId()); + PlayCustomUserInfoEntity customUserInfo = customUserInfoService + .selectById(ThreadLocalRequestDetail.getCustomUserInfo().getId()); // 租户信息 SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(tenantId); Boolean profitSharing = tenant.getProfitsharingRate() > 0; @@ -198,8 +187,8 @@ public class WxPlayController { long totalFee = getTotalFee(money); // 创建订单信息 String orderNo = playOrderInfoService.getOrderNo(); - orderInfoService.createRechargeOrder(orderNo, new BigDecimal(totalFee * 1.0 / 100), new BigDecimal(totalFee * 1.0 / 100), customUserInfo.getId()); - + orderInfoService.createRechargeOrder(orderNo, new BigDecimal(totalFee * 1.0 / 100), + new BigDecimal(totalFee * 1.0 / 100), customUserInfo.getId()); WxPayService wxPayService = mpService.getWxPay(); WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest(); @@ -220,14 +209,14 @@ public class WxPlayController { WxPayUnifiedOrderResult orderResult; try { - //统一下单，商户系统先调用该接口在微信支付服务后台生成预支付交易单，返回正确的预支付交易会话标识后再在APP里面调起支付 + // 统一下单，商户系统先调用该接口在微信支付服务后台生成预支付交易单，返回正确的预支付交易会话标识后再在APP里面调起支付 orderResult = wxPayService.unifiedOrder(request); } catch (WxPayException e) { throw new RuntimeException(e); } -// + // String prepayId = orderResult.getPrepayId(); - //组合参数构建支付 + // 组合参数构建支付 Map paySignInfo = new HashMap<>(5); String timeStamp = String.valueOf(System.currentTimeMillis()); String nonceStr = "dalfhh241lnandnsklajax"; @@ -239,8 +228,11 @@ public class WxPlayController { String[] signInfo = new String[0]; String paySign = SignUtils.createSign(paySignInfo, "MD5", wxPayService.getConfig().getMchKey(), signInfo); - //组合支付参数 - JSONObject jsonObject = new JSONObject().fluentPut("appId", wxPayService.getConfig().getAppId()).fluentPut("timeStamp", timeStamp).fluentPut("nonceStr", nonceStr).fluentPut("package", "prepay_id=" + prepayId).fluentPut("signType", "MD5").fluentPut("paySign", paySign); + // 组合支付参数 + JSONObject jsonObject = new JSONObject().fluentPut("appId", wxPayService.getConfig().getAppId()) + .fluentPut("timeStamp", timeStamp).fluentPut("nonceStr", nonceStr) + .fluentPut("package", "prepay_id=" + prepayId).fluentPut("signType", "MD5") + .fluentPut("paySign", paySign); return R.ok(jsonObject); } @@ -251,7 +243,9 @@ public class WxPlayController { String nonceStr = "dalfhh241lnandnsklajax"; request.setNonceStr(nonceStr); request.setSignType("HMAC-SHA256"); - request.setReceiver(new JSONObject().fluentPut("type", "MERCHANT_ID").fluentPut("account", "1681470208").fluentPut("name", "合肥经济技术开发区陪陪信息技术服务部（个体工商户）").fluentPut("relation_type", "SERVICE_PROVIDER").toString()); + request.setReceiver(new JSONObject().fluentPut("type", "MERCHANT_ID").fluentPut("account", "1681470208") + .fluentPut("name", "合肥经济技术开发区陪陪信息技术服务部（个体工商户）").fluentPut("relation_type", "SERVICE_PROVIDER") + .toString()); try { ProfitSharingReceiverResult result = wxPayService.getProfitSharingService().addReceiver(request); log.info("请求添加分账结果：" + JSONObject.toJSONString(result)); @@ -261,9 +255,9 @@ public class WxPlayController { } - /** - * @param money 金额,单位-元 + * @param money + * 金额,单位-元 * @return 金额, 单位-分 */ public long getTotalFee(String money) { @@ -285,9 +279,9 @@ public class WxPlayController { try { doc = DocumentHelper.parseText(xml); // 将字符串转为XML Element rootElt = doc.getRootElement(); // 获取根节点 - List list = rootElt.elements();//获取根节点下所有节点 - for (Element element : list) { //遍历节点 - map.put(element.getName(), element.getText()); //节点的name为map的key，text为map的value + List list = rootElt.elements();// 获取根节点下所有节点 + for (Element element : list) { // 遍历节点 + map.put(element.getName(), element.getText()); // 节点的name为map的key，text为map的value } } catch (Exception e) { throw new RuntimeException(e); @@ -295,15 +289,16 @@ public class WxPlayController { return map; } - - private void profitSharing(WxPayService wxPayService, Map orderMap, PlayOrderInfoEntity orderInfoEntity, SysTenantEntity tenant) throws WxPayException { + private void profitSharing(WxPayService wxPayService, Map orderMap, + PlayOrderInfoEntity orderInfoEntity, SysTenantEntity tenant) throws WxPayException { Boolean profitSharing = tenant.getProfitsharingRate() > 0; if (!profitSharing) { return; } log.info("开始进行分账。。。。。。。。。。。。。。。"); long totalFee = getTotalFee(orderInfoEntity.getOrderMoney().toString()); - int amount = new BigDecimal(totalFee).multiply(BigDecimal.valueOf((double) tenant.getProfitsharingRate() / 100)).intValue(); + int amount = new BigDecimal(totalFee).multiply(BigDecimal.valueOf((double) tenant.getProfitsharingRate() / 100)) + .intValue(); if (amount == 0) { return; } @@ -312,12 +307,17 @@ public class WxPlayController { request.setTransactionId(orderMap.get("transaction_id")); request.setOutOrderNo("ps" + orderMap.get("out_trade_no")); - request.setReceivers(new JSONArray().fluentAdd(new JSONObject().fluentPut("type", "MERCHANT_ID").fluentPut("name", "合肥经济技术开发区陪陪信息技术服务部（个体工商户）").fluentPut("account", "1681470208").fluentPut("amount", amount)).toString()); + request.setReceivers(new JSONArray().fluentAdd( + new JSONObject().fluentPut("type", "MERCHANT_ID").fluentPut("name", "合肥经济技术开发区陪陪信息技术服务部（个体工商户）") + .fluentPut("account", "1681470208").fluentPut("amount", amount)) + .toString()); ProfitSharingResult result = wxPayService.getProfitSharingService().profitSharing(request); log.info("分账结果：" + JSONObject.toJSONString(result)); // 保存分账金额 BigDecimal profitSharingAmount = new BigDecimal(amount).divide(new BigDecimal(100)); - orderInfoService.update(null, Wrappers.lambdaUpdate(PlayOrderInfoEntity.class).eq(PlayOrderInfoEntity::getId, orderInfoEntity.getId()).set(PlayOrderInfoEntity::getProfitSharingAmount, profitSharingAmount)); + orderInfoService.update(null, + Wrappers.lambdaUpdate(PlayOrderInfoEntity.class).eq(PlayOrderInfoEntity::getId, orderInfoEntity.getId()) + .set(PlayOrderInfoEntity::getProfitSharingAmount, profitSharingAmount)); } } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayOrderRankingController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayOrderRankingController.java index 0afa6ea..09fb662 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayOrderRankingController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayOrderRankingController.java @@ -10,14 +10,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.List; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import java.util.List; - /** * @author admin * @since 2024/5/25 下午10:25 @@ -28,22 +27,19 @@ import java.util.List; @RequestMapping("/wx/orderRanking") public class WxPlayOrderRankingController { - @Resource private IPlayClerkRankingInfoService playClerkRankingInfoService; - /** * 查询当前排行 */ @ApiOperation(value = "查询当前排行", notes = "查询店员当前排行榜信息") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayOrderRankingReturnVo.class) - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayOrderRankingReturnVo.class)}) @ClerkUserLogin @GetMapping("/clerk/selectCurrentRanking") public R selectCurrentRanking() { - PlayOrderRankingReturnVo result = playClerkRankingInfoService.selectCurrentRanking(ThreadLocalRequestDetail.getClerkUserInfo().getId()); + PlayOrderRankingReturnVo result = playClerkRankingInfoService + .selectCurrentRanking(ThreadLocalRequestDetail.getClerkUserInfo().getId()); return R.ok(result); } @@ -53,12 +49,12 @@ public class WxPlayOrderRankingController { */ @ApiOperation(value = "查询历史排行", notes = "查询店员历史排行榜信息") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayOrderHistoryRankingReturnVo.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayOrderHistoryRankingReturnVo.class, responseContainer = "List")}) @ClerkUserLogin @GetMapping("/clerk/selectHistoryRanking") public R selectHistoryRanking() { - List result = playClerkRankingInfoService.selectHistoryRanking(ThreadLocalRequestDetail.getClerkUserInfo().getId()); + List result = playClerkRankingInfoService + .selectHistoryRanking(ThreadLocalRequestDetail.getClerkUserInfo().getId()); return R.ok(result); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxShopController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxShopController.java index bc512bd..8b52b3f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxShopController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxShopController.java @@ -14,15 +14,14 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.List; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import java.util.List; - /** * 店铺接口 * @@ -35,7 +34,6 @@ import java.util.List; @RequestMapping("/wx/shop") public class WxShopController { - @Resource private IPlayShopCarouselInfoService playShopCarouselInfoService; @@ -47,36 +45,30 @@ public class WxShopController { */ @ApiOperation(value = "获取首页轮播图", notes = "获取店铺首页轮播图信息") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = ShopHomeCarouseInfoReturnVo.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = ShopHomeCarouseInfoReturnVo.class, responseContainer = "List")}) @GetMapping(value = "custom/getShopHomeCarouseInfo") public R getShopHomeCarouseInfo() { List entities = playShopCarouselInfoService.selectHomeCarouselInfo(); return R.ok(ConvertUtil.entityToVoList(entities, ShopHomeCarouseInfoReturnVo.class)); } - /** * 获取店铺文章列表 */ @ApiOperation(value = "获取文章列表", notes = "获取店铺所有文章列表") @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功", response = PlayShopArticleInfoEntity.class, responseContainer = "List") - }) + @ApiResponse(code = 200, message = "操作成功", response = PlayShopArticleInfoEntity.class, responseContainer = "List")}) @ClerkUserLogin @GetMapping(value = "clerk/getArticleList") public R getArticleList() { return R.ok(playShopArticleInfoService.selectByList()); } - /** * 阅读店铺文章 */ @ApiOperation(value = "阅读文章", notes = "阅读店铺文章并增加访问次数") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @ClerkUserLogin @GetMapping(value = "clerk/readShopArticleInfo") public R readShopArticleInfo(@ApiParam(value = "文章参数", required = true) @RequestBody PlayShopReadArticleVo vo) { @@ -86,5 +78,4 @@ public class WxShopController { return R.ok("成功"); } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxSmsController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxSmsController.java index 3b77822..00bdf22 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxSmsController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxSmsController.java @@ -7,14 +7,13 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; - /** * 动态接口 * @@ -31,14 +30,11 @@ public class WxSmsController { @ApiOperation(value = "发送短信", notes = "向指定手机号发送短信验证码") @ApiImplicitParam(name = "phone", value = "手机号码", required = true, dataType = "String", paramType = "query") - @ApiResponses({ - @ApiResponse(code = 200, message = "操作成功") - }) + @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @GetMapping("/send") public R sendSms(@RequestParam("phone") String phone) { smsUtils.sendSmsApi(phone); return R.ok(); } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkCommodityTreeData.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkCommodityTreeData.java index 5ef54f1..3065ac6 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkCommodityTreeData.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkCommodityTreeData.java @@ -2,10 +2,9 @@ package com.starry.admin.modules.weichat.entity; import com.starry.admin.modules.clerk.module.entity.PlayClerkCommodityEntity; import com.starry.common.utils.ConvertUtil; -import lombok.Data; - import java.math.BigDecimal; import java.util.List; +import lombok.Data; /** * 店员商品树状数据 @@ -17,10 +16,8 @@ public class PlayClerkCommodityTreeData { private String commodityType; - private List value; - public PlayClerkCommodityTreeData(String commodityType, List value) { this.commodityType = commodityType; this.value = ConvertUtil.entityToVoList(value, ClerkCommodityInfo.class); @@ -37,6 +34,5 @@ public class PlayClerkCommodityTreeData { private String serviceDuration; - } } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkFollowQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkFollowQueryVo.java index 06b717b..ae084c1 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkFollowQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkFollowQueryVo.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.weichat.entity; - import com.starry.common.domain.BasePageEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkFollowReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkFollowReturnVo.java index cc8acd1..47453e5 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkFollowReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkFollowReturnVo.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.weichat.entity; - import lombok.Data; /** @@ -70,5 +69,4 @@ public class PlayClerkFollowReturnVo { **/ private Integer followNumber; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkFollowStateUpdate.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkFollowStateUpdate.java index 3cd2f33..6e4ef8b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkFollowStateUpdate.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkFollowStateUpdate.java @@ -1,10 +1,8 @@ package com.starry.admin.modules.weichat.entity; - -import lombok.Data; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; +import lombok.Data; /** * 店员和陪聊关注状态 @@ -14,7 +12,6 @@ import javax.validation.constraints.Pattern; @Data public class PlayClerkFollowStateUpdate { - /** * 店员用户ID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserAlbumVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserAlbumVo.java index a279168..b61ecdd 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserAlbumVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserAlbumVo.java @@ -1,10 +1,9 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - +import java.util.List; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import java.util.List; +import lombok.Data; /** * 店员相册实体 diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserAudioVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserAudioVo.java index bdd6923..3c8997e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserAudioVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserAudioVo.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - import javax.validation.constraints.NotNull; +import lombok.Data; /** * 店员录音文件 diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserAvatarVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserAvatarVo.java index e254b24..591c916 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserAvatarVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserAvatarVo.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - import javax.validation.constraints.NotNull; +import lombok.Data; /** * 店员头像信息 diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserBindCodeVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserBindCodeVo.java index 83767e0..2278ba1 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserBindCodeVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserBindCodeVo.java @@ -1,9 +1,7 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - import javax.validation.constraints.NotBlank; - +import lombok.Data; /** * @author admin @@ -11,7 +9,6 @@ import javax.validation.constraints.NotBlank; @Data public class PlayClerkUserBindCodeVo { - /** * 手机号码区号 */ @@ -30,5 +27,4 @@ public class PlayClerkUserBindCodeVo { @NotBlank(message = "验证码不能为空") private String code; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserByWxAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserByWxAddVo.java index 2374f3b..79706a2 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserByWxAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserByWxAddVo.java @@ -1,12 +1,10 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - +import java.util.List; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import java.util.List; - +import lombok.Data; /** * 微信端申请成为店员 @@ -16,7 +14,6 @@ import java.util.List; @Data public class PlayClerkUserByWxAddVo { - /** * 店员昵称 */ @@ -41,7 +38,6 @@ public class PlayClerkUserByWxAddVo { @NotNull(message = "微信号码不能为空") private String weiChatCode; - /** * 手机号码区号 */ @@ -77,12 +73,10 @@ public class PlayClerkUserByWxAddVo { @NotBlank(message = "音频不能为空") private String audio; - @NotNull(message = "album不能为空") @Size(min = 1, max = 5, message = "照片必须为1-5张") private List album; - /** * 个性签名 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserByWxEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserByWxEditVo.java index 3f4314f..b4d4b69 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserByWxEditVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserByWxEditVo.java @@ -1,10 +1,8 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; - +import lombok.Data; /** * 微信端申请成为店员 @@ -14,7 +12,6 @@ import javax.validation.constraints.NotNull; @Data public class PlayClerkUserByWxEditVo { - /** * 店员昵称 */ @@ -39,7 +36,6 @@ public class PlayClerkUserByWxEditVo { @NotNull(message = "微信号码不能为空") private Integer weiChatCode; - /** * 手机号码区号 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserLoginResponseVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserLoginResponseVo.java index ebb1395..c889e53 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserLoginResponseVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserLoginResponseVo.java @@ -3,11 +3,9 @@ package com.starry.admin.modules.weichat.entity; import com.alibaba.fastjson2.JSONObject; import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity; import com.starry.admin.modules.clerk.module.vo.PlayClerkCommodityQueryVo; -import lombok.Data; - import java.util.ArrayList; import java.util.List; - +import lombok.Data; /** * 微信端店员登录返回值 @@ -132,7 +130,6 @@ public class PlayClerkUserLoginResponseVo { */ private List commodity = new ArrayList<>(); - /** * 是否允许登录(0:允许，1:不允许) */ @@ -147,7 +144,4 @@ public class PlayClerkUserLoginResponseVo { private PlayClerkLevelInfoEntity levelInfo; - - - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserOnlineStateVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserOnlineStateVo.java index f5b19d6..0c5b512 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserOnlineStateVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserOnlineStateVo.java @@ -1,9 +1,8 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; +import lombok.Data; /** * 店员在线状态【1：在线，0：离线】 diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserOtherVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserOtherVo.java index 05c51fa..b6e47fd 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserOtherVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserOtherVo.java @@ -1,9 +1,8 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - import java.util.ArrayList; import java.util.List; +import lombok.Data; /** * 店员录音文件 @@ -29,7 +28,6 @@ public class PlayClerkUserOtherVo { */ private String signature; - /** * 星座 */ @@ -71,9 +69,8 @@ public class PlayClerkUserOtherVo { private String weChatPayImage; /** - * 支付宝收款码图片 + * 支付宝收款码图片 **/ private String alipayImage; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserSendCodeVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserSendCodeVo.java index d171583..50fbfa0 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserSendCodeVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserSendCodeVo.java @@ -1,9 +1,7 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - import javax.validation.constraints.NotBlank; - +import lombok.Data; /** * @author admin @@ -11,7 +9,6 @@ import javax.validation.constraints.NotBlank; @Data public class PlayClerkUserSendCodeVo { - /** * 手机号码区号 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkWxPerformanceInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkWxPerformanceInfoQueryVo.java index c04ebaf..b080fc2 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkWxPerformanceInfoQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkWxPerformanceInfoQueryVo.java @@ -14,13 +14,11 @@ public class PlayClerkWxPerformanceInfoQueryVo { */ private String clerkId; - /** * 订单开始时间 */ private String startTime; - /** * 订单结束时间 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayCommodityReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayCommodityReturnVo.java index 34fffde..e0dc0a5 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayCommodityReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayCommodityReturnVo.java @@ -1,9 +1,8 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - import java.math.BigDecimal; import java.util.List; +import lombok.Data; /** * 服务项目返回对象 @@ -32,12 +31,10 @@ public class PlayCommodityReturnVo { */ private String serviceDuration; - /** * 服务单价 */ private BigDecimal price; - List child; } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayCustomLeaveAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayCustomLeaveAddVo.java index 14e846a..2788227 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayCustomLeaveAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayCustomLeaveAddVo.java @@ -1,12 +1,11 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; -import org.hibernate.validator.constraints.Length; - +import java.util.List; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import java.util.List; +import lombok.Data; +import org.hibernate.validator.constraints.Length; /** * 顾客新增留言对象 diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayGiftInfoDto.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayGiftInfoDto.java index 75753cb..250d5cf 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayGiftInfoDto.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayGiftInfoDto.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - import java.math.BigDecimal; +import lombok.Data; @Data public class PlayGiftInfoDto { diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayGroupWagesQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayGroupWagesQueryVo.java index 0ae7d26..8cd2059 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayGroupWagesQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayGroupWagesQueryVo.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - import java.util.List; +import lombok.Data; /** * 组长工资查询对象 diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayGroupWagesReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayGroupWagesReturnVo.java index 10d62c8..bce6469 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayGroupWagesReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayGroupWagesReturnVo.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - import java.math.BigDecimal; +import lombok.Data; /** * 组长工资查询对象 @@ -23,7 +22,6 @@ public class PlayGroupWagesReturnVo { */ private BigDecimal orderMoney = BigDecimal.ZERO; - /** * 订单最终金额（支付金额） */ @@ -56,7 +54,6 @@ public class PlayGroupWagesReturnVo { */ private final BigDecimal averageUnitPrice = BigDecimal.ZERO; - /** * 组长工资 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderCancellationVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderCancellationVo.java index 70d1842..d31e046 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderCancellationVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderCancellationVo.java @@ -1,10 +1,9 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - -import javax.validation.constraints.NotBlank; import java.util.ArrayList; import java.util.List; +import javax.validation.constraints.NotBlank; +import lombok.Data; /** * @author admin @@ -13,7 +12,6 @@ import java.util.List; @Data public class PlayOrderCancellationVo { - /** * 申请人ID */ @@ -24,7 +22,6 @@ public class PlayOrderCancellationVo { @NotBlank(message = "订单ID不能为空") private String orderId; - /** * 取消原因 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderComplaintAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderComplaintAddVo.java index 2fea0af..ced7342 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderComplaintAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderComplaintAddVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.NotBlank; import java.util.Date; import java.util.List; +import javax.validation.constraints.NotBlank; +import lombok.Data; +import org.hibernate.validator.constraints.Length; /** * 订单投诉新增VO diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderEvaluateAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderEvaluateAddVo.java index 7bd7fd5..24c3483 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderEvaluateAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderEvaluateAddVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.weichat.entity; +import java.util.Date; +import javax.validation.constraints.*; import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.*; -import java.util.Date; - /** * 订单评价新增VO * diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderInfoGiftAdd.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderInfoGiftAdd.java index 2f68152..1376cfb 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderInfoGiftAdd.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderInfoGiftAdd.java @@ -1,13 +1,11 @@ package com.starry.admin.modules.weichat.entity; - import com.starry.admin.modules.shop.module.constant.GiftConstant; -import lombok.Data; - import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import lombok.Data; /** * 新增赠礼订单实体 @@ -23,16 +21,16 @@ public class PlayOrderInfoGiftAdd { @NotBlank(message = "打赏对象不能为空") private String clerkId; - @NotBlank(message = "礼物ID不能为空") private String giftId; @NotNull(message = "礼物数量不能为空") - @Min(value = GiftConstant.MINIMUM_SINGLE_GIFT_QUANTITY, message = "礼物数量不能小于" + GiftConstant.MINIMUM_SINGLE_GIFT_QUANTITY) - @Max(value = GiftConstant.MAXIMUM_SINGLE_GIFT_QUANTITY, message = "礼物数量不能大于" + GiftConstant.MAXIMUM_SINGLE_GIFT_QUANTITY) + @Min(value = GiftConstant.MINIMUM_SINGLE_GIFT_QUANTITY, message = "礼物数量不能小于" + + GiftConstant.MINIMUM_SINGLE_GIFT_QUANTITY) + @Max(value = GiftConstant.MAXIMUM_SINGLE_GIFT_QUANTITY, message = "礼物数量不能大于" + + GiftConstant.MAXIMUM_SINGLE_GIFT_QUANTITY) private int giftQuantity; - private String weiChatCode; /** diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderInfoRandomAdd.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderInfoRandomAdd.java index 0facc30..0514899 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderInfoRandomAdd.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderInfoRandomAdd.java @@ -1,14 +1,12 @@ package com.starry.admin.modules.weichat.entity; - import com.starry.admin.modules.shop.module.constant.GiftConstant; -import lombok.Data; - +import java.util.List; import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.util.List; +import lombok.Data; /** * 新增随机订单实体 @@ -37,16 +35,16 @@ public class PlayOrderInfoRandomAdd { **/ private List labels; - @NotBlank(message = "商品ID不能为空") private String commodityId; @NotNull(message = "数量不能为空") - @Min(value = GiftConstant.MINIMUM_SINGLE_GIFT_QUANTITY, message = "数量不能小于" + GiftConstant.MINIMUM_SINGLE_GIFT_QUANTITY) - @Max(value = GiftConstant.MAXIMUM_SINGLE_GIFT_QUANTITY, message = "数量不能大于" + GiftConstant.MAXIMUM_SINGLE_GIFT_QUANTITY) + @Min(value = GiftConstant.MINIMUM_SINGLE_GIFT_QUANTITY, message = "数量不能小于" + + GiftConstant.MINIMUM_SINGLE_GIFT_QUANTITY) + @Max(value = GiftConstant.MAXIMUM_SINGLE_GIFT_QUANTITY, message = "数量不能大于" + + GiftConstant.MAXIMUM_SINGLE_GIFT_QUANTITY) private int commodityQuantity; - @NotBlank(message = "微信号不能为空") private String weiChatCode; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderInfoRewardAdd.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderInfoRewardAdd.java index 0ecf928..0dadc53 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderInfoRewardAdd.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderInfoRewardAdd.java @@ -1,18 +1,16 @@ package com.starry.admin.modules.weichat.entity; - -import lombok.Data; - import javax.validation.constraints.NotBlank; +import lombok.Data; /** * 新增打赏订单实体 + * * @author admin */ @Data public class PlayOrderInfoRewardAdd { - /** * 店员用户ID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayShopReadArticleVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayShopReadArticleVo.java index 8736647..8899fef 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayShopReadArticleVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayShopReadArticleVo.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - import javax.validation.constraints.NotNull; +import lombok.Data; /** * @author admin diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponOrderQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponOrderQueryVo.java index 9cf9cab..2a26fd1 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponOrderQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponOrderQueryVo.java @@ -11,10 +11,8 @@ import lombok.Data; @Data public class WxCouponOrderQueryVo { - private String commodityId; - /*** * 店员等级ID */ @@ -30,6 +28,5 @@ public class WxCouponOrderQueryVo { */ private String placeType; - private int commodityQuantity; } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponOrderReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponOrderReturnVo.java index f0ffacc..98f935e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponOrderReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponOrderReturnVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.weichat.entity; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - import java.math.BigDecimal; import java.time.LocalDateTime; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 顾客优惠券下单查询返回对象 @@ -21,12 +20,10 @@ public class WxCouponOrderReturnVo { */ private String id; - /** * 优惠券名称 **/ - private String couponName ="测试券"; - + private String couponName = "测试券"; /** * 有效期类型（0:永久有效;1:固定时间内有效;2:领取后几天内有效） @@ -79,5 +76,4 @@ public class WxCouponOrderReturnVo { */ private String reasonForUnavailableUse; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponQueryVo.java index 189c853..162ea0a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponQueryVo.java @@ -1,9 +1,8 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; +import lombok.Data; /** * 顾客优惠券查询对象 @@ -14,10 +13,8 @@ import javax.validation.constraints.Pattern; @Data public class WxCouponQueryVo { - private String commodityId; - /** * 下单类型（-1:其他类型;0:指定单;1:随机单;2:打赏单） */ @@ -25,6 +22,5 @@ public class WxCouponQueryVo { @Pattern(regexp = "[0|1]", message = "订单类型必须为0或者1") private String placeType; - private int commodityQuantity; } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponReceiveReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponReceiveReturnVo.java index cbcace6..1160ab7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponReceiveReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponReceiveReturnVo.java @@ -3,12 +3,11 @@ package com.starry.admin.modules.weichat.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.starry.admin.common.conf.StringTypeHandler; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 顾客优惠券领取查询返回对象 @@ -24,13 +23,11 @@ public class WxCouponReceiveReturnVo { */ private String id; - /** * 优惠券名称 **/ private String couponName; - /** * 有效期类型（0:永久有效;1:固定时间内有效;2:领取后几天内有效） */ @@ -86,5 +83,4 @@ public class WxCouponReceiveReturnVo { */ private String obtained = "0"; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponReturnVo.java index 80ea12b..2eed36e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponReturnVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.weichat.entity; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - import java.math.BigDecimal; import java.time.LocalDateTime; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 顾客优惠券查询对象 @@ -21,13 +20,11 @@ public class WxCouponReturnVo { */ private String id; - /** * 优惠券名称 **/ private String couponName; - /** * 有效期类型（0:永久有效;1:固定时间内有效;2:领取后几天内有效） */ @@ -77,5 +74,4 @@ public class WxCouponReturnVo { */ private String reasonForUnavailableUse; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxPayReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxPayReturnVo.java index 348b0ee..1be21f5 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxPayReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxPayReturnVo.java @@ -19,7 +19,8 @@ public class WxPayReturnVo { private String prepayId; private String callback; - public WxPayReturnVo(String orderId, String timeStamp, String nonceStr, String signType, String paySign, String prepayId, String callback) { + public WxPayReturnVo(String orderId, String timeStamp, String nonceStr, String signType, String paySign, + String prepayId, String callback) { this.orderId = orderId; this.timeStamp = timeStamp; this.nonceStr = nonceStr; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxPlayClerkUserQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxPlayClerkUserQueryVo.java index 2e5aa98..2166ab7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxPlayClerkUserQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxPlayClerkUserQueryVo.java @@ -33,5 +33,4 @@ public class WxPlayClerkUserQueryVo extends BasePageEntity { **/ private String province; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxUserLoginVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxUserLoginVo.java index 118852d..c6e730e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxUserLoginVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxUserLoginVo.java @@ -1,13 +1,11 @@ package com.starry.admin.modules.weichat.entity; -import lombok.Data; - import javax.validation.constraints.NotBlank; +import lombok.Data; @Data public class WxUserLoginVo { - @NotBlank(message = "code不能为空") private String code; } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxUserQueryAddressVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxUserQueryAddressVo.java index ad27a42..d1e4c1e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxUserQueryAddressVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxUserQueryAddressVo.java @@ -8,6 +8,5 @@ import lombok.Data; @Data public class WxUserQueryAddressVo { - private String url; } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkAddArticleVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkAddArticleVo.java index c658931..494e1c7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkAddArticleVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkAddArticleVo.java @@ -1,13 +1,12 @@ package com.starry.admin.modules.weichat.entity.article; -import lombok.Data; - +import java.time.LocalDateTime; +import java.util.List; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; -import java.time.LocalDateTime; -import java.util.List; +import lombok.Data; /** * 店员新增动态 @@ -29,7 +28,6 @@ public class PlayClerkAddArticleVo { @NotBlank(message = "动态内容不能为空") private String articleCon; - /** * 动态附件类型（0：图片;1：视频;3:录音） */ @@ -45,7 +43,6 @@ public class PlayClerkAddArticleVo { @Size(max = 6, message = "附件数量必须小于6") private List annexCon; - /** * 发布时间 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleCustomQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleCustomQueryVo.java index 1424245..afa419e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleCustomQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleCustomQueryVo.java @@ -5,14 +5,12 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * @author admin - * 顾客查询动态信息查询返回对象 + * @author admin 顾客查询动态信息查询返回对象 */ @EqualsAndHashCode(callSuper = true) @Data public class PlayClerkArticleCustomQueryVo extends BasePageEntity { - /** * 收藏状态（0：未收藏，1:已收藏） */ @@ -23,5 +21,4 @@ public class PlayClerkArticleCustomQueryVo extends BasePageEntity { */ private String clerkId; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleCustomReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleCustomReturnVo.java index f6048c2..cbb7580 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleCustomReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleCustomReturnVo.java @@ -3,15 +3,13 @@ package com.starry.admin.modules.weichat.entity.article; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.starry.admin.modules.clerk.module.entity.PlayCustomArticleInfoEntity; +import java.time.LocalDateTime; +import java.util.List; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import java.util.List; - /** - * @author admin - * 顾客查询动态信息查询返回对象 + * @author admin 顾客查询动态信息查询返回对象 */ @Data public class PlayClerkArticleCustomReturnVo { @@ -45,7 +43,6 @@ public class PlayClerkArticleCustomReturnVo { */ private String articleCon; - /** * 动态附件类型（0:图片;1:视频;2:音频） */ @@ -56,7 +53,6 @@ public class PlayClerkArticleCustomReturnVo { */ private List annexCon; - /** * 发布时间 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleFollowCustomFollowStateEditStateVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleFollowCustomFollowStateEditStateVo.java index f4beb3e..718a695 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleFollowCustomFollowStateEditStateVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleFollowCustomFollowStateEditStateVo.java @@ -1,21 +1,18 @@ package com.starry.admin.modules.weichat.entity.article; import com.starry.common.domain.BasePageEntity; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; - /** - * @author admin - * 顾客收藏动态状态修改 + * @author admin 顾客收藏动态状态修改 */ @EqualsAndHashCode(callSuper = true) @Data public class PlayClerkArticleFollowCustomFollowStateEditStateVo extends BasePageEntity { - @NotBlank(message = "id不能为空") private String id; @@ -26,5 +23,4 @@ public class PlayClerkArticleFollowCustomFollowStateEditStateVo extends BasePage @Pattern(regexp = "[01]", message = "followState值必须为0或者1") private String followState; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleFollowCustomGreedStateEditStateVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleFollowCustomGreedStateEditStateVo.java index 80e7271..dec2dcc 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleFollowCustomGreedStateEditStateVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleFollowCustomGreedStateEditStateVo.java @@ -1,21 +1,18 @@ package com.starry.admin.modules.weichat.entity.article; import com.starry.common.domain.BasePageEntity; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; - /** - * @author admin - * 顾客点赞动态查询状态修改 + * @author admin 顾客点赞动态查询状态修改 */ @EqualsAndHashCode(callSuper = true) @Data public class PlayClerkArticleFollowCustomGreedStateEditStateVo extends BasePageEntity { - @NotBlank(message = "不能为空") private String id; @@ -26,5 +23,4 @@ public class PlayClerkArticleFollowCustomGreedStateEditStateVo extends BasePageE @Pattern(regexp = "[01]", message = "greedState值必须为0或者1") private String greedState; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkLevelAndRankingVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkLevelAndRankingVo.java index 3a7c9a7..e43b23e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkLevelAndRankingVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkLevelAndRankingVo.java @@ -14,7 +14,6 @@ public class PlayClerkLevelAndRankingVo { */ private String levelName; - /** * 开始名次 */ @@ -25,11 +24,9 @@ public class PlayClerkLevelAndRankingVo { */ private Integer endRanking; - private Integer sort; - - public PlayClerkLevelAndRankingVo(String levelName, Integer startRanking, Integer endRanking,Integer sort) { + public PlayClerkLevelAndRankingVo(String levelName, Integer startRanking, Integer endRanking, Integer sort) { this.levelName = levelName; this.startRanking = startRanking; this.endRanking = endRanking; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkLevelInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkLevelInfoReturnVo.java index 2aee813..2696757 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkLevelInfoReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkLevelInfoReturnVo.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.weichat.entity.clerk; -import lombok.Data; - import java.util.List; +import lombok.Data; /** * @author admin @@ -16,14 +15,11 @@ public class PlayClerkLevelInfoReturnVo { */ private String levelId; - /** * 等级名称 */ private String levelName; - private List levelAndRanking; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkUserInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkUserInfoQueryVo.java index 4f63420..fad8e3a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkUserInfoQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkUserInfoQueryVo.java @@ -17,7 +17,6 @@ import lombok.EqualsAndHashCode; @ApiModel(value = "店员查询参数", description = "分页查询店员的条件参数对象") public class PlayClerkUserInfoQueryVo extends BasePageEntity { - /** * 店员昵称 **/ @@ -77,5 +76,4 @@ public class PlayClerkUserInfoQueryVo extends BasePageEntity { @ApiModelProperty(value = "手机号码", example = "13800138000") private String phone; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkUserInfoResultVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkUserInfoResultVo.java index 0ff6c20..5fd9587 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkUserInfoResultVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkUserInfoResultVo.java @@ -3,10 +3,9 @@ package com.starry.admin.modules.weichat.entity.clerk; import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.util.ArrayList; import java.util.List; +import lombok.Data; /** * @author admin @@ -40,7 +39,6 @@ public class PlayClerkUserInfoResultVo { @ApiModelProperty(value = "店员等级名称") private String levelName; - /** * 性别[0:未知;1:男;2:女] */ @@ -59,7 +57,6 @@ public class PlayClerkUserInfoResultVo { @ApiModelProperty(value = "音频", notes = "音频文件URL") private String audio; - /** * 星座 */ @@ -102,7 +99,6 @@ public class PlayClerkUserInfoResultVo { @ApiModelProperty(value = "所在城市", example = "深圳市") private String city; - /** * 关注（0：未关注，1:已关注） */ @@ -121,7 +117,6 @@ public class PlayClerkUserInfoResultVo { @ApiModelProperty(value = "上架状态", notes = "1：上架，0：下架") private String listingState; - /** * 实名状态【1：已实名，0：未实名】 */ @@ -140,7 +135,6 @@ public class PlayClerkUserInfoResultVo { @ApiModelProperty(value = "随机接单状态", notes = "1：允许，0：禁止") private String randomOrderState; - /** * 服务项目 */ @@ -153,12 +147,10 @@ public class PlayClerkUserInfoResultVo { @ApiModelProperty(value = "地址", notes = "店员所在详细地址") private String address; - /** * 最低消费 */ @ApiModelProperty(value = "最低消费", notes = "店员服务的最低消费", example = "最低1船票") private String latestConsumption = "最低1船票"; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/costom/PlayCustomHideLevelStateEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/costom/PlayCustomHideLevelStateEditVo.java index 417c24f..acabb9f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/costom/PlayCustomHideLevelStateEditVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/costom/PlayCustomHideLevelStateEditVo.java @@ -1,9 +1,8 @@ package com.starry.admin.modules.weichat.entity.costom; -import lombok.Data; - import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; +import lombok.Data; /** * 顾客状态修改 diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/costom/PlayCustomHideRankingStateEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/costom/PlayCustomHideRankingStateEditVo.java index 8475985..4a8eb5a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/costom/PlayCustomHideRankingStateEditVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/costom/PlayCustomHideRankingStateEditVo.java @@ -1,9 +1,8 @@ package com.starry.admin.modules.weichat.entity.costom; -import lombok.Data; - import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; +import lombok.Data; /** * 顾客状态修改 diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/evaluate/PlayCustomOrderEvaluateReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/evaluate/PlayCustomOrderEvaluateReturnVo.java index f13f823..5292732 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/evaluate/PlayCustomOrderEvaluateReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/evaluate/PlayCustomOrderEvaluateReturnVo.java @@ -1,9 +1,8 @@ package com.starry.admin.modules.weichat.entity.evaluate; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - import java.util.Date; +import lombok.Data; /** * 订单评价对象查询返回对象 @@ -16,13 +15,11 @@ public class PlayCustomOrderEvaluateReturnVo { private String id; - /** * 匿名评价(0:匿名，1:非匿名) */ private String anonymous; - /** * 评价等级【1-5星，最低1星，最高5星】 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/gift/PlayClerkGiftReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/gift/PlayClerkGiftReturnVo.java index 36c53c0..1195d93 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/gift/PlayClerkGiftReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/gift/PlayClerkGiftReturnVo.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.weichat.entity.gift; -import lombok.Data; - import java.math.BigDecimal; +import lombok.Data; /** * 店员礼物查询对象 @@ -13,7 +12,6 @@ import java.math.BigDecimal; @Data public class PlayClerkGiftReturnVo { - /** * UUID */ @@ -44,13 +42,11 @@ public class PlayClerkGiftReturnVo { */ private String unit; - /** * 礼物数量 */ private long giffNumber; - /** * 礼物状态（0：正常，1：已下架） */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/gift/PlayCustomGiftQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/gift/PlayCustomGiftQueryVo.java index 46d0167..19fd07c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/gift/PlayCustomGiftQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/gift/PlayCustomGiftQueryVo.java @@ -11,17 +11,14 @@ import lombok.Data; @Data public class PlayCustomGiftQueryVo { - /** * 是否已获得礼物（0:已获取，1:所有礼物） */ private String obtained; - /** * 是否是历史礼物(0:不是,1:是) */ private String history; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClearOrderInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClearOrderInfoQueryVo.java index b2f8934..ccdc8c9 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClearOrderInfoQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClearOrderInfoQueryVo.java @@ -14,15 +14,9 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class PlayClearOrderInfoQueryVo extends BasePageEntity { - private String id; /** - * 订单状态【0:1:2:3:4】 - * 0：已下单 - * 1：已接单 - * 2：已开始 - * 3：已完成 - * 4：已取消 + * 订单状态【0:1:2:3:4】 0：已下单 1：已接单 2：已开始 3：已完成 4：已取消 */ private String orderStatus; @@ -41,5 +35,4 @@ public class PlayClearOrderInfoQueryVo extends BasePageEntity { */ private String purchaserBy; - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderDetailsReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderDetailsReturnVo.java index a071aaf..02056a8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderDetailsReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderDetailsReturnVo.java @@ -1,10 +1,9 @@ package com.starry.admin.modules.weichat.entity.order; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - import java.math.BigDecimal; import java.util.Date; +import lombok.Data; /** * 店员订单详情返回信息 @@ -26,12 +25,7 @@ public class PlayClerkOrderDetailsReturnVo { private String orderNo; /** - * 订单状态【0:1:2:3:4】 - * 0：已下单（待接单） - * 1：已接单（待开始） - * 2：已开始（服务中） - * 3：已完成 - * 4：已取消 + * 订单状态【0:1:2:3:4】 0：已下单（待接单） 1：已接单（待开始） 2：已开始（服务中） 3：已完成 4：已取消 */ private String orderStatus; @@ -45,7 +39,6 @@ public class PlayClerkOrderDetailsReturnVo { */ private int commodityNumber; - /** * 支付方式，0：余额支付,1:微信支付,2:支付宝支付 */ @@ -61,7 +54,6 @@ public class PlayClerkOrderDetailsReturnVo { */ private String weiChatCode; - /** * 订单金额 */ @@ -152,7 +144,6 @@ public class PlayClerkOrderDetailsReturnVo { */ private String customLevelName; - /** * 店员ID */ @@ -194,5 +185,4 @@ public class PlayClerkOrderDetailsReturnVo { **/ private String serviceDuration; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderInfoQueryVo.java index bb1f032..56a40e8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderInfoQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderInfoQueryVo.java @@ -14,15 +14,9 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class PlayClerkOrderInfoQueryVo extends BasePageEntity { - private String id; /** - * 订单状态【0:1:2:3:4】 - * 0：已下单 - * 1：已接单 - * 2：已开始 - * 3：已完成 - * 4：已取消 + * 订单状态【0:1:2:3:4】 0：已下单 1：已接单 2：已开始 3：已完成 4：已取消 */ private String orderStatus; @@ -41,5 +35,4 @@ public class PlayClerkOrderInfoQueryVo extends BasePageEntity { */ private String acceptBy; - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderListReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderListReturnVo.java index 9f18bc3..ab46be8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderListReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderListReturnVo.java @@ -1,10 +1,9 @@ package com.starry.admin.modules.weichat.entity.order; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - import java.math.BigDecimal; import java.util.Date; +import lombok.Data; /** * 店员查询订单列表返回对象 @@ -15,7 +14,6 @@ import java.util.Date; @Data public class PlayClerkOrderListReturnVo { - /** * 订单ID */ @@ -27,12 +25,7 @@ public class PlayClerkOrderListReturnVo { private String orderNo; /** - * 订单状态【0:1:2:3:4】 - * 0：已下单（待接单） - * 1：已接单（待开始） - * 2：已开始（服务中） - * 3：已完成 - * 4：已取消 + * 订单状态【0:1:2:3:4】 0：已下单（待接单） 1：已接单（待开始） 2：已开始（服务中） 3：已完成 4：已取消 */ private String orderStatus; @@ -46,13 +39,11 @@ public class PlayClerkOrderListReturnVo { */ private String firstOrder; - /** * 商品数量 */ private int commodityNumber; - /** * 订单备注 */ @@ -64,13 +55,11 @@ public class PlayClerkOrderListReturnVo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date purchaserTime; - /** * 订单最终金额（支付金额） */ private BigDecimal finalAmount; - /** * 用户ID */ @@ -137,5 +126,4 @@ public class PlayClerkOrderListReturnVo { **/ private String serviceDuration; - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkRandomOrderDetailReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkRandomOrderDetailReturnVo.java index fe111f0..be76f97 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkRandomOrderDetailReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkRandomOrderDetailReturnVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.weichat.entity.order; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - import java.math.BigDecimal; import java.util.Date; import java.util.List; +import lombok.Data; /** * 随机单详情返回接口 @@ -27,12 +26,7 @@ public class PlayClerkRandomOrderDetailReturnVo { private String orderNo; /** - * 订单状态【0:1:2:3:4】 - * 0：已下单（待接单） - * 1：已接单（待开始） - * 2：已开始（服务中） - * 3：已完成 - * 4：已取消 + * 订单状态【0:1:2:3:4】 0：已下单（待接单） 1：已接单（待开始） 2：已开始（服务中） 3：已完成 4：已取消 */ private final String orderStatus = "0"; @@ -46,7 +40,6 @@ public class PlayClerkRandomOrderDetailReturnVo { */ private int commodityNumber; - /** * 支付方式，0：余额支付,1:微信支付,2:支付宝支付 */ @@ -62,7 +55,6 @@ public class PlayClerkRandomOrderDetailReturnVo { */ private String weiChatCode; - /** * 卖家要求 * @@ -70,7 +62,6 @@ public class PlayClerkRandomOrderDetailReturnVo { **/ private List labels; - /** * 订单金额 */ @@ -97,7 +88,6 @@ public class PlayClerkRandomOrderDetailReturnVo { */ private Integer estimatedRevenueRatio; - /** * 优惠金额 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayCustomOrderDetailsReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayCustomOrderDetailsReturnVo.java index 3591a8e..42988f6 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayCustomOrderDetailsReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayCustomOrderDetailsReturnVo.java @@ -1,10 +1,9 @@ package com.starry.admin.modules.weichat.entity.order; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - import java.math.BigDecimal; import java.util.Date; +import lombok.Data; /** * 顾客查询订单详情返回对象 @@ -15,7 +14,6 @@ import java.util.Date; @Data public class PlayCustomOrderDetailsReturnVo { - /** * 订单ID */ @@ -27,12 +25,7 @@ public class PlayCustomOrderDetailsReturnVo { private String orderNo; /** - * 订单状态【0:1:2:3:4】 - * 0：已下单（待接单） - * 1：已接单（待开始） - * 2：已开始（服务中） - * 3：已完成 - * 4：已取消 + * 订单状态【0:1:2:3:4】 0：已下单（待接单） 1：已接单（待开始） 2：已开始（服务中） 3：已完成 4：已取消 */ private String orderStatus; @@ -46,7 +39,6 @@ public class PlayCustomOrderDetailsReturnVo { */ private int commodityNumber; - /** * 支付方式，0：余额支付,1:微信支付,2:支付宝支付 */ @@ -57,7 +49,6 @@ public class PlayCustomOrderDetailsReturnVo { */ private String remark; - /** * 订单金额 */ @@ -118,19 +109,16 @@ public class PlayCustomOrderDetailsReturnVo { */ private String complaint = "0"; - /** * 订单最终金额（支付金额） */ private BigDecimal finalAmount; - /** * 优惠金额 */ private BigDecimal discountAmount; - /** * 用户ID */ @@ -187,7 +175,6 @@ public class PlayCustomOrderDetailsReturnVo { **/ private String serviceDuration; - /** * 微信号码 * @@ -195,5 +182,4 @@ public class PlayCustomOrderDetailsReturnVo { **/ private String weiChatCode; - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayCustomOrderInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayCustomOrderInfoQueryVo.java index 3090b4f..843452a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayCustomOrderInfoQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayCustomOrderInfoQueryVo.java @@ -14,15 +14,9 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class PlayCustomOrderInfoQueryVo extends BasePageEntity { - private String id; /** - * 订单状态【0:1:2:3:4】 - * 0：已下单 - * 1：已接单 - * 2：已开始 - * 3：已完成 - * 4：已取消 + * 订单状态【0:1:2:3:4】 0：已下单 1：已接单 2：已开始 3：已完成 4：已取消 */ private String orderStatus; @@ -41,5 +35,4 @@ public class PlayCustomOrderInfoQueryVo extends BasePageEntity { */ private String purchaserBy; - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayCustomOrderListReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayCustomOrderListReturnVo.java index 58ebdd1..60f3eff 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayCustomOrderListReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayCustomOrderListReturnVo.java @@ -1,10 +1,9 @@ package com.starry.admin.modules.weichat.entity.order; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - import java.math.BigDecimal; import java.util.Date; +import lombok.Data; /** * 顾客查询订单列表返回对象 @@ -15,7 +14,6 @@ import java.util.Date; @Data public class PlayCustomOrderListReturnVo { - /** * 订单ID */ @@ -27,12 +25,7 @@ public class PlayCustomOrderListReturnVo { private String orderNo; /** - * 订单状态【0:1:2:3:4】 - * 0：已下单（待接单） - * 1：已接单（待开始） - * 2：已开始（服务中） - * 3：已完成 - * 4：已取消 + * 订单状态【0:1:2:3:4】 0：已下单（待接单） 1：已接单（待开始） 2：已开始（服务中） 3：已完成 4：已取消 */ private String orderStatus; @@ -46,14 +39,11 @@ public class PlayCustomOrderListReturnVo { */ private int commodityNumber; - - /** * 订单备注 */ private String remark; - /** * 下单时间 */ @@ -70,13 +60,11 @@ public class PlayCustomOrderListReturnVo { */ private String complaint = "0"; - /** * 订单最终金额（支付金额） */ private BigDecimal finalAmount; - /** * 用户ID */ @@ -133,5 +121,4 @@ public class PlayCustomOrderListReturnVo { **/ private String serviceDuration; - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderHistoryRankingReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderHistoryRankingReturnVo.java index 2317373..b73c024 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderHistoryRankingReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderHistoryRankingReturnVo.java @@ -1,10 +1,9 @@ package com.starry.admin.modules.weichat.entity.order; +import java.time.LocalDate; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDate; - /** * 订单排行分页查询对象 * @@ -14,7 +13,6 @@ import java.time.LocalDate; @Data public class PlayOrderHistoryRankingReturnVo { - /** * 开始统计时间 */ @@ -32,5 +30,4 @@ public class PlayOrderHistoryRankingReturnVo { */ private Long rankingIndex; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoCommodityAdd.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoCommodityAdd.java index c5d2ea1..8605570 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoCommodityAdd.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoCommodityAdd.java @@ -1,15 +1,13 @@ package com.starry.admin.modules.weichat.entity.order; - import com.starry.admin.modules.shop.module.constant.GiftConstant; -import lombok.Data; -import org.hibernate.validator.constraints.Length; - +import java.util.List; import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.util.List; +import lombok.Data; +import org.hibernate.validator.constraints.Length; /** * 新增赠礼订单实体 @@ -19,25 +17,22 @@ import java.util.List; @Data public class PlayOrderInfoCommodityAdd { - /** * 店员用户ID */ @NotBlank(message = "打赏对象不能为空") private String clerkId; - @NotBlank(message = "商品ID不能为空") private String commodityId; - - @NotNull(message = "数量不能为空") - @Min(value = GiftConstant.MINIMUM_SINGLE_GIFT_QUANTITY, message = "数量不能小于" + GiftConstant.MINIMUM_SINGLE_GIFT_QUANTITY) - @Max(value = GiftConstant.MAXIMUM_SINGLE_GIFT_QUANTITY, message = "数量不能大于" + GiftConstant.MAXIMUM_SINGLE_GIFT_QUANTITY) + @Min(value = GiftConstant.MINIMUM_SINGLE_GIFT_QUANTITY, message = "数量不能小于" + + GiftConstant.MINIMUM_SINGLE_GIFT_QUANTITY) + @Max(value = GiftConstant.MAXIMUM_SINGLE_GIFT_QUANTITY, message = "数量不能大于" + + GiftConstant.MAXIMUM_SINGLE_GIFT_QUANTITY) private int commodityQuantity; - @NotBlank(message = "微信号不能为空") @Length(max = 255, message = "微信号码长度不超过255个字符") private String weiChatCode; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoContinueAdd.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoContinueAdd.java index e80736c..6b40900 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoContinueAdd.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoContinueAdd.java @@ -1,12 +1,10 @@ package com.starry.admin.modules.weichat.entity.order; - -import lombok.Data; - +import java.util.List; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import java.util.List; +import lombok.Data; /** * 续单申请 @@ -22,7 +20,6 @@ public class PlayOrderInfoContinueAdd { @NotBlank(message = "orderId不能为空") private String orderId; - /** * 订单备注 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoContinueQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoContinueQueryVo.java index 37f9750..9e95271 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoContinueQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoContinueQueryVo.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.weichat.entity.order; - import com.starry.common.domain.BasePageEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoRandomQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoRandomQueryVo.java index 0f7b317..2f6b0a7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoRandomQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoRandomQueryVo.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.weichat.entity.order; - import com.starry.common.domain.BasePageEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,5 +13,4 @@ import lombok.EqualsAndHashCode; @Data public class PlayOrderInfoRandomQueryVo extends BasePageEntity { - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoRandomReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoRandomReturnVo.java index 68ea646..de79acb 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoRandomReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoRandomReturnVo.java @@ -1,7 +1,6 @@ package com.starry.admin.modules.weichat.entity.order; import com.fasterxml.jackson.annotation.JsonFormat; - import java.math.BigDecimal; import java.util.Date; @@ -22,12 +21,7 @@ public class PlayOrderInfoRandomReturnVo { private String orderNo; /** - * 订单状态【0:1:2:3:4】 - * 0：已下单（待接单） - * 1：已接单（待开始） - * 2：已开始（服务中） - * 3：已完成 - * 4：已取消 + * 订单状态【0:1:2:3:4】 0：已下单（待接单） 1：已接单（待开始） 2：已开始（服务中） 3：已完成 4：已取消 */ private final String orderStatus = "0"; @@ -36,13 +30,11 @@ public class PlayOrderInfoRandomReturnVo { */ private final String placeType = "1"; - /** * 商品数量 */ private int commodityNumber; - /** * 订单备注 */ @@ -54,13 +46,11 @@ public class PlayOrderInfoRandomReturnVo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date purchaserTime; - /** * 订单最终金额（支付金额） */ private BigDecimal finalAmount; - /** * 用户ID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderRankingListVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderRankingListVo.java index bd9f6ce..56e0ca5 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderRankingListVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderRankingListVo.java @@ -11,7 +11,6 @@ import lombok.Data; @Data public class PlayOrderRankingListVo { - /** * 店员ID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderRankingReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderRankingReturnVo.java index c942cbd..d062824 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderRankingReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderRankingReturnVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.weichat.entity.order; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - import java.math.BigDecimal; import java.time.LocalDate; import java.util.List; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 订单排行分页查询对象 diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayRandomOrderInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayRandomOrderInfoReturnVo.java index 7f351b4..4e3f5d3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayRandomOrderInfoReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayRandomOrderInfoReturnVo.java @@ -1,10 +1,9 @@ package com.starry.admin.modules.weichat.entity.order; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - import java.math.BigDecimal; import java.util.Date; +import lombok.Data; /** * @author admin @@ -13,7 +12,6 @@ import java.util.Date; @Data public class PlayRandomOrderInfoReturnVo { - /** * 订单ID */ @@ -25,12 +23,7 @@ public class PlayRandomOrderInfoReturnVo { private String orderNo; /** - * 订单状态【0:1:2:3:4】 - * 0：已下单（待接单） - * 1：已接单（待开始） - * 2：已开始（服务中） - * 3：已完成 - * 4：已取消 + * 订单状态【0:1:2:3:4】 0：已下单（待接单） 1：已接单（待开始） 2：已开始（服务中） 3：已完成 4：已取消 */ private String orderStatus; @@ -44,13 +37,11 @@ public class PlayRandomOrderInfoReturnVo { */ private String firstOrder; - /** * 商品数量 */ private int commodityNumber; - /** * 订单备注 */ @@ -62,13 +53,11 @@ public class PlayRandomOrderInfoReturnVo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date purchaserTime; - /** * 订单最终金额（支付金额） */ private BigDecimal finalAmount; - /** * 用户ID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayRewardInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayRewardInfoReturnVo.java index 677134c..305a891 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayRewardInfoReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayRewardInfoReturnVo.java @@ -1,10 +1,9 @@ package com.starry.admin.modules.weichat.entity.order; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - import java.math.BigDecimal; import java.util.Date; +import lombok.Data; /** * 打赏动态查询返回信息 @@ -50,18 +49,15 @@ public class PlayRewardInfoReturnVo { */ private String commodityName; - /** * 订单金额 */ private BigDecimal orderMoney; - /** * 下单时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date purchaserTime; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/user/PlayCustomUserReturnDetailVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/user/PlayCustomUserReturnDetailVo.java index 55e395e..d213a4f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/user/PlayCustomUserReturnDetailVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/user/PlayCustomUserReturnDetailVo.java @@ -1,10 +1,9 @@ package com.starry.admin.modules.weichat.entity.user; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Data; - import java.math.BigDecimal; import java.util.Date; +import lombok.Data; /** * @author admin @@ -134,7 +133,6 @@ public class PlayCustomUserReturnDetailVo { @JsonIgnore private String token; - /** * 员工状态【1：是陪聊，0：不是陪聊】 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkCurrentPeriodWagesReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkCurrentPeriodWagesReturnVo.java index f0a0312..cd20f97 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkCurrentPeriodWagesReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkCurrentPeriodWagesReturnVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.weichat.entity.wages; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - import java.math.BigDecimal; import java.time.LocalDate; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * @author admin @@ -19,7 +18,6 @@ public class ClerkCurrentPeriodWagesReturnVo { */ private String id; - /** * 总金额 */ @@ -39,11 +37,9 @@ public class ClerkCurrentPeriodWagesReturnVo { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDate endCountDate; - /** * 平台工资（订单） */ private OrderWagesReturnVo orderWages; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkHistoricalWagesReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkHistoricalWagesReturnVo.java index d35f0be..78774b0 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkHistoricalWagesReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkHistoricalWagesReturnVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.weichat.entity.wages; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - import java.math.BigDecimal; import java.time.LocalDate; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * @author admin @@ -19,7 +18,6 @@ public class ClerkHistoricalWagesReturnVo { */ private String id; - /** * 订单金额 */ @@ -39,5 +37,4 @@ public class ClerkHistoricalWagesReturnVo { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDate endCountDate; - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkUnsettledWagesReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkUnsettledWagesReturnVo.java index 9345e9d..bf7499f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkUnsettledWagesReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkUnsettledWagesReturnVo.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.weichat.entity.wages; -import lombok.Data; - import java.math.BigDecimal; +import lombok.Data; /** * @author admin @@ -11,13 +10,11 @@ import java.math.BigDecimal; @Data public class ClerkUnsettledWagesReturnVo { - /** * 订单金额 */ private BigDecimal orderMoney; - /** * 订单总数 */ @@ -28,8 +25,6 @@ public class ClerkUnsettledWagesReturnVo { */ private BigDecimal estimatedRevenue; - - public ClerkUnsettledWagesReturnVo(BigDecimal orderMoney, Integer orderNumber, BigDecimal estimatedRevenue) { this.orderMoney = orderMoney; this.orderNumber = orderNumber; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkWagesDetailsReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkWagesDetailsReturnVo.java index 3f3fd04..f35414f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkWagesDetailsReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkWagesDetailsReturnVo.java @@ -1,11 +1,10 @@ package com.starry.admin.modules.weichat.entity.wages; import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - import java.math.BigDecimal; import java.time.LocalDateTime; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * @author admin diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/OrderWagesReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/OrderWagesReturnVo.java index 26fa2e2..1b0a12a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/OrderWagesReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/OrderWagesReturnVo.java @@ -1,8 +1,7 @@ package com.starry.admin.modules.weichat.entity.wages; -import lombok.Data; - import java.math.BigDecimal; +import lombok.Data; /** * @author admin diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/Constants.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/Constants.java index 8677df6..1cb6324 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/Constants.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/Constants.java @@ -4,11 +4,10 @@ import io.jsonwebtoken.Claims; /** * 通用常量信息 - * + * * @author ruoyi */ -public class Constants -{ +public class Constants { /** * UTF-8 字符集 */ @@ -65,7 +64,7 @@ public class Constants * 登录失败 */ public static final String LOGIN_FAIL = "Error"; - + /** * 验证码有效期（分钟） */ @@ -142,11 +141,11 @@ public class Constants /** * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） */ - public static final String[] JOB_WHITELIST_STR = { "com.ruoyi" }; + public static final String[] JOB_WHITELIST_STR = {"com.ruoyi"}; /** * 定时任务违规的字符 */ - public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", - "org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.common.config" }; + public static final String[] JOB_ERROR_STR = {"java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", + "org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.common.config"}; } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxAccessTokenService.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxAccessTokenService.java index e5730f4..f451bd6 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxAccessTokenService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxAccessTokenService.java @@ -1,12 +1,10 @@ package com.starry.admin.modules.weichat.service; - +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; import org.springframework.stereotype.Service; -import javax.annotation.Resource; - /** * 微信公众号开发 * @@ -16,11 +14,9 @@ import javax.annotation.Resource; @Service public class WxAccessTokenService { - @Resource private WxCustomMpService wxCustomMpService; - /** * 获取微信AccessToken * @@ -29,7 +25,7 @@ public class WxAccessTokenService { public String getAccessToken() throws WxErrorException { String token = wxCustomMpService.proxyWxMpService().getAccessToken(); log.error("token = " + token); - //缓存业务处理 + // 缓存业务处理 return token; } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java index 3608d42..2051b46 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java @@ -19,6 +19,11 @@ import com.starry.admin.modules.personnel.service.IPlayPersonnelAdminInfoService import com.starry.admin.modules.system.module.entity.SysTenantEntity; import com.starry.admin.modules.system.service.impl.SysTenantServiceImpl; import com.starry.admin.utils.SecurityUtils; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; @@ -28,12 +33,6 @@ import me.chanjar.weixin.mp.config.impl.WxMpMapConfigImpl; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; - /** * @author admin */ @@ -53,13 +52,11 @@ public class WxCustomMpService { @Resource private IPlayClerkUserInfoService clerkUserInfoService; - /** * 支付成功回调地址 */ public static String NOTIFY_URL = "https://julyharbor.com/api/wx/pay/jsCallback"; - public WxMpService proxyWxMpService() { String tenantId = SecurityUtils.getTenantId(); if (StrUtil.isBlankIfStr(tenantId)) { @@ -103,16 +100,17 @@ public class WxCustomMpService { return wxPayService; } - /** * 充值成功-发送微信消息 * - * @param order 订单信息 + * @param order + * 订单信息 */ public void sendBalanceMessage(PlayOrderInfoEntity order) { PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(order.getPurchaserBy()); SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(order.getTenantId()); - WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getChongzhichenggongTemplateId(), customUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".julyharbor.com/user/"); + WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getChongzhichenggongTemplateId(), + customUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".julyharbor.com/user/"); List data = new ArrayList<>(); data.add(new WxMpTemplateData("time4", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"))); data.add(new WxMpTemplateData("amount2", order.getOrderMoney().toString())); @@ -126,21 +124,24 @@ public class WxCustomMpService { } } - /** - * 顾客下指定单后，给店员发新订单通知 - * 通过微信公众号发送消息 + * 顾客下指定单后，给店员发新订单通知 通过微信公众号发送消息 * - * @param tenantId 租户ID - * @param openId 消息接收人openID - * @param orderNo 消息内容-订单编号 + * @param tenantId + * 租户ID + * @param openId + * 消息接收人openID + * @param orderNo + * 消息内容-订单编号 * @param money * @param commodityName */ - public void sendCreateOrderMessage(String tenantId, String openId, String orderNo, String money, String commodityName) { + public void sendCreateOrderMessage(String tenantId, String openId, String orderNo, String money, + String commodityName) { SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(tenantId); - WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getXindingdanshoulitongzhiTemplateId(), openId, "http://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/orderDetail/"); + WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getXindingdanshoulitongzhiTemplateId(), + openId, "http://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/orderDetail/"); List data = new ArrayList<>(); data.add(new WxMpTemplateData("time6", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"))); data.add(new WxMpTemplateData("character_string9", orderNo)); @@ -168,7 +169,9 @@ public class WxCustomMpService { PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.selectById(orderInfo.getAcceptBy()); PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(orderInfo.getPurchaserBy()); - WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getJiedanchenggongtongzhiTemplateId(), clerkUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/orderDetail/" + orderInfo.getId()); + WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getJiedanchenggongtongzhiTemplateId(), + clerkUserInfo.getOpenid(), + "http://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/orderDetail/" + orderInfo.getId()); List data = new ArrayList<>(); data.add(new WxMpTemplateData("character_string1", orderInfo.getOrderNo())); data.add(new WxMpTemplateData("time2", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"))); @@ -180,7 +183,8 @@ public class WxCustomMpService { } templateMessage.setToUser(customUserInfo.getOpenid()); - templateMessage.setUrl("http://" + tenant.getTenantKey() + ".julyharbor.com/user/#/orderDetail/" + orderInfo.getId()); + templateMessage + .setUrl("http://" + tenant.getTenantKey() + ".julyharbor.com/user/#/orderDetail/" + orderInfo.getId()); try { proxyWxMpService().getTemplateMsgService().sendTemplateMsg(templateMessage); } catch (WxErrorException e) { @@ -189,7 +193,8 @@ public class WxCustomMpService { } - public void sendCheckMessage(PlayClerkUserReviewInfoEntity entity, PlayClerkUserInfoEntity userInfo, String reviewState) { + public void sendCheckMessage(PlayClerkUserReviewInfoEntity entity, PlayClerkUserInfoEntity userInfo, + String reviewState) { String touser = userInfo.getOpenid(); SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(userInfo.getTenantId()); @@ -221,9 +226,12 @@ public class WxCustomMpService { String template_id = tenant.getRzsqAdminTemplateId(); String tenantKey = tenant.getTenantKey(); String url = "http://" + tenantKey + ".julyharbor.com/clerk/#/admin/clerk-apply-list"; - List adminInfoEntityList = playPersonnelAdminInfoService.list(Wrappers.lambdaQuery(PlayPersonnelAdminInfoEntity.class).select(PlayPersonnelAdminInfoEntity::getSysUserId)); + List adminInfoEntityList = playPersonnelAdminInfoService.list(Wrappers + .lambdaQuery(PlayPersonnelAdminInfoEntity.class).select(PlayPersonnelAdminInfoEntity::getSysUserId)); for (PlayPersonnelAdminInfoEntity adminInfoEntity : adminInfoEntityList) { - PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.getOne(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).eq(PlayClerkUserInfoEntity::getSysUserId, adminInfoEntity.getSysUserId()), false); + PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService + .getOne(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class) + .eq(PlayClerkUserInfoEntity::getSysUserId, adminInfoEntity.getSysUserId()), false); if (Objects.isNull(clerkUserInfo)) { continue; } @@ -234,7 +242,7 @@ public class WxCustomMpService { List data = new ArrayList<>(); data.add(new WxMpTemplateData("phone_number15", entity.getPhone())); data.add(new WxMpTemplateData("thing11", entity.getNickname())); - //data.add(new WxMpTemplateData("thing3", "有新的店员提交了审核，请前去查看")); + // data.add(new WxMpTemplateData("thing3", "有新的店员提交了审核，请前去查看")); data.add(new WxMpTemplateData("thing2", "有新的店员提交了审核，请前去查看")); templateMessage.setData(data); try { @@ -250,9 +258,12 @@ public class WxCustomMpService { /** * 获取微信发啥消息模板 * - * @param templateId 消息模板ID - * @param toUser 发送目标用户ID - * @param url 消息回调地址 + * @param templateId + * 消息模板ID + * @param toUser + * 发送目标用户ID + * @param url + * 消息回调地址 * @return WxMpTemplateMessage */ public WxMpTemplateMessage getWxMpTemplateMessage(String templateId, String toUser, String url) { @@ -266,14 +277,19 @@ public class WxCustomMpService { public void sendComplaintMessage(PlayOrderComplaintInfoEntity info, PlayOrderInfoEntity orderInfo) { SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(info.getTenantId()); - List adminInfoEntityList = playPersonnelAdminInfoService.list(Wrappers.lambdaQuery(PlayPersonnelAdminInfoEntity.class).select(PlayPersonnelAdminInfoEntity::getSysUserId)); + List adminInfoEntityList = playPersonnelAdminInfoService.list(Wrappers + .lambdaQuery(PlayPersonnelAdminInfoEntity.class).select(PlayPersonnelAdminInfoEntity::getSysUserId)); for (PlayPersonnelAdminInfoEntity adminInfo : adminInfoEntityList) { - PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.getOne(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).eq(PlayClerkUserInfoEntity::getSysUserId, adminInfo.getSysUserId()), false); + PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService + .getOne(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class) + .eq(PlayClerkUserInfoEntity::getSysUserId, adminInfo.getSysUserId()), false); if (Objects.isNull(clerkUserInfo)) { continue; } - WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getDingdantousuchuliTemplateId(), clerkUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/admin/order/complain-list"); + WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getDingdantousuchuliTemplateId(), + clerkUserInfo.getOpenid(), + "http://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/admin/order/complain-list"); List data = new ArrayList<>(); data.add(new WxMpTemplateData("character_string", orderInfo.getOrderNo())); data.add(new WxMpTemplateData("time2", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"))); @@ -285,14 +301,15 @@ public class WxCustomMpService { } } - } public void sendOrderFinishMessage(PlayOrderInfoEntity order) { if (order.getPlaceType().equals("1") || order.getPlaceType().equals("2")) { SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(order.getTenantId()); PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(order.getPurchaserBy()); - WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getDingdanwanchengtongzhiTemplateId(), customUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".julyharbor.com/user/#/orderDetail/" + order.getId()); + WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getDingdanwanchengtongzhiTemplateId(), + customUserInfo.getOpenid(), + "http://" + tenant.getTenantKey() + ".julyharbor.com/user/#/orderDetail/" + order.getId()); List data = new ArrayList<>(); data.add(new WxMpTemplateData("time18", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"))); data.add(new WxMpTemplateData("character_string8", order.getOrderNo())); @@ -312,7 +329,9 @@ public class WxCustomMpService { PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(orderInfo.getPurchaserBy()); - WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getQuxiaodingdantongzhiTemplateId(), customUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".julyharbor.com/user/#/orderDetail/" + orderInfo.getId()); + WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getQuxiaodingdantongzhiTemplateId(), + customUserInfo.getOpenid(), + "http://" + tenant.getTenantKey() + ".julyharbor.com/user/#/orderDetail/" + orderInfo.getId()); List data = new ArrayList<>(); data.add(new WxMpTemplateData("character_string2", orderInfo.getOrderNo())); data.add(new WxMpTemplateData("thing5", StringUtils.isEmpty(refundReason) ? "已取消" : refundReason)); @@ -324,11 +343,12 @@ public class WxCustomMpService { log.error(e.getMessage(), e); } - if(StringUtils.isNotEmpty(orderInfo.getAcceptBy())){ + if (StringUtils.isNotEmpty(orderInfo.getAcceptBy())) { PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.selectById(orderInfo.getAcceptBy()); templateMessage.setToUser(clerkUserInfo.getOpenid()); - templateMessage.setUrl("http://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/orderDetail/" + orderInfo.getId()); + templateMessage.setUrl( + "http://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/orderDetail/" + orderInfo.getId()); try { proxyWxMpService().getTemplateMsgService().sendTemplateMsg(templateMessage); } catch (WxErrorException e) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomUserService.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomUserService.java index 1db2196..5395bd6 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomUserService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomUserService.java @@ -4,30 +4,25 @@ import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity; import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService; import com.starry.common.constant.Constants; import com.starry.common.utils.StringUtils; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - +import java.util.Objects; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.Objects; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; @Slf4j @Service public class WxCustomUserService { - @Resource private IPlayCustomUserInfoService customUserInfoService; - @Resource private HttpServletRequest request; - @Resource private WxTokenService tokenService; - /** * 获取当前登录顾客ID * @@ -55,5 +50,4 @@ public class WxCustomUserService { return userToken.equals(entity.getToken()) ? userId : ""; } - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxOauthService.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxOauthService.java index 9bdf126..613f711 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxOauthService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxOauthService.java @@ -1,6 +1,5 @@ package com.starry.admin.modules.weichat.service; - import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; import com.starry.admin.common.exception.ServiceException; @@ -12,15 +11,14 @@ import com.starry.admin.modules.custom.service.IPlayCustomLevelInfoService; import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService; import com.starry.common.utils.ConvertUtil; import com.starry.common.utils.IdUtils; +import java.util.Date; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.bean.WxOAuth2UserInfo; import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken; import me.chanjar.weixin.common.error.WxErrorException; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.Date; - /** * 微信授权 * @@ -30,11 +28,9 @@ import java.util.Date; @Service public class WxOauthService { - @Resource private WxCustomMpService wxCustomMpService; - @Resource private IPlayCustomUserInfoService customUserInfoService; @@ -47,12 +43,11 @@ public class WxOauthService { @Resource private IPlayCustomLevelInfoService playCustomLevelInfoService; - /** - * 微信用户登录 - * 如果用户不存在，初始化用户并登录 + * 微信用户登录 如果用户不存在，初始化用户并登录 * - * @param code 微信授权code + * @param code + * 微信授权code * @return String 用户ID * @author admin * @since 2024/4/15 11:01 @@ -82,19 +77,16 @@ public class WxOauthService { } } - public void clerkUserLogout(PlayClerkUserInfoEntity entity) { entity.setToken("empty"); clerkUserInfoService.update(entity); } - public void customUserLogout(PlayCustomUserInfoEntity entity) { entity.setToken("empty"); customUserInfoService.update(entity); } - public String customUserLogin(String code) { WxOAuth2AccessToken token = getWxOAuth2AccessToken(code); String openId = getOpenId(token); @@ -115,11 +107,11 @@ public class WxOauthService { return entity.getId(); } - /** * 获取微信授权Token * - * @param code code + * @param code + * code * @return WxOAuth2AccessToken * @author admin * @since 2024/4/8 14:47 @@ -140,7 +132,8 @@ public class WxOauthService { /** * 获取微信用户ID * - * @param token code + * @param token + * code * @return WxOAuth2AccessToken * @author admin * @since 2024/4/8 14:47 @@ -159,7 +152,8 @@ public class WxOauthService { /** * 获取微信用户ID * - * @param token WxOAuth2AccessToken + * @param token + * WxOAuth2AccessToken * @return WxOAuth2UserInfo * @author admin * @since 2024/4/8 14:47 diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxTokenService.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxTokenService.java index 2d3268c..70868ae 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxTokenService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxTokenService.java @@ -4,15 +4,14 @@ import cn.hutool.core.date.DateUtil; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; /** * token验证处理 @@ -48,11 +47,11 @@ public class WxTokenService { protected static final long MILLIS_SECOND = 1000; - /** * 根据微信用户id创建token * - * @param userId 微信用户ID + * @param userId + * 微信用户ID * @return String token * @author admin * @since 2024/4/10 11:21 @@ -63,15 +62,16 @@ public class WxTokenService { } Map claims = new HashMap<>(16); claims.put(Constants.LOGIN_USER_KEY_WX, userId); - return Jwts.builder().setClaims(claims).setExpiration(DateUtil.offsetMinute(new Date(), expireTime)).signWith(SignatureAlgorithm.HS512, secret).compact(); + return Jwts.builder().setClaims(claims).setExpiration(DateUtil.offsetMinute(new Date(), expireTime)) + .signWith(SignatureAlgorithm.HS512, secret).compact(); } - /** * 根据token获取微信用户ID * - * @param token token - * @return String 微信用户ID + * @param token + * token + * @return String 微信用户ID * @author admin * @since 2024/4/10 11:24 **/ @@ -89,8 +89,10 @@ public class WxTokenService { /** * 根据token获取微信用户TenantId * - * @param token token - * @param identity 用户身份（0:租户，1:顾客） + * @param token + * token + * @param identity + * 用户身份（0:租户，1:顾客） * @return String 微信用户租户ID * @author admin * @since 2024/4/10 11:24 @@ -103,116 +105,124 @@ public class WxTokenService { return claims.get(Constants.LOGIN_USER_KEY_WX).toString(); } - // public String getTenantId(String token) { - // if (StringUtils.isEmpty(token)) { - // throw new RuntimeException("token不能为空"); - // } - // Map claims = new HashMap<>(); - // claims.put(Constants.LOGIN_USER_KEY_MINI, miniUserId); - // return Jwts.builder().setClaims(claims).setExpiration(DateUtil.offsetMinute(new Date(), expireTime)).signWith(SignatureAlgorithm.HS512, secret).compact(); + // if (StringUtils.isEmpty(token)) { + // throw new RuntimeException("token不能为空"); // } -// -// // 小程序端-coser -// public String createMiniCoserToken(Long miniCoserId) { -// if (Objects.isNull(miniCoserId)) { -// throw new RuntimeException("用户id不能为空"); -// } -// Map claims = new HashMap<>(); -// claims.put(Constants.LOGIN_USER_KEY_COSER, miniCoserId); -// return Jwts.builder().setClaims(claims).setExpiration(DateUtil.offsetMinute(new Date(), expireTime)).signWith(SignatureAlgorithm.HS512, secret).compact(); -// } -// -// // 小程序端-coser -// public Long getMiniCoserIdByToken(String token) { -// if (StringUtils.isEmpty(token)) { -// throw new RuntimeException("token不能为空"); -// } -// Claims claims = parseToken(token); -// String userId = claims.get(Constants.LOGIN_USER_KEY_COSER).toString(); -// return Long.parseLong(userId); -// } -// -// -// /** -// * 验证令牌有效期，相差不足20分钟，自动刷新缓存 -// * -// * @param loginUser -// * @return 令牌 -// */ -// public void verifyToken(LoginUser loginUser) { -// long expireTime = loginUser.getExpireTime(); -// long currentTime = System.currentTimeMillis(); -// if (expireTime - currentTime <= MILLIS_MINUTE_TEN) { -// refreshToken(loginUser); -// } -// } -// -// /** -// * 刷新令牌有效期 -// * -// * @param loginUser 登录信息 -// */ -// public void refreshToken(LoginUser loginUser) { -// loginUser.setLoginTime(System.currentTimeMillis()); -// loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE); -// // 根据uuid将loginUser缓存 -// String userKey = getTokenKey(loginUser.getToken()); -// redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES); -// } -// -// -// /** -// * 设置用户代理信息 -// * -// * @param loginUser 登录信息 -// */ -// public void setUserAgent(LoginUser loginUser) { -// UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent")); -// String ip = IpUtils.getIpAddr(); -// loginUser.setIpaddr(ip); -// loginUser.setLoginLocation(AddressUtils.getRealAddressByIP(ip)); -// loginUser.setBrowser(userAgent.getBrowser().getName()); -// loginUser.setOs(userAgent.getOperatingSystem().getName()); -// } -// -// /** -// * 从数据声明生成令牌 -// * -// * @param claims 数据声明 -// * @return 令牌 -// */ -// private String createToken(Map claims) { -// String token = Jwts.builder().setClaims(claims).signWith(SignatureAlgorithm.HS512, secret).compact(); -// return token; -// } -// + // Map claims = new HashMap<>(); + // claims.put(Constants.LOGIN_USER_KEY_MINI, miniUserId); + // return + // Jwts.builder().setClaims(claims).setExpiration(DateUtil.offsetMinute(new + // Date(), expireTime)).signWith(SignatureAlgorithm.HS512, secret).compact(); + // } + // + // // 小程序端-coser + // public String createMiniCoserToken(Long miniCoserId) { + // if (Objects.isNull(miniCoserId)) { + // throw new RuntimeException("用户id不能为空"); + // } + // Map claims = new HashMap<>(); + // claims.put(Constants.LOGIN_USER_KEY_COSER, miniCoserId); + // return + // Jwts.builder().setClaims(claims).setExpiration(DateUtil.offsetMinute(new + // Date(), expireTime)).signWith(SignatureAlgorithm.HS512, secret).compact(); + // } + // + // // 小程序端-coser + // public Long getMiniCoserIdByToken(String token) { + // if (StringUtils.isEmpty(token)) { + // throw new RuntimeException("token不能为空"); + // } + // Claims claims = parseToken(token); + // String userId = claims.get(Constants.LOGIN_USER_KEY_COSER).toString(); + // return Long.parseLong(userId); + // } + // + // + // /** + // * 验证令牌有效期，相差不足20分钟，自动刷新缓存 + // * + // * @param loginUser + // * @return 令牌 + // */ + // public void verifyToken(LoginUser loginUser) { + // long expireTime = loginUser.getExpireTime(); + // long currentTime = System.currentTimeMillis(); + // if (expireTime - currentTime <= MILLIS_MINUTE_TEN) { + // refreshToken(loginUser); + // } + // } + // + // /** + // * 刷新令牌有效期 + // * + // * @param loginUser 登录信息 + // */ + // public void refreshToken(LoginUser loginUser) { + // loginUser.setLoginTime(System.currentTimeMillis()); + // loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * + // MILLIS_MINUTE); + // // 根据uuid将loginUser缓存 + // String userKey = getTokenKey(loginUser.getToken()); + // redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES); + // } + // + // + // /** + // * 设置用户代理信息 + // * + // * @param loginUser 登录信息 + // */ + // public void setUserAgent(LoginUser loginUser) { + // UserAgent userAgent = + // UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent")); + // String ip = IpUtils.getIpAddr(); + // loginUser.setIpaddr(ip); + // loginUser.setLoginLocation(AddressUtils.getRealAddressByIP(ip)); + // loginUser.setBrowser(userAgent.getBrowser().getName()); + // loginUser.setOs(userAgent.getOperatingSystem().getName()); + // } + // + // /** + // * 从数据声明生成令牌 + // * + // * @param claims 数据声明 + // * @return 令牌 + // */ + // private String createToken(Map claims) { + // String token = + // Jwts.builder().setClaims(claims).signWith(SignatureAlgorithm.HS512, + // secret).compact(); + // return token; + // } + // /** * 从令牌中获取数据声明 * - * @param token 令牌 + * @param token + * 令牌 * @return 数据声明 */ private Claims parseToken(String token) { return Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody(); } -// -// /** -// * 获取请求token -// * -// * @param request -// * @return token -// */ -// private String getToken(HttpServletRequest request) { -// String token = request.getHeader(header); -// if (StrUtil.isNotBlank(token) && token.startsWith(Constants.TOKEN_PREFIX)) { -// token = token.replace(Constants.TOKEN_PREFIX, ""); -// } -// return token; -// } -// -// private String getTokenKey(String uuid) { -// return CacheConstants.LOGIN_TOKEN_KEY + uuid; -// } + // + // /** + // * 获取请求token + // * + // * @param request + // * @return token + // */ + // private String getToken(HttpServletRequest request) { + // String token = request.getHeader(header); + // if (StrUtil.isNotBlank(token) && token.startsWith(Constants.TOKEN_PREFIX)) { + // token = token.replace(Constants.TOKEN_PREFIX, ""); + // } + // return token; + // } + // + // private String getTokenKey(String uuid) { + // return CacheConstants.LOGIN_TOKEN_KEY + uuid; + // } } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/WxFileUtils.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/WxFileUtils.java index c7f4955..60213db 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/WxFileUtils.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/WxFileUtils.java @@ -3,6 +3,10 @@ package com.starry.admin.modules.weichat.utils; import cn.hutool.core.io.FileUtil; import com.alibaba.fastjson2.JSONObject; import com.starry.admin.common.exception.CustomException; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; import lombok.extern.slf4j.Slf4j; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; @@ -14,26 +18,23 @@ import ws.schild.jave.MultimediaObject; import ws.schild.jave.encode.AudioAttributes; import ws.schild.jave.encode.EncodingAttributes; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.HashMap; - - @Slf4j public class WxFileUtils { - /** * 下载微信临时素材文件 * - * @param access_token 微信token - * @param mediaId 素材ID + * @param access_token + * 微信token + * @param mediaId + * 素材ID * @return InputStream - * @throws IOException IOException + * @throws IOException + * IOException */ public static InputStream getTemporaryMaterial(String access_token, String mediaId) throws IOException { - String url = "https://api.weixin.qq.com/cgi-bin/media/get?access_token=" + access_token + "&media_id=" + mediaId; + String url = "https://api.weixin.qq.com/cgi-bin/media/get?access_token=" + access_token + "&media_id=" + + mediaId; // 请求参数 HashMap param = new HashMap<>(); param.put("media_id", mediaId); diff --git a/play-admin/src/main/java/com/starry/admin/utils/DictUtils.java b/play-admin/src/main/java/com/starry/admin/utils/DictUtils.java index 834f556..6fe2be7 100644 --- a/play-admin/src/main/java/com/starry/admin/utils/DictUtils.java +++ b/play-admin/src/main/java/com/starry/admin/utils/DictUtils.java @@ -6,7 +6,6 @@ import com.starry.common.constant.CacheConstants; import com.starry.common.redis.RedisCache; import com.starry.common.utils.SpringUtils; import com.starry.common.utils.StringUtils; - import java.util.Collection; import java.util.List; @@ -18,7 +17,8 @@ public class DictUtils { /** * 获取 cache key * - * @param key 参数键 + * @param key + * 参数键 * @return 缓存键key */ public static String getCacheKey(String key) { @@ -28,7 +28,8 @@ public class DictUtils { /** * 获取字典缓存 * - * @param key 参数键 + * @param key + * 参数键 * @return dictDatas 字典数据列表 */ public static List getDictCache(String key) { @@ -42,8 +43,10 @@ public class DictUtils { /** * 设置字典缓存 * - * @param key 参数键 - * @param dataList 字典数据列表 + * @param key + * 参数键 + * @param dataList + * 字典数据列表 */ public static void setDictCache(String key, List dataList) { SpringUtils.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dataList); diff --git a/play-admin/src/main/java/com/starry/admin/utils/ExcelUtils.java b/play-admin/src/main/java/com/starry/admin/utils/ExcelUtils.java index 9b62c05..c96b2ae 100644 --- a/play-admin/src/main/java/com/starry/admin/utils/ExcelUtils.java +++ b/play-admin/src/main/java/com/starry/admin/utils/ExcelUtils.java @@ -1,11 +1,10 @@ package com.starry.admin.utils; import com.alibaba.excel.EasyExcel; - -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.List; +import javax.servlet.http.HttpServletResponse; /** * @author admin @@ -16,7 +15,8 @@ public class ExcelUtils { return EasyExcel.read(is).head(pojoClass).sheet().doReadSync(); } - public static void exportEasyExcel(HttpServletResponse response, Class pojoClass, List list, String sheetName) { + public static void exportEasyExcel(HttpServletResponse response, Class pojoClass, List list, + String sheetName) { try { EasyExcel.write(response.getOutputStream(), pojoClass).sheet(sheetName).doWrite(list); } catch (IOException e) { diff --git a/play-admin/src/main/java/com/starry/admin/utils/HttpUtils.java b/play-admin/src/main/java/com/starry/admin/utils/HttpUtils.java index 48991f0..a6a1993 100644 --- a/play-admin/src/main/java/com/starry/admin/utils/HttpUtils.java +++ b/play-admin/src/main/java/com/starry/admin/utils/HttpUtils.java @@ -1,5 +1,16 @@ package com.starry.admin.utils; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.security.KeyManagementException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpResponse; import org.apache.http.NameValuePair; @@ -18,18 +29,6 @@ import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicNameValuePair; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.security.KeyManagementException; -import java.security.NoSuchAlgorithmException; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - public class HttpUtils { /** @@ -43,10 +42,8 @@ public class HttpUtils { * @return * @throws Exception */ - public static HttpResponse doGet(String host, String path, String method, - Map headers, - Map querys) - throws Exception { + public static HttpResponse doGet(String host, String path, String method, Map headers, + Map querys) throws Exception { HttpClient httpClient = wrapClient(host); HttpGet request = new HttpGet(buildUrl(host, path, querys)); @@ -69,11 +66,8 @@ public class HttpUtils { * @return * @throws Exception */ - public static HttpResponse doPost(String host, String path, String method, - Map headers, - Map querys, - Map bodys) - throws Exception { + public static HttpResponse doPost(String host, String path, String method, Map headers, + Map querys, Map bodys) throws Exception { HttpClient httpClient = wrapClient(host); HttpPost request = new HttpPost(buildUrl(host, path, querys)); @@ -107,11 +101,8 @@ public class HttpUtils { * @return * @throws Exception */ - public static HttpResponse doPost(String host, String path, String method, - Map headers, - Map querys, - String body) - throws Exception { + public static HttpResponse doPost(String host, String path, String method, Map headers, + Map querys, String body) throws Exception { HttpClient httpClient = wrapClient(host); HttpPost request = new HttpPost(buildUrl(host, path, querys)); @@ -138,11 +129,8 @@ public class HttpUtils { * @return * @throws Exception */ - public static HttpResponse doPost(String host, String path, String method, - Map headers, - Map querys, - byte[] body) - throws Exception { + public static HttpResponse doPost(String host, String path, String method, Map headers, + Map querys, byte[] body) throws Exception { HttpClient httpClient = wrapClient(host); HttpPost request = new HttpPost(buildUrl(host, path, querys)); @@ -169,11 +157,8 @@ public class HttpUtils { * @return * @throws Exception */ - public static HttpResponse doPut(String host, String path, String method, - Map headers, - Map querys, - String body) - throws Exception { + public static HttpResponse doPut(String host, String path, String method, Map headers, + Map querys, String body) throws Exception { HttpClient httpClient = wrapClient(host); HttpPut request = new HttpPut(buildUrl(host, path, querys)); @@ -200,11 +185,8 @@ public class HttpUtils { * @return * @throws Exception */ - public static HttpResponse doPut(String host, String path, String method, - Map headers, - Map querys, - byte[] body) - throws Exception { + public static HttpResponse doPut(String host, String path, String method, Map headers, + Map querys, byte[] body) throws Exception { HttpClient httpClient = wrapClient(host); HttpPut request = new HttpPut(buildUrl(host, path, querys)); @@ -230,10 +212,8 @@ public class HttpUtils { * @return * @throws Exception */ - public static HttpResponse doDelete(String host, String path, String method, - Map headers, - Map querys) - throws Exception { + public static HttpResponse doDelete(String host, String path, String method, Map headers, + Map querys) throws Exception { HttpClient httpClient = wrapClient(host); HttpDelete request = new HttpDelete(buildUrl(host, path, querys)); @@ -244,7 +224,8 @@ public class HttpUtils { return httpClient.execute(request); } - private static String buildUrl(String host, String path, Map querys) throws UnsupportedEncodingException { + private static String buildUrl(String host, String path, Map querys) + throws UnsupportedEncodingException { StringBuilder sbUrl = new StringBuilder(); sbUrl.append(host); if (!StringUtils.isBlank(path)) { @@ -312,4 +293,4 @@ public class HttpUtils { throw new RuntimeException(ex); } } -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/utils/ListToStringHandle.java b/play-admin/src/main/java/com/starry/admin/utils/ListToStringHandle.java index dc57dd8..f288eb3 100644 --- a/play-admin/src/main/java/com/starry/admin/utils/ListToStringHandle.java +++ b/play-admin/src/main/java/com/starry/admin/utils/ListToStringHandle.java @@ -8,27 +8,26 @@ package com.starry.admin.utils; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.ibatis.type.BaseTypeHandler; -import org.apache.ibatis.type.JdbcType; - import java.sql.CallableStatement; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.ibatis.type.BaseTypeHandler; +import org.apache.ibatis.type.JdbcType; /** - * List ==> string + * List ==> string * * @Date 2022-10-08 */ public class ListToStringHandle extends BaseTypeHandler { - @Override - public void setNonNullParameter(PreparedStatement preparedStatement, int i, List list, JdbcType jdbcType) throws SQLException { + public void setNonNullParameter(PreparedStatement preparedStatement, int i, List list, JdbcType jdbcType) + throws SQLException { if (CollectionUtils.isNotEmpty(list)) { preparedStatement.setString(i, JSON.toJSONString(list)); } else { @@ -55,4 +54,3 @@ public class ListToStringHandle extends BaseTypeHandler { return result == null ? new ArrayList<>() : JSONArray.parseArray(result); } } - diff --git a/play-admin/src/main/java/com/starry/admin/utils/MoneyUtils.java b/play-admin/src/main/java/com/starry/admin/utils/MoneyUtils.java index e19a3b8..1189ce1 100644 --- a/play-admin/src/main/java/com/starry/admin/utils/MoneyUtils.java +++ b/play-admin/src/main/java/com/starry/admin/utils/MoneyUtils.java @@ -1,19 +1,19 @@ package com.starry.admin.utils; - import com.starry.admin.common.exception.CustomException; /** * 金额辅助类 + * * @author admin */ public class MoneyUtils { - /** * 校验金钱值是否正常 * - * @param money 金钱值 + * @param money + * 金钱值 */ public static void verificationTypeIsNormal(String money) { if (money == null || money.isEmpty()) { @@ -33,5 +33,4 @@ public class MoneyUtils { } } - } diff --git a/play-admin/src/main/java/com/starry/admin/utils/SecurityUtils.java b/play-admin/src/main/java/com/starry/admin/utils/SecurityUtils.java index b9797b2..7708887 100644 --- a/play-admin/src/main/java/com/starry/admin/utils/SecurityUtils.java +++ b/play-admin/src/main/java/com/starry/admin/utils/SecurityUtils.java @@ -1,6 +1,5 @@ package com.starry.admin.utils; - import com.starry.admin.common.domain.LoginUser; import com.starry.admin.common.security.entity.JwtUser; import com.starry.admin.modules.system.module.entity.SysUserEntity; @@ -80,7 +79,8 @@ public class SecurityUtils { /** * 生成BCryptPasswordEncoder密码 * - * @param password 密码 + * @param password + * 密码 * @return 加密字符串 */ public static String encryptPassword(String password) { @@ -91,8 +91,10 @@ public class SecurityUtils { /** * 判断密码是否相同 * - * @param rawPassword 真实密码 - * @param encodedPassword 加密后字符 + * @param rawPassword + * 真实密码 + * @param encodedPassword + * 加密后字符 * @return 结果 */ public static boolean matchesPassword(String rawPassword, String encodedPassword) { diff --git a/play-admin/src/main/java/com/starry/admin/utils/SmsUtils.java b/play-admin/src/main/java/com/starry/admin/utils/SmsUtils.java index 9ed758e..8d177a5 100644 --- a/play-admin/src/main/java/com/starry/admin/utils/SmsUtils.java +++ b/play-admin/src/main/java/com/starry/admin/utils/SmsUtils.java @@ -2,15 +2,14 @@ package com.starry.admin.utils; import cn.hutool.core.util.RandomUtil; import com.starry.common.redis.RedisCache; +import java.util.HashMap; +import java.util.Map; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpResponse; import org.apache.http.util.EntityUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.Map; - /** * @Author: huchuansai * @Date: 2024/7/29 5:41 PM @@ -33,17 +32,17 @@ public class SmsUtils { // 校验短信验证码是否正确 public void checkSmsCode(String phone, String code) { - //if(StringUtils.isEmpty(code)){ - // throw new RuntimeException("短信验证码必填"); - //} - //String key = "sms:phone:" + phone; - //Object data = redisCache.getCacheObject(key); - //if (Objects.isNull(data)) { - // throw new RuntimeException("短信验证码无效或已过期"); - //} - //if (!code.equals(data.toString())) { - // throw new RuntimeException("短信验证码错误"); - //} + // if(StringUtils.isEmpty(code)){ + // throw new RuntimeException("短信验证码必填"); + // } + // String key = "sms:phone:" + phone; + // Object data = redisCache.getCacheObject(key); + // if (Objects.isNull(data)) { + // throw new RuntimeException("短信验证码无效或已过期"); + // } + // if (!code.equals(data.toString())) { + // throw new RuntimeException("短信验证码错误"); + // } } private static void sendSms(String phone, String code, String templateId) { @@ -57,7 +56,7 @@ public class SmsUtils { Map querys = new HashMap<>(); Map bodys = new HashMap<>(); bodys.put("content", "code:" + code); - bodys.put("template_id", templateId); //注意，模板CST_11253 仅作调试使用，下发短信不稳定，请联系客服报备自己的专属签名模板，以保障业务稳定使用 + bodys.put("template_id", templateId); // 注意，模板CST_11253 仅作调试使用，下发短信不稳定，请联系客服报备自己的专属签名模板，以保障业务稳定使用 bodys.put("phone_number", phone); try { HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys); diff --git a/play-common/src/main/java/com/starry/common/annotation/DataScope.java b/play-common/src/main/java/com/starry/common/annotation/DataScope.java index eac2b19..3fef312 100644 --- a/play-common/src/main/java/com/starry/common/annotation/DataScope.java +++ b/play-common/src/main/java/com/starry/common/annotation/DataScope.java @@ -21,7 +21,6 @@ public @interface DataScope { */ String userAlias() default ""; - /** * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@ss获取，多个权限用逗号分隔开来 */ diff --git a/play-common/src/main/java/com/starry/common/annotation/EnumValue.java b/play-common/src/main/java/com/starry/common/annotation/EnumValue.java index f33720e..1e96aa8 100644 --- a/play-common/src/main/java/com/starry/common/annotation/EnumValue.java +++ b/play-common/src/main/java/com/starry/common/annotation/EnumValue.java @@ -1,14 +1,14 @@ package com.starry.common.annotation; -import javax.validation.Constraint; -import javax.validation.Payload; -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import javax.validation.Constraint; +import javax.validation.Payload; + /** * 枚举参数校验注解 * @@ -40,4 +40,4 @@ public @interface EnumValue { @interface List { EnumValue[] value(); } -} \ No newline at end of file +} diff --git a/play-common/src/main/java/com/starry/common/annotation/EnumValueValidator.java b/play-common/src/main/java/com/starry/common/annotation/EnumValueValidator.java index e366d33..b2ab85d 100644 --- a/play-common/src/main/java/com/starry/common/annotation/EnumValueValidator.java +++ b/play-common/src/main/java/com/starry/common/annotation/EnumValueValidator.java @@ -34,4 +34,4 @@ public class EnumValueValidator implements ConstraintValidator { private static final Long[] l = new Long[]{}; @Override - public void setNonNullParameter(PreparedStatement ps, int i, - Long[] parameter, JdbcType jdbcType) throws SQLException { + public void setNonNullParameter(PreparedStatement ps, int i, Long[] parameter, JdbcType jdbcType) + throws SQLException { ps.setString(i, JSONUtil.toJsonStr(parameter)); } @Override - public Long[] getNullableResult(ResultSet rs, String columnName) - throws SQLException { + public Long[] getNullableResult(ResultSet rs, String columnName) throws SQLException { return JSONUtil.parseArray(rs.getString(columnName)).toArray(l); } @Override - public Long[] getNullableResult(ResultSet rs, int columnIndex) - throws SQLException { + public Long[] getNullableResult(ResultSet rs, int columnIndex) throws SQLException { return JSONUtil.parseArray(rs.getString(columnIndex)).toArray(l); } @Override - public Long[] getNullableResult(CallableStatement cs, int columnIndex) - throws SQLException { + public Long[] getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { return JSONUtil.parseArray(cs.getString(columnIndex)).toArray(l); } diff --git a/play-common/src/main/java/com/starry/common/config/typehandler/ArrayStringTypeHandler.java b/play-common/src/main/java/com/starry/common/config/typehandler/ArrayStringTypeHandler.java index 7ba226a..30705f0 100644 --- a/play-common/src/main/java/com/starry/common/config/typehandler/ArrayStringTypeHandler.java +++ b/play-common/src/main/java/com/starry/common/config/typehandler/ArrayStringTypeHandler.java @@ -1,19 +1,17 @@ package com.starry.common.config.typehandler; import cn.hutool.json.JSONUtil; +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.MappedJdbcTypes; import org.apache.ibatis.type.MappedTypes; -import java.sql.CallableStatement; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - /** - * 存储到数据库, 将String数组转换成字符串; - * 从数据库获取数据, 将字符串转为LONG数组. + * 存储到数据库, 将String数组转换成字符串; 从数据库获取数据, 将字符串转为LONG数组. */ @MappedTypes({String[].class}) @MappedJdbcTypes({JdbcType.VARCHAR}) @@ -22,26 +20,23 @@ public class ArrayStringTypeHandler extends BaseTypeHandler { private static final String[] l = new String[]{}; @Override - public void setNonNullParameter(PreparedStatement ps, int i, - String[] parameter, JdbcType jdbcType) throws SQLException { + public void setNonNullParameter(PreparedStatement ps, int i, String[] parameter, JdbcType jdbcType) + throws SQLException { ps.setString(i, JSONUtil.toJsonStr(parameter)); } @Override - public String[] getNullableResult(ResultSet rs, String columnName) - throws SQLException { + public String[] getNullableResult(ResultSet rs, String columnName) throws SQLException { return JSONUtil.parseArray(rs.getString(columnName)).toArray(l); } @Override - public String[] getNullableResult(ResultSet rs, int columnIndex) - throws SQLException { + public String[] getNullableResult(ResultSet rs, int columnIndex) throws SQLException { return JSONUtil.parseArray(rs.getString(columnIndex)).toArray(l); } @Override - public String[] getNullableResult(CallableStatement cs, int columnIndex) - throws SQLException { + public String[] getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { return JSONUtil.parseArray(cs.getString(columnIndex)).toArray(l); } diff --git a/play-common/src/main/java/com/starry/common/config/typehandler/JsonTypeHandler.java b/play-common/src/main/java/com/starry/common/config/typehandler/JsonTypeHandler.java index ca95a81..bc34a9f 100644 --- a/play-common/src/main/java/com/starry/common/config/typehandler/JsonTypeHandler.java +++ b/play-common/src/main/java/com/starry/common/config/typehandler/JsonTypeHandler.java @@ -2,34 +2,31 @@ package com.starry.common.config.typehandler; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.MappedJdbcTypes; import org.apache.ibatis.type.MappedTypes; -import java.sql.CallableStatement; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - /** - * 存储到数据库, 将JSON对象转换成字符串; - * 从数据库获取数据, 将字符串转为JSON对象. + * 存储到数据库, 将JSON对象转换成字符串; 从数据库获取数据, 将字符串转为JSON对象. */ @MappedTypes({JSONObject.class}) @MappedJdbcTypes({JdbcType.VARCHAR}) public class JsonTypeHandler extends BaseTypeHandler { @Override - public void setNonNullParameter(PreparedStatement ps, int i, JSONObject parameter, - JdbcType jdbcType) throws SQLException { + public void setNonNullParameter(PreparedStatement ps, int i, JSONObject parameter, JdbcType jdbcType) + throws SQLException { ps.setString(i, JSONUtil.toJsonStr(parameter)); } @Override - public JSONObject getNullableResult(ResultSet rs, String columnName) - throws SQLException { + public JSONObject getNullableResult(ResultSet rs, String columnName) throws SQLException { return JSONUtil.parseObj(rs.getString(columnName)).toBean(JSONObject.class); } @@ -41,8 +38,7 @@ public class JsonTypeHandler extends BaseTypeHandler { } @Override - public JSONObject getNullableResult(CallableStatement cs, int columnIndex) - throws SQLException { + public JSONObject getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { return JSONUtil.parseObj(cs.getString(columnIndex)).toBean(JSONObject.class); } diff --git a/play-common/src/main/java/com/starry/common/constant/Constants.java b/play-common/src/main/java/com/starry/common/constant/Constants.java index c8e48d7..1657ff7 100644 --- a/play-common/src/main/java/com/starry/common/constant/Constants.java +++ b/play-common/src/main/java/com/starry/common/constant/Constants.java @@ -1,8 +1,7 @@ package com.starry.common.constant; /** - * @author admin - * 通用常量信息 + * @author admin 通用常量信息 */ public class Constants { @@ -66,7 +65,4 @@ public class Constants { public static final String LOGIN_USER_KEY_MINI = "login_user_key_mini"; public static final String LOGIN_USER_KEY_COSER = "login_user_key_coser"; - - - } diff --git a/play-common/src/main/java/com/starry/common/constant/SecurityConstants.java b/play-common/src/main/java/com/starry/common/constant/SecurityConstants.java index 6aa934c..72efcfd 100644 --- a/play-common/src/main/java/com/starry/common/constant/SecurityConstants.java +++ b/play-common/src/main/java/com/starry/common/constant/SecurityConstants.java @@ -1,8 +1,7 @@ package com.starry.common.constant; /** - * @author admin - * 权限相关常量 + * @author admin 权限相关常量 */ public class SecurityConstants { /** diff --git a/play-common/src/main/java/com/starry/common/constant/UserConstants.java b/play-common/src/main/java/com/starry/common/constant/UserConstants.java index 14daae4..4ab6c03 100644 --- a/play-common/src/main/java/com/starry/common/constant/UserConstants.java +++ b/play-common/src/main/java/com/starry/common/constant/UserConstants.java @@ -7,7 +7,7 @@ package com.starry.common.constant; public class UserConstants { /** - * 校验返回结果码 0：唯一 1：不唯一 + * 校验返回结果码 0：唯一 1：不唯一 */ public final static String UNIQUE = "0"; public final static String NOT_UNIQUE = "1"; diff --git a/play-common/src/main/java/com/starry/common/context/CustomSecurityContextHolder.java b/play-common/src/main/java/com/starry/common/context/CustomSecurityContextHolder.java index ac55741..14a5c92 100644 --- a/play-common/src/main/java/com/starry/common/context/CustomSecurityContextHolder.java +++ b/play-common/src/main/java/com/starry/common/context/CustomSecurityContextHolder.java @@ -4,13 +4,11 @@ import cn.hutool.core.convert.Convert; import com.alibaba.ttl.TransmittableThreadLocal; import com.starry.common.constant.SecurityConstants; import com.starry.common.utils.StringUtils; - import java.util.Map; import java.util.concurrent.ConcurrentHashMap; /** - * @author admin - * 获取当前线程变量中的 租户id 部门id 用户id、用户名称、Token等信息 + * @author admin 获取当前线程变量中的 租户id 部门id 用户id、用户名称、Token等信息 * @since 2023/3/6 */ public class CustomSecurityContextHolder { @@ -27,7 +25,6 @@ public class CustomSecurityContextHolder { return Convert.toStr(map.getOrDefault(key, StringUtils.EMPTY)); } - public static T get(String key, Class clazz) { Map map = getLocalMap(); return StringUtils.cast(map.getOrDefault(key, null)); @@ -46,7 +43,6 @@ public class CustomSecurityContextHolder { THREAD_LOCAL.set(threadLocalMap); } - public static String getTenantId() { return Convert.toStr(get(SecurityConstants.DETAILS_TENANT_ID), "9999"); } diff --git a/play-common/src/main/java/com/starry/common/controller/CaptchaController.java b/play-common/src/main/java/com/starry/common/controller/CaptchaController.java index 83d55a4..c1f01ed 100644 --- a/play-common/src/main/java/com/starry/common/controller/CaptchaController.java +++ b/play-common/src/main/java/com/starry/common/controller/CaptchaController.java @@ -1,20 +1,17 @@ package com.starry.common.controller; - import com.starry.common.domain.Captcha; import com.starry.common.redis.CaptchaService; import com.starry.common.result.R; import io.swagger.annotations.ApiOperation; +import javax.annotation.Resource; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; - /** - * @author admin - * 验证码前端控制器 + * @author admin 验证码前端控制器 * @since 2022/7/7 */ @RestController diff --git a/play-common/src/main/java/com/starry/common/domain/BaseEntity.java b/play-common/src/main/java/com/starry/common/domain/BaseEntity.java index ce20b3f..2875b91 100644 --- a/play-common/src/main/java/com/starry/common/domain/BaseEntity.java +++ b/play-common/src/main/java/com/starry/common/domain/BaseEntity.java @@ -4,20 +4,18 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; +import javax.persistence.MappedSuperclass; +import javax.persistence.Transient; +import lombok.Getter; +import lombok.Setter; +import org.springframework.format.annotation.DateTimeFormat; /** - * @author admin - * 基类 + * @author admin 基类 * @since 2022/7/14 */ @Getter diff --git a/play-common/src/main/java/com/starry/common/domain/BasePageEntity.java b/play-common/src/main/java/com/starry/common/domain/BasePageEntity.java index 079b2f5..cd1031a 100644 --- a/play-common/src/main/java/com/starry/common/domain/BasePageEntity.java +++ b/play-common/src/main/java/com/starry/common/domain/BasePageEntity.java @@ -3,16 +3,14 @@ package com.starry.common.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; import lombok.Data; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; -import java.io.Serializable; -import java.util.Date; - /** - * @author admin - * 分页基类 + * @author admin 分页基类 * @since 2021/9/2 */ @Data @@ -64,4 +62,3 @@ public class BasePageEntity implements Serializable { private String endTime; } - diff --git a/play-common/src/main/java/com/starry/common/domain/Captcha.java b/play-common/src/main/java/com/starry/common/domain/Captcha.java index 9d033f6..be7f35c 100644 --- a/play-common/src/main/java/com/starry/common/domain/Captcha.java +++ b/play-common/src/main/java/com/starry/common/domain/Captcha.java @@ -3,8 +3,7 @@ package com.starry.common.domain; import lombok.Data; /** - * @author admin - * 验证码拼图类 + * @author admin 验证码拼图类 */ @Data public class Captcha { diff --git a/play-common/src/main/java/com/starry/common/enums/BusinessType.java b/play-common/src/main/java/com/starry/common/enums/BusinessType.java index 0aee865..8092f8c 100644 --- a/play-common/src/main/java/com/starry/common/enums/BusinessType.java +++ b/play-common/src/main/java/com/starry/common/enums/BusinessType.java @@ -1,8 +1,7 @@ package com.starry.common.enums; /** - * @author admin - * 业务操作类型 + * @author admin 业务操作类型 * @since 2022/7/22 */ public enum BusinessType { diff --git a/play-common/src/main/java/com/starry/common/filter/RepeatableFilter.java b/play-common/src/main/java/com/starry/common/filter/RepeatableFilter.java index 72d33de..1e405d1 100644 --- a/play-common/src/main/java/com/starry/common/filter/RepeatableFilter.java +++ b/play-common/src/main/java/com/starry/common/filter/RepeatableFilter.java @@ -1,11 +1,10 @@ package com.starry.common.filter; import com.starry.common.utils.StringUtils; -import org.springframework.http.MediaType; - +import java.io.IOException; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; -import java.io.IOException; +import org.springframework.http.MediaType; /** * Repeatable 过滤器 diff --git a/play-common/src/main/java/com/starry/common/filter/RepeatedlyRequestWrapper.java b/play-common/src/main/java/com/starry/common/filter/RepeatedlyRequestWrapper.java index 11c6205..236b077 100644 --- a/play-common/src/main/java/com/starry/common/filter/RepeatedlyRequestWrapper.java +++ b/play-common/src/main/java/com/starry/common/filter/RepeatedlyRequestWrapper.java @@ -1,17 +1,15 @@ package com.starry.common.filter; - import com.starry.common.utils.http.HttpHelper; - +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStreamReader; import javax.servlet.ReadListener; import javax.servlet.ServletInputStream; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStreamReader; /** * 构建可重复读取inputStream的request diff --git a/play-common/src/main/java/com/starry/common/filter/XssFilter.java b/play-common/src/main/java/com/starry/common/filter/XssFilter.java index 2923fd4..9d8bd7d 100644 --- a/play-common/src/main/java/com/starry/common/filter/XssFilter.java +++ b/play-common/src/main/java/com/starry/common/filter/XssFilter.java @@ -1,16 +1,15 @@ package com.starry.common.filter; import cn.hutool.core.util.StrUtil; - -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * 防止XSS攻击的过滤器 @@ -76,4 +75,4 @@ public class XssFilter implements Filter { public void destroy() { } -} \ No newline at end of file +} diff --git a/play-common/src/main/java/com/starry/common/filter/XssHttpServletRequestWrapper.java b/play-common/src/main/java/com/starry/common/filter/XssHttpServletRequestWrapper.java index 4dc125d..a25c475 100644 --- a/play-common/src/main/java/com/starry/common/filter/XssHttpServletRequestWrapper.java +++ b/play-common/src/main/java/com/starry/common/filter/XssHttpServletRequestWrapper.java @@ -2,17 +2,16 @@ package com.starry.common.filter; import com.starry.common.utils.StringUtils; import com.starry.common.utils.html.EscapeUtil; -import org.apache.commons.io.IOUtils; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; - +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.nio.charset.StandardCharsets; import javax.servlet.ReadListener; import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.nio.charset.StandardCharsets; +import org.apache.commons.io.IOUtils; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; /** * XSS过滤处理 @@ -87,4 +86,4 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { String header = super.getHeader(HttpHeaders.CONTENT_TYPE); return MediaType.APPLICATION_JSON_VALUE.equalsIgnoreCase(header); } -} \ No newline at end of file +} diff --git a/play-common/src/main/java/com/starry/common/redis/CaptchaService.java b/play-common/src/main/java/com/starry/common/redis/CaptchaService.java index 4e925b2..b418bfd 100644 --- a/play-common/src/main/java/com/starry/common/redis/CaptchaService.java +++ b/play-common/src/main/java/com/starry/common/redis/CaptchaService.java @@ -4,14 +4,13 @@ import cn.hutool.core.util.StrUtil; import com.starry.common.constant.CacheConstants; import com.starry.common.domain.Captcha; import com.starry.common.utils.CaptchaUtils; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.data.redis.core.ValueOperations; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; import java.awt.image.BufferedImage; import java.util.UUID; import java.util.concurrent.TimeUnit; +import javax.annotation.Resource; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.stereotype.Service; /** * 验证码服务 diff --git a/play-common/src/main/java/com/starry/common/redis/RedisCache.java b/play-common/src/main/java/com/starry/common/redis/RedisCache.java index 1360506..7224c01 100644 --- a/play-common/src/main/java/com/starry/common/redis/RedisCache.java +++ b/play-common/src/main/java/com/starry/common/redis/RedisCache.java @@ -1,14 +1,13 @@ package com.starry.common.redis; +import java.util.Collection; +import java.util.concurrent.TimeUnit; +import javax.annotation.Resource; import org.springframework.dao.QueryTimeoutException; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Component; -import javax.annotation.Resource; -import java.util.Collection; -import java.util.concurrent.TimeUnit; - /** * @author rieds 工具类 * @since 2022/8/26 @@ -22,7 +21,8 @@ public class RedisCache { /** * 获得缓存的基本对象。 * - * @param key 缓存键值 + * @param key + * 缓存键值 * @return 缓存键值对应的数据 */ public T getCacheObject(final String key) { @@ -38,8 +38,10 @@ public class RedisCache { /** * 缓存基本的对象，Integer、String、实体类等 * - * @param key 缓存的键值 - * @param value 缓存的值 + * @param key + * 缓存的键值 + * @param value + * 缓存的值 */ public void setCacheObject(final String key, final T value) { redisTemplate.opsForValue().set(key, value); @@ -48,10 +50,14 @@ public class RedisCache { /** * 缓存基本的对象，Integer、String、实体类等 * - * @param key 缓存的键值 - * @param value 缓存的值 - * @param timeout 过期时间 - * @param timeUnit 时间颗粒度 + * @param key + * 缓存的键值 + * @param value + * 缓存的值 + * @param timeout + * 过期时间 + * @param timeUnit + * 时间颗粒度 */ public void setCacheObject(final String key, final T value, final Long timeout, final TimeUnit timeUnit) { redisTemplate.opsForValue().set(key, value, timeout, timeUnit); @@ -69,7 +75,8 @@ public class RedisCache { /** * 获得缓存的基本对象列表 * - * @param pattern 字符串前缀 + * @param pattern + * 字符串前缀 * @return 对象列表 */ public Collection keys(final String pattern) { @@ -79,7 +86,8 @@ public class RedisCache { /** * 删除集合对象 * - * @param collection 多个对象 + * @param collection + * 多个对象 * @return */ public long deleteObject(final Collection collection) { diff --git a/play-common/src/main/java/com/starry/common/result/R.java b/play-common/src/main/java/com/starry/common/result/R.java index 30c9a6f..8dcfadc 100644 --- a/play-common/src/main/java/com/starry/common/result/R.java +++ b/play-common/src/main/java/com/starry/common/result/R.java @@ -1,13 +1,11 @@ package com.starry.common.result; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.beans.ConstructorProperties; import java.io.Serializable; +import lombok.Data; /** * @author admin @@ -49,7 +47,8 @@ public class R implements Serializable { Page page = (Page) data; this.total = page.getTotal(); this.data = page.getRecords(); - this.pageInfo = new PageInfo((int) page.getCurrent(), (int) page.getSize(), page.getTotal(), page.getPages()); + this.pageInfo = new PageInfo((int) page.getCurrent(), (int) page.getSize(), page.getTotal(), + page.getPages()); } else { this.data = data; } diff --git a/play-common/src/main/java/com/starry/common/result/ResultCodeEnum.java b/play-common/src/main/java/com/starry/common/result/ResultCodeEnum.java index 207ce37..cfaa7e2 100644 --- a/play-common/src/main/java/com/starry/common/result/ResultCodeEnum.java +++ b/play-common/src/main/java/com/starry/common/result/ResultCodeEnum.java @@ -1,17 +1,12 @@ package com.starry.common.result; /** - * @author admin - * 返回码枚举 + * @author admin 返回码枚举 */ public enum ResultCodeEnum implements IBaseEnum { - SUCCESS(200, "操作成功"), - FAILED(500, "操作失败"), - VALIDATE_FAILED(404, "参数检验失败"), - UNAUTHORIZED(401, "无效的会话，或者会话已过期，请重新登录。"), - FORBIDDEN(403, "没有相关权限"), - TENANT_NOT_FOUND(403, "租户不存在"); + SUCCESS(200, "操作成功"), FAILED(500, "操作失败"), VALIDATE_FAILED(404, "参数检验失败"), UNAUTHORIZED(401, + "无效的会话，或者会话已过期，请重新登录。"), FORBIDDEN(403, "没有相关权限"), TENANT_NOT_FOUND(403, "租户不存在"); private final int code; private final String message; diff --git a/play-common/src/main/java/com/starry/common/sensitive/Sensitive.java b/play-common/src/main/java/com/starry/common/sensitive/Sensitive.java index 9b5d7b3..9071721 100644 --- a/play-common/src/main/java/com/starry/common/sensitive/Sensitive.java +++ b/play-common/src/main/java/com/starry/common/sensitive/Sensitive.java @@ -2,7 +2,6 @@ package com.starry.common.sensitive; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/play-common/src/main/java/com/starry/common/sensitive/SensitiveSerialize.java b/play-common/src/main/java/com/starry/common/sensitive/SensitiveSerialize.java index 15f452e..fd460bf 100644 --- a/play-common/src/main/java/com/starry/common/sensitive/SensitiveSerialize.java +++ b/play-common/src/main/java/com/starry/common/sensitive/SensitiveSerialize.java @@ -6,16 +6,15 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; +import java.io.IOException; +import java.util.Objects; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; -import java.io.IOException; -import java.util.Objects; - /** * @author admin - *

- * 脱敏序列化 + *

+ * 脱敏序列化 */ @NoArgsConstructor @AllArgsConstructor @@ -25,30 +24,31 @@ public class SensitiveSerialize extends JsonSerializer implements Contex @Override public void serialize(final String originStr, final JsonGenerator jsonGenerator, - final SerializerProvider serializerProvider) throws IOException { + final SerializerProvider serializerProvider) throws IOException { switch (type) { - case CHINESE_NAME: + case CHINESE_NAME : jsonGenerator.writeString(SensitiveUtils.chineseName(originStr)); break; - case MOBILE_PHONE: + case MOBILE_PHONE : jsonGenerator.writeString(SensitiveUtils.mobilePhone(originStr)); break; - case EMAIL: + case EMAIL : jsonGenerator.writeString(SensitiveUtils.email(originStr)); break; - case PASSWORD: + case PASSWORD : jsonGenerator.writeString(SensitiveUtils.password(originStr)); break; - case KEY: + case KEY : jsonGenerator.writeString(SensitiveUtils.key(originStr)); break; - default: + default : throw new IllegalArgumentException("未定义的敏感信息枚举类" + type); } } @Override - public JsonSerializer createContextual(final SerializerProvider serializerProvider, final BeanProperty beanProperty) throws JsonMappingException { + public JsonSerializer createContextual(final SerializerProvider serializerProvider, + final BeanProperty beanProperty) throws JsonMappingException { if (beanProperty != null) { if (Objects.equals(beanProperty.getType().getRawClass(), String.class)) { Sensitive sensitive = beanProperty.getAnnotation(Sensitive.class); diff --git a/play-common/src/main/java/com/starry/common/sensitive/SensitiveUtils.java b/play-common/src/main/java/com/starry/common/sensitive/SensitiveUtils.java index 7b7365d..12602ca 100644 --- a/play-common/src/main/java/com/starry/common/sensitive/SensitiveUtils.java +++ b/play-common/src/main/java/com/starry/common/sensitive/SensitiveUtils.java @@ -32,10 +32,14 @@ public class SensitiveUtils { /** * 对字符串进行脱敏操作 * - * @param originStr 原始字符串 - * @param prefixNoMaskLen 左侧需要保留几位明文字段 - * @param suffixNoMaskLen 右侧需要保留几位明文字段 - * @param maskStr 用于遮罩的字符串, 如'*' + * @param originStr + * 原始字符串 + * @param prefixNoMaskLen + * 左侧需要保留几位明文字段 + * @param suffixNoMaskLen + * 右侧需要保留几位明文字段 + * @param maskStr + * 用于遮罩的字符串, 如'*' * @return 脱敏后结果 */ public static String process(String originStr, int prefixNoMaskLen, int suffixNoMaskLen, String maskStr) { @@ -61,7 +65,8 @@ public class SensitiveUtils { /** * 中文姓名只显示最后一个汉字 * - * @param fullName 姓名 + * @param fullName + * 姓名 * @return */ public static String chineseName(String fullName) { @@ -74,7 +79,8 @@ public class SensitiveUtils { /** * 手机号码前三位，后四位，如186****2356 * - * @param num 手机号码 + * @param num + * 手机号码 * @return */ public static String mobilePhone(String num) { @@ -84,7 +90,8 @@ public class SensitiveUtils { /** * 地址只显示到地区 * - * @param address 地址 + * @param address + * 地址 * @return */ public static String address(String address) { @@ -94,7 +101,8 @@ public class SensitiveUtils { /** * 电子邮箱 仅显示第一个字母，@后面的地址显示，比如：r**@qq.com * - * @param email 电子邮箱 + * @param email + * 电子邮箱 * @return */ public static String email(String email) { @@ -113,7 +121,8 @@ public class SensitiveUtils { /** * 密码的全部字符，如：****** * - * @param password 密码 + * @param password + * 密码 * @return */ public static String password(String password) { @@ -126,7 +135,8 @@ public class SensitiveUtils { /** * 密钥除了最后三位，全部，比如：***klo * - * @param key 密钥 + * @param key + * 密钥 * @return 结果 */ public static String key(String key) { @@ -152,4 +162,4 @@ public class SensitiveUtils { String s = mobilePhone("18653653621"); System.out.println(s); } -} \ No newline at end of file +} diff --git a/play-common/src/main/java/com/starry/common/utils/Arith.java b/play-common/src/main/java/com/starry/common/utils/Arith.java index e6df8a0..5f1046e 100644 --- a/play-common/src/main/java/com/starry/common/utils/Arith.java +++ b/play-common/src/main/java/com/starry/common/utils/Arith.java @@ -24,8 +24,10 @@ public class Arith { /** * 提供精确的加法运算。 * - * @param v1 被加数 - * @param v2 加数 + * @param v1 + * 被加数 + * @param v2 + * 加数 * @return 两个参数的和 */ public static double add(double v1, double v2) { @@ -37,8 +39,10 @@ public class Arith { /** * 提供精确的减法运算。 * - * @param v1 被减数 - * @param v2 减数 + * @param v1 + * 被减数 + * @param v2 + * 减数 * @return 两个参数的差 */ public static double sub(double v1, double v2) { @@ -50,8 +54,10 @@ public class Arith { /** * 提供精确的乘法运算。 * - * @param v1 被乘数 - * @param v2 乘数 + * @param v1 + * 被乘数 + * @param v2 + * 乘数 * @return 两个参数的积 */ public static double mul(double v1, double v2) { @@ -61,11 +67,12 @@ public class Arith { } /** - * 提供（相对）精确的除法运算，当发生除不尽的情况时，精确到 - * 小数点以后10位，以后的数字四舍五入。 + * 提供（相对）精确的除法运算，当发生除不尽的情况时，精确到 小数点以后10位，以后的数字四舍五入。 * - * @param v1 被除数 - * @param v2 除数 + * @param v1 + * 被除数 + * @param v2 + * 除数 * @return 两个参数的商 */ public static double div(double v1, double v2) { @@ -73,18 +80,19 @@ public class Arith { } /** - * 提供（相对）精确的除法运算。当发生除不尽的情况时，由scale参数指 - * 定精度，以后的数字四舍五入。 + * 提供（相对）精确的除法运算。当发生除不尽的情况时，由scale参数指 定精度，以后的数字四舍五入。 * - * @param v1 被除数 - * @param v2 除数 - * @param scale 表示表示需要精确到小数点以后几位。 + * @param v1 + * 被除数 + * @param v2 + * 除数 + * @param scale + * 表示表示需要精确到小数点以后几位。 * @return 两个参数的商 */ public static double div(double v1, double v2, int scale) { if (scale < 0) { - throw new IllegalArgumentException( - "The scale must be a positive integer or zero"); + throw new IllegalArgumentException("The scale must be a positive integer or zero"); } BigDecimal b1 = new BigDecimal(Double.toString(v1)); BigDecimal b2 = new BigDecimal(Double.toString(v2)); @@ -97,14 +105,15 @@ public class Arith { /** * 提供精确的小数位四舍五入处理。 * - * @param v 需要四舍五入的数字 - * @param scale 小数点后保留几位 + * @param v + * 需要四舍五入的数字 + * @param scale + * 小数点后保留几位 * @return 四舍五入后的结果 */ public static double round(double v, int scale) { if (scale < 0) { - throw new IllegalArgumentException( - "The scale must be a positive integer or zero"); + throw new IllegalArgumentException("The scale must be a positive integer or zero"); } BigDecimal b = new BigDecimal(Double.toString(v)); BigDecimal one = BigDecimal.ONE; diff --git a/play-common/src/main/java/com/starry/common/utils/CaptchaUtils.java b/play-common/src/main/java/com/starry/common/utils/CaptchaUtils.java index 1fe3e8c..b3adc5b 100644 --- a/play-common/src/main/java/com/starry/common/utils/CaptchaUtils.java +++ b/play-common/src/main/java/com/starry/common/utils/CaptchaUtils.java @@ -1,10 +1,6 @@ package com.starry.common.utils; - import com.starry.common.domain.Captcha; -import org.apache.commons.lang3.RandomUtils; - -import javax.imageio.ImageIO; import java.awt.*; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; @@ -14,6 +10,8 @@ import java.net.URL; import java.util.Base64; import java.util.Objects; import java.util.Random; +import javax.imageio.ImageIO; +import org.apache.commons.lang3.RandomUtils; /** * @author 拼图验证码工具类 @@ -110,7 +108,8 @@ public class CaptchaUtils { /** * 抠图，并生成阻塞块 **/ - public static void cutByTemplate(BufferedImage canvasImage, BufferedImage blockImage, int blockWidth, int blockHeight, int blockRadius, int blockX, int blockY) { + public static void cutByTemplate(BufferedImage canvasImage, BufferedImage blockImage, int blockWidth, + int blockHeight, int blockRadius, int blockX, int blockY) { BufferedImage waterImage = new BufferedImage(blockWidth, blockHeight, BufferedImage.TYPE_4BYTE_ABGR); // 阻塞块的轮廓图 int[][] blockData = getBlockData(blockWidth, blockHeight, blockRadius); @@ -124,7 +123,8 @@ public class CaptchaUtils { waterImage.setRGB(i, j, Color.BLACK.getRGB()); blockImage.setRGB(i, j, canvasImage.getRGB(blockX + i, blockY + j)); // 轮廓设置为白色，取带像素和无像素的界点，判断该点是不是临界轮廓点 - if (blockData[i + 1][j] == 0 || blockData[i][j + 1] == 0 || blockData[i - 1][j] == 0 || blockData[i][j - 1] == 0) { + if (blockData[i + 1][j] == 0 || blockData[i][j + 1] == 0 || blockData[i - 1][j] == 0 + || blockData[i][j - 1] == 0) { blockImage.setRGB(i, j, Color.WHITE.getRGB()); waterImage.setRGB(i, j, Color.WHITE.getRGB()); } @@ -169,7 +169,8 @@ public class CaptchaUtils { for (int j = 0; j < blockHeight; j++) { data[i][j] = 0; // 创建中间的方形区域 - if ((i >= blockRadius && i <= blockWidth - blockRadius && j >= blockRadius && j <= blockHeight - blockRadius)) { + if ((i >= blockRadius && i <= blockWidth - blockRadius && j >= blockRadius + && j <= blockHeight - blockRadius)) { data[i][j] = 1; } double d1 = Math.pow(i - Objects.requireNonNull(circle1)[0], 2) + Math.pow(j - circle1[1], 2); diff --git a/play-common/src/main/java/com/starry/common/utils/ConvertUtil.java b/play-common/src/main/java/com/starry/common/utils/ConvertUtil.java index 432bdee..ce0e5a2 100644 --- a/play-common/src/main/java/com/starry/common/utils/ConvertUtil.java +++ b/play-common/src/main/java/com/starry/common/utils/ConvertUtil.java @@ -1,12 +1,10 @@ package com.starry.common.utils; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; - import java.util.ArrayList; import java.util.Collection; import java.util.List; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; /** * @author admin @@ -14,7 +12,6 @@ import java.util.List; @Slf4j public class ConvertUtil { - public static T entityToVo(Object source, Class target) { if (source == null) { return null; diff --git a/play-common/src/main/java/com/starry/common/utils/HttpUtils.java b/play-common/src/main/java/com/starry/common/utils/HttpUtils.java index fb7d09f..b36bb47 100644 --- a/play-common/src/main/java/com/starry/common/utils/HttpUtils.java +++ b/play-common/src/main/java/com/starry/common/utils/HttpUtils.java @@ -1,9 +1,5 @@ package com.starry.common.utils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.net.ssl.*; import java.io.*; import java.net.ConnectException; import java.net.SocketTimeoutException; @@ -11,6 +7,9 @@ import java.net.URL; import java.net.URLConnection; import java.nio.charset.StandardCharsets; import java.security.cert.X509Certificate; +import javax.net.ssl.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * 通用http发送方法 @@ -23,7 +22,8 @@ public class HttpUtils { /** * 向指定 URL 发送GET方法的请求 * - * @param url 发送请求的 URL + * @param url + * 发送请求的 URL * @return 所代表远程资源的响应结果 */ public static String sendGet(String url) { @@ -33,8 +33,10 @@ public class HttpUtils { /** * 向指定 URL 发送GET方法的请求 * - * @param url 发送请求的 URL - * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @param url + * 发送请求的 URL + * @param param + * 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 * @return 所代表远程资源的响应结果 */ public static String sendGet(String url, String param) { @@ -44,9 +46,12 @@ public class HttpUtils { /** * 向指定 URL 发送GET方法的请求 * - * @param url 发送请求的 URL - * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 - * @param contentType 编码类型 + * @param url + * 发送请求的 URL + * @param param + * 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @param contentType + * 编码类型 * @return 所代表远程资源的响应结果 */ public static String sendGet(String url, String param, String contentType) { @@ -90,8 +95,10 @@ public class HttpUtils { /** * 向指定 URL 发送POST方法的请求 * - * @param url 发送请求的 URL - * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @param url + * 发送请求的 URL + * @param param + * 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 * @return 所代表远程资源的响应结果 */ public static String sendPost(String url, String param) { @@ -205,4 +212,4 @@ public class HttpUtils { return true; } } -} \ No newline at end of file +} diff --git a/play-common/src/main/java/com/starry/common/utils/IdUtils.java b/play-common/src/main/java/com/starry/common/utils/IdUtils.java index 6f71c0f..ba78910 100644 --- a/play-common/src/main/java/com/starry/common/utils/IdUtils.java +++ b/play-common/src/main/java/com/starry/common/utils/IdUtils.java @@ -8,7 +8,6 @@ import cn.hutool.core.util.RandomUtil; **/ public class IdUtils { - /** * 生成8位的UUID * diff --git a/play-common/src/main/java/com/starry/common/utils/RegionUtils.java b/play-common/src/main/java/com/starry/common/utils/RegionUtils.java index 87cb53d..ba85014 100644 --- a/play-common/src/main/java/com/starry/common/utils/RegionUtils.java +++ b/play-common/src/main/java/com/starry/common/utils/RegionUtils.java @@ -5,6 +5,10 @@ package com.starry.common.utils; * @since 2024/7/25 下午3:15 **/ +import java.io.File; +import java.io.InputStream; +import java.lang.reflect.Method; +import java.util.Objects; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.lionsoul.ip2region.DataBlock; @@ -13,11 +17,6 @@ import org.lionsoul.ip2region.DbSearcher; import org.lionsoul.ip2region.Util; import org.springframework.core.io.ClassPathResource; -import java.io.File; -import java.io.InputStream; -import java.lang.reflect.Method; -import java.util.Objects; - /** * 根据ip离线查询地址 * @@ -74,16 +73,16 @@ public class RegionUtils { int algorithm = DbSearcher.MEMORY_ALGORITYM; Method method = null; switch (algorithm) { - case DbSearcher.BTREE_ALGORITHM: + case DbSearcher.BTREE_ALGORITHM : method = searcher.getClass().getMethod("btreeSearch", String.class); break; - case DbSearcher.BINARY_ALGORITHM: + case DbSearcher.BINARY_ALGORITHM : method = searcher.getClass().getMethod("binarySearch", String.class); break; - case DbSearcher.MEMORY_ALGORITYM: + case DbSearcher.MEMORY_ALGORITYM : method = searcher.getClass().getMethod("memorySearch", String.class); break; - default: + default : return StringUtils.EMPTY; } @@ -103,4 +102,4 @@ public class RegionUtils { return StringUtils.EMPTY; } -} \ No newline at end of file +} diff --git a/play-common/src/main/java/com/starry/common/utils/ServletUtils.java b/play-common/src/main/java/com/starry/common/utils/ServletUtils.java index 7300029..42c96c6 100644 --- a/play-common/src/main/java/com/starry/common/utils/ServletUtils.java +++ b/play-common/src/main/java/com/starry/common/utils/ServletUtils.java @@ -1,18 +1,16 @@ package com.starry.common.utils; - import cn.hutool.core.convert.Convert; -import org.springframework.web.context.request.RequestAttributes; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; /** * 客户端工具类 @@ -91,8 +89,10 @@ public class ServletUtils { /** * 将字符串渲染到客户端 * - * @param response 渲染对象 - * @param string 待渲染的字符串 + * @param response + * 渲染对象 + * @param string + * 待渲染的字符串 */ public static void renderString(HttpServletResponse response, String string) { try { @@ -110,34 +110,27 @@ public class ServletUtils { * * @param request */ - /*public static boolean isAjaxRequest(HttpServletRequest request) - { - String accept = request.getHeader("accept"); - if (accept != null && accept.contains("application/json")) - { - return true; - } - - String xRequestedWith = request.getHeader("X-Requested-With"); - if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) - { - return true; - } - - String uri = request.getRequestURI(); - if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml")) - { - return true; - } - - String ajax = request.getParameter("__ajax"); - return StringUtils.inStringIgnoreCase(ajax, "json", "xml"); - }*/ + /* + * public static boolean isAjaxRequest(HttpServletRequest request) { String + * accept = request.getHeader("accept"); if (accept != null && + * accept.contains("application/json")) { return true; } + * + * String xRequestedWith = request.getHeader("X-Requested-With"); if + * (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) { + * return true; } + * + * String uri = request.getRequestURI(); if (StringUtils.inStringIgnoreCase(uri, + * ".json", ".xml")) { return true; } + * + * String ajax = request.getParameter("__ajax"); return + * StringUtils.inStringIgnoreCase(ajax, "json", "xml"); } + */ /** * 内容编码 * - * @param str 内容 + * @param str + * 内容 * @return 编码后的内容 */ public static String urlEncode(String str) { @@ -151,7 +144,8 @@ public class ServletUtils { /** * 内容解码 * - * @param str 内容 + * @param str + * 内容 * @return 解码后的内容 */ public static String urlDecode(String str) { diff --git a/play-common/src/main/java/com/starry/common/utils/SpringUtils.java b/play-common/src/main/java/com/starry/common/utils/SpringUtils.java index 989eb33..3855c55 100644 --- a/play-common/src/main/java/com/starry/common/utils/SpringUtils.java +++ b/play-common/src/main/java/com/starry/common/utils/SpringUtils.java @@ -9,8 +9,7 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.stereotype.Component; /** - * @author admin - * spring工具类 方便在非spring管理环境中获取bean + * @author admin spring工具类 方便在非spring管理环境中获取bean * @since 2022/7/28 */ @Component diff --git a/play-common/src/main/java/com/starry/common/utils/StringUtils.java b/play-common/src/main/java/com/starry/common/utils/StringUtils.java index d40a405..0ff80ae 100644 --- a/play-common/src/main/java/com/starry/common/utils/StringUtils.java +++ b/play-common/src/main/java/com/starry/common/utils/StringUtils.java @@ -1,13 +1,11 @@ package com.starry.common.utils; import cn.hutool.core.text.StrFormatter; - import java.util.Collection; import java.util.Map; /** - * @author admin - * 字符串工具类 + * @author admin 字符串工具类 * @since 2022/7/19 */ public class StringUtils extends org.apache.commons.lang3.StringUtils { @@ -22,7 +20,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { */ private static final char SEPARATOR = '_'; - /** * 驼峰转下划线命名 */ @@ -65,7 +62,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { /** * 判断一个对象是否为空 * - * @param object Object + * @param object + * Object * @return true：为空 false：非空 */ public static boolean isNull(Object object) { @@ -75,8 +73,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { /** * 判断一个对象是否非空 * - * @param object Object - * @return true：非空 false：空 + * @param object + * Object + * @return true：非空 false：空 */ public static boolean isNotNull(Object object) { return !isNull(object); @@ -85,8 +84,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { /** * 判断一个对象数组是否为空 * - * @param objects 要判断的对象数组 - * * @return true：为空 false：非空 + * @param objects + * 要判断的对象数组 * @return true：为空 false：非空 */ public static boolean isEmpty(Object[] objects) { return isNull(objects) || (objects.length == 0); @@ -95,7 +94,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { /** * 判断一个Map是否为空 * - * @param map 要判断的Map + * @param map + * 要判断的Map * @return true：为空 false：非空 */ public static boolean isEmpty(Map map) { @@ -105,7 +105,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { /** * 判断一个Map是否为空 * - * @param map 要判断的Map + * @param map + * 要判断的Map * @return true：非空 false：空 */ public static boolean isNotEmpty(Map map) { @@ -115,7 +116,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { /** * 判断一个Collection是否非空，包含List，Set，Queue * - * @param coll 要判断的Collection + * @param coll + * 要判断的Collection * @return true：非空 false：空 */ public static boolean isNotEmpty(Collection coll) { @@ -125,7 +127,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { /** * 判断一个Collection是否为空， 包含List，Set，Queue * - * @param coll 要判断的Collection + * @param coll + * 要判断的Collection * @return true：为空 false：非空 */ public static boolean isEmpty(Collection coll) { @@ -141,8 +144,10 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a
* 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b
* - * @param template 文本模板，被替换的部分用 {} 表示 - * @param params 参数值 + * @param template + * 文本模板，被替换的部分用 {} 表示 + * @param params + * 参数值 * @return 格式化后的文本 */ public static String format(String template, Object... params) { @@ -155,8 +160,10 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { /** * 判断给定的set列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value * - * @param collection 给定的集合 - * @param array 给定的数组 + * @param collection + * 给定的集合 + * @param array + * 给定的数组 * @return boolean 结果 */ public static boolean containsAny(Collection collection, String... array) { @@ -199,10 +206,11 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { } /** - * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 - * 例如：HELLO_WORLD -> HelloWorld + * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD -> + * HelloWorld * - * @param name 转换前的下划线大写方式命名的字符串 + * @param name + * 转换前的下划线大写方式命名的字符串 * @return 转换后的驼峰式命名的字符串 */ public static String convertToCamelCase(String name) { diff --git a/play-common/src/main/java/com/starry/common/utils/ThreadsUtils.java b/play-common/src/main/java/com/starry/common/utils/ThreadsUtils.java index 8eb0300..e9c0cb2 100644 --- a/play-common/src/main/java/com/starry/common/utils/ThreadsUtils.java +++ b/play-common/src/main/java/com/starry/common/utils/ThreadsUtils.java @@ -1,24 +1,19 @@ package com.starry.common.utils; +import java.util.concurrent.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.concurrent.*; - /** - * @author admin - * 线程相关工具类 + * @author admin 线程相关工具类 * @since 2022/7/25 */ public class ThreadsUtils { private static final Logger logger = LoggerFactory.getLogger(ThreadsUtils.class); /** - * 停止线程池 - * 先使用shutdown, 停止接收新任务并尝试完成所有已存在任务. - * 如果超时, 则调用shutdownNow, 取消在workQueue中Pending的任务,并中断所有阻塞函数. - * 如果仍然超時，則強制退出. - * 另对在shutdown时线程本身被调用中断做了处理. + * 停止线程池 先使用shutdown, 停止接收新任务并尝试完成所有已存在任务. 如果超时, 则调用shutdownNow, + * 取消在workQueue中Pending的任务,并中断所有阻塞函数. 如果仍然超時，則強制退出. 另对在shutdown时线程本身被调用中断做了处理. */ public static void shutdownAndAwaitTermination(ExecutorService pool) { if (pool != null && !pool.isShutdown()) { diff --git a/play-common/src/main/java/com/starry/common/utils/file/FileUploadUtils.java b/play-common/src/main/java/com/starry/common/utils/file/FileUploadUtils.java index 0078293..8d6c46e 100644 --- a/play-common/src/main/java/com/starry/common/utils/file/FileUploadUtils.java +++ b/play-common/src/main/java/com/starry/common/utils/file/FileUploadUtils.java @@ -1,12 +1,10 @@ package com.starry.common.utils.file; +import java.util.Objects; import org.springframework.web.multipart.MultipartFile; -import java.util.Objects; - /** - * @author admin - * 文件上传工具类 + * @author admin 文件上传工具类 * @since 2022/10/28 */ public class FileUploadUtils { @@ -29,5 +27,4 @@ public class FileUploadUtils { return null; } - } diff --git a/play-common/src/main/java/com/starry/common/utils/html/EscapeUtil.java b/play-common/src/main/java/com/starry/common/utils/html/EscapeUtil.java index fd77857..f9bdd2a 100644 --- a/play-common/src/main/java/com/starry/common/utils/html/EscapeUtil.java +++ b/play-common/src/main/java/com/starry/common/utils/html/EscapeUtil.java @@ -1,6 +1,5 @@ package com.starry.common.utils.html; - import com.starry.common.utils.StringUtils; /** @@ -29,7 +28,8 @@ public class EscapeUtil { /** * 转义文本中的HTML字符为安全的字符 * - * @param text 被转义的文本 + * @param text + * 被转义的文本 * @return 转义后的文本 */ public static String escape(String text) { @@ -39,7 +39,8 @@ public class EscapeUtil { /** * 还原被转义的HTML特殊字符 * - * @param content 包含转义符的HTML内容 + * @param content + * 包含转义符的HTML内容 * @return 转换后的字符串 */ public static String unescape(String content) { @@ -49,7 +50,8 @@ public class EscapeUtil { /** * 清除所有HTML标签，但是不删除标签内的内容 * - * @param content 文本 + * @param content + * 文本 * @return 清除标签后的文本 */ public static String clean(String content) { @@ -59,7 +61,8 @@ public class EscapeUtil { /** * Escape编码 * - * @param text 被编码的文本 + * @param text + * 被编码的文本 * @return 编码后的字符 */ private static String encode(String text) { @@ -83,7 +86,8 @@ public class EscapeUtil { /** * Escape解码 * - * @param content 被转义的内容 + * @param content + * 被转义的内容 * @return 解码后的字符串 */ public static String decode(String content) { diff --git a/play-common/src/main/java/com/starry/common/utils/html/HTMLFilter.java b/play-common/src/main/java/com/starry/common/utils/html/HTMLFilter.java index f24efac..c60e608 100644 --- a/play-common/src/main/java/com/starry/common/utils/html/HTMLFilter.java +++ b/play-common/src/main/java/com/starry/common/utils/html/HTMLFilter.java @@ -58,7 +58,8 @@ public final class HTMLFilter { **/ private final String[] vSelfClosingTags; /** - * html elements which must always have separate opening and closing tags (e.g. "") + * html elements which must always have separate opening and closing tags (e.g. + * "") **/ private final String[] vNeedClosingTags; /** @@ -74,7 +75,8 @@ public final class HTMLFilter { **/ private final String[] vAllowedProtocols; /** - * tags which should be removed if they contain no content (e.g. "" or "") + * tags which should be removed if they contain no content (e.g. "" or + * "") **/ private final String[] vRemoveBlanks; /** @@ -87,8 +89,9 @@ public final class HTMLFilter { private final boolean stripComment; private final boolean encodeQuotes; /** - * flag determining whether to try to make tags when presented with "unbalanced" angle brackets (e.g. "" - * becomes " text "). If set to false, unbalanced angle brackets will be html escaped. + * flag determining whether to try to make tags when presented with "unbalanced" + * angle brackets (e.g. "" becomes " text "). If set to + * false, unbalanced angle brackets will be html escaped. */ private final boolean alwaysMakeTags; @@ -131,7 +134,8 @@ public final class HTMLFilter { /** * Map-parameter configurable constructor. * - * @param conf map containing configuration. keys match field names. + * @param conf + * map containing configuration. keys match field names. */ @SuppressWarnings("unchecked") public HTMLFilter(final Map conf) { @@ -194,10 +198,13 @@ public final class HTMLFilter { } /** - * given a user submitted input String, filter out any invalid or restricted html. + * given a user submitted input String, filter out any invalid or restricted + * html. * - * @param input text (i.e. submitted by a user) than may contain html - * @return "clean" version of input, with only valid, whitelisted html elements allowed + * @param input + * text (i.e. submitted by a user) than may contain html + * @return "clean" version of input, with only valid, whitelisted html elements + * allowed */ public String filter(final String input) { reset(); @@ -326,7 +333,8 @@ public final class HTMLFilter { final String body = m.group(2); String ending = m.group(3); - // debug( "in a starting tag, name='" + name + "'; body='" + body + "'; ending='" + ending + "'" ); + // debug( "in a starting tag, name='" + name + "'; body='" + body + "'; + // ending='" + ending + "'" ); if (allowed(name)) { final StringBuilder params = new StringBuilder(); @@ -494,4 +502,4 @@ public final class HTMLFilter { private boolean allowedAttribute(final String name, final String paramName) { return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName)); } -} \ No newline at end of file +} diff --git a/play-common/src/main/java/com/starry/common/utils/http/HttpHelper.java b/play-common/src/main/java/com/starry/common/utils/http/HttpHelper.java index d8415b8..bf7c6ca 100644 --- a/play-common/src/main/java/com/starry/common/utils/http/HttpHelper.java +++ b/play-common/src/main/java/com/starry/common/utils/http/HttpHelper.java @@ -1,15 +1,14 @@ package com.starry.common.utils.http; -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.servlet.ServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; +import javax.servlet.ServletRequest; +import org.apache.commons.lang3.exception.ExceptionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * 通用http工具封装 diff --git a/play-common/src/main/java/com/starry/common/utils/http/HttpUtils.java b/play-common/src/main/java/com/starry/common/utils/http/HttpUtils.java index a24295f..61c3e75 100644 --- a/play-common/src/main/java/com/starry/common/utils/http/HttpUtils.java +++ b/play-common/src/main/java/com/starry/common/utils/http/HttpUtils.java @@ -1,10 +1,6 @@ package com.starry.common.utils.http; import com.starry.common.constant.Constants; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.net.ssl.*; import java.io.*; import java.net.ConnectException; import java.net.SocketTimeoutException; @@ -12,6 +8,9 @@ import java.net.URL; import java.net.URLConnection; import java.nio.charset.StandardCharsets; import java.security.cert.X509Certificate; +import javax.net.ssl.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * 通用http发送方法 @@ -24,8 +23,10 @@ public class HttpUtils { /** * 向指定 URL 发送GET方法的请求 * - * @param url 发送请求的 URL - * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @param url + * 发送请求的 URL + * @param param + * 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 * @return 所代表远程资源的响应结果 */ public static String sendGet(String url, String param) { @@ -35,9 +36,12 @@ public class HttpUtils { /** * 向指定 URL 发送GET方法的请求 * - * @param url 发送请求的 URL - * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 - * @param contentType 编码类型 + * @param url + * 发送请求的 URL + * @param param + * 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @param contentType + * 编码类型 * @return 所代表远程资源的响应结果 */ public static String sendGet(String url, String param, String contentType) { @@ -81,8 +85,10 @@ public class HttpUtils { /** * 向指定 URL 发送POST方法的请求 * - * @param url 发送请求的 URL - * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @param url + * 发送请求的 URL + * @param param + * 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 * @return 所代表远程资源的响应结果 */ public static String sendPost(String url, String param) { @@ -196,4 +202,4 @@ public class HttpUtils { return true; } } -} \ No newline at end of file +} diff --git a/play-common/src/main/java/com/starry/common/utils/ip/AddressUtils.java b/play-common/src/main/java/com/starry/common/utils/ip/AddressUtils.java index 797c9ea..3c9320b 100644 --- a/play-common/src/main/java/com/starry/common/utils/ip/AddressUtils.java +++ b/play-common/src/main/java/com/starry/common/utils/ip/AddressUtils.java @@ -1,13 +1,11 @@ package com.starry.common.utils.ip; - import com.starry.common.utils.RegionUtils; import com.starry.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; /** - * @author admin - * 获取地址工具类 + * @author admin 获取地址工具类 * @since 2022/7/25 */ @Slf4j diff --git a/play-common/src/main/java/com/starry/common/utils/ip/IpUtils.java b/play-common/src/main/java/com/starry/common/utils/ip/IpUtils.java index 36b38cb..dc721d4 100644 --- a/play-common/src/main/java/com/starry/common/utils/ip/IpUtils.java +++ b/play-common/src/main/java/com/starry/common/utils/ip/IpUtils.java @@ -1,11 +1,9 @@ package com.starry.common.utils.ip; - import com.starry.common.utils.StringUtils; - -import javax.servlet.http.HttpServletRequest; import java.net.InetAddress; import java.net.UnknownHostException; +import javax.servlet.http.HttpServletRequest; /** * 获取IP方法 @@ -16,7 +14,8 @@ public class IpUtils { /** * 获取客户端IP * - * @param request 请求对象 + * @param request + * 请求对象 * @return IP地址 */ public static String getIpAddr(HttpServletRequest request) { @@ -47,7 +46,8 @@ public class IpUtils { /** * 检查是否为内部IP地址 * - * @param ip IP地址 + * @param ip + * IP地址 * @return 结果 */ public static boolean internalIp(String ip) { @@ -58,7 +58,8 @@ public class IpUtils { /** * 检查是否为内部IP地址 * - * @param addr byte地址 + * @param addr + * byte地址 * @return 结果 */ private static boolean internalIp(byte[] addr) { @@ -77,18 +78,18 @@ public class IpUtils { final byte SECTION_5 = (byte) 0xC0; final byte SECTION_6 = (byte) 0xA8; switch (b0) { - case SECTION_1: + case SECTION_1 : return true; - case SECTION_2: + case SECTION_2 : if (b1 >= SECTION_3 && b1 <= SECTION_4) { return true; } - case SECTION_5: + case SECTION_5 : switch (b1) { - case SECTION_6: + case SECTION_6 : return true; } - default: + default : return false; } } @@ -96,7 +97,8 @@ public class IpUtils { /** * 将IPv4地址转换成字节 * - * @param text IPv4地址 + * @param text + * IPv4地址 * @return byte 字节 */ public static byte[] textToNumericFormatV4(String text) { @@ -110,7 +112,7 @@ public class IpUtils { long l; int i; switch (elements.length) { - case 1: + case 1 : l = Long.parseLong(elements[0]); if ((l < 0L) || (l > 4294967295L)) { return null; @@ -120,7 +122,7 @@ public class IpUtils { bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF); bytes[3] = (byte) (int) (l & 0xFF); break; - case 2: + case 2 : l = Integer.parseInt(elements[0]); if ((l < 0L) || (l > 255L)) { return null; @@ -134,7 +136,7 @@ public class IpUtils { bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF); bytes[3] = (byte) (int) (l & 0xFF); break; - case 3: + case 3 : for (i = 0; i < 2; ++i) { l = Integer.parseInt(elements[i]); if ((l < 0L) || (l > 255L)) { @@ -149,7 +151,7 @@ public class IpUtils { bytes[2] = (byte) (int) (l >> 8 & 0xFF); bytes[3] = (byte) (int) (l & 0xFF); break; - case 4: + case 4 : for (i = 0; i < 4; ++i) { l = Integer.parseInt(elements[i]); if ((l < 0L) || (l > 255L)) { @@ -158,7 +160,7 @@ public class IpUtils { bytes[i] = (byte) (int) (l & 0xFF); } break; - default: + default : return null; } } catch (NumberFormatException e) { @@ -196,7 +198,8 @@ public class IpUtils { /** * 从多级反向代理中获得第一个非unknown IP地址 * - * @param ip 获得的IP地址 + * @param ip + * 获得的IP地址 * @return 第一个非unknown IP地址 */ public static String getMultistageReverseProxyIp(String ip) { @@ -216,10 +219,11 @@ public class IpUtils { /** * 检测给定字符串是否为未知，多用于检测HTTP请求相关 * - * @param checkString 被检测的字符串 + * @param checkString + * 被检测的字符串 * @return 是否未知 */ public static boolean isUnknown(String checkString) { return StringUtils.isBlank(checkString) || "unknown".equalsIgnoreCase(checkString); } -} \ No newline at end of file +} diff --git a/play-generator/src/main/java/com/starry/generator/MainGenerator.java b/play-generator/src/main/java/com/starry/generator/MainGenerator.java index ee9cfed..b3428a4 100644 --- a/play-generator/src/main/java/com/starry/generator/MainGenerator.java +++ b/play-generator/src/main/java/com/starry/generator/MainGenerator.java @@ -1,40 +1,38 @@ package com.starry.generator; -import com.starry.generator.core.CodeGenerator; import com.starry.generator.config.GeneratorConfig; +import com.starry.generator.core.CodeGenerator; /** - * 代码生成器主类 - * 通过main方法直接运行生成代码 - * + * 代码生成器主类 通过main方法直接运行生成代码 + * * @author admin * @since 2024-01-01 */ public class MainGenerator { - + public static void main(String[] args) { // 数据库配置 GeneratorConfig config = new GeneratorConfig(); - config.setUrl("jdbc:mysql://122.51.20.105:3306/play-with?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai"); + config.setUrl( + "jdbc:mysql://122.51.20.105:3306/play-with?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai"); config.setDriverName("com.mysql.cj.jdbc.Driver"); config.setUsername("root"); config.setPassword("KdaKRZ2trpdhNePa"); - + // 生成配置 config.setAuthor("huchuansai"); config.setPackageName("com.starry.admin"); config.setOutputDir("./generated-code"); config.setAutoRemovePre(false); config.setTablePrefix("sys_"); - + // 要生成的表名（可以配置多个） - String[] tableNames = { - "sys_role", - }; - + String[] tableNames = {"sys_role",}; + // 创建代码生成器并执行生成 CodeGenerator generator = new CodeGenerator(config); - + try { System.out.println("开始生成代码..."); generator.generateCode(tableNames); @@ -44,4 +42,4 @@ public class MainGenerator { e.printStackTrace(); } } -} \ No newline at end of file +} diff --git a/play-generator/src/main/java/com/starry/generator/MainGeneratorWithConfig.java b/play-generator/src/main/java/com/starry/generator/MainGeneratorWithConfig.java index a1fe59f..19368fd 100644 --- a/play-generator/src/main/java/com/starry/generator/MainGeneratorWithConfig.java +++ b/play-generator/src/main/java/com/starry/generator/MainGeneratorWithConfig.java @@ -1,26 +1,24 @@ package com.starry.generator; -import com.starry.generator.core.CodeGenerator; import com.starry.generator.config.GeneratorConfig; - +import com.starry.generator.core.CodeGenerator; import java.io.IOException; import java.io.InputStream; import java.util.Properties; /** - * 代码生成器主类 - 支持配置文件版本 - * 通过读取 config.properties 配置文件来生成代码 - * + * 代码生成器主类 - 支持配置文件版本 通过读取 config.properties 配置文件来生成代码 + * * @author admin * @since 2024-01-01 */ public class MainGeneratorWithConfig { - + public static void main(String[] args) { try { // 读取配置文件 GeneratorConfig config = loadConfig(); - + // 获取要生成的表名 String tableNamesStr = getProperty("gen.tableNames", ""); if (tableNamesStr.isEmpty()) { @@ -28,15 +26,15 @@ public class MainGeneratorWithConfig { return; } String[] tableNames = tableNamesStr.split(","); - + // 清理表名（去除前后空格） for (int i = 0; i < tableNames.length; i++) { tableNames[i] = tableNames[i].trim(); } - + // 创建代码生成器并执行生成 CodeGenerator generator = new CodeGenerator(config); - + System.out.println("=== 代码生成器配置信息 ==="); System.out.println("数据库地址: " + config.getUrl()); System.out.println("包名: " + config.getPackageName()); @@ -45,20 +43,20 @@ public class MainGeneratorWithConfig { System.out.println("要生成的表: " + String.join(", ", tableNames)); System.out.println("========================"); System.out.println(); - + System.out.println("开始生成代码..."); generator.generateCode(tableNames); System.out.println(); System.out.println("代码生成完成！输出目录：" + config.getOutputDir()); - + } catch (Exception e) { System.err.println("代码生成失败：" + e.getMessage()); e.printStackTrace(); } } - + private static Properties properties; - + private static GeneratorConfig loadConfig() throws IOException { // 加载配置文件 properties = new Properties(); @@ -69,17 +67,17 @@ public class MainGeneratorWithConfig { } properties.load(input); } - + // 创建配置对象 GeneratorConfig config = new GeneratorConfig(); - + // 数据库配置 config.setUrl(getProperty("db.url", "")); config.setDatabaseName(getProperty("db.name", "")); config.setDriverName(getProperty("db.driver", "com.mysql.cj.jdbc.Driver")); config.setUsername(getProperty("db.username", "")); config.setPassword(getProperty("db.password", "")); - + // 生成配置 config.setAuthor(getProperty("gen.author", "admin")); config.setPackageName(getProperty("gen.packageName", "com.starry.play")); @@ -87,7 +85,7 @@ public class MainGeneratorWithConfig { config.setAutoRemovePre(Boolean.parseBoolean(getProperty("gen.autoRemovePre", "false"))); config.setTablePrefix(getProperty("gen.tablePrefix", "sys_")); config.setTplCategory(getProperty("gen.tplCategory", "crud")); - + // 验证必需的配置 if (config.getUrl().isEmpty()) { throw new IllegalArgumentException("数据库连接地址不能为空，请配置 db.url"); @@ -95,11 +93,11 @@ public class MainGeneratorWithConfig { if (config.getUsername().isEmpty()) { throw new IllegalArgumentException("数据库用户名不能为空，请配置 db.username"); } - + return config; } - + private static String getProperty(String key, String defaultValue) { return properties.getProperty(key, defaultValue); } -} \ No newline at end of file +} diff --git a/play-generator/src/main/java/com/starry/generator/config/GenConfig.java b/play-generator/src/main/java/com/starry/generator/config/GenConfig.java index 603830f..8a40c64 100644 --- a/play-generator/src/main/java/com/starry/generator/config/GenConfig.java +++ b/play-generator/src/main/java/com/starry/generator/config/GenConfig.java @@ -6,8 +6,7 @@ import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; /** - * @author admin - * 读取代码生成相关配置 + * @author admin 读取代码生成相关配置 * @since 2022/7/15 */ @Component diff --git a/play-generator/src/main/java/com/starry/generator/config/GeneratorConfig.java b/play-generator/src/main/java/com/starry/generator/config/GeneratorConfig.java index 98a3902..24f76e7 100644 --- a/play-generator/src/main/java/com/starry/generator/config/GeneratorConfig.java +++ b/play-generator/src/main/java/com/starry/generator/config/GeneratorConfig.java @@ -3,41 +3,40 @@ package com.starry.generator.config; import lombok.Data; /** - * 代码生成器配置类 - * 用于配置数据库连接和生成参数 - * + * 代码生成器配置类 用于配置数据库连接和生成参数 + * * @author admin * @since 2024-01-01 */ @Data public class GeneratorConfig { - + // 数据库连接配置 private String url; private String driverName; private String username; private String password; private String databaseName; - + // 代码生成配置 private String author; private String packageName; private String outputDir; private boolean autoRemovePre; private String tablePrefix; - + // 模板类型 (crud, tree, sub) private String tplCategory = "crud"; - + // 功能名称 private String functionName; - + // 模块名 private String moduleName; - + // 业务名 private String businessName; - + public GeneratorConfig() { // 设置默认值 this.author = "admin"; @@ -47,7 +46,7 @@ public class GeneratorConfig { this.tablePrefix = "sys_"; this.tplCategory = "crud"; } - + /** * 从URL中获取数据库名 */ @@ -55,7 +54,7 @@ public class GeneratorConfig { if (databaseName != null && !databaseName.isEmpty()) { return databaseName; } - + // 如果没有手动设置数据库名，从URL中解析 if (url != null) { String dbName = url.substring(url.lastIndexOf("/") + 1); @@ -66,4 +65,4 @@ public class GeneratorConfig { } return ""; } -} \ No newline at end of file +} diff --git a/play-generator/src/main/java/com/starry/generator/constant/GenConstants.java b/play-generator/src/main/java/com/starry/generator/constant/GenConstants.java index 8be220c..5423d0c 100644 --- a/play-generator/src/main/java/com/starry/generator/constant/GenConstants.java +++ b/play-generator/src/main/java/com/starry/generator/constant/GenConstants.java @@ -1,8 +1,7 @@ package com.starry.generator.constant; /** - * @author admin - * 代码生成通用常量 + * @author admin 代码生成通用常量 */ public class GenConstants { diff --git a/play-generator/src/main/java/com/starry/generator/controller/GenController.java b/play-generator/src/main/java/com/starry/generator/controller/GenController.java index 00714c3..e0ce23d 100644 --- a/play-generator/src/main/java/com/starry/generator/controller/GenController.java +++ b/play-generator/src/main/java/com/starry/generator/controller/GenController.java @@ -1,6 +1,5 @@ package com.starry.generator.controller; - import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.metadata.IPage; import com.starry.common.annotation.Log; @@ -10,15 +9,13 @@ import com.starry.generator.entity.GenTableEntity; import com.starry.generator.entity.vo.GenTableVo; import com.starry.generator.service.GenTableService; import io.swagger.annotations.ApiOperation; -import org.apache.commons.io.IOUtils; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; import java.util.Map; - +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.io.IOUtils; +import org.springframework.web.bind.annotation.*; /** * @author admin diff --git a/play-generator/src/main/java/com/starry/generator/core/CodeGenerator.java b/play-generator/src/main/java/com/starry/generator/core/CodeGenerator.java index 341331d..6d23a36 100644 --- a/play-generator/src/main/java/com/starry/generator/core/CodeGenerator.java +++ b/play-generator/src/main/java/com/starry/generator/core/CodeGenerator.java @@ -1,16 +1,11 @@ package com.starry.generator.core; import com.starry.generator.config.GeneratorConfig; -import com.starry.generator.entity.GenTableEntity; import com.starry.generator.entity.GenTableColumnEntity; +import com.starry.generator.entity.GenTableEntity; import com.starry.generator.utils.GenUtils; import com.starry.generator.utils.VelocityInitializer; import com.starry.generator.utils.VelocityUtils; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import lombok.extern.slf4j.Slf4j; - import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -18,45 +13,51 @@ import java.io.StringWriter; import java.sql.*; import java.util.ArrayList; import java.util.List; +import lombok.extern.slf4j.Slf4j; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; /** * 核心代码生成器 - * + * * @author admin * @since 2024-01-01 */ @Slf4j public class CodeGenerator { - + private final GeneratorConfig config; - + public CodeGenerator(GeneratorConfig config) { this.config = config; } - + /** * 生成代码 - * - * @param tableNames 表名数组 + * + * @param tableNames + * 表名数组 */ public void generateCode(String[] tableNames) throws Exception { // 初始化 Velocity VelocityInitializer.initVelocity(); - + // 创建输出目录 createOutputDirectory(); - + for (String tableName : tableNames) { log.info("开始生成表 {} 的代码", tableName); generateTableCode(tableName); log.info("表 {} 代码生成完成", tableName); } } - + /** * 生成单个表的代码 - * - * @param tableName 表名 + * + * @param tableName + * 表名 */ private void generateTableCode(String tableName) throws Exception { // 获取表信息 @@ -65,53 +66,52 @@ public class CodeGenerator { log.warn("表 {} 不存在，跳过生成", tableName); return; } - + // 获取表字段信息 List columns = getTableColumns(tableName); table.setColumns(columns); - + // 初始化表信息 initTableInfo(table); - + // 初始化字段信息 initColumnInfo(table); - + // 设置主键列信息 setPkColumn(table); - + // 设置模板变量信息 VelocityContext context = VelocityUtils.prepareContext(table); - + // 获取模版列表 List templates = VelocityUtils.getTemplateList(table.getTplCategory()); - + for (String template : templates) { // 渲染模板 StringWriter sw = new StringWriter(); Template tpl = Velocity.getTemplate(template, "UTF-8"); tpl.merge(context, sw); - + // 写入文件 writeToFile(template, table, sw.toString()); } } - + /** * 获取表信息 */ private GenTableEntity getTableInfo(String tableName) throws Exception { - String sql = "SELECT table_name, table_comment FROM information_schema.tables " + - "WHERE table_schema = ? AND table_name = ?"; - - try (Connection conn = getConnection(); - PreparedStatement stmt = conn.prepareStatement(sql)) { - + String sql = "SELECT table_name, table_comment FROM information_schema.tables " + + "WHERE table_schema = ? AND table_name = ?"; + + try (Connection conn = getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) { + String dbName = getDatabaseName(); log.info("查询表信息 - 数据库名: {}, 表名: {}", dbName, tableName); - + stmt.setString(1, dbName); stmt.setString(2, tableName); - + try (ResultSet rs = stmt.executeQuery()) { if (rs.next()) { GenTableEntity table = new GenTableEntity(); @@ -128,7 +128,7 @@ public class CodeGenerator { } return null; } - + /** * 显示数据库中的所有表（用于调试） */ @@ -149,24 +149,23 @@ public class CodeGenerator { } } } - + /** * 获取表字段信息 */ private List getTableColumns(String tableName) throws Exception { List columns = new ArrayList<>(); - - String sql = "SELECT column_name, data_type, column_comment, is_nullable, " + - "column_key, column_default, extra FROM information_schema.columns " + - "WHERE table_schema = ? AND table_name = ? ORDER BY ordinal_position"; - - try (Connection conn = getConnection(); - PreparedStatement stmt = conn.prepareStatement(sql)) { - + + String sql = "SELECT column_name, data_type, column_comment, is_nullable, " + + "column_key, column_default, extra FROM information_schema.columns " + + "WHERE table_schema = ? AND table_name = ? ORDER BY ordinal_position"; + + try (Connection conn = getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) { + String dbName = getDatabaseName(); stmt.setString(1, dbName); stmt.setString(2, tableName); - + try (ResultSet rs = stmt.executeQuery()) { while (rs.next()) { GenTableColumnEntity column = new GenTableColumnEntity(); @@ -176,15 +175,15 @@ public class CodeGenerator { column.setIsRequired("NO".equals(rs.getString("is_nullable")) ? "1" : "0"); column.setIsPk("PRI".equals(rs.getString("column_key")) ? "1" : "0"); column.setIsIncrement("auto_increment".equals(rs.getString("extra")) ? "1" : "0"); - + columns.add(column); } } } - + return columns; } - + /** * 初始化表信息 */ @@ -197,7 +196,7 @@ public class CodeGenerator { table.setFunctionAuthor(config.getAuthor()); table.setTplCategory(config.getTplCategory()); } - + /** * 初始化字段信息 */ @@ -208,7 +207,7 @@ public class CodeGenerator { } } } - + /** * 设置主键列信息 */ @@ -219,29 +218,29 @@ public class CodeGenerator { break; } } - + if (table.getPkColumn() == null) { table.setPkColumn(table.getColumns().get(0)); } } - + /** * 写入文件 */ private void writeToFile(String template, GenTableEntity table, String content) throws IOException { String fileName = getFileName(template, table); File file = new File(fileName); - + // 创建父目录 file.getParentFile().mkdirs(); - + try (FileWriter writer = new FileWriter(file)) { writer.write(content); } - + log.info("生成文件：{}", fileName); } - + /** * 获取文件名 */ @@ -251,10 +250,10 @@ public class CodeGenerator { String moduleName = table.getModuleName(); String businessName = table.getBusinessName(); String className = table.getClassName(); - + String javaPath = outputDir + "/src/main/java/" + packageName.replace(".", "/"); String resourcesPath = outputDir + "/src/main/resources"; - + if (template.contains("entity.java.vm")) { return javaPath + "/entity/" + className + "Entity.java"; } else if (template.contains("mapper.java.vm")) { @@ -278,10 +277,10 @@ public class CodeGenerator { } else if (template.contains("index.vue.vm")) { return outputDir + "/views/" + moduleName + "/" + businessName + "/index.vue"; } - + return outputDir + "/" + template.replace(".vm", ""); } - + /** * 获取数据库连接 */ @@ -289,14 +288,14 @@ public class CodeGenerator { Class.forName(config.getDriverName()); return DriverManager.getConnection(config.getUrl(), config.getUsername(), config.getPassword()); } - + /** * 从URL中获取数据库名 */ private String getDatabaseName() { - return config.getDatabaseName(); + return config.getDatabaseName(); } - + /** * 创建输出目录 */ @@ -306,4 +305,4 @@ public class CodeGenerator { outputDir.mkdirs(); } } -} \ No newline at end of file +} diff --git a/play-generator/src/main/java/com/starry/generator/entity/GenTableColumnEntity.java b/play-generator/src/main/java/com/starry/generator/entity/GenTableColumnEntity.java index 3217388..2f30af9 100644 --- a/play-generator/src/main/java/com/starry/generator/entity/GenTableColumnEntity.java +++ b/play-generator/src/main/java/com/starry/generator/entity/GenTableColumnEntity.java @@ -1,6 +1,5 @@ package com.starry.generator.entity; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -8,15 +7,13 @@ import com.starry.common.domain.BaseEntity; import com.starry.common.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import javax.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - /** - * @author admin - * 代码生成业务字段表 gen_table_column + * @author admin 代码生成业务字段表 gen_table_column * @since 2022/7/14 */ @Getter diff --git a/play-generator/src/main/java/com/starry/generator/entity/GenTableEntity.java b/play-generator/src/main/java/com/starry/generator/entity/GenTableEntity.java index 54390e1..1e4c123 100644 --- a/play-generator/src/main/java/com/starry/generator/entity/GenTableEntity.java +++ b/play-generator/src/main/java/com/starry/generator/entity/GenTableEntity.java @@ -9,15 +9,13 @@ import com.starry.common.utils.StringUtils; import com.starry.generator.constant.GenConstants; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import javax.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotBlank; -import java.util.List; - /** - * @author admin - * 业务表 gen_table + * @author admin 业务表 gen_table * @since 2022/7/14 */ @Getter @@ -156,7 +154,6 @@ public class GenTableEntity extends BaseEntity { @TableField(exist = false) private String parentMenuName; - public static boolean isCrud(String tplCategory) { return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory); } diff --git a/play-generator/src/main/java/com/starry/generator/entity/vo/GenTableVo.java b/play-generator/src/main/java/com/starry/generator/entity/vo/GenTableVo.java index fe0dcfd..64f4ef4 100644 --- a/play-generator/src/main/java/com/starry/generator/entity/vo/GenTableVo.java +++ b/play-generator/src/main/java/com/starry/generator/entity/vo/GenTableVo.java @@ -6,15 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.starry.common.domain.BasePageEntity; import com.starry.generator.entity.GenTableColumnEntity; import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import javax.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotBlank; -import java.util.List; - /** - * @author admin - * 业务表 gen_table + * @author admin 业务表 gen_table * @since 2022/7/14 */ diff --git a/play-generator/src/main/java/com/starry/generator/mapper/GenTableColumnMapper.java b/play-generator/src/main/java/com/starry/generator/mapper/GenTableColumnMapper.java index b34ef5b..8cccb10 100644 --- a/play-generator/src/main/java/com/starry/generator/mapper/GenTableColumnMapper.java +++ b/play-generator/src/main/java/com/starry/generator/mapper/GenTableColumnMapper.java @@ -3,7 +3,6 @@ package com.starry.generator.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.generator.entity.GenTableColumnEntity; - import java.util.List; /** @@ -19,7 +18,8 @@ public interface GenTableColumnMapper extends BaseMapper { /** * 根据表名称查询列信息 * - * @param tableName 表名称 + * @param tableName + * 表名称 * @return 列信息 */ @InterceptorIgnore(tenantLine = "1") diff --git a/play-generator/src/main/java/com/starry/generator/mapper/GenTableMapper.java b/play-generator/src/main/java/com/starry/generator/mapper/GenTableMapper.java index c3583fb..7035a1b 100644 --- a/play-generator/src/main/java/com/starry/generator/mapper/GenTableMapper.java +++ b/play-generator/src/main/java/com/starry/generator/mapper/GenTableMapper.java @@ -6,13 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.starry.generator.entity.GenTableEntity; import com.starry.generator.entity.vo.GenTableVo; +import java.util.List; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** - * @author admin - * 业务 数据层 + * @author admin 业务 数据层 * @since 2022/7/14 */ public interface GenTableMapper extends BaseMapper { @@ -20,12 +18,13 @@ public interface GenTableMapper extends BaseMapper { /** * 查询业务列表 * - * @param genTableEntity 业务信息 + * @param genTableEntity + * 业务信息 * @return 业务集合 */ - IPage selectGenTableList(Page page, @Param(value = "genTableEntity") GenTableVo genTableEntity); - + IPage selectGenTableList(Page page, + @Param(value = "genTableEntity") GenTableVo genTableEntity); @InterceptorIgnore(tenantLine = "1") IPage selectDbTableList(Page page, @Param("genTableEntity") GenTableEntity genTableEntity); @@ -33,7 +32,8 @@ public interface GenTableMapper extends BaseMapper { /** * 查询数据库列表 * - * @param tableNames 表名称组 + * @param tableNames + * 表名称组 * @return 数据库表集合 */ @InterceptorIgnore(tenantLine = "1") @@ -49,7 +49,8 @@ public interface GenTableMapper extends BaseMapper { /** * 查询表ID业务信息 * - * @param id 业务ID + * @param id + * 业务ID * @return 业务信息 */ GenTableEntity selectGenTableById(Long id); @@ -57,7 +58,8 @@ public interface GenTableMapper extends BaseMapper { /** * 查询表名称业务信息 * - * @param tableName 表名称 + * @param tableName + * 表名称 * @return 业务信息 */ GenTableEntity selectGenTableByName(String tableName); diff --git a/play-generator/src/main/java/com/starry/generator/service/GenTableService.java b/play-generator/src/main/java/com/starry/generator/service/GenTableService.java index b8630aa..8d3eddf 100644 --- a/play-generator/src/main/java/com/starry/generator/service/GenTableService.java +++ b/play-generator/src/main/java/com/starry/generator/service/GenTableService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.generator.entity.GenTableEntity; import com.starry.generator.entity.vo.GenTableVo; - import java.util.List; import java.util.Map; @@ -17,17 +16,19 @@ public interface GenTableService extends IService { /** * 查询数据库列表 * - * @param genTableEntity 业务信息 + * @param genTableEntity + * 业务信息 * @return 数据库表集合 */ - /*List selectDbTableList(GenTableEntity genTableEntity);*/ + /* List selectDbTableList(GenTableEntity genTableEntity); */ IPage selectDbTableList(GenTableEntity genTableEntity); /** * 查询据库列表 * - * @param tableNames 表名称组 + * @param tableNames + * 表名称组 * @return 数据库表集合 */ List selectDbTableListByNames(String[] tableNames); @@ -35,14 +36,16 @@ public interface GenTableService extends IService { /** * 导入表结构 * - * @param tableList 导入表列表 + * @param tableList + * 导入表列表 */ void importGenTable(List tableList); /** * 查询业务列表 * - * @param genTableEntity 业务信息 + * @param genTableEntity + * 业务信息 * @return 业务集合 */ IPage selectGenTableList(GenTableVo genTableEntity); @@ -50,7 +53,8 @@ public interface GenTableService extends IService { /** * 预览代码 * - * @param tableId 表编号 + * @param tableId + * 表编号 * @return 预览数据列表 */ Map previewCode(Long tableId); @@ -58,7 +62,8 @@ public interface GenTableService extends IService { /** * 生成代码（下载方式） * - * @param tableName 表名称 + * @param tableName + * 表名称 * @return 数据 */ byte[] downloadCode(String tableName); @@ -66,7 +71,8 @@ public interface GenTableService extends IService { /** * 批量生成代码（下载方式） * - * @param tableNames 表数组 + * @param tableNames + * 表数组 * @return 数据 */ byte[] downloadCode(String[] tableNames); @@ -74,7 +80,8 @@ public interface GenTableService extends IService { /** * 删除业务信息 * - * @param tableIds 需要删除的表数据ID + * @param tableIds + * 需要删除的表数据ID */ void deleteGenTableByIds(Long[] tableIds); } diff --git a/play-generator/src/main/java/com/starry/generator/service/GenTableServiceImpl.java b/play-generator/src/main/java/com/starry/generator/service/GenTableServiceImpl.java index 5e7db07..8af375a 100644 --- a/play-generator/src/main/java/com/starry/generator/service/GenTableServiceImpl.java +++ b/play-generator/src/main/java/com/starry/generator/service/GenTableServiceImpl.java @@ -17,15 +17,6 @@ import com.starry.generator.mapper.GenTableMapper; import com.starry.generator.utils.GenUtils; import com.starry.generator.utils.VelocityInitializer; import com.starry.generator.utils.VelocityUtils; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.io.IOUtils; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.StringWriter; @@ -35,6 +26,14 @@ import java.util.List; import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import javax.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.IOUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * @author admin @@ -47,13 +46,14 @@ public class GenTableServiceImpl extends ServiceImpl selectDbTableList(GenTableEntity genTableEntity) { - return baseMapper.selectDbTableList(genTableEntity); - }*/ + /* + * @Override public List selectDbTableList(GenTableEntity + * genTableEntity) { return baseMapper.selectDbTableList(genTableEntity); } + */ @Override public IPage selectDbTableList(GenTableEntity genTableEntity) { - Page mpPage = new Page(Convert.toLong(ServletUtils.getParameterToInt("pageNum"), 1L), Convert.toLong(ServletUtils.getParameterToInt("pageSize"), 10L)); + Page mpPage = new Page(Convert.toLong(ServletUtils.getParameterToInt("pageNum"), 1L), + Convert.toLong(ServletUtils.getParameterToInt("pageSize"), 10L)); return baseMapper.selectDbTableList(mpPage, genTableEntity); } @@ -73,7 +73,8 @@ public class GenTableServiceImpl extends ServiceImpl 0) { // 查询数据库表列信息 - List genTableColumnEntities = genTableColumnMapper.selectDbTableColumnsByName(tableName); + List genTableColumnEntities = genTableColumnMapper + .selectDbTableColumnsByName(tableName); if (CollectionUtil.isNotEmpty(genTableColumnEntities)) { for (GenTableColumnEntity column : genTableColumnEntities) { GenUtils.initColumnField(column, table); @@ -100,7 +101,7 @@ public class GenTableServiceImpl extends ServiceImpl genTableColumnEntities = genTableColumnMapper.selectList(new LambdaQueryWrapper().in(GenTableColumnEntity::getTableId, Arrays.asList(tableIds))); + List genTableColumnEntities = genTableColumnMapper + .selectList(new LambdaQueryWrapper().in(GenTableColumnEntity::getTableId, + Arrays.asList(tableIds))); genTableColumnMapper.deleteBatchIds(genTableColumnEntities); } @@ -151,7 +154,7 @@ public class GenTableServiceImpl extends ServiceImpl HelloWorld + * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD -> + * HelloWorld * - * @param name 转换前的下划线大写方式命名的字符串 + * @param name + * 转换前的下划线大写方式命名的字符串 * @return 转换后的驼峰式命名的字符串 */ public static String convertToCamelCase(String name) { @@ -94,7 +96,8 @@ public class GenUtils { /** * 获取模块名 * - * @param packageName 包名 + * @param packageName + * 包名 * @return 模块名 */ public static String getModuleName(String packageName) { @@ -106,7 +109,8 @@ public class GenUtils { /** * 获取业务名 * - * @param tableName 表名 + * @param tableName + * 表名 * @return 业务名 */ public static String getBusinessName(String tableName) { @@ -128,10 +132,13 @@ public class GenUtils { column.setJavaType(GenConstants.TYPE_STRING); column.setQueryType(GenConstants.QUERY_EQ); - if (arraysContains(GenConstants.COLUMN_TYPE_STR, dataType) || arraysContains(GenConstants.COLUMN_TYPE_TEXT, dataType)) { + if (arraysContains(GenConstants.COLUMN_TYPE_STR, dataType) + || arraysContains(GenConstants.COLUMN_TYPE_TEXT, dataType)) { // 字符串长度超过500设置为文本域 Integer columnLength = getColumnLength(column.getColumnType()); - String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMN_TYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT; + String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMN_TYPE_TEXT, dataType) + ? GenConstants.HTML_TEXTAREA + : GenConstants.HTML_INPUT; column.setHtmlType(htmlType); } else if (arraysContains(GenConstants.COLUMN_TYPE_TIME, dataType)) { // 时间类型 @@ -197,10 +204,10 @@ public class GenUtils { } /** - * 获取数据库类型字段 - * 例如： bigint 、varchar(64) + * 获取数据库类型字段 例如： bigint 、varchar(64) * - * @param columnType 列类型 + * @param columnType + * 列类型 * @return 截取后的列类型 */ public static String getDbType(String columnType) { @@ -214,7 +221,8 @@ public class GenUtils { /** * 获取字段长度 * - * @param columnType 列类型 + * @param columnType + * 列类型 * @return 截取后的列类型 */ public static Integer getColumnLength(String columnType) { @@ -255,8 +263,10 @@ public class GenUtils { /** * 校验数组是否包含指定值 * - * @param arr 数组 - * @param targetValue 值 + * @param arr + * 数组 + * @param targetValue + * 值 * @return 是否包含 */ public static boolean arraysContains(String[] arr, String targetValue) { diff --git a/play-generator/src/main/java/com/starry/generator/utils/VelocityInitializer.java b/play-generator/src/main/java/com/starry/generator/utils/VelocityInitializer.java index 55f9687..edf88ac 100644 --- a/play-generator/src/main/java/com/starry/generator/utils/VelocityInitializer.java +++ b/play-generator/src/main/java/com/starry/generator/utils/VelocityInitializer.java @@ -1,8 +1,7 @@ package com.starry.generator.utils; -import org.apache.velocity.app.Velocity; - import java.util.Properties; +import org.apache.velocity.app.Velocity; /** * @author VelocityEngine工厂 @@ -13,7 +12,8 @@ public class VelocityInitializer { public static void initVelocity() { Properties p = new Properties(); // 加载classpath目录下的vm文件 - p.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); + p.setProperty("resource.loader.file.class", + "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); // 定义字符集 p.setProperty(Velocity.INPUT_ENCODING, "UTF-8"); // 初始化Velocity引擎，指定配置Properties diff --git a/play-generator/src/main/java/com/starry/generator/utils/VelocityUtils.java b/play-generator/src/main/java/com/starry/generator/utils/VelocityUtils.java index 0b321b1..e1c2711 100644 --- a/play-generator/src/main/java/com/starry/generator/utils/VelocityUtils.java +++ b/play-generator/src/main/java/com/starry/generator/utils/VelocityUtils.java @@ -1,6 +1,5 @@ package com.starry.generator.utils; - import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; @@ -9,13 +8,11 @@ import com.starry.common.utils.StringUtils; import com.starry.generator.constant.GenConstants; import com.starry.generator.entity.GenTableColumnEntity; import com.starry.generator.entity.GenTableEntity; +import java.util.*; import org.apache.velocity.VelocityContext; -import java.util.*; - /** - * @author admin - * 模板处理工具类 + * @author admin 模板处理工具类 * @since 2022/7/19 */ public class VelocityUtils { @@ -80,7 +77,8 @@ public class VelocityUtils { /** * 获取包前缀 * - * @param packageName 包名称 + * @param packageName + * 包名称 * @return 包前缀名称 */ public static String getPackagePrefix(String packageName) { @@ -91,7 +89,8 @@ public class VelocityUtils { /** * 根据列类型获取导入包 * - * @param genTableEntity 业务表对象 + * @param genTableEntity + * 业务表对象 * @return 返回需要导入的包列表 */ public static HashSet getImportList(GenTableEntity genTableEntity) { @@ -116,8 +115,10 @@ public class VelocityUtils { /** * 获取权限前缀 * - * @param moduleName 模块名称 - * @param businessName 业务名称 + * @param moduleName + * 模块名称 + * @param businessName + * 业务名称 * @return 返回权限前缀 */ public static String getPermissionPrefix(String moduleName, String businessName) { @@ -127,7 +128,8 @@ public class VelocityUtils { /** * 根据列类型获取字典组 * - * @param genTableEntity 业务表对象 + * @param genTableEntity + * 业务表对象 * @return 返回字典组 */ public static String getDicts(GenTableEntity genTableEntity) { @@ -144,12 +146,16 @@ public class VelocityUtils { /** * 添加字典列表 * - * @param dicts 字典列表 - * @param columns 列集合 + * @param dicts + * 字典列表 + * @param columns + * 列集合 */ public static void addDicts(Set dicts, List columns) { for (GenTableColumnEntity column : columns) { - if (!column.isSuperColumn() && StrUtil.isNotBlank(column.getDictType()) && StringUtils.equalsAny(column.getHtmlType(), new String[]{GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX})) { + if (!column.isSuperColumn() && StrUtil.isNotBlank(column.getDictType()) && StringUtils.equalsAny( + column.getHtmlType(), + new String[]{GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX})) { dicts.add("'" + column.getDictType() + "'"); } } @@ -201,11 +207,13 @@ public class VelocityUtils { /** * 获取上级菜单ID字段 * - * @param paramsObj 生成其他选项 + * @param paramsObj + * 生成其他选项 * @return 上级菜单ID字段 */ public static String getParentMenuId(JSONObject paramsObj) { - if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID) && StrUtil.isNotBlank(paramsObj.getString(GenConstants.PARENT_MENU_ID))) { + if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID) + && StrUtil.isNotBlank(paramsObj.getString(GenConstants.PARENT_MENU_ID))) { return paramsObj.getString(GenConstants.PARENT_MENU_ID); } return DEFAULT_PARENT_MENU_ID; @@ -214,7 +222,8 @@ public class VelocityUtils { /** * 获取树编码 * - * @param paramsObj 生成其他选项 + * @param paramsObj + * 生成其他选项 * @return 树编码 */ public static String getTreeCode(JSONObject paramsObj) { @@ -227,7 +236,8 @@ public class VelocityUtils { /** * 获取树父编码 * - * @param paramsObj 生成其他选项 + * @param paramsObj + * 生成其他选项 * @return 树父编码 */ public static String getTreeParentCode(JSONObject paramsObj) { @@ -240,7 +250,8 @@ public class VelocityUtils { /** * 获取树名称 * - * @param paramsObj 生成其他选项 + * @param paramsObj + * 生成其他选项 * @return 树名称 */ public static String getTreeName(JSONObject paramsObj) { @@ -319,7 +330,8 @@ public class VelocityUtils { if (template.contains("entity.java.vm")) { fileName = StringUtils.format("{}/module/entity/{}Entity.java", javaPath, className); - } else if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTableEntity.getTplCategory())) { + } else if (template.contains("sub-domain.java.vm") + && StringUtils.equals(GenConstants.TPL_SUB, genTableEntity.getTplCategory())) { fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTableEntity.getSubTable().getClassName()); } else if (template.contains("mapper.java.vm")) { fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className); diff --git a/pom.xml b/pom.xml index 065ba67..ec99f40 100644 --- a/pom.xml +++ b/pom.xml @@ -257,13 +257,15 @@ 2.43.0 - - - 1.17.0 - - - - + + + + + true + 4 + + + src/main/java/**/*.java @@ -281,14 +283,14 @@ - + + - google_checks.xml + sun_checks.xml UTF-8 true true @@ -311,6 +313,7 @@ + --> \ No newline at end of file