Skip to content

B
bigdatainterservice
Commit 874b45a9 by yanru
Options

修改定时任务，当调取网安接口的状态和库中数据状态不一致时更新状态信息

parent 2a6b9b86
Showing with 13 additions and 30 deletions
src/main/java/com/founder/interservice/regionalanalysis/service/impl/RegionalsScheduledService.java
...@@ -80,10 +80,13 @@ public class RegionalsScheduledService { ...@@ -80,10 +80,13 @@ public class RegionalsScheduledService {
if(!taskInfoResult.startsWith("Rate")){ if(!taskInfoResult.startsWith("Rate")){
if(null != taskInfoResult && taskInfoResult.startsWith("{")){ if(null != taskInfoResult && taskInfoResult.startsWith("{")){
getAndSaveInfo(taskInfoResult,task); getAndSaveInfo(taskInfoResult,task);
updateTaskStates(taskId,progress,state); //updateTaskStates(taskId,progress,state);
} }
} }
} }
if(!task.getProgress().equals(progress) || !task.getState().equals(state)){
updateTaskStates(task.getTaskId(),progress,state); //修改任务状态
}
} }
} }
}catch (Exception e){ }catch (Exception e){
......
src/main/java/com/founder/interservice/regionalanalysis/service/impl/ScheduledService.java
...@@ -82,10 +82,12 @@ public class ScheduledService { ...@@ -82,10 +82,12 @@ public class ScheduledService {
if(!taskInfoResult.startsWith("Rate")){ if(!taskInfoResult.startsWith("Rate")){
if(null != taskInfoResult && taskInfoResult.startsWith("{")){ if(null != taskInfoResult && taskInfoResult.startsWith("{")){
getAndSaveInfo(taskInfoResult,task); getAndSaveInfo(taskInfoResult,task);
updateTaskStates(taskId,progress,state);
} }
} }
} }
if(!task.getProgress().equals(progress) || !task.getState().equals(state)){
updateTaskStates(task.getTaskId(),progress,state); //修改任务状态
}
} }
} }
}catch (Exception e){ }catch (Exception e){
......
src/main/java/com/founder/interservice/tracktraveltogether/service/impl/TogetherScheduledService.java
...@@ -64,7 +64,6 @@ public class TogetherScheduledService { ...@@ -64,7 +64,6 @@ public class TogetherScheduledService {
System.out.println("=============TogetherTask Start Running================"); System.out.println("=============TogetherTask Start Running================");
System.out.println("=============TogetherTask Start Running================"); System.out.println("=============TogetherTask Start Running================");
System.out.println("=============TogetherTask Start Running================"); System.out.println("=============TogetherTask Start Running================");
System.out.println("Thread Name：=======" + Thread.currentThread().getName());
try{ try{
//1 下去查询任务表中status = "QUEUEING","STARTING","RUNNING"的任务 //1 下去查询任务表中status = "QUEUEING","STARTING","RUNNING"的任务
List<TrackTogetherTask> taskList = taskRepository.findAll(new Specification<TrackTogetherTask>() { List<TrackTogetherTask> taskList = taskRepository.findAll(new Specification<TrackTogetherTask>() {
...@@ -79,31 +78,15 @@ public class TogetherScheduledService { ...@@ -79,31 +78,15 @@ public class TogetherScheduledService {
}); });
if(taskList != null && !taskList.isEmpty()){ if(taskList != null && !taskList.isEmpty()){
for (TrackTogetherTask task:taskList) { for (TrackTogetherTask task:taskList) {
System.out.println("=============TogetherTask taskStatusMap================");
System.out.println("=============TogetherTask taskStatusMap================");
System.out.println("=============TogetherTask taskStatusMap================");
System.out.println("=============TogetherTask taskStatusMap================");
System.out.println("=============TogetherTask taskStatusMap================");
Map<String,String> taskStatusMap = this.queryTaskStates(task.getTaskId()); Map<String,String> taskStatusMap = this.queryTaskStates(task.getTaskId());
String progress=taskStatusMap.get("progress"); String progress=taskStatusMap.get("progress");
String state =taskStatusMap.get("state"); String state =taskStatusMap.get("state");
//String progress ="1";
//String state = "FINISHED";
System.out.println("progress====="+progress+"====state====="+state);
System.out.println("progress====="+progress+"====state====="+state);
System.out.println("progress====="+progress+"====state====="+state);
if(("1".equals(progress)||"1.0".equals(progress)) && "FINISHED".equalsIgnoreCase(state)){ if(("1".equals(progress)||"1.0".equals(progress)) && "FINISHED".equalsIgnoreCase(state)){
String taskInfoResult = pushWaDataService.getTogetherTaskInfo(task.getTaskId()); String taskInfoResult = pushWaDataService.getTogetherTaskInfo(task.getTaskId());
System.out.println("============taskInfoResult=============="+taskInfoResult);
System.out.println("============taskInfoResult=============="+taskInfoResult);
System.out.println("============taskInfoResult=============="+taskInfoResult);
System.out.println("============taskInfoResult=============="+taskInfoResult);
System.out.println("============taskInfoResult=============="+taskInfoResult);
//String taskInfoResult="{ \"success\": true, \"message\": \"success\", \"data\": { \"taskId\": \"b4b147bc522828731f1a016bfa72c073-540-00-xjzd-fangzheng-6-1558149353717\", \"items\": [ { \"objectValue\": \"460026204648484\", \"objectType\": 4314, \"objectTypeName\": \"IMSI\", \"count\": 10}, { \"objectValue\": \"460027927395260\", \"objectType\": 4314, \"objectTypeName\": \"IMSI\", \"count\": 9}, { \"objectValue\": \"460008356061096\", \"objectType\": 4314, \"objectTypeName\": \"IMSI\", \"count\": 6} ]}, \"errCode\": null }"; //String taskInfoResult="{ \"success\": true, \"message\": \"success\", \"data\": { \"taskId\": \"b4b147bc522828731f1a016bfa72c073-540-00-xjzd-fangzheng-6-1558149353717\", \"items\": [ { \"objectValue\": \"460026204648484\", \"objectType\": 4314, \"objectTypeName\": \"IMSI\", \"count\": 10}, { \"objectValue\": \"460027927395260\", \"objectType\": 4314, \"objectTypeName\": \"IMSI\", \"count\": 9}, { \"objectValue\": \"460008356061096\", \"objectType\": 4314, \"objectTypeName\": \"IMSI\", \"count\": 6} ]}, \"errCode\": null }";
getAndSaveInfo(taskInfoResult); getAndSaveInfo(taskInfoResult);
updateTaskStates(task.getTaskId(),progress,state); //修改任务状态
} }
if(!StringUtils.isEmpty(state)&&!state.equals(task.getState())&&!"1".equals(progress) && !"FINISHED".equals(state)){ if(!task.getProgress().equals(progress) || !task.getState().equals(state)){
updateTaskStates(task.getTaskId(),progress,state); //修改任务状态 updateTaskStates(task.getTaskId(),progress,state); //修改任务状态
} }
} }
...@@ -115,11 +98,6 @@ public class TogetherScheduledService { ...@@ -115,11 +98,6 @@ public class TogetherScheduledService {
public void getAndSaveInfo(String taskInfoResult) throws RuntimeException{ public void getAndSaveInfo(String taskInfoResult) throws RuntimeException{
try{ try{
System.out.println("===========getAndSaveInfo============"+taskInfoResult);
System.out.println("===========getAndSaveInfo============"+taskInfoResult);
System.out.println("===========getAndSaveInfo============"+taskInfoResult);
System.out.println("===========getAndSaveInfo============"+taskInfoResult);
System.out.println("===========getAndSaveInfo============"+taskInfoResult);
if(null != taskInfoResult && taskInfoResult.startsWith("{")) { if(null != taskInfoResult && taskInfoResult.startsWith("{")) {
JSONObject o = JSONObject.parseObject(taskInfoResult); JSONObject o = JSONObject.parseObject(taskInfoResult);
JSONObject jsonObject = o.getJSONObject("data"); JSONObject jsonObject = o.getJSONObject("data");
...@@ -137,7 +115,7 @@ public class TogetherScheduledService { ...@@ -137,7 +115,7 @@ public class TogetherScheduledService {
List<TogetherTaskResult> results = taskResultRepository.findAll(example); List<TogetherTaskResult> results = taskResultRepository.findAll(example);
if (results == null || results.isEmpty()) { if (results == null || results.isEmpty()) {
taskResultRepository.save(r); taskResultRepository.save(r);
//getAndSaveRydetail(taskResults); getAndSaveRydetail(taskResults);
} }
} }
getAndSaveRydetail(taskResults); getAndSaveRydetail(taskResults);
......
src/main/resources/mybatis/mapper/xzxt/RegionalTaskMapper.xml
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
t.TASK_ID = #{taskId} t.TASK_ID = #{taskId}
</if> </if>
</where> </where>
order by t.djsj order by t.djsj desc
) t1 ) t1
where rownum <![CDATA[ <= ]]> #{endNum} where rownum <![CDATA[ <= ]]> #{endNum}
) t2 ) t2
......
src/main/resources/mybatis/mapper/xzxt/TrackTogetkerTaskMapper.xml
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
and t.TASK_ID = #{taskId} and t.TASK_ID = #{taskId}
</if> </if>
</where> </where>
order by t.djsj order by t.djsj desc
) t1 ) t1
where rownum <![CDATA[ <= ]]> #{end } where rownum <![CDATA[ <= ]]> #{end }
) t2 ) t2
......
src/main/webapp/WEB-INF/jsp/gjbs/skgjbstask.jsp
...@@ -73,7 +73,7 @@ function queryTasks(type){ ...@@ -73,7 +73,7 @@ function queryTasks(type){
{title:"伴随开始时间",field:"startTime",align:'center',width:'10%'}, {title:"伴随开始时间",field:"startTime",align:'center',width:'10%'},
{title:"伴随结束时间",field:"endTime",align:'center',width:'10%'}, {title:"伴随结束时间",field:"endTime",align:'center',width:'10%'},
{title:"任务状态",field:"state",align:'center',width:'8%',formatter : function(val,row,index){ {title:"任务状态",field:"state",align:'center',width:'8%',formatter : function(val,row,index){
if(val=="等候中"||val=="开始运行"||val=="运行中"){ if(val=="等候中"||val=="开始运行"||val=="执行中"||val=="运行中"){
return val+"<i class=\"fa fa-spinner fa-pulse fa-fw\"></i>"; return val+"<i class=\"fa fa-spinner fa-pulse fa-fw\"></i>";
}else if(val=="已完成"){ }else if(val=="已完成"){
return val+"<i class=\"fa fa-check-circle-o fa-zdy1\" aria-hidden=\"true\"></i>"; return val+"<i class=\"fa fa-check-circle-o fa-zdy1\" aria-hidden=\"true\"></i>";
......
src/main/webapp/WEB-INF/jsp/qypz/skgjpztask.jsp
...@@ -66,7 +66,7 @@ function queryTasks(type){ ...@@ -66,7 +66,7 @@ function queryTasks(type){
{title:"碰撞表达式",field:"expression",align:'center',width:'10%'}, {title:"碰撞表达式",field:"expression",align:'center',width:'10%'},
{title:"区域个数",field:"qyCount",align:'center',width:'7%'}, {title:"区域个数",field:"qyCount",align:'center',width:'7%'},
{title:"任务状态",field:"state",align:'center',width:'10%',formatter : function(val,row,index){ {title:"任务状态",field:"state",align:'center',width:'10%',formatter : function(val,row,index){
if(row.state=="等候中"||row.state=="开始运行"||row.state=="执行中"){ if(row.state=="等候中"||row.state=="开始运行"||row.state=="执行中"||row.state=="运行中"){
return row.state+"<i class=\"fa fa-spinner fa-pulse fa-fw\"></i>"; return row.state+"<i class=\"fa fa-spinner fa-pulse fa-fw\"></i>";
}else if(row.state=="标识号调取完成"||row.state=="比对碰撞已完成"){ }else if(row.state=="标识号调取完成"||row.state=="比对碰撞已完成"){
return row.state+"<i class=\"fa fa-check-circle-o fa-zdy1\" aria-hidden=\"true\"></i>"; return row.state+"<i class=\"fa fa-check-circle-o fa-zdy1\" aria-hidden=\"true\"></i>";
......
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