From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/job/IHcFtpFileDAO.xml | 60 +++++++++++++++++++++++++-----------------------------------
1 files changed, 25 insertions(+), 35 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/job/IHcFtpFileDAO.xml b/java110-db/src/main/resources/mapper/job/IHcFtpFileDAO.xml
old mode 100644
new mode 100755
index 4ae020f..d3a6d56
--- a/java110-db/src/main/resources/mapper/job/IHcFtpFileDAO.xml
+++ b/java110-db/src/main/resources/mapper/job/IHcFtpFileDAO.xml
@@ -22,39 +22,30 @@
-->
<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>
<insert id="addFtpItem" parameterType="Map">
- insert into HC_FTP_TASK(taskid,
+ insert into hc_ftp_task(taskid,
taskname,
file_name,
u_or_d,
@@ -89,7 +80,7 @@
<select id="queryTaskDetailInfo" parameterType="long"
resultType="Map">
- select * from HC_FTP_TASKLOG_DETAIL
+ select * from hc_ftp_tasklog_detail
where detailid=#{value}
</select>
<select id="queryFtpUserInfo" parameterType="long" resultType="Map">
@@ -111,7 +102,7 @@
<select id="queryFtpItemsCount" parameterType="Map"
resultType="Integer">
SELECT count(1)
- FROM HC_FTP_TASK A
+ FROM hc_ftp_task A
WHERE A.STATE = 'A'
</select>
@@ -136,7 +127,7 @@
A.AFTERFUNCTION,
A.DEAL_CLASS,
A.CREATE_DATE
- FROM HC_FTP_TASK A
+ FROM hc_ftp_task A
WHERE A.STATE = 'A') A1
where 1 = 1 limit #{curPage},#{pageSize}
]]>
@@ -167,7 +158,7 @@
A.AFTERFUNCTION,
A.DEAL_CLASS,
A.CREATE_DATE
- FROM HC_FTP_TASK A
+ FROM hc_ftp_task A
WHERE A.STATE = 'A'
and A.TASKID = #{taskId}
</select>
@@ -192,7 +183,7 @@
A.AFTERFUNCTION,
A.DEAL_CLASS,
A.CREATE_DATE
- FROM HC_FTP_TASK A
+ FROM hc_ftp_task A
WHERE A.STATE = 'A'
and A.TASKNAME like '%' || #{taskName} || '%'
and rownum < 1000
@@ -200,8 +191,8 @@
</select>
<!-- 淇敼ftp閰嶇疆淇℃伅 -->
<update id="updateFtpItemByTaskId" parameterType="Map">
- update HC_FTP_TASK sft
- set update_date = sysdate
+ update hc_ftp_task sft
+ set update_date = SYSDATE()
<if test="taskName !=null and taskName != ''">,sft.taskname = #{taskName}
</if>
<if test="fileName !=null and fileName != ''">,sft.file_name = #{fileName}
@@ -232,15 +223,15 @@
<!-- 淇敼ftp閰嶇疆淇℃伅 -->
<update id="updateFtpItemRunState" parameterType="Map">
update
- HC_FTP_TASK sft
- set update_date = sysdate,sft.run_state= #{runState}
+ hc_ftp_task sft
+ set update_date = SYSDATE(),sft.run_state= #{runState}
where sft.run_state = #{oldRunState}
</update>
<!-- 鍒犻櫎ftp閰嶇疆淇℃伅 -->
<update id="deleteFtpItemByTaskId" parameterType="Map">
update
- HC_FTP_TASK sft
+ hc_ftp_task sft
set sft.state = 'R'
where sft.state = 'A'
and sft.taskid in
@@ -268,7 +259,7 @@
A.AFTERFLAG,
A.AFTERFUNCTION,
A.DEAL_CLASS
- FROM HC_FTP_TASK A
+ FROM hc_ftp_task A
WHERE A.STATE = 'A'
AND A.TASKID in
<foreach open="(" close=")"
@@ -280,13 +271,13 @@
<select id="queryFtpItemAttrsByTaskId" parameterType="Map"
resultType="Map">
SELECT A.TASKID, A.ITEM_SPEC_ID, A.VALUE
- FROM HC_FTP_TASK_ATTR A
+ FROM hc_ftp_task_attr A
WHERE A.TASKID = #{taskId}
</select>
<!-- 淇濆瓨FTPItem鐨勫睘鎬т俊鎭� -->
<insert id="addFtpItemAttrs" parameterType="Map">
insert into
- HC_FTP_TASK_ATTR(taskid,item_spec_id,value)
+ hc_ftp_task_attr(taskid,item_spec_id,value)
values(#{taskId},#{itemSpecId},#{value})
</insert>
<!-- 鏌ヨ娌℃湁涓嬭浇杩囩殑鏂囦欢鍚� -->
@@ -295,7 +286,7 @@
<![CDATA[
SELECT #{fileNames} AS fileNames FROM DUAL
where #{fileNames} not in
- (select sfl.file_name from saop_ftp_log sfl where sfl.taskId = #{taskId})
+ (select sfl.file_name from hc_ftp_log sfl where sfl.taskId = #{taskId})
]]>
</select>
@@ -305,7 +296,7 @@
SELECT seq_cep_taskid.NEXTVAL AS logid from dual
]]>
</selectKey>
- insert into saop_ftp_log(
+ insert into hc_ftp_log(
log_id,
taskid,
file_name,
@@ -321,13 +312,12 @@
<select id="queryItemSpec" parameterType="Map" resultType="Map">
- select a.item_spec_cd, a.domain, a.name, a.describes, a.create_date
- from saop_ftp_item_spec a
+ select a.item_spec_cd as ITEM_SPEC_CD, a.domain as DOMAIN, a.name as NAME, a.describes as DESCRIBES, a.create_date as CREATE_DATE
+ from hc_ftp_item_spec a
where a.status_cd = '0'
<if test="domain != null and domain !='' "> and a.domain = #{domain}</if>
<if test="name != null and name !='' "> and a.name = #{name}</if>
<if test="itemSpecCd != null and itemSpecCd !='' "> and a.item_spec_cd = #{itemSpecCd}
</if>
</select>
-
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0