From 1f77f288fee9d8363c9bdd0f0fab11d522a68aeb Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 3 Jun 2024 20:03:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E5=AD=97=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #[1171117056688128]关键字过滤 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1171117056688128 --- .../dto/resourcecenter/ResourceSearchVo.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java index 3f379f2..61296d2 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java @@ -102,6 +102,10 @@ public class ResourceSearchVo extends ConditionConfigVo { private Boolean isHasAuth = false; @EntityField(name = "校验团体类型", type = ApiParamType.STRING) private String cmdbGroupType = "readonly"; + @EntityField(name = "IP字段映射的属性ID", type = ApiParamType.LONG) + private Long ipFieldAttrId; + @EntityField(name = "name字段映射的属性ID", type = ApiParamType.LONG) + private Long nameFieldAttrId; public ResourceSearchVo() { } @@ -417,4 +421,20 @@ public class ResourceSearchVo extends ConditionConfigVo { public void setCmdbGroupType(String cmdbGroupType) { this.cmdbGroupType = cmdbGroupType; } + + public Long getIpFieldAttrId() { + return ipFieldAttrId; + } + + public void setIpFieldAttrId(Long ipFieldAttrId) { + this.ipFieldAttrId = ipFieldAttrId; + } + + public Long getNameFieldAttrId() { + return nameFieldAttrId; + } + + public void setNameFieldAttrId(Long nameFieldAttrId) { + this.nameFieldAttrId = nameFieldAttrId; + } } -- Gitee From 00d5e4ad1fc621a69d59b3229e120e8e7bbd36e2 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 3 Jun 2024 20:07:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96-?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #[1171117056688128]资产清单性能优化-关键字过滤 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1171117056688128 --- .../IResourceListApiCrossoverService.java | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 src/main/java/neatlogic/framework/cmdb/crossover/IResourceListApiCrossoverService.java diff --git a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceListApiCrossoverService.java b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceListApiCrossoverService.java deleted file mode 100644 index 8729252..0000000 --- a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceListApiCrossoverService.java +++ /dev/null @@ -1,25 +0,0 @@ -/*Copyright (C) $today.year 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.framework.cmdb.crossover; - -import neatlogic.framework.crossover.ICrossoverService; -import com.alibaba.fastjson.JSONObject; - -public interface IResourceListApiCrossoverService extends ICrossoverService { - - Object myDoService(JSONObject jsonObj) throws Exception; - -} -- Gitee