Merge pull request #74 from Jzow/master

Update delete api -> deleteBatch api
eairps · Oct 8, 2023 · 1354b95 · 1354b95
2 parents 1a5cb2a + d9673a2
commit 1354b95
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 26 deletions.
diff --git a/api/src/main/java/com/wansensoft/api/product/ProductCategoryController.kt b/api/src/main/java/com/wansensoft/api/product/ProductCategoryController.kt
@@ -25,8 +25,8 @@ class ProductCategoryController(private val productCategoryService: ProductCateg
         return productCategoryService.addOrUpdateProductCategory(productCategory)
     }
 
-    @PostMapping("/delete")
-    fun deleteProductCategory(@RequestParam id: Long): Response<String> {
-        return productCategoryService.deleteProductCategory(id)
+    @PostMapping("/deleteBatch")
+    fun deleteProductCategory(@RequestParam ids: List<Long>): Response<String> {
+        return productCategoryService.deleteProductCategory(ids)
     }
 }
diff --git a/domain/src/main/java/com/wansensoft/dto/product/AddOrUpdateProductCategoryDTO.kt b/domain/src/main/java/com/wansensoft/dto/product/AddOrUpdateProductCategoryDTO.kt
@@ -9,13 +9,11 @@ class AddOrUpdateProductCategoryDTO {
 
     val categoryName: String? = null
 
-    val categoryLevel: Int? = null
+    val categoryNumber: String? = null
 
     val parentId: Long? = null
 
     val sort: Int? = null
 
-    val serialNumber: String? = null
-
     val remark: String? = null
 }
diff --git a/domain/src/main/java/com/wansensoft/entities/product/ProductCategory.java b/domain/src/main/java/com/wansensoft/entities/product/ProductCategory.java
@@ -54,9 +54,9 @@ public class ProductCategory implements Serializable {
     private String categoryName;
 
     /**
-     * 等级
+     * 分类编号
      */
-    private Integer categoryLevel;
+    private String categoryNumber;
 
     /**
      * 上级id
@@ -68,11 +68,6 @@ public class ProductCategory implements Serializable {
      */
     private Integer sort;
 
-    /**
-     * 编号
-     */
-    private String serialNumber;
-
     /**
      * 备注
      */

diff --git a/domain/src/main/java/com/wansensoft/vo/ProductCategoryVO.java b/domain/src/main/java/com/wansensoft/vo/ProductCategoryVO.java
@@ -18,6 +18,8 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
+
 @Data
 @Builder
 @NoArgsConstructor
@@ -27,16 +29,19 @@ public class ProductCategoryVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long parentId;
-
     private String categoryName;
 
-    private Integer categoryLevel;
+    private String categoryNumber;
 
-    private String serialNumber;
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long parentId;
+
+    private String parentName;
 
     private String remark;
 
     private Integer sort;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
 }
diff --git a/service/src/main/java/com/wansensoft/service/product/ProductCategoryService.kt b/service/src/main/java/com/wansensoft/service/product/ProductCategoryService.kt
@@ -24,5 +24,5 @@ interface ProductCategoryService : IService<ProductCategory> {
 
     fun addOrUpdateProductCategory(productCategory: AddOrUpdateProductCategoryDTO) : Response<String>
 
-    fun deleteProductCategory(id: Long?) : Response<String>
+    fun deleteProductCategory(ids: List<Long>?) : Response<String>
 }
diff --git a/service/src/main/java/com/wansensoft/service/product/impl/ProductCategoryServiceImpl.kt b/service/src/main/java/com/wansensoft/service/product/impl/ProductCategoryServiceImpl.kt
@@ -44,6 +44,14 @@ open class ProductCategoryServiceImpl(
             .list()
         productCategories.forEach {
             val productCategoryVO = ProductCategoryVO()
+            // 获取item的父级分类名称
+            val parentId = it.parentId
+            if (parentId != null) {
+                val parentCategory = lambdaQuery()
+                    .eq(ProductCategory::getId, parentId)
+                    .one()
+                productCategoryVO.parentName = parentCategory.categoryName
+            }
             BeanUtils.copyProperties(it, productCategoryVO)
             productCategoryVOs.add(productCategoryVO)
         }
@@ -61,10 +69,9 @@ open class ProductCategoryServiceImpl(
                         .id(SnowflakeIdUtil.nextId())
                         .tenantId(userId)
                         .categoryName(dto.categoryName)
-                        .categoryLevel(dto.categoryLevel)
+                        .categoryNumber(dto.categoryNumber)
                         .parentId(dto.parentId)
                         .sort(dto.sort)
-                        .serialNumber(dto.serialNumber)
                         .remark(dto.remark)
                         .createTime(LocalDateTime.now())
                         .createBy(userId)
@@ -80,10 +87,9 @@ open class ProductCategoryServiceImpl(
                     .eq(ProductCategory::getId, dto.id)
                     .apply {
                         set(StringUtils.hasText(dto.categoryName), ProductCategory::getCategoryName, dto.categoryName)
-                        set(dto.categoryLevel != null, ProductCategory::getCategoryLevel, dto.categoryLevel)
+                        set(StringUtils.hasText(dto.categoryNumber), ProductCategory::getCategoryNumber, dto.categoryNumber)
                         set(dto.parentId != null, ProductCategory::getParentId, dto.parentId)
                         set(dto.sort != null, ProductCategory::getSort, dto.sort)
-                        set(StringUtils.hasText(dto.serialNumber), ProductCategory::getSerialNumber, dto.serialNumber)
                         set(StringUtils.hasText(dto.remark), ProductCategory::getRemark, dto.remark)
                         set(ProductCategory::getUpdateTime, LocalDateTime.now())
                         set(ProductCategory::getUpdateBy, userId)
@@ -98,13 +104,13 @@ open class ProductCategoryServiceImpl(
         }
     }
 
-    override fun deleteProductCategory(id: Long?): Response<String> {
+    override fun deleteProductCategory(ids: List<Long>?): Response<String> {
         // 如果id为空返回参数错误 否则进行逻辑删除产品分类id
-        if(id == null) {
+        if(ids.isNullOrEmpty()) {
             return Response.responseMsg(BaseCodeEnum.PARAMETER_NULL)
         }
         val deleteResult = lambdaUpdate()
-            .eq(ProductCategory::getId, id)
+            .`in`(ProductCategory::getId, ids)
             .set(ProductCategory::getDeleteFlag, CommonConstants.DELETED)
             .update()