Merge branch 'small-tupu' of http://124.70.32.114:3100/jianzhenyu/Changsha_tupu into hanyuqing

ruoyi-api/src/main/java/com/ruoyi/api/controller/TestXiaoTuPuController.java

@@ -147,6 +147,23 @@ public class TestXiaoTuPuController extends BaseController {
     public void test7() throws IOException {
         pointService.buildPoint();
     }
+
+//    获取所有模型
+    @GetMapping("getKeyWorlds")
+    public List<Map> getKeyWorlds() throws IOException {
+        List<Map> a =  zhyPointMapper.selectPointByType1("keyword");
+        return a;
+    }
+
+
+    @GetMapping("getTitlebyReId/{id}")
+    public List<Map> getTitlebyReId(@PathVariable("id")Integer id) throws IOException {
+        List<Map> a =  zhyPointMapper.selectPointResByNeo4jId(id);
+        return a;
+    }
+
+
+
     public Map<String, Object> convertToGraphFormat(List<Map> rawNodes, List<Map> rawRelationships) {
         List<Map<String, Object>> nodes = new ArrayList<>();
         List<Map<String, Object>> links = new ArrayList<>();

ruoyi-api/src/main/java/com/ruoyi/api/mapper/ZhyPointMapper.java

@@ -8,7 +8,11 @@ import java.util.Map;
 @Mapper
 public interface ZhyPointMapper {
     List<Map> selectPointByName(@Param("name") String name);
+    List<Map> selectPointResByNeo4jId(@Param("neo4jId") Integer neo4jId);
+
+    List<Map> selectPointByType1(@Param("type1") String type1);
+
     List<Map> selectPointRelationshipByName(@Param("author") String author,@Param("keyword") String keyword,@Param("agency") String agency,@Param("title") String title);
-    int insertPoint(@Param("name") String name,@Param("uuid") Integer uuid);
+    int insertPoint(@Param("name") String name,@Param("uuid") Integer uuid,@Param("type1") String type1);
     int insertPointReship(@Param("author") String author,@Param("keyword") String keyword,@Param("agency") String agency,@Param("relationship_id") Integer relationship_id,@Param("title") String title,@Param("url") String url);
 }

ruoyi-api/src/main/java/com/ruoyi/api/service/impl/PointService.java

@@ -394,7 +394,7 @@ public class PointService {
             Map<String, Object> data = new HashMap<>();
             data.put("type", type);
             int neo4jId = createPoint(name, data);
-            zhyPointMapper.insertPoint(name, neo4jId);
+            zhyPointMapper.insertPoint(name, neo4jId,type);
             return neo4jId;
         } else {
             return Integer.valueOf(String.valueOf(existing.get(0).get("uuid")));

ruoyi-api/src/main/resources/mapper/api/ZhyPointMapper.xml

@@ -9,6 +9,14 @@
         select * from zhy_point where point_name=#{name}
     </select>
 
+    <select id="selectPointByType1" resultType="map">
+        select * from zhy_point where type1=#{type1}
+    </select>
+    <select id="selectPointResByNeo4jId" resultType="map">
+        select * from zhy_point_relationship where relationship_id=#{neo4jId}
+    </select>
+
+
     <select id="selectPointRelationshipByName" resultType="map">
         SELECT *
         FROM zhy_point_relationship
@@ -29,7 +37,7 @@
     </select>
 
     <insert id="insertPoint">
-        insert into zhy_point (point_name,uuid) values (#{name},#{uuid})
+        insert into zhy_point (point_name,uuid,type1) values (#{name},#{uuid},#{type1})
     </insert>
 
     <insert id="insertPointReship">