upright
/
backend-duoji-monitor
mirror of https://gitlab.hzleaper.com:81/duoji/backend-duoji-monitor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug: order

Browse Source
camera_merge
qiushui 4 years ago
parent 9b2525995f
commit f4afcf6b03
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File

8
web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java
Unescape Escape View File

@ -3,10 +3,7 @@ package com.zhehekeji.web.controller;
import com.zhehekeji.core.pojo.Result; import com.zhehekeji.core.pojo.Result;
import com.zhehekeji.core.util.Assert; import com.zhehekeji.core.util.Assert;
import com.zhehekeji.web.entity.Camera; import com.zhehekeji.web.entity.Camera;
import com.zhehekeji.web.lib.CameraConnMap; import com.zhehekeji.web.lib.*;
import com.zhehekeji.web.lib.LoginModule;
import com.zhehekeji.web.lib.NetSDKLib;
import com.zhehekeji.web.lib.PtzControlModule;
import com.zhehekeji.web.mapper.CameraMapper; import com.zhehekeji.web.mapper.CameraMapper;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -287,7 +284,8 @@ public class CameraControlController {
@ApiOperation(value = "立即拍照") @ApiOperation(value = "立即拍照")
public Result pic(@PathVariable Integer id) { public Result pic(@PathVariable Integer id) {
checkLogin(id); checkLogin(id);
//System.out.println(PtzControlModule.pic(id,0,"aaa")); OrderInfo orderInfo = new OrderInfo(0L,"SRM123","AAA",1,1,"C5",true);
System.out.println(PtzControlModule.pic(id,0,orderInfo));
return Result.success(); return Result.success();
} }

26
web/src/main/java/com/zhehekeji/web/lib/CallBack.java
Unescape Escape View File

@ -64,19 +64,19 @@ public class CallBack {
public void invoke(NetSDKLib.LLong lLoginId, NetSDKLib.LLong lAttachHandle, Pointer pBuf, int dwBufLen, long dwUser) { public void invoke(NetSDKLib.LLong lLoginId, NetSDKLib.LLong lAttachHandle, Pointer pBuf, int dwBufLen, long dwUser) {
NetSDKLib.NET_PTZ_LOCATION_INFO PTZInfo = new NetSDKLib.NET_PTZ_LOCATION_INFO(); NetSDKLib.NET_PTZ_LOCATION_INFO PTZInfo = new NetSDKLib.NET_PTZ_LOCATION_INFO();
ToolKits.GetPointerData(pBuf, PTZInfo); ToolKits.GetPointerData(pBuf, PTZInfo);
if(PTZInfo.bState == 2){ // if(PTZInfo.bState == 2){
Integer cameraId = CameraConnMap.getCameraIdByLoginId(lLoginId); // Integer cameraId = CameraConnMap.getCameraIdByLoginId(lLoginId);
if(cameraId != null){ // if(cameraId != null){
OrderInfo orderInfo = CameraCaptureMap.getOrderInfoByStreetId(cameraId); // OrderInfo orderInfo = CameraCaptureMap.getOrderInfoByStreetId(cameraId);
log.info("cameraId:{}",cameraId); // log.info("cameraId:{}",cameraId);
if(orderInfo != null && !"C6".equals(orderInfo.getCode())){ // if(orderInfo != null && !"C6".equals(orderInfo.getCode())){
log.info("cameraId:{} 到位 拍照,code:{},orderNUm:{}",cameraId,orderInfo.getCode(),orderInfo.getOrderNum()); // log.info("cameraId:{} 到位 拍照,code:{},orderNUm:{}",cameraId,orderInfo.getCode(),orderInfo.getOrderNum());
PtzControlModule.pic(cameraId,0,orderInfo); // PtzControlModule.pic(cameraId,0,orderInfo);
} // }
CameraCaptureMap.remove(cameraId); // CameraCaptureMap.remove(cameraId);
} // }
//
} // }
} }
} }

4
web/src/main/java/com/zhehekeji/web/service/PlcService.java
Unescape Escape View File

@ -156,8 +156,8 @@ public class PlcService {
stock.setStatus(StockStatus.PENDING.getStatus()); stock.setStatus(StockStatus.PENDING.getStatus());
stockMapper.updateById(stock); stockMapper.updateById(stock);
} }
// PtzControlModule.pic(street.getCamera1Id(),0,orderInfo); PtzControlModule.pic(street.getCamera1Id(),0,orderInfo);
// PtzControlModule.pic(street.getCamera2Id(),0,orderInfo); PtzControlModule.pic(street.getCamera2Id(),0,orderInfo);
} }
/** /**

Write Preview
Loading…
Cancel
Save