去除hdfs类型数据源的sparkcube参数

MaTao008 · Feb 13, 2019 · e929715 · e929715
1 parent 4ff5f2b
commit e929715
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/dl-biz/src/main/java/com/ucar/datalink/biz/meta/MetaManager.java b/dl-biz/src/main/java/com/ucar/datalink/biz/meta/MetaManager.java
@@ -9,6 +9,7 @@
 import com.ucar.datalink.domain.meta.ColumnMeta;
 import com.ucar.datalink.domain.meta.MediaMeta;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -49,9 +50,10 @@ else if( info.getType()==MediaSourceType.HBASE ) {
         }
         else if( info.getType()==MediaSourceType.HDFS ) {
             //处理HDFS类型的元数据
-            List<MediaMeta> tables = HDFSUtil.getTables(info);
-            updateMediaMetaDBType(tables,MediaSourceType.HDFS);
-            return tables;
+//            List<MediaMeta> tables = HDFSUtil.getTables(info);
+//            updateMediaMetaDBType(tables,MediaSourceType.HDFS);
+//            return tables;
+            return new ArrayList<>();
         }
         else if( info.getType()==MediaSourceType.SDDL ) {
             //处理SDDL类型的元数据
@@ -89,8 +91,9 @@ else if( info.getType()==MediaSourceType.HBASE ) {
         }
         else if( info.getType()==MediaSourceType.HDFS ) {
             //处理HDFS类型的元数据列
-            List<ColumnMeta> list = HDFSUtil.getColumns(info, tableName);
-            return list;
+//            List<ColumnMeta> list = HDFSUtil.getColumns(info, tableName);
+//            return list;
+            return new ArrayList<>();
         }
         else if( info.getType()==MediaSourceType.SDDL ) {
             SddlMediaSrcParameter sddl = (SddlMediaSrcParameter)info.getParameterObj();

diff --git a/.../com/ucar/datalink/manager/core/web/controller/mediaSource/HDFSMediaSourceController.java b/.../com/ucar/datalink/manager/core/web/controller/mediaSource/HDFSMediaSourceController.java
@@ -67,7 +67,7 @@ public Page<HDFSMediaSourceView> initHDFSList(){
             view.getHdfsMediaSrcParameter().setNameNode2(((HDFSMediaSrcParameter) i.getParameterObj()).getNameNode2());
             view.getHdfsMediaSrcParameter().setHadoopUser(((HDFSMediaSrcParameter) i.getParameterObj()).getHadoopUser());
             view.getHdfsMediaSrcParameter().setZkMediaSourceId(((HDFSMediaSrcParameter) i.getParameterObj()).getZkMediaSourceId());
-            view.getHdfsMediaSrcParameter().setSparkcubeAddress(((HDFSMediaSrcParameter) i.getParameterObj()).getSparkcubeAddress());
+//            view.getHdfsMediaSrcParameter().setSparkcubeAddress(((HDFSMediaSrcParameter) i.getParameterObj()).getSparkcubeAddress());
             MediaSourceInfo zk = mediaSourceService.getById(view.getHdfsMediaSrcParameter().getZkMediaSourceId());
             if (zk != null) {
                 view.setZkMediaSourceName(zk.getName());

diff --git a/dl-manager/dl-manager-core/src/main/resources/webapp/WEB-INF/jsp/hdfsMediaSource/add.jsp b/dl-manager/dl-manager-core/src/main/resources/webapp/WEB-INF/jsp/hdfsMediaSource/add.jsp
@@ -75,13 +75,13 @@
                     </div>
                 </div>
 
-                <div class="form-group">
+                <%--<div class="form-group">
                     <label class="col-sm-3 control-label no-padding-right" for="form-add-spark_cube_meta">spark cube地址</label>
                     <div class="col-sm-9">
                         <input type="text" id="form-add-spark_cube_meta" name="hdfsMediaSrcParameter.sparkcubeAddress"
                                class="col-xs-10 col-sm-5" style="width:350px;height:35px" maxlength="50"/>
                     </div>
-                </div>
+                </div>--%>
 
                 <div class="form-group">
                     <label class="col-sm-3 control-label no-padding-right" for="form-add-desc">描述</label>
@@ -116,7 +116,7 @@
         var nameNode1 = $.trim($("#form-add-nameNode1").val());
         var nameNode2 = $.trim($("#form-add-nameNode2").val());
         var hadoopUser = $.trim($("#form-add-hadoopUser").val());
-        var spark_cube = $.trim($("#form-add-spark_cube_meta").val());
+//        var spark_cube = $.trim($("#form-add-spark_cube_meta").val());
         var desc = $.trim($("#form-add-desc").val());
 
         if (name == "") {
@@ -139,10 +139,10 @@
             alert("HadoopUser不能为空!");
             return false;
         }
-        if(spark_cube == "") {
+        /*if(spark_cube == "") {
             alert("Spark cube地址不能为空！");
             return false;
-        }
+        }*/
         if (desc == "") {
             alert("描述不能为空!");
             return false;

diff --git a/dl-manager/dl-manager-core/src/main/resources/webapp/WEB-INF/jsp/hdfsMediaSource/edit.jsp b/dl-manager/dl-manager-core/src/main/resources/webapp/WEB-INF/jsp/hdfsMediaSource/edit.jsp
@@ -87,13 +87,13 @@
                     </div>
                 </div>
 
-                <div class="form-group">
+                <%--<div class="form-group">
                     <label class="col-sm-3 control-label no-padding-right" for="form-add-spark_cube_meta">Spark cube地址</label>
                     <div class="col-sm-9">
                         <input type="text" id="form-add-spark_cube_meta" name="hdfsMediaSrcParameter.sparkcubeAddress" value="${hdfsMediaSrcParameter.sparkcubeAddress}"
                                class="col-xs-10 col-sm-5" style="width:350px;height:35px" maxlength="50"/>
                     </div>
-                </div>
+                </div>--%>
 
                 <div class="form-group">
                     <label class="col-sm-3 control-label no-padding-right" for="form-update-desc">描述</label>
@@ -129,7 +129,7 @@
         var nameNode1 = $.trim($("#form-update-nameNode1").val());
         var nameNode2 = $.trim($("#form-update-nameNode2").val());
         var hadoopUser = $.trim($("#form-update-hadoopUser").val());
-        var spark_cube = $.trim($("#form-add-spark_cube_meta").val());
+//        var spark_cube = $.trim($("#form-add-spark_cube_meta").val());
         var desc = $.trim($("#form-update-desc").val());
 
         if (name == "") {
@@ -152,10 +152,10 @@
             alert("HadoopUser不能为空!");
             return false;
         }
-        if(spark_cube == "") {
+        /*if(spark_cube == "") {
             alert("Spark cube地址不能为空！");
             return false;
-        }
+        }*/
         if (desc == "") {
             alert("描述不能为空!");
             return false;

diff --git a/dl-manager/dl-manager-core/src/main/resources/webapp/WEB-INF/jsp/hdfsMediaSource/list.jsp b/dl-manager/dl-manager-core/src/main/resources/webapp/WEB-INF/jsp/hdfsMediaSource/list.jsp
@@ -28,7 +28,6 @@
                             <td>nameNode2</td>
                             <td>HadoopUser</td>
                             <td>所属Zk集群</td>
-                            <td>Spark cube地址</td>
                             <td>创建时间</td>
                             <td>操作</td>
                         </tr>
@@ -69,7 +68,6 @@
             {"data": "hdfsMediaSrcParameter.nameNode2"},
             {"data": "hdfsMediaSrcParameter.hadoopUser"},
             {"data": "zkMediaSourceName"},
-            {"data": "hdfsMediaSrcParameter.sparkcubeAddress"},
             {
                 "data": "createTime",
                 "bSortable": false,