edit

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

@@ -63,14 +63,14 @@ public class AircraftController {
     @PostMapping("add")
     public Result<String> add(@RequestBody AircraftEntity data){return  aircraftService.addAndCheck(data);}
 
-    @ApiOperation("增加机型节点")
-    @ApiResponses({
-            @ApiResponse(code = 0, message = "成功")
-    })
-    @PostMapping("addAircraft1")
-    public Result<String> addAircraft1(@RequestBody Aircraft1Entity data){
-        return aircraftService.addAircraft1(data);
-    }
+//    @ApiOperation("增加机型节点")
+//    @ApiResponses({
+//            @ApiResponse(code = 0, message = "成功")
+//    })
+//    @PostMapping("addAircraft1")
+//    public Result<String> addAircraft1(@RequestBody Aircraft1Entity data){
+//        return aircraftService.addAircraft1(data);
+//    }
 
 
     @ApiOperation("根据机型名称查询图谱节点")//完全一致
@@ -78,8 +78,8 @@ public class AircraftController {
             @ApiResponse(code = 0, message = "成功")
     })
     @GetMapping("getAircraftByAircraftType")
-    public Result<Aircraft1Entity> getAircraftByAircraftType(@RequestParam String name){
-        return  Result.success(aircraftService.getAircraft1EntitiesByAircraftType(name));
+    public Result<Aircraft1Entity> getAircraft1ByMysqlId(@RequestParam Integer id){
+        return  Result.success(aircraftService.getAircraft1EntitiesByMysqlId(id));
     }
 
     @ApiOperation("删除机型信息")
@@ -90,7 +90,7 @@ public class AircraftController {
     public Result<String> delete(@RequestBody DeleteEntity deleteEntity){
         return  aircraftService.delete(deleteEntity.getIds());}
 
-    @ApiOperation("修改机型信息")
+    @ApiOperation("修改机型信息/对应图谱机型节点信息")
     @ApiResponses({
             @ApiResponse(code = 0, message = "成功")
     })

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

@@ -32,7 +32,7 @@ public class DeviceController {
         this.deviceService = deviceService;
     }
 
-    @ApiOperation("增添元器件或系统")
+    @ApiOperation("增添元器件或系统及对应图谱")
     @ApiResponses({
             @ApiResponse(code = 0, message = "成功")
     })
@@ -53,14 +53,14 @@ public class DeviceController {
 //    @PostMapping("getLastId")
 //    public Result<List<DeviceEntity>> getLastId(){return  Result.success(deviceService.getLastInsert());}
 
-    @ApiOperation("删除元器件或系统")
+    @ApiOperation("删除元器件或系统/删除元器件知识图谱和对应关系")
     @ApiResponses({
             @ApiResponse(code = 0, message = "成功")
     })
     @PostMapping("delete")
     public Result<String> delete(@RequestBody DeleteEntity deleteEntity){return  deviceService.delete(deleteEntity.getIds());}
 
-    @ApiOperation("修改元器件或系统")
+    @ApiOperation("修改元器件或系统/对应图谱")
     @ApiResponses({
             @ApiResponse(code = 0, message = "成功")
     })

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

@@ -20,14 +20,12 @@ import java.util.List;
 
 @Api(tags = "电影图谱接口")
 @RequestMapping("api/movie")
-//@CrossOrigin(allowCredentials = "true")
+@CrossOrigin(allowCredentials = "true")
 @RestController
 public class MovieController {
     @Resource
     private MovieService movieService;
 
-
-
     private final Driver neo4jDriver;
 
     public MovieController(Driver neo4jDriver) {

src/main/java/com/zglc/kg/dao/Aircraft1Dao.java

@@ -11,7 +11,7 @@ import java.util.List;
 @Repository
 public interface Aircraft1Dao extends Neo4jRepository<Aircraft1Entity,Long> {
 
-    Aircraft1Entity getAircraft1EntitiesByAircraftType(String name);
+    Aircraft1Entity getAircraft1EntitiesByMysqlId(Integer id);
 
 
 

src/main/java/com/zglc/kg/dao/AircraftDao.java

@@ -19,4 +19,7 @@ public interface AircraftDao extends Mapper<AircraftEntity> {
     List<AircraftEntity> findByName(@Param("name") String name);
 
     Integer findMinId();
+
+    AircraftEntity getLastInsert();
+
 }

src/main/java/com/zglc/kg/dao/AircraftSystemRelationDao.java

@@ -12,17 +12,6 @@ import java.util.List;
 public interface AircraftSystemRelationDao extends Neo4jRepository<AircraftSystemRelationEntity,Long> {
 
 
-    //返回节点n以及n指向或指向n的所有节点与关系
-//    @Query("MATCH p=(n:Person)-[:ACTED_IN]->(m:Movie) WHERE n.name={name1} RETURN p")
-//    @Query("MATCH p=(n:Bot)<-[r:BotRelation]->(m:Bot) WHERE m.name={name} RETURN p")
-//    @Query("MATCH p=()-[r:Relation]->() RETURN p LIMIT 25")
-//    List<AircraftSystemRelationEntity> findAllBySymptom(@Param("name1") String name);
-//
-//
-//    @Query("MATCH p= (tom:Person)-[:Relation]->(tomHanksMovies) WHERE tom.name={name1} RETURN p")
-//    List<AircraftSystemRelationEntity> findAllBySymptom1(@Param("name1") String name1);
 
-//    String nodeSql = String.format("MATCH (n:`%s`) <-[r]->(m) %s return * limit %s", domain, cqWhere,
-//            query.getPageSize());
 }
 

src/main/java/com/zglc/kg/dao/BaseRelationDao.java

@@ -15,7 +15,7 @@ public interface BaseRelationDao extends Neo4jRepository<BaseRelationEntity,Long
 
 
     //返回节点n以及n指向或指向n的所有节点与关系
-    @Query("MATCH p=(n:Person)-[:Relation]->(m:Movie) WHERE n.name={name} RETURN p")
+    @Query("MATCH p=(n:Person)-[:Relation1]->(m:Movie) WHERE n.name={name} RETURN p")
 //    @Query("MATCH p=()-[r:Relation]->() RETURN p LIMIT 25")
 //    @Query("MATCH p=(n:Person)-[:Relation]->(m:Movie) WHERE n.name={name} RETURN p")
     List<BaseRelationEntity> findAllBySymptom(@Param("name") String name);

src/main/java/com/zglc/kg/dao/Device1Dao.java

@@ -1,15 +1,21 @@
 package com.zglc.kg.dao;
 
 import com.zglc.kg.entity.Device1Entity;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.neo4j.annotation.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface Device1Dao extends Neo4jRepository<Device1Entity,Long> {
 
-//    Device1Entity getAircraft1EntitiesByAircraftType(String name);
-
+    Device1Entity getDevice1EntitiesByMysqlId(Integer id);
 
+//    MATCH (n:device {mysql_id:147})-[r]-() DELETE n,r
+    @Query("MATCH (n:device)-[r]-() WHERE n.mysql_id={id} DELETE n,r")
+    void deleteNR(@Param("id") Integer id);
 
 }
 

src/main/java/com/zglc/kg/dao/SubsystemDeviceRelationDao.java

@@ -0,0 +1,12 @@
+package com.zglc.kg.dao;
+
+import com.zglc.kg.entity.SubsystemDeviceRelationEntity;
+import org.springframework.data.neo4j.repository.Neo4jRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SubsystemDeviceRelationDao extends Neo4jRepository<SubsystemDeviceRelationEntity,Long> {
+
+
+}
+

src/main/java/com/zglc/kg/dao/SystemSubsystemRelationDao.java

@@ -0,0 +1,12 @@
+package com.zglc.kg.dao;
+
+import com.zglc.kg.entity.SystemSubsystemRelationEntity;
+import org.springframework.data.neo4j.repository.Neo4jRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SystemSubsystemRelationDao extends Neo4jRepository<SystemSubsystemRelationEntity,Long> {
+
+
+}
+

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

@@ -19,17 +19,17 @@ public class Aircraft1Entity {
     @Property(name = "aircraft_describe")
     private String aircraftDescribe;
 
-//    @Property(name = "mysql_id")
-//    private Integer mysqlId;
+    @Property(name = "mysql_id")
+    private Integer mysqlId;
 
     public Aircraft1Entity() {
     }
 
-    public Aircraft1Entity(Long id, String aircraftType, String aircraftDescribe) {
+    public Aircraft1Entity(Long id, String aircraftType, String aircraftDescribe,Integer mysqlId) {
         this.id = id;
         this.aircraftType = aircraftType;
         this.aircraftDescribe = aircraftDescribe;
-//        this.mysqlId = mysqlId;
+        this.mysqlId = mysqlId;
 
     }
 
@@ -57,26 +57,12 @@ public class Aircraft1Entity {
         this.aircraftDescribe = aircraftDescribe;
     }
 
-//    public Integer getMysqlId() {
-//        return mysqlId;
-//    }
-//
-//    public void setMysqlId(Integer mysqlId) {
-//        this.mysqlId = mysqlId;
-//    }
-
-
-
-//    @Override
-//    public String toString() {
-//        return "Aircraft1Entity{" +
-//                "id=" + id +
-//                ", aircraftType='" + aircraftType + '\'' +
-//                ", aircraftType='" + aircraftType + '\'' +
-//                ", aircraftDescribe='" + aircraftDescribe + '\'' +
-//                ", released='" + released + '\'' +
-//                '}';
-//    }
+    public Integer getMysqlId() {
+        return mysqlId;
+    }
 
+    public void setMysqlId(Integer mysqlId) {
+        this.mysqlId = mysqlId;
+    }
 
 }

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

@@ -8,7 +8,7 @@ import org.neo4j.ogm.annotation.StartNode;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
-@RelationshipEntity(type = "Relationhhh")
+@RelationshipEntity(type = "RelationAS")
 public class AircraftSystemRelationEntity {
     @Id
     @GeneratedValue
@@ -18,24 +18,24 @@ public class AircraftSystemRelationEntity {
     @EndNode
     private Device1Entity endNode;
     @Property
-    private String relation1;
+    private String relationAS;
 
     public AircraftSystemRelationEntity() {
     }
 
-    public AircraftSystemRelationEntity(Long id, Aircraft1Entity startNode, Device1Entity endNode, String relation1) {
+    public AircraftSystemRelationEntity(Long id, Aircraft1Entity startNode, Device1Entity endNode, String relationAS) {
         this.id = id;
         this.startNode = startNode;
         this.endNode = endNode;
-        this.relation1 = relation1;
+        this.relationAS = relationAS;
     }
 
-    public String getRelation1() {
-        return relation1;
+    public String getRelationAS() {
+        return relationAS;
     }
 
-    public void setRelation1(String relation1) {
-        this.relation1 = relation1;
+    public void setRelationAS(String relationAS) {
+        this.relationAS = relationAS;
     }
 
     public Long getId() {
@@ -62,13 +62,4 @@ public class AircraftSystemRelationEntity {
         this.endNode = endNode;
     }
 
-//    @Override
-//    public String toString() {
-//        return "RelationEntity{" +
-//                "id=" + id +
-//                ", startNode=" + startNode +
-//                ", endNode=" + endNode +
-//                ", relation1='" + relation1 + '\'' +
-//                '}';
-//    }
 }

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

@@ -42,12 +42,15 @@ public class Device1Entity {
     @Property(name = "subsys_name")
     private String subsys_name;
 
+    @Property(name = "mysql_id")
+    private Integer mysqlId;
 
     public Device1Entity() {
     }
 
     public Device1Entity(Long id, String device_name, Integer device_type,String device_describe, Integer aircraft_id,
-                         String aircraft_type,Integer syst_id,String syst_name,Integer subsys_id,String subsys_name) {
+                         String aircraft_type,Integer syst_id,String syst_name,Integer subsys_id,String subsys_name,
+                         Integer mysqlId) {
         this.id = id;
         this.device_name = device_name;
         this.device_type = device_type;
@@ -58,6 +61,7 @@ public class Device1Entity {
         this.syst_name = syst_name;
         this.subsys_id = subsys_id;
         this.subsys_name = subsys_name;
+        this.mysqlId = mysqlId;
 
     }
 
@@ -141,5 +145,11 @@ public class Device1Entity {
         this.subsys_name = subsys_name;
     }
 
+    public Integer getMysqlId() {
+        return mysqlId;
+    }
 
+    public void setMysqlId(Integer mysqlId) {
+        this.mysqlId = mysqlId;
+    }
 }

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

@@ -0,0 +1,65 @@
+package com.zglc.kg.entity;
+
+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;
+
+@RelationshipEntity(type = "RelationSubD")
+public class SubsystemDeviceRelationEntity {
+    @Id
+    @GeneratedValue
+    private Long id;
+    @StartNode
+    private Device1Entity startNode;
+    @EndNode
+    private Device1Entity endNode;
+    @Property
+    private String RelationSubD;
+
+    public SubsystemDeviceRelationEntity() {
+    }
+
+    public SubsystemDeviceRelationEntity(Long id, Device1Entity startNode, Device1Entity endNode, String RelationSubD) {
+        this.id = id;
+        this.startNode = startNode;
+        this.endNode = endNode;
+        this.RelationSubD = RelationSubD;
+    }
+
+    public String getRelationSubD() {
+        return RelationSubD;
+    }
+
+    public void setRelationSubD(String RelationSubD) {
+        this.RelationSubD = RelationSubD;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Device1Entity getStartNode() {
+        return startNode;
+    }
+
+    public void setStartNode(Device1Entity startNode) {
+        this.startNode = startNode;
+    }
+
+    public Device1Entity getEndNode() {
+        return endNode;
+    }
+
+    public void setEndNode(Device1Entity endNode) {
+        this.endNode = endNode;
+    }
+
+}

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

@@ -0,0 +1,65 @@
+package com.zglc.kg.entity;
+
+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;
+
+@RelationshipEntity(type = "RelationSysSub")
+public class SystemSubsystemRelationEntity {
+    @Id
+    @GeneratedValue
+    private Long id;
+    @StartNode
+    private Device1Entity startNode;
+    @EndNode
+    private Device1Entity endNode;
+    @Property
+    private String RelationSysSub;
+
+    public SystemSubsystemRelationEntity() {
+    }
+
+    public SystemSubsystemRelationEntity(Long id, Device1Entity startNode, Device1Entity endNode, String RelationSysSub) {
+        this.id = id;
+        this.startNode = startNode;
+        this.endNode = endNode;
+        this.RelationSysSub = RelationSysSub;
+    }
+
+    public String getRelationSysSub() {
+        return RelationSysSub;
+    }
+
+    public void setRelationSysSub(String RelationSysSub) {
+        this.RelationSysSub = RelationSysSub;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Device1Entity getStartNode() {
+        return startNode;
+    }
+
+    public void setStartNode(Device1Entity startNode) {
+        this.startNode = startNode;
+    }
+
+    public Device1Entity getEndNode() {
+        return endNode;
+    }
+
+    public void setEndNode(Device1Entity endNode) {
+        this.endNode = endNode;
+    }
+
+}

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

@@ -44,8 +44,8 @@ public class AircraftService {
         return Result.result(flag, msg, msg);
     }
 
-    public Aircraft1Entity getAircraft1EntitiesByAircraftType(String name){
-        return aircraft1Dao.getAircraft1EntitiesByAircraftType(name);
+    public Aircraft1Entity getAircraft1EntitiesByMysqlId(Integer id){
+        return aircraft1Dao.getAircraft1EntitiesByMysqlId(id);
     }
 
     public Result<String> addAndCheck(AircraftEntity data){
@@ -59,11 +59,14 @@ public class AircraftService {
             msg = "机型已存在!";
         } else {
             int index = aircraftDao.insertSelective(data);
+            //获取最新机型id
+            AircraftEntity aircraft2 = aircraftDao.getLastInsert();
             //加入机型节点
             Aircraft1Entity aircraft1 = new Aircraft1Entity();
 //            aircraft1.setId(data.getId().longValue());
             aircraft1.setAircraftType(data.getAircraft_type());
             aircraft1.setAircraftDescribe(data.getAircraft_describe());
+            aircraft1.setMysqlId(aircraft2.getId());
             aircraft1Dao.save(aircraft1);
             if (index == 0) {
                 flag = false;
@@ -104,6 +107,11 @@ public class AircraftService {
         AircraftEntity tmpData = aircraftDao.selectByPrimaryKey(data.getId());
         if (tmpData != null) {
             int index = aircraftDao.updateByPrimaryKeySelective(data);
+            Aircraft1Entity aircraft1 = aircraft1Dao.getAircraft1EntitiesByMysqlId(data.getId());
+            aircraft1.setAircraftType(data.getAircraft_type());
+            aircraft1.setAircraftDescribe(data.getAircraft_describe());
+            aircraft1.setMysqlId(data.getId());
+            aircraft1Dao.save(aircraft1);
             if (index == 0) {
                 flag = false;
                 msg = "信息修改失败";

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

@@ -1,9 +1,6 @@
 package com.zglc.kg.service;
-import com.zglc.kg.dao.Aircraft1Dao;
+import com.zglc.kg.dao.*;
 import com.zglc.kg.entity.*;
-import com.zglc.kg.dao.DeviceDao;
-import com.zglc.kg.dao.AircraftDao;
-import com.zglc.kg.dao.AircraftSystemRelationDao;
 import org.springframework.stereotype.Service;
 import com.zglc.kg.base.Result;
 import tk.mybatis.mapper.entity.Example;
@@ -15,28 +12,20 @@ import java.util.List;
 @Service
 public class DeviceService {
 
-//    private DeviceDao deviceDao;
-//    private AircraftDao aircraftDao;
-//    private Aircraft1Dao aircraft1Dao;
-//    private AircraftSystemRelationDao aircraftSystemRelationDao;
-//
-//    public DeviceService(DeviceDao deviceDao,AircraftSystemRelationDao aircraftSystemRelationDao,AircraftDao aircraftDao
-//            ,Aircraft1Dao aircraft1Dao) {
-//        this.deviceDao = deviceDao;
-//        this.aircraftSystemRelationDao = aircraftSystemRelationDao;
-//        this.aircraftDao = aircraftDao;
-//        this.aircraft1Dao = aircraft1Dao;
-//
-//    }
     @Resource
     private DeviceDao deviceDao;
     @Resource
+    private Device1Dao device1Dao;
+    @Resource
     private AircraftDao aircraftDao;
     @Resource
     private Aircraft1Dao aircraft1Dao;
     @Resource
     private AircraftSystemRelationDao aircraftSystemRelationDao;
-
+    @Resource
+    private SystemSubsystemRelationDao systemSubsystemRelationDao;
+    @Resource
+    private SubsystemDeviceRelationDao subsystemDeviceRelationDao;
 
 
     public Result<String> add(DeviceEntity data) {
@@ -49,10 +38,7 @@ public class DeviceService {
             case 0:{
                 AircraftEntity aircraft = aircraftDao.selectByPrimaryKey(data.getAircraft_id());
                 AircraftSystemRelationEntity aircraftSystemRelation = new AircraftSystemRelationEntity();
-                Aircraft1Entity aircraft1 = aircraft1Dao.getAircraft1EntitiesByAircraftType(aircraft.getAircraft_type());
-//                aircraft1.setId(aircraft.getId().longValue());
-//                aircraft1.setAircraftType(aircraft.getAircraft_type());
-//                aircraft1.setAircraftDescribe(aircraft.getAircraft_describe());
+                Aircraft1Entity aircraft1 = aircraft1Dao.getAircraft1EntitiesByMysqlId(aircraft.getId());
                 aircraftSystemRelation.setStartNode(aircraft1);
                 DeviceEntity device = deviceDao.getLastInsert();
                 Device1Entity device1 = new Device1Entity();
@@ -66,9 +52,53 @@ public class DeviceService {
                 device1.setSyst_name(device.getSubsys_name());
                 device1.setSubsys_id(device.getSubsys_id());
                 device1.setSubsys_name(device.getSubsys_name());
+                device1.setMysqlId(device.getId());
                 aircraftSystemRelation.setEndNode(device1);
-                aircraftSystemRelation.setRelation1("包含");
+                aircraftSystemRelation.setRelationAS("包含");
                 aircraftSystemRelationDao.save(aircraftSystemRelation);
+                break;
+            }
+            case 1:{
+                SystemSubsystemRelationEntity systemSubsystemRelation = new SystemSubsystemRelationEntity();
+                Device1Entity device1 = device1Dao.getDevice1EntitiesByMysqlId(data.getSyst_id());
+                systemSubsystemRelation.setStartNode(device1);
+                DeviceEntity device = deviceDao.getLastInsert();
+                Device1Entity device2 = new Device1Entity();
+                device2.setDevice_name(device.getDevice_name());
+                device2.setDevice_type(device.getDevice_type());
+                device2.setDevice_describe(device.getDevice_describe());
+                device2.setAircraft_id(device.getAircraft_id());
+                device2.setAircraft_type(device.getAircraft_type());
+                device2.setSyst_id(device.getSyst_id());
+                device2.setSyst_name(device.getSubsys_name());
+                device2.setSubsys_id(device.getSubsys_id());
+                device2.setSubsys_name(device.getSubsys_name());
+                device2.setMysqlId(device.getId());
+                systemSubsystemRelation.setEndNode(device2);
+                systemSubsystemRelation.setRelationSysSub("包含");
+                systemSubsystemRelationDao.save(systemSubsystemRelation);
+                break;
+            }
+            case 2:{
+                SubsystemDeviceRelationEntity subsystemDeviceRelation = new SubsystemDeviceRelationEntity();
+                Device1Entity device1 = device1Dao.getDevice1EntitiesByMysqlId(data.getSubsys_id());
+                subsystemDeviceRelation.setStartNode(device1);
+                DeviceEntity device = deviceDao.getLastInsert();
+                Device1Entity device2 = new Device1Entity();
+                device2.setDevice_name(device.getDevice_name());
+                device2.setDevice_type(device.getDevice_type());
+                device2.setDevice_describe(device.getDevice_describe());
+                device2.setAircraft_id(device.getAircraft_id());
+                device2.setAircraft_type(device.getAircraft_type());
+                device2.setSyst_id(device.getSyst_id());
+                device2.setSyst_name(device.getSubsys_name());
+                device2.setSubsys_id(device.getSubsys_id());
+                device2.setSubsys_name(device.getSubsys_name());
+                device2.setMysqlId(device.getId());
+                subsystemDeviceRelation.setEndNode(device2);
+                subsystemDeviceRelation.setRelationSubD("包含");
+                subsystemDeviceRelationDao.save(subsystemDeviceRelation);
+                break;
             }
         }
 
@@ -97,6 +127,9 @@ public class DeviceService {
         while(iter.hasNext()) {
             Integer id = (Integer)iter.next();
             int index = deviceDao.deleteByPrimaryKey(id);
+//            Device1Entity device1 = device1Dao.getDevice1EntitiesByMysqlId(id);
+//            device1Dao.deleteById(device1.getId());
+            device1Dao.deleteNR(id);
             if (index == 0) {
                 flag = false;
                 msg += "删除失败!" + id + ";";
@@ -113,6 +146,18 @@ public class DeviceService {
         DeviceEntity tmpData = deviceDao.selectByPrimaryKey(data.getId());
         if (tmpData != null) {
             int index = deviceDao.updateByPrimaryKeySelective(data);
+            Device1Entity device1 = device1Dao.getDevice1EntitiesByMysqlId(data.getId());
+            device1.setDevice_name(data.getDevice_name());
+            device1.setDevice_type(data.getDevice_type());
+            device1.setDevice_describe(data.getDevice_describe());
+            device1.setAircraft_id(data.getAircraft_id());
+            device1.setAircraft_type(data.getAircraft_type());
+            device1.setSyst_id(data.getSyst_id());
+            device1.setSyst_name(data.getSubsys_name());
+            device1.setSubsys_id(data.getSubsys_id());
+            device1.setSubsys_name(data.getSubsys_name());
+            device1.setMysqlId(data.getId());
+            device1Dao.save(device1);
             if (index == 0) {
                 flag = false;
                 msg = "信息修改失败";

src/main/resources/mapping/AircraftDao.xml

@@ -28,4 +28,8 @@
         select min(id) from t_aircraft
     </select>
 
+    <select id="getLastInsert" resultMap="aircraftMap">
+        SELECT * FROM t_aircraft ORDER BY id DESC LIMIT 1
+    </select>
+
 </mapper>

target/classes/mapping/AircraftDao.xml

@@ -28,4 +28,8 @@
         select min(id) from t_aircraft
     </select>
 
+    <select id="getLastInsert" resultMap="aircraftMap">
+        SELECT * FROM t_aircraft ORDER BY id DESC LIMIT 1
+    </select>
+
 </mapper>