Merge branch 'dev' of depot-qinghai/depot-monitor-qinghai into dev-2.15.0

src/main/java/com/chinaitop/depot/basic/mapper/MonitorCameraMapper.xml

@@ -607,7 +607,7 @@
       WHERE camera.isremove = '1' AND nvr.delete_mark = '1' AND camera.org_id = #{orgid,jdbcType=VARCHAR} AND nvr.org_id = #{orgid,jdbcType=VARCHAR}
     )a where rn = 1 -->
     
-    SELECT
+    <!-- SELECT
         camera.id camera_id,
         camera.alias,
         camera.factory,
@@ -631,6 +631,26 @@
       LEFT JOIN monitor_nvr nvr ON nvr.id = camera.nvr_id
       LEFT JOIN camera_storehouse s on s.camera_id = camera.id
       WHERE camera.isremove = '1' AND nvr.delete_mark = '1' AND camera.org_id = #{orgid,jdbcType=VARCHAR} AND nvr.org_id = #{orgid,jdbcType=VARCHAR}
+    group by camera.id -->
+    
+    SELECT
+        camera.id camera_id,
+        camera.alias,
+        camera.factory,
+        camera.live,
+        camera.ip camera_ip,
+        camera.username camera_name,
+        camera.password camera_password,
+        camera.port camera_port,
+        camera.type camera_type,
+        camera.channel_number,
+        camera.org_id,
+        camera.camera_index_code cameraIndexCode,
+        s.storehouse_id storehouseId
+      FROM
+          monitor_camera camera
+      LEFT JOIN camera_storehouse s on s.camera_id = camera.id
+      WHERE camera.isremove = '1' AND camera.org_id = #{orgid,jdbcType=VARCHAR}
     group by camera.id
   </select>
 

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

@@ -143,18 +143,18 @@ public class PreviewPlaybackController {
         CaptureReqDTO captureReqDTO = (CaptureReqDTO)mapper1.readValue(captureReqDTOJson, CaptureReqDTO.class);
         
         // JSON字符串转对象
-        ObjectMapper mapper = new ObjectMapper();
-        CameraCapture cameraCapture = (CameraCapture)mapper.readValue(cameraCaptureJson, CameraCapture.class);
+        /*ObjectMapper mapper = new ObjectMapper();
+        CameraCapture cameraCapture = (CameraCapture)mapper.readValue(cameraCaptureJson, CameraCapture.class);*/
         
     	CaptureResDTO captureResDTO = hkService.manualCapture(captureReqDTO);
          
     	
          //加到表里
-    	CameraCapture cameraCapture1 = cameraCaptureService.save(cameraCapture,captureResDTO.getPicUrl());
+    	/*CameraCapture cameraCapture1 = cameraCaptureService.save(cameraCapture,captureResDTO.getPicUrl());
          if(cameraCapture1.getId()>0){
         	 //传到国家局
         	 this.gjjjk(cameraCapture1.getId(), Integer.valueOf(cameraCapture1.getOrgId()), "i");
-         }
+         }*/
          
          return captureResDTO.getPicUrl();
     }

src/main/resources/bootstrap-prod.yml

@@ -55,7 +55,8 @@ windows-path: /home/depot/monitorzd/
 jsgjjsjUrl: http://localhost:9022/recPublish/sendMessage
 # 海康
 hk:
-  host: 59.220.180.103:443 #平台（nginx）IP 和端口
+  #host: 59.220.180.103:443 #平台（nginx）IP 和端口
+  host: 172.18.93.217:443 #平台（nginx）IP 和端口
   app-key: 22161302 #合作方 key
   app-secret: aSDjmmd5S4uSKkQSygiV #合作方 Secret
   

src/test/java/com/chinaitop/depot/hk/service/HkServiceTest.java

@@ -56,7 +56,7 @@ public class HkServiceTest {
 
     @Test
     public void recordStart() {
-        log.info("recordStart:{}", JSON.toJSONString(hkService.recordStart(new RecordStartReqDTO("1234", 6, 1))));
+        //log.info("recordStart:{}", JSON.toJSONString(hkService.recordStart(new RecordStartReqDTO("1234", 6, 1))));
     }
 
     @Test
@@ -66,7 +66,7 @@ public class HkServiceTest {
 
     @Test
     public void manualCapture() {
-        log.info("manualCapture:{}", JSON.toJSONString(hkService.manualCapture(new CaptureReqDTO("1234"))));
+        //log.info("manualCapture:{}", JSON.toJSONString(hkService.manualCapture(new CaptureReqDTO("1234"))));
     }
 
     @Test