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

feat(consultation,emergency): 修复达梦数据库字段别名及资源等级查询问题

Browse Source 
- ConResourceMapper.xml 查询中新增 RESOURCE_LEVEL 字段别名映射，解决达梦数据库大写字段名导致的 level 字段无法正确返回问题
- AedEquipmentMangerServiceImpl 相关逻辑优化
This commit is contained in:
lianlonggang
2026-04-01 14:43:03 +08:00
parent cb5bbb1021
commit a7a037daf9
8 changed files with 122 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/xcsql/emergency.sql
+66 -66
View File
@@ -1,63 +1,63 @@
-- 应急模块sql整理
-- 以下所有sql均包含"AYGC_JKYWK".前缀, 后续部署, 如果不需要, 可以批量删除前缀
-- 以下所有sql均包含前缀, 后续部署, 如果不需要, 可以批量删除前缀
-- 更新达梦数据库保留字段名
ALTER TABLE "AYGC_JKYWK"."TBL_QIMO_NOTICE" ALTER COLUMN "BEGIN" RENAME TO "BEGIN_TIME";
ALTER TABLE "AYGC_JKYWK"."TBL_QIMO_NOTICE" ALTER COLUMN "END" RENAME TO "END_TIME";
ALTER TABLE "AYGC_JKYWK"."AED_EQUIPMENT_MANGER" ALTER COLUMN "MODEL" RENAME TO "MODEL_NUMBER";
ALTER TABLE "TBL_QIMO_NOTICE" ALTER COLUMN "BEGIN" RENAME TO "BEGIN_TIME";
ALTER TABLE "TBL_QIMO_NOTICE" ALTER COLUMN "END" RENAME TO "END_TIME";
ALTER TABLE "AED_EQUIPMENT_MANGER" ALTER COLUMN "MODEL" RENAME TO "MODEL_NUMBER";
-- 更新表名(36张)
ALTER TABLE "AYGC_JKYWK"."AED" RENAME TO "QH_EME_AED";
ALTER TABLE "AYGC_JKYWK"."AED_EQUIPMENT_MAINTAIN" RENAME TO "QH_EME_AED_EQUIP_MAINTAIN";
ALTER TABLE "AYGC_JKYWK"."AED_EQUIPMENT_MANGER" RENAME TO "QH_EME_AED_EQUIP_MANGER";
ALTER TABLE "AYGC_JKYWK"."AED_EQUIPMENT_RETRAIN" RENAME TO "QH_EME_AED_EQUIP_RETRAIN";
ALTER TABLE "AYGC_JKYWK"."AED_EQUIPMENT_TRAIN" RENAME TO "QH_EME_AED_EQUIP_TRAIN";
ALTER TABLE "AYGC_JKYWK"."AED_LATEST" RENAME TO "QH_EME_AED_LATEST";
ALTER TABLE "AYGC_JKYWK"."AED_LOCATION_EQUIPMENT" RENAME TO "QH_EME_AED_LOC_EQUIP";
-- ALTER TABLE "AYGC_JKYWK"."AED_USE_RECORD" RENAME TO "QH_EME_AED_USE_RECORD";
ALTER TABLE "AYGC_JKYWK"."AED_WARN_INFO" RENAME TO "QH_EME_AED_WARN_INFO";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_CENTER" RENAME TO "QH_EME_CENTER";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_CENTER_ADMIN" RENAME TO "QH_EME_CENTER_ADMIN";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_CENTER_OPEN_TIME" RENAME TO "QH_EME_CENTER_OPEN_TIME";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_CENTER_RESOURCE" RENAME TO "QH_EME_CENTER_RESOUR";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_GROUPED" RENAME TO "QH_EME_GROUPED";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_HEALTH_ROOM" RENAME TO "QH_EME_HEALTH_ROOM";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_NEW_SCHEDULES" RENAME TO "QH_EME_NEW_SCHEDULES";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_SCHEDULES_NEW_ITEM" RENAME TO "QH_EME_SCHED_NEW_ITEM";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_ORDER" RENAME TO "QH_EME_ORDER";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_ORDER_DETAIL" RENAME TO "QH_EME_ORDER_DETAIL";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_ORDER_INTERVENE" RENAME TO "QH_EME_ORDER_INTERVENE";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_ORDER_OPERATOR" RENAME TO "QH_EME_ORDER_OPERATOR";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_ORDER_SEND_RECORD" RENAME TO "QH_EME_ORDER_SEND_REC";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_PROFESSION_USER" RENAME TO "QH_EME_PROFESS_USER";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_RESOURCE" RENAME TO "QH_EME_RESOURCE";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_SCHEDULE_CUSTOM" RENAME TO "QH_EME_SCHED_CUSTOM";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_SCHEDULE_DEFAULT" RENAME TO "QH_EME_SCHED_DEFAULT";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_SCHEDULE_RECORD" RENAME TO "QH_EME_SCHED_RECORD";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_SCREEN_ANIMATION" RENAME TO "QH_EME_SCRN_ANIMAT";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_SERIOUS_DISEASE" RENAME TO "QH_EME_SERIOUS_DIS";
ALTER TABLE "AYGC_JKYWK"."LARGE_SCREEN_DATA" RENAME TO "QH_EME_SCRN_DATA";
ALTER TABLE "AYGC_JKYWK"."SYS_NOTIFY_SMS_PHONE" RENAME TO "QH_EME_NOTIF_SMS_PHONE";
ALTER TABLE "AYGC_JKYWK"."TBL_QIMO_NOTICE" RENAME TO "QH_EME_QIMO_NOTICE";
ALTER TABLE "AYGC_JKYWK"."TBL_USER_HELP" RENAME TO "QH_EME_USER_HELP";
ALTER TABLE "AED" RENAME TO "QH_EME_AED";
ALTER TABLE "AED_EQUIPMENT_MAINTAIN" RENAME TO "QH_EME_AED_EQUIP_MAINTAIN";
ALTER TABLE "AED_EQUIPMENT_MANGER" RENAME TO "QH_EME_AED_EQUIP_MANGER";
ALTER TABLE "AED_EQUIPMENT_RETRAIN" RENAME TO "QH_EME_AED_EQUIP_RETRAIN";
ALTER TABLE "AED_EQUIPMENT_TRAIN" RENAME TO "QH_EME_AED_EQUIP_TRAIN";
ALTER TABLE "AED_LATEST" RENAME TO "QH_EME_AED_LATEST";
ALTER TABLE "AED_LOCATION_EQUIPMENT" RENAME TO "QH_EME_AED_LOC_EQUIP";
-- ALTER TABLE "AED_USE_RECORD" RENAME TO "QH_EME_AED_USE_RECORD";
ALTER TABLE "AED_WARN_INFO" RENAME TO "QH_EME_AED_WARN_INFO";
ALTER TABLE "EMERGENCY_CENTER" RENAME TO "QH_EME_CENTER";
ALTER TABLE "EMERGENCY_CENTER_ADMIN" RENAME TO "QH_EME_CENTER_ADMIN";
ALTER TABLE "EMERGENCY_CENTER_OPEN_TIME" RENAME TO "QH_EME_CENTER_OPEN_TIME";
ALTER TABLE "EMERGENCY_CENTER_RESOURCE" RENAME TO "QH_EME_CENTER_RESOUR";
ALTER TABLE "EMERGENCY_GROUPED" RENAME TO "QH_EME_GROUPED";
ALTER TABLE "EMERGENCY_HEALTH_ROOM" RENAME TO "QH_EME_HEALTH_ROOM";
ALTER TABLE "EMERGENCY_NEW_SCHEDULES" RENAME TO "QH_EME_NEW_SCHEDULES";
ALTER TABLE "EMERGENCY_SCHEDULES_NEW_ITEM" RENAME TO "QH_EME_SCHED_NEW_ITEM";
ALTER TABLE "EMERGENCY_ORDER" RENAME TO "QH_EME_ORDER";
ALTER TABLE "EMERGENCY_ORDER_DETAIL" RENAME TO "QH_EME_ORDER_DETAIL";
ALTER TABLE "EMERGENCY_ORDER_INTERVENE" RENAME TO "QH_EME_ORDER_INTERVENE";
ALTER TABLE "EMERGENCY_ORDER_OPERATOR" RENAME TO "QH_EME_ORDER_OPERATOR";
ALTER TABLE "EMERGENCY_ORDER_SEND_RECORD" RENAME TO "QH_EME_ORDER_SEND_REC";
ALTER TABLE "EMERGENCY_PROFESSION_USER" RENAME TO "QH_EME_PROFESS_USER";
ALTER TABLE "EMERGENCY_RESOURCE" RENAME TO "QH_EME_RESOURCE";
ALTER TABLE "EMERGENCY_SCHEDULE_CUSTOM" RENAME TO "QH_EME_SCHED_CUSTOM";
ALTER TABLE "EMERGENCY_SCHEDULE_DEFAULT" RENAME TO "QH_EME_SCHED_DEFAULT";
ALTER TABLE "EMERGENCY_SCHEDULE_RECORD" RENAME TO "QH_EME_SCHED_RECORD";
ALTER TABLE "EMERGENCY_SCREEN_ANIMATION" RENAME TO "QH_EME_SCRN_ANIMAT";
ALTER TABLE "EMERGENCY_SERIOUS_DISEASE" RENAME TO "QH_EME_SERIOUS_DIS";
ALTER TABLE "LARGE_SCREEN_DATA" RENAME TO "QH_EME_SCRN_DATA";
ALTER TABLE "SYS_NOTIFY_SMS_PHONE" RENAME TO "QH_EME_NOTIF_SMS_PHONE";
ALTER TABLE "TBL_QIMO_NOTICE" RENAME TO "QH_EME_QIMO_NOTICE";
ALTER TABLE "TBL_USER_HELP" RENAME TO "QH_EME_USER_HELP";
-- QH_EME_VIDEO_MAC 此表数据库已被删除
ALTER TABLE "AYGC_JKYWK"."TBL_VIDEO_MAC" RENAME TO "QH_EME_VIDEO_MAC";
ALTER TABLE "AYGC_JKYWK"."XJ_AED" RENAME TO "QH_EME_XJ_AED";
ALTER TABLE "AYGC_JKYWK"."ZY_AMBULANCE_DATA" RENAME TO "QH_EME_AMBUL_DATA";
ALTER TABLE "TBL_VIDEO_MAC" RENAME TO "QH_EME_VIDEO_MAC";
ALTER TABLE "XJ_AED" RENAME TO "QH_EME_XJ_AED";
ALTER TABLE "ZY_AMBULANCE_DATA" RENAME TO "QH_EME_AMBUL_DATA";
DROP TABLE "AYGC_JKYWK"."QH_EME_VIDEO_MAC";
DROP TABLE "AYGC_JKYWK"."AED_EQUIPMENT_CERTIFICATE";
DROP TABLE "AYGC_JKYWK"."AED_EQUIPMENT_MANGER_20251202";
DROP TABLE "AYGC_JKYWK"."AED_EQUIPMENT_MANGER_20251213";
DROP TABLE "AYGC_JKYWK"."AED_EQUIPMENT_MANGER_20251224";
DROP TABLE "AYGC_JKYWK"."EMERGENCY_RESOURCE_20251202";
DROP TABLE "AYGC_JKYWK"."XJ_AED_20251128";
DROP TABLE "QH_EME_VIDEO_MAC";
DROP TABLE "AED_EQUIPMENT_CERTIFICATE";
DROP TABLE "AED_EQUIPMENT_MANGER_20251202";
DROP TABLE "AED_EQUIPMENT_MANGER_20251213";
DROP TABLE "AED_EQUIPMENT_MANGER_20251224";
DROP TABLE "EMERGENCY_RESOURCE_20251202";
DROP TABLE "XJ_AED_20251128";
-- 缺失表新建
CREATE TABLE "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"
CREATE TABLE "QH_EME_AED_USE_RECORD"
(
"ID" BIGINT NOT NULL,
"EQUIPMENT_ID" BIGINT,
@@ -78,21 +78,21 @@ CREATE TABLE "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"
"UPDATE_TIME" TIMESTAMP(0),
CONSTRAINT "AED_USE_RECORD_PRIMARY" NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ;
COMMENT ON TABLE "AYGC_JKYWK"."QH_EME_AED_USE_RECORD" IS 'aed应用记录表';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."ID" IS '主键';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."EQUIPMENT_ID" IS '设备id';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."USED_TIME" IS '使用时间';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."SALVED_PERSON" IS '被救助人';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."HEART_FLAG" IS '症状1 来源字典（1：有呼吸，2：无呼吸）';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."CONSCIOUSNESS_FLAG" IS '症状2来源字典（1：有意识，2：无意识）';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."USE_USER" IS '使用人';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."USE_INSTRUCTION" IS '使用过程说明';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."START_NUMS" IS '启动次数';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."SUCCESS_RATE" IS '成功除颤率';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."FAIL_RATE" IS '故障率';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."USE_RESULT" IS '应用结果（1：救治成功，2：救治失败）';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."DEL_FLAG" IS '删除状态(0-正常,1-已删除)';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."CREATE_BY" IS '创建人';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."CREATE_TIME" IS '创建时间';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."UPDATE_BY" IS '更新人';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."UPDATE_TIME" IS '更新时间';
COMMENT ON TABLE "QH_EME_AED_USE_RECORD" IS 'aed应用记录表';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."ID" IS '主键';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."EQUIPMENT_ID" IS '设备id';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."USED_TIME" IS '使用时间';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."SALVED_PERSON" IS '被救助人';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."HEART_FLAG" IS '症状1 来源字典（1：有呼吸，2：无呼吸）';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."CONSCIOUSNESS_FLAG" IS '症状2来源字典（1：有意识，2：无意识）';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."USE_USER" IS '使用人';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."USE_INSTRUCTION" IS '使用过程说明';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."START_NUMS" IS '启动次数';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."SUCCESS_RATE" IS '成功除颤率';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."FAIL_RATE" IS '故障率';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."USE_RESULT" IS '应用结果（1：救治成功，2：救治失败）';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."DEL_FLAG" IS '删除状态(0-正常,1-已删除)';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."CREATE_BY" IS '创建人';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."CREATE_TIME" IS '创建时间';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."UPDATE_BY" IS '更新人';
COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."UPDATE_TIME" IS '更新时间';