From a632953649174765738feabb4d4f8381a63abc95 Mon Sep 17 00:00:00 2001 From: wuweida <2918581207@qq.com> Date: Fri, 20 May 2022 15:45:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=91=84=E5=83=8F?= =?UTF-8?q?=E5=A4=B4=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitormanage/controller/Controller.java | 13 +++++++++ .../controller/FordController.java | 3 +- .../monitormanage/dto/CameraChannelNLDto.java | 28 +++++++++++++++++++ .../mapper/CameraChannelMapper.java | 4 +++ .../resources/mapper/CameraChannelMapper.xml | 8 ++++++ 5 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/hisense/monitormanage/dto/CameraChannelNLDto.java diff --git a/src/main/java/com/hisense/monitormanage/controller/Controller.java b/src/main/java/com/hisense/monitormanage/controller/Controller.java index 7bbeb89..f02a942 100644 --- a/src/main/java/com/hisense/monitormanage/controller/Controller.java +++ b/src/main/java/com/hisense/monitormanage/controller/Controller.java @@ -279,6 +279,19 @@ public class Controller { return success; } + /** + * + * @param page + * @param pageSize + * @return + */ + @GetMapping("selectCamera") + public Result selectNLAll(Integer page,Integer pageSize){ + List selectNLAll = cameraChannelMapper.selectNLAll(page,pageSize); + Result success = Result.success(selectNLAll); + return success; + } + //查询视频点播巡检结果，只取异常的 // @RequestMapping("listChannelPlayStates") // public Result listChannelPlayStates( diff --git a/src/main/java/com/hisense/monitormanage/controller/FordController.java b/src/main/java/com/hisense/monitormanage/controller/FordController.java index c1ab9dd..201e8fc 100644 --- a/src/main/java/com/hisense/monitormanage/controller/FordController.java +++ b/src/main/java/com/hisense/monitormanage/controller/FordController.java @@ -1,6 +1,5 @@ package com.hisense.monitormanage.controller; -import io.swagger.annotations.ApiOperation; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @@ -15,7 +14,7 @@ import java.net.URLConnection; public class FordController { @GetMapping("components/**") - public void ford(HttpServletRequest request, HttpServletResponse response)throws Exception{ + public void ford(HttpServletRequest request, HttpServletResponse response){ String imageDomain = "http://10.132.191.48:30080"; diff --git a/src/main/java/com/hisense/monitormanage/dto/CameraChannelNLDto.java b/src/main/java/com/hisense/monitormanage/dto/CameraChannelNLDto.java new file mode 100644 index 0000000..62ea30a --- /dev/null +++ b/src/main/java/com/hisense/monitormanage/dto/CameraChannelNLDto.java @@ -0,0 +1,28 @@ +package com.hisense.monitormanage.dto; + +import lombok.Data; + +@Data +public class CameraChannelNLDto { + + private String labelCode; + + private String labelName; + + private String channelCode; + + private String channelId; + + private String channelName; + + private String gpsX; + + private String gpsY; + + private Integer status;//1在线；0离线 + + private String nodeName; + + private Integer checkStatus;//1正常；0异常 + +} diff --git a/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java b/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java index c9e3e74..edce4ee 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java @@ -3,6 +3,7 @@ package com.hisense.monitormanage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hisense.monitormanage.dto.CameraChannelDto; import com.hisense.monitormanage.dto.CameraChannelDto1; +import com.hisense.monitormanage.dto.CameraChannelNLDto; import com.hisense.monitormanage.dto.ChannelLabelDto; import com.hisense.monitormanage.entity.CameraChannel; import com.hisense.monitormanage.entity.Label; @@ -50,4 +51,7 @@ public interface CameraChannelMapper extends BaseMapper { @Param("gpsY") String gpsY, @Param("gpsY1") String gpsY1); + + List selectNLAll(@Param("page") Integer page,@Param("pageSize") Integer pageSize); + } diff --git a/src/main/resources/mapper/CameraChannelMapper.xml b/src/main/resources/mapper/CameraChannelMapper.xml index ade2f93..dfbccd8 100644 --- a/src/main/resources/mapper/CameraChannelMapper.xml +++ b/src/main/resources/mapper/CameraChannelMapper.xml @@ -24,4 +24,12 @@ + + \ No newline at end of file From bf10750ff5bd92d4a8660c37e8071963322ac364 Mon Sep 17 00:00:00 2001 From: wuweida <2918581207@qq.com> Date: Fri, 20 May 2022 16:25:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E7=BB=8F=E7=BA=AC=E5=BA=A6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8D=8A=E5=BE=84=E5=86=85=E6=89=80=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitormanage/controller/Controller.java | 28 +++++++++---------- .../mapper/CameraChannelMapper.java | 10 +++---- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/hisense/monitormanage/controller/Controller.java b/src/main/java/com/hisense/monitormanage/controller/Controller.java index f02a942..2284827 100644 --- a/src/main/java/com/hisense/monitormanage/controller/Controller.java +++ b/src/main/java/com/hisense/monitormanage/controller/Controller.java @@ -4,6 +4,7 @@ import com.hisense.monitormanage.dto.*; import com.hisense.monitormanage.entity.*; import com.hisense.monitormanage.mapper.*; import com.hisense.monitormanage.service.*; +import com.hisense.monitormanage.utils.LongLatUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -207,25 +208,24 @@ public class Controller { } /** - * 根据两个点查询范围内的摄像头 + * 根据经纬度查询半径内所有的摄像头 * @param gpsX - * @param gpsX1 * @param gpsY - * @param gpsY1 + * @param raidus * @return */ @GetMapping ("selectAllByGps") - public Result selectAllByGps(String gpsX,String gpsX1,String gpsY,String gpsY1){ - - List gps = cameraChannelMapper.selectAllByGps(gpsX, gpsX1, gpsY, gpsY1); - double gpsx = Double.parseDouble(gpsX); - double gpsx1 = Double.parseDouble(gpsX1); - double gpsy = Double.parseDouble(gpsY); - double gpsy1 = Double.parseDouble(gpsY1); - if (gpsx < gpsx1 || gpsy < gpsy1){ - return Result.success(gps); - } - return Result.error("请输入正确的精度范围"); + @ApiOperation("根据经纬度查询半径内所有的摄像头") + @ApiImplicitParams({ + @ApiImplicitParam(name = "gpsX", value = "经度", paramType = "query",required = true,dataType ="double"), + @ApiImplicitParam(name = "gpsY", value = "纬度", paramType = "query",required = true,dataType ="double"), + @ApiImplicitParam(name = "raidus", value = "半径，米", paramType = "query",required = true,dataType ="Integer"),} + ) + public Result selectAllByGps(Double gpsX,Double gpsY,Integer raidus){ + double[] around = LongLatUtil.getAround(gpsX, gpsY, raidus); + List c = cameraChannelMapper.selectAllByGps(around[0], around[2], around[1], around[3]); + Result success = Result.success(c); + return success; } /** diff --git a/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java b/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java index edce4ee..3009d1a 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java @@ -44,12 +44,12 @@ public interface CameraChannelMapper extends BaseMapper { "ON a.label_code = b.label_code AND b.channel_code = c.channel_code where c.`status`!= 0) m where m.label_code in (${labelCode}) ") List selectLabelAndChannel(@Param("labelCode") String labelCode); - @Select("select cc.channel_code,cc.gps_x,cc.gps_y from t_camera_channel cc " + + @Select("select cc.* from t_camera_channel cc " + "where (gps_x between #{gpsX} and #{gpsX1}) and (gps_y between #{gpsY} and #{gpsY1} )") - List selectAllByGps(@Param("gpsX") String gpsX, - @Param("gpsX1") String gpsX1, - @Param("gpsY") String gpsY, - @Param("gpsY1") String gpsY1); + List selectAllByGps(@Param("gpsX") Double gpsX, + @Param("gpsX1") Double gpsX1, + @Param("gpsY") Double gpsY, + @Param("gpsY1") Double gpsY1); List selectNLAll(@Param("page") Integer page,@Param("pageSize") Integer pageSize);