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