From d2a2f8291c419c5adbfb94d23159740f6f79b024 Mon Sep 17 00:00:00 2001 From: hejiayang <296714699@qq.com> Date: Thu, 5 Mar 2026 11:15:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=85=B3=E9=94=AE=E5=AD=97=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/renkang/emergency/entity/AedEquipmentManger.java | 3 ++- .../java/com/renkang/emergency/entity/TblQimoNotice.java | 7 +++++-- .../main/java/com/renkang/emergency/util/QimoVoUtil.java | 4 ++-- .../com/renkang/emergency/async/AsyncImportService.java | 6 +++--- .../com/renkang/emergency/data/model/vo/PhoneDataInfo.java | 4 ++-- .../service/impl/EmergencyGroupedServiceImpl.java | 4 ++-- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/AedEquipmentManger.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/AedEquipmentManger.java index 9fcd007..0a0f7d7 100644 --- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/AedEquipmentManger.java +++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/AedEquipmentManger.java @@ -345,7 +345,8 @@ public class AedEquipmentManger implements Serializable { */ @Excel(name = "型号", width = 15) @Schema(title = "型号") - private String modelNumber; + @TableField("modelNumber") + private String model; /** * 来源字典 设备类型 1：立式 ，2：挂式，3：车载 */ diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblQimoNotice.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblQimoNotice.java index 029fe02..bedada9 100644 --- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblQimoNotice.java +++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblQimoNotice.java @@ -1,5 +1,6 @@ package com.renkang.emergency.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -81,13 +82,15 @@ public class TblQimoNotice implements Serializable { */ @Schema(title = "通话接通时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @Excel(name = "通话接通时间", width = 15, format = "yyyy-MM-dd HH:mm:ss") - private java.util.Date beginTime; + @TableField("beginTime") + private java.util.Date begin; /** * 通话结束时间 */ @Schema(title = "通话结束时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @Excel(name = "通话结束时间", width = 15, format = "yyyy-MM-dd HH:mm:ss") - private java.util.Date endTime; + @TableField("endTime") + private java.util.Date end; /** * 来电进入技能组时间 */ diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/util/QimoVoUtil.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/util/QimoVoUtil.java index bff0cfb..474acd6 100644 --- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/util/QimoVoUtil.java +++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/util/QimoVoUtil.java @@ -33,8 +33,8 @@ public class QimoVoUtil { try { qimoNoticeEntity.setRing(DateUtils.parseDate(qimoVo.getRing(), "yyyy-MM-dd hh:mm:ss")); qimoNoticeEntity.setRingingDate(DateUtils.parseDate(qimoVo.getRingingDate(), "yyyy-MM-dd hh:mm:ss")); - qimoNoticeEntity.setBeginTime(DateUtils.parseDate(qimoVo.getBegin(), "yyyy-MM-dd hh:mm:ss")); - qimoNoticeEntity.setEndTime(DateUtils.parseDate(qimoVo.getEnd(), "yyyy-MM-dd hh:mm:ss")); + qimoNoticeEntity.setBegin(DateUtils.parseDate(qimoVo.getBegin(), "yyyy-MM-dd hh:mm:ss")); + qimoNoticeEntity.setEnd(DateUtils.parseDate(qimoVo.getEnd(), "yyyy-MM-dd hh:mm:ss")); qimoNoticeEntity.setQueueTime(DateUtils.parseDate(qimoVo.getQueueTime(), "yyyy-MM-dd hh:mm:ss")); qimoNoticeEntity.setRingingTimestamp(qimoVo.getRingingTimestamp()); } catch (ParseException e) { diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/async/AsyncImportService.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/async/AsyncImportService.java index 0f51312..8c5f935 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/async/AsyncImportService.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/async/AsyncImportService.java @@ -139,11 +139,11 @@ public class AsyncImportService { exportVO.setCenterName(Optional.ofNullable(groupedMap.get(tblQimoNotice.getExten())).map(EmergencyGrouped::getCenterName).orElse("")); exportVO.setSeatId(tblQimoNotice.getExten()); exportVO.setPhone(tblQimoNotice.getCallNo()); - Optional.ofNullable(tblQimoNotice.getBeginTime()) - .ifPresent(begin -> Optional.ofNullable(tblQimoNotice.getEndTime()).ifPresent(end -> { + Optional.ofNullable(tblQimoNotice.getBegin()) + .ifPresent(begin -> Optional.ofNullable(tblQimoNotice.getEnd()).ifPresent(end -> { exportVO.setCallDuration(String.valueOf(end.getTime() - begin.getTime())); })); - exportVO.setCallTime(Optional.ofNullable(tblQimoNotice.getBeginTime()) + exportVO.setCallTime(Optional.ofNullable(tblQimoNotice.getBegin()) .map(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH)::format).orElse("")); exports.add(exportVO); } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/model/vo/PhoneDataInfo.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/model/vo/PhoneDataInfo.java index c65f645..83db736 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/model/vo/PhoneDataInfo.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/model/vo/PhoneDataInfo.java @@ -60,8 +60,8 @@ public class PhoneDataInfo { this.seatNo = tblQimoNotice.getExten(); this.phone = tblQimoNotice.getCallNo(); this.callTime = tblQimoNotice.getRing(); - if (ObjUtil.isNotEmpty(tblQimoNotice.getBeginTime()) && ObjUtil.isNotEmpty(tblQimoNotice.getEndTime())) { - this.callDuration = String.valueOf((tblQimoNotice.getEndTime().getTime() - tblQimoNotice.getBeginTime().getTime()) / 1000); + if (ObjUtil.isNotEmpty(tblQimoNotice.getBegin()) && ObjUtil.isNotEmpty(tblQimoNotice.getEnd())) { + this.callDuration = String.valueOf((tblQimoNotice.getEnd().getTime() - tblQimoNotice.getBegin().getTime()) / 1000); } } } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/EmergencyGroupedServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/EmergencyGroupedServiceImpl.java index bb2aacb..f3fa2c6 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/EmergencyGroupedServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/EmergencyGroupedServiceImpl.java @@ -251,8 +251,8 @@ public class EmergencyGroupedServiceImpl extends MPJBaseServiceImpl