|
@@ -223,6 +223,9 @@ class ModelFileController {
|
|
@ApiOperation(value = "准备分片上传模型文件接口", notes = "")
|
|
@ApiOperation(value = "准备分片上传模型文件接口", notes = "")
|
|
fun multipartUpload(@RequestBody request: UploadModelRequest): SBaseResponse {
|
|
fun multipartUpload(@RequestBody request: UploadModelRequest): SBaseResponse {
|
|
try {
|
|
try {
|
|
|
|
+ var model: ModelFile
|
|
|
|
+
|
|
|
|
+
|
|
modelFileService.checkUploadInputValid(request)
|
|
modelFileService.checkUploadInputValid(request)
|
|
var floor = dataService.floorModelService.select(SFilter.eq("projectId", request.projectId!!),
|
|
var floor = dataService.floorModelService.select(SFilter.eq("projectId", request.projectId!!),
|
|
SFilter.eq("floorName", request.floorName!!), SFilter.eq("folderId", request.folderId!!)).entity()
|
|
SFilter.eq("floorName", request.floorName!!), SFilter.eq("folderId", request.folderId!!)).entity()
|
|
@@ -233,11 +236,31 @@ class ModelFileController {
|
|
// 检查是否可以上传新模型
|
|
// 检查是否可以上传新模型
|
|
modelFileService.checkUpdatable(floor, request)
|
|
modelFileService.checkUpdatable(floor, request)
|
|
|
|
|
|
- // 创建模型记录
|
|
|
|
- var model = modelFileService.addRecord(request, floor, properties)
|
|
|
|
-
|
|
|
|
// 注册uploadId
|
|
// 注册uploadId
|
|
- val uploadId = modelFileService.registerMultipartUpload(model, properties)
|
|
|
|
|
|
+ var url: String
|
|
|
|
+ //是否jsonz文件
|
|
|
|
+ if(request.jsonz == true){
|
|
|
|
+ url = properties.fileService.exportPath
|
|
|
|
+ }else {
|
|
|
|
+ url = properties.fileService.registerMultipartUpload
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ if(request.modelId.isNullOrEmpty()){
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ // 创建模型记录
|
|
|
|
+ model = modelFileService.addRecord(request, floor, properties)
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ }else{
|
|
|
|
+
|
|
|
|
+ model = dataService.modelFileService.select(SFilter.eq("id",request.modelId!!)).entity()!!
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ val uploadId = modelFileService.registerMultipartUpload(model, properties,url)
|
|
var uploadModelResponse = UploadModelResponse()
|
|
var uploadModelResponse = UploadModelResponse()
|
|
uploadModelResponse.result = SResponseType.success
|
|
uploadModelResponse.result = SResponseType.success
|
|
uploadModelResponse.uploadId = uploadId
|
|
uploadModelResponse.uploadId = uploadId
|
|
@@ -270,10 +293,26 @@ class ModelFileController {
|
|
return SBaseResponse(SResponseType.failure, "状态${model.status}, 不能合并")
|
|
return SBaseResponse(SResponseType.failure, "状态${model.status}, 不能合并")
|
|
// 合并上传的分片文件
|
|
// 合并上传的分片文件
|
|
val mergeResult = modelFileService.mergeMultipart(request.uploadId!!, properties)
|
|
val mergeResult = modelFileService.mergeMultipart(request.uploadId!!, properties)
|
|
|
|
+ if(request.uploadModel == true){
|
|
|
|
+ if (mergeResult) {
|
|
|
|
+ model.jsonStatus = 2
|
|
|
|
+ model.md5 = request.md5
|
|
|
|
+ dataService.modelFileService.update(model, arrayListOf("status", "md5"))
|
|
|
|
+ monitorService.endUpload(request.modelId!!)
|
|
|
|
+ return SCreateResponse(arrayListOf(model))
|
|
|
|
+ }else{
|
|
|
|
+ return SBaseResponse(SResponseType.failure, "上传出错, 请稍后重新上传")
|
|
|
|
+ }
|
|
|
|
+ }
|
|
if (mergeResult) {
|
|
if (mergeResult) {
|
|
// 修改模型文件状态到已上传(1)
|
|
// 修改模型文件状态到已上传(1)
|
|
model.status = 1
|
|
model.status = 1
|
|
model.md5 = request.md5
|
|
model.md5 = request.md5
|
|
|
|
+ //jsonz状态改变
|
|
|
|
+ if(request.jsonz == true){
|
|
|
|
+ model.jsonStatus = 1
|
|
|
|
+ model.status = 3
|
|
|
|
+ }
|
|
dataService.modelFileService.update(model, arrayListOf("status", "md5"))
|
|
dataService.modelFileService.update(model, arrayListOf("status", "md5"))
|
|
monitorService.endUpload(request.modelId!!)
|
|
monitorService.endUpload(request.modelId!!)
|
|
return SCreateResponse(arrayListOf(model))
|
|
return SCreateResponse(arrayListOf(model))
|