diff --git a/src/main/java/com/supervision/common/domain/R.java b/src/main/java/com/supervision/common/domain/R.java index 832b4de..20f4a87 100644 --- a/src/main/java/com/supervision/common/domain/R.java +++ b/src/main/java/com/supervision/common/domain/R.java @@ -21,10 +21,14 @@ public class R implements Serializable { public static final String TOTAL_COUNT = "total"; public static final String RESULT_LIST = "result"; - /** 成功 */ + /** + * 成功 + */ public static final int SUCCESS = Constants.SUCCESS; - /** 失败 */ + /** + * 失败 + */ public static final int FAIL = Constants.FAIL; private int code; @@ -37,6 +41,14 @@ public class R implements Serializable { return restResult(null, SUCCESS, null); } + public static R judgeResult(Boolean bo, String successMessage, String failMessage) { + if (bo) { + return restResult(null, SUCCESS, successMessage); + } else { + return restResult(null, FAIL, failMessage); + } + } + public static R okMsg(String msg) { return restResult(null, SUCCESS, msg); } @@ -73,7 +85,9 @@ public class R implements Serializable { return restResult(resultStatusEnum); } - public static R fail(ResultStatusEnum resultStatusEnum, T data) {return restResult(resultStatusEnum,data);} + public static R fail(ResultStatusEnum resultStatusEnum, T data) { + return restResult(resultStatusEnum, data); + } private static R restResult(ResultStatusEnum resultStatusEnum, T data) { R apiResult = new R<>(); @@ -100,7 +114,6 @@ public class R implements Serializable { } - public static Map buildDataMap(List list) { Map dataMap = new HashMap<>(); if (list == null) { diff --git a/src/main/java/com/supervision/neo4j/controller/Neo4jController.java b/src/main/java/com/supervision/neo4j/controller/Neo4jController.java index 1554864..f592460 100644 --- a/src/main/java/com/supervision/neo4j/controller/Neo4jController.java +++ b/src/main/java/com/supervision/neo4j/controller/Neo4jController.java @@ -65,7 +65,8 @@ public class Neo4jController { @PostMapping("/saveRelation") public R saveRelation(@RequestBody Rel rel) { - return neo4jService.saveRelation(rel); + Boolean result = neo4jService.saveRelation(rel); + return R.judgeResult(result, null, "保存失败"); } /*************************************************************************************/ diff --git a/src/main/java/com/supervision/neo4j/service/Neo4jService.java b/src/main/java/com/supervision/neo4j/service/Neo4jService.java index 7306722..9a5f6f9 100644 --- a/src/main/java/com/supervision/neo4j/service/Neo4jService.java +++ b/src/main/java/com/supervision/neo4j/service/Neo4jService.java @@ -23,7 +23,7 @@ public interface Neo4jService { Rel findRelation(Rel rel); - R saveRelation(Rel rel); + Boolean saveRelation(Rel rel); R getNode(String picType, String caseId); diff --git a/src/main/java/com/supervision/neo4j/service/impl/Neo4jServiceImpl.java b/src/main/java/com/supervision/neo4j/service/impl/Neo4jServiceImpl.java index 68da9d5..0961562 100644 --- a/src/main/java/com/supervision/neo4j/service/impl/Neo4jServiceImpl.java +++ b/src/main/java/com/supervision/neo4j/service/impl/Neo4jServiceImpl.java @@ -198,7 +198,7 @@ public class Neo4jServiceImpl implements Neo4jService { } @Override - public R saveRelation(Rel rel) { + public Boolean saveRelation(Rel rel) { Rel res = null; try { Session session = driver.session(); @@ -214,11 +214,7 @@ public class Neo4jServiceImpl implements Neo4jService { } catch (Exception e) { e.printStackTrace(); } - if (rel != null) { - return R.ok(rel); - } else { - return R.fail("保存失败"); - } + return rel != null; } @Override diff --git a/src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java index 7572dc7..84a70ee 100644 --- a/src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java @@ -1,5 +1,6 @@ package com.supervision.police.service.impl; +import cn.hutool.core.util.StrUtil; import com.alibaba.druid.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -121,7 +122,7 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl extractThreeInfo(String caseId, String name, String recordId) { + private List extractTripleInfo(String caseId, String name, String recordId) { List records = noteRecordMapper.selectRecord(caseId, name, recordId); List tripleInfos = new ArrayList<>(); for (NoteRecord record : records) { @@ -150,9 +151,8 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl getThreeInfo(String caseId, String name, String recordId) { // TODO 这里应该改成异步的形式,通过异步的形式来进行提取三元组信息,不能每次点击就跑一遍 - return extractThreeInfo(caseId, name, recordId); + return extractTripleInfo(caseId, name, recordId); } @Override @@ -181,6 +181,7 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl r = neo4jService.saveRelation(rel); + neo4jService.saveRelation(rel); } tripleInfo.setAddNeo4j("1"); int j = tripleInfoMapper.updateById(tripleInfo); if (j > 0) { i++; } + // TODO 重复添加的OK了,删除的呢? } catch (Exception e) { log.error(e.getMessage(), e); }