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/consult.sql
+1
View File
@@ -64,3 +64,4 @@ ALTER TABLE IM_MSG_RECORD_ALL RENAME TO QH_CON_IM_MSG_ALL;
-- 修改表字段（触发关键字了） -- 修改表字段（触发关键字了）
ALTER TABLE QH_CON_EVALUATE RENAME COLUMN "CONTEXT" TO EVA_CONTEXT; ALTER TABLE QH_CON_EVALUATE RENAME COLUMN "CONTEXT" TO EVA_CONTEXT;
ALTER TABLE QH_CON_RESOURCE RENAME COLUMN "LEVEL" TO RESOURCE_LEVEL;
db/xcsql/emergency.sql
+66 -66
View File
@@ -1,63 +1,63 @@
-- 应急模块sql整理 -- 应急模块sql整理
-- 以下所有sql均包含"AYGC_JKYWK".前缀, 后续部署, 如果不需要, 可以批量删除前缀 -- 以下所有sql均包含前缀, 后续部署, 如果不需要, 可以批量删除前缀
-- 更新达梦数据库保留字段名 -- 更新达梦数据库保留字段名
ALTER TABLE "AYGC_JKYWK"."TBL_QIMO_NOTICE" ALTER COLUMN "BEGIN" RENAME TO "BEGIN_TIME"; ALTER TABLE "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 "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 "AED_EQUIPMENT_MANGER" ALTER COLUMN "MODEL" RENAME TO "MODEL_NUMBER";
-- 更新表名(36张) -- 更新表名(36张)
ALTER TABLE "AYGC_JKYWK"."AED" RENAME TO "QH_EME_AED"; ALTER TABLE "AED" RENAME TO "QH_EME_AED";
ALTER TABLE "AYGC_JKYWK"."AED_EQUIPMENT_MAINTAIN" RENAME TO "QH_EME_AED_EQUIP_MAINTAIN"; ALTER TABLE "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 "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 "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 "AED_EQUIPMENT_TRAIN" RENAME TO "QH_EME_AED_EQUIP_TRAIN";
ALTER TABLE "AYGC_JKYWK"."AED_LATEST" RENAME TO "QH_EME_AED_LATEST"; ALTER TABLE "AED_LATEST" RENAME TO "QH_EME_AED_LATEST";
ALTER TABLE "AYGC_JKYWK"."AED_LOCATION_EQUIPMENT" RENAME TO "QH_EME_AED_LOC_EQUIP"; ALTER TABLE "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 "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 "AED_WARN_INFO" RENAME TO "QH_EME_AED_WARN_INFO";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_CENTER" RENAME TO "QH_EME_CENTER"; ALTER TABLE "EMERGENCY_CENTER" RENAME TO "QH_EME_CENTER";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_CENTER_ADMIN" RENAME TO "QH_EME_CENTER_ADMIN"; ALTER TABLE "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 "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 "EMERGENCY_CENTER_RESOURCE" RENAME TO "QH_EME_CENTER_RESOUR";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_GROUPED" RENAME TO "QH_EME_GROUPED"; ALTER TABLE "EMERGENCY_GROUPED" RENAME TO "QH_EME_GROUPED";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_HEALTH_ROOM" RENAME TO "QH_EME_HEALTH_ROOM"; ALTER TABLE "EMERGENCY_HEALTH_ROOM" RENAME TO "QH_EME_HEALTH_ROOM";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_NEW_SCHEDULES" RENAME TO "QH_EME_NEW_SCHEDULES"; ALTER TABLE "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 "EMERGENCY_SCHEDULES_NEW_ITEM" RENAME TO "QH_EME_SCHED_NEW_ITEM";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_ORDER" RENAME TO "QH_EME_ORDER"; ALTER TABLE "EMERGENCY_ORDER" RENAME TO "QH_EME_ORDER";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_ORDER_DETAIL" RENAME TO "QH_EME_ORDER_DETAIL"; ALTER TABLE "EMERGENCY_ORDER_DETAIL" RENAME TO "QH_EME_ORDER_DETAIL";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_ORDER_INTERVENE" RENAME TO "QH_EME_ORDER_INTERVENE"; ALTER TABLE "EMERGENCY_ORDER_INTERVENE" RENAME TO "QH_EME_ORDER_INTERVENE";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_ORDER_OPERATOR" RENAME TO "QH_EME_ORDER_OPERATOR"; ALTER TABLE "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 "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 "EMERGENCY_PROFESSION_USER" RENAME TO "QH_EME_PROFESS_USER";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_RESOURCE" RENAME TO "QH_EME_RESOURCE"; ALTER TABLE "EMERGENCY_RESOURCE" RENAME TO "QH_EME_RESOURCE";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_SCHEDULE_CUSTOM" RENAME TO "QH_EME_SCHED_CUSTOM"; ALTER TABLE "EMERGENCY_SCHEDULE_CUSTOM" RENAME TO "QH_EME_SCHED_CUSTOM";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_SCHEDULE_DEFAULT" RENAME TO "QH_EME_SCHED_DEFAULT"; ALTER TABLE "EMERGENCY_SCHEDULE_DEFAULT" RENAME TO "QH_EME_SCHED_DEFAULT";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_SCHEDULE_RECORD" RENAME TO "QH_EME_SCHED_RECORD"; ALTER TABLE "EMERGENCY_SCHEDULE_RECORD" RENAME TO "QH_EME_SCHED_RECORD";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_SCREEN_ANIMATION" RENAME TO "QH_EME_SCRN_ANIMAT"; ALTER TABLE "EMERGENCY_SCREEN_ANIMATION" RENAME TO "QH_EME_SCRN_ANIMAT";
ALTER TABLE "AYGC_JKYWK"."EMERGENCY_SERIOUS_DISEASE" RENAME TO "QH_EME_SERIOUS_DIS"; ALTER TABLE "EMERGENCY_SERIOUS_DISEASE" RENAME TO "QH_EME_SERIOUS_DIS";
ALTER TABLE "AYGC_JKYWK"."LARGE_SCREEN_DATA" RENAME TO "QH_EME_SCRN_DATA"; ALTER TABLE "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 "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 "TBL_QIMO_NOTICE" RENAME TO "QH_EME_QIMO_NOTICE";
ALTER TABLE "AYGC_JKYWK"."TBL_USER_HELP" RENAME TO "QH_EME_USER_HELP"; ALTER TABLE "TBL_USER_HELP" RENAME TO "QH_EME_USER_HELP";
-- QH_EME_VIDEO_MAC 此表数据库已被删除 -- QH_EME_VIDEO_MAC 此表数据库已被删除
ALTER TABLE "AYGC_JKYWK"."TBL_VIDEO_MAC" RENAME TO "QH_EME_VIDEO_MAC"; ALTER TABLE "TBL_VIDEO_MAC" RENAME TO "QH_EME_VIDEO_MAC";
ALTER TABLE "AYGC_JKYWK"."XJ_AED" RENAME TO "QH_EME_XJ_AED"; ALTER TABLE "XJ_AED" RENAME TO "QH_EME_XJ_AED";
ALTER TABLE "AYGC_JKYWK"."ZY_AMBULANCE_DATA" RENAME TO "QH_EME_AMBUL_DATA"; ALTER TABLE "ZY_AMBULANCE_DATA" RENAME TO "QH_EME_AMBUL_DATA";
DROP TABLE "AYGC_JKYWK"."QH_EME_VIDEO_MAC"; DROP TABLE "QH_EME_VIDEO_MAC";
DROP TABLE "AYGC_JKYWK"."AED_EQUIPMENT_CERTIFICATE"; DROP TABLE "AED_EQUIPMENT_CERTIFICATE";
DROP TABLE "AYGC_JKYWK"."AED_EQUIPMENT_MANGER_20251202"; DROP TABLE "AED_EQUIPMENT_MANGER_20251202";
DROP TABLE "AYGC_JKYWK"."AED_EQUIPMENT_MANGER_20251213"; DROP TABLE "AED_EQUIPMENT_MANGER_20251213";
DROP TABLE "AYGC_JKYWK"."AED_EQUIPMENT_MANGER_20251224"; DROP TABLE "AED_EQUIPMENT_MANGER_20251224";
DROP TABLE "AYGC_JKYWK"."EMERGENCY_RESOURCE_20251202"; DROP TABLE "EMERGENCY_RESOURCE_20251202";
DROP TABLE "AYGC_JKYWK"."XJ_AED_20251128"; 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, "ID" BIGINT NOT NULL,
"EQUIPMENT_ID" BIGINT, "EQUIPMENT_ID" BIGINT,
@@ -78,21 +78,21 @@ CREATE TABLE "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"
"UPDATE_TIME" TIMESTAMP(0), "UPDATE_TIME" TIMESTAMP(0),
CONSTRAINT "AED_USE_RECORD_PRIMARY" NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ; 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 TABLE "QH_EME_AED_USE_RECORD" IS 'aed应用记录表';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."ID" IS '主键'; COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."ID" IS '主键';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."EQUIPMENT_ID" IS '设备id'; COMMENT ON COLUMN "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 "QH_EME_AED_USE_RECORD"."USED_TIME" IS '使用时间';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."SALVED_PERSON" IS '被救助人'; COMMENT ON COLUMN "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 "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 "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 "QH_EME_AED_USE_RECORD"."USE_USER" IS '使用人';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."USE_INSTRUCTION" IS '使用过程说明'; COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."USE_INSTRUCTION" IS '使用过程说明';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."START_NUMS" IS '启动次数'; COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."START_NUMS" IS '启动次数';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."SUCCESS_RATE" IS '成功除颤率'; COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."SUCCESS_RATE" IS '成功除颤率';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."FAIL_RATE" IS '故障率'; COMMENT ON COLUMN "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 "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 "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 "QH_EME_AED_USE_RECORD"."CREATE_BY" IS '创建人';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."CREATE_TIME" IS '创建时间'; COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."CREATE_TIME" IS '创建时间';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."UPDATE_BY" IS '更新人'; COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."UPDATE_BY" IS '更新人';
COMMENT ON COLUMN "AYGC_JKYWK"."QH_EME_AED_USE_RECORD"."UPDATE_TIME" IS '更新时间'; COMMENT ON COLUMN "QH_EME_AED_USE_RECORD"."UPDATE_TIME" IS '更新时间';
db/xcsql/watch.sql
+48 -48
View File
@@ -1,52 +1,52 @@
-- 手表模块sql整理 -- 手表模块sql整理
-- 以下所有sql均包含"AYGC_JKYWK".前缀, 后续部署, 如果不需要, 可以批量删除前缀 -- 以下所有sql均包含前缀, 后续部署, 如果不需要, 可以批量删除前缀
-- 更新表名(47张) -- 更新表名(47张)
ALTER TABLE "AYGC_JKYWK"."ARCHIVES_BODY_TYPE" RENAME TO "QH_WAT_ARCHIVES_BODY_TYPE"; ALTER TABLE "ARCHIVES_BODY_TYPE" RENAME TO "QH_WAT_ARCHIVES_BODY_TYPE";
ALTER TABLE "AYGC_JKYWK"."DEPT_STATISTIC_DATA" RENAME TO "QH_WAT_DEPT_STAT_DATA"; ALTER TABLE "DEPT_STATISTIC_DATA" RENAME TO "QH_WAT_DEPT_STAT_DATA";
ALTER TABLE "AYGC_JKYWK"."USER_RECORD_SPORTS_DAY" RENAME TO "QH_WAT_USER_REC_SPORT_DAY"; ALTER TABLE "USER_RECORD_SPORTS_DAY" RENAME TO "QH_WAT_USER_REC_SPORT_DAY";
ALTER TABLE "AYGC_JKYWK"."USER_RECORD_SPORTS_INFO" RENAME TO "QH_WAT_USER_REC_SPORT_INF"; ALTER TABLE "USER_RECORD_SPORTS_INFO" RENAME TO "QH_WAT_USER_REC_SPORT_INF";
ALTER TABLE "AYGC_JKYWK"."USER_WE_CHAT_SPORTS_DAY" RENAME TO "QH_WAT_USER_WECH_SPO_DAY"; ALTER TABLE "USER_WE_CHAT_SPORTS_DAY" RENAME TO "QH_WAT_USER_WECH_SPO_DAY";
ALTER TABLE "AYGC_JKYWK"."WATCH_ABNORMAL_RECORD" RENAME TO "QH_WAT_ABNORMAL_RECORD"; ALTER TABLE "WATCH_ABNORMAL_RECORD" RENAME TO "QH_WAT_ABNORMAL_RECORD";
ALTER TABLE "AYGC_JKYWK"."WATCH_BIND_HIS" RENAME TO "QH_WAT_BIND_HIS"; ALTER TABLE "WATCH_BIND_HIS" RENAME TO "QH_WAT_BIND_HIS";
ALTER TABLE "AYGC_JKYWK"."WATCH_BIND_HIS_BAK" RENAME TO "QH_WAT_BIND_HIS_BAK"; ALTER TABLE "WATCH_BIND_HIS_BAK" RENAME TO "QH_WAT_BIND_HIS_BAK";
ALTER TABLE "AYGC_JKYWK"."WATCH_BIND_HIS_COPY1" RENAME TO "QH_WAT_BIND_HIS_COPY1"; ALTER TABLE "WATCH_BIND_HIS_COPY1" RENAME TO "QH_WAT_BIND_HIS_COPY1";
ALTER TABLE "AYGC_JKYWK"."WATCH_BIND_HIS_COPY2" RENAME TO "QH_WAT_BIND_HIS_COPY2"; ALTER TABLE "WATCH_BIND_HIS_COPY2" RENAME TO "QH_WAT_BIND_HIS_COPY2";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA" RENAME TO "QH_WAT_DATA"; ALTER TABLE "WATCH_DATA" RENAME TO "QH_WAT_DATA";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_CALORIE" RENAME TO "QH_WAT_DATA_CALORIE"; ALTER TABLE "WATCH_DATA_CALORIE" RENAME TO "QH_WAT_DATA_CALORIE";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_DAY" RENAME TO "QH_WAT_DATA_DAY"; ALTER TABLE "WATCH_DATA_DAY" RENAME TO "QH_WAT_DATA_DAY";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_DETAIL" RENAME TO "QH_WAT_DATA_DETAIL"; ALTER TABLE "WATCH_DATA_DETAIL" RENAME TO "QH_WAT_DATA_DETAIL";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_DISTANCE" RENAME TO "QH_WAT_DATA_DISTANCE"; ALTER TABLE "WATCH_DATA_DISTANCE" RENAME TO "QH_WAT_DATA_DISTANCE";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_ECG" RENAME TO "QH_WAT_DATA_ECG"; ALTER TABLE "WATCH_DATA_ECG" RENAME TO "QH_WAT_DATA_ECG";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_EXERCISE" RENAME TO "QH_WAT_DATA_EXERCISE"; ALTER TABLE "WATCH_DATA_EXERCISE" RENAME TO "QH_WAT_DATA_EXERCISE";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_GPS" RENAME TO "QH_WAT_DATA_GPS"; ALTER TABLE "WATCH_DATA_GPS" RENAME TO "QH_WAT_DATA_GPS";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_HEART_RATE" RENAME TO "QH_WAT_DATA_HEART_RATE"; ALTER TABLE "WATCH_DATA_HEART_RATE" RENAME TO "QH_WAT_DATA_HEART_RATE";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_SLEEP" RENAME TO "QH_WAT_DATA_SLEEP"; ALTER TABLE "WATCH_DATA_SLEEP" RENAME TO "QH_WAT_DATA_SLEEP";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_SLEEP_NEW" RENAME TO "QH_WAT_DATA_SLEEP_NEW"; ALTER TABLE "WATCH_DATA_SLEEP_NEW" RENAME TO "QH_WAT_DATA_SLEEP_NEW";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_SLEEP_NEW_DAY" RENAME TO "QH_WAT_DATA_SLEEP_NEW_DAY"; ALTER TABLE "WATCH_DATA_SLEEP_NEW_DAY" RENAME TO "QH_WAT_DATA_SLEEP_NEW_DAY";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_SLEEP_NEW_ERR" RENAME TO "QH_WAT_DATA_SLEEP_NEW_ERR"; ALTER TABLE "WATCH_DATA_SLEEP_NEW_ERR" RENAME TO "QH_WAT_DATA_SLEEP_NEW_ERR";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_SLEEP_NEW_MINUTE" RENAME TO "QH_WAT_DATA_SLEEP_NEW_MIN"; ALTER TABLE "WATCH_DATA_SLEEP_NEW_MINUTE" RENAME TO "QH_WAT_DATA_SLEEP_NEW_MIN";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_SPO2" RENAME TO "QH_WAT_DATA_SPO2"; ALTER TABLE "WATCH_DATA_SPO2" RENAME TO "QH_WAT_DATA_SPO2";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_STEPS" RENAME TO "QH_WAT_DATA_STEPS"; ALTER TABLE "WATCH_DATA_STEPS" RENAME TO "QH_WAT_DATA_STEPS";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_STEPS_HF" RENAME TO "QH_WAT_DATA_STEPS_HF"; ALTER TABLE "WATCH_DATA_STEPS_HF" RENAME TO "QH_WAT_DATA_STEPS_HF";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_STRESS" RENAME TO "QH_WAT_DATA_STRESS"; ALTER TABLE "WATCH_DATA_STRESS" RENAME TO "QH_WAT_DATA_STRESS";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_TEMPERATURE" RENAME TO "QH_WAT_DATA_TEMP"; ALTER TABLE "WATCH_DATA_TEMPERATURE" RENAME TO "QH_WAT_DATA_TEMP";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_WORKOUT" RENAME TO "QH_WAT_DATA_WORKOUT"; ALTER TABLE "WATCH_DATA_WORKOUT" RENAME TO "QH_WAT_DATA_WORKOUT";
ALTER TABLE "AYGC_JKYWK"."WATCH_DATA_WORKOUT_TRACE" RENAME TO "QH_WAT_DATA_WORKOUT_TRACE"; ALTER TABLE "WATCH_DATA_WORKOUT_TRACE" RENAME TO "QH_WAT_DATA_WORKOUT_TRACE";
ALTER TABLE "AYGC_JKYWK"."WATCH_DEPART_REPORT" RENAME TO "QH_WAT_DEPART_REPORT"; ALTER TABLE "WATCH_DEPART_REPORT" RENAME TO "QH_WAT_DEPART_REPORT";
ALTER TABLE "AYGC_JKYWK"."WATCH_DEVICE" RENAME TO "QH_WAT_DEVICE"; ALTER TABLE "WATCH_DEVICE" RENAME TO "QH_WAT_DEVICE";
ALTER TABLE "AYGC_JKYWK"."WATCH_DEVICE_SWITCH" RENAME TO "QH_WAT_DEVICE_SWITCH"; ALTER TABLE "WATCH_DEVICE_SWITCH" RENAME TO "QH_WAT_DEVICE_SWITCH";
ALTER TABLE "AYGC_JKYWK"."WATCH_KEY_USER" RENAME TO "QH_WAT_KEY_USER"; ALTER TABLE "WATCH_KEY_USER" RENAME TO "QH_WAT_KEY_USER";
ALTER TABLE "AYGC_JKYWK"."WATCH_MONITOR_DATA" RENAME TO "QH_WAT_MONITOR_DATA"; ALTER TABLE "WATCH_MONITOR_DATA" RENAME TO "QH_WAT_MONITOR_DATA";
ALTER TABLE "AYGC_JKYWK"."WATCH_MONITOR_MOBILE" RENAME TO "QH_WAT_MONITOR_MOBILE"; ALTER TABLE "WATCH_MONITOR_MOBILE" RENAME TO "QH_WAT_MONITOR_MOBILE";
ALTER TABLE "AYGC_JKYWK"."WATCH_MQTT_NOTICE" RENAME TO "QH_WAT_MQTT_NOTICE"; ALTER TABLE "WATCH_MQTT_NOTICE" RENAME TO "QH_WAT_MQTT_NOTICE";
ALTER TABLE "AYGC_JKYWK"."WATCH_STAT_USER_INFO_DAY_HEART_RATE" RENAME TO "QH_WAT_STAT_USER_DAY_HR"; ALTER TABLE "WATCH_STAT_USER_INFO_DAY_HEART_RATE" RENAME TO "QH_WAT_STAT_USER_DAY_HR";
ALTER TABLE "AYGC_JKYWK"."WATCH_STAT_USER_INFO_DAY_SDC" RENAME TO "QH_WAT_STAT_USER_DAY_SDC"; ALTER TABLE "WATCH_STAT_USER_INFO_DAY_SDC" RENAME TO "QH_WAT_STAT_USER_DAY_SDC";
ALTER TABLE "AYGC_JKYWK"."WATCH_STAT_USER_INFO_DAY_SLEEP" RENAME TO "QH_WAT_STAT_USER_DAY_SLE"; ALTER TABLE "WATCH_STAT_USER_INFO_DAY_SLEEP" RENAME TO "QH_WAT_STAT_USER_DAY_SLE";
ALTER TABLE "AYGC_JKYWK"."WATCH_STAT_USER_INFO_DAY_SPO2" RENAME TO "QH_WAT_STAT_USER_DAY_SPO2"; ALTER TABLE "WATCH_STAT_USER_INFO_DAY_SPO2" RENAME TO "QH_WAT_STAT_USER_DAY_SPO2";
ALTER TABLE "AYGC_JKYWK"."WATCH_STAT_USER_INFO_DAY_STRESS" RENAME TO "QH_WAT_STAT_USER_DAY_STRE"; ALTER TABLE "WATCH_STAT_USER_INFO_DAY_STRESS" RENAME TO "QH_WAT_STAT_USER_DAY_STRE";
ALTER TABLE "AYGC_JKYWK"."WATCH_STAT_USER_INFO_DAY_TEMP" RENAME TO "QH_WAT_STAT_USER_DAY_TEMP"; ALTER TABLE "WATCH_STAT_USER_INFO_DAY_TEMP" RENAME TO "QH_WAT_STAT_USER_DAY_TEMP";
ALTER TABLE "AYGC_JKYWK"."WATCH_STAT_USER_INFO_DAY_WORKOUT" RENAME TO "QH_WAT_STAT_USER_DAY_WORK"; ALTER TABLE "WATCH_STAT_USER_INFO_DAY_WORKOUT" RENAME TO "QH_WAT_STAT_USER_DAY_WORK";
ALTER TABLE "AYGC_JKYWK"."WATCH_SYN_MAX_ID" RENAME TO "QH_WAT_SYN_MAX_ID"; ALTER TABLE "WATCH_SYN_MAX_ID" RENAME TO "QH_WAT_SYN_MAX_ID";
ALTER TABLE "AYGC_JKYWK"."WATCH_USER_DATA" RENAME TO "QH_WAT_USER_DATA"; ALTER TABLE "WATCH_USER_DATA" RENAME TO "QH_WAT_USER_DATA";
health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConResource.java
+1
View File
@@ -117,6 +117,7 @@ public class ConResource extends ConPage implements Serializable {
*/ */
@Excel(name = "医院等级", width = 15) @Excel(name = "医院等级", width = 15)
@Schema(title = "医院等级") @Schema(title = "医院等级")
@TableField(value = "RESOURCE_LEVEL")
private String level; private String level;
/** /**
* 图片 * 图片
health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConResourceMapper.xml
+3 -3
View File
@@ -8,7 +8,7 @@
</update> </update>
<select id="queryPageList" resultType="com.renkang.consultation.entity.ConResource"> <select id="queryPageList" resultType="com.renkang.consultation.entity.ConResource">
SELECT cr.* FROM qh_con_resource cr SELECT cr.*,cr.RESOURCE_LEVEL "level" FROM qh_con_resource cr
<where> <where>
cr.del_flag = 0 cr.del_flag = 0
<if test="conResource.resourceName != null and conResource.resourceName != ''"> <if test="conResource.resourceName != null and conResource.resourceName != ''">
@@ -21,7 +21,7 @@
AND cr.address LIKE CONCAT('%', #{conResource.province}, '%') AND cr.address LIKE CONCAT('%', #{conResource.province}, '%')
</if> </if>
<if test="conResource.level != null and conResource.level != ''"> <if test="conResource.level != null and conResource.level != ''">
AND cr."LEVEL" = #{conResource.level} AND cr.RESOURCE_LEVEL = #{conResource.level}
</if> </if>
<if test="conResource.status != null and conResource.status != ''"> <if test="conResource.status != null and conResource.status != ''">
AND cr.status = #{conResource.status} AND cr.status = #{conResource.status}
@@ -32,7 +32,7 @@
<select id="selectBatchIds" resultType="com.renkang.consultation.entity.ConResource"> <select id="selectBatchIds" resultType="com.renkang.consultation.entity.ConResource">
SELECT id, resource_name, longitude, latitude, "TYPE", second_type, aidrange, gd_id, url, province, city, area, SELECT id, resource_name, longitude, latitude, "TYPE", second_type, aidrange, gd_id, url, province, city, area,
address, "LEVEL", img, synopsis, sort, "STATUS", del_flag, create_by, create_time, update_by, update_time, memo, address, RESOURCE_LEVEL, img, synopsis, sort, "STATUS", del_flag, create_by, create_time, update_by, update_time, memo,
key_departments, user_score, user_score_num, resource_detail, tf_top key_departments, user_score, user_score_num, resource_detail, tf_top
FROM qh_con_resource FROM qh_con_resource
WHERE id IN WHERE id IN
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/service/impl/AedEquipmentMangerServiceImpl.java
+1 -1
View File
@@ -444,7 +444,7 @@ public class AedEquipmentMangerServiceImpl extends ServiceImpl<AedEquipmentMange
queryWrapper.like(AedEquipmentManger::getHostSerialNum, hostModel); queryWrapper.like(AedEquipmentManger::getHostSerialNum, hostModel);
} }
if (StrUtil.isNotBlank(orgCode)) { if (StrUtil.isNotBlank(orgCode)) {
queryWrapper.likeRight(AedEquipmentManger::getDepartCode, GlobalUtils.getSecondDepartOrgCode(orgCode)); queryWrapper.likeRight(AedEquipmentManger::getDepartCode, GlobalUtils.getThirdDepartOrgCode(orgCode));
} }
List<AedEquipmentManger> list = aedEquipmentMangerMapper.selectList(queryWrapper); List<AedEquipmentManger> list = aedEquipmentMangerMapper.selectList(queryWrapper);
if (CollectionUtil.isEmpty(list)) { if (CollectionUtil.isEmpty(list)) {
jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/DmKeywordInterceptor.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class DmKeywordInterceptor implements Interceptor {
* 可根据实际需要添加更多关键字 * 可根据实际需要添加更多关键字
*/ */
private static final Set<String> DM_KEYWORDS = new HashSet<>(Arrays.asList( private static final Set<String> DM_KEYWORDS = new HashSet<>(Arrays.asList(
"MODEL", "BEGIN", "END", "CONTEXT" "MODEL", "BEGIN", "END", "CONTEXT", "LEVEL", "DESC"
)); ));
@Override @Override
jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/HealthConsultResource.java
+1 -1
View File
@@ -126,7 +126,7 @@ public class HealthConsultResource implements Serializable {
*/ */
@Excel(name = "医院简介", width = 15) @Excel(name = "医院简介", width = 15)
@Schema(title = "医院简介") @Schema(title = "医院简介")
@TableField(value = "INTRODUCTION", property = "\"desc\"") @TableField(value = "INTRODUCTION")
private String desc; private String desc;
/** /**
* 排序序号 * 排序序号