push

yd-base-api/src/main/java/com/yd/base/api/controller/ApiSpeciesTypeController.java

@@ -3,6 +3,8 @@ package com.yd.base.api.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.base.api.service.SpeciesTypeService;
 import com.yd.base.feign.client.speciestype.ApiSpeciesTypeFeignClient;
+import com.yd.base.feign.dto.ApiSpeciesCustomizeDto;
+import com.yd.base.feign.request.speciestype.ApiSpeciesCustomizeSaveRequest;
 import com.yd.base.feign.request.speciestype.ApiSpeciesTypeAddRequest;
 import com.yd.base.feign.request.speciestype.ApiSpeciesTypeEditRequest;
 import com.yd.base.feign.request.speciestype.ApiSpeciesTypePageRequest;
@@ -14,6 +16,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 规格类型信息
  *
@@ -77,4 +81,15 @@ public class ApiSpeciesTypeController implements ApiSpeciesTypeFeignClient {
     public Result del(String speciesTypeBizId) {
         return speciesTypeService.del(speciesTypeBizId);
     }
+
+    /**
+     * 保存-规格自定义数据
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<List<ApiSpeciesCustomizeDto>> saveCustomize(ApiSpeciesCustomizeSaveRequest request) {
+        return speciesTypeService.saveCustomize(request);
+    }
+
 }

yd-base-api/src/main/java/com/yd/base/api/service/ApiRelObjectSpeciesService.java

 package com.yd.base.api.service;
 
+import com.yd.base.feign.request.relobjectspecies.ApiRelObjectListSpeciesListAddRequest;
 import com.yd.base.feign.request.relobjectspecies.ApiRelObjectSpeciesListAddRequest;
 import com.yd.base.feign.request.relobjectspecies.ApiRelObjectSpeciesQueryRequest;
 import com.yd.base.feign.response.relobjectspecies.ApiRelObjectSpeciesQueryResponse;
@@ -11,4 +12,6 @@ public interface ApiRelObjectSpeciesService {
     Result<List<ApiRelObjectSpeciesQueryResponse>> query(ApiRelObjectSpeciesQueryRequest request);
 
     Result addRelObjectSpeciesList(ApiRelObjectSpeciesListAddRequest request);
+
+    Result addRelObjectListSpeciesList(ApiRelObjectListSpeciesListAddRequest request);
 }

yd-base-api/src/main/java/com/yd/base/api/service/SpeciesTypeService.java

 package com.yd.base.api.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.base.feign.dto.ApiSpeciesCustomizeDto;
+import com.yd.base.feign.request.speciestype.ApiSpeciesCustomizeSaveRequest;
 import com.yd.base.feign.request.speciestype.ApiSpeciesTypeAddRequest;
 import com.yd.base.feign.request.speciestype.ApiSpeciesTypeEditRequest;
 import com.yd.base.feign.request.speciestype.ApiSpeciesTypePageRequest;
@@ -8,6 +10,8 @@ import com.yd.base.feign.response.speciestype.ApiSpeciesTypeDetailResponse;
 import com.yd.base.feign.response.speciestype.ApiSpeciesTypePageResponse;
 import com.yd.common.result.Result;
 
+import java.util.List;
+
 public interface SpeciesTypeService {
     Result<IPage<ApiSpeciesTypePageResponse>> page(ApiSpeciesTypePageRequest request);
 
@@ -18,4 +22,6 @@ public interface SpeciesTypeService {
     Result<ApiSpeciesTypeDetailResponse> detail(String speciesTypeBizId);
 
     Result del(String speciesTypeBizId);
+
+    Result<List<ApiSpeciesCustomizeDto>> saveCustomize(ApiSpeciesCustomizeSaveRequest request);
 }

yd-base-api/src/main/java/com/yd/base/api/service/impl/ApiRelObjectSpeciesServiceImpl.java

 package com.yd.base.api.service.impl;
 
 import com.yd.base.api.service.ApiRelObjectSpeciesService;
+import com.yd.base.feign.dto.ApiObjectDto;
+import com.yd.base.feign.request.relobjectspecies.ApiRelObjectListSpeciesListAddRequest;
 import com.yd.base.feign.request.relobjectspecies.ApiRelObjectSpeciesListAddRequest;
 import com.yd.base.feign.request.relobjectspecies.ApiRelObjectSpeciesQueryRequest;
 import com.yd.base.feign.response.relobjectspecies.ApiRelObjectSpeciesQueryResponse;
 import com.yd.base.service.model.RelObjectSpecies;
 import com.yd.base.service.service.IRelObjectSpeciesService;
 import com.yd.common.result.Result;
+import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -58,4 +64,29 @@ public class ApiRelObjectSpeciesServiceImpl implements ApiRelObjectSpeciesServic
         }
         return Result.success();
     }
+
+    /**
+     * 添加对象集合规格数据
+     * @param request
+     * @return
+     */
+    @Override
+    public Result addRelObjectListSpeciesList(ApiRelObjectListSpeciesListAddRequest request) {
+        if (!CollectionUtils.isEmpty(request.getApiObjectDtoList())) {
+            List<String> objectBizIdList = request.getApiObjectDtoList().stream().map(ApiObjectDto::getObjectBizId).collect(Collectors.toList());
+            iRelObjectSpeciesService.delByObjectBizIdList(objectBizIdList);
+
+            for (ApiObjectDto apiObjectDto : request.getApiObjectDtoList()) {
+                if (!CollectionUtils.isEmpty(request.getSpeciesTypeBizIdList())) {
+                    List<RelObjectSpecies> saveList = request.getSpeciesTypeBizIdList().stream().map(d -> {
+                        RelObjectSpecies relObjectSpecies = new RelObjectSpecies();
+                        BeanUtils.copyProperties(d,relObjectSpecies);
+                        return relObjectSpecies;
+                    }).collect(Collectors.toList());
+                }
+            }
+        }
+
+        return null;
+    }
 }

yd-base-api/src/main/java/com/yd/base/api/service/impl/ApiSpeciesTypeServiceImpl.java

@@ -3,6 +3,8 @@ package com.yd.base.api.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.base.api.service.SpeciesTypeService;
+import com.yd.base.feign.dto.ApiSpeciesCustomizeDto;
+import com.yd.base.feign.request.speciestype.ApiSpeciesCustomizeSaveRequest;
 import com.yd.base.feign.request.speciestype.ApiSpeciesTypeAddRequest;
 import com.yd.base.feign.request.speciestype.ApiSpeciesTypeEditRequest;
 import com.yd.base.feign.request.speciestype.ApiSpeciesTypePageRequest;
@@ -114,6 +116,18 @@ public class ApiSpeciesTypeServiceImpl implements SpeciesTypeService {
     }
 
     /**
+     * 保存-规格自定义数据
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<List<ApiSpeciesCustomizeDto>> saveCustomize(ApiSpeciesCustomizeSaveRequest request) {
+        //保存分类规格类型数据（对象规格）
+
+        return null;
+    }
+
+    /**
      * 校验规格类型对象是否存在
      * @param speciesTypeBizId
      * @return

yd-base-feign/src/main/java/com/yd/base/feign/client/speciestype/ApiSpeciesTypeFeignClient.java

 package com.yd.base.feign.client.speciestype;
 
+import com.yd.base.feign.dto.ApiSpeciesCustomizeDto;
 import com.yd.base.feign.fallback.speciestype.ApiSpeciesTypeFeignFallbackFactory;
+import com.yd.base.feign.request.speciestype.ApiSpeciesCustomizeSaveRequest;
 import com.yd.base.feign.request.speciestype.ApiSpeciesTypeAddRequest;
 import com.yd.base.feign.request.speciestype.ApiSpeciesTypeEditRequest;
 import com.yd.base.feign.request.speciestype.ApiSpeciesTypePageRequest;
@@ -10,6 +12,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 /**
  * 基础数据服务-规格类型类型信息Feign客户端
@@ -56,4 +59,12 @@ public interface ApiSpeciesTypeFeignClient {
      */
     @DeleteMapping("/del")
     Result del(@NotBlank(message = "规格类型表唯一业务ID能为空") @RequestParam(value = "speciesTypeBizId") String speciesTypeBizId);
+
+    /**
+     * 保存-规格自定义数据
+     * @param request
+     * @return
+     */
+    @PostMapping("/save/customize")
+    Result<List<ApiSpeciesCustomizeDto>> saveCustomize(@Validated @RequestBody ApiSpeciesCustomizeSaveRequest request);
 }

yd-base-feign/src/main/java/com/yd/base/feign/dto/ApiSpeciesCustomizeDto.java

+package com.yd.base.feign.dto;
+
+import lombok.Data;
+
+@Data
+public class ApiSpeciesCustomizeDto {
+
+    /**
+     * 规格类型表唯一业务ID
+     */
+    private String speciesTypeBizId;
+
+    /**
+     * 规格类型名称
+     */
+    private String typeName;
+
+    /**
+     * 规格表唯一业务ID
+     */
+    private String speciesBizId;
+
+    /**
+     * 规格值
+     */
+    private String value;
+}

yd-base-feign/src/main/java/com/yd/base/feign/fallback/speciestype/ApiSpeciesTypeFeignFallbackFactory.java

 package com.yd.base.feign.fallback.speciestype;
 
 import com.yd.base.feign.client.speciestype.ApiSpeciesTypeFeignClient;
+import com.yd.base.feign.dto.ApiSpeciesCustomizeDto;
+import com.yd.base.feign.request.speciestype.ApiSpeciesCustomizeSaveRequest;
 import com.yd.base.feign.request.speciestype.ApiSpeciesTypeAddRequest;
 import com.yd.base.feign.request.speciestype.ApiSpeciesTypeEditRequest;
 import com.yd.base.feign.request.speciestype.ApiSpeciesTypePageRequest;
@@ -10,6 +12,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 基础数据服务-规格类型信息Feign降级处理
  */
@@ -43,6 +47,11 @@ public class ApiSpeciesTypeFeignFallbackFactory implements FallbackFactory<ApiSp
             public Result del(String speciesTypeBizId) {
                 return null;
             }
+
+            @Override
+            public Result<List<ApiSpeciesCustomizeDto>> saveCustomize(ApiSpeciesCustomizeSaveRequest request) {
+                return null;
+            }
         };
     }
 }

yd-base-feign/src/main/java/com/yd/base/feign/request/relobjectspecies/ApiRelObjectListSpeciesListAddRequest.java

+package com.yd.base.feign.request.relobjectspecies;
+
+import com.yd.base.feign.dto.ApiObjectDto;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ApiRelObjectListSpeciesListAddRequest {
+
+    /**
+     * 对象集合
+     */
+    private List<ApiObjectDto> apiObjectDtoList;
+
+    /**
+     * 规格类型表唯一业务ID列表
+     */
+    private List<String> speciesTypeBizIdList;
+}

yd-base-feign/src/main/java/com/yd/base/feign/request/speciestype/ApiSpeciesCustomizeSaveRequest.java

+package com.yd.base.feign.request.speciestype;
+
+import com.yd.base.feign.dto.ApiObjectDto;
+import com.yd.base.feign.dto.ApiSpeciesCustomizeDto;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ApiSpeciesCustomizeSaveRequest {
+
+    /**
+     * 分类集合
+     */
+    private List<ApiObjectDto> apiObjectDtoList;
+
+    /**
+     * 自定义规格数据列表
+     */
+    private List<ApiSpeciesCustomizeDto> apiSpeciesCustomizeDtoList;
+}

yd-base-service/src/main/java/com/yd/base/service/service/IRelObjectSpeciesService.java

@@ -20,4 +20,6 @@ public interface IRelObjectSpeciesService extends IService<RelObjectSpecies> {
     List<ApiRelObjectSpeciesQueryResponse> query(ApiRelObjectSpeciesQueryRequest request);
 
     Boolean delByObjectBizId(String objectBizId);
+
+    Boolean delByObjectBizIdList(List<String> objectBizIdList);
 }

yd-base-service/src/main/java/com/yd/base/service/service/impl/RelObjectSpeciesServiceImpl.java

@@ -31,4 +31,9 @@ public class RelObjectSpeciesServiceImpl extends ServiceImpl<RelObjectSpeciesMap
     public Boolean delByObjectBizId(String objectBizId) {
         return this.remove(new LambdaQueryWrapper<RelObjectSpecies>().eq(RelObjectSpecies::getObjectBizId,objectBizId));
     }
+
+    @Override
+    public Boolean delByObjectBizIdList(List<String> objectBizIdList) {
+        return this.remove(new LambdaQueryWrapper<RelObjectSpecies>().in(RelObjectSpecies::getObjectBizId,objectBizIdList));
+    }
 }