Commit Graph

525 Commits

Author SHA1 Message Date
wxy001
5219a0c766 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	springboot/wumei-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
#	springboot/wumei-iot/src/main/java/com/ruoyi/iot/mqtt/EmqxService.java
#	springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/config/TDengineConfig.java
#	springboot/wumei-iot/src/main/resources/mapper/tdengine/DatabaseMapper.xml
#	springboot/wumei-iot/src/main/resources/mapper/tdengine/TDDeviceLogMapper.xml
2022-05-24 01:18:18 +08:00
wxy001
d032413a56 2022年5月24日01:05:38 还原ApplicationStart,讲TDengine相关类型和配置归于同一个包 2022-05-24 01:06:40 +08:00
随遇而安
8fb4f017e5 !32 增加时序数据库TDengine支持
Merge pull request !32 from xxmfl/master
2022-05-23 03:40:19 +00:00
wxy001
c43459e987 增加时序数据库TDengine存储设备日志和设备监测数据 2022-05-23 00:48:30 +08:00
wxy001
81232fbb04 2022年5月22日23:48:54 增加TDengine存储日志功能,
提供基础的新增和查询功能
2022-05-22 23:50:01 +08:00
wxy001
44f682c3ba 2022年5月20日19:30:44
1.集成TDengine作为日志和监测数据存储库使用
2.实现简单的新增和查询功能接口
2022-05-20 19:32:14 +08:00
kerwincui
7e00d8c0d6 解决多租户导致设备不显示问题 2022-05-18 20:57:05 +08:00
随遇而安
86940906ca update app/README.md. 2022-05-18 12:55:16 +00:00
随遇而安
568e4fbb25 update README.md. 2022-05-17 13:13:16 +00:00
随遇而安
2094e117c1 update README.md. 2022-05-17 07:28:10 +00:00
kerwincui
ccb0da2779 实时监测的bug修复 2022-05-16 18:55:55 +08:00
kerwincui
32f284b3c4 后端启动bug处理 2022-05-16 16:15:31 +08:00
kerwincui
3172f37090 暂时注释授权码的判断 2022-05-15 17:40:22 +08:00
kerwincui
85e3f1f6c8 还原设备实时监测代码,取消注释。 2022-05-15 17:38:35 +08:00
随遇而安
c82e65eea4 update sdk/RaspberryPi/README.md. 2022-05-14 02:58:44 +00:00
随遇而安
a0e8628e8a update sdk/RaspberryPi/README.md. 2022-05-14 02:56:57 +00:00
kerwincui
1b6f4ae53c 文档更新 2022-05-14 10:55:21 +08:00
随遇而安
7f91d1cbaa update sdk/RaspberryPi/README.md. 2022-05-14 02:50:59 +00:00
随遇而安
4018b2b02b update sdk/RaspberryPi/更多参考教程.txt. 2022-05-14 02:50:08 +00:00
kerwincui
ddd3b77182 修改文档 2022-05-14 10:49:08 +08:00
随遇而安
59cc0ad683 update sdk/RaspberryPi/README.md. 2022-05-14 02:46:27 +00:00
kerwincui
6511c32b02 更新markdown 2022-05-14 10:44:45 +08:00
kerwincui
d523a1bf1f 更新markdown文件 2022-05-14 10:39:55 +08:00
随遇而安
b65a19ad7f !31 增加对树莓派SDK的说明文件
Merge pull request !31 from YBZX/master
2022-05-14 02:31:35 +00:00
YBZX
3b75b121c4 增加对树莓派sdk说明文件 2022-05-13 15:59:09 +08:00
kerwincui
747eac3879 emq管理的权限控制调整 2022-05-13 13:43:50 +08:00
随遇而安
881bc88f5c update README.md. 2022-05-13 04:52:09 +00:00
随遇而安
23fe83f85c !30 开发完成的树莓派sdk
Merge pull request !30 from YBZX/master
2022-05-13 03:55:27 +00:00
kerwincui
0a59ea9478 规则引擎界面调整 2022-05-13 00:48:19 +08:00
YBZX
091782d000 添加树莓派sdk 2022-05-13 00:09:05 +08:00
kerwincui
bc147649c7 调整客户端界面 2022-05-12 18:07:39 +08:00
kerwincui
1b345cbbdd 第三方登录页面调整 2022-05-12 17:48:34 +08:00
kerwincui
70173b9b82 首页修改 2022-05-12 17:05:41 +08:00
kerwincui
bd4dd405d2 首页修改 2022-05-12 16:39:38 +08:00
kerwincui
bc694b8a6f 设备列表取消订阅 2022-05-12 14:25:42 +08:00
kerwincui
cd63e1eba4 注册和登录页面修改 2022-05-12 14:25:18 +08:00
kerwincui
303d6dc6b0 添加ios包文件 2022-05-10 14:10:21 +08:00
kerwincui
50e478317c apk更新 2022-05-09 20:14:16 +08:00
随遇而安
72467de6b9 update app/README.md. 2022-05-09 12:13:08 +00:00
随遇而安
0997fb4eed update app/README.md. 2022-05-09 12:12:23 +00:00
随遇而安
a6b2bed0f8 update app/README.md. 2022-05-09 12:11:25 +00:00
随遇而安
118c4814fb update app/README.md. 2022-05-09 12:10:24 +00:00
随遇而安
14f49580b9 update README.md. 2022-05-09 11:47:09 +00:00
kerwincui
1625cd0628 修改图片目录 2022-05-09 16:34:21 +08:00
随遇而安
e18d1de429 update README.md. 2022-05-09 06:35:27 +00:00
随遇而安
24b1fa84e5 update README.md. 2022-05-06 17:58:39 +00:00
随遇而安
7b715ea6e3 update app/README.md. 2022-05-06 17:58:20 +00:00
随遇而安
64c5834901 update README.md. 2022-05-06 17:57:22 +00:00
随遇而安
4217347366 update app/README.md. 2022-05-01 06:43:12 +00:00
随遇而安
cbc180ac9f update app/README.md. 2022-05-01 06:42:50 +00:00