From 39150345df15b76699639dab899e7b8893c221df Mon Sep 17 00:00:00 2001 From: yaxin Date: Thu, 26 Dec 2024 13:22:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=A6=81=E6=B1=82=E2=80=9C=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E2=80=9D=EF=BC=8C=E5=88=99=E5=88=A4=E6=96=ADcount=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=A4=A7=E4=BA=8Evalue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../police/service/impl/ModelServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java index 09738dc..4e25d85 100644 --- a/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java @@ -323,7 +323,7 @@ public class ModelServiceImpl implements ModelService { * @return 是否存在 */ private boolean graphIndexAnalysis(String casePersonName, String queryLang, String caseId, RuleCondition ruleCondition, ModelAtomicResult atomicResult) { - boolean flag = false; + boolean exist = false; Session session = driver.session(); //图谱 Map params = new HashMap<>(); @@ -336,7 +336,7 @@ public class ModelServiceImpl implements ModelService { run = session.run(queryLang, params); } catch (Exception e) { log.error("图数据库查询出现错误,查询语句{},参数{}", queryLang, JSONUtil.toJsonStr(params), e); - return flag; + return exist; } List res = Neo4jUtils.getResultDTOList(run); int count = 0; @@ -357,12 +357,12 @@ public class ModelServiceImpl implements ModelService { } } } - //如果关系判断要求“不存在”，则判断count是否为0，如果关系判断要求“存在”，则判断count是否大于value - if ((ruleCondition.getRelationalSymbol().equals("4") && count == 0) || (StringUtils.isNotEmpty(ruleCondition.getOperator()) && StringUtils.isNotEmpty(ruleCondition.getValue()) && CalculationUtil.evaluateExpression(String.valueOf(count), ruleCondition.getOperator(), ruleCondition.getValue()))) { - flag = true; + //如果关系判断要求“存在”，则判断count是否大于value + if (ruleCondition.getRelationalSymbol().equals("3") && StringUtils.isNotEmpty(ruleCondition.getOperator()) && StringUtils.isNotEmpty(ruleCondition.getValue()) && CalculationUtil.evaluateExpression(String.valueOf(count), ruleCondition.getOperator(), ruleCondition.getValue())) { + exist = true; } modelAtomicResultService.saveOrUpdate(atomicResult); - return flag; + return exist; } /** From 7349399d28657a31885a26c442162427d819d268 Mon Sep 17 00:00:00 2001 From: yaxin Date: Fri, 27 Dec 2024 09:52:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=A6=81=E6=B1=82=E2=80=9C=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E2=80=9D=EF=BC=8C=E5=88=99=E5=88=A4=E6=96=AD=E6=9D=A1?= =?UTF-8?q?=E6=95=B0=E9=9C=80=E8=A6=81=E5=A4=A7=E4=BA=8E0=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=85=B3=E7=B3=BB=E5=88=A4=E6=96=AD=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E2=80=9C=E5=AD=98=E5=9C=A8=E2=80=9D=EF=BC=8C=E5=88=99?= =?UTF-8?q?=E5=88=A4=E6=96=ADcount=E6=98=AF=E5=90=A6=E5=A4=A7=E4=BA=8Evalu?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../police/service/impl/ModelServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java index 4e25d85..97a7228 100644 --- a/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java @@ -323,7 +323,7 @@ public class ModelServiceImpl implements ModelService { * @return 是否存在 */ private boolean graphIndexAnalysis(String casePersonName, String queryLang, String caseId, RuleCondition ruleCondition, ModelAtomicResult atomicResult) { - boolean exist = false; + boolean flag = false; Session session = driver.session(); //图谱 Map params = new HashMap<>(); @@ -336,7 +336,7 @@ public class ModelServiceImpl implements ModelService { run = session.run(queryLang, params); } catch (Exception e) { log.error("图数据库查询出现错误,查询语句{},参数{}", queryLang, JSONUtil.toJsonStr(params), e); - return exist; + return flag; } List res = Neo4jUtils.getResultDTOList(run); int count = 0; @@ -357,12 +357,12 @@ public class ModelServiceImpl implements ModelService { } } } - //如果关系判断要求“存在”，则判断count是否大于value - if (ruleCondition.getRelationalSymbol().equals("3") && StringUtils.isNotEmpty(ruleCondition.getOperator()) && StringUtils.isNotEmpty(ruleCondition.getValue()) && CalculationUtil.evaluateExpression(String.valueOf(count), ruleCondition.getOperator(), ruleCondition.getValue())) { - exist = true; + //如果关系判断要求“不存在”，则判断条数需要大于0，如果关系判断要求“存在”，则判断count是否大于value + if ((ruleCondition.getRelationalSymbol().equals("4") && count > 0) || ruleCondition.getRelationalSymbol().equals("3") && StringUtils.isNotEmpty(ruleCondition.getOperator()) && StringUtils.isNotEmpty(ruleCondition.getValue()) && CalculationUtil.evaluateExpression(String.valueOf(count), ruleCondition.getOperator(), ruleCondition.getValue())) { + flag = true; } modelAtomicResultService.saveOrUpdate(atomicResult); - return exist; + return flag; } /**