feat: 产品中心

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")

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;
 }

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;

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;
 }

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<ProductSeriesInfoAddRequest> items;
 }

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;
 
     /**

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;
+
     /**
      * 排序
      */

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;
+
     /**
      * 创建人
      */

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;
+
     /**
      * 系列名称
      */

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<ProductMobilebrokenIntro> {
 
-    PageData<ProductMobilebrokenIntroSearchVO> getList(ProductMobilebrokenIntroSearchRequest request, Page<?> page);
+    Page<ProductMobilebrokenIntroSearchVO> getList(ProductMobilebrokenIntroSearchRequest request, Page<?> page);
 
     String get(String language);
 }

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<ProductModel> {
 
-    PageData<ProductModelSearchVO> getList(ProductModelSearchRequest request, Page<?> page);
+    Page<ProductModelSearchVO> getList(ProductModelSearchRequest request, Page<?> page);
 
     List<ProductModelVO> get(String typeNo, String language);
 

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<ProductPart> {
 
-    PageData<ProductPartSearchVO> getList(ProductPartSearchRequest request, Page<?> page);
+    Page<ProductPartSearchVO> getList(ProductPartSearchRequest request, Page<?> page);
 
     ProductPartInfoVO getInfo(Integer partId);
 }

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<ProductSeries> {
 
-    PageData<ProductSeriesSearchVO> getList(ProductSeriesSearchRequest request, Page<?> page);
+    Page<ProductSeriesSearchVO> getList(ProductSeriesSearchRequest request, Page<?> page);
 
     List<ProductSeriesVO> get(Integer moduleId,String language);
 }

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<ProductType> {
 
-    PageData<ProductTypeSearchVO> getList(ProductTypeSearchRequest request, Page<?> page);
+    Page<ProductTypeSearchVO> getList(ProductTypeSearchRequest request, Page<?> page);
 
     List<ProductTypeVO> get(Integer moduleId,String seriesNo, String language);
 }

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<ProductMobile
 
     void publish(@Valid ProductPublishRequest request);
 
-    PageData<ProductMobilebrokenIntroSearchVO> getList(ProductMobilebrokenIntroSearchRequest request);
+    Page<ProductMobilebrokenIntroSearchVO> getList(ProductMobilebrokenIntroSearchRequest request);
 
     String get(String language);
 

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<ProductModel> {
 
     void update(ProductModelUpdateRequest request);
 
-    PageData<ProductModelSearchVO> getList(ProductModelSearchRequest request);
+    Page<ProductModelSearchVO> getList(ProductModelSearchRequest request);
 
     List<ProductModelVO> getList(Integer moduleId,String typeNo, String language, boolean main);
 

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<ProductPart> {
 
     void update(@Valid ProductPartUpdateRequest request);
 
-    PageData<ProductPartSearchVO> getList(ProductPartSearchRequest request);
+    Page<ProductPartSearchVO> getList(ProductPartSearchRequest request);
 
     ProductPartInfoVO getInfo(@Valid @NotNull Integer partId);
 

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<ProductSeries> {
 
     void update(@Valid ProductSeriesUpdateRequest request);
 
-    PageData<ProductSeriesSearchVO> getList(ProductSeriesSearchRequest request);
+    Page<ProductSeriesSearchVO> getList(ProductSeriesSearchRequest request);
 
     List<ProductSeriesVO> get(Integer moduleId,String language);
 

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<ProductType> {
 
     void update(@Valid ProductTypeUpdateRequest request);
 
-    PageData<ProductTypeSearchVO> getList(ProductTypeSearchRequest request);
+    Page<ProductTypeSearchVO> getList(ProductTypeSearchRequest request);
 
     List<ProductTypeVO> get(Integer moduleId,String seriesNo,String language);
 

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseServiceImpl.java

@@ -76,8 +76,8 @@ public class ProductCaseServiceImpl extends ServiceImpl<ProductCaseMapper, Produ
                 .eq(Objects.nonNull(request.getEnable()), ProductCase::getEnable, request.getEnable())
                 .eq(Objects.nonNull(request.getState()), ProductCase::getState, request.getState())
                 .like(Objects.nonNull(request.getTitle()), ProductCase::getTitle, request.getTitle())
-                .ge(Objects.nonNull(request.getStartDate()), ProductCase::getPublishTime, request.getStartDate())
+                .ge(Objects.nonNull(request.getStartTime()), ProductCase::getPublishTime, request.getStartTime())
-                .le(Objects.nonNull(request.getEndDate()), ProductCase::getPublishTime, request.getEndDate())
+                .le(Objects.nonNull(request.getEndTime()), ProductCase::getPublishTime, request.getEndTime())
                 .orderByAsc(ProductCase::getState)
                 .orderByAsc(ProductCase::getTitle)
                 .orderByDesc(ProductCase::getId)
@@ -102,11 +102,11 @@ public class ProductCaseServiceImpl extends ServiceImpl<ProductCaseMapper, Produ
                                 .eq(ProductCase::getState,PublishState.Published.getState())
                                 .exists())
                         .throwMessage("已有状态为已发布的数据");
-                info.setState(PublishState.Published.getState());
-                info.setPublishBy(AdminUserUtil.getUserName());
-                info.setPublishTime(LocalDateTime.now());
-                updateById(info);
             }
+            info.setEnable(true);
+            info.setUpdateBy(AdminUserUtil.getUserName());
+            info.setUpdateTime(LocalDateTime.now());
+            updateById(info);
         }else {
             //禁用
             VUtils.trueThrowBusinessError(Objects.equals(info.getState(),PublishState.Published.getState()))

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java

@@ -137,17 +137,17 @@ public class ProductHonorServiceImpl extends ServiceImpl<ProductHonorMapper, Pro
         VUtils.trueThrowBusinessError(Objects.isNull(info)).throwMessage("无效的数据");
         if (request.getEnable()){
             //启用
-            if (Objects.equals(info.getState(),PublishState.Published.getState())){
+            if (Objects.equals(info.getState(), PublishState.Published.getState())) {
                 VUtils.trueThrowBusinessError(lambdaQuery()
-                        .eq(ProductHonor::getTitle,info.getTitle().trim())
+                                .eq(ProductHonor::getTitle, info.getTitle().trim())
-                        .eq(ProductHonor::getState,PublishState.Published.getState())
+                                .eq(ProductHonor::getState, PublishState.Published.getState())
-                        .exists())
+                                .exists())
                         .throwMessage("已有状态为已发布的数据");
-                info.setState(PublishState.Published.getState());
-                info.setPublishBy(AdminUserUtil.getUserName());
-                info.setPublishTime(LocalDateTime.now());
-                updateById(info);
             }
+            info.setEnable(true);
+            info.setUpdateBy(AdminUserUtil.getUserName());
+            info.setUpdateTime(LocalDateTime.now());
+            updateById(info);
         }else {
             //禁用
             VUtils.trueThrowBusinessError(Objects.equals(info.getState(),PublishState.Published.getState()))

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductMobilebrokenIntroServiceImpl.java

@@ -3,7 +3,6 @@ package com.nflg.mobilebroken.repository.service.impl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.ProductMobilebrokenIntroInfoVO;
 import com.nflg.mobilebroken.common.pojo.vo.ProductMobilebrokenIntroSearchVO;
@@ -99,7 +98,7 @@ public class ProductMobilebrokenIntroServiceImpl extends ServiceImpl<ProductMobi
     }
 
     @Override
-    public PageData<ProductMobilebrokenIntroSearchVO> getList(ProductMobilebrokenIntroSearchRequest request) {
+    public Page<ProductMobilebrokenIntroSearchVO> getList(ProductMobilebrokenIntroSearchRequest request) {
         return baseMapper.getList(request,new Page<>(request.getPage(), request.getPageSize()));
     }
 

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java

@@ -78,11 +78,11 @@ public class ProductModelFileServiceImpl extends ServiceImpl<ProductModelFileMap
                                 .eq(ProductModelFile::getState,PublishState.Published.getState())
                                 .exists())
                         .throwMessage("已有状态为已发布的数据");
-                info.setState(PublishState.Published.getState());
-                info.setPublishBy(AdminUserUtil.getUserName());
-                info.setPublishTime(LocalDateTime.now());
-                updateById(info);
             }
+            info.setEnable(true);
+            info.setUpdateBy(AdminUserUtil.getUserName());
+            info.setUpdateTime(LocalDateTime.now());
+            updateById(info);
         }else {
             //禁用
             VUtils.trueThrowBusinessError(Objects.equals(info.getState(),PublishState.Published.getState()))

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java

@@ -146,11 +146,11 @@ public class ProductModelImageServiceImpl extends ServiceImpl<ProductModelImageM
                                 .eq(ProductModelImage::getState,PublishState.Published.getState())
                                 .exists())
                         .throwMessage("已有状态为已发布的数据");
-                info.setState(PublishState.Published.getState());
-                info.setPublishBy(AdminUserUtil.getUserName());
-                info.setPublishTime(LocalDateTime.now());
-                updateById(info);
             }
+            info.setEnable(true);
+            info.setUpdateBy(AdminUserUtil.getUserName());
+            info.setUpdateTime(LocalDateTime.now());
+            updateById(info);
         }else {
             //禁用
             VUtils.trueThrowBusinessError(Objects.equals(info.getState(),PublishState.Published.getState()))

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java

@@ -5,7 +5,6 @@ import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.*;
 import com.nflg.mobilebroken.common.util.AdminUserUtil;
@@ -83,7 +82,7 @@ public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, Pro
     }
 
     @Override
-    public PageData<ProductModelSearchVO> getList(ProductModelSearchRequest request) {
+    public Page<ProductModelSearchVO> getList(ProductModelSearchRequest request) {
         return baseMapper.getList(request, new Page<>(request.getPage(), request.getPageSize()));
     }
 
@@ -167,11 +166,11 @@ public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, Pro
                                 .eq(ProductModel::getState,PublishState.Published.getState())
                                 .exists())
                         .throwMessage("已有状态为已发布的数据");
-                info.setState(PublishState.Published.getState());
-                info.setPublishBy(AdminUserUtil.getUserName());
-                info.setPublishTime(LocalDateTime.now());
-                updateById(info);
             }
+            info.setEnable(true);
+            info.setUpdateBy(AdminUserUtil.getUserName());
+            info.setUpdateTime(LocalDateTime.now());
+            updateById(info);
         }else {
             //禁用
             VUtils.trueThrowBusinessError(Objects.equals(info.getState(),PublishState.Published.getState()))

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java

@@ -78,11 +78,11 @@ public class ProductModelVideoServiceImpl extends ServiceImpl<ProductModelVideoM
                                 .eq(ProductModelVideo::getState,PublishState.Published.getState())
                                 .exists())
                         .throwMessage("已有状态为已发布的数据");
-                info.setState(PublishState.Published.getState());
-                info.setPublishBy(AdminUserUtil.getUserName());
-                info.setPublishTime(LocalDateTime.now());
-                updateById(info);
             }
+            info.setEnable(true);
+            info.setUpdateBy(AdminUserUtil.getUserName());
+            info.setUpdateTime(LocalDateTime.now());
+            updateById(info);
         }else {
             //禁用
             VUtils.trueThrowBusinessError(Objects.equals(info.getState(),PublishState.Published.getState()))

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil;
 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.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;
@@ -75,7 +74,7 @@ public class ProductPartServiceImpl extends ServiceImpl<ProductPartMapper, Produ
     }
 
     @Override
-    public PageData<ProductPartSearchVO> getList(ProductPartSearchRequest request) {
+    public Page<ProductPartSearchVO> getList(ProductPartSearchRequest request) {
         return baseMapper.getList(request, new Page<>(request.getPage(), request.getPageSize()));
     }
 

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesInfoServiceImpl.java

@@ -34,6 +34,7 @@ public class ProductSeriesInfoServiceImpl extends ServiceImpl<ProductSeriesInfoM
                     items.stream()
                             .map(it -> 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<ProductSeriesInfoM
                     items.stream()
                             .map(it -> new ProductSeriesInfo()
                                     .setId(it.getId())
-                                    .setLanguageCode(it.getLanguageCode())
+                                    .setName(it.getName())
                                     .setImage(it.getImage())
                                     .setContent(it.getContent())
                                     .setUpdateBy(AdminUserUtil.getUserName())

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<ProductSeriesMapper, P
                 .orElse(null);
         VUtils.trueThrowBusinessError(Objects.isNull(cn)).throwMessage("必须包含中文数据");
         ProductSeries productSeries = new ProductSeries()
+                .setModuleId(request.getModuleId())
                 .setName(cn.getName().trim())
                 .setSort(request.getSort())
                 .setCreateBy(AdminUserUtil.getUserName())
@@ -72,6 +72,13 @@ public class ProductSeriesServiceImpl extends ServiceImpl<ProductSeriesMapper, P
         if (Objects.equals(info.getState(), PublishState.Published.getState())){
             add(request);
         }else {
+            ProductSeriesInfoAddRequest cn=request.getItems().stream()
+                    .filter(it-> 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<ProductSeriesMapper, P
     }
 
     @Override
-    public PageData<ProductSeriesSearchVO> getList(ProductSeriesSearchRequest request) {
+    public Page<ProductSeriesSearchVO> getList(ProductSeriesSearchRequest request) {
         return baseMapper.getList(request,new Page<>(request.getPage(), request.getPageSize()));
     }
 
@@ -156,11 +163,11 @@ public class ProductSeriesServiceImpl extends ServiceImpl<ProductSeriesMapper, P
                                 .eq(ProductSeries::getState,PublishState.Published.getState())
                                 .exists())
                         .throwMessage("已有状态为已发布的数据");
-                info.setState(PublishState.Published.getState());
-                info.setPublishBy(AdminUserUtil.getUserName());
-                info.setPublishTime(LocalDateTime.now());
-                updateById(info);
             }
+            info.setEnable(true);
+            info.setUpdateBy(AdminUserUtil.getUserName());
+            info.setUpdateTime(LocalDateTime.now());
+            updateById(info);
         }else {
             //禁用
             VUtils.trueThrowBusinessError(Objects.equals(info.getState(),PublishState.Published.getState()))
@@ -188,6 +195,7 @@ public class ProductSeriesServiceImpl extends ServiceImpl<ProductSeriesMapper, P
         VUtils.trueThrowBusinessError(Objects.isNull(series)).throwMessage("无效的数据");
         return new ProductSeriesInfoVO()
                 .setId(series.getId())
+                .setModuleId(series.getModuleId())
                 .setSort(series.getSort())
                 .setItems(productSeriesInfoService.getInfo(seriesId));
     }

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java

@@ -7,7 +7,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.ProductTypeInfoVO;
 import com.nflg.mobilebroken.common.pojo.vo.ProductTypeSearchVO;
@@ -77,6 +76,12 @@ public class ProductTypeServiceImpl extends ServiceImpl<ProductTypeMapper, Produ
         if (Objects.equals(info.getState(), PublishState.Published.getState())) {
             add(request);
         } else {
+            ProductTypeInfoAddRequest cn=request.getItems().stream()
+                    .filter(it-> 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<ProductTypeMapper, Produ
     }
 
     @Override
-    public PageData<ProductTypeSearchVO> getList(ProductTypeSearchRequest request) {
+    public Page<ProductTypeSearchVO> getList(ProductTypeSearchRequest request) {
         return baseMapper.getList(request,new Page<>(request.getPage(),  request.getPageSize()));
     }
 
@@ -108,11 +113,11 @@ public class ProductTypeServiceImpl extends ServiceImpl<ProductTypeMapper, Produ
                                 .eq(ProductType::getState,PublishState.Published.getState())
                                 .exists())
                         .throwMessage("已有状态为已发布的数据");
-                info.setState(PublishState.Published.getState());
-                info.setPublishBy(AdminUserUtil.getUserName());
-                info.setPublishTime(LocalDateTime.now());
-                updateById(info);
             }
+            info.setEnable(true);
+            info.setUpdateBy(AdminUserUtil.getUserName());
+            info.setUpdateTime(LocalDateTime.now());
+            updateById(info);
         }else {
             //禁用
             VUtils.trueThrowBusinessError(Objects.equals(info.getState(),PublishState.Published.getState()))
@@ -198,6 +203,7 @@ public class ProductTypeServiceImpl extends ServiceImpl<ProductTypeMapper, Produ
         VUtils.trueThrowBusinessError(Objects.isNull(info)).throwMessage("无效的数据");
         return new ProductTypeInfoVO()
                 .setId(info.getId())
+                .setModuleId(info.getModuleId())
                 .setSeriesName(info.getSeriesName())
                 .setItems(productTypeInfoService.getInfo(typeId))
                 .setFiles(productTypeFileService.getInfo(typeId));