Commit Graph

348 Commits (b5db785c5323f2c94dfa4788686f4ed14e6ac7a9)

Author SHA1 Message Date
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
jay 2e43719aa5 fix: 角色id 2023-06-12 17:23:57 +08:00
jay 89cb601d6f fix: 角色id 2023-06-12 17:16:25 +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 84e8f7c27d fix: 新增岗位信息 2023-06-12 11:26:47 +08:00
jay 23aa49890f refactor: 数组改成list 2023-06-12 10:32:57 +08:00
jay 29ed57407a fix: 用户唯一检查 2023-06-12 10:15:21 +08:00
jay 56dfeffafc fix: 检查用户名唯一 2023-06-12 09:42:51 +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 069a0ba364 update:字典服务控制层优化 2023-06-10 20:41:39 +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 b00e57cf33 update:将所有请求改为post 2023-06-08 11:14:18 +08:00
jay c3107e6b79 update 用户信息查询 2023-06-07 15:31:57 +08:00
jay 94cd29e5c0 refactor 接口 2023-06-06 19:39:10 +08:00
jay 2c4e7d808d refactor 接口 2023-06-06 18:46:15 +08:00
jay cc07728873 refactor 接口 2023-06-06 18:20:18 +08:00
jay b0a3ed9756 refactor 接口 2023-06-06 17:39:48 +08:00
荭琪枫 3ce468878d refactor:添加oss 2023-06-06 17:35:25 +08:00
荭琪枫 beee0feaf4 feat:更新编译报错h2数据库包没要导入导致启动失败问题 2023-06-06 15:11:30 +08:00
jay 62fe672ec2 refactor 接口参数 2023-06-06 11:52:06 +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 bbc5b4a48f fix 规则 import 2023-06-05 21:36:17 +08:00
jay 14eff2584d fix 规则管理 2023-06-05 21:07:20 +08:00
jay 5a60d5b781 fix 任务管理 2023-06-05 21:04:39 +08:00
jay 4bf5851b49 fix 报错 2023-06-05 18:35:39 +08:00
jay 96787d2382 feat 初始化数据 2023-06-05 17:52:37 +08:00
jay f4b588fa46 mapstruct配置 2023-06-05 11:07:27 +08:00
jay b470be12c3 fix mapstruct-plus配置 2023-06-04 16:41:59 +08:00
jay cdf77d22a0 feat 若依登录接口 2023-06-02 18:11:42 +08:00
jay 915c81d3f8 fix 项目启动失败 2023-06-01 21:14:47 +08:00
jay f47b2b3ef5 fix hikaricp依赖冲突 2023-06-01 20:25:49 +08:00
jay 5e4c44846f fix 排除依赖 2023-06-01 20:20:45 +08:00
jay b333dc0260 refactor oss配置 2023-06-01 20:12:29 +08:00
tangfudong 031e01556c update:修改未写的分页函数 2023-06-01 17:09:57 +08:00
jay f3dbe69e00 Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-01 15:00:47 +08:00
jay cb6f165a02 feat system基础数据操作接口 2023-06-01 15:00:30 +08:00
tangfudong 4a3da101e3 update:syscofig优化 2023-06-01 14:34:31 +08:00
Longjun.Tu 3659356135 fix:SysConfigController修改 2023-06-01 10:21:38 +08:00
荭琪枫 66cfe70478 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-06-01 10:18:19 +08:00
荭琪枫 4c78784e9d feat:修改icommon 2023-06-01 10:17:55 +08:00
tangfudong 72dd4a9a0c update:多租户待定 2023-06-01 09:52:03 +08:00
荭琪枫 fa5e281317 feat:优化角色 2023-05-31 23:14:12 +08:00
荭琪枫 871544b1b9 feat:优化角色 2023-05-31 22:57:00 +08:00
荭琪枫 b96bef0447 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-05-31 21:04:30 +08:00
荭琪枫 caae09dc87 refactor:重构 2023-05-31 21:04:13 +08:00
jay ebbb930a06 refactor 系统配置 2023-05-31 18:48:10 +08:00
jay f152e95010 refactor 设备服务 2023-05-31 17:44:58 +08:00
tangfudong dfbdf118db refactor:操作日志服务、用户在线监控服务、系统访问服务 2023-05-31 16:23:59 +08:00
tangfudong 5c1e048d61 refactor:岗位服务 2023-05-31 14:40:56 +08:00
tangfudong a84987e1ae refactor:用户服务 2023-05-31 11:42:58 +08:00
jay 90e95fe247 fix 报错 2023-05-31 11:05:23 +08:00
jay 106763d291 fix 依赖 2023-05-31 11:03:37 +08:00
jay 1040da6dba fix 依赖 2023-05-31 11:01:47 +08:00
jay 44e6380f13 fix 依赖 2023-05-31 11:01:10 +08:00
jay 14d59bfeb1 fix 方法报错 2023-05-31 09:23:35 +08:00
jay 7eee581dbc refactor 规则引擎 2023-05-31 08:56:21 +08:00
jay bb924b513f refactor 组件服务 2023-05-30 18:11:54 +08:00
jay e441a507e3 refactor 产品服务 2023-05-30 18:07:58 +08:00
荭琪枫 eafac7e2ec Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-05-30 16:33:37 +08:00
荭琪枫 a485fb9a5a update:修改sysrole实现 2023-05-30 16:32:51 +08:00
jay 3e4c2b7b6d refactor 组件接口 2023-05-30 16:20:38 +08:00
jay e335d709fc fix 代码生成器,包引用 2023-05-30 10:37:28 +08:00
jay 786300cc51 feat 代码生成器 2023-05-30 10:34:27 +08:00
jay a7c767542a refactor 2023-05-30 08:28:56 +08:00
荭琪枫 3b28702b69 update:修改sysmenu实现 2023-05-29 17:33:27 +08:00
荭琪枫 eacbc2f5ec update:修改sysmenu实现 2023-05-29 15:46:43 +08:00
jay 1b72784166 refactor: 重构 2023-05-29 11:47:32 +08:00
xiwa 71e3e99e6e refactor:处理报错内容、代码简化 2023-05-28 20:12:31 +08:00
荭琪枫 252ced4d5f feat:更新引用包 2023-05-28 14:30:58 +08:00
Longjun.Tu 15b560a5f2 refactor:queryDsl工具类完善 2023-05-26 17:59:58 +08:00
xiwa 783eac5c45 refactor:数据字典等实现修改 2023-05-26 02:19:02 +08:00
xiwa d54f520d98 refactor:系统配置、部门管理接口实现修改 2023-05-25 05:02:25 +08:00
xiwa 4afa3be915 refactor:common报错内容修改 2023-05-24 08:25:24 +08:00
Longjun.Tu aa2423c7d1 refactor:oss模块引入 2023-05-23 19:00:25 +08:00
regan d7a4f0228d refactor: dao实现 2023-05-19 00:33:04 +08:00
xiwa 092c7f9cc3 refactor:报错内容修改 2023-05-18 23:18:35 +08:00
Longjun.Tu 5cae4ea12a refactor:雪花ID实现 2023-05-18 15:00:53 +08:00
xiwa a963dfef48 refactor:处理报错内容 2023-05-18 08:04:04 +08:00
regan c7d290d239 refactor:mapstruct plus 引用 dao层结构调整 2023-05-18 01:02:16 +08:00
Longjun.Tu 5c348d7427 refactor:dao层rdb实现修改 2023-05-17 16:24:21 +08:00
xiwa b75a7cb1b6 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-05-17 08:24:08 +08:00
xiwa edc219291e refactor:数据接口修改 2023-05-17 08:23:01 +08:00
regan 4fc19b06f9 refactor:queryDsl引入和消息模块调整 2023-05-16 23:16:36 +08:00
xiwa a0b3caa80e refactor:结构和引用调整 2023-05-16 08:36:47 +08:00
xiwa 1a38916458 refactor:基于ruoyi等对框架调整 2023-05-15 08:31:02 +08:00