Skip to content

李苗 / Vion-DevOps

Go to a project
Commit 1161af17 by HlQ
Options

[add] 服务列表等相关查询时不经过 JsonbTypeHandler 处理

1 parent 88bacf3d
Inline Side-by-side
Showing 3 changed files with 14 additions and 2 deletions
src/main/java/vion/model/monitor/RAgentService.java
...@@ -12,7 +12,7 @@ import java.time.LocalDateTime; ...@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
*/ */
@Getter @Getter
@Setter @Setter
@TableName(value = "mr_agent_service", autoResultMap = true) @TableName(value = "mr_agent_service")
public class RAgentService { public class RAgentService {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
......
src/main/java/vion/model/monitor/ServiceInfo.java
...@@ -14,7 +14,7 @@ import java.time.LocalDateTime; ...@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
*/ */
@Getter @Getter
@Setter @Setter
@TableName(value = "m_service", autoResultMap = true) @TableName(value = "m_service")
@JsonInclude(JsonInclude.Include.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
public class ServiceInfo extends BaseDTO { public class ServiceInfo extends BaseDTO {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
......
src/main/java/vion/service/impl/monitor/AgentServiceImpl.java
...@@ -150,6 +150,9 @@ public class AgentServiceImpl extends MPJBaseServiceImpl<AgentMapper, Agent> imp ...@@ -150,6 +150,9 @@ public class AgentServiceImpl extends MPJBaseServiceImpl<AgentMapper, Agent> imp
.selectAs(ServiceInfo::getType, ServiceInfo::getType) .selectAs(ServiceInfo::getType, ServiceInfo::getType)
.selectAs(RAgentService::getUrl, ServiceInfo::getUrl) .selectAs(RAgentService::getUrl, ServiceInfo::getUrl)
.selectAs(RAgentService::getMethod, ServiceInfo::getMethod) .selectAs(RAgentService::getMethod, ServiceInfo::getMethod)
.select("t1.req_headers as reqHeaders")
.select("t1.req_body as reqBody")
.selectAs(RAgentService::getResBody, ServiceInfo::getResBody)
.selectAs(RAgentService::getUsername, ServiceInfo::getUsername) .selectAs(RAgentService::getUsername, ServiceInfo::getUsername)
.selectAs(RAgentService::getPassword, ServiceInfo::getPassword) .selectAs(RAgentService::getPassword, ServiceInfo::getPassword)
.selectAs(ServiceInfo::getDescription, ServiceInfo::getDescription) .selectAs(ServiceInfo::getDescription, ServiceInfo::getDescription)
...@@ -184,6 +187,9 @@ public class AgentServiceImpl extends MPJBaseServiceImpl<AgentMapper, Agent> imp ...@@ -184,6 +187,9 @@ public class AgentServiceImpl extends MPJBaseServiceImpl<AgentMapper, Agent> imp
rAgentService.setServiceUid(s.getUid()); rAgentService.setServiceUid(s.getUid());
rAgentService.setUrl(s.getUrl()); rAgentService.setUrl(s.getUrl());
rAgentService.setMethod(s.getMethod()); rAgentService.setMethod(s.getMethod());
rAgentService.setReqHeaders(s.getReqHeaders());
rAgentService.setReqBody(s.getReqBody());
rAgentService.setResBody(s.getResBody());
rAgentService.setUsername(s.getUsername()); rAgentService.setUsername(s.getUsername());
rAgentService.setPassword(s.getPassword()); rAgentService.setPassword(s.getPassword());
return rAgentService; return rAgentService;
...@@ -213,6 +219,9 @@ public class AgentServiceImpl extends MPJBaseServiceImpl<AgentMapper, Agent> imp ...@@ -213,6 +219,9 @@ public class AgentServiceImpl extends MPJBaseServiceImpl<AgentMapper, Agent> imp
.selectAs(ServiceInfo::getType, ServiceInfo::getType) .selectAs(ServiceInfo::getType, ServiceInfo::getType)
.selectAs(RAgentService::getUrl, ServiceInfo::getUrl) .selectAs(RAgentService::getUrl, ServiceInfo::getUrl)
.selectAs(RAgentService::getMethod, ServiceInfo::getMethod) .selectAs(RAgentService::getMethod, ServiceInfo::getMethod)
.select("t1.req_headers as reqHeaders")
.select("t1.req_body as reqBody")
.selectAs(RAgentService::getResBody, ServiceInfo::getResBody)
.selectAs(RAgentService::getUsername, ServiceInfo::getUsername) .selectAs(RAgentService::getUsername, ServiceInfo::getUsername)
.selectAs(RAgentService::getPassword, ServiceInfo::getPassword) .selectAs(RAgentService::getPassword, ServiceInfo::getPassword)
.leftJoin(RAgentService.class, RAgentService::getServiceUid, ServiceInfo::getUid) .leftJoin(RAgentService.class, RAgentService::getServiceUid, ServiceInfo::getUid)
...@@ -297,6 +306,9 @@ public class AgentServiceImpl extends MPJBaseServiceImpl<AgentMapper, Agent> imp ...@@ -297,6 +306,9 @@ public class AgentServiceImpl extends MPJBaseServiceImpl<AgentMapper, Agent> imp
.selectAs(ServiceInfo::getType, ServiceInfo::getType) .selectAs(ServiceInfo::getType, ServiceInfo::getType)
.selectAs(RAgentService::getUrl, ServiceInfo::getUrl) .selectAs(RAgentService::getUrl, ServiceInfo::getUrl)
.selectAs(RAgentService::getMethod, ServiceInfo::getMethod) .selectAs(RAgentService::getMethod, ServiceInfo::getMethod)
.select("t1.req_headers as reqHeaders")
.select("t1.req_body as reqBody")
.selectAs(RAgentService::getResBody, ServiceInfo::getResBody)
.selectAs(RAgentService::getUsername, ServiceInfo::getUsername) .selectAs(RAgentService::getUsername, ServiceInfo::getUsername)
.selectAs(RAgentService::getPassword, ServiceInfo::getPassword) .selectAs(RAgentService::getPassword, ServiceInfo::getPassword)
.leftJoin(RAgentService.class, RAgentService::getServiceUid, ServiceInfo::getUid) .leftJoin(RAgentService.class, RAgentService::getServiceUid, ServiceInfo::getUid)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!