取消线程审批

src/main/java/com/founder/interservice/dzgz/service/impl/DzgzScheduledServer.java

@@ -45,7 +45,7 @@ public class DzgzScheduledServer{
     private PushWaDataService pushWaDataService;
 
 
-    @Scheduled(initialDelay = 60000,fixedDelay = 60000) //项目启动后延迟1分钟执行，每次执行完后一分钟后再次执行
+    /*@Scheduled(initialDelay = 60000,fixedDelay = 60000) *///项目启动后延迟1分钟执行，每次执行完后一分钟后再次执行
     public void queryTaskResult(){
         System.out.println("=============DZGZ Thread startting ===============");
         System.out.println("=============DZGZ Thread startting ===============");
@@ -361,7 +361,7 @@ public class DzgzScheduledServer{
     /**
      * 进行案前踩点与案后分析模型的分析
      */
-    @Scheduled(initialDelay = 60000,fixedDelay = 60000) //项目启动后延迟1分钟执行，每次执行完后一分钟后再次执行
+   /* @Scheduled(initialDelay = 60000,fixedDelay = 60000)*/ //项目启动后延迟1分钟执行，每次执行完后一分钟后再次执行
     public void getTaskResult(){
         System.out.println("=============AJDZGZ Thread startting ===============");
         System.out.println("=============AJDZGZ Thread startting ===============");

src/main/java/com/founder/interservice/regionalanalysis/service/impl/RegionalsScheduledService.java

@@ -73,7 +73,7 @@ public class RegionalsScheduledService {
             if(regionalsTaskList != null && !regionalsTaskList.isEmpty()){
                 String taskId = null,progress=null,state=null,result=null;Map<String,String> waRegionalsTaskMap=null;
                 for (RegionalsTask task:regionalsTaskList) {
-                    XdhSpUtil xdhSpUtil = new XdhSpUtil();
+                   /* XdhSpUtil xdhSpUtil = new XdhSpUtil();
                     String sqdx = "";
                     if(!StringUtil.ckeckEmpty(task.getTaskId())){
                         String[] idArr = task.getTaskId().split("-");
@@ -83,8 +83,9 @@ public class RegionalsScheduledService {
                     String spzt = "";
                     if (obj!=null){
                         spzt = (String) obj.get("data");
-                        if("1".equals(spzt)){
+                        if("1".equals(spzt)) {
                             //审批通过
+                        }}*/
                             taskId = task.getTaskId();
                             //查询比对结果状态
                             waRegionalsTaskMap = this.queryTaskStates(taskId);
@@ -107,8 +108,6 @@ public class RegionalsScheduledService {
                                 updateTaskStates(task.getTaskId(),progress,state); //修改任务状态
                             }
                         }
-                    }
-                }
             }
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/founder/interservice/tracktraveltogether/service/impl/TogetherScheduledService.java

@@ -82,13 +82,17 @@ public class TogetherScheduledService {
             });
             if(taskList != null && !taskList.isEmpty()){
                 for (TrackTogetherTask task:taskList) {
-                    XdhSpUtil xdhSpUtil = new XdhSpUtil();
+                    //取消审批
+                   /* XdhSpUtil xdhSpUtil = new XdhSpUtil();
                     JSONObject obj = xdhSpUtil.getSpResultUtil(task.getTaskCaseId(),task.getFsrIdentity(),task.getObjectValue(),"时空轨迹伴随",bizCode,cjServiceId);
                     String spzt = "";
                     if (obj!=null){
                         spzt = (String) obj.get("data");
                         if("1".equals(spzt)){
-                            //审批通过
+                        //审批通过
+                        }
+                    }*/
+
                             Map<String,String> taskStatusMap = this.queryTaskStates(task.getTaskId());
                             String  progress=taskStatusMap.get("progress");
                             String state =taskStatusMap.get("state");
@@ -100,8 +104,6 @@ public class TogetherScheduledService {
                             if(!task.getProgress().equals(progress) || !task.getState().equals(state)){
                                 updateTaskStates(task.getTaskId(),progress,state); //修改任务状态
                             }
-                        }
-                    }
                 }
             }
         }catch (Exception e){

src/main/resources/static/js/ychy.js

@@ -60,7 +60,7 @@ function toBssa(zjhm,asjbh){
 //轨迹回溯
 function toGjhs(objectValue,objectType) {
     var curDate = new Date();
-    var kssj = new Date(curDate.getTime() - 120*60*60*1000).format("yyyy-MM-dd");//当前时间前推五天
+    var kssj = new Date(curDate.getTime() - 48*60*60*1000).format("yyyy-MM-dd");//当前时间前推五天
     var jssj = new Date(curDate.getTime()).format("yyyy-MM-dd");//当前时间格式化
 	if (objectType == "4314"){
 		objectType = "006";

src/main/webapp/WEB-INF/jsp/ysgjzs.jsp

@@ -126,7 +126,7 @@
 			"yhCate":"00",
 			"projectName":"刑专智慧侦查脑图"
 		};
-		/*$("#gjzsTable").datagrid({
+		$("#gjzsTable").datagrid({
 			url: "/pageTrackList",
 			columns : [table_title],
 			queryParams:param,
@@ -142,7 +142,7 @@
 			loadFilter: function(data){
 				return data;
 			}
-		});*/
+		});
 	});
 	function doClear(){
 		$("#kssj").val('');