diff --git a/modules/thing/src/main/java/com/thing/extend/dto/TransportExtendMsgDTO.java b/modules/thing/src/main/java/com/thing/extend/dto/TransportExtendMsgDTO.java index 1ab006f..0ab4dbe 100644 --- a/modules/thing/src/main/java/com/thing/extend/dto/TransportExtendMsgDTO.java +++ b/modules/thing/src/main/java/com/thing/extend/dto/TransportExtendMsgDTO.java @@ -41,15 +41,15 @@ public class TransportExtendMsgDTO implements Serializable { @JsonProperty(access = JsonProperty.Access.READ_ONLY) private Long creator; @Schema(description = "创建时间") - @JsonProperty(access = JsonProperty.Access.READ_ONLY) - @JsonFormat(pattern = DateTimeUtils.DATE_TIME_PATTERN_STR) - private Date createDate; +// @JsonProperty(access = JsonProperty.Access.READ_ONLY) +// @JsonFormat(pattern = DateTimeUtils.DATE_TIME_PATTERN_STR) + private Long createDate; @Schema(description = "更新者") @JsonProperty(access = JsonProperty.Access.READ_ONLY) private Long updater; @Schema(description = "更新时间") - @JsonProperty(access = JsonProperty.Access.READ_ONLY) - @JsonFormat(pattern = DateTimeUtils.DATE_TIME_PATTERN_STR) - private Date updateDate; +// @JsonProperty(access = JsonProperty.Access.READ_ONLY) +// @JsonFormat(pattern = DateTimeUtils.DATE_TIME_PATTERN_STR) + private Long updateDate; } \ No newline at end of file diff --git a/modules/thing/src/main/java/com/thing/extend/service/impl/TransportExtendMsgServiceImpl.java b/modules/thing/src/main/java/com/thing/extend/service/impl/TransportExtendMsgServiceImpl.java index d0c09b0..6c6dafb 100644 --- a/modules/thing/src/main/java/com/thing/extend/service/impl/TransportExtendMsgServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/extend/service/impl/TransportExtendMsgServiceImpl.java @@ -8,6 +8,7 @@ import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.thing.common.core.constants.Constant; import com.thing.common.core.exception.SysException; +import com.thing.common.core.utils.DateTimeUtils; import com.thing.common.core.utils.excel.ExcelUtils; import com.thing.common.core.web.response.PageData; import com.thing.common.orm.service.impl.BaseServiceImpl; @@ -164,7 +165,7 @@ public class TransportExtendMsgServiceImpl extends BaseServiceImpl list = mapper.getList(params); List collect = list.parallelStream() - .map(item -> new TransportExtendMsgExcel(item.getConfiguration(), item.getInputMsg(), item.getOutputMsg(), item.getErrorMsg(), DateUtil.formatDateTime(item.getCreateDate()))) + .map(item -> new TransportExtendMsgExcel(item.getConfiguration(), item.getInputMsg(), item.getOutputMsg(), item.getErrorMsg(), DateTimeUtils.timeConvertStr(item.getCreateDate()))) .sorted(Comparator.comparing(TransportExtendMsgExcel::getCreateDate).reversed()) .collect(Collectors.toList()); ExcelUtils.exportExcel(collect, extendEntity.getName() + "消息日志", null, TransportExtendMsgExcel.class, extendEntity.getName() + "消息日志.xls", response);