Skip to content

B
bi-report
Commit 83dedd9b authored by 赵建伟's avatar 赵建伟
Browse files
Options

update codes

parent 5f6b935c
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 29 deletions
lib/java/bi-report-service/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml → lib/java/bi-report-service/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml
View file @ 83dedd9b
<component name="libraryTable">
<library name="Maven: commons-collections:commons-collections:3.2.2">
<library name="Maven: commons-collections:commons-collections:3.2.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_annotations_2_7_2.xml → lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_annotations_2_7_0.xml
View file @ 83dedd9b
<component name="libraryTable">
<library name="Maven: org.apache.hadoop:hadoop-annotations:2.7.2">
<library name="Maven: org.apache.hadoop:hadoop-annotations:2.7.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-annotations/2.7.2/hadoop-annotations-2.7.2.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-annotations/2.7.0/hadoop-annotations-2.7.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-annotations/2.7.2/hadoop-annotations-2.7.2-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-annotations/2.7.0/hadoop-annotations-2.7.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-annotations/2.7.2/hadoop-annotations-2.7.2-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-annotations/2.7.0/hadoop-annotations-2.7.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_hdfs_2_7_2.xml → lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_auth_2_7_0.xml
View file @ 83dedd9b
<component name="libraryTable">
<library name="Maven: org.apache.hadoop:hadoop-hdfs:2.7.2">
<library name="Maven: org.apache.hadoop:hadoop-auth:2.7.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-hdfs/2.7.2/hadoop-hdfs-2.7.2.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-auth/2.7.0/hadoop-auth-2.7.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-hdfs/2.7.2/hadoop-hdfs-2.7.2-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-auth/2.7.0/hadoop-auth-2.7.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-hdfs/2.7.2/hadoop-hdfs-2.7.2-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-auth/2.7.0/hadoop-auth-2.7.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_common_2_7_2.xml → lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_common_2_7_0.xml
View file @ 83dedd9b
<component name="libraryTable">
<library name="Maven: org.apache.hadoop:hadoop-common:2.7.2">
<library name="Maven: org.apache.hadoop:hadoop-common:2.7.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-common/2.7.2/hadoop-common-2.7.2.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-common/2.7.0/hadoop-common-2.7.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-common/2.7.2/hadoop-common-2.7.2-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-common/2.7.0/hadoop-common-2.7.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-common/2.7.2/hadoop-common-2.7.2-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-common/2.7.0/hadoop-common-2.7.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_auth_2_7_2.xml → lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_hdfs_2_7_0.xml
View file @ 83dedd9b
<component name="libraryTable">
<library name="Maven: org.apache.hadoop:hadoop-auth:2.7.2">
<library name="Maven: org.apache.hadoop:hadoop-hdfs:2.7.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-auth/2.7.2/hadoop-auth-2.7.2.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-hdfs/2.7.0/hadoop-hdfs-2.7.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-auth/2.7.2/hadoop-auth-2.7.2-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-hdfs/2.7.0/hadoop-hdfs-2.7.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-auth/2.7.2/hadoop-auth-2.7.2-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-hdfs/2.7.0/hadoop-hdfs-2.7.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/service-server/pom.xml
View file @ 83dedd9b
......@@ -125,12 +125,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>2.7.2</version>
<version>2.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>2.7.2</version>
<version>2.7.0</version>
</dependency>
</dependencies>
<build>
......
lib/java/bi-report-service/service-server/service-server.iml
View file @ 83dedd9b
......@@ -248,7 +248,7 @@
<orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-hdfs:2.7.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-hdfs:2.7.0" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
<orderEntry type="library" name="Maven: org.mortbay.jetty:jetty:6.1.26" level="project" />
<orderEntry type="library" name="Maven: org.mortbay.jetty:jetty-util:6.1.26" level="project" />
......@@ -267,9 +267,9 @@
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
<orderEntry type="library" name="Maven: org.apache.htrace:htrace-core:3.1.0-incubating" level="project" />
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-all:1.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-common:2.7.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-annotations:2.7.2" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-common:2.7.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-annotations:2.7.0" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: javax.servlet.jsp:jsp-api:2.1" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-json:1.9" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
......@@ -284,7 +284,7 @@
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.7.0" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.8.0" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-auth:2.7.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-auth:2.7.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15" level="project" />
<orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-i18n:2.0.0-M15" level="project" />
<orderEntry type="library" name="Maven: org.apache.directory.api:api-asn1-api:1.0.0-M20" level="project" />
......
lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/SparksqlServiceImpl.java
View file @ 83dedd9b
......@@ -80,8 +80,9 @@ public class SparksqlServiceImpl implements SparksqlService {
ResultSetMetaData metaData = rs.getMetaData();
int columnCount = metaData.getColumnCount();
for(int i=1;i<= columnCount;i++){
String catalogName = metaData.getCatalogName(i);
headers.add(catalogName);
//String catalogName = metaData.getCatalogName(i);
//headers.add(catalogName);
headers.add("AA");
}
while(rs.next()){
List<String> rowVals = new ArrayList<String>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment