item：应急处置流程优化，冗余删除

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

@@ -483,9 +483,13 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
         contingencyPlanInstance.setStartUserId(user.getUserId());
         contingencyPlanInstance.setStartUserName(user.getRealName());
         Map<String, String> userInfo = contingencyPlanInstanceMapper.getUserByUserId(user.getUserId());
-        String img = userInfo.get("personImg");
-        if (StringUtils.isNotBlank(img)) {
-            contingencyPlanInstance.setPersonImg(img);
+        if (userInfo != null) {
+            String img = userInfo.get("personImg");
+            if (StringUtils.isNotBlank(img)) {
+                contingencyPlanInstance.setPersonImg(img);
+            } else {
+                contingencyPlanInstance.setPersonImg(personImg);
+            }
         } else {
             contingencyPlanInstance.setPersonImg(personImg);
         }

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

@@ -17,7 +17,6 @@ import com.yeejoin.amos.fas.business.dao.repository.IEquipmentDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskLevelDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskSourceDao;
 import com.yeejoin.amos.fas.business.dao.repository.ISafetyIndexChangeLogDao;
-import com.yeejoin.amos.fas.business.feign.IDutyModeServer;
 import com.yeejoin.amos.fas.business.feign.JcsFeign;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.service.intfc.IDataRefreshService;
@@ -57,10 +56,6 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-//import com.yeejoin.amos.fas.business.dao.repository.IWaterResourceDao;
-//import com.yeejoin.amos.fas.dao.entity.FireStation;
-//import com.yeejoin.amos.fas.dao.entity.WaterResource;
-
 /**
  * @author DELL
  */
@@ -74,11 +69,9 @@ public class View3dServiceImpl implements IView3dService {
     @Autowired
     private IRiskSourceDao iRiskSourceDao;
 
-
     @Autowired
     private IEquipmentDao iEquipmentDao;
-    //    @Autowired
-//    private IWaterResourceDao iWaterResourceDao;
+
     @Autowired
     private PatrolMapper patrolMapper;
     @Autowired
@@ -87,9 +80,6 @@ public class View3dServiceImpl implements IView3dService {
     private ISafetyIndexChangeLogDao iSafetyIndexChangeLogDao;
 
     @Autowired
-    private IDutyModeServer dutyModeServer;
-
-    @Autowired
     private JcsFeign jcsFeign;
 
     @Value("${param.system.online.date}")
@@ -134,11 +124,7 @@ public class View3dServiceImpl implements IView3dService {
                 this.updateFireCarPosition(pointBo);
             case "fireChamber":
             case "fireFoamRoom":
-//                this.updateFireStationPosition(pointBo);
-//                break;
             case "hydrant":
-//            case "pool":
-//                this.updateWaterSourcePosition(pointBo);
                 break;
             default:
                 log.error("不支持的类型-->" + pointType);
@@ -160,34 +146,6 @@ public class View3dServiceImpl implements IView3dService {
 //       }
     }
 
-//    public void updateWaterSourcePosition(BindPointBo pointBo) {
-//        Optional<WaterResource> data = iWaterResourceDao.findById(pointBo.getPointId());
-//        if(data.isPresent()){
-//            WaterResource waterResource = data.get();
-//            String ue4Location = pointBo.getUe4Location();
-//            String ue4Rotation = pointBo.getUe4Rotation();
-//            String position3d = pointBo.getPosition3d();
-//            if(ue4Location != null) waterResource.setUe4Location(ue4Location);
-//            if(ue4Rotation != null) waterResource.setUe4Rotation(ue4Rotation);
-//            if(position3d != null) waterResource.setPosition3d(position3d);
-//            iWaterResourceDao.save(waterResource);
-//        }
-//    }
-
-//    public void updateFireStationPosition(BindPointBo pointBo) {
-//        Optional<FireStation> data = iFireStationDao.findById(pointBo.getPointId());
-//        if(data.isPresent()){
-//            FireStation fireStation = data.get();
-//            String ue4Location = pointBo.getUe4Location();
-//            String ue4Rotation = pointBo.getUe4Rotation();
-//            String position3d = pointBo.getPosition3d();
-//            if(ue4Location != null) fireStation.setUe4Location(ue4Location);
-//            if(ue4Rotation != null) fireStation.setUe4Rotation(ue4Rotation);
-//            if(position3d != null) fireStation.setPosition3d(position3d);
-//            iFireStationDao.save(fireStation);
-//        }
-//    }
-
     public void updateFireEquipmentPosition(BindPointBo pointBo) {
 //       Optional<FireEquipment> data = iFireEquipmentDao.findById(pointBo.getPointId());
 //       if(data.isPresent()){