merge-requests/3/head 1.1-release
qiushui 4 years ago
parent 7b437b4f4b
commit 9ddd2e73bb

@ -32,11 +32,6 @@ public class Camera {
@ApiModelProperty(value = "预置点 增长值",hidden = true)
private Integer ptzId;
/**
*
*/
private String m3u8;
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
}

@ -190,7 +190,7 @@ public class PlcService {
/**
* C2 C4
*/
Boolean needCapture = doNeedCaptureByCode(code);
Boolean needCapture = doNeedCaptureByCode(orderInfo.getCmdCode());
/***
*
*
@ -199,7 +199,7 @@ public class PlcService {
*
*/
Integer cameraId = getCameraByPlcCmd(plcCmdInfo,orderInfo.getLeftRight());
gyrateCameraByCode(cameraId,code);
gyrateCameraByCode(cameraId,orderInfo.getCmdCode());
if(needCapture){
Boolean delay = false;
if(code.startsWith("C1") || code.startsWith("C3")){

Loading…
Cancel
Save