集成

build/classes/META-INF/persistence.xml

@@ -1,5 +0,0 @@
-<?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/dao/mapper/dataInfoMoveTmpmapper.xml

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" ?>    
+<!DOCTYPE mapper    
+PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"    
+"http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
+
+<mapper namespace="com.platform.dao.DataInfoMoveTmpDao">
+	<resultMap id="getEntityByText" type="com.platform.entities.DataInfoEntityMoveTmp">
+		<id property="id" column="id" javaType="int" jdbcType="INTEGER" />
+		<result property="regionalismCode" column="regionalism_code"
+			javaType="string" jdbcType="VARCHAR" />
+		<result property="cityName" column="city_name" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="districtName" column="district_name"
+			javaType="string" jdbcType="VARCHAR" />
+		<result property="systemCode" column="system_code" javaType="int"
+			jdbcType="INTEGER" />
+		<result property="systemName" column="system_name" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="dataType" column="data_type" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="dataVersion" column="data_version" javaType="int"
+			jdbcType="INTEGER" />
+		<result property="submittedBatch" column="submitted_batch"
+			javaType="string" jdbcType="VARCHAR" />
+		<result property="dataPath" column="data_path" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="charset" column="data_charset" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="collectingTime" column="collection_time"
+			javaType="string" jdbcType="DATE" />
+		<result property="collectorContacts" column="collector_contacts"
+			javaType="string" jdbcType="VARCHAR" />
+		<result property="collectorName" column="collector_name"
+			javaType="string" jdbcType="VARCHAR" />
+		<result property="year" column="data_year" javaType="string"
+			jdbcType="VARCHAR" />
+			
+		<result property="dstPath" column="dst_path" javaType="string"
+		jdbcType="VARCHAR" />
+		<result property="completeStatus" column="complete_status" javaType="string"
+		jdbcType="VARCHAR" />
+		<result property="rate" column="rate" javaType="int"
+		jdbcType="INTEGER" />
+	</resultMap>
+	
+	<!-- 获取数据全部记录信息 -->
+	<select id="findAll" parameterType="" resultMap="getEntityByText">
+		SELECT
+		a.id,a.regionalism_code,b.city_name,b.district_name, a.system_code,b.system_name,b.data_type,b.data_version,b.submitted_batch,
+		b.data_path,b.data_charset,b.collection_time,b.collector_name,b.collector_contacts,b.data_year,a.dst_path,a.complete_status,a.rate
+		FROM 
+		move_data_tmp a LEFT JOIN data_details b 
+		ON a.system_code = b.system_code AND a.regionalism_code = b.regionalism_code;
+	</select>
+	
+	<update id="update" parameterType="com.platform.entities.DataInfoEntityMoveTmp">
+		UPDATE
+		move_data_tmp
+		<set >
+			<trim suffixOverrides=",">
+				<if test="regionalismCode != null and regionalismCode != ''">
+					regionalism_code = #{regionalismCode},
+				</if>
+				<if test="systemCode != null and systemCode != ''">
+					system_code= #{systemCode},
+				</if>
+				<if test="dstPath != null and dstPath != ''">
+					dst_path= #{dstPath},
+				</if>
+				<if test="completeStatus != null and completeStatus != ''">
+					complete_status= #{completeStatus},
+				</if>
+				rate= #{rate}
+			</trim>
+		</set>
+		<where>
+			id = #{id}
+		</where>
+	</update>
+	
+	<insert id="save" parameterType="">
+		INSERT INTO
+		move_data_tmp(
+		<trim suffixOverrides=",">
+			<if test="id > 0">
+				id,
+			</if>
+			<if test="regionalismCode != null and regionalismCode != ''">
+				regionalism_code,
+			</if>
+			<if test="systemCode != null and systemCode != ''">
+				system_code,
+			</if>
+			<if test="dstPath != null and dstPath != ''">
+				dst_path,
+			</if>
+			<if test="completeStatus != null and completeStatus != ''">
+				complete_status,
+			</if>
+			rate
+		</trim>
+		)
+		VALUES(
+		<trim suffixOverrides=",">
+			<if test="id > 0">
+				id,
+			</if>
+			<if test="regionalismCode != null and regionalismCode != ''">
+				#{regionalismCode},
+			</if>
+			<if test="systemCode != null and systemCode != ''">
+				#{systemCode},
+			</if>
+			<if test="dstPath != null and dstPath != ''">
+				#{dstPath},
+			</if>
+			<if test="completeStatus != null and completeStatus != ''">
+				#{completeStatus},
+			</if>
+			#{rate}
+		</trim>
+		)
+	</insert>
+	
+	<delete id="remove" parameterType="java.lang.INTEGER">
+		DELETE FROM
+			move_data_tmp 
+		WHERE
+			id = #{id}
+	</delete>
+
+	<!-- 获取数据符合筛选条件的总记录条数 -->
+	<select id="getLimitedDataCount" resultType="java.lang.Integer"
+		parameterType="PagerOptions">
+		SELECT COUNT(id) FROM move_data_tmp
+		<if test="PagerOptions!=null">
+			<where>
+				<include refid="conditionsFilters" />
+			</where>
+		</if>
+
+	</select>
+
+	<!-- 获取数据查询的起始di -->
+	<select id="getLimitedBeginId" resultType="java.lang.Integer"
+		parameterType="PagerOptions">
+		SELECT MAX(idx) FROM (SELECT id idx FROM move_data_tmp
+		ORDER BY id LIMIT 0,#{PagerOptions.totalLimit}) AS TEMP
+	</select>
+
+</mapper>  

src/com/platform/controller/DataModelController.java

@@ -185,7 +185,7 @@ public class DataModelController extends BaseController{
 		System.out.println(nodes);
 		System.out.println(selectItems);
 		System.out.println("--------------");
-		int result = gfsService.copyFolder(listItemPath, (String)map.get("name"), "app");
+		int result = gfsService.copyFolder(listItemPath, (String)map.get("path"), "app");
 		return result;
 	}
 	

src/com/platform/dao/DataInfoMoveTmpDao.java

@@ -0,0 +1,28 @@
+package com.platform.dao;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.platform.entities.DataInfoEntityMoveTmp;
+
+/**
+ * @author chen
+ * 数据迁移状态 临时 存放 ，
+ */
+@Repository(value = "dataInfoMoveTmpDao")
+public interface DataInfoMoveTmpDao {
+
+	/** 查
+	 * @return
+	 * @throws Exception
+	 */
+	List<DataInfoEntityMoveTmp> findAll() throws Exception;
+	
+	int update(DataInfoEntityMoveTmp data) throws Exception;
+	
+	int save(DataInfoEntityMoveTmp data) throws Exception;
+	
+	int remove(DataInfoEntityMoveTmp data) throws Exception;
+	
+}

src/com/platform/entities/Brick.java

@@ -20,13 +20,46 @@ package com.platform.entities;
  */
 
 public class Brick {
-
+	
+	/** volume总大小  */
+	private double availableSize;
+	
+	/** volume已使用大小  */
+	private double usedSize;
 	/** ip  */
 	private String ip;
 	
 	/** 路径  */
 	private String path;
 
+	/**
+	 * @return the availableSize
+	 */
+	public double getAvailableSize() {
+		return availableSize;
+	}
+
+	/**
+	 * @param availableSize the availableSize to set
+	 */
+	public void setAvailableSize(double availableSize) {
+		this.availableSize = availableSize;
+	}
+
+	/**
+	 * @return the usedSize
+	 */
+	public double getUsedSize() {
+		return usedSize;
+	}
+
+	/**
+	 * @param usedSize the usedSize to set
+	 */
+	public void setUsedSize(double usedSize) {
+		this.usedSize = usedSize;
+	}
+
 	/**
 	 * @return the ip
 	 */

src/com/platform/entities/DataInfoEntityMoveTmp.java

@@ -0,0 +1,54 @@
+package com.platform.entities;
+
+public class DataInfoEntityMoveTmp extends DataInfoEntity {
+	
+	private String dstPath;
+	
+	private String completeStatus;
+	
+	private int rate;
+
+	/**
+	 * @return the dstPath
+	 */
+	public String getDstPath() {
+		return dstPath;
+	}
+
+	/**
+	 * @param dstPath the dstPath to set
+	 */
+	public void setDstPath(String dstPath) {
+		this.dstPath = dstPath;
+	}
+
+	/**
+	 * @return the completeStatus
+	 */
+	public String getCompleteStatus() {
+		return completeStatus;
+	}
+
+	/**
+	 * @param completeStatus the completeStatus to set
+	 */
+	public void setCompleteStatus(String completeStatus) {
+		this.completeStatus = completeStatus;
+	}
+
+	/**
+	 * @return the rate
+	 */
+	public int getRate() {
+		return rate;
+	}
+
+	/**
+	 * @param rate the rate to set
+	 */
+	public void setRate(int rate) {
+		this.rate = rate;
+	}
+	
+
+}

src/com/platform/glusterfs/ClusterInfo.java

@@ -14,6 +14,16 @@ import org.apache.log4j.PropertyConfigurator;
 
 import com.platform.utils.Constant;
 
+/**
+ * 获取集群节点信息
+ * 如果获取不正常，则返回null，如果获取正常，返回map表示节点ip和ip的状态
+ * 如果ip在集群中且联通状态为PeerinCluster(Connected)
+ * 如果ip在集群中且但不连通为PeerinCluster(Disconnected)
+ * @author    liliy
+ * @version   [版本号，2016年9月12日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
 public class ClusterInfo {
 	public static Logger log = Logger.getLogger(ClusterInfo.class);
 
@@ -21,11 +31,6 @@ public class ClusterInfo {
 		log.info("get cluster info");
 		Map<String, String> peerIps = new HashMap<String, String>();
 
-		/*
-		String command = "echo \"" + Constant.rootPasswd + "\"|sudo -S gluster peer status";
-		RunCommand runCommand = new RunCommand();
-		List<String> reStrings = runCommand.runCommandWait(command);
-		*/
 		List<String> reStrings = Constant.ganymedSSH.execCmdWait(Constant.hostIp, Constant.rootUser, Constant.rootPasswd, Constant.port, Constant.glusterPeerStatus);
 		if (reStrings == null) {
 			log.error("1101 command get result is null");
@@ -76,7 +81,26 @@ public class ClusterInfo {
 		}
 		return peerIps;
 	}
-
+ 
+	/**
+	 * 根据给定的ip获的ip的状态，即是否在集群中并联通
+	 * 如果ip不在集群中，返回null
+	 * 如果ip在集群中且联通状态为PeerinCluster(Connected)
+	 * 如果ip在集群中且但不连通为PeerinCluster(Disconnected)
+	 * @param peerip
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public String getPeerStatus(String peerip){
+		Map<String, String> peerIps=showClusterInfo();
+		if(peerIps==null || peerIps.size()==0){
+			return null;
+		}
+		if(!peerIps.containsKey(peerip)){
+			return Constant.peerincluster_disconnected;
+		}
+		return peerIps.get(peerip);
+	}
 	
 	
 	public static void main(String[] args) {

src/com/platform/glusterfs/GetTreeData.java

@@ -1,14 +1,15 @@
+
 package com.platform.glusterfs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.PropertyConfigurator;
 import org.junit.Test;
-import org.springframework.stereotype.Service;
-
 import com.platform.entities.FolderNode;
+import com.platform.utils.Constant;
+import com.platform.utils.FileOperateHelper;
+import com.platform.utils.GanymedSSH;
 
 /**
  * <一句话功能简述> 获得GFS某个目录下的子目录
@@ -29,7 +30,10 @@ public class GetTreeData {
 	 * @see [类、类#方法、类#成员]
 	 */
 	public FolderNode getDatas(String name) {
-		FolderNode fileNode = new FolderNode(name);
+		String names[]=name.split("/");
+		String only_name=names[names.length-1];
+		FolderNode fileNode = new FolderNode(only_name);
+		fileNode.setPath(name);
 		Map<String, String> files = showData.showFolderData(name);
 		if(files==null || files.size()==0){
 			return fileNode;
@@ -38,10 +42,10 @@ public class GetTreeData {
 		List<FolderNode> list = new ArrayList<FolderNode>();
 		fileNode.setChildNodes(list);
 		for (Map.Entry<String, String> entry : files.entrySet()) {
-			int number = Integer.parseInt(entry.getValue());
-			if ("app".equals(entry.getKey())) {
+			if(entry.getKey().equals("app")){
 				continue;
 			}
+			int number = Integer.parseInt(entry.getValue());
 			if (number == 1) {
 				fileNode.getChildNodes().add(new FolderNode(entry.getKey(), number));
 			}
@@ -54,27 +58,65 @@ public class GetTreeData {
 		return fileNode;
 	}
 	
-//	public static void main(String[] args) {
-//		GetTreeData getTreeData=new GetTreeData();
-//		FileOrFolder fileOrFolder=getTreeData.getDatas("/home");
-//		System.out.println(fileOrFolder);
-//	}
+	
+	/**
+	 * <一句话功能简述> 获得所以子目录
+	 * <功能详细描述>
+	 * @param name
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public FolderNode getDatasWithShell(String name) {
+		if(name.endsWith("/")){
+			name=name.substring(0, name.length());
+		}
+		String names[]=name.split("/");
+		String only_name=names[names.length-1];
+		FolderNode fileNode = new FolderNode(name);
+		fileNode.setPath(name);
+		
+		String shellComment=new FileOperateHelper().fileReaderAndendline(Constant.fileGetTreeData);
+		String sh_path="/getTreedata.sh";
+		String cmd="echo -e "+shellComment+" > "+sh_path+" & chmod +x "+sh_path;
+		Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+//		Map<String, String> files = showData.showFolderData(name);
+		List<String> files=Constant.ganymedSSH.execCmdWaitAcquiescent(sh_path+" "+name);
+		if(files==null){
+			return null;
+		}
+		if(files.size()==0){
+			return fileNode;
+		}
+		for(String file:files){
+			
+		}
+
+		return fileNode;
+	}
+	@Test
+	public void test_getTreeData() {
+	
+		GetTreeData getTreeData=new GetTreeData();
+		FolderNode fileOrFolder=getTreeData.getDatas("/home");
+		System.out.println(fileOrFolder);
+	}
 }
+/*
+class FileOrFolder {
+	String name;
+	int isFolder; // 1 is file and other integer is folder show children number
+	List<FileOrFolder> children;
 
-//class FileOrFolder {
-//	String name;
-//	int isFolder; // 1 is file and other integer is folder show children number
-//	List<FileOrFolder> children;
-//
-//	public FileOrFolder(String name) {
-//		// TODO Auto-generated constructor stub
-//		this.name = name;
-//	}
-//
-//	public FileOrFolder(String name, int isFolder) {
-//		// TODO Auto-generated constructor stub
-//		this.name = name;
-//		this.isFolder = isFolder;
-//	}
-//}
+	public FileOrFolder(String name) {
+		// TODO Auto-generated constructor stub
+		this.name = name;
+	}
+
+	public FileOrFolder(String name, int isFolder) {
+		// TODO Auto-generated constructor stub
+		this.name = name;
+		this.isFolder = isFolder;
+	}
+}
 
+*/

src/com/platform/glusterfs/SetCluster.java

@@ -1,5 +1,11 @@
 package com.platform.glusterfs;
 
-public class SetCluster {
+import org.apache.log4j.Logger;
 
+public class SetCluster {
+	public static Logger log =   Logger.getLogger ( SetCluster.class); 
+	
+	public int addPeer(String peerip){
+		return 0;
+	}
 }

src/com/platform/glusterfs/SetVolume.java

@@ -108,16 +108,18 @@ public class SetVolume {
 			return -1;
 		}
 
-		String mountPoint = new VolumeInfo().getVolumeMountPoint(volumeName);
+		List<String> mountPoints = new VolumeInfo().getVolumeMountPoint(volumeName);
 		if (stopVolume(volumeName) != 0) {
 			log.error("3802 " + volumeName + " stop failed !");
 			return -2;
 		}
 		log.info("stop "+volumeName+" successed!");
-		if (mountPoint != null) {
-			String command = "umount " + mountPoint;
+		for(String mountPoint:mountPoints){
+			if (mountPoint != null) {
+			String command = "umount -l " + mountPoint;
 			Constant.ganymedSSH.execCmdNoWaitAcquiescent(command);
-			log.info("umount "+mountPoint+" successed!");
+			log.info("umount  "+mountPoint+" successed!");
+		}
 		}
 		String command="echo -e \"y\"| gluster volume delete "+volumeName;
 		List<String> reStrings=Constant.ganymedSSH.execCmdWaitAcquiescent(command);

src/com/platform/glusterfs/ShowData.java

@@ -17,13 +17,14 @@ import com.platform.utils.Constant;
 public class ShowData {
 	
 	public static Logger log =   Logger.getLogger ( ShowData.class); 
+
 	/**
-	 * get the data of volumeName Map<string s1,string s2> s1 is data name and s2 is type file or folder 
+	 * get the data of volumeName Map<string s1,string s2> s1 is data name and s2 is type file or folder
+	 * <功能详细描述>
 	 * @param volumeName
 	 * @return
+	 * @see [类、类#方法、类#成员]
 	 */
-
-
 	public Map<String,String> showVolumeFiles(String volumeName){
 		log.info("start show the data");		
 		Map<String,String> data_type=new HashMap<String, String>();