记得上下班打卡 | git大法好,push需谨慎

Commit db367dc5 authored by jiangxiulong's avatar jiangxiulong

视频人流量 streamName

parent b014a0e5
...@@ -30,14 +30,9 @@ public class KylinCamera implements Serializable { ...@@ -30,14 +30,9 @@ public class KylinCamera implements Serializable {
private String cameraId; private String cameraId;
/** /**
* 国标ID * 设备用户名/国标ID
*/ */
private String cameraGbId; private String streamName;
/**
* 设备ID
*/
private String cameraName;
/** /**
* 场地ID * 场地ID
......
...@@ -3,8 +3,7 @@ CREATE TABLE `kylin_camera` ...@@ -3,8 +3,7 @@ CREATE TABLE `kylin_camera`
( (
`mid` int unsigned NOT NULL AUTO_INCREMENT, `mid` int unsigned NOT NULL AUTO_INCREMENT,
`camera_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'camera_id', `camera_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'camera_id',
`camera_gb_id` varchar(255) NOT NULL DEFAULT '' COMMENT '国标ID', `stream_name` varchar(255) NOT NULL DEFAULT '' COMMENT '设备用户名/国标ID',
`camera_name` varchar(255) NOT NULL DEFAULT '' COMMENT '设备ID',
`field_id` varchar(64) NOT NULL DEFAULT '' COMMENT '场地ID', `field_id` varchar(64) NOT NULL DEFAULT '' COMMENT '场地ID',
`img_url` varchar(500) NOT NULL DEFAULT '' COMMENT '截图url', `img_url` varchar(500) NOT NULL DEFAULT '' COMMENT '截图url',
`site_type` tinyint NOT NULL DEFAULT 0 COMMENT '地点类型 1卫生间 2。。。', `site_type` tinyint NOT NULL DEFAULT 0 COMMENT '地点类型 1卫生间 2。。。',
......
...@@ -24,19 +24,12 @@ public class KylinCameraCallBackController { ...@@ -24,19 +24,12 @@ public class KylinCameraCallBackController {
@ApiOperation("截图回调") @ApiOperation("截图回调")
public String record( public String record(
@RequestBody String requestBody, @RequestBody String requestBody,
// @RequestParam() String requestBody, @RequestParam(value = "siteType") Integer siteType,
@RequestParam(value = "Version", defaultValue = "") String Version, @RequestParam(value = "fieldId") String fieldId
@RequestParam(value = "Signature", defaultValue = "") String Signature,
@RequestParam(value = "SignatureMethod", defaultValue = "") String SignatureMethod,
@RequestParam(value = "SignatureNonce", defaultValue = "") String SignatureNonce,
@RequestParam(value = "SignatureVersion", defaultValue = "") String SignatureVersion,
@RequestParam(value = "AccessKeyId", defaultValue = "") String AccessKeyId,
@RequestParam(value = "Timestamp", defaultValue = "") String Timestamp
) { ) {
try { try {
log.info("\n接收截图回调请求:[Version=[{}], Signature=[{}], [SignatureMethod=[{}], SignatureNonce=[{}], SignatureVersion=[{}]," log.info("接收截图回调请求:[siteType=[{}], fieldId=[{}], requestBody=[{}]",
+ " AccessKeyId=[{}], Timestamp=[{}], requestBody=[\n{}\n] ", siteType, fieldId, requestBody);
Version, Signature, SignatureMethod, SignatureNonce, SignatureVersion, AccessKeyId, Timestamp, requestBody);
// TODO: 2022/1/10 jxltodo 验签 // TODO: 2022/1/10 jxltodo 验签
return "success"; return "success";
} catch (Exception e) { } catch (Exception e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment