fix bug: order

web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java

@@ -3,10 +3,7 @@ package com.zhehekeji.web.controller;
 import com.zhehekeji.core.pojo.Result;
 import com.zhehekeji.core.util.Assert;
 import com.zhehekeji.web.entity.Camera;
-import com.zhehekeji.web.lib.CameraConnMap;
-import com.zhehekeji.web.lib.LoginModule;
-import com.zhehekeji.web.lib.NetSDKLib;
-import com.zhehekeji.web.lib.PtzControlModule;
+import com.zhehekeji.web.lib.*;
 import com.zhehekeji.web.mapper.CameraMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -287,7 +284,8 @@ public class CameraControlController {
     @ApiOperation(value = "立即拍照")
     public Result pic(@PathVariable Integer 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();
     }
 

web/src/main/java/com/zhehekeji/web/lib/CallBack.java

@@ -64,19 +64,19 @@ public class CallBack {
         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();
             ToolKits.GetPointerData(pBuf, PTZInfo);
-            if(PTZInfo.bState == 2){
-                Integer cameraId = CameraConnMap.getCameraIdByLoginId(lLoginId);
-                if(cameraId != null){
-                    OrderInfo orderInfo = CameraCaptureMap.getOrderInfoByStreetId(cameraId);
-                    log.info("cameraId:{}",cameraId);
-                    if(orderInfo != null && !"C6".equals(orderInfo.getCode())){
-                        log.info("cameraId:{} 到位 拍照,code:{},orderNUm:{}",cameraId,orderInfo.getCode(),orderInfo.getOrderNum());
-                        PtzControlModule.pic(cameraId,0,orderInfo);
-                    }
-                    CameraCaptureMap.remove(cameraId);
-                }
-
-            }
+//            if(PTZInfo.bState == 2){
+//                Integer cameraId = CameraConnMap.getCameraIdByLoginId(lLoginId);
+//                if(cameraId != null){
+//                    OrderInfo orderInfo = CameraCaptureMap.getOrderInfoByStreetId(cameraId);
+//                    log.info("cameraId:{}",cameraId);
+//                    if(orderInfo != null && !"C6".equals(orderInfo.getCode())){
+//                        log.info("cameraId:{} 到位 拍照,code:{},orderNUm:{}",cameraId,orderInfo.getCode(),orderInfo.getOrderNum());
+//                        PtzControlModule.pic(cameraId,0,orderInfo);
+//                    }
+//                    CameraCaptureMap.remove(cameraId);
+//                }
+//
+//            }
         }
 
     }

web/src/main/java/com/zhehekeji/web/service/PlcService.java

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