Commit Graph

348 Commits (dcfadb4b9f518e813050b17c19544e7a64187aef)

Author SHA1 Message Date
xiwa 3cd0622adb feat:增加指定初始文件路径 2024-02-28 22:36:56 +08:00
xiwa 7ea874c5ac feat:增加子设备注册关联 2024-02-24 23:30:26 +08:00
zhangpengxiang 6e6c3290be 修复获取虚拟设备列表接口分页BUG 2024-02-23 13:45:41 +08:00
zhangpengxiang 5eea178ab5 修改新增虚拟设备字段信息为NULL的问题 2024-02-22 16:03:12 +08:00
xiwa 181a8af8fa Merge branch 'dev-V0.5.0' of https://gitee.com/open-iita/iotkit-parent into dev-V0.5.0 2024-02-20 21:13:56 +08:00
xiwa 62c3be6ea0 fix:数据初始化、插件上报等修改 2024-02-20 21:13:37 +08:00
gaoyoulong b0bcea7d81 企业微信通知,钉钉通知,get方法给post方法 2024-02-20 11:02:27 +08:00
xiwa 85988e297f feat:初始数据修复 2024-02-19 12:34:53 +08:00
xiwa 9213704d02 feat:初始化数据调整、增加系统数据导出 2024-02-18 20:47:01 +08:00
xiwa 6361bb399c fix:插件上传、下行日志bug修复 2024-02-14 15:19:09 +08:00
xiwa 1fcf5035dc feat:迁移plugin-core到iot-core 2024-02-09 00:12:27 +08:00
xiwa ef0de940f1 feat:增加插件自启动 2024-02-03 20:27:42 +08:00
xiwa c25318d60f fix:规则引擎问题修复 2024-02-03 19:54:17 +08:00
xiwa 0d04a302a8 fix:属性过滤取值错误修复 2024-01-17 21:31:58 +08:00
xiwa 2da3174e01 feat:插件上传调整 2024-01-12 07:55:56 +08:00
xiwa c4ab4c90f3 Merge branch 'dev-V0.5.0' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.5.0 2024-01-06 22:43:26 +08:00
xiwa 69df507ae3 feat:独立spring-brick仓库 2024-01-06 22:43:18 +08:00
李道甫 8bd516de55 fix:修复模拟设备下行属性调试报错,修复模拟设备下行属性日志记录报错 2023-12-27 17:59:00 +08:00
xiwa 7a4c5e7390 feat:支持无通道告警 2023-12-27 06:05:55 +08:00
xiwa aec5a23b3f feat:规则引擎支持关联告警 2023-12-24 19:46:17 +08:00
xiwa 9ac5c81fc5 feat:更新脚本不用重启插件 2023-12-18 00:20:48 +08:00
xiwa 4070f1cca3 feat:修复插件重启报错、增加iotdb支持 2023-12-10 23:05:24 +08:00
xiwa 20116e47ac fix:action增加toString调用父类 2023-11-08 00:20:47 +08:00
xiwa 1934b743c2 fix:修复bug #I8DLHU 2023-11-03 22:58:29 +08:00
xiwa 723585f47c fix:插件脚本引擎获取修改 2023-10-30 08:39:59 +08:00
xiwa baea6416f4 fix:插件上传默认停止 2023-10-29 12:57:43 +08:00
xiwa b0ef14f731 fix:插件支持脚本文件自动导入 2023-10-27 08:12:06 +08:00
xiwa a636d3b283 fix:移除iot-test-mqtt到插件中 2023-10-16 08:00:40 +08:00
xiwa 99ce49f4c5 fix:合并dev-v0.4.6调整 2023-10-15 09:20:44 +08:00
xiwa 6c8dc8af9f feat:核心模块、插件模块抽离,插件完善 2023-10-10 07:34:00 +08:00
xiwa 21b8755751 feat:插件功能 2023-09-19 08:48:28 +08:00
xiwa def1852011 feat:td3.0支持调整 2023-08-13 09:01:25 +08:00
jay 3d6ef5fd7d Merge branch 'feature-openapi' into dev-V0.4.5 2023-08-11 10:30:58 +08:00
tangfudong 88d8133e14 add:添加应用信息相关接口 2023-08-10 18:38:22 +08:00
jay dc67b35d74 fix: 新增用户时报错,租户id查询 2023-08-08 15:58:14 +08:00
jay dafedadc0d fix: 物模型初始化数据,tdengine2.6初始化失败 2023-08-07 14:25:56 +08:00
xiwa cf7204c6f4 feat:多租户功能调整合并 2023-08-07 08:32:23 +08:00
dsy 7101975078 1.修改registerDevice接口的数据返回格式 2023-08-03 17:11:21 +08:00
jay 670836f6bf fix: json格式化放法 2023-08-02 16:46:41 +08:00
jay 31a6bec131 fix: 删除多余依赖 2023-08-02 16:45:37 +08:00
dsy 444de0a35a 1.修改queryDevicePropertyStatus接口的数据返回格式
2.修改setDeviceProperty接口的参数格式
2023-08-02 13:11:42 +08:00
dsy 67ab77a4ee Merge remote-tracking branch 'openiita-dev/dev-V0.4.5' into dev-V0.4.5 2023-08-01 16:45:03 +08:00
dsy d5af15ee10 1.获取物理属性快照添加物理模型信息 2023-08-01 16:41:15 +08:00
jay 076372eebc update: 贡献者页面权限 2023-08-01 11:03:49 +08:00
jay dbfb72e2c8 fix: 清除在线用户 2023-08-01 10:33:59 +08:00
jay 090ee3b825 fix: openapi pom版本 2023-07-31 11:21:45 +08:00
dsy 306a68e0b7 1.获取物理属性快照添加物理模型信息 2023-07-28 10:19:00 +08:00
dsy 9fa0056fef 1.修复openapi接口的一些bug
2.编辑设备name的时候添加判断不可重复名称
2023-07-27 10:44:58 +08:00
dsy 1f3afb77c1 1.单个设备注册、单个设备删除、设置设备的属性、查询指定设备的属性快照接口 2023-07-26 11:44:59 +08:00
jay 81b72b5693 fix: iot-openapi 权限拦截 2023-07-26 11:13:57 +08:00
花木水之间 a60fa98640
!22 openapi模块推送测试
Merge pull request !22 from sawyer/dev-V0.4.5
2023-07-26 02:46:14 +00:00
dsy ff0685994d 1.新建openapi模块,并添加了获取token和获取设备详情接口(未测试)
2.添加设备时新增判断,同产品下不可重复deviceName
2023-07-25 11:54:04 +08:00
xiwa 8df36940b6 feat:添加iot模块的功能权限和菜单 2023-07-24 13:24:41 +08:00
xiwa 9e07ff8d9c fix:权限拦截修改 2023-07-21 07:48:32 +08:00
荭琪枫 a0ee59b6c5 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-07-19 21:53:29 +08:00
荭琪枫 3b5f1aeb43 fix:添加批量升级创建时间 2023-07-19 21:53:25 +08:00
xiwa c26b26ce1c fix:规则引擎、定时任务问题修复 2023-07-19 10:05:55 +08:00
xiwa 104c193951
!20 fix: 修复规则引擎初始化错误bug
Merge pull request !20 from Sage/dev-V0.4.5
2023-07-18 18:00:25 +00:00
荭琪枫 991319f4ce fix:添加批量升级创建时间 2023-07-18 22:57:51 +08:00
荭琪枫 2a59e21d80 fix:添加批量升级创建时间 2023-07-18 22:44:21 +08:00
荭琪枫 5fb249f765 fix:添加批量升级创建时间 2023-07-18 22:33:34 +08:00
荭琪枫 a58a129737 fix:添加批量升级创建时间 2023-07-18 20:58:51 +08:00
荭琪枫 58008a7417 fix:添加批量升级创建时间 2023-07-18 00:02:59 +08:00
Sage 15e41fb318 fix: 修复规则引擎初始化bug 2023-07-17 17:25:24 +08:00
荭琪枫 f64ebb2814 fix:添加批量升级创建时间 2023-07-16 21:32:38 +08:00
tiger 680a50a85c feat: 完成多租户功能
多租户查询时,使用aop处理;新增,修改使用Hibernate
Filter处理。
主要逻辑:如果是超级管理员,租户id为000000,由超级管理员新增租户信息。当传过来的租户id是超级管理员是,不对租户id拦截处理。
非超级管理员,新增,更新,删除都有Hibernate的监听器处理,默认增加前端传过来的租户id。查询的时候,使用aop技术拦截。
详细说明,可以参考:https://blog.csdn.net/yuanyangzimu/article/details/131746893 或者 https://www.cnblogs.com/ch-10/p/17557409.html
2023-07-16 14:37:32 +08:00
tiger 5b577e3b99 feat: 引入jpa多租户
多租户查询时,使用aop处理;新增,修改使用Hibernate Filter处理
2023-07-15 23:29:47 +08:00
tiger 130581bc0c feat: 引入jpa多租户
jpa拦截初步完成
2023-07-15 01:04:20 +08:00
jay ac087ac9d7 Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-07-13 12:51:24 +08:00
荭琪枫 fade633289 add:添加批量升级批次管理 2023-07-12 21:57:16 +08:00
荭琪枫 4758fbc6b5 add:添加批量升级批次管理 2023-07-12 21:47:48 +08:00
jay 9b20cd24bb feat: 铱塔智联-贡献者初始化 2023-07-12 16:23:22 +08:00
荭琪枫 af192adda9 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-07-11 23:39:10 +08:00
荭琪枫 14552dbf97 fix:ota upgrade add producket key 2023-07-11 23:38:49 +08:00
xiwa 67c3cbb57e fix:物模型数据标识符修改 2023-07-11 00:25:14 +08:00
regan 70a6d9b058 fix: ota上传回显 2023-07-10 20:49:44 +08:00
jay 21cef99c95 fix: 产品编辑 2023-07-10 14:30:01 +08:00
xiwa 1c15bdc354 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-07-09 18:00:28 +08:00
xiwa 0ae3275c1b fix:增加物模型属性标识符校验 2023-07-09 18:00:22 +08:00
jay 7f00e72495 fix: 代码生成器 2023-07-09 17:29:05 +08:00
jay c8a18c168b Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-07-09 17:28:36 +08:00
jay 0799fea279 fix: 贡献者接口 2023-07-09 17:28:21 +08:00
regan 5f477ba024 fix: 用户头像上传调试 2023-07-09 17:13:57 +08:00
xiwa eae8dba660 fix:项目初始化优化 2023-07-09 15:15:50 +08:00
regan c7906551ae Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-07-08 17:07:02 +08:00
regan 83fbebb3b4 fix: oss 配置调试 2023-07-08 17:06:55 +08:00
xiwa 3c688e2271
!16 待优化项任务:sonerlint扫描,按建议修改相关不规范的代码
Merge pull request !16 from gxnualbert/dev-V0.4.5
2023-07-08 09:06:06 +00:00
regan 6d5f5e015c fix: oss 配置调试 2023-07-08 15:59:24 +08:00
regan fe810c5d8f fix: oss 配置调试 2023-07-08 15:52:23 +08:00
chenhui aba262dcb0 Merge branch 'upstream4-5' into dev-V0.4.5 2023-07-08 11:45:20 +08:00
chenhui 031dc16345 style: SonarLint扫描以及clean code代码规范修改
iot-module,iot-test-tool,iot-starter,iot-components模块SonarLint扫描以及clean
code代码规范修改
2023-07-08 11:42:58 +08:00
荭琪枫 10cd6d90e4 fix:删除无用的注释 2023-07-08 10:49:52 +08:00
xiwa 0ac4de90af fix:phoneNumber报错修复 2023-07-07 10:25:00 +08:00
xiwa 83b2a05dee Merge branch 'pr_14' into dev-V0.4.5 2023-07-06 23:54:28 +08:00
xiwa e6104c6e8b fix:pr修改 2023-07-06 23:53:12 +08:00
荭琪枫 a5c8ea933d Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-07-06 23:21:11 +08:00
荭琪枫 92f63efb47 ota:update converter.js 2023-07-06 23:20:55 +08:00
chenhui d1345b03c1 SonarLint & clean code 2023-07-06 22:40:11 +08:00
regan 128832eeb9 fix: oss 配置调试 2023-07-05 22:37:47 +08:00
jay 563459ba77 feat: 代码生成器-前端 2023-07-04 13:56:14 +08:00