From 7bf548492a145e66295d905f795943a28b490463 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Tue, 14 May 2024 23:21:57 +0800
Subject: [PATCH] =?UTF-8?q?1078-=E4=BF=AE=E5=A4=8D=E6=91=84=E5=83=8F?=
 =?UTF-8?q?=E5=A4=B4=E7=AB=8B=E5=8D=B3=E6=8B=8D=E6=91=84=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E5=BA=94=E7=AD=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/jt1078/proc/request/J0805.java          | 13 ++++++++-----
 .../vmp/jt1078/service/impl/jt1078ServiceImpl.java  |  2 +-
 .../iot/vmp/jt1078/session/SessionManager.java      |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0805.java b/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0805.java
index a621f67a0..9424ce0e5 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0805.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0805.java
@@ -10,6 +10,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import org.springframework.context.ApplicationEvent;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -27,17 +28,19 @@ public class J0805 extends Re {
     /**
      * 表示拍摄成功的多媒体个数
      */
-    private List<Long> ids;
+    private List<Long> ids = new ArrayList<>();
 
     @Override
     protected Rs decode0(ByteBuf buf, Header header, Session session) {
         respNo = buf.readUnsignedShort();
         result = buf.readUnsignedByte();
-        int length = buf.readUnsignedByte();
-        for (int i = 0; i < length; i++) {
-            ids.add(buf.readUnsignedInt());
+        if (result == 0) {
+            int length = buf.readUnsignedShort();
+            for (int i = 0; i < length; i++) {
+                ids.add(buf.readUnsignedInt());
+            }
         }
-        SessionManager.INSTANCE.response(header.getTerminalId(), "0805", (long) respNo, ids);
+        SessionManager.INSTANCE.response(header.getTerminalId(), "0805", null, ids);
         return null;
     }
 
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java
index 787ebe379..6948f8046 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java
@@ -711,6 +711,6 @@ public class jt1078ServiceImpl implements Ijt1078Service {
     public List<Long> shooting(String deviceId, JTShootingCommand shootingCommand) {
         J8801 j8801 = new J8801();
         j8801.setCommand(shootingCommand);
-        return (List<Long>)jt1078Template.shooting(deviceId, j8801, 20);
+        return (List<Long>)jt1078Template.shooting(deviceId, j8801, 300);
     }
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/session/SessionManager.java b/src/main/java/com/genersoft/iot/vmp/jt1078/session/SessionManager.java
index e9d66158b..fe67960f3 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/session/SessionManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/session/SessionManager.java
@@ -81,6 +81,7 @@ public enum SessionManager {
             return null;
         }
         String requestKey = requestKey(cmd.getDevId(), cmd.getRespId(), cmd.getPackageNo());
+        System.out.println("requestKey==" + requestKey);
         SynchronousQueue<Object> subscribe = subscribe(requestKey);
         if (subscribe == null) {
             log.error("DevId: {} key:{} send repaid", cmd.getDevId(), requestKey);