Merge branch 'main' of git.yuntengiot.com:huang/thingskit-drawio

黄 x
2 parents 19b67464 04bfec3e
Showing 9 changed files with 149 additions and 99 deletions
.gitignore
.idea/.gitignore
.idea/azure/azureSettings.xml
.idea/google-java-format.xml
.idea/modules.xml
.idea/runConfigurations.xml
.idea/thingskit-drawio.iml
src/main/webapp/index.html
src/main/webapp/js/api/index.js
--- a/.gitignore
View file @f407ab2
+++ b/.gitignore
View file @f407ab2
@@ -3,3 +3,5 @@ build
 classes
 node_modules
 .vscode/settings.json
+.idea
+yarn.lock
--- a/.idea/.gitignore deleted 100644 → 0
View file @19b6746
+++ b/.idea/.gitignore deleted 100644 → 0
View file @19b6746
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Zeppelin ignored files
-/ZeppelinRemoteNotebooks/
--- a/.idea/azure/azureSettings.xml deleted 100644 → 0
View file @19b6746
+++ b/.idea/azure/azureSettings.xml deleted 100644 → 0
View file @19b6746
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AzureSettings">
-    <option name="appInsights" value="rO0ABXVyAEtbTGNvbS5taWNyb3NvZnQuYXBwbGljYXRpb25pbnNpZ2h0cy5wcmVmZXJlbmNlLkFwcGxpY2F0aW9uSW5zaWdodHNSZXNvdXJjZTvCzxEP0C2HbAIAAHhwAAAAAA==" />
-  </component>
-</project>
--- a/.idea/google-java-format.xml deleted 100644 → 0
View file @19b6746
+++ b/.idea/google-java-format.xml deleted 100644 → 0
View file @19b6746
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GoogleJavaFormatSettings">
-    <option name="enabled" value="false" />
-  </component>
-</project>
--- a/.idea/modules.xml deleted 100644 → 0
View file @19b6746
+++ b/.idea/modules.xml deleted 100644 → 0
View file @19b6746
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/thingskit-drawio.iml" filepath="$PROJECT_DIR$/.idea/thingskit-drawio.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/runConfigurations.xml deleted 100644 → 0
View file @19b6746
+++ b/.idea/runConfigurations.xml deleted 100644 → 0
View file @19b6746
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
--- a/.idea/thingskit-drawio.iml deleted 100644 → 0
View file @19b6746
+++ b/.idea/thingskit-drawio.iml deleted 100644 → 0
View file @19b6746
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/src/main/webapp/index.html
View file @f407ab2
+++ b/src/main/webapp/index.html
View file @f407ab2
@@ -9,7 +9,7 @@
 	<meta name="Keywords" content="diagram, online, flow chart, flowchart maker, uml, erd">
 	<meta itemprop="name" content="diagrams.net - free flowchart maker and diagrams online">
 	<meta itemprop="description" content="diagrams.net is a free online diagramming application  and flowchart maker . You can use it to create UML, entity relationship,
-		org charts, BPMN and BPM, database schema and networks. Also possible are telecommunication network, workflow, flowcharts, maps overlays and GIS, electronic 
+		org charts, BPMN and BPM, database schema and networks. Also possible are telecommunication network, workflow, flowcharts, maps overlays and GIS, electronic
 		circuit and social network diagrams.">
 	<meta itemprop="image" content="https://lh4.googleusercontent.com/-cLKEldMbT_E/Tx8qXDuw6eI/AAAAAAAAAAs/Ke0pnlk8Gpg/w500-h344-k/BPMN%2Bdiagram%2Brc2f.png">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
@@ -17,18 +17,25 @@
 	<meta name="mobile-web-app-capable" content="yes">
 	<meta name="theme-color" content="#d89000">
 	<script src="./plugins/axios.min.js"></script>
-	<script src="./js/jquery/jquery-3.3.1.min.js"></script>
-	<script src="./js/jquery.easyui.min.js"></script>
+<!--	<script src="./js/jquery/jquery-3.3.1.min.js"></script>-->
+<!--	<script src="./js/jquery.easyui.min.js"></script>-->
 	<link rel="stylesheet" href="https://cdnjs.loli.net/ajax/libs/layui/2.6.8/css/layui.min.css" integrity="sha512-iQBJbsNHXUcgEIgWThd2dr8tOdKPvICwqjPEZYY81z3eMya44A5MiAqfWSCh+Ee1YzNYkdrI982Qhwgr8LEYOQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
 	<script src="https://cdnjs.loli.net/ajax/libs/layui/2.6.8/layui.min.js" integrity="sha512-EKrFvch3qTzLFQgjbcjpsRmF8T3UCtc9ojtMAu6dvvP+bV8qYUDOaQ84nwYCkSLT7lbqGoya/Kf+8fyCBE0vRg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-	
+
+	<!-- 引入修改样式	-->
+	<link rel="stylesheet" href="./styles/formatChange.css">
+
 	<!-- 引入select.zTree及相关依赖 -->
-	<link rel="stylesheet" href="./styles/zTreeStyle.css" type="text/css">
-	<link rel="stylesheet" href="./styles/jquery.select.zTree.v1.5.css" type="text/css">
-	<script type="text/javascript" src="./js/jquery.ztree.core.min.js"></script>
-	<script type="text/javascript" src="./js/jquery.ztree.exhide.min.js"></script>
-	<script type="text/javascript" src="./js/jquery.select.zTree.v1.5.min.js"></script>
+<!--	<link rel="stylesheet" href="./styles/zTreeStyle.css" type="text/css">-->
+<!--	<link rel="stylesheet" href="./styles/jquery.select.zTree.v1.5.css" type="text/css">-->
+<!--	<script type="text/javascript" src="./js/jquery.ztree.core.min.js"></script>-->
+<!--	<script type="text/javascript" src="./js/jquery.ztree.exhide.min.js"></script>-->
+<!--	<script type="text/javascript" src="./js/jquery.select.zTree.v1.5.min.js"></script>-->
+
+<!-- Axios	-->
 	<script src="./plugins/defHttp.js"></script>
+	
+	<script src="./js/api/index.js"></script>
 	<script type="text/javascript">
 		/**
@@ -54,27 +61,27 @@
 		{
 			var result = new Object();
 			var params = window.location.search.slice(1).split('&');
-			
+
 			for (var i = 0; i < params.length; i++)
 			{
 				var idx = params[i].indexOf('=');
-				
+
 				if (idx > 0)
 				{
 					result[params[i].substring(0, idx)] = params[i].substring(idx + 1);
 				}
 			}
-			
+
 			return result;
 		})();
-		
+
 		// Forces CDN caches by passing URL parameters via URL hash
 		if (window.location.hash != null && window.location.hash.substring(0, 2) == '#P')
 		{
 			try
 			{
 				urlParams = JSON.parse(decodeURIComponent(window.location.hash.substring(2)));
-				
+
 				if (urlParams.hash != null)
 				{
 					window.location.hash = urlParams.hash;
@@ -85,7 +92,7 @@
 				// ignore
 			}
 		}
-		
+
 		// Global variable for desktop
 		var mxIsElectron = window && window.process && window.process.type;
@@ -95,21 +102,21 @@
 			(function()
 			{
 				var proto = window.location.protocol;
-				
+
 				if (!mxIsElectron)
 				{
 					var host = window.location.host;
-		
+
 					// Redirects apex, drive and rt to www
 					if (host === 'draw.io' || host === 'rt.draw.io' || host === 'drive.draw.io')
 					{
 						host = 'www.draw.io';
 					}
-					
+
 					var href = proto + '//' + host + window.location.href.substring(
 							window.location.protocol.length +
 							window.location.host.length + 2);
-		
+
 					// Redirects if href changes
 					if (href != window.location.href)
 					{
@@ -118,7 +125,7 @@
 				}
 			})();
 		}
-		
+
 		/**
 		 * Adds meta tag to the page.
 		 */
@@ -127,15 +134,15 @@
 			try
 			{
 				var s = document.createElement('meta');
-				
-				if (name != null) 
+
+				if (name != null)
 				{
 					s.setAttribute('name', name);
 				}
 				s.setAttribute('content', content);
-				
-				if (httpEquiv != null) 
+
+				if (httpEquiv != null)
 				{
 					s.setAttribute('http-equiv', httpEquiv);
 				}
@@ -148,14 +155,14 @@
 				// ignore
 			}
 		};
-		
+
 		/**
 		 * Synchronously adds scripts to the page.
 		 */
 		function mxscript(src, onLoad, id, dataAppKey, noWrite)
 		{
 			var defer = onLoad == null && !noWrite;
-			
+
 			if ((urlParams['dev'] != '1' && typeof document.createElement('canvas').getContext === "function") ||
 				onLoad != null || noWrite)
 			{
@@ -168,16 +175,16 @@
 				{
 					s.setAttribute('id', id);
 				}
-				
+
 				if (dataAppKey != null)
 				{
 					s.setAttribute('data-app-key', dataAppKey);
 				}
-				
+
 				if (onLoad != null)
 				{
 					var r = false;
-				
+
 					s.onload = s.onreadystatechange = function()
 					{
 						if (!r && (!this.readyState || this.readyState == 'complete'))
@@ -187,9 +194,9 @@
 						}
 				  	};
 				}
-			  	
+
 			  	var t = document.getElementsByTagName('script')[0];
-			  	
+
 			  	if (t != null)
 			  	{
 			  		t.parentNode.insertBefore(s, t);
@@ -211,11 +218,11 @@
 			g.type = 'text/javascript';
 			g.async = true;
 			g.src = src;
-			
+
 		    var s = document.getElementsByTagName('script')[0];
 		    s.parentNode.insertBefore(g, s);
 		};
-		
+
 		/**
 		 * Adds meta tags with application name (depends on offline URL parameter)
 		 */
@@ -230,10 +237,10 @@
 				mxmeta(null, 'default-src \'self\' \'unsafe-inline\'; connect-src \'self\' https://*.draw.io https://fonts.googleapis.com https://fonts.gstatic.com; img-src * data:; media-src *; font-src *; style-src-elem \'self\' \'unsafe-inline\' https://fonts.googleapis.com', 'Content-Security-Policy');
 			}
 		})();
-		
+
 		// Checks for local storage
 		var isLocalStorage = false;
-		
+
 		try
 		{
 			isLocalStorage = urlParams['local'] != '1' && typeof(localStorage) != 'undefined';
@@ -244,15 +251,15 @@
 		}
 		var mxScriptsLoaded = false, mxWinLoaded = false;
-		
+
 		function checkAllLoaded()
 		{
 			if (mxScriptsLoaded && mxWinLoaded)
 			{
-				App.main();				
+				App.main();
 			}
 		};
-		
+
 		var t0 = new Date();
 		// Changes paths for local development environment
@@ -260,18 +267,18 @@
 		{
 			// Used to request grapheditor/mxgraph sources in dev mode
 			var mxDevUrl = document.location.protocol + '//devhost.jgraph.com/drawio/src/main';
-			
+
 			// Used to request draw.io sources in dev mode
 			var drawDevUrl = document.location.protocol + '//devhost.jgraph.com/drawio/src/main/webapp/';
 			var geBasePath = drawDevUrl + '/js/grapheditor';
 			var mxBasePath = mxDevUrl + '/mxgraph';
-			
+
 			if (document.location.protocol == 'file:')
 			{
 				geBasePath = './js/grapheditor';
 				mxBasePath = './mxgraph';
 				drawDevUrl = './';
-				
+
 				// Forces includes for dev environment in node.js
 				mxForceIncludes = true;
 			}
@@ -287,19 +294,19 @@
 			mxscript(drawDevUrl + 'js/diagramly/Init.js');
 			mxscript(geBasePath + '/Init.js');
 			mxscript(mxBasePath + '/mxClient.js');
-			
+
 			// Adds all JS code that depends on mxClient. This indirection via Devel.js is
 			// required in some browsers to make sure mxClient.js (and the files that it
 			// loads asynchronously) are available when the code loaded in Devel.js runs.
 			mxscript(drawDevUrl + 'js/diagramly/Devel.js');
-			
+
 			// Electron
 			if (mxIsElectron)
 			{
 				mxscript('js/diagramly/DesktopLibrary.js');
 				mxscript('js/diagramly/ElectronApp.js');
 			}
-			
+
 			mxscript(drawDevUrl + 'js/PostConfig.js');
 		}
 		else
@@ -307,18 +314,18 @@
 			(function()
 			{
 				var hostName = window.location.hostname;
-				
+
 				// Supported domains are *.draw.io and the packaged version in Quip
 				var supportedDomain = (hostName.substring(hostName.length - 8, hostName.length) === '.draw.io') ||
 					(hostName.substring(hostName.length - 13, hostName.length) === '.diagrams.net');
-				
+
 				function loadAppJS()
 				{
 					mxscript('js/app.min.js', function()
 					{
 						mxScriptsLoaded = true;
 						checkAllLoaded();
-						
+
 						// Electron
 						if (mxIsElectron)
 						{
@@ -345,7 +352,7 @@
 						}
 					});
 				};
-				
+
 				if (!supportedDomain || mxIsElectron)
 				{
 					mxscript('js/PreConfig.js', loadAppJS);
@@ -361,7 +368,7 @@
 		window.onerror = function()
 		{
 			var status = document.getElementById('geStatus');
-			
+
 			if (status != null)
 			{
 				status.innerHTML = 'Page could not be loaded. Please try refreshing.';
@@ -461,7 +468,7 @@ if (navigator.userAgent != null && navigator.userAgent.toLowerCase().
 {
 	// Redirects old Electron app to latest version
 	var div = document.getElementById('geInfo');
-	
+
 	if (div != null)
 	{
 		div.innerHTML = '<center><h2>You are using an out of date version of this app.<br>Please download the latest version ' +
--- a/src/main/webapp/js/api/index.js 0 → 100644
View file @f407ab2
+++ b/src/main/webapp/js/api/index.js 0 → 100644
View file @f407ab2
+class ConfigurationNodeApi {
+    /**
+     * @description 获取组态信息
+     * @param {'CONFIGURE' | 'CONTENT' | 'NODE'} levelType - 组态资源类型
+     * @param {string} levelId - 组态资源ID
+     */
+    static getConfigurationInfo(levelType, levelId) {
+        return defHttp.get(`/yt/configuration/node/${levelType}/${levelId}`)
+    }
+
+    /**
+     * @description 获取组织节点树
+     * @returns
+     */
+    static getOrgTree() {
+        return defHttp.get('/yt/organization/me/list')
+    }
+
+    /**
+     * @description 通过设备ID 获取 设备属性
+     * @param tbDeviceId
+     * @returns {Promise<*>}
+     */
+    static getDeviceAttr(tbDeviceId) {
+        return defHttp.get(`/plugins/telemetry/DEVICE/${tbDeviceId}/keys/timeseries`)
+    }
+
+    /**
+     * @description 获取组织下的设备
+     * @param {'DIRECT_CONNECTION' | 'GATEWAY' | 'SENDOR'} deviceType - 'DIRECT_CONNECTION' 直连设备 'GATEWAY' 网关设备 'SENDOR' 传感器
+     * @param {string} orgId - 组织ID
+     * @returns {Promise<*>}
+     */
+    static getDeviceUnderTheOrg(deviceType, orgId) {
+        return defHttp.get(`/yt/device/list/${deviceType}?organizationId=${orgId}`)
+    }
+
+    /**
+     * @description 查询设备的子设备
+     * @param deviceId 设备ID
+     * @returns {Promise<*>}
+     */
+    static getDeviceChildDevice(deviceId) {
+        return defHttp.get(`/yt/device/relation?page=1&pageSize=10&fromId=${deviceId}`)
+    }
+
+    /**
+     * @description 查询所有主设备列表
+     * @param orgId
+     * @returns {Promise<*>}
+     */
+    static getMasterDevice(orgId) {
+        return defHttp.get(`/yt/device/list/master/${orgId}`)
+    }
+
+    /**
+     * @description 查询所有从设备
+     * @param orgId
+     * @param masterDeviceId
+     * @returns {Promise<*>}
+     */
+    static getSlaveDevice(orgId, masterDeviceId) {
+        return defHttp.get(`/yt/device/list/slave/${orgId}?masterId=${masterDeviceId}`)
+    }
+
+    /**
+     * @description 编辑数据交互
+     */
+    static updateNodeEvent(data) {
+        return defHttp.post('/yt/configuration/node/event', data)
+    }
+
+    /**
+     * @description 编辑动画效果
+     * @param {*} data 
+     * @returns 
+     */
+    static updateNodeAct(data) {
+        return defHttp.post('/yt/configuration/node/act', data)
+    }
+
+    /**
+     * @description 更新节点绑定信息
+     * @param {*} data 
+     * @returns 
+     */
+    static updateNodeInfo(data) {
+        return defHttp.post('/yt/configuration/node', data)
+    }
+}