diff options
| author | zhangshuai <[email protected]> | 2023-03-02 10:34:35 +0800 |
|---|---|---|
| committer | zhangshuai <[email protected]> | 2023-03-02 12:24:09 +0800 |
| commit | f4ec273b2bedcf67cda7614b273404602a1c3084 (patch) | |
| tree | 47b1bad0104f7ad89a636d96f1cb30e861a42889 | |
| parent | 49bf97e6172231d66e7f4ff362a728fb5ad68aed (diff) | |
fix: NEZ-2623 修复Agent添加数据时重复host,port可保存成功rel-23.01.04
| -rw-r--r-- | nz-admin/src/main/java/com/nis/modules/agent/service/impl/AgentServiceImpl.java | 5 | ||||
| -rw-r--r-- | nz-common/src/main/java/com/nis/common/utils/RCode.java | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/nz-admin/src/main/java/com/nis/modules/agent/service/impl/AgentServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/agent/service/impl/AgentServiceImpl.java index 75f0ae34..0397550b 100644 --- a/nz-admin/src/main/java/com/nis/modules/agent/service/impl/AgentServiceImpl.java +++ b/nz-admin/src/main/java/com/nis/modules/agent/service/impl/AgentServiceImpl.java @@ -74,11 +74,10 @@ public class AgentServiceImpl extends ServiceImpl<AgentDao, Agent> implements Ag public void validateParam(Agent agentEntity) { - // host port type 唯一 + // host port 唯一 List<Agent> pList = this.list(new LambdaQueryWrapper<Agent>() .eq(Agent::getHost, agentEntity.getHost()) - .eq(Agent::getPort, agentEntity.getPort()) - .eq(Agent::getType, agentEntity.getType())); + .eq(Agent::getPort, agentEntity.getPort())); boolean flag = false; if ((pList == null || pList.size() == 0) || (pList != null && pList.size() == 1 && pList.get(0).getId().equals(agentEntity.getId()))) { diff --git a/nz-common/src/main/java/com/nis/common/utils/RCode.java b/nz-common/src/main/java/com/nis/common/utils/RCode.java index 058e4e56..7de44513 100644 --- a/nz-common/src/main/java/com/nis/common/utils/RCode.java +++ b/nz-common/src/main/java/com/nis/common/utils/RCode.java @@ -580,7 +580,7 @@ public enum RCode { AGENT_PORT_ERROR(523012, "Agent port is incorrect"), AGENT_HOST_ERROR(523013, "Agent host is incorrect"), AGENT_NOTEXSITS(526014, "Agent is not exsits"), // Agent 不存在 - AGENT_EXIST_ERROR(526015, "Agent is exists : host,type,port repeat"), + AGENT_EXIST_ERROR(526015, "Agent is exists : host,port repeat"), AGENT_TYPE_INVALIDE(523016,"Agent type is incorrect"), AGENT_UNAVAILABLE(526017,"No agent available"), AGENT_TOKEN_ISNULL(521018, "Agent token info can not be empty"), |