Commit Graph

326 Commits

Author SHA1 Message Date
zhouhao 888f776124 修复未激活设备无法获取标签信息 2022-01-13 11:09:43 +08:00
zhouhao 1794e3d33a 1.12.0 2022-01-07 14:15:22 +08:00
zhouhao 0a6869fa44 设备注册时,如果设备已经注册则更新配置等信息。 2022-01-05 15:00:13 +08:00
zhouhao 0618d457d6 优化设备告警逻辑 2021-12-30 16:31:40 +08:00
zhouhao e18c99afce 添加消息全局UID 2021-12-30 16:22:37 +08:00
zhouhao da7e8093cf 修复无法转换非条件中属性值问题 2021-12-30 16:13:22 +08:00
zhouhao 1e1fb62b54 修复多个告警条件可能不触发的问题 2021-12-23 18:30:28 +08:00
zhou-hao ec414a3cc4 优化聚合查询 2021-12-08 10:54:26 +08:00
zhou-hao 8ba8941d78 优化设备状态同步逻辑 2021-12-01 14:35:17 +08:00
zhou-hao 5583a5f50d 优化菜单赋权逻辑 2021-11-18 17:10:27 +08:00
zhou-hao f2fdb4d4b5 优化菜单赋权逻辑 2021-11-18 17:10:06 +08:00
zhou-hao 1d0514292e fix error 2021-11-10 15:28:43 +08:00
zhou-hao f98de97c4b feat: 增加根据设备告警记录查询设备相关数据条件
传入查询条件
where = id dev-alarm 'state eq newer'
等同于
{
"column":"id",
"termType":"dev-alarm",
"value":"state eq newer"
}
2021-10-28 12:44:25 +08:00
zhou-hao 89fd9bf38c 修复未回复子设备指令问题 2021-10-20 09:18:16 +08:00
zhou-hao d99931fd88 1.12.0-SNAPSHOT 2021-10-13 14:55:50 +08:00
zhou-hao caf5e54d37 1.11.0 2021-10-13 14:53:38 +08:00
zhou-hao cee26b5c1c 修复子设备状态设置错误 2021-10-12 15:51:19 +08:00
zhou-hao 182de36567 增加循环依赖检查 2021-10-12 15:06:36 +08:00
zhou-hao 2a96d6896d 优化菜单管理 2021-10-12 09:39:11 +08:00
zhou-hao 1b29bd5e9f 优化设备告警逻辑 2021-09-07 11:19:31 +08:00
zhou-hao d22ff38384 优化代码结构 2021-08-16 09:52:51 +08:00
zhou-hao 07b3028e67 修复已禁用设备会被自动注册问题 2021-08-16 09:52:41 +08:00
zhou-hao ed7ea1e0fc 1.11.0-SNAPSHOT 2021-08-05 10:41:45 +08:00
zhou-hao 3592b74aec Merge remote-tracking branch 'origin/master' 2021-08-05 09:41:26 +08:00
zhou-hao d27d54a234 优化消息日志处理逻辑 2021-08-05 09:39:43 +08:00
zhouhao 27471ca990 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/web/OrganizationController.java
2021-08-04 20:41:44 +08:00
zhouhao 49165a593a Merge branch '1.8' 2021-08-04 20:41:17 +08:00
zhouhao 270aec11f3 优化 2021-08-04 20:40:47 +08:00
zhou-hao bd03dbd72a 1.10.0 2021-08-02 11:08:06 +08:00
zhou-hao 331f31a62b 优化设备指令发送规则执行器 2021-07-28 14:45:18 +08:00
zhou-hao 68af4adc4b fixed #79 2021-07-27 10:00:40 +08:00
zhou-hao aefcbec026 生成告警记录时生成ID,方便下游做处理。 2021-07-26 10:27:02 +08:00
zhou-hao 0b897833f9 忽略产品物模型中没有的事件 2021-07-19 13:40:25 +08:00
zhou-hao 3ce7343f07 设置默认语言环境为zh 2021-07-13 17:57:39 +08:00
zhou-hao 750418a92a i18n part 0 2021-07-02 13:36:56 +08:00
zhou-hao 3193bd2ad4 增加DeviceDataManager实现 2021-06-21 18:42:24 +08:00
zhou-hao 40d6a3ba41 设备导入导出支持机构:需要先将用户绑定到机构中. 2021-06-08 10:07:47 +08:00
zhou-hao 1585916776 增加属性源时间支持 2021-06-04 08:51:12 +08:00
zhou-hao c1ee8618ae 优化 2021-06-02 15:04:38 +08:00
zhou-hao 5666c23af1 1.10.0-SNAPSHOT 2021-06-02 13:46:18 +08:00
zhou-hao 3fa9c47af3 1.9.0 2021-05-31 09:31:03 +08:00
Tensai 9c65346a6c docs(数据流【设备网关-->物模型转换->时序入库】): 增加数据流入库的代码注释 优化代码结构
Signed-off-by: Tensai <517634644@qq.com>
2021-05-28 14:06:12 +08:00
Tensai 6a8a11338e Merge branch 'master' of https://github.com/jetlinks/jetlinks-community
 Conflicts:
	jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/data/AbstractDeviceDataStoragePolicy.java
2021-05-28 11:52:50 +08:00
Tensai f991c63403 Merge branch 'master' of https://github.com/qq517634644/jetlinks-community 2021-05-28 11:00:11 +08:00
Tensai 84ba163992 docs(数据流【设备网关-->物模型转换->时序入库】): 增加数据流入库的代码注释 优化代码结构
Signed-off-by: Tensai <517634644@qq.com>
2021-05-28 10:57:38 +08:00
zhou-hao c1363bd555 支持指定属性查询记录 2021-05-26 11:14:42 +08:00
zhou-hao d8d4668da1 优化每日在线数量统计 2021-05-26 10:14:04 +08:00
zhou-hao 4326ea01ae 增加机构绑定,解绑用户接口。 2021-05-25 11:06:02 +08:00
zhou-hao 4c53c2cd80 优化自状态管理 2021-05-24 15:53:27 +08:00
zhou-hao f6cbc93baa 优化指令发送处理 2021-05-20 17:41:38 +08:00