Browse Source

更新图谱节点基类信息

MarkHuang 4 năm trước cách đây
mục cha
commit
d502810fb7

+ 4 - 4
src/main/java/com/diagbot/repository/YiBaoDiseaseNode.java

@@ -30,19 +30,19 @@ public class YiBaoDiseaseNode {
 			pushBaseDTO = new PushBaseDTO();
 			pushBaseDTO.setName(disease.getName());
 			pushDTO.setDisease(pushBaseDTO);
-			pushDTO.setSymptoms(disease.getSymptoms().stream().collect(Collectors.toMap(Symptom::getName,Symptom::getNodeId,(e1, e2) -> e2))
+			pushDTO.setSymptoms(disease.getSymptoms().stream().collect(Collectors.toMap(Symptom::getName,Symptom::getId,(e1, e2) -> e2))
 					.entrySet().stream().sorted(Collections.reverseOrder(Map.Entry.comparingByValue()))
 					.map(x ->NeoUtil.updatePushInfo(x.getKey())).collect(Collectors.toList()));
 
-			pushDTO.setVitals(disease.getVitals().stream().collect(Collectors.toMap(Vital::getName,Vital::getNodeId,(e1, e2) -> e2))
+			pushDTO.setVitals(disease.getVitals().stream().collect(Collectors.toMap(Vital::getName,Vital::getId,(e1, e2) -> e2))
 					.entrySet().stream().sorted(Collections.reverseOrder(Map.Entry.comparingByValue()))
 					.map(x ->NeoUtil.updatePushInfo(x.getKey())).collect(Collectors.toList()));
 
-			pushDTO.setLis(disease.getLisnames().stream().collect(Collectors.toMap(LisBigName::getName,LisBigName::getNodeId,(e1, e2) -> e2))
+			pushDTO.setLis(disease.getLisnames().stream().collect(Collectors.toMap(LisBigName::getName,LisBigName::getId,(e1, e2) -> e2))
 					.entrySet().stream().sorted(Collections.reverseOrder(Map.Entry.comparingByValue()))
 					.map(x ->NeoUtil.updatePushInfo(x.getKey())).collect(Collectors.toList()));
 
-			pushDTO.setPacs(disease.getPacsnames().stream().collect(Collectors.toMap(PacsName::getName,PacsName::getNodeId,(e1, e2) -> e2))
+			pushDTO.setPacs(disease.getPacsnames().stream().collect(Collectors.toMap(PacsName::getName,PacsName::getId,(e1, e2) -> e2))
 					.entrySet().stream().sorted(Collections.reverseOrder(Map.Entry.comparingByValue()))
 					.map(x ->NeoUtil.updatePushInfo(x.getKey())).collect(Collectors.toList()));
 

+ 15 - 5
src/main/java/com/diagbot/web/EntityController.java

@@ -1,11 +1,14 @@
 package com.diagbot.web;
 
 import com.diagbot.dto.NeoEntityDTO;
+import com.diagbot.entity.node.base.BaseNode;
 import com.diagbot.facade.EntityFacade;
+import com.diagbot.vo.KgQueryVO;
 import com.diagbot.vo.NeoEntityVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import org.mapstruct.Mapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -26,11 +29,6 @@ public class EntityController {
     @Autowired
     private EntityFacade entityFacade;
 
-    @ApiOperation(value = "实体API", notes = "")
-    @PostMapping("/initEntity")
-    public void initEntity() {
-        entityFacade.initEntity();
-    }
 
     @ApiOperation(value = "实体标签API", notes = "")
     @GetMapping("/getLabels")
@@ -39,6 +37,12 @@ public class EntityController {
     }
 
 
+    @ApiOperation(value = "实体查询API", notes = "")
+    @PostMapping("/getNode")
+    public List<BaseNode> getNodes(@RequestBody KgQueryVO kgQueryVO) {
+        return entityFacade.getNodes(kgQueryVO);
+    }
+
     @ApiOperation(value = "实体更新API", notes = "")
     @PostMapping("/updateNode")
     public NeoEntityDTO updateNode(@RequestBody NeoEntityVO neoEntityVO) {
@@ -46,5 +50,11 @@ public class EntityController {
         return entityFacade.updateNeoNode(neoEntityVO);
     }
 
+    @ApiOperation(value = "实体删除API", notes = "")
+    @PostMapping("/deleteNode")
+    public int deleteNode(@RequestBody NeoEntityVO neoEntityVO) {
+        return entityFacade.deleteNeoNode(neoEntityVO);
+    }
+
 }