zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zcy:b88af215c303c8ec300643e0a63ed5bf91d11d2d
Branches Tags
zcy:V0.5.x
..
compare: zcy:86d51844ffb31b29b8f65c1ca1eb9f37d702eaa5
Branches Tags
zcy:V0.5.x

No commits in common. "b88af215c303c8ec300643e0a63ed5bf91d11d2d" and "86d51844ffb31b29b8f65c1ca1eb9f37d702eaa5" have entirely different histories.
b88af215c3 ... 86d51844ff

125 changed files with 389 additions and 927 deletions
Show Stats Expand all files Collapse all files

3
README.md
View File

@ -155,5 +155,4 @@ https://open-iita.feishu.cn/wiki/Km67wBKNNiFMrMkldCJcxa6vnLe
微信群(添加我微信备注"进群"):
![输入图片说明](doc/ma.png)
商务联系:
![输入图片说明](doc/image.png)

23
data/init/deviceInfo.json
View File

@ -1,6 +1,5 @@
[
{
"tenantId" : 0,
"id": "16552595723210menci0001008000012f",
"deviceId": "16552595723210menci0001008000012f",
"productKey": "PN3EDmkBZDD8whDd",
@ -153,7 +152,6 @@
}
},
{
"tenantId" : 0,
"id": "16552594863210linght001005000012c",
"deviceId": "16552594863210linght001005000012c",
"productKey": "xpsYHExTKPFaQMS7",
@ -216,7 +214,6 @@
}
},
{
"tenantId" : 0,
"id": "16552594646210pulg0a0010160000122",
"deviceId": "16552594646210pulg0a0010160000122",
"productKey": "cGCrkK7Ex4FESAwe",
@ -246,7 +243,6 @@
"createAt": 1655259464621
},
{
"tenantId" : 0,
"id": "16552594604220pulg0a0010150000127",
"deviceId": "16552594604220pulg0a0010150000127",
"productKey": "cGCrkK7Ex4FESAwe",
@ -276,7 +272,6 @@
"createAt": 1655259460422
},
{
"tenantId" : 0,
"id": "16552594572370pulg0a001014000012e",
"deviceId": "16552594572370pulg0a001014000012e",
"productKey": "cGCrkK7Ex4FESAwe",
@ -306,7 +301,6 @@
"createAt": 1655259457237
},
{
"tenantId" : 0,
"id": "16552594542310pulg0a0010130000123",
"deviceId": "16552594542310pulg0a0010130000123",
"productKey": "cGCrkK7Ex4FESAwe",
@ -336,7 +330,6 @@
"createAt": 1655259454231
},
{
"tenantId" : 0,
"id": "16552594511210pulg0a001012000012c",
"deviceId": "16552594511210pulg0a001012000012c",
"productKey": "cGCrkK7Ex4FESAwe",
@ -366,7 +359,6 @@
"createAt": 1655259451121
},
{
"tenantId" : 0,
"id": "16552594475270pulg0a0010110000125",
"deviceId": "16552594475270pulg0a0010110000125",
"productKey": "cGCrkK7Ex4FESAwe",
@ -454,7 +446,6 @@
"createAt": 1655259440522
},
{
"tenantId" : 0,
"id": "16552594368340pulg0a0010080000126",
"deviceId": "16552594368340pulg0a0010080000126",
"productKey": "cGCrkK7Ex4FESAwe",
@ -484,7 +475,6 @@
"createAt": 1655259436834
},
{
"tenantId" : 0,
"id": "16552594320310pulg0a0010070000126",
"deviceId": "16552594320310pulg0a0010070000126",
"productKey": "cGCrkK7Ex4FESAwe",
@ -514,7 +504,6 @@
"createAt": 1655259432067
},
{
"tenantId" : 0,
"id": "16542484163750d60ee9025d8430e327",
"deviceId": "16542484163750d60ee9025d8430e327",
"productKey": "Eit3kmGJtxSHfCKT",
@ -537,7 +526,6 @@
"createAt": 1654248416391
},
{
"tenantId" : 0,
"id": "16538390924670pulg0a001006000012a",
"deviceId": "16538390924670pulg0a001006000012a",
"productKey": "cGCrkK7Ex4FESAwe",
@ -580,7 +568,6 @@
"createAt": 1653839092467
},
{
"tenantId" : 0,
"id": "16538390885690pulg0a0010050000126",
"deviceId": "16538390885690pulg0a0010050000126",
"productKey": "cGCrkK7Ex4FESAwe",
@ -633,7 +620,6 @@
}
},
{
"tenantId" : 0,
"id": "16538390820760pulg0a0010030000127",
"deviceId": "16538390820760pulg0a0010030000127",
"productKey": "cGCrkK7Ex4FESAwe",
@ -657,7 +643,6 @@
"createAt": 1653839082076
},
{
"tenantId" : 0,
"id": "16538390787670pulg0a0010020000124",
"deviceId": "16538390787670pulg0a0010020000124",
"productKey": "cGCrkK7Ex4FESAwe",
@ -716,7 +701,6 @@
}
},
{
"tenantId" : 0,
"id": "16538390097670switch0300100500143",
"deviceId": "16538390097670switch0300100500143",
"productKey": "eDhXKwEzwFybM5R7",
@ -748,7 +732,6 @@
}
},
{
"tenantId" : 0,
"id": "16538390048670switch0300100400141",
"deviceId": "16538390048670switch0300100400141",
"productKey": "eDhXKwEzwFybM5R7",
@ -780,7 +763,6 @@
}
},
{
"tenantId" : 0,
"id": "16538390008670switch0300100300145",
"deviceId": "16538390008670switch0300100300145",
"productKey": "eDhXKwEzwFybM5R7",
@ -812,7 +794,6 @@
}
},
{
"tenantId" : 0,
"id": "16538389971670switch0300100200140",
"deviceId": "16538389971670switch0300100200140",
"productKey": "eDhXKwEzwFybM5R7",
@ -844,7 +825,6 @@
}
},
{
"tenantId" : 0,
"id": "16538389915670switch030010010014c",
"deviceId": "16538389915670switch030010010014c",
"productKey": "eDhXKwEzwFybM5R7",
@ -870,7 +850,6 @@
"createAt": 1653838991567
},
{
"tenantId" : 0,
"id": "16538383943670wenshidu01008000139",
"deviceId": "16538383943670wenshidu01008000139",
"productKey": "6kYp6jszrDns2yh4",
@ -894,7 +873,6 @@
"createAt": 1653838394367
},
{
"tenantId" : 0,
"id": "16538383910670wenshidu01007000136",
"deviceId": "16538383910670wenshidu01007000136",
"productKey": "6kYp6jszrDns2yh4",
@ -918,7 +896,6 @@
"createAt": 1653838391067
},
{
"tenantId" : 0,
"id": "16538383880670wenshidu0100600013b",
"deviceId": "16538383880670wenshidu0100600013b",
"productKey": "6kYp6jszrDns2yh4",

16
data/init/home.json
View File

@ -4,7 +4,7 @@
"createTime" : 1708254320542,
"updateBy" : null,
"updateTime" : 1708254320542,
"tenantId" : 0,
"tenantId" : null,
"id" : 1,
"name" : "我的家庭",
"address" : "",
@ -19,7 +19,7 @@
"createTime" : 1708254320593,
"updateBy" : null,
"updateTime" : 1708254320593,
"tenantId" : 0,
"tenantId" : null,
"id" : 2,
"name" : "我的家",
"address" : null,
@ -34,7 +34,7 @@
"createTime" : 1708254320600,
"updateBy" : null,
"updateTime" : 1708254320600,
"tenantId" : 0,
"tenantId" : null,
"id" : 3,
"name" : "我深圳的家",
"address" : "广东省深圳市南山区西丽镇",
@ -49,7 +49,7 @@
"createTime" : 1708254320605,
"updateBy" : null,
"updateTime" : 1708254320605,
"tenantId" : 0,
"tenantId" : null,
"id" : 4,
"name" : "我深圳的家",
"address" : "广东省深圳市南山区西丽镇",
@ -64,7 +64,7 @@
"createTime" : 1708254320609,
"updateBy" : null,
"updateTime" : 1708254320609,
"tenantId" : 0,
"tenantId" : null,
"id" : 5,
"name" : "我深圳的家",
"address" : "广东省深圳市南山区西丽镇",
@ -79,7 +79,7 @@
"createTime" : 1708254320613,
"updateBy" : null,
"updateTime" : 1708254320613,
"tenantId" : 0,
"tenantId" : null,
"id" : 6,
"name" : "我深圳的家",
"address" : "广东省深圳市南山区西丽镇",
@ -94,7 +94,7 @@
"createTime" : 1708254320618,
"updateBy" : null,
"updateTime" : 1708254320618,
"tenantId" : 0,
"tenantId" : null,
"id" : 7,
"name" : "myhome",
"address" : "shengzhen nanshan",
@ -109,7 +109,7 @@
"createTime" : 1708254320622,
"updateBy" : null,
"updateTime" : 1708254320622,
"tenantId" : 0,
"tenantId" : null,
"id" : 8,
"name" : "myhome",
"address" : "shengzhen nanshan",

118
data/init/icon.json
View File

@ -4,7 +4,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "行人道闸",
"viewBox": "0 0 1024 1024",
@ -18,7 +18,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "信息",
"viewBox": "0 0 1024 1024",
@ -32,7 +32,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "指纹解锁",
"viewBox": "0 0 1024 1024",
@ -46,7 +46,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "出门",
"viewBox": "0 0 1024 1024",
@ -60,7 +60,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "车牌识别",
"viewBox": "0 0 1024 1024",
@ -74,7 +74,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "门禁卡",
"viewBox": "0 0 1024 1024",
@ -88,7 +88,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "电视",
"viewBox": "0 0 1024 1024",
@ -102,7 +102,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "人脸识别",
"viewBox": "0 0 1024 1024",
@ -116,7 +116,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "智能灯光",
"viewBox": "0 0 1024 1024",
@ -130,7 +130,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "数字密码",
"viewBox": "0 0 1024 1024",
@ -144,7 +144,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "语音对讲",
"viewBox": "0 0 1024 1024",
@ -158,7 +158,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "信息",
"viewBox": "0 0 1024 1024",
@ -172,7 +172,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "摄像枪",
"viewBox": "0 0 1024 1024",
@ -186,7 +186,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "可视对讲机",
"viewBox": "0 0 1024 1024",
@ -200,7 +200,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "门磁传感器",
"viewBox": "0 0 1024 1024",
@ -214,7 +214,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "摄像头",
"viewBox": "0 0 1024 1024",
@ -228,7 +228,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "天气",
"viewBox": "0 0 1024 1024",
@ -242,7 +242,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "降噪",
"viewBox": "0 0 1024 1024",
@ -256,7 +256,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "时钟",
"viewBox": "0 0 1024 1024",
@ -270,7 +270,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "手机",
"viewBox": "0 0 1024 1024",
@ -284,7 +284,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "交换机",
"viewBox": "0 0 1024 1024",
@ -298,7 +298,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "视频留言",
"viewBox": "0 0 1024 1024",
@ -312,7 +312,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "燃气报警2",
"viewBox": "0 0 1024 1024",
@ -326,7 +326,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "声光报警",
"viewBox": "0 0 1024 1024",
@ -340,7 +340,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "火警",
"viewBox": "0 0 1024 1024",
@ -354,7 +354,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "燃气报警器",
"viewBox": "0 0 1024 1024",
@ -368,7 +368,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "门锁",
"viewBox": "0 0 1024 1024",
@ -382,7 +382,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "静音",
"viewBox": "0 0 1024 1024",
@ -396,7 +396,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "控制中心",
"viewBox": "0 0 1024 1024",
@ -410,7 +410,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "红外传感器",
"viewBox": "0 0 1024 1024",
@ -424,7 +424,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconName": "开锁",
"viewBox": "0 0 1024 1024",
"xmlns": "http://www.w3.org/2000/svg",
@ -437,7 +437,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconName": "车道闸",
"viewBox": "0 0 1024 1024",
"xmlns": "http://www.w3.org/2000/svg",
@ -450,11 +450,11 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,"createBy" : null,
"tenantId" : "000000","createBy" : null,
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "安防",
"viewBox": "0 0 1024 1024",
@ -468,7 +468,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "电梯",
"viewBox": "0 0 1024 1024",
@ -482,7 +482,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541592097542213,
"iconName": "火灾报警",
"viewBox": "0 0 1024 1024",
@ -496,7 +496,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "粉尘监测",
"viewBox": "0 0 1024 1024",
@ -510,7 +510,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "柴油发电机",
"viewBox": "0 0 1024 1024",
@ -524,7 +524,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "报警主机",
"viewBox": "0 0 1024 1024",
@ -538,7 +538,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "智能插座",
"viewBox": "0 0 1024 1024",
@ -552,7 +552,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "物联网网关",
"viewBox": "0 0 1024 1024",
@ -566,7 +566,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "变压器温度",
"viewBox": "0 0 1024 1024",
@ -580,7 +580,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "中央空调",
"viewBox": "0 0 1024 1024",
@ -594,7 +594,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "故障",
"viewBox": "0 0 1024 1024",
@ -608,7 +608,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "红外探测器",
"viewBox": "0 0 1024 1024",
@ -622,7 +622,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "报警",
"viewBox": "0 0 1024 1024",
@ -636,7 +636,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "火警",
"viewBox": "0 0 1024 1024",
@ -650,7 +650,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "液位传感器",
"viewBox": "0 0 1024 1024",
@ -664,7 +664,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "感温探测器",
"viewBox": "0 0 1024 1024",
@ -678,7 +678,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "表面温度",
"viewBox": "0 0 1024 1024",
@ -692,7 +692,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "液压传感器",
"viewBox": "0 0 1024 1024",
@ -706,7 +706,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "消防水泵",
"viewBox": "0 0 1024 1024",
@ -720,7 +720,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "排风机",
"viewBox": "0 0 1024 1024",
@ -734,7 +734,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "温湿度",
"viewBox": "0 0 1024 1024",
@ -748,7 +748,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "视频",
"viewBox": "0 0 1024 1024",
@ -762,7 +762,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "电器火灾",
"viewBox": "0 0 1024 1024",
@ -776,7 +776,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "消防用水",
"viewBox": "0 0 1024 1024",
@ -790,7 +790,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "无线火灾报警",
"viewBox": "0 0 1024 1024",
@ -804,7 +804,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"iconTypeId": 541673667244101,
"iconName": "火灾报警",
"viewBox": "0 0 1024 1024",

4
data/init/iconType.json
View File

@ -4,7 +4,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"typeDescribe" : null,
"typeName" : "智能家居"
}, {
@ -13,7 +13,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : "000000",
"typeDescribe" : null,
"typeName" : "工业物联网"
}]

38
data/init/product.json
View File

@ -4,7 +4,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 1,
"productKey" : "openiitagateway01",
"productSecret" : "openiitasecret01",
@ -24,7 +24,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 2,
"productKey" : "openiitapump01",
"productSecret" : "openiitapump01",
@ -44,7 +44,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 3,
"productKey" : "openiitanbpump01",
"productSecret" : "openiitanbpump01",
@ -64,7 +64,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 516578994839621,
"productKey" : "xpsYHExTKPFaQMS7",
"productSecret" : "xdkKUymrEGSCYWswqCvSPyRSFvH5j7CU",
@ -84,7 +84,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 516578994847813,
"productKey" : "hdX3PCMcFrCYpesJ",
"productSecret" : "xdkKUymrEGSCYWswqCvSPyRSFvH5j7CU",
@ -104,7 +104,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 516578994860101,
"productKey" : "hbtgIA0SuVw9lxjB",
"productSecret" : "xdkKUymrEGSCYWswqCvSPyRSFvH5j7CU",
@ -123,7 +123,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 516578994864197,
"productKey" : "eDhXKwEzwFybM5R7",
"productSecret" : "xdkKUymrEGSCYWswqCvSPyRSFvH5j7CU",
@ -142,7 +142,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 516578994876485,
"productKey" : "cGCrkK7Ex4FESAwe",
"productSecret" : "xdkKUymrEGSCYWswqCvSPyRSFvH5j7CU",
@ -161,7 +161,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 516578994880581,
"productKey" : "Rf4QSjbm65X45753",
"productSecret" : "xdkKUymrEGSCYWswqCvSPyRSFvH5j7CU",
@ -180,7 +180,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 516578994884677,
"productKey" : "PN3EDmkBZDD8whDd",
"productSecret" : "xdkKUymrEGSCYWswqCvSPyRSFvH5j7CU",
@ -199,7 +199,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 516578994896965,
"productKey" : "N523nWsCiG3CAn6X",
"productSecret" : "xdkKUymrEGSCYWswqCvSPyRSFvH5j7CU",
@ -218,7 +218,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 516578994901061,
"productKey" : "Eit3kmGJtxSHfCKT",
"productSecret" : "xdkKUymrEGSCYWswqCvSPyRSFvH5j7CU",
@ -238,7 +238,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 516578994905157,
"productKey" : "DSGxxKk6E8mmDk6C",
"productSecret" : "xdkKUymrEGSCYWswqCvSPyRSFvH5j7CU",
@ -257,7 +257,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 516578994909253,
"productKey" : "D8c5pXFmt2KJDxNm",
"productSecret" : "xdkKUymrEGSCYWswqCvSPyRSFvH5j7CU",
@ -277,7 +277,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 516578994913349,
"productKey" : "AWcJnf7ymGSkaz5M",
"productSecret" : "xdkKUymrEGSCYWswqCvSPyRSFvH5j7CU",
@ -296,7 +296,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 516578994925637,
"productKey" : "6kYp6jszrDns2yh4",
"productSecret" : "xdkKUymrEGSCYWswqCvSPyRSFvH5j7CU",
@ -316,7 +316,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 516578994933829,
"productKey" : "bGdZt8ffBETtsirm",
"productSecret" : "xdkKUymrEGSCYWswqCvSPyRSFvH5j7CU",
@ -336,7 +336,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 516578994942021,
"productKey" : "BRD3x4fkKxkaxXFt",
"productSecret" : "xdkKUymrEGSCYWswqCvSPyRSFvH5j7CU",
@ -356,7 +356,7 @@
"createTime" : null,
"updateBy" : null,
"updateTime" : null,
"tenantId" : 0,
"tenantId" : null,
"id" : 516578994958405,
"productKey" : "PwMfpXmp4ZWkGahn",
"productSecret" : "xdkKUymrEGSCYWswqCvSPyRSFvH5j7CU",

18
data/init/space.json
View File

@ -4,7 +4,7 @@
"createTime" : 1708254320774,
"updateBy" : null,
"updateTime" : 1708254320774,
"tenantId" : 0,
"tenantId" : null,
"id" : 1,
"homeId" : 1,
"name" : "123",
@ -15,7 +15,7 @@
"createTime" : 1708254320794,
"updateBy" : null,
"updateTime" : 1708254320794,
"tenantId" : 0,
"tenantId" : null,
"id" : 2,
"homeId" : 1,
"name" : "123",
@ -26,7 +26,7 @@
"createTime" : 1708254320798,
"updateBy" : null,
"updateTime" : 1708254320798,
"tenantId" : 0,
"tenantId" : null,
"id" : 3,
"homeId" : 1,
"name" : "客厅",
@ -37,7 +37,7 @@
"createTime" : 1708254320804,
"updateBy" : null,
"updateTime" : 1708254320804,
"tenantId" : 0,
"tenantId" : null,
"id" : 4,
"homeId" : 1,
"name" : "卧室",
@ -48,7 +48,7 @@
"createTime" : 1708254320809,
"updateBy" : null,
"updateTime" : 1708254320809,
"tenantId" : 0,
"tenantId" : null,
"id" : 5,
"homeId" : 1,
"name" : "客厅",
@ -59,7 +59,7 @@
"createTime" : 1708254320813,
"updateBy" : null,
"updateTime" : 1708254320813,
"tenantId" : 0,
"tenantId" : null,
"id" : 6,
"homeId" : 1,
"name" : "阳台",
@ -70,7 +70,7 @@
"createTime" : 1708254320817,
"updateBy" : null,
"updateTime" : 1708254320817,
"tenantId" : 0,
"tenantId" : null,
"id" : 7,
"homeId" : 1,
"name" : "厨房",
@ -81,7 +81,7 @@
"createTime" : 1708254320824,
"updateBy" : null,
"updateTime" : 1708254320824,
"tenantId" : 0,
"tenantId" : null,
"id" : 8,
"homeId" : 1,
"name" : "卧室",
@ -92,7 +92,7 @@
"createTime" : 1708254320852,
"updateBy" : null,
"updateTime" : 1708254320852,
"tenantId" : 0,
"tenantId" : null,
"id" : 9,
"homeId" : 1,
"name" : "客厅",

20
data/init/spaceDevice.json
View File

@ -4,7 +4,7 @@
"createTime" : 1708254321238,
"updateBy" : null,
"updateTime" : 1708254321238,
"tenantId" : 0,
"tenantId" : null,
"id" : 1,
"deviceId" : "164785263238900cefafcfeeab0000125",
"name" : "卧室的ZGW01",
@ -17,7 +17,7 @@
"createTime" : 1708254321248,
"updateBy" : null,
"updateTime" : 1708254321248,
"tenantId" : 0,
"tenantId" : null,
"id" : 2,
"deviceId" : "164776322117404acb9f03008d1500168",
"name" : "卧室的插座",
@ -30,7 +30,7 @@
"createTime" : 1708254321252,
"updateBy" : null,
"updateTime" : 1708254321252,
"tenantId" : 0,
"tenantId" : null,
"id" : 3,
"deviceId" : "1647763221972019a89f03008d1500163",
"name" : "卧室的插座",
@ -43,7 +43,7 @@
"createTime" : 1708254321255,
"updateBy" : null,
"updateTime" : 1708254321255,
"tenantId" : 0,
"tenantId" : null,
"id" : 4,
"deviceId" : "164776322227201472a803008d150016e",
"name" : "卧室的插座",
@ -56,7 +56,7 @@
"createTime" : 1708254321258,
"updateBy" : null,
"updateTime" : 1708254321258,
"tenantId" : 0,
"tenantId" : null,
"id" : 5,
"deviceId" : "16477632226720c2cc9f03008d1500166",
"name" : "卧室的插座",
@ -69,7 +69,7 @@
"createTime" : 1708254321261,
"updateBy" : null,
"updateTime" : 1708254321261,
"tenantId" : 0,
"tenantId" : null,
"id" : 6,
"deviceId" : "16477632215720c11b1602008d1500160",
"name" : "卧室的插座",
@ -82,7 +82,7 @@
"createTime" : 1708254321264,
"updateBy" : null,
"updateTime" : 1708254321264,
"tenantId" : 0,
"tenantId" : null,
"id" : 7,
"deviceId" : "1647690908735019dd9f03008d1500163",
"name" : "卧室的插座",
@ -95,7 +95,7 @@
"createTime" : 1708254321268,
"updateBy" : null,
"updateTime" : 1708254321268,
"tenantId" : 0,
"tenantId" : null,
"id" : 8,
"deviceId" : "16538390924670pulg0a001006000012a",
"name" : "阳台的插座",
@ -108,7 +108,7 @@
"createTime" : 1708254321271,
"updateBy" : null,
"updateTime" : 1708254321271,
"tenantId" : 0,
"tenantId" : null,
"id" : 9,
"deviceId" : "16501806313260000833feffac33bc16c",
"name" : "灯的插座",
@ -121,7 +121,7 @@
"createTime" : 1708254321275,
"updateBy" : null,
"updateTime" : 1708254321275,
"tenantId" : 0,
"tenantId" : null,
"id" : 10,
"deviceId" : "165017126122400cefafcfee61000012b",
"name" : "客厅网关",

2
data/init/sys_app.json
View File

@ -4,7 +4,7 @@
"createTime" : 1708254323547,
"updateBy" : null,
"updateTime" : 1708254323547,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 453554819821637,
"appName" : "微信小程序",
"appId" : "xxx",

14
data/init/sys_config.json
View File

@ -4,7 +4,7 @@
"createTime" : 1708254321796,
"updateBy" : null,
"updateTime" : 1708254321796,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 1,
"configName" : "主框架页-默认皮肤样式名称",
"configKey" : "sys.index.skinName",
@ -17,7 +17,7 @@
"createTime" : 1708254321808,
"updateBy" : null,
"updateTime" : 1708254321808,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 2,
"configName" : "用户管理-账号初始密码",
"configKey" : "sys.user.initPassword",
@ -30,7 +30,7 @@
"createTime" : 1708254321811,
"updateBy" : null,
"updateTime" : 1708254321811,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 3,
"configName" : "主框架页-侧边栏主题",
"configKey" : "sys.index.sideTheme",
@ -43,7 +43,7 @@
"createTime" : 1708254321814,
"updateBy" : null,
"updateTime" : 1708254321814,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 5,
"configName" : "账号自助-是否开启用户注册功能",
"configKey" : "sys.account.registerUser",
@ -56,7 +56,7 @@
"createTime" : 1708254321818,
"updateBy" : null,
"updateTime" : 1708254321818,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 11,
"configName" : "OSS预览列表资源开关",
"configKey" : "sys.oss.previewListResource",
@ -69,7 +69,7 @@
"createTime" : 1708254321820,
"updateBy" : null,
"updateTime" : 1708254321820,
"tenantId" : 0,
"tenantId" : "452748015218757",
"id" : 452767972696133,
"configName" : "主框架页-默认皮肤样式名称",
"configKey" : "sys.index.skinName",
@ -115,4 +115,4 @@
"configValue" : "false",
"configType" : "Y",
"remark" : "是否开启注册用户功能（true开启，false关闭）"
} ]
} ]

50
data/init/sys_dict_data.json
View File

@ -4,7 +4,7 @@
"createTime" : 1708254321935,
"updateBy" : null,
"updateTime" : 1708254321935,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 1,
"dictSort" : 1,
"dictLabel" : "男",
@ -21,7 +21,7 @@
"createTime" : 1708254321951,
"updateBy" : null,
"updateTime" : 1708254321951,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 2,
"dictSort" : 2,
"dictLabel" : "女",
@ -38,7 +38,7 @@
"createTime" : 1708254321958,
"updateBy" : null,
"updateTime" : 1708254321958,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 3,
"dictSort" : 3,
"dictLabel" : "未知",
@ -55,7 +55,7 @@
"createTime" : 1708254321962,
"updateBy" : null,
"updateTime" : 1708254321962,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 4,
"dictSort" : 1,
"dictLabel" : "显示",
@ -72,7 +72,7 @@
"createTime" : 1708254321968,
"updateBy" : null,
"updateTime" : 1708254321968,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 5,
"dictSort" : 2,
"dictLabel" : "隐藏",
@ -89,7 +89,7 @@
"createTime" : 1708254321971,
"updateBy" : null,
"updateTime" : 1708254321971,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 6,
"dictSort" : 1,
"dictLabel" : "正常",
@ -106,7 +106,7 @@
"createTime" : 1708254321976,
"updateBy" : null,
"updateTime" : 1708254321976,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 7,
"dictSort" : 2,
"dictLabel" : "停用",
@ -123,7 +123,7 @@
"createTime" : 1708254321981,
"updateBy" : null,
"updateTime" : 1708254321981,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 12,
"dictSort" : 1,
"dictLabel" : "是",
@ -140,7 +140,7 @@
"createTime" : 1708254321987,
"updateBy" : null,
"updateTime" : 1708254321987,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 13,
"dictSort" : 2,
"dictLabel" : "否",
@ -157,7 +157,7 @@
"createTime" : 1708254321991,
"updateBy" : null,
"updateTime" : 1708254321991,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 14,
"dictSort" : 1,
"dictLabel" : "通知",
@ -174,7 +174,7 @@
"createTime" : 1708254321994,
"updateBy" : null,
"updateTime" : 1708254321994,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 15,
"dictSort" : 2,
"dictLabel" : "公告",
@ -191,7 +191,7 @@
"createTime" : 1708254322001,
"updateBy" : null,
"updateTime" : 1708254322001,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 16,
"dictSort" : 1,
"dictLabel" : "正常",
@ -208,7 +208,7 @@
"createTime" : 1708254322006,
"updateBy" : null,
"updateTime" : 1708254322006,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 17,
"dictSort" : null,
"dictLabel" : "关闭",
@ -225,7 +225,7 @@
"createTime" : 1708254322012,
"updateBy" : null,
"updateTime" : 1708254322012,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 18,
"dictSort" : null,
"dictLabel" : "新增",
@ -242,7 +242,7 @@
"createTime" : 1708254322018,
"updateBy" : null,
"updateTime" : 1708254322018,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 19,
"dictSort" : null,
"dictLabel" : "修改",
@ -259,7 +259,7 @@
"createTime" : 1708254322022,
"updateBy" : null,
"updateTime" : 1708254322022,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 20,
"dictSort" : null,
"dictLabel" : "删除",
@ -276,7 +276,7 @@
"createTime" : 1708254322025,
"updateBy" : null,
"updateTime" : 1708254322025,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 21,
"dictSort" : null,
"dictLabel" : "授权",
@ -293,7 +293,7 @@
"createTime" : 1708254322027,
"updateBy" : null,
"updateTime" : 1708254322027,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 22,
"dictSort" : null,
"dictLabel" : "导出",
@ -310,7 +310,7 @@
"createTime" : 1708254322030,
"updateBy" : null,
"updateTime" : 1708254322030,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 23,
"dictSort" : null,
"dictLabel" : "导入",
@ -327,7 +327,7 @@
"createTime" : 1708254322035,
"updateBy" : null,
"updateTime" : 1708254322035,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 24,
"dictSort" : null,
"dictLabel" : "强退",
@ -344,7 +344,7 @@
"createTime" : 1708254322038,
"updateBy" : null,
"updateTime" : 1708254322038,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 25,
"dictSort" : null,
"dictLabel" : "生成代码",
@ -361,7 +361,7 @@
"createTime" : 1708254322041,
"updateBy" : null,
"updateTime" : 1708254322041,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 26,
"dictSort" : null,
"dictLabel" : "清空数据",
@ -378,7 +378,7 @@
"createTime" : 1708254322044,
"updateBy" : null,
"updateTime" : 1708254322044,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 27,
"dictSort" : null,
"dictLabel" : "成功",
@ -395,7 +395,7 @@
"createTime" : 1708254322046,
"updateBy" : null,
"updateTime" : 1708254322046,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 28,
"dictSort" : null,
"dictLabel" : "失败",
@ -412,7 +412,7 @@
"createTime" : 1708254322051,
"updateBy" : null,
"updateTime" : 1708254322051,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 29,
"dictSort" : null,
"dictLabel" : "其他",

16
data/init/sys_dict_type.json
View File

@ -4,7 +4,7 @@
"createTime" : 1708254322074,
"updateBy" : null,
"updateTime" : 1708254322074,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 1,
"dictName" : "用户性别",
"dictType" : "sys_user_sex",
@ -16,7 +16,7 @@
"createTime" : 1708254322084,
"updateBy" : null,
"updateTime" : 1708254322084,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 2,
"dictName" : "菜单状态",
"dictType" : "sys_show_hide",
@ -28,7 +28,7 @@
"createTime" : 1708254322088,
"updateBy" : null,
"updateTime" : 1708254322088,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 3,
"dictName" : "系统开关",
"dictType" : "sys_normal_disable",
@ -40,7 +40,7 @@
"createTime" : 1708254322091,
"updateBy" : null,
"updateTime" : 1708254322091,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 6,
"dictName" : "系统是否",
"dictType" : "sys_yes_no",
@ -52,7 +52,7 @@
"createTime" : 1708254322093,
"updateBy" : null,
"updateTime" : 1708254322093,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 7,
"dictName" : "通知类型",
"dictType" : "sys_notice_type",
@ -64,7 +64,7 @@
"createTime" : 1708254322097,
"updateBy" : null,
"updateTime" : 1708254322097,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 8,
"dictName" : "通知状态",
"dictType" : "sys_notice_status",
@ -76,7 +76,7 @@
"createTime" : 1708254322100,
"updateBy" : null,
"updateTime" : 1708254322100,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 9,
"dictName" : "操作类型",
"dictType" : "sys_oper_type",
@ -88,7 +88,7 @@
"createTime" : 1708254322103,
"updateBy" : null,
"updateTime" : 1708254322103,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 10,
"dictName" : "系统状态",
"dictType" : "sys_common_status",

4
data/init/sys_logininfor.json
View File

@ -1,6 +1,6 @@
[ {
"id" : 516579924885573,
"tenantId" : 0,
"tenantId" : "000000",
"userName" : "admin",
"status" : "0",
"ipaddr" : "127.0.0.1",
@ -11,7 +11,7 @@
"loginTime" : 1708254547722
}, {
"id" : 1665628533390614529,
"tenantId" : 0,
"tenantId" : "000000",
"userName" : "admin",
"status" : "0",
"ipaddr" : "127.0.0.1",

4
data/init/sys_notice.json
View File

@ -4,7 +4,7 @@
"createTime" : 1708254322623,
"updateBy" : null,
"updateTime" : 1708254322623,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 1,
"noticeTitle" : "温馨提醒：2018-07-01 新版本发布啦",
"noticeType" : "2",
@ -18,7 +18,7 @@
"createTime" : 1708254322639,
"updateBy" : null,
"updateTime" : 1708254322639,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 2,
"noticeTitle" : "维护通知：2018-07-01 系统凌晨维护",
"noticeType" : "1",

22
data/init/sys_oper_log.json
View File

@ -5,7 +5,7 @@
"updateBy" : null,
"updateTime" : null,
"id" : 516580177526853,
"tenantId" : 0,
"tenantId" : "000000",
"title" : "菜单管理",
"businessType" : 2,
"businessTypes" : null,
@ -30,7 +30,7 @@
"updateBy" : null,
"updateTime" : null,
"id" : 516580271538245,
"tenantId" : 0,
"tenantId" : "000000",
"title" : "菜单管理",
"businessType" : 2,
"businessTypes" : null,
@ -55,7 +55,7 @@
"updateBy" : null,
"updateTime" : null,
"id" : 516580303495237,
"tenantId" : 0,
"tenantId" : "000000",
"title" : "菜单管理",
"businessType" : 2,
"businessTypes" : null,
@ -80,7 +80,7 @@
"updateBy" : null,
"updateTime" : null,
"id" : 516580369678405,
"tenantId" : 0,
"tenantId" : "000000",
"title" : "菜单管理",
"businessType" : 2,
"businessTypes" : null,
@ -105,7 +105,7 @@
"updateBy" : null,
"updateTime" : null,
"id" : 516580424007749,
"tenantId" : 0,
"tenantId" : "000000",
"title" : "菜单管理",
"businessType" : 2,
"businessTypes" : null,
@ -130,7 +130,7 @@
"updateBy" : null,
"updateTime" : null,
"id" : 516580484644933,
"tenantId" : 0,
"tenantId" : "000000",
"title" : "菜单管理",
"businessType" : 2,
"businessTypes" : null,
@ -155,7 +155,7 @@
"updateBy" : null,
"updateTime" : null,
"id" : 516580523356229,
"tenantId" : 0,
"tenantId" : "000000",
"title" : "菜单管理",
"businessType" : 2,
"businessTypes" : null,
@ -180,7 +180,7 @@
"updateBy" : null,
"updateTime" : null,
"id" : 516580549386309,
"tenantId" : 0,
"tenantId" : "000000",
"title" : "菜单管理",
"businessType" : 2,
"businessTypes" : null,
@ -205,7 +205,7 @@
"updateBy" : null,
"updateTime" : null,
"id" : 516580700786757,
"tenantId" : 0,
"tenantId" : "000000",
"title" : "用户管理",
"businessType" : 3,
"businessTypes" : null,
@ -230,7 +230,7 @@
"updateBy" : null,
"updateTime" : null,
"id" : 516580742733893,
"tenantId" : 0,
"tenantId" : "000000",
"title" : "用户管理",
"businessType" : 3,
"businessTypes" : null,
@ -255,7 +255,7 @@
"updateBy" : null,
"updateTime" : null,
"id" : 1665641342438514690,
"tenantId" : 0,
"tenantId" : "000000",
"title" : "代码生成",
"businessType" : 6,
"businessTypes" : null,

8
data/init/sys_oss_config.json
View File

@ -4,7 +4,7 @@
"createTime" : 1708254322687,
"updateBy" : 1,
"updateTime" : 1708254322687,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 1,
"configKey" : "oss-embed",
"accessKey" : "admin",
@ -26,7 +26,7 @@
"createTime" : 1708254322701,
"updateBy" : 1,
"updateTime" : 1708254322701,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 2,
"configKey" : "qiniu",
"accessKey" : "XXXXXXXXXXXXXXX",
@ -48,7 +48,7 @@
"createTime" : 1708254322703,
"updateBy" : 1,
"updateTime" : 1708254322703,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 3,
"configKey" : "aliyun",
"accessKey" : "XXXXXXXXXXXXXXX",
@ -70,7 +70,7 @@
"createTime" : 1708254322705,
"updateBy" : 1,
"updateTime" : 1708254322705,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 4,
"configKey" : "qcloud",
"accessKey" : "XXXXXXXXXXXXXXX",

8
data/init/sys_post.json
View File

@ -4,7 +4,7 @@
"createTime" : 1708254322729,
"updateBy" : null,
"updateTime" : 1708254322729,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 1,
"postCode" : "ceo",
"postName" : "董事长",
@ -17,7 +17,7 @@
"createTime" : 1708254322742,
"updateBy" : null,
"updateTime" : 1708254322742,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 2,
"postCode" : "se",
"postName" : "项目经理",
@ -30,7 +30,7 @@
"createTime" : 1708254322745,
"updateBy" : null,
"updateTime" : 1708254322745,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 3,
"postCode" : "hr",
"postName" : "人力资源",
@ -43,7 +43,7 @@
"createTime" : 1708254322750,
"updateBy" : null,
"updateTime" : 1708254322750,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 4,
"postCode" : "user",
"postName" : "普通员工",

4
data/init/sys_role.json
View File

@ -4,7 +4,7 @@
"createTime" : 1708254322779,
"updateBy" : null,
"updateTime" : 1708254322779,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 1,
"roleName" : "超级管理员",
"roleKey" : "superadmin",
@ -22,7 +22,7 @@
"createTime" : 1708254322799,
"updateBy" : null,
"updateTime" : 1708254322799,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 2,
"roleName" : "普通角色",
"roleKey" : "common",

2
data/init/sys_tenant.json
View File

@ -5,7 +5,7 @@
"updateBy" : null,
"updateTime" : 1708254323415,
"id" : 1,
"tenantId" : 0,
"tenantId" : "000000",
"contactUserName" : "管理组",
"contactPhone" : "15888888888",
"companyName" : "XXX有限公司",

2
data/init/sys_user.json
View File

@ -4,7 +4,7 @@
"createTime" : 1708254323474,
"updateBy" : 1,
"updateTime" : 1708254547736,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 1,
"deptId" : 103,
"userName" : "admin",

16
data/init/userInfo.json
View File

@ -4,7 +4,7 @@
"createTime" : 1708254321471,
"updateBy" : null,
"updateTime" : 1708254321471,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 432323,
"uid" : "18126045687",
"secret" : "483752384B473759556E685768796B6F644E48634F76486C51646A41576B545A2B396C34474244414F334F517674507547437A72627A7154302B724441734C5A",
@ -24,7 +24,7 @@
"createTime" : 1708254321468,
"updateBy" : null,
"updateTime" : 1708254321468,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 3454543,
"uid" : "tm1",
"secret" : null,
@ -44,7 +44,7 @@
"createTime" : 1708254321451,
"updateBy" : null,
"updateTime" : 1708254321451,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 13123123,
"uid" : "iotkit",
"secret" : "6E49354D37437030564370666E48486150524B3134743258735059354D75324F6532594478654C47767535614C6C6E767139625170774E576477785A34513369",
@ -64,7 +64,7 @@
"createTime" : 1708254321458,
"updateBy" : null,
"updateTime" : 1708254321458,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 23423423,
"uid" : "tm3",
"secret" : null,
@ -84,7 +84,7 @@
"createTime" : 1708254321463,
"updateBy" : null,
"updateTime" : 1708254321463,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 45234345,
"uid" : "du1",
"secret" : "483752384B473759556E685768796B6F644E48634F76486C51646A41576B545A2B396C34474244414F334F517674507547437A72627A7154302B724441734C5A",
@ -104,7 +104,7 @@
"createTime" : 1708254321454,
"updateBy" : null,
"updateTime" : 1708254321454,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 12312312312,
"uid" : "du2",
"secret" : null,
@ -124,7 +124,7 @@
"createTime" : 1708254321446,
"updateBy" : null,
"updateTime" : 1708254321446,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 141231312312,
"uid" : "guest1",
"secret" : "48774861346645676F51324A4D6E6639306E6474437741634C4333746C4575666C316F76503455542B5836763065315A2F676244695056557356704D49513569",
@ -144,7 +144,7 @@
"createTime" : 1708254321434,
"updateBy" : null,
"updateTime" : 1708254321434,
"tenantId" : 0,
"tenantId" : "000000",
"id" : 13123123123213,
"uid" : "13480802157",
"secret" : "483752384B473759556E685768796B6F644E48634F76486C51646A41576B545A2B396C34474244414F334F78574F4778613764564338594E666770595A376177",

BIN
doc/image.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 165 KiB

1
iot-dao/iot-data-model/pom.xml
View File

@ -44,7 +44,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/alert/AlertConfig.java
View File

@ -23,7 +23,6 @@
package cc.iotkit.model.alert;
import cc.iotkit.model.Owned;
import cc.iotkit.model.TenantModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -36,7 +35,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AlertConfig extends TenantModel implements Owned<Long> {
public class AlertConfig implements Owned<Long> {
private Long id;

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/alert/AlertRecord.java
View File

@ -23,7 +23,6 @@
package cc.iotkit.model.alert;
import cc.iotkit.model.Owned;
import cc.iotkit.model.TenantModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -36,7 +35,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AlertRecord extends TenantModel implements Owned<Long> {
public class AlertRecord implements Owned<Long> {
private Long id;

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/device/DeviceConfig.java
View File

@ -23,7 +23,6 @@
package cc.iotkit.model.device;
import cc.iotkit.model.Id;
import cc.iotkit.model.TenantModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -36,7 +35,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class DeviceConfig extends TenantModel implements Id<String> {
public class DeviceConfig implements Id<String> {
private String id;

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/device/DeviceGroup.java
View File

@ -23,14 +23,13 @@
package cc.iotkit.model.device;
import cc.iotkit.model.Owned;
import cc.iotkit.model.TenantModel;
import lombok.Data;
/**
* 设备分组
*/
@Data
public class DeviceGroup extends TenantModel implements Owned<String> {
public class DeviceGroup implements Owned<String> {
/**
* 分组id

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/device/DeviceInfo.java
View File

@ -23,7 +23,6 @@
package cc.iotkit.model.device;
import cc.iotkit.model.Owned;
import cc.iotkit.model.TenantModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -38,7 +37,7 @@ import java.util.Map;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class DeviceInfo extends TenantModel implements Owned<String> {
public class DeviceInfo implements Owned<String> {
private String id;

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/device/VirtualDevice.java
View File

@ -23,7 +23,6 @@
package cc.iotkit.model.device;
import cc.iotkit.model.Owned;
import cc.iotkit.model.TenantModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -39,7 +38,7 @@ import java.util.List;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class VirtualDevice extends TenantModel implements Owned<String> {
public class VirtualDevice implements Owned<String> {
public static final String STATE_STOPPED = "stopped";
public static final String STATE_RUNNING = "running";

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/notify/Channel.java
View File

@ -24,7 +24,6 @@
package cc.iotkit.model.notify;
import cc.iotkit.model.Id;
import cc.iotkit.model.TenantModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -39,7 +38,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class Channel extends TenantModel implements Id<Long> {
public class Channel implements Id<Long> {
private Long id;

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/notify/ChannelConfig.java
View File

@ -24,7 +24,6 @@
package cc.iotkit.model.notify;
import cc.iotkit.model.Id;
import cc.iotkit.model.TenantModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -39,7 +38,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ChannelConfig extends TenantModel implements Id<Long> {
public class ChannelConfig implements Id<Long> {
private Long id;

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/notify/ChannelTemplate.java
View File

@ -24,7 +24,6 @@
package cc.iotkit.model.notify;
import cc.iotkit.model.Id;
import cc.iotkit.model.TenantModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -39,7 +38,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ChannelTemplate extends TenantModel implements Id<Long> {
public class ChannelTemplate implements Id<Long> {
private Long id;

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/notify/NotifyMessage.java
View File

@ -24,7 +24,6 @@
package cc.iotkit.model.notify;
import cc.iotkit.model.Id;
import cc.iotkit.model.TenantModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -39,7 +38,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class NotifyMessage extends TenantModel implements Id<Long> {
public class NotifyMessage implements Id<Long> {
private Long id;

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/ota/DeviceOta.java
View File

@ -23,7 +23,6 @@
package cc.iotkit.model.ota;
import cc.iotkit.model.TenantModel;
import lombok.Data;
/**
@ -32,7 +31,7 @@ import lombok.Data;
* @Description:
*/
@Data
public class DeviceOta extends TenantModel {
public class DeviceOta {
private String currentVersion;
private String deviceId;
}

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/ota/DeviceOtaDetail.java
View File

@ -24,7 +24,6 @@
package cc.iotkit.model.ota;
import cc.iotkit.model.Id;
import cc.iotkit.model.TenantModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -40,7 +39,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class DeviceOtaDetail extends TenantModel implements Id<Long> {
public class DeviceOtaDetail implements Id<Long> {
private Long id;

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/ota/DeviceOtaInfo.java
View File

@ -24,7 +24,6 @@
package cc.iotkit.model.ota;
import cc.iotkit.model.Id;
import cc.iotkit.model.TenantModel;
import lombok.*;
/**
@ -37,7 +36,7 @@ import lombok.*;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class DeviceOtaInfo extends TenantModel implements Id<Long> {
public class DeviceOtaInfo implements Id<Long> {
private Long id;

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/ota/OtaDevice.java
View File

@ -24,7 +24,6 @@
package cc.iotkit.model.ota;
import cc.iotkit.model.Id;
import cc.iotkit.model.TenantModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -39,7 +38,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OtaDevice extends TenantModel implements Id<Long> {
public class OtaDevice implements Id<Long> {
private Long id;

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/ota/OtaInfo.java
View File

@ -23,7 +23,6 @@
package cc.iotkit.model.ota;
import cc.iotkit.model.TenantModel;
import lombok.Data;
import java.io.Serializable;
@ -34,6 +33,6 @@ import java.io.Serializable;
* @Description:
*/
@Data
public class OtaInfo extends TenantModel implements Serializable {
public class OtaInfo implements Serializable {
}

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/ota/OtaPackage.java
View File

@ -24,7 +24,6 @@
package cc.iotkit.model.ota;
import cc.iotkit.model.Id;
import cc.iotkit.model.TenantModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -41,7 +40,7 @@ import java.util.Map;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OtaPackage extends TenantModel implements Id<Long> {
public class OtaPackage implements Id<Long> {
private Long id;

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/plugin/PluginInfo.java
View File

@ -25,7 +25,6 @@ package cc.iotkit.model.plugin;
import cc.iotkit.model.BaseModel;
import cc.iotkit.model.Id;
import cc.iotkit.model.TenantModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -38,7 +37,7 @@ import java.io.Serializable;
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class PluginInfo extends TenantModel implements Id<Long>, Serializable {
public class PluginInfo extends BaseModel implements Id<Long>, Serializable {
/**
* 插件状态-停止

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/plugin/PluginInstance.java
View File

@ -25,7 +25,6 @@ package cc.iotkit.model.plugin;
import cc.iotkit.model.BaseModel;
import cc.iotkit.model.Id;
import cc.iotkit.model.TenantModel;
import lombok.*;
import java.io.Serializable;
@ -40,7 +39,7 @@ import java.io.Serializable;
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class PluginInstance extends TenantModel implements Id<Long>, Serializable {
public class PluginInstance extends BaseModel implements Id<Long>, Serializable {
private Long id;

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/product/AppDesign.java
View File

@ -23,7 +23,6 @@
package cc.iotkit.model.product;
import cc.iotkit.model.Owned;
import cc.iotkit.model.TenantModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -33,7 +32,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AppDesign extends TenantModel implements Owned<String> {
public class AppDesign implements Owned<String> {
private String id;

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/product/Category.java
View File

@ -23,11 +23,10 @@
package cc.iotkit.model.product;
import cc.iotkit.model.Id;
import cc.iotkit.model.TenantModel;
import lombok.Data;
@Data
public class Category extends TenantModel implements Id<String> {
public class Category implements Id<String> {
private String id;

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/product/ProductModel.java
View File

@ -23,7 +23,6 @@
package cc.iotkit.model.product;
import cc.iotkit.model.Id;
import cc.iotkit.model.TenantModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -33,7 +32,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ProductModel extends TenantModel implements Id<String> {
public class ProductModel implements Id<String> {
public static final String TYPE_JS = "JavaScript";
public static final String TYPE_LUA = "LuaScript";

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/system/SysLoginInfo.java
View File

@ -24,7 +24,6 @@
package cc.iotkit.model.system;
import cc.iotkit.model.Id;
import cc.iotkit.model.TenantModel;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@ -37,7 +36,7 @@ import java.util.Date;
* @date 2023-02-07
*/
@Data
public class SysLoginInfo extends TenantModel implements Id<Long>,Serializable {
public class SysLoginInfo implements Id<Long>,Serializable {
private static final long serialVersionUID = 1L;
/**

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/system/SysRoleDept.java
View File

@ -25,7 +25,6 @@ package cc.iotkit.model.system;
import cc.iotkit.model.BaseModel;
import cc.iotkit.model.Id;
import cc.iotkit.model.TenantModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -38,7 +37,7 @@ import java.io.Serializable;
**/
@EqualsAndHashCode(callSuper = true)
@Data
public class SysRoleDept extends TenantModel implements Id<Long>, Serializable {
public class SysRoleDept extends BaseModel implements Id<Long>, Serializable {
private static final long serialVersionUID = 1L;

3
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/system/SysRoleMenu.java
View File

@ -25,7 +25,6 @@ package cc.iotkit.model.system;
import cc.iotkit.model.BaseModel;
import cc.iotkit.model.Id;
import cc.iotkit.model.TenantModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -39,7 +38,7 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Data
public class SysRoleMenu extends TenantModel implements Id<Long>, Serializable {
public class SysRoleMenu extends BaseModel implements Id<Long>, Serializable {
private static final long serialVersionUID = 1L;

4
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/system/SysUserPost.java
View File

@ -26,8 +26,6 @@ package cc.iotkit.model.system;
import cc.iotkit.model.BaseModel;
import cc.iotkit.model.Id;
import java.io.Serializable;
import cc.iotkit.model.TenantModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -39,7 +37,7 @@ import lombok.EqualsAndHashCode;
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class SysUserPost extends TenantModel implements Id<Long>, Serializable {
public class SysUserPost extends BaseModel implements Id<Long>, Serializable {
private static final long serialVersionUID = 1L;
private Long id;

4
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/system/SysUserRole.java
View File

@ -26,8 +26,6 @@ package cc.iotkit.model.system;
import cc.iotkit.model.BaseModel;
import cc.iotkit.model.Id;
import java.io.Serializable;
import cc.iotkit.model.TenantModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -39,7 +37,7 @@ import lombok.EqualsAndHashCode;
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class SysUserRole extends TenantModel implements Id<Long>, Serializable {
public class SysUserRole extends BaseModel implements Id<Long>, Serializable {
private static final long serialVersionUID = 1L;
private Long id;

1
iot-dao/iot-data-service/pom.xml
View File

@ -25,7 +25,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>

3
iot-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysMenuData.java
View File

@ -67,7 +67,4 @@ public interface ISysMenuData extends ICommonData<SysMenu, Long> {
boolean checkMenuNameUnique(SysMenu menu);
List<Long> selectParentIdByMenuIds(List<Long> menuIds);
List<Long> findByMenuIdListAndNotParentIdList(List<Long> menuIds, List<Long> parentIds);
}

1
iot-dao/iot-data-serviceImpl-cache/pom.xml
View File

@ -52,7 +52,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>

4
iot-dao/iot-data-serviceImpl-rdb/pom.xml
View File

@ -96,10 +96,6 @@
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>cc.iotkit</groupId>
<artifactId>iot-common-satoken</artifactId>
</dependency>
</dependencies>

17
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/DeviceIdGroup.java
View File

@ -22,34 +22,21 @@
*/
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.ParamDef;
import javax.persistence.EntityListeners;
@Data
@NoArgsConstructor
@AllArgsConstructor
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class DeviceIdGroup extends BaseEntity implements TenantAware {
public class DeviceIdGroup {
@ApiModelProperty(value = "设备组id")
private Long id;
private String id;
@ApiModelProperty(value = "设备id")
private String deviceId;
@ApiModelProperty(value = "组名称")
private String name;
private Long tenantId;
}

18
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertConfig.java
View File

@ -23,28 +23,22 @@
package cc.iotkit.data.model;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.alert.AlertConfig;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
@Data
@Entity
@Table(name = "alert_config")
@AutoMapper(target = AlertConfig.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbAlertConfig extends BaseEntity implements TenantAware {
public class TbAlertConfig {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -100,6 +94,4 @@ public class TbAlertConfig extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "创建时间")
private Long createAt;
private Long tenantId;
}

17
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertRecord.java
View File

@ -23,28 +23,22 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.alert.AlertRecord;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
@Data
@Entity
@Table(name = "alert_record")
@AutoMapper(target = AlertRecord.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbAlertRecord extends BaseEntity implements TenantAware {
public class TbAlertRecord {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -88,5 +82,4 @@ public class TbAlertRecord extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "是否已读")
private Boolean readFlg;
private Long tenantId;
}

18
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbCategory.java
View File

@ -22,28 +22,22 @@
*/
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.product.Category;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
@Data
@Entity
@Table(name = "category")
@AutoMapper(target = Category.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbCategory extends BaseEntity implements TenantAware {
public class TbCategory {
@ApiModelProperty(value = "分类id")
@Id
@ -57,5 +51,5 @@ public class TbCategory extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "分类描述")
private Long createAt;
private Long tenantId;
}

18
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannel.java
View File

@ -23,19 +23,16 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.notify.Channel;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* author: 石恒
@ -46,10 +43,7 @@ import javax.persistence.*;
@Entity
@Table(name = "channel")
@AutoMapper(target= Channel.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbChannel extends BaseEntity implements TenantAware {
public class TbChannel {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@GenericGenerator(name = "SnowflakeIdGenerator", strategy = "cc.iotkit.data.config.id.SnowflakeIdGenerator")
@ -67,6 +61,4 @@ public class TbChannel extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "创建时间")
private Long createAt;
private Long tenantId;
}

13
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelConfig.java
View File

@ -23,18 +23,12 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.notify.ChannelConfig;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
@ -48,10 +42,7 @@ import javax.persistence.*;
@Table(name = "channel_config")
@ApiModel(value = "通道配置")
@AutoMapper(target = ChannelConfig.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbChannelConfig extends BaseEntity implements TenantAware {
public class TbChannelConfig {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@GenericGenerator(name = "SnowflakeIdGenerator", strategy = "cc.iotkit.data.config.id.SnowflakeIdGenerator")
@ -70,6 +61,4 @@ public class TbChannelConfig extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "创建时间")
private Long createAt;
private Long tenantId;
}

18
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelTemplate.java
View File

@ -23,20 +23,17 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.notify.ChannelTemplate;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* @Author: 石恒
@ -48,10 +45,7 @@ import javax.persistence.*;
@Table(name = "channel_template")
@ApiModel(value = "通道模板")
@AutoMapper(target= ChannelTemplate.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbChannelTemplate extends BaseEntity implements TenantAware {
public class TbChannelTemplate {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@GenericGenerator(name = "SnowflakeIdGenerator", strategy = "cc.iotkit.data.config.id.SnowflakeIdGenerator")
@ -69,6 +63,4 @@ public class TbChannelTemplate extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "创建时间")
private Long createAt;
private Long tenantId;
}

13
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceConfig.java
View File

@ -23,19 +23,13 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.device.DeviceConfig;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
@ -44,10 +38,7 @@ import javax.persistence.*;
@ApiModel(value = "设备配置")
@Table(name = "device_config")
@AutoMapper(target = DeviceConfig.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbDeviceConfig extends BaseEntity implements TenantAware {
public class TbDeviceConfig {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -77,6 +68,4 @@ public class TbDeviceConfig extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "创建时间")
private Long createAt;
private Long tenantId;
}

17
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroup.java
View File

@ -22,30 +22,24 @@
*/
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.device.DeviceGroup;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
@Data
@Entity
@Table(name = "device_group")
@ApiModel(value = "设备组")
@AutoMapper(target = DeviceGroup.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbDeviceGroup extends BaseEntity implements TenantAware {
public class TbDeviceGroup {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -80,5 +74,4 @@ public class TbDeviceGroup extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "创建时间")
private long createAt;
private Long tenantId;
}

17
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroupMapping.java
View File

@ -23,29 +23,23 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Entity
@Table(name = "device_group_mapping")
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbDeviceGroupMapping extends BaseEntity implements TenantAware {
public class TbDeviceGroupMapping {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -59,5 +53,4 @@ public class TbDeviceGroupMapping extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "设备组id")
private String groupId;
private Long tenantId;
}

21
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceInfo.java
View File

@ -23,8 +23,6 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.device.DeviceInfo;
import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMapping;
@ -32,22 +30,19 @@ import io.github.linpeilie.annotations.ReverseAutoMapping;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
@Data
@Entity
@Table(name = "device_info")
@ApiModel(value = "设备信息")
@AutoMapper(target = DeviceInfo.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbDeviceInfo extends BaseEntity implements TenantAware {
public class TbDeviceInfo {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -95,10 +90,4 @@ public class TbDeviceInfo extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "创建时间")
private Long createAt;
/**
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private Long tenantId;
}

13
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceOtaDetail.java
View File

@ -23,18 +23,12 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.ota.DeviceOtaDetail;
import cc.iotkit.model.ota.DeviceOtaInfo;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
@ -48,10 +42,7 @@ import javax.persistence.*;
@Table(name = "device_ota_detail")
@ApiModel(value = "设备升级明细")
@AutoMapper(target = DeviceOtaDetail.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbDeviceOtaDetail extends BaseEntity implements TenantAware {
public class TbDeviceOtaDetail {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@GenericGenerator(name = "SnowflakeIdGenerator", strategy = "cc.iotkit.data.config.id.SnowflakeIdGenerator")
@ -75,6 +66,4 @@ public class TbDeviceOtaDetail extends BaseEntity implements TenantAware {
private String deviceName;
private Long otaInfoId;
private Long tenantId;
}

13
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceOtaInfo.java
View File

@ -23,18 +23,12 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.ota.DeviceOtaInfo;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
@ -48,10 +42,7 @@ import javax.persistence.*;
@Table(name = "device_ota_info")
@ApiModel(value = "设备信息")
@AutoMapper(target = DeviceOtaInfo.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbDeviceOtaInfo extends BaseEntity implements TenantAware {
public class TbDeviceOtaInfo {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@GenericGenerator(name = "SnowflakeIdGenerator", strategy = "cc.iotkit.data.config.id.SnowflakeIdGenerator")
@ -75,6 +66,4 @@ public class TbDeviceOtaInfo extends BaseEntity implements TenantAware {
private String productKey;
private Long createAt;
private Long tenantId;
}

19
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceSubUser.java
View File

@ -22,27 +22,22 @@
*/
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
@Data
@Entity
@Table(name = "device_sub_user")
@ApiModel(value = "设备用户映射")
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbDeviceSubUser extends BaseEntity implements TenantAware {
public class TbDeviceSubUser {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -56,6 +51,4 @@ public class TbDeviceSubUser extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "设备用户id")
private String uid;
private Long tenantId;
}

12
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceTag.java
View File

@ -22,19 +22,13 @@
*/
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
@ -45,10 +39,7 @@ import javax.persistence.*;
@Entity
@Table(name = "device_tag")
@ApiModel(value = "设备标签")
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbDeviceTag extends BaseEntity implements TenantAware {
public class TbDeviceTag {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -78,5 +69,4 @@ public class TbDeviceTag extends BaseEntity implements TenantAware {
@Column(name = "[value]")
private String value;
private Long tenantId;
}

3
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbIcon.java
View File

@ -23,7 +23,6 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.product.Icon;
import io.github.linpeilie.annotations.AutoMapper;
@ -43,7 +42,7 @@ import javax.persistence.*;
@ApiModel(value = "图标")
@Table(name = "icon")
@AutoMapper(target = Icon.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "string")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbIcon extends BaseEntity implements TenantAware {

18
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbNotifyMessage.java
View File

@ -23,20 +23,17 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.notify.NotifyMessage;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* @Author: 石恒
@ -48,10 +45,7 @@ import javax.persistence.*;
@ApiModel(value = "通知消息")
@Table(name = "notify_message")
@AutoMapper(target= NotifyMessage.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbNotifyMessage extends BaseEntity implements TenantAware {
public class TbNotifyMessage {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@GenericGenerator(name = "SnowflakeIdGenerator", strategy = "cc.iotkit.data.config.id.SnowflakeIdGenerator")
@ -67,6 +61,4 @@ public class TbNotifyMessage extends BaseEntity implements TenantAware {
private Long createAt;
private Long updateAt;
private Long tenantId;
}

12
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOauthClient.java
View File

@ -22,25 +22,21 @@
*/
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.OauthClient;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
@Data
@Entity
@Table(name = "oauth_client")
@AutoMapper(target = OauthClient.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbOauthClient {
@Id

18
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOtaDevice.java
View File

@ -23,16 +23,13 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* @Author: 石恒
@ -42,10 +39,7 @@ import javax.persistence.*;
@Data
@Entity
@Table(name = "ota_device")
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbOtaDevice extends BaseEntity implements TenantAware {
public class TbOtaDevice {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -61,6 +55,4 @@ public class TbOtaDevice extends BaseEntity implements TenantAware {
private Integer status;
private Long createAt;
private Long tenantId;
}

13
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOtaPackage.java
View File

@ -23,16 +23,10 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.ota.OtaPackage;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
@ -45,10 +39,7 @@ import javax.persistence.*;
@Entity
@Table(name = "ota_package")
@AutoMapper(target = OtaPackage.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbOtaPackage extends BaseEntity implements TenantAware {
public class TbOtaPackage {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -81,6 +72,4 @@ public class TbOtaPackage extends BaseEntity implements TenantAware {
private String extData;
private Long createAt;
private Long tenantId;
}

18
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbPluginInstance.java
View File

@ -23,21 +23,18 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.plugin.PluginInstance;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
@Data
@EqualsAndHashCode(callSuper = true)
@ -45,10 +42,7 @@ import javax.persistence.*;
@ApiModel(value = "插件实例")
@Table(name = "plugin_instance")
@AutoMapper(target = PluginInstance.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbPluginInstance extends BaseEntity implements TenantAware {
public class TbPluginInstance extends BaseEntity {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -87,6 +81,4 @@ public class TbPluginInstance extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "心跳时间")
private Long heartbeatAt;
private Long tenantId;
}

3
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProduct.java
View File

@ -23,7 +23,6 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.product.Product;
import io.github.linpeilie.annotations.AutoMapper;
@ -45,7 +44,7 @@ import javax.persistence.*;
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "string")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbProduct extends BaseEntity implements TenantAware {
public class TbProduct implements TenantAware {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")

13
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProductModel.java
View File

@ -23,18 +23,12 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.product.ProductModel;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
@ -43,10 +37,7 @@ import javax.persistence.*;
@ApiModel(value = "产品型号")
@Table(name = "product_model")
@AutoMapper(target = ProductModel.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbProductModel extends BaseEntity implements TenantAware {
public class TbProductModel {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -84,6 +75,4 @@ public class TbProductModel extends BaseEntity implements TenantAware {
private String state;
@ApiModelProperty(value = "修改时间")
private Long modifyAt;
private Long tenantId;
}

12
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbRuleInfo.java
View File

@ -22,9 +22,6 @@
*/
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.rule.RuleInfo;
import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMapping;
@ -32,10 +29,7 @@ import io.github.linpeilie.annotations.ReverseAutoMapping;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
@ -44,10 +38,7 @@ import javax.persistence.*;
@Table(name = "rule_info")
@ApiModel(value = "规则")
@AutoMapper(target = RuleInfo.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbRuleInfo extends BaseEntity implements TenantAware {
public class TbRuleInfo {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -92,5 +83,4 @@ public class TbRuleInfo extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "创建时间")
private Long createAt;
private Long tenantId;
}

12
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbScreen.java
View File

@ -23,16 +23,15 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.screen.Screen;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* @Author：tfd
@ -42,9 +41,6 @@ import javax.persistence.*;
@Entity
@Table(name = "screen")
@AutoMapper(target = Screen.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbScreen {
@Id

7
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbScreenApi.java
View File

@ -23,14 +23,10 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.screen.ScreenApi;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
@ -42,9 +38,6 @@ import javax.persistence.*;
@Entity
@Table(name = "screen_api")
@AutoMapper(target = ScreenApi.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbScreenApi {
@Id

16
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOss.java
View File

@ -23,21 +23,18 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.system.SysOss;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* OSS对象存储对象
@ -50,10 +47,7 @@ import javax.persistence.*;
@Table(name = "sys_oss")
@ApiModel(value = "OSS对象存储对象")
@AutoMapper(target = SysOss.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbSysOss extends BaseEntity implements TenantAware {
public class TbSysOss extends BaseEntity {
/**
* 对象存储主键

18
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleDept.java
View File

@ -23,19 +23,16 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.system.SysRoleDept;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* 角色和部门关联 sys_role_dept
@ -47,10 +44,7 @@ import javax.persistence.*;
@Entity
@Table(name = "sys_role_dept")
@AutoMapper(target = SysRoleDept.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbSysRoleDept extends BaseEntity implements TenantAware {
public class TbSysRoleDept {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -70,6 +64,4 @@ public class TbSysRoleDept extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "部门ID")
private Long deptId;
private Long tenantId;
}

18
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleMenu.java
View File

@ -23,19 +23,16 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.system.SysRoleMenu;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* 角色和菜单关联 sys_role_menu
@ -47,10 +44,7 @@ import javax.persistence.*;
@Entity
@Table(name = "sys_role_menu")
@AutoMapper(target = SysRoleMenu.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbSysRoleMenu extends BaseEntity implements TenantAware {
public class TbSysRoleMenu {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -70,6 +64,4 @@ public class TbSysRoleMenu extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "菜单ID")
private Long menuId;
private Long tenantId;
}

1
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenant.java
View File

@ -44,6 +44,7 @@ import java.util.Date;
* @author Michelle.Chung
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Entity
@Table(name = "sys_tenant")
@AutoMapper(target = SysTenant.class)

18
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserPost.java
View File

@ -23,18 +23,15 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* 用户和岗位关联 sys_user_post
@ -46,10 +43,7 @@ import javax.persistence.*;
@Entity
@Table(name = "sys_user_post")
@AutoMapper(target = cc.iotkit.model.system.SysUserPost.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbSysUserPost extends BaseEntity implements TenantAware {
public class TbSysUserPost extends BaseEntity {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -68,6 +62,4 @@ public class TbSysUserPost extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "岗位ID")
private Long postId;
private Long tenantId;
}

17
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserRole.java
View File

@ -23,18 +23,15 @@
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* 用户和角色关联 sys_user_role
@ -46,10 +43,7 @@ import javax.persistence.*;
@Entity
@Table(name = "sys_user_role")
@AutoMapper(target = cc.iotkit.model.system.SysUserRole.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbSysUserRole extends BaseEntity implements TenantAware {
public class TbSysUserRole extends BaseEntity {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -68,5 +62,4 @@ public class TbSysUserRole extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "角色ID")
private Long roleId;
private Long tenantId;
}

13
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbTaskInfo.java
View File

@ -22,19 +22,13 @@
*/
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.rule.TaskInfo;
import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMapping;
import io.github.linpeilie.annotations.ReverseAutoMapping;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
@ -42,10 +36,7 @@ import javax.persistence.*;
@Entity
@Table(name = "task_info")
@AutoMapper(target = TaskInfo.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbTaskInfo extends BaseEntity implements TenantAware {
public class TbTaskInfo {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -107,6 +98,4 @@ public class TbTaskInfo extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "操作备注")
private String reason;
private Long tenantId;
}

12
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbThingModel.java
View File

@ -22,19 +22,13 @@
*/
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.product.ThingModel;
import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMapping;
import io.github.linpeilie.annotations.ReverseAutoMapping;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
@ -42,10 +36,7 @@ import javax.persistence.*;
@Entity
@Table(name = "thing_model")
@AutoMapper(target = ThingModel.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbThingModel extends BaseEntity implements TenantAware {
public class TbThingModel {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -62,5 +53,4 @@ public class TbThingModel extends BaseEntity implements TenantAware {
@ReverseAutoMapping(ignore = true)
private String model;
private Long tenantId;
}

13
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDevice.java
View File

@ -22,17 +22,11 @@
*/
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import cc.iotkit.model.device.VirtualDevice;
import io.github.linpeilie.annotations.AutoMapper;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
@ -40,10 +34,7 @@ import javax.persistence.*;
@Entity
@Table(name = "virtual_device")
@AutoMapper(target = VirtualDevice.class)
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbVirtualDevice extends BaseEntity implements TenantAware {
public class TbVirtualDevice {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -106,6 +97,4 @@ public class TbVirtualDevice extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "创建时间")
private Long createAt;
private Long tenantId;
}

17
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDeviceMapping.java
View File

@ -22,29 +22,23 @@
*/
package cc.iotkit.data.model;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.listener.TenantListener;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.ParamDef;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Entity
@Table(name = "virtual_device_mapping")
@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")})
@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
@EntityListeners(TenantListener.class)
public class TbVirtualDeviceMapping extends BaseEntity implements TenantAware {
public class TbVirtualDeviceMapping {
@Id
@GeneratedValue(generator = "SnowflakeIdGenerator")
@ -57,5 +51,4 @@ public class TbVirtualDeviceMapping extends BaseEntity implements TenantAware {
@ApiModelProperty(value = "设备ID")
private String deviceId;
private Long tenantId;
}

6
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java
View File

@ -25,7 +25,6 @@ package cc.iotkit.data.service;
import cc.iotkit.common.api.PageRequest;
import cc.iotkit.common.api.Paging;
import cc.iotkit.common.satoken.utils.LoginHelper;
import cc.iotkit.common.utils.MapstructUtils;
import cc.iotkit.common.utils.ReflectUtil;
import cc.iotkit.data.dao.*;
@ -369,7 +368,7 @@ public class DeviceInfoDataImpl implements IDeviceInfoData, IJPACommData<DeviceI
@Transactional
public void addToGroup(String deviceId, DeviceInfo.Group group) {
String groupId = UUID.randomUUID().toString();
deviceGroupMappingRepository.save(new TbDeviceGroupMapping(groupId, deviceId, group.getId(), LoginHelper.getTenantId()));
deviceGroupMappingRepository.save(new TbDeviceGroupMapping(groupId, deviceId, group.getId()));
//更新设备数量
updateGroupDeviceCount(groupId);
@ -463,8 +462,7 @@ public class DeviceInfoDataImpl implements IDeviceInfoData, IJPACommData<DeviceI
deviceGroupMappingRepository.save(new TbDeviceGroupMapping(
UUID.randomUUID().toString(),
data.getDeviceId(),
id,
LoginHelper.getTenantId()
id
));
}
});

17
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysMenuDataImpl.java
View File

@ -35,11 +35,8 @@ import cc.iotkit.data.model.TbSysMenu;
import cc.iotkit.data.system.ISysMenuData;
import cc.iotkit.data.util.PredicateBuilder;
import cc.iotkit.model.system.SysMenu;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.Projections;
import com.querydsl.jpa.impl.JPAQuery;
import com.querydsl.jpa.impl.JPAQueryFactory;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Primary;
@ -232,18 +229,4 @@ public class SysMenuDataImpl implements ISysMenuData, IJPACommData<SysMenu, Long
.build()).fetchOne();
return Objects.isNull(tbSysMenu);
}
@Override
public List<Long> selectParentIdByMenuIds(List<Long> menuIds) {
return jpaQueryFactory.select(tbSysMenu.parentId).from(tbSysMenu).where(tbSysMenu.id.in(menuIds)).fetch();
}
@Override
public List<Long> findByMenuIdListAndNotParentIdList(List<Long> menuIds, List<Long> parentIds) {
Predicate build = PredicateBuilder.instance()
.and(tbSysMenu.id.in(menuIds))
.and(CollectionUtil.isNotEmpty(parentIds), () -> tbSysMenu.id.notIn(parentIds)).build();
return jpaQueryFactory.select(tbSysMenu.id).from(tbSysMenu).where(build).fetch();
}
}

24
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysTenantDataImpl.java
View File

@ -23,8 +23,6 @@
package cc.iotkit.data.service;
import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.helper.TenantHelper;
import cc.iotkit.common.utils.MapstructUtils;
import cc.iotkit.common.utils.StringUtils;
import cc.iotkit.data.dao.IJPACommData;
@ -32,10 +30,7 @@ import cc.iotkit.data.dao.SysTenantRepository;
import cc.iotkit.data.model.TbSysTenant;
import cc.iotkit.data.system.ISysTenantData;
import cc.iotkit.data.util.PredicateBuilder;
import cc.iotkit.model.TenantModel;
import cc.iotkit.model.system.SysTenant;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.util.ObjectUtil;
import com.querydsl.jpa.impl.JPAQueryFactory;
import lombok.RequiredArgsConstructor;
@ -45,7 +40,6 @@ import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import static cc.iotkit.data.model.QTbSysTenant.tbSysTenant;
@ -81,7 +75,7 @@ public class SysTenantDataImpl implements ISysTenantData, IJPACommData<SysTenant
@Override
public List<SysTenant> findAllByCondition(SysTenant data) {
List<TbSysTenant> ret=jpaQueryFactory.selectFrom(tbSysTenant).where(PredicateBuilder.instance()
.and(ObjectUtil.isNotNull(data.getTenantId()),()->tbSysTenant.tenantId.eq(data.getTenantId()))
.and(StringUtils.isNotBlank(data.getContactUserName()),()->tbSysTenant.contactUserName.like(data.getContactUserName()))
.and(StringUtils.isNotBlank(data.getContactPhone()),()->tbSysTenant.contactPhone.eq(data.getContactPhone()))
.and(StringUtils.isNotBlank(data.getCompanyName()),()->tbSysTenant.companyName.like(data.getCompanyName()))
@ -106,20 +100,4 @@ public class SysTenantDataImpl implements ISysTenantData, IJPACommData<SysTenant
.build()).fetchOne();
return Objects.isNull(ret);
}
@Override
public SysTenant save(SysTenant data) {
Long id = data.getId();
Object tbData = MapstructUtils.convert(data, getJpaRepositoryClass());
Optional byId = id == null ? Optional.empty() : getBaseRepository().findById(id);
if (byId.isPresent()) {
Object dbObj = byId.get();
//只更新不为空的字段
BeanUtil.copyProperties(tbData, dbObj, CopyOptions.create().ignoreNullValue());
tbData = dbObj;
}
Object o = getBaseRepository().save(tbData);
return (SysTenant) MapstructUtils.convert(o, getTClass());
}
}

3
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/VirtualDeviceDataImpl.java
View File

@ -22,7 +22,6 @@
*/
package cc.iotkit.data.service;
import cc.iotkit.common.satoken.utils.LoginHelper;
import cc.iotkit.data.dao.IJPACommData;
import cc.iotkit.data.manager.IVirtualDeviceData;
import cc.iotkit.data.dao.VirtualDeviceMappingRepository;
@ -131,7 +130,7 @@ public class VirtualDeviceDataImpl implements IVirtualDeviceData, IJPACommData<V
data.getDevices().stream().map(d -> new TbVirtualDeviceMapping(
IdUtil.simpleUUID(),
data.getId(),
d, LoginHelper.getTenantId()
d
)).collect(Collectors.toList())
);
return data;

1
iot-dao/iot-temporal-service/pom.xml
View File

@ -30,7 +30,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>

1
iot-dao/iot-temporal-serviceImpl-td/pom.xml
View File

@ -74,7 +74,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>

1
iot-dao/iot-temporal-serviceImpl-ts/pom.xml
View File

@ -99,7 +99,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>

3
iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/DeviceController.java
View File

@ -28,7 +28,6 @@ import cc.iotkit.common.api.Request;
import cc.iotkit.common.api.Response;
import cc.iotkit.common.excel.utils.ExcelUtil;
import cc.iotkit.common.thing.ThingModelMessage;
import cc.iotkit.common.validate.QueryGroup;
import cc.iotkit.manager.dto.bo.device.*;
import cc.iotkit.manager.dto.bo.deviceconfig.DeviceConfigAddBo;
import cc.iotkit.manager.dto.bo.devicegroup.DeviceAddGroupBo;
@ -188,7 +187,7 @@ public class DeviceController {
@ApiOperation("设备物模型日志")
@SaCheckPermission("iot:deviceLog:query")
@PostMapping("/deviceLogs/list")
public Paging<ThingModelMessage> logs(@Validated(QueryGroup.class) @RequestBody PageRequest<DeviceLogQueryBo> request) {
public Paging<ThingModelMessage> logs(@Validated @RequestBody PageRequest<DeviceLogQueryBo> request) {
return deviceServiceImpl.logs(request);
}

3
iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProductController.java
View File

@ -29,7 +29,6 @@ import cc.iotkit.common.log.annotation.Log;
import cc.iotkit.common.log.enums.BusinessType;
import cc.iotkit.common.validate.AddGroup;
import cc.iotkit.common.validate.EditGroup;
import cc.iotkit.common.validate.QueryGroup;
import cc.iotkit.manager.dto.bo.category.CategoryBo;
import cc.iotkit.manager.dto.bo.product.IconBo;
import cc.iotkit.manager.dto.bo.product.IconTypeBo;
@ -68,7 +67,7 @@ public class ProductController {
@ApiOperation("列表")
@SaCheckPermission("iot:product:query")
@PostMapping("/list")
public Paging<ProductVo> getProducts(@Validated(QueryGroup.class) @RequestBody
public Paging<ProductVo> getProducts(@Validated @RequestBody
PageRequest<ProductBo> request) {
return productService.selectPageList(request);
}

1
iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceQueryBo.java
View File

@ -69,6 +69,7 @@ public class DeviceQueryBo extends BaseDto {
@ApiModelProperty(value="设备状态")
@Size(max = 255, message = "设备状态长度不正确")
@AutoMapping(ignore = true)
@ReverseAutoMapping(ignore = true)
private Boolean online;

3
iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/devicegroup/DeviceGroupBo.java
View File

@ -43,12 +43,15 @@ public class DeviceGroupBo extends BaseDto {
private static final long serialVersionUID = -1L;
@ApiModelProperty(value = "分组id")
@NotNull(message = "分组id不能为空")
private String id;
@ApiModelProperty(value = "创建时间")
@NotNull(message = "创建时间不能为空")
private Long createAt;
@ApiModelProperty(value = "设备数量")
@NotNull(message = "设备数量不能为空")
private Integer deviceQty;
@ApiModelProperty(value = "设备组名称")

Some files were not shown because too many files have changed in this diff Show More