row、cow相关字段名都加上room前缀,避免关键字冲突

This commit is contained in:
陈劲松
2019-07-23 17:57:41 +08:00
parent 2b30d020e4
commit f241b34773

View File

@@ -1143,8 +1143,8 @@ data |Object |R | 
 list |Object[] |R |   list |Object[] |R | 
  id |Integer |R |主键   id |Integer |R |主键
  name |String |R |机房名称   name |String |R |机房名称
  rows |Integer |R |行数   roomRows |Integer |R |行数
  cols |Integer |R |列数   roomCols |Integer |R |列数
  addr |Integer |R |地区   addr |Integer |R |地区
  remarks |String |R |备注   remarks |String |R |备注
@@ -1161,8 +1161,8 @@ data |Object |R | 
"list": [{ "list": [{
"id": 1, "id": 1,
"name": "room2", "name": "room2",
"rows": 4, "roomRows": 4,
"cols": 6, "roomCols": 6,
"addr": 1, "addr": 1,
"remarks": "" "remarks": ""
}] }]
@@ -1197,8 +1197,8 @@ msg |string |R | 
data |Object |R |  data |Object |R | 
 id |Integer |R |主键  id |Integer |R |主键
 name |String |R |机房名称  name |String |R |机房名称
 rows |Integer |R |行数  roomRows |Integer |R |行数
 cols |Integer |R |列数  roomCols |Integer |R |列数
 addr |Integer |R |地区  addr |Integer |R |地区
 remarks |String |R |备注  remarks |String |R |备注
@@ -1211,8 +1211,8 @@ data |Object |R | 
"data": { "data": {
"id": 1, "id": 1,
"name": "room2", "name": "room2",
"rows": 4, "roomRows": 4,
"cols": 6, "roomCols": 6,
"addr": 1, "addr": 1,
"remarks": "" "remarks": ""
} }
@@ -1230,8 +1230,8 @@ data |Object |R | 
参数名称 |类型 |出现要求 |描述 参数名称 |类型 |出现要求 |描述
:---- |:--- |:------ |:--- :---- |:--- |:------ |:---
name |String |R |名称 name |String |R |名称
rows |Integer |R |行数 roomRows |Integer |R |行数
cols |Integer |R |列数 roomCols |Integer |R |列数
addr |Integer |R |地区 addr |Integer |R |地区
remark |String |O |备注 remark |String |O |备注
@@ -1240,8 +1240,8 @@ remark |String |O |备注
``` ```
{ {
"name": "room9", "name": "room9",
"rows": 2, "roomRows": 2,
"cols": 4, "roomCols": 4,
"addr": 54, "addr": 54,
"remark": "en" "remark": "en"
} }
@@ -1280,8 +1280,8 @@ msg |string |R | 
:---- |:--- |:------ |:--- :---- |:--- |:------ |:---
id |Integer |R |id id |Integer |R |id
name |String |R |名称 name |String |R |名称
rows |Integer |R |行数 roomRows |Integer |R |行数
cols |Integer |R |列数 roomCols |Integer |R |列数
addr |Integer |R |地区 addr |Integer |R |地区
remark |String |O |备注 remark |String |O |备注
@@ -1292,8 +1292,8 @@ remark |String |O |备注
{ {
"id": 9, "id": 9,
"name": "room9", "name": "room9",
"rows": 2, "roomRows": 2,
"cols": 4, "roomCols": 4,
"addr": 54, "addr": 54,
"remark": "en" "remark": "en"
} }
@@ -1412,13 +1412,13 @@ msg |string |R | 
参数名称 |类型 |出现要求 |描述 参数名称 |类型 |出现要求 |描述
:---- |:--- |:------ |:--- :---- |:--- |:------ |:---
id |String |R |唯一标识 id |String |R |唯一标识
cols |Integer |R |列数 roomCols |Integer |R |列数
rows |Integer |R |行数 roomRows |Integer |R |行数
示例: 示例:
``` ```
GET /room/roomSizeCheck?id=15&cols=5&rows=3 GET /room/roomSizeCheck?id=15&roomCols=5&roomRows=3
``` ```
###### 返回结果 ###### 返回结果
@@ -1485,8 +1485,8 @@ data |Object |R | 
  id |Integer |R |主键   id |Integer |R |主键
  name |String |R |机柜名称   name |String |R |机柜名称
  roomName |String |R |机房名称   roomName |String |R |机房名称
  row |Integer |R |行号   roomRow |Integer |R |行号
  col |Integer |R |列号   roomCol |Integer |R |列号
  ubit |Integer |R |u位数量   ubit |Integer |R |u位数量
  remarks |String |R |备注   remarks |String |R |备注
@@ -1504,8 +1504,8 @@ data |Object |R | 
"id": 1, "id": 1,
"name": "cab2", "name": "cab2",
"roomName": "room2", "roomName": "room2",
"rows": 4, "roomRows": 4,
"cols": 6, "roomCols": 6,
"ubit": 1, "ubit": 1,
"remarks": "" "remarks": ""
}] }]
@@ -1541,8 +1541,8 @@ data |Object |R | 
 id |Integer |R |主键  id |Integer |R |主键
 name |String |R |机柜名称  name |String |R |机柜名称
 roomName |String |R |机房名称  roomName |String |R |机房名称
 row |Integer |R |行号  roomRow |Integer |R |行号
 col |Integer |R |列号  roomCol |Integer |R |列号
 ubit |Integer |R |u位数量  ubit |Integer |R |u位数量
 nodes |Object[] |R |包含的节点  nodes |Object[] |R |包含的节点
  uuid |Integer |R |uuid   uuid |Integer |R |uuid
@@ -1562,8 +1562,8 @@ data |Object |R | 
"id": 1, "id": 1,
"name": "cab2", "name": "cab2",
"roomName": "room2", "roomName": "room2",
"rows": 4, "rooRrows": 4,
"cols": 6, "roomCols": 6,
"nodes": [{ "nodes": [{
"uuid": 5, "uuid": 5,
"ip": "1.2.3.4", "ip": "1.2.3.4",
@@ -1589,8 +1589,8 @@ data |Object |R | 
:---- |:--- |:------ |:--- :---- |:--- |:------ |:---
name |String |R |名称 name |String |R |名称
roomId |Integer |R |机房id roomId |Integer |R |机房id
row |Integer |R |行号 roomRow |Integer |R |行号
col |Integer |R |列号 rooCcol |Integer |R |列号
ubit |Integer |R |U位数量 ubit |Integer |R |U位数量
remark |String |O |备注 remark |String |O |备注
@@ -1600,8 +1600,8 @@ remark |String |O |备注
{ {
"name": "cab9", "name": "cab9",
"roomId": 1, "roomId": 1,
"row": 2, "rooRrow": 2,
"col": 4, "roomCol": 4,
"ubit": 12, "ubit": 12,
"remark": "en" "remark": "en"
} }
@@ -1635,8 +1635,8 @@ msg |string |R | 
:---- |:--- |:------ |:--- :---- |:--- |:------ |:---
id |Integer |R |id id |Integer |R |id
name |String |R |名称 name |String |R |名称
row |Integer |R |行号 rooRrow |Integer |R |行号
col |Integer |R |列号 roomRol |Integer |R |列号
ubit |Integer |R |U位数量 ubit |Integer |R |U位数量
remark |String |O |备注 remark |String |O |备注
@@ -1646,8 +1646,8 @@ remark |String |O |备注
{ {
"id": 9, "id": 9,
"name": "cab9", "name": "cab9",
"row": 2, "roomRow": 2,
"col": 4, "roomCol": 4,
"ubit": 12, "ubit": 12,
"remark": "en" "remark": "en"
} }
@@ -1804,9 +1804,9 @@ data |Object |R | 
 list |Object[] |R |   list |Object[] |R | 
  roomId |Integer |R |房间id   roomId |Integer |R |房间id
  roomName |String |R |房间名称   roomName |String |R |房间名称
  rows |Object[] |R |可用行   roomRows |Object[] |R |可用行
   row |Integer |R |可用行号    roomRow |Integer |R |可用行号
   cols |Integer[] |R |可用列号    roomCols |Integer[] |R |可用列号
示例: 示例:
@@ -1818,13 +1818,13 @@ data |Object |R | 
"list": [{ "list": [{
"roomId": 1, "roomId": 1,
"roomName": "room88", "roomName": "room88",
"rows": [{ "roomRows": [{
"row": 1, "roomRow": 1,
"cols": [1,3,4] "roomCols": [1,3,4]
}, },
{ {
"row": 2, "roomRow": 2,
"cols": [1,2,3,4,7,8,9] "roomCols": [1,2,3,4,7,8,9]
}] }]
}] }]
} }