From 4c98dd2d30256f57b0fa32b4ae65464e6bf52a2b Mon Sep 17 00:00:00 2001 From: hejiayang <296714699@qq.com> Date: Wed, 4 Mar 2026 18:01:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BA=94=E6=80=A5=E5=B0=B1=E5=8C=BB?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=81=E7=A7=BB=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E8=B0=83=E6=95=B4=201.=E5=90=AF=E5=8A=A8=E7=B1=BB=E6=8E=92?= =?UTF-8?q?=E9=99=A4QuartzAutoConfiguration.class=202.=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=AD=97=E6=AE=B5=E4=B8=8E=E8=BE=BE=E6=A2=A6=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E5=85=B3=E9=94=AE=E5=AD=97=E6=AE=B5=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4=203.sql=E9=94=AE=E5=90=8D=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/renkang/emergency/entity/AedEquipmentManger.java | 2 +- .../java/com/renkang/emergency/entity/TblQimoNotice.java | 4 ++-- .../main/java/com/renkang/emergency/util/QimoVoUtil.java | 4 ++-- .../emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml | 1 - .../com/renkang/emergency/async/AsyncImportService.java | 6 +++--- .../com/renkang/emergency/data/model/vo/PhoneDataInfo.java | 4 ++-- .../emergency/service/impl/EmergencyGroupedServiceImpl.java | 4 ++-- .../java/com/renkang/HealthEmergencyCloudApplication.java | 3 ++- 8 files changed, 14 insertions(+), 14 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 c0e9f61..9fcd007 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,7 @@ public class AedEquipmentManger implements Serializable { */ @Excel(name = "型号", width = 15) @Schema(title = "型号") - private String model; + private String modelNumber; /** * 来源字典 设备类型 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 e4dbd82..029fe02 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 @@ -81,13 +81,13 @@ 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 begin; + private java.util.Date beginTime; /** * 通话结束时间 */ @Schema(title = "通话结束时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @Excel(name = "通话结束时间", width = 15, format = "yyyy-MM-dd HH:mm:ss") - private java.util.Date end; + private java.util.Date endTime; /** * 来电进入技能组时间 */ 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 474acd6..bff0cfb 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.setBegin(DateUtils.parseDate(qimoVo.getBegin(), "yyyy-MM-dd hh:mm:ss")); - qimoNoticeEntity.setEnd(DateUtils.parseDate(qimoVo.getEnd(), "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.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/aed/mapper/xml/AedEquipmentMangerMapper.xml b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml index 294da69..9d89b41 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml @@ -25,7 +25,6 @@ operate_instruction as operateInstruction, operate_video as operateVideo, disclaimer as disclaimer, - control_org_name as controlOrgName, manage_user_name as manageUserName, manage_user_mobile as manageUserMobile, mfrs_Mobile as mfrsMobile, 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 8c5f935..0f51312 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.getBegin()) - .ifPresent(begin -> Optional.ofNullable(tblQimoNotice.getEnd()).ifPresent(end -> { + Optional.ofNullable(tblQimoNotice.getBeginTime()) + .ifPresent(begin -> Optional.ofNullable(tblQimoNotice.getEndTime()).ifPresent(end -> { exportVO.setCallDuration(String.valueOf(end.getTime() - begin.getTime())); })); - exportVO.setCallTime(Optional.ofNullable(tblQimoNotice.getBegin()) + exportVO.setCallTime(Optional.ofNullable(tblQimoNotice.getBeginTime()) .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 83db736..c65f645 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.getBegin()) && ObjUtil.isNotEmpty(tblQimoNotice.getEnd())) { - this.callDuration = String.valueOf((tblQimoNotice.getEnd().getTime() - tblQimoNotice.getBegin().getTime()) / 1000); + if (ObjUtil.isNotEmpty(tblQimoNotice.getBeginTime()) && ObjUtil.isNotEmpty(tblQimoNotice.getEndTime())) { + this.callDuration = String.valueOf((tblQimoNotice.getEndTime().getTime() - tblQimoNotice.getBeginTime().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 f3fa2c6..bb2aacb 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