Commit Graph

165 Commits (e4ae9d0c5b84ff1ceb370269227c55a349d01d3b)

Author SHA1 Message Date
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
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
jay 6dc33d9fbc feat IJPACommData基础数据操作接口 2023-06-01 14:08:04 +08:00
jay f3895c458c feat IJPACommData基础数据操作接口 2023-06-01 14:05:55 +08:00
jay eda4285368 Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-01 10:40:48 +08:00
jay 91f6b73b45 feat IJPACommData基础数据操作接口 2023-06-01 10:40:32 +08:00
荭琪枫 b5249a94a2 feat:修改icommon 2023-06-01 10:23:48 +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
jay 7b5419ce94 Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-05-31 18:48:38 +08:00
jay ebbb930a06 refactor 系统配置 2023-05-31 18:48:10 +08:00
荭琪枫 b9e5fff02d refactor:重构 2023-05-31 18:32:08 +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 106763d291 fix 依赖 2023-05-31 11:03:37 +08:00
jay 44e6380f13 fix 依赖 2023-05-31 11:01:10 +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 713e6d216a refactor 数据库字段注释 2023-05-30 14:27:15 +08:00
jay e335d709fc fix 代码生成器,包引用 2023-05-30 10:37:28 +08:00
荭琪枫 6247ea73d2 update:修改sysmenu实现 2023-05-29 18:17:49 +08:00
荭琪枫 3b28702b69 update:修改sysmenu实现 2023-05-29 17:33:27 +08:00
荭琪枫 eacbc2f5ec update:修改sysmenu实现 2023-05-29 15:46:43 +08:00
荭琪枫 fdc70a097e update:修改sysmenu实现 2023-05-29 15:41:06 +08:00
荭琪枫 cd59eb8481 update:修改sysmenu实现 2023-05-29 15:39:11 +08:00
jay 1b72784166 refactor: 重构 2023-05-29 11:47:32 +08:00
荭琪枫 7e48dfd5a3 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-05-28 23:37:42 +08:00
荭琪枫 9d02dcfa88 update 2023-05-28 23:37:09 +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 6da2c1de6e refactor: 日志模块 2023-05-19 00:45:38 +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
regan 4fc19b06f9 refactor:queryDsl引入和消息模块调整 2023-05-16 23:16:36 +08:00
xiwa 80f261dc9e Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-05-16 08:36:55 +08:00
xiwa a0b3caa80e refactor:结构和引用调整 2023-05-16 08:36:47 +08:00
jay 714d8674eb fix: swagger包导入 2023-05-15 18:35:37 +08:00
xiwa 1a38916458 refactor:基于ruoyi等对框架调整 2023-05-15 08:31:02 +08:00
荭琪枫 153d271414 feat:添加渠道类型入库 2023-05-11 18:21:26 +08:00
荭琪枫 5d44b3498a Merge branch 'dev-shiheng' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-shiheng 2023-05-11 10:43:55 +08:00
荭琪枫 3255090ee6 Merge branch 'dev' into dev-shiheng 2023-05-11 09:49:40 +08:00
Longjun.Tu 16ce89e1c1 feat(告警中心):数据库、接口相关 2023-05-11 00:05:15 +08:00
荭琪枫 2372a4fc6f feat:添加邮箱消息通知 2023-05-09 23:41:46 +08:00
荭琪枫 86b4f05ada feat:添加消息中心设计文档 2023-05-09 18:29:49 +08:00
荭琪枫 2b29d500cf feat:添加钉钉和企业微信消息通知 2023-05-08 23:33:32 +08:00
荭琪枫 1c0da87072 message 2023-05-08 18:31:27 +08:00
荭琪枫 f6e3c46276 message 2023-05-08 18:29:42 +08:00
Longjun.Tu 42e87c6883 项目结构调整 2023-05-06 14:46:44 +08:00
tangfudong 72af57de8e 添加异常枚举,统一自定义异常 2023-05-04 14:30:45 +08:00
tangfudong b236d517e5 Merge remote-tracking branch 'remotes/openOrigin/dev' into dev
# Conflicts:
#	iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java
#	iot-components/iot-websocket-component/src/main/java/cc/iotkit/comp/websocket/server/WebSocketServerVerticle.java
2023-04-20 13:53:38 +08:00
tangfudong 5e99867ae9 添加支持DLT6451997协议支持
添加设备列表新增时手动绑定父设备功能
2023-04-20 11:40:07 +08:00