perfection the data-import functions

application/admin/controllers/DataController.php

@@ -4265,8 +4265,8 @@ class Admin_DataController extends Zend_Controller_Action
 			return true;
 		}
 
-		//检查能否写入数据表
+		//检查能否写入数据表 和 导入数据
-		if($ac == "checktables"){
+		if($ac == "checktables" || $ac == "import"){
 			$this->_helper->layout->disableLayout();
 			$this->_helper->viewRenderer->setNoRender();
 
@@ -4278,9 +4278,6 @@ class Admin_DataController extends Zend_Controller_Action
 				return true;
 			}
 
-			$tableControl = new Visual\DataTableControl;
-			$fields = $tableControl->readFields($schema . "." .$table);
-
 			$fileHandle = new Dataimport\File;
 			$realFile = $fileHandle->getRealName($file);
 
@@ -4288,13 +4285,25 @@ class Admin_DataController extends Zend_Controller_Action
 			/** @var \Westdc\Dataimport\Processing\Csv $processing */
 			$processing->init($realFile);
 
+			if($ac == "checktables")
+			{
+				$tableControl = new Visual\DataTableControl;
+				$fields = $tableControl->readFields($schema . "." .$table);
+
 				$status = $processing->checkTableField($fields);
-
+				$this->_helper->json($status);
-			//$this->_helper->json($status);
-
 				return true;
 			}
 
+			elseif($ac == "import"){
+				$status = $processing->import($schema . "." .$table);
+				$this->_helper->json($status);
+				return true;
+			}
+			return true;
+
+		}
+
 		return true;
 	}//dataimportAction()
 	

application/admin/views/scripts/data/dataimport-target.phtml

@@ -41,6 +41,8 @@ $this->headTitle()->setSeparator(' - ');
             <input type="hidden" name="schema" value="">
             <input type="hidden" name="table" value="" id="input-table">
             <button type="button" id="ctl-next" class="btn btn-success disabled" disabled>下一步</button>
+            <button type="button" id="ctl-show-table" class="btn btn-info hidden" disabled>查看数据表结构</button>
+            <button type="button" id="ctl-import" class="btn btn-info" disabled="disabled" style="display: none;">导入数据表</button>
         </form>
     </div>
 </div>
@@ -51,6 +53,45 @@ $this->headTitle()->setSeparator(' - ');
             ctl.checkTable();
         });
 
+        $("#ctl-show-table").click(function(){
+
+        });
+
+        $("#ctl-import").click(function(){
+            $.ajax({
+                'type':"POST",
+                'url':'/admin/data/dataimport/ac/import',
+                'data':$('#schema-form').serialize(),
+                'success':function(data){
+
+                    if (data!=true)
+                    {
+                        if(!$.isEmptyObject(data))
+                            $(".error-alerts").show();
+                        $("#errors").html(data.join("<br />"));
+                        return true;
+                    }else{
+                        $('#ctl-import').remove();
+                        $("#errors").html("数据导入成功！页面将自动跳转到数据可视化管理页面");
+                        setTimeout("top.location = '/admin/data/visual';",3000);
+                    }
+                },
+                'timeout': 30000,
+                'beforeSend' : function(){
+                    $('#error-loading').html("正在进行数据导入......");
+                    $('#error-loading').show();
+                    $('#ctl-import').attr('disabled','disabled');
+                },
+                'complete' : function(){
+                    $('#error-loading').hide();
+                },
+                'error' : function(){
+                    $('#ctl-import').removeAttr('disabled');
+                }
+
+            });
+        });
+
         $('.ctl-schema-btn').click(function(){
             $('#schema-form input[name=schema]').val($(this).val());
 
@@ -124,13 +165,23 @@ $this->headTitle()->setSeparator(' - ');
                 'url':'/admin/data/dataimport/ac/checktables',
                 'data':$('#schema-form').serialize(),
                 'success':function(data){
-                    if (data!=null)
+                    if (data!=true)
                     {
-
+                        if(!$.isEmptyObject(data))
+                        $(".error-alerts").show();
+                        $("#errors").html(data.join("<br />"));
                         return true;
-
                     }else{
-                        alert('处理中出现错误');
+                        $(".error-alerts").show();
+                        $('#errors').html('数据准备完成，可以进行导入操作');
+
+                        $('.ctl-schema-btn').attr("disabled","disabled");
+                        $('.ctl-table-name').attr("disabled","disabled");
+
+                        $('#ctl-next').hide();
+                        $('#ctl-show-table').hide();
+                        $('#ctl-import').show();
+                        $('#ctl-import').removeAttr("disabled");
                     }
                 },
                 'timeout': 30000,

application/module/Helpers/PDO.php

@@ -5,8 +5,6 @@ class PDO extends \PDO
 {
 	private $debug = 0;		//调试模式
 	
-	private $config_local_path = "config/autoload/local.php";
-	
 	public $db_cfg;
 	
 	function __construct($DSN = NULL)
@@ -14,7 +12,7 @@ class PDO extends \PDO
 
 		if(empty($DSN))
 		{
-			$config_local = new Zend_Config(include $this->config_local_path);
+			$config_local = \Zend_Registry::get('config');
 			$dsn = "pgsql:host={$config_local->db->hostname};"
 					."port=5432;"
 					."dbname={$config_local->db->database};"

application/module/Westdc/Dataimport/AbstractProcessing.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: liujin834
+ * Date: 15-1-27
+ * Time: 下午2:37
+ */
+
+namespace Westdc\Dataimport;
+
+
+abstract class AbstractProcessing {
+
+    /**
+     * 获取判断数据类型的函数
+     * @param $pgsql_data_type
+     * @param $data
+     * @return null|string
+     */
+    public function checkFieldsDataType($pgsql_data_type,$data){
+
+        switch ($pgsql_data_type){
+            case "integer":
+            case "bigint":
+            case "int2vector":
+            case "real":
+            case "double precision":
+                return is_int($data) || is_float($data);
+            case "date":
+            case "char":
+            case "character varying":
+                return is_string($data);
+
+            default:
+                return FALSE;
+        }
+
+    }
+
+}

application/module/Westdc/Dataimport/File.php

@@ -44,7 +44,7 @@ class File{
 			}
 			
 			$ext = $this->getFileTextExt($file['name']);
-			$filename = $this->gen_uuid().".".$ext;
+			$filename = $file['name']."_".$this->gen_uuid().".".$ext;
 			
 			$new_filepath = $this->getSavePath().$filename;
 			

application/module/Westdc/Dataimport/Processing/Csv.php

@@ -8,9 +8,11 @@
 namespace Westdc\Dataimport\Processing;
 
 use Westdc\Dataimport\ProcessingInterface;
+use Westdc\Dataimport\AbstractProcessing;
 use Goodby\CSV as CSVOBJ;
+use Helpers\PDO;
 
-class Csv implements ProcessingInterface{
+class Csv extends AbstractProcessing implements ProcessingInterface{
 
     private $source_file;
     private $csv_object;
@@ -20,6 +22,8 @@ class Csv implements ProcessingInterface{
     const ERROR_INDEX_TYPE_DIFFERENT = "值的类型于上一行不同";
     const ERROR_EMPTY_FILE = "文件是空的";
     const ERROR_LINE_TITLE = "行:";
+    const ERROR_COLUMN_TITLE = "列:";
+    const ERROR_DATA_TYPE_NOT_MATCHED = "数据与数据库中的类型不匹配，不能进行导入";
 
     /**
      * 初始化
@@ -31,6 +35,10 @@ class Csv implements ProcessingInterface{
 
         $interpreter = new CSVOBJ\Import\Standard\Interpreter;
         $interpreter->addObserver(function($columns){
+            foreach($columns as $k=>$v){
+                if(is_numeric($v))
+                    $columns[$k] = $v+0;
+            }
             $this->csv_line_data[] = $columns;
         });
         $lexer = new CSVOBJ\Import\Standard\Lexer(new CSVOBJ\Import\Standard\LexerConfig);
@@ -61,7 +69,7 @@ class Csv implements ProcessingInterface{
             $size/=1024;
         }
         return (floor($size*100)/100).$type[$i];//floor是取整函数，为了防止出现一串的小数，这里取了两位小数
-    }//getSize()
+    }//getSize(){
 
     /**
      * 獲取文件類型
@@ -148,22 +156,64 @@ class Csv implements ProcessingInterface{
     {
         $error_stack = [];
 
-        $frist_line = $this->getLines()[0];
+        $first_line = $this->getLines()[0];
-        var_dump($fields);
 
         foreach($fields as $index => $field)
         {
-            if($field['data_type']){
+            $func = $this->checkFieldsDataType($field['data_type'],$first_line[$index]);
 
-            }
+            if($func)
+                continue;
+            else
+                $error_stack[] = self::ERROR_COLUMN_TITLE . $index .":" . self::ERROR_DATA_TYPE_NOT_MATCHED;
         }
 
-        if(0)
+        if(count($error_stack) < 1)
             return true;
         else
             return $error_stack;
+
     }
 
 
+    public function import($table)
+    {
+        $config = \Zend_Registry::get('config');
+        $db = new PDO([
+            'host' => $config->visual_db->hostname,
+            'port' => $config->visual_db->port,
+            'db' => $config->visual_db->database,
+            'user' => $config->visual_db->username,
+            'pwd' => $config->visual_db->password
+        ]);
+        $db->setAttribute(\PDO::ATTR_PERSISTENT,true);
 
+        $error_stack = [];
+        try{
+            $db->setAttribute(\PDO::ATTR_ERRMODE , \PDO::ERRMODE_EXCEPTION);
+            $db->beginTransaction();
+
+            $place_holder=[];
+
+            foreach($this->getLines()[0] as $v)
+            {
+                $place_holder[] = "?";
+            }
+
+            $sth = $db->prepare("INSERT INTO $table VALUES (".join(",",$place_holder).")");
+
+            foreach($this->getLines() as $line)
+            {
+                $sth->execute($line);
+            }
+
+            $db->commit();
+        }catch(\Exception $e){
+            $db->rollBack();
+            $error_stack[] = $e->getMessage();
+            return $error_stack;
+        }
+
+        return true;
+    }
 }