Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into develope

WebContent/WEB-INF/config/config.properties

@@ -17,6 +17,9 @@ jdbc.mysql.password=root
 #=============================================================================================================
 # hui用户名
 gather-user-name=system
+gather-standard-user-name=u_bzbjy
+gather-standard-exec-table-name=kzxzb
+gather-standard-pay-table-name=zfxxb
 # 密码
 gather-user-password=oracle
 
@@ -43,7 +46,7 @@ jdbc.minEvictableIdleTimeMillis=300000
 #
 #==============================================================================================================
 table-suffix=_20152016
-extract-log-localtion=/home/web_manage/log/
+
 gather-tablespace-name=TS_TTSSS
 
 #dbf file's path              must exist
@@ -57,43 +60,53 @@ kubeMasterUrl=http://192.168.0.110:8080/
 collect-user-name=system
 collect-password=oracle
 collect-service-name=orcl
+# standard table :  
+# eg:sql ->  select count(*) from u_bzbjy.kzxzb;  select count(*) from u_bzbjy.zfxxb;
+collect-user-table=u_bzbjy
+collect-exec-table=kzxzb
+collect-pay-table=zfxxb
 
 gfs_control_ip=192.168.0.110
 
 gfs_control_rootPassWd=root
 
-HttpClientConstant_URL_IP_PORT=http://192.168.0.110:8088/jfinal/
+HttpClientConstant_URL_IP_PORT=http://192.168.0.110:9001/
 
 dataBefore=6
 
+numOneImportExcel=12
+oracle-orcl=orcl
+oracle-user=system
+oracle-psw=oracle
+
 #=============================================================================================================
-# 文件上传下载
+# windows path
 #=============================================================================================================
-#file_upload_path=D:\\test\\
+
+#extract-log-localtion=D:\\test\\log\\
+#extract-standard-log-localtion=D:\\test\\log2\\
 #
+#file_upload_path=D:\\test\\
 #file_download_path=D:\\test\\export.xlsx
 #
 #package_download_path=D:\\test\\
-#
 #package_name=sql_script_standard
 #
 #sql_script_path_last=D:\\test\\sql_script_last\\
-#
 #sql_script_path_standard=D:\\test\\sql_script_standard\\
 
 #=============================================================================================================
-# 文件上传下载
+# linux path
 #=============================================================================================================
 
-file_upload_path=/excel_import_dir/
+extract-log-localtion=/home/web_manage/log/
+extract-standard-log-localtion=/home/web_manage/log2/
 
+file_upload_path=/excel_import_dir/
 file_download_path=/excel_export_dir/export.xlsx
 
 package_download_path=/
-
 package_name=DefaultDescription
 
 sql_script_path_last=/DefaultDescription_last/
-
 sql_script_path_standard=/DefaultDescription/
-

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

@@ -4,16 +4,24 @@
     "http://mybatis.org/dtd/mybatis-3-config.dtd">
 <configuration>
 	<typeAliases>
+		<typeAlias alias="string" type="java.lang.String" />
 		<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="PagerOptions" type="com.platform.form.PagerOptions"/>
 		<typeAlias alias="GatherOracleInfo" type="com.platform.entities.GatherOracleInfo"/>
 		<typeAlias alias="DataInfoEntityMoveTmp" type="com.platform.entities.DataInfoEntityMoveTmp"/>
 		<typeAlias alias="SystemEntity" type="com.platform.entities.SystemEntity"/>
 		<typeAlias alias="RegionalismEntity" type="com.platform.entities.RegionalismEntity"/>
-		<typeAlias alias="oracleForm" type="com.platform.entities.oracleForm"/>
+		<typeAlias alias="oracleForm" type="com.platform.form.oracleForm"/> 
 	</typeAliases>
-	<mappers>
+	
+	<plugins>
+	 <plugin interceptor="com.platform.utils.page.PageInterceptor">    
+	    </plugin>  
+	</plugins>
+	
+	
+	<!-- <mappers>
 		<mapper resource="com/dao/mapper/data-details-mapper.xml" />
 		<mapper resource="com/dao/mapper/config-details-mapper.xml"/>	
 		<mapper resource="com/dao/mapper/dataInfoMoveTmpmapper.xml"/>
@@ -22,4 +30,6 @@
 		<mapper resource="com/dao/mapper/SystemCodeMapper.xml"/>
 		<mapper resource="com/dao/mapper/VolumeMapper.xml"/>
 	</mappers>
+	 -->
+	
 </configuration>    

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

@@ -22,6 +22,7 @@
        http://www.springframework.org/schema/task/spring-task-3.0.xsd">
 
 	<!-- 读取db.properties中的属性值 -->
+
 	<bean
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="location" value="WEB-INF/config/config.properties"></property>
@@ -40,13 +41,29 @@
 		<property name="username" value="${jdbc.mysql.username}" />
 		<property name="password" value="${jdbc.mysql.password}" />
 	</bean>
+<!-- 	<bean id="mySQLSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
+		<property name="configLocation" value="WEB-INF/config/mybatis-applicationConfig.xml" />
+		<property name="dataSource" ref="mySQLDataSource" />
+	</bean> -->
 	<bean id="mySQLSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
 		<property name="configLocation" value="WEB-INF/config/mybatis-applicationConfig.xml" />
 		<property name="dataSource" ref="mySQLDataSource" />
+		<property name="mapperLocations">   
+		  <list>           
+		    <value>classpath:com/dao/mapper/*apper.xml</value>      
+		  </list>    
+	    </property>
 	</bean>
+	
+		<!-- mapper扫描器 -->
 	<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-		<property name="basePackage" value="com.platform.dao,com.dao.mapper" />
+		<!-- 扫描包路径，如果需要扫描多个包，中间使用半角逗号隔开 -->
+		<property name="basePackage" value="com/platform/dao"></property>
+		<property name="sqlSessionFactoryBeanName" value="mySQLSessionFactory" />
 	</bean>
+	<!-- <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
+		<property name="basePackage" value="com.platform.dao" />
+	</bean> -->
 	<!-- 配置声明式事物 事物管理器 -->
 	<!-- 配置声明式事物 -->
 	<bean id="mySQLTxManager"

src/com/base/BaseController.java

@@ -15,6 +15,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 
 import com.platform.utils.Configs;
@@ -30,7 +31,7 @@ import com.platform.utils.Configs;
 public class BaseController { 
 	
 	/** log4j  */
-	public static Logger log = Configs.DAILY_ROLLING_LOGGER;
+	public final static Logger log = Logger.getLogger(BaseController.class);
 	
     /**
      * <一句话功能简述> 基于@ExceptionHandler异常处理----全局异常处理
@@ -42,19 +43,21 @@ public class BaseController {
      */
     @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 " + ex);
+    	log.error("URI"+request.getRequestURI());
+        log.error("BaseController --exp " + ex);
         new CustomException("base_code_", ex);
         // 根据不同错误转向不同页面  
         if(ex instanceof CustomException) {
+        	//返回异常信息
+        	ModelMap modelMap = new ModelMap();
         	CustomException cuse = (CustomException) ex;
         	Map<String, String> errmsg = new HashMap<>();
         	errmsg.put("code", cuse.getCode());
         	errmsg.put("msg", cuse.getMsg());
         	log.error(cuse.getCode());
+        	modelMap.addAllAttributes(errmsg);
         	response.setStatus(500);
-            return response;  
+            return modelMap;  
         } else {  
         	//其他错误则 调到指定页面
         	log.error(Configs.GLOBAL_EXP_NOT_CUSTOM, ex);

src/com/base/Custom4exception.java

@@ -42,4 +42,8 @@ public class Custom4exception {
 	/**	 * MySQL错误	 */
 	public final static String MySQL_Except = "3002002001";
 	
+//3003001
+	/**	 * 信息系统-校验-sqlserver抽取标准表 --连接不上标准表汇总库错误	 */
+	public final static String CHECKOUT_EXTRACT_EXCEPT = "3003001001";
+	
 }

src/com/base/CustomException.java

@@ -7,7 +7,6 @@ import java.lang.reflect.InvocationTargetException;
 
 import org.apache.log4j.Logger;
 
-import com.platform.controller.DataModelController;
 import com.platform.utils.Bean2MapUtils;
 import com.platform.utils.Configs;
 import com.platform.utils.Constant;
@@ -51,7 +50,7 @@ public class CustomException extends Exception {
 	 * @param obj
 	 */
 	public CustomException(String code,Exception e,Object... obj) {
-		super(code);
+//		super(code);
 		StringBuffer sbuf= new StringBuffer();
 		this.code = code;
 		sbuf.append(code);

src/com/base/MyException.java

@@ -0,0 +1,44 @@
+
+/**
+ * 文件名   :   MyException.java
+ * 版权       :   <版权/公司名>
+ * 描述       :   <描述>
+ * @author  liliy
+ * 版本       :   <版本>
+ * 修改时间：      2016年10月19日
+ * 修改内容：      <修改内容>
+ */
+package com.base;
+
+/**
+ * <一句话功能简述>
+ * <功能详细描述>
+ * @author    liliy
+ * @version   [版本号，2016年10月19日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+
+public class MyException {
+	private String mess;
+	
+	public MyException() {
+	}
+	
+	/**
+	 * <一句话功能简述>
+	 * <功能详细描述>
+	 * @see [类、类#方法、类#成员]
+	 */
+	public MyException(String mess) {
+		// TODO Auto-generated constructor stub
+		setMess(mess);
+	}
+	
+	public void setMess(String mess){
+		this.mess=mess;
+	}
+	public String getMess(){
+		return this.mess;
+	}
+}

src/com/base/PostData.java

@@ -0,0 +1,114 @@
+
+/**
+ * 文件名   :   PostObj.java
+ * 版权       :   <版权/公司名>
+ * 描述       :   <描述>
+ * @author  liliy
+ * 版本       :   <版本>
+ * 修改时间：      2016年10月18日
+ * 修改内容：      <修改内容>
+ */
+package com.base;
+
+import java.util.List;
+import java.util.Stack;
+
+/**
+ * <一句话功能简述>
+ * <功能详细描述>
+ * @author    liliy
+ * @version   [版本号，2016年10月18日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+
+public class PostData {
+	private Object data;
+	private Stack<MyException> exceptionsStack;
+	/**
+	 * <一句话功能简述>
+	 * <功能详细描述>
+	 * @see [类、类#方法、类#成员]
+	 */
+	public PostData() {
+		// TODO Auto-generated constructor stub
+		exceptionsStack=new Stack<>();
+	}
+	public PostData(Object data) {
+		// TODO Auto-generated constructor stub
+		this.data=data;
+		exceptionsStack=new Stack<>();
+	}
+	/**
+	 * @return the data
+	 */
+	public Object getData() {
+		return data;
+	}
+	/**
+	 * @param data the data to set
+	 */
+	public void setData(Object data) {
+		this.data = data;
+	}
+	/**
+	 * 
+	 * <一句话功能简述>
+	 * <功能详细描述>
+	 * @param e
+	 * @see [类、类#方法、类#成员]
+	 */
+	public void pushExceptionsStack(String mess){
+		MyException myException=new MyException(mess);
+		exceptionsStack.push(myException);
+	}
+	public void pushExceptionsStackList(List<String> messs){
+		if(messs==null)return;
+		for(String mess:messs){
+		MyException myException=new MyException(mess);
+		exceptionsStack.push(myException);
+		}
+	}
+	/**
+	 * 
+	 * <一句话功能简述>
+	 * <功能详细描述>
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public MyException popExceptionsStack(){
+		if (isEmptyExceptionsStack()){
+			return null;
+		}
+		return exceptionsStack.pop();
+	}
+	/**
+	 * 
+	 * <一句话功能简述>
+	 * <功能详细描述>
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public boolean isEmptyExceptionsStack(){
+		return exceptionsStack.empty();
+	}
+	/**
+	 * 
+	 * <一句话功能简述>
+	 * <功能详细描述>
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public Stack<MyException> getExceptionsStack() {
+		return exceptionsStack;
+	}
+	/**
+	 * @param exceptionsStack the exceptionsStack to set
+	 */
+	public void setExceptionsStack(Stack<MyException> exceptionsStack) {
+		this.exceptionsStack = exceptionsStack;
+	}
+	
+}
+
+

src/com/base/TaskOperateData.java

@@ -0,0 +1,182 @@
+
+/**
+ * 文件名   :   TaskOperateData.java
+ * 版权       :   <版权/公司名>
+ * 描述       :   <描述>
+ * @author  liliy
+ * 版本       :   <版本>
+ * 修改时间：      2016年11月2日
+ * 修改内容：      <修改内容>
+ */
+package com.base;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.platform.glusterfs.SetCluster;
+import com.platform.utils.Constant;
+import com.platform.utils.Support;
+
+/**
+ * 数据操作中记录 <功能详细描述>
+ * 
+ * @author liliy
+ * @version [版本号，2016年11月2日]
+ * @see [相关类/方法]
+ * @since [产品/模块版本]
+ */
+
+public class TaskOperateData {
+	/**
+	 * 数据状态，0：准备迁移，1：表示正在迁移，2：表示迁移完成，正在MD5校验，3：表示校验成功，-1：表示迁移完成，校验失败,-2:表示迁移失败
+	 * 4:表示正在删除，5：表示删除完成，-3：表示删除失败
+	 */
+	private int status = 1;
+
+	/**
+	 * 任务完成后返回状态
+	 */
+	// private int taskReturn = 0;
+
+	/**
+	 * 任务拷贝数据总大小，以字节为单位
+	 */
+	private Long allSize = 0L;
+	/**
+	 * 已经拷贝了的大小
+	 */
+	private Long completedSize = 0L;
+	/**
+	 * 进度
+	 */
+	private int progress = 0;
+
+	/**
+	 * 源路径和目的路径
+	 */
+	private String sourcePath = null;
+	/** 目的路径 */
+	private String destPath = null;
+
+	/**
+	 * 删除任务数据
+	 */
+	private String removeDataName = null;
+
+	/**
+	 * 任务的开始时间和结束时间
+	 */
+	private String startTime = null;
+	/** 结束时间 */
+	private String endTime = null;
+	/**
+	 * @return the status
+	 */
+	public int getStatus() {
+		return status;
+	}
+	/**
+	 * @param status the status to set
+	 */
+	public void setStatus(int status) {
+		this.status = status;
+	}
+	/**
+	 * @return the allSize
+	 */
+	public Long getAllSize() {
+		return allSize;
+	}
+	/**
+	 * @param allSize the allSize to set
+	 */
+	public void setAllSize(Long allSize) {
+		this.allSize = allSize;
+	}
+	/**
+	 * @return the completedSize
+	 */
+	public Long getCompletedSize() {
+		return completedSize;
+	}
+	/**
+	 * @param completedSize the completedSize to set
+	 */
+	public void setCompletedSize(Long completedSize) {
+		this.completedSize = completedSize;
+	}
+	/**
+	 * @return the progress
+	 */
+	public int getProgress() {
+		return progress;
+	}
+	/**
+	 * @param progress the progress to set
+	 */
+	public void setProgress(int progress) {
+		this.progress = progress;
+	}
+	
+	/**
+	 * @return the sourcePath
+	 */
+	public String getSourcePath() {
+		return sourcePath;
+	}
+	/**
+	 * @param sourcePath the sourcePath to set
+	 */
+	public void setSourcePath(String sourcePath) {
+		this.sourcePath = sourcePath;
+	}
+	/**
+	 * @return the destPath
+	 */
+	public String getDestPath() {
+		return destPath;
+	}
+	/**
+	 * @param destPath the destPath to set
+	 */
+	public void setDestPath(String destPath) {
+		this.destPath = destPath;
+	}
+	/**
+	 * @return the removeDataName
+	 */
+	public String getRemoveDataName() {
+		return removeDataName;
+	}
+	/**
+	 * @param removeDataName the removeDataName to set
+	 */
+	public void setRemoveDataName(String removeDataName) {
+		this.removeDataName = removeDataName;
+	}
+	/**
+	 * @return the startTime
+	 */
+	public String getStartTime() {
+		return startTime;
+	}
+	/**
+	 * @param startTime the startTime to set
+	 */
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+	/**
+	 * @return the endTime
+	 */
+	public String getEndTime() {
+		return endTime;
+	}
+	/**
+	 * @param endTime the endTime to set
+	 */
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+
+}

src/com/base/i18n.properties

@@ -8,4 +8,7 @@
 3002001003=\u8FDE\u63A5\u6C47\u603B-\u521B\u5EFAoracle\u8FDE\u63A5\u5931\u8D25
 
 #3002002
-3002002001=MySQL\u9519\u8BEF
+3002002001=MySQL\u9519\u8BEF
+
+#3003001
+3003001001=\u8FDE\u63A5\u4E0D\u4E0A\u6807\u51C6\u8868\u6C47\u603B\u5E93

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

@@ -15,10 +15,11 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 		<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="type" column="type" 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
+		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,type type
 	</sql>
 
 	<select id="selectAllOracle" resultType="com.platform.entities.GatherOracleInfo">
@@ -59,6 +60,9 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 			<if test="status != null and status != ''">
 				service_status,
 			</if>
+			<if test="type != null and type != ''">
+				type,
+			</if>
 		</trim>
 		)
 		VALUES(
@@ -90,6 +94,9 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 			<if test="status != null and status != ''">
 				#{status},
 			</if>
+			<if test="type != null and type != ''">
+				#{type},
+			</if>
 		</trim>
 		)
 	</insert>
@@ -133,6 +140,9 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 				<if test="status != null and status != ''">
 					service_status= #{status},
 				</if>
+				<if test="type != null and type != ''">
+					type= #{type},
+				</if>
 				<if test="remove != null and remove != ''">
 					remove= #{remove},
 				</if>
@@ -142,5 +152,30 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 			id = #{id}
 		</where>
 	</update>
+	<update id="updateAllOracle" parameterType="com.platform.entities.GatherOracleInfo">
+		UPDATE
+		services_info
+		<set >
+			<trim suffixOverrides=",">
+				<if test="type != null and type != ''">
+					type= #{type},
+				</if>
+			</trim>
+		</set>
+	</update>
+	<update id="updateAllOracleExceptId" parameterType="com.platform.entities.GatherOracleInfo">
+		UPDATE
+		services_info
+		<set >
+			<trim suffixOverrides=",">
+				<if test="type != null and type != ''">
+					type= #{type},
+				</if>
+			</trim>
+		</set>
+		<where>
+			id != #{id}
+		</where>
+	</update>
 	
 </mapper>

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

@@ -5,51 +5,36 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 
 <mapper namespace="com.platform.dao.DataInfoDao">
 	<resultMap id="getEntityByText" type="com.platform.entities.DataInfoEntity">
-		<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="extractStatus" column="extract_status" jdbcType="INTEGER" />
+		<id property="id" column="id"/>
+		<result property="regionalismCode" column="regionalism_code"/>
+		<result property="cityName" column="city_name"/>
+		<result property="districtName" column="district_name"/>
+		<result property="systemCode" column="system_code"/>
+		<result property="systemName" column="system_name"/>
+		<result property="dataType" column="data_type"/>
+		<result property="dataVersion" column="data_version"/>
+		<result property="submittedBatch" column="submitted_batch"/>
+		<result property="dataPath" column="data_path"/>
+		<result property="charset" column="data_charset"/>
+		<result property="collectingTime" column="collection_time"/>
+		<result property="collectorContacts" column="collector_contacts"/>
+		<result property="collectorName" column="collector_name"/>
+		<result property="extractStatus" column="extract_status"/>
 		
-		<result property="year" column="data_year" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="startYear" column="start_year" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="endYear" column="end_year" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="volumeIp" column="volume_ip" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="volumePath" column="volume_path" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="mark" column="mark" javaType="string"
-		jdbcType="VARCHAR" />
-		<result property="volumePath" column="volume_path" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="mark" column="mark" javaType="string"
-		jdbcType="VARCHAR" />
+		<result property="year" column="data_year"/>
+		<result property="startYear" column="start_year"/>
+		<result property="endYear" column="end_year"/>
+		<result property="volumeIp" column="volume_ip"/>
+		<result property="volumePath" column="volume_path"/>
+		<result property="mark" column="mark"/>
+		<result property="volumePath" column="volume_path"/>
+		<result property="dataBaseType" column="data_base_type"/>
+		<result property="execResultLast" column="checkout_indicate_last"/>
+			
+		<result property="payResultLast" column="checkout_pay_last"/>
+		<result property="standardExtractStatus" column="standard_extract_status"/>
+		<result property="checkoutFlag" column="checkout_flag"/>
+		<result property="mark" column="mark"/>
 	</resultMap>
 	<sql id="conditionsFilters">
 		<if test="dataType!=null">
@@ -78,18 +63,21 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 		<if test="dataYear !=null">
 			AND data_details.data_year=#{dataYear}
 		</if>
-		<if test="array !=null and array.length > 0">
+		<if test="dataBaseType !=null and dataBaseType !=''">
+			AND data_details.data_base_type=#{dataBaseType}
+		</if>
+		<if test="array !=null and array.size() != 0">
 			<foreach collection="array" item="item" index="index">
-			AND CONCAT(regionalism_code,system_code,city_name,district_name,system_name,data_year) LIKE CONCAT('%',CONCAT(#{item},'%'))
+				AND CONCAT(regionalism_code,system_code,city_name,district_name,system_name,data_year) LIKE CONCAT('%',CONCAT('${item}','%'))
 			</foreach>
 		</if>
 	</sql>
 
 	<!-- 获取数据符合筛选条件的全部记录信息 -->
-	<select id="getLimitedDataInfoEntities" parameterType="com.platform.entities.PagerOptions"
+	<select id="getLimitedDataInfoEntities" parameterType="com.platform.form.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,mark
+		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,data_base_type,standard_extract_status,checkout_flag,mark
 		FROM data_details
 			<where>
 				<include refid="conditionsFilters" />
@@ -108,15 +96,34 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 				LIMIT #{limit}
 			</if>
 	</select>
+	<!-- 获取数据符合筛选条件的全部记录信息 -->
+	<select id="getLimitedDataInfoByPage" parameterType="com.platform.form.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,data_base_type,standard_extract_status,checkout_flag,mark
+		FROM data_details
+		<where>
+			<include refid="conditionsFilters" />
+		</where>
+		ORDER BY data_details.id
+	</select>
 	
 	<!-- 获取数据符合筛选条件的全部记录信息 -->
 	<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,mark
+		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,data_base_type,standard_extract_status,checkout_flag,mark
 		FROM data_details
 		ORDER BY data_details.id
 	</select>
 	
+	<!-- 获取数据符合筛选条件的全部记录信息 -->
+	<select id="findById" resultMap="getEntityByText" parameterType="java.lang.Integer">
+		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,data_base_type,standard_extract_status,checkout_indicate_last,checkout_pay_last,checkout_flag,mark
+		FROM data_details
+		WHERE id =#{id}
+	</select>
+	
 		<!-- 获取数据 条件：采集时间 -->
 	<select id="findByParam" resultType="com.platform.entities.DataInfoEntity" parameterType="com.platform.entities.DataInfoEntity">
 		SELECT
@@ -129,7 +136,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 
 	<!-- 获取数据符合筛选条件的总记录条数 -->
 	<select id="getLimitedDataCount" resultType="java.lang.Integer"
-		parameterType="com.platform.entities.PagerOptions">
+		parameterType="com.platform.form.PagerOptions">
 		SELECT COUNT(id) FROM data_details
 			<where>
 				<include refid="conditionsFilters" />
@@ -139,7 +146,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 
 	<!-- 获取数据查询的起始di -->
 	<select id="getLimitedBeginId" resultType="java.lang.Integer"
-		parameterType="com.platform.entities.PagerOptions">
+		parameterType="com.platform.form.PagerOptions">
 		SELECT MAX(idx) FROM (SELECT id idx FROM data_details 
 		ORDER BY id LIMIT 0,#{totalLimit}) AS TEMP
 	</select>
@@ -196,6 +203,18 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 			<if test="extractStatus > 0">
 				extract_status,
 			</if>
+			<if test="payResult != null and payResult != ''">
+				checkout_pay,
+			</if>
+			<if test="execResult != null and execResult != ''">
+				checkout_indicate,
+			</if>
+			<if test="startMonth != null and startMonth != ''">
+				start_month,
+			</if>
+			<if test="endMonth != null and endMonth != ''">
+				end_month,
+			</if>
 		</trim>
 		)
 		VALUES(
@@ -248,6 +267,18 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 			<if test="extractStatus > 0">
 				#{extractStatus},
 			</if>
+			<if test="payResult != null and payResult != ''">
+				#{payResult},
+			</if>
+			<if test="execResult != null and execResult != ''">
+				#{execResult},
+			</if>
+			<if test="startMonth != null and startMonth != ''">
+				#{startMonth},
+			</if>
+			<if test="endMonth != null and endMonth != ''">
+				#{endMonth},
+			</if>
 		</trim>
 		)
 	</insert>

src/com/dao/mapper/dataInfoMoveTmpmapper.xml

@@ -61,7 +61,8 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 		b.data_version dataVersion,b.submitted_batch submittedBatch,b.data_path dataPath,b.data_charset charset,
 		b.collection_time collectingTime,b.collector_name collectorName,b.collector_contacts collectorContacts,
 		b.data_year year,b.extract_status extractStatus,b.start_year startYear,b.end_year endYear,
-		b.volume_ip volumeIp,b.volume_path volumePath
+		b.volume_ip volumeIp,b.volume_path volumePath,b.checkout_pay payResult,b.checkout_indicate execResult,
+		b.start_month startMonth,b.end_month endMonth
 		FROM 
 		move_data_tmp a LEFT JOIN data_details b 
 		ON a.system_code = b.system_code AND a.regionalism_code = b.regionalism_code AND a.fkid = b.id
@@ -78,6 +79,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 		<where>
 			a.id = #{id}
 		</where>
+		for update
 	</select>
 	
 	<update id="update" parameterType="com.platform.entities.DataInfoEntityMoveTmp">

src/com/dao/mapper/standard_data_details-mapper.xml

@@ -108,7 +108,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 	
 	<!-- sql txt  find_city_Column_List -->
 	<sql id="find_city_Column_List">
-		d.id dataId,a.area_code areaCode,a.city_name cityName,a.district_name districtName,a.system_name sysName,a.sys_code sysCode,a.area_level areaLevel,a.sys_version sysVersion,a.begin_in_use beginUseTime,a.function_details functionDetails,
+		d.standard_extract_status standardExtractStatus,d.extract_status extractStatus,d.data_year year,d.data_path path,d.id dataId,a.area_code areaCode,a.city_name cityName,a.district_name districtName,a.system_name sysName,a.sys_code sysCode,a.area_level areaLevel,a.sys_version sysVersion,a.begin_in_use beginUseTime,a.function_details functionDetails,
 		a.department_manager departmentManager,a.manager_contacts managerContacts,a.sys_developer_full_name developerFullName,a.data_base_type dataBaseType,a.data_base_version dataBaseVersion,
 		a.is_budget_exec budgetExecManage,a.is_budget_quota budgetQuotaManage,a.is_collection collection,a.is_department_budget departmentBudgetManage,a.total_budget_account totalBudgetAccount,
 		a.final_account_manage finalAccountManage,a.report_form_manage reportFormManage,a.non_tax_revenue_manage nonTaxManage,a.wage_system wageSystem,
@@ -117,7 +117,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 	</sql>
 
 	<!-- 获取数据符合筛选条件的全部记录信息 -->
-	<select id="getLimitedDataInfoEntities" parameterType="com.platform.entities.PagerOptions"
+	<select id="getLimitedDataInfoEntities" parameterType="com.platform.form.PagerOptions"
 		resultMap="getEntityByText">
 		SELECT
 		<include refid="Base_Column_List" />
@@ -145,7 +145,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 
 	<!-- 获取数据符合筛选条件的总记录条数 -->
 	<select id="getLimitedDataCount" resultType="java.lang.Integer"
-		parameterType="com.platform.entities.PagerOptions">
+		parameterType="com.platform.form.PagerOptions">
 		SELECT COUNT(id) FROM standard_data_details
 			<where>
 				<include refid="conditionsFilters" />
@@ -155,7 +155,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 
 	<!-- 获取数据查询的起始di -->
 	<select id="getLimitedBeginId" resultType="java.lang.Integer"
-		parameterType="com.platform.entities.PagerOptions">
+		parameterType="com.platform.form.PagerOptions">
 		SELECT MAX(idx) FROM (SELECT id idx FROM standard_data_details 
 		ORDER BY id LIMIT 0,#{totalLimit}) AS TEMP
 	</select>
@@ -196,8 +196,10 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 		SELECT
 		<include refid="find_city_Column_List" />
 		FROM standard_data_details a left join collection_data_description l on a.area_code=l.regionalism_code AND a.sys_code=l.sys_code
-				left join data_info d on a.area_code=d.regionalism_code AND a.sys_code=d.system_code
-		WHERE a.is_collection='是' AND a.city_name=#{cityName}
+				left join data_info d on a.area_code=d.regionalism_code AND a.sys_code=d.system_code AND d.remove='0'
+			<where>
+				a.is_collection='是' AND a.city_name=#{cityName}
+			</where>
 		ORDER BY a.area_code,a.sys_code,d.data_version
 	</select>