WMS/wms-admin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改名

Browse Source
This commit is contained in:
zc
2026-02-27 10:50:07 +08:00
parent 0ee56404c2
commit 86527b9c21
611 changed files with 2741 additions and 2752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
wms-module-system/src/main/java/top/wms/admin/auth/AbstractLoginHandler.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.auth;
package top.wms.admin.auth;
import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil;
@@ -7,19 +7,19 @@ import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
import top.ysoft.admin.auth.model.req.LoginReq;
import top.ysoft.admin.common.context.RoleContext;
import top.ysoft.admin.common.context.UserContext;
import top.ysoft.admin.common.context.UserContextHolder;
import top.ysoft.admin.common.context.UserExtraContext;
import top.ysoft.admin.common.enums.DisEnableStatusEnum;
import top.ysoft.admin.system.model.entity.DeptDO;
import top.ysoft.admin.system.model.entity.UserDO;
import top.ysoft.admin.system.model.resp.ClientResp;
import top.ysoft.admin.system.service.DeptService;
import top.ysoft.admin.system.service.OptionService;
import top.ysoft.admin.system.service.RoleService;
import top.ysoft.admin.system.service.UserService;
import top.wms.admin.auth.model.req.LoginReq;
import top.wms.admin.common.context.RoleContext;
import top.wms.admin.common.context.UserContext;
import top.wms.admin.common.context.UserContextHolder;
import top.wms.admin.common.context.UserExtraContext;
import top.wms.admin.common.enums.DisEnableStatusEnum;
import top.wms.admin.system.model.entity.DeptDO;
import top.wms.admin.system.model.entity.UserDO;
import top.wms.admin.system.model.resp.ClientResp;
import top.wms.admin.system.service.DeptService;
import top.wms.admin.system.service.OptionService;
import top.wms.admin.system.service.RoleService;
import top.wms.admin.system.service.UserService;
import top.continew.starter.core.validation.CheckUtils;
import top.continew.starter.core.validation.Validator;
import top.continew.starter.web.util.SpringWebUtils;
@@ -27,7 +27,7 @@ import top.continew.starter.web.util.SpringWebUtils;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import static top.ysoft.admin.system.enums.PasswordPolicyEnum.PASSWORD_EXPIRATION_DAYS;
import static top.wms.admin.system.enums.PasswordPolicyEnum.PASSWORD_EXPIRATION_DAYS;
/**
* 登录处理器基类

10
wms-module-system/src/main/java/top/wms/admin/auth/LoginHandler.java
View File

@@ -1,10 +1,10 @@
package top.ysoft.admin.auth;
package top.wms.admin.auth;
import jakarta.servlet.http.HttpServletRequest;
import top.ysoft.admin.auth.enums.AuthTypeEnum;
import top.ysoft.admin.auth.model.req.LoginReq;
import top.ysoft.admin.auth.model.resp.LoginResp;
import top.ysoft.admin.system.model.resp.ClientResp;
import top.wms.admin.auth.enums.AuthTypeEnum;
import top.wms.admin.auth.model.req.LoginReq;
import top.wms.admin.auth.model.resp.LoginResp;
import top.wms.admin.system.model.resp.ClientResp;
/**
* 登录处理器

6
wms-module-system/src/main/java/top/wms/admin/auth/LoginHandlerFactory.java
View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.auth;
package top.wms.admin.auth;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import top.ysoft.admin.auth.enums.AuthTypeEnum;
import top.ysoft.admin.auth.model.req.LoginReq;
import top.wms.admin.auth.enums.AuthTypeEnum;
import top.wms.admin.auth.model.req.LoginReq;
import java.util.EnumMap;
import java.util.List;

4
wms-module-system/src/main/java/top/wms/admin/auth/enums/AuthTypeEnum.java
View File

@@ -1,8 +1,8 @@
package top.ysoft.admin.auth.enums;
package top.wms.admin.auth.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import top.ysoft.admin.common.constant.UiConstants;
import top.wms.admin.common.constant.UiConstants;
import top.continew.starter.core.enums.BaseEnum;
/**

22
wms-module-system/src/main/java/top/wms/admin/auth/handler/AccountLoginHandler.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.auth.handler;
package top.wms.admin.auth.handler;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.extra.servlet.JakartaServletUtil;
@@ -6,16 +6,16 @@ import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Component;
import top.ysoft.admin.auth.AbstractLoginHandler;
import top.ysoft.admin.auth.enums.AuthTypeEnum;
import top.ysoft.admin.auth.model.req.AccountLoginReq;
import top.ysoft.admin.auth.model.resp.LoginResp;
import top.ysoft.admin.common.constant.CacheConstants;
import top.ysoft.admin.common.constant.SysConstants;
import top.ysoft.admin.common.util.SecureUtils;
import top.ysoft.admin.system.enums.PasswordPolicyEnum;
import top.ysoft.admin.system.model.entity.UserDO;
import top.ysoft.admin.system.model.resp.ClientResp;
import top.wms.admin.auth.AbstractLoginHandler;
import top.wms.admin.auth.enums.AuthTypeEnum;
import top.wms.admin.auth.model.req.AccountLoginReq;
import top.wms.admin.auth.model.resp.LoginResp;
import top.wms.admin.common.constant.CacheConstants;
import top.wms.admin.common.constant.SysConstants;
import top.wms.admin.common.util.SecureUtils;
import top.wms.admin.system.enums.PasswordPolicyEnum;
import top.wms.admin.system.model.entity.UserDO;
import top.wms.admin.system.model.resp.ClientResp;
import top.continew.starter.cache.redisson.util.RedisUtils;
import top.continew.starter.core.util.ExceptionUtils;
import top.continew.starter.core.validation.CheckUtils;

16
wms-module-system/src/main/java/top/wms/admin/auth/handler/EmailLoginHandler.java
View File

@@ -1,14 +1,14 @@
package top.ysoft.admin.auth.handler;
package top.wms.admin.auth.handler;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Component;
import top.ysoft.admin.auth.AbstractLoginHandler;
import top.ysoft.admin.auth.enums.AuthTypeEnum;
import top.ysoft.admin.auth.model.req.EmailLoginReq;
import top.ysoft.admin.auth.model.resp.LoginResp;
import top.ysoft.admin.common.constant.CacheConstants;
import top.ysoft.admin.system.model.entity.UserDO;
import top.ysoft.admin.system.model.resp.ClientResp;
import top.wms.admin.auth.AbstractLoginHandler;
import top.wms.admin.auth.enums.AuthTypeEnum;
import top.wms.admin.auth.model.req.EmailLoginReq;
import top.wms.admin.auth.model.resp.LoginResp;
import top.wms.admin.common.constant.CacheConstants;
import top.wms.admin.system.model.entity.UserDO;
import top.wms.admin.system.model.resp.ClientResp;
import top.continew.starter.cache.redisson.util.RedisUtils;
import top.continew.starter.core.validation.ValidationUtils;

16
wms-module-system/src/main/java/top/wms/admin/auth/handler/PhoneLoginHandler.java
View File

@@ -1,14 +1,14 @@
package top.ysoft.admin.auth.handler;
package top.wms.admin.auth.handler;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Component;
import top.ysoft.admin.auth.AbstractLoginHandler;
import top.ysoft.admin.auth.enums.AuthTypeEnum;
import top.ysoft.admin.auth.model.req.PhoneLoginReq;
import top.ysoft.admin.auth.model.resp.LoginResp;
import top.ysoft.admin.common.constant.CacheConstants;
import top.ysoft.admin.system.model.entity.UserDO;
import top.ysoft.admin.system.model.resp.ClientResp;
import top.wms.admin.auth.AbstractLoginHandler;
import top.wms.admin.auth.enums.AuthTypeEnum;
import top.wms.admin.auth.model.req.PhoneLoginReq;
import top.wms.admin.auth.model.resp.LoginResp;
import top.wms.admin.common.constant.CacheConstants;
import top.wms.admin.system.model.entity.UserDO;
import top.wms.admin.system.model.resp.ClientResp;
import top.continew.starter.cache.redisson.util.RedisUtils;
import top.continew.starter.core.validation.ValidationUtils;

38
wms-module-system/src/main/java/top/wms/admin/auth/handler/SocialLoginHandler.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.auth.handler;
package top.wms.admin.auth.handler;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.bean.BeanUtil;
@@ -15,24 +15,24 @@ import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthUser;
import me.zhyd.oauth.request.AuthRequest;
import org.springframework.stereotype.Component;
import top.ysoft.admin.auth.AbstractLoginHandler;
import top.ysoft.admin.auth.enums.AuthTypeEnum;
import top.ysoft.admin.auth.model.req.SocialLoginReq;
import top.ysoft.admin.auth.model.resp.LoginResp;
import top.ysoft.admin.common.constant.RegexConstants;
import top.ysoft.admin.common.constant.SysConstants;
import top.ysoft.admin.common.enums.DisEnableStatusEnum;
import top.ysoft.admin.common.enums.GenderEnum;
import top.ysoft.admin.system.enums.MessageTemplateEnum;
import top.ysoft.admin.system.enums.MessageTypeEnum;
import top.ysoft.admin.system.model.entity.RoleDO;
import top.ysoft.admin.system.model.entity.UserDO;
import top.ysoft.admin.system.model.entity.UserSocialDO;
import top.ysoft.admin.system.model.req.MessageReq;
import top.ysoft.admin.system.model.resp.ClientResp;
import top.ysoft.admin.system.service.MessageService;
import top.ysoft.admin.system.service.UserRoleService;
import top.ysoft.admin.system.service.UserSocialService;
import top.wms.admin.auth.AbstractLoginHandler;
import top.wms.admin.auth.enums.AuthTypeEnum;
import top.wms.admin.auth.model.req.SocialLoginReq;
import top.wms.admin.auth.model.resp.LoginResp;
import top.wms.admin.common.constant.RegexConstants;
import top.wms.admin.common.constant.SysConstants;
import top.wms.admin.common.enums.DisEnableStatusEnum;
import top.wms.admin.common.enums.GenderEnum;
import top.wms.admin.system.enums.MessageTemplateEnum;
import top.wms.admin.system.enums.MessageTypeEnum;
import top.wms.admin.system.model.entity.RoleDO;
import top.wms.admin.system.model.entity.UserDO;
import top.wms.admin.system.model.entity.UserSocialDO;
import top.wms.admin.system.model.req.MessageReq;
import top.wms.admin.system.model.resp.ClientResp;
import top.wms.admin.system.service.MessageService;
import top.wms.admin.system.service.UserRoleService;
import top.wms.admin.system.service.UserSocialService;
import top.continew.starter.core.autoconfigure.project.ProjectProperties;
import top.continew.starter.core.exception.BadRequestException;
import top.continew.starter.core.validation.ValidationUtils;

2
wms-module-system/src/main/java/top/wms/admin/auth/model/query/OnlineUserQuery.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.auth.model.query;
package top.wms.admin.auth.model.query;
import cn.hutool.core.date.DatePattern;
import io.swagger.v3.oas.annotations.media.Schema;

2
wms-module-system/src/main/java/top/wms/admin/auth/model/req/AccountLoginReq.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.auth.model.req;
package top.wms.admin.auth.model.req;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;

2
wms-module-system/src/main/java/top/wms/admin/auth/model/req/EmailLoginReq.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.auth.model.req;
package top.wms.admin.auth.model.req;
import cn.hutool.core.lang.RegexPool;
import io.swagger.v3.oas.annotations.media.Schema;

4
wms-module-system/src/main/java/top/wms/admin/auth/model/req/LoginReq.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.auth.model.req;
package top.wms.admin.auth.model.req;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -6,7 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import top.ysoft.admin.auth.enums.AuthTypeEnum;
import top.wms.admin.auth.enums.AuthTypeEnum;
import java.io.Serial;
import java.io.Serializable;

2
wms-module-system/src/main/java/top/wms/admin/auth/model/req/PhoneLoginReq.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.auth.model.req;
package top.wms.admin.auth.model.req;
import cn.hutool.core.lang.RegexPool;
import io.swagger.v3.oas.annotations.media.Schema;

2
wms-module-system/src/main/java/top/wms/admin/auth/model/req/SocialLoginReq.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.auth.model.req;
package top.wms.admin.auth.model.req;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;

2
wms-module-system/src/main/java/top/wms/admin/auth/model/resp/CaptchaResp.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.auth.model.resp;
package top.wms.admin.auth.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Builder;

2
wms-module-system/src/main/java/top/wms/admin/auth/model/resp/LoginResp.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.auth.model.resp;
package top.wms.admin.auth.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Builder;

6
wms-module-system/src/main/java/top/wms/admin/auth/model/resp/OnlineUserResp.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.auth.model.resp;
package top.wms.admin.auth.model.resp;
import cn.crane4j.annotation.Assemble;
import cn.crane4j.annotation.AssembleMethod;
@@ -6,8 +6,8 @@ import cn.crane4j.annotation.ContainerMethod;
import cn.crane4j.annotation.MappingType;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.ysoft.admin.auth.service.OnlineUserService;
import top.ysoft.admin.common.constant.ContainerConstants;
import top.wms.admin.auth.service.OnlineUserService;
import top.wms.admin.common.constant.ContainerConstants;
import java.io.Serial;
import java.io.Serializable;

2
wms-module-system/src/main/java/top/wms/admin/auth/model/resp/RouteResp.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.auth.model.resp;
package top.wms.admin.auth.model.resp;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema;

2
wms-module-system/src/main/java/top/wms/admin/auth/model/resp/SocialAuthAuthorizeResp.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.auth.model.resp;
package top.wms.admin.auth.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Builder;

4
wms-module-system/src/main/java/top/wms/admin/auth/model/resp/UserInfoResp.java
View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.auth.model.resp;
package top.wms.admin.auth.model.resp;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.ysoft.admin.common.enums.GenderEnum;
import top.wms.admin.common.enums.GenderEnum;
import top.continew.starter.security.mask.annotation.JsonMask;
import top.continew.starter.security.mask.enums.MaskType;

8
wms-module-system/src/main/java/top/wms/admin/auth/service/AuthService.java
View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.auth.service;
package top.wms.admin.auth.service;
import jakarta.servlet.http.HttpServletRequest;
import top.ysoft.admin.auth.model.req.LoginReq;
import top.ysoft.admin.auth.model.resp.LoginResp;
import top.ysoft.admin.auth.model.resp.RouteResp;
import top.wms.admin.auth.model.req.LoginReq;
import top.wms.admin.auth.model.resp.LoginResp;
import top.wms.admin.auth.model.resp.RouteResp;
import java.util.List;

6
wms-module-system/src/main/java/top/wms/admin/auth/service/OnlineUserService.java
View File

@@ -1,7 +1,7 @@
package top.ysoft.admin.auth.service;
package top.wms.admin.auth.service;
import top.ysoft.admin.auth.model.query.OnlineUserQuery;
import top.ysoft.admin.auth.model.resp.OnlineUserResp;
import top.wms.admin.auth.model.query.OnlineUserQuery;
import top.wms.admin.auth.model.resp.OnlineUserResp;
import top.continew.starter.extension.crud.model.query.PageQuery;
import top.continew.starter.extension.crud.model.resp.PageResp;

34
wms-module-system/src/main/java/top/wms/admin/auth/service/impl/AuthServiceImpl.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.auth.service.impl;
package top.wms.admin.auth.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
@@ -8,22 +8,22 @@ import cn.hutool.core.lang.tree.TreeUtil;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import top.ysoft.admin.auth.LoginHandler;
import top.ysoft.admin.auth.LoginHandlerFactory;
import top.ysoft.admin.auth.enums.AuthTypeEnum;
import top.ysoft.admin.auth.model.req.LoginReq;
import top.ysoft.admin.auth.model.resp.LoginResp;
import top.ysoft.admin.auth.model.resp.RouteResp;
import top.ysoft.admin.auth.service.AuthService;
import top.ysoft.admin.common.constant.SysConstants;
import top.ysoft.admin.common.context.RoleContext;
import top.ysoft.admin.common.enums.DisEnableStatusEnum;
import top.ysoft.admin.system.enums.MenuTypeEnum;
import top.ysoft.admin.system.model.resp.ClientResp;
import top.ysoft.admin.system.model.resp.MenuResp;
import top.ysoft.admin.system.service.ClientService;
import top.ysoft.admin.system.service.MenuService;
import top.ysoft.admin.system.service.RoleService;
import top.wms.admin.auth.LoginHandler;
import top.wms.admin.auth.LoginHandlerFactory;
import top.wms.admin.auth.enums.AuthTypeEnum;
import top.wms.admin.auth.model.req.LoginReq;
import top.wms.admin.auth.model.resp.LoginResp;
import top.wms.admin.auth.model.resp.RouteResp;
import top.wms.admin.auth.service.AuthService;
import top.wms.admin.common.constant.SysConstants;
import top.wms.admin.common.context.RoleContext;
import top.wms.admin.common.enums.DisEnableStatusEnum;
import top.wms.admin.system.enums.MenuTypeEnum;
import top.wms.admin.system.model.resp.ClientResp;
import top.wms.admin.system.model.resp.MenuResp;
import top.wms.admin.system.service.ClientService;
import top.wms.admin.system.service.MenuService;
import top.wms.admin.system.service.RoleService;
import top.continew.starter.core.validation.ValidationUtils;
import top.continew.starter.extension.crud.annotation.TreeField;
import top.continew.starter.extension.crud.autoconfigure.CrudProperties;

14
wms-module-system/src/main/java/top/wms/admin/auth/service/impl/OnlineUserServiceImpl.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.auth.service.impl;
package top.wms.admin.auth.service.impl;
import cn.crane4j.annotation.AutoOperate;
import cn.dev33.satoken.dao.SaTokenDao;
@@ -10,12 +10,12 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import top.ysoft.admin.auth.model.query.OnlineUserQuery;
import top.ysoft.admin.auth.model.resp.OnlineUserResp;
import top.ysoft.admin.auth.service.OnlineUserService;
import top.ysoft.admin.common.context.UserContext;
import top.ysoft.admin.common.context.UserContextHolder;
import top.ysoft.admin.common.context.UserExtraContext;
import top.wms.admin.auth.model.query.OnlineUserQuery;
import top.wms.admin.auth.model.resp.OnlineUserResp;
import top.wms.admin.auth.service.OnlineUserService;
import top.wms.admin.common.context.UserContext;
import top.wms.admin.common.context.UserContextHolder;
import top.wms.admin.common.context.UserExtraContext;
import top.continew.starter.core.constant.StringConstants;
import top.continew.starter.extension.crud.model.query.PageQuery;
import top.continew.starter.extension.crud.model.resp.PageResp;

16
wms-module-system/src/main/java/top/wms/admin/consume/mapper/DownRecordMapper.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.mapper;
package top.wms.admin.consume.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -6,15 +6,15 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import top.continew.starter.data.mp.base.BaseMapper;
import top.ysoft.admin.consume.model.entity.DownRecordDO;
import top.ysoft.admin.consume.model.resp.DownRecordResp;
import top.wms.admin.consume.model.entity.DownRecordDO;
import top.wms.admin.consume.model.resp.DownRecordResp;
/**
* 消费下发记录 Mapper
*
* @author zc
* @since 2026/02/25 11:01
*/
* 消费下发记录 Mapper
*
* @author zc
* @since 2026/02/25 11:01
*/
@Repository
public interface DownRecordMapper extends BaseMapper<DownRecordDO> {

4
wms-module-system/src/main/java/top/wms/admin/consume/mapper/GroupMapper.java
View File

@@ -1,7 +1,7 @@
package top.ysoft.admin.consume.mapper;
package top.wms.admin.consume.mapper;
import top.continew.starter.data.mp.base.BaseMapper;
import top.ysoft.admin.consume.model.entity.GroupDO;
import top.wms.admin.consume.model.entity.GroupDO;
import org.springframework.stereotype.Repository;
/**

4
wms-module-system/src/main/java/top/wms/admin/consume/mapper/GroupUserMapper.java
View File

@@ -1,8 +1,8 @@
package top.ysoft.admin.consume.mapper;
package top.wms.admin.consume.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import top.ysoft.admin.consume.model.entity.GroupUserDO;
import top.wms.admin.consume.model.entity.GroupUserDO;
/**
* 消费组用户映射器

6
wms-module-system/src/main/java/top/wms/admin/consume/mapper/RechargeRecordMapper.java
View File

@@ -1,13 +1,13 @@
package top.ysoft.admin.consume.mapper;
package top.wms.admin.consume.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import top.continew.starter.data.mp.base.BaseMapper;
import top.ysoft.admin.consume.model.entity.RechargeRecordDO;
import top.wms.admin.consume.model.entity.RechargeRecordDO;
import org.springframework.stereotype.Repository;
import top.ysoft.admin.consume.model.resp.RechargeRecordResp;
import top.wms.admin.consume.model.resp.RechargeRecordResp;
import java.util.List;

6
wms-module-system/src/main/java/top/wms/admin/consume/mapper/RecordMapper.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.mapper;
package top.wms.admin.consume.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import top.continew.starter.data.mp.base.BaseMapper;
import top.ysoft.admin.consume.model.entity.RecordDO;
import top.ysoft.admin.consume.model.resp.RecordResp;
import top.wms.admin.consume.model.entity.RecordDO;
import top.wms.admin.consume.model.resp.RecordResp;
import java.util.List;

6
wms-module-system/src/main/java/top/wms/admin/consume/mapper/ReportMapper.java
View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.consume.mapper;
package top.wms.admin.consume.mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import top.ysoft.admin.consume.model.query.ReportQuery;
import top.ysoft.admin.consume.model.resp.report.*;
import top.wms.admin.consume.model.query.ReportQuery;
import top.wms.admin.consume.model.resp.report.*;
import java.util.List;

4
wms-module-system/src/main/java/top/wms/admin/consume/mapper/TenantMapper.java
View File

@@ -1,7 +1,7 @@
package top.ysoft.admin.consume.mapper;
package top.wms.admin.consume.mapper;
import top.continew.starter.data.mp.base.BaseMapper;
import top.ysoft.admin.consume.model.entity.TenantDO;
import top.wms.admin.consume.model.entity.TenantDO;
import org.springframework.stereotype.Repository;
/**

4
wms-module-system/src/main/java/top/wms/admin/consume/mapper/TimeIntervalMapper.java
View File

@@ -1,7 +1,7 @@
package top.ysoft.admin.consume.mapper;
package top.wms.admin.consume.mapper;
import top.continew.starter.data.mp.base.BaseMapper;
import top.ysoft.admin.consume.model.entity.TimeIntervalDO;
import top.wms.admin.consume.model.entity.TimeIntervalDO;
import org.springframework.stereotype.Repository;
/**

12
wms-module-system/src/main/java/top/wms/admin/consume/mapstruct/RechargeRecordConvert.java
View File

@@ -1,12 +1,12 @@
package top.ysoft.admin.consume.mapstruct;
package top.wms.admin.consume.mapstruct;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import top.ysoft.admin.common.enums.ConsumeRechargeModeEnum;
import top.ysoft.admin.common.enums.ConsumeRechargeTypeEnum;
import top.ysoft.admin.common.enums.ConsumeRechargeWayEnum;
import top.ysoft.admin.consume.model.entity.RechargeRecordDO;
import top.ysoft.admin.consume.model.resp.RechargeRecordResp;
import top.wms.admin.common.enums.ConsumeRechargeModeEnum;
import top.wms.admin.common.enums.ConsumeRechargeTypeEnum;
import top.wms.admin.common.enums.ConsumeRechargeWayEnum;
import top.wms.admin.consume.model.entity.RechargeRecordDO;
import top.wms.admin.consume.model.resp.RechargeRecordResp;
import java.util.List;

2
wms-module-system/src/main/java/top/wms/admin/consume/mapstruct/RecordConvert.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.mapstruct;
package top.wms.admin.consume.mapstruct;
import org.mapstruct.Mapper;

4
wms-module-system/src/main/java/top/wms/admin/consume/model/entity/DownRecordDO.java
View File

@@ -1,10 +1,10 @@
package top.ysoft.admin.consume.model.entity;
package top.wms.admin.consume.model.entity;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableName;
import top.ysoft.admin.common.model.entity.BaseDO;
import top.wms.admin.common.model.entity.BaseDO;
import java.io.Serial;
import java.time.*;

4
wms-module-system/src/main/java/top/wms/admin/consume/model/entity/GroupDO.java
View File

@@ -1,8 +1,8 @@
package top.ysoft.admin.consume.model.entity;
package top.wms.admin.consume.model.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import top.ysoft.admin.common.model.entity.BaseDO;
import top.wms.admin.common.model.entity.BaseDO;
import java.io.Serial;
import java.math.BigDecimal;

2
wms-module-system/src/main/java/top/wms/admin/consume/model/entity/GroupUserDO.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.entity;
package top.wms.admin.consume.model.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

6
wms-module-system/src/main/java/top/wms/admin/consume/model/entity/RechargeRecordDO.java
View File

@@ -1,10 +1,10 @@
package top.ysoft.admin.consume.model.entity;
package top.wms.admin.consume.model.entity;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableName;
import top.ysoft.admin.common.model.entity.BaseDO;
import top.wms.admin.common.model.entity.BaseDO;
import java.io.Serial;
import java.time.*;
@@ -102,7 +102,7 @@ public class RechargeRecordDO extends BaseDO {
* 充值类型 0补贴 1充值 2退款
*/
private Integer rechargeType;
/**
/**
* 清除补贴金额，分
*/
private BigDecimal clearBtje;

4
wms-module-system/src/main/java/top/wms/admin/consume/model/entity/RecordDO.java
View File

@@ -1,10 +1,10 @@
package top.ysoft.admin.consume.model.entity;
package top.wms.admin.consume.model.entity;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableName;
import top.ysoft.admin.common.model.entity.BaseDO;
import top.wms.admin.common.model.entity.BaseDO;
import java.io.Serial;
import java.math.BigDecimal;

4
wms-module-system/src/main/java/top/wms/admin/consume/model/entity/TenantDO.java
View File

@@ -1,10 +1,10 @@
package top.ysoft.admin.consume.model.entity;
package top.wms.admin.consume.model.entity;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableName;
import top.ysoft.admin.common.model.entity.BaseDO;
import top.wms.admin.common.model.entity.BaseDO;
import java.io.Serial;

4
wms-module-system/src/main/java/top/wms/admin/consume/model/entity/TimeIntervalDO.java
View File

@@ -1,10 +1,10 @@
package top.ysoft.admin.consume.model.entity;
package top.wms.admin.consume.model.entity;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableName;
import top.ysoft.admin.common.model.entity.BaseDO;
import top.wms.admin.common.model.entity.BaseDO;
import java.io.Serial;
import java.math.BigDecimal;

6
wms-module-system/src/main/java/top/wms/admin/consume/model/query/DownRecordQuery.java
View File

@@ -1,20 +1,16 @@
package top.ysoft.admin.consume.model.query;
package top.wms.admin.consume.model.query;
import cn.hutool.core.date.DatePattern;
import jakarta.validation.constraints.Size;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import org.springframework.format.annotation.DateTimeFormat;
import top.continew.starter.data.core.annotation.Query;
import top.continew.starter.data.core.enums.QueryType;
import java.io.Serial;
import java.io.Serializable;
import java.time.*;
import java.util.Date;
import java.util.List;
/**
* 消费下发记录查询条件

2
wms-module-system/src/main/java/top/wms/admin/consume/model/query/GroupQuery.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.query;
package top.wms.admin.consume.model.query;
import lombok.Data;

2
wms-module-system/src/main/java/top/wms/admin/consume/model/query/RechargeRecordQuery.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.query;
package top.wms.admin.consume.model.query;
import cn.hutool.core.date.DatePattern;
import lombok.Data;

2
wms-module-system/src/main/java/top/wms/admin/consume/model/query/RecordQuery.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.query;
package top.wms.admin.consume.model.query;
import cn.hutool.core.date.DatePattern;
import io.swagger.v3.oas.annotations.media.Schema;

2
wms-module-system/src/main/java/top/wms/admin/consume/model/query/ReportQuery.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.query;
package top.wms.admin.consume.model.query;
import cn.hutool.core.date.DatePattern;
import io.swagger.v3.oas.annotations.media.Schema;

2
wms-module-system/src/main/java/top/wms/admin/consume/model/query/TenantQuery.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.query;
package top.wms.admin.consume.model.query;
import lombok.Data;

2
wms-module-system/src/main/java/top/wms/admin/consume/model/query/TimeIntervalQuery.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.query;
package top.wms.admin.consume.model.query;
import lombok.Data;

4
wms-module-system/src/main/java/top/wms/admin/consume/model/req/DownRecordReq.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.req;
package top.wms.admin.consume.model.req;
import jakarta.validation.constraints.*;
@@ -6,8 +6,6 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import org.hibernate.validator.constraints.Length;
import java.io.Serial;
import java.io.Serializable;
import java.time.*;

2
wms-module-system/src/main/java/top/wms/admin/consume/model/req/GroupReq.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.req;
package top.wms.admin.consume.model.req;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

5
wms-module-system/src/main/java/top/wms/admin/consume/model/req/PeopleDepositImportReq.java
View File

@@ -1,11 +1,10 @@
package top.ysoft.admin.consume.model.req;
package top.wms.admin.consume.model.req;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import top.ysoft.admin.common.enums.DisEnableStatusEnum;
import top.ysoft.admin.system.enums.ImportPolicyEnum;
import top.wms.admin.system.enums.ImportPolicyEnum;
import java.io.Serial;
import java.io.Serializable;

5
wms-module-system/src/main/java/top/wms/admin/consume/model/req/PeopleDepositImportRowReq.java
View File

@@ -1,14 +1,13 @@
package top.ysoft.admin.consume.model.req;
package top.wms.admin.consume.model.req;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.Data;
import top.ysoft.admin.common.constant.RegexConstants;
import top.wms.admin.common.constant.RegexConstants;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 人员充值导入行数据

2
wms-module-system/src/main/java/top/wms/admin/consume/model/req/RechargeRecordReq.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.req;
package top.wms.admin.consume.model.req;
import lombok.Data;

2
wms-module-system/src/main/java/top/wms/admin/consume/model/req/RecordReq.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.req;
package top.wms.admin.consume.model.req;
import lombok.Data;

2
wms-module-system/src/main/java/top/wms/admin/consume/model/req/TenantReq.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.req;
package top.wms.admin.consume.model.req;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
wms-module-system/src/main/java/top/wms/admin/consume/model/req/TimeIntervalReq.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.req;
package top.wms.admin.consume.model.req;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

4
wms-module-system/src/main/java/top/wms/admin/consume/model/resp/DownRecordResp.java
View File

@@ -1,10 +1,10 @@
package top.ysoft.admin.consume.model.resp;
package top.wms.admin.consume.model.resp;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.ysoft.admin.common.model.resp.BaseDetailResp;
import top.wms.admin.common.model.resp.BaseDetailResp;
import java.io.Serial;
import java.time.*;

4
wms-module-system/src/main/java/top/wms/admin/consume/model/resp/GroupResp.java
View File

@@ -1,11 +1,11 @@
package top.ysoft.admin.consume.model.resp;
package top.wms.admin.consume.model.resp;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.continew.starter.extension.crud.model.resp.LabelValueResp;
import top.ysoft.admin.common.model.resp.BaseDetailResp;
import top.wms.admin.common.model.resp.BaseDetailResp;
import java.io.Serial;
import java.math.BigDecimal;

2
wms-module-system/src/main/java/top/wms/admin/consume/model/resp/PeopleDepositImportParseResp.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.resp;
package top.wms.admin.consume.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;

12
wms-module-system/src/main/java/top/wms/admin/consume/model/resp/RechargeRecordResp.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.resp;
package top.wms.admin.consume.model.resp;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
@@ -6,10 +6,10 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter;
import top.ysoft.admin.common.enums.ConsumeRechargeModeEnum;
import top.ysoft.admin.common.enums.ConsumeRechargeTypeEnum;
import top.ysoft.admin.common.enums.ConsumeRechargeWayEnum;
import top.ysoft.admin.common.model.resp.BaseDetailResp;
import top.wms.admin.common.enums.ConsumeRechargeModeEnum;
import top.wms.admin.common.enums.ConsumeRechargeTypeEnum;
import top.wms.admin.common.enums.ConsumeRechargeWayEnum;
import top.wms.admin.common.model.resp.BaseDetailResp;
import java.io.Serial;
import java.math.BigDecimal;
@@ -155,7 +155,7 @@ public class RechargeRecordResp extends BaseDetailResp {
@ColumnWidth(30)
private LocalDateTime createTime;
/**
/**
* 清除补贴金额，分
*/
@Schema(description = "清除补贴金额，分")

6
wms-module-system/src/main/java/top/wms/admin/consume/model/resp/RecordResp.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.resp;
package top.wms.admin.consume.model.resp;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
@@ -6,8 +6,8 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter;
import top.ysoft.admin.common.enums.*;
import top.ysoft.admin.common.model.resp.BaseDetailResp;
import top.wms.admin.common.enums.*;
import top.wms.admin.common.model.resp.BaseDetailResp;
import java.io.Serial;
import java.math.BigDecimal;

4
wms-module-system/src/main/java/top/wms/admin/consume/model/resp/TenantResp.java
View File

@@ -1,10 +1,10 @@
package top.ysoft.admin.consume.model.resp;
package top.wms.admin.consume.model.resp;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.ysoft.admin.common.model.resp.BaseDetailResp;
import top.wms.admin.common.model.resp.BaseDetailResp;
import java.io.Serial;
import java.time.*;

4
wms-module-system/src/main/java/top/wms/admin/consume/model/resp/TimeIntervalResp.java
View File

@@ -1,10 +1,10 @@
package top.ysoft.admin.consume.model.resp;
package top.wms.admin.consume.model.resp;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.ysoft.admin.common.model.resp.BaseDetailResp;
import top.wms.admin.common.model.resp.BaseDetailResp;
import java.io.Serial;
import java.time.*;

2
wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/BaseReport.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.resp.report;
package top.wms.admin.consume.model.resp.report;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;

2
wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/BranchReport.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.resp.report;
package top.wms.admin.consume.model.resp.report;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;

4
wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/MealReport.java
View File

@@ -1,10 +1,10 @@
package top.ysoft.admin.consume.model.resp.report;
package top.wms.admin.consume.model.resp.report;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter;
import top.ysoft.admin.common.enums.ConsumeTmrtypeEnum;
import top.wms.admin.common.enums.ConsumeTmrtypeEnum;
/**
* 餐段报表

2
wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/MerchantReport.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.resp.report;
package top.wms.admin.consume.model.resp.report;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;

2
wms-module-system/src/main/java/top/wms/admin/consume/model/resp/report/PeopleReport.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.model.resp.report;
package top.wms.admin.consume.model.resp.report;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;

8
wms-module-system/src/main/java/top/wms/admin/consume/service/DownRecordService.java
View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.consume.service;
package top.wms.admin.consume.service;
import top.continew.starter.extension.crud.service.BaseService;
import top.ysoft.admin.consume.model.query.DownRecordQuery;
import top.ysoft.admin.consume.model.req.DownRecordReq;
import top.ysoft.admin.consume.model.resp.DownRecordResp;
import top.wms.admin.consume.model.query.DownRecordQuery;
import top.wms.admin.consume.model.req.DownRecordReq;
import top.wms.admin.consume.model.resp.DownRecordResp;
/**
* 消费下发记录业务接口

8
wms-module-system/src/main/java/top/wms/admin/consume/service/GroupService.java
View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.consume.service;
package top.wms.admin.consume.service;
import top.continew.starter.extension.crud.service.BaseService;
import top.ysoft.admin.consume.model.query.GroupQuery;
import top.ysoft.admin.consume.model.req.GroupReq;
import top.ysoft.admin.consume.model.resp.GroupResp;
import top.wms.admin.consume.model.query.GroupQuery;
import top.wms.admin.consume.model.req.GroupReq;
import top.wms.admin.consume.model.resp.GroupResp;
/**
* 消费组业务接口

4
wms-module-system/src/main/java/top/wms/admin/consume/service/GroupUserService.java
View File

@@ -1,7 +1,7 @@
package top.ysoft.admin.consume.service;
package top.wms.admin.consume.service;
import com.baomidou.mybatisplus.extension.service.IService;
import top.ysoft.admin.consume.model.entity.GroupUserDO;
import top.wms.admin.consume.model.entity.GroupUserDO;
public interface GroupUserService extends IService<GroupUserDO> {

8
wms-module-system/src/main/java/top/wms/admin/consume/service/RechargeRecordService.java
View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.consume.service;
package top.wms.admin.consume.service;
import top.continew.starter.extension.crud.service.BaseService;
import top.ysoft.admin.consume.model.query.RechargeRecordQuery;
import top.ysoft.admin.consume.model.req.RechargeRecordReq;
import top.ysoft.admin.consume.model.resp.RechargeRecordResp;
import top.wms.admin.consume.model.query.RechargeRecordQuery;
import top.wms.admin.consume.model.req.RechargeRecordReq;
import top.wms.admin.consume.model.resp.RechargeRecordResp;
/**
* 充值记录业务接口

8
wms-module-system/src/main/java/top/wms/admin/consume/service/RecordService.java
View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.consume.service;
package top.wms.admin.consume.service;
import top.continew.starter.extension.crud.service.BaseService;
import top.ysoft.admin.consume.model.query.RecordQuery;
import top.ysoft.admin.consume.model.req.RecordReq;
import top.ysoft.admin.consume.model.resp.RecordResp;
import top.wms.admin.consume.model.query.RecordQuery;
import top.wms.admin.consume.model.req.RecordReq;
import top.wms.admin.consume.model.resp.RecordResp;
/**
* 消费记录业务接口

12
wms-module-system/src/main/java/top/wms/admin/consume/service/ReportService.java
View File

@@ -1,14 +1,14 @@
package top.ysoft.admin.consume.service;
package top.wms.admin.consume.service;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.ibatis.annotations.Param;
import top.continew.starter.extension.crud.model.query.PageQuery;
import top.continew.starter.extension.crud.model.resp.PageResp;
import top.ysoft.admin.consume.model.query.ReportQuery;
import top.ysoft.admin.consume.model.resp.report.BranchReport;
import top.ysoft.admin.consume.model.resp.report.MealReport;
import top.ysoft.admin.consume.model.resp.report.MerchantReport;
import top.ysoft.admin.consume.model.resp.report.PeopleReport;
import top.wms.admin.consume.model.query.ReportQuery;
import top.wms.admin.consume.model.resp.report.BranchReport;
import top.wms.admin.consume.model.resp.report.MealReport;
import top.wms.admin.consume.model.resp.report.MerchantReport;
import top.wms.admin.consume.model.resp.report.PeopleReport;
import java.util.List;

8
wms-module-system/src/main/java/top/wms/admin/consume/service/TenantService.java
View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.consume.service;
package top.wms.admin.consume.service;
import top.continew.starter.extension.crud.service.BaseService;
import top.ysoft.admin.consume.model.query.TenantQuery;
import top.ysoft.admin.consume.model.req.TenantReq;
import top.ysoft.admin.consume.model.resp.TenantResp;
import top.wms.admin.consume.model.query.TenantQuery;
import top.wms.admin.consume.model.req.TenantReq;
import top.wms.admin.consume.model.resp.TenantResp;
/**
* 商户信息业务接口

8
wms-module-system/src/main/java/top/wms/admin/consume/service/TimeIntervalService.java
View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.consume.service;
package top.wms.admin.consume.service;
import top.continew.starter.extension.crud.service.BaseService;
import top.ysoft.admin.consume.model.query.TimeIntervalQuery;
import top.ysoft.admin.consume.model.req.TimeIntervalReq;
import top.ysoft.admin.consume.model.resp.TimeIntervalResp;
import top.wms.admin.consume.model.query.TimeIntervalQuery;
import top.wms.admin.consume.model.req.TimeIntervalReq;
import top.wms.admin.consume.model.resp.TimeIntervalResp;
/**
* 消费时段业务接口

29
wms-module-system/src/main/java/top/wms/admin/consume/service/impl/DownRecordServiceImpl.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.service.impl;
package top.wms.admin.consume.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,17 +11,14 @@ import org.springframework.stereotype.Service;
import top.continew.starter.extension.crud.model.query.PageQuery;
import top.continew.starter.extension.crud.model.resp.PageResp;
import top.continew.starter.extension.crud.service.BaseServiceImpl;
import top.ysoft.admin.consume.mapper.DownRecordMapper;
import top.ysoft.admin.consume.model.entity.DownRecordDO;
import top.ysoft.admin.consume.model.entity.RecordDO;
import top.ysoft.admin.consume.model.query.DownRecordQuery;
import top.ysoft.admin.consume.model.query.RecordQuery;
import top.ysoft.admin.consume.model.req.DownRecordReq;
import top.ysoft.admin.consume.model.resp.DownRecordResp;
import top.ysoft.admin.consume.model.resp.RecordResp;
import top.ysoft.admin.consume.service.DownRecordService;
import top.ysoft.admin.system.mapper.PeopleEquipmentMapper;
import top.ysoft.admin.system.model.entity.PeopleEquipmentDO;
import top.wms.admin.consume.mapper.DownRecordMapper;
import top.wms.admin.consume.model.entity.DownRecordDO;
import top.wms.admin.consume.model.query.DownRecordQuery;
import top.wms.admin.consume.model.req.DownRecordReq;
import top.wms.admin.consume.model.resp.DownRecordResp;
import top.wms.admin.consume.service.DownRecordService;
import top.wms.admin.system.mapper.PeopleEquipmentMapper;
import top.wms.admin.system.model.entity.PeopleEquipmentDO;
/**
* 消费下发记录业务实现
@@ -47,16 +44,14 @@ public class DownRecordServiceImpl extends BaseServiceImpl<DownRecordMapper, Dow
this.sort(queryWrapper, pageQuery);
IPage<DownRecordResp> page = baseMapper.selectRecordsPage(new Page<>(pageQuery.getPage(), pageQuery
.getSize()), queryWrapper);
.getSize()), queryWrapper);
return PageResp.build(page);
}
@Override
public void down(Long equipmentId, Long peopleId) {
peopleEquipmentMapper.delete(new QueryWrapper<PeopleEquipmentDO>()
.eq("equipment_id", equipmentId)
.eq("people_id", peopleId));
peopleEquipmentMapper.delete(new QueryWrapper<PeopleEquipmentDO>().eq("equipment_id", equipmentId)
.eq("people_id", peopleId));
}
}

24
wms-module-system/src/main/java/top/wms/admin/consume/service/impl/GroupServiceImpl.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.service.impl;
package top.wms.admin.consume.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
@@ -6,17 +6,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import top.continew.starter.extension.crud.service.BaseServiceImpl;
import top.ysoft.admin.consume.mapper.GroupMapper;
import top.ysoft.admin.consume.model.entity.GroupDO;
import top.ysoft.admin.consume.model.entity.GroupUserDO;
import top.ysoft.admin.consume.model.query.GroupQuery;
import top.ysoft.admin.consume.model.req.GroupReq;
import top.ysoft.admin.consume.model.resp.GroupResp;
import top.ysoft.admin.consume.service.GroupService;
import top.ysoft.admin.consume.service.GroupUserService;
import top.ysoft.admin.peopleBranch.mapper.PeopleMapper;
import top.ysoft.admin.peopleBranch.mapstruct.PeopleConvert;
import top.ysoft.admin.peopleBranch.model.entity.PeopleDO;
import top.wms.admin.consume.mapper.GroupMapper;
import top.wms.admin.consume.model.entity.GroupDO;
import top.wms.admin.consume.model.entity.GroupUserDO;
import top.wms.admin.consume.model.query.GroupQuery;
import top.wms.admin.consume.model.req.GroupReq;
import top.wms.admin.consume.model.resp.GroupResp;
import top.wms.admin.consume.service.GroupService;
import top.wms.admin.consume.service.GroupUserService;
import top.wms.admin.peopleBranch.mapper.PeopleMapper;
import top.wms.admin.peopleBranch.mapstruct.PeopleConvert;
import top.wms.admin.peopleBranch.model.entity.PeopleDO;
import java.util.List;
import java.util.stream.Collectors;

8
wms-module-system/src/main/java/top/wms/admin/consume/service/impl/GroupUserServiceImpl.java
View File

@@ -1,11 +1,11 @@
package top.ysoft.admin.consume.service.impl;
package top.wms.admin.consume.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import top.ysoft.admin.consume.mapper.GroupUserMapper;
import top.ysoft.admin.consume.model.entity.GroupUserDO;
import top.ysoft.admin.consume.service.GroupUserService;
import top.wms.admin.consume.mapper.GroupUserMapper;
import top.wms.admin.consume.model.entity.GroupUserDO;
import top.wms.admin.consume.service.GroupUserService;
/**
* 消费组用户业务实现

14
wms-module-system/src/main/java/top/wms/admin/consume/service/impl/RechargeRecordServiceImpl.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.service.impl;
package top.wms.admin.consume.service.impl;
import cn.crane4j.annotation.AutoOperate;
import cn.hutool.core.date.DateUtil;
@@ -14,12 +14,12 @@ import top.continew.starter.extension.crud.model.query.SortQuery;
import top.continew.starter.extension.crud.model.resp.PageResp;
import top.continew.starter.extension.crud.service.BaseServiceImpl;
import top.continew.starter.file.excel.util.ExcelUtils;
import top.ysoft.admin.consume.mapper.RechargeRecordMapper;
import top.ysoft.admin.consume.model.entity.RechargeRecordDO;
import top.ysoft.admin.consume.model.query.RechargeRecordQuery;
import top.ysoft.admin.consume.model.req.RechargeRecordReq;
import top.ysoft.admin.consume.model.resp.RechargeRecordResp;
import top.ysoft.admin.consume.service.RechargeRecordService;
import top.wms.admin.consume.mapper.RechargeRecordMapper;
import top.wms.admin.consume.model.entity.RechargeRecordDO;
import top.wms.admin.consume.model.query.RechargeRecordQuery;
import top.wms.admin.consume.model.req.RechargeRecordReq;
import top.wms.admin.consume.model.resp.RechargeRecordResp;
import top.wms.admin.consume.service.RechargeRecordService;
import java.util.List;

16
wms-module-system/src/main/java/top/wms/admin/consume/service/impl/RecordServiceImpl.java
View File

@@ -1,6 +1,5 @@
package top.ysoft.admin.consume.service.impl;
package top.wms.admin.consume.service.impl;
import cn.crane4j.annotation.AutoOperate;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -16,13 +15,12 @@ import top.continew.starter.extension.crud.model.query.SortQuery;
import top.continew.starter.extension.crud.model.resp.PageResp;
import top.continew.starter.extension.crud.service.BaseServiceImpl;
import top.continew.starter.file.excel.util.ExcelUtils;
import top.ysoft.admin.consume.mapper.RecordMapper;
import top.ysoft.admin.consume.model.entity.RecordDO;
import top.ysoft.admin.consume.model.query.RecordQuery;
import top.ysoft.admin.consume.model.req.RecordReq;
import top.ysoft.admin.consume.model.resp.RecordResp;
import top.ysoft.admin.consume.service.RecordService;
import top.ysoft.admin.peopleBranch.mapper.PeopleMapper;
import top.wms.admin.consume.mapper.RecordMapper;
import top.wms.admin.consume.model.entity.RecordDO;
import top.wms.admin.consume.model.query.RecordQuery;
import top.wms.admin.consume.model.req.RecordReq;
import top.wms.admin.consume.model.resp.RecordResp;
import top.wms.admin.consume.service.RecordService;
import java.util.List;

10
wms-module-system/src/main/java/top/wms/admin/consume/service/impl/ReportServiceImpl.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.consume.service.impl;
package top.wms.admin.consume.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
@@ -8,10 +8,10 @@ import org.springframework.stereotype.Service;
import top.continew.starter.extension.crud.model.query.PageQuery;
import top.continew.starter.extension.crud.model.resp.PageResp;
import top.continew.starter.file.excel.util.ExcelUtils;
import top.ysoft.admin.consume.mapper.ReportMapper;
import top.ysoft.admin.consume.model.query.ReportQuery;
import top.ysoft.admin.consume.model.resp.report.*;
import top.ysoft.admin.consume.service.ReportService;
import top.wms.admin.consume.mapper.ReportMapper;
import top.wms.admin.consume.model.query.ReportQuery;
import top.wms.admin.consume.model.resp.report.*;
import top.wms.admin.consume.service.ReportService;
import java.util.List;

14
wms-module-system/src/main/java/top/wms/admin/consume/service/impl/TenantServiceImpl.java
View File

@@ -1,16 +1,16 @@
package top.ysoft.admin.consume.service.impl;
package top.wms.admin.consume.service.impl;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import top.continew.starter.extension.crud.service.BaseServiceImpl;
import top.ysoft.admin.consume.mapper.TenantMapper;
import top.ysoft.admin.consume.model.entity.TenantDO;
import top.ysoft.admin.consume.model.query.TenantQuery;
import top.ysoft.admin.consume.model.req.TenantReq;
import top.ysoft.admin.consume.model.resp.TenantResp;
import top.ysoft.admin.consume.service.TenantService;
import top.wms.admin.consume.mapper.TenantMapper;
import top.wms.admin.consume.model.entity.TenantDO;
import top.wms.admin.consume.model.query.TenantQuery;
import top.wms.admin.consume.model.req.TenantReq;
import top.wms.admin.consume.model.resp.TenantResp;
import top.wms.admin.consume.service.TenantService;
/**
* 商户信息业务实现

14
wms-module-system/src/main/java/top/wms/admin/consume/service/impl/TimeIntervalServiceImpl.java
View File

@@ -1,16 +1,16 @@
package top.ysoft.admin.consume.service.impl;
package top.wms.admin.consume.service.impl;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import top.continew.starter.extension.crud.service.BaseServiceImpl;
import top.ysoft.admin.consume.mapper.TimeIntervalMapper;
import top.ysoft.admin.consume.model.entity.TimeIntervalDO;
import top.ysoft.admin.consume.model.query.TimeIntervalQuery;
import top.ysoft.admin.consume.model.req.TimeIntervalReq;
import top.ysoft.admin.consume.model.resp.TimeIntervalResp;
import top.ysoft.admin.consume.service.TimeIntervalService;
import top.wms.admin.consume.mapper.TimeIntervalMapper;
import top.wms.admin.consume.model.entity.TimeIntervalDO;
import top.wms.admin.consume.model.query.TimeIntervalQuery;
import top.wms.admin.consume.model.req.TimeIntervalReq;
import top.wms.admin.consume.model.resp.TimeIntervalResp;
import top.wms.admin.consume.service.TimeIntervalService;
/**
* 消费时段业务实现

4
wms-module-system/src/main/java/top/wms/admin/equipment/mapper/EquipmentMapper.java
View File

@@ -1,8 +1,8 @@
package top.ysoft.admin.equipment.mapper;
package top.wms.admin.equipment.mapper;
import org.springframework.stereotype.Repository;
import top.continew.starter.data.mp.base.BaseMapper;
import top.ysoft.admin.equipment.model.entity.EquipmentDO;
import top.wms.admin.equipment.model.entity.EquipmentDO;
/**
* 设备信息 Mapper

4
wms-module-system/src/main/java/top/wms/admin/equipment/mapper/ProductMapper.java
View File

@@ -1,7 +1,7 @@
package top.ysoft.admin.equipment.mapper;
package top.wms.admin.equipment.mapper;
import top.continew.starter.data.mp.base.BaseMapper;
import top.ysoft.admin.equipment.model.entity.ProductDO;
import top.wms.admin.equipment.model.entity.ProductDO;
/**
* 产品信息 Mapper

8
wms-module-system/src/main/java/top/wms/admin/equipment/mapstruct/EquipmentConvert.java
View File

@@ -1,11 +1,11 @@
package top.ysoft.admin.equipment.mapstruct;
package top.wms.admin.equipment.mapstruct;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import top.continew.starter.extension.crud.model.resp.LabelValueResp;
import top.ysoft.admin.equipment.model.entity.EquipmentDO;
import top.ysoft.admin.equipment.model.req.EquipmentReq;
import top.ysoft.admin.equipment.model.resp.EquipmentResp;
import top.wms.admin.equipment.model.entity.EquipmentDO;
import top.wms.admin.equipment.model.req.EquipmentReq;
import top.wms.admin.equipment.model.resp.EquipmentResp;
import java.util.List;

4
wms-module-system/src/main/java/top/wms/admin/equipment/mapstruct/ProductConvert.java
View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.equipment.mapstruct;
package top.wms.admin.equipment.mapstruct;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import top.continew.starter.extension.crud.model.resp.LabelValueResp;
import top.ysoft.admin.equipment.model.entity.ProductDO;
import top.wms.admin.equipment.model.entity.ProductDO;
import java.util.List;

4
wms-module-system/src/main/java/top/wms/admin/equipment/model/entity/EquipmentDO.java
View File

@@ -1,8 +1,8 @@
package top.ysoft.admin.equipment.model.entity;
package top.wms.admin.equipment.model.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import top.ysoft.admin.common.model.entity.BaseDO;
import top.wms.admin.common.model.entity.BaseDO;
import java.io.Serial;

4
wms-module-system/src/main/java/top/wms/admin/equipment/model/entity/ProductDO.java
View File

@@ -1,10 +1,10 @@
package top.ysoft.admin.equipment.model.entity;
package top.wms.admin.equipment.model.entity;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableName;
import top.ysoft.admin.common.model.entity.BaseDO;
import top.wms.admin.common.model.entity.BaseDO;
import java.io.Serial;

2
wms-module-system/src/main/java/top/wms/admin/equipment/model/query/EquipmentQuery.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.equipment.model.query;
package top.wms.admin.equipment.model.query;
import lombok.Data;

2
wms-module-system/src/main/java/top/wms/admin/equipment/model/query/ProductQuery.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.equipment.model.query;
package top.wms.admin.equipment.model.query;
import lombok.Data;

2
wms-module-system/src/main/java/top/wms/admin/equipment/model/req/EquipmentReq.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.equipment.model.req;
package top.wms.admin.equipment.model.req;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;

2
wms-module-system/src/main/java/top/wms/admin/equipment/model/req/ProductReq.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.equipment.model.req;
package top.wms.admin.equipment.model.req;
import jakarta.validation.constraints.*;

4
wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/EquipmentDetailResp.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.equipment.model.resp;
package top.wms.admin.equipment.model.resp;
import lombok.Data;
@@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import top.ysoft.admin.common.model.resp.BaseDetailResp;
import top.wms.admin.common.model.resp.BaseDetailResp;
import java.io.Serial;

6
wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/EquipmentResp.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.equipment.model.resp;
package top.wms.admin.equipment.model.resp;
import cn.crane4j.annotation.Assemble;
import cn.crane4j.annotation.Mapping;
@@ -6,8 +6,8 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.ysoft.admin.common.constant.ContainerConstants;
import top.ysoft.admin.common.model.resp.BaseResp;
import top.wms.admin.common.constant.ContainerConstants;
import top.wms.admin.common.model.resp.BaseResp;
import java.io.Serial;
import java.time.*;

4
wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/ProductDetailResp.java
View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.equipment.model.resp;
package top.wms.admin.equipment.model.resp;
import lombok.Data;
@@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import top.ysoft.admin.common.model.resp.BaseDetailResp;
import top.wms.admin.common.model.resp.BaseDetailResp;
import java.io.Serial;
import java.time.*;

4
wms-module-system/src/main/java/top/wms/admin/equipment/model/resp/ProductResp.java
View File

@@ -1,10 +1,10 @@
package top.ysoft.admin.equipment.model.resp;
package top.wms.admin.equipment.model.resp;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.ysoft.admin.common.model.resp.BaseDetailResp;
import top.wms.admin.common.model.resp.BaseDetailResp;
import java.io.Serial;
import java.time.*;

10
wms-module-system/src/main/java/top/wms/admin/equipment/service/EquipmentService.java
View File

@@ -1,11 +1,11 @@
package top.ysoft.admin.equipment.service;
package top.wms.admin.equipment.service;
import top.continew.starter.extension.crud.model.resp.LabelValueResp;
import top.continew.starter.extension.crud.service.BaseService;
import top.ysoft.admin.equipment.model.query.EquipmentQuery;
import top.ysoft.admin.equipment.model.req.EquipmentReq;
import top.ysoft.admin.equipment.model.resp.EquipmentDetailResp;
import top.ysoft.admin.equipment.model.resp.EquipmentResp;
import top.wms.admin.equipment.model.query.EquipmentQuery;
import top.wms.admin.equipment.model.req.EquipmentReq;
import top.wms.admin.equipment.model.resp.EquipmentDetailResp;
import top.wms.admin.equipment.model.resp.EquipmentResp;
import java.util.List;

10
wms-module-system/src/main/java/top/wms/admin/equipment/service/ProductService.java
View File

@@ -1,11 +1,11 @@
package top.ysoft.admin.equipment.service;
package top.wms.admin.equipment.service;
import top.continew.starter.extension.crud.model.resp.LabelValueResp;
import top.continew.starter.extension.crud.service.BaseService;
import top.ysoft.admin.equipment.model.entity.ProductDO;
import top.ysoft.admin.equipment.model.query.ProductQuery;
import top.ysoft.admin.equipment.model.req.ProductReq;
import top.ysoft.admin.equipment.model.resp.ProductResp;
import top.wms.admin.equipment.model.entity.ProductDO;
import top.wms.admin.equipment.model.query.ProductQuery;
import top.wms.admin.equipment.model.req.ProductReq;
import top.wms.admin.equipment.model.resp.ProductResp;
import java.util.List;

Some files were not shown because too many files have changed in this diff Show More