Commit 2246194b by libin

时空伴随任务采集时开始结束时间规则修改,提示信息修改

parent 3f4f1c27
package com.founder.interservice.sksjzc.common;
import com.founder.interservice.regionalanalysis.service.RegionalAnalysisService;
import com.founder.interservice.sksjzc.qyph.service.QyphService;
import com.founder.interservice.spatiotemporalBackTrack.service.SpatiotemporalBackTrackService;
import com.founder.interservice.tracktraveltogether.service.TrackTogetherService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
@Service
public class SksjzcCommonService {
@Autowired
private RegionalAnalysisService regionalAnalysisService;
@Autowired
private TrackTogetherService trackTogetherService;
@Autowired
private SpatiotemporalBackTrackService spatiotemporalBackTrackService;
@Autowired
private QyphService qyphService;
public Map<String,Object> getSksjzcAllCount(){
ExecutorService executor= Executors.newCachedThreadPool();
List<Future> futureList = new ArrayList<>();
//区域碰撞总数统计
Future qypzCountFuture = executor.submit(new Callable<Object>() {
@Override
public Object call() throws Exception {
return null;
}
});
futureList.add(qypzCountFuture);
return null;
}
}
...@@ -42,8 +42,6 @@ function submit() { ...@@ -42,8 +42,6 @@ function submit() {
var taskCaseId = $("#taskCaseId").val(); var taskCaseId = $("#taskCaseId").val();
console.info($('#form1').serialize())
console.info($('#form1').serializeArray())
if($('#form1').form('enableValidation').form('validate')){ if($('#form1').form('enableValidation').form('validate')){
var kssj = $("#datepicker1").val(); var kssj = $("#datepicker1").val();
var jssj = $("#datepicker2").val(); var jssj = $("#datepicker2").val();
...@@ -51,9 +49,8 @@ function submit() { ...@@ -51,9 +49,8 @@ function submit() {
var endTime = new Date(jssj); var endTime = new Date(jssj);
var usedTime = endTime - startTime; // 相差的毫秒数 var usedTime = endTime - startTime; // 相差的毫秒数
var days = Math.floor(usedTime / (24 * 3600 * 1000)); // 计算出天数 var days = Math.floor(usedTime / (24 * 3600 * 1000)); // 计算出天数
console.log("天数="+days)
if(days>1){ if(days>1){
$.messager.show({title:'提示',msg:'提示:最小时间间隔为2小时,当天伴随最大时间为8小时,历史伴随时间间隔为24小时!'}); $.messager.show({title:'提示',msg:'提示:当天伴随最大时间间隔不超过4小时,历史伴随时间间隔不超过24小时!'});
return; return;
} }
$(".loading-wrap").show(); $(".loading-wrap").show();
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<td class="ar" width="13.3%">标识号类型:</td> <td class="ar" width="13.3%">标识号类型:</td>
<td width="20%"> <td width="20%">
<span class="textbox" style="border:none;"> <span class="textbox" style="border:none;">
<select name = "objectType" id="objectType" class="easyui-combobox" data-options="panelHeight:'auto'" style="height:26px;"> <select name = "objectType" id="objectType" readonly="true" class="easyui-combobox" data-options="panelHeight:'auto'" style="height:26px;">
<option value=""></option> <option value=""></option>
<c:if test="${flag eq 'skbsjsp'}"> <c:if test="${flag eq 'skbsjsp'}">
<option value="3996" <c:if test="${objectType eq '3996'}">selected="selected"</c:if>>手机号码</option> <option value="3996" <c:if test="${objectType eq '3996'}">selected="selected"</c:if>>手机号码</option>
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
</c:if> </c:if>
<c:if test="${flag eq 'skbs'}"> <c:if test="${flag eq 'skbs'}">
<%-- <option value="3996">手机号码</option>--%> <%-- <option value="3996">手机号码</option>--%>
<option value="4314">IMSI</option> <option value="4314" selected="true">IMSI</option>
<%-- <option value="6424">车牌号</option>--%> <%-- <option value="6424">车牌号</option>--%>
</c:if> </c:if>
</select> </select>
...@@ -99,17 +99,17 @@ ...@@ -99,17 +99,17 @@
<td class="ar">伴随开始时间:</td> <td class="ar">伴随开始时间:</td>
<td> <td>
<span class="textbox" style="border:none;"> <span class="textbox" style="border:none;">
<input id="datepicker1" name="sTime" class="val easyui-validatebox Wdate zdy-wdate" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'datepicker2\',{d:-1})}',maxDate:'#F{$dp.$D(\'datepicker2\',{H:-2})}'})" data-options="required:true"/> <input id="datepicker1" name="sTime" onclick="limitDate()" onchange="limitDate()" class="val easyui-validatebox Wdate zdy-wdate" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'datepicker2\',{d:-1})}',maxDate:'#F{\'%y-%M-%d 23:59:59\'}'})" data-options="required:true"/>
</span> </span>
</td> </td>
<td class="ar">伴随结束时间:</td> <td class="ar">伴随结束时间:</td>
<td> <td>
<span class="textbox" style="border:none;"> <span class="textbox" style="border:none;">
<input id="datepicker2" name="eTime" class="val easyui-validatebox Wdate zdy-wdate" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'datepicker1\',{H:2})}',maxDate:'#F{$dp.$D(\'datepicker1\',{d:1})}'})" data-options="required:true"/> <input id="datepicker2" name="eTime" class="val easyui-validatebox Wdate zdy-wdate" type="text" onkeypress="return checkDateFmt();" data-options="required:true"/>
</span> </span>
</td> </td>
</tr> </tr>
<tr><td colspan="4" style="text-indent: 127px;color: red;">提示:最小时间间隔为2小时,当天伴随最大时间为8小时,历史伴随时间间隔为24小时。</td></tr> <tr><td colspan="4" style="text-indent: 127px;color: red;">提示:当天伴随最大时间间隔不超过4小时,历史伴随时间间隔不超过24小时。</td></tr>
<tr> <tr>
<td class="ar" width="13.3%">发送人警号:</td> <td class="ar" width="13.3%">发送人警号:</td>
<td width="20%"> <td width="20%">
...@@ -154,8 +154,10 @@ ...@@ -154,8 +154,10 @@
<script type="text/javascript" src="/common/datepicker/WdatePicker.js"></script> <script type="text/javascript" src="/common/datepicker/WdatePicker.js"></script>
<script type="text/javascript" src="/common/datepicker/calendar.js"></script> <script type="text/javascript" src="/common/datepicker/calendar.js"></script>
<script> <script>
//onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'datepicker1\')}',maxDate:'#F{\'%y-%M-%d 23:59:59\'}'})"
$(document).ready(function() { $(document).ready(function() {
document.getElementById("datepicker1").value = today(); document.getElementById("datepicker1").value = today();
initLimitTime();
}); });
function today(){ function today(){
var today=new Date(); var today=new Date();
...@@ -172,6 +174,100 @@ ...@@ -172,6 +174,100 @@
ss = ss < 10 ? "0" + ss:ss; ss = ss < 10 ? "0" + ss:ss;
return h+"-"+m+"-"+d+" "+hh+":"+mm+":"+ss; return h+"-"+m+"-"+d+" "+hh+":"+mm+":"+ss;
} }
function limitDate(){
var todays=new Date();
var h=todays.getFullYear();
var m=todays.getMonth()+1;
var d=todays.getDate();
m= m<10?"0"+m:m;
d= d<10?"0"+d:d;
var todayMax=new Date(h+"-"+m+"-"+d+" 23:59:59");
var startTimeVal=$("#datepicker1").val();
if(startTimeVal){
var startTime=new Date(startTimeVal);
var minus=(todays - startTime) / (1000 * 60 * 60 * 24);
if(minus>1){//历史时间
$("#datepicker2").off("focus").on("focus",function(){
WdatePicker({
dateFmt:'yyyy-MM-dd HH:mm:ss',
minDate:'#F{$dp.$D(\'datepicker1\')}',
maxDate:'#F{$dp.$D(\'datepicker1\',{d:+1})}'
})
});
}else{
var minusH=(todayMax.getTime() - startTime.getTime()) / (1000 * 60 * 60 );
if(minusH<4){
$("#datepicker2").off("focus").on("focus",function(){
console.log("set today !");
WdatePicker({
dateFmt:'yyyy-MM-dd HH:mm:ss',
minDate:'#F{$dp.$D(\'datepicker1\')}',
maxDate:'%y-%M-%d 23:59:59'
});
});
}else{
$("#datepicker2").off("focus").on("focus",function(){
WdatePicker({
dateFmt:'yyyy-MM-dd HH:mm:ss',
minDate:'#F{$dp.$D(\'datepicker1\')}',
maxDate:'#F{$dp.$D(\'datepicker1\',{H:+4})}'
});
});
}
}
}else{
$.messager.alert({title:'提示',msg:'请选择开始时间!'});
$("#datepicker1").val(today());
$("#datepicker2").val("");
}
}
function initLimitTime(){
var todays=new Date();
var h=todays.getFullYear();
var m=todays.getMonth()+1;
var d=todays.getDate();
m= m<10?"0"+m:m;
d= d<10?"0"+d:d;
var todayMax=new Date(h+"-"+m+"-"+d+" 23:59:59");
var startTimeVal=$("#datepicker1").val();
if(startTimeVal){
var startTime=new Date(startTimeVal);
var sh=startTime.getFullYear();
var sm=startTime.getMonth()+1;
var sd=startTime.getDate();
var shh=startTime.getHours();
var smm=startTime.getMinutes();
var sss=startTime.getSeconds();
var startTimeVal=$("#datepicker1").val();
var startTime=new Date(startTimeVal);
var minusH=(todayMax.getTime() - startTime.getTime()) / (1000 * 60 * 60 );
if(minusH<4){
$("#datepicker2").off("focus").on("focus",function(){
WdatePicker({
dateFmt:'yyyy-MM-dd HH:mm:ss',
minDate:'#F{$dp.$D(\'datepicker1\')}',
maxDate:'%y-%M-%d 23:59:59'
});
});
}else{
$("#datepicker2").off("focus").on("focus",function(){
WdatePicker({
dateFmt:'yyyy-MM-dd HH:mm:ss',
minDate:'#F{$dp.$D(\'datepicker1\')}',
maxDate:'#F{$dp.$D(\'datepicker1\',{H:+4})}'
});
});
}
}else{
$.messager.alert({title:'提示',msg:'请选择开始时间!'});
$("#datepicker1").val(today());
$("#datepicker2").val("");
}
}
</script> </script>
<script type="text/javascript" src="/js/bsrwInsert.js"></script> <script type="text/javascript" src="/js/bsrwInsert.js"></script>
</body> </body>
......
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