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 ids; + private List 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 shooting(String deviceId, JTShootingCommand shootingCommand) { J8801 j8801 = new J8801(); j8801.setCommand(shootingCommand); - return (List)jt1078Template.shooting(deviceId, j8801, 20); + return (List)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 subscribe = subscribe(requestKey); if (subscribe == null) { log.error("DevId: {} key:{} send repaid", cmd.getDevId(), requestKey);