Commit Graph

243 Commits (ff0685994db5394f117dccbddb74c43e7bd0450a)

Author SHA1 Message Date
荭琪枫 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
jay 7d59858c53 refactor: 代码生成器模板 2023-06-25 21:57:52 +08:00
jay 5051ac78a8 refactor: 代码生成器模板 2023-06-25 21:52:19 +08:00
jay d148a354ca fix: oss初始化 2023-06-25 21:51:39 +08:00
jay 49b8241ad1 fix: 代码生成器中的WorkerId 2023-06-25 11:45:07 +08:00
jay 256d436329 Merge branch 'feature_V0.4.5_gencode' into dev-V0.4.5 2023-06-24 21:03:06 +08:00
jay 4fde0db036 fix: h2代码生成器 2023-06-24 21:02:25 +08:00
jay 86584d1fa3 fix: 代码生成器 2023-06-24 18:29:04 +08:00
荭琪枫 f65fb9a10d add upload 2023-06-23 17:37:10 +08:00
jay 9f028aa476 fix: 代码生成器 2023-06-22 17:13:12 +08:00
xiwa a2dcfe4de5 fix:延时任务和虚拟设备 2023-06-22 09:18:36 +08:00
tangfudong 0994c7f1c9 fix:物模型型号配置添加删除接口 2023-06-21 17:29:25 +08:00
tangfudong eb5c8c2872 fix:个人信息中心联调完成 2023-06-21 11:45:05 +08:00
xiwa 1884459744 fix:定时任务 2023-06-21 01:11:33 +08:00
荭琪枫 918370e054 优化otaId 2023-06-20 23:03:53 +08:00
tangfudong 236d459dde fix:用户新增默认设置用户类型 2023-06-20 17:56:55 +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 68dc41b4d1 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-06-18 20:14:52 +08:00
xiwa 0ce0a704e8 fix:规则删除失败 2023-06-18 20:14:46 +08:00
jay 4b7f8ea0a8 Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-18 18:43:35 +08:00
jay bfd97831d6 fix: 修改角色状态 2023-06-18 18:36:28 +08:00
regan 7999679c55 faet: baetyl接口封装 2023-06-18 18:19:52 +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
jay aadef99a30 fix: 登录日志 2023-06-14 11:18:54 +08:00
tangfudong 071ce2adbe fix:修复产品编辑接口,注释原有数据校验 2023-06-14 09:23:47 +08:00
xiwa 4da69a7508 fix:删除字典参数修改 2023-06-14 01:12:40 +08:00
xiwa ab1fa5db2c fix:修改导出文件等问题 2023-06-14 01:04:55 +08:00
regan 5f7b1fbb44 fix: 产品列表注解 2023-06-13 21:46:33 +08:00
jay 962c2fdd38 fix: 配置查询 2023-06-13 19:27:39 +08:00
jay e4ae9d0c5b fix: 系统管理 2023-06-13 19:18:05 +08:00
jay 475343da9b fix: 登录日志 2023-06-13 18:56:16 +08:00
jay 3c357d540a fix: 操作日志 2023-06-13 18:30:52 +08:00
jay 603024538d Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-13 18:07:57 +08:00
jay 0ed88be5d9 fix: 参数设置 2023-06-13 18:07:38 +08:00
tangfudong e9cdaa031b fix:修复去重bug 2023-06-13 18:07:27 +08:00
jay eb1e8fa0aa fix: jpa设置错误 2023-06-13 17:10:33 +08:00
jay 99afdbf0c7 fix: 字典查询 2023-06-13 15:49:01 +08:00
xiwa c6ea4a9759 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-06-13 08:28:26 +08:00
xiwa b2295bdd4c fix:用户角色部门编辑问题修复 2023-06-13 08:28:19 +08:00
荭琪枫 8ec34a286e Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-06-12 22:59:11 +08:00
荭琪枫 c0752d8903 add:添加ota转换 2023-06-12 22:58:54 +08:00
jay a40f5944b5 fix: mapstruct-plus配置 2023-06-12 21:32:39 +08:00
jay 51af01c1ec fix: 菜单检测子菜单 2023-06-12 21:30:22 +08:00
jay 63e8461d88 fix: 角色取消授权 2023-06-12 20:58:21 +08:00
jay 22637889c0 fix: 角色授权 2023-06-12 19:35:01 +08:00
jay ce99a78d39 fix: 获取对应角色部门树列表 2023-06-12 18:12:31 +08:00
jay 28824fb4ff fix: 角色编辑 2023-06-12 17:42:58 +08:00