|
@@ -2139,7 +2139,7 @@ public class Neo4jAPI {
|
|
|
Map<String, Object> scale = new LinkedHashMap<>();
|
|
|
|
|
|
try {
|
|
|
- String query = "match (m:Scale) WHERE m.name=~'.*" + scaleName + ".*' return m.type";
|
|
|
+ String query = "match (m:Scale) WHERE m.name='" + scaleName + "' return m.type";
|
|
|
Rset = session.run(query);
|
|
|
String type = Rset.next().get("m.type").toString().replace("\"", "");
|
|
|
if (Integer.valueOf(type) == 1) {
|
|
@@ -2345,13 +2345,13 @@ public class Neo4jAPI {
|
|
|
|
|
|
try {
|
|
|
String query = "match (m:Scale)-[r1]->(n1)-[r2]->(n2)-[r3]->(n3)-[r4]->(n4) " +
|
|
|
- "WHERE m.name=~'.*" + scaleName + ".*' " +
|
|
|
+ "WHERE m.name='" + scaleName + "'" +
|
|
|
"return m.name,m.calc,m.type,m.titleName,n1.name,n1.isShow,r2.mutex as r2mutex,n2.name," +
|
|
|
"n2.required as n2required,n3.name as n3name,n3.coefficient as n3coefficient," +
|
|
|
"n3.constant as n3constant,n3.controlType as n3controlType,n3.indexId as n3indexId, r4.score as r4score," +
|
|
|
"n4.name as n4name order by toInt(r1.p),toInt(r2.p),toInt(r3.p) desc,toInt(r4.p) " +
|
|
|
"union " +
|
|
|
- "match (m:Scale)-[r1]->(n1:Method)-[r2]->(n2) WHERE m.name=~'.*" + scaleName + ".*' " +
|
|
|
+ "match (m:Scale)-[r1]->(n1:Method)-[r2]->(n2) WHERE m.name='" + scaleName + "' " +
|
|
|
"return m.name,m.calc,m.type,m.titleName,n1.name,n1.isShow,r2.score as r2mutex,n2.name,null as n2required," +
|
|
|
"null as n3name,null as n3coefficient,null as n3constant,null as n3controlType,null as n3indexId,null as r4score, " +
|
|
|
"null as n4name order by toInt(r2.p)";
|
|
@@ -2620,7 +2620,7 @@ public class Neo4jAPI {
|
|
|
JSONArray rows = new JSONArray();
|
|
|
JSONObject row = new JSONObject();
|
|
|
try {
|
|
|
- String query = "match (m:Scale)-[r1]->(n1)-[r2]->(n2)-[r3]->(n3) WHERE m.name=~'.*" + scaleName + ".*' " +
|
|
|
+ String query = "match (m:Scale)-[r1]->(n1)-[r2]->(n2)-[r3]->(n3) WHERE m.name='" + scaleName + "' " +
|
|
|
"return m.name,m.calc,m.type,n1.name,n1.indexId,n1.required,n1.controlType,n2.name,n3.name " +
|
|
|
"order by toInt(r1.p),toInt(r2.p),toInt(r3.p)";
|
|
|
|