From 86145e48fa25a6ff050b8f6020a0dd75b9c0d3d0 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期日, 13 十月 2024 23:53:52 +0800
Subject: [PATCH] 测点配置修改
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/vo/HttpApiRespVO.java | 6 +++---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/entity/HttpApiEntity.java | 2 +-
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/service/impl/HttpTagServiceImpl.java | 4 ++--
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/admin/TagController.java | 2 +-
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/dao/HttpTagDao.java | 3 +--
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/service/HttpTagService.java | 2 +-
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/vo/HttpTagPageReqVO.java | 4 +---
7 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/dao/HttpTagDao.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/dao/HttpTagDao.java
index aee37f1..d1ec9fc 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/dao/HttpTagDao.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/dao/HttpTagDao.java
@@ -13,8 +13,7 @@
public interface HttpTagDao extends BaseMapperX<HttpTagEntity> {
default PageResult<HttpTagEntity> selectPage(HttpTagPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<HttpTagEntity>()
- .likeIfPresent(HttpTagEntity::getTagName, reqVO.getTagType())
- .likeIfPresent(HttpTagEntity::getTagName, reqVO.getTagCode())
+ .eq(HttpTagEntity::getApiId, reqVO.getApiId())
.likeIfPresent(HttpTagEntity::getTagName, reqVO.getTagName())
.orderByDesc(HttpTagEntity::getCreateTime));
}
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/entity/HttpApiEntity.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/entity/HttpApiEntity.java
index cb2b7e3..f9727ad 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/entity/HttpApiEntity.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/entity/HttpApiEntity.java
@@ -54,7 +54,7 @@
/**
* 是否认证
*/
- private Integer isAuth;
+ private Boolean isAuth;
/**
* 认证地址
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/service/HttpTagService.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/service/HttpTagService.java
index 766b21c..2cd7521 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/service/HttpTagService.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/service/HttpTagService.java
@@ -22,5 +22,5 @@
List<HttpTagEntity> selectList(Map<String, Object> params);
- List<HttpTagEntity> getByCode(String code);
+ List<HttpTagEntity> getApiId(String code);
}
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/service/impl/HttpTagServiceImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/service/impl/HttpTagServiceImpl.java
index adf69c8..9825c91 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/service/impl/HttpTagServiceImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/service/impl/HttpTagServiceImpl.java
@@ -67,9 +67,9 @@
}
@Override
- public List<HttpTagEntity> getByCode(String code) {
+ public List<HttpTagEntity> getApiId(String apiId) {
return httpTagDao.selectList(new QueryWrapper<HttpTagEntity>()
- .eq("http_api_code", code)
+ .eq("api_id", apiId)
.orderByDesc("create_time"));
}
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/vo/HttpApiRespVO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/vo/HttpApiRespVO.java
index 9c73475..478e9e7 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/vo/HttpApiRespVO.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/vo/HttpApiRespVO.java
@@ -45,9 +45,9 @@
@ExcelProperty("描述")
private String descp;
- @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @ExcelProperty("状态")
- private Integer status;
+ @Schema(description = "是否认证", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @ExcelProperty("是否认证")
+ private Boolean isAuth;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@ExcelProperty("创建时间")
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/vo/HttpTagPageReqVO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/vo/HttpTagPageReqVO.java
index 11bfab8..0a0be7d 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/vo/HttpTagPageReqVO.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/vo/HttpTagPageReqVO.java
@@ -17,9 +17,7 @@
@ToString(callSuper = true)
public class HttpTagPageReqVO extends PageParam {
- private String tagType;
-
- private String tagCode;
+ private String apiId;
private String tagName;
}
\ No newline at end of file
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/admin/TagController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/admin/TagController.java
index 22d3e8c..cad7f29 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/admin/TagController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/admin/TagController.java
@@ -153,7 +153,7 @@
TagOptionDTO op1 = new TagOptionDTO();
op1.setValue(item.getId());
op1.setLabel(item.getName());
- List<HttpTagEntity> tags = tagService.getByCode(item.getCode());
+ List<HttpTagEntity> tags = tagService.getApiId(item.getId());
List<TagOptionDTO> op2 = new ArrayList<>();
tags.forEach(item1 -> {
TagOptionDTO op3 = new TagOptionDTO();
--
Gitblit v1.9.3