volumeType，冷热区的更改

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

@@ -44,11 +44,16 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 			jdbcType="VARCHAR" />
 		<result property="volumePath" column="volume_path" javaType="string"
 			jdbcType="VARCHAR" />
+		<result property="mark" column="mark" javaType="string"
+		jdbcType="VARCHAR" />
 	</resultMap>
 	<sql id="conditionsFilters">
 		<if test="dataType!=null">
 			AND data_details.data_type=#{dataType}
 		</if>
+		<if test="mark!=null and mark != ''">
+			AND data_details.mark=#{mark}
+		</if>
 		<if test="submittedBatch!=null">
 			AND
 			data_details.submitted_batch=#{submittedBatch}
@@ -80,7 +85,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 	<select id="getLimitedDataInfoEntities" parameterType="com.platform.entities.PagerOptions"
 		resultMap="getEntityByText">
 		SELECT
-		id,regionalism_code,city_name,district_name,system_code,system_name,data_type,data_version,submitted_batch,data_path,data_charset,collection_time,collector_name,collector_contacts,extract_status,data_year,start_year,end_year,volume_ip,volume_path
+		id,regionalism_code,city_name,district_name,system_code,system_name,data_type,data_version,submitted_batch,data_path,data_charset,collection_time,collector_name,collector_contacts,extract_status,data_year,start_year,end_year,volume_ip,volume_path,mark
 		FROM data_details
 			<where>
 				<include refid="conditionsFilters" />
@@ -103,7 +108,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 	<!-- 获取数据符合筛选条件的全部记录信息 -->
 	<select id="findAll" resultMap="getEntityByText">
 		SELECT
-		id,regionalism_code,city_name,district_name,system_code,system_name,data_type,data_version,submitted_batch,data_path,data_charset,collection_time,collector_name,collector_contacts,extract_status,data_year,start_year,end_year,volume_ip,volume_path
+		id,regionalism_code,city_name,district_name,system_code,system_name,data_type,data_version,submitted_batch,data_path,data_charset,collection_time,collector_name,collector_contacts,extract_status,data_year,start_year,end_year,volume_ip,volume_path,mark
 		FROM data_details
 		ORDER BY data_details.id
 	</select>

src/com/platform/controller/DataModelController.java

@@ -93,7 +93,8 @@ public class DataModelController extends BaseController {
 				.append("}").toString());
 		PagerOptions pagerOptions = (PagerOptions) UtilsHelper
 				.newObjAndSetAttrsByClass(PagerOptions.class, params);
-
+		//冷热区查询字段mark
+		pagerOptions.setMark(String.valueOf(pagerOptions.getVolumeType()));
 		return dfs.getPagerTableData(pagerOptions);
 	}
 

src/com/platform/entities/DataInfoEntity.java

@@ -35,6 +35,10 @@ public class DataInfoEntity {
 	/**	volume的path	 */
 	private String volumePath;
 	
+	private int volumeType;
+	
+	private String mark;
+	
 	public DataInfoEntity() {
 	}
 
@@ -251,6 +255,34 @@ public class DataInfoEntity {
 		this.volumePath = volumePath;
 	}
 
+	/**
+	 * @return the volumeType
+	 */
+	public int getVolumeType() {
+		return volumeType;
+	}
+
+	/**
+	 * @param volumeType the volumeType to set
+	 */
+	public void setVolumeType(int volumeType) {
+		this.volumeType = volumeType;
+	}
+
+	/**
+	 * @return the mark
+	 */
+	public String getMark() {
+		return mark;
+	}
+
+	/**
+	 * @param mark the mark to set
+	 */
+	public void setMark(String mark) {
+		this.mark = mark;
+	}
+
 	@Override
 	public String toString() {
 		return "id=" + this.id + " ,regionalismCode=" + this.regionalismCode

src/com/platform/entities/PagerOptions.java

@@ -27,9 +27,13 @@ public class PagerOptions {
 	private Integer priorTableSize; //前一次操作一页显示的数据条数
 	
 	private String keyQuery;
-	
+	//模糊查询字段
 	private String[] array;
 	
+	private int volumeType;
+	//冷热区字段
+	private String mark;
+	
 	public Integer getCurrentPageNum() {
 		return currentPageNum;
 	}
@@ -153,5 +157,33 @@ public class PagerOptions {
 	public void setArray(String[] array) {
 		this.array = array;
 	}
+
+	/**
+	 * @return the volumeType
+	 */
+	public int getVolumeType() {
+		return volumeType;
+	}
+
+	/**
+	 * @param volumeType the volumeType to set
+	 */
+	public void setVolumeType(int volumeType) {
+		this.volumeType = volumeType;
+	}
+
+	/**
+	 * @return the mark
+	 */
+	public String getMark() {
+		return mark;
+	}
+
+	/**
+	 * @param mark the mark to set
+	 */
+	public void setMark(String mark) {
+		this.mark = mark;
+	}
 	
 }

src/com/platform/service/DataInfoServiceImp.java

@@ -46,6 +46,11 @@ public class DataInfoServiceImp implements DataInfoService {
 			pagerOptions.setOffset(offset + 1);
 			List<DataInfoEntity> result = dfdDao
 					.getLimitedDataInfoEntities(pagerOptions);
+			if (null != result) {
+				for (DataInfoEntity dataInfoEntity : result) {
+					dataInfoEntity.setVolumeType(Integer.valueOf(dataInfoEntity.getMark()));
+				}
+			}
 			modelMap.addAttribute("data", result);
 			modelMap.addAttribute("length", count);
 		} catch (Exception e) {

src/com/platform/service/impl/MoveDataServiceImpl.java

@@ -57,6 +57,12 @@ public class MoveDataServiceImpl implements IMoveDataService {
 	public boolean moveData(List<DataInfoEntity> data, FolderNode node)
 			throws Exception {
 		boolean isSuccess = false;
+		if (null ==node.getName() ||"".equals(node.getName())) {
+			return false;
+		}
+		if (null ==node.getPath() ||"".equals(node.getPath())) {
+			return false;
+		}
 		String tailPath = "";
 		if (null != data) {
 			// XXX/320198_16/1,or XXX/320122KFQ_15/1 ---> /320198_16/1, or