From 2c094dabc6876f80fd62bc2d1791ff603f9b6c66 Mon Sep 17 00:00:00 2001 From: SmallChi <564952747@qq.com> Date: Tue, 18 Dec 2018 22:43:35 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E8=A1=A8=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=202.=E5=89=8D=E7=AB=AF=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/README.md | 6 - src/JT808.DotNetty.Dashbord.UI/README.md | 6 + .../src/locale/index.js | 14 +- .../src/locale/lang/en-US.js | 10 -- .../src/locale/lang/zh-CN.js | 18 ++- .../src/locale/lang/zh-TW.js | 9 -- .../src/mock/session.js | 2 +- .../src/mock/sourcePackage.js | 2 - .../src/mock/transmit.js | 19 ++- .../src/router/routers.js | 19 ++- .../src/view/directive/directive.vue | 121 ------------------ .../src/view/session/session.vue | 80 ++++++++++-- .../src/view/single-page/home/example.vue | 114 ----------------- .../src/view/single-page/home/home.vue | 40 ++---- .../src/view/sourcepackage/sourcepackage.vue | 87 +++++++++++-- .../src/view/transmit/transmit.vue | 81 ++++++++++-- .../JT808AtomicCounterController.cs | 2 +- .../Controllers/JT808SessionController.cs | 6 +- .../Dtos/JT808SessionInfoDto.cs | 4 - .../Dtos/JT808SourcePackageChannelInfoDto.cs | 6 +- .../Enums/JT808UnificationSendType.cs | 15 +++ .../Internal/IJT808DotNettyWebApi.cs | 2 - .../JT808.DotNetty.Dashbord.csproj | 7 +- .../Models/JT808_AtomicCounter.cs | 26 ++++ .../Models/JT808_Session.cs | 35 +++++ .../Models/JT808_SessionLog.cs | 30 +++++ .../Models/JT808_SourcePackage.cs | 31 +++++ .../Models/JT808_SourcePackageLog.cs | 29 +++++ .../Models/JT808_Transmit.cs | 31 +++++ .../Models/JT808_TransmitLog.cs | 29 +++++ .../Models/JT808_UnificationSend.cs | 36 ++++++ .../Providers/JT808DbContext.cs | 48 +++++++ src/JT808.DotNetty.Dashbord/Startup.cs | 3 +- .../Codecs/JT808ClientDecoder.cs | 3 - .../Dtos/JT808SessionInfoDto.cs | 4 - .../JT808SessionServiceDefaultImpl.cs | 5 - 36 files changed, 588 insertions(+), 392 deletions(-) delete mode 100644 src/JT808.DotNetty.Dashbord.UI/src/view/directive/directive.vue delete mode 100644 src/JT808.DotNetty.Dashbord.UI/src/view/single-page/home/example.vue create mode 100644 src/JT808.DotNetty.Dashbord/Enums/JT808UnificationSendType.cs create mode 100644 src/JT808.DotNetty.Dashbord/Models/JT808_AtomicCounter.cs create mode 100644 src/JT808.DotNetty.Dashbord/Models/JT808_Session.cs create mode 100644 src/JT808.DotNetty.Dashbord/Models/JT808_SessionLog.cs create mode 100644 src/JT808.DotNetty.Dashbord/Models/JT808_SourcePackage.cs create mode 100644 src/JT808.DotNetty.Dashbord/Models/JT808_SourcePackageLog.cs create mode 100644 src/JT808.DotNetty.Dashbord/Models/JT808_Transmit.cs create mode 100644 src/JT808.DotNetty.Dashbord/Models/JT808_TransmitLog.cs create mode 100644 src/JT808.DotNetty.Dashbord/Models/JT808_UnificationSend.cs create mode 100644 src/JT808.DotNetty.Dashbord/Providers/JT808DbContext.cs diff --git a/api/README.md b/api/README.md index 05a5f41..fe64cfd 100644 --- a/api/README.md +++ b/api/README.md @@ -72,7 +72,6 @@ | LastActiveTime| DateTime| 最后上线时间| | StartTime| DateTime| 上线时间| | TerminalPhoneNo|string| 终端手机号| -| WebApiPort| string| WebApi端口号| | RemoteAddressIP| string| 远程ip地址| #### 1.获取会话集合 @@ -99,14 +98,12 @@ "LastActiveTime":"2018-11-27 20:00:00", "StartTime":"2018-11-25 20:00:00", "TerminalPhoneNo":"123456789012", - "WebApiPort":828, "RemoteAddressIP":"127.0.0.1:11808" },{ "ChannelId":"eadad23", "LastActiveTime":"2018-11-27 20:00:00", "StartTime":"2018-11-25 20:00:00", "TerminalPhoneNo":"123456789013", - "WebApiPort":828, "RemoteAddressIP":"127.0.0.1:11808" } ] @@ -240,7 +237,6 @@ |属性|数据类型|参数说明| |------|:------:|:------| | RemoteAddress| string | 远程ip地址| -| LocalAddress| string | 本地ip地址| | Registered| bool | 通道是否注册| | Active| bool | 通道是否激活| | Open| bool | 通道是否打开| @@ -254,13 +250,11 @@ "Data":[ { "RemoteAddress":"127.0.0.1:6665", - "LocalAddress":"127.0.0.1:6664", "Registered":true, "Active":true, "Open":true },{ "RemoteAddress":"127.0.0.1:6667", - "LocalAddress":"127.0.0.1:6666", "Registered":true, "Active":true, "Open":true diff --git a/src/JT808.DotNetty.Dashbord.UI/README.md b/src/JT808.DotNetty.Dashbord.UI/README.md index 55bc6da..9c1c4d8 100644 --- a/src/JT808.DotNetty.Dashbord.UI/README.md +++ b/src/JT808.DotNetty.Dashbord.UI/README.md @@ -1,14 +1,20 @@ # Install + ```bush // install dependencies npm install ``` + ## Run + ### Development + ```bush npm run dev ``` + ### Production(Build) + ```bush npm run build ``` \ No newline at end of file diff --git a/src/JT808.DotNetty.Dashbord.UI/src/locale/index.js b/src/JT808.DotNetty.Dashbord.UI/src/locale/index.js index c35492e..75dc39e 100644 --- a/src/JT808.DotNetty.Dashbord.UI/src/locale/index.js +++ b/src/JT808.DotNetty.Dashbord.UI/src/locale/index.js @@ -2,11 +2,11 @@ import Vue from 'vue' import VueI18n from 'vue-i18n' import { localRead } from '@/libs/util' import customZhCn from './lang/zh-CN' -import customZhTw from './lang/zh-TW' -import customEnUs from './lang/en-US' +// import customZhTw from './lang/zh-TW' +// import customEnUs from './lang/en-US' import zhCnLocale from 'iview/src/locale/lang/zh-CN' -import enUsLocale from 'iview/src/locale/lang/en-US' -import zhTwLocale from 'iview/src/locale/lang/zh-TW' +// import enUsLocale from 'iview/src/locale/lang/en-US' +// import zhTwLocale from 'iview/src/locale/lang/zh-TW' Vue.use(VueI18n) @@ -20,9 +20,9 @@ Vue.config.lang = lang // vue-i18n 6.x+写法 Vue.locale = () => {} const messages = { - 'zh-CN': Object.assign(zhCnLocale, customZhCn), - 'zh-TW': Object.assign(zhTwLocale, customZhTw), - 'en-US': Object.assign(enUsLocale, customEnUs) + 'zh-CN': Object.assign(zhCnLocale, customZhCn) + // 'zh-TW': Object.assign(zhTwLocale, customZhTw), + // 'en-US': Object.assign(enUsLocale, customEnUs) } const i18n = new VueI18n({ locale: lang, diff --git a/src/JT808.DotNetty.Dashbord.UI/src/locale/lang/en-US.js b/src/JT808.DotNetty.Dashbord.UI/src/locale/lang/en-US.js index d915372..b7247ed 100644 --- a/src/JT808.DotNetty.Dashbord.UI/src/locale/lang/en-US.js +++ b/src/JT808.DotNetty.Dashbord.UI/src/locale/lang/en-US.js @@ -10,18 +10,8 @@ export default { img_cropper_page: 'Image-editor', update: 'Update', doc: 'Document', - join_page: 'QQ Group', update_table_page: 'Update .CSV', update_paste_page: 'Paste Table Data', - multilevel: 'multilevel', - directive_page: 'Directive', - level_1: 'Level-1', - level_2: 'Level-2', - level_2_1: 'Level-2-1', - level_2_3: 'Level-2-3', - level_2_2: 'Level-2-2', - level_2_2_1: 'Level-2-2-1', - level_2_2_2: 'Level-2-2-2', excel: 'Excel', 'upload-excel': 'Upload Excel', 'export-excel': 'Export Excel', diff --git a/src/JT808.DotNetty.Dashbord.UI/src/locale/lang/zh-CN.js b/src/JT808.DotNetty.Dashbord.UI/src/locale/lang/zh-CN.js index 4393738..125b9a9 100644 --- a/src/JT808.DotNetty.Dashbord.UI/src/locale/lang/zh-CN.js +++ b/src/JT808.DotNetty.Dashbord.UI/src/locale/lang/zh-CN.js @@ -9,19 +9,10 @@ export default { icons_page: '自定义图标', img_cropper_page: '图片编辑器', update: '上传数据', - join_page: 'QQ群', - doc: '文档', update_table_page: '上传CSV文件', update_paste_page: '粘贴表格数据', multilevel: '多级菜单', directive_page: '指令', - level_1: 'Level-1', - level_2: 'Level-2', - level_2_1: 'Level-2-1', - level_2_3: 'Level-2-3', - level_2_2: 'Level-2-2', - level_2_2_1: 'Level-2-2-1', - level_2_2_2: 'Level-2-2-2', excel: 'Excel', 'upload-excel': '上传excel', 'export-excel': '导出excel', @@ -38,5 +29,12 @@ export default { params: '动态路由', cropper_page: '图片裁剪', message_page: '消息中心', - tree_table_page: '树状表格' + tree_table_page: '树状表格', + _session: '会话管理', + _sourcepackage: '原包管理', + _transmit: '转发管理', + session: '会话管理', + sourcepackage: '原包管理', + transmit: '转发管理', + login: '登录' } diff --git a/src/JT808.DotNetty.Dashbord.UI/src/locale/lang/zh-TW.js b/src/JT808.DotNetty.Dashbord.UI/src/locale/lang/zh-TW.js index fed4b1d..7763cd9 100644 --- a/src/JT808.DotNetty.Dashbord.UI/src/locale/lang/zh-TW.js +++ b/src/JT808.DotNetty.Dashbord.UI/src/locale/lang/zh-TW.js @@ -9,19 +9,10 @@ export default { icons_page: '自定義圖標', img_cropper_page: '圖片編輯器', update: '上傳數據', - join_page: 'QQ群', - doc: '文檔', update_table_page: '上傳CSV文件', update_paste_page: '粘貼表格數據', multilevel: '多级菜单', directive_page: '指令', - level_1: 'Level-1', - level_2: 'Level-2', - level_2_1: 'Level-2-1', - level_2_3: 'Level-2-3', - level_2_2: 'Level-2-2', - level_2_2_1: 'Level-2-2-1', - level_2_2_2: 'Level-2-2-2', excel: 'Excel', 'upload-excel': '上傳excel', 'export-excel': '導出excel', diff --git a/src/JT808.DotNetty.Dashbord.UI/src/mock/session.js b/src/JT808.DotNetty.Dashbord.UI/src/mock/session.js index becf0e9..9a68057 100644 --- a/src/JT808.DotNetty.Dashbord.UI/src/mock/session.js +++ b/src/JT808.DotNetty.Dashbord.UI/src/mock/session.js @@ -14,7 +14,7 @@ export default { }, GetAll () { return setData([{ - 'ChannelId': 'eadad23', + 'ChannelId': 'eadad24', 'LastActiveTime': '2018-11-27 20:00:00', 'StartTime': '2018-11-25 20:00:00', 'TerminalPhoneNo': '123456789012', diff --git a/src/JT808.DotNetty.Dashbord.UI/src/mock/sourcePackage.js b/src/JT808.DotNetty.Dashbord.UI/src/mock/sourcePackage.js index c045661..af7b68a 100644 --- a/src/JT808.DotNetty.Dashbord.UI/src/mock/sourcePackage.js +++ b/src/JT808.DotNetty.Dashbord.UI/src/mock/sourcePackage.js @@ -15,13 +15,11 @@ export default { GetAll () { return setData([{ 'RemoteAddress': '127.0.0.1:6665', - 'LocalAddress': '127.0.0.1:6664', 'Registered': true, 'Active': true, 'Open': true }, { 'RemoteAddress': '127.0.0.1:6667', - 'LocalAddress': '127.0.0.1:6666', 'Registered': true, 'Active': true, 'Open': true diff --git a/src/JT808.DotNetty.Dashbord.UI/src/mock/transmit.js b/src/JT808.DotNetty.Dashbord.UI/src/mock/transmit.js index feb1e8d..1e2ef03 100644 --- a/src/JT808.DotNetty.Dashbord.UI/src/mock/transmit.js +++ b/src/JT808.DotNetty.Dashbord.UI/src/mock/transmit.js @@ -13,9 +13,22 @@ export default { })) }, GetAll () { - return setData([ - '127.0.0.1:6665', - '127.0.0.1:6667' + return setData([{ + IP: '127.0.0.1', + Port: 6667 + }, + { + IP: '127.0.0.1', + Port: 6668 + }, + { + IP: '127.0.0.1', + Port: 6669 + }, + { + IP: '127.0.0.1', + Port: 6670 + } ]) } } diff --git a/src/JT808.DotNetty.Dashbord.UI/src/router/routers.js b/src/JT808.DotNetty.Dashbord.UI/src/router/routers.js index 4757c3e..d88798d 100644 --- a/src/JT808.DotNetty.Dashbord.UI/src/router/routers.js +++ b/src/JT808.DotNetty.Dashbord.UI/src/router/routers.js @@ -1,5 +1,4 @@ import Main from '@/components/main' -import parentView from '@/components/parent-view' /** * iview-admin中meta除了原生参数外可配置的参数: @@ -71,8 +70,8 @@ export default [ ] }, { - path: '/session', - name: 'session', + path: '/_session', + name: '_session', meta: { hideInBread: true }, @@ -80,7 +79,7 @@ export default [ children: [ { path: '/session', - name: '会话管理', + name: 'session', meta: { icon: 'ios-hammer', title: '会话管理' @@ -90,8 +89,8 @@ export default [ ] }, { - path: '/sourcepackage', - name: 'sourcePackage', + path: '/_sourcePackage', + name: '_sourcePackage', meta: { hideInBread: true }, @@ -99,7 +98,7 @@ export default [ children: [ { path: '/sourcepackage', - name: '原包管理', + name: 'sourcepackage', meta: { icon: 'ios-hammer', title: '原包管理', @@ -110,8 +109,8 @@ export default [ ] }, { - path: '/transmit', - name: 'transmit', + path: '/_transmit', + name: '_transmit', meta: { hideInBread: true }, @@ -119,7 +118,7 @@ export default [ children: [ { path: '/transmit', - name: '转发管理', + name: 'transmit', meta: { icon: 'ios-hammer', title: '转发管理', diff --git a/src/JT808.DotNetty.Dashbord.UI/src/view/directive/directive.vue b/src/JT808.DotNetty.Dashbord.UI/src/view/directive/directive.vue deleted file mode 100644 index d731335..0000000 --- a/src/JT808.DotNetty.Dashbord.UI/src/view/directive/directive.vue +++ /dev/null @@ -1,121 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Dashbord.UI/src/view/session/session.vue b/src/JT808.DotNetty.Dashbord.UI/src/view/session/session.vue index 33f3ce3..d0dab4a 100644 --- a/src/JT808.DotNetty.Dashbord.UI/src/view/session/session.vue +++ b/src/JT808.DotNetty.Dashbord.UI/src/view/session/session.vue @@ -1,34 +1,90 @@ diff --git a/src/JT808.DotNetty.Dashbord.UI/src/view/single-page/home/example.vue b/src/JT808.DotNetty.Dashbord.UI/src/view/single-page/home/example.vue deleted file mode 100644 index 5fb3465..0000000 --- a/src/JT808.DotNetty.Dashbord.UI/src/view/single-page/home/example.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Dashbord.UI/src/view/single-page/home/home.vue b/src/JT808.DotNetty.Dashbord.UI/src/view/single-page/home/home.vue index 0240022..d504c9b 100644 --- a/src/JT808.DotNetty.Dashbord.UI/src/view/single-page/home/home.vue +++ b/src/JT808.DotNetty.Dashbord.UI/src/view/single-page/home/home.vue @@ -1,7 +1,7 @@ diff --git a/src/JT808.DotNetty.Dashbord.UI/src/view/transmit/transmit.vue b/src/JT808.DotNetty.Dashbord.UI/src/view/transmit/transmit.vue index f21961d..a7c9641 100644 --- a/src/JT808.DotNetty.Dashbord.UI/src/view/transmit/transmit.vue +++ b/src/JT808.DotNetty.Dashbord.UI/src/view/transmit/transmit.vue @@ -1,32 +1,85 @@