Commit 24877f7d by zhangxingmin

oss-v1版本

parent 59fe034f
...@@ -3,13 +3,14 @@ package com.yd.oss.api.controller; ...@@ -3,13 +3,14 @@ package com.yd.oss.api.controller;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.oss.api.service.ApiMaterialService; import com.yd.oss.api.service.ApiMaterialService;
import com.yd.oss.feign.client.ApiMaterialFeignClient; import com.yd.oss.feign.client.ApiMaterialFeignClient;
import com.yd.oss.feign.request.ApiMaterialDownloadRequest;
import com.yd.oss.feign.request.ApiMaterialListRequest; import com.yd.oss.feign.request.ApiMaterialListRequest;
import com.yd.oss.feign.response.ApiMaterialDownloadResponse;
import com.yd.oss.feign.response.ApiMaterialListResponse; import com.yd.oss.feign.response.ApiMaterialListResponse;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; 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; import java.util.List;
/** /**
...@@ -35,4 +36,15 @@ public class ApiMaterialController implements ApiMaterialFeignClient { ...@@ -35,4 +36,15 @@ public class ApiMaterialController implements ApiMaterialFeignClient {
public Result<List<ApiMaterialListResponse>> list(ApiMaterialListRequest request) { public Result<List<ApiMaterialListResponse>> list(ApiMaterialListRequest request) {
return apiMaterialService.list(request); return apiMaterialService.list(request);
} }
/**
* 下载-材料列表压缩包
* @param request
* @return
*/
@Override
public Result<ApiMaterialDownloadResponse> downloadCompressedFile(ApiMaterialDownloadRequest request) {
return apiMaterialService.downloadCompressedFile(request);
}
} }
package com.yd.oss.api.service; package com.yd.oss.api.service;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.oss.feign.request.ApiMaterialDownloadRequest;
import com.yd.oss.feign.request.ApiMaterialListRequest; import com.yd.oss.feign.request.ApiMaterialListRequest;
import com.yd.oss.feign.response.ApiMaterialDownloadResponse;
import com.yd.oss.feign.response.ApiMaterialListResponse; import com.yd.oss.feign.response.ApiMaterialListResponse;
import java.util.List; import java.util.List;
public interface ApiMaterialService { public interface ApiMaterialService {
Result<List<ApiMaterialListResponse>> list(ApiMaterialListRequest request); Result<List<ApiMaterialListResponse>> list(ApiMaterialListRequest request);
Result<ApiMaterialDownloadResponse> downloadCompressedFile(ApiMaterialDownloadRequest request);
} }
...@@ -2,18 +2,20 @@ package com.yd.oss.api.service.impl; ...@@ -2,18 +2,20 @@ package com.yd.oss.api.service.impl;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.oss.api.service.ApiMaterialService; import com.yd.oss.api.service.ApiMaterialService;
import com.yd.oss.feign.request.ApiMaterialDownloadRequest;
import com.yd.oss.feign.request.ApiMaterialListRequest; import com.yd.oss.feign.request.ApiMaterialListRequest;
import com.yd.oss.feign.response.ApiMaterialDownloadResponse;
import com.yd.oss.feign.response.ApiMaterialListResponse; import com.yd.oss.feign.response.ApiMaterialListResponse;
import com.yd.oss.service.dto.MaterialDto; import com.yd.oss.service.dto.MaterialDto;
import com.yd.oss.service.model.Material; import com.yd.oss.service.model.Material;
import com.yd.oss.service.service.CompressedFileService;
import com.yd.oss.service.service.IMaterialService; import com.yd.oss.service.service.IMaterialService;
import lombok.extern.slf4j.Slf4j; 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 org.springframework.util.CollectionUtils;
import java.util.*;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Slf4j @Slf4j
...@@ -23,6 +25,9 @@ public class ApiMaterialServiceImpl implements ApiMaterialService { ...@@ -23,6 +25,9 @@ public class ApiMaterialServiceImpl implements ApiMaterialService {
@Autowired @Autowired
private IMaterialService iMaterialService; private IMaterialService iMaterialService;
@Autowired
private CompressedFileService compressedFileService;
/** /**
* 列表查询-材料基础信息 * 列表查询-材料基础信息
* @param request * @param request
...@@ -42,5 +47,15 @@ public class ApiMaterialServiceImpl implements ApiMaterialService { ...@@ -42,5 +47,15 @@ public class ApiMaterialServiceImpl implements ApiMaterialService {
return Result.success(); return Result.success();
} }
/**
* 下载-材料列表压缩包
* @param request
* @return
*/
@Override
public Result<ApiMaterialDownloadResponse> downloadCompressedFile(ApiMaterialDownloadRequest request) {
return compressedFileService.downloadCompressedFile(request);
}
} }
\ No newline at end of file
...@@ -2,12 +2,14 @@ package com.yd.oss.feign.client; ...@@ -2,12 +2,14 @@ package com.yd.oss.feign.client;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.oss.feign.fallback.ApiMaterialFeignFallbackFactory; import com.yd.oss.feign.fallback.ApiMaterialFeignFallbackFactory;
import com.yd.oss.feign.request.ApiMaterialDownloadRequest;
import com.yd.oss.feign.request.ApiMaterialListRequest; import com.yd.oss.feign.request.ApiMaterialListRequest;
import com.yd.oss.feign.response.ApiMaterialDownloadResponse;
import com.yd.oss.feign.response.ApiMaterialListResponse; import com.yd.oss.feign.response.ApiMaterialListResponse;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import java.util.List; import java.util.List;
/** /**
...@@ -23,4 +25,12 @@ public interface ApiMaterialFeignClient { ...@@ -23,4 +25,12 @@ public interface ApiMaterialFeignClient {
*/ */
@PostMapping("/list") @PostMapping("/list")
Result<List<ApiMaterialListResponse>> list(@RequestBody ApiMaterialListRequest request); Result<List<ApiMaterialListResponse>> list(@RequestBody ApiMaterialListRequest request);
/**
* 下载-材料列表压缩包
* @param request
* @return
*/
@PostMapping("/download/compressed/file")
Result<ApiMaterialDownloadResponse> downloadCompressedFile(@Validated @RequestBody ApiMaterialDownloadRequest request);
} }
...@@ -41,4 +41,6 @@ public interface ApiRelObjectMaterialFeignClient { ...@@ -41,4 +41,6 @@ public interface ApiRelObjectMaterialFeignClient {
*/ */
@PostMapping("/add/relObjectMaterialList") @PostMapping("/add/relObjectMaterialList")
Result addRelObjectMaterialList(@Validated @RequestBody ApiRelObjectMaterialListAddRequest request); Result addRelObjectMaterialList(@Validated @RequestBody ApiRelObjectMaterialListAddRequest request);
} }
package com.yd.oss.feign.dto;
import lombok.Data;
import java.util.List;
@Data
public class ApiMaterialDto {
/**
* 资料人(字典)
*/
private String dataPerson;
/**
* 资料类型(字典)
*/
private String dataType;
/**
* 文件URL列表
*/
private List<String> fileUrlList;
}
...@@ -2,6 +2,7 @@ package com.yd.oss.feign.fallback; ...@@ -2,6 +2,7 @@ package com.yd.oss.feign.fallback;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.oss.feign.client.ApiMaterialFeignClient; import com.yd.oss.feign.client.ApiMaterialFeignClient;
import com.yd.oss.feign.request.ApiMaterialDownloadRequest;
import com.yd.oss.feign.request.ApiMaterialListRequest; import com.yd.oss.feign.request.ApiMaterialListRequest;
import com.yd.oss.feign.response.ApiMaterialListResponse; import com.yd.oss.feign.response.ApiMaterialListResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -23,6 +24,11 @@ public class ApiMaterialFeignFallbackFactory implements FallbackFactory<ApiMater ...@@ -23,6 +24,11 @@ public class ApiMaterialFeignFallbackFactory implements FallbackFactory<ApiMater
public Result<List<ApiMaterialListResponse>> list(ApiMaterialListRequest request) { public Result<List<ApiMaterialListResponse>> list(ApiMaterialListRequest request) {
return null; return null;
} }
@Override
public Result downloadCompressedFile(ApiMaterialDownloadRequest request) {
return null;
}
}; };
} }
} }
package com.yd.oss.feign.request;
import com.yd.oss.feign.dto.ApiMaterialDto;
import lombok.Data;
import java.util.List;
@Data
public class ApiMaterialDownloadRequest {
/**
* 对象名(包名)
*/
private String objectName;
/**
* 对象业务ID
*/
private String objectBizId;
/**
* 材料列表
*/
private List<ApiMaterialDto> apiMaterialDtoList;
}
package com.yd.oss.feign.response;
import lombok.Data;
@Data
public class ApiMaterialDownloadResponse {
/**
* OSS文件URL
*/
private String url;
}
package com.yd.oss.service.service;
import com.yd.common.result.Result;
import com.yd.oss.feign.request.ApiMaterialDownloadRequest;
import com.yd.oss.feign.response.ApiMaterialDownloadResponse;
public interface CompressedFileService {
Result<ApiMaterialDownloadResponse> downloadCompressedFile(ApiMaterialDownloadRequest request);
}
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