From c99ca55169ad424072541be77245f7aeae8e39a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 4 Jun 2025 17:59:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BA=A7=E5=93=81=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProductTypeController.java | 4 ++-- .../request/ProductCaseSearchRequest.java | 4 ++-- .../request/ProductIntroSearchRequest.java | 3 +++ ...ProductMobilebrokenIntroSearchRequest.java | 4 ++-- .../pojo/request/ProductSeriesAddRequest.java | 7 +++++++ .../request/ProductSeriesInfoAddRequest.java | 4 ++++ .../common/pojo/vo/ProductSeriesInfoVO.java | 5 +++++ .../common/pojo/vo/ProductSeriesSearchVO.java | 15 ++++++++++++++ .../common/pojo/vo/ProductTypeInfoVO.java | 5 +++++ .../ProductMobilebrokenIntroMapper.java | 3 +-- .../repository/mapper/ProductModelMapper.java | 3 +-- .../repository/mapper/ProductPartMapper.java | 3 +-- .../mapper/ProductSeriesMapper.java | 3 +-- .../repository/mapper/ProductTypeMapper.java | 3 +-- .../IProductMobilebrokenIntroService.java | 4 ++-- .../service/IProductModelService.java | 4 ++-- .../service/IProductPartService.java | 4 ++-- .../service/IProductSeriesService.java | 4 ++-- .../service/IProductTypeService.java | 4 ++-- .../service/impl/ProductCaseServiceImpl.java | 12 +++++------ .../service/impl/ProductHonorServiceImpl.java | 16 +++++++-------- .../ProductMobilebrokenIntroServiceImpl.java | 3 +-- .../impl/ProductModelFileServiceImpl.java | 8 ++++---- .../impl/ProductModelImageServiceImpl.java | 8 ++++---- .../service/impl/ProductModelServiceImpl.java | 11 +++++----- .../impl/ProductModelVideoServiceImpl.java | 8 ++++---- .../service/impl/ProductPartServiceImpl.java | 3 +-- .../impl/ProductSeriesInfoServiceImpl.java | 3 ++- .../impl/ProductSeriesServiceImpl.java | 20 +++++++++++++------ .../service/impl/ProductTypeServiceImpl.java | 18 +++++++++++------ 30 files changed, 121 insertions(+), 75 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductTypeController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductTypeController.java index d17a07a2..2d173591 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductTypeController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductTypeController.java @@ -58,7 +58,7 @@ public class ProductTypeController extends ControllerBase{ } /** - * 删除系列 + * 删除类型 * @param request 请求参数 */ @PostMapping("/delete") @@ -68,7 +68,7 @@ public class ProductTypeController extends ControllerBase{ } /** - * 发布或者取消发布系列 + * 发布或者取消发布类型 * @param request 请求参数 */ @PostMapping("/publish") diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductCaseSearchRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductCaseSearchRequest.java index 6194fcca..bdd4fcfe 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductCaseSearchRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductCaseSearchRequest.java @@ -25,10 +25,10 @@ public class ProductCaseSearchRequest extends PageRequest { /** * 开始时间 */ - private LocalDateTime startDate; + private LocalDateTime startTime; /** * 结束时间 */ - private LocalDateTime endDate; + private LocalDateTime endTime; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductIntroSearchRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductIntroSearchRequest.java index e15ea289..7a19cba3 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductIntroSearchRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductIntroSearchRequest.java @@ -1,7 +1,10 @@ package com.nflg.mobilebroken.common.pojo.request; +import lombok.Data; + import java.time.LocalDateTime; +@Data public class ProductIntroSearchRequest extends PageRequest{ private Integer dictionaryItemId; diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductMobilebrokenIntroSearchRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductMobilebrokenIntroSearchRequest.java index 83f54b9a..f3f59ca5 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductMobilebrokenIntroSearchRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductMobilebrokenIntroSearchRequest.java @@ -20,10 +20,10 @@ public class ProductMobilebrokenIntroSearchRequest extends PageRequest{ /** * 开始时间 */ - private LocalDateTime startDate; + private LocalDateTime startTime; /** * 结束时间 */ - private LocalDateTime endDate; + private LocalDateTime endTime; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductSeriesAddRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductSeriesAddRequest.java index 53d1e981..fb1a01ba 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductSeriesAddRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductSeriesAddRequest.java @@ -2,11 +2,17 @@ package com.nflg.mobilebroken.common.pojo.request; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.util.List; @Data public class ProductSeriesAddRequest { + /** + * 模块ID + */ + private Integer moduleId; + /** * 排序 */ @@ -15,5 +21,6 @@ public class ProductSeriesAddRequest { /** * 多语言数据 */ + @NotEmpty private List items; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductSeriesInfoAddRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductSeriesInfoAddRequest.java index 818da71c..71e3a974 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductSeriesInfoAddRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductSeriesInfoAddRequest.java @@ -2,6 +2,8 @@ package com.nflg.mobilebroken.common.pojo.request; import lombok.Data; +import javax.validation.constraints.NotBlank; + @Data public class ProductSeriesInfoAddRequest { @@ -10,11 +12,13 @@ public class ProductSeriesInfoAddRequest { /** * 语言代码 */ + @NotBlank private String languageCode; /** * 名称 */ + @NotBlank private String name; /** diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductSeriesInfoVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductSeriesInfoVO.java index 2e29e5bc..7a710b4b 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductSeriesInfoVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductSeriesInfoVO.java @@ -12,6 +12,11 @@ public class ProductSeriesInfoVO { private Integer id; + /** + * 模块ID + */ + private Integer moduleId; + /** * 排序 */ diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductSeriesSearchVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductSeriesSearchVO.java index 4f2ace54..a8c3d6e9 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductSeriesSearchVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductSeriesSearchVO.java @@ -29,6 +29,21 @@ public class ProductSeriesSearchVO { */ private Integer sort; + /** + * 发布状态，0：未发布；1-已发布，2-已废弃 + */ + private Integer state; + + /** + * 发布人 + */ + private String publishBy; + + /** + * 发布时间 + */ + private LocalDateTime publishTime; + /** * 创建人 */ diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductTypeInfoVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductTypeInfoVO.java index 2ff8bf0a..74463fa7 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductTypeInfoVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductTypeInfoVO.java @@ -13,6 +13,11 @@ public class ProductTypeInfoVO { private Integer id; + /** + * 模块ID + */ + private Integer moduleId; + /** * 系列名称 */ diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductMobilebrokenIntroMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductMobilebrokenIntroMapper.java index 2237e766..7b16cbf9 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductMobilebrokenIntroMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductMobilebrokenIntroMapper.java @@ -2,7 +2,6 @@ package com.nflg.mobilebroken.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.pojo.request.ProductMobilebrokenIntroSearchRequest; import com.nflg.mobilebroken.common.pojo.vo.ProductMobilebrokenIntroSearchVO; import com.nflg.mobilebroken.repository.entity.ProductMobilebrokenIntro; @@ -17,7 +16,7 @@ import com.nflg.mobilebroken.repository.entity.ProductMobilebrokenIntro; */ public interface ProductMobilebrokenIntroMapper extends BaseMapper { - PageData getList(ProductMobilebrokenIntroSearchRequest request, Page page); + Page getList(ProductMobilebrokenIntroSearchRequest request, Page page); String get(String language); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelMapper.java index 3406a9ba..23fe40ef 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelMapper.java @@ -2,7 +2,6 @@ package com.nflg.mobilebroken.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.pojo.request.ProductModelSearchRequest; import com.nflg.mobilebroken.common.pojo.vo.ProductModelInfoVO; import com.nflg.mobilebroken.common.pojo.vo.ProductModelSearchVO; @@ -21,7 +20,7 @@ import java.util.List; */ public interface ProductModelMapper extends BaseMapper { - PageData getList(ProductModelSearchRequest request, Page page); + Page getList(ProductModelSearchRequest request, Page page); List get(String typeNo, String language); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductPartMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductPartMapper.java index b8d910e6..e11c6b7d 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductPartMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductPartMapper.java @@ -2,7 +2,6 @@ package com.nflg.mobilebroken.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.pojo.request.ProductPartSearchRequest; import com.nflg.mobilebroken.common.pojo.vo.ProductPartInfoVO; import com.nflg.mobilebroken.common.pojo.vo.ProductPartSearchVO; @@ -18,7 +17,7 @@ import com.nflg.mobilebroken.repository.entity.ProductPart; */ public interface ProductPartMapper extends BaseMapper { - PageData getList(ProductPartSearchRequest request, Page page); + Page getList(ProductPartSearchRequest request, Page page); ProductPartInfoVO getInfo(Integer partId); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductSeriesMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductSeriesMapper.java index 6674a8f8..f34f9e5d 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductSeriesMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductSeriesMapper.java @@ -2,7 +2,6 @@ package com.nflg.mobilebroken.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.pojo.request.ProductSeriesSearchRequest; import com.nflg.mobilebroken.common.pojo.vo.ProductSeriesSearchVO; import com.nflg.mobilebroken.common.pojo.vo.ProductSeriesVO; @@ -20,7 +19,7 @@ import java.util.List; */ public interface ProductSeriesMapper extends BaseMapper { - PageData getList(ProductSeriesSearchRequest request, Page page); + Page getList(ProductSeriesSearchRequest request, Page page); List get(Integer moduleId,String language); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java index fbc2ee6a..c7854ef4 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java @@ -2,7 +2,6 @@ package com.nflg.mobilebroken.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.pojo.request.ProductTypeSearchRequest; import com.nflg.mobilebroken.common.pojo.vo.ProductTypeSearchVO; import com.nflg.mobilebroken.common.pojo.vo.ProductTypeVO; @@ -20,7 +19,7 @@ import java.util.List; */ public interface ProductTypeMapper extends BaseMapper { - PageData getList(ProductTypeSearchRequest request, Page page); + Page getList(ProductTypeSearchRequest request, Page page); List get(Integer moduleId,String seriesNo, String language); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductMobilebrokenIntroService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductMobilebrokenIntroService.java index 29ea278b..02f5978c 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductMobilebrokenIntroService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductMobilebrokenIntroService.java @@ -1,7 +1,7 @@ package com.nflg.mobilebroken.repository.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.pojo.request.*; import com.nflg.mobilebroken.common.pojo.vo.ProductMobilebrokenIntroInfoVO; import com.nflg.mobilebroken.common.pojo.vo.ProductMobilebrokenIntroSearchVO; @@ -28,7 +28,7 @@ public interface IProductMobilebrokenIntroService extends IService getList(ProductMobilebrokenIntroSearchRequest request); + Page getList(ProductMobilebrokenIntroSearchRequest request); String get(String language); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelService.java index a3c82ad7..e88e8fb9 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelService.java @@ -1,7 +1,7 @@ package com.nflg.mobilebroken.repository.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.pojo.request.*; import com.nflg.mobilebroken.common.pojo.vo.*; import com.nflg.mobilebroken.repository.entity.ProductModel; @@ -25,7 +25,7 @@ public interface IProductModelService extends IService { void update(ProductModelUpdateRequest request); - PageData getList(ProductModelSearchRequest request); + Page getList(ProductModelSearchRequest request); List getList(Integer moduleId,String typeNo, String language, boolean main); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductPartService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductPartService.java index 099a815c..c4714262 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductPartService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductPartService.java @@ -1,7 +1,7 @@ package com.nflg.mobilebroken.repository.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.pojo.request.*; import com.nflg.mobilebroken.common.pojo.vo.ProductPartInfoVO; import com.nflg.mobilebroken.common.pojo.vo.ProductPartSearchVO; @@ -24,7 +24,7 @@ public interface IProductPartService extends IService { void update(@Valid ProductPartUpdateRequest request); - PageData getList(ProductPartSearchRequest request); + Page getList(ProductPartSearchRequest request); ProductPartInfoVO getInfo(@Valid @NotNull Integer partId); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductSeriesService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductSeriesService.java index 414bd42b..ab540194 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductSeriesService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductSeriesService.java @@ -1,7 +1,7 @@ package com.nflg.mobilebroken.repository.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.pojo.request.*; import com.nflg.mobilebroken.common.pojo.vo.ProductSeriesInfoVO; import com.nflg.mobilebroken.common.pojo.vo.ProductSeriesSearchVO; @@ -28,7 +28,7 @@ public interface IProductSeriesService extends IService { void update(@Valid ProductSeriesUpdateRequest request); - PageData getList(ProductSeriesSearchRequest request); + Page getList(ProductSeriesSearchRequest request); List get(Integer moduleId,String language); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java index 551e4da1..b85430a5 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java @@ -1,7 +1,7 @@ package com.nflg.mobilebroken.repository.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.pojo.request.*; import com.nflg.mobilebroken.common.pojo.vo.ProductTypeInfoVO; import com.nflg.mobilebroken.common.pojo.vo.ProductTypeSearchVO; @@ -29,7 +29,7 @@ public interface IProductTypeService extends IService { void update(@Valid ProductTypeUpdateRequest request); - PageData getList(ProductTypeSearchRequest request); + Page getList(ProductTypeSearchRequest request); List get(Integer moduleId,String seriesNo,String language); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseServiceImpl.java index da0b7d22..8973716e 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseServiceImpl.java @@ -76,8 +76,8 @@ public class ProductCaseServiceImpl extends ServiceImpl getList(ProductMobilebrokenIntroSearchRequest request) { + public Page getList(ProductMobilebrokenIntroSearchRequest request) { return baseMapper.getList(request,new Page<>(request.getPage(), request.getPageSize())); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java index 0beee6a8..6d6412a0 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java @@ -78,11 +78,11 @@ public class ProductModelFileServiceImpl extends ServiceImpl getList(ProductModelSearchRequest request) { + public Page getList(ProductModelSearchRequest request) { return baseMapper.getList(request, new Page<>(request.getPage(), request.getPageSize())); } @@ -167,11 +166,11 @@ public class ProductModelServiceImpl extends ServiceImpl getList(ProductPartSearchRequest request) { + public Page getList(ProductPartSearchRequest request) { return baseMapper.getList(request, new Page<>(request.getPage(), request.getPageSize())); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesInfoServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesInfoServiceImpl.java index 5ebb0b2b..49425302 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesInfoServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesInfoServiceImpl.java @@ -34,6 +34,7 @@ public class ProductSeriesInfoServiceImpl extends ServiceImpl new ProductSeriesInfo() .setSeriesId(seriesId) + .setName(it.getName()) .setLanguageCode(it.getLanguageCode()) .setImage(it.getImage()) .setContent(it.getContent()) @@ -53,7 +54,7 @@ public class ProductSeriesInfoServiceImpl extends ServiceImpl new ProductSeriesInfo() .setId(it.getId()) - .setLanguageCode(it.getLanguageCode()) + .setName(it.getName()) .setImage(it.getImage()) .setContent(it.getContent()) .setUpdateBy(AdminUserUtil.getUserName()) diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesServiceImpl.java index 4ac3e28c..0a5d4517 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesServiceImpl.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.mobilebroken.common.constant.Constant; import com.nflg.mobilebroken.common.constant.PublishState; -import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.pojo.request.*; import com.nflg.mobilebroken.common.pojo.vo.ProductSeriesInfoVO; import com.nflg.mobilebroken.common.pojo.vo.ProductSeriesSearchVO; @@ -57,6 +56,7 @@ public class ProductSeriesServiceImpl extends ServiceImpl StrUtil.equals(it.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE)) + .findFirst() + .orElse(null); + VUtils.trueThrowBusinessError(Objects.isNull(cn)).throwMessage("必须包含中文数据"); + info.setModuleId(request.getModuleId()); + info.setName(cn.getName().trim()); info.setSort(request.getSort()); info.setUpdateBy(AdminUserUtil.getUserName()); info.setUpdateTime(LocalDateTime.now()); @@ -81,7 +88,7 @@ public class ProductSeriesServiceImpl extends ServiceImpl getList(ProductSeriesSearchRequest request) { + public Page getList(ProductSeriesSearchRequest request) { return baseMapper.getList(request,new Page<>(request.getPage(), request.getPageSize())); } @@ -156,11 +163,11 @@ public class ProductSeriesServiceImpl extends ServiceImpl StrUtil.equals(it.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE)) + .findFirst() + .orElse(null); + VUtils.trueThrowBusinessError(Objects.isNull(cn)).throwMessage("必须包含中文数据"); + info.setName(cn.getName().trim()); info.setSort(request.getSort()); info.setUpdateBy(AdminUserUtil.getUserName()); info.setUpdateTime(LocalDateTime.now()); @@ -87,7 +92,7 @@ public class ProductTypeServiceImpl extends ServiceImpl getList(ProductTypeSearchRequest request) { + public Page getList(ProductTypeSearchRequest request) { return baseMapper.getList(request,new Page<>(request.getPage(), request.getPageSize())); } @@ -108,11 +113,11 @@ public class ProductTypeServiceImpl extends ServiceImpl