push

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

@@ -5,6 +5,7 @@ import com.yd.base.api.service.ApiFieldService;
 import com.yd.base.feign.client.field.ApiFieldFeignClient;
 import com.yd.base.feign.request.field.ApiFieldAddRequest;
 import com.yd.base.feign.request.field.ApiFieldEditRequest;
+import com.yd.base.feign.request.field.ApiFieldListRequest;
 import com.yd.base.feign.request.field.ApiFieldPageRequest;
 import com.yd.base.feign.response.field.ApiFieldDetailResponse;
 import com.yd.base.feign.response.field.ApiFieldPageResponse;
@@ -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 ApiFieldController implements ApiFieldFeignClient {
     }
 
     /**
+     * 列表查询-字段
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<List<ApiFieldDetailResponse>> list(ApiFieldListRequest request) {
+        return apiFieldService.list(request);
+    }
+
+    /**
      * 添加-字段
      * @param request
      * @return

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

@@ -3,14 +3,19 @@ package com.yd.base.api.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.base.feign.request.field.ApiFieldAddRequest;
 import com.yd.base.feign.request.field.ApiFieldEditRequest;
+import com.yd.base.feign.request.field.ApiFieldListRequest;
 import com.yd.base.feign.request.field.ApiFieldPageRequest;
 import com.yd.base.feign.response.field.ApiFieldDetailResponse;
 import com.yd.base.feign.response.field.ApiFieldPageResponse;
 import com.yd.common.result.Result;
 
+import java.util.List;
+
 public interface ApiFieldService {
     Result<IPage<ApiFieldPageResponse>> page(ApiFieldPageRequest request);
 
+    Result<List<ApiFieldDetailResponse>> list(ApiFieldListRequest request);
+
     Result add(ApiFieldAddRequest request);
 
     Result edit(ApiFieldEditRequest request);

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.base.api.service.ApiFieldService;
 import com.yd.base.feign.request.field.ApiFieldAddRequest;
 import com.yd.base.feign.request.field.ApiFieldEditRequest;
+import com.yd.base.feign.request.field.ApiFieldListRequest;
 import com.yd.base.feign.request.field.ApiFieldPageRequest;
 import com.yd.base.feign.response.field.ApiFieldDetailResponse;
 import com.yd.base.feign.response.field.ApiFieldPageResponse;
@@ -21,7 +22,12 @@ 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 java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -43,6 +49,28 @@ public class ApiFieldServiceImpl implements ApiFieldService {
     }
 
     /**
+     * 列表查询-字段
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<List<ApiFieldDetailResponse>> list(ApiFieldListRequest request) {
+        if (CollectionUtils.isEmpty(request.getFieldBizIdList())) {
+            return Result.success();
+        }
+        List<ApiFieldDetailResponse> responses = new ArrayList<>();
+        List<Field> fieldList = iFieldService.queryList(FieldDto.builder().fieldBizIdList(request.getFieldBizIdList()).build());
+        if (!CollectionUtils.isEmpty(fieldList)) {
+            responses = fieldList.stream().map(dto -> {
+                ApiFieldDetailResponse response = new ApiFieldDetailResponse();
+                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/field/ApiFieldFeignClient.java

@@ -3,6 +3,7 @@ package com.yd.base.feign.client.field;
 import com.yd.base.feign.fallback.field.ApiFieldFeignFallbackFactory;
 import com.yd.base.feign.request.field.ApiFieldAddRequest;
 import com.yd.base.feign.request.field.ApiFieldEditRequest;
+import com.yd.base.feign.request.field.ApiFieldListRequest;
 import com.yd.base.feign.request.field.ApiFieldPageRequest;
 import com.yd.base.feign.response.field.ApiFieldDetailResponse;
 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 ApiFieldFeignClient {
     Result page(@RequestBody ApiFieldPageRequest request);
 
     /**
+     * 列表查询-字段
+     * @param request
+     * @return
+     */
+    @PostMapping("/list")
+    Result<List<ApiFieldDetailResponse>> list(@RequestBody ApiFieldListRequest request);
+
+    /**
      * 添加-字段
      * @param request
      * @return

yd-base-feign/src/main/java/com/yd/base/feign/enums/SpeciesTypeEnum.java

+package com.yd.base.feign.enums;
+
+/**
+ * 规格类型枚举
+ */
+public enum SpeciesTypeEnum {
+
+    PROTECTION_PLAN("保障计划","PROTECTION_PLAN"),
+    PAYMENT_TERM("供款年期","PAYMENT_TERM"),
+    ;
+
+
+    //字典项标签（名称）
+    private String itemLabel;
+    //字典项值
+    private String itemValue;
+
+    //构造函数
+    SpeciesTypeEnum(String itemLabel, String itemValue) {
+        this.itemLabel = itemLabel;
+        this.itemValue = itemValue;
+    }
+    public String getItemLabel() {
+        return itemLabel;
+    }
+    public String getItemValue() {
+        return itemValue;
+    }
+}

yd-base-feign/src/main/java/com/yd/base/feign/fallback/field/ApiFieldFeignFallbackFactory.java

@@ -3,6 +3,7 @@ package com.yd.base.feign.fallback.field;
 import com.yd.base.feign.client.field.ApiFieldFeignClient;
 import com.yd.base.feign.request.field.ApiFieldAddRequest;
 import com.yd.base.feign.request.field.ApiFieldEditRequest;
+import com.yd.base.feign.request.field.ApiFieldListRequest;
 import com.yd.base.feign.request.field.ApiFieldPageRequest;
 import com.yd.base.feign.response.field.ApiFieldDetailResponse;
 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 ApiFieldFeignFallbackFactory implements FallbackFactory<ApiFieldFei
             }
 
             @Override
+            public Result<List<ApiFieldDetailResponse>> list(ApiFieldListRequest request) {
+                return null;
+            }
+
+            @Override
             public Result add(ApiFieldAddRequest request) {
                 return null;
             }

yd-base-feign/src/main/java/com/yd/base/feign/request/field/ApiFieldListRequest.java

+package com.yd.base.feign.request.field;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ApiFieldListRequest {
+
+    private List<String> fieldBizIdList;
+}

yd-base-feign/src/main/java/com/yd/base/feign/response/field/ApiFieldDetailResponse.java

@@ -95,4 +95,9 @@ public class ApiFieldDetailResponse {
      * 更新时间
      */
     private LocalDateTime updateTime;
+
+    /**
+     * 文本框类型
+     */
+    private String textBoxType;
 }