output

src/main/java/com/zglc/kg/controller/AlgorithmCallController.java

@@ -55,7 +55,7 @@ public class AlgorithmCallController {
             @ApiResponse(code = 0, message = "成功")
     })
     @GetMapping("get")
-    public  Result<AlgorithmCallEntity> get(@RequestParam Integer id){return  Result.success(algorithmCallService.getAlgorithmParam(id));}
+    public  Result<List<AlgorithmCallEntity>> get(@RequestParam Integer id){return  algorithmCallService.getAlgorithmCall(id);}
 
     @ApiOperation("按算法ID查找算法调用记录")
     @ApiResponses({

src/main/java/com/zglc/kg/controller/AlgorithmController.java

@@ -58,7 +58,7 @@ public class AlgorithmController {
             @ApiResponse(code = 0, message = "成功")
     })
     @GetMapping("get")
-    public  Result<AlgorithmEntity> get(@RequestParam Integer id){return  Result.success(algorithmService.getAlgorithm(id));}
+    public  Result<List<AlgorithmEntity>> get(@RequestParam Integer id){return  algorithmService.getAlgorithm(id);}
 
     @ApiOperation("按算法名称查询")
     @GetMapping("getByName")

src/main/java/com/zglc/kg/controller/DeviceController.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zglc.kg.base.Result;
 import com.zglc.kg.entity.AircraftSystemRelationEntity;
+import com.zglc.kg.entity.CommonRelationEntity;
 import com.zglc.kg.entity.DeleteEntity;
 import com.zglc.kg.entity.DeviceEntity;
 import io.swagger.annotations.Api;
@@ -148,4 +149,13 @@ public class DeviceController {
     public Result<Map<String, Object>> findAircraftKg(String name){
         return deviceService.findAircraftKg(name);
     }
+
+    @ApiOperation("按机型查看图谱1")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @GetMapping("findAircraftKg1")
+    public Result<List<CommonRelationEntity>> findAircraftKg1(String name){
+        return deviceService.findAircraftKg1(name);
+    }
 }

src/main/java/com/zglc/kg/entity/CommonRelationEntity.java

@@ -0,0 +1,30 @@
+package com.zglc.kg.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.EndNode;
+import org.neo4j.ogm.annotation.Property;
+import org.neo4j.ogm.annotation.RelationshipEntity;
+import org.neo4j.ogm.annotation.StartNode;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Getter
+@Setter
+@RelationshipEntity(type = "CommonRelation")
+public class CommonRelationEntity {
+    @Id
+    @GeneratedValue
+    private Long id;
+    @Property
+    private String relation;
+    @Property
+    private String startNode;
+    @Property
+    private Long startNodeId;
+    @Property
+    private String endNode;
+    @Property
+    private Long endNodeId;
+}

src/main/java/com/zglc/kg/service/AlgorithmCallService.java

@@ -7,10 +7,7 @@ import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class AlgorithmCallService {
@@ -135,8 +132,11 @@ public class AlgorithmCallService {
         return Result.success(list);
     }
 
-    public AlgorithmCallEntity getAlgorithmParam(Integer id) {
-        return algorithmCallDao.selectByPrimaryKey(id);
+    public Result<List<AlgorithmCallEntity>> getAlgorithmCall(Integer id) {
+        AlgorithmCallEntity alg = algorithmCallDao.selectByPrimaryKey(id);
+        List<AlgorithmCallEntity> lst = new ArrayList<>();
+        lst.add(alg);
+        return Result.success(lst);
     }
 
     public List<AlgorithmCallEntity> getByExperimentId(int id) {

src/main/java/com/zglc/kg/service/AlgorithmService.java

@@ -9,6 +9,7 @@ import com.zglc.kg.entity.Algorithm1Entity;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -109,8 +110,11 @@ public class AlgorithmService {
         return Result.success(list);
     }
 
-    public AlgorithmEntity getAlgorithm(Integer id) {
-        return algorithmDao.selectByPrimaryKey(id);
+    public Result<List<AlgorithmEntity>> getAlgorithm(Integer id) {
+        AlgorithmEntity alg = algorithmDao.selectByPrimaryKey(id);
+        List<AlgorithmEntity> lst = new ArrayList<>();
+        lst.add(alg);
+        return Result.success(lst);
     }
 
 }

src/main/java/com/zglc/kg/service/DeviceService.java

@@ -6,10 +6,7 @@ import com.zglc.kg.base.Result;
 import tk.mybatis.mapper.entity.Example;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class DeviceService {
@@ -230,10 +227,52 @@ public class DeviceService {
 
     public Result<Map<String, Object>> findAircraftKg(String name){
         Map<String, Object> map = new HashMap<>();
-//        if (type == null || "".equals(type) || "all".equals(type)){
         map.put("AircraftSystemRe", device1Dao.findAircraftSystemReByAircraft(name));
         map.put("SystemSubsystemRe", device1Dao.findSystemSubsystemReByAircraft(name));
         map.put("SubsystemDeviceRe", device1Dao.findSubsystemDeviceReByAircraft(name));
         return Result.success(map);
     }
+
+    public Result<List<CommonRelationEntity>> findAircraftKg1(String name){
+        List<CommonRelationEntity> lst = new ArrayList<>();
+        List<AircraftSystemRelationEntity> lst1 = device1Dao.findAircraftSystemReByAircraft(name);
+        for (AircraftSystemRelationEntity Relation1:lst1)
+        {
+            CommonRelationEntity CRelation = new CommonRelationEntity();
+            CRelation.setId(Relation1.getId());
+            CRelation.setRelation(Relation1.getRelation());
+            CRelation.setStartNode(Relation1.getStartNode().getName());
+            CRelation.setStartNodeId(Relation1.getStartNode().getId());
+            CRelation.setEndNode(Relation1.getEndNode().getName());
+            CRelation.setEndNodeId(Relation1.getEndNode().getId());
+            lst.add(CRelation);
+        }
+        List<SystemSubsystemRelationEntity> lst2 = device1Dao.findSystemSubsystemReByAircraft(name);
+        for (SystemSubsystemRelationEntity Relation2:lst2)
+        {
+            CommonRelationEntity CRelation = new CommonRelationEntity();
+            CRelation.setId(Relation2.getId());
+            CRelation.setRelation(Relation2.getRelation());
+            CRelation.setStartNode(Relation2.getStartNode().getName());
+            CRelation.setStartNodeId(Relation2.getStartNode().getId());
+            CRelation.setEndNode(Relation2.getEndNode().getName());
+            CRelation.setEndNodeId(Relation2.getEndNode().getId());
+            lst.add(CRelation);
+        }
+        List<SubsystemDeviceRelationEntity> lst3 = device1Dao.findSubsystemDeviceReByAircraft(name);
+        for (SubsystemDeviceRelationEntity Relation3:lst3)
+        {
+            CommonRelationEntity CRelation = new CommonRelationEntity();
+            CRelation.setId(Relation3.getId());
+            CRelation.setRelation(Relation3.getRelation());
+            CRelation.setStartNode(Relation3.getStartNode().getName());
+            CRelation.setStartNodeId(Relation3.getStartNode().getId());
+            CRelation.setEndNode(Relation3.getEndNode().getName());
+            CRelation.setEndNodeId(Relation3.getEndNode().getId());
+            lst.add(CRelation);
+        }
+        return Result.success(lst);
+    }
+
+
 }

src/main/resources/mapping/AlgorithmDao.xml

@@ -7,26 +7,32 @@
     <resultMap type="com.zglc.kg.entity.AlgorithmEntity" id="algorithmMap">
         <result property="id" column="id"/>
         <result property="algorithm_type" column="algorithm_type"/>
-        <result property="algorithm_title" column="algorithm_title"/>
-        <result property="algorithm_method_name" column="algorithm_method_name"/>
+        <result property="algorithm_name" column="algorithm_name"/>
         <result property="algorithm_format" column="algorithm_format"/>
-        <result property="algorithm_des" column="algorithm_des"/>
+        <result property="device_name" column="device_name"/>
         <result property="create_time" column="create_time"/>
-        <result property="create_user" column="create_user"/>
-        <result property="is_enable" column="is_enable"/>
-        <result property="parent_id" column="parent_id"/>
-        <result property="is_fusion_method" column="is_fusion_method"/>
-        <result property="assess_method" column="assess_method"/>
-        <result property="assess_model" column="assess_model"/>
-        <result property="environment_load" column="environment_load"/>
-        <result property="show_type" column="show_type"/>
-        <result property="r_type" column="r_type"/>
-        <result property="m_type" column="m_type"/>
-        <result property="data_file_path" column="data_file_path"/>
-        <result property="is_zh" column="is_zh"/>
-        <result property="apply_type" column="apply_type"/>
-        <result property="is_open" column="is_open"/>
-        <result property="is_algorithm_model" column="is_algorithm_model"/>
+        <result property="algorithm_path" column="algorithm_path"/>
+        <result property="remarks" column="remarks"/>
+<!--        <result property="algorithm_title" column="algorithm_title"/>-->
+<!--        <result property="algorithm_method_name" column="algorithm_method_name"/>-->
+<!--        <result property="algorithm_format" column="algorithm_format"/>-->
+<!--        <result property="algorithm_des" column="algorithm_des"/>-->
+<!--        <result property="create_time" column="create_time"/>-->
+<!--        <result property="create_user" column="create_user"/>-->
+<!--        <result property="is_enable" column="is_enable"/>-->
+<!--        <result property="parent_id" column="parent_id"/>-->
+<!--        <result property="is_fusion_method" column="is_fusion_method"/>-->
+<!--        <result property="assess_method" column="assess_method"/>-->
+<!--        <result property="assess_model" column="assess_model"/>-->
+<!--        <result property="environment_load" column="environment_load"/>-->
+<!--        <result property="show_type" column="show_type"/>-->
+<!--        <result property="r_type" column="r_type"/>-->
+<!--        <result property="m_type" column="m_type"/>-->
+<!--        <result property="data_file_path" column="data_file_path"/>-->
+<!--        <result property="is_zh" column="is_zh"/>-->
+<!--        <result property="apply_type" column="apply_type"/>-->
+<!--        <result property="is_open" column="is_open"/>-->
+<!--        <result property="is_algorithm_model" column="is_algorithm_model"/>-->
     </resultMap>
 
     <select id="listAll" resultMap="algorithmMap">
@@ -37,7 +43,7 @@
 
     <select id="findByName" parameterType="String" resultMap="algorithmMap">
         select  * from t_algorithm
-        where algorithm_title like #{name}
+        where algorithm_name like #{name}
     </select>
 
     <select id="getCount" resultType="java.lang.Integer">

target/classes/mapping/AlgorithmDao.xml

@@ -7,26 +7,32 @@
     <resultMap type="com.zglc.kg.entity.AlgorithmEntity" id="algorithmMap">
         <result property="id" column="id"/>
         <result property="algorithm_type" column="algorithm_type"/>
-        <result property="algorithm_title" column="algorithm_title"/>
-        <result property="algorithm_method_name" column="algorithm_method_name"/>
+        <result property="algorithm_name" column="algorithm_name"/>
         <result property="algorithm_format" column="algorithm_format"/>
-        <result property="algorithm_des" column="algorithm_des"/>
+        <result property="device_name" column="device_name"/>
         <result property="create_time" column="create_time"/>
-        <result property="create_user" column="create_user"/>
-        <result property="is_enable" column="is_enable"/>
-        <result property="parent_id" column="parent_id"/>
-        <result property="is_fusion_method" column="is_fusion_method"/>
-        <result property="assess_method" column="assess_method"/>
-        <result property="assess_model" column="assess_model"/>
-        <result property="environment_load" column="environment_load"/>
-        <result property="show_type" column="show_type"/>
-        <result property="r_type" column="r_type"/>
-        <result property="m_type" column="m_type"/>
-        <result property="data_file_path" column="data_file_path"/>
-        <result property="is_zh" column="is_zh"/>
-        <result property="apply_type" column="apply_type"/>
-        <result property="is_open" column="is_open"/>
-        <result property="is_algorithm_model" column="is_algorithm_model"/>
+        <result property="algorithm_path" column="algorithm_path"/>
+        <result property="remarks" column="remarks"/>
+<!--        <result property="algorithm_title" column="algorithm_title"/>-->
+<!--        <result property="algorithm_method_name" column="algorithm_method_name"/>-->
+<!--        <result property="algorithm_format" column="algorithm_format"/>-->
+<!--        <result property="algorithm_des" column="algorithm_des"/>-->
+<!--        <result property="create_time" column="create_time"/>-->
+<!--        <result property="create_user" column="create_user"/>-->
+<!--        <result property="is_enable" column="is_enable"/>-->
+<!--        <result property="parent_id" column="parent_id"/>-->
+<!--        <result property="is_fusion_method" column="is_fusion_method"/>-->
+<!--        <result property="assess_method" column="assess_method"/>-->
+<!--        <result property="assess_model" column="assess_model"/>-->
+<!--        <result property="environment_load" column="environment_load"/>-->
+<!--        <result property="show_type" column="show_type"/>-->
+<!--        <result property="r_type" column="r_type"/>-->
+<!--        <result property="m_type" column="m_type"/>-->
+<!--        <result property="data_file_path" column="data_file_path"/>-->
+<!--        <result property="is_zh" column="is_zh"/>-->
+<!--        <result property="apply_type" column="apply_type"/>-->
+<!--        <result property="is_open" column="is_open"/>-->
+<!--        <result property="is_algorithm_model" column="is_algorithm_model"/>-->
     </resultMap>
 
     <select id="listAll" resultMap="algorithmMap">
@@ -37,7 +43,7 @@
 
     <select id="findByName" parameterType="String" resultMap="algorithmMap">
         select  * from t_algorithm
-        where algorithm_title like #{name}
+        where algorithm_name like #{name}
     </select>
 
     <select id="getCount" resultType="java.lang.Integer">