.classpath

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/junit-4.12.jar"/>
+	<classpathentry kind="output" path="build/classes"/>
+</classpath>

.gitignore

@@ -1,5 +0,0 @@
-/target
-/build
-.classpath
-
-/bin/

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>data_manager_backend</name>
+	<name>data-aggregation-platform</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -25,11 +25,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>

.settings/com.genuitec.eclipse.migration.prefs

@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-performed.operation.correct.unbound.jre=1.0
-performed.operation.resolve.unknown.runtime=1.0

.settings/org.eclipse.core.resources.prefs

@@ -1,5 +1,2 @@
 eclipse.preferences.version=1
 encoding//WebContent/WEB-INF/config/config.properties=UTF-8
-encoding//src/com/platform/utils/GanymedSSH.java=UTF-8
-encoding/<project>=UTF-8
-separateDerivedEncodings=true

.settings/org.eclipse.jdt.core.prefs

@@ -1,101 +1,7 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.7

.settings/org.eclipse.jpt.core.prefs

@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jpt.core.platform=generic2_1
-org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=false

.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

.settings/org.eclipse.wst.common.component

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="data_manager_backend">
+    <wb-module deploy-name="data-aggregation-platform">
         <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/test"/>
-        <property name="java-output-path" value="/data_manager_backend/build/classes"/>
+        <property name="java-output-path" value="/data-aggregation-platform/build/classes"/>
         <property name="context-root" value="/"/>
     </wb-module>
 </project-modules>

.settings/org.eclipse.wst.common.project.facet.core.prefs.xml

@@ -1,7 +0,0 @@
-<root>
-  <facet id="jpt.jpa">
-    <node name="libprov">
-      <attribute name="provider-id" value="jpa-no-op-library-provider"/>
-    </node>
-  </facet>
-</root>

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <runtime name="MyEclipse Tomcat v7.0"/>
+  <runtime name="Apache Tomcat v7.0"/>
   <fixed facet="java"/>
   <fixed facet="wst.jsdt.web"/>
   <fixed facet="jst.web"/>
   <installed facet="java" version="1.7"/>
   <installed facet="jst.web" version="3.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="jpt.jpa" version="2.1"/>
 </faceted-project>

WebContent/WEB-INF/config/config.properties

@@ -1,10 +1,10 @@
 #=============================================================================================================
-# MySQL
+# MySQL连接配置
 #=============================================================================================================
 # 驱动程序
 jdbc.mysql.driver=com.mysql.jdbc.Driver
 # 连接url
-jdbc.mysql.url=jdbc:mysql://192.168.0.101:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+jdbc.mysql.url=jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
 # 用户名
 jdbc.mysql.username=root
 # 密码
@@ -13,14 +13,15 @@ jdbc.mysql.password=root
 #=============================================================================================================
 # Oracle 连接配置
 #=============================================================================================================
-# hui用户名
+# 驱动程序
-gather-user-name=system
+jdbc.oracle.driver=oracle.jdbc.driver.OracleDriver
+# 连接url
+jdbc.oracle.url=jdbc:oracle:thin:@localhost:1521:orcl;
+# 用户名
+jdbc.oracle.username=system
 # 密码
-gather-user-password=oracle
+jdbc.oracle.password=oracle
-#
+
-gather-port=1521
-#
-gather-service-name=orcl
 #=============================================================================================================
 # 数据库公共配置
 #=============================================================================================================
@@ -35,16 +36,4 @@ jdbc.removeAbandonedTimeout=600
 jdbc.testWhileIdle=true
 jdbc.timeBetweenEvictionRunsMillis=60000
 jdbc.numTestsPerEvictionRun=20
-jdbc.minEvictableIdleTimeMillis=300000
+jdbc.minEvictableIdleTimeMillis=300000
-#==============================================================================================================
-#
-#==============================================================================================================
-table-suffix=_20152016
-extract-log-localtion=/home/log/
-gather-tablespace-name=TS_TTSSS
-gather-tablespace-path=
-gather-table-user-password=
-kubeMasterUrl=http://192.168.0.110:8080/
-collect-user-name=system
-collect-password=oracle
-collect-service-name=orcl

WebContent/WEB-INF/config/getTreedata.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-function ergodic(){
-  for file in `ls $1`
-  do
-    if [ "$file" != "app" -a -d $1"/"$file  ]
-    then
-      ergodic $1"/"$file
-    else
-      local path=$1"/"$file
-      echo $path 
-    fi
-  done
-}
-
-IFS=$'\n'                      #这个必须要，否则会在文件名中有空格时出错
-INIT_PATH=".";
-ergodic $1

WebContent/WEB-INF/config/log4j-config.xml

@@ -14,7 +14,7 @@
 	<appender name="dailyRollingFile" class="org.apache.log4j.DailyRollingFileAppender">
 		<param name="Threshold" value="info"></param>
 		<param name="ImmediateFlush" value="true"></param>
-		<param name="File" value="logs/dailyRollingFile.log"></param>
+		<param name="File" value="d:/logs/dailyRollingFile.log"></param>
 		<param name="DatePattern" value="'.'yyyy-MM-dd'.log'"></param>
 		<layout class="org.apache.log4j.PatternLayout">
 			<param name="ConversionPattern" value="[%d{yyyy-MM-dd HH:mm:ss\} %-5p] [%t] {%c:%L}-%m%n"></param>
@@ -23,7 +23,7 @@
 
 	<!-- 输出日志到文件 文件大小到达指定尺寸的时候产生一个新的文件 -->
 	<appender name="railyFile" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="logs/railyFile.log"></param>
+		<param name="File" value="d:/logs/railyFile.log"></param>
 		<param name="ImmediateFlush" value="true" />
 		<param name="Threshold" value="info"></param>
 		<param name="Append" value="true"></param>

WebContent/WEB-INF/config/mybatis-applicationConfig.xml

@@ -7,12 +7,8 @@
 		<typeAlias alias="EncodedInfoEntity" type="com.platform.entities.EncodedInfoEntity" />
 		<typeAlias alias="DataInfoEntity" type="com.platform.entities.DataInfoEntity" />
 		<typeAlias alias="PagerOptions" type="com.platform.entities.PagerOptions"/>
-		<typeAlias alias="GatherOracleInfo" type="com.platform.entities.GatherOracleInfo"/>
-		<typeAlias alias="DataInfoEntityMoveTmp" type="com.platform.entities.DataInfoEntityMoveTmp"/>
 	</typeAliases>
 	<mappers>
-		<mapper resource="com/dao/mapper/data-details-mapper.xml" />
+		<mapper resource="com/dao/mapper/data-detaisl-mapper.xml" />		
-		<mapper resource="com/dao/mapper/config-details-mapper.xml"/>	
-		<mapper resource="com/dao/mapper/dataInfoMoveTmpmapper.xml"/>
 	</mappers>
 </configuration>    

WebContent/WEB-INF/config/spring-applicationContext.xml

@@ -3,7 +3,6 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
 	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
 	xmlns:context="http://www.springframework.org/schema/context"
-	 xmlns:task="http://www.springframework.org/schema/task"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd 
        http://www.springframework.org/schema/tx 
@@ -11,9 +10,7 @@
        http://www.springframework.org/schema/aop 
        http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
        http://www.springframework.org/schema/context
-       http://www.springframework.org/schema/context/spring-context-3.0.xsd
+       http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd  
-        http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">
 	<!-- 读取db.properties中的属性值 -->
 	<bean
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -74,8 +71,4 @@
 		<context:exclude-filter type="annotation"
 			expression="org.springframework.stereotype.Controller" />
 	</context:component-scan>
-	<!-- Enables the Spring Task @Scheduled programming model -->  
-    <task:executor id="executor" pool-size="5" />  
-    <task:scheduler id="scheduler" pool-size="10" />  
-    <task:annotation-driven executor="executor" scheduler="scheduler" />  
 </beans>