oss-v1版本

yd-oss-api/src/main/java/com/yd/oss/api/controller/ApiRelObjectMaterialController.java

@@ -6,6 +6,7 @@ import com.yd.oss.api.service.ApiRelObjectMaterialService;
 import com.yd.oss.feign.client.ApiRelObjectMaterialFeignClient;
 import com.yd.oss.feign.request.ApiRelObjectMaterialListAddRequest;
 import com.yd.oss.feign.request.ApiRelObjectMaterialPageRequest;
+import com.yd.oss.feign.request.ApiRelObjectMaterialUploadSubmitRequest;
 import com.yd.oss.feign.response.ApiRelObjectMaterialPageResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -56,4 +57,14 @@ public class ApiRelObjectMaterialController implements ApiRelObjectMaterialFeign
         return apiRelObjectMaterialService.addRelObjectMaterialList(request);
     }
 
+    /**
+     * 上传-提交
+     * @param request
+     * @return
+     */
+    @Override
+    public Result submit(ApiRelObjectMaterialUploadSubmitRequest request) {
+        return null;
+    }
+
 }

yd-oss-api/src/main/java/com/yd/oss/api/service/ApiOssFileService.java

@@ -15,4 +15,7 @@ public interface ApiOssFileService {
 
     Result updateByMaterial(List<RelObjectMaterial> relObjectMaterialList,
                             List<ApiRelMaterialDto> materialDtoList);
+
+    Result updateByMaterial(String relObjectMaterialBizId,
+                            List<String> fileBizIdList);
 }

yd-oss-api/src/main/java/com/yd/oss/api/service/ApiRelObjectMaterialService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
 import com.yd.oss.feign.request.ApiRelObjectMaterialListAddRequest;
 import com.yd.oss.feign.request.ApiRelObjectMaterialPageRequest;
+import com.yd.oss.feign.request.ApiRelObjectMaterialUploadSubmitRequest;
 import com.yd.oss.feign.response.ApiRelObjectMaterialPageResponse;
 
 public interface ApiRelObjectMaterialService {
@@ -12,4 +13,6 @@ public interface ApiRelObjectMaterialService {
     Result del(String relObjectMaterialBizId);
 
     Result addRelObjectMaterialList(ApiRelObjectMaterialListAddRequest request);
+
+    Result submit(ApiRelObjectMaterialUploadSubmitRequest request);
 }

yd-oss-api/src/main/java/com/yd/oss/api/service/impl/ApiOssFileServiceImpl.java

@@ -94,6 +94,25 @@ public class ApiOssFileServiceImpl implements ApiOssFileService {
         return Result.success();
     }
 
+    @Override
+    public Result updateByMaterial(String relObjectMaterialBizId, List<String> fileBizIdList) {
+        if (CollectionUtils.isEmpty(fileBizIdList)) {
+            return Result.success();
+        }
+        List<OssFile> ossFileList = iOssFileService.queryList(OssFileDto.builder().fileBizIdList(fileBizIdList).build());
+        if (!CollectionUtils.isEmpty(ossFileList)) {
+            ossFileList = ossFileList.stream().map(file -> {
+                file.setObjectType(CommonEnum.UID_TYPE_REL_OBJECT_MATERIAL.getCode());
+                file.setObjectTableName(CommonEnum.UID_TYPE_REL_OBJECT_MATERIAL.getName());
+                file.setObjectTableName(CommonEnum.UID_TYPE_REL_OBJECT_MATERIAL.getCode());
+                file.setObjectBizId(relObjectMaterialBizId);
+                return file;
+            }).collect(Collectors.toList());
+            iOssFileService.saveOrUpdateBatch(ossFileList);
+        }
+        return Result.success();
+    }
+
     /**
      * 校验文件元数据信息是否存在
      * @param fileBizId

yd-oss-api/src/main/java/com/yd/oss/api/service/impl/ApiRelObjectMaterialServiceImpl.java

@@ -11,14 +11,17 @@ import com.yd.oss.api.service.ApiOssFileService;
 import com.yd.oss.api.service.ApiRelObjectMaterialService;
 import com.yd.oss.feign.request.ApiRelObjectMaterialListAddRequest;
 import com.yd.oss.feign.request.ApiRelObjectMaterialPageRequest;
+import com.yd.oss.feign.request.ApiRelObjectMaterialUploadSubmitRequest;
 import com.yd.oss.feign.response.ApiRelObjectMaterialPageResponse;
 import com.yd.oss.service.model.RelObjectMaterial;
 import com.yd.oss.service.service.IRelObjectMaterialService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 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.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -93,6 +96,24 @@ public class ApiRelObjectMaterialServiceImpl implements ApiRelObjectMaterialServ
     }
 
     /**
+     * 上传-提交
+     * @param request
+     * @return
+     */
+    @Override
+    public Result submit(ApiRelObjectMaterialUploadSubmitRequest request) {
+        Result<RelObjectMaterial> result = checkRelObjectMaterialIsExist(request.getRelObjectMaterialBizId());
+        RelObjectMaterial relObjectMaterial = result.getData();
+        if (!CollectionUtils.isEmpty(request.getFileBizIdList())) {
+            relObjectMaterial.setStatus("YSC");
+            iRelObjectMaterialService.saveOrUpdate(relObjectMaterial);
+        }
+        //更新保存文件元数据列表
+        apiOssFileService.updateByMaterial(relObjectMaterial.getRelObjectMaterialBizId(),request.getFileBizIdList());
+        return Result.success();
+    }
+
+    /**
      * 校验对象材料关系表信息是否存在
      * @param relObjectMaterialBizId
      * @return

yd-oss-feign/src/main/java/com/yd/oss/feign/client/ApiRelObjectMaterialFeignClient.java

@@ -4,6 +4,7 @@ import com.yd.common.result.Result;
 import com.yd.oss.feign.fallback.ApiRelObjectMaterialFeignFallbackFactory;
 import com.yd.oss.feign.request.ApiRelObjectMaterialListAddRequest;
 import com.yd.oss.feign.request.ApiRelObjectMaterialPageRequest;
+import com.yd.oss.feign.request.ApiRelObjectMaterialUploadSubmitRequest;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -42,5 +43,11 @@ public interface ApiRelObjectMaterialFeignClient {
     @PostMapping("/add/relObjectMaterialList")
     Result addRelObjectMaterialList(@Validated @RequestBody ApiRelObjectMaterialListAddRequest request);
 
-
+    /**
+     * 上传-提交
+     * @param request
+     * @return
+     */
+    @PostMapping("/upload/submit")
+    Result submit(@Validated @RequestBody ApiRelObjectMaterialUploadSubmitRequest request);
 }

yd-oss-feign/src/main/java/com/yd/oss/feign/fallback/ApiRelObjectMaterialFeignFallbackFactory.java

@@ -4,6 +4,7 @@ import com.yd.common.result.Result;
 import com.yd.oss.feign.client.ApiRelObjectMaterialFeignClient;
 import com.yd.oss.feign.request.ApiRelObjectMaterialListAddRequest;
 import com.yd.oss.feign.request.ApiRelObjectMaterialPageRequest;
+import com.yd.oss.feign.request.ApiRelObjectMaterialUploadSubmitRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
@@ -31,6 +32,11 @@ public class ApiRelObjectMaterialFeignFallbackFactory implements FallbackFactory
             public Result addRelObjectMaterialList(ApiRelObjectMaterialListAddRequest request) {
                 return null;
             }
+
+            @Override
+            public Result submit(ApiRelObjectMaterialUploadSubmitRequest request) {
+                return null;
+            }
         };
     }
 }

yd-oss-feign/src/main/java/com/yd/oss/feign/request/ApiRelObjectMaterialUploadSubmitRequest.java

+package com.yd.oss.feign.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ApiRelObjectMaterialUploadSubmitRequest {
+
+    /**
+     * 对象材料关系表唯一业务ID
+     */
+    private String relObjectMaterialBizId;
+
+    /**
+     * 文件元数据表唯一业务ID列表
+     */
+    private List<String> fileBizIdList;
+
+}