花木水之间
|
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 |
|
xiwa
|
104c193951
|
!20 fix: 修复规则引擎初始化错误bug
Merge pull request !20 from Sage/dev-V0.4.5
|
2023-07-18 18:00:25 +00: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 |
Sage
|
15e41fb318
|
fix: 修复规则引擎初始化bug
|
2023-07-17 17:25:24 +08:00 |
|
荭琪枫
|
f64ebb2814
|
fix:添加批量升级创建时间
|
2023-07-16 21:32:38 +08:00 |
tiger
|
680a50a85c
|
feat: 完成多租户功能
多租户查询时，使用aop处理；新增，修改使用Hibernate
Filter处理。
主要逻辑：如果是超级管理员，租户id为000000，由超级管理员新增租户信息。当传过来的租户id是超级管理员是，不对租户id拦截处理。
非超级管理员，新增，更新，删除都有Hibernate的监听器处理，默认增加前端传过来的租户id。查询的时候，使用aop技术拦截。
详细说明，可以参考：https://blog.csdn.net/yuanyangzimu/article/details/131746893 或者 https://www.cnblogs.com/ch-10/p/17557409.html
|
2023-07-16 14:37:32 +08:00 |
|
tiger
|
5b577e3b99
|
feat: 引入jpa多租户
多租户查询时，使用aop处理；新增，修改使用Hibernate Filter处理
|
2023-07-15 23:29:47 +08:00 |
|
tiger
|
130581bc0c
|
feat: 引入jpa多租户
jpa拦截初步完成
|
2023-07-15 01:04:20 +08:00 |
|
jay
|
ac087ac9d7
|
Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5
|
2023-07-13 12:51:24 +08:00 |
|
荭琪枫
|
fade633289
|
add:添加批量升级批次管理
|
2023-07-12 21:57:16 +08:00 |
|
荭琪枫
|
4758fbc6b5
|
add:添加批量升级批次管理
|
2023-07-12 21:47:48 +08:00 |
|
jay
|
9b20cd24bb
|
feat: 铱塔智联-贡献者初始化
|
2023-07-12 16:23:22 +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
|
1c15bdc354
|
Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5
|
2023-07-09 18:00:28 +08:00 |
|
xiwa
|
0ae3275c1b
|
fix:增加物模型属性标识符校验
|
2023-07-09 18:00:22 +08:00 |
|
jay
|
7f00e72495
|
fix: 代码生成器
|
2023-07-09 17:29:05 +08:00 |
|
jay
|
c8a18c168b
|
Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5
|
2023-07-09 17:28:36 +08:00 |
|
jay
|
0799fea279
|
fix: 贡献者接口
|
2023-07-09 17:28:21 +08:00 |
|
regan
|
5f477ba024
|
fix: 用户头像上传调试
|
2023-07-09 17:13:57 +08:00 |
|
xiwa
|
eae8dba660
|
fix:项目初始化优化
|
2023-07-09 15:15:50 +08:00 |
|
regan
|
c7906551ae
|
Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5
|
2023-07-08 17:07:02 +08:00 |
|
regan
|
83fbebb3b4
|
fix: oss 配置调试
|
2023-07-08 17:06:55 +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
|
0ac4de90af
|
fix:phoneNumber报错修复
|
2023-07-07 10:25:00 +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 |
|
荭琪枫
|
a5c8ea933d
|
Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5
|
2023-07-06 23:21:11 +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 |
|
regan
|
128832eeb9
|
fix: oss 配置调试
|
2023-07-05 22:37:47 +08:00 |
|
jay
|
563459ba77
|
feat: 代码生成器-前端
|
2023-07-04 13:56:14 +08:00 |
|
jay
|
a44128fc1f
|
feat: 代码生成器
|
2023-07-04 13:32:48 +08:00 |
|
jay
|
54d4b91ea5
|
feat: 新增贡献者接口
|
2023-07-04 13:32:19 +08:00 |
|
jay
|
2d39ba1d04
|
update: 代码生成器
|
2023-07-04 13:28:32 +08:00 |
|
jay
|
1b6d831eb2
|
update: 代码生成器
|
2023-07-03 22:02:42 +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 |
|
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 |