fix

kgraph-graph/src/main/java/com/kgraph/graph/neo4j/DTO/EntityDTO.java

@@ -0,0 +1,10 @@
+package com.kgraph.graph.neo4j.DTO;
+
+import com.kgraph.graph.neo4j.domain.Neo4jEntity;
+import lombok.Data;
+
+@Data
+public class EntityDTO extends Neo4jEntity {
+    private int pageNum;
+    private int pageSize;
+}

kgraph-graph/src/main/java/com/kgraph/graph/neo4j/DTO/RelationDTO.java

@@ -0,0 +1,10 @@
+package com.kgraph.graph.neo4j.DTO;
+
+import com.kgraph.graph.neo4j.domain.Neo4jRelation;
+import lombok.Data;
+
+@Data
+public class RelationDTO extends Neo4jRelation {
+    private int pageNum;
+    private int pageSize;
+}

kgraph-graph/src/main/java/com/kgraph/graph/neo4j/controller/Neo4jEntityController.java

@@ -2,6 +2,7 @@ package com.kgraph.graph.neo4j.controller;
 
 import com.kgraph.common.core.controller.BaseController;
 import com.kgraph.common.core.domain.AjaxResult;
+import com.kgraph.graph.neo4j.DTO.EntityDTO;
 import com.kgraph.graph.neo4j.domain.Neo4jEntity;
 import com.kgraph.graph.neo4j.seavice.INeo4jEntityService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,9 +17,9 @@ public class Neo4jEntityController extends BaseController {
     @Autowired
     INeo4jEntityService service;
 
-    @GetMapping("/list")
-    public Page<Neo4jEntity> findAll(Pageable page) {
-        return service.findAll(page);
+    @GetMapping("/findAll")
+    public Iterable<Neo4jEntity> findAll() {
+        return service.findAll();
     }
 
     @GetMapping("/{id}")
@@ -26,15 +27,26 @@ public class Neo4jEntityController extends BaseController {
         return success(service.findById(id));
     }
 
-    @PostMapping("/save")
+    @PostMapping()
     public AjaxResult save(@RequestBody Neo4jEntity entity) {
         service.save(entity);
         return success();
     }
+    @PutMapping()
+    public AjaxResult update(@RequestBody Neo4jEntity entity) {
+        service.save(entity);
+        return success();
+    }
 
     @DeleteMapping("/{id}")
     public AjaxResult delete(@PathVariable("id") Long id){
         service.delete(id);
         return success();
     }
+
+    @GetMapping("/list")
+    public Page<Neo4jEntity> getPageList(EntityDTO dto){
+        Page<Neo4jEntity> pageList = service.getPageList(dto);
+        return pageList;
+    }
 }

kgraph-graph/src/main/java/com/kgraph/graph/neo4j/controller/Neo4jRelationController.java

@@ -2,11 +2,11 @@ package com.kgraph.graph.neo4j.controller;
 
 import com.kgraph.common.core.controller.BaseController;
 import com.kgraph.common.core.domain.AjaxResult;
+import com.kgraph.graph.neo4j.DTO.RelationDTO;
 import com.kgraph.graph.neo4j.domain.Neo4jRelation;
 import com.kgraph.graph.neo4j.seavice.INeo4jRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -15,9 +15,9 @@ public class Neo4jRelationController extends BaseController {
     @Autowired
     INeo4jRelationService service;
 
-    @GetMapping("/list")
-    public Page<Neo4jRelation> findAll(Pageable page) {
-        return service.findAll(page);
+    @GetMapping("/findAll")
+    public Iterable<Neo4jRelation> findAll() {
+        return service.findAll();
     }
 
     @GetMapping("/{id}")
@@ -25,15 +25,27 @@ public class Neo4jRelationController extends BaseController {
         return service.findById(id);
     }
 
-    @PostMapping("/save")
+    @PostMapping()
     public AjaxResult save(@RequestBody Neo4jRelation entity) {
         service.save(entity);
         return success();
     }
 
+    @PutMapping()
+    public AjaxResult update(@RequestBody Neo4jRelation entity) {
+        service.save(entity);
+        return success();
+    }
+
     @DeleteMapping("/{id}")
     public AjaxResult delete(@PathVariable("id") Long id){
         service.delete(id);
         return success();
     }
+
+    @GetMapping("/list")
+    public Page<Neo4jRelation> getPageList(RelationDTO dto){
+        Page<Neo4jRelation> pageList = service.getPageList(dto);
+        return pageList;
+    }
 }

kgraph-graph/src/main/java/com/kgraph/graph/neo4j/mapper/EntityRepository.java

@@ -1,6 +1,9 @@
 package com.kgraph.graph.neo4j.mapper;
 
+import com.kgraph.graph.neo4j.DTO.EntityDTO;
 import com.kgraph.graph.neo4j.domain.Neo4jEntity;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.neo4j.annotation.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.repository.query.Param;
@@ -20,4 +23,14 @@ public interface EntityRepository extends Neo4jRepository<Neo4jEntity, Long> {
      * @return 实体
      */
     Neo4jEntity findByName(String name);
+
+    /**
+     *
+     * @return
+     */
+    @Query(value = "match (e:Entity) return e", countQuery = "match (e:Entity) return count(e)")
+    Page<Neo4jEntity> getPageList(PageRequest page);
+
+    @Query(value = "match (e:Entity{name: $0.name}) return e", countQuery = "match (e:Entity{name: $0.name}) return count(e)")
+    Page<Neo4jEntity> getPageListByName(EntityDTO dto, PageRequest page);
 }

kgraph-graph/src/main/java/com/kgraph/graph/neo4j/mapper/RelationRepository.java

@@ -1,6 +1,9 @@
 package com.kgraph.graph.neo4j.mapper;
 
+import com.kgraph.graph.neo4j.DTO.RelationDTO;
 import com.kgraph.graph.neo4j.domain.Neo4jRelation;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.neo4j.annotation.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.repository.query.Param;
@@ -27,4 +30,10 @@ public interface RelationRepository extends Neo4jRepository<Neo4jRelation, Long>
 
     @Query("MATCH data=(es:Entity)-[r]->(ee:Entity) WHERE id(es)= $startId AND id(ee)= $endId AND r.name = $name RETURN data")
     Neo4jRelation findRelation(@Param("startId") Long startId, @Param("endId") Long endId, @Param("name") String name);
+
+    @Query(value = "match data=(e1:Entity)-[r:Relation]->(e2:Entity) return data", countQuery = "match data=(e1:Entity)-[r:Relation]->(e2:Entity) return count(data)")
+    Page<Neo4jRelation> getPageList(PageRequest page);
+
+    @Query(value = "match data=(e1:Entity)-[r:Relation{name:$0.name}]->(e2:Entity) return data", countQuery = "match data=(e1:Entity)-[r:Relation{name:$0.name}]->(e2:Entity) return count(data)")
+    Page<Neo4jRelation> getPageListByName(RelationDTO dto, PageRequest page);
 }

kgraph-graph/src/main/java/com/kgraph/graph/neo4j/seavice/INeo4jEntityService.java

@@ -1,12 +1,14 @@
 package com.kgraph.graph.neo4j.seavice;
 
+import com.kgraph.graph.neo4j.DTO.EntityDTO;
 import com.kgraph.graph.neo4j.domain.Neo4jEntity;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
 public interface INeo4jEntityService {
-    Page<Neo4jEntity> findAll(Pageable var1);
+    Iterable<Neo4jEntity> findAll();
     Neo4jEntity findById(Long id);
     Neo4jEntity save(Neo4jEntity entity);
     void delete(Long id);
+    Page<Neo4jEntity> getPageList(EntityDTO dto);
 }

kgraph-graph/src/main/java/com/kgraph/graph/neo4j/seavice/INeo4jRelationService.java

@@ -1,12 +1,15 @@
 package com.kgraph.graph.neo4j.seavice;
 
+import com.kgraph.graph.neo4j.DTO.RelationDTO;
+import com.kgraph.graph.neo4j.domain.Neo4jEntity;
 import com.kgraph.graph.neo4j.domain.Neo4jRelation;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
 public interface INeo4jRelationService {
-    Page<Neo4jRelation> findAll(Pageable var1);
+    Iterable<Neo4jRelation> findAll();
     Neo4jRelation findById(Long id);
     Neo4jRelation save(Neo4jRelation entity);
     void delete(Long id);
+    Page<Neo4jRelation> getPageList(RelationDTO dto);
 }

kgraph-graph/src/main/java/com/kgraph/graph/neo4j/seavice/impl/Neo4JNeo4jEntityServiceImpl.java

@@ -1,10 +1,13 @@
 package com.kgraph.graph.neo4j.seavice.impl;
 
+import com.kgraph.common.utils.StringUtils;
+import com.kgraph.graph.neo4j.DTO.EntityDTO;
 import com.kgraph.graph.neo4j.domain.Neo4jEntity;
 import com.kgraph.graph.neo4j.mapper.EntityRepository;
 import com.kgraph.graph.neo4j.seavice.INeo4jEntityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
@@ -15,8 +18,8 @@ public class Neo4JNeo4jEntityServiceImpl implements INeo4jEntityService {
     EntityRepository repository;
 
     @Override
-    public Page<Neo4jEntity> findAll(Pageable page) {
-        return repository.findAll(page);
+    public Iterable<Neo4jEntity> findAll() {
+        return repository.findAll();
     }
 
     @Override
@@ -33,4 +36,13 @@ public class Neo4JNeo4jEntityServiceImpl implements INeo4jEntityService {
     public void delete(Long id){
         repository.deleteById(id);
     }
+
+    @Override
+    public Page<Neo4jEntity> getPageList(EntityDTO dto) {
+        if (StringUtils.isNotEmpty(dto.getName())) {
+            return repository.getPageListByName(dto, PageRequest.of(dto.getPageNum() - 1, dto.getPageSize()));
+        } else {
+            return repository.getPageList(PageRequest.of(dto.getPageNum() - 1, dto.getPageSize()));
+        }
+    }
 }

kgraph-graph/src/main/java/com/kgraph/graph/neo4j/seavice/impl/Neo4JNeo4jRelationServiceImpl.java

@@ -1,10 +1,14 @@
 package com.kgraph.graph.neo4j.seavice.impl;
 
+import com.kgraph.common.utils.StringUtils;
+import com.kgraph.graph.neo4j.DTO.RelationDTO;
+import com.kgraph.graph.neo4j.domain.Neo4jEntity;
 import com.kgraph.graph.neo4j.domain.Neo4jRelation;
 import com.kgraph.graph.neo4j.mapper.RelationRepository;
 import com.kgraph.graph.neo4j.seavice.INeo4jRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
@@ -15,8 +19,8 @@ public class Neo4JNeo4jRelationServiceImpl implements INeo4jRelationService {
     RelationRepository repository;
 
     @Override
-    public Page<Neo4jRelation> findAll(Pageable page) {
-        return repository.findAll(page);
+    public Iterable<Neo4jRelation> findAll() {
+        return repository.findAll();
     }
 
     @Override
@@ -33,4 +37,13 @@ public class Neo4JNeo4jRelationServiceImpl implements INeo4jRelationService {
     public void delete(Long id){
         repository.deleteById(id);
     }
+
+    @Override
+    public Page<Neo4jRelation> getPageList(RelationDTO dto) {
+        if (StringUtils.isNotEmpty(dto.getName())) {
+            return repository.getPageListByName(dto, PageRequest.of(dto.getPageNum() - 1, dto.getPageSize()));
+        } else {
+            return repository.getPageList(PageRequest.of(dto.getPageNum() - 1, dto.getPageSize()));
+        }
+    }
 }

sql/updatesql20230503.sql

@@ -0,0 +1,7 @@
+use kgraph;
+
+DELETE from sys_user_post;
+DELETE from sys_dept;
+update `sys_user` set dept_id = null;
+
+commit;