1.修改getone为findone

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/View3dServiceImpl.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.fas.business.service.impl;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import com.yeejoin.amos.fas.business.bo.BindPointBo;
 import com.yeejoin.amos.fas.business.dao.mapper.PatrolMapper;
@@ -97,8 +98,9 @@ public class View3dServiceImpl implements IView3dService {
     }
 
     public void updateFireCarPosition(BindPointBo pointBo) {
-       FireCar fireCar = iFireCarDao.getOne(pointBo.getPointId());
-       if(fireCar != null){
+       Optional<FireCar> data = iFireCarDao.findById(pointBo.getPointId());
+       if(data.isPresent()){
+           FireCar fireCar = data.get();
            fireCar.setUe4Location(pointBo.getUe4Location());
            fireCar.setUe4Rotation(pointBo.getUe4Rotation());
            iFireCarDao.save(fireCar);
@@ -106,8 +108,9 @@ public class View3dServiceImpl implements IView3dService {
     }
 
     public void updateWaterSourcePosition(BindPointBo pointBo) {
-        WaterResource waterResource = iWaterResourceDao.getOne(pointBo.getPointId());
-        if(waterResource != null){
+        Optional<WaterResource> data = iWaterResourceDao.findById(pointBo.getPointId());
+        if(data.isPresent()){
+            WaterResource waterResource = data.get();
             waterResource.setUe4Location(pointBo.getUe4Location());
             waterResource.setUe4Rotation(pointBo.getUe4Rotation());
             iWaterResourceDao.save(waterResource);
@@ -115,8 +118,9 @@ public class View3dServiceImpl implements IView3dService {
     }
 
     public void updateFireStationPosition(BindPointBo pointBo) {
-        FireStation fireStation = iFireStationDao.getOne(pointBo.getPointId());
-        if(fireStation != null){
+        Optional<FireStation> data = iFireStationDao.findById(pointBo.getPointId());
+        if(data.isPresent()){
+            FireStation fireStation = data.get();
             fireStation.setUe4Location(pointBo.getUe4Location());
             fireStation.setUe4Rotation(pointBo.getUe4Rotation());
             iFireStationDao.save(fireStation);
@@ -124,8 +128,9 @@ public class View3dServiceImpl implements IView3dService {
     }
 
     public void updateFireEquipmentPosition(BindPointBo pointBo) {
-       FireEquipment fireEquipment = iFireEquipmentDao.getOne(pointBo.getPointId());
-       if(fireEquipment != null){
+       Optional<FireEquipment> data = iFireEquipmentDao.findById(pointBo.getPointId());
+       if(data.isPresent()){
+           FireEquipment fireEquipment = data.get();
            fireEquipment.setUe4Location(pointBo.getUe4Location());
            fireEquipment.setUe4Rotation(pointBo.getUe4Rotation());
            iFireEquipmentDao.save(fireEquipment);
@@ -133,11 +138,14 @@ public class View3dServiceImpl implements IView3dService {
     }
 
     public void updateEquipmentPosition(BindPointBo pointBo) {
-        Equipment equipment = iEquipmentDao.getOne(pointBo.getPointId());
-        if(equipment != null){
+        Optional<Equipment> data=iEquipmentDao.findById(pointBo.getPointId());
+        Equipment  equipment = null;
+        if(data.isPresent()){
+            equipment = data.get();
             equipment.setUe4Location(pointBo.getUe4Location());
             equipment.setUe4Rotation(pointBo.getUe4Rotation());
             iEquipmentDao.save(equipment);
+            iEquipmentDao.findById(pointBo.getPointId()).get();
         }
     }
 
@@ -146,8 +154,9 @@ public class View3dServiceImpl implements IView3dService {
     }
 
     public void updateRiskSourcePosition(BindPointBo pointBo) {
-        RiskSource riskSource = iRiskSourceDao.getOne(pointBo.getPointId());
-        if(riskSource != null){
+        Optional<RiskSource> data = iRiskSourceDao.findById(pointBo.getPointId());
+        if(data.isPresent()){
+            RiskSource riskSource = data.get();
             riskSource.setUe4Location(pointBo.getUe4Location());
             riskSource.setUe4Rotation(pointBo.getUe4Rotation());
             iRiskSourceDao.save(riskSource);