From 4cc20386d9d4c3934a0ac4e95f9874ec83e60873 Mon Sep 17 00:00:00 2001 From: wuweihua <88888888> Date: Mon, 14 Sep 2026 09:32:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/price/domain/BmsProductCountry.java | 4 ++-- .../main/java/com/ruoyi/price/domain/PrcBillFee.java | 2 +- .../com/ruoyi/price/domain/PrcPriceSetDetail.java | 4 ++-- .../main/java/com/ruoyi/price/domain/PrcQuoteFee.java | 2 +- .../ruoyi/price/domain/PrcWeightSectionDetail.java | 4 ++-- .../java/com/ruoyi/price/domain/XtdZoneCountry.java | 4 ++-- .../java/com/ruoyi/price/domain/XtdZoneDivision.java | 4 ++-- .../java/com/ruoyi/price/search/BillSyncSnapshot.java | 10 +++++----- .../com/ruoyi/price/search/EsBillSearchStore.java | 11 +++++++++-- .../mapper/price/BmsProductCountryMapper.xml | 4 ++-- .../main/resources/mapper/price/PrcBillFeeMapper.xml | 2 +- .../mapper/price/PrcPriceSetDetailMapper.xml | 4 ++-- .../main/resources/mapper/price/PrcQuoteFeeMapper.xml | 2 +- .../mapper/price/PrcWeightSectionDetailMapper.xml | 4 ++-- .../resources/mapper/price/XtdZoneCountryMapper.xml | 4 ++-- .../resources/mapper/price/XtdZoneDivisionMapper.xml | 4 ++-- bms-front/src/views/monitor/eslog/index.vue | 4 ++-- 17 files changed, 40 insertions(+), 33 deletions(-) diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/BmsProductCountry.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/BmsProductCountry.java index 0bde8b5c..e034774d 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/BmsProductCountry.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/BmsProductCountry.java @@ -33,9 +33,9 @@ public class BmsProductCountry implements Serializable /** 0 pending, 1 active, 2 expired */ private String status; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createdAt; + private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updatedAt; + private Date updateTime; /** query only: true = expire_date is null */ private Boolean openOnly; /** query alias of status (0/1/2) */ diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcBillFee.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcBillFee.java index b026905e..13313560 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcBillFee.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcBillFee.java @@ -22,5 +22,5 @@ public class PrcBillFee implements Serializable private String roundMode; private String remark; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createdAt; + private Date createTime; } diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetDetail.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetDetail.java index ea6142cf..dc1e877a 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetDetail.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetDetail.java @@ -30,7 +30,7 @@ public class PrcPriceSetDetail implements Serializable private String roundMode; private Integer prId; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createdAt; + private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updatedAt; + private Date updateTime; } diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcQuoteFee.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcQuoteFee.java index 5914aacb..e302644c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcQuoteFee.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcQuoteFee.java @@ -24,5 +24,5 @@ public class PrcQuoteFee implements Serializable private String roundMode; private String remark; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createdAt; + private Date createTime; } diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcWeightSectionDetail.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcWeightSectionDetail.java index 8c8d1804..1a8561e3 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcWeightSectionDetail.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcWeightSectionDetail.java @@ -24,7 +24,7 @@ public class PrcWeightSectionDetail implements Serializable @JsonFormat(pattern = "yyyy-MM-dd") private Date expireDate; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createdAt; + private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updatedAt; + private Date updateTime; } diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/XtdZoneCountry.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/XtdZoneCountry.java index bcad40cb..cae0e499 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/XtdZoneCountry.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/XtdZoneCountry.java @@ -16,7 +16,7 @@ public class XtdZoneCountry implements Serializable private String countryCode; private String zcDividekind; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createdAt; + private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updatedAt; + private Date updateTime; } diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/XtdZoneDivision.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/XtdZoneDivision.java index 049a4695..aec89e75 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/XtdZoneDivision.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/XtdZoneDivision.java @@ -19,9 +19,9 @@ public class XtdZoneDivision implements Serializable private String znEname; private String znNote; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createdAt; + private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updatedAt; + private Date updateTime; /** 列表展示，非表字段 */ private Integer countryCount; } diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/BillSyncSnapshot.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/BillSyncSnapshot.java index 7dabb31e..868a6b1f 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/BillSyncSnapshot.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/BillSyncSnapshot.java @@ -10,7 +10,7 @@ public class BillSyncSnapshot private String responseJson; private String status; private String errorMessage; - private String updatedAt; + private String updateTime; public String getDocId() { @@ -82,13 +82,13 @@ public class BillSyncSnapshot this.errorMessage = errorMessage; } - public String getUpdatedAt() + public String getUpdateTime() { - return updatedAt; + return updateTime; } - public void setUpdatedAt(String updatedAt) + public void setUpdateTime(String updateTime) { - this.updatedAt = updatedAt; + this.updateTime = updateTime; } } diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/EsBillSearchStore.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/EsBillSearchStore.java index f4833a80..60be52c2 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/EsBillSearchStore.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/EsBillSearchStore.java @@ -67,7 +67,9 @@ public class EsBillSearchStore implements IBillSearchStore doc.put("error", StringUtils.isEmpty(errorMessage) ? null : errorMessage); doc.put("request", parseOrRaw(requestJson)); doc.put("response", parseOrRaw(responseJson)); - doc.put("updatedAt", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(now)); + String ts = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(now); + doc.put("updatedAt", ts); + doc.put("updateTime", ts); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); HttpEntity entity = new HttpEntity(doc.toJSONString(), headers); @@ -218,7 +220,12 @@ public class EsBillSearchStore implements IBillSearchStore } snap.setRequestJson(toJsonString(source.get("request"))); snap.setResponseJson(toJsonString(source.get("response"))); - snap.setUpdatedAt(source.getString("updatedAt")); + String time = source.getString("updateTime"); + if (StringUtils.isEmpty(time)) + { + time = source.getString("updatedAt"); + } + snap.setUpdateTime(time); String status = source.getString("status"); snap.setStatus(StringUtils.isEmpty(status) ? EsBizLogSupport.STATUS_SUCCESS : status); snap.setErrorMessage(source.getString("error")); diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductCountryMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductCountryMapper.xml index 281eea16..6115a410 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductCountryMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductCountryMapper.xml @@ -20,8 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcBillFeeMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcBillFeeMapper.xml index 9eff5768..d0dfd4df 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcBillFeeMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcBillFeeMapper.xml @@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcWeightSectionDetailMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcWeightSectionDetailMapper.xml index 5df521a6..ff538977 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcWeightSectionDetailMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcWeightSectionDetailMapper.xml @@ -14,8 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/XtdZoneCountryMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/price/XtdZoneCountryMapper.xml index 9ab80df8..407e03c7 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/XtdZoneCountryMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/price/XtdZoneCountryMapper.xml @@ -9,8 +9,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/XtdZoneDivisionMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/price/XtdZoneDivisionMapper.xml index b8403e0c..999204d4 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/XtdZoneDivisionMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/price/XtdZoneDivisionMapper.xml @@ -12,8 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + diff --git a/bms-front/src/views/monitor/eslog/index.vue b/bms-front/src/views/monitor/eslog/index.vue index 072f5fc4..737c03ff 100644 --- a/bms-front/src/views/monitor/eslog/index.vue +++ b/bms-front/src/views/monitor/eslog/index.vue @@ -30,7 +30,7 @@ {{ statusLabel(detail.status) }} {{ detail.bizId || '-' }} - {{ detail.updatedAt || '-' }} + {{ detail.updateTime || '-' }} {{ detail.errorMessage }} @@ -84,7 +84,7 @@ const columns = [ { label: '类型', prop: 'logType', align: 'center', width: 110, slot: 'logType' }, { label: '状态', prop: 'status', align: 'center', width: 100, slot: 'status' }, { label: '业务ID', prop: 'bizId', minWidth: 180, showOverflowTooltip: true }, - { label: '写入时间', prop: 'updatedAt', align: 'center', width: 180 }, + { label: '写入时间', prop: 'updateTime', align: 'center', width: 180 }, { label: '操作', prop: 'action', align: 'center', width: 90, fixed: 'right', slot: 'action', showInToolbar: false } ]