git-svn-id: https://192.168.57.71/svn/jsgkj@314 931142cf-59ea-a443-aa0e-51397b428577

xtdsp/trunk/src/main/java/com/xt/dsp/mappers/TaskSqlBeanMapper.java

@@ -6,5 +6,10 @@ import com.xt.dsp.model.TaskSqlBean;
 import com.xt.dsp.system.BaseMapper;
 
 public interface TaskSqlBeanMapper extends BaseMapper<TaskSqlBean> {
-	List<TaskSqlBean> selectByTaskId(String taskId);
+	/**
+	 * 根据任务编码查询Sql任务配置
+	 * @param taskId
+	 * @return
+	 */
+	List<TaskSqlBean> selectByTaskCode(String taskId);
 }

xtdsp/trunk/src/main/java/com/xt/dsp/model/TaskSqlBean.java

@@ -6,7 +6,7 @@ public class TaskSqlBean {
 	public static final String MODE_ONE = "1";
 	public static final String MODE_ALL = "2";
 	private String id;
-	private String taskId;
+	private String taskCode;
 	private String srcConn;
 	private String targetConn;
 	private String querySql;
@@ -55,8 +55,8 @@ public class TaskSqlBean {
 		return targetTable;
 	}
 
-	public String getTaskId() {
-		return taskId;
+	public String getTaskCode() {
+		return taskCode;
 	}
 
 	public String getUpdateSql() {
@@ -99,8 +99,8 @@ public class TaskSqlBean {
 		this.targetTable = targetTable == null ? null : targetTable.trim();
 	}
 
-	public void setTaskId(String taskId) {
-		this.taskId = taskId == null ? null : taskId.trim();
+	public void setTaskCode(String taskCode) {
+		this.taskCode = taskCode == null ? null : taskCode.trim();
 	}
 
 	public void setUpdateSql(String updateSql) {

xtdsp/trunk/src/main/java/com/xt/dsp/service/TaskSqlService.java

@@ -6,7 +6,7 @@ import com.xt.dsp.model.TaskSqlBean;
 
 public interface TaskSqlService extends TaskRun {
 
-	List<TaskSqlBean> selectByTaskId(String taskId);
+	List<TaskSqlBean> selectByTaskCode(String taskCode);
 
 	TaskSqlBean selectByPrimaryKey(String id);
 

xtdsp/trunk/src/main/java/com/xt/dsp/serviceImpl/TaskSqlServiceImpl.java

@@ -55,8 +55,8 @@ public class TaskSqlServiceImpl implements TaskSqlService {
 	@Autowired
 	private DataSourceService dataSourceService;
 
-	public List<TaskSqlBean> selectByTaskId(String taskId) {
-		return mapper.selectByTaskId(taskId);
+	public List<TaskSqlBean> selectByTaskCode(String taskCode) {
+		return mapper.selectByTaskCode(taskCode);
 	}
 
 	/**
@@ -75,7 +75,8 @@ public class TaskSqlServiceImpl implements TaskSqlService {
 	}
 
 	/**
-	 * SQL同步任务处理
+	 * SQL同步任务处理<br>
+	 * 事务处理
 	 * 
 	 * @param taskSqlBeans
 	 */
@@ -86,7 +87,7 @@ public class TaskSqlServiceImpl implements TaskSqlService {
 		long start = System.currentTimeMillis();
 		// 执行缓存
 		executeCache(t);
-		List<TaskSqlBean> taskSqlBeans = selectByTaskId(t.getId());
+		List<TaskSqlBean> taskSqlBeans = selectByTaskCode(t.getCode());
 		if (taskSqlBeans == null || taskSqlBeans.size() == 0) {
 			return 0;
 		}

xtdsp/trunk/src/main/resources/com/xt/dsp/mappers/TaskSqlBeanMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.xt.dsp.mappers.TaskSqlBeanMapper" >
   <resultMap id="BaseResultMap" type="com.xt.dsp.model.TaskSqlBean" >
     <id column="ID" property="id" jdbcType="VARCHAR" />
-    <result column="TASK_ID" property="taskId" jdbcType="VARCHAR" />
+    <result column="TASK_CODE" property="taskCode" jdbcType="VARCHAR" />
     <result column="SRC_CONN" property="srcConn" jdbcType="VARCHAR" />
     <result column="TARGET_CONN" property="targetConn" jdbcType="VARCHAR" />
     <result column="QUERY_SQL" property="querySql" jdbcType="VARCHAR" />
@@ -19,17 +19,17 @@
     where ID = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.xt.dsp.model.TaskSqlBean" >
-    insert into DSP_TASK_SQL (ID, TASK_ID, SRC_CONN, TARGET_CONN,QUERY_SQL, 
+    insert into DSP_TASK_SQL (ID, TASK_CODE, SRC_CONN, TARGET_CONN,QUERY_SQL, 
        TARGET_TABLE,UPDATE_SQL,INSERT_SQL,REFRESH_SQL,COLUMNS,SYN_MODE
       )
-    values (#{id,jdbcType=VARCHAR}, #{taskId,jdbcType=VARCHAR}, #{srcConn,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=VARCHAR}, #{taskCode,jdbcType=VARCHAR}, #{srcConn,jdbcType=VARCHAR}, 
       #{targetConn,jdbcType=VARCHAR}, #{querySql,jdbcType=VARCHAR}, #{targetTable,jdbcType=VARCHAR}, #{updateSql,jdbcType=VARCHAR},
       #{insertSql,jdbcType=VARCHAR},#{refreshSql,jdbcType=VARCHAR},#{columns,jdbcType=VARCHAR},#{mode,jdbcType=VARCHAR}
       )
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.dsp.model.TaskSqlBean" >
     update DSP_TASK_SQL
-    set TASK_ID = #{taskId,jdbcType=VARCHAR},
+    set TASK_CODE = #{taskCode,jdbcType=VARCHAR},
       SRC_CONN = #{srcConn,jdbcType=VARCHAR},
       TARGET_CONN = #{targetConn,jdbcType=VARCHAR},
       QUERY_SQL = #{querySql,jdbcType=VARCHAR},
@@ -42,19 +42,19 @@
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select ID, TASK_ID, SRC_CONN, TARGET_CONN, TARGET_TABLE,QUERY_SQL, 
+    select ID, TASK_CODE, SRC_CONN, TARGET_CONN, TARGET_TABLE,QUERY_SQL, 
        TARGET_TABLE,UPDATE_SQL,INSERT_SQL,REFRESH_SQL,COLUMNS,SYN_MODE
     from DSP_TASK_SQL
     where ID = #{id,jdbcType=VARCHAR}
   </select>
-  <select id="selectByTaskId" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select ID, TASK_ID, SRC_CONN, TARGET_CONN, TARGET_TABLE,QUERY_SQL, 
+  <select id="selectByTaskCode" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select ID, TASK_CODE, SRC_CONN, TARGET_CONN, TARGET_TABLE,QUERY_SQL, 
        TARGET_TABLE,UPDATE_SQL,INSERT_SQL,REFRESH_SQL,COLUMNS,SYN_MODE
     from DSP_TASK_SQL
-    where TASK_ID = #{taskId,jdbcType=VARCHAR}
+    where TASK_CODE = #{taskCode,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
-    select ID, TASK_ID, SRC_CONN, TARGET_CONN, TARGET_TABLE,QUERY_SQL, 
+    select ID, TASK_CODE, SRC_CONN, TARGET_CONN, TARGET_TABLE,QUERY_SQL, 
        TARGET_TABLE,UPDATE_SQL,INSERT_SQL,REFRESH_SQL,COLUMNS,SYN_MODE
     from DSP_TASK_SQL
   </select>