diff --git a/admin/app/config.router.js b/admin/app/config.router.js index 0f125702..4aa78934 100644 --- a/admin/app/config.router.js +++ b/admin/app/config.router.js @@ -1058,36 +1058,6 @@ app ] } }) - .state('settings.gsmmodem', { - url: "/gsmmodem", - templateUrl: "views/settings/gsmmodem/gsmmodem.html", - data: { - pageTitle: 'MENU.SETTINGS.GSM_MODEM' - }, - resolve: { - deps: [ - '$ocLazyLoad', - function ($ocLazyLoad) { - return $ocLazyLoad.load(['ui.select', 'ui.checkbox', 'toaster']).then( - function () { - return $ocLazyLoad.load([{ - files: ['js/plugins/sweetalert/sweetalert.min.js', 'css/plugins/sweetalert/sweetalert.css'] - }, { - name: 'oitozero.ngSweetAlert', - files: ['js/plugins/sweetalert/angular-sweetalert.min.js'] - }, { - serie: true, - files: [ - 'app/services/settings/gsmmodem/gsmmodem.service.js', - 'app/controllers/settings/gsmmodem/gsmmodem.controller.js' - ] - }]); - } - ); - } - ] - } - }) .state('settings.knowledgefile', { url: "/knowledgefile", templateUrl: "views/settings/knowledgefile/knowledgefile.html", diff --git a/admin/app/controllers/settings/gsmmodem/gsmmodem.controller.js b/admin/app/controllers/settings/gsmmodem/gsmmodem.controller.js deleted file mode 100644 index 1827f029..00000000 --- a/admin/app/controllers/settings/gsmmodem/gsmmodem.controller.js +++ /dev/null @@ -1,155 +0,0 @@ -'use strict'; - -app.controller('GSMModemController', function($scope, $translate,$uibModal, GSMModemService,toaster,SweetAlert) { - - $scope.getAllGSMModems = function() { - GSMModemService.getAllGSMModems(function (response) { - if (angular.isDefined(response.status) && response.status === 200) { - $scope.gsmmodems = response.data; - } else { - $scope.gsmmodems = []; - } - }); - - }; - - $scope.addGSMModem = function() { - var modalInstance = $uibModal.open({ - templateUrl: 'views/settings/gsmmodem/gsmmodem.model.html', - controller: 'ModalAddGSMModemCtrl', - windowClass: "animated fadeIn", - resolve: { - params:function(){ - return { - gsmmodems:angular.copy($scope.gsmmodems) - }; - } - } - }); - modalInstance.result.then(function(gsmmodem) { - GSMModemService.addGSMModem(gsmmodem, function(response) { - if (angular.isDefined(response.status) && response.status === 201) { - toaster.pop({ - type: "success", - title: $translate.instant("TOASTER.SUCCESS_TITLE"), - body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("SETTING.GSM_MODEM")}), - showCloseButton: true, - }); - $scope.getAllGSMModems(); - } else { - toaster.pop({ - type: "error", - title: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("SETTING.GSM_MODEM")}), - body: $translate.instant(response.data.description), - showCloseButton: true, - }); - } - }); - }, function() { - - }); - }; - - $scope.editGSMModem=function(gsmmodem){ - var modalInstance = $uibModal.open({ - windowClass: "animated fadeIn", - templateUrl: 'views/settings/gsmmodem/gsmmodem.model.html', - controller: 'ModalEditGSMModemCtrl', - resolve: { - params:function(){ - return { - gsmmodem:angular.copy(gsmmodem), - gsmmodems:angular.copy($scope.gsmmodems) - }; - } - } - }); - - modalInstance.result.then(function (modifiedGSMModem) { - GSMModemService.editGSMModem(modifiedGSMModem,function (response){ - if(angular.isDefined(response.status) && response.status === 200) { - toaster.pop({ - type: "success", - title: $translate.instant("TOASTER.SUCCESS_TITLE"), - body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("SETTING.GSM_MODEM")}), - showCloseButton: true, - }); - $scope.getAllGSMModems(); - }else{ - toaster.pop({ - type: "error", - title: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("SETTING.GSM_MODEM")}), - body: $translate.instant(response.data.description), - showCloseButton: true, - }); - } - }); - }, function () { - //do nothing; - }); - }; - - $scope.deleteGSMModem=function(gsmmodem){ - SweetAlert.swal({ - title: $translate.instant("SWEET.TITLE"), - text: $translate.instant("SWEET.TEXT"), - type: "warning", - showCancelButton: true, - confirmButtonColor: "#DD6B55", - confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"), - cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"), - closeOnConfirm: true, - closeOnCancel: true }, - function (isConfirm) { - if (isConfirm) { - GSMModemService.deleteGSMModem(gsmmodem, function(response) { - if (angular.isDefined(response.status) && response.status === 204) { - toaster.pop({ - type: "success", - title: $translate.instant("TOASTER.SUCCESS_TITLE"), - body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("SETTING.GSM_MODEM")}), - showCloseButton: true, - }); - $scope.getAllGSMModems(); - } else { - toaster.pop({ - type: "error", - title: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("SETTING.GSM_MODEM")}), - body: $translate.instant(response.data.description), - showCloseButton: true, - }); - } - }); - } - }); - }; - - $scope.getAllGSMModems(); -}); - -app.controller('ModalAddGSMModemCtrl', function ($scope, $uibModalInstance,params) { - - $scope.operation="SETTING.ADD_GSM_MODEM"; - $scope.gsmmodems=params.gsmmodems; - $scope.ok = function () { - $uibModalInstance.close($scope.gsmmodem); - }; - - $scope.cancel = function () { - $uibModalInstance.dismiss('cancel'); - }; -}); - -app.controller('ModalEditGSMModemCtrl', function ($scope, $uibModalInstance, params) { - $scope.operation="SETTING.EDIT_GSM_MODEM"; - $scope.gsmmodem = params.gsmmodem; - $scope.gsmmodems=params.gsmmodems; - - $scope.ok = function () { - $uibModalInstance.close($scope.gsmmodem); - }; - - $scope.cancel = function () { - $uibModalInstance.dismiss('cancel'); - }; -}); diff --git a/admin/app/services/settings/gsmmodem/gsmmodem.service.js b/admin/app/services/settings/gsmmodem/gsmmodem.service.js deleted file mode 100644 index 689b0c0e..00000000 --- a/admin/app/services/settings/gsmmodem/gsmmodem.service.js +++ /dev/null @@ -1,53 +0,0 @@ -'use strict'; -app.factory('GSMModemService', function($http) { - return { - getAllGSMModems:function(callback){ - $http.get(getAPI()+'gsmmodems') - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - }, - searchGSMModems: function(query, callback) { - $http.get(getAPI()+'gsmmodems', { params: { q: query } }) - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - }, - addGSMModem: function(gsmmodem, callback) { - $http.post(getAPI()+'gsmmodems',{data:gsmmodem}) - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - }, - editGSMModem: function(gsmmodem, callback) { - $http.put(getAPI()+'gsmmodems/'+gsmmodem.id,{data:gsmmodem}) - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - }, - deleteGSMModem: function(gsmmodem, callback) { - $http.delete(getAPI()+'gsmmodems/'+gsmmodem.id) - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - }, - getGSMModem: function(id, callback) { - $http.get(getAPI()+'gsmmodems/'+id) - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - } - }; -}); diff --git a/admin/app/translations.js b/admin/app/translations.js index 9bf44184..2eacd7a5 100644 --- a/admin/app/translations.js +++ b/admin/app/translations.js @@ -96,7 +96,6 @@ function config($translateProvider) { MENU: 'Menu Settings', TARIFF: 'Tariff Settings', EMAIL_SERVER: 'Email Server Settings', - GSM_MODEM: 'GSM Modem Settings', CONTACT: 'Contacts', KNOWLEDGEFILE: 'Knowledge Base Settings' }, @@ -155,7 +154,6 @@ function config($translateProvider) { ADD_ENERGY_ITEM: 'Add Energy Item', ADD_CONTACT: 'Add Contact', ADD_EMAIL_SERVER: 'Add Email Server', - ADD_GSM_MODEM: 'Add GSM Modem', EDIT_SPACE: 'Edit Space', EDIT_TENANT: 'Edit Tenant', @@ -169,7 +167,6 @@ function config($translateProvider) { EDIT_CATEGORY: 'Edit Energy Category', EDIT_CONTACT: 'Edit Contact', EDIT_EMAIL_SERVER: 'Edit Email Server', - EDIT_GSM_MODEM: 'Edit GSM Modem', REQUIRES_AUTHENTICATION: 'Requires Authentication', SELECT_DATE: 'Please Select Date', @@ -1086,7 +1083,6 @@ function config($translateProvider) { MENU: '菜单管理', TARIFF: '能源费率管理', EMAIL_SERVER: '邮件服务器设置', - GSM_MODEM: '短信模块设置', CONTACT: '联系人管理', KNOWLEDGEFILE: '知识库管理' }, @@ -1145,7 +1141,6 @@ function config($translateProvider) { ADD_ENERGY_ITEM: '添加能耗分项', ADD_CONTACT: '添加联系人', ADD_EMAIL_SERVER: '添加邮件服务器', - ADD_GSM_MODEM: '添加短信模块', EDIT_SPACE: '编辑空间', EDIT_TENANT: '编辑租户', @@ -1160,7 +1155,6 @@ function config($translateProvider) { EDIT_ENERGY_ITEM: '编辑能耗分项', EDIT_CONTACT: '编辑联系人', EDIT_EMAIL_SERVER: '编辑邮箱服务器', - EDIT_GSM_MODEM: '编辑短信模块', REQUIRES_AUTHENTICATION: '需要身份验证', SELECT_DATE: '请选择日期', @@ -1194,7 +1188,6 @@ function config($translateProvider) { INPUT_BAUD_RATE: '请输入波特率', EMAIL_SERVER: '邮件服务器', - GSM_MODEM: '短信模块', INVALID_FORMAT: '格式不正确', INVALID_FROM_ADDR: '发件人地址不正确', INVALID_BAUD_RATE: '波特率不正确', @@ -2084,7 +2077,6 @@ function config($translateProvider) { MENU: 'Verwaltung des Menüs', TARIFF: 'Energieratenmanagement', EMAIL_SERVER: 'Mailserver-Einstellungen', - GSM_MODEM: 'SMS-Moduleinstellungen', CONTACT: 'Kontaktmanagement', KNOWLEDGEFILE: 'Wissensdatenbankverwaltung' }, @@ -2143,7 +2135,6 @@ function config($translateProvider) { ADD_ENERGY_ITEM: 'Unterelemente zum Energieverbrauch hinzufügen', ADD_CONTACT: 'Kontakt hinzufügen', ADD_EMAIL_SERVER: 'Mail-Server hinzufügen', - ADD_GSM_MODEM: 'SMS-Modul hinzufügen', EDIT_SPACE: 'Leerzeichen bearbeiten', EDIT_TENANT: 'Mieter bearbeiten', @@ -2158,7 +2149,6 @@ function config($translateProvider) { EDIT_ENERGY_ITEM: 'Unterelemente zum Energieverbrauch bearbeiten', EDIT_CONTACT: 'Kontakt bearbeiten', EDIT_EMAIL_SERVER: 'Postfachserver bearbeiten', - EDIT_GSM_MODEM: 'SMS-Modul bearbeiten', REQUIRES_AUTHENTICATION: 'Authentifizierung erforderlich', SELECT_DATE: 'Bitte wählen Sie ein Datum', @@ -2192,7 +2182,6 @@ function config($translateProvider) { INPUT_BAUD_RATE: 'Bitte geben Sie die Baudrate ein', EMAIL_SERVER: 'Mail-Server', - GSM_MODEM: 'SMS-Modul', INVALID_FORMAT: 'Falsches Format', INVALID_FROM_ADDR: 'Falsche Absenderadresse', INVALID_BAUD_RATE: 'Falsche Baudrate', diff --git a/admin/views/common/navigation.html b/admin/views/common/navigation.html index 7dce87db..605c107b 100644 --- a/admin/views/common/navigation.html +++ b/admin/views/common/navigation.html @@ -32,7 +32,6 @@
  • {{ 'MENU.SETTINGS.DISTRIBUTION_SYSTEM' | translate }}
  • {{ 'MENU.SETTINGS.MENU' | translate }}
  • {{ 'MENU.SETTINGS.EMAIL_SERVER' | translate }}
    • -
  • {{ 'MENU.SETTINGS.GSM_MODEM' | translate }}
  • {{ 'MENU.SETTINGS.KNOWLEDGEFILE' | translate }}
    • diff --git a/admin/views/settings/gsmmodem/gsmmodem.html b/admin/views/settings/gsmmodem/gsmmodem.html deleted file mode 100644 index 91f336f6..00000000 --- a/admin/views/settings/gsmmodem/gsmmodem.html +++ /dev/null @@ -1,36 +0,0 @@ -
    -
    -
    -
    - - -
    - - - - - - - - - - - - - - - - - - -
    {{'SETTING.ID' | translate}}{{'SETTING.SERIAL_PORT' | translate}}{{'SETTING.BAUD_RATE' | translate}}{{'SETTING.ACTION' | translate}}
    {{ gsmmodem.id }}{{ gsmmodem.serial_port }}{{ gsmmodem.baud_rate }} - {{'SETTING.EDIT' | translate}} - -
    -
    -     -     -
    -
    -
    -
    diff --git a/admin/views/settings/gsmmodem/gsmmodem.model.html b/admin/views/settings/gsmmodem/gsmmodem.model.html deleted file mode 100644 index 0e166e0f..00000000 --- a/admin/views/settings/gsmmodem/gsmmodem.model.html +++ /dev/null @@ -1,31 +0,0 @@ -
    -
    -

    {{operation | translate}}

    -
    -
    -
    -
    - -
    -
    - {{'SETTING.INPUT_SERIAL_PORT' | translate}} -
    -
    -
    -
    -
    - -
    -
    - {{'SETTING.INPUT_BAUD_RATE' | translate}} - {{'SETTING.INVALID_BAUD_RATE' | translate}} -
    -
    -
    -
    -
    -
    - - -
    -
    diff --git a/database/myems_fdd_db.sql b/database/myems_fdd_db.sql index d80c1d23..473e9f4e 100644 --- a/database/myems_fdd_db.sql +++ b/database/myems_fdd_db.sql @@ -7,22 +7,6 @@ DROP DATABASE IF EXISTS `myems_fdd_db` ; CREATE DATABASE IF NOT EXISTS `myems_fdd_db` ; USE `myems_fdd_db` ; --- --------------------------------------------------------------------------------------------------------------------- --- Table `myems_fdd_db`.`tbl_aliyun_sms_api` --- refer to https://dysms.console.aliyun.com/ --- API Version 2017-05-25 --- --------------------------------------------------------------------------------------------------------------------- -DROP TABLE IF EXISTS `myems_fdd_db`.`tbl_aliyun_sms_api` ; - -CREATE TABLE IF NOT EXISTS `myems_fdd_db`.`tbl_aliyun_sms_api` ( - `id` BIGINT NOT NULL AUTO_INCREMENT, - `access_key_id` VARCHAR(256) NOT NULL, - `access_key_secret` VARCHAR(256) NOT NULL, - `endpoint` VARCHAR(256) NOT NULL, - `sign_name` VARCHAR(256) NOT NULL, - `template_code` VARCHAR(256) NOT NULL, - PRIMARY KEY (`id`)); - -- --------------------------------------------------------------------------------------------------------------------- -- Table `myems_fdd_db`.`tbl_email_messages` -- --------------------------------------------------------------------------------------------------------------------- @@ -42,30 +26,6 @@ CREATE TABLE IF NOT EXISTS `myems_fdd_db`.`tbl_email_messages` ( PRIMARY KEY (`id`)); CREATE INDEX `tbl_email_messages_index_1` ON `myems_fdd_db`.`tbl_email_messages` (`status`, `scheduled_datetime_utc`); --- --------------------------------------------------------------------------------------------------------------------- --- Table `myems_fdd_db`.`tbl_gsm_modems` --- --------------------------------------------------------------------------------------------------------------------- -DROP TABLE IF EXISTS `myems_fdd_db`.`tbl_gsm_modems` ; - -CREATE TABLE IF NOT EXISTS `myems_fdd_db`.`tbl_gsm_modems` ( - `id` BIGINT NOT NULL AUTO_INCREMENT, - `serial_port` VARCHAR(64) NOT NULL, - `baud_rate` INT NOT NULL, - PRIMARY KEY (`id`)); - --- --------------------------------------------------------------------------------------------------------------------- --- Data for table `myems_fdd_db`.`tbl_gsm_modems` --- --------------------------------------------------------------------------------------------------------------------- -START TRANSACTION; -USE `myems_fdd_db`; - -INSERT INTO `myems_fdd_db`.`tbl_gsm_modems` -(`id`, `serial_port`, `baud_rate`) -VALUES -(1, '/dev/ttyS0', 115200); - -COMMIT; - -- --------------------------------------------------------------------------------------------------------------------- -- Table `myems_fdd_db`.`tbl_rules` -- --------------------------------------------------------------------------------------------------------------------- diff --git a/database/upgrade/upgrade1.2.4.sql b/database/upgrade/upgrade1.2.4.sql index d0706fd1..f1f70c5a 100644 --- a/database/upgrade/upgrade1.2.4.sql +++ b/database/upgrade/upgrade1.2.4.sql @@ -1,16 +1,3 @@ --- --------------------------------------------------------------------------------------------------------------------- --- Table `myems_fdd_db`.`tbl_aliyun_sms_api` --- refer to https://dysms.console.aliyun.com/ --- API Version 2017-05-25 --- --------------------------------------------------------------------------------------------------------------------- -CREATE TABLE IF NOT EXISTS `myems_fdd_db`.`tbl_aliyun_sms_api` ( - `id` BIGINT NOT NULL AUTO_INCREMENT, - `access_key_id` VARCHAR(256) NOT NULL, - `access_key_secret` VARCHAR(256) NOT NULL, - `endpoint` VARCHAR(256) NOT NULL, - `sign_name` VARCHAR(256) NOT NULL, - `template_code` VARCHAR(256) NOT NULL, - PRIMARY KEY (`id`)); DROP TABLE IF EXISTS `myems_fdd_db`.`tbl_gsm_modems` ; diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 10a7d96c..66e63491 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -2701,107 +2701,6 @@ } ] }, - { - "name": "Aliyun SMS API", - "item": [ - { - "name": "GET All Aliyun SMS APIs", - "request": { - "method": "GET", - "header": [], - "url": { - "raw": "{{base_url}}/aliyunsmsapis", - "host": [ - "{{base_url}}" - ], - "path": [ - "aliyunsmsapis" - ] - } - }, - "response": [] - }, - { - "name": "GET an Aliyun SMS API by ID", - "request": { - "method": "GET", - "header": [], - "url": { - "raw": "{{base_url}}/aliyunsmsapis/1", - "host": [ - "{{base_url}}" - ], - "path": [ - "aliyunsmsapis", - "1" - ] - } - }, - "response": [] - }, - { - "name": "POST Create New Aliyun SMS API", - "request": { - "method": "POST", - "header": [], - "body": { - "mode": "raw", - "raw": "{\"data\":{\"access_key_id\":\"xTAI5t8KUj8jXXXXXXXXXXXX\",\"access_key_secret\":\"fXXjFLA7GeXXXXXXXXXXXXXXXXXXXX\",\"endpoint\":\"https://dysmsapi.aliyuncs.com\",\"sign_name\":\"MYEMS\",\"template_code\":\"SMS_153055065\"}}" - }, - "url": { - "raw": "{{base_url}}/aliyunsmsapis", - "host": [ - "{{base_url}}" - ], - "path": [ - "aliyunsmsapis" - ] - } - }, - "response": [] - }, - { - "name": "PUT Update an Aliyun SMS API", - "request": { - "method": "PUT", - "header": [], - "body": { - "mode": "raw", - "raw": "{\"data\":{\"access_key_id\":\"LTAI5t8KUj8jXXXXXXXXXXXX\",\"access_key_secret\":\"fXXjFLA7GeXXXXXXXXXXXXXXXXXXXX\",\"endpoint\":\"https://dysmsapi.aliyuncs.com\",\"sign_name\":\"MYEMS\",\"template_code\":\"SMS_153055065\"}}" - }, - "url": { - "raw": "{{base_url}}/aliyunsmsapis/1", - "host": [ - "{{base_url}}" - ], - "path": [ - "aliyunsmsapis", - "1" - ] - } - }, - "response": [] - }, - { - "name": "DELETE an Aliyun SMS API by ID", - "request": { - "method": "DELETE", - "header": [], - "url": { - "raw": "{{base_url}}/aliyunsmsapis/2", - "host": [ - "{{base_url}}" - ], - "path": [ - "aliyunsmsapis", - "2" - ] - } - }, - "response": [] - } - ] - }, { "name": "Knowledge File", "item": [ diff --git a/myems-api/README.md b/myems-api/README.md index afbf9b66..f58f38c5 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -183,7 +183,7 @@ View in Postman: import the file MyEMS.postman_collection.json with Postman [Rule](#Rule) | [Email Message](#Email Message) | [Text Message](#Text Message) | [Web Message](#Web Message) | [Wechat Message](#Wechat Message) -[Email Server](#Email Server) | [GSM Modem](#GSM Modem) +[Email Server](#Email Server) [User](#User) | [Privilege](#Privilege) | [Contact](#Contact) | [Notification](#Notification) @@ -891,37 +891,6 @@ curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"MyEMS Ga curl -i -X GET {{base_url}}/gateways/{id}/datasources ``` -### GSM Modem -* GET a GSM Modem by ID - -```bash -curl -i -X GET {{base_url}}/gsmmodems/{id} -``` -Result in JSON - -| Name | Data Type | Description | -|---------------|-----------|---------------------------------------| -| id | integer | GSM Modem ID | -| serial_port | string | GSM Modem serial port | -| baud_rate | integer | GSM Modem baud rate | - -* GET All GSM Modems -```bash -curl -i -X GET {{base_url}}/gsmmodems -``` -* DELETE a GSM Modem by ID -```bash -curl -i -X DELETE {{base_url}}/gsmmodems/{id} -``` -* POST Create New GSM Modem -```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"serial_port":"/dev/ttyS0","baud_rate":115200}}' {{base_url}}/gsmmodems -``` -* PUT Update a GSM Modem -```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"serial_port":"/dev/ttyS0","baud_rate":115200}}' {{base_url}}/gsmmodems/{id} -``` - ### Knowledge File * GET Knowledge File by ID diff --git a/myems-api/app.py b/myems-api/app.py index 406bbf4a..9c269659 100644 --- a/myems-api/app.py +++ b/myems-api/app.py @@ -1,7 +1,7 @@ import falcon from falcon_cors import CORS from falcon_multipart.middleware import MultipartMiddleware -from core import aliyunsmsapi, energyflowdiagram, privilege, textmessage, distributioncircuit, virtualmeter, \ +from core import energyflowdiagram, privilege, textmessage, distributioncircuit, virtualmeter, \ costcenter, point, knowledgefile, meter, tariff, user, storetype, timezone, \ costfile, offlinemeterfile, version, contact, emailserver, combinedequipment, datasource, equipment, tenant, \ shopfloor, webmessage, distributionsystem, store, emailmessage, tenanttype, wechatmessage, space, gateway, \ @@ -102,10 +102,6 @@ api = falcon.API(middleware=[cors.middleware, MultipartMiddleware()]) # Routes for System Core ######################################################################################################################## -api.add_route('/aliyunsmsapis', - aliyunsmsapi.AliyunSMSAPICollection()) -api.add_route('/aliyunsmsapis/{id_}', - aliyunsmsapi.AliyunSMSAPIItem()) api.add_route('/combinedequipments', combinedequipment.CombinedEquipmentCollection()) api.add_route('/combinedequipments/{id_}', diff --git a/myems-api/core/aliyunsmsapi.py b/myems-api/core/aliyunsmsapi.py deleted file mode 100644 index c9c329cd..00000000 --- a/myems-api/core/aliyunsmsapi.py +++ /dev/null @@ -1,268 +0,0 @@ -import falcon -import json -import mysql.connector -import config -from core.userlogger import user_logger - - -class AliyunSMSAPICollection: - @staticmethod - def __init__(): - """Initializes AliyunSMSAPICollection""" - pass - - @staticmethod - def on_options(req, resp): - resp.status = falcon.HTTP_200 - - @staticmethod - def on_get(req, resp): - cnx = mysql.connector.connect(**config.myems_fdd_db) - cursor = cnx.cursor() - - query = (" SELECT id, access_key_id, access_key_secret, endpoint, sign_name, template_code " - " FROM tbl_aliyun_sms_api ") - cursor.execute(query) - rows = cursor.fetchall() - cursor.close() - cnx.disconnect() - - result = list() - if rows is not None and len(rows) > 0: - for row in rows: - meta_result = {"id": row[0], - "access_key_id": row[1], - "access_key_secret": row[2], - "endpoint": row[3], - "sign_name": row[4], - "template_code": row[5]} - result.append(meta_result) - - resp.body = json.dumps(result) - - @staticmethod - @user_logger - def on_post(req, resp): - """Handles POST requests""" - try: - raw_json = req.stream.read().decode('utf-8') - except Exception as ex: - raise falcon.HTTPError(falcon.HTTP_400, title='API.ERROR', description=ex) - - new_values = json.loads(raw_json) - - if 'access_key_id' not in new_values['data'].keys() or \ - not isinstance(new_values['data']['access_key_id'], str) or \ - len(str.strip(new_values['data']['access_key_id'])) == 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_ALIYUN_SMS_API_ACCESS_KEY_ID') - access_key_id = str.strip(new_values['data']['access_key_id']) - - if 'access_key_secret' not in new_values['data'].keys() or \ - not isinstance(new_values['data']['access_key_secret'], str) or \ - len(new_values['data']['access_key_secret']) == 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_ALIYUN_SMS_API_ACCESS_KEY_SECRET') - access_key_secret = new_values['data']['access_key_secret'] - - if 'endpoint' not in new_values['data'].keys() or \ - not isinstance(new_values['data']['endpoint'], str) or \ - len(new_values['data']['endpoint']) == 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_ALIYUN_SMS_API_ENDPOINT') - endpoint = new_values['data']['endpoint'] - - if 'sign_name' not in new_values['data'].keys() or \ - not isinstance(new_values['data']['sign_name'], str) or \ - len(new_values['data']['sign_name']) == 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_ALIYUN_SMS_API_SIGN_NAME') - sign_name = new_values['data']['sign_name'] - - if 'template_code' not in new_values['data'].keys() or \ - not isinstance(new_values['data']['template_code'], str) or \ - len(new_values['data']['template_code']) == 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_ALIYUN_SMS_API_TEMPLATE_CODE') - template_code = new_values['data']['template_code'] - - cnx = mysql.connector.connect(**config.myems_fdd_db) - cursor = cnx.cursor() - - cursor.execute(" SELECT id " - " FROM tbl_aliyun_sms_api " - " WHERE access_key_id = %s ", (access_key_id,)) - if cursor.fetchone() is not None: - cursor.close() - cnx.disconnect() - raise falcon.HTTPError(falcon.HTTP_404, title='API.BAD_REQUEST', - description='API.ALIYUN_SMS_API_ACCESS_KEY_ID_IS_ALREADY_IN_USE') - - add_value = (" INSERT INTO tbl_aliyun_sms_api " - " (access_key_id, access_key_secret, endpoint, sign_name, template_code) " - " VALUES (%s, %s, %s, %s, %s) ") - cursor.execute(add_value, (access_key_id, - access_key_secret, - endpoint, - sign_name, - template_code)) - new_id = cursor.lastrowid - cnx.commit() - cursor.close() - cnx.disconnect() - - resp.status = falcon.HTTP_201 - resp.location = '/aliyunsmsapis/' + str(new_id) - - -class AliyunSMSAPIItem: - @staticmethod - def __init__(): - """Initializes AliyunSMSAPIItem""" - pass - - @staticmethod - def on_options(req, resp, id_): - resp.status = falcon.HTTP_200 - - @staticmethod - def on_get(req, resp, id_): - if not id_.isdigit() or int(id_) <= 0: - raise falcon.HTTPError(falcon.HTTP_400, '400 Bad Request') - - cnx = mysql.connector.connect(**config.myems_fdd_db) - cursor = cnx.cursor() - - query = (" SELECT id, access_key_id, access_key_secret, endpoint, sign_name, template_code " - " FROM tbl_aliyun_sms_api " - " WHERE id = %s ") - cursor.execute(query, (id_,)) - row = cursor.fetchone() - cursor.close() - cnx.disconnect() - if row is None: - raise falcon.HTTPError(falcon.HTTP_404, 'API.NOT_FOUND') - - result = {"id": row[0], - "access_key_id": row[1], - "access_key_secret": row[2], - "endpoint": row[3], - "sign_name": row[4], - "template_code": row[5]} - resp.body = json.dumps(result) - - @staticmethod - @user_logger - def on_delete(req, resp, id_): - if not id_.isdigit() or int(id_) <= 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_ALIYUN_SMS_API_ID') - - cnx = mysql.connector.connect(**config.myems_fdd_db) - cursor = cnx.cursor() - - cursor.execute(" SELECT access_key_id " - " FROM tbl_aliyun_sms_api " - " WHERE id = %s ", (id_,)) - if cursor.fetchone() is None: - cursor.close() - cnx.disconnect() - raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND', - description='API.ALIYUN_SMS_API_NOT_FOUND') - - cursor.execute(" DELETE FROM tbl_aliyun_sms_api WHERE id = %s ", (id_,)) - cnx.commit() - - cursor.close() - cnx.disconnect() - - resp.status = falcon.HTTP_204 - - @staticmethod - @user_logger - def on_put(req, resp, id_): - """Handles PUT requests""" - try: - raw_json = req.stream.read().decode('utf-8') - except Exception as ex: - raise falcon.HTTPError(falcon.HTTP_400, title='API.EXCEPTION', description=ex) - - if not id_.isdigit() or int(id_) <= 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_ALIYUN_SMS_API_ID') - - new_values = json.loads(raw_json) - - if 'access_key_id' not in new_values['data'].keys() or \ - not isinstance(new_values['data']['access_key_id'], str) or \ - len(str.strip(new_values['data']['access_key_id'])) == 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_ALIYUN_SMS_API_ACCESS_KEY_ID') - access_key_id = str.strip(new_values['data']['access_key_id']) - - if 'access_key_secret' not in new_values['data'].keys() or \ - not isinstance(new_values['data']['access_key_secret'], str) or \ - len(new_values['data']['access_key_secret']) == 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_ALIYUN_SMS_API_ACCESS_KEY_SECRET') - access_key_secret = new_values['data']['access_key_secret'] - - if 'endpoint' not in new_values['data'].keys() or \ - not isinstance(new_values['data']['endpoint'], str) or \ - len(new_values['data']['endpoint']) == 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_ALIYUN_SMS_API_ENDPOINT') - endpoint = new_values['data']['endpoint'] - - if 'sign_name' not in new_values['data'].keys() or \ - not isinstance(new_values['data']['sign_name'], str) or \ - len(new_values['data']['sign_name']) == 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_ALIYUN_SMS_API_SIGN_NAME') - sign_name = new_values['data']['sign_name'] - - if 'template_code' not in new_values['data'].keys() or \ - not isinstance(new_values['data']['template_code'], str) or \ - len(new_values['data']['template_code']) == 0: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.INVALID_ALIYUN_SMS_API_TEMPLATE_CODE') - template_code = new_values['data']['template_code'] - - cnx = mysql.connector.connect(**config.myems_fdd_db) - cursor = cnx.cursor() - - cursor.execute(" SELECT access_key_id " - " FROM tbl_aliyun_sms_api " - " WHERE id = %s ", - (id_,)) - if cursor.fetchone() is None: - cursor.close() - cnx.disconnect() - raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND', - description='API.ALIYUN_SMS_API_NOT_FOUND') - - cursor.execute(" SELECT access_key_id " - " FROM tbl_aliyun_sms_api " - " WHERE access_key_id = %s AND id != %s ", (access_key_id, id_)) - if cursor.fetchone() is not None: - cursor.close() - cnx.disconnect() - raise falcon.HTTPError(falcon.HTTP_404, title='API.BAD_REQUEST', - description='API.ALIYUN_SMS_API_ACCESS_KEY_ID_IS_ALREADY_IN_USE') - - update_row = (" UPDATE tbl_aliyun_sms_api " - " SET access_key_id = %s, access_key_secret = %s, endpoint = %s, sign_name = %s, " - " template_code = %s " - " WHERE id = %s ") - cursor.execute(update_row, (access_key_id, - access_key_secret, - endpoint, - sign_name, - template_code, - id_,)) - cnx.commit() - - cursor.close() - cnx.disconnect() - - resp.status = falcon.HTTP_200 diff --git a/web/src/i18n.js b/web/src/i18n.js index af848b98..9321728c 100644 --- a/web/src/i18n.js +++ b/web/src/i18n.js @@ -353,8 +353,6 @@ const resources = { "API.ADMINISTRATOR_SESSION_NOT_FOUND": "Administrator session not found", "API.ADMINISTRATOR_SESSION_TIMEOUT": "Administrator session timeout", "API.ADVANCED_REPORT_NOT_FOUND": "Advanced report not found", - "API.ALIYUN_SMS_API_ACCESS_KEY_ID_IS_ALREADY_IN_USE": "Aliyun SMS API Access Key ID is Already in Use", - "API.ALIYUN_SMS_API_NOT_FOUND": "Aliyun SMS API Not Found", "API.BAD_REQUEST": "Bad request", "API.CANNOT_SET_EXISTING_SUBMETER_AS_MASTER_METER": "Cannot set existing submeter as master meter", "API.COMBINED_EQUIPMENT_EQUIPMENT_RELATION_EXISTS": "Combined equipment equipment relation exists", @@ -433,12 +431,6 @@ const resources = { "API.INVALID_ADDRESS": "Invalid address", "API.INVALID_ADDRESS_VALUE": "Invalid address value", "API.INVALID_ADVANCED_REPORT_ID": "Invalid advanced report id", - "API.INVALID_ALIYUN_SMS_API_ACCESS_KEY_ID": "Invalid Aliyun SMS API Access Key ID", - "API.INVALID_ALIYUN_SMS_API_ACCESS_KEY_SECRET": "Invalid Aliyun SMS API Access Key Secret", - "API.INVALID_ALIYUN_SMS_API_ENDPOINT": "Invalid Aliyun SMS API Endpoint", - "API.INVALID_ALIYUN_SMS_API_ID": "Invalid Aliyun SMS API ID", - "API.INVALID_ALIYUN_SMS_API_SIGN_NAME": "Invalid Aliyun SMS API Sign Name", - "API.INVALID_ALIYUN_SMS_API_TEMPLATE_CODE": "Invalid Aliyun SMS API Template Code", "API.INVALID_AREA_VALUE": "Invalid area value", "API.INVALID_BASE_PERIOD_END_DATETIME": "Invalid base period end datetime", "API.INVALID_BASE_PERIOD_START_DATETIME": "Invalid base period start datetime", @@ -1110,8 +1102,6 @@ const resources = { "API.ADMINISTRATOR_SESSION_NOT_FOUND": "Administrator session not found", "API.ADMINISTRATOR_SESSION_TIMEOUT": "Administrator session timeout", "API.ADVANCED_REPORT_NOT_FOUND": "Advanced report not found", - "API.ALIYUN_SMS_API_ACCESS_KEY_ID_IS_ALREADY_IN_USE": "Aliyun SMS API Access Key ID is Already in Use", - "API.ALIYUN_SMS_API_NOT_FOUND": "Aliyun SMS API Not Found", "API.BAD_REQUEST": "Bad request", "API.CANNOT_SET_EXISTING_SUBMETER_AS_MASTER_METER": "Cannot set existing submeter as master meter", "API.COMBINED_EQUIPMENT_EQUIPMENT_RELATION_EXISTS": "Combined equipment equipment relation exists", @@ -1190,12 +1180,6 @@ const resources = { "API.INVALID_ADDRESS": "Invalid address", "API.INVALID_ADDRESS_VALUE": "Invalid address value", "API.INVALID_ADVANCED_REPORT_ID": "Invalid advanced report id", - "API.INVALID_ALIYUN_SMS_API_ACCESS_KEY_ID": "Invalid Aliyun SMS API Access Key ID", - "API.INVALID_ALIYUN_SMS_API_ACCESS_KEY_SECRET": "Invalid Aliyun SMS API Access Key Secret", - "API.INVALID_ALIYUN_SMS_API_ENDPOINT": "Invalid Aliyun SMS API Endpoint", - "API.INVALID_ALIYUN_SMS_API_ID": "Invalid Aliyun SMS API ID", - "API.INVALID_ALIYUN_SMS_API_SIGN_NAME": "Invalid Aliyun SMS API Sign Name", - "API.INVALID_ALIYUN_SMS_API_TEMPLATE_CODE": "Invalid Aliyun SMS API Template Code", "API.INVALID_AREA_VALUE": "Invalid area value", "API.INVALID_BASE_PERIOD_END_DATETIME": "Invalid base period end datetime", "API.INVALID_BASE_PERIOD_START_DATETIME": "Invalid base period start datetime", @@ -1866,8 +1850,6 @@ const resources = { "API.ADMINISTRATOR_SESSION_NOT_FOUND": "Administrator session not found", "API.ADMINISTRATOR_SESSION_TIMEOUT": "Administrator session timeout", "API.ADVANCED_REPORT_NOT_FOUND": "Advanced report not found", - "API.ALIYUN_SMS_API_ACCESS_KEY_ID_IS_ALREADY_IN_USE": "Aliyun SMS API Access Key ID is Already in Use", - "API.ALIYUN_SMS_API_NOT_FOUND": "Aliyun SMS API Not Found", "API.BAD_REQUEST": "Bad request", "API.CANNOT_SET_EXISTING_SUBMETER_AS_MASTER_METER": "Cannot set existing submeter as master meter", "API.COMBINED_EQUIPMENT_EQUIPMENT_RELATION_EXISTS": "Combined equipment equipment relation exists", @@ -1946,12 +1928,6 @@ const resources = { "API.INVALID_ADDRESS": "Invalid address", "API.INVALID_ADDRESS_VALUE": "Invalid address value", "API.INVALID_ADVANCED_REPORT_ID": "Invalid advanced report id", - "API.INVALID_ALIYUN_SMS_API_ACCESS_KEY_ID": "Invalid Aliyun SMS API Access Key ID", - "API.INVALID_ALIYUN_SMS_API_ACCESS_KEY_SECRET": "Invalid Aliyun SMS API Access Key Secret", - "API.INVALID_ALIYUN_SMS_API_ENDPOINT": "Invalid Aliyun SMS API Endpoint", - "API.INVALID_ALIYUN_SMS_API_ID": "Invalid Aliyun SMS API ID", - "API.INVALID_ALIYUN_SMS_API_SIGN_NAME": "Invalid Aliyun SMS API Sign Name", - "API.INVALID_ALIYUN_SMS_API_TEMPLATE_CODE": "Invalid Aliyun SMS API Template Code", "API.INVALID_AREA_VALUE": "Invalid area value", "API.INVALID_BASE_PERIOD_END_DATETIME": "Invalid base period end datetime", "API.INVALID_BASE_PERIOD_START_DATETIME": "Invalid base period start datetime",