merge heihedata branch from r3921 to r3924

2013-09-26 10:40:36 +00:00 · 2013-09-26 10:40:36 +00:00 · b854b5cb53
parent 3dc9186923
commit b854b5cb53
1 changed files with 4 additions and 3 deletions
--- a/application/admin/controllers/DownController.php
+++ b/application/admin/controllers/DownController.php
@ -548,8 +548,9 @@ class Admin_DownController extends Zend_Controller_Action
 				}
 				
 				//如果是wsn数据则生成数据
-				$dataservice = new DataService();
-				@$dataservice->makeWsnData();
+				//wsn数据在ftp服务器端进行处理
+				/*$dataservice = new DataService();
+				@$dataservice->makeWsnData();*/
 				
 				$sql="update dataorder set status=5,ts_approved=now()  where offlineappid=?";
 				$this->db->query($sql,array($finish));