标识号区域碰撞

common/common_utils/src/main/java/com/founder/commonutils/peopleEntity/JzXxResult.java

+package com.founder.commonutils.peopleEntity;
+
+
+public class JzXxResult {
+
+    private String deviceAddress;// 地址
+    private String deviceCode;// 设备编号
+    private String deviceMc;// 设备名称
+    private String type;// 类型
+    private String x;
+    private String y;
+
+    public String getDeviceAddress() {
+        return deviceAddress;
+    }
+
+    public void setDeviceAddress(String deviceAddress) {
+        this.deviceAddress = deviceAddress;
+    }
+
+    public String getDeviceCode() {
+        return deviceCode;
+    }
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
+    }
+
+    public String getDeviceMc() {
+        return deviceMc;
+    }
+
+    public void setDeviceMc(String deviceMc) {
+        this.deviceMc = deviceMc;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getX() {
+        return x;
+    }
+
+    public void setX(String x) {
+        this.x = x;
+    }
+
+    public String getY() {
+        return y;
+    }
+
+    public void setY(String y) {
+        this.y = y;
+    }
+}

common/common_utils/src/main/java/com/founder/commonutils/peopleEntity/RegionalsTask.java

@@ -28,7 +28,7 @@ public class RegionalsTask implements Serializable {
     @ApiModelProperty("任务类型")
     private String taskType;//任务类型  skhs 时空回溯  qypz 区域碰撞 ccbs车车伴随
     @ApiModelProperty("任务来源")
-    private String taskObject;//任务对象 01 车  02 人 03 人像
+    private String taskObject;//任务对象 01 车  02 人 03 人像 07手机号
     @ApiModelProperty("第三方任务id")
     private String taskIdThirdParty;//第三方任务id，例如东莞人像区域碰撞云天返回的任务id
 

common/common_utils/src/main/java/com/founder/commonutils/peopleEntity/SjGjInfo.java

@@ -7,6 +7,7 @@ public class SjGjInfo {
 
     private String objectValue;//值为手机号
     private String objectType;//类型为手机
+    private String objectTypeName;//类型为手机
     //地址
     private String address;
     //基站编号
@@ -19,6 +20,7 @@ public class SjGjInfo {
     private String stationName;
     //时间戳
     private String timestamp;
+    private String time;
     //经度
     private String x;
     //纬度
@@ -31,6 +33,22 @@ public class SjGjInfo {
     private String taskId;
     private String region;
 
+    public String getObjectTypeName() {
+        return objectTypeName;
+    }
+
+    public void setObjectTypeName(String objectTypeName) {
+        this.objectTypeName = objectTypeName;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
     public String getCount() {
         return count;
     }

serviceapi/peopleapi/src/main/java/com/founder/peopleapi/controller/PhoneController.java

@@ -30,10 +30,10 @@ public class PhoneController {
     @ApiOperation(value = "手机轨迹")
     @OperLog(message = "手机轨迹", operation = OperationType.QUERY)
     @PostMapping("/getSjGjInfo")
-    public MapRestResult getSjGjInfo(@ApiParam(name = "objectValue", value = "标识号值", required = false)
+    public MapRestResult getSjGjInfo(@ApiParam(name = "objectValue", value = "标识号值", required = true)
                                      @RequestParam String objectValue,
-                                     @ApiParam(name = "objectType", value = "标识号类型", required = true)
-                                     @RequestParam(required = false) String objectType,
+                                     @ApiParam(name = "objectType", value = "标识号类型", required = false)
+                                     @RequestParam String objectType,
                                      @ApiParam(name = "kssj", value = "开始时间", required = true)
                                      @RequestParam String kssj,
                                      @ApiParam(name = "jssj", value = "结束时间", required = true)
@@ -48,4 +48,19 @@ public class PhoneController {
         tbStRegionalstaskresult.setPagePara(Integer.valueOf(tbStRegionalstaskresult.getLimit()));
         return phoneService.getRegionalsResult(tbStRegionalstaskresult);
     }
+
+
+    @OperLog(message = "范围内基站点位数据接口",operation = OperationType.QUERY)
+    @ApiOperation(value = "范围内基站点位数据接口")
+    @PostMapping("/selectJzXx")
+    public MapRestResult selectJzXx(@ApiParam(name = "qsjd",value = "起始经度")
+                                    @RequestParam String qsjd,
+                                    @ApiParam(name = "qswd",value = "起始纬度")
+                                    @RequestParam String qswd,
+                                    @ApiParam(name = "jsjd",value = "结束经度")
+                                    @RequestParam String jsjd,
+                                    @ApiParam(name = "jswd",value = "结束纬度")
+                                    @RequestParam String jswd) {
+        return phoneService.selectJzXx(qsjd,qswd,jsjd,jswd);
+    }
 }
\ No newline at end of file

serviceapi/peopleapi/src/main/java/com/founder/peopleapi/mapper/PhoneInfoMapper.java

 package com.founder.peopleapi.mapper;
 
+import com.founder.commonutils.peopleEntity.JzXxResult;
 import com.founder.commonutils.peopleEntity.RegionalsDetail;
 import com.founder.commonutils.peopleEntity.RegionalsPerson;
 import com.founder.commonutils.peopleEntity.TbStRegionalstaskresult;
-import com.founder.commonutils.peopleEntity.reslutFl;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -19,4 +18,5 @@ public interface PhoneInfoMapper {
     Integer getAllResultcount(TbStRegionalstaskresult tbStRegionalstaskresult);
     List<RegionalsDetail> getAllRegionalsDetail(@Param("reultId") String reultId);
     RegionalsPerson getAllRegionalsPerson(@Param("sfzhm") String sfzhm);
+    List<JzXxResult>  getJzInfoByQsJwd(@Param("qsjd")String qsjd,@Param("qswd") String qswd,@Param("jsjd") String jsjd,@Param("jswd") String jswd);
 }

serviceapi/peopleapi/src/main/java/com/founder/peopleapi/mapper/RegInfoMapper.java

@@ -26,7 +26,4 @@ public interface RegInfoMapper {
 
     void updateRegionalsTask(RegionalsTask regionalsTask);
 
-    List<RegionalsTask> selecteRegionalsTasks(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("taskObject") String taskObject, @Param("carNum") String carNum, @Param("fsrIdentity") String fsrIdentity);
-
-    List<RegionalsCarCarResult> selecteRegionalsTasksResults(@Param("taskId") String taskId);
 }

serviceapi/peopleapi/src/main/java/com/founder/peopleapi/mapper/xml/PhoneInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.founder.peopleapi.mapper.PhoneInfoMapper">
 
-    <resultMap id="RegionalsDetail" type="com.founder.commonutils.carEntity.RegionalsDetail">
+    <resultMap id="RegionalsDetail" type="com.founder.commonutils.peopleEntity.RegionalsDetail">
         <result column="xxzjbh" property="xxzjbh" jdbcType="VARCHAR"/>
         <result column="sfzhm" property="sfzhm" jdbcType="VARCHAR"/>
         <result column="sf_Check" property="sfCheck" jdbcType="VARCHAR"/>
@@ -108,5 +108,18 @@
         </if>
     </select>
 
-</mapper>
+    <!--根据起始经纬度获取人像点位数据-->
+    <select id="getJzInfoByQsJwd" parameterType="java.lang.String" resultType="com.founder.commonutils.peopleEntity.JzXxResult">
+        select
+        BSID as deviceCode,
+        XZQH_DZ as deviceAddress,
+        XCOORD as x,
+        YCOORD as y
+        from tb_my_jzxx t    where 1=1
+        <if test="qsjd!=null and qsjd!='' and qsjd!=null and qsjd!='' and qswd!=null and qswd!='' and jswd!=null and jswd!=''">
+            AND XCOORD<![CDATA[>=]]>#{qsjd,jdbcType=VARCHAR} AND XCOORD<![CDATA[<=]]>#{jsjd,jdbcType=VARCHAR}
+            AND YCOORD<![CDATA[>=]]>#{qswd,jdbcType=VARCHAR} AND YCOORD<![CDATA[<=]]>#{jswd,jdbcType=VARCHAR}
+        </if>
+    </select>
 
+</mapper>
\ No newline at end of file

serviceapi/peopleapi/src/main/java/com/founder/peopleapi/mapper/xml/RegInfoMapper.xml

@@ -141,69 +141,14 @@
         where 1=1
         <if test="taskId != null and taskId != ''">and TASK_ID = #{ taskId , jdbcType=VARCHAR }</if>
     </update>
-    <!--获取所有任务-->
-    <select id="selecteRegionalsTasks" parameterType="String"
-            resultType="com.founder.commonutils.peopleEntity.RegionalsTask">
-        SELECT task_Id AS taskId,
-        task_Name AS taskName,
-        (CASE WHEN progress = 'BEGIN' THEN '任务开始'
-        WHEN progress = 'RUN' THEN '任务执行'
-        WHEN progress = 'END' THEN '任务完成'
-        else '任务失败' end)
-        as progress,
-        state as state,
-        fsr_Jh as fsrJh,
-        fsr_Identity as fsrIdentity,
-        task_Type as taskType,
-        task_Object as taskObject,
-        to_char(djsj,'yyyy-mm-dd hh24:mi:ss') as djsj,
-        fsr_Xm as fsrXm,
-        carNum as carNum
-        FROM tb_st_regionals_task
-        where 1=1
-        <if test="startTime != null and startTime != ''">and DJSJ <![CDATA[>=]]>
-            TO_DATE(#{ startTime , jdbcType=VARCHAR },'yyyy-MM-dd')
-        </if>
-        <if test="endTime != null and endTime != ''">and DJSJ <![CDATA[<]]>
-            (TO_DATE(#{ endTime , jdbcType=VARCHAR },'yyyy-MM-dd')+1)
-        </if>
-        <if test="taskObject != null and taskObject != ''">and task_Object = #{ taskObject , jdbcType=VARCHAR }</if>
-        <if test="fsrIdentity != null and fsrIdentity != ''">and fsr_Identity = #{ fsrIdentity , jdbcType=VARCHAR }</if>
-        <if test="carNum != null and carNum != ''">and carNum = #{ carNum , jdbcType=VARCHAR }</if>
-    </select>
-    <!--获取任务结果-->
-    <select id="selecteRegionalsTasksResults" parameterType="String"
-            resultType="com.founder.commonutils.peopleEntity.RegionalsCarCarResult">
-        SELECT
-        r.xxzjbh as xxzjbh,
-        r.task_id as taskId,
-        r.object_value as object_value,
-        to_char(r.djsj,'yyyy-mm-dd hh24:mi:ss') as djsj,
-        r.X AS X,
-        r.Y AS Y,
-        r.KKURLPIC as kkUrlPic,
-        to_char(r.time,'yyyy-mm-dd hh24:mi:ss') as time,
-        r.deviceid as deviceId,
-        r.devicename as deviceName,
-        p.XM as xm,
-        p.MZ as mz,
-        p.img as img,
-        p.xb as xb,
-        p.sfzhm as sfzhm,
-        p.xzzdzmc as xzzdzmc,
-        p.phone as phone,
-        p.HJDQHDZ as hjdqhdz,
-        p.csrq as csrq
-        FROM TB_ST_REGIONALS_RESULT r,TB_ST_REGIONALS_detail d,TB_ST_REGIONALS_PERSON p
-        where r.XXZJBH = d.RESULT_ID
-        and d.SFZHM = P.SFZHM(+)
-        <if test="taskId != null and taskId != ''">and r.task_Id = #{ taskId , jdbcType=VARCHAR }</if>
-    </select>
+
     <!--标识号碰撞结果数据保存-->
     <insert id="saveResultPz" parameterType="com.founder.commonutils.peopleEntity.SjGjInfo">
         INSERT INTO TB_ST_REGIONALS_RESULT (
           XXZJBH,
           TASK_ID,
+          OBJECT_TYPE,
+          OBJECT_TYPE_NAME,
           OBJECT_VALUE,
           REGION,
           count,
@@ -215,6 +160,8 @@
         VALUES(
         #{ xxzjbh , jdbcType=VARCHAR }
         ,#{ taskId , jdbcType=VARCHAR }
+        ,#{ objectType , jdbcType=VARCHAR }
+        ,#{ objectTypeName , jdbcType=VARCHAR }
         ,#{ objectValue , jdbcType=VARCHAR }
         ,#{ region , jdbcType=VARCHAR }
         ,#{ count , jdbcType=VARCHAR }

serviceapi/peopleapi/src/main/java/com/founder/peopleapi/service/PhoneService.java

 package com.founder.peopleapi.service;
 
 import com.founder.commonutils.peopleEntity.AreaInfo;
-import com.founder.commonutils.peopleEntity.TbStRegionalstaskresult;
 import com.founder.commonutils.publicEntity.MapRestResult;
 
 import java.util.List;
@@ -14,5 +13,6 @@ public interface PhoneService {
 
     MapRestResult getRegionalsResult(com.founder.commonutils.peopleEntity.TbStRegionalstaskresult tbStRegionalstaskresult) throws Exception;
 
+    MapRestResult selectJzXx(String qsjd,String qswd,String jsjd,String jswd);
 
 }

serviceapi/peopleapi/src/main/java/com/founder/peopleapi/service/RegTaskService.java

@@ -22,7 +22,4 @@ public interface RegTaskService {
 
     MapRestResult saveRegional(Regionals regionals);
 
-    List<RegionalsTask> selecteRegionalsTasks(String startTime, String endTime, String taskObject, String carNum, String fsrIdentity);
-
-    List<RegionalsCarCarResult> selecteRegionalsTasksResults(@Param("taskId") String taskId);
 }

serviceapi/peopleapi/src/main/java/com/founder/peopleapi/service/impl/RegTaskServiceImpl.java

@@ -40,13 +40,5 @@ public class RegTaskServiceImpl implements RegTaskService {
         return MapRestResult.build(200,"区域保存成功","");
     }
 
-    @Override
-    public List<RegionalsTask> selecteRegionalsTasks(String startTime, String endTime, String taskObject, String carNum, String fsrIdentity) {
-        return regInfoMapper.selecteRegionalsTasks(startTime,endTime,taskObject,carNum,fsrIdentity);
-    }
 
-    @Override
-    public List<RegionalsCarCarResult> selecteRegionalsTasksResults(String taskId) {
-        return regInfoMapper.selecteRegionalsTasksResults(taskId);
-    }
 }