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

Merge branch 'PR' into develop

pull/100/head
13621160019@163.com 2021-12-17 22:34:37 +08:00
parent 01e894eaea 6e4fd34651
commit 1d1775a7aa
5 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,14 +11,14 @@ app.controller('EmailMessageOptionController', function(
endDate: moment()
};
$scope.dtOptions = {
timePicker: false,
timePicker: true,
timePicker24Hour: true,
timePickerIncrement: 1,
timePickerSeconds: true,
startView:2,
autoApply: true,
locale:{
format: 'YYYY-MM-DD',
format: 'YYYY-MM-DDTHH:mm:ss',
applyLabel: "OK",
cancelLabel: "Cancel",
},
@ -30,11 +30,12 @@ app.controller('EmailMessageOptionController', function(
};
$scope.execute = function() {
var datestart, dateend;
var startdatetime, enddatetime;
var query = {
datestart: $scope.daterange.startDate.format().slice(0, 10),
dateend: $scope.daterange.endDate.format().slice(0, 10)
startdatetime: $scope.daterange.startDate.format().slice(0, 19),
enddatetime: $scope.daterange.endDate.format().slice(0, 19)
};
$scope.$emit('handleEmitEmailMessageOptionChanged', {
load: true,
period:$scope.currentPeriod

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

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

4
admin/views/fdd/emailmessage.html
View File

@ -4,8 +4,8 @@
<form role="form">
<div class="form-group no-margin">
<label>{{'COMMON.DATE' | translate}}</label>
<textarea rows="1" date-range-picker class="form-control date-picker" type="text"
ng-model="daterange" options="dtOptions" readonly="" placeholder="请选择日期" />
<textarea rows="2" date-range-picker class="form-control date-picker" type="text"
ng-model="daterange" options="dtOptions" readonly="" />
</div>
</form>
</div>

2
myems-api/app.py
View File

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

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

@ -13,35 +13,45 @@ class EmailMessageCollection:
pass
@staticmethod
def on_options(req, resp, startdate, enddate):
def on_options(req, resp):
resp.status = falcon.HTTP_200
@staticmethod
def on_get(req, resp, startdate, enddate):
def on_get(req, resp):
access_control(req)
try:
start_datetime_local = datetime.strptime(startdate, '%Y-%m-%d')
except Exception:
raise falcon.HTTPError(falcon.HTTP_400,
title='API.BAD_REQUEST',
description='API.INVALID_START_DATE_FORMAT')
try:
end_datetime_local = datetime.strptime(enddate, '%Y-%m-%d')
except Exception:
raise falcon.HTTPError(falcon.HTTP_400,
title='API.BAD_REQUEST',
description='API.INVALID_END_DATE_FORMAT')
print(req.params)
start_datetime_local = req.params.get('startdatetime')
end_datetime_local = req.params.get('enddatetime')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
if config.utc_offset[0] == '-':
timezone_offset = -timezone_offset
start_datetime_utc = start_datetime_local.replace(tzinfo=timezone.utc)
start_datetime_utc -= timedelta(minutes=timezone_offset)
if start_datetime_local is None:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description="API.INVALID_START_DATETIME_FORMAT")
else:
start_datetime_local = str.strip(start_datetime_local)
try:
start_datetime_utc = datetime.strptime(start_datetime_local,
'%Y-%m-%dT%H:%M:%S').replace(tzinfo=timezone.utc) - \
timedelta(minutes=timezone_offset)
except ValueError:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description="API.INVALID_START_DATETIME_FORMAT")
end_datetime_utc = end_datetime_local.replace(tzinfo=timezone.utc)
end_datetime_utc -= timedelta(minutes=timezone_offset)
end_datetime_utc += timedelta(days=1)
if end_datetime_local is None:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description="API.INVALID_END_DATETIME_FORMAT")
else:
end_datetime_local = str.strip(end_datetime_local)
try:
end_datetime_utc = datetime.strptime(end_datetime_local,
'%Y-%m-%dT%H:%M:%S').replace(tzinfo=timezone.utc) - \
timedelta(minutes=timezone_offset)
except ValueError:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description="API.INVALID_END_DATETIME_FORMAT")
if start_datetime_utc >= end_datetime_utc:
raise falcon.HTTPError(falcon.HTTP_400,