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

Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5

V0.5.x
jay 2023-06-17 20:57:07 +08:00
parent 8b55b19cba fd28cef2d3
commit 64d0b1f7fc
4 changed files with 14 additions and 497 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

495
data/init/sys_menu.json
View File

@ -43,28 +43,6 @@
"status": "0",
"visible": "0"
},
{
"id": 3,
"createBy": 1,
"createDept": 103,
"updateBy": 1,
"component": null,
"icon": "tool",
"isCache": "0",
"isFrame": "1",
"menuName": "系统工具",
"menuType": "M",
"orderNum": 24,
"parentId": 0,
"path": "tool",
"perms": "",
"queryParam": "",
"remark": "系统工具目录",
"status": "0",
"visible": "0"
},
{
"id": 4,
"createBy": 1,
@ -76,34 +54,14 @@
"icon": "guide",
"isCache": "0",
"isFrame": "0",
"menuName": "PLUS官网",
"menuName": "铱塔官网",
"menuType": "M",
"orderNum": 25,
"parentId": 0,
"path": "https://gitee.com/dromara/RuoYi-Vue-Plus",
"path": "http://iotkit-open-source.gitee.io/document",
"perms": "",
"queryParam": "",
"remark": "RuoYi-Vue-Plus官网地址",
"status": "0",
"visible": "0"
},
{
"id": 5,
"createBy": 1,
"createDept": 103,
"updateBy": 1,
"component": null,
"icon": "star",
"isCache": "0",
"isFrame": "1",
"menuName": "测试菜单",
"menuType": "M",
"orderNum": 25,
"parentId": 0,
"path": "demo",
"perms": null,
"queryParam": null,
"remark": "",
"remark": "铱塔官网",
"status": "0",
"visible": "0"
},
@ -348,94 +306,6 @@
"status": "0",
"visible": "0"
},
{
"id": 113,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "monitor/cache/index",
"icon": "redis",
"isCache": "0",
"isFrame": "1",
"menuName": "缓存监控",
"menuType": "C",
"orderNum": 5,
"parentId": 2,
"path": "cache",
"perms": "monitor:cache:list",
"queryParam": "",
"remark": "缓存监控菜单",
"status": "0",
"visible": "0"
},
{
"id": 114,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "tool/build/index",
"icon": "build",
"isCache": "0",
"isFrame": "1",
"menuName": "表单构建",
"menuType": "C",
"orderNum": 1,
"parentId": 3,
"path": "build",
"perms": "tool:build:list",
"queryParam": "",
"remark": "表单构建菜单",
"status": "0",
"visible": "0"
},
{
"id": 115,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "tool/gen/index",
"icon": "code",
"isCache": "0",
"isFrame": "1",
"menuName": "代码生成",
"menuType": "C",
"orderNum": 2,
"parentId": 3,
"path": "gen",
"perms": "tool:gen:list",
"queryParam": "",
"remark": "代码生成菜单",
"status": "0",
"visible": "0"
},
{
"id": 117,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "monitor/admin/index",
"icon": "dashboard",
"isCache": "0",
"isFrame": "1",
"menuName": "Admin监控",
"menuType": "C",
"orderNum": 5,
"parentId": 2,
"path": "Admin",
"perms": "monitor:admin:list",
"queryParam": "",
"remark": "Admin监控菜单",
"status": "0",
"visible": "0"
},
{
"id": 118,
"createBy": 1,
@ -458,28 +328,6 @@
"status": "0",
"visible": "0"
},
{
"id": 120,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "monitor/xxljob/index",
"icon": "job",
"isCache": "0",
"isFrame": "1",
"menuName": "任务调度中心",
"menuType": "C",
"orderNum": 5,
"parentId": 2,
"path": "XxlJob",
"perms": "monitor:xxljob:list",
"queryParam": "",
"remark": "Xxl-Job控制台菜单",
"status": "0",
"visible": "0"
},
{
"id": 121,
"createBy": 1,
@ -1778,259 +1626,6 @@
"status": "0",
"visible": "0"
},
{
"id": 1500,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "demo/demo/index",
"icon": "#",
"isCache": "0",
"isFrame": "1",
"menuName": "测试单表",
"menuType": "C",
"orderNum": 1,
"parentId": 5,
"path": "demo",
"perms": "demo:demo:list",
"queryParam": null,
"remark": "测试单表菜单",
"status": "0",
"visible": "0"
},
{
"id": 1501,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "",
"icon": "#",
"isCache": "0",
"isFrame": "1",
"menuName": "测试单表查询",
"menuType": "F",
"orderNum": 1,
"parentId": 1500,
"path": "#",
"perms": "demo:demo:query",
"queryParam": null,
"remark": "",
"status": "0",
"visible": "0"
},
{
"id": 1502,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "",
"icon": "#",
"isCache": "0",
"isFrame": "1",
"menuName": "测试单表新增",
"menuType": "F",
"orderNum": 2,
"parentId": 1500,
"path": "#",
"perms": "demo:demo:add",
"queryParam": null,
"remark": "",
"status": "0",
"visible": "0"
},
{
"id": 1503,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "",
"icon": "#",
"isCache": "0",
"isFrame": "1",
"menuName": "测试单表修改",
"menuType": "F",
"orderNum": 3,
"parentId": 1500,
"path": "#",
"perms": "demo:demo:edit",
"queryParam": null,
"remark": "",
"status": "0",
"visible": "0"
},
{
"id": 1504,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "",
"icon": "#",
"isCache": "0",
"isFrame": "1",
"menuName": "测试单表删除",
"menuType": "F",
"orderNum": 4,
"parentId": 1500,
"path": "#",
"perms": "demo:demo:remove",
"queryParam": null,
"remark": "",
"status": "0",
"visible": "0"
},
{
"id": 1505,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "",
"icon": "#",
"isCache": "0",
"isFrame": "1",
"menuName": "测试单表导出",
"menuType": "F",
"orderNum": 5,
"parentId": 1500,
"path": "#",
"perms": "demo:demo:export",
"queryParam": null,
"remark": "",
"status": "0",
"visible": "0"
},
{
"id": 1506,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "demo/tree/index",
"icon": "#",
"isCache": "0",
"isFrame": "1",
"menuName": "测试树表",
"menuType": "C",
"orderNum": 1,
"parentId": 5,
"path": "tree",
"perms": "demo:tree:list",
"queryParam": null,
"remark": "测试树表菜单",
"status": "0",
"visible": "0"
},
{
"id": 1507,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "",
"icon": "#",
"isCache": "0",
"isFrame": "1",
"menuName": "测试树表查询",
"menuType": "F",
"orderNum": 1,
"parentId": 1506,
"path": "#",
"perms": "demo:tree:query",
"queryParam": null,
"remark": "",
"status": "0",
"visible": "0"
},
{
"id": 1508,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "",
"icon": "#",
"isCache": "0",
"isFrame": "1",
"menuName": "测试树表新增",
"menuType": "F",
"orderNum": 2,
"parentId": 1506,
"path": "#",
"perms": "demo:tree:add",
"queryParam": null,
"remark": "",
"status": "0",
"visible": "0"
},
{
"id": 1509,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "",
"icon": "#",
"isCache": "0",
"isFrame": "1",
"menuName": "测试树表修改",
"menuType": "F",
"orderNum": 3,
"parentId": 1506,
"path": "#",
"perms": "demo:tree:edit",
"queryParam": null,
"remark": "",
"status": "0",
"visible": "0"
},
{
"id": 1510,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "",
"icon": "#",
"isCache": "0",
"isFrame": "1",
"menuName": "测试树表删除",
"menuType": "F",
"orderNum": 4,
"parentId": 1506,
"path": "#",
"perms": "demo:tree:remove",
"queryParam": null,
"remark": "",
"status": "0",
"visible": "0"
},
{
"id": 1511,
"createBy": 1,
"createDept": 103,
"updateBy": null,
"updateTime": null,
"component": "",
"icon": "#",
"isCache": "0",
"isFrame": "1",
"menuName": "测试树表导出",
"menuType": "F",
"orderNum": 5,
"parentId": 1506,
"path": "#",
"perms": "demo:tree:export",
"queryParam": null,
"remark": "",
"status": "0",
"visible": "0"
},
{
"id": 1600,
"createBy": 1,
@ -2423,72 +2018,6 @@
"status": "0",
"visible": "0"
},
{
"id": 2202,
"createBy": 1,
"createDept": 103,
"updateBy": 1,
"component": null,
"icon": "list",
"isCache": "0",
"isFrame": "1",
"menuName": "crud组件Demo",
"menuType": "M",
"orderNum": 1,
"parentId": 0,
"path": "/crudDemo",
"perms": null,
"queryParam": null,
"remark": "",
"status": "0",
"visible": "0"
},
{
"id": 2203,
"createBy": 1,
"createDept": 103,
"updateBy": 1,
"component": "iot/crudDemo/disperseDemo",
"icon": "build",
"isCache": "0",
"isFrame": "1",
"menuName": "拆分组件demo",
"menuType": "C",
"orderNum": 1,
"parentId": 2202,
"path": "disperseDemo",
"perms": null,
"queryParam": null,
"remark": "",
"status": "0",
"visible": "0"
},
{
"id": 2204,
"createBy": 1,
"createDept": 103,
"updateBy": 1,
"component": "iot/crudDemo/crudDemo",
"icon": "cascader",
"isCache": "0",
"isFrame": "1",
"menuName": "crud组合组件",
"menuType": "C",
"orderNum": 2,
"parentId": 1660167072208510978,
"path": "crudDemo",
"perms": null,
"queryParam": null,
"remark": "",
"status": "0",
"visible": "0"
},
{
"id": 2205,
"createBy": 1,
@ -2585,7 +2114,7 @@
"updateBy": 1,
"component": "iot/communication/convertors/index",
"icon": "",
"icon": "component",
"isCache": "1",
"isFrame": "1",
"menuName": "设备消息转换器",
@ -2607,7 +2136,7 @@
"updateBy": 1,
"component": "iot/communication/components/index",
"icon": "",
"icon": "component",
"isCache": "1",
"isFrame": "1",
"menuName": "通讯组件管理",
@ -2651,7 +2180,7 @@
"updateBy": 1,
"component": "iot/ruleEngine/ruleSys/index",
"icon": "",
"icon": "component",
"isCache": "0",
"isFrame": "1",
"menuName": "规则管理",
@ -2673,7 +2202,7 @@
"updateBy": 1,
"component": "iot/ruleEngine/scheduledTask/index",
"icon": "",
"icon": "component",
"isCache": "0",
"isFrame": "1",
"menuName": "定时任务",
@ -2759,7 +2288,7 @@
"updateBy": 1,
"component": "iot/messageCenter/list",
"icon": "",
"icon": "message",
"isCache": "0",
"isFrame": "1",
"menuName": "消息列表",
@ -2803,7 +2332,7 @@
"updateBy": 1,
"component": "iot/channel/config",
"icon": "",
"icon": "system",
"isCache": "0",
"isFrame": "1",
"menuName": "通道配置",
@ -2825,7 +2354,7 @@
"updateBy": 1,
"component": "iot/channel/template",
"icon": "",
"icon": "system",
"isCache": "0",
"isFrame": "1",
"menuName": "模板配置",
@ -2869,7 +2398,7 @@
"updateBy": 1,
"component": "iot/alarm/list",
"icon": "",
"icon": "message",
"isCache": "0",
"isFrame": "1",
"menuName": "告警列表",
@ -2891,7 +2420,7 @@
"updateBy": 1,
"component": "iot/alarm/config",
"icon": "",
"icon": "system",
"isCache": "0",
"isFrame": "1",
"menuName": "告警配置",

10
iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/thingmodel/ThingModelVo.java
View File

@ -1,11 +1,7 @@
package cc.iotkit.manager.dto.vo.thingmodel;
import cc.iotkit.model.product.ThingModel;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMapping;
import io.github.linpeilie.annotations.ReverseAutoMapping;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -15,23 +11,17 @@ import java.io.Serializable;
@ApiModel(value = "ThingModelVo")
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = ThingModel.class)
public class ThingModelVo implements Serializable {
private static final long serialVersionUID = -1L;
@ApiModelProperty(value = "主键")
@ExcelProperty(value = "主键")
private String id;
@ApiModelProperty(value = "模型内容")
@ExcelProperty(value = "模型内容")
private ThingModel.Model model;
@ApiModelProperty(value = "产品key")
@ExcelProperty(value = "产品key")
private String productKey;
}

2
iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/DeviceServiceImpl.java
View File

@ -167,7 +167,7 @@ public class DeviceServiceImpl implements IDeviceService {
@Override
public DeviceInfo getDetail(String deviceId) {
DeviceInfo deviceInfo = deviceInfoData.findByDeviceId(deviceId);
dataOwnerService.checkOwner(deviceInfo);
// dataOwnerService.checkOwner(deviceInfo);
deviceInfo.setProperty(deviceInfoData.getProperties(deviceId));
return deviceInfo;
}

4
iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysUserOnlineController.java
View File

@ -37,7 +37,6 @@ public class SysUserOnlineController extends BaseController {
/**
* 获取在线用户监控列表
*
*/
@ApiOperation("获取在线用户监控列表")
@SaCheckPermission("monitor:online:list")
@ -74,12 +73,11 @@ public class SysUserOnlineController extends BaseController {
Collections.reverse(userOnlineDTOList);
userOnlineDTOList.removeAll(Collections.singleton(null));
List<SysUserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class);
return null;
return new Paging<>(userOnlineList.size(), userOnlineList);
}
/**
* 强退用户
*
*/
@ApiOperation("强退用户")
@SaCheckPermission("monitor:online:forceLogout")