From 23d06b59bb6b1afa7230d4ad2d45d04d9343b1cd Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Wed, 25 Sep 2024 16:52:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90=E4=BB=BB=E5=8A=A1=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ysIntegratedForegroundTaskServiceImpl.java | 15 +++++++++++ ...tegratedForegroundTaskParameterEntity.java | 11 +++++++- ...ntegratedForegroundTaskParameterEntity.xml | 26 ++++++++++++++----- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/service/impl/SysIntegratedForegroundTaskServiceImpl.java b/base-service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/service/impl/SysIntegratedForegroundTaskServiceImpl.java index 7ca8544c..5a9fa93e 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/service/impl/SysIntegratedForegroundTaskServiceImpl.java +++ b/base-service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/service/impl/SysIntegratedForegroundTaskServiceImpl.java @@ -106,17 +106,24 @@ public class SysIntegratedForegroundTaskServiceImpl extends BaseService { try { pluginBaseEntity.executeBusiness(jsonObject); + sysIntegratedForegroundTaskParameterEntity.setStatus("2"); + sysIntegratedForegroundTaskParameterEntity.setModify_time(new Date()); + sysIntegratedForegroundTaskParameterDao.update(sysIntegratedForegroundTaskParameterEntity); } catch (Exception e) { logger.error("插件："+entity.getPlugId()+"执行失败："+e.getMessage()); } }); }else { + sysIntegratedForegroundTaskParameterEntity.setStatus("2"); + sysIntegratedForegroundTaskParameterEntity.setModify_time(new Date()); + sysIntegratedForegroundTaskParameterDao.update(sysIntegratedForegroundTaskParameterEntity); return BaseResult.getSuccessMessageEntity("提交成功，当前任务执行失败，请联系系统管理员"); } return BaseResult.getSuccessMessageEntity("提交成功，执行结果请去查看任务日志"); @@ -171,17 +178,25 @@ public class SysIntegratedForegroundTaskServiceImpl extends BaseService { try { pluginBaseEntity.executeBusiness(jsonObject); + sysIntegratedForegroundTaskParameterEntity.setStatus("2"); + sysIntegratedForegroundTaskParameterEntity.setModify_time(new Date()); + sysIntegratedForegroundTaskParameterDao.update(sysIntegratedForegroundTaskParameterEntity); } catch (Exception e) { logger.error("插件："+entity.getPlugId()+"执行失败："+e.getMessage()); } }); }else { + sysIntegratedForegroundTaskParameterEntity.setStatus("2"); + sysIntegratedForegroundTaskParameterEntity.setModify_time(new Date()); + sysIntegratedForegroundTaskParameterDao.update(sysIntegratedForegroundTaskParameterEntity); return BaseResult.getSuccessMessageEntity("提交成功，当前任务执行失败，请联系系统管理员"); } return BaseResult.getSuccessMessageEntity("提交成功，执行结果请去查看任务日志"); diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.java b/base-service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.java index 3ae60fda..f4907e2b 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.java +++ b/base-service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.java @@ -20,7 +20,8 @@ public class SysIntegratedForegroundTaskParameterEntity extends BaseEntity { private String inParameter; /** 备注 */ private String remark; - + /** 任务状态 1、执行中 2、执行完成 */ + private String status; public String getFormmainId() { return formmainId; @@ -53,5 +54,13 @@ public class SysIntegratedForegroundTaskParameterEntity extends BaseEntity { this.setCreate_time(new Date()); this.setModify_time(new Date()); } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } } diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.xml b/base-service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.xml index 4421e1d0..fc6a59bf 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.xml +++ b/base-service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.xml @@ -7,7 +7,9 @@ - + + + @@ -21,7 +23,8 @@ ,formmain_id ,in_parameter ,remark - ,sorts + ,status + ,sorts ,create_user_id ,create_time ,modify_user_id @@ -39,6 +42,7 @@ and formmain_id = #{formmainId} and in_parameter = #{inParameter} and remark = #{remark} + and status = #{status} and sorts = #{sorts} and create_user_id = #{create_user_id} and create_time = #{create_time} @@ -60,6 +64,7 @@ and formmain_id = #{formmainId} and in_parameter = #{inParameter} and remark = #{remark} + and status = #{status} and sorts = #{sorts} and create_user_id = #{create_user_id} and create_time = #{create_time} @@ -83,6 +88,7 @@ and formmain_id like concat('%',#{formmainId},'%') and in_parameter like concat('%',#{inParameter},'%') and remark like concat('%',#{remark},'%') + and status like concat('%',#{status},'%') and sorts like concat('%',#{sorts},'%') and create_user_id like concat('%',#{create_user_id},'%') and create_time like concat('%',#{create_time},'%') @@ -106,6 +112,7 @@ or formmain_id = #{formmainId} or in_parameter = #{inParameter} or remark = #{remark} + or status = #{status} or sorts = #{sorts} or create_user_id = #{create_user_id} or create_time = #{create_time} @@ -127,6 +134,7 @@ formmain_id , in_parameter , remark , + status , sorts , create_user_id , create_time , @@ -142,6 +150,7 @@ #{formmainId} , #{inParameter} , #{remark} , + #{status} , #{sorts} , #{create_user_id} , #{create_time} , @@ -155,23 +164,24 @@ - insert into sys_integrated_foreground_task_parameter(formmain_id, in_parameter, remark, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, sts) + insert into sys_integrated_foreground_task_parameter(formmain_id, in_parameter, remark, status, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, sts) values - (#{entity.formmainId},#{entity.inParameter},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, 'Y') + (#{entity.formmainId},#{entity.inParameter},#{entity.remark},#{entity.status},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, 'Y') - insert into sys_integrated_foreground_task_parameter(formmain_id, in_parameter, remark, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id) + insert into sys_integrated_foreground_task_parameter(formmain_id, in_parameter, remark,status, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id) values - (#{entity.formmainId},#{entity.inParameter},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}) + (#{entity.formmainId},#{entity.inParameter},#{entity.remark},#{entity.status},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}) on duplicate key update formmain_id = values(formmain_id), in_parameter = values(in_parameter), remark = values(remark), + status = values(status), sorts = values(sorts), create_user_id = values(create_user_id), create_time = values(create_time), @@ -186,6 +196,7 @@ update sys_integrated_foreground_task_parameter set formmain_id = #{formmainId}, in_parameter = #{inParameter}, remark = #{remark}, + status = #{status}, sorts = #{sorts}, create_user_id = #{create_user_id}, create_time = #{create_time}, @@ -209,6 +220,7 @@ update sys_integrated_foreground_task_parameter set sts= 'N' ,modify_time = #{m and formmain_id = #{formmainId} and in_parameter = #{inParameter} and remark = #{remark} + and status = #{status} and sorts = #{sorts} and sts = #{sts} and sts='Y' @@ -226,6 +238,7 @@ update sys_integrated_foreground_task_parameter set sts= 'N' ,modify_time = #{m ,a.formmain_id ,a.in_parameter ,a.remark + ,a.status ,a.sorts ,p.person_name as create_user_id ,a.create_time @@ -241,6 +254,7 @@ update sys_integrated_foreground_task_parameter set sts= 'N' ,modify_time = #{m and a.formmain_id = #{formmainId} and a.in_parameter = #{inParameter} and a.remark = #{remark} + and a.status = #{status} and a.sorts = #{sorts} and a.create_user_id = #{create_user_id} and a.create_time = #{create_time}