|
@@ -19,6 +19,7 @@
|
|
*/
|
|
*/
|
|
package cn.sagacloud.server.algorithm.controllers.modelFile
|
|
package cn.sagacloud.server.algorithm.controllers.modelFile
|
|
|
|
|
|
|
|
+import cn.sagacloud.server.algorithm.backstage.model.datacenter.DCFloor
|
|
import cn.sagacloud.server.algorithm.models.config.MyProperties
|
|
import cn.sagacloud.server.algorithm.models.config.MyProperties
|
|
import cn.sagacloud.server.algorithm.models.jsonAnalyzer.AllComponents
|
|
import cn.sagacloud.server.algorithm.models.jsonAnalyzer.AllComponents
|
|
import cn.sagacloud.server.algorithm.models.jsonAnalyzer.BaseObj
|
|
import cn.sagacloud.server.algorithm.models.jsonAnalyzer.BaseObj
|
|
@@ -29,12 +30,14 @@ import cn.sagacloud.server.algorithm.models.responses.UploadModelResponse
|
|
import cn.sagacloud.server.algorithm.services.BaseDataService
|
|
import cn.sagacloud.server.algorithm.services.BaseDataService
|
|
import cn.sagacloud.server.algorithm.services.CommonService
|
|
import cn.sagacloud.server.algorithm.services.CommonService
|
|
import cn.sagacloud.server.algorithm.services.activemq.JMSProducer
|
|
import cn.sagacloud.server.algorithm.services.activemq.JMSProducer
|
|
|
|
+import cn.sagacloud.server.algorithm.services.datacenter.DataCenterService
|
|
import cn.sagacloud.server.algorithm.services.endpoint.ModelFileService
|
|
import cn.sagacloud.server.algorithm.services.endpoint.ModelFileService
|
|
import cn.sagacloud.server.algorithm.services.excel.ExcelService
|
|
import cn.sagacloud.server.algorithm.services.excel.ExcelService
|
|
import cn.sagacloud.server.algorithm.services.http.HttpService
|
|
import cn.sagacloud.server.algorithm.services.http.HttpService
|
|
import cn.sagacloud.server.algorithm.services.message.MessageService
|
|
import cn.sagacloud.server.algorithm.services.message.MessageService
|
|
import cn.sagacloud.server.algorithm.services.monitor.ModelMonitorService
|
|
import cn.sagacloud.server.algorithm.services.monitor.ModelMonitorService
|
|
import cn.sagacloud.server.algorithm.services.json.JSONAnalyzerService
|
|
import cn.sagacloud.server.algorithm.services.json.JSONAnalyzerService
|
|
|
|
+import cn.sagacloud.server.algorithm.util.IdUtils
|
|
import com.sybotan.database.SFilter
|
|
import com.sybotan.database.SFilter
|
|
import com.sybotan.service.SPageContext
|
|
import com.sybotan.service.SPageContext
|
|
import com.sybotan.service.models.enums.SResponseType
|
|
import com.sybotan.service.models.enums.SResponseType
|
|
@@ -88,6 +91,9 @@ class ModelFileController {
|
|
@Autowired
|
|
@Autowired
|
|
lateinit var jsonAnalyzerService : JSONAnalyzerService
|
|
lateinit var jsonAnalyzerService : JSONAnalyzerService
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ lateinit var dataCenterService: DataCenterService
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 删除模型文件(只有记录, 文件不动)
|
|
* 删除模型文件(只有记录, 文件不动)
|
|
*
|
|
*
|
|
@@ -226,16 +232,36 @@ class ModelFileController {
|
|
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()
|
|
- // 如果楼层不存在, 则创建
|
|
|
|
|
|
+
|
|
|
|
+// var result = false
|
|
if(floor == null){
|
|
if(floor == null){
|
|
floor = modelFileService.addFloor(request)
|
|
floor = modelFileService.addFloor(request)
|
|
}
|
|
}
|
|
// 检查是否可以上传新模型
|
|
// 检查是否可以上传新模型
|
|
modelFileService.checkUpdatable(floor, request)
|
|
modelFileService.checkUpdatable(floor, request)
|
|
-
|
|
|
|
// 创建模型记录
|
|
// 创建模型记录
|
|
var model = modelFileService.addRecord(request, floor, properties)
|
|
var model = modelFileService.addRecord(request, floor, properties)
|
|
|
|
|
|
|
|
+
|
|
|
|
+ // 如果楼层不存在, 则创建
|
|
|
|
+ if(floor.hasCreate == false){
|
|
|
|
+ val dcfloor = DCFloor()
|
|
|
|
+ dcfloor.id = floor.id
|
|
|
|
+ dcfloor.buildingId = request.folderId
|
|
|
|
+ dcfloor.projectId = request.projectId
|
|
|
|
+ dcfloor.localId = request.localId
|
|
|
|
+ dcfloor.localName = request.localName
|
|
|
|
+ dcfloor.floorSequenceId = request.floorSequenceId
|
|
|
|
+ dcfloor.modelId = model.id
|
|
|
|
+ val result = dataCenterService.floorCreate(dcfloor,request.projectId!!)
|
|
|
|
+ if(!result){
|
|
|
|
+ return SBaseResponse(SResponseType.failure, "创建楼层失败")
|
|
|
|
+ }else{
|
|
|
|
+ if(!dataService.modelFileService.replace(model))
|
|
|
|
+ throw Exception("添加模型失败")
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
// 注册uploadId
|
|
// 注册uploadId
|
|
val uploadId = modelFileService.registerMultipartUpload(model, properties)
|
|
val uploadId = modelFileService.registerMultipartUpload(model, properties)
|
|
var uploadModelResponse = UploadModelResponse()
|
|
var uploadModelResponse = UploadModelResponse()
|