金刚位 拍卖公告分页修复

前台 公告分页修复

auc/src/main/java/cn/hobbystocks/auc/AucApplication.java

@@ -1,7 +1,5 @@
 package cn.hobbystocks.auc;
 
-import java.util.TimeZone;
-
 import com.dtflys.forest.springboot.annotation.ForestScan;
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
@@ -12,6 +10,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import springfox.documentation.oas.annotations.EnableOpenApi;
 
+import java.util.TimeZone;
+
 @ForestScan(basePackages = "cn.hobbystocks.auc.forest")
 @MapperScan("cn/hobbystocks/auc/mapper")
 @SpringBootApplication

auc/src/main/java/cn/hobbystocks/auc/aop/ControllerLoggingInterceptor.java

@@ -1,13 +1,13 @@
 package cn.hobbystocks.auc.aop;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.UUID;
 
 @Component

auc/src/main/java/cn/hobbystocks/auc/app/AppClient.java

@@ -1,19 +1,13 @@
 package cn.hobbystocks.auc.app;
 
-import cn.hobbystocks.auc.domain.Bid;
 import cn.hobbystocks.auc.forest.CommonForestClient;
-import cn.hobbystocks.auc.vo.CardGroupLivesConfigVO;
-import cn.hobbystocks.auc.vo.LivingExplainDTO;
 import cn.hobbystocks.auc.vo.SkuDTO;
 import com.alibaba.fastjson.JSON;
 import com.dtflys.forest.http.ForestResponse;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import com.google.common.collect.Maps;
-import java.util.*;
 
 @Component
 @Slf4j

auc/src/main/java/cn/hobbystocks/auc/config/MyFlywayMigrationStrategy.java

@@ -1,10 +1,8 @@
 package cn.hobbystocks.auc.config;
 
 import cn.hobbystocks.auc.common.user.UserUtils;
-
 import cn.hobbystocks.auc.service.ILotService;
 import lombok.SneakyThrows;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

auc/src/main/java/cn/hobbystocks/auc/web/BidController.java

@@ -1,7 +1,7 @@
 package cn.hobbystocks.auc.web;
 
-import cn.hobbystocks.auc.common.core.domain.AjaxResult;
 import cn.hobbystocks.auc.common.constant.Constants;
+import cn.hobbystocks.auc.common.core.domain.AjaxResult;
 import cn.hobbystocks.auc.common.user.UserUtils;
 import cn.hobbystocks.auc.common.utils.SensitiveDataUtils;
 import cn.hobbystocks.auc.common.utils.StringUtils;
@@ -10,7 +10,10 @@ import cn.hobbystocks.auc.vo.BidVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Objects;

auc/src/main/java/cn/hobbystocks/auc/web/DepositRecordController.java

@@ -12,7 +12,10 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Objects;

auc/src/main/java/cn/hobbystocks/auc/web/DiamondPositionController.java

@@ -1,31 +1,26 @@
 package cn.hobbystocks.auc.web;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-
-import cn.hobbystocks.auc.common.constant.Constants;
 import cn.hobbystocks.auc.common.core.domain.AjaxResult;
 import cn.hobbystocks.auc.common.user.UserInfo;
 import cn.hobbystocks.auc.common.user.UserUtils;
-import cn.hobbystocks.auc.common.utils.DateUtils;
 import cn.hobbystocks.auc.convert.DiamondPositionConvert;
 import cn.hobbystocks.auc.domain.DiamondPosition;
-import cn.hobbystocks.auc.request.*;
+import cn.hobbystocks.auc.request.DiamondPositionPageRequest;
+import cn.hobbystocks.auc.request.DiamondPositionQueryRequest;
+import cn.hobbystocks.auc.request.DiamondPositionSaveRequest;
 import cn.hobbystocks.auc.response.DiamondPositionResponse;
 import cn.hobbystocks.auc.service.IDiamondPositionService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * 金刚位管理Controller

auc/src/main/java/cn/hobbystocks/auc/web/LotController.java

@@ -1,10 +1,6 @@
 package cn.hobbystocks.auc.web;
 
-import java.util.*;
-
-
-import cn.hobbystocks.auc.annotation.RequireRoles;
-import cn.hobbystocks.auc.app.AppClient;
+import cn.hobbystocks.auc.common.constant.Constants;
 import cn.hobbystocks.auc.common.core.domain.AjaxResult;
 import cn.hobbystocks.auc.common.easy.factory.EasyColumnEnums;
 import cn.hobbystocks.auc.common.easy.factory.EasyExcelFactory;
@@ -13,35 +9,28 @@ import cn.hobbystocks.auc.common.poi.ExcelUtil;
 import cn.hobbystocks.auc.common.user.UserInfo;
 import cn.hobbystocks.auc.common.user.UserUtils;
 import cn.hobbystocks.auc.common.utils.DateUtils;
-import cn.hobbystocks.auc.common.utils.ExcelUtils;
 import cn.hobbystocks.auc.common.utils.StringUtils;
-import cn.hobbystocks.auc.common.utils.UserType;
+import cn.hobbystocks.auc.domain.Auction;
 import cn.hobbystocks.auc.domain.Bid;
 import cn.hobbystocks.auc.domain.Lot;
-import cn.hobbystocks.auc.common.constant.Constants;
 import cn.hobbystocks.auc.dto.ExportFieldDto;
 import cn.hobbystocks.auc.dto.LotExportDTO;
 import cn.hobbystocks.auc.mapper.BidMapper;
 import cn.hobbystocks.auc.request.LotRequest;
 import cn.hobbystocks.auc.service.IAuctionService;
 import cn.hobbystocks.auc.service.SyncService;
-import cn.hobbystocks.auc.task.DynamicTaskService;
 import cn.hobbystocks.auc.vo.LotVO;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.net.HttpHeaders;
-import io.swagger.annotations.*;
-import org.apache.logging.log4j.util.Strings;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import cn.hobbystocks.auc.domain.Auction;
-
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * 拍品Controller

bid/src/main/java/cn/hobbystocks/auc/BidApplication.java

@@ -1,7 +1,5 @@
 package cn.hobbystocks.auc;
 
-import java.util.TimeZone;
-
 import com.dtflys.forest.springboot.annotation.ForestScan;
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
@@ -13,6 +11,8 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import springfox.documentation.oas.annotations.EnableOpenApi;
 
+import java.util.TimeZone;
+
 @ForestScan(basePackages = "cn.hobbystocks.auc.forest")
 @MapperScan("cn/hobbystocks/auc/mapper")
 @EnableScheduling

bid/src/main/java/cn/hobbystocks/auc/app/AppClient.java

@@ -1,11 +1,7 @@
 package cn.hobbystocks.auc.app;
 
 import cn.hobbystocks.auc.common.utils.DateUtils;
-import cn.hobbystocks.auc.domain.Bid;
-import cn.hobbystocks.auc.domain.Lot;
-import cn.hobbystocks.auc.domain.LotFans;
-import cn.hobbystocks.auc.domain.LotFansPushRecord;
-import cn.hobbystocks.auc.domain.Order;
+import cn.hobbystocks.auc.domain.*;
 import cn.hobbystocks.auc.event.SoldEvent;
 import cn.hobbystocks.auc.forest.CommonForestClient;
 import cn.hobbystocks.auc.handle.context.Live;

bid/src/main/java/cn/hobbystocks/auc/aspectj/ControllerLoggingInterceptor.java

@@ -1,13 +1,13 @@
 package cn.hobbystocks.auc.aspectj;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.UUID;
 
 @Component

bid/src/main/java/cn/hobbystocks/auc/handle/SkuSoldHandler.java

@@ -2,25 +2,19 @@ package cn.hobbystocks.auc.handle;
 
 import cn.hobbystocks.auc.app.AppClient;
 import cn.hobbystocks.auc.common.constant.Constants;
-import cn.hobbystocks.auc.common.utils.StringUtils;
-import cn.hobbystocks.auc.domain.Bid;
 import cn.hobbystocks.auc.domain.Order;
 import cn.hobbystocks.auc.event.SoldEvent;
 import cn.hobbystocks.auc.mapper.LotMapper;
 import cn.hobbystocks.auc.service.IOrderService;
 import cn.hobbystocks.auc.task.DynamicTaskService;
 import cn.hobbystocks.auc.vo.OrderVO;
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Sets;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 /**
  * 所有的拍品成交都会走这里，包含积分抢拍商品
  */

bid/src/main/java/cn/hobbystocks/auc/listener/LiveEndListener.java

@@ -5,22 +5,15 @@ import cn.hobbystocks.auc.common.constant.Constants;
 import cn.hobbystocks.auc.common.utils.DateUtils;
 import cn.hobbystocks.auc.domain.LotGroup;
 import cn.hobbystocks.auc.event.EndEvent;
-import cn.hobbystocks.auc.forest.CommonForestClient;
 import cn.hobbystocks.auc.handle.context.Live;
 import cn.hobbystocks.auc.service.ILotService;
 import cn.hobbystocks.auc.task.DynamicTaskService;
-import cn.hobbystocks.auc.vo.CardGroupLivesConfigVO;
-import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
 
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Objects;
 
 /**

bid/src/main/java/cn/hobbystocks/auc/listener/SoldListener.java

@@ -1,11 +1,9 @@
 package cn.hobbystocks.auc.listener;
 
-import cn.hobbystocks.auc.common.utils.StringUtils;
 import cn.hobbystocks.auc.domain.Lot;
 import cn.hobbystocks.auc.domain.SoldOrderRecord;
 import cn.hobbystocks.auc.event.SoldEvent;
 import cn.hobbystocks.auc.handle.SoldHandlerHolder;
-import cn.hobbystocks.auc.mapper.LotGroupMapper;
 import cn.hobbystocks.auc.mapper.LotMapper;
 import cn.hobbystocks.auc.mapper.SoldOrderRecordMapper;
 import lombok.extern.slf4j.Slf4j;

bid/src/main/java/cn/hobbystocks/auc/web/InController.java

@@ -1,6 +1,5 @@
 package cn.hobbystocks.auc.web;
 
-import cn.hobbystocks.auc.common.constant.Constants;
 import cn.hobbystocks.auc.common.core.domain.AjaxResult;
 import cn.hobbystocks.auc.domain.Lot;
 import cn.hobbystocks.auc.domain.LotGroup;

bid/src/main/java/cn/hobbystocks/auc/web/LocalController.java

@@ -1,24 +1,18 @@
 package cn.hobbystocks.auc.web;
 
-import cn.hobbystocks.auc.common.constant.Constants;
 import cn.hobbystocks.auc.common.core.domain.AjaxResult;
 import cn.hobbystocks.auc.domain.Bid;
 import cn.hobbystocks.auc.domain.Lot;
 import cn.hobbystocks.auc.domain.LotGroup;
 import cn.hobbystocks.auc.domain.Order;
-import cn.hobbystocks.auc.dto.LotDTO;
-import cn.hobbystocks.auc.handle.context.tradition.TraditionRule;
 import cn.hobbystocks.auc.service.IBidService;
 import cn.hobbystocks.auc.service.ILotService;
 import cn.hobbystocks.auc.service.IOrderService;
-import cn.hobbystocks.auc.vo.LotGroupDTO;
 import cn.hobbystocks.auc.vo.LotGroupVO;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Lists;
-import io.swagger.annotations.*;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;

bid/src/main/java/cn/hobbystocks/auc/web/LotFansController.java

@@ -5,8 +5,8 @@ import cn.hobbystocks.auc.common.user.UserUtils;
 import cn.hobbystocks.auc.domain.LotFans;
 import cn.hobbystocks.auc.request.LotFansTogglePageRequest;
 import cn.hobbystocks.auc.request.LotFansToggleRequest;
-import cn.hobbystocks.auc.response.LotFansResponse;
 import cn.hobbystocks.auc.response.FavoriteOperationResponse;
+import cn.hobbystocks.auc.response.LotFansResponse;
 import cn.hobbystocks.auc.service.LotFansService;
 import cn.hobbystocks.auc.vo.FansVO;
 import io.swagger.annotations.Api;
@@ -14,7 +14,10 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 

bid/src/main/java/cn/hobbystocks/auc/web/LotNoticeController.java

@@ -1,19 +1,21 @@
 package cn.hobbystocks.auc.web;
 
+import cn.hobbystocks.auc.common.core.controller.BaseController;
 import cn.hobbystocks.auc.common.core.domain.AjaxResult;
 import cn.hobbystocks.auc.domain.LotNotice;
 import cn.hobbystocks.auc.service.LotNoticeService;
 import cn.hobbystocks.auc.vo.LotNoticeVO;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @Api(tags = "拍卖公告")
 @RequestMapping("/lot/notice")
-public class LotNoticeController {
+public class LotNoticeController extends BaseController {
 
     @Autowired
     LotNoticeService lotNoticeService;
@@ -21,8 +23,9 @@ public class LotNoticeController {
     @PostMapping("/list")
     @ApiOperation(value = "拍卖公告查询",notes = "根据拍卖类型分页查询拍卖公告")
     public AjaxResult getNoticeByType(@RequestBody LotNotice lotNotice){
-        Page<LotNoticeVO> lotNoticePage = lotNoticeService.selectLotNoticeByType(lotNotice);
-        return AjaxResult.success(lotNoticePage);
+        startPage(lotNotice);
+        List<LotNoticeVO> lotNoticePage = lotNoticeService.selectLotNoticeByType(lotNotice);
+        return AjaxResult.successPage(lotNoticePage);
     }
 
     @GetMapping("detail/{id}")

bid/src/main/java/cn/hobbystocks/auc/web/SelfController.java

@@ -8,7 +8,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/bid/self")

bid/src/main/java/cn/hobbystocks/auc/web/ShippingBiddingController.java

@@ -3,30 +3,21 @@ package cn.hobbystocks.auc.web;
 import cn.hobbystocks.auc.annotation.RequireRoles;
 import cn.hobbystocks.auc.app.AppClient;
 import cn.hobbystocks.auc.common.core.domain.AjaxResult;
-import cn.hobbystocks.auc.common.user.UserUtils;
 import cn.hobbystocks.auc.common.utils.PageUtils;
-import cn.hobbystocks.auc.common.utils.StringUtils;
 import cn.hobbystocks.auc.common.utils.UserType;
 import cn.hobbystocks.auc.domain.LotGroup;
 import cn.hobbystocks.auc.service.ILotService;
-import cn.hobbystocks.auc.vo.CardGroupLivesConfigVO;
-import cn.hobbystocks.auc.vo.LivingExplainDTO;
 import cn.hobbystocks.auc.vo.LotGroupVO;
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Maps;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RestTemplate;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 
 @RestController
 @RequestMapping("/bid/bidding/shipping")

lot/src/main/java/cn/hobbystocks/auc/common/config/FastJson2JsonRedisSerializer.java

@@ -1,19 +1,20 @@
 package cn.hobbystocks.auc.common.config;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.parser.ParserConfig;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.SerializationException;
-import com.alibaba.fastjson.parser.ParserConfig;
 import org.springframework.util.Assert;
+
 import java.nio.charset.Charset;
 
 /**
  * Redis使用FastJson序列化
- * 
+ *
  * @author ruoyi
  */
 public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>

lot/src/main/java/cn/hobbystocks/auc/common/config/RedisConfig.java

@@ -1,5 +1,10 @@
 package cn.hobbystocks.auc.common.config;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
 import io.lettuce.core.ClientOptions;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.springframework.beans.factory.annotation.Value;
@@ -16,11 +21,6 @@ import org.springframework.data.redis.connection.lettuce.LettucePoolingClientCon
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
 
 /**
  * redis配置

lot/src/main/java/cn/hobbystocks/auc/common/config/SwaggerConfig.java

@@ -1,13 +1,11 @@
 package cn.hobbystocks.auc.common.config;
 
-import java.util.ArrayList;
-import java.util.List;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
 import org.springframework.core.Ordered;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
@@ -15,18 +13,17 @@ import org.springframework.web.filter.CorsFilter;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.ApiKey;
-import springfox.documentation.service.AuthorizationScope;
-import springfox.documentation.service.SecurityReference;
-import springfox.documentation.service.SecurityScheme;
+import springfox.documentation.service.*;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Swagger2的接口配置
- * 
+ *
  * @author ruoyi
  */
 @Configuration

lot/src/main/java/cn/hobbystocks/auc/common/core/controller/BaseController.java

@@ -1,22 +1,20 @@
 package cn.hobbystocks.auc.common.core.controller;
 
-import java.beans.PropertyEditorSupport;
-import java.util.Date;
-import java.util.Objects;
-
-
+import cn.hobbystocks.auc.common.core.domain.BaseEntity;
 import cn.hobbystocks.auc.common.core.page.PageDomain;
+import cn.hobbystocks.auc.common.core.page.TableSupport;
 import cn.hobbystocks.auc.common.user.UserUtils;
+import cn.hobbystocks.auc.common.utils.DateUtils;
 import cn.hobbystocks.auc.common.utils.PageUtils;
+import cn.hobbystocks.auc.common.utils.sql.SqlUtil;
+import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 
-import com.github.pagehelper.PageHelper;
-import cn.hobbystocks.auc.common.core.domain.BaseEntity;
-import cn.hobbystocks.auc.common.core.page.TableSupport;
-import cn.hobbystocks.auc.common.utils.DateUtils;
-import cn.hobbystocks.auc.common.utils.sql.SqlUtil;
+import java.beans.PropertyEditorSupport;
+import java.util.Date;
+import java.util.Objects;
 
 /**
  * web层通用数据处理

lot/src/main/java/cn/hobbystocks/auc/common/core/domain/AjaxResult.java

@@ -1,19 +1,17 @@
 package cn.hobbystocks.auc.common.core.domain;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
+import cn.hobbystocks.auc.common.constant.HttpStatus;
 import cn.hobbystocks.auc.common.utils.PaginationUtil;
-import cn.hobbystocks.auc.domain.Lot;
-import cn.hobbystocks.auc.domain.LotGroup;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageInfo;
-import cn.hobbystocks.auc.common.constant.HttpStatus;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * 操作消息提醒
- * 
+ *
  * @author ruoyi
  */
 public class AjaxResult extends HashMap<String, Object> {
@@ -49,7 +47,7 @@ public class AjaxResult extends HashMap<String, Object> {
 
 	/**
 	 * 初始化一个新创建的 AjaxResult 对象
-	 * 
+	 *
 	 * @param code 状态码
 	 * @param msg  返回内容
 	 */
@@ -61,7 +59,7 @@ public class AjaxResult extends HashMap<String, Object> {
 
 	/**
 	 * 初始化一个新创建的 AjaxResult 对象
-	 * 
+	 *
 	 * @param code 状态码
 	 * @param msg  返回内容
 	 * @param data 数据对象
@@ -85,7 +83,7 @@ public class AjaxResult extends HashMap<String, Object> {
 
 	/**
 	 * 返回成功消息
-	 * 
+	 *
 	 * @return 成功消息
 	 */
 	public static AjaxResult success() {
@@ -94,7 +92,7 @@ public class AjaxResult extends HashMap<String, Object> {
 
 	/**
 	 * 返回成功数据
-	 * 
+	 *
 	 * @return 成功消息
 	 */
 	public static AjaxResult success(Object data) {
@@ -103,7 +101,7 @@ public class AjaxResult extends HashMap<String, Object> {
 
 	/**
 	 * 返回成功消息
-	 * 
+	 *
 	 * @param msg 返回内容
 	 * @return 成功消息
 	 */
@@ -113,7 +111,7 @@ public class AjaxResult extends HashMap<String, Object> {
 
 	/**
 	 * 返回成功消息
-	 * 
+	 *
 	 * @param msg  返回内容
 	 * @param data 数据对象
 	 * @return 成功消息
@@ -129,7 +127,7 @@ public class AjaxResult extends HashMap<String, Object> {
 
 	/**
 	 * 返回错误消息
-	 * 
+	 *
 	 * @return
 	 */
 	public static AjaxResult error() {
@@ -138,7 +136,7 @@ public class AjaxResult extends HashMap<String, Object> {
 
 	/**
 	 * 返回错误消息
-	 * 
+	 *
 	 * @param msg 返回内容
 	 * @return 警告消息
 	 */
@@ -148,7 +146,7 @@ public class AjaxResult extends HashMap<String, Object> {
 
 	/**
 	 * 返回错误消息
-	 * 
+	 *
 	 * @param msg  返回内容
 	 * @param data 数据对象
 	 * @return 警告消息
@@ -159,7 +157,7 @@ public class AjaxResult extends HashMap<String, Object> {
 
 	/**
 	 * 返回错误消息
-	 * 
+	 *
 	 * @param code 状态码
 	 * @param msg  返回内容
 	 * @return 警告消息

lot/src/main/java/cn/hobbystocks/auc/common/core/domain/BaseEntity.java

@@ -1,17 +1,16 @@
 package cn.hobbystocks.auc.common.core.domain;
 
-import java.io.Serializable;
-import java.util.*;
-
 import cn.hobbystocks.auc.annotation.Sensitive;
 import cn.hobbystocks.auc.annotation.View;
 import cn.hobbystocks.auc.common.utils.sql.SqlUtil;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+import java.util.*;
+
 /**
  * Entity基类
  *

lot/src/main/java/cn/hobbystocks/auc/common/core/domain/entity/SysDept.java

@@ -1,15 +1,15 @@
 package cn.hobbystocks.auc.common.core.domain.entity;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import cn.hobbystocks.auc.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 部门表 sys_dept
- * 
+ *
  * @author ruoyi
  */
 public class SysDept extends BaseEntity
@@ -48,7 +48,7 @@ public class SysDept extends BaseEntity
 
     /** 父部门名称 */
     private String parentName;
-    
+
     /** 子部门 */
     private List<SysDept> children = new ArrayList<SysDept>();
 

lot/src/main/java/cn/hobbystocks/auc/common/core/domain/entity/SysRole.java

@@ -1,13 +1,12 @@
 package cn.hobbystocks.auc.common.core.domain.entity;
 
+import cn.hobbystocks.auc.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import cn.hobbystocks.auc.common.core.domain.BaseEntity;
-
 /**
  * 角色表 sys_role
- * 
+ *
  * @author ruoyi
  */
 public class SysRole extends BaseEntity
@@ -200,7 +199,7 @@ public class SysRole extends BaseEntity
     {
         this.deptIds = deptIds;
     }
-    
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

lot/src/main/java/cn/hobbystocks/auc/common/core/domain/entity/SysUser.java

@@ -1,17 +1,17 @@
 package cn.hobbystocks.auc.common.core.domain.entity;
 
-import java.util.Date;
-import java.util.List;
-
 import cn.hobbystocks.auc.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 用户对象 sys_user
- * 
+ *
  * @author ruoyi
  */
 public class SysUser extends BaseEntity
@@ -25,7 +25,7 @@ public class SysUser extends BaseEntity
     /** 部门ID */
 //    @Excel(name = "部门编号", type = Type.IMPORT)
     private String deptId;
-    
+
     private String deptKey;
 
     /** 用户账号 */

lot/src/main/java/cn/hobbystocks/auc/common/core/domain/model/LoginUser.java

@@ -1,16 +1,16 @@
 package cn.hobbystocks.auc.common.core.domain.model;
 
-import java.util.Collection;
-import java.util.Set;
-
 import cn.hobbystocks.auc.common.core.domain.entity.SysUser;
+import com.alibaba.fastjson.annotation.JSONField;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
-import com.alibaba.fastjson.annotation.JSONField;
+
+import java.util.Collection;
+import java.util.Set;
 
 /**
  * 登录用户身份权限
- * 
+ *
  * @author ruoyi
  */
 public class LoginUser implements UserDetails {
@@ -145,7 +145,7 @@ public class LoginUser implements UserDetails {
 
 	/**
 	 * 指定用户是否解锁,锁定的用户无法进行身份验证
-	 * 
+	 *
 	 * @return
 	 */
 	@JSONField(serialize = false)
@@ -156,7 +156,7 @@ public class LoginUser implements UserDetails {
 
 	/**
 	 * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
-	 * 
+	 *
 	 * @return
 	 */
 	@JSONField(serialize = false)
@@ -167,7 +167,7 @@ public class LoginUser implements UserDetails {
 
 	/**
 	 * 是否可用 ,禁用的用户不能身份验证
-	 * 
+	 *
 	 * @return
 	 */
 	@JSONField(serialize = false)

lot/src/main/java/cn/hobbystocks/auc/common/core/page/TableDataInfo.java

@@ -1,13 +1,13 @@
 package cn.hobbystocks.auc.common.core.page;
 
+import cn.hobbystocks.auc.common.constant.HttpStatus;
+
 import java.io.Serializable;
 import java.util.List;
 
-import cn.hobbystocks.auc.common.constant.HttpStatus;
-
 /**
  * 表格分页数据对象
- * 
+ *
  * @author ruoyi
  */
 public class TableDataInfo implements Serializable {
@@ -33,7 +33,7 @@ public class TableDataInfo implements Serializable {
 
 	/**
 	 * 分页
-	 * 
+	 *
 	 * @param list  列表数据
 	 * @param total 总记录数
 	 */

lot/src/main/java/cn/hobbystocks/auc/common/core/redis/RedisCache.java

@@ -1,13 +1,5 @@
 package cn.hobbystocks.auc.common.core.redis;
 
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 import cn.hobbystocks.auc.handle.context.Live;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.BoundSetOperations;
@@ -16,6 +8,9 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Component;
 
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
 /**
  * spring redis 工具类
  *

lot/src/main/java/cn/hobbystocks/auc/common/core/text/Convert.java

@@ -1,5 +1,8 @@
 package cn.hobbystocks.auc.common.core.text;
 
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
@@ -7,9 +10,6 @@ import java.nio.charset.Charset;
 import java.text.NumberFormat;
 import java.util.Set;
 
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-
 
 /**
  * 类型转换器

lot/src/main/java/cn/hobbystocks/auc/common/easy/factory/EasyExcelFactory.java

@@ -18,10 +18,8 @@ import org.apache.commons.collections4.list.TreeList;
 
 import javax.servlet.ServletOutputStream;
 import java.io.File;
-import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.nio.file.Files;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;

lot/src/main/java/cn/hobbystocks/auc/common/enums/LotStatusEnum.java

@@ -1,6 +1,5 @@
 package cn.hobbystocks.auc.common.enums;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
 

lot/src/main/java/cn/hobbystocks/auc/common/enums/PubStatusEnum.java

@@ -1,7 +1,6 @@
 package cn.hobbystocks.auc.common.enums;
 
 import lombok.Getter;
-import org.apache.commons.lang3.StringUtils;
 
 /**
  * 拍卖状态

lot/src/main/java/cn/hobbystocks/auc/common/exception/GlobalExceptionHandler.java

@@ -1,8 +1,5 @@
 package cn.hobbystocks.auc.common.exception;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.ValidationException;
-
 import cn.hobbystocks.auc.common.core.domain.AjaxResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,11 +9,13 @@ import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.ValidationException;
 import java.util.Objects;
 
 /**
  * 全局异常处理器
- * 
+ *
  * @author ruoyi
  */
 @RestControllerAdvice

lot/src/main/java/cn/hobbystocks/auc/common/filter/AuthenticationFilter.java

@@ -1,14 +1,5 @@
 package cn.hobbystocks.auc.common.filter;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Objects;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import cn.hobbystocks.auc.common.user.UserInfo;
 import cn.hobbystocks.auc.common.user.UserUtils;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -17,6 +8,14 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Objects;
+
 
 /**
  * 过滤器 获取用户权限

lot/src/main/java/cn/hobbystocks/auc/common/poi/ExcelUtil.java

@@ -1,30 +1,20 @@
 package cn.hobbystocks.auc.common.poi;
 
 
-import cn.hobbystocks.auc.common.core.text.Convert;
-import cn.hobbystocks.auc.common.utils.*;
-import cn.hobbystocks.auc.common.utils.reflect.ReflectUtils;
+import cn.hobbystocks.auc.common.utils.Excel;
+import cn.hobbystocks.auc.common.utils.Excels;
 import cn.hobbystocks.auc.dto.ExportFieldDto;
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFDataValidation;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Excel相关处理

lot/src/main/java/cn/hobbystocks/auc/common/user/UserUtils.java

@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
-import java.util.Enumeration;
 import java.util.Objects;
 
 /**

lot/src/main/java/cn/hobbystocks/auc/common/utils/CloneUtils.java

@@ -1,6 +1,5 @@
 package cn.hobbystocks.auc.common.utils;
 
-import cn.hutool.core.util.ObjectUtil;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.ByteArrayInputStream;

lot/src/main/java/cn/hobbystocks/auc/common/utils/DateUtils.java

@@ -1,5 +1,7 @@
 package cn.hobbystocks.auc.common.utils;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -7,7 +9,6 @@ import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.Date;
-import org.apache.commons.lang3.time.DateFormatUtils;
 
 /**
  * 时间工具类

lot/src/main/java/cn/hobbystocks/auc/common/utils/ExcelUtils.java

@@ -1,6 +1,5 @@
 package cn.hobbystocks.auc.common.utils;
 
-import com.google.common.net.HttpHeaders;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddressList;
@@ -14,7 +13,6 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
 

lot/src/main/java/cn/hobbystocks/auc/common/utils/HttpUtils.java

@@ -1,5 +1,6 @@
 package cn.hobbystocks.auc.common.utils;
 
+import com.alibaba.fastjson.JSONObject;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
@@ -11,12 +12,10 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.LoggerFactory;
 
-import com.alibaba.fastjson.JSONObject;
-
 public class HttpUtils {
 
 	/**
-	 * 
+	 *
 	 * @param url
 	 * @param param
 	 */

lot/src/main/java/cn/hobbystocks/auc/common/utils/LotComparator.java

@@ -1,9 +1,9 @@
 package cn.hobbystocks.auc.common.utils;
 
-import java.util.Comparator;
-
 import cn.hobbystocks.auc.domain.Lot;
 
+import java.util.Comparator;
+
 public class LotComparator implements Comparator<Lot> {
 
 	@Override

lot/src/main/java/cn/hobbystocks/auc/common/utils/PageUtils.java

@@ -1,14 +1,14 @@
 package cn.hobbystocks.auc.common.utils;
 
-import com.github.pagehelper.PageHelper;
 import cn.hobbystocks.auc.common.core.domain.BaseEntity;
 import cn.hobbystocks.auc.common.utils.sql.SqlUtil;
+import com.github.pagehelper.PageHelper;
 
 import java.util.Objects;
 
 /**
  * 分页工具类
- * 
+ *
  * @author ruoyi
  */
 public class PageUtils extends PageHelper {

lot/src/main/java/cn/hobbystocks/auc/common/utils/ServletUtils.java

@@ -1,19 +1,19 @@
 package cn.hobbystocks.auc.common.utils;
 
-import java.io.IOException;
-import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import cn.hobbystocks.auc.common.core.text.Convert;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import cn.hobbystocks.auc.common.core.text.Convert;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.util.Objects;
 
 /**
  * 客户端工具类
- * 
+ *
  * @author ruoyi
  */
 public class ServletUtils
@@ -100,7 +100,7 @@ public class ServletUtils
 
     /**
      * 将字符串渲染到客户端
-     * 
+     *
      * @param response 渲染对象
      * @param string 待渲染的字符串
      */

lot/src/main/java/cn/hobbystocks/auc/common/utils/reflect/ReflectUtils.java

@@ -1,21 +1,15 @@
 package cn.hobbystocks.auc.common.utils.reflect;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Date;
-
 import cn.hobbystocks.auc.common.core.text.Convert;
 import cn.hobbystocks.auc.common.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.*;
+import java.util.Date;
+
 /**
  * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
  *

lot/src/main/java/cn/hobbystocks/auc/convert/SpuCategoryConvert.java

@@ -1,9 +1,7 @@
 package cn.hobbystocks.auc.convert;
 
 
-import cn.hobbystocks.auc.domain.DiamondPosition;
 import cn.hobbystocks.auc.domain.SpuCategory;
-import cn.hobbystocks.auc.response.DiamondPositionResponse;
 import cn.hobbystocks.auc.response.SpuChildCategoryResponse;
 import cn.hobbystocks.auc.response.SpuMainCategoryResponse;
 import org.mapstruct.Mapper;

lot/src/main/java/cn/hobbystocks/auc/domain/Auction.java

@@ -1,8 +1,5 @@
 package cn.hobbystocks.auc.domain;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 import cn.hobbystocks.auc.common.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -14,6 +11,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ToString

lot/src/main/java/cn/hobbystocks/auc/domain/DiamondPosition.java

@@ -1,21 +1,10 @@
 package cn.hobbystocks.auc.domain;
 
 
-import cn.hobbystocks.auc.annotation.Sensitive;
-import cn.hobbystocks.auc.annotation.View;
-import cn.hobbystocks.auc.common.core.domain.BaseEntity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * 金刚位管理表

lot/src/main/java/cn/hobbystocks/auc/domain/Lot.java

@@ -1,17 +1,12 @@
 package cn.hobbystocks.auc.domain;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
 import cn.hobbystocks.auc.annotation.Sensitive;
 import cn.hobbystocks.auc.annotation.View;
+import cn.hobbystocks.auc.common.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import cn.hobbystocks.auc.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -19,6 +14,9 @@ import nonapi.io.github.classgraph.json.Id;
 import org.apache.ibatis.type.Alias;
 
 import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 @Data
 @ToString

lot/src/main/java/cn/hobbystocks/auc/domain/LotFansPushRecord.java

@@ -1,12 +1,8 @@
 package cn.hobbystocks.auc.domain;
 
 import cn.hobbystocks.auc.common.core.domain.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.*;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 @Data
 @ToString
 @Builder

lot/src/main/java/cn/hobbystocks/auc/domain/SpuCategory.java

@@ -1,15 +1,10 @@
 package cn.hobbystocks.auc.domain;
 
-import cn.hobbystocks.auc.annotation.Sensitive;
-import cn.hobbystocks.auc.annotation.View;
-import cn.hobbystocks.auc.common.core.domain.BaseEntity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Locale;
 
 @Data
 @NoArgsConstructor

lot/src/main/java/cn/hobbystocks/auc/dto/LotExportDTO.java

@@ -1,19 +1,10 @@
 package cn.hobbystocks.auc.dto;
 
-import cn.hobbystocks.auc.annotation.Sensitive;
-import cn.hobbystocks.auc.annotation.View;
 import cn.hobbystocks.auc.common.utils.Excel;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-
 @Data
 public class LotExportDTO {
 

lot/src/main/java/cn/hobbystocks/auc/event/EventPublisher.java

@@ -4,7 +4,6 @@ import cn.hobbystocks.auc.domain.Bid;
 import cn.hobbystocks.auc.handle.context.Live;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

lot/src/main/java/cn/hobbystocks/auc/event/SoldEvent.java

@@ -6,7 +6,6 @@ import cn.hobbystocks.auc.domain.Lot;
 import cn.hobbystocks.auc.handle.context.Live;
 import lombok.Data;
 
-import java.util.Date;
 import java.util.List;
 
 @Data

lot/src/main/java/cn/hobbystocks/auc/handle/RuleHandlerHolder.java

@@ -2,9 +2,7 @@ package cn.hobbystocks.auc.handle;
 
 import cn.hobbystocks.auc.domain.Lot;
 import cn.hobbystocks.auc.handle.context.Live;
-import cn.hobbystocks.auc.domain.Bid;
 import cn.hobbystocks.auc.handle.context.LiveContext;
-import cn.hobbystocks.auc.handle.impl.tradition.TraditionRuleHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

lot/src/main/java/cn/hobbystocks/auc/handle/context/tradition/TraditionLive.java

@@ -1,12 +1,10 @@
 package cn.hobbystocks.auc.handle.context.tradition;
 
 import cn.hobbystocks.auc.annotation.View;
-import cn.hobbystocks.auc.domain.Bid;
 import cn.hobbystocks.auc.domain.Lot;
 import cn.hobbystocks.auc.handle.context.Live;
 import lombok.Data;
 
-
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;

lot/src/main/java/cn/hobbystocks/auc/handle/context/tradition/TraditionRule.java

@@ -4,7 +4,6 @@ import cn.hobbystocks.auc.annotation.View;
 import cn.hobbystocks.auc.handle.context.Rule;
 import lombok.Data;
 
-
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;

lot/src/main/java/cn/hobbystocks/auc/handle/impl/tradition/AbstractTraditionRuleHandler.java

@@ -13,7 +13,6 @@ import cn.hobbystocks.auc.handle.context.tradition.TraditionRule;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;

lot/src/main/java/cn/hobbystocks/auc/mapper/AuctionMapper.java

@@ -3,7 +3,6 @@ package cn.hobbystocks.auc.mapper;
 
 import cn.hobbystocks.auc.domain.Auction;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

lot/src/main/java/cn/hobbystocks/auc/mapper/DiamondPositionMapper.java

@@ -3,7 +3,6 @@ package cn.hobbystocks.auc.mapper;
 import cn.hobbystocks.auc.domain.DiamondPosition;
 import cn.hobbystocks.auc.request.DiamondPositionPageRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

lot/src/main/java/cn/hobbystocks/auc/mapper/LotGroupMapper.java

@@ -1,7 +1,6 @@
 package cn.hobbystocks.auc.mapper;
 
 import cn.hobbystocks.auc.domain.LotGroup;
-import cn.hobbystocks.auc.vo.LotGroupVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

lot/src/main/java/cn/hobbystocks/auc/mapper/LotMapper.java

@@ -1,8 +1,6 @@
 package cn.hobbystocks.auc.mapper;
 
 import cn.hobbystocks.auc.domain.Lot;
-import cn.hobbystocks.auc.domain.LotGroup;
-import cn.hobbystocks.auc.vo.LotVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;

lot/src/main/java/cn/hobbystocks/auc/mapper/LotNoticeMapper.java

@@ -3,13 +3,14 @@ package cn.hobbystocks.auc.mapper;
 import cn.hobbystocks.auc.domain.LotNotice;
 import cn.hobbystocks.auc.vo.LotNoticeVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface LotNoticeMapper extends BaseMapper<LotNotice> {
 
     //根据分类查询拍卖公告列表
-    Page<LotNoticeVO>  selectNoticeByType(Page<LotNoticeVO> page, @Param("type") String type);
+    List<LotNoticeVO> selectNoticeByType(@Param("type") String type);
 
 
 

lot/src/main/java/cn/hobbystocks/auc/mapper/SpuCategoryMapper.java

@@ -1,10 +1,6 @@
 package cn.hobbystocks.auc.mapper;
 
-import cn.hobbystocks.auc.domain.DiamondPosition;
 import cn.hobbystocks.auc.domain.SpuCategory;
-import cn.hobbystocks.auc.request.DiamondPositionPageRequest;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

lot/src/main/java/cn/hobbystocks/auc/request/DiamondPositionPageRequest.java

@@ -1,15 +1,10 @@
 package cn.hobbystocks.auc.request;
 
 import cn.hobbystocks.auc.common.core.domain.BaseEntity;
-import cn.hobbystocks.auc.domain.Lot;
-import cn.hobbystocks.auc.vo.InData;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 @ApiModel("金刚位分页对象")
 public class DiamondPositionPageRequest extends BaseEntity{

lot/src/main/java/cn/hobbystocks/auc/request/DiamondPositionSaveRequest.java

@@ -5,9 +5,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-
 @Data
 @ApiModel("金刚位创建/更新请求对象")
 public class DiamondPositionSaveRequest {

lot/src/main/java/cn/hobbystocks/auc/request/LotFansTogglePageRequest.java

@@ -2,11 +2,7 @@ package cn.hobbystocks.auc.request;
 
 import cn.hobbystocks.auc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 @Data
 @ApiModel("收藏拍品请求对象")

lot/src/main/java/cn/hobbystocks/auc/request/LotQueryRequest.java

@@ -1,23 +1,14 @@
 package cn.hobbystocks.auc.request;
 
-import cn.hobbystocks.auc.annotation.Sensitive;
-import cn.hobbystocks.auc.annotation.View;
 import cn.hobbystocks.auc.common.core.domain.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-import nonapi.io.github.classgraph.json.Id;
-import org.apache.ibatis.type.Alias;
-import org.springframework.web.bind.annotation.RequestParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-import java.math.BigDecimal;
 import java.util.Date;
 
 @Data

lot/src/main/java/cn/hobbystocks/auc/response/DiamondPositionResponse.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 @Data
 @ApiModel("金刚位响应对象")

lot/src/main/java/cn/hobbystocks/auc/response/LotFansResponse.java

@@ -1,6 +1,5 @@
 package cn.hobbystocks.auc.response;
 
-import cn.hobbystocks.auc.annotation.View;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,7 +8,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 @Data

lot/src/main/java/cn/hobbystocks/auc/response/SpuChildCategoryResponse.java

@@ -1,12 +1,9 @@
 package cn.hobbystocks.auc.response;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-
 @Data
 @ApiModel("子分类VO")
 public class SpuChildCategoryResponse {

lot/src/main/java/cn/hobbystocks/auc/response/SpuMainCategoryResponse.java

@@ -1,11 +1,9 @@
 package cn.hobbystocks.auc.response;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Data

lot/src/main/java/cn/hobbystocks/auc/service/DepositOrderService.java

@@ -1,8 +1,8 @@
 package cn.hobbystocks.auc.service;
 
 import cn.hobbystocks.auc.domain.DepositOrder;
-import cn.hobbystocks.auc.dto.DepositRecordDTO;
 import cn.hobbystocks.auc.dto.DepositOrderDTO;
+import cn.hobbystocks.auc.dto.DepositRecordDTO;
 import cn.hobbystocks.auc.request.DepositRecordRequest;
 import com.baomidou.mybatisplus.extension.service.IService;
 

lot/src/main/java/cn/hobbystocks/auc/service/IDiamondPositionService.java

@@ -4,7 +4,6 @@ import cn.hobbystocks.auc.domain.DiamondPosition;
 import cn.hobbystocks.auc.request.DiamondPositionPageRequest;
 import cn.hobbystocks.auc.request.DiamondPositionSaveRequest;
 import cn.hobbystocks.auc.response.DiamondPositionResponse;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;

lot/src/main/java/cn/hobbystocks/auc/service/LotNoticeService.java

@@ -2,7 +2,6 @@ package cn.hobbystocks.auc.service;
 
 import cn.hobbystocks.auc.domain.LotNotice;
 import cn.hobbystocks.auc.vo.LotNoticeVO;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -29,5 +28,5 @@ public interface LotNoticeService extends IService<LotNotice> {
      */
     int pubLotNotice(LotNotice lotNotice);
 
-    Page<LotNoticeVO> selectLotNoticeByType(LotNotice lotNotice);
+    List<LotNoticeVO> selectLotNoticeByType(LotNotice lotNotice);
 }

lot/src/main/java/cn/hobbystocks/auc/service/SpuCategoryService.java

@@ -1,13 +1,7 @@
 package cn.hobbystocks.auc.service;
 
-import cn.hobbystocks.auc.domain.DiamondPosition;
-import cn.hobbystocks.auc.domain.SpuCategory;
 import cn.hobbystocks.auc.request.CategoryQueryRequest;
-import cn.hobbystocks.auc.request.DiamondPositionPageRequest;
-import cn.hobbystocks.auc.request.DiamondPositionSaveRequest;
-import cn.hobbystocks.auc.response.DiamondPositionResponse;
 import cn.hobbystocks.auc.response.SpuMainCategoryResponse;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 

lot/src/main/java/cn/hobbystocks/auc/service/impl/AddressServiceImpl.java

@@ -2,7 +2,6 @@ package cn.hobbystocks.auc.service.impl;
 
 import cn.hobbystocks.auc.dto.ShippingAddressDto;
 import cn.hobbystocks.auc.mapper.AddressMapper;
-
 import cn.hobbystocks.auc.service.AddressService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;

lot/src/main/java/cn/hobbystocks/auc/service/impl/AuctionServiceImpl.java

@@ -1,18 +1,16 @@
 package cn.hobbystocks.auc.service.impl;
 
 import cn.hobbystocks.auc.cache.CacheMap;
-import cn.hobbystocks.auc.domain.Lot;
-import cn.hobbystocks.auc.service.ILotService;
 import cn.hobbystocks.auc.common.constant.Constants;
 import cn.hobbystocks.auc.common.core.redis.RedisCache;
 import cn.hobbystocks.auc.common.core.text.Convert;
 import cn.hobbystocks.auc.common.utils.DateUtils;
 import cn.hobbystocks.auc.domain.Auction;
+import cn.hobbystocks.auc.domain.Lot;
 import cn.hobbystocks.auc.mapper.AuctionMapper;
 import cn.hobbystocks.auc.service.IAuctionService;
+import cn.hobbystocks.auc.service.ILotService;
 import cn.hobbystocks.auc.vo.AuctionVO;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

lot/src/main/java/cn/hobbystocks/auc/service/impl/DepositOrderServiceImpl.java

@@ -4,8 +4,8 @@ import cn.hobbystocks.auc.common.exception.ServiceException;
 import cn.hobbystocks.auc.domain.Auction;
 import cn.hobbystocks.auc.domain.DepositOrder;
 import cn.hobbystocks.auc.domain.Lot;
-import cn.hobbystocks.auc.dto.DepositRecordDTO;
 import cn.hobbystocks.auc.dto.DepositOrderDTO;
+import cn.hobbystocks.auc.dto.DepositRecordDTO;
 import cn.hobbystocks.auc.forest.OrderApi;
 import cn.hobbystocks.auc.mapper.DepositOrderMapper;
 import cn.hobbystocks.auc.request.DepositRecordRequest;

lot/src/main/java/cn/hobbystocks/auc/service/impl/DiamondPositionServiceImpl.java

@@ -1,23 +1,16 @@
 package cn.hobbystocks.auc.service.impl;
 
-import cn.hobbystocks.auc.common.constant.Constants;
-import cn.hobbystocks.auc.common.core.domain.AjaxResult;
 import cn.hobbystocks.auc.common.utils.DateUtils;
 import cn.hobbystocks.auc.convert.DiamondPositionConvert;
 import cn.hobbystocks.auc.domain.DiamondPosition;
-import cn.hobbystocks.auc.domain.Lot;
 import cn.hobbystocks.auc.mapper.DiamondPositionMapper;
 import cn.hobbystocks.auc.request.DiamondPositionPageRequest;
 import cn.hobbystocks.auc.request.DiamondPositionSaveRequest;
 import cn.hobbystocks.auc.response.DiamondPositionResponse;
 import cn.hobbystocks.auc.service.IDiamondPositionService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.collect.Lists;
+import com.github.pagehelper.Page;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -44,6 +37,13 @@ public class DiamondPositionServiceImpl extends ServiceImpl<DiamondPositionMappe
 //        IPage<DiamondPosition> diamondPositionIPage =new Page<>(request.getPageNum(),request.getPageSize());
         List<DiamondPosition> diamondPositions = diamondPositionMapper.selectDiamondPositionList(request);
         List<DiamondPositionResponse> collect = diamondPositions.stream().map(DiamondPositionConvert.INSTANCE::toDiamondPositionResponse).collect(Collectors.toList());
+        if (diamondPositions instanceof Page) {
+            Page<DiamondPosition> sourcePage = (Page<DiamondPosition>) diamondPositions;
+            Page<DiamondPositionResponse> responsePage = new Page<>(sourcePage.getPageNum(), sourcePage.getPageSize());
+            responsePage.setTotal(sourcePage.getTotal());
+            responsePage.addAll(collect);
+            return responsePage;
+        }
         return collect;
     }
 

lot/src/main/java/cn/hobbystocks/auc/service/impl/LotFansServiceImpl.java

@@ -28,7 +28,6 @@ import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;

lot/src/main/java/cn/hobbystocks/auc/service/impl/LotNoticeServiceImpl.java

@@ -7,7 +7,6 @@ import cn.hobbystocks.auc.service.LotNoticeService;
 import cn.hobbystocks.auc.vo.LotNoticeVO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -41,8 +40,8 @@ public class LotNoticeServiceImpl extends ServiceImpl<LotNoticeMapper, LotNotice
     }
 
     @Override
-    public Page<LotNoticeVO> selectLotNoticeByType(LotNotice lotNotice) {
-        Page<LotNoticeVO> lotNoticePage = new Page<>(lotNotice.getPageNum(), lotNotice.getPageSize());
-        return getBaseMapper().selectNoticeByType(lotNoticePage,lotNotice.getType());
+    public List<LotNoticeVO> selectLotNoticeByType(LotNotice lotNotice) {
+//        Page<LotNoticeVO> lotNoticePage = new Page<>(lotNotice.getPageNum(), lotNotice.getPageSize());
+        return getBaseMapper().selectNoticeByType(lotNotice.getType());
     }
 }

lot/src/main/java/cn/hobbystocks/auc/service/impl/LotServiceImpl.java

@@ -11,11 +11,7 @@ import cn.hobbystocks.auc.common.enums.RuleTypeEnum;
 import cn.hobbystocks.auc.common.exception.ServiceException;
 import cn.hobbystocks.auc.common.user.UserInfo;
 import cn.hobbystocks.auc.common.user.UserUtils;
-import cn.hobbystocks.auc.common.utils.CloneUtils;
-import cn.hobbystocks.auc.common.utils.DateUtils;
-import cn.hobbystocks.auc.common.utils.PageUtils;
-import cn.hobbystocks.auc.common.utils.SensitiveDataUtils;
-import cn.hobbystocks.auc.common.utils.StringUtils;
+import cn.hobbystocks.auc.common.utils.*;
 import cn.hobbystocks.auc.convert.LotConvert;
 import cn.hobbystocks.auc.domain.*;
 import cn.hobbystocks.auc.dto.LotExportDTO;

lot/src/main/java/cn/hobbystocks/auc/service/impl/SpuCategoryServiceImpl.java

@@ -1,34 +1,23 @@
 package cn.hobbystocks.auc.service.impl;
 
-import cn.hobbystocks.auc.common.utils.DateUtils;
-import cn.hobbystocks.auc.convert.DiamondPositionConvert;
 import cn.hobbystocks.auc.convert.SpuCategoryConvert;
-import cn.hobbystocks.auc.domain.DiamondPosition;
 import cn.hobbystocks.auc.domain.SpuCategory;
 import cn.hobbystocks.auc.mapper.DiamondPositionMapper;
 import cn.hobbystocks.auc.mapper.SpuCategoryMapper;
 import cn.hobbystocks.auc.request.CategoryQueryRequest;
-import cn.hobbystocks.auc.request.DiamondPositionPageRequest;
-import cn.hobbystocks.auc.request.DiamondPositionSaveRequest;
-import cn.hobbystocks.auc.response.DiamondPositionResponse;
 import cn.hobbystocks.auc.response.SpuChildCategoryResponse;
 import cn.hobbystocks.auc.response.SpuMainCategoryResponse;
-import cn.hobbystocks.auc.service.IDiamondPositionService;
 import cn.hobbystocks.auc.service.SpuCategoryService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Service
 @Slf4j

lot/src/main/java/cn/hobbystocks/auc/vo/LiveVO.java

@@ -4,7 +4,6 @@ import cn.hobbystocks.auc.domain.Bid;
 import cn.hobbystocks.auc.handle.context.Live;
 import cn.hobbystocks.auc.handle.context.tradition.TraditionLive;
 import lombok.Data;
-
 import org.springframework.beans.BeanUtils;
 
 import java.util.ArrayList;

lot/src/main/java/cn/hobbystocks/auc/vo/LotVO.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 
-
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;