Commit Graph

231 Commits (ac087ac9d7a5086ad3254c7bbffb15c1c00225e6)

Author SHA1 Message Date
regan 646c5dd49d fix: 告警列表 2023-06-17 14:36:22 +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 04505e3495 fix:通道配置和模板配置完成 2023-06-16 18:44:35 +08:00
jay d85c06e5fc fix: 菜单查询 2023-06-16 18:29:41 +08:00
jay 135458519a fix: 错误提示 2023-06-16 18:13:05 +08:00
荭琪枫 8c0ae750e4 refa:迁移channel 2023-06-16 17:03:41 +08:00
荭琪枫 c02bde242c refa:迁移channel 2023-06-16 16:25:50 +08:00
jay 2a16130310 fix: mapstruct-plus配置 2023-06-16 10:20:45 +08:00
荭琪枫 1f34bb5aed add:添加ota上报入库 2023-06-16 00:02:44 +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 b263c34ef8 fix: 用户id 2023-06-14 14:41:53 +08:00
tangfudong da6548e9d8 fix:产品品类管理 2023-06-14 11:58:10 +08:00
jay aadef99a30 fix: 登录日志 2023-06-14 11:18:54 +08:00
xiwa ab1fa5db2c fix:修改导出文件等问题 2023-06-14 01:04:55 +08:00
jay e4ae9d0c5b fix: 系统管理 2023-06-13 19:18:05 +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 bcd49ec371 fix: id自动生成 2023-06-13 15:37:16 +08:00
tangfudong bd79f6d4bc fix:修复导入报错和数据初始化 2023-06-13 14:07:08 +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 343d1f00ee fix: insertBatch 2023-06-12 22:03:04 +08:00
jay 9bfb983f81 fix: insertBatch 2023-06-12 22:01:13 +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 22637889c0 fix: 角色授权 2023-06-12 19:35:01 +08:00
jay 4e6a354847 fix: 雪花算法id 2023-06-12 19:12:52 +08:00
jay c188cceb6f fix: selectMenuListByRoleId 2023-06-12 18:08:28 +08:00
jay d25227d903 fix: 操作日志长度 2023-06-12 17:48:31 +08:00
jay 28824fb4ff fix: 角色编辑 2023-06-12 17:42:58 +08:00
jay e3f4f815b9 fix: 角色编辑 2023-06-12 17:32:53 +08:00
jay e311b9791e fix: 角色管理 2023-06-12 17:13:06 +08:00
jay 26f7a8f56d refactor: mapstruct-plus配置 2023-06-12 15:43:58 +08:00
jay 6d4446e786 refactor: 用户分配角色 2023-06-12 15:09:58 +08:00
jay 98055d9d17 fix: 手机号,用户唯一校验 2023-06-12 11:25:17 +08:00
regan abc796c6e4 refactor: baety接口封装 2023-06-11 20:55:20 +08:00
xiwa 3632d15485 fix:系统管理相关接口报错修复 2023-06-11 20:24:28 +08:00
xiwa 4822a8ee50 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-06-10 23:58:05 +08:00
xiwa 57e26656b4 fix:系统管理相关接口报错修复 2023-06-10 23:57:59 +08:00
1621142473@qq.com 4ec90c1cd7 update:字典服务优化 2023-06-10 20:25:25 +08:00
荭琪枫 822b04eb03 refactor:重构OTA升级管理 2023-06-10 19:41:11 +08:00
荭琪枫 eb2ba17ba2 refactor:重构OTA升级管理 2023-06-10 15:59:42 +08:00
tangfudong 8e41ad2711 update:联调用户管理和字典管理 2023-06-09 18:52:12 +08:00
tangfudong 9c6e07a7b3 update:分页数据属性名改为rows 2023-06-09 10:55:17 +08:00
tangfudong d3dd5701df fix:修复分页无法查询问题 2023-06-08 19:17:47 +08:00
jay b68493be55 Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-08 11:18:18 +08:00
jay 2256138d83 fix 全局返回,只拦截cc.iotkit 2023-06-08 11:17:58 +08:00
tangfudong b00e57cf33 update:将所有请求改为post 2023-06-08 11:14:18 +08:00
xiwa 165449fcb8 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-06-08 08:08:09 +08:00
xiwa 2e8dca3175 fix:获取userId修改 2023-06-08 08:08:03 +08:00
jay 293c251bc9 update 用户信息查询 2023-06-07 16:11:05 +08:00
jay c3107e6b79 update 用户信息查询 2023-06-07 15:31:57 +08:00
jay 3a4ce185d3 fix 用户信息查询 2023-06-07 14:42:04 +08:00
jay 7581079bcf fix 用户信息查询 2023-06-07 14:30:48 +08:00
jay ea89ec6338 fix 用户信息查询 2023-06-07 12:04:03 +08:00
jay 77f657df32 fix id生成: 存在id则不覆盖 2023-06-07 11:55:34 +08:00
jay 89e0ee703f Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-06 19:39:35 +08:00
jay 94cd29e5c0 refactor 接口 2023-06-06 19:39:10 +08:00
regan cc31460052 fix: 配置文件redis 密码参数删除 2023-06-06 19:09:38 +08:00
jay cc07728873 refactor 接口 2023-06-06 18:20:18 +08:00
jay b0a3ed9756 refactor 接口 2023-06-06 17:39:48 +08:00
荭琪枫 6c1bd70c8e Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-06-06 15:13:40 +08:00
荭琪枫 beee0feaf4 feat:更新编译报错h2数据库包没要导入导致启动失败问题 2023-06-06 15:11:30 +08:00
jay 27b32e7d87 fix 登录接口 2023-06-06 14:12:54 +08:00
jay 8e7c103494 fix mapstruct配置 2023-06-05 22:43:34 +08:00
jay 7cd67f6335 fix mapstruct配置 2023-06-05 22:30:06 +08:00
jay 256df1b0a5 fix IJPACommData findall 2023-06-05 20:55:54 +08:00
jay 4bf5851b49 fix 报错 2023-06-05 18:35:39 +08:00
jay ece079137b fix IJPACommData 2023-06-05 18:24:03 +08:00
jay c2034bc6fc fix 初始化数据 2023-06-05 18:15:43 +08:00
jay 276be8b1b9 fix IJPACommData 2023-06-05 16:37:17 +08:00
jay c6d168b495 fix IJPACommData 2023-06-05 15:30:59 +08:00
jay a2b3dfca87 fix 用户异常 2023-06-05 11:35:56 +08:00
jay f4b588fa46 mapstruct配置 2023-06-05 11:07:27 +08:00
jay 4125b71352 mapstruct配置 2023-06-05 09:34:30 +08:00
jay 4aaeefcf5b fix mapstruct冲突 2023-06-04 20:31:53 +08:00
jay b470be12c3 fix mapstruct-plus配置 2023-06-04 16:41:59 +08:00
jay 086caecc66 fix 报错 2023-06-04 10:50:12 +08:00
jay 8d4a827cb3 fix 报错 2023-06-04 09:53:05 +08:00
jay b0aabdf5c3 feat 若依登录接口 2023-06-02 18:12:36 +08:00
jay cdf77d22a0 feat 若依登录接口 2023-06-02 18:11:42 +08:00
jay 7f1453b971 fix sa-token 依赖冲突 2023-06-02 15:12:47 +08:00
jay c47c5e4a68 chore flattened-pom 2023-06-02 11:42:48 +08:00
jay ed8d5b78a2 fix 注入 2023-06-02 11:36:31 +08:00
jay 868c147511 fix spring2.6以后和knife4j冲突 2023-06-02 11:05:09 +08:00
jay 603ebff3cd fix automapper 2023-06-01 21:34:10 +08:00
jay 915c81d3f8 fix 项目启动失败 2023-06-01 21:14:47 +08:00
jay b64d1399ed fix swagger自动配置 2023-06-01 20:26:46 +08:00
jay fc685dd637 refactor swagger依赖 2023-06-01 20:22:37 +08:00
jay b333dc0260 refactor oss配置 2023-06-01 20:12:29 +08:00
jay ce1163f8ac fix 数据实现 2023-06-01 19:49:29 +08:00
tangfudong 031e01556c update:修改未写的分页函数 2023-06-01 17:09:57 +08:00
jay 03bab5d899 fix PageBuilder泛型 2023-06-01 15:38:37 +08:00
jay 6084ef4333 fix PageBuilder泛型 2023-06-01 15:08:01 +08:00