接口入参格式统一为json

src/main/java/com/qizhen/healsphere/service/EntityService.java

@@ -1,10 +1,7 @@
 package com.qizhen.healsphere.service;
 
 import com.qizhen.healsphere.repository.neo4j.entity.BaseEntity;
-import com.qizhen.healsphere.web.vo.CreateEntityVO;
-import com.qizhen.healsphere.web.vo.EntityVO;
-import com.qizhen.healsphere.web.vo.MergeEntityVO;
-import com.qizhen.healsphere.web.vo.UpdateEntityVO;
+import com.qizhen.healsphere.web.vo.*;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
@@ -14,13 +11,13 @@ public interface EntityService {
 
     List<Map<String, Object>> createEntity(List<CreateEntityVO> createEntityList);
 
-    Boolean deleteEntity(List<Long> ids);
+    Boolean deleteEntity(DeleteEntityVO ids);
 
     List<Map<String, Object>> updateEntityName(List<UpdateEntityVO> updateEntityList);
 
     List<Map<String, Object>> findEntityListByName(String label, String name);
 
-    Map<String, Object> findEntityById(Long id);
+    Map<String, Object> findEntityById(FindEntityVO id);
 
     BaseEntity findNodeByName(String label, String name);
 

src/main/java/com/qizhen/healsphere/service/RelationshipService.java

@@ -1,6 +1,7 @@
 package com.qizhen.healsphere.service;
 
 import com.qizhen.healsphere.web.vo.EntityVO;
+import com.qizhen.healsphere.web.vo.RelationshipNameVO;
 import com.qizhen.healsphere.web.vo.RelationshipVO;
 import com.qizhen.healsphere.web.vo.UpdateRelationTypeVO;
 
@@ -14,7 +15,7 @@ public interface RelationshipService {
 
     Boolean deleteRelationship(List<RelationshipVO> relationshipList);
 
-    List<String> findRelationshipType(String relationshipType);
+    List<String> findRelationshipType(RelationshipNameVO relationshipName);
 
     Boolean updateRelationshipType(List<UpdateRelationTypeVO> updateRelationshipTypeList);
 }

src/main/java/com/qizhen/healsphere/service/impl/EntityServiceImpl.java

@@ -5,10 +5,8 @@ import com.qizhen.healsphere.repository.neo4j.BaseNodeRepository;
 import com.qizhen.healsphere.repository.neo4j.param.MergeNodeParam;
 import com.qizhen.healsphere.repository.neo4j.entity.BaseEntity;
 import com.qizhen.healsphere.service.EntityService;
-import com.qizhen.healsphere.web.vo.CreateEntityVO;
-import com.qizhen.healsphere.web.vo.EntityVO;
-import com.qizhen.healsphere.web.vo.MergeEntityVO;
-import com.qizhen.healsphere.web.vo.UpdateEntityVO;
+import com.qizhen.healsphere.web.EntityController;
+import com.qizhen.healsphere.web.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -47,17 +45,18 @@ public class EntityServiceImpl implements EntityService {
     }
 
     @Override
-    public Boolean deleteEntity(List<Long> ids) {
+    public Boolean deleteEntity(DeleteEntityVO ids) {
 
+        List<Long> entityIds = ids.getIds();
         //查询是否存在删除实体
-        boolean allExist = ids.stream()
+        boolean allExist = entityIds.stream()
                 .allMatch(id -> nodeRepository.findNodeById(id) != null);
         if (!allExist) {
             return false;
         }
 
         // 删除单个实体
-        ids.forEach(id -> nodeRepository.deleteNode(id));
+        entityIds.forEach(id -> nodeRepository.deleteNode(id));
 
         return true;
     }
@@ -92,9 +91,9 @@ public class EntityServiceImpl implements EntityService {
     }
 
     @Override
-    public Map<String, Object>findEntityById(Long id) {
+    public Map<String, Object>findEntityById(FindEntityVO id) {
 
-        Map<String, Object> entityById = nodeRepository.findNodeById(id);
+        Map<String, Object> entityById = nodeRepository.findNodeById(id.getId());
         return entityById;
     }
 

src/main/java/com/qizhen/healsphere/service/impl/RelationshipServiceImpl.java

@@ -5,6 +5,7 @@ import com.qizhen.healsphere.repository.neo4j.BaseRelationshipRepository;
 import com.qizhen.healsphere.service.EntityService;
 import com.qizhen.healsphere.service.RelationshipService;
 import com.qizhen.healsphere.web.vo.EntityVO;
+import com.qizhen.healsphere.web.vo.RelationshipNameVO;
 import com.qizhen.healsphere.web.vo.RelationshipVO;
 import com.qizhen.healsphere.web.vo.UpdateRelationTypeVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,9 +65,9 @@ public class RelationshipServiceImpl implements RelationshipService {
     }
 
     @Override
-    public List<String> findRelationshipType(String relationshipType) {
+    public List<String> findRelationshipType(RelationshipNameVO relationshipName) {
 
-        return relationshipRepository.findRelationshipNames(relationshipType);
+        return relationshipRepository.findRelationshipNames(relationshipName.getRelationshipType());
     }
 
     @Override

src/main/java/com/qizhen/healsphere/web/EntityController.java

@@ -2,9 +2,7 @@ package com.qizhen.healsphere.web;
 
 import com.qizhen.healsphere.service.EntityService;
 import com.qizhen.healsphere.web.dto.RespDTO;
-import com.qizhen.healsphere.web.vo.CreateEntityVO;
-import com.qizhen.healsphere.web.vo.MergeEntityVO;
-import com.qizhen.healsphere.web.vo.UpdateEntityVO;
+import com.qizhen.healsphere.web.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +37,7 @@ public class EntityController {
             notes = "")
     @RequestMapping(value = "/deleteEntity",method = RequestMethod.POST)
     @ResponseBody
-    public RespDTO<Boolean> deleteEntity(@RequestBody List<Long> ids) {
+    public RespDTO<Boolean> deleteEntity(@RequestBody DeleteEntityVO ids) {
 
         Boolean flag = entityService.deleteEntity(ids);
         return RespDTO.onSuc(flag);
@@ -72,7 +70,7 @@ public class EntityController {
             notes = "")
     @RequestMapping(value = "/findEntity",method = RequestMethod.POST)
     @ResponseBody
-    public RespDTO<Map<String, Object>> findEntity(@RequestBody Long id) {
+    public RespDTO<Map<String, Object>> findEntity(@RequestBody FindEntityVO id) {
 
         Map<String, Object> entity = entityService.findEntityById(id);
         return RespDTO.onSuc(entity);

src/main/java/com/qizhen/healsphere/web/RelationshipController.java

@@ -2,6 +2,7 @@ package com.qizhen.healsphere.web;
 
 import com.qizhen.healsphere.service.RelationshipService;
 import com.qizhen.healsphere.web.dto.RespDTO;
+import com.qizhen.healsphere.web.vo.RelationshipNameVO;
 import com.qizhen.healsphere.web.vo.RelationshipVO;
 import com.qizhen.healsphere.web.vo.UpdateRelationTypeVO;
 import io.swagger.annotations.Api;
@@ -48,9 +49,9 @@ public class RelationshipController {
             notes = "")
     @RequestMapping(value = "/findRelationshipType",method = RequestMethod.POST)
     @ResponseBody
-    public RespDTO<List<String>> findRelationshipType(@RequestBody String relationshipType) {
+    public RespDTO<List<String>> findRelationshipType(@RequestBody RelationshipNameVO relationshipName) {
 
-        List<String> relationshipTypeList = relationshipService.findRelationshipType(relationshipType);
+        List<String> relationshipTypeList = relationshipService.findRelationshipType(relationshipName);
         return RespDTO.onSuc(relationshipTypeList);
     }
 

src/main/java/com/qizhen/healsphere/web/vo/DeleteEntityVO.java

@@ -0,0 +1,12 @@
+package com.qizhen.healsphere.web.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class DeleteEntityVO {
+    private List<Long> ids;
+}

src/main/java/com/qizhen/healsphere/web/vo/FindEntityVO.java

@@ -0,0 +1,12 @@
+package com.qizhen.healsphere.web.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class FindEntityVO {
+    private Long id;
+}

src/main/java/com/qizhen/healsphere/web/vo/RelationshipNameVO.java

@@ -0,0 +1,13 @@
+package com.qizhen.healsphere.web.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Map;
+
+@Getter
+@Setter
+public class RelationshipNameVO {
+    //关系名称
+    private String relationshipType;
+}