Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/founder/interservice/mapper/xzxt/RegionalTaskMapper.java
#	src/main/java/com/founder/interservice/mapper/xzxt/TogetherTaskResultMapper.java
#	src/main/java/com/founder/interservice/regionalanalysis/service/RegionalAnalysisService.java
#	src/main/java/com/founder/interservice/regionalanalysis/service/impl/RegionalAnalysisServiceImpl.java
#	src/main/java/com/founder/interservice/spatiotemporalBackTrack/controller/SpatiotemporalBackTrackController.java
#	src/main/java/com/founder/interservice/spatiotemporalBackTrack/service/SpatiotemporalBackTrackService.java
#	src/main/java/com/founder/interservice/spatiotemporalBackTrack/service/impl/SpatiotemporalBackTrackServiceImpl.java
#	src/main/java/com/founder/interservice/tracktraveltogether/controller/TrackTogetherContoller.java
#	src/main/java/com/founder/interservice/tracktraveltogether/service/TrackTogetherService.java
#	src/main/java/com/founder/interservice/tracktraveltogether/service/impl/TrackTogetherServiceImpl.java
#	src/main/resources/mybatis/mapper/xzxt/RegionalTaskMapper.xml
#	src/main/resources/mybatis/mapper/xzxt/SBTResultDetailMapper.xml
#	src/main/resources/mybatis/mapper/xzxt/TogetkerTaskResultMapper.xml

src/main/java/com/founder/interservice/bkxx/controller/BkController.java

@@ -360,6 +360,19 @@ public class BkController {
         return objectMap;
     }
 
+    //美亚布控服务--查询任务接口--不分页
+    @RequestMapping(value = "/queryAjBks",method = {RequestMethod.GET,RequestMethod.POST})
+    @ResponseBody
+    public Map<String,Object>queryAjBks(Ajbk ajbk){
+        Map<String,Object> objectMap = new HashMap<>();
+        try{
+            objectMap = bkService.getAjBkrws(ajbk);
+        }catch (InterServiceException e){
+            e.printStackTrace();
+        }
+        return objectMap;
+    }
+
     //美亚布控服务--查询布控比中结果接口
     @RequestMapping(value = "/queryBkBzxxList",method = {RequestMethod.GET,RequestMethod.POST})
     @ResponseBody
@@ -382,6 +395,18 @@ public class BkController {
         return objectMap;
     }
 
+    //美亚布控服务--查询布控比中结果接口--不分页
+    @RequestMapping(value = "/queryBkBzxxs",method = {RequestMethod.GET,RequestMethod.POST})
+    @ResponseBody
+    public Map<String,Object> queryBkBzxxs(Bkbzxx bkbzxx){
+        Map<String,Object> objectMap = new HashMap<>();
+        try{
+            objectMap = bkService.getAjBkbzxxs(bkbzxx);
+        }catch (InterServiceException e){
+            e.printStackTrace();
+        }
+        return objectMap;
+    }
 
     /**
      * 一键布控

src/main/java/com/founder/interservice/bkxx/service/BkService.java

@@ -40,4 +40,8 @@ public interface BkService {
     Map<String,Object> getBkbzxx(Bkbzxx bkbzxx);
 
     List<Ajbk> getAjBkrw(Ajbk ajbk);
+
+    Map<String, Object> getAjBkrws(Ajbk ajbk);
+
+    Map<String, Object> getAjBkbzxxs(Bkbzxx bkbzxx);
 }

src/main/java/com/founder/interservice/bkxx/service/impl/BkScheduleService.java

@@ -139,7 +139,7 @@ public class BkScheduleService {
        List<Bkxx> retuList = new ArrayList<>();
         for (Bkxx bkxx:bkxxList){
             XdhSpUtil xdhSpUtil = new XdhSpUtil();
-            JSONObject obj = xdhSpUtil.getSpResultUtil(bkxx.getAsjbh(),bkxx.getSqr_sfzh(),bkxx.getBkdxhm(),"智慧侦查脑图",bizCode,cjServiceId);
+            JSONObject obj = xdhSpUtil.getSpResultUtil(bkxx.getAsjbh(),bkxx.getSqr_sfzh(),bkxx.getBkdxhm(),"信息布控",bizCode,cjServiceId);
             String spzt = "";
             if (obj!=null){
                 spzt = (String) obj.get("data");

src/main/java/com/founder/interservice/bkxx/service/impl/BkServiceImpl.java

@@ -274,4 +274,24 @@ public class BkServiceImpl implements BkService{
         return bkrwList;
     }
 
+    @Override
+    public Map<String, Object> getAjBkrws(Ajbk ajbk) {
+        Map<String, Object> resultMap = new HashMap<>();
+        List<Ajbk> bkrwList = ajbkMapper.selectBkrw(ajbk);
+        int total = ajbkMapper.selectAjBkxxPageTotalCount(ajbk);
+        resultMap.put("rows",bkrwList);
+        resultMap.put("total",total);
+        return resultMap;
+    }
+
+    @Override
+    public Map<String, Object> getAjBkbzxxs(Bkbzxx bkbzxx) {
+        Map<String, Object> resultMap = new HashMap<>();
+        List<Bkbzxx> bkrwList = ajbkMapper.selectBkrwbzxx(bkbzxx);
+        int total = ajbkMapper.selectBkbzxxPageTotalCount(bkbzxx);
+        resultMap.put("rows",bkrwList);
+        resultMap.put("total",total);
+        return resultMap;
+    }
+
 }

src/main/java/com/founder/interservice/mapper/gxzxt/AjbkMapper.java

@@ -19,4 +19,6 @@ public interface AjbkMapper {
     int selectBkbzxxPageTotalCount(Bkbzxx bkbzxx);
 
     List<Ajbk> selectBkrw(Ajbk ajbk);
+
+    List<Bkbzxx> selectBkrwbzxx(Bkbzxx bkbzxx);
 }

src/main/java/com/founder/interservice/mapper/xzxt/RegionalTaskMapper.java

@@ -26,4 +26,7 @@ public interface RegionalTaskMapper {
     int queryRegionalsTaskListCount(RegionalsTask regionalsTask);
 
     List<Regional> getRegionalListByTaskId(String taskId);
+    //根据任务id删除任务
+    public int deleteRegionalsTaskByTaskId(String taskId);
+
 }

src/main/java/com/founder/interservice/mapper/xzxt/RegionalTaskResultMapper.java

@@ -27,4 +27,6 @@ public interface RegionalTaskResultMapper {
     Integer togetherDetailIsExist(RegionalTaskResultDetail detail) throws Exception;
     public void saveTogetherDetail(RegionalTaskResultDetail detail) throws  Exception;
     public void updateTogetherDetail(RegionalTaskResultDetail detail) throws  Exception;
+    //根据任务id删除任务结果
+    public int deleteRegionalTaskResultByTaskId(String taskId);
 }

src/main/java/com/founder/interservice/mapper/xzxt/SBTResultDetailMapper.java

@@ -32,4 +32,8 @@ public interface SBTResultDetailMapper {
     public List<Object[]> getFldhBzhCountList(SpatiotemporalBackTrackResultVO vo);
     List<SBTResultDetail> getSkhsTaskResultDetailExcelList(SBTResultDetail detail);
 
+    int deleteSkbsTrackByTaskId(String taskId);
+    int deleteSkbsTrackResultByTaskId(String taskId);
+
+
 }

src/main/java/com/founder/interservice/mapper/xzxt/TogetherTaskResultMapper.java

@@ -35,4 +35,6 @@ public interface TogetherTaskResultMapper {
 
     //获取时空伴随导出数据
     List<RegionalTaskResultDetail> getSkbsTaskResultDetailExcelList(RegionalTaskResultDetail param) throws Exception;
+    //删除时空伴随结果
+    int deleteTogetkerTaskResultByTaskId(String taskId);
 }

src/main/java/com/founder/interservice/mapper/xzxt/TrackTogetherMapper.java

@@ -22,4 +22,8 @@ public interface TrackTogetherMapper {
     public List<TrackTogetherTask> queryTasksByAsjbhAndFwbsh(TrackTogetherTask taskParam);
 
     int queryTasksByAsjbhAndFwbshCount(TrackTogetherTask taskParam);
+    //删除时空伴随任务
+    int deleteTrackTogetkerTaskByTaskId(String taskId);
+
+
 }

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

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import sun.misc.BASE64Encoder;
@@ -675,5 +676,27 @@ public class RegionalAnalysisController {
         return resultMap;
     }
 
+    @RequestMapping(value = "deleteRegionalsTaskByTaskId",method = {RequestMethod.GET,RequestMethod.POST})
+    @ResponseBody
+    public Map<String, Object> deleteRegionalsTaskByTaskId(String taskId){
+        Map<String, Object> resultObj = new HashMap<>();
+        int count=0;
+        int resultCount=0;
+        try {
+            count = regionalAnalysisService.deleteRegionalsTaskByTaskId(taskId);
+            if(count>0){
+                 resultCount=regionalAnalysisService.deleteRegionalTaskResultByTaskId(taskId);
+            }
+        } catch (Exception e) {
+            resultObj.put("status", "error");
+            e.printStackTrace();
+        }
+        resultObj.put("status", "success");
+        resultObj.put("count",count);
+        resultObj.put("resultCount",resultCount);
+        return resultObj;
+    }
+
+
 
 }

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

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Transient;
 import java.util.Date;
 
 @Data
@@ -18,7 +19,6 @@ public class RegionalTaskResultDetail {
     private String objectTypeName;
     private String objectValue;
     private int count; //伴随次数
-    private String bscscount;
     private String birthday;
     private String name;
     private byte[] ryzp;
@@ -39,7 +39,11 @@ public class RegionalTaskResultDetail {
     private String sfFzxyr;//是否犯罪嫌疑人
     private String sfGwry;//是否高危人员
     private String regionlist;//所属区域
+    @Transient
     private int rqLength;//出生日期长度
+    @Transient
     private String sfbs;//是否本市
+    @Transient
+    private String bscscount;
 
 }

src/main/java/com/founder/interservice/regionalanalysis/service/RegionalAnalysisService.java

@@ -67,4 +67,12 @@ public interface RegionalAnalysisService {
 
     //根据taskId获取区域信息
     List<Regional> getRegionalListByTaskId(String taskId);
+    //根据任务id删除任务
+    public int deleteRegionalsTaskByTaskId(String taskId);
+    //根据任务id删除任务结果
+    public int deleteRegionalTaskResultByTaskId(String taskId);
+
+
+
+
 }

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

@@ -361,4 +361,16 @@ public class RegionalAnalysisServiceImpl implements RegionalAnalysisService {
     public List<Regional> getRegionalListByTaskId(String taskId) {
         return regionalTaskMapper.getRegionalListByTaskId(taskId);
     }
+    //删除任务
+    @Override
+    public int deleteRegionalsTaskByTaskId(String taskId){
+      return   regionalTaskMapper.deleteRegionalsTaskByTaskId(taskId);
+    }
+    //删除任务结果
+    @Override
+    public int deleteRegionalTaskResultByTaskId(String taskId){
+        return   regionalTaskResultMapper.deleteRegionalTaskResultByTaskId(taskId);
+    }
+
+
 }

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

@@ -465,4 +465,25 @@ public class SpatiotemporalBackTrackController {
         String[] headersField = {"objectValue","objectTypeName","zjlx","zjhm","name","sex","birthday"};
         exportExcelUtil.exportExcel("时空回溯结果显示统计表", headersName, headersField, rtrdList, response);
     }
+
+    @RequestMapping(value = "deleteSkhsTaskByTaskId",method = {RequestMethod.GET,RequestMethod.POST})
+    @ResponseBody
+    public Map<String, Object> deleteSkhsTaskByTaskId(String taskId){
+        Map<String, Object> resultObj = new HashMap<>();
+        int count=0;
+        int resultCount=0;
+        try {
+            count = spatiotemporalBackTrackService.deleteSkbsTrackByTaskId(taskId);
+            if(count>0){
+                resultCount=spatiotemporalBackTrackService.deleteSkbsTrackResultByTaskId(taskId);
+            }
+        } catch (Exception e) {
+            resultObj.put("status", "error");
+            e.printStackTrace();
+        }
+        resultObj.put("status", "success");
+        resultObj.put("count",count);
+        resultObj.put("resultCount",resultCount);
+        return resultObj;
+    }
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.persistence.Transient;
 import java.util.Date;
 
 @Data
@@ -34,10 +35,12 @@ public class SBTResultDetail {
     private int startNum;
     private int endNum;
 
+    @Transient
     private int rqLength;//出生日期长度
+    @Transient
     private String sfbs;//是否本市
+    @Transient
     private String zp;
-
     private String sfFzxyr;//是否犯罪嫌疑人
     private String sfGwry;//是否高危人员
 

src/main/java/com/founder/interservice/spatiotemporalBackTrack/service/SpatiotemporalBackTrackService.java

@@ -29,5 +29,9 @@ public interface SpatiotemporalBackTrackService {
       List<Object[]> getSkhsFlCountList(String checkVal,SpatiotemporalBackTrackResultVO vo);
 
       List<SBTResultDetail> getSkhsTaskResultDetailExcelList(SBTResultDetail detail) throws Exception;
+      //时空回溯任务删除
+      public int  deleteSkbsTrackByTaskId(String taskId);
+      //时空回溯任务结果删除
+      public int deleteSkbsTrackResultByTaskId(String taskId);
       //时空回溯相关  结束
 }

src/main/java/com/founder/interservice/spatiotemporalBackTrack/service/impl/SpatiotemporalBackTrackServiceImpl.java

@@ -163,4 +163,16 @@ public class SpatiotemporalBackTrackServiceImpl implements SpatiotemporalBackTra
     public List<SBTResultDetail> getSkhsTaskResultDetailExcelList(SBTResultDetail detail) throws Exception {
         return sBTResultDetailMapper.getSkhsTaskResultDetailExcelList(detail);
     }
+
+    //时空回溯任务删除
+    @Override
+    public int deleteSkbsTrackByTaskId(String taskId) {
+        return sBTResultDetailMapper.deleteSkbsTrackByTaskId(taskId);
+    }
+
+    //时空回溯任务结果删除
+    @Override
+    public int deleteSkbsTrackResultByTaskId(String taskId) {
+        return sBTResultDetailMapper.deleteSkbsTrackResultByTaskId(taskId);
+    }
 }

src/main/java/com/founder/interservice/tracktraveltogether/controller/TrackTogetherContoller.java

@@ -504,4 +504,26 @@ public class TrackTogetherContoller {
         String[] headersField = {"objectValue","objectTypeName","count","zjlx","zjhm","name","sex","birthday"};
         exportExcelUtil.exportExcel("时空伴随结果显示统计表", headersName, headersField, rtrdList, response);
     }
+
+    @RequestMapping(value = "deleteTrackTogeterByTaskId",method = {RequestMethod.GET,RequestMethod.POST})
+    @ResponseBody
+    public Map<String, Object> deleteTrackTogeterByTaskId(String taskId){
+        Map<String, Object> resultObj = new HashMap<>();
+        int count=0;
+        int resultCount=0;
+        try {
+            count = trackTogetherService.deleteTrackTogetkerTaskByTaskId(taskId);
+            if(count>0){
+                  resultCount=trackTogetherService.deleteTogetkerTaskResultByTaskId(taskId);
+            }
+        } catch (Exception e) {
+            resultObj.put("status", "error");
+            e.printStackTrace();
+        }
+        resultObj.put("status", "success");
+        resultObj.put("count",count);
+        resultObj.put("resultCount",resultCount);
+        return resultObj;
+    }
+
 }

src/main/java/com/founder/interservice/tracktraveltogether/model/TogetherTaskResult.java

@@ -37,9 +37,13 @@ public class TogetherTaskResult {
     @Transient
     private int endNum;
 
+    @Transient
     private String checkVal;
+    @Transient
     private String sqlStr;
+    @Transient
     private String isNullField;
+    @Transient
     private String groupByField;
 
 }

src/main/java/com/founder/interservice/tracktraveltogether/service/TrackTogetherService.java

@@ -44,4 +44,9 @@ public interface TrackTogetherService {
     List<Object[]> getSkbsFlCountList(String checkVal, TogetherTaskResult vo);
 
     List<RegionalTaskResultDetail> getSkbsTaskResultDetailExcelList(RegionalTaskResultDetail detail)throws Exception;
+
+    //删除时空伴随任务
+    public int deleteTrackTogetkerTaskByTaskId(String  taskId);
+    //删除时空伴随任务结果
+    public int deleteTogetkerTaskResultByTaskId(String  taskId);
 }

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

@@ -278,4 +278,15 @@ public class TrackTogetherServiceImpl implements TrackTogetherService {
         return togetherTaskResultMapper.getSkbsTaskResultDetailExcelList(detail);
     }
 
+    @Override
+    public int deleteTrackTogetkerTaskByTaskId(String taskId) {
+       return  trackTogetherMapper.deleteTrackTogetkerTaskByTaskId(taskId);
+    }
+
+    @Override
+    public int deleteTogetkerTaskResultByTaskId(String taskId) {
+       return togetherTaskResultMapper.deleteTogetkerTaskResultByTaskId(taskId);
+    }
+
+
 }

src/main/resources/mybatis/mapper/gxzxt/AjbkMapper.xml

@@ -206,4 +206,19 @@
                 WHERE 1=1
                   <include refid = "bkbzxx_where_sql" />
     </select>
+    <select id="selectBkrwbzxx" parameterType="com.founder.interservice.bkxx.model.Bkbzxx" resultType="com.founder.interservice.bkxx.model.Bkbzxx">
+        SELECT
+            t2.pk_value as pkValue,
+            t2.bzid as bzid,
+            t2.bkfknr as bkfknr,
+            t2.bkzyid as bkzyid,
+            t2.bkzy as bkzy,
+            t2.sffs as sffs,
+            t2.sfsc as sfsc,
+            t2.type as type,
+            t2.createdtime as createdtime
+            from Z_AJBK_BZXX t2
+            WHERE 1=1
+              <include refid = "bkbzxx_where_sql" />
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -109,4 +109,8 @@
         from  TB_ST_REGIONAL
         where task_id = #{taskId}
     </select>
+    <!--区域碰撞任务删除-->
+    <delete id="deleteRegionalsTaskByTaskId" parameterType="String">
+        delete from TB_ST_REGIONALSTASK where task_id=#{taskId}
+    </delete>
 </mapper>
\ No newline at end of file

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

@@ -241,4 +241,8 @@
         t.OBJECT_TYPE = #{objectType}
         and t.OBJECT_VALUE = #{objectValue}
     </update>
+    <!--区域碰撞任务结果删除-->
+    <delete id="deleteRegionalTaskResultByTaskId" parameterType="String">
+        delete from TB_ST_REGIONALSTASKRESULT where task_id=#{taskId}
+    </delete>
 </mapper>
\ No newline at end of file

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

@@ -348,4 +348,13 @@
         order by td.name desc nulls LAST,t.djsj desc
     </select>
 
+    <!--时空回溯任务删除-->
+    <delete id="deleteSkbsTrackByTaskId" parameterType="String">
+        delete from tb_st_spatiotemporalbacktrack where task_id=#{taskId}
+    </delete>
+    <!--时空回溯任务结果删除-->
+    <delete id="deleteSkbsTrackResultByTaskId" parameterType="String">
+        delete from tb_st_spatiotemporalresult where task_id=#{taskId}
+    </delete>
+
 </mapper>
\ No newline at end of file

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

@@ -117,4 +117,8 @@
         <if test="bscscount!=null and bscscount!=''"> and t.COUNT =#{bscscount} </if>
         order by t.COUNT desc
     </select>
+    <!--时空伴随任务结果删除-->
+    <delete id="deleteTogetkerTaskResultByTaskId" parameterType="String">
+        delete from tb_st_togethertaskresult where task_id=#{taskId}
+    </delete>
 </mapper>
\ No newline at end of file

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

@@ -55,4 +55,8 @@
             </if>
         </where>
     </select>
+    <!--时空伴随任务删除-->
+    <delete id="deleteTrackTogetkerTaskByTaskId" parameterType="String">
+        delete from TB_ST_TRACKTOGETHERTASK where task_id=#{taskId}
+    </delete>
 </mapper>
\ No newline at end of file

src/main/webapp/WEB-INF/jsp/bkxx/bkxx_add.jsp

@@ -48,7 +48,7 @@
 				<table class="sp_table" width="100%">
 					<tbody>
 					<tr>
-						<td class="ar" width="13.3%"><span class="red">*</span>布控对象号码：</td>
+						<td class="ar" width="13.3%"><span class="red">*</span>嫌疑人身份证号：</td>
 						<td width="20%">
                             <span class="textbox" style="border:none;">
 								<input type="text" name="zjhm" id = "zjhm" class="easyui-textbox" data-options="required:true,validType:['idCode']" value="${ajbk.zjhm}" style="height:26px;">