diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java b/src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java index b6e57b518..7368c9fbe 100644 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java @@ -40,7 +40,7 @@ public class Jt808Decoder extends ByteToMessageDecoder { @Override protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) throws Exception { Session session = ctx.channel().attr(Session.KEY).get(); - log.debug("> {} hex:{}", session, ByteBufUtil.hexDump(in)); + log.info("> {} hex:{}", session, ByteBufUtil.hexDump(in)); try { ByteBuf buf = unEscapeAndCheck(in); diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078TerminalController.java b/src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078TerminalController.java index b310102ea..3c9036bef 100644 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078TerminalController.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078TerminalController.java @@ -109,7 +109,7 @@ public class JT1078TerminalController { @Operation(summary = "1078-新增通道", security = @SecurityRequirement(name = JwtUtils.HEADER)) @Parameter(name = "channel", description = "通道", required = true) @PostMapping("/channel/add") - public JTChannel addChannel(JTChannel channel){ + public JTChannel addChannel(@RequestBody JTChannel channel){ assert channel.getChannelId() != null; assert channel.getTerminalDbId() != 0; service.addChannel(channel); diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/dao/provider/JTChannelProvider.java b/src/main/java/com/genersoft/iot/vmp/jt1078/dao/provider/JTChannelProvider.java index 8a5be9a63..c06f0ecbd 100644 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/dao/provider/JTChannelProvider.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/dao/provider/JTChannelProvider.java @@ -25,7 +25,7 @@ public class JTChannelProvider { public String selectAll(Map params ){ StringBuilder sqlBuild = new StringBuilder(); sqlBuild.append(BASE_SQL); - sqlBuild.append(" WHERE 1=1 "); + sqlBuild.append(" WHERE jc.terminal_db_id = #{terminalDbId} "); if (params.get("query") != null) { sqlBuild.append(" AND ") .append(" jc.name LIKE ").append("'%").append(params.get("query")).append("%'") diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0102.java b/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0102.java index 65811012d..accab00be 100644 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0102.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0102.java @@ -28,12 +28,13 @@ public class J0102 extends Re { @Override protected Rs decode0(ByteBuf buf, Header header, Session session) { - int lenCode = buf.readUnsignedByte(); - byte[] authenticationCodeBytes = new byte[lenCode]; -// ByteBuf byteBuf = buf.readBytes(authenticationCodeBytes); - authenticationCode = buf.readCharSequence(lenCode, Charset.forName("GBK")).toString(); + if (header.is2019Version()) { + int lenCode = buf.readUnsignedByte(); + authenticationCode = buf.readCharSequence(lenCode, Charset.forName("GBK")).toString(); + }else { + authenticationCode = buf.readCharSequence(buf.readableBytes(), Charset.forName("GBK")).toString(); + } log.info("设备鉴权： authenticationCode： " + authenticationCode); - // if 2019 to decode next return null; } diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0107.java b/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0107.java index ff548fe9f..730c1d106 100644 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0107.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0107.java @@ -42,10 +42,14 @@ public class J0107 extends Re { deviceAttribute.setMakerId(buf.readCharSequence(5, Charset.forName("GBK")).toString().trim()); deviceAttribute.setDeviceModel(buf.readCharSequence(20, Charset.forName("GBK")).toString().trim()); - buf.readCharSequence(10, Charset.forName("GBK")); + if (header.is2019Version()) { + buf.readCharSequence(10, Charset.forName("GBK")); + } deviceAttribute.setTerminalId(buf.readCharSequence(7, Charset.forName("GBK")).toString().trim()); - buf.readCharSequence(23, Charset.forName("GBK")); + if (header.is2019Version()) { + buf.readCharSequence(23, Charset.forName("GBK")); + } byte[] bytes = new byte[10]; buf.readBytes(bytes); diff --git a/web/src/views/jtDevice/channel/edit.vue b/web/src/views/jtDevice/channel/edit.vue index e7d9ab550..6624fad66 100644 --- a/web/src/views/jtDevice/channel/edit.vue +++ b/web/src/views/jtDevice/channel/edit.vue @@ -54,7 +54,7 @@ export default { console.log(this.jtChannel) const isEdit = typeof (this.jtChannel.id) !== 'undefined' if (isEdit) { - this.$store.dispatch('jtDevice/updateChannel') + this.$store.dispatch('jtDevice/updateChannel', this.jtChannel) .then(data => { this.$message({ showClose: true, @@ -67,7 +67,7 @@ export default { console.log(error) }) } else { - this.$store.dispatch('jtDevice/addChannel') + this.$store.dispatch('jtDevice/addChannel', this.jtChannel) .then(data => { this.$message({ showClose: true, diff --git a/web/src/views/jtDevice/jtDeviceParam.vue b/web/src/views/jtDevice/jtDeviceParam.vue index 2eb7b1034..02e2e4eb7 100755 --- a/web/src/views/jtDevice/jtDeviceParam.vue +++ b/web/src/views/jtDevice/jtDeviceParam.vue @@ -216,19 +216,22 @@ - - - - - - +
+ + + + + + +
+ - 定时拍照控制 - + 定时拍照控制 + @@ -261,7 +264,7 @@ - +