Modified the TextMessages webmessage wechatmessage interface

admin/app/controllers/fdd/textmessage/textmessageoption.controller.js

@@ -30,15 +30,16 @@ app.controller('TextMessageOptionController', function(
 	};
 
 	$scope.execute = function() {
-		var datestart,dateend;
+		var startdatetime, enddatetime;
 		var query = {
-			datestart: $scope.daterange.startDate.format().slice(0, 10),
+			startdatetime: $scope.daterange.startDate.format().slice(0, 19),
-			dateend: $scope.daterange.endDate.format().slice(0, 10)
+			enddatetime: $scope.daterange.endDate.format().slice(0, 19)
 		};
 		$scope.$emit('handleEmitTextMessageOptionChanged', {
 			load: true,
 			period:$scope.currentPeriod
 		});
+		console.log(query)
         let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
 		TextMessageAnalysisService.getAnalysisResult(query, headers, function (response) {
 			if (angular.isDefined(response.status) && response.status === 200) {

admin/app/controllers/fdd/webmessage/webmessageoption.controller.js

@@ -30,14 +30,16 @@ app.controller('WebMessageOptionController', function(
 	};
 
 	$scope.execute = function() {
+		var startdatetime, enddatetime;
 		var query = {
-			datestart: $scope.daterange.startDate.format().slice(0, 10),
+			startdatetime: $scope.daterange.startDate.format().slice(0, 19),
-			dateend: $scope.daterange.endDate.format().slice(0, 10)
+			enddatetime: $scope.daterange.endDate.format().slice(0, 19)
 		};
 		$scope.$emit('handleEmitWebMessageOptionChanged', {
 			load: true,
 			period:$scope.currentPeriod
 		});
+		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) {

admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js

@@ -30,14 +30,16 @@ app.controller('WechatMessageOptionController', function(
 	};
 
 	$scope.execute = function() {
+		var startdatetime, enddatetime;
 		var query = {
-			datestart: $scope.daterange.startDate.format().slice(0, 10),
+			startdatetime: $scope.daterange.startDate.format().slice(0, 19),
-			dateend: $scope.daterange.endDate.format().slice(0, 10)
+			enddatetime: $scope.daterange.endDate.format().slice(0, 19)
 		};
 		$scope.$emit('handleEmitWechatMessageOptionChanged', {
 			load: true,
 			period:$scope.currentPeriod
 		});
+		console.log(query)
         let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
 		WechatMessageAnalysisService.getAnalysisResult(query, headers, function (response) {
 			if (angular.isDefined(response.status) && response.status === 200) {

admin/app/services/fdd/textmessageanalysis.service.js

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

admin/app/services/fdd/webmessageanalysis.service.js

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

admin/app/services/fdd/wechatmessageanalysis.service.js

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

myems-api/app.py

@@ -442,7 +442,7 @@ api.add_route('/tenanttypes',
 api.add_route('/tenanttypes/{id_}',
               tenanttype.TenantTypeItem())
 
-api.add_route('/textmessages/from/{startdate}/to/{enddate}',
+api.add_route('/textmessages',
               textmessage.TextMessageCollection())
 api.add_route('/textmessages/{id_}',
               textmessage.TextMessageItem())
@@ -472,14 +472,14 @@ api.add_route('/virtualmeters',
 api.add_route('/virtualmeters/{id_}',
               virtualmeter.VirtualMeterItem())
 
-api.add_route('/webmessages/from/{startdate}/to/{enddate}',
+api.add_route('/webmessages',
               webmessage.WebMessageCollection())
 api.add_route('/webmessagesnew',
               webmessage.WebMessageStatusNewCollection())
 api.add_route('/webmessages/{id_}',
               webmessage.WebMessageItem())
 
-api.add_route('/wechatmessages/from/{startdate}/to/{enddate}',
+api.add_route('/wechatmessages',
               wechatmessage.WechatMessageCollection())
 api.add_route('/wechatmessages/{id_}',
               wechatmessage.WechatMessageItem())