3 Commits bf719f6116 ... 81eaca8e8e

Author SHA1 Message Date
  caiaf 81eaca8e8e 项目配置 3 years ago
  caiaf f884dbddfd merge 3 years ago
  caiaf 7ae6e0db58 merge 3 years ago

+ 1 - 1
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/controllers/modelEntity/ProjectController.kt

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController
  */
 @Api(tags = ["项目配置接口"])
 @RestController
-@RequestMapping("/project")
+@RequestMapping("/project/jsonConfig")
 class ProjectController {
 
     companion object {

+ 10 - 8
revit-algorithm/src/main/resources-dev/application.yml

@@ -18,7 +18,7 @@ spring:
     name:                               revit-algorithm
     type:                               com.alibaba.druid.pool.DruidDataSource
     driver-class-name:                  org.postgresql.Driver
-    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
+    url:                                jdbc:postgresql://192.168.64.15:5432/datacenterwanda
     #    url:                                jdbc:postgresql://192.168.20.250:5432/postgres
     #    url:                                jdbc:postgresql://47.94.89.44:5432/datacenter
     username:                           postgres
@@ -49,7 +49,7 @@ spring:
       max-request-size:                90MB        # 限制上传的多个文件的总大小
       max-file-size:                   90MB        # 限制单个文件的最大值
   activemq:
-    broker-url: failover:(tcp://39.102.40.239:61616)
+    broker-url: failover:(tcp://192.168.64.15:61616)
     in-memory: true
     pool:
       enabled: false
@@ -74,6 +74,7 @@ properties:
   #文件服务器配置
   fileService:
     # 基本属性
+    #url:                               http://api.sagacloud.cn/dp-auxiliary/image-service/ # http://47.93.33.207:28888/image-service/ #http://adm.sagacloud.cn/image-service/
     url:                               http://47.93.33.207:8888/image-service/
     systemId:                          revit
     secret:                            63afbef6906c342b
@@ -98,7 +99,7 @@ properties:
     mergeMultipartUpload:              ${properties.fileService.url}common/merge_multipart${properties.fileService.suffixWithSecret}&uploadId=
 
   scheduler:
-    url:                               http://39.102.40.239:8080/scheduler/
+    url:                               http://192.168.64.17:28890/scheduler/
     createTask:                        ${properties.scheduler.url}task/create
     queryTask:                         ${properties.scheduler.url}task/query
     queryTaskResult:                   ${properties.scheduler.url}result/query
@@ -106,7 +107,7 @@ properties:
 
 
   datacenter:
-    url:                               http://39.102.40.239:8080/datacenter/
+    url:                               http://192.168.64.17:28890/datacenter/
     # 设备相关接口
     equipCreate: ${properties.datacenter.url}object/equip/create
     equipDelete: ${properties.datacenter.url}object/equip/delete
@@ -125,17 +126,18 @@ properties:
     # 楼层相关接口
     floorQuery: ${properties.datacenter.url}object/floor/query
     floorUpdate: ${properties.datacenter.url}object/floor/update
+    floorCreate: ${properties.datacenter.url}object/floor/create
     # 绑定楼层接口
     floorBind: ${properties.datacenter.url}rel/update/equip-ispace
-    # 资产接口
-    propertyQuery: ${properties.datacenter.url}object/property/query
-    propertyUpdate: ${properties.datacenter.url}object/property/update
+#    # 资产接口
+#    propertyQuery: ${properties.datacenter.url}object/property/query
+#    propertyUpdate: ${properties.datacenter.url}object/property/update
     # 同步构件接口
     windowCreate: ${properties.datacenter.url}window/create_ignore
     vwallCreate: ${properties.datacenter.url}vwall/create_ignore
     doorCreate: ${properties.datacenter.url}door/create_ignore
 
   message:
-    url: http://39.102.40.239:8080/message-center/
+    url: http://192.168.64.17:28890/message-center/
     # 发送消息接口
     createPath: ${properties.message.url}message/create

+ 45 - 0
scheduler/src/main/kotlin/cn/sagacloud/server/scheduler/models/TaskEntity.kt

@@ -108,6 +108,51 @@ open class TaskEntity: SBaseEntity() {
     @JsonProperty(value = "DownloadFinishTime")
     @JSONField(name = "DownloadFinishTime")
     var downloadFinishTime: Date? = null
+
+    @JsonProperty(value = "FloorServerUrl")
+    @JSONField(name = "FloorServerUrl")
+    @Column(name = "floor_server_url")
+    var floorServerUrl:String? = null
+
+    @JsonProperty(value = "UseablePhaseName")
+    @JSONField(name = "UseablePhaseName")
+    @Column(name = "useable_phase_name")
+    var useablePhaseName:String? = null
+
+    @JsonProperty(value = "SagaSign")
+    @JSONField(name = "SagaSign")
+    @Column(name = "saga_sign")
+    var sagaSign:String? = null
+
+    @JsonProperty(value = "CheckItems")
+    @JSONField(name = "CheckItems")
+    @Column(name = "check_items")
+    var checkItems:String? = null
+
+    @JsonProperty(value = "FacilityParameters")
+    @JSONField(name = "FacilityParameters")
+    @Column(name = "facility_parameters")
+    var facilityParameters:String? = null
+
+    @JsonProperty(value = "SpaceParameters")
+    @JSONField(name = "SpaceParameters")
+    @Column(name = "space_parameters")
+    var spaceParameters:String? = null
+
+    @JsonProperty(value = "RoomParameters")
+    @JSONField(name = "RoomParameters")
+    @Column(name = "room_parameters")
+    var roomParameters:String? = null
+
+    @JsonProperty(value = "MEPCurveParameters")
+    @JSONField(name = "MEPCurveParameters")
+    @Column(name = "mepcurve_parameters")
+    var mEPCurveParameters:String? = null
+
+    @JsonProperty(value = "EquipComponentCode")
+    @JSONField(name = "EquipComponentCode")
+    @Column(name = "equip_code")
+    var equipComponentCode:String? = null
 } // Class AppendixType