改名
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin;
|
||||
package top.wms.admin;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaIgnore;
|
||||
import com.alicp.jetcache.anno.config.EnableMethodCache;
|
||||
@@ -23,18 +23,18 @@ import top.continew.starter.web.model.R;
|
||||
*/
|
||||
@Slf4j
|
||||
@EnableFileStorage
|
||||
@EnableMethodCache(basePackages = "top.ysoft.admin")
|
||||
@EnableMethodCache(basePackages = "top.wms.admin")
|
||||
@EnableGlobalResponse
|
||||
@EnableCrudRestController
|
||||
@RestController
|
||||
@SpringBootApplication
|
||||
@RequiredArgsConstructor
|
||||
public class YsoftAdminApplication {
|
||||
public class WmsAdminApplication {
|
||||
|
||||
private final ProjectProperties projectProperties;
|
||||
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(YsoftAdminApplication.class, args);
|
||||
SpringApplication.run(WmsAdminApplication.class, args);
|
||||
}
|
||||
|
||||
@Hidden
|
||||
@@ -1,9 +1,9 @@
|
||||
package top.ysoft.admin.config.log;
|
||||
package top.wms.admin.config.log;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import top.ysoft.admin.system.mapper.LogMapper;
|
||||
import top.ysoft.admin.system.service.UserService;
|
||||
import top.wms.admin.system.mapper.LogMapper;
|
||||
import top.wms.admin.system.service.UserService;
|
||||
import top.continew.starter.log.annotation.ConditionalOnEnabledLog;
|
||||
import top.continew.starter.log.dao.LogDao;
|
||||
import top.continew.starter.web.autoconfigure.trace.TraceProperties;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.config.log;
|
||||
package top.wms.admin.config.log;
|
||||
|
||||
import cn.dev33.satoken.SaManager;
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
@@ -12,13 +12,13 @@ import cn.hutool.json.JSONUtil;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.scheduling.annotation.Async;
|
||||
import top.ysoft.admin.auth.enums.AuthTypeEnum;
|
||||
import top.ysoft.admin.auth.model.req.*;
|
||||
import top.ysoft.admin.common.constant.SysConstants;
|
||||
import top.ysoft.admin.system.enums.LogStatusEnum;
|
||||
import top.ysoft.admin.system.mapper.LogMapper;
|
||||
import top.ysoft.admin.system.model.entity.LogDO;
|
||||
import top.ysoft.admin.system.service.UserService;
|
||||
import top.wms.admin.auth.enums.AuthTypeEnum;
|
||||
import top.wms.admin.auth.model.req.*;
|
||||
import top.wms.admin.common.constant.SysConstants;
|
||||
import top.wms.admin.system.enums.LogStatusEnum;
|
||||
import top.wms.admin.system.mapper.LogMapper;
|
||||
import top.wms.admin.system.model.entity.LogDO;
|
||||
import top.wms.admin.system.service.UserService;
|
||||
import top.continew.starter.core.constant.StringConstants;
|
||||
import top.continew.starter.core.util.ExceptionUtils;
|
||||
import top.continew.starter.core.util.StrUtils;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.config.satoken;
|
||||
package top.wms.admin.config.satoken;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.config.satoken;
|
||||
package top.wms.admin.config.satoken;
|
||||
|
||||
import cn.dev33.satoken.fun.SaParamFunction;
|
||||
import cn.dev33.satoken.interceptor.SaInterceptor;
|
||||
@@ -6,7 +6,7 @@ import cn.dev33.satoken.stp.StpUtil;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.springframework.lang.Nullable;
|
||||
import top.ysoft.admin.common.context.UserContextHolder;
|
||||
import top.wms.admin.common.context.UserContextHolder;
|
||||
|
||||
/**
|
||||
* Sa-Token 扩展拦截器
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.config.satoken;
|
||||
package top.wms.admin.config.satoken;
|
||||
|
||||
import cn.dev33.satoken.SaManager;
|
||||
import cn.dev33.satoken.context.SaHolder;
|
||||
@@ -12,9 +12,9 @@ import cn.dev33.satoken.stp.StpUtil;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import top.ysoft.admin.common.context.UserContext;
|
||||
import top.ysoft.admin.common.context.UserContextHolder;
|
||||
import top.ysoft.admin.open.sign.OpenApiSignTemplate;
|
||||
import top.wms.admin.common.context.UserContext;
|
||||
import top.wms.admin.common.context.UserContextHolder;
|
||||
import top.wms.admin.open.sign.OpenApiSignTemplate;
|
||||
import top.continew.starter.auth.satoken.autoconfigure.SaTokenExtensionProperties;
|
||||
import top.continew.starter.core.constant.StringConstants;
|
||||
import top.continew.starter.core.exception.BusinessException;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package top.ysoft.admin.config.satoken;
|
||||
package top.wms.admin.config.satoken;
|
||||
|
||||
import cn.dev33.satoken.stp.StpInterface;
|
||||
import top.ysoft.admin.common.context.UserContext;
|
||||
import top.ysoft.admin.common.context.UserContextHolder;
|
||||
import top.wms.admin.common.context.UserContext;
|
||||
import top.wms.admin.common.context.UserContextHolder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.auth;
|
||||
package top.wms.admin.controller.auth;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaIgnore;
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
@@ -14,16 +14,16 @@ import me.zhyd.oauth.request.AuthRequest;
|
||||
import me.zhyd.oauth.utils.AuthStateUtils;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
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.model.resp.SocialAuthAuthorizeResp;
|
||||
import top.ysoft.admin.auth.model.resp.UserInfoResp;
|
||||
import top.ysoft.admin.auth.service.AuthService;
|
||||
import top.ysoft.admin.common.context.UserContext;
|
||||
import top.ysoft.admin.common.context.UserContextHolder;
|
||||
import top.ysoft.admin.system.model.resp.user.UserDetailResp;
|
||||
import top.ysoft.admin.system.service.UserService;
|
||||
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.model.resp.SocialAuthAuthorizeResp;
|
||||
import top.wms.admin.auth.model.resp.UserInfoResp;
|
||||
import top.wms.admin.auth.service.AuthService;
|
||||
import top.wms.admin.common.context.UserContext;
|
||||
import top.wms.admin.common.context.UserContextHolder;
|
||||
import top.wms.admin.system.model.resp.user.UserDetailResp;
|
||||
import top.wms.admin.system.service.UserService;
|
||||
import top.continew.starter.core.exception.BadRequestException;
|
||||
import top.continew.starter.log.annotation.Log;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.code;
|
||||
package top.wms.admin.controller.code;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
@@ -9,13 +9,13 @@ import jakarta.servlet.http.HttpServletResponse;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import top.ysoft.admin.generator.model.entity.FieldConfigDO;
|
||||
import top.ysoft.admin.generator.model.entity.GenConfigDO;
|
||||
import top.ysoft.admin.generator.model.query.GenConfigQuery;
|
||||
import top.ysoft.admin.generator.model.req.GenConfigReq;
|
||||
import top.ysoft.admin.generator.model.resp.GeneratePreviewResp;
|
||||
import top.ysoft.admin.generator.service.GeneratorService;
|
||||
import top.ysoft.admin.system.service.DictService;
|
||||
import top.wms.admin.generator.model.entity.FieldConfigDO;
|
||||
import top.wms.admin.generator.model.entity.GenConfigDO;
|
||||
import top.wms.admin.generator.model.query.GenConfigQuery;
|
||||
import top.wms.admin.generator.model.req.GenConfigReq;
|
||||
import top.wms.admin.generator.model.resp.GeneratePreviewResp;
|
||||
import top.wms.admin.generator.service.GeneratorService;
|
||||
import top.wms.admin.system.service.DictService;
|
||||
import top.continew.starter.extension.crud.model.query.PageQuery;
|
||||
import top.continew.starter.extension.crud.model.resp.LabelValueResp;
|
||||
import top.continew.starter.extension.crud.model.resp.PageResp;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.common;
|
||||
package top.wms.admin.controller.common;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaIgnore;
|
||||
import cn.hutool.core.date.LocalDateTimeUtil;
|
||||
@@ -28,12 +28,12 @@ import org.dromara.sms4j.core.factory.SmsFactory;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import top.ysoft.admin.auth.model.resp.CaptchaResp;
|
||||
import top.ysoft.admin.common.config.properties.CaptchaProperties;
|
||||
import top.ysoft.admin.common.constant.CacheConstants;
|
||||
import top.ysoft.admin.common.constant.SysConstants;
|
||||
import top.ysoft.admin.system.enums.OptionCategoryEnum;
|
||||
import top.ysoft.admin.system.service.OptionService;
|
||||
import top.wms.admin.auth.model.resp.CaptchaResp;
|
||||
import top.wms.admin.common.config.properties.CaptchaProperties;
|
||||
import top.wms.admin.common.constant.CacheConstants;
|
||||
import top.wms.admin.common.constant.SysConstants;
|
||||
import top.wms.admin.system.enums.OptionCategoryEnum;
|
||||
import top.wms.admin.system.service.OptionService;
|
||||
import top.continew.starter.cache.redisson.util.RedisUtils;
|
||||
import top.continew.starter.captcha.graphic.core.GraphicCaptchaService;
|
||||
import top.continew.starter.core.autoconfigure.project.ProjectProperties;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.common;
|
||||
package top.wms.admin.controller.common;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaIgnore;
|
||||
import cn.hutool.core.lang.tree.Tree;
|
||||
@@ -16,18 +16,18 @@ import org.slf4j.LoggerFactory;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import top.ysoft.admin.common.constant.CacheConstants;
|
||||
import top.ysoft.admin.common.util.PictureUtils;
|
||||
import top.ysoft.admin.peopleBranch.model.query.BranchQuery;
|
||||
import top.ysoft.admin.peopleBranch.service.BranchService;
|
||||
import top.ysoft.admin.space.model.query.PointQuery;
|
||||
import top.ysoft.admin.space.model.query.SpaceQuery;
|
||||
import top.ysoft.admin.space.service.PointService;
|
||||
import top.ysoft.admin.space.service.SpaceService;
|
||||
import top.ysoft.admin.system.enums.OptionCategoryEnum;
|
||||
import top.ysoft.admin.system.model.query.*;
|
||||
import top.ysoft.admin.system.model.resp.file.FileUploadResp;
|
||||
import top.ysoft.admin.system.service.*;
|
||||
import top.wms.admin.common.constant.CacheConstants;
|
||||
import top.wms.admin.common.util.PictureUtils;
|
||||
import top.wms.admin.peopleBranch.model.query.BranchQuery;
|
||||
import top.wms.admin.peopleBranch.service.BranchService;
|
||||
import top.wms.admin.space.model.query.PointQuery;
|
||||
import top.wms.admin.space.model.query.SpaceQuery;
|
||||
import top.wms.admin.space.service.PointService;
|
||||
import top.wms.admin.space.service.SpaceService;
|
||||
import top.wms.admin.system.enums.OptionCategoryEnum;
|
||||
import top.wms.admin.system.model.query.*;
|
||||
import top.wms.admin.system.model.resp.file.FileUploadResp;
|
||||
import top.wms.admin.system.service.*;
|
||||
import top.continew.starter.core.validation.ValidationUtils;
|
||||
import top.continew.starter.extension.crud.model.query.SortQuery;
|
||||
import top.continew.starter.extension.crud.model.resp.LabelValueResp;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.common;
|
||||
package top.wms.admin.controller.common;
|
||||
|
||||
import com.alicp.jetcache.anno.CachePenetrationProtect;
|
||||
import com.alicp.jetcache.anno.CacheRefresh;
|
||||
@@ -14,12 +14,12 @@ import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import top.ysoft.admin.common.constant.CacheConstants;
|
||||
import top.ysoft.admin.system.model.resp.dashboard.DashboardAccessTrendResp;
|
||||
import top.ysoft.admin.system.model.resp.dashboard.DashboardChartCommonResp;
|
||||
import top.ysoft.admin.system.model.resp.dashboard.DashboardNoticeResp;
|
||||
import top.ysoft.admin.system.model.resp.dashboard.DashboardOverviewCommonResp;
|
||||
import top.ysoft.admin.system.service.DashboardService;
|
||||
import top.wms.admin.common.constant.CacheConstants;
|
||||
import top.wms.admin.system.model.resp.dashboard.DashboardAccessTrendResp;
|
||||
import top.wms.admin.system.model.resp.dashboard.DashboardChartCommonResp;
|
||||
import top.wms.admin.system.model.resp.dashboard.DashboardNoticeResp;
|
||||
import top.wms.admin.system.model.resp.dashboard.DashboardOverviewCommonResp;
|
||||
import top.wms.admin.system.service.DashboardService;
|
||||
import top.continew.starter.core.validation.ValidationUtils;
|
||||
import top.continew.starter.log.annotation.Log;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.consume;
|
||||
package top.wms.admin.controller.consume;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
@@ -10,14 +10,12 @@ import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.continew.starter.log.annotation.Log;
|
||||
import top.continew.starter.web.model.R;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.common.enums.OperTypeEnum;
|
||||
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.ysoft.admin.consume.service.DownRecordService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 消费下发记录管理 API
|
||||
@@ -34,7 +32,7 @@ public class DownRecordController extends BaseController<DownRecordService, Down
|
||||
@Operation(summary = "下发", description = "下发")
|
||||
@SaCheckPermission("consume:downRecord:down")
|
||||
@PatchMapping("/down/{equipmentId}/{peopleId}")
|
||||
public R down(@PathVariable Long equipmentId, @PathVariable Long peopleId) {
|
||||
public R down(@PathVariable Long equipmentId, @PathVariable Long peopleId) {
|
||||
baseService.down(equipmentId, peopleId);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
package top.ysoft.admin.controller.consume;
|
||||
package top.wms.admin.controller.consume;
|
||||
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
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.wms.admin.common.controller.BaseController;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 消费组管理 API
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
package top.ysoft.admin.controller.consume;
|
||||
package top.wms.admin.controller.consume;
|
||||
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
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.common.controller.BaseController;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 充值记录管理 API
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.consume;
|
||||
package top.wms.admin.controller.consume;
|
||||
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
|
||||
@@ -8,11 +8,11 @@ import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
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.wms.admin.common.controller.BaseController;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 消费记录管理 API
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.consume;
|
||||
package top.wms.admin.controller.consume;
|
||||
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
@@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
import top.continew.starter.extension.crud.model.query.PageQuery;
|
||||
import top.continew.starter.extension.crud.model.resp.PageResp;
|
||||
import top.continew.starter.web.model.R;
|
||||
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.ysoft.admin.consume.service.ReportService;
|
||||
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 top.wms.admin.consume.service.ReportService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.consume;
|
||||
package top.wms.admin.controller.consume;
|
||||
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
|
||||
@@ -8,11 +8,11 @@ import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
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.common.controller.BaseController;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 商户信息管理 API
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.consume;
|
||||
package top.wms.admin.controller.consume;
|
||||
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
|
||||
@@ -8,11 +8,11 @@ import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
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.common.controller.BaseController;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 消费时段管理 API
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.equipment;
|
||||
package top.wms.admin.controller.equipment;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
@@ -6,12 +6,12 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.continew.starter.extension.crud.model.resp.LabelValueResp;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
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.ysoft.admin.equipment.service.EquipmentService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
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 top.wms.admin.equipment.service.EquipmentService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.equipment;
|
||||
package top.wms.admin.controller.equipment;
|
||||
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
|
||||
@@ -7,11 +7,11 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.system.model.query.PeopleEquipmentQuery;
|
||||
import top.ysoft.admin.system.model.req.PeopleEquipmentReq;
|
||||
import top.ysoft.admin.system.model.resp.PeopleEquipmentResp;
|
||||
import top.ysoft.admin.system.service.PeopleEquipmentService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.system.model.query.PeopleEquipmentQuery;
|
||||
import top.wms.admin.system.model.req.PeopleEquipmentReq;
|
||||
import top.wms.admin.system.model.resp.PeopleEquipmentResp;
|
||||
import top.wms.admin.system.service.PeopleEquipmentService;
|
||||
|
||||
/**
|
||||
* 人员设备下发信息管理 API
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.equipment;
|
||||
package top.wms.admin.controller.equipment;
|
||||
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -7,11 +7,11 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
import top.continew.starter.extension.crud.model.resp.LabelValueResp;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
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.ysoft.admin.equipment.service.ProductService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
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 top.wms.admin.equipment.service.ProductService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.monitor;
|
||||
package top.wms.admin.controller.monitor;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
@@ -9,9 +9,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
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.wms.admin.auth.model.query.OnlineUserQuery;
|
||||
import top.wms.admin.auth.model.resp.OnlineUserResp;
|
||||
import top.wms.admin.auth.service.OnlineUserService;
|
||||
import top.continew.starter.core.validation.CheckUtils;
|
||||
import top.continew.starter.extension.crud.model.query.PageQuery;
|
||||
import top.continew.starter.extension.crud.model.resp.PageResp;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.open;
|
||||
package top.wms.admin.controller.open;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
@@ -10,13 +10,13 @@ import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PatchMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.open.model.query.AppQuery;
|
||||
import top.ysoft.admin.open.model.req.AppReq;
|
||||
import top.ysoft.admin.open.model.resp.AppDetailResp;
|
||||
import top.ysoft.admin.open.model.resp.AppResp;
|
||||
import top.ysoft.admin.open.model.resp.AppSecretResp;
|
||||
import top.ysoft.admin.open.service.AppService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.open.model.query.AppQuery;
|
||||
import top.wms.admin.open.model.req.AppReq;
|
||||
import top.wms.admin.open.model.resp.AppDetailResp;
|
||||
import top.wms.admin.open.model.resp.AppResp;
|
||||
import top.wms.admin.open.model.resp.AppSecretResp;
|
||||
import top.wms.admin.open.service.AppService;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.peopleBranch;
|
||||
package top.wms.admin.controller.peopleBranch;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import cn.hutool.core.lang.tree.Tree;
|
||||
@@ -6,10 +6,10 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import top.continew.starter.log.annotation.Log;
|
||||
import top.ysoft.admin.peopleBranch.model.query.BranchQuery;
|
||||
import top.ysoft.admin.peopleBranch.model.req.BranchReq;
|
||||
import top.ysoft.admin.peopleBranch.model.resp.BranchResp;
|
||||
import top.ysoft.admin.peopleBranch.service.BranchService;
|
||||
import top.wms.admin.peopleBranch.model.query.BranchQuery;
|
||||
import top.wms.admin.peopleBranch.model.req.BranchReq;
|
||||
import top.wms.admin.peopleBranch.model.resp.BranchResp;
|
||||
import top.wms.admin.peopleBranch.service.BranchService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.peopleBranch;
|
||||
package top.wms.admin.controller.peopleBranch;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
@@ -20,20 +20,19 @@ import top.continew.starter.extension.crud.model.resp.LabelValueResp;
|
||||
import top.continew.starter.extension.crud.model.resp.PageResp;
|
||||
import top.continew.starter.log.annotation.Log;
|
||||
import top.continew.starter.web.model.R;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.consume.model.req.PeopleDepositImportReq;
|
||||
import top.ysoft.admin.consume.model.resp.PeopleDepositImportParseResp;
|
||||
import top.ysoft.admin.peopleBranch.model.query.PeopleQuery;
|
||||
import top.ysoft.admin.peopleBranch.model.req.PeopleImportReq;
|
||||
import top.ysoft.admin.peopleBranch.model.req.PeopleReq;
|
||||
import top.ysoft.admin.peopleBranch.model.resp.ConsumePeopleResp;
|
||||
import top.ysoft.admin.peopleBranch.model.resp.PeopleImportParseResp;
|
||||
import top.ysoft.admin.peopleBranch.model.resp.PeopleImportResp;
|
||||
import top.ysoft.admin.peopleBranch.model.resp.PeopleResp;
|
||||
import top.ysoft.admin.peopleBranch.service.PeopleService;
|
||||
import top.ysoft.admin.system.model.req.user.UserImportReq;
|
||||
import top.ysoft.admin.system.model.resp.user.UserImportResp;
|
||||
import top.ysoft.admin.system.service.ImportExcelService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.consume.model.req.PeopleDepositImportReq;
|
||||
import top.wms.admin.consume.model.resp.PeopleDepositImportParseResp;
|
||||
import top.wms.admin.peopleBranch.model.query.PeopleQuery;
|
||||
import top.wms.admin.peopleBranch.model.req.PeopleImportReq;
|
||||
import top.wms.admin.peopleBranch.model.req.PeopleReq;
|
||||
import top.wms.admin.peopleBranch.model.resp.ConsumePeopleResp;
|
||||
import top.wms.admin.peopleBranch.model.resp.PeopleImportParseResp;
|
||||
import top.wms.admin.peopleBranch.model.resp.PeopleImportResp;
|
||||
import top.wms.admin.peopleBranch.model.resp.PeopleResp;
|
||||
import top.wms.admin.peopleBranch.service.PeopleService;
|
||||
import top.wms.admin.system.model.resp.user.UserImportResp;
|
||||
import top.wms.admin.system.service.ImportExcelService;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
@@ -103,7 +102,6 @@ public class PeopleController extends BaseController<PeopleService, PeopleResp,
|
||||
return baseService.importPeople(req);
|
||||
}
|
||||
|
||||
|
||||
//消费相关
|
||||
@Log(ignore = true)
|
||||
@Operation(summary = "分页查询人员消费列表", description = "分页查询列表")
|
||||
@@ -113,7 +111,6 @@ public class PeopleController extends BaseController<PeopleService, PeopleResp,
|
||||
return baseService.pageConsume(query, pageQuery);
|
||||
}
|
||||
|
||||
|
||||
@Log(ignore = true)
|
||||
@Operation(summary = "导出人员充值列表", description = "导出人员充值列表")
|
||||
@GetMapping("/exportConsume")
|
||||
@@ -187,7 +184,6 @@ public class PeopleController extends BaseController<PeopleService, PeopleResp,
|
||||
return baseService.parseConsumeImport(file);
|
||||
}
|
||||
|
||||
|
||||
@Operation(summary = "导入数据", description = "导入数据")
|
||||
@SaCheckPermission("consume:PeopleDeposit:import")
|
||||
@PostMapping(value = "/consume/import")
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.peopleDownRecord;
|
||||
package top.wms.admin.controller.peopleDownRecord;
|
||||
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -9,13 +9,13 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
import top.continew.starter.web.model.R;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.common.enums.OperTypeEnum;
|
||||
import top.ysoft.admin.peopleDownRecord.model.query.PeopleDownQuery;
|
||||
import top.ysoft.admin.peopleDownRecord.model.req.PeopleDownReq;
|
||||
import top.ysoft.admin.peopleDownRecord.model.resp.PeopleDownResp;
|
||||
import top.ysoft.admin.peopleDownRecord.service.PeopleDownService;
|
||||
import top.ysoft.admin.yfApi.service.ISysYFService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.common.enums.OperTypeEnum;
|
||||
import top.wms.admin.peopleDownRecord.model.query.PeopleDownQuery;
|
||||
import top.wms.admin.peopleDownRecord.model.req.PeopleDownReq;
|
||||
import top.wms.admin.peopleDownRecord.model.resp.PeopleDownResp;
|
||||
import top.wms.admin.peopleDownRecord.service.PeopleDownService;
|
||||
import top.wms.admin.yfApi.service.ISysYFService;
|
||||
|
||||
@Tag(name = "下发管理 API")
|
||||
@RequiredArgsConstructor
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.rule;
|
||||
package top.wms.admin.controller.rule;
|
||||
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
|
||||
@@ -7,11 +7,11 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.rule.model.query.EmpowerRecordQuery;
|
||||
import top.ysoft.admin.rule.model.req.EmpowerRecordReq;
|
||||
import top.ysoft.admin.rule.model.resp.EmpowerRecordResp;
|
||||
import top.ysoft.admin.rule.service.EmpowerRecordService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.rule.model.query.EmpowerRecordQuery;
|
||||
import top.wms.admin.rule.model.req.EmpowerRecordReq;
|
||||
import top.wms.admin.rule.model.resp.EmpowerRecordResp;
|
||||
import top.wms.admin.rule.service.EmpowerRecordService;
|
||||
|
||||
/**
|
||||
* 授权记录管理 API
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.rule;
|
||||
package top.wms.admin.controller.rule;
|
||||
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
|
||||
@@ -7,11 +7,11 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.rule.model.query.PeopleRecordQuery;
|
||||
import top.ysoft.admin.rule.model.req.PeopleRecordReq;
|
||||
import top.ysoft.admin.rule.model.resp.PeopleRecordResp;
|
||||
import top.ysoft.admin.rule.service.PeopleRecordService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.rule.model.query.PeopleRecordQuery;
|
||||
import top.wms.admin.rule.model.req.PeopleRecordReq;
|
||||
import top.wms.admin.rule.model.resp.PeopleRecordResp;
|
||||
import top.wms.admin.rule.service.PeopleRecordService;
|
||||
|
||||
/**
|
||||
* 人员识别记录管理 API
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.rule;
|
||||
package top.wms.admin.controller.rule;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -11,11 +11,11 @@ import org.springframework.web.bind.annotation.*;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.continew.starter.extension.crud.model.resp.LabelValueResp;
|
||||
import top.continew.starter.web.model.R;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.rule.model.query.RuleQuery;
|
||||
import top.ysoft.admin.rule.model.req.RuleReq;
|
||||
import top.ysoft.admin.rule.model.resp.RuleResp;
|
||||
import top.ysoft.admin.rule.service.RuleService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.rule.model.query.RuleQuery;
|
||||
import top.wms.admin.rule.model.req.RuleReq;
|
||||
import top.wms.admin.rule.model.resp.RuleResp;
|
||||
import top.wms.admin.rule.service.RuleService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.schedule;
|
||||
package top.wms.admin.controller.schedule;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
|
||||
@@ -8,11 +8,11 @@ import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import top.ysoft.admin.common.constant.CacheConstants;
|
||||
import top.ysoft.admin.open.mapper.AppMapper;
|
||||
import top.ysoft.admin.open.model.entity.AppDO;
|
||||
import top.ysoft.admin.system.mapper.*;
|
||||
import top.ysoft.admin.system.model.entity.*;
|
||||
import top.wms.admin.common.constant.CacheConstants;
|
||||
import top.wms.admin.open.mapper.AppMapper;
|
||||
import top.wms.admin.open.model.entity.AppDO;
|
||||
import top.wms.admin.system.mapper.*;
|
||||
import top.wms.admin.system.model.entity.*;
|
||||
import top.continew.starter.cache.redisson.util.RedisUtils;
|
||||
import top.continew.starter.core.constant.StringConstants;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.schedule;
|
||||
package top.wms.admin.controller.schedule;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
@@ -8,11 +8,11 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import top.ysoft.admin.schedule.model.query.JobQuery;
|
||||
import top.ysoft.admin.schedule.model.req.JobReq;
|
||||
import top.ysoft.admin.schedule.model.req.JobStatusReq;
|
||||
import top.ysoft.admin.schedule.model.resp.JobResp;
|
||||
import top.ysoft.admin.schedule.service.JobService;
|
||||
import top.wms.admin.schedule.model.query.JobQuery;
|
||||
import top.wms.admin.schedule.model.req.JobReq;
|
||||
import top.wms.admin.schedule.model.req.JobStatusReq;
|
||||
import top.wms.admin.schedule.model.resp.JobResp;
|
||||
import top.wms.admin.schedule.service.JobService;
|
||||
import top.continew.starter.extension.crud.model.resp.PageResp;
|
||||
import top.continew.starter.extension.crud.validation.CrudValidationGroup;
|
||||
import top.continew.starter.log.annotation.Log;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.schedule;
|
||||
package top.wms.admin.controller.schedule;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
@@ -8,13 +8,13 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import top.ysoft.admin.schedule.model.JobInstanceLogPageResult;
|
||||
import top.ysoft.admin.schedule.model.query.JobInstanceLogQuery;
|
||||
import top.ysoft.admin.schedule.model.query.JobInstanceQuery;
|
||||
import top.ysoft.admin.schedule.model.query.JobLogQuery;
|
||||
import top.ysoft.admin.schedule.model.resp.JobInstanceResp;
|
||||
import top.ysoft.admin.schedule.model.resp.JobLogResp;
|
||||
import top.ysoft.admin.schedule.service.JobLogService;
|
||||
import top.wms.admin.schedule.model.JobInstanceLogPageResult;
|
||||
import top.wms.admin.schedule.model.query.JobInstanceLogQuery;
|
||||
import top.wms.admin.schedule.model.query.JobInstanceQuery;
|
||||
import top.wms.admin.schedule.model.query.JobLogQuery;
|
||||
import top.wms.admin.schedule.model.resp.JobInstanceResp;
|
||||
import top.wms.admin.schedule.model.resp.JobLogResp;
|
||||
import top.wms.admin.schedule.service.JobLogService;
|
||||
import top.continew.starter.extension.crud.model.resp.PageResp;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
package top.ysoft.admin.controller.space;
|
||||
package top.wms.admin.controller.space;
|
||||
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.space.model.query.PointQuery;
|
||||
import top.ysoft.admin.space.model.req.PointReq;
|
||||
import top.ysoft.admin.space.model.resp.PointResp;
|
||||
import top.ysoft.admin.space.service.PointService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.space.model.query.PointQuery;
|
||||
import top.wms.admin.space.model.req.PointReq;
|
||||
import top.wms.admin.space.model.resp.PointResp;
|
||||
import top.wms.admin.space.service.PointService;
|
||||
|
||||
/**
|
||||
* 点位管理管理 API
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.space;
|
||||
package top.wms.admin.controller.space;
|
||||
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
|
||||
@@ -7,12 +7,12 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.space.model.query.SpaceQuery;
|
||||
import top.ysoft.admin.space.model.req.SpaceReq;
|
||||
import top.ysoft.admin.space.model.resp.SpaceResp;
|
||||
import top.ysoft.admin.space.model.resp.SpaceResp;
|
||||
import top.ysoft.admin.space.service.SpaceService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.space.model.query.SpaceQuery;
|
||||
import top.wms.admin.space.model.req.SpaceReq;
|
||||
import top.wms.admin.space.model.resp.SpaceResp;
|
||||
import top.wms.admin.space.model.resp.SpaceResp;
|
||||
import top.wms.admin.space.service.SpaceService;
|
||||
|
||||
/**
|
||||
* 空间管理管理 API
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package top.ysoft.admin.controller.system;
|
||||
package top.wms.admin.controller.system;
|
||||
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.system.model.query.ClientQuery;
|
||||
import top.ysoft.admin.system.model.req.ClientReq;
|
||||
import top.ysoft.admin.system.model.resp.ClientResp;
|
||||
import top.ysoft.admin.system.service.ClientService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.system.model.query.ClientQuery;
|
||||
import top.wms.admin.system.model.req.ClientReq;
|
||||
import top.wms.admin.system.model.resp.ClientResp;
|
||||
import top.wms.admin.system.service.ClientService;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.system;
|
||||
package top.wms.admin.controller.system;
|
||||
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
|
||||
@@ -7,11 +7,11 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.system.model.query.ConfigQuery;
|
||||
import top.ysoft.admin.system.model.req.ConfigReq;
|
||||
import top.ysoft.admin.system.model.resp.ConfigResp;
|
||||
import top.ysoft.admin.system.service.ConfigService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.system.model.query.ConfigQuery;
|
||||
import top.wms.admin.system.model.req.ConfigReq;
|
||||
import top.wms.admin.system.model.resp.ConfigResp;
|
||||
import top.wms.admin.system.service.ConfigService;
|
||||
|
||||
/**
|
||||
* 参数配置管理 API
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package top.ysoft.admin.controller.system;
|
||||
package top.wms.admin.controller.system;
|
||||
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.system.model.query.DeptQuery;
|
||||
import top.ysoft.admin.system.model.req.DeptReq;
|
||||
import top.ysoft.admin.system.model.resp.DeptResp;
|
||||
import top.ysoft.admin.system.service.DeptService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.system.model.query.DeptQuery;
|
||||
import top.wms.admin.system.model.req.DeptReq;
|
||||
import top.wms.admin.system.model.resp.DeptResp;
|
||||
import top.wms.admin.system.service.DeptService;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.system;
|
||||
package top.wms.admin.controller.system;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
@@ -6,12 +6,12 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import top.ysoft.admin.common.constant.CacheConstants;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.system.model.query.DictQuery;
|
||||
import top.ysoft.admin.system.model.req.DictReq;
|
||||
import top.ysoft.admin.system.model.resp.DictResp;
|
||||
import top.ysoft.admin.system.service.DictService;
|
||||
import top.wms.admin.common.constant.CacheConstants;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.system.model.query.DictQuery;
|
||||
import top.wms.admin.system.model.req.DictReq;
|
||||
import top.wms.admin.system.model.resp.DictResp;
|
||||
import top.wms.admin.system.service.DictService;
|
||||
import top.continew.starter.cache.redisson.util.RedisUtils;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package top.ysoft.admin.controller.system;
|
||||
package top.wms.admin.controller.system;
|
||||
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.system.model.query.DictItemQuery;
|
||||
import top.ysoft.admin.system.model.req.DictItemReq;
|
||||
import top.ysoft.admin.system.model.resp.DictItemResp;
|
||||
import top.ysoft.admin.system.service.DictItemService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.system.model.query.DictItemQuery;
|
||||
import top.wms.admin.system.model.req.DictItemReq;
|
||||
import top.wms.admin.system.model.resp.DictItemResp;
|
||||
import top.wms.admin.system.service.DictItemService;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
import top.continew.starter.log.annotation.Log;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.system;
|
||||
package top.wms.admin.controller.system;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
@@ -6,12 +6,12 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.system.model.query.FileQuery;
|
||||
import top.ysoft.admin.system.model.req.FileReq;
|
||||
import top.ysoft.admin.system.model.resp.file.FileResp;
|
||||
import top.ysoft.admin.system.model.resp.file.FileStatisticsResp;
|
||||
import top.ysoft.admin.system.service.FileService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.system.model.query.FileQuery;
|
||||
import top.wms.admin.system.model.req.FileReq;
|
||||
import top.wms.admin.system.model.resp.file.FileResp;
|
||||
import top.wms.admin.system.model.resp.file.FileStatisticsResp;
|
||||
import top.wms.admin.system.service.FileService;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
import top.continew.starter.log.annotation.Log;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.system;
|
||||
package top.wms.admin.controller.system;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import com.feiniaojin.gracefulresponse.api.ExcludeFromGracefulResponse;
|
||||
@@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import top.ysoft.admin.system.model.query.LogQuery;
|
||||
import top.ysoft.admin.system.model.resp.log.LogDetailResp;
|
||||
import top.ysoft.admin.system.model.resp.log.LogResp;
|
||||
import top.ysoft.admin.system.service.LogService;
|
||||
import top.wms.admin.system.model.query.LogQuery;
|
||||
import top.wms.admin.system.model.resp.log.LogDetailResp;
|
||||
import top.wms.admin.system.model.resp.log.LogResp;
|
||||
import top.wms.admin.system.service.LogService;
|
||||
import top.continew.starter.extension.crud.model.query.PageQuery;
|
||||
import top.continew.starter.extension.crud.model.query.SortQuery;
|
||||
import top.continew.starter.extension.crud.model.resp.PageResp;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.system;
|
||||
package top.wms.admin.controller.system;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
@@ -7,12 +7,12 @@ import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import top.ysoft.admin.common.constant.CacheConstants;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.system.model.query.MenuQuery;
|
||||
import top.ysoft.admin.system.model.req.MenuReq;
|
||||
import top.ysoft.admin.system.model.resp.MenuResp;
|
||||
import top.ysoft.admin.system.service.MenuService;
|
||||
import top.wms.admin.common.constant.CacheConstants;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.system.model.query.MenuQuery;
|
||||
import top.wms.admin.system.model.req.MenuReq;
|
||||
import top.wms.admin.system.model.resp.MenuResp;
|
||||
import top.wms.admin.system.service.MenuService;
|
||||
import top.continew.starter.cache.redisson.util.RedisUtils;
|
||||
import top.continew.starter.core.constant.StringConstants;
|
||||
import top.continew.starter.core.util.URLUtils;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.system;
|
||||
package top.wms.admin.controller.system;
|
||||
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
@@ -7,12 +7,12 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import top.ysoft.admin.common.context.UserContextHolder;
|
||||
import top.ysoft.admin.system.model.query.MessageQuery;
|
||||
import top.ysoft.admin.system.model.resp.message.MessageResp;
|
||||
import top.ysoft.admin.system.model.resp.message.MessageUnreadResp;
|
||||
import top.ysoft.admin.system.service.MessageService;
|
||||
import top.ysoft.admin.system.service.MessageUserService;
|
||||
import top.wms.admin.common.context.UserContextHolder;
|
||||
import top.wms.admin.system.model.query.MessageQuery;
|
||||
import top.wms.admin.system.model.resp.message.MessageResp;
|
||||
import top.wms.admin.system.model.resp.message.MessageUnreadResp;
|
||||
import top.wms.admin.system.service.MessageService;
|
||||
import top.wms.admin.system.service.MessageUserService;
|
||||
import top.continew.starter.extension.crud.model.query.PageQuery;
|
||||
import top.continew.starter.extension.crud.model.resp.PageResp;
|
||||
import top.continew.starter.log.annotation.Log;
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
package top.ysoft.admin.controller.system;
|
||||
package top.wms.admin.controller.system;
|
||||
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.system.enums.NoticeScopeEnum;
|
||||
import top.ysoft.admin.system.model.query.NoticeQuery;
|
||||
import top.ysoft.admin.system.model.req.NoticeReq;
|
||||
import top.ysoft.admin.system.model.resp.NoticeDetailResp;
|
||||
import top.ysoft.admin.system.model.resp.NoticeResp;
|
||||
import top.ysoft.admin.system.service.NoticeService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.system.enums.NoticeScopeEnum;
|
||||
import top.wms.admin.system.model.query.NoticeQuery;
|
||||
import top.wms.admin.system.model.req.NoticeReq;
|
||||
import top.wms.admin.system.model.resp.NoticeDetailResp;
|
||||
import top.wms.admin.system.model.resp.NoticeResp;
|
||||
import top.wms.admin.system.service.NoticeService;
|
||||
import top.continew.starter.core.validation.ValidationUtils;
|
||||
import top.continew.starter.extension.crud.annotation.CrudApi;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.system;
|
||||
package top.wms.admin.controller.system;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
@@ -7,11 +7,11 @@ import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import top.ysoft.admin.system.model.query.OptionQuery;
|
||||
import top.ysoft.admin.system.model.req.OptionReq;
|
||||
import top.ysoft.admin.system.model.req.OptionResetValueReq;
|
||||
import top.ysoft.admin.system.model.resp.OptionResp;
|
||||
import top.ysoft.admin.system.service.OptionService;
|
||||
import top.wms.admin.system.model.query.OptionQuery;
|
||||
import top.wms.admin.system.model.req.OptionReq;
|
||||
import top.wms.admin.system.model.req.OptionResetValueReq;
|
||||
import top.wms.admin.system.model.resp.OptionResp;
|
||||
import top.wms.admin.system.service.OptionService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.system;
|
||||
package top.wms.admin.controller.system;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
@@ -9,16 +9,16 @@ import jakarta.validation.constraints.NotEmpty;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.system.model.query.RoleQuery;
|
||||
import top.ysoft.admin.system.model.query.RoleUserQuery;
|
||||
import top.ysoft.admin.system.model.req.RoleReq;
|
||||
import top.ysoft.admin.system.model.req.RoleUpdatePermissionReq;
|
||||
import top.ysoft.admin.system.model.resp.role.RoleDetailResp;
|
||||
import top.ysoft.admin.system.model.resp.role.RoleResp;
|
||||
import top.ysoft.admin.system.model.resp.role.RoleUserResp;
|
||||
import top.ysoft.admin.system.service.RoleService;
|
||||
import top.ysoft.admin.system.service.UserRoleService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.system.model.query.RoleQuery;
|
||||
import top.wms.admin.system.model.query.RoleUserQuery;
|
||||
import top.wms.admin.system.model.req.RoleReq;
|
||||
import top.wms.admin.system.model.req.RoleUpdatePermissionReq;
|
||||
import top.wms.admin.system.model.resp.role.RoleDetailResp;
|
||||
import top.wms.admin.system.model.resp.role.RoleResp;
|
||||
import top.wms.admin.system.model.resp.role.RoleUserResp;
|
||||
import top.wms.admin.system.service.RoleService;
|
||||
import top.wms.admin.system.service.UserRoleService;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
import top.continew.starter.extension.crud.model.query.PageQuery;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.system;
|
||||
package top.wms.admin.controller.system;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
@@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.common.model.req.CommonStatusUpdateReq;
|
||||
import top.ysoft.admin.system.model.query.StorageQuery;
|
||||
import top.ysoft.admin.system.model.req.StorageReq;
|
||||
import top.ysoft.admin.system.model.resp.StorageResp;
|
||||
import top.ysoft.admin.system.service.StorageService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.common.model.req.CommonStatusUpdateReq;
|
||||
import top.wms.admin.system.model.query.StorageQuery;
|
||||
import top.wms.admin.system.model.req.StorageReq;
|
||||
import top.wms.admin.system.model.resp.StorageResp;
|
||||
import top.wms.admin.system.service.StorageService;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
import top.continew.starter.extension.crud.enums.Api;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.system;
|
||||
package top.wms.admin.controller.system;
|
||||
|
||||
import com.xkcoding.justauth.AuthRequestFactory;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
@@ -14,19 +14,19 @@ import me.zhyd.oauth.request.AuthRequest;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import top.ysoft.admin.common.constant.CacheConstants;
|
||||
import top.ysoft.admin.common.context.UserContextHolder;
|
||||
import top.ysoft.admin.common.util.SecureUtils;
|
||||
import top.ysoft.admin.system.enums.SocialSourceEnum;
|
||||
import top.ysoft.admin.system.model.entity.UserSocialDO;
|
||||
import top.ysoft.admin.system.model.req.user.UserBasicInfoUpdateReq;
|
||||
import top.ysoft.admin.system.model.req.user.UserEmailUpdateRequest;
|
||||
import top.ysoft.admin.system.model.req.user.UserPasswordUpdateReq;
|
||||
import top.ysoft.admin.system.model.req.user.UserPhoneUpdateReq;
|
||||
import top.ysoft.admin.system.model.resp.AvatarResp;
|
||||
import top.ysoft.admin.system.model.resp.user.UserSocialBindResp;
|
||||
import top.ysoft.admin.system.service.UserService;
|
||||
import top.ysoft.admin.system.service.UserSocialService;
|
||||
import top.wms.admin.common.constant.CacheConstants;
|
||||
import top.wms.admin.common.context.UserContextHolder;
|
||||
import top.wms.admin.common.util.SecureUtils;
|
||||
import top.wms.admin.system.enums.SocialSourceEnum;
|
||||
import top.wms.admin.system.model.entity.UserSocialDO;
|
||||
import top.wms.admin.system.model.req.user.UserBasicInfoUpdateReq;
|
||||
import top.wms.admin.system.model.req.user.UserEmailUpdateRequest;
|
||||
import top.wms.admin.system.model.req.user.UserPasswordUpdateReq;
|
||||
import top.wms.admin.system.model.req.user.UserPhoneUpdateReq;
|
||||
import top.wms.admin.system.model.resp.AvatarResp;
|
||||
import top.wms.admin.system.model.resp.user.UserSocialBindResp;
|
||||
import top.wms.admin.system.service.UserService;
|
||||
import top.wms.admin.system.service.UserSocialService;
|
||||
import top.continew.starter.cache.redisson.util.RedisUtils;
|
||||
import top.continew.starter.core.util.ExceptionUtils;
|
||||
import top.continew.starter.core.validation.ValidationUtils;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.system;
|
||||
package top.wms.admin.controller.system;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import cn.hutool.core.util.ReUtil;
|
||||
@@ -13,19 +13,19 @@ import org.springframework.http.MediaType;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import top.ysoft.admin.common.controller.BaseController;
|
||||
import top.ysoft.admin.common.constant.RegexConstants;
|
||||
import top.ysoft.admin.common.util.SecureUtils;
|
||||
import top.ysoft.admin.system.model.query.UserQuery;
|
||||
import top.ysoft.admin.system.model.req.user.UserImportReq;
|
||||
import top.ysoft.admin.system.model.req.user.UserPasswordResetReq;
|
||||
import top.ysoft.admin.system.model.req.user.UserReq;
|
||||
import top.ysoft.admin.system.model.req.user.UserRoleUpdateReq;
|
||||
import top.ysoft.admin.system.model.resp.user.UserDetailResp;
|
||||
import top.ysoft.admin.system.model.resp.user.UserImportParseResp;
|
||||
import top.ysoft.admin.system.model.resp.user.UserImportResp;
|
||||
import top.ysoft.admin.system.model.resp.user.UserResp;
|
||||
import top.ysoft.admin.system.service.UserService;
|
||||
import top.wms.admin.common.controller.BaseController;
|
||||
import top.wms.admin.common.constant.RegexConstants;
|
||||
import top.wms.admin.common.util.SecureUtils;
|
||||
import top.wms.admin.system.model.query.UserQuery;
|
||||
import top.wms.admin.system.model.req.user.UserImportReq;
|
||||
import top.wms.admin.system.model.req.user.UserPasswordResetReq;
|
||||
import top.wms.admin.system.model.req.user.UserReq;
|
||||
import top.wms.admin.system.model.req.user.UserRoleUpdateReq;
|
||||
import top.wms.admin.system.model.resp.user.UserDetailResp;
|
||||
import top.wms.admin.system.model.resp.user.UserImportParseResp;
|
||||
import top.wms.admin.system.model.resp.user.UserImportResp;
|
||||
import top.wms.admin.system.model.resp.user.UserResp;
|
||||
import top.wms.admin.system.service.UserService;
|
||||
import top.continew.starter.core.util.ExceptionUtils;
|
||||
import top.continew.starter.core.validation.ValidationUtils;
|
||||
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.system;
|
||||
package top.wms.admin.controller.system;
|
||||
|
||||
import org.dromara.x.file.storage.core.FileInfo;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -6,11 +6,11 @@ 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 top.ysoft.admin.common.util.PictureUtils;
|
||||
// import top.ysoft.admin.controller.file.SysFileController;
|
||||
// import top.ysoft.admin.file.domain.SysFile;
|
||||
import top.ysoft.admin.system.model.resp.file.FileUploadResp;
|
||||
import top.ysoft.admin.system.service.FileService;
|
||||
import top.wms.admin.common.util.PictureUtils;
|
||||
// import top.wms.admin.controller.file.SysFileController;
|
||||
// import top.wms.admin.file.domain.SysFile;
|
||||
import top.wms.admin.system.model.resp.file.FileUploadResp;
|
||||
import top.wms.admin.system.service.FileService;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/test")
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.controller.yfApi;
|
||||
package top.wms.admin.controller.yfApi;
|
||||
|
||||
import cn.hutool.core.thread.ThreadUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
@@ -12,10 +12,10 @@ import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import top.continew.starter.log.annotation.Log;
|
||||
import top.ysoft.admin.yfApi.domain.BackInfo;
|
||||
import top.ysoft.admin.yfApi.domain.BackResult;
|
||||
import top.ysoft.admin.yfApi.domain.HeartInfo;
|
||||
import top.ysoft.admin.yfApi.service.IYFListenService;
|
||||
import top.wms.admin.yfApi.domain.BackInfo;
|
||||
import top.wms.admin.yfApi.domain.BackResult;
|
||||
import top.wms.admin.yfApi.domain.HeartInfo;
|
||||
import top.wms.admin.yfApi.service.IYFListenService;
|
||||
|
||||
/**
|
||||
* 宇泛人脸设备回调
|
||||
|
||||
@@ -11,7 +11,7 @@ server:
|
||||
--- ### 数据源配置
|
||||
spring.datasource:
|
||||
type: com.zaxxer.hikari.HikariDataSource
|
||||
# 请务必提前创建好名为 ysoft_admin 的数据库,如果使用其他数据库名请注意同步修改 DB_NAME 配置
|
||||
# 请务必提前创建好名为 wms_admin 的数据库,如果使用其他数据库名请注意同步修改 DB_NAME 配置
|
||||
url: jdbc:p6spy:mysql://127.0.0.1:3306/continew?serverTimezone=Asia/Shanghai&useSSL=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
|
||||
username: root
|
||||
password: root
|
||||
@@ -284,7 +284,7 @@ snail-job:
|
||||
# 命名空间 ID
|
||||
namespace: ${SCHEDULE_NAMESPACE:764d604ec6fc45f68cd92514c40e9e1a}
|
||||
# 分组名
|
||||
group: ${SCHEDULE_GROUP:ysoft-admin}
|
||||
group: ${SCHEDULE_GROUP:wms-admin}
|
||||
# 令牌
|
||||
token: ${SCHEDULE_TOKEN:SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj}
|
||||
## 服务端配置(任务调度中心)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
--- ### 项目配置
|
||||
project:
|
||||
# URL(跨域配置默认放行此 URL,第三方登录回调默认使用此 URL 为前缀,请注意更改为你实际的前端 URL)
|
||||
url: https://admin.ysoft.top
|
||||
url: https://admin.wms.top
|
||||
# 是否为生产环境
|
||||
production: true
|
||||
|
||||
@@ -13,13 +13,13 @@ server:
|
||||
--- ### 数据源配置
|
||||
spring.datasource:
|
||||
type: com.zaxxer.hikari.HikariDataSource
|
||||
# 请务必提前创建好名为 ysoft_admin 的数据库,如果使用其他数据库名请注意同步修改 DB_NAME 配置
|
||||
url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:ysoft_admin}?serverTimezone=Asia/Shanghai&useSSL=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
|
||||
# 请务必提前创建好名为 wms_admin 的数据库,如果使用其他数据库名请注意同步修改 DB_NAME 配置
|
||||
url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:wms_admin}?serverTimezone=Asia/Shanghai&useSSL=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
|
||||
username: ${DB_USER:root}
|
||||
password: ${DB_PWD:123456}
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
# # PostgreSQL 配置
|
||||
# url: jdbc:postgresql://${DB_HOST:127.0.0.1}:${DB_PORT:5432}/${DB_NAME:ysoft_admin}?serverTimezone=Asia/Shanghai&useSSL=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&stringtype=unspecified
|
||||
# url: jdbc:postgresql://${DB_HOST:127.0.0.1}:${DB_PORT:5432}/${DB_NAME:wms_admin}?serverTimezone=Asia/Shanghai&useSSL=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&stringtype=unspecified
|
||||
# username: ${DB_USER:root}
|
||||
# password: ${DB_PWD:123456}
|
||||
# driver-class-name: org.postgresql.Driver
|
||||
@@ -142,8 +142,8 @@ continew-starter.log:
|
||||
## 项目日志配置(配置重叠部分,优先级高于 logback-spring.xml 中的配置)
|
||||
logging:
|
||||
level:
|
||||
top.ysoft.admin: INFO
|
||||
top.ysoft.starter: INFO
|
||||
top.wms.admin: INFO
|
||||
top.wms.starter: INFO
|
||||
file:
|
||||
path: ../logs
|
||||
|
||||
@@ -276,7 +276,7 @@ snail-job:
|
||||
# 命名空间 ID
|
||||
namespace: ${SCHEDULE_NAMESPACE:764d604ec6fc45f68cd92514c40e9e1a}
|
||||
# 分组名
|
||||
group: ${SCHEDULE_GROUP:ysoft-admin}
|
||||
group: ${SCHEDULE_GROUP:wms-admin}
|
||||
# 令牌
|
||||
token: ${SCHEDULE_TOKEN:SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj}
|
||||
## 服务端配置(任务调度中心)
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
--- ### 项目配置
|
||||
project:
|
||||
# 名称
|
||||
name: Ysoft Admin
|
||||
name: Wms Admin
|
||||
# 应用名称
|
||||
app-name: ysoft-admin
|
||||
app-name: wms-admin
|
||||
# 版本
|
||||
version: 3.6.0-SNAPSHOT
|
||||
# 描述
|
||||
description: 持续迭代优化的前后端分离中后台管理系统框架,开箱即用,持续提供舒适的开发体验。
|
||||
# 基本包
|
||||
base-package: top.ysoft.admin
|
||||
base-package: top.wms.admin
|
||||
## 作者信息配置
|
||||
contact:
|
||||
name: Charles7c
|
||||
@@ -18,7 +18,7 @@ project:
|
||||
## 许可协议信息配置
|
||||
license:
|
||||
name: Apache-2.0
|
||||
url: https://github.com/ysoft-org/ysoft-admin/blob/dev/LICENSE
|
||||
url: https://github.com/wms-org/wms-admin/blob/dev/LICENSE
|
||||
|
||||
--- ### 日志配置
|
||||
continew-starter.log:
|
||||
|
||||
@@ -248,8 +248,8 @@ INSERT INTO `sys_role_dept` (`role_id`, `dept_id`) VALUES (547888897925840927, 5
|
||||
INSERT INTO `sys_storage`
|
||||
(`id`, `name`, `code`, `type`, `access_key`, `secret_key`, `endpoint`, `bucket_name`, `domain`, `description`, `is_default`, `sort`, `status`, `create_user`, `create_time`)
|
||||
VALUES
|
||||
(1, '开发环境', 'local_dev', 1, NULL, NULL, NULL, 'C:/ysoft-admin/data/file/', 'http://localhost:8000/file', '本地存储', b'1', 1, 1, 1, NOW()),
|
||||
(2, '生产环境', 'local_prod', 1, NULL, NULL, NULL, '../data/file/', 'http://api.ysoft.top/file', '本地存储', b'0', 2, 2, 1, NOW());
|
||||
(1, '开发环境', 'local_dev', 1, NULL, NULL, NULL, 'C:/wms-admin/data/file/', 'http://localhost:8000/file', '本地存储', b'1', 1, 1, 1, NOW()),
|
||||
(2, '生产环境', 'local_prod', 1, NULL, NULL, NULL, '../data/file/', 'http://api.wms.top/file', '本地存储', b'0', 2, 2, 1, NOW());
|
||||
|
||||
-- 初始化终端数据
|
||||
INSERT INTO `sys_client`
|
||||
|
||||
@@ -248,8 +248,8 @@ INSERT INTO "sys_role_dept" ("role_id", "dept_id") VALUES (547888897925840927, 5
|
||||
INSERT INTO "sys_storage"
|
||||
("id", "name", "code", "type", "access_key", "secret_key", "endpoint", "bucket_name", "domain", "description", "is_default", "sort", "status", "create_user", "create_time")
|
||||
VALUES
|
||||
(1, '开发环境', 'local_dev', 1, NULL, NULL, NULL, 'C:/ysoft-admin/data/file/', 'http://localhost:8000/file', '本地存储', true, 1, 1, 1, NOW()),
|
||||
(2, '生产环境', 'local_prod', 1, NULL, NULL, NULL, '../data/file/', 'http://api.ysoft.top/file', '本地存储', false, 2, 2, 1, NOW());
|
||||
(1, '开发环境', 'local_dev', 1, NULL, NULL, NULL, 'C:/wms-admin/data/file/', 'http://localhost:8000/file', '本地存储', true, 1, 1, 1, NOW()),
|
||||
(2, '生产环境', 'local_prod', 1, NULL, NULL, NULL, '../data/file/', 'http://api.wms.top/file', '本地存储', false, 2, 2, 1, NOW());
|
||||
|
||||
-- 初始化终端数据
|
||||
INSERT INTO "sys_client"
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<div style="height: 29px; line-height: 25px; padding: 15px 30px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #307AF2; background: #00308f; border-radius: 5px 5px 0 0;">
|
||||
<div style="font-size: 24px; font-weight: bolder; color: #fff; display: inline-flex; align-items: center;">
|
||||
<a href="${siteUrl}">
|
||||
<img src="https://admin.ysoft.top/logo.svg" alt="${siteTitle}" style="vertical-align: middle;">
|
||||
<img src="https://admin.wms.top/logo.svg" alt="${siteTitle}" style="vertical-align: middle;">
|
||||
</a>
|
||||
<a href="${siteUrl}" style="margin-left: 4px; text-decoration: none; color: #fff;">${siteTitle}</a>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user