Commit Graph

243 Commits (7d590ed05db0fcdfaaec15b66d63f696afa2a7dc)
 

Author SHA1 Message Date
xins 4089c5f8b6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ruoyi-ui/src/api/business/device.js
1 year ago
xins 5c3f1aec4b 若依微服务1.2.5
1、
1 year ago
夜笙歌 1a81756ecf init 1 year ago
zhouhy c95c2ca727 1.2.5场景管理/监控单元管理 1 year ago
zhouhy 545f8536f5 更新 'ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java' 1 year ago
zhouhy ec65589f68 1.2.5场景管理/监控单元管理 1 year ago
zhouhy 89c213cede 1.2.5场景管理/监控单元管理 1 year ago
zhouhy bead9d6a7e Merge remote-tracking branch 'origin/master' 1 year ago
xins 22e1c58338 若依微服务1.2.4
1、TDengine服务完善
2、设备管理新增时在tdengine创建表,在redis存储用户名和密码
3、监控平台接口修改
1 year ago
xins bfd9bf573b 若依微服务1.2.3
1、设备管理增删改查
1 year ago
夜笙歌 e4f977911a 修改看板 1 year ago
夜笙歌 dc505ab90e 修改看板接口 1 year ago
夜笙歌 68b448c9ce 上传电子围栏 1 year ago
夜笙歌 677c5f7b61 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ruoyi-ui/src/views/board/index/index.vue
1 year ago
夜笙歌 c88f1bbf83 上传电子围栏 1 year ago
xins 13199aa96a 若依微服务1.2.2版本
1、菜单支持国际化
2、用户管理增加租户的维护
3、租户权限过滤增加
1 year ago
zhouhy 8896cd8652 Merge remote-tracking branch 'origin/master' 1 year ago
xins bcccd60a6b 若依微服务1.2.1版本
TeEngine服务完善
1 year ago
xins 1abf79f98f 若依微服务1.2.1版本
监控平台所有方法重写
1 year ago
xins a1030e6180 若依微服务1.2.0版本
监控平台所有方法重写
1 year ago
xins d75aa67860 若依微服务1.2.0版本
监控平台所有方法重写
1 year ago
Wen JY d7b20bc371 change - websocket api接口异常处理 1 year ago
Wen JY 495289af1a change - websocket api返回值修改 1 year ago
Wen JY 1f29cf95d2 Merge remote-tracking branch 'origin/master' 1 year ago
Wen JY 5d6b6da804 change - broker监听器注入方式修改,websocket日志类修改final修饰 1 year ago
zhouhy b3e6bb5128 Merge remote-tracking branch 'origin/master' 1 year ago
zhouhy 389e333fe0 Merge remote-tracking branch 'origin/master' 1 year ago
夜笙歌 c3453a69a9 上传看板 1 year ago
zhouhy d82cf0f96d 1.1.3 监控单元Controller修改 1 year ago
Wen JY b4b02d9763 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwDeviceModeFunctionMapper.java
1 year ago
Wen JY 33bfbeeb1b add - WebSocket Server模块 1 year ago
xins d6681b60e1 Merge remote-tracking branch 'origin/master' 1 year ago
xins 41259cb5e6 若依微服务1.1.9版本
代码提交问题
1 year ago
zhouhy cef22f8287 1.1.3 监控单元Controller修改 1 year ago
zhouhy 7f13f3c0e7 1.1.3 监控单元Controller修改 1 year ago
zhouhy 7a3fd5ee04 1.1.3 监控单元Controller修改 1 year ago
zhouhy bbfa19c0a8 1.1.3 监控单元Controller修改 1 year ago
zhouhy 8854095388 1.1.3 监控单元Controller修改 1 year ago
Wen JY e1cc7df3be Merge remote-tracking branch 'origin/master' 1 year ago
Wen JY 26e2fe0b4e change - broker 参数配置修改,增加设备连接状态推送配置 1 year ago
xins e8c7ef4223 若依微服务1.1.8版本
同步配置
1 year ago
Wen JY 8c12296969 Merge remote-tracking branch 'origin/master' 1 year ago
Wen JY 222201ef5b change - broker 客户端认证逻辑修改 1 year ago
xins b1d23e194d 提交不了 1 year ago
xins 84cb7cdc4e 提交不了 1 year ago
Wen JY cac6b971fb Merge remote-tracking branch 'origin/master' 1 year ago
Wen JY c8cc19330d add - broker客户端接入白名单,yml中进行配置 1 year ago
xins 767d41e759 若依微服务1.1.7版本
同步配置
1 year ago
zhouhy 2bd6a15a09 1.1.3 监控单元Controller修改 1 year ago
xins 3043fffea3 若依微服务1.1.7版本
同步配置
1 year ago