qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

记录推送耗时

This commit is contained in:
钱涛 2025-04-02 17:05:04 +08:00
parent ba650b9fe6
commit 0a78f17230
13 changed files with 98 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resource/sqlupgrade/DM/sql202504020203.sql Normal file
View File

@ -0,0 +1,6 @@
ALTER TABLE hrsa_push_record ADD fail_reason varchar2(4000);
/
ALTER TABLE hrsa_push_record_detail ADD fail_reason varchar2(4000);
/

6
resource/sqlupgrade/GS/sql202504020203.sql Normal file
View File

@ -0,0 +1,6 @@
ALTER TABLE hrsa_push_record ADD fail_reason varchar2(4000);
/
ALTER TABLE hrsa_push_record_detail ADD fail_reason varchar2(4000);
/

6
resource/sqlupgrade/JC/sql202504020203.sql Normal file
View File

@ -0,0 +1,6 @@
ALTER TABLE hrsa_push_record ADD fail_reason varchar2(4000);
/
ALTER TABLE hrsa_push_record_detail ADD fail_reason varchar2(4000);
/

3
resource/sqlupgrade/Mysql/sql202504020203.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TABLE hrsa_push_record ADD COLUMN fail_reason varchar(4000);
ALTER TABLE hrsa_push_record_detail ADD COLUMN fail_reason varchar(4000) ;

5
resource/sqlupgrade/Oracle/sql202504020203.sql Normal file
View File

@ -0,0 +1,5 @@
ALTER TABLE hrsa_push_record ADD fail_reason varchar2(4000);
/
ALTER TABLE hrsa_push_record_detail ADD fail_reason varchar2(4000);
/

3
resource/sqlupgrade/PG/sql202504020203.sql Normal file
View File

@ -0,0 +1,3 @@
alter table hrsa_push_record add fail_reason VARCHAR(4000) ;
alter table hrsa_push_record_detail add fail_reason VARCHAR(4000) ;

5
resource/sqlupgrade/SQLServer/sql202504020203.sql Normal file
View File

@ -0,0 +1,5 @@
alter table hrsa_push_record add fail_reason VARCHAR(4000)
go
alter table hrsa_push_record_detail add fail_reason VARCHAR(4000)
go

6
resource/sqlupgrade/ST/sql202504020203.sql Normal file
View File

@ -0,0 +1,6 @@
ALTER TABLE hrsa_push_record ADD fail_reason varchar2(4000);
/
ALTER TABLE hrsa_push_record_detail ADD fail_reason varchar2(4000);
/

13
src/com/engine/salary/entity/push/dto/PushRecordDTO.java
View File

@ -3,6 +3,7 @@ package com.engine.salary.entity.push.dto;
import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.annotation.TableTitle;
import com.engine.salary.enums.push.PushRecordStatusEnum;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -66,50 +67,46 @@ public class PushRecordDTO {
/**
* 执行时间
*/
@TableTitle(title = "执行时间", dataIndex = "startTime", key = "startTime")
@TableTitle(title = "执行开始时间", dataIndex = "startTime", key = "startTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
/**
* 结束时间
*/
@ElogTransform(name = "结束时间")
@TableTitle(title = "执行结束时间", dataIndex = "endTime", key = "endTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
/**
* 推送类型，0推送，1撤回
*/
@ElogTransform(name = "推送类型")
private Integer type;
/**
* 创建时间
*/
@ElogTransform(name = "创建时间")
private Date createTime;
/**
* 创建人
*/
@ElogTransform(name = "创建人")
private Long creator;
/**
* 是否已删除。0：未删除、1：已删除
*/
@ElogTransform(name = "是否已删除。0：未删除、1：已删除")
private Integer deleteType;
/**
* 租户ID
*/
@ElogTransform(name = "租户ID")
private String tenantKey;
/**
* 更新时间
*/
@ElogTransform(name = "更新时间")
private Date updateTime;

2
src/com/engine/salary/entity/push/po/PushRecordPO.java
View File

@ -64,7 +64,7 @@ public class PushRecordPO {
* 失败原因
*/
@ElogTransform(name = "失败原因")
private String fail_reason;
private String failReason;
/**
* 开始时间

2
src/com/engine/salary/mapper/push/PushRecordDetailMapper.xml
View File

@ -105,7 +105,7 @@
, t.status
, t.tenant_key
, t.update_time
, t.fail_reason
, t.fail_reason as failReason
, e.LASTNAME as username
FROM hrsa_push_record_detail t
left join hrsa_salary_acct_emp emp

53
src/com/engine/salary/mapper/push/PushRecordMapper.xml
View File

@ -3,18 +3,21 @@
<mapper namespace="com.engine.salary.mapper.push.PushRecordMapper">
<resultMap id="BaseResultMap" type="com.engine.salary.entity.push.po.PushRecordPO">
<result column="id" property="id"/>
<result column="name" property="name"/>
<result column="acct_record_id" property="acctRecordId"/>
<result column="setting_id" property="settingId"/>
<result column="mode_id" property="modeId"/>
<result column="table_name" property="tableName"/>
<result column="name" property="name"/>
<result column="type" property="type"/>
<result column="status" property="status"/>
<result column="setting_id" property="settingId"/>
<result column="acct_record_id" property="acctRecordId"/>
<result column="type" property="type"/>
<result column="create_time" property="createTime"/>
<result column="creator" property="creator"/>
<result column="delete_type" property="deleteType"/>
<result column="tenant_key" property="tenantKey"/>
<result column="update_time" property="updateTime"/>
<result column="fail_reason" property="failReason"/>
<result column="start_time" property="startTime"/>
<result column="end_time" property="endTime"/>
</resultMap>
<!-- 表字段 -->
@ -34,6 +37,9 @@
, t.tenant_key
, t.type
, t.update_time
, t.fail_reason
, t.start_time
, t.end_time
</sql>
<!-- 查询全部 -->
@ -98,6 +104,15 @@
<if test="updateTime != null">
AND update_time = #{updateTime}
</if>
<if test="failReason != null">
AND fail_reason = #{failReason}
</if>
<if test="startTime != null">
AND start_time = #{startTime}
</if>
<if test="endTime != null">
AND end_time = #{endTime}
</if>
<if test="ids != null and ids.size()>0">
AND id IN
<foreach collection="ids" open="(" item="id" separator="," close=")">
@ -152,6 +167,15 @@
<if test="updateTime != null">
update_time,
</if>
<if test="failReason != null">
fail_reason,
</if>
<if test="startTime != null">
start_time,
</if>
<if test="endTime != null">
end_time,
</if>
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
<if test="modeId != null">
@ -193,6 +217,15 @@
<if test="updateTime != null">
#{updateTime},
</if>
<if test="failReason != null">
#{failReason},
</if>
<if test="startTime != null">
#{startTime},
</if>
<if test="endTime != null">
#{endTime},
</if>
</trim>
</insert>
@ -212,6 +245,9 @@
tenant_key=#{tenantKey},
type=#{type},
update_time=#{updateTime},
fail_reason=#{failReason},
start_time=#{startTime},
end_time=#{endTime},
</set>
WHERE id = #{id} AND delete_type = 0
</update>
@ -257,6 +293,15 @@
<if test="updateTime != null">
update_time=#{updateTime},
</if>
<if test="failReason != null">
fail_reason=#{failReason},
</if>
<if test="startTime != null">
start_time=#{startTime},
</if>
<if test="endTime != null">
end_time=#{endTime},
</if>
</set>
WHERE id = #{id} AND delete_type = 0
</update>

3
src/com/engine/salary/service/impl/PushServiceImpl.java
View File

@ -407,6 +407,7 @@ public class PushServiceImpl extends Service implements PushService {
//待推送
PushRecordPO pushRecordPO = getPushRecordMapper().getById(id);
pushRecordPO.setStatus(PushRecordStatusEnum.RUN_WAITING.getValue());
pushRecordPO.setStartTime(new Date());
getPushRecordMapper().updateIgnoreNull(pushRecordPO);
try {
@ -445,7 +446,7 @@ public class PushServiceImpl extends Service implements PushService {
pushRecordPO.setEndTime(new Date());
pushRecordPO.setStatus(PushRecordStatusEnum.RUN_SUCCESS.getValue());
} catch (Exception e) {
pushRecordPO.setFail_reason(e.getMessage());
pushRecordPO.setFailReason(e.getMessage());
pushRecordPO.setStatus(PushRecordStatusEnum.RUN_FAIL.getValue());
}
getPushRecordMapper().updateIgnoreNull(pushRecordPO);