hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into 237master

This commit is contained in:
lvleigang 2024-09-25 16:53:25 +08:00
parent 9228089692 1d979524f3
commit 14d3a6bf56
3 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
base-service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/service/impl/SysIntegratedForegroundTaskServiceImpl.java
View File

@ -106,17 +106,24 @@ public class SysIntegratedForegroundTaskServiceImpl extends BaseService<SysInteg
sysIntegratedForegroundTaskParameterEntity.setFormmainId(entity.getId());
sysIntegratedForegroundTaskParameterEntity.setInParameter(jsonObject.toJSONString());
sysIntegratedForegroundTaskParameterEntity.setCreate();
sysIntegratedForegroundTaskParameterEntity.setStatus("1");
sysIntegratedForegroundTaskParameterDao.save(sysIntegratedForegroundTaskParameterEntity);
PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(entity.getPlugId());
if(pluginBaseEntity != null ){
taskExecutor.execute(() -> {
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<SysInteg
sysIntegratedForegroundTaskParameterEntity.setFormmainId(entity.getId());
sysIntegratedForegroundTaskParameterEntity.setInParameter(jsonObject.toJSONString());
sysIntegratedForegroundTaskParameterEntity.setCreate();
sysIntegratedForegroundTaskParameterEntity.setStatus("1");
sysIntegratedForegroundTaskParameterDao.save(sysIntegratedForegroundTaskParameterEntity);
PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(entity.getPlugId());
if(pluginBaseEntity != null ){
taskExecutor.execute(() -> {
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("提交成功，执行结果请去查看任务日志");

11
base-service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.java
View File

@ -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;
}
}

26
base-service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.xml
View File

@ -7,7 +7,9 @@
<result property="formmainId" column="formmain_id" jdbcType="VARCHAR"/>
<result property="inParameter" column="in_parameter" jdbcType="VARCHAR"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
<result property="sorts" column="sorts" jdbcType="INTEGER"/>
<result property="status" column="status" jdbcType="VARCHAR"/>
<result property="sorts" column="sorts" jdbcType="INTEGER"/>
<result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
<result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
<result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
@ -21,7 +23,8 @@
,formmain_id
,in_parameter
,remark
,sorts
,status
,sorts
,create_user_id
,create_time
,modify_user_id
@ -39,6 +42,7 @@
<if test="formmainId != null and formmainId != ''"> and formmain_id = #{formmainId} </if>
<if test="inParameter != null and inParameter != ''"> and in_parameter = #{inParameter} </if>
<if test="remark != null and remark != ''"> and remark = #{remark} </if>
<if test="status != null and status != ''"> and status = #{status} </if>
<if test="sorts != null"> and sorts = #{sorts} </if>
<if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
<if test="create_time != null"> and create_time = #{create_time} </if>
@ -60,6 +64,7 @@
<if test="formmainId != null and formmainId != ''"> and formmain_id = #{formmainId} </if>
<if test="inParameter != null and inParameter != ''"> and in_parameter = #{inParameter} </if>
<if test="remark != null and remark != ''"> and remark = #{remark} </if>
<if test="status != null and status != ''"> and status = #{status} </if>
<if test="sorts != null"> and sorts = #{sorts} </if>
<if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
<if test="create_time != null"> and create_time = #{create_time} </if>
@ -83,6 +88,7 @@
<if test="formmainId != null and formmainId != ''"> and formmain_id like concat('%',#{formmainId},'%') </if>
<if test="inParameter != null and inParameter != ''"> and in_parameter like concat('%',#{inParameter},'%') </if>
<if test="remark != null and remark != ''"> and remark like concat('%',#{remark},'%') </if>
<if test="status != null and status != ''"> and status like concat('%',#{status},'%') </if>
<if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
<if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
<if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
@ -106,6 +112,7 @@
<if test="formmainId != null and formmainId != ''"> or formmain_id = #{formmainId} </if>
<if test="inParameter != null and inParameter != ''"> or in_parameter = #{inParameter} </if>
<if test="remark != null and remark != ''"> or remark = #{remark} </if>
<if test="status != null and status != ''"> or status = #{status} </if>
<if test="sorts != null"> or sorts = #{sorts} </if>
<if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
<if test="create_time != null"> or create_time = #{create_time} </if>
@ -127,6 +134,7 @@
<if test="formmainId != null and formmainId != ''"> formmain_id , </if>
<if test="inParameter != null and inParameter != ''"> in_parameter , </if>
<if test="remark != null and remark != ''"> remark , </if>
<if test="status != null and status != ''"> status , </if>
<if test="sorts != null"> sorts , </if>
<if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
<if test="create_time != null"> create_time , </if>
@ -142,6 +150,7 @@
<if test="formmainId != null and formmainId != ''"> #{formmainId} ,</if>
<if test="inParameter != null and inParameter != ''"> #{inParameter} ,</if>
<if test="remark != null and remark != ''"> #{remark} ,</if>
<if test="status != null and status != ''"> #{status} ,</if>
<if test="sorts != null"> #{sorts} ,</if>
<if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
<if test="create_time != null"> #{create_time} ,</if>
@ -155,23 +164,24 @@
</insert>
<!-- 批量新增 -->
<insert id="entityInsertBatch" >
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
<foreach collection="entities" item="entity" separator=",">
(#{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')
</foreach>
</insert>
<!-- 批量新增或者修改-->
<insert id="entityInsertOrUpdateBatch" >
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
<foreach collection="entities" item="entity" separator=",">
(#{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})
</foreach>
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
<if test="formmainId != null and formmainId != ''"> formmain_id = #{formmainId},</if>
<if test="inParameter != null and inParameter != ''"> in_parameter = #{inParameter},</if>
<if test="remark != null and remark != ''"> remark = #{remark},</if>
<if test="status != null and status != ''"> status = #{status},</if>
<if test="sorts != null"> sorts = #{sorts},</if>
<if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
<if test="create_time != null"> create_time = #{create_time},</if>
@ -209,6 +220,7 @@ update sys_integrated_foreground_task_parameter set sts= 'N' ,modify_time = #{m
<if test="formmainId != null and formmainId != ''"> and formmain_id = #{formmainId} </if>
<if test="inParameter != null and inParameter != ''"> and in_parameter = #{inParameter} </if>
<if test="remark != null and remark != ''"> and remark = #{remark} </if>
<if test="status != null and status != ''"> and status = #{status} </if>
<if test="sorts != null"> and sorts = #{sorts} </if>
<if test="sts != null and sts != ''"> and sts = #{sts} </if>
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
<if test="formmainId != null and formmainId != ''"> and a.formmain_id = #{formmainId} </if>
<if test="inParameter != null and inParameter != ''"> and a.in_parameter = #{inParameter} </if>
<if test="remark != null and remark != ''"> and a.remark = #{remark} </if>
<if test="status != null and status != ''"> and a.status = #{status} </if>
<if test="sorts != null"> and a.sorts = #{sorts} </if>
<if test="create_user_id != null and create_user_id != ''"> and a.create_user_id = #{create_user_id} </if>
<if test="create_time != null"> and a.create_time = #{create_time} </if>