iailab-module-data/iailab-module-data-biz/db/mysql/tenant.sql
@@ -214,14 +214,14 @@ CREATE TABLE `t_http_token` ( `id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, `api_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, `login_url` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, `client_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, `client_secret` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, `username` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, `password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, `token` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'token', `id` varchar(36) NOT NULL COMMENT 'ID', `api_id` varchar(36) NOT NULL COMMENT '接口ID', `login_url` varchar(200) DEFAULT NULL COMMENT '登录地址', `client_id` varchar(100) DEFAULT NULL COMMENT 'ClientId', `client_secret` varchar(100) DEFAULT NULL COMMENT 'ClientSecret', `username` varchar(50) DEFAULT NULL COMMENT '用户名', `password` varchar(50) DEFAULT NULL COMMENT '密码', `token` varchar(2000) DEFAULT NULL COMMENT 'token', `expire_time` datetime DEFAULT NULL COMMENT '过期时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE, @@ -229,14 +229,16 @@ ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='接口Token'; CREATE TABLE `t_http_tag` ( `id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '查询号', `http_api_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'HTTP 接口代码', `tag_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '测点编码', `tag_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '测点名称', `id` varchar(36) NOT NULL COMMENT 'ID', `api_id` varchar(36) NOT NULL COMMENT '接口ID', `tag_name` varchar(64) NOT NULL COMMENT '标签名称', `data_type` varchar(16) NOT NULL COMMENT '数据类型', `enabled` tinyint(1) DEFAULT NULL COMMENT '是否启用', `tag_desc` varchar(64) DEFAULT NULL COMMENT '描述', `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='接口Tag表'; ) ENGINE=InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT='接口Tag表'; -- 指标管理------------ CREATE TABLE t_ind_data_set( iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/controller/admin/HttpApiController.java
@@ -12,6 +12,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.Date; import java.util.List; import java.util.UUID; @@ -53,8 +54,8 @@ @PreAuthorize("@ss.hasPermission('data:channel-http:create')") @PostMapping("/create") public CommonResult<Boolean> create(@RequestBody HttpApiEntity httpApiEntity){ String id = UUID.randomUUID().toString(); httpApiEntity.setId(id); httpApiEntity.setId(UUID.randomUUID().toString()); httpApiEntity.setCreateTime(new Date()); httpApiService.add(httpApiEntity); return success(true); } @@ -63,6 +64,7 @@ @PutMapping("/update") public CommonResult<Boolean> update(@RequestBody HttpApiEntity httpApiEntity) { httpApiService.update(httpApiEntity); httpApiEntity.setUpdateTime(new Date()); return success(true); }
@@ -12,6 +12,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.Date; import java.util.List; import java.util.UUID; @@ -54,8 +55,8 @@ @PreAuthorize("@ss.hasPermission('data:channel-http:create')") @PostMapping("/create") public CommonResult<Boolean> add(@RequestBody HttpTagEntity httpTagEntity){ String id = UUID.randomUUID().toString(); httpTagEntity.setId(id); httpTagEntity.setId(UUID.randomUUID().toString()); httpTagEntity.setCreateTime(new Date()); tagService.add(httpTagEntity); return success(true); } @@ -63,6 +64,7 @@ @PreAuthorize("@ss.hasPermission('data:channel-http:update')") @PutMapping("/update") public CommonResult<Boolean> update(@RequestBody HttpTagEntity httpTagEntity) { httpTagEntity.setUpdateTime(new Date()); tagService.update(httpTagEntity); return success(true); } iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/controller/admin/HttpTokenController.java
@@ -12,6 +12,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.Date; import java.util.List; import java.util.UUID; @@ -53,8 +54,8 @@ @PreAuthorize("@ss.hasPermission('data:channel-http:create')") @PostMapping("/create") public CommonResult<Boolean> create(@RequestBody HttpTokenEntity HttpTokenEntity){ String id = UUID.randomUUID().toString(); HttpTokenEntity.setId(id); HttpTokenEntity.setId(UUID.randomUUID().toString()); HttpTokenEntity.setUpdateTime(new Date()); httpTokenService.add(HttpTokenEntity); return success(true); } iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/dao/HttpTagDao.java
@@ -13,8 +13,8 @@ public interface HttpTagDao extends BaseMapperX<HttpTagEntity> { default PageResult<HttpTagEntity> selectPage(HttpTagPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX<HttpTagEntity>() .likeIfPresent(HttpTagEntity::getTagType, reqVO.getTagType()) .likeIfPresent(HttpTagEntity::getTagCode, reqVO.getTagCode()) .likeIfPresent(HttpTagEntity::getTagName, reqVO.getTagType()) .likeIfPresent(HttpTagEntity::getTagName, reqVO.getTagCode()) .likeIfPresent(HttpTagEntity::getTagName, reqVO.getTagName()) .orderByDesc(HttpTagEntity::getCreateTime)); } iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/entity/EleLowTagEntity.java
文件已删除 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/entity/FxjyTagEntity.java
文件已删除 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/entity/HttpTagEntity.java
@@ -27,26 +27,31 @@ private String id; /** * HTTP api code * 接口ID */ private String httpApiCode; private String apiId; /** * 测点类型 */ private String tagType; /** * 测点编码 */ private String tagCode; /** * 测点名称 * 标签名称 */ private String tagName; /** * 数据类型 */ private String dataType; /** * 标签描述 */ private String tagDesc; /** * 是否启用 */ private Boolean enabled; /** * 创建时间 */ private Date createTime; iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/entity/XSTTagEntity.java
文件已删除 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/entity/ChannelModBusTagEntity.java
@@ -37,7 +37,7 @@ private String dataType; /** * 是否可以tag，如果为false，即使定义了但是runtime不会读取该数据 * 是否启用 */ private Boolean enabled;
@@ -157,8 +157,8 @@ List<TagOptionDTO> op2 = new ArrayList<>(); tags.forEach(item1 -> { TagOptionDTO op3 = new TagOptionDTO(); op3.setValue(item1.getTagCode()); op3.setLabel(item1.getTagCode()); op3.setValue(item1.getTagName()); op3.setLabel(item1.getTagName()); op2.add(op3); }); op1.setChildren(op2);
