Skip to content

A
amos-boot-biz
Commit 70c7fb9b authored by tangwei's avatar tangwei
Browse files
Options

Merge branch 'developer' into develop_ccs

parents f82c1cbb 0ddd9fdc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 20 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/entity/FireEquipmentFireAlarm.java
View file @ 70c7fb9b
......@@ -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
View file @ 70c7fb9b
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;
......@@ -78,6 +79,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;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java
View file @ 70c7fb9b
......@@ -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
View file @ 70c7fb9b
......@@ -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
View file @ 70c7fb9b
......@@ -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;
......@@ -96,6 +96,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
View file @ 70c7fb9b
......@@ -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
View file @ 70c7fb9b
......@@ -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
View file @ 70c7fb9b
......@@ -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/StockServiceImpl.java
View file @ 70c7fb9b
......@@ -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
View file @ 70c7fb9b
......@@ -82,6 +82,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;
}
......@@ -530,6 +534,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 {
......@@ -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
View file @ 70c7fb9b
......@@ -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
View file @ 70c7fb9b
......@@ -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
View file @ 70c7fb9b
......@@ -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
View file @ 70c7fb9b
......@@ -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
View file @ 70c7fb9b
......@@ -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
View file @ 70c7fb9b
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment