时空绘制的推荐功能全区域改为轨迹吻合度100%

src/main/java/com/founder/interservice/regionalanalysis/controller/RegionalAnalysisController.java

@@ -733,7 +733,7 @@ public class RegionalAnalysisController {
 
     /**/
     @RequestMapping(value = "/toTjDialog",method = {RequestMethod.GET,RequestMethod.POST})
-        public  ModelAndView toTjDialog(String taskId,boolean isCount,String tjCount,String tjType,String asjbh,String sfzhUser,String fsrjh,String djsjStr){
+        public  ModelAndView toTjDialog(String taskId,boolean isCount,String tjCount,String tjType,String asjbh,String sfzhUser,String fsrjh,String djsjStr,String type){
         ModelAndView modelAndView = new ModelAndView("qypz/tjDialog");
         modelAndView.addObject("taskId",taskId);
         modelAndView.addObject("isCount",isCount);
@@ -743,6 +743,7 @@ public class RegionalAnalysisController {
         modelAndView.addObject("sfzhUser",sfzhUser);
         modelAndView.addObject("fsrjh",fsrjh);
         modelAndView.addObject("djsjStr",djsjStr);
+        modelAndView.addObject("type",type);
         return modelAndView;
     }
 

src/main/java/com/founder/interservice/regionalanalysis/model/RegionalTaskResultDetail.java

@@ -60,6 +60,8 @@ public class RegionalTaskResultDetail extends PageBean{
     private String tjType;//推荐类型：1：人员 2：号码： 3 车辆
     @Transient
     private String gwdqs;//高危地区
+    @Transient
+    private String type;//区分区域碰撞或者时空绘制
 
 
 

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

@@ -441,7 +441,11 @@ public class RegionalAnalysisServiceImpl implements RegionalAnalysisService {
                 if("false".equals(entity.getIsCount())){
                     list=regionalTaskResultDetailMapper.findRegionalTaskResultTjList(entity);
                 }
+                if("skhz".equals(entity.getType())){
+                    tjly="轨迹吻合度100%";
+                }else{
                     tjly="全区域";
+                }
             }else{
                 entity.setSfFzxyr("");
                 entity.setSfGwry("");
@@ -453,7 +457,11 @@ public class RegionalAnalysisServiceImpl implements RegionalAnalysisService {
                     if("false".equals(entity.getIsCount())){
                         list=regionalTaskResultDetailMapper.findRegionalTaskResultTjList(entity);
                     }
+                    if("skhz".equals(entity.getType())){
+                        tjly="轨迹吻合度100%";
+                    }else{
                         tjly="全区域";
+                    }
                 }else{
                     entity.setRegionlist("");
                     //高危/前科
@@ -471,10 +479,14 @@ public class RegionalAnalysisServiceImpl implements RegionalAnalysisService {
                             if("false".equals(entity.getIsCount())){
                                 list=regionalTaskResultDetailMapper.findRegionalTaskResultTjList(entity);
                             }
+                            if("skhz".equals(entity.getType())){
+                                tjly="轨迹吻合度100%";
+                            }else{
                                 tjly="全区域";
                             }
                         }
                     }
+                }
 
             }
             if (null != list && list.size() > 0) {
@@ -527,7 +539,12 @@ public class RegionalAnalysisServiceImpl implements RegionalAnalysisService {
                     if("false".equals(entity.getIsCount())){
                         list=regionalTaskResultDetailMapper.findRegionalTaskResultTjList(entity);
                     }
+                    if("skhz".equals(entity.getType())){
+                        tjly="高危地域、轨迹吻合度100%";
+                    }else{
                         tjly="高危地域、全区域";
+                    }
+
                 }else{
                     //所属高危地狱
                     entity.setRegionlist("");
@@ -546,9 +563,13 @@ public class RegionalAnalysisServiceImpl implements RegionalAnalysisService {
                             if("false".equals(entity.getIsCount())){
                                 list=regionalTaskResultDetailMapper.findRegionalTaskResultTjList(entity);
                             }
+                            if("skhz".equals(entity.getType())){
+                                tjly="轨迹吻合度100%";
+                            }else{
                                 tjly="全区域";
                             }
                         }
+                    }
 
                 }
             }else{//如果没有高危地区，直接取全区域手机号码
@@ -559,9 +580,13 @@ public class RegionalAnalysisServiceImpl implements RegionalAnalysisService {
                     if("false".equals(entity.getIsCount())){
                         list=regionalTaskResultDetailMapper.findRegionalTaskResultTjList(entity);
                     }
+                    if("skhz".equals(entity.getType())){
+                        tjly="轨迹吻合度100%";
+                    }else{
                         tjly="全区域";
                     }
                 }
+            }
             resultMap.setCount(count);
             resultMap.setData(list);
             resultMap.setTjly(tjly);

src/main/resources/static/js/qypzjgxsNew.js

@@ -881,7 +881,7 @@ function showDialog(tjType) {
         if(count!=0){
     openUrlForm({
         id:dialogId,
-        url:'/toTjDialog?taskId='+taskId+"&isCount=false&tjCount="+ count+"&tjType="+tjType+"&asjbh="+asjbh+"&sfzhUser="+sfzhUser+"&fsrjh="+fsrjh+"&djsjStr="+djsjStr+"&yhCate=00&projectName=刑专智慧侦查脑图",
+        url:'/toTjDialog?taskId='+taskId+"&isCount=false&tjCount="+ count+"&tjType="+tjType+"&asjbh="+asjbh+"&sfzhUser="+sfzhUser+"&fsrjh="+fsrjh+"&djsjStr="+djsjStr+"&type="+type+"&yhCate=00&projectName=刑专智慧侦查脑图",
         title:'<img src="'+imgUrl+'" style="height:25px;position:relative;top:-2px;"/><span style="color: #06532f;font-weight: 600;">智能推荐</span>',
         width:width,
         height:408,

src/main/resources/static/js/tjDialog.js

@@ -26,7 +26,7 @@ function esbfydatathread(page,limit) {
         dataType: 'json',
         //async:false,
         //timeout: 0, //超时时间设置，单位毫秒
-        data: {taskId:taskId,isCount:isCount,page:page,limit:limit,yhCate:00,projectName:00},
+        data: {taskId:taskId,isCount:isCount,page:page,limit:limit,type:type,yhCate:00,projectName:00},
         success: function (esbdatas) {
             $(".loading").hide();
             if(esbdatas.data.length>0){
@@ -34,7 +34,6 @@ function esbfydatathread(page,limit) {
                 //数据加载...
                 $.each(esbdatas.data, function (n, data) {
                     var tjly="";
-                    debugger;
                     if(tjType==1 || tjType==4 || tjType==6){
                         $(".result-box:last").clone().appendTo(".dialog-content");
                         if(data.ryzp == null){
@@ -80,7 +79,11 @@ function esbfydatathread(page,limit) {
                         $(".ryzp:last").attr("src", "/images/car.png");
                         var ychy='<img src="/images/asjxx_ychy.png" width=20 height=20  onclick="sksjzcYchy(this,\''+data.objectValue+'\',\''+''+'\',\''+data.objectType+'\',\'2\',\'1\')"/>';
                         $(".eclipse1:last").html("<span style='position: relative;top:-5px;'>"+data.objectValue+"</span>"+ychy);
+                        if(type=="skhz"){
+                            $(".eclipse3:last").html("轨迹吻合度100%");
+                        }else{
                             $(".eclipse3:last").html("全区域");
+                        }
                         $(".result-box-cl:last").show();
                     }
 

src/main/webapp/WEB-INF/jsp/qypz/qypzjgxsNew.jsp

@@ -415,6 +415,8 @@
     var tjhmCount="${tjhmCount}";
     var tjclCount="${tjclCount}";
 
+    var type="${type}";//区分区域碰撞或者时空绘制
+
     $(window).scroll(function(){
         console.log($(document).scrollTop());
         if($(document).scrollTop()>=(gdWrap_H-140)){

src/main/webapp/WEB-INF/jsp/qypz/tjDialog.jsp

@@ -59,6 +59,7 @@
     var sfzhUser='${sfzhUser}';
     var fsrjh='${fsrjh}';
     var djsjStr='${djsjStr}';
+    var type='${type}';
     esbfydatathread(1,limit);
    /* $('.M-box11').pagination({
         mode: 'fixed',