diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductBaseController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductBaseController.java index 89a8657a..868ad0e5 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductBaseController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductBaseController.java @@ -1,9 +1,12 @@ package com.nflg.mobilebroken.admin.controller; +import com.nflg.mobilebroken.common.constant.Constant; import com.nflg.mobilebroken.common.pojo.ApiResult; 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.DictionaryItem; +import com.nflg.mobilebroken.repository.service.IDictionaryItemService; import com.nflg.mobilebroken.repository.service.IProductCaseService; import com.nflg.mobilebroken.repository.service.IProductHonorService; import com.nflg.mobilebroken.repository.service.IProductIntroService; @@ -13,6 +16,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; import javax.validation.constraints.NotNull; +import java.util.List; /** * 产品中心基础信息 @@ -22,6 +26,9 @@ import javax.validation.constraints.NotNull; @RequestMapping("/product/base") public class ProductBaseController extends ControllerBase{ + @Resource + private IDictionaryItemService dictionaryItemService; + @Resource private IProductIntroService productIntroService; @@ -31,6 +38,15 @@ public class ProductBaseController extends ControllerBase{ @Resource private IProductCaseService productCaseService; + /** + * 获取栏目列表 + * @return 栏目列表 + */ + @GetMapping("/getCategoryList") + public ApiResult> getCategoryList(){ + return ApiResult.success(dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_PRODUCT_INTRO_CATEGORY)); + } + /** * 添加介绍 * @param request 请求参数 diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/Constant.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/Constant.java index 18b1b7e0..6dd7bbd3 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/Constant.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/Constant.java @@ -128,4 +128,6 @@ public class Constant { public static final String DICTIONARY_AD_POSITION ="AdvertisementPosition"; public static final String DICTIONARY_PRODUCT_MODEL_MAIN_PARAMS ="ProductModelMainParams"; + + public static final String DICTIONARY_PRODUCT_INTRO_CATEGORY ="ProductIntroCategory"; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductPartInfoAddRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductPartInfoAddRequest.java index 6adbc9e4..bdba5a5d 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductPartInfoAddRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductPartInfoAddRequest.java @@ -1,6 +1,5 @@ package com.nflg.mobilebroken.common.pojo.request; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -27,7 +26,6 @@ public class ProductPartInfoAddRequest { /** * 介绍 */ - @TableField(value = "`desc`") private String desc; /** diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductCaseInfo.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductCaseInfo.java index 9af3aabb..3044561b 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductCaseInfo.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductCaseInfo.java @@ -1,14 +1,16 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 产品中心-案例-详情 @@ -41,6 +43,7 @@ public class ProductCaseInfo implements Serializable { /** * 描述 */ + @TableField(value = "`desc`") private String desc; /** diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductIntroInfo.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductIntroInfo.java index 2b1ce937..3f3be4fa 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductIntroInfo.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductIntroInfo.java @@ -1,14 +1,16 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 产品中心-介绍详情 @@ -46,6 +48,7 @@ public class ProductIntroInfo implements Serializable { /** * 内容 */ + @TableField(value = "`desc`") private String desc; /** diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductMobilebrokenIntroInfo.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductMobilebrokenIntroInfo.java index 0de4aaa5..79fe2006 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductMobilebrokenIntroInfo.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductMobilebrokenIntroInfo.java @@ -1,14 +1,16 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 产品中心-介绍详情 @@ -41,6 +43,7 @@ public class ProductMobilebrokenIntroInfo implements Serializable { /** * 内容 */ + @TableField(value = "`desc`") private String desc; /** diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelInfo.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelInfo.java index 3487e6c7..45246025 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelInfo.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelInfo.java @@ -1,14 +1,16 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 产品中心-机型详情 @@ -41,6 +43,7 @@ public class ProductModelInfo implements Serializable { /** * 机型介绍 */ + @TableField(value = "`desc`") private String desc; /** diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPartInfo.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPartInfo.java index 5fc19dee..d9f357ea 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPartInfo.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPartInfo.java @@ -1,13 +1,15 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; + /** *

* 产品中心-部件详情 @@ -60,5 +62,6 @@ public class ProductPartInfo implements Serializable { /** * 部件介绍 */ + @TableField(value = "`desc`") private String desc; } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPartParams.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPartParams.java index f11dd543..47884d4f 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPartParams.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPartParams.java @@ -1,14 +1,16 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 产品中心-部件-参数 @@ -46,6 +48,7 @@ public class ProductPartParams implements Serializable { /** * 参数值 */ + @TableField(value = "`value`") private String value; /** diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductCaseInfoService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductCaseInfoService.java index a42ace98..10b2b2c3 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductCaseInfoService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductCaseInfoService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.mobilebroken.common.pojo.request.ProductCaseInfoAddRequest; import com.nflg.mobilebroken.repository.entity.ProductCaseInfo; +import javax.validation.constraints.NotEmpty; import java.util.List; /** @@ -21,4 +22,6 @@ public interface IProductCaseInfoService extends IService { void update(List items); List getInfo(Integer caseId); + + void delete(@NotEmpty List ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductHonorInfoService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductHonorInfoService.java index 02f817ce..f2897faa 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductHonorInfoService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductHonorInfoService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.mobilebroken.common.pojo.request.ProductHonorInfoAddRequest; import com.nflg.mobilebroken.repository.entity.ProductHonorInfo; +import javax.validation.constraints.NotEmpty; import java.util.List; /** @@ -21,4 +22,6 @@ public interface IProductHonorInfoService extends IService { void update(List items); List getInfo(Integer honorId); + + void delete(@NotEmpty List ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductIntroInfoService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductIntroInfoService.java index 82fbf048..15784476 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductIntroInfoService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductIntroInfoService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.mobilebroken.common.pojo.request.ProductIntroInfoAddRequest; import com.nflg.mobilebroken.repository.entity.ProductIntroInfo; +import javax.validation.constraints.NotEmpty; import java.util.List; /** @@ -21,4 +22,6 @@ public interface IProductIntroInfoService extends IService { void update(List items); List getInfo(Integer introId); + + void delete(@NotEmpty List ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductMobilebrokenIntroInfoService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductMobilebrokenIntroInfoService.java index 27d64a09..110c7306 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductMobilebrokenIntroInfoService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductMobilebrokenIntroInfoService.java @@ -4,6 +4,7 @@ import com.nflg.mobilebroken.common.pojo.request.ProductMobileIntroInfoAddReques import com.nflg.mobilebroken.repository.entity.ProductMobilebrokenIntroInfo; import com.baomidou.mybatisplus.extension.service.IService; +import javax.validation.constraints.NotEmpty; import java.util.List; /** @@ -21,4 +22,6 @@ public interface IProductMobilebrokenIntroInfoService extends IService items); List getInfo(Integer introId); + + void delete(@NotEmpty List ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelFileService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelFileService.java index 6bdd7526..12c6139d 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelFileService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelFileService.java @@ -8,6 +8,7 @@ import com.nflg.mobilebroken.common.pojo.vo.ProductModelFileInfoVO; import com.nflg.mobilebroken.repository.entity.ProductModelFile; import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; import java.util.List; /** @@ -35,4 +36,6 @@ public interface IProductModelFileService extends IService { ProductModelFileInfoVO getInfo(Integer modelFileId); List getListByLanguage(Integer modelId, String language); + + void deleteByModel(@NotEmpty List ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelHotimageService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelHotimageService.java index 5aaa9c26..d96ea28e 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelHotimageService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelHotimageService.java @@ -6,7 +6,9 @@ import com.nflg.mobilebroken.common.pojo.request.*; import com.nflg.mobilebroken.repository.entity.ProductModelHotimage; import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.util.List; /** *

@@ -31,4 +33,6 @@ public interface IProductModelHotimageService extends IService ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelImageService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelImageService.java index 1985de58..e8a828b7 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelImageService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelImageService.java @@ -8,6 +8,7 @@ import com.nflg.mobilebroken.common.pojo.vo.ProductModelImagesInfoVO; import com.nflg.mobilebroken.repository.entity.ProductModelImage; import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; import java.util.List; /** @@ -35,4 +36,6 @@ public interface IProductModelImageService extends IService { void enable(@Valid EnableRequest request); List getListByLanguage(Integer modelId, String language); + + void deleteByModel(@NotEmpty List ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelInfoService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelInfoService.java index e818c533..30b42f28 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelInfoService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelInfoService.java @@ -10,6 +10,8 @@ import com.nflg.mobilebroken.common.pojo.vo.ProductModelInfoSearchVO; import com.nflg.mobilebroken.repository.entity.ProductModelInfo; import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; +import java.util.List; /** *

@@ -32,4 +34,6 @@ public interface IProductModelInfoService extends IService { IPage getList(ProductModelInfoSearchRequest request); ProductModelInfo getInfo(Integer modelId, String language); + + void deleteByModel(@NotEmpty List ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelParamsService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelParamsService.java index 917ab5ab..1d7e6c3b 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelParamsService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelParamsService.java @@ -10,6 +10,7 @@ import com.nflg.mobilebroken.common.pojo.vo.ProductModelParamVO; import com.nflg.mobilebroken.repository.entity.ProductModelParams; import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; import java.util.List; /** @@ -35,4 +36,6 @@ public interface IProductModelParamsService extends IService List getListByLanguage(Integer modelId, String language,boolean main); List getAllListByLanguage(Integer modelId, String language); + + void deleteByModel(@NotEmpty List ids); } 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 4bb3b6ae..a0e57b47 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 @@ -39,4 +39,6 @@ public interface IProductModelService extends IService { List getModelCompareInfo(@Valid BatchDeleteRequest request, String language); List getListForCompare(@Valid @NotNull String typeNo); + + void deleteByParent(String seriesName, String name); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelVideoService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelVideoService.java index 0023dad6..5a4e4450 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelVideoService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelVideoService.java @@ -8,6 +8,7 @@ import com.nflg.mobilebroken.common.pojo.vo.ProductVideoVO; import com.nflg.mobilebroken.repository.entity.ProductModelVideo; import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; import java.util.List; /** @@ -35,4 +36,6 @@ public interface IProductModelVideoService extends IService { ProductModelVideoInfoVO getInfo(Integer modelVideoId); List getListByLanguage(Integer modelId, String language); + + void deleteByModel(@NotEmpty List ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductPartInfoService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductPartInfoService.java index 419d1a0f..a79c82f6 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductPartInfoService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductPartInfoService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.mobilebroken.common.pojo.request.ProductPartInfoAddRequest; import com.nflg.mobilebroken.repository.entity.ProductPartInfo; +import javax.validation.constraints.NotEmpty; import java.util.List; /** @@ -21,4 +22,6 @@ public interface IProductPartInfoService extends IService { void update(List items); List getInfo(Integer partId); + + void delete(@NotEmpty List ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductSeriesInfoService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductSeriesInfoService.java index fcfe762b..b5438faf 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductSeriesInfoService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductSeriesInfoService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.mobilebroken.common.pojo.request.ProductSeriesInfoAddRequest; import com.nflg.mobilebroken.repository.entity.ProductSeriesInfo; +import javax.validation.constraints.NotEmpty; import java.util.List; /** @@ -21,4 +22,6 @@ public interface IProductSeriesInfoService extends IService { void update(List items); List getInfo(Integer seriesId); + + void delete(@NotEmpty List ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeFileService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeFileService.java index 5f4e8f4c..f1baae31 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeFileService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeFileService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.mobilebroken.common.pojo.request.ProductFileAddRequest; import com.nflg.mobilebroken.repository.entity.ProductTypeFile; +import javax.validation.constraints.NotEmpty; import java.util.List; /** @@ -21,4 +22,6 @@ public interface IProductTypeFileService extends IService { void update(Integer typeId, List files); List getInfo(Integer typeId); + + void delete(@NotEmpty List ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeInfoService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeInfoService.java index f16e63d3..03f1b066 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeInfoService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeInfoService.java @@ -5,6 +5,7 @@ import com.nflg.mobilebroken.common.pojo.request.ProductTypeInfoAddRequest; import com.nflg.mobilebroken.repository.entity.ProductTypeInfo; import org.springframework.transaction.annotation.Transactional; +import javax.validation.constraints.NotEmpty; import java.util.List; /** @@ -23,4 +24,6 @@ public interface IProductTypeInfoService extends IService { void update(List items); List getInfo(Integer typeId); + + void delete(@NotEmpty List ids); } 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 cacddd3d..7ce654e8 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 @@ -41,4 +41,6 @@ public interface IProductTypeService extends IService { Set getSimpleList(@Valid @NotBlank String seriesName); ProductTypeInfoVO getInfo(@Valid @NotNull Integer typeId); + + void deleteByParent(String name); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseInfoServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseInfoServiceImpl.java index 765c3e03..11735a91 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseInfoServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.nflg.mobilebroken.repository.service.impl; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.mobilebroken.common.pojo.request.ProductCaseInfoAddRequest; import com.nflg.mobilebroken.common.util.AdminUserUtil; @@ -68,4 +69,9 @@ public class ProductCaseInfoServiceImpl extends ServiceImpl getInfo(Integer caseId) { return baseMapper.getInfo(caseId); } + + @Override + public void delete(List ids) { + remove(new LambdaQueryWrapper().in(ProductCaseInfo::getCaseId, ids)); + } } 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 6af7632b..977d395b 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 @@ -117,6 +117,7 @@ public class ProductCaseServiceImpl extends ServiceImpl getInfo(Integer honorId) { return baseMapper.getInfo(honorId); } + + @Override + public void delete(List ids) { + remove(new LambdaQueryWrapper().in(ProductHonorInfo::getHonorId, ids)); + } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java index df5874f2..b944a158 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java @@ -118,6 +118,7 @@ public class ProductHonorServiceImpl extends ServiceImpl getInfo(Integer introId) { return baseMapper.getInfo(introId); } + + @Override + public void delete(List ids) { + remove(new LambdaQueryWrapper().in(ProductIntroInfo::getIntroId, ids)); + } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductIntroServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductIntroServiceImpl.java index 90811345..85580fb2 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductIntroServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductIntroServiceImpl.java @@ -107,6 +107,7 @@ public class ProductIntroServiceImpl extends ServiceImpl getInfo(Integer introId) { return baseMapper.getInfo(introId); } + + @Override + public void delete(List ids) { + remove(new LambdaQueryWrapper().in(ProductMobilebrokenIntroInfo::getMobilebrokenIntroId, ids)); + } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductMobilebrokenIntroServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductMobilebrokenIntroServiceImpl.java index b86a19f4..a04dc323 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductMobilebrokenIntroServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductMobilebrokenIntroServiceImpl.java @@ -58,6 +58,7 @@ public class ProductMobilebrokenIntroServiceImpl extends ServiceImpl getListByLanguage(Integer modelId, String language) { return baseMapper.getListByLanguage(modelId,language); } + + @Override + public void deleteByModel(List ids) { + remove(new LambdaQueryWrapper().in(ProductModelFile::getModelId, ids)); + } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelHotimageServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelHotimageServiceImpl.java index e1a090cb..86d65081 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelHotimageServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelHotimageServiceImpl.java @@ -1,5 +1,6 @@ package com.nflg.mobilebroken.repository.service.impl; +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; @@ -13,6 +14,7 @@ import com.nflg.mobilebroken.repository.service.IProductModelHotimageService; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.util.List; import java.util.Objects; /** @@ -117,4 +119,9 @@ public class ProductModelHotimageServiceImpl extends ServiceImpl ids) { + remove(new LambdaQueryWrapper().in(ProductModelHotimage::getModelId, ids)); + } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java index 2eee377d..4f750349 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java @@ -1,6 +1,7 @@ package com.nflg.mobilebroken.repository.service.impl; import cn.hutool.core.util.StrUtil; +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; @@ -164,4 +165,9 @@ public class ProductModelImageServiceImpl extends ServiceImpl getListByLanguage(Integer modelId, String language) { return baseMapper.getListByLanguage(modelId,language); } + + @Override + public void deleteByModel(List ids) { + remove(new LambdaQueryWrapper().in(ProductModelImage::getModelId, ids)); + } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelInfoServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelInfoServiceImpl.java index 0b161421..788cbc0f 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelInfoServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.nflg.mobilebroken.repository.service.impl; +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; @@ -17,6 +18,7 @@ import com.nflg.mobilebroken.repository.service.IProductModelInfoService; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.util.List; import java.util.Objects; /** @@ -103,4 +105,9 @@ public class ProductModelInfoServiceImpl extends ServiceImpl ids) { + remove(new LambdaQueryWrapper().in(ProductModelInfo::getModeId, ids)); + } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java index 7b4c4154..f34d74af 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java @@ -1,5 +1,6 @@ package com.nflg.mobilebroken.repository.service.impl; +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; @@ -128,4 +129,9 @@ public class ProductModelParamsServiceImpl extends ServiceImpl getAllListByLanguage(Integer modelId, String language) { return baseMapper.getAllListByLanguage(modelId, language); } + + @Override + public void deleteByModel(List ids) { + remove(new LambdaQueryWrapper().in(ProductModelParams::getModelId, ids)); + } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java index ced7c76f..d882f465 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java @@ -103,6 +103,7 @@ public class ProductModelServiceImpl extends ServiceImpl ids = lambdaQuery() + .eq(ProductModel::getSeriesName, seriesName) + .eq(ProductModel::getTypeName, typeName) + .list() + .stream() + .map(ProductModel::getId) + .collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(ids)){ + removeByIds(ids); + productPartParamsService.deleteByModel(ids); + productModelInfoService.deleteByModel(ids); + productModelFileService.deleteByModel(ids); + productModelImageService.deleteByModel(ids); + productModelVideoService.deleteByModel(ids); + productModelHotimageService.deleteByModel(ids); + } + } + private ProductModelCompareInfoVO getModelCompareInfo(Integer modelId, String language){ ProductModel productModel = getById(modelId); VUtils.trueThrowBusinessError(Objects.isNull(productModel)).throwMessage("无效的数据"); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java index 00f04440..7901e1b2 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java @@ -1,6 +1,7 @@ package com.nflg.mobilebroken.repository.service.impl; import cn.hutool.core.util.StrUtil; +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; @@ -162,4 +163,9 @@ public class ProductModelVideoServiceImpl extends ServiceImpl getListByLanguage(Integer modelId, String language) { return baseMapper.getListByLanguage(modelId,language); } + + @Override + public void deleteByModel(List ids) { + remove(new LambdaQueryWrapper().in(ProductModelVideo::getModelId, ids)); + } } \ No newline at end of file diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartInfoServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartInfoServiceImpl.java index 79ca6c21..e204873b 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartInfoServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.nflg.mobilebroken.repository.service.impl; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.mobilebroken.common.pojo.request.ProductPartInfoAddRequest; import com.nflg.mobilebroken.repository.entity.ProductPartInfo; @@ -65,4 +66,9 @@ public class ProductPartInfoServiceImpl extends ServiceImpl getInfo(Integer partId) { return baseMapper.getInfo(partId); } + + @Override + public void delete(List ids) { + remove(new LambdaQueryWrapper().in(ProductPartInfo::getPartId, ids)); + } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartServiceImpl.java index ce8c7695..1042dd95 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartServiceImpl.java @@ -122,6 +122,7 @@ public class ProductPartServiceImpl extends ServiceImpl getInfo(Integer seriesId) { return baseMapper.getInfo(seriesId); } + + @Override + public void delete(List ids) { + remove(new LambdaQueryWrapper().in(ProductSeriesInfo::getSeriesId, ids)); + } } 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 57211cfb..b28b9ef9 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 @@ -16,6 +16,8 @@ import com.nflg.mobilebroken.repository.entity.ProductSeries; import com.nflg.mobilebroken.repository.mapper.ProductSeriesMapper; import com.nflg.mobilebroken.repository.service.IProductSeriesInfoService; import com.nflg.mobilebroken.repository.service.IProductSeriesService; +import com.nflg.mobilebroken.repository.service.IProductTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,12 +36,16 @@ import java.util.stream.Collectors; * @author 代码生成器生成 * @since 2025 */ +@Slf4j @Service public class ProductSeriesServiceImpl extends ServiceImpl implements IProductSeriesService { @Resource private IProductSeriesInfoService productSeriesInfoService; + @Resource + private IProductTypeService productTypeService; + @Transactional @Override public void add(ProductSeriesAddRequest request) { @@ -82,6 +88,7 @@ public class ProductSeriesServiceImpl extends ServiceImpl names = lambdaQuery() + .in(ProductSeries::getId, request.getIds()) + .list() + .stream() + .map(ProductSeries::getName) + .collect(Collectors.toSet()); removeByIds(request.getIds()); + productSeriesInfoService.delete(request.getIds()); + names.forEach(name -> { + if (!lambdaQuery().eq(ProductSeries::getName, name).exists()){ + log.info("删除对应的设备类型数据"); + productTypeService.deleteByParent(name); + } + }); } @Override diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeFileServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeFileServiceImpl.java index 023514a5..3b98d963 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeFileServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeFileServiceImpl.java @@ -74,4 +74,9 @@ public class ProductTypeFileServiceImpl extends ServiceImpl getInfo(Integer typeId) { return baseMapper.getInfo(typeId); } + + @Override + public void delete(List ids) { + remove(new LambdaQueryWrapper().in(ProductTypeFile::getTypeId, ids)); + } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeInfoServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeInfoServiceImpl.java index 2b3da5ed..dd982f02 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeInfoServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.nflg.mobilebroken.repository.service.impl; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.mobilebroken.common.pojo.request.ProductTypeInfoAddRequest; import com.nflg.mobilebroken.common.util.AdminUserUtil; @@ -71,4 +72,9 @@ public class ProductTypeInfoServiceImpl extends ServiceImpl getInfo(Integer typeId) { return baseMapper.getInfo(typeId); } + + @Override + public void delete(List ids) { + remove(new LambdaQueryWrapper().in(ProductTypeInfo::getTypeId, ids)); + } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java index 5ded2a04..09b30d28 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java @@ -1,5 +1,6 @@ package com.nflg.mobilebroken.repository.service.impl; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -14,14 +15,17 @@ import com.nflg.mobilebroken.common.util.AdminUserUtil; import com.nflg.mobilebroken.common.util.VUtils; import com.nflg.mobilebroken.repository.entity.ProductType; import com.nflg.mobilebroken.repository.mapper.ProductTypeMapper; +import com.nflg.mobilebroken.repository.service.IProductModelService; import com.nflg.mobilebroken.repository.service.IProductTypeFileService; import com.nflg.mobilebroken.repository.service.IProductTypeInfoService; import com.nflg.mobilebroken.repository.service.IProductTypeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; +import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.Set; @@ -35,6 +39,7 @@ import java.util.stream.Collectors; * @author 代码生成器生成 * @since 2025 */ +@Slf4j @Service public class ProductTypeServiceImpl extends ServiceImpl implements IProductTypeService { @@ -44,6 +49,9 @@ public class ProductTypeServiceImpl extends ServiceImpl list = lambdaQuery() + .in(ProductType::getId, request.getIds()) + .list(); removeByIds(request.getIds()); + productTypeInfoService.delete(request.getIds()); + productTypeFileService.delete(request.getIds()); + if (CollectionUtil.isNotEmpty(list)) { + list.forEach(it -> { + if (!lambdaQuery() + .eq(ProductType::getSeriesName, it.getSeriesName()) + .eq(ProductType::getName, it.getName()) + .exists()) { + log.info("删除对应的设备机型数据"); + productModelService.deleteByParent(it.getSeriesName(), it.getName()); + } + }); + } } @Override @@ -177,4 +202,29 @@ public class ProductTypeServiceImpl extends ServiceImpl list = lambdaQuery().eq(ProductType::getSeriesName, name).list(); + if (CollectionUtil.isNotEmpty(list)) { + list.forEach(p -> { + delete(p.getId()); + }); + } + } + + private void delete(Integer typeId){ + ProductType info=getById(typeId); + removeById(typeId); + productTypeInfoService.delete(Collections.singletonList(typeId)); + productTypeFileService.delete(Collections.singletonList(typeId)); + if(!lambdaQuery() + .eq(ProductType::getName, info.getName()) + .eq(ProductType::getSeriesName, info.getSeriesName()) + .exists()){ + log.info("删除对应的设备机型数据"); + productModelService.deleteByParent(info.getSeriesName(), info.getName()); + } + } } diff --git a/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGenerator.java b/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGenerator.java index 477a24c7..b5fcb32c 100644 --- a/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGenerator.java +++ b/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGenerator.java @@ -34,7 +34,8 @@ public class CodeGenerator { ) .strategyConfig(builder -> { builder - .addInclude("^product_.*") //只生成指定表 +// .addInclude("^product_.*") //只生成指定表 + .addInclude("product") .entityBuilder() .enableLombok() .enableChainModel()