diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/config/JT1078Config.java b/src/main/java/com/genersoft/iot/vmp/jt1078/config/JT1078Config.java index e69de29bb..6a6afee19 100644 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/config/JT1078Config.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/config/JT1078Config.java @@ -0,0 +1,18 @@ +package com.genersoft.iot.vmp.jt1078.config; + +import com.genersoft.iot.vmp.jt1078.bean.common.ConfigAttribute; +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +@Component +@Data +@ConfigurationProperties(prefix = "jt1078", ignoreInvalidFields = true) +@Order(3) +public class JT1078Config { + + private Integer port; + + private String password; +} diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/SystemConfigInfo.java b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/SystemConfigInfo.java index 20a046cda..838e70670 100755 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/SystemConfigInfo.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/SystemConfigInfo.java @@ -3,6 +3,7 @@ package com.genersoft.iot.vmp.vmanager.bean; import com.genersoft.iot.vmp.common.VersionPo; import com.genersoft.iot.vmp.conf.SipConfig; import com.genersoft.iot.vmp.conf.UserSetting; +import com.genersoft.iot.vmp.jt1078.config.JT1078Config; import lombok.Data; @Data @@ -12,6 +13,7 @@ public class SystemConfigInfo { private SipConfig sip; private UserSetting addOn; private VersionPo version; + private JT1078Config jt1078Config; } diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java index 3ffc9e310..57fc3d88c 100755 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java @@ -12,6 +12,7 @@ import com.genersoft.iot.vmp.conf.exception.ControllerException; import com.genersoft.iot.vmp.conf.security.JwtUtils; import com.genersoft.iot.vmp.gb28181.service.IDeviceChannelService; import com.genersoft.iot.vmp.gb28181.service.IDeviceService; +import com.genersoft.iot.vmp.jt1078.config.JT1078Config; import com.genersoft.iot.vmp.media.bean.MediaInfo; import com.genersoft.iot.vmp.media.bean.MediaServer; import com.genersoft.iot.vmp.media.event.mediaServer.MediaServerChangeEvent; @@ -67,6 +68,9 @@ public class ServerController { @Autowired private UserSetting userSetting; + @Autowired + private JT1078Config jt1078Config; + @Autowired private IDeviceService deviceService; @@ -196,6 +200,7 @@ public class ServerController { systemConfigInfo.setSip(sipConfig); systemConfigInfo.setAddOn(userSetting); systemConfigInfo.setServerPort(serverPort); + systemConfigInfo.setJt1078Config(jt1078Config); return systemConfigInfo; } diff --git a/web/src/router/index.js b/web/src/router/index.js index b9b4aab7b..bafb8c588 100644 --- a/web/src/router/index.js +++ b/web/src/router/index.js @@ -95,24 +95,16 @@ export const constantRoutes = [ component: () => import('@/views/device/channel/record'), }, { - path: '/jtDevice', - component: Layout, - redirect: '/jtDevice', - onlyIndex: 0, - children: [ - { - path: '', - name: 'JTDevice', - component: () => import('@/views/jtDevice/index'), - meta: { title: '部标设备', icon: 'jtDevice' } - }, - { - path: '/jtDevice/record/:phoneNumber/:channelId', - name: 'JTDeviceRecord', - component: () => import('@/views/jtDevice/channel/record'), - } - ] - }, + path: '/jtDevice', + name: 'JTDevice', + component: () => import('@/views/jtDevice/index'), + meta: { title: '部标设备', icon: 'jtDevice' } + }, + { + path: '/jtDevice/record/:phoneNumber/:channelId', + name: 'JTDeviceRecord', + component: () => import('@/views/jtDevice/channel/record') + }, { path: '/push', name: 'PushList', diff --git a/web/src/views/jtDevice/index.vue b/web/src/views/jtDevice/index.vue index bbf4ae236..e8f863f1f 100755 --- a/web/src/views/jtDevice/index.vue +++ b/web/src/views/jtDevice/index.vue @@ -1,5 +1,5 @@