From b93089367bbf4f0b49a358eb5e1d1daf254a6a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E9=B8=A3?= Date: Tue, 30 Mar 2021 10:33:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=90=83=E6=9C=BA=E6=97=8B=E8=BD=AC360?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 28 + .../web/controller/StockController.java | 12 +- .../java/com/zhehekeji/web/entity/Lychee.java | 16 - .../java/com/zhehekeji/web/lib/CallBack.java | 13 - .../java/com/zhehekeji/web/lib/NetSDKLib.java | 4 +- .../zhehekeji/web/lib/PtzControlModule.java | 529 ++++++++++-------- .../zhehekeji/web/mapper/LycheeMapper.java | 7 - .../com/zhehekeji/web/mapper/StockMapper.java | 7 +- .../web/service/MyProtocolDecoder.java | 2 +- .../web/service/RealTimeService.java | 12 - .../zhehekeji/web/service/StockService.java | 9 +- .../zhehekeji/web/service/WarnService.java | 2 - 12 files changed, 343 insertions(+), 298 deletions(-) create mode 100644 .gitignore delete mode 100644 web/src/main/java/com/zhehekeji/web/entity/Lychee.java delete mode 100644 web/src/main/java/com/zhehekeji/web/mapper/LycheeMapper.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..605d0a6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,28 @@ +# Created by .ignore support plugin (hsz.mobi) +### Java template +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +.gitignore +.idea/workspace.xml diff --git a/web/src/main/java/com/zhehekeji/web/controller/StockController.java b/web/src/main/java/com/zhehekeji/web/controller/StockController.java index 46dd5ec..5413de5 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StockController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StockController.java @@ -114,8 +114,16 @@ public class StockController { @ApiOperation(value = "slow") @RequestMapping(value = "/slow", method = RequestMethod.GET) - public Result slow(Integer ptzId, Integer cameraId) { - PtzControlModule.toPtzSlow(ptzId, cameraId); + public Result slow(Integer cameraId,Integer x) { + PtzControlModule.toPtzSlow(cameraId,x); + return Result.success(); + + } + + @ApiOperation(value = "currentPosition") + @RequestMapping(value = "/currentPosition", method = RequestMethod.GET) + public Result currentPosition(Integer cameraId) { + PtzControlModule.turn360(cameraId); return Result.success(); } } diff --git a/web/src/main/java/com/zhehekeji/web/entity/Lychee.java b/web/src/main/java/com/zhehekeji/web/entity/Lychee.java deleted file mode 100644 index f85b3d5..0000000 --- a/web/src/main/java/com/zhehekeji/web/entity/Lychee.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zhehekeji.web.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -@Data -@TableName("`lychee`") -public class Lychee { - - @TableId - private Integer id; - - private String ip; -} diff --git a/web/src/main/java/com/zhehekeji/web/lib/CallBack.java b/web/src/main/java/com/zhehekeji/web/lib/CallBack.java index 931ee60..3be3a92 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/CallBack.java +++ b/web/src/main/java/com/zhehekeji/web/lib/CallBack.java @@ -77,19 +77,6 @@ public class CallBack { } } -// System.out.println("-------------时间："+new Date()+"--------------"); -// System.out.println("通道号:" + PTZInfo.nChannelID); -// System.out.println("云台水平运动位置:" + PTZInfo.nPTZPan); -// System.out.println("云台垂直运动位置:" + PTZInfo.nPTZTilt); -// System.out.println("云台光圈变动位置:" + PTZInfo.nPTZZoom); -// System.out.println("云台运动状态:" + PTZInfo.bState); -// System.out.println("云台动作:" + PTZInfo.bAction); -// System.out.println("云台聚焦状态:" + PTZInfo.bFocusState); -// System.out.println("在时间段内预置点状态是否有效:" + PTZInfo.bEffectiveInTimeSection); -// System.out.println("聚焦位置:" + PTZInfo.fFocusPosition); -// System.out.println("云台水平运动位置:" + PTZInfo.nPTZPan); -// System.out.println("云台垂直运动位置:" + PTZInfo.nPTZTilt); -// System.out.println("当前倍率:" + (PTZInfo.nZoomValue * 100)); // 真实变倍值 当前倍率（扩大100倍表示） } } diff --git a/web/src/main/java/com/zhehekeji/web/lib/NetSDKLib.java b/web/src/main/java/com/zhehekeji/web/lib/NetSDKLib.java index 15956a4..63e484d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/NetSDKLib.java +++ b/web/src/main/java/com/zhehekeji/web/lib/NetSDKLib.java @@ -16317,8 +16317,8 @@ public interface NetSDKLib extends Library { // 第一个元素为水平角度，0-36000； // 第二个元素为垂直角度，（-18000）-（18000）； // 第三个元素为显示放大倍数，0-MaxZoom*100 - public int nFocusMapValue; // 聚焦映射值 - public int[] reserved=new int[176]; // 保留字段 + //public int nFocusMapValue; // 聚焦映射值 + public int[] reserved=new int[180]; // 保留字段 } // 云台定位中非归一化坐标和变倍 diff --git a/web/src/main/java/com/zhehekeji/web/lib/PtzControlModule.java b/web/src/main/java/com/zhehekeji/web/lib/PtzControlModule.java index ff89468..1eff530 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/PtzControlModule.java +++ b/web/src/main/java/com/zhehekeji/web/lib/PtzControlModule.java @@ -15,297 +15,350 @@ import java.time.LocalDateTime; @Slf4j public class PtzControlModule { - private static CallBack.Mp4ReceiveCB mp4ReceiveCB = new CallBack.Mp4ReceiveCB(); - - /** - * 向上 - */ - public static boolean ptzControlUpStart(Integer cameraId,int nChannelID, int lParam1, int lParam2) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_UP_CONTROL, - lParam1, lParam2, 0, 0); - } - public static boolean ptzControlUpEnd(Integer cameraId,int nChannelID) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_UP_CONTROL, - 0, 0, 0, 1); - } - - /** - * 向下 - */ - public static boolean ptzControlDownStart(Integer cameraId,int nChannelID, int lParam1, int lParam2) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_DOWN_CONTROL, - lParam1, lParam2, 0, 0); - } - public static boolean ptzControlDownEnd(Integer cameraId,int nChannelID) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_DOWN_CONTROL, - 0, 0, 0, 1); - } - - /** - * 向左 - */ - public static boolean ptzControlLeftStart(Integer cameraId,int nChannelID, int lParam1, int lParam2) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_LEFT_CONTROL, - lParam1, lParam2, 0, 0); - } - public static boolean ptzControlLeftEnd(Integer cameraId,int nChannelID) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_LEFT_CONTROL, - 0, 0, 0, 1); - } - - /** - * 向右 - */ - public static boolean ptzControlRightStart(Integer cameraId,int nChannelID, int lParam1,int lParam2) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_RIGHT_CONTROL, - lParam1, lParam2, 0, 0); - } - public static boolean ptzControlRightEnd(Integer cameraId,int nChannelID) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_RIGHT_CONTROL, - 0, 0, 0, 1); - } - - /** - * 向左上 - */ - public static boolean ptzControlLeftUpStart(Integer cameraId,int nChannelID, int lParam1, int lParam2) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTTOP, - lParam1, lParam2, 0, 0); - } - public static boolean ptzControlLeftUpEnd(Integer cameraId,int nChannelID) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTTOP, - 0, 0, 0, 1); - } - - /** - * 向右上 - */ - public static boolean ptzControlRightUpStart(Integer cameraId,int nChannelID, int lParam1, int lParam2) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTTOP, - lParam1, lParam2, 0, 0); - } - public static boolean ptzControlRightUpEnd(Integer cameraId,int nChannelID) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTTOP, - 0, 0, 0, 1); - } - - /** - * 向左下 - */ - public static boolean ptzControlLeftDownStart(Integer cameraId,int nChannelID, int lParam1, int lParam2) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTDOWN, - lParam1, lParam2, 0, 0); - } - public static boolean ptzControlLeftDownEnd(Integer cameraId,int nChannelID) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTDOWN, - 0, 0, 0, 1); - } - - /** - * 向右下 - */ - public static boolean ptzControlRightDownStart(Integer cameraId,int nChannelID, int lParam1, int lParam2) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTDOWN, - lParam1, lParam2, 0, 0); - } - public static boolean ptzControlRightDownEnd(Integer cameraId,int nChannelID) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTDOWN, - 0, 0, 0, 1); - } + private static CallBack.Mp4ReceiveCB mp4ReceiveCB = new CallBack.Mp4ReceiveCB(); + + /** + * 向上 + */ + public static boolean ptzControlUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_UP_CONTROL, + lParam1, lParam2, 0, 0); + } + + public static boolean ptzControlUpEnd(Integer cameraId, int nChannelID) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_UP_CONTROL, + 0, 0, 0, 1); + } + + /** + * 向下 + */ + public static boolean ptzControlDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_DOWN_CONTROL, + lParam1, lParam2, 0, 0); + } + + public static boolean ptzControlDownEnd(Integer cameraId, int nChannelID) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_DOWN_CONTROL, + 0, 0, 0, 1); + } + + /** + * 向左 + */ + public static boolean ptzControlLeftStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_LEFT_CONTROL, + lParam1, lParam2, 0, 0); + } + + public static boolean ptzControlLeftEnd(Integer cameraId, int nChannelID) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_LEFT_CONTROL, + 0, 0, 0, 1); + } + + /** + * 向右 + */ + public static boolean ptzControlRightStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_RIGHT_CONTROL, + lParam1, lParam2, 0, 0); + } + + public static boolean ptzControlRightEnd(Integer cameraId, int nChannelID) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_RIGHT_CONTROL, + 0, 0, 0, 1); + } + + /** + * 向左上 + */ + public static boolean ptzControlLeftUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTTOP, + lParam1, lParam2, 0, 0); + } + + public static boolean ptzControlLeftUpEnd(Integer cameraId, int nChannelID) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTTOP, + 0, 0, 0, 1); + } + + /** + * 向右上 + */ + public static boolean ptzControlRightUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTTOP, + lParam1, lParam2, 0, 0); + } + + public static boolean ptzControlRightUpEnd(Integer cameraId, int nChannelID) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTTOP, + 0, 0, 0, 1); + } + + /** + * 向左下 + */ + public static boolean ptzControlLeftDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTDOWN, + lParam1, lParam2, 0, 0); + } + + public static boolean ptzControlLeftDownEnd(Integer cameraId, int nChannelID) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTDOWN, + 0, 0, 0, 1); + } + + /** + * 向右下 + */ + public static boolean ptzControlRightDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTDOWN, + lParam1, lParam2, 0, 0); + } + + public static boolean ptzControlRightDownEnd(Integer cameraId, int nChannelID) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTDOWN, + 0, 0, 0, 1); + } /** * 变倍+ */ - public static boolean ptzControlZoomAddStart(Integer cameraId,int nChannelID, int lParam2) { + public static boolean ptzControlZoomAddStart(Integer cameraId, int nChannelID, int lParam2) { return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_ADD_CONTROL, - 0, lParam2, 0, 0); + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_ADD_CONTROL, + 0, lParam2, 0, 0); } - public static boolean ptzControlZoomAddEnd(Integer cameraId,int nChannelID) { + + public static boolean ptzControlZoomAddEnd(Integer cameraId, int nChannelID) { return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_ADD_CONTROL, - 0, 0, 0, 1); + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_ADD_CONTROL, + 0, 0, 0, 1); } /** * 变倍- */ - public static boolean ptzControlZoomDecStart(Integer cameraId,int nChannelID, int lParam2) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_DEC_CONTROL, - 0, lParam2, 0, 0); + public static boolean ptzControlZoomDecStart(Integer cameraId, int nChannelID, int lParam2) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_DEC_CONTROL, + 0, lParam2, 0, 0); } - public static boolean ptzControlZoomDecEnd(Integer cameraId,int nChannelID) { + + public static boolean ptzControlZoomDecEnd(Integer cameraId, int nChannelID) { return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_DEC_CONTROL, - 0, 0, 0, 1); + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_DEC_CONTROL, + 0, 0, 0, 1); } /** * 变焦+ */ - public static boolean ptzControlFocusAddStart(Integer cameraId,int nChannelID, int lParam2) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_ADD_CONTROL, - 0, lParam2, 0, 0); + public static boolean ptzControlFocusAddStart(Integer cameraId, int nChannelID, int lParam2) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_ADD_CONTROL, + 0, lParam2, 0, 0); } - public static boolean ptzControlFocusAddEnd(Integer cameraId,int nChannelID) { - return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_ADD_CONTROL, - 0, 0, 0, 1); + + public static boolean ptzControlFocusAddEnd(Integer cameraId, int nChannelID) { + return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_ADD_CONTROL, + 0, 0, 0, 1); } /** * 变焦- */ - public static boolean ptzControlFocusDecStart(Integer cameraId,int nChannelID, int lParam2) { + public static boolean ptzControlFocusDecStart(Integer cameraId, int nChannelID, int lParam2) { return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_DEC_CONTROL, - 0, lParam2, 0, 0); + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_DEC_CONTROL, + 0, lParam2, 0, 0); } - public static boolean ptzControlFocusDecEnd(Integer cameraId,int nChannelID) { + + public static boolean ptzControlFocusDecEnd(Integer cameraId, int nChannelID) { return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_DEC_CONTROL, - 0, 0, 0, 1); + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_DEC_CONTROL, + 0, 0, 0, 1); } /** * 光圈+ */ - public static boolean ptzControlIrisAddStart(Integer cameraId,int nChannelID, int lParam2) { + public static boolean ptzControlIrisAddStart(Integer cameraId, int nChannelID, int lParam2) { return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_ADD_CONTROL, - 0, lParam2, 0, 0); + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_ADD_CONTROL, + 0, lParam2, 0, 0); } - public static boolean ptzControlIrisAddEnd(Integer cameraId,int nChannelID) { + + public static boolean ptzControlIrisAddEnd(Integer cameraId, int nChannelID) { return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_ADD_CONTROL, - 0, 0, 0, 1); + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_ADD_CONTROL, + 0, 0, 0, 1); } /** * 光圈- */ - public static boolean ptzControlIrisDecStart(Integer cameraId,int nChannelID, int lParam2) { + public static boolean ptzControlIrisDecStart(Integer cameraId, int nChannelID, int lParam2) { return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_DEC_CONTROL, - 0, lParam2, 0, 0); + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_DEC_CONTROL, + 0, lParam2, 0, 0); } - public static boolean ptzControlIrisDecEnd(Integer cameraId,int nChannelID) { + + public static boolean ptzControlIrisDecEnd(Integer cameraId, int nChannelID) { return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, - NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_DEC_CONTROL, - 0, 0, 0, 1); + NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_DEC_CONTROL, + 0, 0, 0, 1); } - public static boolean pic(Integer cameraId,int nChannelID,OrderInfo orderInfo) { + public static boolean pic(Integer cameraId, int nChannelID, OrderInfo orderInfo) { NetSDKLib.SNAP_PARAMS stuSnapParams = new NetSDKLib.SNAP_PARAMS(); - stuSnapParams.Channel = nChannelID; // channel - stuSnapParams.mode = 0; // capture picture mode - stuSnapParams.Quality = 3; // picture quality - stuSnapParams.InterSnap = 0; // timer capture picture time interval + stuSnapParams.Channel = nChannelID; // channel + stuSnapParams.mode = 0; // capture picture mode + stuSnapParams.Quality = 3; // picture quality + stuSnapParams.InterSnap = 0; // timer capture picture time interval stuSnapParams.CmdSerial = OrderCmdSerial.nextSerial(); - OrderCmdSerial.put(stuSnapParams.CmdSerial,orderInfo); + OrderCmdSerial.put(stuSnapParams.CmdSerial, orderInfo); IntByReference reserved = new IntByReference(0); - return LoginModule.netsdk.CLIENT_SnapPictureEx(CameraConnMap.getConnId(cameraId), stuSnapParams, reserved); - - } - - public static void downloadMp4(Integer cameraId,String path,String orderNum,LocalDateTime start,LocalDateTime end){ - //视频结束时间加上5s - end = end.plusSeconds(5); - PathUtil.checkDirc(path); - NetSDKLib.NET_TIME startTime = new NetSDKLib.NET_TIME(); - startTime.setTime(start.getYear(),start.getMonthValue(),start.getDayOfMonth(),start.getHour(),start.getMinute(),start.getSecond()); - NetSDKLib.NET_TIME endTime = new NetSDKLib.NET_TIME(); - endTime.setTime(end.getYear(),end.getMonthValue(),end.getDayOfMonth(),end.getHour(),end.getMinute(),end.getSecond()); - NetSDKLib.NET_IN_DOWNLOAD_BY_DATA_TYPE download_by_data_type = new NetSDKLib.NET_IN_DOWNLOAD_BY_DATA_TYPE(); - download_by_data_type.nChannelID = 0; - download_by_data_type.stStartTime = startTime; - download_by_data_type.stStopTime = endTime; - download_by_data_type.szSavedFileName=path; - download_by_data_type.emDataType = 3; - download_by_data_type.emRecordType = 0; - download_by_data_type.cbDownLoadPos = mp4ReceiveCB; - download_by_data_type.write(); - NetSDKLib.NET_OUT_DOWNLOAD_BY_DATA_TYPE net_out_download_by_data_type = new NetSDKLib.NET_OUT_DOWNLOAD_BY_DATA_TYPE(); - net_out_download_by_data_type.write(); - log.info("start download mp4 path:{},startTime:{} ,endTime:{},now:{}",path,startTime.toString(),endTime.toString(),LocalDateTime.now()); - NetSDKLib.LLong l = LoginModule.netsdk.CLIENT_DownloadByDataType(CameraConnMap.getConnId(cameraId),download_by_data_type.getPointer(),net_out_download_by_data_type.getPointer(),8000); - if(l.longValue() == 0){ - log.error("download error :{}",ToolKits.getErrorCodePrint()); - }else { - OrderRealtime.startDownload(l,orderNum); - } - } - - /** - * 设置预置点 - * @param ptzId 预置点ID - * @param name 预置点的名称 - * @param cameraId 球机ID,来获取登录句柄 - */ - public static void ptz(Integer ptzId,String name,Integer cameraId){ - int dwzCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_SET_CONTROL; - int nPressetIndex = ptzId; - Boolean ok =LoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId),0,dwzCommand,0,ptzId,0,0,ToolKits.GetGBKStringToPointer(name)); - Assert.isTrue(ok,"设置失败"); - } - - /** - * 转至 预置点 - * @param ptzId - * @param cameraId - */ - public static void toPtz(Integer ptzId,Integer cameraId){ - int dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_MOVE_CONTROL; - - int nPresetIndex = ptzId; - Boolean ok = LoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId),0,dwPTZCommand,0,ptzId,0,0,null); - if(!ok ){ - log.error("转至预置点 失败 cameraId:{},ptzId:{}",cameraId,ptzId); - } - } - - /** - * 转至 预置点 - * @param ptzId - * @param cameraId - */ - public static void toPtzSlow(Integer ptzId,Integer cameraId){ - int dwPTZCommand = NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_MOVE_ABSOLUTELY; - NetSDKLib.PTZ_CONTROL_ABSOLUTELY absolutely = new NetSDKLib.PTZ_CONTROL_ABSOLUTELY(); - absolutely.stuPosition.nPositionX = 3600; - absolutely.stuPosition.nPositionY= 0; - absolutely.stuSpeed.fPositionX = 0.2f; - absolutely.stuSpeed.fPositionY = 0.2f; - absolutely.write(); - //absolutely.stuSpeed.fZoom = 0.5f; - Boolean ok = LoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId),0,dwPTZCommand, - 0,0,0,0,absolutely.getPointer()); - if(!ok ){ - log.error("失败 cameraId:{},ptzId:{}",cameraId,ptzId); - } - } + return LoginModule.netsdk.CLIENT_SnapPictureEx(CameraConnMap.getConnId(cameraId), stuSnapParams, reserved); + + } + public static void downloadMp4(Integer cameraId, String path, String orderNum, LocalDateTime start, LocalDateTime end) { + //视频结束时间加上5s + end = end.plusSeconds(5); + PathUtil.checkDirc(path); + NetSDKLib.NET_TIME startTime = new NetSDKLib.NET_TIME(); + startTime.setTime(start.getYear(), start.getMonthValue(), start.getDayOfMonth(), start.getHour(), start.getMinute(), start.getSecond()); + NetSDKLib.NET_TIME endTime = new NetSDKLib.NET_TIME(); + endTime.setTime(end.getYear(), end.getMonthValue(), end.getDayOfMonth(), end.getHour(), end.getMinute(), end.getSecond()); + NetSDKLib.NET_IN_DOWNLOAD_BY_DATA_TYPE download_by_data_type = new NetSDKLib.NET_IN_DOWNLOAD_BY_DATA_TYPE(); + download_by_data_type.nChannelID = 0; + download_by_data_type.stStartTime = startTime; + download_by_data_type.stStopTime = endTime; + download_by_data_type.szSavedFileName = path; + download_by_data_type.emDataType = 3; + download_by_data_type.emRecordType = 0; + download_by_data_type.cbDownLoadPos = mp4ReceiveCB; + download_by_data_type.write(); + NetSDKLib.NET_OUT_DOWNLOAD_BY_DATA_TYPE net_out_download_by_data_type = new NetSDKLib.NET_OUT_DOWNLOAD_BY_DATA_TYPE(); + net_out_download_by_data_type.write(); + log.info("start download mp4 path:{},startTime:{} ,endTime:{},now:{}", path, startTime.toString(), endTime.toString(), LocalDateTime.now()); + NetSDKLib.LLong l = LoginModule.netsdk.CLIENT_DownloadByDataType(CameraConnMap.getConnId(cameraId), download_by_data_type.getPointer(), net_out_download_by_data_type.getPointer(), 8000); + if (l.longValue() == 0) { + log.error("download error :{}", ToolKits.getErrorCodePrint()); + } else { + OrderRealtime.startDownload(l, orderNum); + } + } + /** + * 设置预置点 + * + * @param ptzId 预置点ID + * @param name 预置点的名称 + * @param cameraId 球机ID,来获取登录句柄 + */ + public static void ptz(Integer ptzId, String name, Integer cameraId) { + int dwzCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_SET_CONTROL; + Boolean ok = LoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwzCommand, 0, ptzId, 0, 0, ToolKits.GetGBKStringToPointer(name)); + Assert.isTrue(ok, "设置失败"); + } + /** + * 转至 预置点 + * + * @param ptzId + * @param cameraId + */ + public static void toPtz(Integer ptzId, Integer cameraId) { + int dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_MOVE_CONTROL; + Boolean ok = LoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwPTZCommand, 0, ptzId, 0, 0, null); + if (!ok) { + log.error("转至预置点 失败 cameraId:{},ptzId:{}", cameraId, ptzId); + } + } + /** + * 转至 预置点 + * + * @param cameraId + */ + public static void toPtzSlow(Integer cameraId,Integer x) { + int dwPTZCommand = NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_MOVE_ABSOLUTELY; + NetSDKLib.PTZ_CONTROL_ABSOLUTELY absolutely = new NetSDKLib.PTZ_CONTROL_ABSOLUTELY(); + + absolutely.stuPosition.nPositionX = x; + absolutely.stuPosition.nPositionY = 0; + absolutely.stuSpeed.fPositionX = 0.2f; + absolutely.stuSpeed.fPositionY = 0.2f; + absolutely.write(); + //absolutely.stuSpeed.fZoom = 0.5f; + Boolean ok = LoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwPTZCommand, + 0, 0, 0, 0, absolutely.getPointer()); + if (!ok) { + log.error("失败 cameraId:{}", cameraId); + } + } + + /** + * 旋转360度 + * @param cameraId + */ + public static void turn360(Integer cameraId){ + Thread thread = new Thread(new Runnable() { + @Override + public void run() { + int nType = NetSDKLib.NET_DEVSTATE_PTZ_LOCATION; + NetSDKLib.NET_PTZ_LOCATION_INFO ptzLocationInfo = new NetSDKLib.NET_PTZ_LOCATION_INFO(); + IntByReference intRetLen = new IntByReference(); + + ptzLocationInfo.write(); + System.out.println("size:"+ptzLocationInfo.size()); + boolean bRet = LoginModule.netsdk.CLIENT_QueryDevState(CameraConnMap.getConnId(cameraId), nType, ptzLocationInfo.getPointer(), ptzLocationInfo.size(), intRetLen, 3000); + ptzLocationInfo.read(); + + if (bRet) { + System.out.println("xParam:" + ptzLocationInfo.nPTZPan); // 云台水平运动位置,有效范围：[0,3600] + System.out.println("yParam:" + ptzLocationInfo.nPTZTilt); // 云台垂直运动位置,有效范围：[-1800,1800] + System.out.println("zoomParam:" + ptzLocationInfo.nPTZZoom); + int qq = (ptzLocationInfo.nPTZPan + 1799) % 3600; + System.out.println(qq); + toPtzSlow(cameraId,qq); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + qq = (qq + 1799) % 3600; + System.out.println(qq); + toPtzSlow(cameraId,qq); + + } else { + System.err.println( " { error code: ( 0x80000000|" + (LoginModule.netsdk.CLIENT_GetLastError() & 0x7fffffff) +" ). 参考 LastError.java }"); + + } + + } + }); + thread.start(); + } } diff --git a/web/src/main/java/com/zhehekeji/web/mapper/LycheeMapper.java b/web/src/main/java/com/zhehekeji/web/mapper/LycheeMapper.java deleted file mode 100644 index bb7671d..0000000 --- a/web/src/main/java/com/zhehekeji/web/mapper/LycheeMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zhehekeji.web.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhehekeji.web.entity.Lychee; - -public interface LycheeMapper extends BaseMapper { -} diff --git a/web/src/main/java/com/zhehekeji/web/mapper/StockMapper.java b/web/src/main/java/com/zhehekeji/web/mapper/StockMapper.java index c14dd0a..222a738 100644 --- a/web/src/main/java/com/zhehekeji/web/mapper/StockMapper.java +++ b/web/src/main/java/com/zhehekeji/web/mapper/StockMapper.java @@ -5,7 +5,6 @@ import com.zhehekeji.web.entity.Stock; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import java.net.Socket; import java.util.List; public interface StockMapper extends BaseMapper { @@ -14,8 +13,8 @@ public interface StockMapper extends BaseMapper { void insertOrUpdate(@Param("req") Stock stock); - @Select("select * from stock where shelve_id =#{shelveId} and `row` = #{row} and `column` = #{column} limit 1") - Stock getByShelveIdAndRowColumn(String shelveId,Integer row,Integer column); + @Select("select * from stock where shelve_id = #{shelveId} and `row` = #{row} and `column` = #{column} limit 1") + Stock getByShelveIdAndRowColumn(@Param("shelveId") String shelveId,@Param("row") Integer row,@Param("column") Integer column); + - Integer updateStock(Stock stock); } diff --git a/web/src/main/java/com/zhehekeji/web/service/MyProtocolDecoder.java b/web/src/main/java/com/zhehekeji/web/service/MyProtocolDecoder.java index 4683d60..daecb2d 100644 --- a/web/src/main/java/com/zhehekeji/web/service/MyProtocolDecoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/MyProtocolDecoder.java @@ -6,7 +6,6 @@ import io.netty.handler.codec.FixedLengthFrameDecoder; import lombok.extern.slf4j.Slf4j; import java.nio.charset.Charset; -import java.util.concurrent.ThreadPoolExecutor; @Slf4j @@ -96,6 +95,7 @@ public class MyProtocolDecoder extends FixedLengthFrameDecoder { //执行动作 plcService.action(plcOrderInfo, plcId, times, code); }else { +// if(){} plcService.action(plcOrderInfo, plcId, 1, code); } } else if (type.equals(WARN)) { diff --git a/web/src/main/java/com/zhehekeji/web/service/RealTimeService.java b/web/src/main/java/com/zhehekeji/web/service/RealTimeService.java index 916c4bc..95d6d17 100644 --- a/web/src/main/java/com/zhehekeji/web/service/RealTimeService.java +++ b/web/src/main/java/com/zhehekeji/web/service/RealTimeService.java @@ -1,11 +1,8 @@ package com.zhehekeji.web.service; -import com.zhehekeji.core.util.Assert; import com.zhehekeji.web.entity.Camera; -import com.zhehekeji.web.entity.Lychee; import com.zhehekeji.web.entity.Street; import com.zhehekeji.web.mapper.CameraMapper; -import com.zhehekeji.web.mapper.LycheeMapper; import com.zhehekeji.web.mapper.StreetMapper; import com.zhehekeji.web.pojo.realTime.RealTime; import org.springframework.stereotype.Service; @@ -15,7 +12,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; @Service public class RealTimeService { @@ -24,14 +20,6 @@ public class RealTimeService { private StreetMapper streetMapper; @Resource private CameraMapper cameraMapper; - @Resource - private LycheeMapper lycheeMapper; - -// public String lychee(){ -// Lychee lychee = lycheeMapper.selectById(1); -// Assert.notNull(lychee,"未配置荔枝转码服务"); -// return lychee.getIp(); -// } public List realTimes(){ List streets = streetMapper.selectByMap(new HashMap<>(0)); diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java index b1f93c9..64b1505 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -122,7 +122,14 @@ public class StockService { * @return */ public Stock stockInfo(StockCheck stockCheck) { + System.out.println(stockCheck.toString()); Stock stock = stockMapper.getByShelveIdAndRowColumn(stockCheck.getShelveId(), stockCheck.getRow(), stockCheck.getColumn()); + if(stock == null){ + stock = new Stock(); + stock.setColumn(stockCheck.getColumn()); + stock.setRow(stockCheck.getRow()); + stock.setShelveId(stockCheck.getShelveId()); + } return stock; } @@ -135,7 +142,7 @@ public class StockService { public Stock checkCorrect(StockCheck stockCheck) { log.debug("check stock correct, shelveID:{},row:{},column:{}", stockCheck.getShelveId(), stockCheck.getRow(), stockCheck.getColumn()); Stock stock = stockInfo(stockCheck); - Assert.notNull(stock, "该货位暂时没有记录"); + Assert.isTrue(stock != null && stock.getId() != null, "该货位暂时没有记录"); Integer oldStatus = stock.getStatus(); stock.setStatus(StockStatus.SUCCESS.getStatus()); stockMapper.updateById(stock); diff --git a/web/src/main/java/com/zhehekeji/web/service/WarnService.java b/web/src/main/java/com/zhehekeji/web/service/WarnService.java index cbd3622..e15ea25 100644 --- a/web/src/main/java/com/zhehekeji/web/service/WarnService.java +++ b/web/src/main/java/com/zhehekeji/web/service/WarnService.java @@ -1,9 +1,7 @@ package com.zhehekeji.web.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zhehekeji.web.entity.Warn; import com.zhehekeji.web.mapper.WarnMapper; import com.zhehekeji.web.pojo.warn.WarnSearch; import com.zhehekeji.web.pojo.warn.WarnVO;