Commit 48f30b62 by zhangxingmin

push

parent 13f47762
...@@ -5,6 +5,7 @@ import com.yd.base.api.service.ApiFieldService; ...@@ -5,6 +5,7 @@ import com.yd.base.api.service.ApiFieldService;
import com.yd.base.feign.client.field.ApiFieldFeignClient; import com.yd.base.feign.client.field.ApiFieldFeignClient;
import com.yd.base.feign.request.field.ApiFieldAddRequest; import com.yd.base.feign.request.field.ApiFieldAddRequest;
import com.yd.base.feign.request.field.ApiFieldEditRequest; 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.request.field.ApiFieldPageRequest;
import com.yd.base.feign.response.field.ApiFieldDetailResponse; import com.yd.base.feign.response.field.ApiFieldDetailResponse;
import com.yd.base.feign.response.field.ApiFieldPageResponse; import com.yd.base.feign.response.field.ApiFieldPageResponse;
...@@ -14,6 +15,8 @@ import org.springframework.validation.annotation.Validated; ...@@ -14,6 +15,8 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/** /**
* 字段信息 * 字段信息
* *
...@@ -39,6 +42,16 @@ public class ApiFieldController implements ApiFieldFeignClient { ...@@ -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 * @param request
* @return * @return
......
...@@ -3,14 +3,19 @@ package com.yd.base.api.service; ...@@ -3,14 +3,19 @@ package com.yd.base.api.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yd.base.feign.request.field.ApiFieldAddRequest; import com.yd.base.feign.request.field.ApiFieldAddRequest;
import com.yd.base.feign.request.field.ApiFieldEditRequest; 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.request.field.ApiFieldPageRequest;
import com.yd.base.feign.response.field.ApiFieldDetailResponse; import com.yd.base.feign.response.field.ApiFieldDetailResponse;
import com.yd.base.feign.response.field.ApiFieldPageResponse; import com.yd.base.feign.response.field.ApiFieldPageResponse;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import java.util.List;
public interface ApiFieldService { public interface ApiFieldService {
Result<IPage<ApiFieldPageResponse>> page(ApiFieldPageRequest request); Result<IPage<ApiFieldPageResponse>> page(ApiFieldPageRequest request);
Result<List<ApiFieldDetailResponse>> list(ApiFieldListRequest request);
Result add(ApiFieldAddRequest request); Result add(ApiFieldAddRequest request);
Result edit(ApiFieldEditRequest request); Result edit(ApiFieldEditRequest request);
......
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.base.api.service.ApiFieldService; import com.yd.base.api.service.ApiFieldService;
import com.yd.base.feign.request.field.ApiFieldAddRequest; import com.yd.base.feign.request.field.ApiFieldAddRequest;
import com.yd.base.feign.request.field.ApiFieldEditRequest; 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.request.field.ApiFieldPageRequest;
import com.yd.base.feign.response.field.ApiFieldDetailResponse; import com.yd.base.feign.response.field.ApiFieldDetailResponse;
import com.yd.base.feign.response.field.ApiFieldPageResponse; import com.yd.base.feign.response.field.ApiFieldPageResponse;
...@@ -21,7 +22,12 @@ import lombok.extern.slf4j.Slf4j; ...@@ -21,7 +22,12 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; 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.Objects;
import java.util.stream.Collectors;
@Slf4j @Slf4j
@Service @Service
...@@ -43,6 +49,28 @@ public class ApiFieldServiceImpl implements ApiFieldService { ...@@ -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 * @param request
* @return * @return
......
...@@ -3,6 +3,7 @@ package com.yd.base.feign.client.field; ...@@ -3,6 +3,7 @@ package com.yd.base.feign.client.field;
import com.yd.base.feign.fallback.field.ApiFieldFeignFallbackFactory; import com.yd.base.feign.fallback.field.ApiFieldFeignFallbackFactory;
import com.yd.base.feign.request.field.ApiFieldAddRequest; import com.yd.base.feign.request.field.ApiFieldAddRequest;
import com.yd.base.feign.request.field.ApiFieldEditRequest; 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.request.field.ApiFieldPageRequest;
import com.yd.base.feign.response.field.ApiFieldDetailResponse; import com.yd.base.feign.response.field.ApiFieldDetailResponse;
import com.yd.common.result.Result; import com.yd.common.result.Result;
...@@ -10,6 +11,7 @@ import org.springframework.cloud.openfeign.FeignClient; ...@@ -10,6 +11,7 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.util.List;
/** /**
* 基础数据服务-字段信息Feign客户端 * 基础数据服务-字段信息Feign客户端
...@@ -26,6 +28,14 @@ public interface ApiFieldFeignClient { ...@@ -26,6 +28,14 @@ public interface ApiFieldFeignClient {
Result page(@RequestBody ApiFieldPageRequest request); Result page(@RequestBody ApiFieldPageRequest request);
/** /**
* 列表查询-字段
* @param request
* @return
*/
@PostMapping("/list")
Result<List<ApiFieldDetailResponse>> list(@RequestBody ApiFieldListRequest request);
/**
* 添加-字段 * 添加-字段
* @param request * @param request
* @return * @return
......
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;
}
}
...@@ -3,6 +3,7 @@ package com.yd.base.feign.fallback.field; ...@@ -3,6 +3,7 @@ package com.yd.base.feign.fallback.field;
import com.yd.base.feign.client.field.ApiFieldFeignClient; import com.yd.base.feign.client.field.ApiFieldFeignClient;
import com.yd.base.feign.request.field.ApiFieldAddRequest; import com.yd.base.feign.request.field.ApiFieldAddRequest;
import com.yd.base.feign.request.field.ApiFieldEditRequest; 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.request.field.ApiFieldPageRequest;
import com.yd.base.feign.response.field.ApiFieldDetailResponse; import com.yd.base.feign.response.field.ApiFieldDetailResponse;
import com.yd.common.result.Result; import com.yd.common.result.Result;
...@@ -10,6 +11,8 @@ import lombok.extern.slf4j.Slf4j; ...@@ -10,6 +11,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
/** /**
* 基础数据服务-字段信息Feign降级处理 * 基础数据服务-字段信息Feign降级处理
*/ */
...@@ -25,6 +28,11 @@ public class ApiFieldFeignFallbackFactory implements FallbackFactory<ApiFieldFei ...@@ -25,6 +28,11 @@ public class ApiFieldFeignFallbackFactory implements FallbackFactory<ApiFieldFei
} }
@Override @Override
public Result<List<ApiFieldDetailResponse>> list(ApiFieldListRequest request) {
return null;
}
@Override
public Result add(ApiFieldAddRequest request) { public Result add(ApiFieldAddRequest request) {
return null; return null;
} }
......
package com.yd.base.feign.request.field;
import lombok.Data;
import java.util.List;
@Data
public class ApiFieldListRequest {
private List<String> fieldBizIdList;
}
...@@ -95,4 +95,9 @@ public class ApiFieldDetailResponse { ...@@ -95,4 +95,9 @@ public class ApiFieldDetailResponse {
* 更新时间 * 更新时间
*/ */
private LocalDateTime updateTime; private LocalDateTime updateTime;
/**
* 文本框类型
*/
private String textBoxType;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment