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 87292521b08444cc7c1f9239482cb79298d58a57..0000000000000000000000000000000000000000 --- 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; - -} 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 3f379f2c79cc1a356f7f342e74f331ee3f3434b6..61296d2b6891d531920e75506e1a31e32bc65dc2 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; + } }