seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated get messages by date range in admin and api

pull/102/MERGE
13621160019@163.com 2021-12-20 21:15:26 +08:00
parent 3045e8d4f0
commit 907a582c48
19 changed files with 82 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
admin/app/config.router.js
View File

@ -49,7 +49,7 @@ app
serie: true,
files: [
'app/services/login/login.service.js',
'app/services/fdd/webmessageanalysis.service.js',
'app/services/fdd/webmessage.service.js',
'app/services/users/user/user.service.js',
'app/controllers/users/user/user.controller.js',
'app/controllers/login/login.controller.js'
@ -141,7 +141,7 @@ app
}, {
serie: true,
files: [
'app/services/fdd/textmessageanalysis.service.js',
'app/services/fdd/textmessage.service.js',
'app/controllers/fdd/textmessage/textmessage.controller.js',
'app/controllers/fdd/textmessage/textmessagemaster.controller.js',
'app/controllers/fdd/textmessage/textmessageoption.controller.js'
@ -185,7 +185,7 @@ app
}, {
serie: true,
files: [
'app/services/fdd/emailmessageanalysis.service.js',
'app/services/fdd/emailmessage.service.js',
'app/controllers/fdd/emailmessage/emailmessage.controller.js',
'app/controllers/fdd/emailmessage/emailmessagemaster.controller.js',
'app/controllers/fdd/emailmessage/emailmessageoption.controller.js'
@ -229,7 +229,7 @@ app
}, {
serie: true,
files: [
'app/services/fdd/webmessageanalysis.service.js',
'app/services/fdd/webmessage.service.js',
'app/controllers/fdd/webmessage/webmessage.controller.js',
'app/controllers/fdd/webmessage/webmessagemaster.controller.js',
'app/controllers/fdd/webmessage/webmessageoption.controller.js'
@ -273,7 +273,7 @@ app
}, {
serie: true,
files: [
'app/services/fdd/wechatmessageanalysis.service.js',
'app/services/fdd/wechatmessage.service.js',
'app/controllers/fdd/wechatmessage/wechatmessage.controller.js',
'app/controllers/fdd/wechatmessage/wechatmessagemaster.controller.js',
'app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js'
@ -299,7 +299,7 @@ app
serie: true,
files: [
'app/services/login/login.service.js',
'app/services/fdd/webmessageanalysis.service.js',
'app/services/fdd/webmessage.service.js',
'app/services/users/user/user.service.js',
'app/controllers/users/user/user.controller.js',
'app/controllers/login/login.controller.js'
@ -1108,7 +1108,7 @@ app
serie: true,
files: [
'app/services/login/login.service.js',
'app/services/fdd/webmessageanalysis.service.js',
'app/services/fdd/webmessage.service.js',
'app/services/users/user/user.service.js',
'app/controllers/users/user/user.controller.js',
'app/controllers/login/login.controller.js'
@ -1213,7 +1213,7 @@ app
serie: true,
files: [
'app/services/login/login.service.js',
'app/services/fdd/webmessageanalysis.service.js',
'app/services/fdd/webmessage.service.js',
'app/services/users/user/user.service.js',
'app/controllers/users/user/user.controller.js',
'app/controllers/login/login.controller.js'

4
admin/app/controllers/fdd/emailmessage/emailmessage.controller.js
View File

@ -5,7 +5,7 @@ app.controller('EmailMessageController', function(
$window,
$timeout,
$translate,
EmailMessageAnalysisService,
EmailMessageService,
toaster,
SweetAlert) {
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
@ -40,7 +40,7 @@ app.controller('EmailMessageController', function(
function(isConfirm) {
if (isConfirm) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
EmailMessageAnalysisService.deleteEmailMessage(emailmessage, headers, function(response) {
EmailMessageService.deleteEmailMessage(emailmessage, headers, function(response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

4
admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js
View File

@ -4,7 +4,7 @@ app.controller('EmailMessageOptionController', function(
$scope,
$window,
$timeout,
EmailMessageAnalysisService) {
EmailMessageService) {
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.daterange = {
startDate: moment().subtract(7,'days'),
@ -41,7 +41,7 @@ app.controller('EmailMessageOptionController', function(
period:$scope.currentPeriod
});
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
EmailMessageAnalysisService.getAnalysisResult(query, headers, function(response) {
EmailMessageService.getResult(query, headers, function(response) {
if (angular.isDefined(response.status) && response.status === 200) {
$scope.$emit('handleEmitEmailMessageOptionChanged', response.data);
}

4
admin/app/controllers/fdd/textmessage/textmessage.controller.js
View File

@ -5,7 +5,7 @@ app.controller('TextMessageController', function(
$window,
$timeout,
$translate,
TextMessageAnalysisService,
TextMessageService,
SweetAlert,
toaster) {
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
@ -39,7 +39,7 @@ app.controller('TextMessageController', function(
function(isConfirm) {
if (isConfirm) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
TextMessageAnalysisService.deleteTextMessage(textmessage, headers, function (response) {
TextMessageService.deleteTextMessage(textmessage, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

4
admin/app/controllers/fdd/textmessage/textmessageoption.controller.js
View File

@ -4,7 +4,7 @@ app.controller('TextMessageOptionController', function(
$scope,
$window,
$timeout,
TextMessageAnalysisService) {
TextMessageService) {
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.daterange = {
startDate: moment().subtract(7,'days'),
@ -41,7 +41,7 @@ app.controller('TextMessageOptionController', function(
});
console.log(query)
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
TextMessageAnalysisService.getAnalysisResult(query, headers, function (response) {
TextMessageService.getResult(query, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
$scope.$emit('handleEmitTextMessageOptionChanged', response.data);
}

6
admin/app/controllers/fdd/webmessage/webmessage.controller.js
View File

@ -6,7 +6,7 @@ app.controller('WebMessageController', function(
$timeout,
$translate,
$uibModal,
WebMessageAnalysisService,
WebMessageService,
toaster,
SweetAlert) {
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
@ -42,7 +42,7 @@ app.controller('WebMessageController', function(
modalInstance.result.then(function(modifiedWebmessage) {
modifiedWebmessage.status = "acknowledged";
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
WebMessageAnalysisService.editWebMessage(modifiedWebmessage, headers, function (response) {
WebMessageService.editWebMessage(modifiedWebmessage, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
toaster.pop({
type: "success",
@ -81,7 +81,7 @@ app.controller('WebMessageController', function(
function(isConfirm) {
if (isConfirm) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
WebMessageAnalysisService.deleteWebMessage(webmessage, headers, function (response) {
WebMessageService.deleteWebMessage(webmessage, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

10
admin/app/controllers/fdd/webmessage/webmessageoption.controller.js
View File

@ -4,7 +4,7 @@ app.controller('WebMessageOptionController', function(
$scope,
$window,
$timeout,
WebMessageAnalysisService) {
WebMessageService) {
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.daterange = {
startDate: moment().subtract(7,'days'),
@ -41,10 +41,10 @@ app.controller('WebMessageOptionController', function(
});
console.log(query)
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
WebMessageAnalysisService.getAnalysisResult(query, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
$scope.$emit('handleEmitWebMessageOptionChanged', response.data);
}
WebMessageService.getResult(query, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
$scope.$emit('handleEmitWebMessageOptionChanged', response.data);
}
});
};

4
admin/app/controllers/fdd/wechatmessage/wechatmessage.controller.js
View File

@ -5,7 +5,7 @@ app.controller('WechatMessageController', function(
$window,
$timeout,
$translate,
WechatMessageAnalysisService,
WechatMessageService,
toaster,
SweetAlert) {
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
@ -39,7 +39,7 @@ app.controller('WechatMessageController', function(
function(isConfirm) {
if (isConfirm) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
WechatMessageAnalysisService.deleteWechatMessage(wechatmessage, headers, function (response) {
WechatMessageService.deleteWechatMessage(wechatmessage, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

4
admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js
View File

@ -4,7 +4,7 @@ app.controller('WechatMessageOptionController', function(
$scope,
$window,
$timeout,
WechatMessageAnalysisService) {
WechatMessageService) {
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.daterange = {
startDate: moment().subtract(7,'days'),
@ -41,7 +41,7 @@ app.controller('WechatMessageOptionController', function(
});
console.log(query)
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
WechatMessageAnalysisService.getAnalysisResult(query, headers, function (response) {
WechatMessageService.getResult(query, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
$scope.$emit('handleEmitWechatMessageOptionChanged', response.data);
}

4
admin/app/controllers/login/login.controller.js
View File

@ -10,7 +10,7 @@ app.controller('LoginController', function (
$interval,
LoginService,
UserService,
WebMessageAnalysisService,
WebMessageService,
toaster) {
$scope.dataLoading = false;
@ -202,7 +202,7 @@ app.controller('LoginController', function (
$scope.getWebMessage = function () {
if ($scope.cur_user != null && $scope.cur_user.uuid != null && $scope.cur_user.token != null) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
WebMessageAnalysisService.getStatusNewResult(headers, function (response) {
WebMessageService.getStatusNewResult(headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
$scope.webmessages = response.data;
}

5
admin/app/services/fdd/emailmessageanalysis.service.js → admin/app/services/fdd/emailmessage.service.js
View File

@ -1,8 +1,7 @@
'use strict';
app.factory('EmailMessageAnalysisService', function($http) {
app.factory('EmailMessageService', function($http) {
return {
getAnalysisResult: function(query, headers, callback) {
getResult: function(query, headers, callback) {
$http.get(getAPI()+"emailmessages?" + 'startdatetime=' + query.startdatetime + '&enddatetime=' + query.enddatetime, {headers})
.then(function (response) {
callback(response);

5
admin/app/services/fdd/textmessageanalysis.service.js → admin/app/services/fdd/textmessage.service.js
View File

@ -1,8 +1,7 @@
'use strict';
app.factory('TextMessageAnalysisService', function($http) {
app.factory('TextMessageService', function($http) {
return {
getAnalysisResult: function(query, headers, callback) {
getResult: function(query, headers, callback) {
$http.get(getAPI()+"textmessages?" + 'startdatetime=' + query.startdatetime + '&enddatetime=' + query.enddatetime, {headers})
.then(function (response) {
callback(response);

5
admin/app/services/fdd/webmessageanalysis.service.js → admin/app/services/fdd/webmessage.service.js
View File

@ -1,8 +1,7 @@
'use strict';
app.factory('WebMessageAnalysisService', function($http) {
app.factory('WebMessageService', function($http) {
return {
getAnalysisResult: function(query, headers, callback) {
getResult: function(query, headers, callback) {
$http.get(getAPI()+"webmessages?" + "startdatetime=" + query.startdatetime + "&enddatetime=" + query.enddatetime, {headers})
.then(function (response) {
callback(response);

4
admin/app/services/fdd/wechatmessageanalysis.service.js → admin/app/services/fdd/wechatmessage.service.js
View File

@ -1,7 +1,7 @@
'use strict';
app.factory('WechatMessageAnalysisService', function($http) {
app.factory('WechatMessageService', function($http) {
return {
getAnalysisResult: function(query, headers, callback) {
getResult: function(query, headers, callback) {
$http.get(getAPI()+"wechatmessages?" + 'startdatetime=' + query.startdatetime + '&enddatetime=' + query.enddatetime, {headers})
.then(function (response) {
callback(response);

58
myems-api/MyEMS.postman_collection.json
View File

@ -8795,24 +8795,28 @@
},
{
"key": "Token",
"value": "24bb236244f26784fb1397344d926b4871e87a90096eae926a0e448396dbd3ff4a2f70f727089f025238cb47bdbccdc877ef4a50fad8f05a4e5100c5d3eb0d3c",
"value": "9ac434f394c735092cfeb083612e533ca33ca6db4815ebb0c3ff47896d7eaa610e7dc312c04279253f817d65d1ef379378d4a5d07150faee5f6d899adb8b7ca7",
"type": "text",
"description": "Login to get a valid token"
}
],
"url": {
"raw": "{{base_url}}/textmessages/from/2021-12-01/to/2021-12-31",
"raw": "{{base_url}}/textmessages?startdatetime=2021-12-11T00:00:00&enddatetime=2021-12-21T00:00:00",
"host": [
"{{base_url}}"
],
"path": [
"textmessages",
"from",
"2021-12-01",
"to",
"2021-12-31"
"textmessages"
],
"query": [
{
"key": "startdatetime",
"value": "2021-12-11T00:00:00"
},
{
"key": "enddatetime",
"value": "2021-12-21T00:00:00"
},
{
"key": null,
"value": "",
@ -9035,7 +9039,7 @@
},
{
"key": "Token",
"value": "6c32302cb46cae4236fe9d04ccb21f950bce593267f33dc169e700bb98ea5c3446521251a1b4078ebcbe51b4ca4ba59ac01b395e0f69ef42fa0bc36d6bd5683c",
"value": "9ac434f394c735092cfeb083612e533ca33ca6db4815ebb0c3ff47896d7eaa610e7dc312c04279253f817d65d1ef379378d4a5d07150faee5f6d899adb8b7ca7",
"description": "Login to get a valid token",
"type": "text"
}
@ -9068,7 +9072,7 @@
},
{
"key": "Token",
"value": "b422ef869a947eb8dd058f5c9464b11769db7be3232b327fb8a4edac28118df876a5d7d3ab1d8175ef81169126d01fbe3b38baa6da62edf4cbf49b2bef0ed9a7",
"value": "9ac434f394c735092cfeb083612e533ca33ca6db4815ebb0c3ff47896d7eaa610e7dc312c04279253f817d65d1ef379378d4a5d07150faee5f6d899adb8b7ca7",
"description": "Login to get a valid token",
"type": "text"
}
@ -9532,24 +9536,28 @@
},
{
"key": "Token",
"value": "24bb236244f26784fb1397344d926b4871e87a90096eae926a0e448396dbd3ff4a2f70f727089f025238cb47bdbccdc877ef4a50fad8f05a4e5100c5d3eb0d3c",
"value": "9ac434f394c735092cfeb083612e533ca33ca6db4815ebb0c3ff47896d7eaa610e7dc312c04279253f817d65d1ef379378d4a5d07150faee5f6d899adb8b7ca7",
"type": "text",
"description": "Login to get a valid token"
}
],
"url": {
"raw": "{{base_url}}/webmessages/from/2021-12-01/to/2021-12-31",
"raw": "{{base_url}}/webmessages?startdatetime=2021-12-11T00:00:00&enddatetime=2021-12-21T00:00:00",
"host": [
"{{base_url}}"
],
"path": [
"webmessages",
"from",
"2021-12-01",
"to",
"2021-12-31"
"webmessages"
],
"query": [
{
"key": "startdatetime",
"value": "2021-12-11T00:00:00"
},
{
"key": "enddatetime",
"value": "2021-12-21T00:00:00"
},
{
"key": null,
"value": "",
@ -9742,28 +9750,32 @@
},
{
"key": "Token",
"value": "14f2bb7378e6926c20b54bd48bd8618e4d78ece1f1658c946a7257eaa97d3149ecd6407a62a39f0f3a6ef6b65f19d63894f297ad5a58d7b597a547f8b8e2898c",
"value": "9ac434f394c735092cfeb083612e533ca33ca6db4815ebb0c3ff47896d7eaa610e7dc312c04279253f817d65d1ef379378d4a5d07150faee5f6d899adb8b7ca7",
"type": "text",
"description": "Login to get a valid token"
}
],
"url": {
"raw": "{{base_url}}/wechatmessages/from/2021-12-01/to/2021-12-31",
"raw": "{{base_url}}/wechatmessages?startdatetime=2021-12-11T00:00:00&enddatetime=2021-12-21T00:00:00",
"host": [
"{{base_url}}"
],
"path": [
"wechatmessages",
"from",
"2021-12-01",
"to",
"2021-12-31"
"wechatmessages"
],
"query": [
{
"key": null,
"value": "",
"disabled": true
},
{
"key": "startdatetime",
"value": "2021-12-11T00:00:00"
},
{
"key": "enddatetime",
"value": "2021-12-21T00:00:00"
}
]
}

16
myems-api/README.md
View File

@ -506,9 +506,9 @@ Result in JSON
```bash
curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/emailmessages/{id}
```
* GET Email Messages by Datetime Range
* GET Email Messages by Datetime Range
```bash
curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/emailmessages?startdatetime=2021-10-01T00:00:00&enddatetime=2021-10-11T00:00:00
curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/emailmessages?startdatetime={startdatetime}&enddatetime={enddatetime}
```
* DELETE an Email Message by ID
```bash
@ -1955,9 +1955,9 @@ Result in JSON
```bash
curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/textmessages/{id}
```
* GET Text Messages by Date Range
* GET Text Messages by Datetime Range
```bash
curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/textmessages/from/{startdate}/to/{enddate}
curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/textmessages?startdatetime={startdatetime}&enddatetime={enddatetime}
```
* DELETE Text Message by ID
```bash
@ -2088,9 +2088,9 @@ Result in JSON
```bash
curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/webmessages/{id}
```
* GET Web Messages from Startdate to Enddate
* GET Web Messages by Datetime Range
```bash
curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/webmessages/from/{startdate}/to/{enddate}
curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/webmessages?startdatetime={startdatetime}&enddatetime={enddatetime}
```
* GET New Web Messages
```bash
@ -2120,9 +2120,9 @@ Result in JSON
```bash
curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/wechatmessages/{id}
```
* GET Wechat Messages from Startdate to Enddate
* GET Wechat Messages by Datetime Range
```bash
curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/wechatmessages/from/{startdate}/to/{enddate}
curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/wechatmessages?startdatetime={startdatetime}&enddatetime={enddatetime}
```
* DELETE Wechat Message by ID
```bash

1
myems-api/core/textmessage.py
View File

@ -20,7 +20,6 @@ class TextMessageCollection:
def on_get(req, resp):
access_control(req)
print(req.params)
start_datetime_local = req.params.get('startdatetime')
end_datetime_local = req.params.get('enddatetime')

2
myems-api/core/webmessage.py
View File

@ -18,7 +18,7 @@ class WebMessageCollection:
@staticmethod
def on_get(req, resp):
print(req.params)
start_datetime_local = req.params.get('startdatetime')
end_datetime_local = req.params.get('enddatetime')

1
myems-api/core/wechatmessage.py
View File

@ -20,7 +20,6 @@ class WechatMessageCollection(object):
def on_get(req, resp):
access_control(req)
print(req.params)
start_datetime_local = req.params.get('startdatetime')
end_datetime_local = req.params.get('enddatetime')