diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml
index 7d7f5fd7f..8235eb48a 100644
--- a/pigx-visual/pigx-monitor/pom.xml
+++ b/pigx-visual/pigx-monitor/pom.xml
@@ -73,8 +73,8 @@
- com.alibaba
- fastjson
+ cn.hutool
+ hutool-json
diff --git a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/ConnectionResult.java b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/ConnectionResult.java
index edd677825..4e2049c97 100755
--- a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/ConnectionResult.java
+++ b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/ConnectionResult.java
@@ -1,61 +1,68 @@
package com.pig4cloud.pigx.monitor.model.dto;
-import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
+ * Druid 数据源活跃连接响应。
+ *
+ * JSON 字段名与 Druid 监控接口保持一致。
+ *
* @author linchtech
* @date 2020-09-21 9:26
**/
@NoArgsConstructor
@Data
+@Schema(description = "Druid 数据源活跃连接响应")
public class ConnectionResult {
- @JSONField(name = "ResultCode")
+ @Schema(description = "Druid 原始字段:ResultCode")
private int ResultCode;
- @JSONField(name = "Content")
+ @Schema(description = "Druid 原始字段:Content")
private List Content;
+ /** Druid 数据源活跃连接明细。 */
@NoArgsConstructor
@Data
+ @Schema(description = "Druid 数据源活跃连接明细")
public static class ContentBean {
- @JSONField(name = "id")
+ @Schema(description = "Druid 原始字段:id")
private int id;
- @JSONField(name = "connectionId")
+ @Schema(description = "Druid 原始字段:connectionId")
private int connectionId;
- @JSONField(name = "useCount")
+ @Schema(description = "Druid 原始字段:useCount")
private int useCount;
- @JSONField(name = "lastActiveTime")
+ @Schema(description = "Druid 原始字段:lastActiveTime")
private String lastActiveTime;
- @JSONField(name = "connectTime")
+ @Schema(description = "Druid 原始字段:connectTime")
private String connectTime;
- @JSONField(name = "holdability")
+ @Schema(description = "Druid 原始字段:holdability")
private int holdability;
- @JSONField(name = "transactionIsolation")
+ @Schema(description = "Druid 原始字段:transactionIsolation")
private int transactionIsolation;
- @JSONField(name = "autoCommit")
+ @Schema(description = "Druid 原始字段:autoCommit")
private boolean autoCommit;
- @JSONField(name = "readoOnly")
+ @Schema(description = "Druid 原始字段:readoOnly")
private boolean readoOnly;
- @JSONField(name = "keepAliveCheckCount")
+ @Schema(description = "Druid 原始字段:keepAliveCheckCount")
private int keepAliveCheckCount;
- @JSONField(name = "pscache")
+ @Schema(description = "Druid 原始字段:pscache")
private List> pscache;
}
diff --git a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/DataSourceResult.java b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/DataSourceResult.java
index 83702783e..bc8cfb267 100755
--- a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/DataSourceResult.java
+++ b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/DataSourceResult.java
@@ -1,233 +1,241 @@
package com.pig4cloud.pigx.monitor.model.dto;
-import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
+ * Druid 数据源统计响应。
+ *
+ * JSON 字段名与 Druid 监控接口保持一致。
+ *
* @author linchtech
* @date 2020-09-16 18:32
**/
@Data
@NoArgsConstructor
+@Schema(description = "Druid 数据源统计响应")
public class DataSourceResult {
- @JSONField(name = "ResultCode")
+ @Schema(description = "Druid 原始字段:ResultCode")
private int ResultCode;
- @JSONField(name = "Content")
+ @Schema(description = "Druid 原始字段:Content")
private List Content;
+ /** Druid 数据源统计明细。 */
@NoArgsConstructor
@Data
+ @Schema(description = "Druid 数据源统计明细")
public static class ContentBean {
+ @Schema(description = "服务实例 ID")
private String serviceId;
- @JSONField(name = "Identity")
+ @Schema(description = "Druid 原始字段:Identity")
private int Identity;
- @JSONField(name = "Name")
+ @Schema(description = "Druid 原始字段:Name")
private String Name;
- @JSONField(name = "DbType")
+ @Schema(description = "Druid 原始字段:DbType")
private String DbType;
- @JSONField(name = "DriverClassName")
+ @Schema(description = "Druid 原始字段:DriverClassName")
private String DriverClassName;
- @JSONField(name = "URL")
+ @Schema(description = "Druid 原始字段:URL")
private String URL;
- @JSONField(name = "UserName")
+ @Schema(description = "Druid 原始字段:UserName")
private String UserName;
- @JSONField(name = "WaitThreadCount")
+ @Schema(description = "Druid 原始字段:WaitThreadCount")
private int WaitThreadCount;
- @JSONField(name = "NotEmptyWaitCount")
+ @Schema(description = "Druid 原始字段:NotEmptyWaitCount")
private int NotEmptyWaitCount;
- @JSONField(name = "NotEmptyWaitMillis")
+ @Schema(description = "Druid 原始字段:NotEmptyWaitMillis")
private int NotEmptyWaitMillis;
- @JSONField(name = "PoolingCount")
+ @Schema(description = "Druid 原始字段:PoolingCount")
private int PoolingCount;
- @JSONField(name = "PoolingPeak")
+ @Schema(description = "Druid 原始字段:PoolingPeak")
private int PoolingPeak;
- @JSONField(name = "PoolingPeakTime")
+ @Schema(description = "Druid 原始字段:PoolingPeakTime")
private String PoolingPeakTime;
- @JSONField(name = "ActiveCount")
+ @Schema(description = "Druid 原始字段:ActiveCount")
private int ActiveCount;
- @JSONField(name = "ActivePeak")
+ @Schema(description = "Druid 原始字段:ActivePeak")
private int ActivePeak;
- @JSONField(name = "ActivePeakTime")
+ @Schema(description = "Druid 原始字段:ActivePeakTime")
private String ActivePeakTime;
- @JSONField(name = "InitialSize")
+ @Schema(description = "Druid 原始字段:InitialSize")
private int InitialSize;
- @JSONField(name = "MinIdle")
+ @Schema(description = "Druid 原始字段:MinIdle")
private int MinIdle;
- @JSONField(name = "MaxActive")
+ @Schema(description = "Druid 原始字段:MaxActive")
private int MaxActive;
- @JSONField(name = "QueryTimeout")
+ @Schema(description = "Druid 原始字段:QueryTimeout")
private int QueryTimeout;
- @JSONField(name = "TransactionQueryTimeout")
+ @Schema(description = "Druid 原始字段:TransactionQueryTimeout")
private int TransactionQueryTimeout;
- @JSONField(name = "LoginTimeout")
+ @Schema(description = "Druid 原始字段:LoginTimeout")
private int LoginTimeout;
- @JSONField(name = "ValidConnectionCheckerClassName")
+ @Schema(description = "Druid 原始字段:ValidConnectionCheckerClassName")
private String ValidConnectionCheckerClassName;
- @JSONField(name = "ExceptionSorterClassName")
+ @Schema(description = "Druid 原始字段:ExceptionSorterClassName")
private String ExceptionSorterClassName;
- @JSONField(name = "TestOnBorrow")
+ @Schema(description = "Druid 原始字段:TestOnBorrow")
private boolean TestOnBorrow;
- @JSONField(name = "TestOnReturn")
+ @Schema(description = "Druid 原始字段:TestOnReturn")
private boolean TestOnReturn;
- @JSONField(name = "TestWhileIdle")
+ @Schema(description = "Druid 原始字段:TestWhileIdle")
private boolean TestWhileIdle;
- @JSONField(name = "DefaultAutoCommit")
+ @Schema(description = "Druid 原始字段:DefaultAutoCommit")
private boolean DefaultAutoCommit;
- @JSONField(name = "DefaultReadOnly")
+ @Schema(description = "Druid 原始字段:DefaultReadOnly")
private Object DefaultReadOnly;
- @JSONField(name = "DefaultTransactionIsolation")
+ @Schema(description = "Druid 原始字段:DefaultTransactionIsolation")
private Object DefaultTransactionIsolation;
- @JSONField(name = "LogicConnectCount")
+ @Schema(description = "Druid 原始字段:LogicConnectCount")
private int LogicConnectCount;
- @JSONField(name = "LogicCloseCount")
+ @Schema(description = "Druid 原始字段:LogicCloseCount")
private int LogicCloseCount;
- @JSONField(name = "LogicConnectErrorCount")
+ @Schema(description = "Druid 原始字段:LogicConnectErrorCount")
private int LogicConnectErrorCount;
- @JSONField(name = "PhysicalConnectCount")
+ @Schema(description = "Druid 原始字段:PhysicalConnectCount")
private int PhysicalConnectCount;
- @JSONField(name = "PhysicalCloseCount")
+ @Schema(description = "Druid 原始字段:PhysicalCloseCount")
private int PhysicalCloseCount;
- @JSONField(name = "PhysicalConnectErrorCount")
+ @Schema(description = "Druid 原始字段:PhysicalConnectErrorCount")
private int PhysicalConnectErrorCount;
- @JSONField(name = "ExecuteCount")
+ @Schema(description = "Druid 原始字段:ExecuteCount")
private int ExecuteCount;
- @JSONField(name = "ExecuteUpdateCount")
+ @Schema(description = "Druid 原始字段:ExecuteUpdateCount")
private int ExecuteUpdateCount;
- @JSONField(name = "ExecuteQueryCount")
+ @Schema(description = "Druid 原始字段:ExecuteQueryCount")
private int ExecuteQueryCount;
- @JSONField(name = "ExecuteBatchCount")
+ @Schema(description = "Druid 原始字段:ExecuteBatchCount")
private int ExecuteBatchCount;
- @JSONField(name = "ErrorCount")
+ @Schema(description = "Druid 原始字段:ErrorCount")
private int ErrorCount;
- @JSONField(name = "CommitCount")
+ @Schema(description = "Druid 原始字段:CommitCount")
private int CommitCount;
- @JSONField(name = "RollbackCount")
+ @Schema(description = "Druid 原始字段:RollbackCount")
private int RollbackCount;
- @JSONField(name = "PSCacheAccessCount")
+ @Schema(description = "Druid 原始字段:PSCacheAccessCount")
private int PSCacheAccessCount;
- @JSONField(name = "PSCacheHitCount")
+ @Schema(description = "Druid 原始字段:PSCacheHitCount")
private int PSCacheHitCount;
- @JSONField(name = "PSCacheMissCount")
+ @Schema(description = "Druid 原始字段:PSCacheMissCount")
private int PSCacheMissCount;
- @JSONField(name = "StartTransactionCount")
+ @Schema(description = "Druid 原始字段:StartTransactionCount")
private int StartTransactionCount;
- @JSONField(name = "RemoveAbandoned")
+ @Schema(description = "Druid 原始字段:RemoveAbandoned")
private boolean RemoveAbandoned;
- @JSONField(name = "ClobOpenCount")
+ @Schema(description = "Druid 原始字段:ClobOpenCount")
private int ClobOpenCount;
- @JSONField(name = "BlobOpenCount")
+ @Schema(description = "Druid 原始字段:BlobOpenCount")
private int BlobOpenCount;
- @JSONField(name = "KeepAliveCheckCount")
+ @Schema(description = "Druid 原始字段:KeepAliveCheckCount")
private int KeepAliveCheckCount;
- @JSONField(name = "KeepAlive")
+ @Schema(description = "Druid 原始字段:KeepAlive")
private boolean KeepAlive;
- @JSONField(name = "FailFast")
+ @Schema(description = "Druid 原始字段:FailFast")
private boolean FailFast;
- @JSONField(name = "MaxWait")
+ @Schema(description = "Druid 原始字段:MaxWait")
private int MaxWait;
- @JSONField(name = "MaxWaitThreadCount")
+ @Schema(description = "Druid 原始字段:MaxWaitThreadCount")
private int MaxWaitThreadCount;
- @JSONField(name = "PoolPreparedStatements")
+ @Schema(description = "Druid 原始字段:PoolPreparedStatements")
private boolean PoolPreparedStatements;
- @JSONField(name = "MaxPoolPreparedStatementPerConnectionSize")
+ @Schema(description = "Druid 原始字段:MaxPoolPreparedStatementPerConnectionSize")
private int MaxPoolPreparedStatementPerConnectionSize;
- @JSONField(name = "MinEvictableIdleTimeMillis")
+ @Schema(description = "Druid 原始字段:MinEvictableIdleTimeMillis")
private int MinEvictableIdleTimeMillis;
- @JSONField(name = "MaxEvictableIdleTimeMillis")
+ @Schema(description = "Druid 原始字段:MaxEvictableIdleTimeMillis")
private int MaxEvictableIdleTimeMillis;
- @JSONField(name = "LogDifferentThread")
+ @Schema(description = "Druid 原始字段:LogDifferentThread")
private boolean LogDifferentThread;
- @JSONField(name = "RecycleErrorCount")
+ @Schema(description = "Druid 原始字段:RecycleErrorCount")
private int RecycleErrorCount;
- @JSONField(name = "PreparedStatementOpenCount")
+ @Schema(description = "Druid 原始字段:PreparedStatementOpenCount")
private int PreparedStatementOpenCount;
- @JSONField(name = "PreparedStatementClosedCount")
+ @Schema(description = "Druid 原始字段:PreparedStatementClosedCount")
private int PreparedStatementClosedCount;
- @JSONField(name = "UseUnfairLock")
+ @Schema(description = "Druid 原始字段:UseUnfairLock")
private boolean UseUnfairLock;
- @JSONField(name = "InitGlobalVariants")
+ @Schema(description = "Druid 原始字段:InitGlobalVariants")
private boolean InitGlobalVariants;
- @JSONField(name = "InitVariants")
+ @Schema(description = "Druid 原始字段:InitVariants")
private boolean InitVariants;
- @JSONField(name = "FilterClassNames")
+ @Schema(description = "Druid 原始字段:FilterClassNames")
private List FilterClassNames;
- @JSONField(name = "TransactionHistogram")
+ @Schema(description = "Druid 原始字段:TransactionHistogram")
private List TransactionHistogram;
- @JSONField(name = "ConnectionHoldTimeHistogram")
+ @Schema(description = "Druid 原始字段:ConnectionHoldTimeHistogram")
private List ConnectionHoldTimeHistogram;
}
diff --git a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/SqlDetailResult.java b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/SqlDetailResult.java
index 1808dfcef..b7ae7405a 100755
--- a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/SqlDetailResult.java
+++ b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/SqlDetailResult.java
@@ -1,168 +1,175 @@
package com.pig4cloud.pigx.monitor.model.dto;
-import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
+ * Druid SQL 监控详情响应。
+ *
+ * JSON 字段名与 Druid 监控接口保持一致。
+ *
* @author linchtech
* @date 2020-09-16 16:18
**/
@NoArgsConstructor
@Data
+@Schema(description = "Druid SQL 监控详情响应")
public class SqlDetailResult {
- @JSONField(name = "ResultCode")
+ @Schema(description = "Druid 原始字段:ResultCode")
private int ResultCode;
- @JSONField(name = "Content")
+ @Schema(description = "Druid 原始字段:Content")
private ContentBean Content;
+ /** Druid SQL 监控详情。 */
@NoArgsConstructor
@Data
+ @Schema(description = "Druid SQL 监控详情")
public static class ContentBean {
- @JSONField(name = "ExecuteAndResultSetHoldTime")
+ @Schema(description = "Druid 原始字段:ExecuteAndResultSetHoldTime")
private int ExecuteAndResultSetHoldTime;
- @JSONField(name = "LastErrorMessage")
+ @Schema(description = "Druid 原始字段:LastErrorMessage")
private Object LastErrorMessage;
- @JSONField(name = "InputStreamOpenCount")
+ @Schema(description = "Druid 原始字段:InputStreamOpenCount")
private int InputStreamOpenCount;
- @JSONField(name = "BatchSizeTotal")
+ @Schema(description = "Druid 原始字段:BatchSizeTotal")
private int BatchSizeTotal;
- @JSONField(name = "FetchRowCountMax")
+ @Schema(description = "Druid 原始字段:FetchRowCountMax")
private int FetchRowCountMax;
- @JSONField(name = "ErrorCount")
+ @Schema(description = "Druid 原始字段:ErrorCount")
private int ErrorCount;
- @JSONField(name = "BatchSizeMax")
+ @Schema(description = "Druid 原始字段:BatchSizeMax")
private int BatchSizeMax;
- @JSONField(name = "URL")
+ @Schema(description = "Druid 原始字段:URL")
private Object URL;
- @JSONField(name = "Name")
+ @Schema(description = "Druid 原始字段:Name")
private Object Name;
- @JSONField(name = "LastErrorTime")
+ @Schema(description = "Druid 原始字段:LastErrorTime")
private Object LastErrorTime;
- @JSONField(name = "ReaderOpenCount")
+ @Schema(description = "Druid 原始字段:ReaderOpenCount")
private int ReaderOpenCount;
- @JSONField(name = "parsedRelationships")
+ @Schema(description = "Druid 原始字段:parsedRelationships")
private String parsedRelationships;
- @JSONField(name = "EffectedRowCountMax")
+ @Schema(description = "Druid 原始字段:EffectedRowCountMax")
private int EffectedRowCountMax;
- @JSONField(name = "LastErrorClass")
+ @Schema(description = "Druid 原始字段:LastErrorClass")
private Object LastErrorClass;
- @JSONField(name = "InTransactionCount")
+ @Schema(description = "Druid 原始字段:InTransactionCount")
private int InTransactionCount;
- @JSONField(name = "LastErrorStackTrace")
+ @Schema(description = "Druid 原始字段:LastErrorStackTrace")
private Object LastErrorStackTrace;
- @JSONField(name = "ResultSetHoldTime")
+ @Schema(description = "Druid 原始字段:ResultSetHoldTime")
private int ResultSetHoldTime;
- @JSONField(name = "TotalTime")
+ @Schema(description = "Druid 原始字段:TotalTime")
private int TotalTime;
- @JSONField(name = "ID")
+ @Schema(description = "Druid 原始字段:ID")
private int ID;
- @JSONField(name = "ConcurrentMax")
+ @Schema(description = "Druid 原始字段:ConcurrentMax")
private int ConcurrentMax;
- @JSONField(name = "RunningCount")
+ @Schema(description = "Druid 原始字段:RunningCount")
private int RunningCount;
- @JSONField(name = "FetchRowCount")
+ @Schema(description = "Druid 原始字段:FetchRowCount")
private int FetchRowCount;
- @JSONField(name = "parsedFields")
+ @Schema(description = "Druid 原始字段:parsedFields")
private String parsedFields;
- @JSONField(name = "MaxTimespanOccurTime")
+ @Schema(description = "Druid 原始字段:MaxTimespanOccurTime")
private String MaxTimespanOccurTime;
- @JSONField(name = "LastSlowParameters")
+ @Schema(description = "Druid 原始字段:LastSlowParameters")
private Object LastSlowParameters;
- @JSONField(name = "ReadBytesLength")
+ @Schema(description = "Druid 原始字段:ReadBytesLength")
private int ReadBytesLength;
- @JSONField(name = "formattedSql")
+ @Schema(description = "Druid 原始字段:formattedSql")
private String formattedSql;
- @JSONField(name = "DbType")
+ @Schema(description = "Druid 原始字段:DbType")
private String DbType;
- @JSONField(name = "DataSource")
+ @Schema(description = "Druid 原始字段:DataSource")
private Object DataSource;
- @JSONField(name = "SQL")
+ @Schema(description = "Druid 原始字段:SQL")
private String SQL;
- @JSONField(name = "HASH")
+ @Schema(description = "Druid 原始字段:HASH")
private long HASH;
- @JSONField(name = "LastError")
+ @Schema(description = "Druid 原始字段:LastError")
private Object LastError;
- @JSONField(name = "MaxTimespan")
+ @Schema(description = "Druid 原始字段:MaxTimespan")
private int MaxTimespan;
- @JSONField(name = "parsedTable")
+ @Schema(description = "Druid 原始字段:parsedTable")
private String parsedTable;
- @JSONField(name = "parsedOrderbycolumns")
+ @Schema(description = "Druid 原始字段:parsedOrderbycolumns")
private String parsedOrderbycolumns;
- @JSONField(name = "BlobOpenCount")
+ @Schema(description = "Druid 原始字段:BlobOpenCount")
private int BlobOpenCount;
- @JSONField(name = "ExecuteCount")
+ @Schema(description = "Druid 原始字段:ExecuteCount")
private int ExecuteCount;
- @JSONField(name = "EffectedRowCount")
+ @Schema(description = "Druid 原始字段:EffectedRowCount")
private int EffectedRowCount;
- @JSONField(name = "ReadStringLength")
+ @Schema(description = "Druid 原始字段:ReadStringLength")
private int ReadStringLength;
- @JSONField(name = "File")
+ @Schema(description = "Druid 原始字段:File")
private Object File;
- @JSONField(name = "ClobOpenCount")
+ @Schema(description = "Druid 原始字段:ClobOpenCount")
private int ClobOpenCount;
- @JSONField(name = "LastTime")
+ @Schema(description = "Druid 原始字段:LastTime")
private String LastTime;
- @JSONField(name = "parsedConditions")
+ @Schema(description = "Druid 原始字段:parsedConditions")
private String parsedConditions;
- @JSONField(name = "EffectedRowCountHistogram")
+ @Schema(description = "Druid 原始字段:EffectedRowCountHistogram")
private List EffectedRowCountHistogram;
- @JSONField(name = "Histogram")
+ @Schema(description = "Druid 原始字段:Histogram")
private List Histogram;
- @JSONField(name = "ExecuteAndResultHoldTimeHistogram")
+ @Schema(description = "Druid 原始字段:ExecuteAndResultHoldTimeHistogram")
private List ExecuteAndResultHoldTimeHistogram;
- @JSONField(name = "FetchRowCountHistogram")
+ @Schema(description = "Druid 原始字段:FetchRowCountHistogram")
private List FetchRowCountHistogram;
}
diff --git a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/SqlListResult.java b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/SqlListResult.java
index 9034e7e23..4013bfd7e 100755
--- a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/SqlListResult.java
+++ b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/SqlListResult.java
@@ -1,156 +1,166 @@
package com.pig4cloud.pigx.monitor.model.dto;
-import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
+ * Druid SQL 监控列表响应。
+ *
+ * JSON 字段名与 Druid 监控接口保持一致。
+ *
* @author linchtech
* @date 2020-09-16 14:37
**/
@NoArgsConstructor
@Data
+@Schema(description = "Druid SQL 监控列表响应")
public class SqlListResult {
- @JSONField(name = "ResultCode")
+ @Schema(description = "Druid 原始字段:ResultCode")
private int ResultCode;
- @JSONField(name = "Content")
+ @Schema(description = "Druid 原始字段:Content")
private List Content;
+ /** Druid SQL 监控列表明细。 */
@NoArgsConstructor
@Data
+ @Schema(description = "Druid SQL 监控列表明细")
public static class ContentBean {
+ @Schema(description = "服务实例 ID")
private String serviceId;
+ @Schema(description = "服务实例地址")
private String address;
+ @Schema(description = "服务实例端口")
private Integer port;
- @JSONField(name = "ExecuteAndResultSetHoldTime")
+ @Schema(description = "Druid 原始字段:ExecuteAndResultSetHoldTime")
private int ExecuteAndResultSetHoldTime;
- @JSONField(name = "LastErrorMessage")
+ @Schema(description = "Druid 原始字段:LastErrorMessage")
private Object LastErrorMessage;
- @JSONField(name = "InputStreamOpenCount")
+ @Schema(description = "Druid 原始字段:InputStreamOpenCount")
private int InputStreamOpenCount;
- @JSONField(name = "BatchSizeTotal")
+ @Schema(description = "Druid 原始字段:BatchSizeTotal")
private int BatchSizeTotal;
- @JSONField(name = "FetchRowCountMax")
+ @Schema(description = "Druid 原始字段:FetchRowCountMax")
private int FetchRowCountMax;
- @JSONField(name = "ErrorCount")
+ @Schema(description = "Druid 原始字段:ErrorCount")
private int ErrorCount;
- @JSONField(name = "BatchSizeMax")
+ @Schema(description = "Druid 原始字段:BatchSizeMax")
private int BatchSizeMax;
- @JSONField(name = "URL")
+ @Schema(description = "Druid 原始字段:URL")
private Object URL;
- @JSONField(name = "Name")
+ @Schema(description = "Druid 原始字段:Name")
private Object Name;
- @JSONField(name = "LastErrorTime")
+ @Schema(description = "Druid 原始字段:LastErrorTime")
private Object LastErrorTime;
- @JSONField(name = "ReaderOpenCount")
+ @Schema(description = "Druid 原始字段:ReaderOpenCount")
private int ReaderOpenCount;
- @JSONField(name = "EffectedRowCountMax")
+ @Schema(description = "Druid 原始字段:EffectedRowCountMax")
private int EffectedRowCountMax;
- @JSONField(name = "LastErrorClass")
+ @Schema(description = "Druid 原始字段:LastErrorClass")
private Object LastErrorClass;
- @JSONField(name = "InTransactionCount")
+ @Schema(description = "Druid 原始字段:InTransactionCount")
private int InTransactionCount;
- @JSONField(name = "LastErrorStackTrace")
+ @Schema(description = "Druid 原始字段:LastErrorStackTrace")
private Object LastErrorStackTrace;
- @JSONField(name = "ResultSetHoldTime")
+ @Schema(description = "Druid 原始字段:ResultSetHoldTime")
private int ResultSetHoldTime;
- @JSONField(name = "TotalTime")
+ @Schema(description = "Druid 原始字段:TotalTime")
private int TotalTime;
- @JSONField(name = "ID")
+ @Schema(description = "Druid 原始字段:ID")
private int ID;
- @JSONField(name = "ConcurrentMax")
+ @Schema(description = "Druid 原始字段:ConcurrentMax")
private int ConcurrentMax;
- @JSONField(name = "RunningCount")
+ @Schema(description = "Druid 原始字段:RunningCount")
private int RunningCount;
- @JSONField(name = "FetchRowCount")
+ @Schema(description = "Druid 原始字段:FetchRowCount")
private int FetchRowCount;
- @JSONField(name = "MaxTimespanOccurTime")
+ @Schema(description = "Druid 原始字段:MaxTimespanOccurTime")
private String MaxTimespanOccurTime;
- @JSONField(name = "LastSlowParameters")
+ @Schema(description = "Druid 原始字段:LastSlowParameters")
private Object LastSlowParameters;
- @JSONField(name = "ReadBytesLength")
+ @Schema(description = "Druid 原始字段:ReadBytesLength")
private int ReadBytesLength;
- @JSONField(name = "DbType")
+ @Schema(description = "Druid 原始字段:DbType")
private String DbType;
- @JSONField(name = "DataSource")
+ @Schema(description = "Druid 原始字段:DataSource")
private Object DataSource;
- @JSONField(name = "SQL")
+ @Schema(description = "Druid 原始字段:SQL")
private String SQL;
- @JSONField(name = "HASH")
+ @Schema(description = "Druid 原始字段:HASH")
private long HASH;
- @JSONField(name = "LastError")
+ @Schema(description = "Druid 原始字段:LastError")
private Object LastError;
- @JSONField(name = "MaxTimespan")
+ @Schema(description = "Druid 原始字段:MaxTimespan")
private int MaxTimespan;
- @JSONField(name = "BlobOpenCount")
+ @Schema(description = "Druid 原始字段:BlobOpenCount")
private int BlobOpenCount;
- @JSONField(name = "ExecuteCount")
+ @Schema(description = "Druid 原始字段:ExecuteCount")
private int ExecuteCount;
- @JSONField(name = "EffectedRowCount")
+ @Schema(description = "Druid 原始字段:EffectedRowCount")
private int EffectedRowCount;
- @JSONField(name = "ReadStringLength")
+ @Schema(description = "Druid 原始字段:ReadStringLength")
private int ReadStringLength;
- @JSONField(name = "File")
+ @Schema(description = "Druid 原始字段:File")
private Object File;
- @JSONField(name = "ClobOpenCount")
+ @Schema(description = "Druid 原始字段:ClobOpenCount")
private int ClobOpenCount;
- @JSONField(name = "LastTime")
+ @Schema(description = "Druid 原始字段:LastTime")
private String LastTime;
- @JSONField(name = "EffectedRowCountHistogram")
+ @Schema(description = "Druid 原始字段:EffectedRowCountHistogram")
private List EffectedRowCountHistogram;
- @JSONField(name = "Histogram")
+ @Schema(description = "Druid 原始字段:Histogram")
private List Histogram;
- @JSONField(name = "ExecuteAndResultHoldTimeHistogram")
+ @Schema(description = "Druid 原始字段:ExecuteAndResultHoldTimeHistogram")
private List ExecuteAndResultHoldTimeHistogram;
- @JSONField(name = "FetchRowCountHistogram")
+ @Schema(description = "Druid 原始字段:FetchRowCountHistogram")
private List FetchRowCountHistogram;
}
diff --git a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/WallResult.java b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/WallResult.java
index c449c2403..1f18c3a19 100755
--- a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/WallResult.java
+++ b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/model/dto/WallResult.java
@@ -1,6 +1,6 @@
package com.pig4cloud.pigx.monitor.model.dto;
-import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -9,106 +9,119 @@ import java.util.Collections;
import java.util.List;
/**
+ * Druid SQL 防火墙统计响应。
+ *
+ * JSON 字段名与 Druid 监控接口保持一致。
+ *
* @author linchtech
* @date 2020-09-17 18:18
**/
@Data
@NoArgsConstructor
+@Schema(description = "Druid SQL 防火墙统计响应")
public class WallResult {
- @JSONField(name = "ResultCode")
+ @Schema(description = "Druid 原始字段:ResultCode")
private int ResultCode;
- @JSONField(name = "Content")
+ @Schema(description = "Druid 原始字段:Content")
private ContentBean Content = new ContentBean();
+ /** Druid SQL 防火墙统计内容。 */
@NoArgsConstructor
@Data
+ @Schema(description = "Druid SQL 防火墙统计内容")
public static class ContentBean {
- @JSONField(name = "checkCount")
+ @Schema(description = "Druid 原始字段:checkCount")
private int checkCount;
- @JSONField(name = "hardCheckCount")
+ @Schema(description = "Druid 原始字段:hardCheckCount")
private int hardCheckCount;
- @JSONField(name = "violationCount")
+ @Schema(description = "Druid 原始字段:violationCount")
private int violationCount;
- @JSONField(name = "violationEffectRowCount")
+ @Schema(description = "Druid 原始字段:violationEffectRowCount")
private int violationEffectRowCount;
- @JSONField(name = "blackListHitCount")
+ @Schema(description = "Druid 原始字段:blackListHitCount")
private int blackListHitCount;
- @JSONField(name = "blackListSize")
+ @Schema(description = "Druid 原始字段:blackListSize")
private int blackListSize;
- @JSONField(name = "whiteListHitCount")
+ @Schema(description = "Druid 原始字段:whiteListHitCount")
private int whiteListHitCount;
- @JSONField(name = "whiteListSize")
+ @Schema(description = "Druid 原始字段:whiteListSize")
private int whiteListSize;
- @JSONField(name = "syntaxErrorCount")
+ @Schema(description = "Druid 原始字段:syntaxErrorCount")
private int syntaxErrorCount;
- @JSONField(name = "tables")
+ @Schema(description = "Druid 原始字段:tables")
private List tables = new ArrayList<>();
- @JSONField(name = "functions")
+ @Schema(description = "Druid 原始字段:functions")
private List functions = new ArrayList<>();
- @JSONField(name = "blackList")
+ @Schema(description = "Druid 原始字段:blackList")
private List