Commit Graph

184 Commits (b5db785c5323f2c94dfa4788686f4ed14e6ac7a9)

Author SHA1 Message Date
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 9fa0056fef 1.修复openapi接口的一些bug
2.编辑设备name的时候添加判断不可重复名称
2023-07-27 10:44:58 +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
荭琪枫 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
荭琪枫 f64ebb2814 fix:添加批量升级创建时间 2023-07-16 21:32:38 +08:00
荭琪枫 fade633289 add:添加批量升级批次管理 2023-07-12 21:57:16 +08:00
荭琪枫 4758fbc6b5 add:添加批量升级批次管理 2023-07-12 21:47:48 +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 0ae3275c1b fix:增加物模型属性标识符校验 2023-07-09 18:00:22 +08:00
xiwa eae8dba660 fix:项目初始化优化 2023-07-09 15:15:50 +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 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
荭琪枫 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
荭琪枫 167d95c003 add:添加虚拟设备批量删除 2023-07-03 21:14:29 +08:00
荭琪枫 6cf1b30503 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-07-02 21:44:36 +08:00
荭琪枫 87c2a0b7ee add:添加批量删除 2023-07-02 21:44:33 +08:00
tangfudong 06678173c9 fix:设备修改接口添加 2023-06-30 11:35:52 +08:00
荭琪枫 a748b7c2ce add:添加产品删除 2023-06-29 22:26:21 +08:00
tangfudong cec5a72856 fix:设备地图相关接口迁移 2023-06-29 18:35:29 +08:00
tangfudong 6e5de54e6e fix:透传设备属性改为bool,初始化数据添加 2023-06-29 10:39:42 +08:00
荭琪枫 e340f59a48 update productVO add productSecret 2023-06-28 22:12:56 +08:00
荭琪枫 31a3a2a793 update:update ota 2023-06-28 10:40:37 +08:00
荭琪枫 1bd2a9ac9d feat:修改OTA升级 2023-06-27 23:04:34 +08:00
荭琪枫 f92bdd9235 feat:修改OTA升级 2023-06-27 22:48:21 +08:00
tangfudong aa888a3627 fix:迁移设备地图 2023-06-27 11:45:36 +08:00
tangfudong 2779fc269a update:迁移数据大屏模块 2023-06-26 13:53:54 +08:00
荭琪枫 f65fb9a10d add upload 2023-06-23 17:37:10 +08:00
xiwa a2dcfe4de5 fix:延时任务和虚拟设备 2023-06-22 09:18:36 +08:00
tangfudong 0994c7f1c9 fix:物模型型号配置添加删除接口 2023-06-21 17:29:25 +08:00
xiwa 1884459744 fix:定时任务 2023-06-21 01:11:33 +08:00
荭琪枫 918370e054 优化otaId 2023-06-20 23:03:53 +08:00
regan 6f33e020da fix: RuleLogBoAutoMapper 2023-06-19 20:44:09 +08:00
jay 4659484e63 fix: 忽略设备权限校验 2023-06-19 14:53:49 +08:00
xiwa 0ce0a704e8 fix:规则删除失败 2023-06-18 20:14:46 +08:00
xiwa 1ef0ac88a0 fix:规则引擎 2023-06-18 14:34:59 +08:00
jay 983f29c4ea fix: OTA_ID类型 2023-06-17 22:21:35 +08:00
荭琪枫 3575e4d8cf add:添加ota下发 2023-06-17 22:15:29 +08:00
xiwa d4e5c824a6 fix:物模型保存 2023-06-17 22:12:15 +08:00
jay 046860fe31 fix: 设备添加成功返回false 2023-06-17 21:35:12 +08:00
荭琪枫 19fca28fa2 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-06-17 21:01:14 +08:00
荭琪枫 e772f90e08 add:添加OTA上报记录结果并新增OTA上报结果查询 2023-06-17 21:00:55 +08:00
xiwa 2b46269265 fix:菜单调整 2023-06-17 20:45:20 +08:00
xiwa 5e84302179 fix:物模型转换修改 2023-06-17 17:27:20 +08:00
xiwa aabba71331 fix:产品模型 2023-06-17 15:03:22 +08:00
regan d7d67780c5 fix: 告警列表 2023-06-17 14:49:04 +08:00
regan 0f59c1f785 fix: 设备属性接口 2023-06-17 13:08:28 +08:00
regan ae776b7814 fix: 设备属性接口 2023-06-17 12:54:37 +08:00
regan fd799f331f fix: 设备属性接口 2023-06-17 12:40:52 +08:00
xiwa 90672fe6a9 fix:初始数据设备列表修改 2023-06-16 23:05:39 +08:00
tangfudong c2517075dd Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-16 19:14:35 +08:00
tangfudong c6f1e356b2 fix:消息列表联调完成 2023-06-16 19:13:47 +08:00
jay 03ab2263d9 fix: id类型 2023-06-16 19:13:45 +08:00
jay 4595f1f39a fix: 类型转化 2023-06-16 19:12:53 +08:00
tangfudong 04505e3495 fix:通道配置和模板配置完成 2023-06-16 18:44:35 +08:00
jay 9ff610546c fix: 定时任务 2023-06-16 17:59:15 +08:00
jay b12314ef78 fix: 通道配置mapper映射 2023-06-16 17:17:09 +08:00
荭琪枫 8c0ae750e4 refa:迁移channel 2023-06-16 17:03:41 +08:00
jay 2a16130310 fix: mapstruct-plus配置 2023-06-16 10:20:45 +08:00
regan 1838678497 fix: 定时任务列表注解 2023-06-15 21:32:00 +08:00
regan 75fad3038c fix: 定时任务列表注解 2023-06-15 21:28:44 +08:00
regan f9addd2b69 fix: 定时任务列表注解 2023-06-15 21:26:26 +08:00
regan f4afa8109f Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-15 21:24:54 +08:00
regan 75d2c15db4 fix: 产品列表注解 2023-06-15 21:24:39 +08:00
tangfudong eb3e0ffd20 fix:添加通道配置VoBo,添加获取通道配置分页接口 2023-06-15 19:40:26 +08:00
jay a06c01585b fix: 设备列表 2023-06-15 16:54:21 +08:00
jay 38e0f41957 fix: 通讯组件 2023-06-15 16:49:28 +08:00
jay e53e44cb20 Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-15 15:06:38 +08:00
jay 36a23cc99a refactor: 消息转换器 2023-06-15 15:06:23 +08:00
tangfudong bfd9216f26 fix:修改获取所有品类接口 2023-06-15 14:30:39 +08:00
jay 880b454438 fix: 产品id和productKey 2023-06-15 14:14:52 +08:00
xiwa 125b1c2ea3 refactor:产品和模型实体和接口调整 2023-06-15 08:38:54 +08:00
jay d7b65e3ae1 docs: 设备接口 2023-06-14 14:54:41 +08:00
jay 6036282986 refactor: 弃用接口 2023-06-14 14:47:13 +08:00
tangfudong da6548e9d8 fix:产品品类管理 2023-06-14 11:58:10 +08:00
jay 34ff78dfac fix: 组件管理 2023-06-14 11:29:12 +08:00
jay d462408ebd fix: 产品管理接口 2023-06-14 11:25:08 +08:00
tangfudong 071ce2adbe fix:修复产品编辑接口,注释原有数据校验 2023-06-14 09:23:47 +08:00
regan 5f7b1fbb44 fix: 产品列表注解 2023-06-13 21:46:33 +08:00