renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 应急就医数据库迁移相关调整

Browse Source 
1.启动类排除QuartzAutoConfiguration.class
2.数据库字段与达梦保留关键字段冲突调整
3.sql键名重复修改
This commit is contained in:
hejiayang
2026-03-04 18:01:20 +08:00
parent 61045e4389
commit 4c98dd2d30
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/AedEquipmentManger.java
+1 -1
View File
@@ -345,7 +345,7 @@ public class AedEquipmentManger implements Serializable {
*/
@Excel(name = "型号", width = 15)
@Schema(title = "型号")
private String model;
private String modelNumber;
/**
* 来源字典 设备类型 1：立式 ，2：挂式，3：车载
*/
health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblQimoNotice.java
+2 -2
View File
@@ -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;
/**
* 来电进入技能组时间
*/
health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/util/QimoVoUtil.java
+2 -2
View File
@@ -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) {
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml
-1
View File
@@ -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,
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/async/AsyncImportService.java
+3 -3
View File
@@ -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);
}
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/model/vo/PhoneDataInfo.java
+2 -2
View File
@@ -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);
}
}
}
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/EmergencyGroupedServiceImpl.java
+2 -2
View File
@@ -251,8 +251,8 @@ public class EmergencyGroupedServiceImpl extends MPJBaseServiceImpl<EmergencyGro
vo.setDeptName(Optional.ofNullable(thirdDepart).map(SysDepart::getDepartName).orElse(""));
Optional.ofNullable(item.getExten()).ifPresent(vo::setSeatId);
Optional.ofNullable(item.getCallNo()).ifPresent(vo::setPhone);
if (ObjectUtil.isNotEmpty(item.getEnd()) && ObjectUtil.isNotEmpty(item.getBegin())){
vo.setCallDuration(item.getEnd().getTime() - item.getBegin().getTime());
if (ObjectUtil.isNotEmpty(item.getEndTime()) && ObjectUtil.isNotEmpty(item.getBeginTime())){
vo.setCallDuration(item.getEndTime().getTime() - item.getBeginTime().getTime());
}
Optional.ofNullable(item.getCreateDate()).ifPresent(vo::setCallTime);
voList.add(vo);
health-emergency/health-emergency-start/src/main/java/com/renkang/HealthEmergencyCloudApplication.java
+2 -1
View File
@@ -2,9 +2,10 @@ package com.renkang;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication(scanBasePackages = {"com.renkang", "org.jeecg"})
@SpringBootApplication(scanBasePackages = {"com.renkang", "org.jeecg"},exclude = QuartzAutoConfiguration.class)
@EnableFeignClients(basePackages = {"org.jeecg", "com.renkang"})
public class HealthEmergencyCloudApplication {