海康

src/main/java/com/chinaitop/depot/monitor/controller/PreviewPlaybackController.java

@@ -119,14 +119,14 @@ public class PreviewPlaybackController {
      */
     @RequestMapping(value="/manualCapture", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
     @ApiOperation(value="手动抓图", notes = "手动抓图")
-    public String manualCapture(CaptureReqDTO captureReqDTO) {
+    public String manualCapture(CaptureReqDTO captureReqDTO,CameraCapture cameraCapture) {
     	CaptureResDTO captureResDTO = hkService.manualCapture(captureReqDTO);
          
          //加到表里
-    	CameraCapture cameraCapture = cameraCaptureService.save(captureReqDTO,captureResDTO.getPicUrl());
-         if(cameraCapture.getId()>0){
+    	CameraCapture cameraCapture1 = cameraCaptureService.save(cameraCapture,captureResDTO.getPicUrl());
+         if(cameraCapture1.getId()>0){
         	 //传到国家局
-        	 this.gjjjk(cameraCapture.getId(), Integer.valueOf(cameraCapture.getOrgId()), "i");
+        	 this.gjjjk(cameraCapture1.getId(), Integer.valueOf(cameraCapture1.getOrgId()), "i");
          }
          
          return captureResDTO.getPicUrl();

src/main/java/com/chinaitop/depot/monitor/service/CameraCaptureService.java

@@ -1,11 +1,11 @@
 package com.chinaitop.depot.monitor.service;
 
-import com.chinaitop.depot.hk.dto.req.CaptureReqDTO;
 import com.chinaitop.depot.monitor.model.CameraCapture;
 
 public interface CameraCaptureService {
 
-	CameraCapture save(CaptureReqDTO captureReqDTO,String picUrl);
+	CameraCapture save(CameraCapture cameraCapture,String picUrl);
+
 
    
 }

src/main/java/com/chinaitop/depot/monitor/service/impl/CameraCaptureServiceImpl.java

@@ -6,7 +6,6 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
 
-import com.chinaitop.depot.hk.dto.req.CaptureReqDTO;
 import com.chinaitop.depot.monitor.mapper.CameraCaptureMapper;
 import com.chinaitop.depot.monitor.model.CameraCapture;
 import com.chinaitop.depot.monitor.service.CameraCaptureService;
@@ -18,24 +17,23 @@ public class CameraCaptureServiceImpl implements CameraCaptureService{
 	
 	@Resource
     private CameraCaptureMapper cameraCaptureMapper;
-	
-	
+
 	@Override
-	public CameraCapture save(CaptureReqDTO captureReqDTO,String picUrl) {
+	public CameraCapture save(CameraCapture cameraCapture,String picUrl) {
 		// TODO Auto-generated method stub
-		CameraCapture cameraCapture = new CameraCapture();
 		cameraCapture.setCreatedate(new Date());
-		cameraCapture.setCameraId(captureReqDTO.getId());
-		cameraCapture.setOrgId(captureReqDTO.getOrgId()+"");
+		//cameraCapture.setCameraId(cameraCapture.getCameraId());
+		//cameraCapture.setOrgId(cameraCapture.getOrgId()+"");
 		// 图片地址转 文件流  picUrl
 		String wjl = NetFileUtil.getBase64Content(picUrl);
 		cameraCapture.setCntxwjl(wjl);
-		cameraCapture.setStorehouseId(captureReqDTO.getHouseId());
+		//cameraCapture.setStorehouseId(cameraCapture.getStorehouseId());
 		//cameraCapture.setTxwjhzm(txwjhzm);//图像文件后缀名
-		cameraCapture.setWarehouseId(captureReqDTO.getWareHouseId());//
+		//cameraCapture.setWarehouseId(cameraCapture.getWarehouseId());//
 		cameraCapture.setZpsj(new Date());//图片采集时间
 		int i = cameraCaptureMapper.insertSelective(cameraCapture);
 		return cameraCapture;
 	}
 	
+	
 }