From 37acc6ebaeba63b075cae0b2523f16e63076f996 Mon Sep 17 00:00:00 2001 From: sj <1304317391@qq.com> Date: Tue, 27 Sep 2022 16:50:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=95=86=E5=93=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/YxEvaluationQueryParam.java | 18 ++++++++++ .../rest/AppStoreEvaluationController.java | 3 +- .../expert/rest/AppStoreExpertController.java | 4 +-- .../product/rest/AppStoreBrandController.java | 2 +- .../yixiang/common/web/param/QueryParam.java | 12 +++---- .../service/YxEvaluationService.java | 2 +- .../service/impl/YxEvaluationServiceImpl.java | 5 +-- .../expert/service/YxStoreExpertService.java | 2 +- .../impl/YxStoreExpertServiceImpl.java | 5 +-- .../store/service/YxStoreBrandService.java | 5 ++- .../service/impl/YxStoreBrandServiceImpl.java | 6 +--- .../utils/{location => }/BrandDTO.java | 7 ++-- .../utils/{location => }/EvaluationDTO.java | 33 ++++++++++--------- .../utils/{location => }/ExpertDTO.java | 4 +-- 14 files changed, 58 insertions(+), 50 deletions(-) create mode 100644 zsw-bxg/src/main/java/co/yixiang/app/modules/evaluation/param/YxEvaluationQueryParam.java rename zsw-bxg/src/main/java/co/yixiang/utils/{location => }/BrandDTO.java (79%) rename zsw-bxg/src/main/java/co/yixiang/utils/{location => }/EvaluationDTO.java (74%) rename zsw-bxg/src/main/java/co/yixiang/utils/{location => }/ExpertDTO.java (89%) diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/evaluation/param/YxEvaluationQueryParam.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/evaluation/param/YxEvaluationQueryParam.java new file mode 100644 index 00000000..91dbd0c5 --- /dev/null +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/evaluation/param/YxEvaluationQueryParam.java @@ -0,0 +1,18 @@ +package co.yixiang.app.modules.evaluation.param; + +import co.yixiang.common.web.param.QueryParam; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 评测表查询 + * @author ssj + * @date 2022-9-27 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "YxEvaluationQueryParam对象",description ="评测表查询参数") +public class YxEvaluationQueryParam extends QueryParam { + private static final long serialVersionUID =1L; +} diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/evaluation/rest/AppStoreEvaluationController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/evaluation/rest/AppStoreEvaluationController.java index 7997a64f..42638df2 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/evaluation/rest/AppStoreEvaluationController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/evaluation/rest/AppStoreEvaluationController.java @@ -11,8 +11,7 @@ package co.yixiang.app.modules.evaluation.rest; import cn.iocoder.yudao.framework.common.pojo.ApiResult; import co.yixiang.annotation.AnonymousAccess; import co.yixiang.modules.evaluation.service.YxEvaluationService; -import co.yixiang.utils.location.EvaluationDTO; -import co.yixiang.utils.location.ExpertDTO; +import co.yixiang.utils.EvaluationDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/expert/rest/AppStoreExpertController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/expert/rest/AppStoreExpertController.java index 19d2f348..5baca6ed 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/expert/rest/AppStoreExpertController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/expert/rest/AppStoreExpertController.java @@ -10,10 +10,8 @@ package co.yixiang.app.modules.expert.rest; import co.yixiang.annotation.AnonymousAccess; import cn.iocoder.yudao.framework.common.pojo.ApiResult; -import co.yixiang.modules.expert.domain.YxStoreExpert; import co.yixiang.modules.expert.service.YxStoreExpertService; -import co.yixiang.utils.CateDTO; -import co.yixiang.utils.location.ExpertDTO; +import co.yixiang.utils.ExpertDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/product/rest/AppStoreBrandController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/product/rest/AppStoreBrandController.java index 12321567..7e161226 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/product/rest/AppStoreBrandController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/product/rest/AppStoreBrandController.java @@ -3,7 +3,7 @@ package co.yixiang.app.modules.product.rest; import cn.iocoder.yudao.framework.common.pojo.ApiResult; import co.yixiang.annotation.AnonymousAccess; import co.yixiang.modules.store.service.YxStoreBrandService; -import co.yixiang.utils.location.BrandDTO; +import co.yixiang.utils.BrandDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/zsw-bxg/src/main/java/co/yixiang/common/web/param/QueryParam.java b/zsw-bxg/src/main/java/co/yixiang/common/web/param/QueryParam.java index a4913995..557a357a 100644 --- a/zsw-bxg/src/main/java/co/yixiang/common/web/param/QueryParam.java +++ b/zsw-bxg/src/main/java/co/yixiang/common/web/param/QueryParam.java @@ -25,19 +25,19 @@ public abstract class QueryParam implements Serializable{ private String keyword; @ApiModelProperty(value = "当前第几页") - public void setCurrent(Integer current) { - if (current == null || current <= 0){ + public void setPage(Integer page) { + if (page == null || page <= 0){ this.page = 1; }else{ - this.page = current; + this.page = page; } } - public void setSize(Integer size) { - if (size == null || size <= 0){ + public void setLimit(Integer limit) { + if (limit == null || limit <= 0){ this.limit = 10; }else{ - this.limit = size; + this.limit = limit; } } diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/YxEvaluationService.java b/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/YxEvaluationService.java index 69ea5064..a75c329c 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/YxEvaluationService.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/YxEvaluationService.java @@ -13,7 +13,7 @@ import co.yixiang.domain.PageResult; import co.yixiang.modules.evaluation.domain.YxEvaluation; import co.yixiang.modules.evaluation.service.dto.YxEvaluationDto; import co.yixiang.modules.evaluation.service.dto.YxEvaluationQueryCriteria; -import co.yixiang.utils.location.EvaluationDTO; +import co.yixiang.utils.EvaluationDTO; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/impl/YxEvaluationServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/impl/YxEvaluationServiceImpl.java index f89225a1..4d5b4aaa 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/impl/YxEvaluationServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/impl/YxEvaluationServiceImpl.java @@ -18,11 +18,8 @@ import co.yixiang.modules.evaluation.service.YxEvaluationService; import co.yixiang.modules.evaluation.service.dto.YxEvaluationDto; import co.yixiang.modules.evaluation.service.dto.YxEvaluationQueryCriteria; import co.yixiang.modules.evaluation.service.mapper.YxEvaluationMapper; -import co.yixiang.modules.expert.domain.YxStoreExpert; import co.yixiang.utils.FileUtil; -import co.yixiang.utils.TreeUtil; -import co.yixiang.utils.location.EvaluationDTO; -import co.yixiang.utils.location.ExpertDTO; +import co.yixiang.utils.EvaluationDTO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; import lombok.AllArgsConstructor; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/expert/service/YxStoreExpertService.java b/zsw-bxg/src/main/java/co/yixiang/modules/expert/service/YxStoreExpertService.java index 8cc27bb4..07df535d 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/expert/service/YxStoreExpertService.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/expert/service/YxStoreExpertService.java @@ -13,7 +13,7 @@ import co.yixiang.domain.PageResult; import co.yixiang.modules.expert.domain.YxStoreExpert; import co.yixiang.modules.expert.service.dto.YxStoreExpertDto; import co.yixiang.modules.expert.service.dto.YxStoreExpertQueryCriteria; -import co.yixiang.utils.location.ExpertDTO; +import co.yixiang.utils.ExpertDTO; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/expert/service/impl/YxStoreExpertServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/expert/service/impl/YxStoreExpertServiceImpl.java index 35f1f6d9..b21c2002 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/expert/service/impl/YxStoreExpertServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/expert/service/impl/YxStoreExpertServiceImpl.java @@ -13,16 +13,13 @@ import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.domain.PageResult; import co.yixiang.dozer.service.IGenerator; import co.yixiang.enums.ShopCommonEnum; -import co.yixiang.modules.category.domain.YxStoreCategory; import co.yixiang.modules.expert.domain.YxStoreExpert; import co.yixiang.modules.expert.service.YxStoreExpertService; import co.yixiang.modules.expert.service.dto.YxStoreExpertDto; import co.yixiang.modules.expert.service.dto.YxStoreExpertQueryCriteria; import co.yixiang.modules.expert.service.mapper.YxStoreExpertMapper; -import co.yixiang.utils.CateDTO; import co.yixiang.utils.FileUtil; -import co.yixiang.utils.TreeUtil; -import co.yixiang.utils.location.ExpertDTO; +import co.yixiang.utils.ExpertDTO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; import lombok.AllArgsConstructor; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/store/service/YxStoreBrandService.java b/zsw-bxg/src/main/java/co/yixiang/modules/store/service/YxStoreBrandService.java index 62c12dfd..cb54294d 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/store/service/YxStoreBrandService.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/store/service/YxStoreBrandService.java @@ -12,10 +12,9 @@ import co.yixiang.domain.PageResult; import co.yixiang.modules.store.domain.YxStoreBrand; import co.yixiang.modules.store.service.dto.YxStoreBrandDto; import co.yixiang.modules.store.service.dto.YxStoreBrandQueryCriteria; -import co.yixiang.utils.CateDTO; -import co.yixiang.utils.location.BrandDTO; +import co.yixiang.utils.BrandDTO; import org.springframework.data.domain.Pageable; -import java.util.Map; + import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/store/service/impl/YxStoreBrandServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/store/service/impl/YxStoreBrandServiceImpl.java index b194e251..2513d314 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/store/service/impl/YxStoreBrandServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/store/service/impl/YxStoreBrandServiceImpl.java @@ -13,12 +13,9 @@ import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.domain.PageResult; import co.yixiang.dozer.service.IGenerator; import co.yixiang.enums.ShopCommonEnum; -import co.yixiang.modules.expert.domain.YxStoreExpert; import co.yixiang.modules.store.domain.YxStoreBrand; -import co.yixiang.modules.store.service.vo.YxStoreBrandVO; import co.yixiang.utils.FileUtil; -import co.yixiang.utils.location.BrandDTO; -import co.yixiang.utils.location.ExpertDTO; +import co.yixiang.utils.BrandDTO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; import com.github.pagehelper.PageInfo; @@ -33,7 +30,6 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import java.util.List; import java.util.Map; diff --git a/zsw-bxg/src/main/java/co/yixiang/utils/location/BrandDTO.java b/zsw-bxg/src/main/java/co/yixiang/utils/BrandDTO.java similarity index 79% rename from zsw-bxg/src/main/java/co/yixiang/utils/location/BrandDTO.java rename to zsw-bxg/src/main/java/co/yixiang/utils/BrandDTO.java index 505585ce..8985bc0e 100644 --- a/zsw-bxg/src/main/java/co/yixiang/utils/location/BrandDTO.java +++ b/zsw-bxg/src/main/java/co/yixiang/utils/BrandDTO.java @@ -1,4 +1,6 @@ -package co.yixiang.utils.location; +package co.yixiang.utils; +import lombok.Data; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -11,6 +13,7 @@ import java.util.List; * @author ssj * @since 2022-9-20 */ +@Data public class BrandDTO implements Serializable { private static final long serialVersionUID = 1L; @@ -28,6 +31,6 @@ public class BrandDTO implements Serializable { */ private String pic; - private List children = new ArrayList<>(); +// private List children = new ArrayList<>(); } diff --git a/zsw-bxg/src/main/java/co/yixiang/utils/location/EvaluationDTO.java b/zsw-bxg/src/main/java/co/yixiang/utils/EvaluationDTO.java similarity index 74% rename from zsw-bxg/src/main/java/co/yixiang/utils/location/EvaluationDTO.java rename to zsw-bxg/src/main/java/co/yixiang/utils/EvaluationDTO.java index 9679bded..3a8ca883 100644 --- a/zsw-bxg/src/main/java/co/yixiang/utils/location/EvaluationDTO.java +++ b/zsw-bxg/src/main/java/co/yixiang/utils/EvaluationDTO.java @@ -1,8 +1,9 @@ -package co.yixiang.utils.location; +package co.yixiang.utils; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -19,6 +20,7 @@ import java.util.List; * @author sj * @since 2022-09-26 */ +@Data public class EvaluationDTO implements Serializable { private static final long serialVersionUID = 1L; @@ -42,7 +44,6 @@ public class EvaluationDTO implements Serializable { private String videoInput; - /** 关联商品信息 */ @NotNull private String product; @@ -75,22 +76,22 @@ public class EvaluationDTO implements Serializable { private String accessibilitySynopsis; - /** 添加时间 */ - @TableField(fill= FieldFill.INSERT) - private Timestamp createTime; - - - /** 更新时间 */ - @TableField(fill= FieldFill.INSERT_UPDATE) - private Timestamp updateTime; +// /** 添加时间 */ +// @TableField(fill= FieldFill.INSERT) +// private Timestamp createTime; - /** 是否删除 */ - private Integer isDel; +// /** 更新时间 */ +// @TableField(fill= FieldFill.INSERT_UPDATE) +// private Timestamp updateTime; - /** 是否展示 */ - private Integer isShow; +// /** 是否删除 */ +// private Integer isDel; +// +// +// /** 是否展示 */ +// private Integer isShow; /** 排序 */ @@ -98,7 +99,7 @@ public class EvaluationDTO implements Serializable { private Integer sort; - private Long tenantId; +// private Long tenantId; - private List children = new ArrayList<>(); +// private List children = new ArrayList<>(); } diff --git a/zsw-bxg/src/main/java/co/yixiang/utils/location/ExpertDTO.java b/zsw-bxg/src/main/java/co/yixiang/utils/ExpertDTO.java similarity index 89% rename from zsw-bxg/src/main/java/co/yixiang/utils/location/ExpertDTO.java rename to zsw-bxg/src/main/java/co/yixiang/utils/ExpertDTO.java index 48326638..324fcf55 100644 --- a/zsw-bxg/src/main/java/co/yixiang/utils/location/ExpertDTO.java +++ b/zsw-bxg/src/main/java/co/yixiang/utils/ExpertDTO.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.utils.location; +package co.yixiang.utils; import lombok.Data; @@ -56,6 +56,6 @@ public class ExpertDTO implements Serializable { */ private String image; - private List children = new ArrayList<>(); +// private List children = new ArrayList<>(); }