云天励飞 范围内点位信息和时空回溯接口

serviceapi/imageapi/src/main/java/com/founder/imageapi/mapper/xml/CameraInfoMapper.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.founder.imageapi.mapper.CameraInfoMapper">
-
+<mapper namespace="com.founder.ytlf.mapper.CameraInfoMapper">
+    <!--根据起始经纬度获取人像点位数据-->
     <select id="getCameraInfoByIds" parameterType="java.lang.String" resultType="com.founder.commonutils.peopleEntity.Camera">
         select
-        ID as cameraId,
-        NAME as cameraName,
-        CITY as areaName,
-        STATION_ID as areaCode,
-        STATION_ID AS areaCodeName,
-        NAME as districtId,
-        NAME as areaId,
+        t.ID as cameraId,
+        t.NAME as cameraName,
+        (select name from sys_dictitem where groupid = 'CODE_UNIT' and code = substr(t.camera_code,0,6)||'000000') as districtCodeName,
+        substr(t.camera_code,0,6)|| '000000' as districtCode,
+        (select name from sys_dictitem where groupid = 'CODE_XZQH' and code = substr(t.camera_code,0,6)) as areaCodeName,
+        substr(t.camera_code,0,6) as areaCode,
+        t.CITY as areaName,
 
         x as x,
         y as y,
         NAME as cameraType
-        from TB_ZY_CAMERA    where 1=1
-        <if test="cameraIds!=null and cameraIds!=''">and ID in  ${cameraIds}</if>
+        from tb_zy_camera t    where 1=1
+        <if test="cameraIds!=null and cameraIds!=''">and id in  ${cameraIds}</if>
     </select>
     <!--根据起始经纬度获取人像点位数据-->
     <select id="getCameraInfoByQsJwd" parameterType="java.lang.String" resultType="com.founder.commonutils.peopleEntity.Camera">
@@ -24,15 +24,14 @@
         ID as cameraId,
         NAME as cameraName,
         CITY as areaName,
-        STATION_ID as areaCode,
-        STATION_ID AS areaCodeName,
-        NAME as districtId,
-        NAME as areaId,
-
+        (select name from sys_dictitem where groupid = 'CODE_UNIT' and code = substr(t.camera_code,0,6)||'000000') as districtCodeName,
+        substr(t.camera_code,0,6)|| '000000' as districtCode,
+        (select name from sys_dictitem where groupid = 'CODE_XZQH' and code = substr(t.camera_code,0,6)) as areaCodeName,
+        substr(t.camera_code,0,6) as areaCode,
         x as x,
         y as y,
         NAME as cameraType
-        from tb_zy_camera    where 1=1
+        from tb_zy_camera 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 x<![CDATA[>=]]>#{qsjd,jdbcType=VARCHAR} AND x<![CDATA[<=]]>#{jsjd,jdbcType=VARCHAR}
             AND y<![CDATA[>=]]>#{qswd,jdbcType=VARCHAR} AND y<![CDATA[<=]]>#{jswd,jdbcType=VARCHAR}

serviceapi/imageapi/src/main/java/com/founder/imageapi/service/impl/CommonService.java

@@ -23,21 +23,23 @@ public class CommonService {
         List<Camera> cameras = cameraInfoDao.getCameraInfoByIds(cameraId);
         if (cameras != null&&cameras.size()>0) {
             for(Camera camera:cameras){
-                String address = camera.getAreaName() + " " + camera.getAreaCodeName()+ "" +camera.getCameraName();
-                String areaName = camera.getAreaName();
-                String x = camera.getX(),y = camera.getY();
+                String address = camera.getAreaCodeName() + camera.getCameraName();
+                String x = camera.getX(),y = camera.getY();// 经纬度
                 String cameraType=camera.getCameraType();
-                String areaCode=camera.getAreaCode();
-                String areaCodeName=camera.getAreaCodeName();
-                map.put("address", address);//某地区 某派出所  某摄像头
+                String areaCode=camera.getAreaCode();// 地区代码
+                String areaCodeName=camera.getAreaCodeName();// 地区名称 某市某城区
+                String districtCode=camera.getDistrictCode();// 分局代码
+                String districtCodeName=camera.getDistrictCodeName();// 分局名称
+                map.put("address", address);//某分局 某派出所  某摄像头
                 map.put("x", x);
                 map.put("y", y);
                 map.put("cameraName", camera.getCameraName());// 摄像头名称
 
                 map.put("cameraType",cameraType);
-                map.put("districtCodeName",areaName);// 地区名称
-                map.put("areaCode",areaCode);// 派出所代码
-                map.put("areaCodeName",areaCodeName);// 派出所名称
+                map.put("districtCodeName",districtCodeName);// 分局名称
+                map.put("districtCode",districtCode);// 分局代码
+                map.put("areaCode",areaCode);// 地区代码
+                map.put("areaCodeName",areaCodeName);// 地区名称
             }
 
         }

serviceapi/imageapi/src/main/java/com/founder/imageapi/service/impl/ImageServiceImpl.java

@@ -359,7 +359,7 @@ public class ImageServiceImpl implements ImageService {
 
                 p.setCameraType((String)map.get("cameraType"));
                 p.setDistrictCode((String)map.get("districtCode"));
-                //p.setDistrictCodeName((String)map.get("districtCodeName"));
+                p.setDistrictCodeName((String)map.get("districtCodeName"));
                 p.setAreaCode((String)map.get("areaCode"));
                 p.setAreaCodeName((String)map.get("areaCodeName"));