diff --git a/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/security/SecurityOrderController.java b/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/security/SecurityOrderController.java index d7888aa..732f311 100644 --- a/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/security/SecurityOrderController.java +++ b/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/security/SecurityOrderController.java @@ -52,6 +52,7 @@ public class SecurityOrderController { .alarmId(reqVO.getAlarmId()) .alarmType(reqVO.getAlarmType()) .cameraId(reqVO.getCameraId()) + .cameraName(reqVO.getCameraName()) .roiId(reqVO.getRoiId()) .imageUrl(reqVO.getImageUrl()) .sourceType(reqVO.getSourceType()) diff --git a/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/security/vo/SecurityOrderCreateReqVO.java b/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/security/vo/SecurityOrderCreateReqVO.java index d0a1b96..7cc3ac8 100644 --- a/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/security/vo/SecurityOrderCreateReqVO.java +++ b/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/security/vo/SecurityOrderCreateReqVO.java @@ -39,6 +39,9 @@ public class SecurityOrderCreateReqVO { @Schema(description = "摄像头ID", example = "CAM_001") private String cameraId; + @Schema(description = "摄像头名称", example = "T3大堂吧台") + private String cameraName; + @Schema(description = "ROI区域ID", example = "ROI_001") private String roiId; diff --git a/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/open/security/SecurityOrderOpenController.java b/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/open/security/SecurityOrderOpenController.java index 0e88f0b..d8c1a47 100644 --- a/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/open/security/SecurityOrderOpenController.java +++ b/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/open/security/SecurityOrderOpenController.java @@ -54,6 +54,7 @@ public class SecurityOrderOpenController { .alarmId(reqVO.getAlarmId()) .alarmType(reqVO.getAlarmType()) .cameraId(reqVO.getCameraId()) + .cameraName(reqVO.getCameraName()) .roiId(reqVO.getRoiId()) .imageUrl(reqVO.getImageUrl()) .sourceType(reqVO.getSourceType()) diff --git a/viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/dal/dataobject/workorder/OpsOrderSecurityExtDO.java b/viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/dal/dataobject/workorder/OpsOrderSecurityExtDO.java index 426eeef..055e6fc 100644 --- a/viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/dal/dataobject/workorder/OpsOrderSecurityExtDO.java +++ b/viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/dal/dataobject/workorder/OpsOrderSecurityExtDO.java @@ -47,6 +47,10 @@ public class OpsOrderSecurityExtDO extends BaseDO { * 摄像头ID */ private String cameraId; + /** + * 摄像头名称 + */ + private String cameraName; /** * ROI区域ID */ diff --git a/viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/service/securityorder/SecurityOrderCreateReqDTO.java b/viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/service/securityorder/SecurityOrderCreateReqDTO.java index fae0fd5..bb065ff 100644 --- a/viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/service/securityorder/SecurityOrderCreateReqDTO.java +++ b/viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/service/securityorder/SecurityOrderCreateReqDTO.java @@ -36,6 +36,9 @@ public class SecurityOrderCreateReqDTO { private String cameraId; + /** 摄像头名称 */ + private String cameraName; + private String roiId; private String imageUrl; diff --git a/viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/service/securityorder/SecurityOrderServiceImpl.java b/viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/service/securityorder/SecurityOrderServiceImpl.java index 491ce10..f6564f4 100644 --- a/viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/service/securityorder/SecurityOrderServiceImpl.java +++ b/viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/service/securityorder/SecurityOrderServiceImpl.java @@ -108,6 +108,7 @@ public class SecurityOrderServiceImpl implements SecurityOrderService { .alarmId(createReq.getAlarmId()) .alarmType(createReq.getAlarmType()) .cameraId(createReq.getCameraId()) + .cameraName(createReq.getCameraName()) .roiId(createReq.getRoiId()) .imageUrl(createReq.getImageUrl()) .build();