执行历史关联数据源，执行时长和影响条数展示

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbSqlExecutorController.java

@@ -82,8 +82,9 @@ public class DbSqlExecutorController {
 	}
 	
 	@PostMapping(value = "/history/list")
-	public ResponseJson historyList() {
+	public ResponseJson historyList(Long sourceId) {
 		UpdateWrapper<DbHistory> wrapper = new UpdateWrapper<>();
+		wrapper.eq(sourceId != null, "datasource_id", sourceId);
 		wrapper.orderByDesc("id");
 		List<DbHistory> favoriteList = dbHistoryService.list(wrapper);
 		return DocDbResponseJson.ok(favoriteList);

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteResult.java

@@ -12,16 +12,19 @@ import java.util.Map;
  */
 public class ExecuteResult {
 	private int updateCount;
+	private long useTime;
 	private List<Map<String, Object>> result;
 	
 	public ExecuteResult() {
 		this.updateCount = 0;
+		this.useTime = 0;
 		this.result = Collections.emptyList();
 	}
 	
-	public ExecuteResult(int updateCount, List<Map<String, Object>> result) {
+	public ExecuteResult(int updateCount, List<Map<String, Object>> result, long useTime) {
 		this.updateCount = updateCount;
 		this.result = result;
+		this.useTime = useTime;
 	}
 	
 	public int getUpdateCount() {
@@ -39,4 +42,12 @@ public class ExecuteResult {
 	public void setResult(List<Map<String, Object>> result) {
 		this.result = result;
 	}
+	
+	public long getUseTime() {
+		return useTime;
+	}
+	
+	public void setUseTime(long useTime) {
+		this.useTime = useTime;
+	}
 }

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/SqlExecutor.java

@@ -81,13 +81,14 @@ public class SqlExecutor {
 		String sqlStr = SqlLogUtil.getSqlString(paramMap, boundSql);
 		logger.info("sql ==> {}", sqlStr);
 		// 保留历史记录
-		dbHistoryService.saveHistory(sqlStr);
+		dbHistoryService.saveHistory(sqlStr, factoryBean.getId());
 		
 		List<ParameterMapping> parameterMappings = boundSql.getParameterMappings();
 		PreparedStatement preparedStatement = null;
 		DruidPooledConnection connection = null;
 		// 执行查询
 		try {
+			long startTime = System.currentTimeMillis();
 			connection = factoryBean.getDataSource().getConnection();
 			preparedStatement = connection.prepareStatement(sql);
 			// 设置当前的PreparedStatement
@@ -122,7 +123,8 @@ public class SqlExecutor {
 			// 更新的数量
 			int updateCount = preparedStatement.getUpdateCount();
 			updateCount = (updateCount < 0) ? 0 : updateCount;
-			return new ExecuteResult(updateCount, resultList);
+			long useTime = System.currentTimeMillis() - startTime;
+			return new ExecuteResult(updateCount, resultList, useTime);
 		} catch (Exception e) {
 			throw new RuntimeException(e);
 		} finally {

zyplayer-doc-db/src/main/resources/doc-db-manifest.js

@@ -1,2 +1,2 @@
-!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,c,u){for(var a,i,f,l=0,s=[];l<t.length;l++)i=t[l],o[i]&&s.push(o[i][0]),o[i]=0;for(a in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(r&&r(t,c,u);s.length;)s.shift()();if(u)for(l=0;l<u.length;l++)f=n(n.s=u[l]);return f};var t={},o={2:0};n.e=function(e){function r(){a.onerror=a.onload=null,clearTimeout(i);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var c=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=c;var u=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,n.nc&&a.setAttribute("nonce",n.nc),a.src=n.p+""+e+".js?"+{0:"a4e51a5424d256972972",1:"0a0403eb1820498dc9bc"}[e];var i=setTimeout(r,12e4);return a.onerror=a.onload=r,u.appendChild(a),c},n.m=e,n.c=t,n.i=function(e){return e},n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=doc-db-manifest.js.map?852703c813fad5db2b75
+!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,c,u){for(var i,a,f,l=0,s=[];l<t.length;l++)a=t[l],o[a]&&s.push(o[a][0]),o[a]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(t,c,u);s.length;)s.shift()();if(u)for(l=0;l<u.length;l++)f=n(n.s=u[l]);return f};var t={},o={2:0};n.e=function(e){function r(){i.onerror=i.onload=null,clearTimeout(a);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var c=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=c;var u=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,n.nc&&i.setAttribute("nonce",n.nc),i.src=n.p+""+e+".js?"+{0:"9104ba11e1fb6c27ed3d",1:"0a0403eb1820498dc9bc"}[e];var a=setTimeout(r,12e4);return i.onerror=i.onload=r,u.appendChild(i),c},n.m=e,n.c=t,n.i=function(e){return e},n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=doc-db-manifest.js.map?1b2ff88d57049717469c

zyplayer-doc-db/src/main/resources/doc-db.html

@@ -8,7 +8,7 @@
 
 <body>
 <div id="app"></div>
-<script type="text/javascript" src="doc-db-manifest.js?852703c813fad5db2b75"></script><script type="text/javascript" src="doc-db-vendor.js?0a0403eb1820498dc9bc"></script><script type="text/javascript" src="doc-db-index.js?a4e51a5424d256972972"></script></body>
+<script type="text/javascript" src="doc-db-manifest.js?1b2ff88d57049717469c"></script><script type="text/javascript" src="doc-db-vendor.js?0a0403eb1820498dc9bc"></script><script type="text/javascript" src="doc-db-index.js?9104ba11e1fb6c27ed3d"></script></body>
 
 </html>