push

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

@@ -5,6 +5,7 @@ import com.yd.base.api.service.ApiFieldValueService;
 import com.yd.base.feign.client.fieldvalue.ApiFieldValueFeignClient;
 import com.yd.base.feign.request.fieldvalue.ApiFieldValueAddRequest;
 import com.yd.base.feign.request.fieldvalue.ApiFieldValueEditRequest;
+import com.yd.base.feign.request.fieldvalue.ApiFieldValueListRequest;
 import com.yd.base.feign.request.fieldvalue.ApiFieldValuePageRequest;
 import com.yd.base.feign.response.fieldvalue.ApiFieldValueDetailResponse;
 import com.yd.base.feign.response.fieldvalue.ApiFieldValuePageResponse;
@@ -14,6 +15,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;
+
 /**
  * 字段值信息
  *
@@ -39,6 +42,16 @@ public class ApiFieldValueController implements ApiFieldValueFeignClient {
     }
 
     /**
+     * 列表查询-字段值
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<List<ApiFieldValueDetailResponse>> list(ApiFieldValueListRequest request) {
+        return apiFieldValueService.list(request);
+    }
+
+    /**
      * 添加-字段值
      * @param request
      * @return

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

@@ -3,14 +3,19 @@ package com.yd.base.api.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.base.feign.request.fieldvalue.ApiFieldValueAddRequest;
 import com.yd.base.feign.request.fieldvalue.ApiFieldValueEditRequest;
+import com.yd.base.feign.request.fieldvalue.ApiFieldValueListRequest;
 import com.yd.base.feign.request.fieldvalue.ApiFieldValuePageRequest;
 import com.yd.base.feign.response.fieldvalue.ApiFieldValueDetailResponse;
 import com.yd.base.feign.response.fieldvalue.ApiFieldValuePageResponse;
 import com.yd.common.result.Result;
 
+import java.util.List;
+
 public interface ApiFieldValueService {
     Result<IPage<ApiFieldValuePageResponse>> page(ApiFieldValuePageRequest request);
 
+    Result<List<ApiFieldValueDetailResponse>> list(ApiFieldValueListRequest request);
+
     Result add(ApiFieldValueAddRequest request);
 
     Result edit(ApiFieldValueEditRequest request);

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

@@ -6,6 +6,7 @@ import com.yd.base.api.service.ApiFieldValueService;
 import com.yd.base.api.service.ApiRelFieldValueService;
 import com.yd.base.feign.request.fieldvalue.ApiFieldValueAddRequest;
 import com.yd.base.feign.request.fieldvalue.ApiFieldValueEditRequest;
+import com.yd.base.feign.request.fieldvalue.ApiFieldValueListRequest;
 import com.yd.base.feign.request.fieldvalue.ApiFieldValuePageRequest;
 import com.yd.base.feign.response.fieldvalue.ApiFieldValueDetailResponse;
 import com.yd.base.feign.response.fieldvalue.ApiFieldValuePageResponse;
@@ -23,8 +24,11 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -49,6 +53,25 @@ public class ApiFieldValueServiceImpl implements ApiFieldValueService {
     }
 
     /**
+     * 列表查询-字段值
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<List<ApiFieldValueDetailResponse>> list(ApiFieldValueListRequest request) {
+        List<ApiFieldValueDetailResponse> responses = new ArrayList<>();
+        List<FieldValue> fieldValueList = iFieldValueService.queryList(FieldValueDto.builder().fieldValueBizIdList(request.getFieldValueBizIdList()).build());
+        if (!CollectionUtils.isEmpty(fieldValueList)) {
+            responses = fieldValueList.stream().map(dto -> {
+                ApiFieldValueDetailResponse response = new ApiFieldValueDetailResponse();
+                BeanUtils.copyProperties(dto,response);
+                return response;
+            }).collect(Collectors.toList());
+        }
+        return Result.success(responses);
+    }
+
+    /**
      * 添加-字段值
      * @param request
      * @return

yd-base-feign/src/main/java/com/yd/base/feign/client/fieldvalue/ApiFieldValueFeignClient.java

@@ -3,6 +3,7 @@ package com.yd.base.feign.client.fieldvalue;
 import com.yd.base.feign.fallback.fieldvalue.ApiFieldValueFeignFallbackFactory;
 import com.yd.base.feign.request.fieldvalue.ApiFieldValueAddRequest;
 import com.yd.base.feign.request.fieldvalue.ApiFieldValueEditRequest;
+import com.yd.base.feign.request.fieldvalue.ApiFieldValueListRequest;
 import com.yd.base.feign.request.fieldvalue.ApiFieldValuePageRequest;
 import com.yd.base.feign.response.fieldvalue.ApiFieldValueDetailResponse;
 import com.yd.common.result.Result;
@@ -10,6 +11,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客户端
@@ -26,6 +28,14 @@ public interface ApiFieldValueFeignClient {
     Result page(@RequestBody ApiFieldValuePageRequest request);
 
     /**
+     * 列表查询-字段值
+     * @param request
+     * @return
+     */
+    @PostMapping("/list")
+    Result<List<ApiFieldValueDetailResponse>> list(@RequestBody ApiFieldValueListRequest request);
+
+    /**
      * 添加-字段值
      * @param request
      * @return

yd-base-feign/src/main/java/com/yd/base/feign/fallback/fieldvalue/ApiFieldValueFeignFallbackFactory.java

@@ -3,6 +3,7 @@ package com.yd.base.feign.fallback.fieldvalue;
 import com.yd.base.feign.client.fieldvalue.ApiFieldValueFeignClient;
 import com.yd.base.feign.request.fieldvalue.ApiFieldValueAddRequest;
 import com.yd.base.feign.request.fieldvalue.ApiFieldValueEditRequest;
+import com.yd.base.feign.request.fieldvalue.ApiFieldValueListRequest;
 import com.yd.base.feign.request.fieldvalue.ApiFieldValuePageRequest;
 import com.yd.base.feign.response.fieldvalue.ApiFieldValueDetailResponse;
 import com.yd.common.result.Result;
@@ -10,6 +11,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 基础数据服务-字段值信息Feign降级处理
  */
@@ -25,6 +28,11 @@ public class ApiFieldValueFeignFallbackFactory implements FallbackFactory<ApiFie
             }
 
             @Override
+            public Result<List<ApiFieldValueDetailResponse>> list(ApiFieldValueListRequest request) {
+                return null;
+            }
+
+            @Override
             public Result add(ApiFieldValueAddRequest request) {
                 return null;
             }

yd-base-feign/src/main/java/com/yd/base/feign/request/fieldvalue/ApiFieldValueListRequest.java

+package com.yd.base.feign.request.fieldvalue;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ApiFieldValueListRequest {
+
+    /**
+     * 字段值表唯一业务ID列表
+     */
+    private List<String> fieldValueBizIdList;
+}

yd-base-service/src/main/java/com/yd/base/service/dto/FieldValueDto.java

@@ -5,6 +5,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
 @Builder
 @NoArgsConstructor
@@ -17,6 +19,11 @@ public class FieldValueDto {
     private String fieldValueBizId;
 
     /**
+     * 字段值表唯一业务ID列表
+     */
+    private List<String> fieldValueBizIdList;
+
+    /**
      * 字段值
      */
     private String value;

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

@@ -13,6 +13,7 @@ import com.yd.base.service.model.FieldValue;
 import com.yd.base.service.service.IFieldValueService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.List;
 
@@ -43,6 +44,7 @@ public class FieldValueServiceImpl extends ServiceImpl<FieldValueMapper, FieldVa
         List<FieldValue> list = baseMapper.selectList(new LambdaQueryWrapper<FieldValue>()
                 .eq(StringUtils.isNotBlank(dto.getFieldValueBizId()) && !dto.getIsExcludeMy(),FieldValue::getFieldValueBizId,dto.getFieldValueBizId())
                 .eq(StringUtils.isNotBlank(dto.getValue()),FieldValue::getValue,dto.getValue())
+                .in(!CollectionUtils.isEmpty(dto.getFieldValueBizIdList()),FieldValue::getFieldValueBizId,dto.getFieldValueBizIdList())
                 .ne(dto.getIsExcludeMy(),FieldValue::getFieldValueBizId,dto.getFieldValueBizId())
         );
         return list;