diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java index 89b2341..5804b57 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java @@ -139,7 +139,7 @@ * @param isStop 开始控制还是结束控制 0-开始， 1-结束 * @return 调用 不需要预览的不带速度控制接口 NET_DVR_PTZControl_Other */ - @ApiOperation("设备控制-(clean-镜头清洁，zoomIn-视频放大，zoomOut-视频缩小)") + @ApiOperation("设备控制-(clean-镜头清洁，zoomIn-视频放大，zoomOut-视频缩小，light-灯光开关)") @GetMapping("/control") @ResponseBody public Object control(@ApiParam("机器人ID") String robotId, @ApiParam("设备ip") String deviceIp, @ApiParam("指令") String command, @ApiParam("0-开始， 1-结束") Integer isStop) { diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java index 89b2341..5804b57 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java @@ -139,7 +139,7 @@ * @param isStop 开始控制还是结束控制 0-开始， 1-结束 * @return 调用 不需要预览的不带速度控制接口 NET_DVR_PTZControl_Other */ - @ApiOperation("设备控制-(clean-镜头清洁，zoomIn-视频放大，zoomOut-视频缩小)") + @ApiOperation("设备控制-(clean-镜头清洁，zoomIn-视频放大，zoomOut-视频缩小，light-灯光开关)") @GetMapping("/control") @ResponseBody public Object control(@ApiParam("机器人ID") String robotId, @ApiParam("设备ip") String deviceIp, @ApiParam("指令") String command, @ApiParam("0-开始， 1-结束") Integer isStop) { diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java index 7d36807..aad87c5 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java @@ -564,6 +564,9 @@ case "zoomOut": iPTZCommand = HCNetSDK.ZOOM_OUT; break; + case "light": + iPTZCommand = HCNetSDK.LIGHT_PWRON; + break; default: break; } diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java index 89b2341..5804b57 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java @@ -139,7 +139,7 @@ * @param isStop 开始控制还是结束控制 0-开始， 1-结束 * @return 调用 不需要预览的不带速度控制接口 NET_DVR_PTZControl_Other */ - @ApiOperation("设备控制-(clean-镜头清洁，zoomIn-视频放大，zoomOut-视频缩小)") + @ApiOperation("设备控制-(clean-镜头清洁，zoomIn-视频放大，zoomOut-视频缩小，light-灯光开关)") @GetMapping("/control") @ResponseBody public Object control(@ApiParam("机器人ID") String robotId, @ApiParam("设备ip") String deviceIp, @ApiParam("指令") String command, @ApiParam("0-开始， 1-结束") Integer isStop) { diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java index 7d36807..aad87c5 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java @@ -564,6 +564,9 @@ case "zoomOut": iPTZCommand = HCNetSDK.ZOOM_OUT; break; + case "light": + iPTZCommand = HCNetSDK.LIGHT_PWRON; + break; default: break; } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index e5e10d7..e1a78b5 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -11,7 +11,7 @@ casic-server 2.0.0 - war + jar casic-server casic 的spring boot版本 diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java index 89b2341..5804b57 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java @@ -139,7 +139,7 @@ * @param isStop 开始控制还是结束控制 0-开始， 1-结束 * @return 调用 不需要预览的不带速度控制接口 NET_DVR_PTZControl_Other */ - @ApiOperation("设备控制-(clean-镜头清洁，zoomIn-视频放大，zoomOut-视频缩小)") + @ApiOperation("设备控制-(clean-镜头清洁，zoomIn-视频放大，zoomOut-视频缩小，light-灯光开关)") @GetMapping("/control") @ResponseBody public Object control(@ApiParam("机器人ID") String robotId, @ApiParam("设备ip") String deviceIp, @ApiParam("指令") String command, @ApiParam("0-开始， 1-结束") Integer isStop) { diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java index 7d36807..aad87c5 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java @@ -564,6 +564,9 @@ case "zoomOut": iPTZCommand = HCNetSDK.ZOOM_OUT; break; + case "light": + iPTZCommand = HCNetSDK.LIGHT_PWRON; + break; default: break; } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index e5e10d7..e1a78b5 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -11,7 +11,7 @@ casic-server 2.0.0 - war + jar casic-server casic 的spring boot版本 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java index ab22e20..955b8a5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java @@ -7,20 +7,19 @@ @Data public class RobotInfoSetDTO { - /** - * 主键 - */ + @ApiModelProperty(value = "机器人ID", dataType = "Long") private Long id; - /** - * 设置线速度 - */ + @ApiModelProperty(value = "设置线速度", dataType = "BigDecimal") private BigDecimal confV; - /** - * 设置角速度 - */ @ApiModelProperty(value = "设置角速度", dataType = "BigDecimal") private BigDecimal confW; + + @ApiModelProperty(value = "阈值设定", dataType = "BigDecimal") + private BigDecimal alarmThreshold; + + @ApiModelProperty(value = "栅格设定", dataType = "BigDecimal") + private BigDecimal gridScale; } diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java index 89b2341..5804b57 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java @@ -139,7 +139,7 @@ * @param isStop 开始控制还是结束控制 0-开始， 1-结束 * @return 调用 不需要预览的不带速度控制接口 NET_DVR_PTZControl_Other */ - @ApiOperation("设备控制-(clean-镜头清洁，zoomIn-视频放大，zoomOut-视频缩小)") + @ApiOperation("设备控制-(clean-镜头清洁，zoomIn-视频放大，zoomOut-视频缩小，light-灯光开关)") @GetMapping("/control") @ResponseBody public Object control(@ApiParam("机器人ID") String robotId, @ApiParam("设备ip") String deviceIp, @ApiParam("指令") String command, @ApiParam("0-开始， 1-结束") Integer isStop) { diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java index 7d36807..aad87c5 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java @@ -564,6 +564,9 @@ case "zoomOut": iPTZCommand = HCNetSDK.ZOOM_OUT; break; + case "light": + iPTZCommand = HCNetSDK.LIGHT_PWRON; + break; default: break; } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index e5e10d7..e1a78b5 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -11,7 +11,7 @@ casic-server 2.0.0 - war + jar casic-server casic 的spring boot版本 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java index ab22e20..955b8a5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java @@ -7,20 +7,19 @@ @Data public class RobotInfoSetDTO { - /** - * 主键 - */ + @ApiModelProperty(value = "机器人ID", dataType = "Long") private Long id; - /** - * 设置线速度 - */ + @ApiModelProperty(value = "设置线速度", dataType = "BigDecimal") private BigDecimal confV; - /** - * 设置角速度 - */ @ApiModelProperty(value = "设置角速度", dataType = "BigDecimal") private BigDecimal confW; + + @ApiModelProperty(value = "阈值设定", dataType = "BigDecimal") + private BigDecimal alarmThreshold; + + @ApiModelProperty(value = "栅格设定", dataType = "BigDecimal") + private BigDecimal gridScale; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java index c66d009..7f30c44 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java @@ -23,73 +23,73 @@ /** * 主键 */ - @ApiModelProperty(value = "主键" , dataType = "Long") + @ApiModelProperty(value = "主键", dataType = "Long") @TableField("id") private Long id; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间" , dataType = "Date") + @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") private Date createTime; /** * 修改时间 */ - @ApiModelProperty(value = "修改时间" , dataType = "Date") + @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") private Date updateTime; /** * 设置线速度 */ - @ApiModelProperty(value = "设置线速度" , dataType = "BigDecimal") + @ApiModelProperty(value = "设置线速度", dataType = "BigDecimal") @TableField("conf_v") private BigDecimal confV; /** * 设置角速度 */ - @ApiModelProperty(value = "设置角速度" , dataType = "BigDecimal") + @ApiModelProperty(value = "设置角速度", dataType = "BigDecimal") @TableField("conf_w") private BigDecimal confW; /** * 机器人名称 */ - @ApiModelProperty(value = "机器人名称" , dataType = "String") + @ApiModelProperty(value = "机器人名称", dataType = "String") @TableField("robot_name") private String robotName; /** * 机器人IP */ - @ApiModelProperty(value = "机器人mqtt" , dataType = "Long") + @ApiModelProperty(value = "机器人mqtt", dataType = "Long") @TableField("robot_url") private String robotUrl; - @ApiModelProperty(value = "机器人IP" , dataType = "Long") + @ApiModelProperty(value = "机器人IP", dataType = "Long") @TableField("robot_ip") private String robotIp; /** * 机器人端口 */ - @ApiModelProperty(value = "机器人端口" , dataType = "Long") + @ApiModelProperty(value = "机器人端口", dataType = "Long") @TableField("robot_port") private Long robotPort; /** * 机器人用户名 */ - @ApiModelProperty(value = "机器人用户名" , dataType = "String") + @ApiModelProperty(value = "机器人用户名", dataType = "String") @TableField("robot_admin") private String robotAdmin; /** * 密码 */ - @ApiModelProperty(value = "密码" , dataType = "String") + @ApiModelProperty(value = "密码", dataType = "String") @TableField("robot_password") private String robotPassword; @@ -104,26 +104,34 @@ @TableField(exist = false) private RouteInfo currRoute; - @ApiModelProperty(value = "pcd下载地址" , dataType = "String") + @ApiModelProperty(value = "pcd下载地址", dataType = "String") @TableField("pcd_download") private String pcdDownload; - @ApiModelProperty(value = "启动监听消息" , dataType = "String") + @ApiModelProperty(value = "启动监听消息", dataType = "String") @TableField("default_topic") private String defaultTopic; - @ApiModelProperty(value = "告警阈值配置" , dataType = "String") + @ApiModelProperty(value = "告警阈值配置", dataType = "String") @TableField("alarm_threshold") private BigDecimal alarmThreshold; - @ApiModelProperty(value = "电压上限" , dataType = "Integer") + @ApiModelProperty(value = "电压上限", dataType = "Integer") @TableField("voltage_max") private Integer voltageMax; - @ApiModelProperty(value = "电压下限" , dataType = "Integer") + @ApiModelProperty(value = "电压下限", dataType = "Integer") @TableField("voltage_min") private Integer voltageMin; + @ApiModelProperty(value = "地图栅格设定", dataType = "Integer") + @TableField("grid_scale") + private Integer gridScale; + + @ApiModelProperty(value = "机器人云台信息", dataType = "Integer") + @TableField(exist = false) + private DeviceInfo ptzInfo; + @Override public String toString() { return "RobotInfo{" diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java index 89b2341..5804b57 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java @@ -139,7 +139,7 @@ * @param isStop 开始控制还是结束控制 0-开始， 1-结束 * @return 调用 不需要预览的不带速度控制接口 NET_DVR_PTZControl_Other */ - @ApiOperation("设备控制-(clean-镜头清洁，zoomIn-视频放大，zoomOut-视频缩小)") + @ApiOperation("设备控制-(clean-镜头清洁，zoomIn-视频放大，zoomOut-视频缩小，light-灯光开关)") @GetMapping("/control") @ResponseBody public Object control(@ApiParam("机器人ID") String robotId, @ApiParam("设备ip") String deviceIp, @ApiParam("指令") String command, @ApiParam("0-开始， 1-结束") Integer isStop) { diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java index 7d36807..aad87c5 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java @@ -564,6 +564,9 @@ case "zoomOut": iPTZCommand = HCNetSDK.ZOOM_OUT; break; + case "light": + iPTZCommand = HCNetSDK.LIGHT_PWRON; + break; default: break; } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index e5e10d7..e1a78b5 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -11,7 +11,7 @@ casic-server 2.0.0 - war + jar casic-server casic 的spring boot版本 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java index ab22e20..955b8a5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java @@ -7,20 +7,19 @@ @Data public class RobotInfoSetDTO { - /** - * 主键 - */ + @ApiModelProperty(value = "机器人ID", dataType = "Long") private Long id; - /** - * 设置线速度 - */ + @ApiModelProperty(value = "设置线速度", dataType = "BigDecimal") private BigDecimal confV; - /** - * 设置角速度 - */ @ApiModelProperty(value = "设置角速度", dataType = "BigDecimal") private BigDecimal confW; + + @ApiModelProperty(value = "阈值设定", dataType = "BigDecimal") + private BigDecimal alarmThreshold; + + @ApiModelProperty(value = "栅格设定", dataType = "BigDecimal") + private BigDecimal gridScale; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java index c66d009..7f30c44 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java @@ -23,73 +23,73 @@ /** * 主键 */ - @ApiModelProperty(value = "主键" , dataType = "Long") + @ApiModelProperty(value = "主键", dataType = "Long") @TableField("id") private Long id; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间" , dataType = "Date") + @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") private Date createTime; /** * 修改时间 */ - @ApiModelProperty(value = "修改时间" , dataType = "Date") + @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") private Date updateTime; /** * 设置线速度 */ - @ApiModelProperty(value = "设置线速度" , dataType = "BigDecimal") + @ApiModelProperty(value = "设置线速度", dataType = "BigDecimal") @TableField("conf_v") private BigDecimal confV; /** * 设置角速度 */ - @ApiModelProperty(value = "设置角速度" , dataType = "BigDecimal") + @ApiModelProperty(value = "设置角速度", dataType = "BigDecimal") @TableField("conf_w") private BigDecimal confW; /** * 机器人名称 */ - @ApiModelProperty(value = "机器人名称" , dataType = "String") + @ApiModelProperty(value = "机器人名称", dataType = "String") @TableField("robot_name") private String robotName; /** * 机器人IP */ - @ApiModelProperty(value = "机器人mqtt" , dataType = "Long") + @ApiModelProperty(value = "机器人mqtt", dataType = "Long") @TableField("robot_url") private String robotUrl; - @ApiModelProperty(value = "机器人IP" , dataType = "Long") + @ApiModelProperty(value = "机器人IP", dataType = "Long") @TableField("robot_ip") private String robotIp; /** * 机器人端口 */ - @ApiModelProperty(value = "机器人端口" , dataType = "Long") + @ApiModelProperty(value = "机器人端口", dataType = "Long") @TableField("robot_port") private Long robotPort; /** * 机器人用户名 */ - @ApiModelProperty(value = "机器人用户名" , dataType = "String") + @ApiModelProperty(value = "机器人用户名", dataType = "String") @TableField("robot_admin") private String robotAdmin; /** * 密码 */ - @ApiModelProperty(value = "密码" , dataType = "String") + @ApiModelProperty(value = "密码", dataType = "String") @TableField("robot_password") private String robotPassword; @@ -104,26 +104,34 @@ @TableField(exist = false) private RouteInfo currRoute; - @ApiModelProperty(value = "pcd下载地址" , dataType = "String") + @ApiModelProperty(value = "pcd下载地址", dataType = "String") @TableField("pcd_download") private String pcdDownload; - @ApiModelProperty(value = "启动监听消息" , dataType = "String") + @ApiModelProperty(value = "启动监听消息", dataType = "String") @TableField("default_topic") private String defaultTopic; - @ApiModelProperty(value = "告警阈值配置" , dataType = "String") + @ApiModelProperty(value = "告警阈值配置", dataType = "String") @TableField("alarm_threshold") private BigDecimal alarmThreshold; - @ApiModelProperty(value = "电压上限" , dataType = "Integer") + @ApiModelProperty(value = "电压上限", dataType = "Integer") @TableField("voltage_max") private Integer voltageMax; - @ApiModelProperty(value = "电压下限" , dataType = "Integer") + @ApiModelProperty(value = "电压下限", dataType = "Integer") @TableField("voltage_min") private Integer voltageMin; + @ApiModelProperty(value = "地图栅格设定", dataType = "Integer") + @TableField("grid_scale") + private Integer gridScale; + + @ApiModelProperty(value = "机器人云台信息", dataType = "Integer") + @TableField(exist = false) + private DeviceInfo ptzInfo; + @Override public String toString() { return "RobotInfo{" diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/dto/StartTrackRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/dto/StartTrackRequest.java index 68eb828..5588167 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/dto/StartTrackRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/dto/StartTrackRequest.java @@ -8,18 +8,18 @@ */ @Data public class StartTrackRequest extends BaseRobotCmdDTO { - @ApiModelProperty(value = "sn编码(可不填 默认机器ID)" , dataType = "String") + @ApiModelProperty(value = "sn编码(可不填 默认机器ID)", dataType = "String") private String sn; - @ApiModelProperty(value = "下发状态 1:开启 0:关闭" , dataType = "String") + @ApiModelProperty(value = "下发状态 1:开启 0:关闭", dataType = "String") private Integer action; - @ApiModelProperty(value = "等待状态 1:等待 0:不等待" , dataType = "String") + @ApiModelProperty(value = "等待状态 1:等待 0:不等待", dataType = "String") private Integer wait; - - @ApiModelProperty(value = "轨迹名称" , dataType = "String") + @ApiModelProperty(value = "等待状态 0:循迹 1:任务", dataType = "isTask") + private Integer isTask; + @ApiModelProperty(value = "轨迹名称", dataType = "String") private String track_name; - - @ApiModelProperty(value = "关键点名称" , dataType = "String" , hidden = true) + @ApiModelProperty(value = "关键点名称", dataType = "String", hidden = true) private String taskpoint_name; } diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java index 89b2341..5804b57 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java @@ -139,7 +139,7 @@ * @param isStop 开始控制还是结束控制 0-开始， 1-结束 * @return 调用 不需要预览的不带速度控制接口 NET_DVR_PTZControl_Other */ - @ApiOperation("设备控制-(clean-镜头清洁，zoomIn-视频放大，zoomOut-视频缩小)") + @ApiOperation("设备控制-(clean-镜头清洁，zoomIn-视频放大，zoomOut-视频缩小，light-灯光开关)") @GetMapping("/control") @ResponseBody public Object control(@ApiParam("机器人ID") String robotId, @ApiParam("设备ip") String deviceIp, @ApiParam("指令") String command, @ApiParam("0-开始， 1-结束") Integer isStop) { diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java index 7d36807..aad87c5 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java @@ -564,6 +564,9 @@ case "zoomOut": iPTZCommand = HCNetSDK.ZOOM_OUT; break; + case "light": + iPTZCommand = HCNetSDK.LIGHT_PWRON; + break; default: break; } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index e5e10d7..e1a78b5 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -11,7 +11,7 @@ casic-server 2.0.0 - war + jar casic-server casic 的spring boot版本 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java index ab22e20..955b8a5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java @@ -7,20 +7,19 @@ @Data public class RobotInfoSetDTO { - /** - * 主键 - */ + @ApiModelProperty(value = "机器人ID", dataType = "Long") private Long id; - /** - * 设置线速度 - */ + @ApiModelProperty(value = "设置线速度", dataType = "BigDecimal") private BigDecimal confV; - /** - * 设置角速度 - */ @ApiModelProperty(value = "设置角速度", dataType = "BigDecimal") private BigDecimal confW; + + @ApiModelProperty(value = "阈值设定", dataType = "BigDecimal") + private BigDecimal alarmThreshold; + + @ApiModelProperty(value = "栅格设定", dataType = "BigDecimal") + private BigDecimal gridScale; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java index c66d009..7f30c44 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java @@ -23,73 +23,73 @@ /** * 主键 */ - @ApiModelProperty(value = "主键" , dataType = "Long") + @ApiModelProperty(value = "主键", dataType = "Long") @TableField("id") private Long id; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间" , dataType = "Date") + @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") private Date createTime; /** * 修改时间 */ - @ApiModelProperty(value = "修改时间" , dataType = "Date") + @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") private Date updateTime; /** * 设置线速度 */ - @ApiModelProperty(value = "设置线速度" , dataType = "BigDecimal") + @ApiModelProperty(value = "设置线速度", dataType = "BigDecimal") @TableField("conf_v") private BigDecimal confV; /** * 设置角速度 */ - @ApiModelProperty(value = "设置角速度" , dataType = "BigDecimal") + @ApiModelProperty(value = "设置角速度", dataType = "BigDecimal") @TableField("conf_w") private BigDecimal confW; /** * 机器人名称 */ - @ApiModelProperty(value = "机器人名称" , dataType = "String") + @ApiModelProperty(value = "机器人名称", dataType = "String") @TableField("robot_name") private String robotName; /** * 机器人IP */ - @ApiModelProperty(value = "机器人mqtt" , dataType = "Long") + @ApiModelProperty(value = "机器人mqtt", dataType = "Long") @TableField("robot_url") private String robotUrl; - @ApiModelProperty(value = "机器人IP" , dataType = "Long") + @ApiModelProperty(value = "机器人IP", dataType = "Long") @TableField("robot_ip") private String robotIp; /** * 机器人端口 */ - @ApiModelProperty(value = "机器人端口" , dataType = "Long") + @ApiModelProperty(value = "机器人端口", dataType = "Long") @TableField("robot_port") private Long robotPort; /** * 机器人用户名 */ - @ApiModelProperty(value = "机器人用户名" , dataType = "String") + @ApiModelProperty(value = "机器人用户名", dataType = "String") @TableField("robot_admin") private String robotAdmin; /** * 密码 */ - @ApiModelProperty(value = "密码" , dataType = "String") + @ApiModelProperty(value = "密码", dataType = "String") @TableField("robot_password") private String robotPassword; @@ -104,26 +104,34 @@ @TableField(exist = false) private RouteInfo currRoute; - @ApiModelProperty(value = "pcd下载地址" , dataType = "String") + @ApiModelProperty(value = "pcd下载地址", dataType = "String") @TableField("pcd_download") private String pcdDownload; - @ApiModelProperty(value = "启动监听消息" , dataType = "String") + @ApiModelProperty(value = "启动监听消息", dataType = "String") @TableField("default_topic") private String defaultTopic; - @ApiModelProperty(value = "告警阈值配置" , dataType = "String") + @ApiModelProperty(value = "告警阈值配置", dataType = "String") @TableField("alarm_threshold") private BigDecimal alarmThreshold; - @ApiModelProperty(value = "电压上限" , dataType = "Integer") + @ApiModelProperty(value = "电压上限", dataType = "Integer") @TableField("voltage_max") private Integer voltageMax; - @ApiModelProperty(value = "电压下限" , dataType = "Integer") + @ApiModelProperty(value = "电压下限", dataType = "Integer") @TableField("voltage_min") private Integer voltageMin; + @ApiModelProperty(value = "地图栅格设定", dataType = "Integer") + @TableField("grid_scale") + private Integer gridScale; + + @ApiModelProperty(value = "机器人云台信息", dataType = "Integer") + @TableField(exist = false) + private DeviceInfo ptzInfo; + @Override public String toString() { return "RobotInfo{" diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/dto/StartTrackRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/dto/StartTrackRequest.java index 68eb828..5588167 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/dto/StartTrackRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/dto/StartTrackRequest.java @@ -8,18 +8,18 @@ */ @Data public class StartTrackRequest extends BaseRobotCmdDTO { - @ApiModelProperty(value = "sn编码(可不填 默认机器ID)" , dataType = "String") + @ApiModelProperty(value = "sn编码(可不填 默认机器ID)", dataType = "String") private String sn; - @ApiModelProperty(value = "下发状态 1:开启 0:关闭" , dataType = "String") + @ApiModelProperty(value = "下发状态 1:开启 0:关闭", dataType = "String") private Integer action; - @ApiModelProperty(value = "等待状态 1:等待 0:不等待" , dataType = "String") + @ApiModelProperty(value = "等待状态 1:等待 0:不等待", dataType = "String") private Integer wait; - - @ApiModelProperty(value = "轨迹名称" , dataType = "String") + @ApiModelProperty(value = "等待状态 0:循迹 1:任务", dataType = "isTask") + private Integer isTask; + @ApiModelProperty(value = "轨迹名称", dataType = "String") private String track_name; - - @ApiModelProperty(value = "关键点名称" , dataType = "String" , hidden = true) + @ApiModelProperty(value = "关键点名称", dataType = "String", hidden = true) private String taskpoint_name; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java index a97031e..63e10b3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java @@ -2,20 +2,25 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.modular.robot.dao.RobotInfoMapper; import com.casic.missiles.modular.robot.dto.RobotInfoSetDTO; +import com.casic.missiles.modular.robot.model.DeviceInfo; import com.casic.missiles.modular.robot.model.RobotInfo; import com.casic.missiles.modular.robot.model.RobotStatusInfo; +import com.casic.missiles.modular.robot.service.IDeviceInfoService; import com.casic.missiles.modular.robot.service.IRobotInfoService; import com.casic.missiles.modular.robot.service.IRobotStatusInfoService; import com.casic.missiles.modular.robot.service.IRouteInfoService; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; import java.util.List; @@ -34,18 +39,29 @@ private final IRobotStatusInfoService robotStatusInfoService; private final AbstractDictService dictService; private final IRouteInfoService routeInfoService; + private final IDeviceInfoService deviceInfoService; - public RobotInfoServiceImpl(@Lazy IRobotStatusInfoService robotStatusInfoService, AbstractDictService dictService, @Lazy IRouteInfoService routeInfoService) { + public RobotInfoServiceImpl(@Lazy IRobotStatusInfoService robotStatusInfoService, AbstractDictService dictService, @Lazy IRouteInfoService routeInfoService, @Lazy IDeviceInfoService deviceInfoService) { this.robotStatusInfoService = robotStatusInfoService; this.dictService = dictService; this.routeInfoService = routeInfoService; + this.deviceInfoService = deviceInfoService; } + @Transactional @Override public List selectRobotInfoPage(Page page, QueryWrapper query) { return this.baseMapper.selectRobotInfoPage(page, query); } + @Transactional + @Override + public > E page(E page, Wrapper queryWrapper) { + IPage infoPage = super.page(page, queryWrapper); + infoPage.getRecords().forEach(this::wrapRobotInfo); + return super.page(page, queryWrapper); + } + @Override public RobotInfo getById(Serializable id) { RobotInfo robotInfo = super.getById(id); @@ -56,12 +72,23 @@ @Override public void updateSpeed(RobotInfoSetDTO robotInfo) { UpdateWrapper update = new UpdateWrapper<>(); - update.set("conf_v", robotInfo.getConfV()); - update.set("conf_w", robotInfo.getConfW()); + if (robotInfo.getConfV() != null) { + update.set("conf_v", robotInfo.getConfV()); + } + if (robotInfo.getConfW() != null) { + update.set("conf_w", robotInfo.getConfW()); + } + if (robotInfo.getAlarmThreshold() != null) { + update.set("alarm_threshold", robotInfo.getAlarmThreshold()); + } + if (robotInfo.getGridScale() != null) { + update.set("grid_scale", robotInfo.getGridScale()); + } update.eq("id", robotInfo.getId()); update(update); } + @Transactional @Override public List list(Wrapper queryWrapper) { List robotInfos = super.list(queryWrapper); @@ -84,7 +111,12 @@ //设置字典名称 robotStatusInfo.setTrackStatusName(dictService.getDictNameByCode("trackStatus", robotStatusInfo.getTrackStatus() + "")); robotStatusInfo.setDiscernTypeName(dictService.getDictNameByCode("discernType", robotStatusInfo.getDiscernType() + "")); - + } + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(DeviceInfo::getRobotId, robotInfo.getId()); + List deviceInfos = deviceInfoService.list(query); + if (CollectionUtil.isNotEmpty(deviceInfos)) { + robotInfo.setPtzInfo(deviceInfos.get(0)); } } }