提交代码

JobService/src/main/java/com/java110/job/Api/HcFtpToFileSystemConfigAction.java

@@ -330,8 +330,8 @@ public class HcFtpToFileSystemConfigAction {
 		if (logger.isDebugEnabled()) {
 			logger.debug("---【PrvncFtpToFileSystemConfigAction.queryFtpItemByTaskId】入参为：" + ftpItemJson, ftpItemJson);
 		}
-
 		try {
+
 			// 校验格式是否正确
 			JSONObject.parseObject(ftpItemJson);
 		} catch (Exception e) {

JobService/src/main/java/com/java110/job/dao/IHcFtpFileDAO.java

@@ -162,4 +162,5 @@ public interface IHcFtpFileDAO {
 	 */
 	public void insertFileData2Table(String insertSQL);
 
+
 }

JobService/src/main/java/com/java110/job/smo/HcFtpToFileSystemQuartz.java

@@ -20,7 +20,7 @@ import java.util.*;
  * @author
  * 
  */
-public abstract class HcFtpToFileSystemQuartz implements JobFuLeiQuartz{
+public abstract class HcFtpToFileSystemQuartz{
 
 	protected static final Logger logger = LoggerFactory.getLogger(HcFtpToFileSystemQuartz.class);
 	@Autowired
@@ -67,6 +67,11 @@ public abstract class HcFtpToFileSystemQuartz implements JobFuLeiQuartz{
 		}
 
 		// 保存任务执行主要日志信息
+		//获取LOGID 默认生成规则为tadkid去掉年月日之前的值+66
+		String id = ftpItemConfigInfo.get("TASKID").toString();
+		id = id.substring(10,id.length());
+		long logid = Long.parseLong (id+"22");
+		ftpItemConfigInfo.put("logid",logid);
 		long taskLogID = insertTaskInfo(ftpItemConfigInfo);
 
 		ftpItemConfigInfo.put("logid", taskLogID);
@@ -223,6 +228,7 @@ public abstract class HcFtpToFileSystemQuartz implements JobFuLeiQuartz{
 	 */
 	protected void saveTaskLogDetail(Map taskInfo) {
 		FtpTaskLogDetail logdetail = new FtpTaskLogDetail();
+		logdetail.setId(Long.valueOf(taskInfo.get("logid").toString()+"66"));
 		logdetail.setLogid(Long.valueOf(taskInfo.get("logid").toString()));
 		logdetail.setTaskid(Long.valueOf(taskInfo.get("taskid").toString()));
 		logdetail.setState((String) taskInfo.get("threadrunstate"));

JobService/src/main/java/com/java110/job/smo/JobFuLeiQuartz.java

@@ -1,8 +0,0 @@
-package com.java110.job.smo;
-
-import java.util.Map;
-
-public interface JobFuLeiQuartz {
-
-    void startFtpTask(Map ftpItemConfigInfo) throws Exception;
-}

JobService/src/main/java/com/java110/job/task/HcFtpToFileSystemJob.java

@@ -4,7 +4,6 @@ import com.java110.common.factory.ApplicationContextFactory;
 import com.java110.common.util.SpringBeanInvoker;
 import com.java110.job.dao.IHcFtpFileDAO;
 import com.java110.job.smo.HcFtpToFileSystemQuartz;
-import com.java110.job.smo.JobFuLeiQuartz;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -32,8 +31,7 @@ public class HcFtpToFileSystemJob implements Job {
 	@Autowired
 	private IHcFtpFileDAO iHcFtpFileDAO;
 
-	private JobFuLeiQuartz jobFuLeiQuartz;
-
+	private HcFtpToFileSystemQuartz hcFtpToFileSystemQuartz;
 	protected void executeInternal(JobExecutionContext context) {
 		try {
 
@@ -57,8 +55,10 @@ public class HcFtpToFileSystemJob implements Job {
 			}
 
 			String dealClass = ftpItemConfigInfo.get("DEAL_CLASS").toString();
-			jobFuLeiQuartz =  ApplicationContextFactory.getBean(dealClass,HcFtpToFileSystemQuartz.class);
-			jobFuLeiQuartz.startFtpTask(ftpItemConfigInfo);
+
+			hcFtpToFileSystemQuartz = (HcFtpToFileSystemQuartz) ApplicationContextFactory.getBean(dealClass);
+			hcFtpToFileSystemQuartz.startFtpTask(ftpItemConfigInfo);
+
 		} catch (Throwable ex) {
 			logger.error("执行任务失败：", ex);
 		}

JobService/src/main/resources/static/js/HcFtpToFileSystemConfigList.js

@@ -109,7 +109,7 @@ function createHtmlContext(taskInfo){
        trStr = trStr
                 + "<td class='text-center'>"+taskTnum+"</td>"
                 + "<td class='text-center'>"
-                + "            <a class='label label-info' href='../prvncFtpfileConfig!queryTaskLogList.action?taskid="+taskId+"' target='_blank'>日志</a>"
+                /*+ "            <a class='label label-info' href='../prvncFtpfileConfig!queryTaskLogList.action?taskid="+taskId+"' target='_blank'>日志</a>"*/
                 + "</td>";
        // 将后台传过来的数据影藏放到页面上
        trStr = trStr

JobService/src/main/resources/templates/HcFtpToFileSystemConfigList.html

@@ -100,9 +100,9 @@
 						<th class="text-center">
 							线程数
 						</th>
-						<th class="text-center">
+						<!--<th class="text-center">
 							操作
-						</th>
+						</th>-->
 					</tr>
 				</thead>
 				<tbody id="tasksContext">

java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -83,9 +83,6 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_noticeId="96";
 
     public static final String CODE_PREFIX_HCJOBId="96";
-
-    public static final String CODE_PREFIX_HCJOBLOCId="99";
-
     //BUSINESSTYPE
     public static final String CODE_PREFIX_id="99";
     public static final String CODE_PREFIX_service_id="98";

java110-db/src/main/resources/mapper/job/IHcFtpFileDAO.xml

@@ -22,34 +22,25 @@
 -->
     <insert id="saveTaskRunLog"
     >
-        <selectKey keyProperty="logid" resultType="long">
-            <![CDATA[
-	        SELECT seq_cep_ftptasklog.NEXTVAL  AS logid from dual
-	        ]]>
-        </selectKey>
+
         insert into
-        hc_ftp_tasklog(logid,taskid,u_or_d,create_date,state,serverfilename,localfilename,filelength)
-        values(#logid#,#taskid#,#uord#,sysdate,#state#,#serverfilename#,#localfilename#,#filelength#)
+        hc_ftp_tasklog(logid,taskid,u_or_d,state,serverfilename,localfilename,filelength)
+        values(#{logid},#{taskid},#{uord},#{state},#{serverfilename},#{localfilename},#{filelength})
     </insert>
 
     <update id="updateTaskRunLog"
     >
-        update hc_ftp_tasklog set update_date=sysdate
+        update hc_ftp_tasklog set update_date=SYSDATE()
         <if test="state !=null and state != ''">,state = #{state}
         </if>
-        where logid=#logid#
+        where logid=#{logid}
     </update>
 
 
     <insert id="saveTaskRunDetailLog">
-        <selectKey keyProperty="id" resultType="long">
-            <![CDATA[
-	        SELECT seq_cep_ftptasklogdetail.NEXTVAL  AS id from dual
-	        ]]>
-        </selectKey>
         insert into
-        hc_ftp_tasklog_detail(id,logid,taskid,create_date,state,tnum,begin,end,data,havedown,remark,SERVERFILENAME,LOCALFILENAME)
-        values(#id#,#logid#,#taskid#,sysdate,#state#,#tnum#,#begin#,#end#,#data#,#havedown#,#remark#,#serverfilename#,#localfilename#)
+        hc_ftp_tasklog_detail(id,logid,taskid,state,tnum,begin,end,data,havedown,remark,SERVERFILENAME,LOCALFILENAME)
+        values(#{id},#{logid},#{taskid},#{state},#{tnum},#{begin},#{end},#{data},#{havedown},#{remark},#{serverfilename},#{localfilename})
     </insert>
 
 
@@ -233,7 +224,7 @@
             <update id="updateFtpItemRunState" parameterType="Map">
                 update
                 hc_ftp_task sft
-                set update_date = sysdate,sft.run_state= #{runState}
+                set update_date = SYSDATE(),sft.run_state= #{runState}
                 where sft.run_state = #{oldRunState}
             </update>
 
@@ -329,5 +320,4 @@
                 <if test="itemSpecCd != null and itemSpecCd !='' "> and a.item_spec_cd = #{itemSpecCd}
                 </if>
             </select>
-
 </mapper>