Browse Source

调整接口

lijie 3 years ago
parent
commit
00de2bc2f6
5 changed files with 280 additions and 18539 deletions
  1. 0 10
      docs/.vuepress/config.js
  2. 260 19
      docs/rwd/data_structure_description.md
  3. 20 55
      docs/rwd/rwd_api.md
  4. 0 18453
      docs/utils/equipmentInfoCodeView.md
  5. 0 2
      docs/utils/index.md

+ 0 - 10
docs/.vuepress/config.js

@@ -19,16 +19,6 @@ module.exports = {
                     title: '通用说明文档',
                     collapsable: false,
                     children: [{ title: '通用说明文档', path: '/utils/common' }]
-                },
-                {
-                    title: '空间信息点说明文档',
-                    collapsable: false,
-                    children: [{ title: '空间信息点说明文档', path: '/utils/spaceInfoCodeView' }]
-                },
-                {
-                    title: '设备信息点说明文档',
-                    collapsable: false,
-                    children: [{ title: '设备信息点说明文档', path: '/utils/equipmentInfoCodeView' }]
                 }
             ],
             '/dic': [

+ 260 - 19
docs/rwd/data_structure_description.md

@@ -65,24 +65,237 @@
 |      valid      |      合法标识      |  tinyint(4)  |    0-无效,1-有效     |
 |       ts        |       乐观锁       |  timestamp   |                      |
 
-### 4.边类型表(dt_relation)
-
-|     字段      |      字段说明      |   数据类型   |         备注         |
-| :-----------: | :----------------: | :----------: | :------------------: |
-|      id       | 主键(无业务含义) | varchar(40)  |       32位UUID       |
-|     code      |     边类型编码     | varchar(40)  |                      |
-|     name      |     边类型名称     | varchar(40)  |                      |
-|  graph_code   |     图类型编码     | varchar(40)  |                      |
-|  directional  |      边方向性      |   int(11)    |                      |
-|   attribute   |       边属性       | varchar(255) |                      |
-|  target_objs  |    主要连接对象    | varchar(255) |                      |
-|    remark     |        备注        | varchar(45)  |                      |
-|    creator    |       创建人       | varchar(32)  |                      |
-| creation_time |      创建时间      |   char(14)   | 格式为yyyyMMddHHmmss |
-|   modifier    |     最后修改人     | varchar(32)  |                      |
-| modified_time |    最后修改时间    |   char(14)   | 格式为yyyyMMddHHmmss |
-|     valid     |      合法标识      |  tinyint(4)  |    0-无效,1-有效     |
-|      ts       |       乐观锁       |  timestamp   |                      |
+### 4.边类型表(dt_define_rel)
+
+|      字段      |          字段说明          |   数据类型   |         备注          |
+| :------------: | :------------------------: | :----------: | :-------------------: |
+|       id       |     主键(无业务含义)     | varchar(40)  |       32位UUID        |
+|      code      |         边类型编码         | varchar(40)  |                       |
+|      name      |         边类型名称         | varchar(40)  |                       |
+|   graph_code   |         图类型编码         | varchar(40)  |                       |
+|  directional   |          边方向性          |   int(11)    |                       |
+|   attribute    |           边属性           | varchar(255) |                       |
+|  target_objs   |        主要连接对象        | varchar(255) |                       |
+|     remark     |            备注            | varchar(45)  |                       |
+| before_cal_rel | 计算关系之前需要计算的关系 |     json     |                       |
+|    cal_rule    |    计算器,就是计算规则     |     json     |                       |
+| from_obj_type  |    边关系左侧的对象分类    | varchar(50)  |                       |
+|  to_obj_type   |     关系右侧的对象分类     | varchar(50)  |                       |
+| automatic_flag |          计算类型          |   tinyint    | 0-手动计算,1-自动计算 |
+|    creator     |           创建人           | varchar(32)  |                       |
+| creation_time  |          创建时间          |   char(14)   | 格式为yyyyMMddHHmmss  |
+|    modifier    |         最后修改人         | varchar(32)  |                       |
+| modified_time  |        最后修改时间        |   char(14)   | 格式为yyyyMMddHHmmss  |
+|     valid      |          合法标识          |  tinyint(4)  |     0-无效,1-有效     |
+|       ts       |           乐观锁           |  timestamp   |                       |
+
+#### 4.1 before_cal_rel字段补充说明
+
+该字段json结构如下
+
+```
+[
+	{
+		"graphCode":"***",
+		"relCode":"***",
+		"relValue":"***",
+		"preRelDirection":true,
+		"currentRelDirection":true
+	}
+]
+```
+
+|        字段         |  字段说明  |                         备注                         |
+| :-----------------: | :--------: | :--------------------------------------------------: |
+|      graphCode      | 图类型编码 |                                                      |
+|       relCode       | 边类型编码 |                                                      |
+|      relValue       | 关系类型值 |                多为空间的功能类型编码                |
+|   preRelDirection   |  关联标记  | 前一种关系的是用左侧关系还是右侧关系与当前关系做关联 |
+| currentRelDirection |  关联标记  | 当前关系的是用左侧关系还是右侧关系与前一种关系做关联 |
+
+
+
+#### 4.2 cal_rule字段补充说明
+
+该字段json结构如下
+
+```
+{
+    "calRuleType":"***",
+    "dependentRelChain":[
+        {
+            "graphCode":"***",
+            "relCode":"***",
+            "relValue":"***",
+            "preRelDirection":true,
+            "currentRelDirection":true
+        }
+    ],
+    "graphCalInfo":{
+        "fromInfoCode":"***",
+        "toInfoCode":"***",
+        "calRelFromFileRelFlag":true,
+        "fromIsPointFlag":true,
+        "toIsPointFlag":true
+    }
+}
+```
+
+|       字段        | 子字段                |   字段说明   |                          备注                           |
+| :---------------: | --------------------- | :----------: | :-----------------------------------------------------: |
+|    calRuleType    |                       | 计算规则类型 |          1-通过关系链计算,2-通过平面图坐标计算          |
+| dependentRelChain |                       |  关系计算链  |              计算规则类型为1时的关系计算链              |
+|                   | graphCode             |  图类型编码  |                                                         |
+|                   | relCode               |  边类型编码  |                                                         |
+|                   | relValue              |  关系类型值  |                 多为空间的功能类型编码                  |
+|                   | preRelDirection       |   关联标记   |  前一种关系的是用左侧关系还是右侧关系与当前关系做关联   |
+|                   | currentRelDirection   |   关联标记   |  当前关系的是用左侧关系还是右侧关系与前一种关系做关联   |
+|   graphCalInfo    |                       |   坐标计算   |          计算规则类型为2时的坐标计算信息点code          |
+|                   | fromInfoCode          |              |                左侧计算坐标的信息点code                 |
+|                   | toInfoCode            |              |                右侧计算坐标的信息点code                 |
+|                   | calRelFromFileRelFlag |              |     有种计算器是先根据model_id关联的业务id作为楼层      |
+|                   | fromIsPointFlag       |              | 关系左侧为点的标识,true-关系左侧是点,false-关系左侧是面 |
+|                   | toIsPointFlag         |              | 关系右侧为点的标识,true-关系右侧是点,false-关系右侧是面 |
+
+
+
+#### 4.3 各种边关系的配置值(特指关系计算业务)
+
+##### 4.3.1 ArchSubset:Bd2Sp
+
+| 字段名         | 配置值                                                       |
+| -------------- | ------------------------------------------------------------ |
+| before_cal_rel | []                                                           |
+| cal_rule       | {"calRuleType": "1", "dependentRelChain": [{"relCode": "Bd2Fl", "relValue": "", "graphCode": "ArchSubset", "preRelDirection": true, "currentRelDirection": true}, {"relCode": "Fl2Sp", "relValue": "", "graphCode": "ArchSubset", "preRelDirection": true, "currentRelDirection": true}]} |
+| from_obj_type  | building                                                     |
+| to_obj_type    | space                                                        |
+| automatic_flag | 1                                                            |
+
+
+
+##### 4.3.2 ArchSubset:Fl2Sp
+
+| 字段名         | 配置值                                                       |
+| -------------- | ------------------------------------------------------------ |
+| before_cal_rel | []                                                           |
+| cal_rule       | {"calRuleType":"2","graphCalInfo":{"fromInfoCode":"outline","toInfoCode":"outline","calRelFromFileRelFlag":false,"fromIsPointFlag":false,"toIsPointFlag":false}} |
+| from_obj_type  | floor                                                        |
+| to_obj_type    | space                                                        |
+| automatic_flag | 1                                                            |
+
+
+
+##### 4.3.3 ArchSubset:Bd2Sh
+
+| 字段名         | 配置值                                                       |
+| -------------- | ------------------------------------------------------------ |
+| before_cal_rel | []                                                           |
+| cal_rule       | {"calRuleType":"1","dependentRelChain":[{"relCode":"Bd2Sp","relValue":"","graphCode":"ArchSubset","preRelDirection":true,"currentRelDirection":true},{"relCode":"Sh2Sp","relValue":"","graphCode":"ArchSubset","preRelDirection":true,"currentRelDirection":false}]} |
+| from_obj_type  | building                                                     |
+| to_obj_type    | shaft                                                        |
+| automatic_flag | 1                                                            |
+
+
+
+##### 4.3.4 MechInArch:Eq2Fl
+
+| 字段名         | 配置值                                                       |
+| -------------- | ------------------------------------------------------------ |
+| before_cal_rel | []                                                           |
+| cal_rule       | {"calRuleType":"2","graphCalInfo":{"fromInfoCode":"bimLocation","toInfoCode":"outline","calRelFromFileRelFlag":false,"fromIsPointFlag":true,"toIsPointFlag":false}} |
+| from_obj_type  | equipment                                                    |
+| to_obj_type    | floor                                                        |
+| automatic_flag | 1                                                            |
+
+
+
+##### 4.3.5 MechInArch:Eq2Bd
+
+| 字段名         | 配置值                                                       |
+| -------------- | ------------------------------------------------------------ |
+| before_cal_rel | [{"graphCode":"MechInArch","relCode":"Eq2Fl","relValue":"","preRelDirection":true,"currentRelDirection":true}] |
+| cal_rule       | {"calRuleType":"1","dependentRelChain":[{"relCode":"Eq2Fl","relValue":"","graphCode":"MechInArch","preRelDirection":true,"currentRelDirection":true},{"relCode":"Bd2Fl","relValue":"","graphCode":"ArchSubset","preRelDirection":true,"currentRelDirection":false}]} |
+| from_obj_type  | equipment                                                    |
+| to_obj_type    | building                                                     |
+| automatic_flag | 1                                                            |
+
+
+
+##### 4.3.6 MechInArch:Eq2Sp
+
+| 字段名         | 配置值                                                       |
+| -------------- | ------------------------------------------------------------ |
+| before_cal_rel | [{"graphCode":"MechInArch","relCode":"Eq2Fl","relValue":"","preRelDirection":true,"currentRelDirection":true},{"graphCode":"ArchSubset","relCode":"Fl2Sp","relValue":"","preRelDirection":true,"currentRelDirection":true}] |
+| cal_rule       | {"calRuleType":"1","dependentRelChain":[{"relCode":"Eq2Fl","relValue":"","graphCode":"MechInArch","preRelDirection":true,"currentRelDirection":true},{"relCode":"Fl2Sp","relValue":"","graphCode":"ArchSubset","preRelDirection":true,"currentRelDirection":true}]} |
+| from_obj_type  | equipment                                                    |
+| to_obj_type    | space                                                        |
+| automatic_flag | 1                                                            |
+
+
+
+##### 4.3.7 MechInArch:Eq2Sh
+
+| 字段名         | 配置值                                                       |
+| -------------- | ------------------------------------------------------------ |
+| before_cal_rel | [{"graphCode":"MechInArch","relCode":"Eq2Sp","relValue":"","preRelDirection":true,"currentRelDirection":true}] |
+| cal_rule       | {"calRuleType":"1","dependentRelChain":[{"relCode":"Eq2Sp","relValue":"","graphCode":"MechInArch","preRelDirection":true,"currentRelDirection":true},{"relCode":"Sh2Sp","relValue":"","graphCode":"ArchSubset","preRelDirection":true,"currentRelDirection":false}]} |
+| from_obj_type  | equipment                                                    |
+| to_obj_type    | shaft                                                        |
+| automatic_flag | 1                                                            |
+
+
+
+##### 4.3.8 MechInArch:Sy2Bd
+
+| 字段名         | 配置值                                                       |
+| -------------- | ------------------------------------------------------------ |
+| before_cal_rel | [{"graphCode":"MechInArch","relCode":"Eq2Bd","relValue":"","preRelDirection":true,"currentRelDirection":true}] |
+| cal_rule       | {"calRuleType":"1","dependentRelChain":[{"relCode":"Sy2Eq","relValue":"","graphCode":"MechInArch","preRelDirection":true,"currentRelDirection":true},{"relCode":"Eq2Bd","relValue":"","graphCode":"MechInArch","preRelDirection":true,"currentRelDirection":true}]} |
+| from_obj_type  | system                                                       |
+| to_obj_type    | building                                                     |
+| automatic_flag | 1                                                            |
+
+
+
+##### 4.3.9 MechInArch:Sy2Fl
+
+| 字段名         | 配置值                                                       |
+| -------------- | ------------------------------------------------------------ |
+| before_cal_rel | [{"graphCode":"MechInArch","relCode":"Eq2Fl","relValue":"","preRelDirection":true,"currentRelDirection":true}] |
+| cal_rule       | {"calRuleType":"1","dependentRelChain":[{"relCode":"Sy2Eq","relValue":"","graphCode":"MechInArch","preRelDirection":true,"currentRelDirection":true},{"relCode":"Eq2Fl","relValue":"","graphCode":"MechInArch","preRelDirection":true,"currentRelDirection":true}]} |
+| from_obj_type  | system                                                       |
+| to_obj_type    | floor                                                        |
+| automatic_flag | 1                                                            |
+
+
+
+##### 4.3.10 MechInArch:Sy2Fl
+
+| 字段名         | 配置值                                                       |
+| -------------- | ------------------------------------------------------------ |
+| before_cal_rel | [{"graphCode":"MechInArch","relCode":"Eq2Sh","relValue":"","preRelDirection":true,"currentRelDirection":true}] |
+| cal_rule       | {"calRuleType":"1","dependentRelChain":[{"relCode":"Sy2Eq","relValue":"","graphCode":"MechInArch","preRelDirection":true,"currentRelDirection":true},{"relCode":"Eq2Sh","relValue":"","graphCode":"MechInArch","preRelDirection":true,"currentRelDirection":true}]} |
+| from_obj_type  | system                                                       |
+| to_obj_type    | floor                                                        |
+| automatic_flag | 1                                                            |
+
+
+
+##### 4.3.11 MechInArch:Sy2Sp
+
+| 字段名         | 配置值                                                       |
+| -------------- | ------------------------------------------------------------ |
+| before_cal_rel | [{"graphCode":"MechInArch","relCode":"Eq2Sp","relValue":"","preRelDirection":true,"currentRelDirection":true}] |
+| cal_rule       | {"calRuleType":"1","dependentRelChain":[{"relCode":"Sy2Eq","relValue":"","graphCode":"MechInArch","preRelDirection":true,"currentRelDirection":true},{"relCode":"Eq2Sp","relValue":"","graphCode":"MechInArch","preRelDirection":true,"currentRelDirection":true}]} |
+| from_obj_type  | system                                                       |
+| to_obj_type    | space                                                        |
+| automatic_flag | 1                                                            |
+
+
+
+
+
+
 
 
 
@@ -122,7 +335,9 @@
 | valid         | 合法标识       | tinyint(4)   | 0-无效,1-有效                                                |
 | ts            | 乐观锁         | timestamp    |                                                              |
 
-### 5.对象类型定义表(dt_define_type)
+
+
+### 6.对象类型定义表(dt_define_type)
 
 | 字段           | 字段说明       | 数据类型     | 备注                                      |
 | -------------- | -------------- | ------------ | ----------------------------------------- |
@@ -149,6 +364,32 @@
 
 
 
+### 6.项目关系记录表(relation_project_cal)
+
+| 字段                | 字段说明           | 数据类型     | 备注                                                         |
+| ------------------- | ------------------ | ------------ | ------------------------------------------------------------ |
+| id                  | 主键               | varchar(200) | 32位UUID                                                     |
+| graph_code          | 图类型编码         | varchar(100) |                                                              |
+| rel_code            | 关系类型编码       | varchar(100) |                                                              |
+| source_flag         | 是否需要配置源末端 | tinyint      | 1-需要,0-不需要                                              |
+| automatic_flag      | 是否自动计算类型   | tinyint      | 1-自动计算,0-手动计算                                        |
+| manual              | 手动计算类型       | tinyint      | 1 禁用  2提示引导 3手动维护                                  |
+| project_id          | 项目id             | varchar(200) |                                                              |
+| computing_time      | 计算时间           | varchar(100) | 最后一次自动计算时间,格式为yyyyMMddHHmmss                    |
+| computational_state | 计算状态           | tinyint      | 1初始状态 2需要计算 3计算中 4等待中 5计算失败(如果处于计算中状态,则不再次调用) |
+| zone_type           | 业务分区类型       | varchar(50)  |                                                              |
+| system_type         | 系统类型           | tinyint      | 风系统1,水系统0                                              |
+| rel_manual_type     | 手动计算关系类型   | varchar(200) |                                                              |
+| compute_version     | 计算版本           | tinyint      |                                                              |
+| creator             | 创建人账号id       | varchar(32)  |                                                              |
+| creation_time       | 创建时间           | char(14)     | 格式为yyyyMMddHHmmss                                         |
+| modified_time       | 最后更新时间       | char(14)     | 格式为yyyyMMddHHmmss                                         |
+| modifier            | 最后更新账号id     | varchar(32)  |                                                              |
+| valid               | 合法标识           | tinyint(4)   | 0-无效,1-有效                                                |
+| ts                  | 乐观锁             | timestamp    |                                                              |
+
+
+
 ## DDL语句
 
 ### 对象实例表

+ 20 - 55
docs/rwd/rwd_api.md

@@ -5168,40 +5168,10 @@ POST请求
 ```
 {
     "result": "success",
-    "data": [
-        {
-            "id":"***",
-            "graphCode": "图类型编码",
-            "graphId": "图类型Id",
-            "relCode": "边类型编码",
-            "objFrom": "",
-            "objTo": "",
-            "valid":1,
-            "creator":"创建人账号id",
-            "creationTime":"创建时间,格式为yyyyMMddHHmmss",
-            "modifiedTime":"最后更新时间,格式为yyyyMMddHHmmss",
-            "modifier":"最后更新账号id"
-        }
-    ]
+    "data": []
 }
 ```
 
-| 字段         | 是否必有 | 字段说明                          |
-| ------------ | -------- | --------------------------------- |
-| id           | 是       | 32位UUID                          |
-| groupCode    | 否       | 集团编码                          |
-| projectId    | 是       | 项目id                            |
-| graphId      | 否       | 图主键                            |
-| graphCode    | 否       | 图编码                            |
-| relCode      | 否       | 关系编码                          |
-| objFrom      | 否       | 来源对象id                        |
-| objTo        | 否       | 目标对象id                        |
-| valid        | 是       | 合法标识,1-有效,0-无效            |
-| creator      | 否       | 创建人账号id                      |
-| creationTime | 否       | 创建时间,格式为yyyyMMddHHmmss     |
-| modifiedTime | 否       | 最后更新时间,格式为yyyyMMddHHmmss |
-| modifier     | 否       | 最后更新账号id                    |
-
 #### 接口修改记录
 
 | 操作时间             | 操作 | 操作内容 |
@@ -5308,22 +5278,17 @@ POST请求
 
 ```
 {
-	"groupConditions":[
-		{
-            "column": "name",
-            "asc": false
-        },
-        {
-            "column": "name",
-            "asc": false
-        }
-	]
+	"classCodes":["***","***"],
+	"objTypes":["***","***"],
+	"groups":["name","name"]
 }
 ```
 
-| 字段 | 是否必须 | 字段说明   |
-| ---- | -------- | ---------- |
-| ***  | 是       | 项目id集合 |
+| 字段       | 是否必须 | 字段说明 |
+| ---------- | -------- | -------- |
+| groups     | 是       | 分组字段 |
+| classCodes | 否       | 对象类型 |
+| objTypes   | 否       | 对象分类 |
 
 #### 成功例子
 
@@ -5334,26 +5299,26 @@ POST请求
         {
             "expectScrapTotal": 0,
             "equipmentTotal": 2,
-            "projectName": "1101010001",
-            "projectId": "Pj1101010001"
+            "localName": "1101010001",
+            "localId": "Pj1101010001"
         }
     ],
     "count":1
 }
 ```
 
-| 字段             | 是否必有 | 字段说明     |
-| ---------------- | -------- | ------------ |
-| expectScrapTotal | 是       | 待报废设备数 |
-| equipmentTotal   | 是       | 设备总数     |
-| projectName      | 是       | 项目名称     |
-| projectId        | 是       | 项目id       |
+| 字段             | 是否必有 | 字段说明         |
+| ---------------- | -------- | ---------------- |
+| expectScrapTotal | 是       | 待报废设备数     |
+| equipmentTotal   | 是       | 设备总数         |
+| localName        | 是       | 第一个分组信息点 |
+| localId          | 是       | 第二个分组信息点 |
 
 #### 接口修改记录
 
-| 操作时间             | 操作 | 操作内容 |
-| -------------------- | ---- | -------- |
-| 2021年9月2日20:56:41 | 新增 | 新增接口 |
+| 操作时间 | 操作 | 操作内容 |
+| -------- | ---- | -------- |
+|          | 新增 | 新增接口 |
 
 
 

File diff suppressed because it is too large
+ 0 - 18453
docs/utils/equipmentInfoCodeView.md


+ 0 - 2
docs/utils/index.md

@@ -3,5 +3,3 @@
 ## [通用说明](/utils/common.md)
 
 ## [空间信息点说明](/utils/spaceInfoCodeView.md)
-
-## [设备信息点说明](/utils/equipmentInfoCodeView.md)