suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,154 Commits 26 Branches 21 Tags 73 MiB
Commit Graph

449 Commits

Author SHA1 Message Date
zhouhao 80185b911a 调整状态同步逻辑 2022-08-03 14:07:14 +08:00
zhouhao 824e6241cd 增加设备会话统计指标 2022-07-08 17:02:15 +08:00
zhouhao 7dcfabf503 优化告警逻辑 2022-07-01 09:21:39 +08:00
zhouhao edec71c78c Merge remote-tracking branch 'origin/1.13' 2022-06-20 18:16:56 +08:00
Winston b1f34881a0 fix: Mono in Mono error 2022-06-20 18:10:35 +08:00
zhouhao 426394328b Merge branch '1.20' 
# Conflicts:
#	jetlinks-standalone/pom.xml
#	pom.xml
 2022-06-20 14:41:22 +08:00
zhouhao b5c7a0e5b2 Merge remote-tracking branch 'origin/master' 2022-06-20 09:50:16 +08:00
zhouhao 2b102fe315 fixed https://github.com/jetlinks/jetlinks-community/issues/173 2022-06-20 09:50:02 +08:00
zhouhao cb3fd4989e use apache Base64 2022-06-20 09:49:09 +08:00
老周 b3702588f9
Merge pull request #171 from wujun8/delete-reg 
批量删除设备,同时在注册中心取消激活已激活设备，并解绑子设备和网关.
 2022-06-15 11:17:12 +08:00
Winston 5d8a7f4050 collectMultimap -> groupBy 2022-06-14 19:44:03 +08:00
Winston f50dd08430 DefaultAsyncEvent.async 不能正确处理 Flux 2022-06-14 19:27:01 +08:00
zhouhao ede32aa7fc Merge branch 'master' into 1.20 
# Conflicts:
#	jetlinks-components/io-component/pom.xml
#	jetlinks-components/io-component/src/main/java/org/jetlinks/community/io/file/FileManagerConfiguration.java
#	jetlinks-components/io-component/src/main/java/org/jetlinks/community/io/file/FileProperties.java
#	jetlinks-components/io-component/src/main/java/org/jetlinks/community/io/file/web/FileManagerController.java
#	jetlinks-components/network-component/tcp-component/src/main/java/org/jetlinks/community/network/tcp/parser/strateies/DelimitedPayloadParserBuilder.java
#	jetlinks-components/notify-component/notify-email/src/main/java/org/jetlinks/community/notify/email/embedded/DefaultEmailNotifier.java
#	pom.xml
 2022-06-14 17:07:28 +08:00
Winston 106ef49155 Optimize imports 2022-06-14 15:07:20 +08:00
Winston 00502e621c 删除设备后置处理 2022-06-14 14:47:23 +08:00
Winston 16cf97055c 批量删除设备,同时在注册中心取消激活已激活设备，并解绑子设备和网关. 2022-06-13 19:05:24 +08:00
ayan 812749393d 静态文件授权支持 2022-06-13 15:38:37 +08:00
Winston 189756ebfd ProtocolSupport.onChildBind onChildUnbind 2022-06-08 17:18:46 +08:00
zhouhao 024c3d9649 1.20.0-SNAPSHOT 2022-05-07 14:15:09 +08:00
zhouhao 3621ef1ea8 Merge remote-tracking branch 'origin/master' 2022-04-06 18:23:00 +08:00
zhouhao 759176ec4a 修复设备告警定时触发可能不生效问题 2022-04-06 18:22:42 +08:00
zhouhao 13f7e87a5c 优化代码格式 2022-02-09 15:04:11 +08:00
zhouhao 803b7af565 1.13.0-SNAPSHOT 2022-01-17 16:16:52 +08:00
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
zhou-hao f19c3421b4 忽略自动启动规则错误 2021-05-20 17:27:51 +08:00
zhou-hao 98e89d8c9b 属性增加手动写值,当物模型配置了手动写值时,下发修改属性指令将不再发送到设备,而是直接入库并返回成功。 2021-05-20 16:29:43 +08:00
zhou-hao dc46a0374c 赋权时,增加越权处理 2021-05-14 16:15:55 +08:00
zhou-hao 9996403e86 优化说明 2021-04-27 11:30:05 +08:00
zhou-hao 342c59cdb0 优化子设备状态管理 2021-04-25 18:48:34 +08:00
zhou-hao ac51b0f77c 优化物模型拓展配置作用域 2021-04-19 17:00:48 +08:00
zhou-hao d449aad80d 优化设备消息存储 2021-04-06 18:05:41 +08:00
zhou-hao 67ffacffe0 增加物模型更新 2021-04-02 14:29:47 +08:00
zhou-hao ab8564447d 机构增加新增和保存接口 2021-04-01 16:50:22 +08:00
zhou-hao 6baf0d61aa 优化transport转换 2021-03-30 09:15:46 +08:00
zhou-hao 4c51ca55e5 增加查询子结构API 2021-03-30 09:10:28 +08:00
zhou-hao abb9077106 Merge remote-tracking branch 'origin/master' 2021-03-23 17:11:27 +08:00
zhou-hao 16787093b7 对单次上报的属性进行排序 2021-03-23 17:11:08 +08:00
zhou-hao 0cf85eb6dc 查询全部属性 2021-03-23 17:10:40 +08:00
zhouhao 51b786646b 优化网络组件 2021-03-19 20:09:03 +08:00
zhou-hao 270c1e70ee 优化物模型发布 2021-03-16 14:46:05 +08:00
zhou-hao 57d2f5fdc9 删除已经废弃的功能 2021-03-11 14:30:11 +08:00
zhou-hao 72ebae0a9a 增加重置物模型接口 2021-03-04 17:52:03 +08:00
zhou-hao 28101b31eb 设备日志增加消息ID 2021-02-24 18:38:46 +08:00
zhou-hao 2cd7f6f861 修复文档错误 2021-02-24 18:30:20 +08:00
zhou-hao 48132369d9 增加更新设备物模型接口 2021-02-24 18:29:13 +08:00
zhou-hao 1fee2614a8 1.9.0-SNAPSHOT 2021-02-24 18:28:06 +08:00
zhou-hao 5be35712de 增加是否独立物模型属性 2021-02-20 11:20:46 +08:00
zhou-hao d317f37ee4 设备标签增加类型转换 2021-01-28 15:35:03 +08:00
zhou-hao 18b25a05c1 增加发送指令到设备API 2021-01-27 17:03:49 +08:00
zhou-hao 8b6bc34970 import Values 2021-01-22 09:36:02 +08:00
FCG e385f73b6c
修复无法获取在线状态等信息的问题 2021-01-21 19:24:03 +08:00
zhou-hao feb5a1f46b state length = 16 2021-01-21 16:38:05 +08:00
zhou-hao ed5355ad53 增加默认物模型接口 2021-01-14 14:12:00 +08:00
zhou-hao 94c9b0e818 增加设备描述 2021-01-11 09:51:37 +08:00
zhou-hao 8a74c22996 1.8.0 2021-01-11 09:45:02 +08:00
zhou-hao 556ba4f27c 优化group 2020-12-28 11:09:08 +08:00
zhou-hao 44416e5c38 增加cachedConfiguration 2020-12-21 11:36:09 +08:00
zhou-hao 46ce8a0652 Merge remote-tracking branch 'origin/master' 2020-12-17 14:50:18 +08:00
zhou-hao 3072e73518 优化设备配置获取 2020-12-17 14:49:51 +08:00
老周 609f88496c
Merge pull request #28 from zengjianfei/master 
Update SqlRuleType.java
 2020-12-12 18:37:04 +08:00
zhou-hao a7842cfb68 1.8-SNAPSHOT 2020-12-12 17:57:47 +08:00
zengjianfei 977795652d
Update SqlRuleType.java 2020-12-11 11:35:01 +08:00
zhou-hao 2227defc5f 优化通知缓存处理 2020-12-01 16:12:44 +08:00
zhou-hao 33dc75439d 1.7.0 release 2020-12-01 15:14:14 +08:00
zhou-hao 7fa81c3372 可通过DeviceMessage.addHeader("ignoreLog",true)指定不记录此消息日志. 2020-12-01 13:56:59 +08:00
zhou-hao 19239af519 可通过DeviceMessage.addHeader("ignoreLog",true)指定不记录此消息日志. 2020-12-01 13:53:44 +08:00
zhou-hao b0b312ad8e 优化设备消息转发到机构topic 2020-11-30 18:51:27 +08:00
zhou-hao 0438fe7167 优化设备消息转发到机构topic 2020-11-30 18:51:03 +08:00
zhou-hao 1ce8d1e0d9 优化子设备消息处理 2020-11-30 17:57:43 +08:00
zhou-hao c919a42f19 优化子设备消息处理 2020-11-27 16:31:07 +08:00
zhou-hao 83b5cab87e 优化物模型拓展配置 2020-11-23 19:00:26 +08:00
zhou-hao b0e383005e 优化TopicMessage释放 2020-11-19 09:31:06 +08:00
zhou-hao 90849d57c6 优化设备消息转发 2020-11-17 18:50:07 +08:00
zhou-hao 2774ab8d9c 优化配置定义 2020-11-17 18:30:48 +08:00
zhou-hao d2a9902058 优化 2020-11-13 18:44:09 +08:00
zhou-hao 67c8e14945 修复查询属性未设置deviceId 2020-11-12 16:06:35 +08:00
zhou-hao 607dc59b93 标签查询增加表达式支持 2020-11-06 21:45:40 +08:00
zhou-hao fc25a3b728 增加云云对接支持查询接口 2020-11-06 15:44:42 +08:00
zhou-hao b383c075c0 增加设备配置定义和物模型操作接口 2020-11-05 11:01:00 +08:00
zhou-hao ccbc50f492 优化设备注册 2020-11-05 11:00:40 +08:00
zhou-hao 369491154e 1.7.0-SNAPSHOT 2020-11-05 10:31:24 +08:00
zhou-hao f4da3a226f 优化自注册时间 2020-11-04 16:48:03 +08:00
zhou-hao 8bb8f6b3d5 1.6.0 2020-10-30 10:58:23 +08:00
zhou-hao 5b193dd183 优化creatorId 2020-10-26 12:50:54 +08:00
zhou-hao 3e0c6cb2bc 优化聚合查询 2020-10-23 18:24:13 +08:00
zhou-hao 105679893b 修复设备日志时间戳错误问题 2020-10-22 15:10:44 +08:00
zhou-hao 1b6ea052f5 增加不存储设备数据策略 2020-10-20 21:33:14 +08:00
zhou-hao b316993505 1.6.0-SNAPSHOT 2020-10-19 19:40:07 +08:00
zhou-hao 785cdce799 Merge remote-tracking branch 'origin/master' 2020-10-14 10:50:28 +08:00
zhou-hao 908e53d6c9 修复无法更新标签问题 2020-10-14 09:57:38 +08:00
zhouhao a44719f665 删除重复添加动作节点 2020-10-13 22:42:41 +08:00
zhou-hao 8bef25b655 修复查询属性记录错误 2020-09-30 14:38:32 +08:00
zhou-hao 38404d9086 1.5.0 2020-09-30 11:35:46 +08:00
zhou-hao c2518daf29 优化统计 2020-09-29 10:12:05 +08:00
zhou-hao e322c28fa9 适配query参数 2020-09-29 09:49:55 +08:00
zhou-hao 2a29778475 查询时copy参数 防污染 2020-09-28 15:04:20 +08:00
zhouhao 38294f1517 Merge remote-tracking branch 'origin/master' 2020-09-26 12:18:47 +08:00
zhouhao 5e8e9ccbf6 优化配置 2020-09-26 12:16:50 +08:00
zhouhao 6316d99837 增加文档说明 2020-09-26 12:03:03 +08:00
zhouhao a366ae9f94 增加设备存储策略功能 2020-09-26 12:02:44 +08:00
zhouhao c29750e25f 增加权限相关文档说明 2020-09-26 10:57:29 +08:00