Commit Graph

45 Commits (ebbcbc14a349423ff1d5e088c77080845657b481)

Author SHA1 Message Date
jay 86d51844ff update 租户id类型 String->Long 2024-06-13 19:08:46 +08:00
jay 40af1e6f51 fix 参数校验不生效 2024-06-13 10:05:33 +08:00
jay 0b66c071f8 update td-engine nchar类型报错 2024-06-11 21:17:38 +08:00
jay 951ff55d25 add 设备最后通讯时间
fix DeviceStateCheckTask,取设备最后通讯时间
2024-05-29 13:59:01 +08:00
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
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
tangfudong 11ad6bdbaa fix:app接口优化 2024-04-17 17:49: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 2824872421 feat:添加物模型日志按设备集合查询接口 2024-04-08 18:41:40 +08:00
tangfudong ae85ef7a06 feat:应用端添加相关接口 2024-04-07 16:00:23 +08:00
gaoyoulong d456f41a1a feat: 首页数据统计 2024-03-24 12:24:14 +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 85a0ccedb5 fix:数据入库租户id填充不正确修复 2024-03-18 23:26:33 +08:00
xiwa b47756096d fix:数据保存填充租户id 2024-03-16 15:46:00 +08:00
xiwa e818736dad feat:增加内置oss 2024-03-16 10:23:54 +08:00
xiwa d4d6f6a7c5 fix:修复产品缓存bug 2024-03-09 20:23:08 +08:00
tangfudong 49aec5df04 fix:修复初始化数据,修复小程序获取设备数据 2024-03-09 01:24:40 +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
gaoyoulong 7bc3635e89 feat: 设备分组功能 2024-03-02 19:39:38 +08:00
xiwa 7ea874c5ac feat:增加子设备注册关联 2024-02-24 23:30:26 +08:00
zhangpengxiang 6e6c3290be 修复获取虚拟设备列表接口分页BUG 2024-02-23 13:45:41 +08:00
xiwa 62c3be6ea0 fix:数据初始化、插件上报等修改 2024-02-20 21:13:37 +08:00
xiwa 6361bb399c fix:插件上传、下行日志bug修复 2024-02-14 15:19:09 +08:00
xiwa 1fcf5035dc feat:迁移plugin-core到iot-core 2024-02-09 00:12:27 +08:00
xiwa 2406165072 feat:去掉租户数据,切换租户报错修复 2024-01-07 18:58:47 +08:00
tangfudong 4a1ae2d75a Merge remote-tracking branch 'origin/dev-V0.5.0' into dev-V0.5.0 2024-01-02 10:46:02 +08:00
xiwa aec5a23b3f feat:规则引擎支持关联告警 2023-12-24 19:46:17 +08:00
tangfudong b66f500a5a Merge branch 'dev-V0.4.5' into dev-V0.5.0
# Conflicts:
#	data/components/750da259-ff77-4869-a5a5-12a5433b0e4c/component.js
#	data/init/sys_app.json
#	iot-common/iot-common-core/src/main/java/cc/iotkit/common/enums/ErrCode.java
#	iot-common/iot-common-satoken/src/main/java/cc/iotkit/common/satoken/config/SaTokenConfig.java
#	iot-common/iot-common-satoken/src/main/java/cc/iotkit/common/satoken/utils/LoginHelper.java
#	iot-common/iot-script-engine/src/main/java/cc/iotkit/script/JavaScriptEngine.java
#	iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceMessageHandler.java
#	iot-components/iot-nb-component/src/main/java/cc/iotkit/comp/nb/NBVerticle.java
#	iot-components/iot-nb-component/src/main/resources/component.js
#	iot-starter/src/main/java/cc/iotkit/config/EmbeddedRedisConfig.java
#	iot-starter/src/main/java/cc/iotkit/web/service/SysLoginService.java
2023-12-20 11:40:25 +08:00
xiwa 4070f1cca3 feat:修复插件重启报错、增加iotdb支持 2023-12-10 23:05:24 +08:00
xiwa 1934b743c2 fix:修复bug #I8DLHU 2023-11-03 22:58:29 +08:00
xiwa b0ef14f731 fix:插件支持脚本文件自动导入 2023-10-27 08:12:06 +08:00
xiwa 5ef1c719c9 fix:补充dynamic-datasource依赖 2023-10-19 08:13:13 +08:00
xiwa 99ce49f4c5 fix:合并dev-v0.4.6调整 2023-10-15 09:20:44 +08:00
xiwa 6c8dc8af9f feat:核心模块、插件模块抽离,插件完善 2023-10-10 07:34:00 +08:00