浏览代码

********************WX******************
关系查询搜索

zhangweixin 4 年之前
父节点
当前提交
82ef45708f
共有 19 个文件被更改,包括 1539 次插入1659 次删除
  1. 0 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSyForSh.kt
  2. 108 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/REq2BdTwo.kt
  3. 53 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/REq2EqTwo.kt
  4. 101 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/REq2FlTwo.kt
  5. 101 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/REq2ShTwo.kt
  6. 53 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/REq2SyTwo.kt
  7. 119 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RPe2SpTwo.kt
  8. 101 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RPeInShTwo.kt
  9. 114 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSy2SpTwo.kt
  10. 41 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSyForBdTwo.kt
  11. 40 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSyForFlTwo.kt
  12. 40 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSyForShTwo.kt
  13. 93 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RelVBase.kt
  14. 26 0
      datacenter/src/main/kotlin/com/persagy/server/services/base/CommonServices.kt
  15. 511 1649
      datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt
  16. 1 1
      equip-component/build.gradle
  17. 2 4
      equip-component/src/main/kotlin/com/persagy/server/service/labsl/CustomSqlLabslService.kt
  18. 4 4
      equip-component/src/main/resources/application-prod.yml
  19. 31 0
      equip-component/src/main/resources/application-prod1.yml

+ 0 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSyForSh.kt

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column

+ 108 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/REq2BdTwo.kt

@@ -0,0 +1,108 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.rel.archforarch
+
+import com.persagy.server.datacenter.models.entities.base.RBaseInfo
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+/**
+ * 空间和空间关系
+ *
+ * @author 张维新
+ */
+@Schema(description = "设备和建筑关系")
+@Table(name = "relationship.v_eq2bd")
+class REq2BdTwo : RBaseInfo(){
+
+    /** 空间Id */
+    @Schema(description = "空间Id")
+    @Id
+    @Column(name = "id1")
+    var id1: String? = null
+
+    /** 空间Id */
+    @Schema(description = "空间Id")
+    @Id
+    @Column(name = "id2")
+    var id2: String? = null
+
+    /** 项目Id */
+    @Schema(description = "项目Id")
+    @Id
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    /** 类型 */
+    @Schema(description = "类型 " )
+    @Id
+    @Column(name = "type")
+    var type: String? = null
+
+    /** 计算标记 1 为手动 2为自动 */
+    @Schema(description = "计算标记 1 为手动 2为自动 ")
+    @Column(name = "sign")
+    var sign: Int? = null
+
+    /** 设备本地编码 */
+    @Schema(description = "设备本地编码")
+    @Column(name = "local_id1")
+    var localId1: String? = null
+
+    /** 设备本地名称 */
+    @Schema(description = "设备本地名称")
+    @Column(name = "local_name1")
+    var localName1: String? = null
+
+    /** 设备本地编码 */
+    @Schema(description = "设备本地编码")
+    @Column(name = "local_id2")
+    var localId2: String? = null
+
+    /** 设备本地名称 */
+    @Schema(description = "设备本地名称")
+    @Column(name = "local_name2")
+    var localName2: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
+    /** 名称 */
+    @Schema(description = "主对象cadid")
+    @Column(name = "cad_id1")
+    var cadId1: String? = null
+
+}

+ 53 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/REq2EqTwo.kt

@@ -0,0 +1,53 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2021.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+package com.persagy.server.datacenter.models.entities.rel.archforarch
+
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+@Schema(description = "设备和系统")
+@Table(name = "relationship.v_eq2eq")
+class REq2EqTwo : RelVBase() {
+
+    /** 名称 */
+    @Schema(description = "主对象cadid")
+    @Column(name = "cad_id1")
+    var cadId1: String? = null
+
+    /** 名称 */
+    @Schema(description = "从对象cadid")
+    @Column(name = "cad_id2")
+    var cadId2: String? = null
+
+    /** 类型 */
+    @Schema(description = "类型 " )
+    @Id
+    @Column(name = "type")
+    var type: String? = null
+
+}

+ 101 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/REq2FlTwo.kt

@@ -0,0 +1,101 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.rel.archforarch
+
+import com.persagy.server.datacenter.models.entities.base.RBaseInfo
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+/**
+ * 空间和空间关系
+ *
+ * @author 张维新
+ */
+@Schema(description = "设备和建筑关系")
+@Table(name = "relationship.v_eqforfl")
+class REq2FlTwo : RBaseInfo(){
+
+    /** 空间Id */
+    @Schema(description = "空间Id")
+    @Id
+    @Column(name = "id1")
+    var id1: String? = null
+
+    /** 空间Id */
+    @Schema(description = "空间Id")
+    @Id
+    @Column(name = "id2")
+    var id2: String? = null
+
+    /** 项目Id */
+    @Schema(description = "项目Id")
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    /** 计算标记 1 为手动 2为自动 */
+    @Schema(description = "计算标记 1 为手动 2为自动 ")
+    @Column(name = "sign")
+    var sign: Int? = null
+
+    /** 设备本地编码 */
+    @Schema(description = "设备本地编码")
+    @Column(name = "local_id1")
+    var localId1: String? = null
+
+    /** 设备本地名称 */
+    @Schema(description = "设备本地名称")
+    @Column(name = "local_name1")
+    var localName1: String? = null
+
+    /** 设备本地编码 */
+    @Schema(description = "设备本地编码")
+    @Column(name = "local_id2")
+    var localId2: String? = null
+
+    /** 设备本地名称 */
+    @Schema(description = "设备本地名称")
+    @Column(name = "local_name2")
+    var localName2: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
+    /** 名称 */
+    @Schema(description = "主对象cadid")
+    @Column(name = "cad_id1")
+    var cadId1: String? = null
+
+}

+ 101 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/REq2ShTwo.kt

@@ -0,0 +1,101 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.rel.archforarch
+
+import com.persagy.server.datacenter.models.entities.base.RBaseInfo
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+/**
+ * 空间和空间关系
+ *
+ * @author 张维新
+ */
+@Schema(description = "设备和建筑关系")
+@Table(name = "relationship.v_eqforsh")
+class REq2ShTwo : RBaseInfo(){
+
+    /** 空间Id */
+    @Schema(description = "空间Id")
+    @Id
+    @Column(name = "id1")
+    var id1: String? = null
+
+    /** 空间Id */
+    @Schema(description = "空间Id")
+    @Id
+    @Column(name = "id2")
+    var id2: String? = null
+
+    /** 项目Id */
+    @Schema(description = "项目Id")
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    /** 计算标记 1 为手动 2为自动 */
+    @Schema(description = "计算标记 1 为手动 2为自动 ")
+    @Column(name = "sign")
+    var sign: Int? = null
+
+    /** 设备本地编码 */
+    @Schema(description = "设备本地编码")
+    @Column(name = "local_id1")
+    var localId1: String? = null
+
+    /** 设备本地名称 */
+    @Schema(description = "设备本地名称")
+    @Column(name = "local_name1")
+    var localName1: String? = null
+
+    /** 设备本地编码 */
+    @Schema(description = "设备本地编码")
+    @Column(name = "local_id2")
+    var localId2: String? = null
+
+    /** 设备本地名称 */
+    @Schema(description = "设备本地名称")
+    @Column(name = "local_name2")
+    var localName2: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
+    /** 名称 */
+    @Schema(description = "主对象cadid")
+    @Column(name = "cad_id1")
+    var cadId1: String? = null
+
+}

+ 53 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/REq2SyTwo.kt

@@ -0,0 +1,53 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2021.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+package com.persagy.server.datacenter.models.entities.rel.archforarch
+
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+@Schema(description = "设备和系统")
+@Table(name = "relationship.v_eq2sy")
+class REq2SyTwo : RelVBase() {
+
+    /** 名称 */
+    @Schema(description = "主对象cadid")
+    @Column(name = "cad_id1")
+    var cadId1: String? = null
+
+    /** 名称 */
+    @Schema(description = "从对象cadid")
+    @Column(name = "cad_id2")
+    var cadId2: String? = null
+
+    /** 类型 */
+    @Schema(description = "类型 " )
+    @Id
+    @Column(name = "type")
+    var type: String? = null
+
+}

+ 119 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RPe2SpTwo.kt

@@ -0,0 +1,119 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.rel.archforarch
+
+import com.persagy.server.datacenter.models.entities.base.RBaseInfo
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+/**
+ * 空间和空间关系
+ *
+ * @author 张维新
+ */
+@Schema(description = "竖井和空间关系")
+@Table(name = "relationship.v_pe2sp")
+class RPe2SpTwo : RBaseInfo(){
+
+    /** 空间Id */
+    @Schema(description = "空间Id")
+    @Id
+    @Column(name = "id1")
+    var id1: String? = null
+
+    /** 空间Id */
+    @Schema(description = "空间Id")
+    @Id
+    @Column(name = "id2")
+    var id2: String? = null
+
+    /** 项目Id */
+    @Schema(description = "项目Id")
+    @Id
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    /** 类型 */
+    @Schema(description = "类型 " )
+    @Id
+    @Column(name = "type")
+    var type: String? = null
+
+    /** 图类型 */
+    @Schema(description = "图类型 " )
+    @Column(name = "graph_code")
+    var graphCode: String? = null
+
+    /** 空间类型 */
+    @Schema(description = "空间类型 " )
+    @Id
+    @Column(name = "zone_type")
+    var zoneType: String? = null
+
+    /** 计算标记 1 为手动 2为自动 */
+    @Schema(description = "计算标记 1 为手动 2为自动 ")
+    @Column(name = "sign")
+    var sign: Int? = null
+
+    /** 设备本地编码 */
+    @Schema(description = "设备本地编码")
+    @Column(name = "local_id1")
+    var localId1: String? = null
+
+    /** 设备本地名称 */
+    @Schema(description = "设备本地名称")
+    @Column(name = "local_name1")
+    var localName1: String? = null
+
+    /** 设备本地编码 */
+    @Schema(description = "设备本地编码")
+    @Column(name = "local_id2")
+    var localId2: String? = null
+
+    /** 设备本地名称 */
+    @Schema(description = "设备本地名称")
+    @Column(name = "local_name2")
+    var localName2: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
+    /** cadId1 */
+    @Schema(description = "cadId1")
+    @Column(name = "cad_id1")
+    var cadId1: String? = null
+
+}

+ 101 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RPeInShTwo.kt

@@ -0,0 +1,101 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.rel.archforarch
+
+import com.persagy.server.datacenter.models.entities.base.RBaseInfo
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+/**
+ * 空间和空间关系
+ *
+ * @author 张维新
+ */
+@Schema(description = "设备和建筑关系")
+@Table(name = "relationship.v_peinsh")
+class RPeInShTwo : RBaseInfo(){
+
+    /** 空间Id */
+    @Schema(description = "空间Id")
+    @Id
+    @Column(name = "id1")
+    var id1: String? = null
+
+    /** 空间Id */
+    @Schema(description = "空间Id")
+    @Id
+    @Column(name = "id2")
+    var id2: String? = null
+
+    /** 项目Id */
+    @Schema(description = "项目Id")
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    /** 计算标记 1 为手动 2为自动 */
+    @Schema(description = "计算标记 1 为手动 2为自动 ")
+    @Column(name = "sign")
+    var sign: Int? = null
+
+    /** 设备本地编码 */
+    @Schema(description = "设备本地编码")
+    @Column(name = "local_id1")
+    var localId1: String? = null
+
+    /** 设备本地名称 */
+    @Schema(description = "设备本地名称")
+    @Column(name = "local_name1")
+    var localName1: String? = null
+
+    /** 设备本地编码 */
+    @Schema(description = "设备本地编码")
+    @Column(name = "local_id2")
+    var localId2: String? = null
+
+    /** 设备本地名称 */
+    @Schema(description = "设备本地名称")
+    @Column(name = "local_name2")
+    var localName2: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
+    /** 名称 */
+    @Schema(description = "主对象cadid")
+    @Column(name = "cad_id1")
+    var cadId1: String? = null
+
+}

+ 114 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSy2SpTwo.kt

@@ -0,0 +1,114 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.rel.archforarch
+
+import com.persagy.server.datacenter.models.entities.base.RBaseInfo
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+/**
+ * 空间和空间关系
+ *
+ * @author 张维新
+ */
+@Schema(description = "竖井和空间关系")
+@Table(name = "relationship.v_sy2sp")
+class RSy2SpTwo : RBaseInfo(){
+
+    /** 空间Id */
+    @Schema(description = "空间Id")
+    @Id
+    @Column(name = "id1")
+    var id1: String? = null
+
+    /** 空间Id */
+    @Schema(description = "空间Id")
+    @Id
+    @Column(name = "id2")
+    var id2: String? = null
+
+    /** 项目Id */
+    @Schema(description = "项目Id")
+    @Id
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    /** 类型 */
+    @Schema(description = "类型 " )
+    @Id
+    @Column(name = "type")
+    var type: String? = null
+
+    /** 空间类型 */
+    @Schema(description = "空间类型 " )
+    @Id
+    @Column(name = "zone_type")
+    var zoneType: String? = null
+
+    /** 计算标记 1 为手动 2为自动 */
+    @Schema(description = "计算标记 1 为手动 2为自动 ")
+    @Column(name = "sign")
+    var sign: Int? = null
+
+    /** 设备本地编码 */
+    @Schema(description = "设备本地编码")
+    @Column(name = "local_id1")
+    var localId1: String? = null
+
+    /** 设备本地名称 */
+    @Schema(description = "设备本地名称")
+    @Column(name = "local_name1")
+    var localName1: String? = null
+
+    /** 设备本地编码 */
+    @Schema(description = "设备本地编码")
+    @Column(name = "local_id2")
+    var localId2: String? = null
+
+    /** 设备本地名称 */
+    @Schema(description = "设备本地名称")
+    @Column(name = "local_name2")
+    var localName2: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
+    /** 名称 */
+    @Schema(description = "主对象cadid")
+    @Column(name = "cad_id1")
+    var cadId1: String? = null
+
+}

+ 41 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSyForBdTwo.kt

@@ -0,0 +1,41 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2021.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+package com.persagy.server.datacenter.models.entities.rel.archforarch
+
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Table
+
+@Schema(description = "设备和系统")
+@Table(name = "relationship.v_syforbd")
+class RSyForBdTwo : RelVBase() {
+
+    /** 名称 */
+    @Schema(description = "主对象cadid")
+    @Column(name = "cad_id1")
+    var cadId1: String? = null
+
+}

+ 40 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSyForFlTwo.kt

@@ -0,0 +1,40 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2021.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+package com.persagy.server.datacenter.models.entities.rel.archforarch
+
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Table
+
+@Schema(description = "系统和楼层")
+@Table(name = "relationship.v_syforfl")
+class RSyForFlTwo : RelVBase() {
+
+    /** 名称 */
+    @Schema(description = "主对象cadid")
+    @Column(name = "cad_id1")
+    var cadId1: String? = null
+}

+ 40 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSyForShTwo.kt

@@ -0,0 +1,40 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2021.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+package com.persagy.server.datacenter.models.entities.rel.archforarch
+
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Table
+
+@Schema(description = "系统和楼层")
+@Table(name = "relationship.v_syforsh")
+class RSyForShTwo : RelVBase() {
+
+    /** 名称 */
+    @Schema(description = "主对象cadid")
+    @Column(name = "cad_id1")
+    var cadId1: String? = null
+}

+ 93 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RelVBase.kt

@@ -0,0 +1,93 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2021.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.rel.archforarch
+
+import com.persagy.server.datacenter.models.entities.base.RBaseInfo
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Id
+
+/**
+ * 试图基类
+ */
+open class RelVBase: RBaseInfo() {
+
+    /** 主对象Id */
+    @Schema(description = "主对象Id")
+    @Id
+    @Column(name = "id1")
+    var id1: String? = null
+
+    /** 从对象Id */
+    @Schema(description = "从对象Id")
+    @Id
+    @Column(name = "id2")
+    var id2: String? = null
+
+    /** 项目Id */
+    @Schema(description = "项目Id")
+    @Id
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    /** 计算标记 1 为手动 2为自动 */
+    @Schema(description = "计算标记 1 为手动 2为自动 ")
+    @Column(name = "sign")
+    var sign: Int? = null
+
+    /** 设备本地编码 */
+    @Schema(description = "设备本地编码")
+    @Column(name = "local_id1")
+    var localId1: String? = null
+
+    /** 设备本地名称 */
+    @Schema(description = "设备本地名称")
+    @Column(name = "local_name1")
+    var localName1: String? = null
+
+    /** 设备本地编码 */
+    @Schema(description = "设备本地编码")
+    @Column(name = "local_id2")
+    var localId2: String? = null
+
+    /** 设备本地名称 */
+    @Schema(description = "设备本地名称")
+    @Column(name = "local_name2")
+    var localName2: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
+
+}

+ 26 - 0
datacenter/src/main/kotlin/com/persagy/server/services/base/CommonServices.kt

@@ -84,6 +84,32 @@ object CommonServices {
     /** 建筑和空间 */
     val rBd2SpTwoService = SObjectService(SMybatisDao(RBd2SpTwo::class.java))
 
+    /********************************************************************************/
+    /** 设备和系统 */
+    val rEq2SyTwoService = SObjectService(SMybatisDao(REq2SyTwo::class.java))
+    /** 设备和设备 */
+    val rEq2EqTwoService = SObjectService(SMybatisDao(REq2EqTwo::class.java))
+    /** 系统服务的建筑 */
+    val rSyForBdTwoService = SObjectService(SMybatisDao(RSyForBdTwo::class.java))
+    /** 系统服务于楼层 */
+    val rSyForFlTwoService = SObjectService(SMybatisDao(RSyForFlTwo::class.java))
+    /** 系统服务于竖井 */
+    val rSyForShTwoService = SObjectService(SMybatisDao(RSyForShTwo::class.java))
+    /** 系统和空间 */
+    val rSy2SpTwoService = SObjectService(SMybatisDao(RSy2SpTwo::class.java))
+    /** 设备和建筑关系 */
+    val rEq2BdTwoService = SObjectService(SMybatisDao(REq2BdTwo::class.java))
+    /** 设备和楼层  */
+    val rEq2FlTwoService = SObjectService(SMybatisDao(REq2FlTwo::class.java))
+    /** 设备和竖井 */
+    val rEq2ShTwoService = SObjectService(SMybatisDao(REq2ShTwo::class.java))
+    /** 资产和竖井 */
+    val rPeInShTwoService = SObjectService(SMybatisDao(RPeInShTwo::class.java))
+    /** 资产和空间 */
+    val rPe2SpTwoService = SObjectService(SMybatisDao(RPe2SpTwo::class.java))
+
+
+
 
 
 

文件差异内容过多而无法显示
+ 511 - 1649
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt


+ 1 - 1
equip-component/build.gradle

@@ -61,7 +61,7 @@ dependencies {
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // spring cloud 依赖
-//    compile group: 'org.springframework.cloud', name: 'spring-cloud-starter-eureka', version: SPRING_CLOUD_VERSION
+    compile group: 'org.springframework.cloud', name: 'spring-cloud-starter-eureka', version: SPRING_CLOUD_VERSION
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // MySQL

+ 2 - 4
equip-component/src/main/kotlin/com/persagy/server/service/labsl/CustomSqlLabslService.kt

@@ -101,8 +101,7 @@ class CustomSqlLabslService {
                 /** 查询类型信息 */
                 val defClassList =
                     defClassService.select(
-                        SFilter.eq("type", "group"),
-                        SFilter.eq("groupCode", dictProject!!.groupCode!!),
+                        SFilter.eq("type","common"),
                         SFilter.inList("code", list)
                     ).exec()
                 /** 系统类型 */
@@ -115,8 +114,7 @@ class CustomSqlLabslService {
                 /** 系统类型列表 */
                 val systemCodeList =
                     defClassService.select(
-                        SFilter.eq("type", "group"),
-                        SFilter.eq("groupCode", dictProject!!.groupCode!!),
+                        SFilter.eq("type","common"),
                         SFilter.inList("code", setSystem.toList())
                     ).exec()
                 for (systemCode in systemCodeList) {

+ 4 - 4
equip-component/src/main/resources/application-prod.yml

@@ -1,16 +1,16 @@
 
 
 server:
-  port: 8080
+  port: 8834
 
 spring:
   datasource:
 #    url:                                jdbc:postgresql://data-center:5432/datacenter
 #    username:                           postgres
 #    password:                           123qwe!@#
-    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
+    url:                                jdbc:postgresql://v49201.db.redstar.pro:5432/datacenter
     username:                           postgres
-    password:                           cGVyc2FneV8yMDIwcXdlIUAj
+    password:                           123456
 
 
 # spring-cloud相关配置
@@ -18,7 +18,7 @@ eureka:
   client:                                   #客户端注册进eureka服务列表内
     service-url:
       #      defaultZone:                          http://192.168.64.18:9931/eureka
-      defaultZone:                                http://frame:123456@39.102.43.179:9931/eureka/
+      defaultZone:                                http://frame:123456@172.16.46.33:9931/integrated-eureka/eureka/,http://frame:123456@172.16.46.34:9931/integrated-eureka/eureka/
       #      defaultZone:                                http://frame:123456@192.168.64.18:9931/eureka
       #      defaultZone:                          http://admin:1qaz2wsx@127.0.0.1:8888/eureka/ #增加密码
       enable-self-preservation: false # 设为false,关闭自我保护

+ 31 - 0
equip-component/src/main/resources/application-prod1.yml

@@ -0,0 +1,31 @@
+
+
+server:
+  port: 8080
+
+spring:
+  datasource:
+#    url:                                jdbc:postgresql://data-center:5432/datacenter
+#    username:                           postgres
+#    password:                           123qwe!@#
+    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
+    username:                           postgres
+    password:                           cGVyc2FneV8yMDIwcXdlIUAj
+
+
+# spring-cloud相关配置
+eureka:
+  client:                                   #客户端注册进eureka服务列表内
+    service-url:
+      #      defaultZone:                          http://192.168.64.18:9931/eureka
+      defaultZone:                                http://frame:123456@39.102.43.179:9931/eureka/
+      #      defaultZone:                                http://frame:123456@192.168.64.18:9931/eureka
+      #      defaultZone:                          http://admin:1qaz2wsx@127.0.0.1:8888/eureka/ #增加密码
+      enable-self-preservation: false # 设为false,关闭自我保护
+      eviction-interval-timer-in-ms: 5000 # 清理间隔(单位毫秒,默认是60*1000)启用主动失效,
+  instance:
+    #不加的话我看过eureka注册界面,是以docker容器的container id注册过去的,譬如container id为abcde,
+    #那么当访问该微服务时,eureka以http://abcde/xxx,去访问的,当然是访问不到该服务.
+    #配置下面的选项后,就会以内网ip加端口去访问就能访问到了。
+    prefer-ip-address: true
+    instance-id: ${spring.cloud.client.ip-address}:${spring.application.name}:${server.port}