Browse Source

!!!!20211030 mysql的json内"转义是\\",由于现有驱动bug,转义成\",导致无法保存。
改动驱动影响较大,由于此字段后续不直接使用,是通过查任务.resultjson获取,因此就先不要modelfile里的resultjson了

yucheng 3 years ago
parent
commit
153b1f5bfa

+ 4 - 0
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/backstage/state/DataCheckState_10.kt

@@ -205,12 +205,16 @@ class DataCheckState_10 : ModelState {
                             message = messageService.buildCheckErrorMessage(it.projectId, it.userId
                                     ?: "", "${folderFloorName.first}的${folderFloorName.second}未通过模型检查, 请修改后重新上传", "平面图命名和项目长度检查未通过", excelService.getDownloadUrl(it.id!!), folderFloorName)
                         }
+                        // 20211030 mysql的json内"转义是\\",由于现有驱动bug,先不要resultjson了
+                        it.taskInfo!!.checkTask!!.resultJson = null
                         dataService.modelFileService.update(it, UploadedState_1.projection)
                         monitorService.endCheck(it.id!!, checkTime)
                         monitorService.modelCheck(it.id!!, noReportMsg, true)
                         messageService.sendMessage(message)
                     } else if (it.status == 2) {
                         message = messageService.buildRefreshMessage(it.projectId, it.userId ?: "")
+                        // 20211030 mysql的json内"转义是\\",由于现有驱动bug,先不要resultjson了
+                        it.taskInfo!!.checkTask!!.resultJson = null
                         dataService.modelFileService.update(it, UploadedState_1.projection)
                         monitorService.endCheck(it.id!!, checkTime)
                         monitorService.modelCheck(it.id!!, singleModelCheckBegin!!, singleModelCheckEnd!!)

+ 4 - 1
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/backstage/state/DataExportState_20.kt

@@ -115,7 +115,6 @@ class DataExportState_20 : ModelState {
                             } else {
                                 if ("success".equals(json["Result"] as String?, ignoreCase = true)) {
                                     it.status = 3
-                                    task.resultJson = null
                                 } else {
                                     it.status = 21
                                 }
@@ -132,12 +131,16 @@ class DataExportState_20 : ModelState {
                         // 发送检查通过通知
                         message = messageService.buildExportErrorMessage(it.projectId, it.userId ?: "",
                                 "${folderFloorName.first}的${folderFloorName.second}模型上传失败,请重新上传", "模型导出数据失败: ${it.taskInfo!!.exportTask!!.resultJson}, 请联系开发人员")
+                        // 20211030 mysql的json内"转义是\\",由于现有驱动bug,先不要resultjson了
+                        it.taskInfo!!.exportTask!!.resultJson = null
                         dataService.modelFileService.update(it, UploadedState_1.projection)
                         monitorService.endExport(it.id!!, exportTime)
                         monitorService.modelExport(it.id!!, it.taskInfo!!.exportTask!!.resultJson, true)
                         messageService.sendMessage(message)
                     } else if (it.status == 3) {
                         message = messageService.buildRefreshMessage(it.projectId, it.userId ?: "")
+                        // 20211030 mysql的json内"转义是\\",由于现有驱动bug,先不要resultjson了
+                        it.taskInfo!!.exportTask!!.resultJson = null
                         dataService.modelFileService.update(it, UploadedState_1.projection)
                         monitorService.endExport(it.id!!, exportTime)
                         monitorService.modelExport(it.id!!)