diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDeviceConfig.java b/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDeviceConfig.java index afcc192b0..1c9ef3502 100644 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDeviceConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDeviceConfig.java @@ -26,7 +26,7 @@ public class JTDeviceConfig { private Long udpRetransmissionCount; @ConfigAttribute(id = 0x6, type="Long", description = "SMS 消息应答超时时间,单位为秒(s)") - private Long smsResponseTimeout; + private Long smsResponseTimeout; @ConfigAttribute(id = 0x7, type="Long", description = "SMS 消息重传次数") private Long smsRetransmissionCount; diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0104.java b/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0104.java index d70a5cb6c..08930a21b 100644 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0104.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0104.java @@ -136,7 +136,7 @@ public class J0104 extends Re { Method methodForChannelParam = deviceConfig.getClass().getDeclaredMethod("set" + StringUtils.capitalize(field.getName()), JTChannelParam.class); methodForChannelParam.invoke(deviceConfig, channelParam); continue; - case "alarmRecordingParam": + case "AlarmRecordingParam": JTAlarmRecordingParam alarmRecordingParam = JTAlarmRecordingParam.decode(buf); Method methodForAlarmRecordingParam = deviceConfig.getClass().getDeclaredMethod("set" + StringUtils.capitalize(field.getName()), JTAlarmRecordingParam.class); methodForAlarmRecordingParam.invoke(deviceConfig, alarmRecordingParam); diff --git a/web_src/src/components/JTDeviceParam.vue b/web_src/src/components/JTDeviceParam.vue index 5c59dee37..ef272baea 100755 --- a/web_src/src/components/JTDeviceParam.vue +++ b/web_src/src/components/JTDeviceParam.vue @@ -12,8 +12,9 @@ - - + + + 通讯参数 @@ -30,9 +31,15 @@ - + + + + + + 服务器参数 + @@ -83,17 +90,18 @@ - - - - + + + 位置汇报 + + 定时汇报 - + @@ -126,15 +134,9 @@ - - - - - - - - - + + 电话号码 + @@ -165,6 +167,10 @@ + + + 报警参数 + @@ -180,6 +186,19 @@ + + + + + + 行驶参数 + + + + + + + @@ -205,13 +224,55 @@ - + - + + + + + + + + 定时拍照控制 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + +
确认 @@ -240,7 +301,11 @@ export default { data() { return { phoneNumber: this.$route.params.phoneNumber, - form: {}, + form: { + collisionAlarmParams: {}, + illegalDrivingPeriods: {}, + cameraTimer: {}, + }, rules: { deviceId: [{ required: true, message: "请输入设备编号", trigger: "blur" }] }, @@ -267,14 +332,6 @@ export default { this.isLoading = false; console.log(res) this.form = res.data.data; - if (this.form.illegalDrivingPeriods) { - this.form.illegalDrivingPeriodsStartTime = this.form.illegalDrivingPeriods.startTime - this.form.illegalDrivingPeriodsEndTime = this.form.illegalDrivingPeriods.endTime - } - if (this.form.collisionAlarmParams) { - this.form.collisionAlarmParamsCollisionAlarmTime = this.form.collisionAlarmParams.collisionAlarmTime - this.form.collisionAlarmParamsCollisionAcceleration = this.form.collisionAlarmParams.collisionAcceleration - } }).cache((e)=>{ this.isLoading = false; }); @@ -282,8 +339,11 @@ export default { onSubmit: function () { this.$axios({ method: 'post', - url: `/api/jt1078/terminal/channel/update`, - params: row + url: `/api/jt1078/set-config`, + data: { + phoneNumber: this.phoneNumber, + config: this.form + } }).then(function (res) { console.log(JSON.stringify(res)); });