Commit Graph

125 Commits (92efe6391997071ce2b8929decddec50250eb3ee)

Author SHA1 Message Date
xiwa 69845a7638 feat:添加Dockerfile和docker启动说明 2024-02-21 23:06:39 +08:00
xiwa 62c3be6ea0 fix:数据初始化、插件上报等修改 2024-02-20 21:13:37 +08:00
xiwa 85988e297f feat:初始数据修复 2024-02-19 12:34:53 +08:00
xiwa 35e0610eb8 feat:初始化数据、演示地址修改 2024-02-19 12:07:36 +08:00
xiwa 9213704d02 feat:初始化数据调整、增加系统数据导出 2024-02-18 20:47:01 +08:00
xiwa 0d04a302a8 fix:属性过滤取值错误修复 2024-01-17 21:31:58 +08:00
xiwa 01abec31c4 fix:初始数据修改 2024-01-09 22:17:46 +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
tangfudong 24d4b28628 update:初始化中添加系统app的数据 2023-12-20 11:29:33 +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
xiwa 21b8755751 feat:插件功能 2023-09-19 08:48:28 +08:00
jay 5f68b99c90 Merge branch 'dev-V0.4.5' into dev-V0.4.5-postgre
# Conflicts:
#	iot-starter/src/main/resources/application.yml
2023-08-30 19:07:53 +08:00
jay 1f51a1de3d fix: 物模型导致td数据库报错 2023-08-11 11:18:01 +08:00
jay f769994f91 Merge branch 'dev-V0.4.5' into dev-V0.4.5-postgre 2023-08-11 10:31:29 +08:00
tangfudong 88d8133e14 add:添加应用信息相关接口 2023-08-10 18:38:22 +08:00
jay f9b73532a6 update: nb组件产品上 无需恢复 2023-08-09 10:34:35 +08:00
jay a78bcfdccd update: nb组件产品上下线逻辑 2023-08-08 16:33:55 +08:00
jay dafedadc0d fix: 物模型初始化数据,tdengine2.6初始化失败 2023-08-07 14:25:56 +08:00
xiwa cf7204c6f4 feat:多租户功能调整合并 2023-08-07 08:32:23 +08:00
jay c8b891d1c1 fix: 普通用户权限 2023-08-01 11:40:54 +08:00
jay 5067f35836 fix: 普通用户权限 2023-08-01 11:34:50 +08:00
jay 0710ce9780 update: 普通用户权限 2023-08-01 11:01:52 +08:00
jay 26499b5cac fix: 透传-modbus组件 2023-07-25 18:32:31 +08:00
jay f4a6517037 fix: 透传-modbus组件 2023-07-25 15:34:34 +08:00
jay 933104863c fix: 透传-modbus组件-下行透传格式 2023-07-25 14:52:24 +08:00
jay 0d1da6d928 fix: 阿里透传-modbus组件 2023-07-24 16:55:01 +08:00
xiwa 8df36940b6 feat:添加iot模块的功能权限和菜单 2023-07-24 13:24:41 +08:00
jay 18e3619632 fix: 物模型 2023-07-20 12:00:49 +08:00
tangfudong 2640d1b2dd Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-07-19 10:54:18 +08:00
tangfudong e3e4596f13 fix:nb透传模块调试完成 2023-07-19 10:52:23 +08:00
jay bbe714b6eb feat: OTA菜单 2023-07-19 10:11:34 +08:00
jay efc0eb3dce feat: 铱塔智联-NB水泵-数据初始化 2023-07-17 15:44:10 +08:00
jay 64dfa7049f feat: 铱塔智联-NB透传水泵-数据初始化 2023-07-17 15:07:23 +08:00
jay bcdc7b06ef feat: 铱塔智联-NB透传水泵-数据初始化 2023-07-17 13:13:54 +08:00
jay e4684e60d7 feat: 铱塔智联-NB透传水泵-数据初始化 2023-07-17 13:05:33 +08:00
jay 757a24de02 feat: 铱塔智联-阿里透传组件 2023-07-17 12:39:45 +08:00
tangfudong 95fd0b6fb9 add:初始化nb水泵物模型数据,nb协议转换脚本开发,nb协议通讯组件开发 2023-07-16 16:49:27 +08:00
jay 9b20cd24bb feat: 铱塔智联-贡献者初始化 2023-07-12 16:23:22 +08:00
jay aeb4cf445b feat: 铱塔智联单泵数据初始化 2023-07-12 14:50:59 +08:00
jay 8293581e9c feat: 铱塔智联单泵数据初始化 2023-07-12 14:42:47 +08:00
xiwa 67c3cbb57e fix:物模型数据标识符修改 2023-07-11 00:25:14 +08:00
jay da5d8ef4dc feat: add铱塔智联网关设备 2023-07-10 14:32:01 +08:00
jay e95b600859 feat: 贡献者页面初始化 2023-07-09 22:05:33 +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