queryDataDevelopNodeList 更改 spark参数,精准匹配改为 模糊匹配

SunPengWan · SunPengWan · commit 97d1d114435b · 2025-06-12T11:52:02.000+08:00
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -1850,23 +1850,23 @@ public List<DataDevelopNodeInfo> dataDevelopNodeResultFilter(DataDevelopNodeRequ
 
             // 新增 Spark 相关属性筛选
             if (!StringUtils.isBlank(request.getSparkDriverMemory()) && flag) {
-                flag = request.getSparkDriverMemory().equals(dataDevelopNodeInfo.getSparkDriverMemory());
+                flag = request.getSparkDriverMemory().contains(dataDevelopNodeInfo.getSparkDriverMemory());
             }
 
             if (!StringUtils.isBlank(request.getSparkExecutorMemory()) && flag) {
-                flag = request.getSparkExecutorMemory().equals(dataDevelopNodeInfo.getSparkExecutorMemory());
+                flag = request.getSparkExecutorMemory().contains(dataDevelopNodeInfo.getSparkExecutorMemory());
             }
 
             if (!StringUtils.isBlank(request.getSparkExecutorCore()) && flag) {
-                flag = request.getSparkExecutorCore().equals(dataDevelopNodeInfo.getSparkExecutorCore());
+                flag = request.getSparkExecutorCore().contains(dataDevelopNodeInfo.getSparkExecutorCore());
             }
 
             if (!StringUtils.isBlank(request.getSparkConf()) && flag) {
-                flag = request.getSparkConf().equals(dataDevelopNodeInfo.getSparkConf());
+                flag = request.getSparkConf().contains(dataDevelopNodeInfo.getSparkConf());
             }
 
             if (!StringUtils.isBlank(request.getSparkExecutorInstances()) && flag) {
-                flag = request.getSparkExecutorInstances().equals(dataDevelopNodeInfo.getSparkExecutorInstances());
+                flag = request.getSparkExecutorInstances().contains(dataDevelopNodeInfo.getSparkExecutorInstances());
             }
 
             // 新增 executeCluster 筛选

Original file line number	Diff line number	Diff line change
`@@ -1850,23 +1850,23 @@ public List<DataDevelopNodeInfo> dataDevelopNodeResultFilter(DataDevelopNodeRequ`
`1850`	`1850`
`1851`	`1851`	`// 新增 Spark 相关属性筛选`
`1852`	`1852`	`if (!StringUtils.isBlank(request.getSparkDriverMemory()) && flag) {`
`1853`		`- flag = request.getSparkDriverMemory().equals(dataDevelopNodeInfo.getSparkDriverMemory());`
	`1853`	`+ flag = request.getSparkDriverMemory().contains(dataDevelopNodeInfo.getSparkDriverMemory());`
`1854`	`1854`	`}`
`1855`	`1855`
`1856`	`1856`	`if (!StringUtils.isBlank(request.getSparkExecutorMemory()) && flag) {`
`1857`		`- flag = request.getSparkExecutorMemory().equals(dataDevelopNodeInfo.getSparkExecutorMemory());`
	`1857`	`+ flag = request.getSparkExecutorMemory().contains(dataDevelopNodeInfo.getSparkExecutorMemory());`
`1858`	`1858`	`}`
`1859`	`1859`
`1860`	`1860`	`if (!StringUtils.isBlank(request.getSparkExecutorCore()) && flag) {`
`1861`		`- flag = request.getSparkExecutorCore().equals(dataDevelopNodeInfo.getSparkExecutorCore());`
	`1861`	`+ flag = request.getSparkExecutorCore().contains(dataDevelopNodeInfo.getSparkExecutorCore());`
`1862`	`1862`	`}`
`1863`	`1863`
`1864`	`1864`	`if (!StringUtils.isBlank(request.getSparkConf()) && flag) {`
`1865`		`- flag = request.getSparkConf().equals(dataDevelopNodeInfo.getSparkConf());`
	`1865`	`+ flag = request.getSparkConf().contains(dataDevelopNodeInfo.getSparkConf());`
`1866`	`1866`	`}`
`1867`	`1867`
`1868`	`1868`	`if (!StringUtils.isBlank(request.getSparkExecutorInstances()) && flag) {`
`1869`		`- flag = request.getSparkExecutorInstances().equals(dataDevelopNodeInfo.getSparkExecutorInstances());`
	`1869`	`+ flag = request.getSparkExecutorInstances().contains(dataDevelopNodeInfo.getSparkExecutorInstances());`
`1870`	`1870`	`}`
`1871`	`1871`
`1872`	`1872`	`// 新增 executeCluster 筛选`