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

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

@ -190,7 +190,7 @@ public class PlcService {
/** /**
* 拍照是C2 C4拍照(取货完成、放货完成) * 拍照是C2 C4拍照(取货完成、放货完成)
*/ */
Boolean needCapture = doNeedCaptureByCode(code); Boolean needCapture = doNeedCaptureByCode(orderInfo.getCmdCode());
/*** /***
* 判断该巷道有几个相机 * 判断该巷道有几个相机
* 如果有一个相机,就一个相机转 * 如果有一个相机,就一个相机转
@ -199,7 +199,7 @@ public class PlcService {
* 没有就不管了 * 没有就不管了
*/ */
Integer cameraId = getCameraByPlcCmd(plcCmdInfo,orderInfo.getLeftRight()); Integer cameraId = getCameraByPlcCmd(plcCmdInfo,orderInfo.getLeftRight());
gyrateCameraByCode(cameraId,code); gyrateCameraByCode(cameraId,orderInfo.getCmdCode());
if(needCapture){ if(needCapture){
Boolean delay = false; Boolean delay = false;
if(code.startsWith("C1") || code.startsWith("C3")){ if(code.startsWith("C1") || code.startsWith("C3")){

Loading…
Cancel
Save