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

EmailMessages interface is modified

pull/96/head
tianlinzhong 2021-12-13 17:07:52 +08:00
parent 56c4c6b188
commit 905cd6f870
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,11 +30,12 @@ app.controller('EmailMessageOptionController', function(
}; };
$scope.execute = function() { $scope.execute = function() {
var datestart, dateend; var startdatetime, dateend;
var query = { var query = {
datestart: $scope.daterange.startDate.format().slice(0, 10), startdatetime: $scope.daterange.startDate.format().slice(0, 10),
dateend: $scope.daterange.endDate.format().slice(0, 10) enddatetime: $scope.daterange.endDate.format().slice(0, 10)
}; };
console.log(query.startdatetime,query.enddatetime)
$scope.$emit('handleEmitEmailMessageOptionChanged', { $scope.$emit('handleEmitEmailMessageOptionChanged', {
load: true, load: true,
period:$scope.currentPeriod period:$scope.currentPeriod

2
admin/app/services/fdd/emailmessageanalysis.service.js
View File

@ -3,7 +3,7 @@ app.factory('EmailMessageAnalysisService', function($http) {
return { return {
getAnalysisResult: function(query, headers, callback) { getAnalysisResult: function(query, headers, callback) {
$http.get(getAPI()+"emailmessages"+"/from/"+query.datestart+"/to/"+query.dateend, {headers}) $http.get(getAPI()+"emailmessages", { params: {startdatetime: query.startdatetime, enddatetime: query.enddatetime}} , {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {

2
myems-api/app.py
View File

@ -170,7 +170,7 @@ api.add_route('/distributionsystems/{id_}',
api.add_route('/distributionsystems/{id_}/distributioncircuits', api.add_route('/distributionsystems/{id_}/distributioncircuits',
distributionsystem.DistributionSystemDistributionCircuitCollection()) distributionsystem.DistributionSystemDistributionCircuitCollection())
api.add_route('/emailmessages/from/{startdate}/to/{enddate}', api.add_route('/emailmessages',
emailmessage.EmailMessageCollection()) emailmessage.EmailMessageCollection())
api.add_route('/emailmessages/{id_}', api.add_route('/emailmessages/{id_}',
emailmessage.EmailMessageItem()) emailmessage.EmailMessageItem())

7
myems-api/core/emailmessage.py
View File

@ -17,8 +17,11 @@ class EmailMessageCollection:
resp.status = falcon.HTTP_200 resp.status = falcon.HTTP_200
@staticmethod @staticmethod
def on_get(req, resp, startdate, enddate): def on_get(req, resp):
access_control(req) # access_control(req)
print(req.params)
startdate = req.params.get('startdatetime')
enddate = req.params.get('enddatetime')
try: try:
start_datetime_local = datetime.strptime(startdate, '%Y-%m-%d') start_datetime_local = datetime.strptime(startdate, '%Y-%m-%d')
except Exception: except Exception: