From ba650b9fe63a7f2e1e34bfb0158af2f31a4d54fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 2 Apr 2025 14:59:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=AE=B0=E5=BD=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=8F=98=E6=9B=B4=EF=BC=9B=20=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/push/dto/PushRecordDTO.java | 5 +- .../entity/push/dto/PushRecordDetailDTO.java | 8 ++- .../entity/push/po/PushRecordDetailPO.java | 2 +- .../push/PushRecordDetailStatusEnum.java | 2 +- .../enums/push/PushRecordStatusEnum.java | 2 +- .../mapper/push/PushRecordDetailMapper.java | 5 +- .../mapper/push/PushRecordDetailMapper.xml | 59 +++++++++++++++++++ .../salary/service/impl/PushServiceImpl.java | 30 ++++------ 8 files changed, 86 insertions(+), 27 deletions(-) diff --git a/src/com/engine/salary/entity/push/dto/PushRecordDTO.java b/src/com/engine/salary/entity/push/dto/PushRecordDTO.java index af5dd4d2a..b1d34a2dd 100644 --- a/src/com/engine/salary/entity/push/dto/PushRecordDTO.java +++ b/src/com/engine/salary/entity/push/dto/PushRecordDTO.java @@ -50,7 +50,7 @@ public class PushRecordDTO { /** * 数据库表名 */ - @TableTitle(title = "记录名", dataIndex = "name", key = "name") + @TableTitle(title = "数据表名", dataIndex = "name", key = "tableName") private String tableName; @@ -59,7 +59,8 @@ public class PushRecordDTO { * * @see PushRecordStatusEnum */ - @TableTitle(title = "推送状态", dataIndex = "status", key = "status") + @TableTitle(title = "推送状态", dataIndex = "statusName", key = "statusName") + private String statusName; private Integer status; /** diff --git a/src/com/engine/salary/entity/push/dto/PushRecordDetailDTO.java b/src/com/engine/salary/entity/push/dto/PushRecordDetailDTO.java index 2807eaf69..de9d56fe5 100644 --- a/src/com/engine/salary/entity/push/dto/PushRecordDetailDTO.java +++ b/src/com/engine/salary/entity/push/dto/PushRecordDetailDTO.java @@ -33,18 +33,22 @@ public class PushRecordDetailDTO { */ private Long acctEmpId; + @TableTitle(title = "人员", dataIndex = "username",key = "username") + private String username; + /** * 执行状态 * @see com.engine.salary.enums.push.PushRecordDetailStatusEnum */ - @TableTitle(title = "执行状态", dataIndex = "status",key = "status") + @TableTitle(title = "执行状态", dataIndex = "statusName",key = "statusName") + private String statusName; private Integer status; /** * 失败原因 */ @TableTitle(title = "失败原因", dataIndex = "fail_reason",key = "status") - private String fail_reason; + private String failReason; /** * 执行sql diff --git a/src/com/engine/salary/entity/push/po/PushRecordDetailPO.java b/src/com/engine/salary/entity/push/po/PushRecordDetailPO.java index 64e27ed08..f55a9c8f0 100644 --- a/src/com/engine/salary/entity/push/po/PushRecordDetailPO.java +++ b/src/com/engine/salary/entity/push/po/PushRecordDetailPO.java @@ -45,7 +45,7 @@ public class PushRecordDetailPO { * 失败原因 */ @ElogTransform(name = "失败原因") - private String fail_reason; + private String failReason; /** * 执行sql diff --git a/src/com/engine/salary/enums/push/PushRecordDetailStatusEnum.java b/src/com/engine/salary/enums/push/PushRecordDetailStatusEnum.java index 47245a544..c303de40b 100644 --- a/src/com/engine/salary/enums/push/PushRecordDetailStatusEnum.java +++ b/src/com/engine/salary/enums/push/PushRecordDetailStatusEnum.java @@ -52,7 +52,7 @@ public enum PushRecordDetailStatusEnum implements BaseEnum { return salaryDataSourceEnum; } } - return null; + return PREPARE; } public static String getDefaultLabelByValue(Integer value) { diff --git a/src/com/engine/salary/enums/push/PushRecordStatusEnum.java b/src/com/engine/salary/enums/push/PushRecordStatusEnum.java index 7b537e28e..57321e2ad 100644 --- a/src/com/engine/salary/enums/push/PushRecordStatusEnum.java +++ b/src/com/engine/salary/enums/push/PushRecordStatusEnum.java @@ -55,7 +55,7 @@ public enum PushRecordStatusEnum implements BaseEnum { return salaryDataSourceEnum; } } - return null; + return DATA_PREPARE; } public static String getDefaultLabelByValue(Integer value) { diff --git a/src/com/engine/salary/mapper/push/PushRecordDetailMapper.java b/src/com/engine/salary/mapper/push/PushRecordDetailMapper.java index 5ad4a105f..1c63a36c2 100644 --- a/src/com/engine/salary/mapper/push/PushRecordDetailMapper.java +++ b/src/com/engine/salary/mapper/push/PushRecordDetailMapper.java @@ -1,5 +1,6 @@ package com.engine.salary.mapper.push; +import com.engine.salary.entity.push.dto.PushRecordDetailDTO; import com.engine.salary.entity.push.po.PushRecordDetailPO; import org.apache.ibatis.annotations.Param; @@ -21,7 +22,9 @@ public interface PushRecordDetailMapper { * @return 返回集合，没有返回空List */ List listSome(PushRecordDetailPO pushRecordDetail); - + + List listDTO(PushRecordDetailDTO dto); + /** * 根据主键查询 diff --git a/src/com/engine/salary/mapper/push/PushRecordDetailMapper.xml b/src/com/engine/salary/mapper/push/PushRecordDetailMapper.xml index ecbeef0cd..2f720d205 100644 --- a/src/com/engine/salary/mapper/push/PushRecordDetailMapper.xml +++ b/src/com/engine/salary/mapper/push/PushRecordDetailMapper.xml @@ -12,6 +12,7 @@ + @@ -28,6 +29,7 @@ , t.status , t.tenant_key , t.update_time + , t.fail_reason @@ -88,6 +90,53 @@ #{id} + ORDER BY id DESC + + + @@ -127,6 +176,9 @@ update_time, + + fail_reason, + @@ -159,6 +211,9 @@ #{updateTime}, + + #{failReason}, + @@ -175,6 +230,7 @@ status=#{status}, tenant_key=#{tenantKey}, update_time=#{updateTime}, + fail_reason=#{failReason}, WHERE id = #{id} AND delete_type = 0 @@ -211,6 +267,9 @@ update_time=#{updateTime}, + + fail_reason=#{failReason}, + WHERE id = #{id} AND delete_type = 0 diff --git a/src/com/engine/salary/service/impl/PushServiceImpl.java b/src/com/engine/salary/service/impl/PushServiceImpl.java index 8503f447b..64cd82e73 100644 --- a/src/com/engine/salary/service/impl/PushServiceImpl.java +++ b/src/com/engine/salary/service/impl/PushServiceImpl.java @@ -257,7 +257,7 @@ public class PushServiceImpl extends Service implements PushService { //查询推送配置 List pushSettingPOS = getPushSettingMapper().listSome(PushSettingPO.builder().able(1).build()); - if(CollUtil.isEmpty(pushSettingPOS)){ + if (CollUtil.isEmpty(pushSettingPOS)) { return; } @@ -436,9 +436,10 @@ public class PushServiceImpl extends Service implements PushService { pushRecordDetailPO.setStatus(PushRecordDetailStatusEnum.SUCCESS.getValue()); } catch (Exception e) { - pushRecordDetailPO.setFail_reason(e.getMessage()); + pushRecordDetailPO.setFailReason(e.getMessage()); pushRecordDetailPO.setStatus(PushRecordDetailStatusEnum.FAIL.getValue()); } + getPushRecordDetailMapper().updateIgnoreNull(pushRecordDetailPO); }); pushRecordPO.setEndTime(new Date()); @@ -460,7 +461,6 @@ public class PushServiceImpl extends Service implements PushService { } - @Override public void removeRecords(List recordIds) { recordIds.forEach(recordId -> { @@ -487,6 +487,7 @@ public class PushServiceImpl extends Service implements PushService { .acctRecordId(po.getAcctRecordId()) .type(po.getType()) .status(po.getStatus()) + .statusName(PushRecordStatusEnum.parseByValue(po.getStatus()).getDefaultLabel()) .startTime(po.getStartTime()) .endTime(po.getEndTime()) .build()) @@ -501,22 +502,13 @@ public class PushServiceImpl extends Service implements PushService { public PageInfo recordDetailList(RecordDetailListQueryParam param) { ValidUtil.doValidator(param); - List pushRecordDetailPOS = getPushRecordDetailMapper().listSome(PushRecordDetailPO.builder().recordId(param.getRecordId()).build()); - List listDTOS = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pushRecordDetailPOS) - .stream() - .map(po -> PushRecordDetailDTO.builder() - .id(po.getId()) - .recordId(po.getRecordId()) - .acctEmpId(po.getAcctEmpId()) - .status(po.getStatus()) - .fail_reason(po.getFail_reason()) - .execute(po.getExecute()) - .createTime(po.getCreateTime()) - .creator(po.getCreator()) - .build()) - .collect(Collectors.toList()); - PageInfo pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), listDTOS, PushRecordDetailDTO.class); - pageInfo.setTotal(pushRecordDetailPOS.size()); + List list = getPushRecordDetailMapper().listDTO(PushRecordDetailDTO.builder().recordId(param.getRecordId()).build()); + List listDTOS = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), list); + listDTOS.forEach(dto -> dto.setStatusName(PushRecordDetailStatusEnum.parseByValue(dto.getStatus()).getDefaultLabel())); + + PageInfo pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), PushRecordDetailDTO.class); + pageInfo.setList(listDTOS); + pageInfo.setTotal(list.size()); return pageInfo; } }