Merge branch 'developer' into develop_ccs

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/entity/FireEquipmentFireAlarm.java

@@ -78,7 +78,7 @@ public class FireEquipmentFireAlarm implements Serializable {
 
     @ApiModelProperty(value = "报警状态")
     @TableField("status")
-    private Boolean status;
+    private Boolean status = true;
 
     @ApiModelProperty(value = "量测数据类型")
     @TableField("type")

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/CarProperty.java

 package com.yeejoin.equipmanage.common.entity;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -79,6 +80,10 @@ public class CarProperty extends BaseEntity {
 	@TableField(value = "emergency_level_describe")
 	private String emergencyLevelDescribe;
 	
+	@TableField("update_date")
+	@ApiModelProperty(value = "更新时间")
+	private Date updateDate;
+
 	@TableField(exist = false)
 	private String unitName;
 	@TableField(exist = false)

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java

@@ -41,7 +41,8 @@ public class EquipmentSpecificIndex extends BaseEntity {
 
     @ApiModelProperty(value = "装备名称（冗余字段）")
     @TableField("equipment_specific_name")
-    private String equipmentSpecialName;
+    private String equipmentSpecificName;
+//   equipmentSpecialName 
 
     @ApiModelProperty(value = "指标名称（冗余字段）")
     @TableField("equipment_index_name")
@@ -99,8 +100,8 @@ public class EquipmentSpecificIndex extends BaseEntity {
     @TableField(exist = false)
     private String indexName;
     
-    @TableField(exist = false)
-    private String equipmentSpecificName;
+//    @TableField(exist = false)
+//    private String equipmentSpecificName;
     
     @TableField(exist = false)
     private String equipmentSpecificIndexName;

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/TopicEnum.java

@@ -17,6 +17,7 @@ public enum TopicEnum {
     EQDQR("fasAlarmInsert", "今日消防警情-待确认"),
     EQYQR("fasAlarmConfirm", "今日消防警情-已确认"),
     EQZXDT("fasAlarmInsertOrUpdate", "最新动态-告警日志列表"),
+    CARZXDT("carIndexInsertOrUpdate", "最新动态-告警日志列表"),
     EQXXTJ("fasReportInsertOrUpdate", "设备信号消息统计列表"),
     ALARM_LOG_INSERT("alarm/log/insert","告警日志插入"),
     IOT_SYSTEM__AlARM("iot-system-alarm", "确警消息");

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/StringUtil.java

@@ -4,7 +4,7 @@ import java.math.BigDecimal;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.yeejoin.equipmanage.common.vo.QRCodeRequest;
@@ -97,6 +97,13 @@ public class StringUtil {
 		return 0;
 	}
 	
+	public static String toNotEmptyString(String s) {
+		if (ObjectUtils.isEmpty(s)) {
+			return "";
+		}
+		return s;
+	}
+
 	/**
 	 * 截取前后都不是0的数字字符串
 	 * 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java

@@ -163,7 +163,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
             List<EquipmentSpecificIndex> equipmentSpecificIndexs = equPropertyList.stream().map(p -> {
                 EquipmentSpecificIndex specificIndex = new EquipmentSpecificIndex();
                 Bean.copyExistPropertis(p, specificIndex);
-                specificIndex.setEquipmentSpecialName(equipmentDetail.getName());
+                specificIndex.setEquipmentSpecificName(equipmentDetail.getName());
                 specificIndex.setEquipmentSpecificId(equipmentSpecificId);
                 return specificIndex;
             }).collect(Collectors.toList());
@@ -176,7 +176,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
             List<EquipmentSpecificIndex> equipmentSpecificIndexs = equPropertyList.stream().map(p -> {
                 EquipmentSpecificIndex specificIndex = new EquipmentSpecificIndex();
                 Bean.copyExistPropertis(p, specificIndex);
-                specificIndex.setEquipmentSpecialName(equipmentDetail.getName());
+                specificIndex.setEquipmentSpecificName(equipmentDetail.getName());
                 specificIndex.setEquipmentSpecificId(equipmentSpecificId);
                 specificIndex.setValue(p.getValue());
                 return specificIndex;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentIndexImpl.java

@@ -151,7 +151,7 @@ public class EquipmentIndexImpl extends ServiceImpl<EquipmentIndexMapper, Equipm
                     equipmentSpecificIndex.setEquipmentIndexId(equipmentIndex.getId());
                     equipmentSpecificIndex.setEquipmentIndexKey(equipmentIndex.getPerfQuotaDefinitionId());
                     equipmentSpecificIndex.setEquipmentIndexName(equipmentIndex.getPerfQuotaName());
-                    equipmentSpecificIndex.setEquipmentSpecialName(y.getName());
+                    equipmentSpecificIndex.setEquipmentSpecificName(y.getName());
                     if (bool.get()) {
                         equipmentSpecificIndex.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
                         equipmentSpecificIndex.setIsAlarm(signalClassify.getIsAlarm());

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1466,7 +1466,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             equipmentSpecificIndex.setEquipmentIndexId(x.getEquipmentIndexId());
             equipmentSpecificIndex.setEquipmentSpecificId(specific.getId());
             EquipmentIndex index = iEquipmentIndexService.getById(x.getEquipmentIndexId());
-            equipmentSpecificIndex.setEquipmentSpecialName(equipName);
+            equipmentSpecificIndex.setEquipmentSpecificName(equipName);
             equipmentSpecificIndex.setEquipmentIndexName(index.getPerfQuotaName());
             equipmentSpecificIndex.setEquipmentIndexKey(index.getPerfQuotaDefinitionId());
             equipmentSpecificIndex.setEmergencyLevelColor(index.getEmergencyLevelColor());

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -36,13 +36,11 @@ import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentFireAlarm;
 import com.yeejoin.equipmanage.common.dto.TemperatureAlarmDto;
 import com.yeejoin.equipmanage.common.entity.CarProperty;
 import com.yeejoin.equipmanage.common.entity.EquipmentAlarmReportDay;
-import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
 import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
-import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
 import com.yeejoin.equipmanage.common.entity.vo.CarIndexVo;
 import com.yeejoin.equipmanage.common.entity.vo.CarPropertyVo;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentIndexVO;
@@ -61,11 +59,9 @@ import com.yeejoin.equipmanage.common.enums.TemperatureAlarm;
 import com.yeejoin.equipmanage.common.enums.TopicEnum;
 import com.yeejoin.equipmanage.common.enums.TrueOrFalseEnum;
 import com.yeejoin.equipmanage.common.utils.DateUtils;
-import com.yeejoin.equipmanage.common.utils.EquipmentStateUtil;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.CarIndexGisVo;
 import com.yeejoin.equipmanage.common.vo.EquipmentIndexLabelsVo;
-import com.yeejoin.equipmanage.common.vo.EquipmentVo;
 import com.yeejoin.equipmanage.common.vo.IotDataVO;
 import com.yeejoin.equipmanage.common.vo.Token;
 import com.yeejoin.equipmanage.common.vo.TopicEntityVo;
@@ -168,9 +164,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     private IEquipmentAlarmReportDayService iEquipmentAlarmReportDayService;
 
     @Autowired
-    private IEquipmentDetailService iEquipmentDetailService;
-
-    @Autowired
     private IEquipmentSpecificSerivce iEquipmentSpecificSerivce;
 
     @Autowired
@@ -180,12 +173,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     private SystemctlFeign systemctlFeign;
 
     @Autowired
-    private TopographyService topographyService;
-
-    @Autowired
-    private IEquipmentService equipmentService;
-
-    @Autowired
     private RemoteSecurityService remoteSecurityService;
 
     @Value("${equipManage.name}")
@@ -262,8 +249,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             return;
         }
         log.info(String.format("收到mqtt消息：%s", message));
-        saveDataToDB(topicEntity, iotDatalist);
-//        realTimeDateProcessing(topicEntity, iotDatalist);
+//        saveDataToDB(topicEntity, iotDatalist);
+        realTimeDateProcessing(topicEntity, iotDatalist);
     }
 
     /**
@@ -876,16 +863,13 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 
     private EquipmentAlarmReportDay addEquipAlarmReportRecord(EquipmentSpecificIndex equipmentSpecificIndex) {
         EquipmentAlarmReportDay equipmentAlarmReportDay = new EquipmentAlarmReportDay();
-//        LambdaQueryWrapper<EquipmentSpecific> speWrapper = new LambdaQueryWrapper<>();
-//        EquipmentSpecific equipmentSpecific = iEquipmentSpecificSerivce.getOne(speWrapper.eq(BaseEntity::getId, equipmentSpecificIndex.getEquipmentSpecificId()));
-//        LambdaQueryWrapper<EquipmentDetail> speDetailWrapper = new LambdaQueryWrapper<>();
-//        EquipmentDetail detail = iEquipmentDetailService.getOne(speDetailWrapper.eq(BaseEntity::getId, equipmentSpecific.getEquipmentDetailId()));
         equipmentAlarmReportDay.setOrgCode(equipmentSpecificIndex.getOrgCode());
         equipmentAlarmReportDay.setReportDate(new Date());
+        equipmentAlarmReportDay.setUpdateDate(new Date());
         equipmentAlarmReportDay.setSystemIds(equipmentSpecificIndex.getSystemId());
         equipmentAlarmReportDay.setLastReportDate(new Date());
         equipmentAlarmReportDay.setEquipmentSpecificId(equipmentSpecificIndex.getEquipmentSpecificId());
-        equipmentAlarmReportDay.setEquipmentSpecificName(equipmentSpecificIndex.getEquipmentSpecialName());
+        equipmentAlarmReportDay.setEquipmentSpecificName(equipmentSpecificIndex.getEquipmentSpecificName());
         equipmentAlarmReportDay.setEquipmentDetailId(equipmentSpecificIndex.getEquipmentDetailId());
         equipmentAlarmReportDay.setEquipmentId(equipmentSpecificIndex.getEquipmentId());
         equipmentAlarmReportDay.setEquipmentCode(equipmentSpecificIndex.getEquipmentCode());
@@ -903,27 +887,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     private EquipmentSpecificAlarmLog addEquipAlarmLogRecord(EquipmentSpecificAlarm equipmentSpecificAlarm) {
         EquipmentSpecificAlarmLog equipmentSpecificAlarmLog = new EquipmentSpecificAlarmLog();
         BeanUtils.copyProperties(equipmentSpecificAlarm, equipmentSpecificAlarmLog);
-//        equipmentSpecificAlarmLog.setOrgCode(equipmentSpecificAlarm.getOrgCode());
+        equipmentSpecificAlarmLog.setId(null);
         equipmentSpecificAlarmLog.setCreateDate(new Date());
-//        equipmentSpecificAlarmLog.setSystemIds(equipmentSpecificAlarm.getSystemIds());
-//        equipmentSpecificAlarmLog.setEquipmentSpecificId(equipmentSpecificAlarm.getEquipmentSpecificId());
-//        equipmentSpecificAlarmLog.setIotCode(equipmentSpecificAlarm.getIotCode());
-//        equipmentSpecificAlarmLog.setSystemCodes(equipmentSpecificAlarm.getSystemCodes());
-//        equipmentSpecificAlarmLog.setEquipmentCode(equipmentSpecificAlarm.getEquipmentCode());
-//        equipmentSpecificAlarmLog.setEquipmentSpecificName(equipmentSpecificAlarm.getEquipmentSpecificName());
-//        equipmentSpecificAlarmLog.setEquipmentDetailId(equipmentSpecificAlarm.getEquipmentDetailId());
-//        equipmentSpecificAlarmLog.setEquipmentId(equipmentSpecificAlarm.getEquipmentId());
-//        equipmentSpecificAlarmLog.setType(equipmentSpecificAlarm.getType());
-//        equipmentSpecificAlarmLog.setEquipmentSpecificIndexValue(equipmentSpecificAlarm.getEquipmentSpecificIndexValue());
-//        equipmentSpecificAlarmLog.setEquipmentSpecificIndexKey(equipmentSpecificAlarm.getEquipmentSpecificIndexKey());
-//        equipmentSpecificAlarmLog.setEquipmentSpecificIndexName(equipmentSpecificAlarm.getEquipmentSpecificIndexName());
-//        equipmentSpecificAlarmLog.setEquipmentIndexId(equipmentSpecificAlarm.getEquipmentIndexId());
         equipmentSpecificAlarmLog.setEquipmentSpecificAlarmId(equipmentSpecificAlarm.getId());
-//        equipmentSpecificAlarmLog.setLocation(equipmentSpecificAlarm.getLocation());
-//        equipmentSpecificAlarmLog.setAlarmReason(equipmentSpecificAlarm.getAlamReason());
-//        equipmentSpecificAlarmLog.setEquipmentSpecificCode(equipmentSpecificAlarm.getEquipmentSpecificCode());
-//        equipmentSpecificAlarmLog.setBuildId(equipmentSpecificAlarm.getBuildId());
-//        equipmentSpecificAlarmLog.setStatus(equipmentSpecificAlarm.getStatus());
         boolean bool = equipmentSpecificAlarmLogService.save(equipmentSpecificAlarmLog);
         //  同步告警消息给平台
         if (amosSwitch && bool) {
@@ -1275,30 +1241,22 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 	  equipmentAlarmLogs.forEach(action->{
 		  FireEquipmentFireAlarm alarm = new FireEquipmentFireAlarm();
 		  BeanUtils.copyProperties(action, alarm);
-//		  alarm.setAlarmReason(action.getAlarmReason());
-		  alarm.setAliasname(action.getEquipmentSpecificIndexName());
-//		  alarm.setConfirmDate(action.getConfirmDate());
-//		  alarm.setConfirmType(action.getConfirmType());
-//		  alarm.setConfirmUser(action.getConfirmUser());
-//		  alarm.setCreateDate(action.getCreateDate());
-		  alarm.setEquipmentMeasurementId(action.getEquipmentIndexId().toString());
-		  alarm.setEquipmentMeasurementMRid(action.getEquipmentIndexId().toString());
-		  alarm.setFieldLabel(action.getEquipmentSpecificIndexKey());
-		  alarm.setFieldName(action.getEquipmentSpecificIndexName());
-		  alarm.setFireEquipmentId(action.getEquipmentSpecificId().toString());
-		  alarm.setFireEquipmentMRid(action.getEquipmentSpecificCode());
-		  alarm.setFireEquipmentName(action.getEquipmentSpecificName());
+		  alarm.setAliasname(StringUtil.toNotEmptyString(action.getEquipmentSpecificIndexName()));
+		  alarm.setEquipmentMeasurementId(StringUtil.toNotEmptyString(action.getEquipmentIndexId().toString()));
+		  alarm.setEquipmentMeasurementMRid(StringUtil.toNotEmptyString(action.getEquipmentIndexId().toString()));
+		  alarm.setFieldLabel(StringUtil.toNotEmptyString(action.getEquipmentSpecificIndexKey()));
+		  alarm.setFieldName(StringUtil.toNotEmptyString(action.getEquipmentSpecificIndexName()));
+		  alarm.setFireEquipmentId(StringUtil.toNotEmptyString(action.getEquipmentSpecificId().toString()));
+		  alarm.setFireEquipmentMRid(StringUtil.toNotEmptyString(action.getEquipmentSpecificCode()));
+		  alarm.setFireEquipmentName(StringUtil.toNotEmptyString(action.getEquipmentSpecificName()));
 		  alarm.setFrequency(1);
-		  alarm.setId(action.getId().toString());
+		  alarm.setId(StringUtil.toNotEmptyString(action.getId().toString()));
 		  alarm.setMrid(action.getId().toString());
 		  alarm.setName(action.getEquipmentSpecificIndexName());
 		  alarm.setRecoveryDate(action.getUpdateDate());
-//		  alarm.setResolveResult(action.getResolveResult());
-		  alarm.setStationCode(ObjectUtils.isEmpty(stationInfo)?"":stationInfo.get("stationCode"));
-		  alarm.setStationName(ObjectUtils.isEmpty(stationInfo)?"":stationInfo.get("stationName"));
-//		  alarm.setType(action.getType());
-//		  alarm.setUpdateDate(action.getUpdateDate());
-		  alarm.setValue(action.getEquipmentSpecificIndexValue());
+		  alarm.setStationCode(StringUtil.toNotEmptyString(stationInfo.get("stationCode")));
+		  alarm.setStationName(StringUtil.toNotEmptyString(stationInfo.get("stationName")));
+		  alarm.setValue(StringUtil.toNotEmptyString(action.getEquipmentSpecificIndexValue()));
 		  alarmList.add(alarm);
 	  });
       return alarmList;
@@ -1417,6 +1375,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
       TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
           @Override
           public void afterCommit() {
+        	  mqttSendGateway.sendToMqtt(TopicEnum.EQZXDT.getTopic(), "");
         	  mqttSendGateway.sendToMqtt(TopicEnum.EQXXTJ.getTopic(), "");
               iEquipmentSpecificSerivce.integrationPageSysDataRefresh(topicEntity.getCode());
               iEquipmentSpecificSerivce.updateEquipmentSpecIndexRealtimeData(equipmentSpecificIndexList);
@@ -1490,19 +1449,33 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 	      }
 	      List<CarPropertyVo> carPropertyVos = new ArrayList<>();
 	      carProperties.forEach(carProperty->{
-	    	  CarProperty property = new CarProperty();
               if (iotDataVO.getKey().equals(carProperty.getNameKey())) {
-                  BeanUtils.copyProperties(carProperty, property);
-                  property.setValue(iotDataVO.getValue().toString());
+                  carProperty.setValue(iotDataVO.getValue().toString());
                   carPropertyVos.add(carPropertyToCarPropertyVo(carProperty));
-                  carIndexsList.add(property);
+                  carIndexsList.add(carProperty);
               }
 	      });
 	      
 	      boolean updateBatchById = carPropertyService.updateBatchById(carIndexsList);
 	      
 	      if(updateBatchById){
-	    	  List<CarIndexGisVo> list = createCarIndexGisVo(carIndexsList);
+	    	  carTransactionSynch(carProperties,carPropertyVos);
+	      }
+	  });
+  }
+  
+  /**
+   * 车辆数据推送及同步
+   * @param carProperties
+   * @param carPropertyVos
+   */
+  public void carTransactionSynch(List<CarProperty> carProperties, List<CarPropertyVo> carPropertyVos){
+	  //TODO 数字化换流站组态屏数据推送,需要在事务提交之后，否侧事务隔离查询不出数据
+      TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+          @Override
+          public void afterCommit() {
+        	  List<CarIndexGisVo> list = createCarIndexGisVo(carProperties);
+	    	  mqttSendGateway.sendToMqtt(TopicEnum.CARZXDT.getTopic(), "");
 		      boolean flag = ifSendToGis(list);
 		      if (flag) {
 		          mqttSendGateway.sendToMqtt(carTopic, JSON.toJSONString(list));
@@ -1532,14 +1505,26 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
   
   private List<CarIndexGisVo> createCarIndexGisVo(List<CarProperty> carProperties){
 	  List<CarIndexGisVo> list = new ArrayList<>();
-	  carProperties.forEach(action->{
+	  long id =0l;
+	  String iotCode = "";
+	  for(CarProperty action : carProperties){
 		  CarIndexGisVo v = new CarIndexGisVo();
+		  id = action.getCarId();
+		  iotCode = action.getIotCode();
 		  v.setId(action.getCarId());
 		  v.setIotCode(action.getIotCode());
 		  v.setNameKey(action.getEquipmentIndexKey());
-		  v.setValue(action.getValue());
+		  v.setValue(ObjectUtils.isEmpty(action.getValue())?"0":action.getValue());
 		  list.add(v);
-	  });
+	  }
+	 
+	  CarIndexGisVo time = new CarIndexGisVo();
+	  time.setId(id);
+	  time.setIotCode(iotCode);
+	  time.setNameKey(CarForGisEnum.SJ.getNameKey());
+	  time.setValue(String.valueOf(new Date().getTime()));
+	  list.add(time);
+	  
 	  return list;
   }
   

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/StockServiceImpl.java

@@ -487,7 +487,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             equipmentSpecificIndex.setEquipmentIndexId(index.getId());
             equipmentSpecificIndex.setEquipmentSpecificId(equipmentSpecific.getId());
             equipmentSpecificIndex.setCreateDate(new Date());
-            equipmentSpecificIndex.setEquipmentSpecialName(equipmentDetail.getName());
+            equipmentSpecificIndex.setEquipmentSpecificName(equipmentDetail.getName());
             equipmentSpecificIndex.setEquipmentIndexName(index.getPerfQuotaName());
             equipmentSpecificIndex.setEquipmentIndexKey(index.getPerfQuotaDefinitionId());
             return equipmentSpecificIndex;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/VideoServiceImpl.java

@@ -83,6 +83,10 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
     @Value("${param.nrvideo.url}")
     private String nrvideoUrl;
     
+    @Value("${param.nrflvbyvoideoid.url}")
+    private String nrflvByVoideoidUrl;
+
+
     @Value("${dcs.client-id}")
     private String clientId;
 
@@ -503,12 +507,12 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
 
 
     @Override
-    public String getVideoUrl(String videoId, String presetIndex, String defaultUrl, String code) {
+    public String getVideoUrl(String videoName, String presetIndex, String defaultUrl, String code) {
     	String url = "";
         if ("hls".equals(vedioFormat)) {
             url = getVideoUrl(code);
         } else {
-        	url = getFlvUrlByVideoIdOrPresetIndex(videoId, presetIndex);
+        	url = getFlvUrlByVideoId(code);
         }
         return ObjectUtils.isEmpty(url) ? defaultUrl : url;
     }
@@ -531,6 +535,35 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
         return url;
     }
     
+    public String getFlvUrlByVideoId(String videoId) {
+        try {
+            Map<String, Object> request = new HashMap<String, Object>();
+            request.put("cameraId", videoId);
+            request.put("clientType", 1);
+            request.put("streamType", 1);
+            request.put("templetId ", "000004");
+            request.put("urlType", 4);
+            JSONObject json = new JSONObject(request);
+            log.info("request：{}", JSONObject.toJSONString(request));
+            log.info("nrvideoUrl=={}", nrflvByVoideoidUrl);
+            String content = HttpContentTypeUtil.sendHttpPostJson(nrflvByVoideoidUrl, json.toJSONString());
+            if (ObjectUtils.isEmpty(content)) {
+                log.error("getFlvUrlByVideoId=flv视频流接口获取失败,参数:{}" + JSONObject.toJSONString(request));
+            }
+            Map<String, Object> respond = JSONObject.parseObject(content, Map.class);
+            log.error("getFlvUrlByVideoId=flv视频流接口返回respond:{}" + JSONObject.toJSONString(respond));
+            if ("SUCCESS".equals(respond.get("resultDesc")) && respond.containsKey("url")) {
+                return respond.get("url").toString();
+            }
+
+            return "";
+        } catch (Exception e) {
+            log.error("getFlvUrlByVideoId=flv视频流接口获取失败:{}", e.getMessage());
+        }
+        return "";
+    }
+
+
     public String getFlvUrlByVideoIdOrPresetIndex(String videoId, String presetIndex) {
         try {
             String rtsp = getRtspUrlByVideoIdOrPresetIndex(videoId, presetIndex);
@@ -543,21 +576,21 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
             request.put("messageType", "/video-service/transcode/getCameraPlaybackFlv/call");
             request.put("cameraId", videoId);
             request.put("rtsp ", rtsp);
-            String content = HttpContentTypeUtil.sendHttpGetWithHeader(nrvideoUrl, request);
             log.info("request：{}", JSONObject.toJSONString(request));
             log.info("nrvideoUrl=={}", nrvideoUrl);
+            String content = HttpContentTypeUtil.sendHttpGetWithHeader(nrvideoUrl, request);
             if (ObjectUtils.isEmpty(content)) {
-                log.error("flv视频流接口获取失败,参数:{}" + JSONObject.toJSONString(request));
+                log.error("getFlvUrlByVideoIdOrPresetIndex==flv视频流接口获取失败,参数:{}" + JSONObject.toJSONString(request));
             }
             Map<String, String> respond = JSONObject.parseObject(content, Map.class);
-            log.error("flv视频流接口返回respond:{}" + JSONObject.toJSONString(respond));
+            log.error("getFlvUrlByVideoIdOrPresetIndex==flv视频流接口返回respond:{}" + JSONObject.toJSONString(respond));
             if (respond.containsKey("url")) {
                 return respond.get("url");
             }
 
             return "";
         } catch (Exception e) {
-            log.error("flv视频流接口获取失败:{}", e.getMessage());
+            log.error("getFlvUrlByVideoIdOrPresetIndex==flv视频流接口获取失败:{}", e.getMessage());
         }
         return "";
     }
@@ -569,11 +602,11 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
         videoRequest.put("messageType", "getCameraRTSP");
         videoRequest.put("cameraId", videoId);
         videoRequest.put("presetIndex", ObjectUtils.isEmpty(presetIndex) ? "1" : presetIndex);
-        String content = HttpContentTypeUtil.sendHttpGetWithHeader(htvideoUrl, videoRequest);
         log.info("videoRequest:{}", JSONObject.toJSONString(videoRequest));
         log.info("htvideoUrl=={}", htvideoUrl);
+        String content = HttpContentTypeUtil.sendHttpGetWithHeader(htvideoUrl, videoRequest);
         if (ObjectUtils.isEmpty(content)) {
-            log.error("接口获取失败,参数={}", JSONObject.toJSONString(videoRequest));
+            log.error("getRtspUrlByVideoIdOrPresetIndex==接口获取失败,参数={}", JSONObject.toJSONString(videoRequest));
         }
         Map<String, String> respond = JSONObject.parseObject(content, Map.class);
 

amos-boot-system-equip/src/main/resources/application-dev.properties

@@ -79,7 +79,10 @@ param.system.online.date = 2019-02-12
 # 视频转码服务开关 hls(关)/flv(开),默认关闭，数字换流站使用时开启
 window.vedioFormat = hls
 # 航天视频服务地址
-param.htvideo.url="http://192.168.4.174:9001";
+param.htvideo.url=http://192.168.4.174:9001;
 # 南瑞视频转码服务地址
-param.nrvideo.url="http://198.87.103.158:8001";
+param.nrvideo.url=http://198.87.103.158:8001;
+
+#南瑞视频平台通过视频id获取flv格式视频播放地址
+param.nrflvbyvoideoid.url=http://192.168.4.159:10010/api/media/live
 

amos-boot-system-equip/src/main/resources/application-docker.properties

@@ -69,3 +69,5 @@ window.vedioFormat = hls
 param.htvideo.url="";
 # 南瑞视频转码服务地址
 param.nrvideo.url="";
+#南瑞视频平台通过视频id获取flv格式视频播放地址
+param.nrflvbyvoideoid.url=http://192.168.4.159:10010/api/media/live

amos-boot-system-equip/src/main/resources/application-jcs.properties

@@ -76,3 +76,5 @@ window.vedioFormat = hls
 param.htvideo.url="";
 # 南瑞视频转码服务地址
 param.nrvideo.url="";
+#南瑞视频平台通过视频id获取flv格式视频播放地址
+param.nrflvbyvoideoid.url=http://192.168.4.159:10010/api/media/live

amos-boot-system-equip/src/main/resources/application-qa.properties

@@ -68,3 +68,5 @@ window.vedioFormat = hls
 param.htvideo.url="";
 # 南瑞视频转码服务地址
 param.nrvideo.url="";
+#南瑞视频平台通过视频id获取flv格式视频播放地址
+param.nrflvbyvoideoid.url=http://192.168.4.159:10010/api/media/live

amos-boot-system-equip/src/main/resources/application-test.properties

@@ -61,3 +61,5 @@ window.vedioFormat = hls
 param.htvideo.url="";
 # 南瑞视频转码服务地址
 param.nrvideo.url="";
+#南瑞视频平台通过视频id获取flv格式视频播放地址
+param.nrflvbyvoideoid.url=http://192.168.4.159:10010/api/media/live

amos-boot-system-equip/src/main/resources/mapper/CarPropertyMapper.xml

@@ -9,6 +9,8 @@
         wcp.remark AS remark,
         wcp.equipment_index_id AS equipmentIndexId,
         wei.name_key AS nameKey,
+        wei.name_key AS equipmentIndexKey,
+        wei.name as equipmentIndexName,
         wcp.is_alarm as isAlarm,
 		wcp.emergency_level_color as emergencyLevelColor,
 		wcp.emergency_level as emergencyLevel,