From 905cd6f870692d6c21d79ce05e5656f9cd505d48 Mon Sep 17 00:00:00 2001
From: tianlinzhong <673359306@qq.com>
Date: Mon, 13 Dec 2021 17:07:52 +0800
Subject: [PATCH] EmailMessages interface is modified

---
 .../fdd/emailmessage/emailmessageoption.controller.js      | 7 ++++---
 admin/app/services/fdd/emailmessageanalysis.service.js     | 2 +-
 myems-api/app.py                                           | 2 +-
 myems-api/core/emailmessage.py                             | 7 +++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js
index 06195354..98d7bc87 100644
--- a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js
+++ b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js
@@ -30,11 +30,12 @@ app.controller('EmailMessageOptionController', function(
 	};
 
 	$scope.execute = function() {
-		var datestart, dateend;
+		var startdatetime, dateend;
 		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, 10),
+			enddatetime: $scope.daterange.endDate.format().slice(0, 10)
 		};
+		console.log(query.startdatetime,query.enddatetime)
 		$scope.$emit('handleEmitEmailMessageOptionChanged', {
 			load: true,
 			period:$scope.currentPeriod
diff --git a/admin/app/services/fdd/emailmessageanalysis.service.js b/admin/app/services/fdd/emailmessageanalysis.service.js
index be596a7a..3f81cb6e 100644
--- a/admin/app/services/fdd/emailmessageanalysis.service.js
+++ b/admin/app/services/fdd/emailmessageanalysis.service.js
@@ -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", { params: {startdatetime: query.startdatetime, enddatetime: query.enddatetime}} , {headers})
             .then(function (response) {
                 callback(response);
             }, function (response) {
diff --git a/myems-api/app.py b/myems-api/app.py
index abadcf81..e54d4210 100644
--- a/myems-api/app.py
+++ b/myems-api/app.py
@@ -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())
diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py
index eab41ee5..73bd3cce 100644
--- a/myems-api/core/emailmessage.py
+++ b/myems-api/core/emailmessage.py
@@ -17,8 +17,11 @@ class EmailMessageCollection:
         resp.status = falcon.HTTP_200
 
     @staticmethod
-    def on_get(req, resp, startdate, enddate):
-        access_control(req)
+    def on_get(req, resp):
+        # access_control(req)
+        print(req.params)
+        startdate = req.params.get('startdatetime')
+        enddate = req.params.get('enddatetime')
         try:
             start_datetime_local = datetime.strptime(startdate, '%Y-%m-%d')
         except Exception: