ufo / ufo-platform · Commits

Go to a project

Authored by mali
Commit 4eacb368895d8ac4b9d97fd9859d04b89b9b5cfe 1 parent 5e6253d8

鉴定视频优化

Inline Side-by-side
Showing 2 changed files with 26 additions and 26 deletions
... ... @@ -49,7 +49,7 @@ public class LiveEventsListener implements ApplicationListener<QiniuLiveRecordEv
record.setEndTime(DateUtil.getCurrentTimeSeconds()); // 鉴定通过和不通过的时候，默认视频结束
if (record.getEndTime() - record.getStartTime() > 1200) {
if (record.getStartTime() == null || record.getEndTime() - record.getStartTime() > 1200) {
LOGGER.error("The length of video overstep 20 minutes, event : {}", event);
return;
}
... ...
... ... @@ -293,8 +293,8 @@ function getToBeJudgedList(){
return "<a role='confirm' dataId='"+ rowData.id +"' style='margin-left:10px;background-color: #5cb85c !important;'>确认收货</a>";
} else if (rowData.status == 3) {
var cameraText = window.localStorage.getItem('ufo:' + rowData.orderCode) ? getTimeStrFrom(window.localStorage.getItem('ufo:' + rowData.orderCode)) : '开始录制';
var operateButton = "<a role='pass' dataId='"+ rowData.id + "'" + " orderCode='"+rowData.orderCode +"' style='margin-left:10px;background-color: #5cb85c !important;'>鉴定通过</a>"+
"<a role='reject' dataId='"+ rowData.id + "'" + " skup='"+rowData.skup +"' style='margin-left:10px;background-color: #d9534f !important; color: #fff !important;'>鉴定不通过</a>"+
var operateButton = "<a role='pass' dataId='"+ rowData.id + "'" + " skup='"+rowData.skup + "' orderCode='"+rowData.orderCode +"' style='margin-left:10px;background-color: #5cb85c !important;'>鉴定通过</a>"+
"<a role='reject' dataId='"+ rowData.id + "'" + " skup='"+rowData.skup + "' orderCode='"+rowData.orderCode +"' style='margin-left:10px;background-color: #d9534f !important; color: #fff !important;'>鉴定不通过</a>"+
"<a role='record' dataId='"+ rowData.id + "' order_code='" + rowData.orderCode + "' skup='"+rowData.skup +"' style='margin-left:10px;background-color: #5bc0de !important; color: #fff !important;'>" + cameraText + "</a>";
if (rowData.containMp4Flag) {
operateButton += "<a role='query' dataId='"+ rowData.id + "' order_code='" + rowData.orderCode + "' skup='"+rowData.skup +"' style='margin-left:10px;background-color: #FFCC33 !important;'>查看视频</a>";
... ... @@ -345,6 +345,8 @@ function getToBeJudgedList(){
onClick: function () {
var buyerOrderCode = $(this).attr("orderCode");
$("#buyerOrderCode").val(buyerOrderCode);
var skup = $(this).attr("skup");
$("#skup").val(skup);
addPassPage($(this).attr("dataId"));
}
});
... ... @@ -353,6 +355,8 @@ function getToBeJudgedList(){
onClick: function () {
var skup = $(this).attr("skup");
$("#skup").val(skup);
var buyerOrderCode = $(this).attr("orderCode");
$("#buyerOrderCode").val(buyerOrderCode);
addRejectPage($(this).attr("dataId"));
}
});
... ... @@ -612,6 +616,15 @@ function viewExpressPage() {
}
function addPassPage(id) {
$.post(contextPath + "/live/generateMp4Vedio", {
depotNo: $("#depotNo").combobox("getValue") ,
orderCode : document.getElementById("buyerOrderCode").value,
skup : document.getElementById("skup").value,
startTime : window.localStorage.getItem('ufo:' + document.getElementById("buyerOrderCode").value)
}, function(data) {
window.localStorage.removeItem('ufo:' + document.getElementById("buyerOrderCode").value);
});
var div = $("<div id='passDiv'>").appendTo($(document.body));
var url = contextPath + "/html/judgeCenter/pass.html?time_version=" + new Date().getTime();
$(div).myDialog({
... ... @@ -669,6 +682,15 @@ function addRebackPage(id) {
}
function addRejectPage(id) {
$.post(contextPath + "/live/generateMp4Vedio", {
depotNo: $("#depotNo").combobox("getValue") ,
orderCode : document.getElementById("buyerOrderCode").value,
skup : document.getElementById("skup").value,
startTime : window.localStorage.getItem('ufo:' + document.getElementById("buyerOrderCode").value)
}, function(data) {
window.localStorage.removeItem('ufo:' + document.getElementById("buyerOrderCode").value);
});
var div = $("<div id='rejectDiv'>").appendTo($(document.body));
var url = contextPath + "/html/judgeCenter/reject.html?time_version=" + new Date().getTime();;
$(div).myDialog({
... ... @@ -733,7 +755,7 @@ function addRecordPage(skup, order_code, id) {
} else if (data.code == 200){ // 保存开始时间
window.localStorage.setItem('ufo:' + order_code, data.data);
var timeStr = getTimeStrFrom(window.localStorage.getItem('ufo:' + order_code));
$('a[order_code="9838419836930"]').find('.l-btn-text').html(timeStr);
$('a[order_code="9838419836930"]:eq(0)').find('.l-btn-text').html(timeStr);
} else {
window.self.$.messager.alert("失败", "服务器异常，稍后再试", "error");
}
... ... @@ -756,18 +778,6 @@ function addQueryPage(skup, order_code, id) {
function deliverGoods(id){
$.post(contextPath + "/live/generateMp4Vedio", {
id : id,
status : 4,
depotNo: $("#depotNo").combobox("getValue") ,
orderCode : document.getElementById("buyerOrderCode").value,
skup : document.getElementById("skup").value,
startTime : window.localStorage.getItem('ufo:' + document.getElementById("buyerOrderCode").value)
}, function(data) {
window.localStorage.removeItem('ufo:' + document.getElementById("buyerOrderCode").value);
});
var expressCompanyId = $("#expressCompany").myCombobox("getValue");
var waybillCode = $("#waybillCode").textbox("getValue");
var mobile = $("#receiveInfo_mobile").val();
... ... @@ -848,16 +858,6 @@ function reBackGoods(id){
//鉴定不通过寄回
function sendBackGoods(id){
$.post(contextPath + "/live/generateMp4Vedio", {
id : id,
status : 4,
depotNo: $("#depotNo").combobox("getValue") ,
orderCode : document.getElementById("buyerOrderCode").value,
skup : document.getElementById("skup").value,
startTime : window.localStorage.getItem('ufo:' + document.getElementById("buyerOrderCode").value)
}, function(data) {
window.localStorage.removeItem('ufo:' + document.getElementById("buyerOrderCode").value);
});
var expressCompanyId = $("#expressCompany").myCombobox("getValue");
var waybillCode = $("#waybillCode").textbox("getValue");
var mobile = $("#sendBackInfo_mobile").val();
... ...