添加副屏视频随主屏警情切换进行联动

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -183,7 +183,9 @@ public interface EquipFeignClient {
      * @return
      */
     @RequestMapping(value = "/building/video/page", method = RequestMethod.GET)
-    ResponseModel<Page<Map<String, Object>>> getVideo( @RequestParam("current") long current, @RequestParam("size") long size, @RequestParam("buildingId") Long buildingId);
+    ResponseModel<Page<Map<String, Object>>> getVideo( @RequestParam("current") long current,
+                                                       @RequestParam("size") long size,
+                                                       @RequestParam("buildingId") Long buildingId);
 
     @RequestMapping(value = "/building/video/page", method = RequestMethod.GET)
     ResponseModel<Page<Map<String, Object>>> getVideopag( @RequestParam("current") String current,
@@ -203,13 +205,11 @@ public interface EquipFeignClient {
     );
 
 
-
-
     @RequestMapping(value = "/confirmAlarm/getDetailsById", method = RequestMethod.GET)
-    public ResponseModel<Map<String, Object>>  getDetailsById(@RequestParam Long alamId, @RequestParam(required = false) Long equipId, @RequestParam(required = false) String type, @RequestParam String area) ;
-
-
-
+    ResponseModel<Map<String, Object>>  getDetailsById(@RequestParam Long alamId,
+                                                       @RequestParam(required = false) Long equipId,
+                                                       @RequestParam(required = false) String type,
+                                                       @RequestParam String area) ;
     /**
      *
      *获取视频列表
@@ -217,7 +217,11 @@ public interface EquipFeignClient {
      * @return
      */
     @RequestMapping(value = "/video/pageVideo", method = RequestMethod.GET)
-    ResponseModel<Page<Map<String, Object>>> pageVideo( @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, @RequestParam("longitude") Double longitude,@RequestParam("latitude") Double latitude,@RequestParam("distance") Double distance);
+    ResponseModel<Page<Map<String, Object>>> pageVideo(@RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("longitude") Double longitude,
+                                                       @RequestParam("latitude") Double latitude,
+                                                       @RequestParam("distance") Double distance);
 
 
     @RequestMapping(value = "/video/pageList", method = RequestMethod.GET)

amos-boot-system-equip/src/main/resources/mapper/VideoMapper.xml

@@ -314,21 +314,14 @@
         </if>
         wle.latitude
         FROM wl_video wle
-
         where   wle.longitude is not null and  wle.latitude is not null
-
-        <if test='distance!=null'>
-             and Round(st_distance(point(wle.longitude,wle.latitude),point(#{longitude},#{latitude}))*111195,1) &lt;=
-             #{distance}
+        <if test='longitude!=null and latitude!=null and distance!=null'>
+             and distance &lt;= #{distance}
         </if>
         <if test='longitude!=null and latitude!=null '>
-
         ORDER BY distance
-
         </if>
-
         limit #{pageNum},#{pageSize}
-
     </select>