Selaa lähdekoodia

加上日志,用来调开发环境没有更新成功的问题

lijie 3 vuotta sitten
vanhempi
commit
25d53accd6

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

@@ -7,6 +7,7 @@ import cn.sagacloud.server.algorithm.models.modelFile.StatusInfo
 import cn.sagacloud.server.algorithm.services.BaseDataService
 import cn.sagacloud.server.algorithm.services.datacenter.DataCenterService
 import cn.sagacloud.server.algorithm.services.message.MessageService
+import com.alibaba.fastjson.JSON
 import com.sybotan.database.SFilter
 import com.sybotan.database.enums.SDirection
 import com.sybotan.service.models.requests.SUpdateRequest
@@ -68,12 +69,21 @@ class FinishState_4 : ModelState {
                     if (it.floorModelId == null) {
                         return@forEach
                     }
+                    if ("1f9d5619571411ecb3554ff529ee3e88".equals(it.id)){
+                        logger.error("开始计算空间影响状态:"+it.id)
+                    }
                     val floorModel = dataService.floorModelService.select(SFilter.and(SFilter.eq("currentModelId", it.id!!), SFilter.eq("id", it.floorModelId!!))).entity()
                             ?: return@forEach
+                    if ("1f9d5619571411ecb3554ff529ee3e88".equals(it.id)){
+                        logger.error("查询楼层模型:"+it.id)
+                    }
                     // 判断数据中心是否有楼层绑定了该模型
                     val floors = dataCenterService.getFloorWithModelId(it.floorModelId!!, it.projectId!!)
                     // 如果有绑定, 则执行受影响的业务空间函数
                     if (!floors.isNullOrEmpty()) {
+                        if ("1f9d5619571411ecb3554ff529ee3e88".equals(it.id)){
+                            logger.error("查询的楼层:"+ JSON.toJSONString(floors))
+                        }
                         val calcAffected = spaceAffectUtil.affectedSpace(it.projectId!!, it.floorModelId!!)
 //                                floorMapper.calcAffected(it.floorModelId!!)
                         // 如果返回true, 更新模型的statusInfo信息点
@@ -86,7 +96,7 @@ class FinishState_4 : ModelState {
                 }
             }catch (ex : Exception){
                 ex.printStackTrace()
-                logger.error(ex.message)
+                logger.error("###########计算空间影响状态报错:"+it.id+ex.message)
             }
         }
     }

+ 20 - 1
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/common/utils/SpaceAffectUtil.kt

@@ -10,6 +10,7 @@ import cn.sagacloud.server.algorithm.models.modelFile.ModelFile
 import cn.sagacloud.server.algorithm.services.BaseDataService.modelFileService
 import cn.sagacloud.server.algorithm.services.BaseDataService.spaceService
 import cn.sagacloud.server.algorithm.services.datacenter.DataCenterRequest
+import com.alibaba.fastjson.JSON
 import com.sybotan.service.SObjectService
 import com.sybotan.service.models.SCascadeQuery
 import com.sybotan.service.models.requests.SQueryRequest
@@ -54,24 +55,39 @@ class SpaceAffectUtil {
         if (StringUtils.isBlank(projectId) || StringUtils.isBlank(modelId)) {
             return true
         }
+        if ("d8ae3c23532711ec917d4bdbc1591e34".equals(modelId)){
+            logger.error("计算空间冲突:"+ modelId)
+        }
         // 查楼层下的空间.根据楼层id查询
         val spaceList = querySpaceByFloorModel(projectId, modelId)
         if (CollectionUtils.isEmpty(spaceList)) {
             return true
         }
+        if ("d8ae3c23532711ec917d4bdbc1591e34".equals(modelId)){
+            logger.error("空间数据:"+ JSON.toJSONString(spaceList))
+        }
         // 查原模型
         val modelIds = queryModelFile(projectId, modelId)
         if (CollectionUtils.size(modelIds) != 2) {
             return true
         }
+        if ("d8ae3c23532711ec917d4bdbc1591e34".equals(modelId)){
+            logger.error("空间模型id数据:"+ JSON.toJSONString(modelIds))
+        }
         // 查模型关联的元空间
         val iSpaceMap = queryMetaSpaceByModel(modelIds)
         if (CollectionUtils.isEmpty(iSpaceMap[modelIds!![1]])) {
             // 旧模型没有关联的元空间不需要处理
             return true
         }
+        if ("d8ae3c23532711ec917d4bdbc1591e34".equals(modelId)){
+            logger.error("查模型关联的元空间:"+ JSON.toJSONString(modelIds))
+        }
         // 获取有变化的空间列表
         val spaces = getAffectedSpaceIds(spaceList, iSpaceMap[modelIds[0]], iSpaceMap[modelIds[1]])
+        if ("d8ae3c23532711ec917d4bdbc1591e34".equals(modelId)){
+            logger.error("空间冲突的空间数据:"+ JSON.toJSONString(spaces))
+        }
         // 更新空间
         updateSpaceList(projectId, spaces)
         return true
@@ -203,7 +219,10 @@ class SpaceAffectUtil {
     private fun updateSpaceList(projectId: String, spaces: List<DCSpace?>?) {
         val request = UpdateRequest<DCSpace>()
         request.content = spaces as ArrayList<DCSpace>
-        service!!.spaceUpdate(request, projectId)
+        val spaceUpdate = service!!.spaceUpdate(request, projectId)
+        if (!"success".equals(spaceUpdate?.result!!)){
+            logger.error("#######更新空间失败:"+JSON.toJSONString(spaceUpdate))
+        }
     }
 
     /**

+ 1 - 0
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/services/datacenter/DataCenterRequest.kt

@@ -206,6 +206,7 @@ class DataCenterRequest{
             val resultStr = HttpService.sendPostDataCenter(properties.datacenter.spaceUpdate, postBody, projectId)
             return JSON.parseObject(resultStr, object : TypeReference<BaseResponse>() { })
         } catch (e: Exception) {
+            logger.error("#########更新空间失败:",e)
         }
         return null
     }

+ 13 - 12
revit-algorithm/src/main/resources-dev/application.yml

@@ -21,12 +21,12 @@ spring:
 #    url:                                jdbc:mysql://rm-2ze20ntn5y9ljsx147o.mysql.rds.aliyuncs.com:3306/revit?allowMultiQueries=true&serverTimezone=UTC&useUnicode=true&useSSL=false&characterEncoding=UTF-8
 #    username:                           root
 #    password:                           zVmW58LaAtjIKbb
-    url:                                jdbc:mysql://192.168.100.91:9934/revit?allowMultiQueries=true&serverTimezone=UTC&useUnicode=true&useSSL=false&characterEncoding=UTF-8
-    username:                           root
-    password:                           persagy@2021
-#    url:                                jdbc:mysql://cd-cdb-nboe1rje.sql.tencentcdb.com:61955/revit?allowMultiQueries=true&serverTimezone=UTC&useUnicode=true&useSSL=false&characterEncoding=UTF-8
+#    url:                                jdbc:mysql://192.168.100.91:9934/revit?allowMultiQueries=true&serverTimezone=UTC&useUnicode=true&useSSL=false&characterEncoding=UTF-8
 #    username:                           root
-#    password:                           Bdtp@1qaz@WSX
+#    password:                           persagy@2021
+    url:                                jdbc:mysql://cd-cdb-nboe1rje.sql.tencentcdb.com:61955/revit?allowMultiQueries=true&serverTimezone=UTC&useUnicode=true&useSSL=false&characterEncoding=UTF-8
+    username:                           root
+    password:                           Bdtp@1qaz@WSX
 
   second_datasource:
     name:                               revit-algorithm
@@ -35,19 +35,19 @@ spring:
 #    url:                                jdbc:mysql://rm-2ze20ntn5y9ljsx147o.mysql.rds.aliyuncs.com:3306/revit_calc?allowMultiQueries=true&serverTimezone=UTC&useUnicode=true&useSSL=false&characterEncoding=UTF-8
 #    username:                           root
 #    password:                           zVmW58LaAtjIKbb
-    url:                                jdbc:mysql://192.168.100.91:9934/revit_calc?allowMultiQueries=true&serverTimezone=UTC&useUnicode=true&useSSL=false&characterEncoding=UTF-8
-    username:                           root
-    password:                           persagy@2021
-#    url:                                jdbc:mysql://cd-cdb-nboe1rje.sql.tencentcdb.com:61955/revit_calc?allowMultiQueries=true&serverTimezone=UTC&useUnicode=true&useSSL=false&characterEncoding=UTF-8
+#    url:                                jdbc:mysql://192.168.100.91:9934/revit_calc?allowMultiQueries=true&serverTimezone=UTC&useUnicode=true&useSSL=false&characterEncoding=UTF-8
 #    username:                           root
-#    password:                           Bdtp@1qaz@WSX
+#    password:                           persagy@2021
+    url:                                jdbc:mysql://cd-cdb-nboe1rje.sql.tencentcdb.com:61955/revit_calc?allowMultiQueries=true&serverTimezone=UTC&useUnicode=true&useSSL=false&characterEncoding=UTF-8
+    username:                           root
+    password:                           Bdtp@1qaz@WSX
 
   jackson:
     date-format:                        yyyy-MM-dd HH:mm:ss
     time-zone:                          Asia/Shanghai
     default-property-inclusion:         non_null
     # 首字母大写
-    property-naming-strategy:           com.fasterxml.jackson.databind.PropertyNamingStrategy.PascalCaseStrategy
+    #property-naming-strategy:           com.fasterxml.jackson.databind.PropertyNamingStrategy.PascalCaseStrategy
     # 以下划线分隔全小写的单词
     #property-naming-strategy:           com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy
     mapper:
@@ -127,7 +127,8 @@ properties:
 
   datacenter:
     #url:                                http://39.105.112.36/datacenter/
-    url:                                http://127.0.0.1:8876/
+    url:                                http://develop.ysbdtp.com/datacenter/
+    #url:                                http://develop.ysbdtp.com/datacenter/
     # 设备相关接口
     equipCreate: ${properties.datacenter.url}object/equip/create
     equipDelete: ${properties.datacenter.url}object/equip/delete