Merge remote-tracking branch 'origin/master'

src/main/java/com/founder/interservice/protogenesis/controller/ProtoController.java

@@ -316,6 +316,9 @@ public class ProtoController {
                         regionalsTask.setTaskCaseId(paramObject.getString("taskCaseId"));
                         regionalsTask.setFsrJh(paramObject.getString("username"));
                         regionalsTask.setFsrIdentity(paramObject.getString("fsrSfzh"));
+                        if(null!=paramObject&&paramObject.containsKey("taskType")){
+                            regionalsTask.setTaskType(paramObject.getString("taskType"));
+                        }
                         //regionalsTask.setDjsj(new Date());
                         regionalsTask.setProgress("0");
                         regionalsTask.setState("QUEUEING");

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

@@ -53,5 +53,6 @@ public class RegionalsTask {
     //区分区域碰撞或时空绘制
     @Transient
     private String type;
+    private String taskType;
 
 }

src/main/java/com/founder/interservice/spatiotemporalBackTrack/controller/SpatiotemporalBackTrackController.java

@@ -51,6 +51,10 @@ public class SpatiotemporalBackTrackController {
                     String asjbh = jsonObject.getString("taskCaseId");
                     String taskName = jsonObject.getString("taskName");
                     String paramStr = jsonObject.getString("paramStr");
+                    String taskType="";
+                    if(jsonObject.containsKey("taskType")){
+                        taskType=jsonObject.getString("taskType");
+                    }
                     if(""!=paramStr && null != paramStr){
                         paramStr  = paramStr.substring(1,paramStr.length()-1);
                     }
@@ -63,6 +67,7 @@ public class SpatiotemporalBackTrackController {
                         spatiotemporalBackTrack.setEndTime(new Date(jsonObject.getLongValue("endTimeStr")));
                         spatiotemporalBackTrack.setProgress("0");
                         spatiotemporalBackTrack.setState("QUEUEING");
+                        spatiotemporalBackTrack.setTaskType(taskType);
                         spatiotemporalBackTrackService.saveSpatiotemporalBackTrack(spatiotemporalBackTrack);
                         resultVO = ResultVOUtil.success(taskId);
                     } else {

src/main/java/com/founder/interservice/spatiotemporalBackTrack/model/SpatiotemporalBackTrack.java

@@ -37,5 +37,6 @@ public class SpatiotemporalBackTrack {
     private int skhsResultCount;//时空回溯任务结果总数
     //区分数据来源（时空回溯或案发潜逃-案发或案前踩点-案发或首次出现-案发）
     private String type;
+    private String taskType;
 
 }

src/main/resources/mybatis/mapper/xzxt/SpatiotemporalBackTrackMapper.xml

@@ -70,6 +70,7 @@
           FSR_XM,
           FSR_LXDH,
           QY_AREA,
+          TASK_TYPE,
           RKSJ
         )VALUES (
         #{taskId},
@@ -158,6 +159,12 @@
         <if test="qyArea == null || qyArea == ''">
             null,
         </if>
+        <if test="taskType != null and taskType != ''">
+            #{taskType},
+        </if>
+        <if test="taskType == null || taskType == ''">
+            null,
+        </if>
         SYSDATE
         )
     </insert>

src/main/resources/static/css/tjDialog.css

@@ -2,8 +2,8 @@
 div,p{margin:0;padding:0;}
 .dialog-content{display: table;width:100%;}
 .photo,.right-box{float: left;}
-.photo{width:40%;text-align: center;vertical-align: middle;}
-.photo img{width:100px;}
+.photo{width:40%;height: 123px;overflow: hidden;text-align: center;vertical-align: middle;position: relative;}
+.photo img{width:100px;position: absolute;left: 0;top: 0;right: 0;bottom: 0;margin: auto;}
 .right-box{width:60%;text-indent: 10px;}
 .right-box p{line-height: 20px;margin-top:15px;}
 .result-box{float:left;width:30%;margin:8px 0 8px 2.3%;border:1px solid #ccc;padding:8px 0;border-radius: 5px;box-shadow: 0px 3px 10px #ccc;}

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

@@ -24,7 +24,7 @@ function sksjzcYchy(obj,objectValue,zjhm,objectType,type) {
          //手机号码
         if (objectType == "3996"){
             htmlChild += "<li data-act='startAnalyze.action' onclick='toQxda(\""+zjhm+"\");'><img src='/images/ajda.png' width='18px;' style='float:left; position:relative; top:6px;margin-right:5px;'/><span>全息档案</span></li>";
-            htmlChild +="<li  onclick='toZzdt(\""+objectType+"\",\""+objectValue+"\",\""+asjbh+"\",\"2\");'><img src='/images/naotu.png' width='16px;' style='float:left; position:relative; top:6px;margin-right:5px;'/><span>智侦导图</span></li>";
+            htmlChild +="<li  onclick='toZzdt(\""+objectType+"\",\""+zjhm+"\",\""+asjbh+"\",\"2\");'><img src='/images/naotu.png' width='16px;' style='float:left; position:relative; top:6px;margin-right:5px;'/><span>智侦导图</span></li>";
         } else {//汽车和IMSI、IMEI、qq、微信id
             htmlChild += "<li data-act='startAnalyze.action' onclick='toQxda(\""+objectValue+"\");'><img src='/images/ajda.png' width='18px;' style='float:left; position:relative; top:6px;margin-right:5px;'/><span>全息档案</span></li>";
             //汽车独有
@@ -40,7 +40,7 @@ function sksjzcYchy(obj,objectValue,zjhm,objectType,type) {
         }
     }else if(type == "3"){//手机号码用采合一
         htmlChild += "<li data-act='startAnalyze.action' onclick='toQxda(\""+zjhm+"\");'><img src='/images/ajda.png' width='18px;' style='float:left; position:relative; top:6px;margin-right:5px;'/><span>全息档案</span></li>";
-        htmlChild +="<li  onclick='toZzdt(\""+objectType+"\",\""+objectValue+"\",\""+asjbh+"\",\"2\");'><img src='/images/naotu.png' width='16px;' style='float:left; position:relative; top:6px;margin-right:5px;'/><span>智侦导图</span></li>";
+        htmlChild +="<li  onclick='toZzdt(\""+3996+"\",\""+zjhm+"\",\""+asjbh+"\",\"2\");'><img src='/images/naotu.png' width='16px;' style='float:left; position:relative; top:6px;margin-right:5px;'/><span>智侦导图</span></li>";
     }
     htmlChild += "</ul>";
     layer.tips(htmlChild, that,{time:15000,tips:[2,'#f3f7f8'],width:380}); //在元素的事件回调体中，follow直接赋予this即可

src/main/webapp/WEB-INF/jsp/gjbs/skgjbsjgxs.jsp

@@ -249,7 +249,7 @@
     var fsrjh = "${fsrjh}";
     console.log(fsrjh);
     var djsjStr = "${djsj}";
-    console.log(djsj);
+    console.log(djsjStr);
 </script>
 </body>
 </html>
\ No newline at end of file