jay
|
2045b802ba
|
Merge remote-tracking branch 'origin/V0.5.x-feature-modbus' into V0.5.x
# Conflicts:
# iot-dao/iot-data-model/src/main/java/cc/iotkit/model/product/ThingModel.java
|
2024-05-18 14:39:27 +08:00 |
|
花木水之间
|
6e6a6fe1ea
|
!44 feat: modbus点位模版同步到产品
Merge pull request !44 from 小团子/V0.5.x-feature-modbus
|
2024-05-18 06:32:29 +00:00 |
ZOUZDC
|
3fc76949d9
|
fix: modbus点位模版同步到产品
同步属性错误修改
|
2024-05-17 00:10:27 +08:00 |
|
ZOUZDC
|
3ccfb11478
|
feat: modbus点位模版同步到产品
将点位模版特有数据封装到proData中
|
2024-05-16 23:35:33 +08:00 |
|
jay
|
95f065d993
|
update Copyright
|
2024-05-15 17:44:17 +08:00 |
|
jay
|
00c2f1ae30
|
fix modbus点位属性-顺序,处理公式
|
2024-05-14 17:53:18 +08:00 |
|
ZOUZDC
|
bdee6f4653
|
feat: modbus管理点位管理
modbus管理点位管理
|
2024-05-14 12:23:11 +08:00 |
tangfudong
|
db1997fb32
|
feat:产品与物模型属性添加图标系统
|
2024-04-30 16:56:16 +08:00 |
gaoyoulong
|
bdef7e045c
|
fix: 物模型消息，设备重复在线，离线过滤处理
|
2024-04-29 11:40:25 +08:00 |
|
gaoyoulong
|
4bee56623d
|
fix: 更新状态检查物模型消息，更新上下线规则引擎bug
|
2024-04-29 11:22:45 +08:00 |
|
jay
|
993f05b75e
|
update: 更新配置文件
|
2024-04-24 13:28:37 +08:00 |
|
gaoyoulong
|
11bb9640e8
|
feat: 设备离线在线状态切换处理
|
2024-04-22 14:37:05 +08:00 |
|
tangfudong
|
11ad6bdbaa
|
fix:app接口优化
|
2024-04-17 17:49:13 +08:00 |
|
gaoyoulong
|
01354d2369
|
fix: 设备离线bug修复：设备通过保活时间离线后，无法切换为在线状态的bug
|
2024-04-16 13:32:13 +08:00 |
|
gaoyoulong
|
8368eb0822
|
Merge branch 'V0.5.x' of https://gitee.com/open-iita/iotkit-parent into V0.5.x
* 'V0.5.x' of https://gitee.com/open-iita/iotkit-parent:
fix:物模型枚举类型修改为字符串类型
feat:添加物模型日志按设备集合查询接口
feat:应用端添加相关接口
feat:app接口添加规则相关接口
fix:优化应用接口移除设备
fix:添加应用端设置属性接口，设备vo添加位置属性
# Conflicts:
# iot-dao/iot-temporal-service/src/main/java/cc/iotkit/temporal/IThingModelMessageData.java
# iot-dao/iot-temporal-serviceImpl-iotdb/src/main/java/cc/iotkit/temporal/iotdb/service/ThingModelMessageDataImpl.java
|
2024-04-10 15:48:32 +08:00 |
|
gaoyoulong
|
a0d2d820aa
|
feat: 首页数据统计接口更新
|
2024-04-10 15:36:11 +08:00 |
|
tangfudong
|
6fb56c3f28
|
fix:物模型枚举类型修改为字符串类型
|
2024-04-10 11:36:09 +08:00 |
|
tangfudong
|
2824872421
|
feat:添加物模型日志按设备集合查询接口
|
2024-04-08 18:41:40 +08:00 |
|
tangfudong
|
ae85ef7a06
|
feat:应用端添加相关接口
|
2024-04-07 16:00:23 +08:00 |
|
tangfudong
|
71afcad7ff
|
feat:app接口添加规则相关接口
|
2024-03-27 17:27:13 +08:00 |
|
tangfudong
|
fd4427b991
|
Merge branch 'dev-V0.5.0' into V0.5.x
|
2024-03-27 11:23:30 +08:00 |
|
gaoyoulong
|
d456f41a1a
|
feat: 首页数据统计
|
2024-03-24 12:24:14 +08:00 |
|
gaoyoulong
|
3af34fbc11
|
fix: 为cc.iotkit.common.service下的接口类，添加实现类
|
2024-03-21 17:48:19 +08:00 |
|
gaoyoulong
|
60b7164575
|
fix： 实现DictService ， 修复导出bug
|
2024-03-21 17:34:10 +08:00 |
xiwa
|
1c9b9ce046
|
feat:数据库配置简化
|
2024-03-21 00:01:29 +08:00 |
|
xiwa
|
cfc30500cc
|
feat:产品增加保活时长、离线状态更新
|
2024-03-20 01:58:13 +08:00 |
|
xiwa
|
a172cee183
|
!41 修复openapi setProperty 500异常
Merge pull request !41 from mark/V0.5.x
|
2024-03-19 14:57:19 +00:00 |
|
tangfudong
|
de49f494c0
|
fix:优化应用接口移除设备
|
2024-03-19 18:40:57 +08:00 |
|
tangfudong
|
7a27435705
|
fix:添加应用端设置属性接口，设备vo添加位置属性
|
2024-03-19 16:52:30 +08:00 |
mark
|
6a0f4c91fb
|
修复openai setProperty 设备编号不存在500异常
|
2024-03-19 13:55:29 +08:00 |
|
xiwa
|
050ddb6000
|
Merge branch 'dev-V0.5.0' into V0.5.x
|
2024-03-18 23:32:01 +08:00 |
|
xiwa
|
85a0ccedb5
|
fix:数据入库租户id填充不正确修复
|
2024-03-18 23:26:33 +08:00 |
|
xiwa
|
51319ea754
|
update README.md.
Signed-off-by: xiwa <xw2sy@163.com>
|
2024-03-16 13:40:30 +00:00 |
|
xiwa
|
b47756096d
|
fix:数据保存填充租户id
|
2024-03-16 15:46:00 +08:00 |
|
xiwa
|
61ec6e1c85
|
update README.md.
Signed-off-by: xiwa <xw2sy@163.com>
|
2024-03-16 02:37:03 +00:00 |
|
xiwa
|
8ab1ffab38
|
Merge branch 'dev-V0.5.0' of https://gitee.com/open-iita/iotkit-parent into dev-V0.5.0
|
2024-03-16 10:24:16 +08:00 |
|
xiwa
|
e818736dad
|
feat:增加内置oss
|
2024-03-16 10:23:54 +08:00 |
|
gaoyoulong
|
4493359468
|
fix: 分组添加bug修复
|
2024-03-14 20:27:24 +08:00 |
|
gaoyoulong
|
c9d8a8ffd6
|
Merge branch 'dev-V0.5.0-gaoyoulong' into dev-V0.5.0
* dev-V0.5.0-gaoyoulong:
feat: 设备导入功能
feat: 设备分组导入监听判断数据为空处理；导入后返回数据使用Response
feat: 设备分组批量导入
|
2024-03-12 09:51:14 +08:00 |
|
gaoyoulong
|
6f74ad1b7b
|
feat: 设备导入功能
|
2024-03-12 09:50:02 +08:00 |
|
xiwa
|
d4d6f6a7c5
|
fix:修复产品缓存bug
|
2024-03-09 20:23:08 +08:00 |
|
gaoyoulong
|
9cfcf2f132
|
feat: 设备分组导入监听判断数据为空处理；导入后返回数据使用Response
|
2024-03-09 11:40:29 +08:00 |
|
tangfudong
|
49aec5df04
|
fix:修复初始化数据，修复小程序获取设备数据
|
2024-03-09 01:24:40 +08:00 |
|
gaoyoulong
|
b2524e67b4
|
feat: 设备分组批量导入
|
2024-03-08 11:20:30 +08:00 |
|
tangfudong
|
246c6b4c37
|
fix:修复系统初始化时保存数据获取用户id为空问题
|
2024-03-06 17:36:43 +08:00 |
|
tangfudong
|
c5ac5b66db
|
feat：添加系统与app的数据下行
|
2024-03-06 09:39:40 +08:00 |
|
xiwa
|
b661638bc6
|
fix:微信小程序登录修复
|
2024-03-05 22:24:54 +08:00 |
|
xiwa
|
34e42df090
|
fix:设备保存状态为空修复
|
2024-03-05 19:58:35 +08:00 |
|
xiwa
|
3962caf969
|
fix:td物模型更新，角色状态更新bug修复
|
2024-03-05 00:22:20 +08:00 |
|
xiwa
|
f0c4b175f7
|
feat:在线查询、注册消息缺少时间等修复
|
2024-03-03 12:41:54 +08:00 |