合并

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

@@ -1,2 +1,4 @@
 eclipse.preferences.version=1
 encoding//WebContent/WEB-INF/config/config.properties=UTF-8
+encoding//src/com/platform/controller/DataModelController.java=UTF-8
+encoding/<project>=UTF-8

src/META-INF/persistence.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+	<persistence-unit name="aggregation-platform">
+	</persistence-unit>
+</persistence>

src/com/base/BaseController.java

@@ -0,0 +1,63 @@
+/**
+ * 文件名    ： BaseController.java
+ * 版权       : XX科技有限公司。
+ * 描述       : <描述>
+ * 修改时间：2016年9月7日
+ * 修改内容：<修改内容>
+ */
+package com.base;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+import com.platform.utils.Configs;
+
+/**
+ * <一句话功能简述> 
+ * <功能详细描述>
+ * @author    chen
+ * @version   [版本号，2016年9月7日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+public class BaseController { 
+	
+	/** log4j  */
+	public static Logger log = Logger.getRootLogger();
+	
+    /**
+     * <一句话功能简述> 基于@ExceptionHandler异常处理----全局异常处理
+     * <功能详细描述>
+     * @param request
+     * @param ex 异常
+     * @return
+     * @see [类、类#方法、类#成员]
+     */
+    @ExceptionHandler  
+    public Object exp(HttpServletRequest request, HttpServletResponse response,Exception ex) {  
+        System.out.println("URI"+request.getRequestURI());
+        request.setAttribute("ex", ex);  
+        System.err.println("BaseController --exp ");
+        // 根据不同错误转向不同页面  
+        if(ex instanceof CustomException) {
+        	CustomException cuse = (CustomException) ex;
+        	Map<String, String> errmsg = new HashMap<>();
+        	errmsg.put("code", cuse.getCode());
+        	errmsg.put("msg", cuse.getMsg());
+        	log.error(cuse.getCode());
+        	response.setStatus(500);
+            return response;  
+        } else {  
+        	//其他错误则 调到指定页面
+        	log.error(Configs.GLOBAL_EXP_NOT_CUSTOM, ex);
+        	response.setStatus(500);
+            return response;  
+        }  
+    }  
+}  

src/com/base/Constant.java

@@ -0,0 +1,23 @@
+package com.base;
+
+/**
+ * <一句话功能简述>
+ * <功能详细描述>
+ * @author    chen
+ * @version   [版本号，2016年9月8日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+public class Constant {
+	
+	/** 国际话配置文件文件-i18n.properties  */
+	public static String I18N_PROPERTIES_FIEL_PATH = "/com/base/i18n.properties";
+	
+	/** WritefileThread-线程睡眠时间--3000 */
+	public final static long THREAD_SLEEP_WRITEFILETHREAD = 3000;
+	
+	/** CustomException记录报异常的对象的对象个数--10 */
+	public final static int CustomException_log_object_size = 10;
+	
+	
+}

src/com/base/Custom4exception.java

@@ -0,0 +1,20 @@
+package com.base;
+
+/**
+ * <一句话功能简述> 异常常量编码
+ * <功能详细描述>
+ * @author    chen
+ * @version   [版本号，2016年9月8日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+public class Custom4exception {
+	//3003001001  :  第一位：标识异常，  第二到第四位：标识模块，第五道第七位：标识类别，第八道第十位标识具体异常
+	/**eg
+	 *  3：异常
+	 * 	 003：虚拟机模块
+	 * 	    001：软件依赖虚拟机资源类别
+	 * 	       001：启动异常
+	 */
+	
+}

src/com/base/CustomException.java

@@ -0,0 +1,124 @@
+package com.base;
+
+import org.apache.log4j.Logger;
+
+/**
+ * <一句话功能简述>
+ * <功能详细描述>
+ * @author    chen
+ * @version   [版本号，2016年9月8日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+@SuppressWarnings("serial")
+public class CustomException extends Exception {
+	
+	/** log4j  */
+	public static Logger log = Logger.getRootLogger();
+	
+	/** 自定义异常信息-错误信息  */
+	private String msg;
+	
+	/** 自定义异常信息-错误代码  */
+	private String code;
+	
+	/** 操作对象  */
+	private Object[] objArray;
+	
+	/** 异常  */
+	private Throwable cause;
+	
+	public CustomException() {
+	        super();
+    }
+	 
+	/**
+	 * @功能 将异常记录进文件
+	 * @param code 异常编码
+	 * @param msg 自定义异常信息
+	 * @param e
+	 * @param obj
+	 */
+	public CustomException(String code,Exception e,Object... obj) {
+		super(code);
+		StringBuffer sbuf= new StringBuffer();
+		sbuf.append(msg);
+		this.code = code;
+		sbuf.append(code);
+		sbuf.append("\r\n");
+		msg = Resource.getProperties().get(code);
+		// 记录自定义的 异常
+		if (null != msg) {
+			sbuf.append(msg);
+			sbuf.append("\r\n");
+		}
+		// 记录原始的异常
+		if (null != e) {
+			StackTraceElement[] array = e.getStackTrace();
+			cause = e.getCause();
+			for (StackTraceElement stackTraceElement : array) {
+				sbuf.append(stackTraceElement.toString());
+				sbuf.append("\r\n");
+			}
+		}
+		//记录  出现异常时  当前的对象
+		if (null != obj) {
+			Object[] array = obj;
+			sbuf.append("Object[] size :  ");
+			sbuf.append(array.length);
+			int forSize = 0;
+			if (Constant.CustomException_log_object_size < array.length) {
+				forSize = Constant.CustomException_log_object_size;
+			}
+			else {
+				forSize = array.length;
+			}
+			for (int i = 0; i < forSize; i++) {
+				sbuf.append(array[i]);
+				sbuf.append("\r\n");
+			}
+			sbuf.append("......");
+			sbuf.append("\r\n");
+		}
+		else {
+			sbuf.append("null");
+			sbuf.append("\r\n");
+		}
+		
+		sbuf.append("\r\n");
+		// 是否 写入 文件
+		log.error(sbuf.toString());
+	}
+
+	/**
+	 * @功能  获得msg
+	 * @return msg
+	 */
+	public String getMsg() {
+		return msg;
+	}
+	
+
+	/**
+	 * @return the code
+	 */
+	public String getCode() {
+		return code;
+	}
+
+	/**
+	 * @功能  获得objArray
+	 * @return objArray
+	 */
+	public Object[] getObjArray() {
+		return objArray;
+	}
+
+	/**
+	 * @功能  获得cause
+	 * @return cause
+	 */
+	public Throwable getCause() {
+		return cause;
+	}
+}

src/com/base/Resource.java

@@ -0,0 +1,79 @@
+package com.base;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
+import com.base.Constant;
+
+public class Resource {
+
+	private static Map<String, String> properties = new HashMap<>();
+	
+	static{
+		// 读取 properties文件
+//		readPropertiesFile(Constant.SYSTEM_PROPERTIES_FIEL_PATH);
+		readPropertiesFile4Chinese(Constant.I18N_PROPERTIES_FIEL_PATH);
+	
+	}
+
+	/**
+	 * @功能 读取配置（解决中文乱码）
+	 * @param filename  "/com/utils/exception/i18n.properties"  的格式
+	 */
+	public static void readPropertiesFile4Chinese(String filename) {
+		Properties pro = new Properties();
+		try {
+			// 读取属性文件 XXXX.properties（Reader。writer解决中文乱码）
+//			InputStreamReader in= new InputStreamReader(Resource.class.getClassLoader().getResourceAsStream(filename), "UTF-8");
+			InputStreamReader in= new InputStreamReader(Resource.class.getResourceAsStream(filename), "UTF-8");
+			BufferedReader bf = new BufferedReader(in);
+	//		InputStreamReader in = new BufferedInputStream(new FileInputStream(filename));
+			pro.load(bf); // /加载属性列表
+			Iterator<String> it = pro.stringPropertyNames().iterator();
+			while (it.hasNext()) {
+				String key = it.next();
+				properties.put(key, pro.getProperty(key));
+			}
+			in.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @功能  获得properties
+	 * @return properties
+	 */
+	public static Map<String, String> getProperties() {
+		return properties;
+	}
+
+	/**
+	 * @功能 读取配置
+	 * @param filename 文件绝对路径
+	 */
+	public static void readPropertiesFile(String filename) {
+			Properties pro = new Properties();
+			try {
+				// 读取属性文件 XXXX.properties（ 中文会 乱码）
+				BufferedInputStream bf = new BufferedInputStream(new FileInputStream(filename));
+				pro.load(bf); // /加载属性列表
+				Iterator<String> it = pro.stringPropertyNames().iterator();
+				while (it.hasNext()) {
+					String key = it.next();
+					properties.put(key, pro.getProperty(key));
+				}
+				bf.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+
+}

src/com/dao/mapper/config-details-mapper.xml

@@ -4,16 +4,143 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 "http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
 
 <mapper namespace="com.platform.dao.GatherOracleDao">
-	<resultMap type="GatherOracleInfo" id="getEntityBytext">
-		<id property="_id" column="id" javaType="int" jdbcType="INTEGER" />
+	<resultMap type="com.platform.entities.GatherOracleInfo" id="getEntityBytext">
+		<id property="id" column="id" javaType="int" jdbcType="INTEGER" />
 		<result property="port" column="service_port" javaType="int" jdbcType="INTEGER"/>
 		<result property="ip" column="service_ip" javaType="string" jdbcType="VARCHAR"/>
 		<result property="name" column="service_name" javaType="string" jdbcType="VARCHAR"/>
 		<result property="user" column="service_user" javaType="string" jdbcType="VARCHAR"/>
 		<result property="password" column="service_password" javaType="string" jdbcType="VARCHAR"/>
-		<result property="database" column="service_database" javaType="string" jdbcType="VARCHAR"/>
+		<result property="databaseName" column="service_database" javaType="string" jdbcType="VARCHAR"/>
 		<result property="tableName" column="service_table" javaType="string" jdbcType="VARCHAR"/>
 		<result property="suffix" column="service_suffix" javaType="string" jdbcType="VARCHAR"/>
 		<result property="status" column="service_status" javaType="string" jdbcType="VARCHAR"/>
+		<result property="remove" column="remove" jdbcType="CHAR"/>
 	</resultMap>
+	<sql id="baseOracleInfo">
+		id id, service_port port, service_ip ip, service_name name, service_user user, service_password password, service_database databaseName, service_table tableName, service_suffix suffix, service_status status
+	</sql>
+
+	<select id="selectAllOracle" resultType="com.platform.entities.GatherOracleInfo">
+		SELECT
+		<include refid="baseOracleInfo" />
+		FROM services_info
+		WHERE remove = "0"
+	</select>
+	
+	<insert id="insertOracle" parameterType="com.platform.entities.GatherOracleInfo">
+		INSERT INTO
+		services_info(
+		<trim suffixOverrides=",">
+			<if test="port > 0">
+				service_port,
+			</if>
+			<if test="ip != null and ip != ''">
+				service_ip,
+			</if>
+			<if test="name != null and name != ''">
+				service_name,
+			</if>
+			<if test="user != null and user != ''">
+				service_user,
+			</if>
+			<if test="password != null and password != ''">
+				service_password,
+			</if>
+			<if test="databaseName != null and databaseName != ''">
+				service_database,
+			</if>
+			<if test="tableName != null and tableName != ''">
+				service_table,
+			</if>
+			<if test="suffix != null and suffix != ''">
+				service_suffix,
+			</if>
+			<if test="status != null and status != ''">
+				service_status,
+			</if>
+		</trim>
+		)
+		VALUES(
+		<trim suffixOverrides=",">
+			<if test="port > 0">
+				#{port},
+			</if>
+			<if test="ip != null and ip != ''">
+				#{ip},
+			</if>
+			<if test="name != null and name != ''">
+				#{name},
+			</if>
+			<if test="user != null and user != ''">
+				#{user},
+			</if>
+			<if test="password != null and password != ''">
+				#{password},
+			</if>
+			<if test="databaseName != null and databaseName != ''">
+				#{databaseName},
+			</if>
+			<if test="tableName != null and tableName != ''">
+				#{tableName},
+			</if>
+			<if test="suffix != null and suffix != ''">
+				#{suffix},
+			</if>
+			<if test="status != null and status != ''">
+				#{status},
+			</if>
+		</trim>
+		)
+	</insert>
+	
+	<delete id="deleteOracleById" parameterType="java.lang.Integer">
+		DELETE FROM services_info 
+		<where>
+			id =#{id}
+		</where>
+	</delete>
+	
+	<update id="updateOracleById" parameterType="com.platform.entities.GatherOracleInfo">
+		UPDATE
+		services_info
+		<set >
+			<trim suffixOverrides=",">
+				<if test="name != null and name != ''">
+					service_name = #{name},
+				</if>
+				<if test="ip != null and ip != ''">
+					service_ip = #{ip},
+				</if>
+				<if test="port > 0">
+					service_port= #{port},
+				</if>
+				<if test="user != null and user != ''">
+					service_user= #{user},
+				</if>
+				<if test="password != null and password != ''">
+					service_password= #{password},
+				</if>
+				<if test="databaseName != null and databaseName != ''">
+					service_database= #{databaseName},
+				</if>
+				<if test="tableName != null and tableName != ''">
+					service_table= #{tableName},
+				</if>
+				<if test="suffix != null and suffix != ''">
+					service_suffix= #{suffix},
+				</if>
+				<if test="status != null and status != ''">
+					service_status= #{status},
+				</if>
+				<if test="remove != null and remove != ''">
+					remove= #{remove},
+				</if>
+			</trim>
+		</set>
+		<where>
+			id = #{id}
+		</where>
+	</update>
+	
 </mapper>

src/com/platform/controller/DataModelController.java

@@ -10,28 +10,42 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import net.sf.json.JSONObject;
+
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.base.BaseController;
+import com.platform.entities.DataInfoEntity;
 import com.platform.entities.FolderNode;
 import com.platform.entities.GatherOracleInfo;
-import com.platform.entities.OracleConnectorParams;
 import com.platform.entities.PagerOptions;
+import com.platform.entities.VolumeEntity;
 import com.platform.service.DataInfoService;
+import com.platform.service.IGfsService;
+import com.platform.service.IMySqlService;
+import com.platform.service.IOracleExtractService;
 import com.platform.service.OracleStatusService;
-import com.platform.test.Brick;
-import com.platform.test.FolderReader;
-import com.platform.test.Volume;
 import com.platform.utils.Configs;
 import com.platform.utils.UtilsHelper;
 
 @Controller
-public class DataModelController {
+public class DataModelController extends BaseController{
 	@Resource(name = "dataInfoService")
 	private DataInfoService dfs;
+	
+	@Resource(name = "gfsService")
+	private IGfsService gfsService;
+	
+	@Resource(name = "mySqlService")
+	private IMySqlService mySqlService;
+	
+	@Resource(name = "OracleExtract")
+	private IOracleExtractService OracleExtract;
 
 	public void setDfsImp(DataInfoService dfs) {
 		this.dfs = dfs;
@@ -44,7 +58,7 @@ public class DataModelController {
 		Map<String, String[]> paramMap = res.getParameterMap();
 		Set<String> keySet = paramMap.keySet();
 		Map<String, String> params = new HashMap<String, String>();
-		StringBuffer sb = new StringBuffer().append("当前的请求参数:{");
+		StringBuffer sb = new StringBuffer().append("锟斤拷前锟斤拷锟斤拷锟斤拷锟斤拷锟<EFBFBD>:{");
 		for (String str : keySet) {
 			String value = paramMap.get(str)[0];
 			if (StringUtils.isNotEmpty(value)) {
@@ -75,7 +89,7 @@ public class DataModelController {
 		String[] oraclesName = paramMap.get("oracleName");
 		if (oraclesName != null)
 			for (String rcName : oraclesName) {
-				Configs.CONSOLE_LOGGER.info("执行后台数据库连接\t" + rcName);
+				Configs.CONSOLE_LOGGER.info("杩炴帴鎴愬姛\t" + rcName);
 				new OracleStatusService().connectToOracle(rcName);
 			}
 	}
@@ -88,52 +102,119 @@ public class DataModelController {
 		String operate = paramMap.get("operation")[0];
 		if (null != oraclesName) {
 			for (String rcName : oraclesName) {
-				Configs.CONSOLE_LOGGER.info("取消后台数据库连接:\t" + rcName);
+				Configs.CONSOLE_LOGGER.info("杩炴帴鎴愬姛:\t" + rcName);
 				new OracleStatusService().cancelToOracle(rcName, operate);
 			}
 		}
 	}
 
-	@RequestMapping("/extractOracleData")
+	@RequestMapping("/oracle/{name}/extract")
 	public void extractOracleData(HttpServletRequest res,
-			HttpServletResponse req) {
-
+			HttpServletResponse req, String name) throws Exception {
+		System.out.println("------extract-------");
+		System.out.println(name);
+		Map<String, String[]> paramMap = res.getParameterMap();
+		//姹囨<E5A7B9>诲簱 瀵硅薄淇℃伅--甯︽湁tableName-
+		String[] nodes = paramMap.get("target");
+		Map map = null;
+		for (String string : nodes) {
+			JSONObject jsonobject = JSONObject.fromObject(string);
+			map = jsonobject;
+			System.out.println(map);
+		}
+		
+		// 閲囬泦搴撳璞<EE87AE>--(澶氫釜閲囬泦搴撴娊鍙栧埌1涓眹鎬诲簱鐨<E7B0B1>1涓猼ableName涓<65>)
+		String[] inneed = paramMap.get("inneed");
+		List<Map<String, String>> colleclist = new ArrayList<Map<String,String>>();
+		for (String string : nodes) {
+			JSONObject jsonobject = JSONObject.fromObject(string);
+			 Map inneedMap = jsonobject;
+			colleclist.add(inneedMap);
+		}
+		OracleExtract.extractOracle(name, colleclist, map);
+		
 	}
 
 	@RequestMapping("/volume/list")
 	@ResponseBody
-	public Volume getFolder(HttpServletRequest res, HttpServletResponse req) {
+	public List<VolumeEntity> getFolder(HttpServletRequest res, HttpServletResponse req) throws Exception {
 		System.out.println("get Request");
-		Brick brick1 = new Brick("192.168.0.101", "D:/bootstrap");
-		Brick brick2 = new Brick("192.168.0.103", "D:\book");
-		List<Brick> bricks = new ArrayList<Brick>();
-		bricks.add(brick1);
-		bricks.add(brick2);
-		List<FolderNode> folderNodes = new ArrayList<>();
-		folderNodes
-				.add(FolderReader
-						.reader("C:\\Users\\wuming\\workspace\\data-aggregation-platform"));
-		Volume volume = new Volume("volume", 1555551024, 153561024, bricks,
-				folderNodes);
-		return volume;
+//		Brick brick1 = new Brick("192.168.0.101", "D:/bootstrap");
+//		Brick brick2 = new Brick("192.168.0.103", "D:\book");
+//		List<Brick> bricks = new ArrayList<Brick>();
+//		bricks.add(brick1);
+//		bricks.add(brick2);
+		List<VolumeEntity> result = gfsService.getAllVolumes();
+		return result;
 	}
-
-	@RequestMapping("/oracle/list/")
+	
+	@RequestMapping(value = "/volume/{name}/move", method= RequestMethod.POST)
 	@ResponseBody
-	public List<OracleConnectorParams> getOracleInfo(HttpServletRequest res,
-			HttpServletResponse req) {
-		List<OracleConnectorParams> orpinfo = new ArrayList<OracleConnectorParams>();
-		//测试下--------------------
-		OracleConnectorParams oracleConnectorParams1 = new GatherOracleInfo("1530", "192.168.0.115", "汇总库1", "System", "oracle", "orcl", 0, "TS_JSSJBS","_20152016", 0);
-		OracleConnectorParams oracleConnectorParams2= new GatherOracleInfo("1521", "192.168.0.110", "汇总库2", "System", "oracle", "orcl", 1, "TS_JSSJBS","_20152016", 1);
-		OracleConnectorParams oracleConnectorParams3 = new GatherOracleInfo("1530", "192.168.0.123", "汇总库3", "System", "oracle", "orcl", 2, "TS_JSSJBS","_20152016", 2);
-		OracleConnectorParams oracleConnectorParams4= new GatherOracleInfo("1521", "192.168.0.120", "汇总库4", "System", "oracle", "orcl", 3, "TS_JSSJBS","_20152016", 3);
-		orpinfo.add(oracleConnectorParams1);
-		orpinfo.add(oracleConnectorParams2);
-		orpinfo.add(oracleConnectorParams3);
-		orpinfo.add(oracleConnectorParams4);
-		//---------------------------------
-		return orpinfo;
+	public Object move(HttpServletRequest res, HttpServletResponse req, String name, 
+			FolderNode selectNode, DataInfoEntity selectItems) throws Exception {
+		System.out.println("get Request");
+		Map<String, String[]> paramMap = res.getParameterMap();
+//		System.out.println(paramMap);
+		String[] nodes = paramMap.get("selectNode");
+		Map map = null;
+		for (String string : nodes) {
+			System.out.println(string);
+			JSONObject jsonobject = JSONObject.fromObject(string);
+			map = jsonobject;
+		}
+		List<String> listItemPath = new ArrayList<String>();
+		String[] items = paramMap.get("selectItems");
+		System.out.println("selectItems");
+		for (String string : items) {
+			System.out.println(string);
+			JSONObject jsobj = JSONObject.fromObject(string);
+			Map itemmap = jsobj;
+			listItemPath.add((String)itemmap.get("dataPath"));
+		}
+		
+		System.out.println(name);
+		System.out.println(nodes);
+		System.out.println(selectItems);
+		System.out.println("--------------");
+		int result = gfsService.copyFolder(listItemPath, (String)map.get("name"), "app");
+		return result;
+	}
+	
+	@RequestMapping("/oracle/list")
+	@ResponseBody
+	public List<GatherOracleInfo> getOracleInfo(HttpServletRequest res,
+			HttpServletResponse req) throws Exception {
+		
+		List<GatherOracleInfo> result = mySqlService.findAllMySql(); 
+		System.out.println("----------getOracleInfo-----------------------");
+		return result;
+	}
+	
+	@RequestMapping("/oracle/{id}/delete")
+	@ResponseBody
+	public void deleteOracleInfo(HttpServletRequest res,
+			HttpServletResponse req, int id) throws Exception {
+		
+		mySqlService.deleteMySql(id); 
+		System.out.println("----------deleteOracleInfo-----------------------");
+	}
+	
+	@RequestMapping("/oracle/{id}/insert")
+	@ResponseBody
+	public void insertOracleInfo(HttpServletRequest res,
+			HttpServletResponse req, GatherOracleInfo oracle) throws Exception {
+		
+		mySqlService.insertOracle(oracle);
+		System.out.println("----------insertOracleInfo-----------------------");
+	}
+	
+	@RequestMapping("/oracle/{id}/update")
+	@ResponseBody
+	public void updateOracleInfo(HttpServletRequest res,
+			HttpServletResponse req, GatherOracleInfo oracle) throws Exception {
+		
+		mySqlService.updateOracle(oracle); 
+		System.out.println("----------updateOracleInfo-----------------------");
 	}
 	
 	@RequestMapping("/oracle/delete/")

src/com/platform/controller/DefaultController.java

@@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -11,18 +12,19 @@ import com.platform.utils.Configs;
 
 @Controller
 public class DefaultController {
+	
 	@RequestMapping("/")
 	public ModelAndView defaultHandler(HttpServletRequest req, HttpServletResponse res){
-		//处理不匹配的请求		
+		//处理不匹配的请求		
 		System.out.println("index");		
 		return new ModelAndView("index");
-		
 	}
 	
 	@RequestMapping("/test")
-	public void test(HttpServletRequest req, HttpServletResponse res){
+	public ModelMap test(HttpServletRequest req, HttpServletResponse res){
 		//System.out.println(Class.class.getClass().getResource("/").getPath());
 		System.out.println(Configs.EXTRACT_LOG_LOCALTION);
+		return new ModelMap();
 	}
 	
 }

src/com/platform/controller/FolderController.java

@@ -0,0 +1,82 @@
+
+package com.platform.controller;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import oracle.sql.DATE;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.base.BaseController;
+import com.base.CustomException;
+import com.platform.entities.GfsFolderEntity;
+import com.platform.entities.VolumeEntity;
+import com.platform.glusterfs.VolumeInfo;
+import com.platform.service.IGfsService;
+
+
+/**
+ * <一句话功能简述>
+ * <功能详细描述>
+ * @author    chen
+ * @version   [版本号，2016年9月8日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+@Controller
+@RequestMapping("")
+public class FolderController extends BaseController {
+	
+	@Resource(name = "gfsService")
+	private IGfsService gfsService;
+	
+	@RequestMapping(value="/getAllSubPathByPath", method= RequestMethod.POST)
+	public Object getAllSubPathByPath(String path) throws Exception {
+		System.out.println(path);
+		Object result = null;
+		if (null != path && !"".equals(path)) {
+			System.out.println(path);
+			result = gfsService.getFolder(path);
+		}
+		return result;
+	}
+	
+//	/**
+//	 * <一句话功能简述> 查询集群中所有的 volume 及其 信息
+//	 * <功能详细描述>
+//	 * @return
+//	 * @throws Exception 
+//	 * @see [类、类#方法、类#成员]
+//	 */
+//	@RequestMapping(value="/volume/list", method= RequestMethod.POST)
+//	public Object getVolums() throws Exception{
+//		System.out.println("----------------------------------");
+//		long a = new Date().getTime();
+//		 List<VolumeEntity> result = gfsService.getAllVolumes();
+//		 System.out.println("----------------------------------");
+//		 System.out.println(new Date().getTime()-a);
+//		return result;
+//	}
+//	
+	/**
+	 * <一句话功能简述> 查询集群中所有的 volume 及其 信息
+	 * <功能详细描述>
+	 * @param volumeName "/home/gfs_ftp_point" "/home/v1_point"
+	 * @return 
+	 * @throws Exception 
+	 * @see [类、类#方法、类#成员]
+	 */
+	
+	@RequestMapping(value="/volume/findByName", method= RequestMethod.POST)
+	public Object getVolumByName(String volumeName) throws Exception{
+		VolumeEntity result = gfsService.getOneVolume(volumeName);
+		return result;
+	}
+	
+}

src/com/platform/controller/SetGlusterfsController.java

@@ -0,0 +1,45 @@
+
+/**
+ * 文件名   :   SetGlusterfs.java
+ * 版权       :   <版权/公司名>
+ * 描述       :   <描述>
+ * @author  liliy
+ * 版本       :   <版本>
+ * 修改时间：      2016年9月8日
+ * 修改内容：      <修改内容>
+ */
+package com.platform.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * <一句话功能简述>
+ * <功能详细描述>
+ * @author    liliy
+ * @version   [版本号，2016年9月8日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+@Controller
+public class SetGlusterfsController {
+	@RequestMapping("/tes")
+	public Object defaultHandler(HttpServletRequest req, HttpServletResponse request) {
+		//<2F><><EFBFBD>?ƥ<><C6A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>		
+		try {            
+           
+           System.out.println("fsdfds");
+            
+            return "listAll";
+        } catch (Exception e) {
+            e.printStackTrace();
+            
+            return "result";
+        }
+    
+
+	}
+}

src/com/platform/controller/ShowGlusterfsController.java

@@ -0,0 +1,44 @@
+
+/**
+ * 文件名   :   ShowGlusterfsController.java
+ * 版权       :   <版权/公司名>
+ * 描述       :   <描述>
+ * @author  liliy
+ * 版本       :   <版本>
+ * 修改时间：      2016年9月8日
+ * 修改内容：      <修改内容>
+ */
+package com.platform.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.platform.glusterfs.ClusterInfo;
+
+/**
+ * <一句话功能简述>
+ * <功能详细描述>
+ * @author    liliy
+ * @version   [版本号，2016年9月8日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+@Controller
+public class ShowGlusterfsController {
+	/**
+	 * <一句话功能简述>
+	 * <功能详细描述>
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	@RequestMapping("/showPeerStatus")
+	public Map<String,String> showPeerStatus(){
+		Map<String, String> peer_status=new ClusterInfo().showClusterInfo();
+		return peer_status;
+	} 
+	
+	
+}

src/com/platform/dao/EncodeInfoDao.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
 import com.platform.entities.EncodedInfoEntity;
 
 /**
- * 数据库操作: 实现增、删、改、查
+ * 数据库操作: 实现增、删、改、查
  * 
  * @author wuming
  * 
@@ -21,49 +21,49 @@ import com.platform.entities.EncodedInfoEntity;
 public interface EncodeInfoDao {
 
 	/**
-	 * 获取查询表下的所有实体（行政区划/系统）信息
+	 * 获取查询表下的所有实体（行政区划/系统）信息
 	 * 
 	 * @param tableName
-	 *            查询的表名
-	 * @return 所有实体信息:名称和编码
+	 *            查询的表名
+	 * @return 所有实体信息:名称和编码
 	 */
 	@Select("SELECT code, name FROM ${tableName}")
 	public List<EncodedInfoEntity> getAllEntityInfo(
 			@Param("tableName") String tableName);
 
 	/**
-	 * 根据实体（行政区划/系统）的名称查询编码
+	 * 根据实体（行政区划/系统）的名称查询编码
 	 * 
 	 * @param code
-	 *            实体编码
+	 *            实体编码
 	 * @param tableName
-	 *            查询的表名
-	 * @return 编码是主键，查询结果最多只有一条记录
+	 *            查询的表名
+	 * @return 编码是主键，查询结果最多只有一条记录
 	 */
 	@Select("SELECT name FROM ${tableName} WHERE code = #{code}")
 	public String getEncodeNameByCode(@Param("code") String code,
 			@Param("tableName") String tableName);
 
 	/**
-	 * 根据实体（行政区划/系统）的编码查询名称
+	 * 根据实体（行政区划/系统）的编码查询名称
 	 * 
 	 * @param name
-	 *            实体名称
+	 *            实体名称
 	 * @param tableName
-	 *            查询的表名
-	 * @return 名称不是主键，查询结果可能会有多个
+	 *            查询的表名
+	 * @return 名称不是主键，查询结果可能会有多个
 	 */
 	@Select("SELECT code FROM ${tableName} WHERE name = #{name}")
 	public List<String> getEncodeCodeByName(@Param("name") String name,
 			@Param("tableName") String tableName);
 
 	/**
-	 * 根据实体（行政区划/系统）的编码，更新实体的名称
+	 * 根据实体（行政区划/系统）的编码，更新实体的名称
 	 * 
 	 * @param code
-	 *            系统编码
+	 *            系统编码
 	 * @param tableName
-	 *            查询的表名
+	 *            查询的表名
 	 * @return
 	 */
 	@Update("UPDATE ${tableName} SET name = #{name} WHERE code = #{code}")
@@ -71,12 +71,12 @@ public interface EncodeInfoDao {
 			@Param("name") String name, @Param("tableName") String tableName);
 
 	/**
-	 * 向表中插入实体（行政区划/系统）信息
+	 * 向表中插入实体（行政区划/系统）信息
 	 * 
 	 * @param efe
-	 *            插入的实体信息
+	 *            插入的实体信息
 	 * @param tableName
-	 *            表名
+	 *            表名
 	 * @return
 	 */
 	@Insert("INSERT INTO ${tableName} (code, name) VALUES (#{efe.code}, #{efe.name})")
@@ -84,12 +84,12 @@ public interface EncodeInfoDao {
 			@Param("tableName") String tableName);
 
 	/**
-	 * 删除表中的实体（行政区划/系统）
+	 * 删除表中的实体（行政区划/系统）
 	 * 
 	 * @param code
-	 *            实体的编码
+	 *            实体的编码
 	 * @param tableName
-	 *            表名
+	 *            表名
 	 * @return
 	 */
 	@Delete("DELETE FROM ${tableName} WHERE code = #{code}")

src/com/platform/dao/GatherOracleDao.java

@@ -1,5 +1,39 @@
 package com.platform.dao;
 
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.platform.entities.GatherOracleInfo;
+
+@Repository(value = "gatherOracleDao")
 public interface GatherOracleDao {
+	
+	/**
+	 * @return 查询所有的oracle记录
+	 * @throws Exception 异常
+	 */
+	public List<GatherOracleInfo> selectAllOracle() throws Exception;
+	
+	/**
+	 * @param id
+	 * @return
+	 * @throws Exception
+	 */
+	public int deleteOracleById(int id) throws Exception;
+	
+	/**
+	 * @param oracle
+	 * @return
+	 * @throws Exception
+	 */
+	public int insertOracle(GatherOracleInfo oracle) throws Exception;
+	
+	/**
+	 * @param oracle
+	 * @return
+	 * @throws Exception
+	 */
+	public int updateOracleById(GatherOracleInfo oracle) throws Exception;
 
 }

src/com/platform/entities/Brick.java

@@ -0,0 +1,58 @@
+
+/**
+ * 文件名   :   Brick.java
+ * 版权       :   <版权/公司名>
+ * 描述       :   <描述>
+ * @author  chen
+ * 版本       :   <版本>
+ * 修改时间：      2016年9月9日
+ * 修改内容：      <修改内容>
+ */
+package com.platform.entities;
+
+/**
+ * <一句话功能简述> volume 下的 块 对象
+ * <功能详细描述>
+ * @author    chen
+ * @version   [版本号，2016年9月9日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+
+public class Brick {
+
+	/** ip  */
+	private String ip;
+	
+	/** 路径  */
+	private String path;
+
+	/**
+	 * @return the ip
+	 */
+	public String getIp() {
+		return ip;
+	}
+
+	/**
+	 * @param ip the ip to set
+	 */
+	public void setIp(String ip) {
+		this.ip = ip;
+	}
+
+	/**
+	 * @return the path
+	 */
+	public String getPath() {
+		return path;
+	}
+
+	/**
+	 * @param path the path to set
+	 */
+	public void setPath(String path) {
+		this.path = path;
+	}
+	
+}

src/com/platform/entities/DataInfoEntity.java

@@ -1,27 +1,27 @@
 package com.platform.entities;
 
 /**
- * 数据信息实体类
+ * 数据信息实体类
  * 
  * @author wuming
  * 
  */
 public class DataInfoEntity {
 	private int id;
-	private String regionalismCode; // 行政区划编码
-	private String cityName; // 市
-	private String districtName; // 区县
-	private int systemCode; // 系统编码
-	private String systemName; // 系统名称
-	private String dataType; // 数据类型：财政\社保\...
-	private int dataVersion; // 数据版本
-	private String submittedBatch; // 上报批次
-	private String dataPath; // 数据路径
-	private String collectingTime; // 采集时间
-	private String collectorContacts; // 采集人的联系
-	private String charset; // 数据的字符编码
-	private String collectorName; // 采集人姓名
-	private String year; // 数据年度
+	private String regionalismCode; // 行政区划编码
+	private String cityName; // 市
+	private String districtName; // 区县
+	private int systemCode; // 系统编码
+	private String systemName; // 系统名称
+	private String dataType; // 数据类型：财政\社保\...
+	private int dataVersion; // 数据版本
+	private String submittedBatch; // 上报批次
+	private String dataPath; // 数据路径
+	private String collectingTime; // 采集时间
+	private String collectorContacts; // 采集人的联系
+	private String charset; // 数据的字符编码
+	private String collectorName; // 采集人姓名
+	private String year; // 数据年度
 
 	public DataInfoEntity() {
 	}

src/com/platform/entities/EncodedInfoEntity.java

@@ -2,14 +2,14 @@ package com.platform.entities;
 
 /**
  * 
- * 编码信息实体
- *   行政区划/系统信息
+ * 编码信息实体
+ *   行政区划/系统信息
  * @author wuming
  *
  */
 public class EncodedInfoEntity {
-	private String name; //名称
-	private String code; //编码
+	private String name; //名称
+	private String code; //编码
 	
 	public EncodedInfoEntity() {}
 	

src/com/platform/entities/FolderNode.java

@@ -4,24 +4,45 @@ import java.util.List;
 
 public class FolderNode {
 	private String name;
+	private int isFolder; // 1 is file and other integer is folder show children number
 	private String path;
-	private List<FolderNode> childNodes;	
+	private List<FolderNode> childNodes;
 	
-	public FolderNode(String name, String path, List<FolderNode> childNodes) {
-		super();
+	public FolderNode() {
+		// TODO Auto-generated constructor stub
+	}
+	
+	public FolderNode(String name) {
 		this.name = name;
-		this.path = path;
-		this.childNodes = childNodes;
+	}
+
+	public FolderNode(String name, int isFolder) {
+		this.name = name;
+		this.isFolder = isFolder;
 	}
 
 	public String getName() {
 		return name;
-	}	
+	}
 
 	public void setName(String name) {
 		this.name = name;
 	}
 
+	/**
+	 * @return the isFolder
+	 */
+	public int getIsFolder() {
+		return isFolder;
+	}
+
+	/**
+	 * @param isFolder the isFolder to set
+	 */
+	public void setIsFolder(int isFolder) {
+		this.isFolder = isFolder;
+	}
+
 	public String getPath() {
 		return path;
 	}