From aaea4d3c55b14528b0c15f06a349fac14dea90a0 Mon Sep 17 00:00:00 2001
From: weiye <jingwk@greatld.com>
Date: Wed, 15 Jan 2020 17:37:39 +0800
Subject: [PATCH] =?UTF-8?q?hive=E6=9E=84=E5=BB=BAjson=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datax/admin/tool/datax/DataxJsonHelper.java  | 16 ++++++++--------
 .../admin/tool/datax/reader/HiveReader.java      |  2 +-
 .../admin/tool/datax/writer/HiveWriter.java      |  2 +-
 .../datax/admin/tool/pojo/DataxHivePojo.java     |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/DataxJsonHelper.java b/datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/DataxJsonHelper.java
index 24f8b4b7..27b91a24 100644
--- a/datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/DataxJsonHelper.java
+++ b/datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/DataxJsonHelper.java
@@ -179,13 +179,13 @@ public class DataxJsonHelper implements DataxJsonInterface {
     public Map<String, Object> buildHiveReader() {
         DataxHivePojo dataxHivePojo = new DataxHivePojo();
         dataxHivePojo.setJdbcDatasource(readerDatasource);
-        List<Map<String, String>> columns = Lists.newArrayList();
-        readerColumns.forEach(c -> {
-            Map<String, String> column = Maps.newLinkedHashMap();
-            column.put("name", c.split(Constant.SPLIT_SCOLON)[0]);
-            column.put("type", c.split(Constant.SPLIT_SCOLON)[1]);
+        List<Map<String, Object>> columns = Lists.newArrayList();
+        for(int i=0;i<readerColumns.size();i++){
+            Map<String, Object> column = Maps.newLinkedHashMap();
+            column.put("index", i);
+            column.put("type", readerColumns.get(i).split(Constant.SPLIT_SCOLON)[1]);
             columns.add(column);
-        });
+        }
         dataxHivePojo.setColumns(columns);
         dataxHivePojo.setReaderDefaultFS(hiveReaderDto.getReaderDefaultFS());
         dataxHivePojo.setReaderFieldDelimiter(hiveReaderDto.getReaderFieldDelimiter());
@@ -208,9 +208,9 @@ public class DataxJsonHelper implements DataxJsonInterface {
     public Map<String, Object> buildHiveWriter() {
         DataxHivePojo dataxHivePojo = new DataxHivePojo();
         dataxHivePojo.setJdbcDatasource(writerDatasource);
-        List<Map<String, String>> columns = Lists.newArrayList();
+        List<Map<String, Object>> columns = Lists.newArrayList();
         writerColumns.forEach(c -> {
-            Map<String, String> column = Maps.newLinkedHashMap();
+            Map<String, Object> column = Maps.newLinkedHashMap();
             column.put("name", c.split(Constant.SPLIT_SCOLON)[0]);
             column.put("type", c.split(Constant.SPLIT_SCOLON)[1]);
             columns.add(column);
diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/reader/HiveReader.java b/datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/reader/HiveReader.java
index 1c87d40b..95828d61 100644
--- a/datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/reader/HiveReader.java
+++ b/datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/reader/HiveReader.java
@@ -15,7 +15,7 @@ import java.util.Map;
 public class HiveReader extends BaseReaderPlugin implements DataxReaderInterface {
     @Override
     public String getName() {
-        return "hivereader";
+        return "hdfsreader";
     }
 
     @Override
diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/writer/HiveWriter.java b/datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/writer/HiveWriter.java
index 3a596e7f..20e9673d 100644
--- a/datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/writer/HiveWriter.java
+++ b/datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/writer/HiveWriter.java
@@ -15,7 +15,7 @@ import java.util.Map;
 public class HiveWriter extends BaseWriterPlugin implements DataxWriterInterface {
     @Override
     public String getName() {
-        return "hivewriter";
+        return "hdfswriter";
     }
 
 
diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/tool/pojo/DataxHivePojo.java b/datax-admin/src/main/java/com/wugui/datax/admin/tool/pojo/DataxHivePojo.java
index cd015538..ecb1daf2 100644
--- a/datax-admin/src/main/java/com/wugui/datax/admin/tool/pojo/DataxHivePojo.java
+++ b/datax-admin/src/main/java/com/wugui/datax/admin/tool/pojo/DataxHivePojo.java
@@ -20,7 +20,7 @@ public class DataxHivePojo {
     /**
      * hive列名
      */
-    private List<Map<String,String>> columns;
+    private List<Map<String,Object>> columns;
 
     /**
      * 数据源信息