From 9c3b53080b98d926726f10b99302de6af33f26ff Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 10 Sep 2021 19:05:47 +0800 Subject: [PATCH] updated demo databse for database ingestion servcie --- README.md | 3 ++- README_DE.md | 1 + README_EN.md | 1 + database/demo/myems_system_db.sql | 8 +++++++- web/src/components/footer/Footer.js | 2 +- web/src/config.js | 4 ++-- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1f451353..926d7307 100644 --- a/README.md +++ b/README.md @@ -248,7 +248,8 @@ docker-compose up -d | Ingest from PostgreSQL | ❌ | ✔️ | 采集数据 https://www.postgresql.org/ | | Ingest from Oracle | ❌ | ✔️ | 采集数据 https://www.oracle.com/database/ | | Ingest from MongoDB | ❌ | ✔️ | 采集数据 https://www.mongodb.com/ | -| FDD 能效故障诊断系统 | ❌ | ✔️ | 需要企业版组件许可或定制开发 | +| Ingest from InfluxDB | ❌ | ✔️ | 采集数据 https://www.influxdata.com/products/influxdb/ | +| FDD 能效故障诊断系统 | ❌ | ✔️ | 需要企业版组件许可或定制开发 | | 阿里云短信服务发送报警 | ❌ | ✔️ | 短信服务 https://www.aliyun.com/product/sms?userCode=8jwn6m8c | | 高级报表系统 | ❌ | ✔️ | 需要企业版组件许可或定制开发 | | 能耗预测 | ❌ | ✔️ | 需要企业版组件许可或定制开发 | diff --git a/README_DE.md b/README_DE.md index 5ec1eff7..51d6e0ac 100644 --- a/README_DE.md +++ b/README_DE.md @@ -246,6 +246,7 @@ docker-compose up -d | Ingest from PostgreSQL | ❌ | ✔️ | https://www.postgresql.org/ | | Ingest from Oracle | ❌ | ✔️ | https://www.oracle.com/database/ | | Ingest from MongoDB | ❌ | ✔️ | https://www.mongodb.com/ | +| Ingest from InfluxDB | ❌ | ✔️ | https://www.influxdata.com/products/influxdb/ | | FDD Rule Engine | ❌ | ✔️ | Erfordert eine Standardkomponentenlizenz | | Alarm via Alibaba Cloud SMS Service| ❌ | ✔️ | https://www.aliyun.com/product/sms?userCode=8jwn6m8c | | Advanced Reporting Engine | ❌ | ✔️ | Erfordert eine Standardkomponentenlizenz oder eine benutzerdefinierte Entwicklung | diff --git a/README_EN.md b/README_EN.md index a1c1b3b4..5b4aa9d1 100644 --- a/README_EN.md +++ b/README_EN.md @@ -247,6 +247,7 @@ docker-compose up -d | Ingest from PostgreSQL | ❌ | ✔️ | https://www.postgresql.org/ | | Ingest from Oracle | ❌ | ✔️ | https://www.oracle.com/database/ | | Ingest from MongoDB | ❌ | ✔️ | https://www.mongodb.com/ | +| Ingest from InfluxDB | ❌ | ✔️ | https://www.influxdata.com/products/influxdb/ | | FDD Rule Engine | ❌ | ✔️ | Requires standard component license or custom development | | Alarm via Alibaba Cloud SMS Service| ❌ | ✔️ | https://www.aliyun.com/product/sms?userCode=8jwn6m8c | | Advanced Reporting Engine | ❌ | ✔️ | Requires standard component license or custom development | diff --git a/database/demo/myems_system_db.sql b/database/demo/myems_system_db.sql index d51208e9..931cd43a 100644 --- a/database/demo/myems_system_db.sql +++ b/database/demo/myems_system_db.sql @@ -149,7 +149,13 @@ VALUES (4, '示例S7数据源', '9eb0d705-d02a-43f8-9c62-7e5ef508b255', 1, 's7', '{"host":"192.168.0.4", "port":102, "rack": 0, "slot": 2}'), (5, '示例ControlLogix数据源', 'd1dc9792-7861-4dd3-9b01-07511dae16c1', 1, 'control-logix', '{"host":"192.168.0.5","port":44818,"processorslot":3}'), (6, '示例OPU UA数据源', '56e1c642-8032-495b-af2e-18a77ca75e0f', 1, 'opc-ua', '{"url":"opc.tcp://192.168.0.6:49320/OPCUA/SimulationServer/"}'), -(7, '示例天气数据源', '9bff8e95-c7c9-4002-b040-08a96ae196b5', 1, 'weather', '{"base_url":"WEATHER_API_URL", "location":"beijing", "key":"APPKEY"}'); +(7, '示例天气数据源', '9bff8e95-c7c9-4002-b040-08a96ae196b5', 1, 'weather', '{"base_url":"WEATHER_API_URL", "location":"beijing", "key":"APPKEY"}'), +(8, '示例MySQL数据源', '409439d0-3e0a-4ab3-865a-a5c0329925f8', 1, 'mysql', '{"host":"192.168.0.8", "port":3306, "user":"myems", "password":"!MyEMS1", "database":"myems_ingestion_db" }'), +(9, '示例SQL Server数据源', '025f0429-5088-4f2a-85a3-dff9b4523692', 1, 'sqlserver', '{"host":"192.168.0.9", "port":1433, "user":"myems", "password":"!MyEMS1", "database":"myems_ingestion_db" }'), +(10, '示例PostgreSQL数据源', 'd89b81e6-4917-4a84-b0e9-c2e939599d3a', 1, 'postgresql', '{"host":"192.168.0.10", "port":5432, "user":"myems", "password":"!MyEMS1", "database":"myems_ingestion_db" }'), +(11, '示例Oracle数据源', '1bdf4db8-ea71-433e-ad16-b637275073d7', 1, 'oracle', '{"host":"192.168.0.11", "port":1521, "user":"myems", "password":"!MyEMS1", "database":"myems_ingestion_db" }'), +(12, '示例MongoDB数据源', 'c211fbad-d1d4-465c-bdf5-242f5593682e', 1, 'mongodb', '{"host":"192.168.0.12", "port":27017, "user":"myems", "password":"!MyEMS1", "database":"myems_ingestion_db" }'), +(13, '示例InfluxDB数据源', '79cb60ff-c683-4289-ac69-bd13e1f970d1', 1, 'mongodb', '{"host":"192.168.0.13", "port":8086, "user":"myems", "password":"!MyEMS1", "database":"myems_ingestion_db" }'); COMMIT; -- --------------------------------------------------------------------------------------------------------------------- diff --git a/web/src/components/footer/Footer.js b/web/src/components/footer/Footer.js index ced9637c..f6848c56 100644 --- a/web/src/components/footer/Footer.js +++ b/web/src/components/footer/Footer.js @@ -9,7 +9,7 @@ const Footer = ({t}) => (

{t('An Industry Leading Open Source Energy Management System')} | -
{new Date().getFullYear()} © MyEMS +
{new Date().getFullYear()} © {atob('TXlFTVM=')}

diff --git a/web/src/config.js b/web/src/config.js index d31aeab5..eb2e9282 100644 --- a/web/src/config.js +++ b/web/src/config.js @@ -1,8 +1,8 @@ export const version = '1.2.3'; export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint export const topNavbarBreakpoint = 'lg'; -//export const APIBaseURL = 'http://127.0.0.1:8000'; -export const APIBaseURL = window.location.protocol+"//"+window.location.hostname+":"+window.location.port+"/api"; +export const APIBaseURL = 'http://127.0.0.1:8000'; +//export const APIBaseURL = window.location.protocol+"//"+window.location.hostname+":"+window.location.port+"/api"; export const settings = { isFluid: true, isRTL: false,