33 Commits
Author SHA1 Message Date
lianlonggang 177e0e4d97 feat(watch): listCustom 接口与导出增加 eventId、locateTime 字段
1. AbnormalEvent 新增 eventId、locateTime 字段
2. listCustom/largeScreenListCustom/listCustomForMap 三个接口返回新字段
3. 导出 Excel 通过 @Excel 注解自动支持新字段(顺序 12、13)
4. locateTime 时间格式化为 yyyy-MM-dd HH:mm:ss
5. 修正 createMonitorData 中遗漏的 eventId 与 locateTime 字段赋值
6. DDL 表名修正为 QH_WAT_MONITOR_DATA(项目实际表名)
2026-09-03 13:43:26 +08:00
lianlonggang f74a2322e4 chore(db): 将已执行完成的 SQL 脚本从 updatesql 迁移至 done 目录
将历史已执行完毕的 SQL 更新脚本统一归档至 db/done/ 目录,
便于区分待执行脚本与已完成脚本。
2026-09-03 10:43:23 +08:00
lianlonggang 822cdbf539 feat(watch): notice 入参新增 eventId、locateTime;新增 updateMonitorGps 接口
1. WatchNotifyVo、WatchMonitorData 新增 eventId 与 locateTime 字段
2. 新增 POST /watchApi/updateMonitorGps 接口
3. watchNo + eventId 联合定位告警数据,任一缺失则忽略
4. 已存在 lon/lat 数据则忽略本次更新,避免覆盖
5. GPS84 → GCJ02 坐标转换 + 高德地址反查(参考 createMonitorData 逻辑)
6. 仅更新 GPS 相关字段,不推送大屏与短信
2026-09-03 10:40:14 +08:00
lianlonggang d75f21c17e feat(db): watch_monitor_data 表新增 EVENT_ID 与 LOCATE_TIME 字段
为支持手表告警事件与定时GPS位置上报的关联,新增两个字段:
- EVENT_ID(事件ID,用于告警事件与GPS位置更新关联)
- LOCATE_TIME(定位时间,手表定时上报的GPS定位时间)

同时新增 IDX_EVENT_ID 单列索引与 IDX_WATCH_NO_EVENT_ID 联合索引,
优化 watchNo + eventId 联合定位查询性能。

数据库:118-DM 达梦数据库,SQL 全大写规范。
2026-09-03 10:40:02 +08:00
lianlonggangandClaude Opus 4.7 ffee8611fe fix(watch): 恢复设备导入校验和手表绑定单位限制,新增未分配设备数统计
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-06-03 11:05:33 +08:00
lianlonggang 0e8f5e7b14 feat(watch): 导入设备绑定时,手表所属单位以员工信息为准 2026-05-06 14:47:33 +08:00
lianlonggang 115407026f fix(device): 解决设备导入和绑定功能的部门权限问题
- 移除设备导入时的部门必填验证,允许为空时默认归入新疆油田公司(A01)
- 移除设备绑定时的跨单位限制检查
- 在设备绑定时根据员工信息更新手表的单位信息
- 修复部门统计数据查询中的层级展示逻辑
- 优化部门统计服务中的注释文档和代码结构
- 添加设备表更新操作中单位编码和部门ID的条件设置
2026-04-30 14:13:26 +08:00
lianlonggang 9f545952e4 fix(upload): 修复文件上传和权限配置问题
- 修正 MyUploadUtil 中 tar/apk 文件上传调用参数,添加必需的布尔参数
- 注释掉 Shiro 配置中 /sys/upload/down/** 和 /sys/upload/show/** 的匿名访问权限
- 解决文件上传功能与安全配置的兼容性问题
2026-04-30 08:49:19 +08:00
lianlonggang 1988e031e5 feat(file-upload): 集成新疆OSS文件上传功能并优化设备删除逻辑
- 实现新疆油田平台OSS文件上传工具类XjOssUtil,支持OAuth2鉴权和文件操作
- 在MyUploadUtil中集成OSS上传逻辑,通过oss_flag配置动态选择上传方式
- 为.tar和.apk文件强制使用MyUploadUtil上传,其他文件根据oss_flag配置决定上传方式
- 在手表设备删除接口中增加绑定用户检查,已绑定用户的手表不允许删除
- 添加GlobalManager依赖注入以支持动态配置读取
- 实现文件上传流程的日志记录和错误处理机制
2026-04-21 17:22:09 +08:00
lianlonggang 44b0f6ca2b feat(care-user): 添加年度参数并导入日期工具类
- 导入 cn.hutool.core.date.DateUtil 工具类
- 新增 year 字段用于存储当前年份
- 使用 DateUtil.thisYear() 设置默认值为当前年份
2026-04-14 10:34:10 +08:00
lianlonggang ae866f0791 fix(controller): 禁止移动端解绑手表设备并优化异步处理
- 移动端解绑设备接口返回错误提示,需联系健康管理员解绑
- 设备绑定流程中的警告开关设置改为异步执行
- 防止外部系统异常影响主业务流程
- 解绑操作中移除对数据中心的通知调用
2026-04-10 10:28:06 +08:00
wanghaoandClaude Sonnet 4.6 4610ac4737 fix(健康监测): 禁用移动端手表解绑功能,改为提示联系管理员操作
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-09 17:19:35 +08:00
wanghaoandClaude Opus 4.6 6d6920a2b3 fix(健康监测): 修复手表绑定单位校验使用前端传入orgCode导致的校验失效问题
将绑定校验的orgCode来源从dto改为watchDevice实体,
避免前端未传orgCode时校验必定失败,同时消除伪造绕过风险

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-04-07 14:41:42 +08:00
hejiayang c7041fa69e fix: 解决用户搜索中HTML转义字符显示问题(漏) 2026-03-31 14:12:18 +08:00
wanghao 370f5e0089 Merge remote-tracking branch 'origin/develop' into develop 2026-03-30 18:29:06 +08:00
hejiayang a47f27967e fix: 防止HTML注入(用户姓名中的 · ),对用户输入姓名进行转义处理
- 在AccountDTO中对doctorName字段进行HTML转义处理
- 在ConDoctorDTO中对doctorName字段进行HTML转义处理
- 在ConEvaluateDTO中对userName和expertName字段进行HTML转义处理
- 在ConHealthInfoAnswerDTO中对fromName字段进行HTML转义处理
- 在ConHelperDTO中对userName字段进行HTML转义处理
- 在ConSessionDTO中对fromName和doctorName字段进行HTML转义处理
- 在CallLogDTO中对realName字段进行HTML转义处理
- 在PhoneListDTO中对realName字段进行HTML转义处理
- 在TblQimoNoticeDTO中对realName字段进行HTML转义处理
- 在EmergencyProfessionUserController中对name参数进行HTML转义处理
- 在OrderServiceImpl中对salvageUserName字段进行HTML转义处理
- 在AbnormalEventFilter中对userName字段进行HTML转义处理
- 在CalorieDataByUserDTO中对realName字段进行HTML转义处理
- 在WatchBindHisServiceImpl中对bindRealName字段进行HTML转义处理
- 在WatchDataServiceImpl中对username字段进行HTML转义处理
- 在WatchDeviceServiceImpl中对bindRealName字段进行HTML转义处理
- 在HealthUserEmployeeExController中对realname字段进行HTML转义处理
- 在SysUserController中对realname字段进行HTML转义处理
- 在SysUserDepartChangeApplyController中对userName参数进行HTML转义处理
- 在SelectWrapperDTO中对realName字段进行HTML转义处理
- 在SysBaseApiImpl中对username参数进行HTML转义处理
- 在SysUserServiceImpl中对name参数进行HTML转义处理
2026-03-30 17:54:36 +08:00
wanghaoandClaude Sonnet 4.6 6c08f5f141 fix(用户管理): 修复不传 realname 时查询用户列表抛 NPE 的问题
对 realname 参数增加非空判断,避免 null 值时调用 replaceAll 抛出 NullPointerException

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-30 17:22:05 +08:00
lianlonggang 690f688c6a 屏蔽pom文件不需要的配置 2026-03-30 16:07:27 +08:00
wanghaoandClaude Sonnet 4.6 63cc815022 fix(用户管理): 修复用户查询时名字中间隔号被 HTML 实体转义的问题
将查询参数中的 &middot; 转义回 · 后再执行查询

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-30 14:54:56 +08:00
wanghaoandClaude Sonnet 4.6 8f00d07377 feat(健康咨询): 新增音视频咨询超时关闭功能及定时任务
- 新增 endVideoSession 接口,供手动触发和定时任务调用
- Mapper 层添加 UPDATE SQL:预约日期已过的视频咨询,有通话记录改为待评价(4),无记录改为取消(6)
- SyncScheduleJob 新增 XXL-Job 任务 endVideoSession,每日自动处理过期视频咨询

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-30 14:54:33 +08:00
wanghaoandClaude Sonnet 4.6 2e90ec71cc fix(手表设备): 手表绑定时校验只能绑定本单位人员
新增单位编码前6位匹配校验,禁止跨单位绑定手表;
同时将"该设备已绑定该员工"改为"该设备已被绑定"

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-27 15:48:55 +08:00
wanghao a43806c4e9 fix(手表设备): 优化错误提示信息,将"该工具不存在"改为"该监测工具不存在" 2026-03-18 14:47:39 +08:00
wanghao 237df3ef38 修改移动端手表绑定接口 2026-03-12 17:28:52 +08:00
wanghao bd9fece99c 新增移动端手表绑定解绑接口 2026-03-12 16:16:58 +08:00
pengjie 47cebd3392 【用户信息】增加返回字段,加密接口 2026-03-06 17:01:49 +08:00
wanghao 61e049cc47 手表数据修改 2026-03-05 17:05:31 +08:00
wanghao ad03177e50 手表数据修改 2026-03-05 17:00:18 +08:00
wanghao 3db3301fe3 手表数据修改 2026-03-05 16:10:31 +08:00
wanghao fa9a186a5e 手表数据修改 2026-03-05 15:53:40 +08:00
wanghao 3cea926a1e 手表接口修改 2026-03-04 17:23:32 +08:00
wanghao fe82afd934 手表接口修改 2026-03-04 15:30:07 +08:00
wanghao 96242b5c00 手表数据返回处理 2026-03-03 17:22:20 +08:00
wanghao 291f6a4eaa 移动端首页手表数据修改 2026-03-03 10:13:15 +08:00
633 changed files with 4647 additions and 3963 deletions
@@ -1,111 +0,0 @@
DROP TABLE "20250917_CARE";
DROP TABLE "ARC_ASSESS_VALUE";
DROP TABLE "ARC_FOOD_ATLAS";
DROP TABLE "ARC_QUESTIONNAIRE";
DROP TABLE "ARC_QUESTIONNAIRE_CHILD";
DROP TABLE "CESHI_NOTE";
DROP TABLE "COMMON_EXPORTS_INFO_QH";
DROP TABLE "COMMON_EXPORTS_ITEM_QH";
DROP TABLE "COMMON_IMPORTS_DETAIL_QH";
DROP TABLE "COMMON_IMPORTS_QH";
DROP TABLE "CON_COST_STATISTICS";
DROP TABLE "CON_DEPARTMENT";
DROP TABLE "CON_DOCTOR_FOLLOW";
DROP TABLE "CON_DOCTOR_SCHEDULING";
DROP TABLE "CON_DOCTOR_SCHEDULING_DATE";
DROP TABLE "CON_EVALUATE";
DROP TABLE "CON_FAMILY_MEMBERS";
DROP TABLE "CON_HEALTH_INFO";
DROP TABLE "CON_HEALTH_INFO_ANSWER";
DROP TABLE "CON_HOSPITAL_FOLLOW";
DROP TABLE "CON_KNOWLEDGE";
DROP TABLE "CON_KNOWLEDGE_CATEGORY";
DROP TABLE "CON_MEDICAL_RECORDS";
DROP TABLE "CON_SESSION_RESERVATION_DATE";
DROP TABLE "DEMO";
DROP TABLE "DEMO_FIELD_DEF_VAL_MAIN";
DROP TABLE "DEMO_FIELD_DEF_VAL_SUB";
DROP TABLE "EMERGENCY_SERIOUS_DISEASE";
DROP TABLE "HEALTH_CLASSIFICATION";
DROP TABLE "HEALTH_USER_EMPLOYEE_EX_QH";
DROP TABLE "JEECG_MONTHLY_GROWTH_ANALYSIS";
DROP TABLE "JEECG_ORDER_CUSTOMER";
DROP TABLE "JEECG_ORDER_MAIN";
DROP TABLE "JEECG_ORDER_TICKET";
DROP TABLE "JEECG_PROJECT_NATURE_INCOME";
DROP TABLE "JIMU_DICT";
DROP TABLE "JIMU_DICT_ITEM";
DROP TABLE "JIMU_REPORT";
DROP TABLE "JIMU_REPORT_DATA_SOURCE";
DROP TABLE "JIMU_REPORT_DB";
DROP TABLE "JIMU_REPORT_DB_FIELD";
DROP TABLE "JIMU_REPORT_DB_PARAM";
DROP TABLE "JIMU_REPORT_LINK";
DROP TABLE "JIMU_REPORT_MAP";
DROP TABLE "JIMU_REPORT_SHARE";
DROP TABLE "JOA_DEMO";
DROP TABLE "LORE_CHECK_SUBJECT";
DROP TABLE "ONL_AUTH_DATA";
DROP TABLE "ONL_AUTH_PAGE";
DROP TABLE "ONL_AUTH_RELATION";
DROP TABLE "ONL_CGFORM_BUTTON";
DROP TABLE "ONL_CGFORM_ENHANCE_JAVA";
DROP TABLE "ONL_CGFORM_ENHANCE_JS";
DROP TABLE "ONL_CGFORM_ENHANCE_SQL";
DROP TABLE "ONL_CGFORM_FIELD";
DROP TABLE "ONL_CGFORM_HEAD";
DROP TABLE "ONL_CGFORM_INDEX";
DROP TABLE "ONL_CGREPORT_HEAD";
DROP TABLE "ONL_CGREPORT_ITEM";
DROP TABLE "ONL_CGREPORT_PARAM";
DROP TABLE "OSS_FILE";
DROP TABLE "QRTZ_BLOB_TRIGGERS";
DROP TABLE "QRTZ_CALENDARS";
DROP TABLE "QRTZ_CRON_TRIGGERS";
DROP TABLE "QRTZ_FIRED_TRIGGERS";
DROP TABLE "QRTZ_JOB_DETAILS" CASCADE;
DROP TABLE "QRTZ_LOCKS";
DROP TABLE "QRTZ_PAUSED_TRIGGER_GRPS";
DROP TABLE "QRTZ_SCHEDULER_STATE";
DROP TABLE "QRTZ_SIMPLE_TRIGGERS";
DROP TABLE "QRTZ_SIMPROP_TRIGGERS";
DROP TABLE "QRTZ_TRIGGERS";
DROP TABLE "REP_DEMO_DXTJ";
DROP TABLE "REP_DEMO_EMPLOYEE";
DROP TABLE "REP_DEMO_GONGSI";
DROP TABLE "REP_DEMO_JIANPIAO";
DROP TABLE "SYS_APP_VERSION_QH";
DROP TABLE "SYS_DEPART_COPY1";
DROP TABLE "SYS_DEPART_GPS_QH";
DROP TABLE "SYS_DEPART_QH";
DROP TABLE "SYS_LOG_QH";
DROP TABLE "SYS_PERMISSION_20241224";
DROP TABLE "SYS_PERMISSION_DATA_RULE_QH";
DROP TABLE "SYS_PERMISSION_QH";
DROP TABLE "SYS_ROLE_INDEX_QH";
DROP TABLE "SYS_ROLE_PERMISSION_QH";
DROP TABLE "SYS_ROLE_QH";
DROP TABLE "SYS_USER_DEPART_CHANGE_APPLY_QH";
DROP TABLE "SYS_USER_DEPART_QH";
DROP TABLE "SYS_USER_QH";
DROP TABLE "SYS_USER_ROLE_QH";
DROP TABLE "TEST_DEMO";
DROP TABLE "TEST_ENHANCE_SELECT";
DROP TABLE "TEST_NOTE";
DROP TABLE "TEST_ORDER_CUSTOMER";
DROP TABLE "TEST_ORDER_MAIN";
DROP TABLE "TEST_ORDER_PRODUCT";
DROP TABLE "TEST_SHOPTYPE_TREE";
DROP TABLE "TEST_V3_HELLO";
DROP TABLE "TMP_REPORT_DATA_1";
DROP TABLE "TMP_REPORT_DATA_INCOME";
DROP TABLE "REMOTE_WEIGHT_MANUFACTURER_INBODY";
DROP TABLE "REMOTE_WEIGHT_MANUFACTURER_LEFU";
DROP TABLE "REMOTE_WEIGHT_MANUFACTURER_ONE";
DROP TABLE "REMOTE_WEIGHT_MANUFACTURER_TWO";
DROP TABLE "REMOTE_WEIGHT_NORMATIVE_DATA";
DROP TABLE "HEALTH_USER_DOCTOR_BASE_EX";
DROP TABLE "HOSPITAL_DEPARTMENT";
DROP TABLE "STATION_HOSPITAL";
DROP TABLE "SYS_APP_VERSION";
DROP TABLE "USER_INFORMATION";
@@ -1,92 +0,0 @@
-- ============================================================
-- System 服务数据库表名修改脚本达梦 DM8
-- 规则统一以 QH_ 开头第二级三字母业务模块前缀总长度 25
-- 生成日期2026-03-10
-- 涉及表数76
-- ============================================================
-- ===== COM 公共模块4 =====
ALTER TABLE "COMMON_EXPORTS_INFO" RENAME TO "QH_COM_EXPORTS_INFO";
ALTER TABLE "COMMON_EXPORTS_ITEM" RENAME TO "QH_COM_EXPORTS_ITEM";
ALTER TABLE "COMMON_IMPORTS" RENAME TO "QH_COM_IMPORTS";
ALTER TABLE "COMMON_IMPORTS_DETAIL" RENAME TO "QH_COM_IMPORTS_DETAIL";
-- ===== HLT 健康模块6 =====
ALTER TABLE "HEALTH_CONSULT_RESOURCE" RENAME TO "QH_HLT_CONSULT_RESOURCE";
ALTER TABLE "HEALTH_HOLIDAY" RENAME TO "QH_HLT_HOLIDAY";
ALTER TABLE "HEALTH_USER_DOCTOR_EX" RENAME TO "QH_HLT_DOCTOR_EX";
ALTER TABLE "HEALTH_USER_EMPLOYEE_EX" RENAME TO "QH_HLT_USER_EMPLOYEE_EX";
ALTER TABLE "HEALTH_USER_OPERATOR_EX" RENAME TO "QH_HLT_USER_OPERATOR_EX";
ALTER TABLE "HEALTH_USER_STATION_EX" RENAME TO "QH_HLT_USER_STATION_EX";
-- ===== SCL 体测模块2 =====
ALTER TABLE "SCALE_HEIGHT" RENAME TO "QH_SCL_HEIGHT";
ALTER TABLE "SCALE_PERSONAL" RENAME TO "QH_SCL_PERSONAL";
-- ===== SYS 系统模块52 =====
ALTER TABLE "SYS_ANNOUNCEMENT" RENAME TO "QH_SYS_ANNOUNCEMENT";
ALTER TABLE "SYS_ANNOUNCEMENT_SEND" RENAME TO "QH_SYS_ANNOUNCEMENT_SEND";
ALTER TABLE "SYS_BANNER" RENAME TO "QH_SYS_BANNER";
ALTER TABLE "SYS_CATEGORY" RENAME TO "QH_SYS_CATEGORY";
ALTER TABLE "SYS_CHECK_RULE" RENAME TO "QH_SYS_CHECK_RULE";
ALTER TABLE "SYS_COMMENT" RENAME TO "QH_SYS_COMMENT";
ALTER TABLE "SYS_CONFIG" RENAME TO "QH_SYS_CONFIG";
ALTER TABLE "SYS_DATA_LOG" RENAME TO "QH_SYS_DATA_LOG";
ALTER TABLE "SYS_DATA_SOURCE" RENAME TO "QH_SYS_DATA_SOURCE";
ALTER TABLE "SYS_DEPART" RENAME TO "QH_SYS_DEPART";
ALTER TABLE "SYS_DEPART_GPS" RENAME TO "QH_SYS_DEPART_GPS";
ALTER TABLE "SYS_DEPART_PERMISSION" RENAME TO "QH_SYS_DEPART_PERMISSION";
ALTER TABLE "SYS_DEPART_ROLE" RENAME TO "QH_SYS_DEPART_ROLE";
ALTER TABLE "SYS_DEPART_ROLE_PERMISSION" RENAME TO "QH_SYS_DEPT_ROLE_PERM";
ALTER TABLE "SYS_DEPART_ROLE_USER" RENAME TO "QH_SYS_DEPART_ROLE_USER";
ALTER TABLE "SYS_DICT" RENAME TO "QH_SYS_DICT";
ALTER TABLE "SYS_DICT_ITEM" RENAME TO "QH_SYS_DICT_ITEM";
ALTER TABLE "SYS_FILES" RENAME TO "QH_SYS_FILES";
ALTER TABLE "SYS_FILL_RULE" RENAME TO "QH_SYS_FILL_RULE";
ALTER TABLE "SYS_FORM_FILE" RENAME TO "QH_SYS_FORM_FILE";
ALTER TABLE "SYS_GATEWAY_ROUTE" RENAME TO "QH_SYS_GATEWAY_ROUTE";
ALTER TABLE "SYS_IOS_REDEEM" RENAME TO "QH_SYS_IOS_REDEEM";
ALTER TABLE "SYS_LOG" RENAME TO "QH_SYS_LOG";
ALTER TABLE "SYS_MESSAGE_NOTICE" RENAME TO "QH_SYS_MSG_NOTICE";
ALTER TABLE "SYS_MESSAGE_NOTICE_SCOPE" RENAME TO "QH_SYS_MSG_NOTICE_SCOPE";
ALTER TABLE "SYS_MESSAGE_REMIND" RENAME TO "QH_SYS_MSG_REMIND";
ALTER TABLE "SYS_NOTICE" RENAME TO "QH_SYS_NOTICE";
ALTER TABLE "SYS_NOTICE_READ_RECORD" RENAME TO "QH_SYS_NOTICE_READ_RECORD";
ALTER TABLE "SYS_PACK_PERMISSION" RENAME TO "QH_SYS_PACK_PERMISSION";
ALTER TABLE "SYS_PERMISSION" RENAME TO "QH_SYS_PERMISSION";
ALTER TABLE "SYS_PERMISSION_DATA_RULE" RENAME TO "QH_SYS_PERM_DATA_RULE";
ALTER TABLE "SYS_PERMISSION_V2" RENAME TO "QH_SYS_PERMISSION_V2";
ALTER TABLE "SYS_POSITION" RENAME TO "QH_SYS_POSITION";
ALTER TABLE "SYS_POSITION_CLASSIFY" RENAME TO "QH_SYS_POSITION_CLASSIFY";
ALTER TABLE "SYS_QUARTZ_JOB" RENAME TO "QH_SYS_QUARTZ_JOB";
ALTER TABLE "SYS_ROLE" RENAME TO "QH_SYS_ROLE";
ALTER TABLE "SYS_ROLE_INDEX" RENAME TO "QH_SYS_ROLE_INDEX";
ALTER TABLE "SYS_ROLE_PERMISSION" RENAME TO "QH_SYS_ROLE_PERMISSION";
ALTER TABLE "SYS_SMS" RENAME TO "QH_SYS_SMS";
ALTER TABLE "SYS_SMS_TEMPLATE" RENAME TO "QH_SYS_SMS_TEMPLATE";
ALTER TABLE "SYS_TENANT" RENAME TO "QH_SYS_TENANT";
ALTER TABLE "SYS_TENANT_PACK" RENAME TO "QH_SYS_TENANT_PACK";
ALTER TABLE "SYS_TENANT_PACK_PERMS" RENAME TO "QH_SYS_TENANT_PACK_PERMS";
ALTER TABLE "SYS_TENANT_PACK_USER" RENAME TO "QH_SYS_TENANT_PACK_USER";
ALTER TABLE "SYS_THIRD_ACCOUNT" RENAME TO "QH_SYS_THIRD_ACCOUNT";
ALTER TABLE "SYS_USER" RENAME TO "QH_SYS_USER";
ALTER TABLE "SYS_USER_AGENT" RENAME TO "QH_SYS_USER_AGENT";
ALTER TABLE "SYS_USER_DEPART" RENAME TO "QH_SYS_USER_DEPART";
ALTER TABLE "SYS_USER_DEPART_CHANGE_APPLY" RENAME TO "QH_SYS_DEPT_CHG_APPLY";
ALTER TABLE "SYS_USER_DEVICE" RENAME TO "QH_SYS_USER_DEVICE";
ALTER TABLE "SYS_USER_EMERGENCY_CONTACT" RENAME TO "QH_SYS_USR_EMERG_CONTACT";
ALTER TABLE "SYS_USER_FAMILY_MEMBERS" RENAME TO "QH_SYS_USR_FAMILY_MBR";
ALTER TABLE "SYS_USER_FAMILY_MEMBERS_REQUEST" RENAME TO "QH_SYS_USR_FAM_MBR_REQ";
ALTER TABLE "SYS_USER_POST" RENAME TO "QH_SYS_USER_POST";
ALTER TABLE "SYS_USER_ROLE" RENAME TO "QH_SYS_USER_ROLE";
ALTER TABLE "SYS_USER_TENANT" RENAME TO "QH_SYS_USER_TENANT";
ALTER TABLE "SYS_VERSION_APP" RENAME TO "QH_SYS_VERSION_APP";
ALTER TABLE "SYS_VERSION_INFO" RENAME TO "QH_SYS_VERSION_INFO";
-- ===== USR 用户模块12 =====
ALTER TABLE "TBL_USER_WX_RELATION" RENAME TO "QH_USR_WX_RELATION";
ALTER TABLE "USER_DATA_RECORD_BLOOD_ABO" RENAME TO "QH_USR_DATA_RCD_BLOOD_ABO";
ALTER TABLE "USER_DATA_RECORD_BLOOD_PRESSURE" RENAME TO "QH_USR_DATA_RCD_BLD_PRS";
ALTER TABLE "USER_DATA_RECORD_BMI" RENAME TO "QH_USR_DATA_RCD_BMI";
ALTER TABLE "USER_DATA_RECORD_BWH" RENAME TO "QH_USR_DATA_RCD_BWH";
ALTER TABLE "USER_WEIGHT_BIND" RENAME TO "QH_USR_WEIGHT_BIND";
@@ -1,69 +0,0 @@
-- ============================================================
-- System 服务无用表删除脚本
-- 说明以下表在当前业务中已无实际使用从原项目迁移而来
-- 注意QH_SYS_QUARTZ_JOB QH_SYS_TENANT 谨慎处理暂不删除
-- 生成日期2026-03-11
-- 涉及表数18
-- ============================================================
-- ============================================================
-- 第一份原表名迁移前
-- ============================================================
-- HLT 健康模块
DROP TABLE "HEALTH_USER_STATION_EX";
-- SCL 体测模块
DROP TABLE "SCALE_HEIGHT";
DROP TABLE "SCALE_PERSONAL";
-- SYS 系统模块
DROP TABLE "SYS_FORM_FILE";
DROP TABLE "SYS_IOS_REDEEM";
DROP TABLE "SYS_PACK_PERMISSION";
DROP TABLE "SYS_TENANT_PACK";
DROP TABLE "SYS_TENANT_PACK_PERMS";
DROP TABLE "SYS_TENANT_PACK_USER";
DROP TABLE "SYS_THIRD_ACCOUNT";
DROP TABLE "SYS_USER_FAMILY_MEMBERS";
DROP TABLE "SYS_USER_FAMILY_MEMBERS_REQUEST";
-- USR 用户模块
DROP TABLE "TBL_USER_WX_RELATION";
DROP TABLE "USER_DATA_RECORD_BLOOD_PRESSURE";
DROP TABLE "USER_DATA_RECORD_BLOOD_ABO";
DROP TABLE "USER_DATA_RECORD_BMI";
DROP TABLE "USER_DATA_RECORD_BWH";
DROP TABLE "USER_WEIGHT_BIND";
-- ============================================================
-- 第二份新表名迁移后QH_ 命名规范
-- ============================================================
-- HLT 健康模块
DROP TABLE "QH_HLT_USER_STATION_EX";
-- SCL 体测模块
DROP TABLE "QH_SCL_HEIGHT";
DROP TABLE "QH_SCL_PERSONAL";
-- SYS 系统模块
DROP TABLE "QH_SYS_FORM_FILE";
DROP TABLE "QH_SYS_IOS_REDEEM";
DROP TABLE "QH_SYS_PACK_PERMISSION";
DROP TABLE "QH_SYS_TENANT_PACK";
DROP TABLE "QH_SYS_TENANT_PACK_PERMS";
DROP TABLE "QH_SYS_TENANT_PACK_USER";
DROP TABLE "QH_SYS_THIRD_ACCOUNT";
DROP TABLE "QH_SYS_USR_FAMILY_MBR";
DROP TABLE "QH_SYS_USR_FAM_MBR_REQ";
-- USR 用户模块
DROP TABLE "QH_USR_WX_RELATION";
DROP TABLE "QH_USR_DATA_RCD_BLD_PRS";
DROP TABLE "QH_USR_DATA_RCD_BLOOD_ABO";
DROP TABLE "QH_USR_DATA_RCD_BMI";
DROP TABLE "QH_USR_DATA_RCD_BWH";
DROP TABLE "QH_USR_WEIGHT_BIND";
@@ -0,0 +1,10 @@
-- QH_WAT_MONITOR_DATA 新增 EVENT_ID事件ID LOCATE_TIME定位时间字段
-- 数据库118-DM 达梦数据库SQL 全大写规范
ALTER TABLE "QH_WAT_MONITOR_DATA" ADD "EVENT_ID" VARCHAR(64) DEFAULT NULL;
ALTER TABLE "QH_WAT_MONITOR_DATA" ADD "LOCATE_TIME" DATETIME DEFAULT NULL;
COMMENT ON COLUMN "QH_WAT_MONITOR_DATA"."EVENT_ID" IS '事件ID';
COMMENT ON COLUMN "QH_WAT_MONITOR_DATA"."LOCATE_TIME" IS '定位时间';
CREATE INDEX "IDX_EVENT_ID" ON "QH_WAT_MONITOR_DATA"("EVENT_ID");
CREATE INDEX "IDX_WATCH_NO_EVENT_ID" ON "QH_WAT_MONITOR_DATA"("WATCH_NO", "EVENT_ID");
-66
View File
@@ -1,66 +0,0 @@
-- 删除青海相关库
DROP TABLE IF EXISTS CON_DOCTOR_FOLLOW_QH;
DROP TABLE IF EXISTS CON_DOCTOR_SATISFY_QH;
DROP TABLE IF EXISTS CON_EVALUATE_QH;
DROP TABLE IF EXISTS CON_FAMILY_MEMBERS_QH;
DROP TABLE IF EXISTS CON_HEALTH_INFO_ANSWER_QH;
DROP TABLE IF EXISTS CON_HEALTH_INFO_CHILD_QH;
DROP TABLE IF EXISTS CON_HEALTH_INFO_QH;
DROP TABLE IF EXISTS CON_HELPER_ONLINE_QH;
DROP TABLE IF EXISTS CON_HELPER_QH;
DROP TABLE IF EXISTS CON_HELPER_SCHEDULING_HISTORY_QH;
DROP TABLE IF EXISTS CON_HELPER_SCHEDULING_QH;
DROP TABLE IF EXISTS CON_HOSPITAL_FOLLOW_QH;
DROP TABLE IF EXISTS CON_MEDICAL_RECORDS_QH;
DROP TABLE IF EXISTS CON_SESSION_QH;
-- 修改表名
ALTER TABLE CON_COST_LOG RENAME TO QH_CON_COST_LOG;
ALTER TABLE CON_COST_STATISTICS RENAME TO QH_CON_COST_STAT;
ALTER TABLE CON_DEPARTMENT RENAME TO QH_CON_DEPT;
ALTER TABLE CON_DOCTOR RENAME TO QH_CON_DOCTOR;
ALTER TABLE CON_DOCTOR_CARD RENAME TO QH_CON_DOC_CARD;
ALTER TABLE CON_DOCTOR_CHANGE_LOG RENAME TO QH_CON_DOC_CHG_LOG;
ALTER TABLE CON_DOCTOR_FOLLOW RENAME TO QH_CON_DOC_FOLLOW;
ALTER TABLE CON_DOCTOR_SATISFY RENAME TO QH_CON_DOC_SATISFY;
ALTER TABLE CON_DOCTOR_SCHEDULING RENAME TO QH_CON_DOC_SCHD;
ALTER TABLE CON_DOCTOR_SCHEDULING_DATE RENAME TO QH_CON_DOC_SCHD_DT;
ALTER TABLE CON_EVALUATE RENAME TO QH_CON_EVALUATE;
ALTER TABLE CON_FAMILY_MEMBERS RENAME TO QH_CON_FAMMEM;
ALTER TABLE CON_HABIT_PARAM RENAME TO QH_CON_HABIT_PARM;
ALTER TABLE CON_HEALTH_INFO RENAME TO QH_CON_HEALTH;
ALTER TABLE CON_HEALTH_INFO_ANSWER RENAME TO QH_CON_HEALTH_ANS;
ALTER TABLE CON_HEALTH_INFO_CHILD RENAME TO QH_CON_HEALTH_CHD;
ALTER TABLE CON_HELPER RENAME TO QH_CON_HELPER;
ALTER TABLE CON_HELPER_ONLINE RENAME TO QH_CON_HELPER_ONLN;
ALTER TABLE CON_HELPER_REST RENAME TO QH_CON_HELPER_REST;
ALTER TABLE CON_HELPER_SCHEDULING RENAME TO QH_CON_HELPER_SCHD;
ALTER TABLE CON_HELPER_SCHEDULING_HISTORY RENAME TO QH_CON_HELPER_SCHD_HIS;
ALTER TABLE CON_HOSPITAL_FOLLOW RENAME TO QH_CON_HOSP_FOLLOW;
ALTER TABLE CON_KNOWLEDGE RENAME TO QH_CON_KNOW;
ALTER TABLE CON_KNOWLEDGE_CATEGORY RENAME TO QH_CON_KNOW_CATE;
ALTER TABLE CON_MEDICAL_RECORDS RENAME TO QH_CON_MEDREC;
ALTER TABLE CON_NOTICE RENAME TO QH_CON_NOTICE;
ALTER TABLE CON_PAUSE_SERVICE RENAME TO QH_CON_PAUSE_SRVC;
ALTER TABLE CON_PHRASES RENAME TO QH_CON_PHRASES;
ALTER TABLE CON_PROPOSE RENAME TO QH_CON_PROPOSE;
ALTER TABLE CON_RESOURCE RENAME TO QH_CON_RESOURCE;
ALTER TABLE CON_SCHEDULING RENAME TO QH_CON_SCHD;
ALTER TABLE CON_SERVICE RENAME TO QH_CON_SRVC;
ALTER TABLE CON_SESSION RENAME TO QH_CON_SESSION;
ALTER TABLE CON_SESSION_RESERVATION_DATE RENAME TO QH_CON_SESS_RESV_DT;
ALTER TABLE CON_SESSION_VIDEO_INFO RENAME TO QH_CON_SESS_VID;
ALTER TABLE CON_SETTLE_CONFIG_COST RENAME TO QH_CON_STL_CFG_COST;
ALTER TABLE CON_SETTLE_CONFIG_PERIOD RENAME TO QH_CON_STL_CFG_PRD;
ALTER TABLE CON_SETTLE_MAIN RENAME TO QH_CON_STL_MAIN;
ALTER TABLE CON_SETTLE_RESULT RENAME TO QH_CON_STL_RSLT;
ALTER TABLE CON_SETTLE_RESULT_ITEM RENAME TO QH_CON_STL_RSLT_ITM;
ALTER TABLE CON_SETTLE_RESULT_PERIOD RENAME TO QH_CON_STL_RSLT_PRD;
ALTER TABLE CON_SICKS RENAME TO QH_CON_SICKS;
ALTER TABLE HOSPITAL_DEPARTMENT RENAME TO QH_CON_HOSP_DEPT;
ALTER TABLE IM_GROUP_SYNC_RECORD RENAME TO QH_CON_IM_GRP_SYNC;
ALTER TABLE IM_MSG_READ_LOG RENAME TO QH_CON_IM_MSG_RDLOG;
ALTER TABLE IM_MSG_RECORD_ALL RENAME TO QH_CON_IM_MSG_ALL;
-- 修改表字段触发关键字了
ALTER TABLE QH_CON_EVALUATE RENAME COLUMN CONTEXT TO EVA_CONTEXT;
-49
View File
@@ -1,49 +0,0 @@
-- 应急模块sql整理
-- 以下所有sql均包含"XJ_EMERGENCY".前缀, 后续部署, 如果不需要, 可以批量删除前缀
-- 更新达梦数据库保留字段名
ALTER TABLE "XJ_EMERGENCY"."TBL_QIMO_NOTICE" ALTER COLUMN "BEGIN" RENAME TO "BEGIN_TIME";
ALTER TABLE "XJ_EMERGENCY"."TBL_QIMO_NOTICE" ALTER COLUMN "END" RENAME TO "END_TIME";
ALTER TABLE "XJ_EMERGENCY"."AED_EQUIPMENT_MANGER" ALTER COLUMN "MODEL" RENAME TO "MODEL_NUMBER";
-- 更新表名(36张)
ALTER TABLE "XJ_EMERGENCY"."AED" RENAME TO "QH_EME_AED";
ALTER TABLE "XJ_EMERGENCY"."AED_EQUIPMENT_MAINTAIN" RENAME TO "QH_EME_AED_EQUIP_MAINTAIN";
ALTER TABLE "XJ_EMERGENCY"."AED_EQUIPMENT_MANGER" RENAME TO "QH_EME_AED_EQUIP_MANGER";
ALTER TABLE "XJ_EMERGENCY"."AED_EQUIPMENT_RETRAIN" RENAME TO "QH_EME_AED_EQUIP_RETRAIN";
ALTER TABLE "XJ_EMERGENCY"."AED_EQUIPMENT_TRAIN" RENAME TO "QH_EME_AED_EQUIP_TRAIN";
ALTER TABLE "XJ_EMERGENCY"."AED_LATEST" RENAME TO "QH_EME_AED_LATEST";
ALTER TABLE "XJ_EMERGENCY"."AED_LOCATION_EQUIPMENT" RENAME TO "QH_EME_AED_LOC_EQUIP";
ALTER TABLE "XJ_EMERGENCY"."AED_USE_RECORD" RENAME TO "QH_EME_AED_USE_RECORD";
ALTER TABLE "XJ_EMERGENCY"."AED_WARN_INFO" RENAME TO "QH_EME_AED_WARN_INFO";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_CENTER" RENAME TO "QH_EME_CENTER";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_CENTER_ADMIN" RENAME TO "QH_EME_CENTER_ADMIN";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_CENTER_OPEN_TIME" RENAME TO "QH_EME_CENTER_OPEN_TIME";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_CENTER_RESOURCE" RENAME TO "QH_EME_CENTER_RESOUR";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_GROUPED" RENAME TO "QH_EME_GROUPED";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_HEALTH_ROOM" RENAME TO "QH_EME_HEALTH_ROOM";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_NEW_SCHEDULES" RENAME TO "QH_EME_NEW_SCHEDULES";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_SCHEDULES_NEW_ITEM" RENAME TO "QH_EME_SCHED_NEW_ITEM";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_ORDER" RENAME TO "QH_EME_ORDER";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_ORDER_DETAIL" RENAME TO "QH_EME_ORDER_DETAIL";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_ORDER_INTERVENE" RENAME TO "QH_EME_ORDER_INTERVENE";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_ORDER_OPERATOR" RENAME TO "QH_EME_ORDER_OPERATOR";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_ORDER_SEND_RECORD" RENAME TO "QH_EME_ORDER_SEND_REC";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_PROFESSION_USER" RENAME TO "QH_EME_PROFESS_USER";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_RESOURCE" RENAME TO "QH_EME_RESOURCE";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_SCHEDULE_CUSTOM" RENAME TO "QH_EME_SCHED_CUSTOM";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_SCHEDULE_DEFAULT" RENAME TO "QH_EME_SCHED_DEFAULT";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_SCHEDULE_RECORD" RENAME TO "QH_EME_SCHED_RECORD";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_SCREEN_ANIMATION" RENAME TO "QH_EME_SCRN_ANIMAT";
ALTER TABLE "XJ_EMERGENCY"."EMERGENCY_SERIOUS_DISEASE" RENAME TO "QH_EME_SERIOUS_DIS";
ALTER TABLE "XJ_EMERGENCY"."LARGE_SCREEN_DATA" RENAME TO "QH_EME_SCRN_DATA";
ALTER TABLE "XJ_EMERGENCY"."SYS_NOTIFY_SMS_PHONE" RENAME TO "QH_EME_NOTIF_SMS_PHONE";
ALTER TABLE "XJ_EMERGENCY"."TBL_QIMO_NOTICE" RENAME TO "QH_EME_QIMO_NOTICE";
ALTER TABLE "XJ_EMERGENCY"."TBL_USER_HELP" RENAME TO "QH_EME_USER_HELP";
-- QH_EME_VIDEO_MAC 此表数据库已被删除
ALTER TABLE "XJ_EMERGENCY"."TBL_VIDEO_MAC" RENAME TO "QH_EME_VIDEO_MAC";
ALTER TABLE "XJ_EMERGENCY"."XJ_AED" RENAME TO "QH_EME_XJ_AED";
ALTER TABLE "XJ_EMERGENCY"."ZY_AMBULANCE_DATA" RENAME TO "QH_EME_AMBUL_DATA";
-265
View File
@@ -1,265 +0,0 @@
-- ============================================================
-- System 服务数据库信创整理脚本达梦 DM8
-- 生成日期2026-03-13
-- 说明生产环境执行脚本表名为原表名
-- 执行顺序
-- 第一步删除所有不需要的表使用原表名
-- 第二步修改剩余表的表名原表名 QH_ 前缀新表名
-- ============================================================
-- ============================================================
-- 第一步删除不需要的表使用原表名
-- 说明整合 20260306 20260311 中要删除的表
-- 涉及表数130
-- ============================================================
-- ===== ARC 归档/历史数据 5 =====
DROP TABLE "20250917_CARE";
DROP TABLE "ARC_ASSESS_VALUE";
DROP TABLE "ARC_FOOD_ATLAS";
DROP TABLE "ARC_QUESTIONNAIRE";
DROP TABLE "ARC_QUESTIONNAIRE_CHILD";
-- ===== _QH 后缀类青海旧库历史备份 18 =====
DROP TABLE "COMMON_EXPORTS_INFO_QH";
DROP TABLE "COMMON_EXPORTS_ITEM_QH";
DROP TABLE "COMMON_IMPORTS_DETAIL_QH";
DROP TABLE "COMMON_IMPORTS_QH";
DROP TABLE "HEALTH_USER_EMPLOYEE_EX_QH";
DROP TABLE "SYS_APP_VERSION_QH";
DROP TABLE "SYS_DEPART_GPS_QH";
DROP TABLE "SYS_DEPART_QH";
DROP TABLE "SYS_LOG_QH";
DROP TABLE "SYS_PERMISSION_DATA_RULE_QH";
DROP TABLE "SYS_PERMISSION_QH";
DROP TABLE "SYS_ROLE_INDEX_QH";
DROP TABLE "SYS_ROLE_PERMISSION_QH";
DROP TABLE "SYS_ROLE_QH";
DROP TABLE "SYS_USER_DEPART_CHANGE_APPLY_QH";
DROP TABLE "SYS_USER_DEPART_QH";
DROP TABLE "SYS_USER_QH";
DROP TABLE "SYS_USER_ROLE_QH";
-- ===== CON 咨询模块已迁移 14 =====
DROP TABLE "CON_COST_STATISTICS";
DROP TABLE "CON_DEPARTMENT";
DROP TABLE "CON_DOCTOR_FOLLOW";
DROP TABLE "CON_DOCTOR_SCHEDULING";
DROP TABLE "CON_DOCTOR_SCHEDULING_DATE";
DROP TABLE "CON_EVALUATE";
DROP TABLE "CON_FAMILY_MEMBERS";
DROP TABLE "CON_HEALTH_INFO";
DROP TABLE "CON_HEALTH_INFO_ANSWER";
DROP TABLE "CON_HOSPITAL_FOLLOW";
DROP TABLE "CON_KNOWLEDGE";
DROP TABLE "CON_KNOWLEDGE_CATEGORY";
DROP TABLE "CON_MEDICAL_RECORDS";
DROP TABLE "CON_SESSION_RESERVATION_DATE";
-- ===== DEMO / TEST / TMP 演示/测试/临时 14 =====
DROP TABLE "DEMO";
DROP TABLE "DEMO_FIELD_DEF_VAL_MAIN";
DROP TABLE "DEMO_FIELD_DEF_VAL_SUB";
DROP TABLE "JOA_DEMO";
DROP TABLE "TEST_DEMO";
DROP TABLE "TEST_ENHANCE_SELECT";
DROP TABLE "TEST_NOTE";
DROP TABLE "TEST_ORDER_CUSTOMER";
DROP TABLE "TEST_ORDER_MAIN";
DROP TABLE "TEST_ORDER_PRODUCT";
DROP TABLE "TEST_SHOPTYPE_TREE";
DROP TABLE "TEST_V3_HELLO";
DROP TABLE "TMP_REPORT_DATA_1";
DROP TABLE "TMP_REPORT_DATA_INCOME";
-- ===== JEECG 框架示例表 5 =====
DROP TABLE "JEECG_MONTHLY_GROWTH_ANALYSIS";
DROP TABLE "JEECG_ORDER_CUSTOMER";
DROP TABLE "JEECG_ORDER_MAIN";
DROP TABLE "JEECG_ORDER_TICKET";
DROP TABLE "JEECG_PROJECT_NATURE_INCOME";
-- ===== JIMU 积木报表内部表 10 =====
DROP TABLE "JIMU_DICT";
DROP TABLE "JIMU_DICT_ITEM";
DROP TABLE "JIMU_REPORT";
DROP TABLE "JIMU_REPORT_DATA_SOURCE";
DROP TABLE "JIMU_REPORT_DB";
DROP TABLE "JIMU_REPORT_DB_FIELD";
DROP TABLE "JIMU_REPORT_DB_PARAM";
DROP TABLE "JIMU_REPORT_LINK";
DROP TABLE "JIMU_REPORT_MAP";
DROP TABLE "JIMU_REPORT_SHARE";
-- ===== ONL Online 代码生成器内部表 13 =====
DROP TABLE "ONL_AUTH_DATA";
DROP TABLE "ONL_AUTH_PAGE";
DROP TABLE "ONL_AUTH_RELATION";
DROP TABLE "ONL_CGFORM_BUTTON";
DROP TABLE "ONL_CGFORM_ENHANCE_JAVA";
DROP TABLE "ONL_CGFORM_ENHANCE_JS";
DROP TABLE "ONL_CGFORM_ENHANCE_SQL";
DROP TABLE "ONL_CGFORM_FIELD";
DROP TABLE "ONL_CGFORM_HEAD";
DROP TABLE "ONL_CGFORM_INDEX";
DROP TABLE "ONL_CGREPORT_HEAD";
DROP TABLE "ONL_CGREPORT_ITEM";
DROP TABLE "ONL_CGREPORT_PARAM";
-- ===== QRTZ Quartz 调度框架内部表 11 =====
DROP TABLE "QRTZ_BLOB_TRIGGERS";
DROP TABLE "QRTZ_CALENDARS";
DROP TABLE "QRTZ_CRON_TRIGGERS";
DROP TABLE "QRTZ_FIRED_TRIGGERS";
DROP TABLE "QRTZ_JOB_DETAILS" CASCADE;
DROP TABLE "QRTZ_LOCKS";
DROP TABLE "QRTZ_PAUSED_TRIGGER_GRPS";
DROP TABLE "QRTZ_SCHEDULER_STATE";
DROP TABLE "QRTZ_SIMPLE_TRIGGERS";
DROP TABLE "QRTZ_SIMPROP_TRIGGERS";
DROP TABLE "QRTZ_TRIGGERS";
-- ===== REP_DEMO 报表演示 4 =====
DROP TABLE "REP_DEMO_DXTJ";
DROP TABLE "REP_DEMO_EMPLOYEE";
DROP TABLE "REP_DEMO_GONGSI";
DROP TABLE "REP_DEMO_JIANPIAO";
-- ===== SYS 历史备份类 2 =====
DROP TABLE "SYS_DEPART_COPY1";
DROP TABLE "SYS_PERMISSION_20241224";
-- ===== 其他未知来源或项目未使用 6 =====
DROP TABLE "CESHI_NOTE";
DROP TABLE "EMERGENCY_SERIOUS_DISEASE";
DROP TABLE "HEALTH_CLASSIFICATION";
DROP TABLE "LORE_CHECK_SUBJECT";
DROP TABLE "OSS_FILE";
DROP TABLE "USER_INFORMATION";
-- ===== REMOTE_WEIGHT 远程体重设备已废弃 5 =====
DROP TABLE "REMOTE_WEIGHT_MANUFACTURER_INBODY";
DROP TABLE "REMOTE_WEIGHT_MANUFACTURER_LEFU";
DROP TABLE "REMOTE_WEIGHT_MANUFACTURER_ONE";
DROP TABLE "REMOTE_WEIGHT_MANUFACTURER_TWO";
DROP TABLE "REMOTE_WEIGHT_NORMATIVE_DATA";
-- ===== 历史遗留 / 已废弃功能表 5 =====
DROP TABLE "HEALTH_USER_DOCTOR_BASE_EX";
DROP TABLE "HOSPITAL_DEPARTMENT";
DROP TABLE "STATION_HOSPITAL";
DROP TABLE "SYS_APP_VERSION";
-- ===== System 服务无业务遗留表 18 =====
-- HLT 健康模块1
DROP TABLE "HEALTH_USER_STATION_EX";
-- SCL 体测模块2
DROP TABLE "SCALE_HEIGHT";
DROP TABLE "SCALE_PERSONAL";
-- SYS 系统模块10
DROP TABLE "SYS_FORM_FILE";
DROP TABLE "SYS_IOS_REDEEM";
DROP TABLE "SYS_PACK_PERMISSION";
DROP TABLE "SYS_TENANT_PACK";
DROP TABLE "SYS_TENANT_PACK_PERMS";
DROP TABLE "SYS_TENANT_PACK_USER";
DROP TABLE "SYS_THIRD_ACCOUNT";
DROP TABLE "SYS_USER_FAMILY_MEMBERS_REQUEST";
-- USR 用户模块6
DROP TABLE "TBL_USER_WX_RELATION";
DROP TABLE "USER_DATA_RECORD_BLOOD_PRESSURE";
DROP TABLE "USER_DATA_RECORD_BLOOD_ABO";
DROP TABLE "USER_DATA_RECORD_BMI";
DROP TABLE "USER_DATA_RECORD_BWH";
DROP TABLE "USER_WEIGHT_BIND";
-- ============================================================
-- 第二步修改剩余表的表名原表名 QH_ 前缀新表名
-- 规则统一以 QH_ 开头第二级三字母业务模块前缀总长度 25
-- 涉及表数76 删除后剩余的表
-- ============================================================
-- ===== COM 公共模块4 =====
ALTER TABLE "COMMON_EXPORTS_INFO" RENAME TO "QH_COM_EXPORTS_INFO";
ALTER TABLE "COMMON_EXPORTS_ITEM" RENAME TO "QH_COM_EXPORTS_ITEM";
ALTER TABLE "COMMON_IMPORTS" RENAME TO "QH_COM_IMPORTS";
ALTER TABLE "COMMON_IMPORTS_DETAIL" RENAME TO "QH_COM_IMPORTS_DETAIL";
-- ===== HLT 健康模块5 =====
ALTER TABLE "HEALTH_CONSULT_RESOURCE" RENAME TO "QH_HLT_CONSULT_RESOURCE";
ALTER TABLE "HEALTH_HOLIDAY" RENAME TO "QH_HLT_HOLIDAY";
ALTER TABLE "HEALTH_USER_DOCTOR_EX" RENAME TO "QH_HLT_DOCTOR_EX";
ALTER TABLE "HEALTH_USER_EMPLOYEE_EX" RENAME TO "QH_HLT_USER_EMPLOYEE_EX";
ALTER TABLE "HEALTH_USER_OPERATOR_EX" RENAME TO "QH_HLT_USER_OPERATOR_EX";
-- ===== SYS 系统模块52 =====
ALTER TABLE "SYS_ANNOUNCEMENT" RENAME TO "QH_SYS_ANNOUNCEMENT";
ALTER TABLE "SYS_ANNOUNCEMENT_SEND" RENAME TO "QH_SYS_ANNOUNCEMENT_SEND";
ALTER TABLE "SYS_BANNER" RENAME TO "QH_SYS_BANNER";
ALTER TABLE "SYS_CATEGORY" RENAME TO "QH_SYS_CATEGORY";
ALTER TABLE "SYS_CHECK_RULE" RENAME TO "QH_SYS_CHECK_RULE";
ALTER TABLE "SYS_COMMENT" RENAME TO "QH_SYS_COMMENT";
ALTER TABLE "SYS_CONFIG" RENAME TO "QH_SYS_CONFIG";
ALTER TABLE "SYS_DATA_LOG" RENAME TO "QH_SYS_DATA_LOG";
ALTER TABLE "SYS_DATA_SOURCE" RENAME TO "QH_SYS_DATA_SOURCE";
ALTER TABLE "SYS_DEPART" RENAME TO "QH_SYS_DEPART";
ALTER TABLE "SYS_DEPART_GPS" RENAME TO "QH_SYS_DEPART_GPS";
ALTER TABLE "SYS_DEPART_PERMISSION" RENAME TO "QH_SYS_DEPART_PERMISSION";
ALTER TABLE "SYS_DEPART_ROLE" RENAME TO "QH_SYS_DEPART_ROLE";
ALTER TABLE "SYS_DEPART_ROLE_PERMISSION" RENAME TO "QH_SYS_DEPT_ROLE_PERM";
ALTER TABLE "SYS_DEPART_ROLE_USER" RENAME TO "QH_SYS_DEPART_ROLE_USER";
ALTER TABLE "SYS_DICT" RENAME TO "QH_SYS_DICT";
ALTER TABLE "SYS_DICT_ITEM" RENAME TO "QH_SYS_DICT_ITEM";
ALTER TABLE "SYS_FILES" RENAME TO "QH_SYS_FILES";
ALTER TABLE "SYS_FILL_RULE" RENAME TO "QH_SYS_FILL_RULE";
ALTER TABLE "SYS_GATEWAY_ROUTE" RENAME TO "QH_SYS_GATEWAY_ROUTE";
ALTER TABLE "SYS_LOG" RENAME TO "QH_SYS_LOG";
ALTER TABLE "SYS_MESSAGE_NOTICE" RENAME TO "QH_SYS_MSG_NOTICE";
ALTER TABLE "SYS_MESSAGE_NOTICE_SCOPE" RENAME TO "QH_SYS_MSG_NOTICE_SCOPE";
ALTER TABLE "SYS_MESSAGE_REMIND" RENAME TO "QH_SYS_MSG_REMIND";
ALTER TABLE "SYS_NOTICE" RENAME TO "QH_SYS_NOTICE";
ALTER TABLE "SYS_NOTICE_READ_RECORD" RENAME TO "QH_SYS_NOTICE_READ_RECORD";
ALTER TABLE "SYS_PERMISSION" RENAME TO "QH_SYS_PERMISSION";
ALTER TABLE "SYS_PERMISSION_DATA_RULE" RENAME TO "QH_SYS_PERM_DATA_RULE";
ALTER TABLE "SYS_PERMISSION_V2" RENAME TO "QH_SYS_PERMISSION_V2";
ALTER TABLE "SYS_POSITION" RENAME TO "QH_SYS_POSITION";
ALTER TABLE "SYS_POSITION_CLASSIFY" RENAME TO "QH_SYS_POSITION_CLASSIFY";
ALTER TABLE "SYS_QUARTZ_JOB" RENAME TO "QH_SYS_QUARTZ_JOB";
ALTER TABLE "SYS_ROLE" RENAME TO "QH_SYS_ROLE";
ALTER TABLE "SYS_ROLE_INDEX" RENAME TO "QH_SYS_ROLE_INDEX";
ALTER TABLE "SYS_ROLE_PERMISSION" RENAME TO "QH_SYS_ROLE_PERMISSION";
ALTER TABLE "SYS_SMS" RENAME TO "QH_SYS_SMS";
ALTER TABLE "SYS_SMS_TEMPLATE" RENAME TO "QH_SYS_SMS_TEMPLATE";
ALTER TABLE "SYS_TENANT" RENAME TO "QH_SYS_TENANT";
ALTER TABLE "SYS_THIRD_ACCOUNT" RENAME TO "QH_SYS_THIRD_ACCOUNT";
ALTER TABLE "SYS_USER" RENAME TO "QH_SYS_USER";
ALTER TABLE "SYS_USER_AGENT" RENAME TO "QH_SYS_USER_AGENT";
ALTER TABLE "SYS_USER_DEPART" RENAME TO "QH_SYS_USER_DEPART";
ALTER TABLE "SYS_USER_DEPART_CHANGE_APPLY" RENAME TO "QH_SYS_DEPT_CHG_APPLY";
ALTER TABLE "SYS_USER_DEVICE" RENAME TO "QH_SYS_USER_DEVICE";
ALTER TABLE "SYS_USER_EMERGENCY_CONTACT" RENAME TO "QH_SYS_USR_EMERG_CONTACT";
ALTER TABLE "SYS_USER_FAMILY_MEMBERS" RENAME TO "QH_SYS_USR_FAMILY_MBR";
ALTER TABLE "SYS_USER_POST" RENAME TO "QH_SYS_USER_POST";
ALTER TABLE "SYS_USER_ROLE" RENAME TO "QH_SYS_USER_ROLE";
ALTER TABLE "SYS_USER_TENANT" RENAME TO "QH_SYS_USER_TENANT";
ALTER TABLE "SYS_VERSION_APP" RENAME TO "QH_SYS_VERSION_APP";
ALTER TABLE "SYS_VERSION_INFO" RENAME TO "QH_SYS_VERSION_INFO";
-- ===== USR 用户模块15 =====
ALTER TABLE "USER_DATA_RECORD_BLOOD_ABO" RENAME TO "QH_USR_DATA_RCD_BLOOD_ABO";
ALTER TABLE "USER_DATA_RECORD_BLOOD_PRESSURE" RENAME TO "QH_USR_DATA_RCD_BLD_PRS";
ALTER TABLE "USER_DATA_RECORD_BMI" RENAME TO "QH_USR_DATA_RCD_BMI";
ALTER TABLE "USER_DATA_RECORD_BWH" RENAME TO "QH_USR_DATA_RCD_BWH";
ALTER TABLE "USER_WEIGHT_BIND" RENAME TO "QH_USR_WEIGHT_BIND";
-- ============================================================
-- 脚本执行完成
-- 总计
-- 第一步删除 129 张不需要的表使用原表名
-- 第二步修改 77 张表的表名原表名 QH_ 前缀新表名
-- ============================================================
-34
View File
@@ -1,34 +0,0 @@
-- ============================================================
-- 权限规则表更新脚本仅更新有用的三条规则
-- 表名QH_SYS_PERM_DATA_RULE
-- 说明
-- 1. 更新手表设备表的权限规则wd.dept_id QH_WAT_DEVICE.DEPT_ID
-- 2. 更新手表数据表的权限规则orgcode QH_WAT_DATA.ORGCODE
-- ============================================================
-- 1. 更新手表设备权限规则 - 规则1
UPDATE "QH_SYS_PERM_DATA_RULE"
SET "RULE_VALUE" = 'FIND_IN_SET(wd.DEPT_ID, ''#{sys_manager_depart_ids}'')'
WHERE "ID" = '2027688332771315713';
-- 2. 更新手表设备权限规则 - 规则2
UPDATE "QH_SYS_PERM_DATA_RULE"
SET "RULE_VALUE" = 'FIND_IN_SET(wd.DEPT_ID, ''#{sys_manager_depart_ids}'')'
WHERE "ID" = '1737389275796287489';
-- 2.1 更新手表设备权限规则 - 规则3
UPDATE "QH_SYS_PERM_DATA_RULE"
SET "RULE_VALUE" = 'FIND_IN_SET(wd.DEPT_ID, ''#{sys_manager_depart_ids}'')'
WHERE "ID" = '1737404792707821569';
-- 3. 更新手表数据权限规则 - 部门代码规则
UPDATE "QH_SYS_PERM_DATA_RULE"
SET "RULE_VALUE" = '( ORGCODE REGEXP CONCAT(''^\('',replace(''#{sys_manager_depart_codes}'','','',''|''),'')\')) =1'
WHERE "ID" = '2027689339962118146';
-- ============================================================
-- 验证更新结果
-- ============================================================
SELECT "ID", "RULE_NAME", "RULE_COLUMN", "RULE_CONDITIONS", "RULE_VALUE"
FROM "QH_SYS_PERM_DATA_RULE"
WHERE "ID" IN ('2027688332771315713', '1737389275796287489', '1737404792707821569', '2027689339962118146');
-52
View File
@@ -1,52 +0,0 @@
-- 手表模块sql整理
-- 以下所有sql均包含"XJ_WATCH".前缀, 后续部署, 如果不需要, 可以批量删除前缀
-- 更新表名(47张)
ALTER TABLE "XJ_WATCH"."ARCHIVES_BODY_TYPE" RENAME TO "QH_WAT_ARCHIVES_BODY_TYPE";
ALTER TABLE "XJ_WATCH"."DEPT_STATISTIC_DATA" RENAME TO "QH_WAT_DEPT_STAT_DATA";
ALTER TABLE "XJ_WATCH"."USER_RECORD_SPORTS_DAY" RENAME TO "QH_WAT_USER_REC_SPORT_DAY";
ALTER TABLE "XJ_WATCH"."USER_RECORD_SPORTS_INFO" RENAME TO "QH_WAT_USER_REC_SPORT_INF";
ALTER TABLE "XJ_WATCH"."USER_WE_CHAT_SPORTS_DAY" RENAME TO "QH_WAT_USER_WECH_SPO_DAY";
ALTER TABLE "XJ_WATCH"."WATCH_ABNORMAL_RECORD" RENAME TO "QH_WAT_ABNORMAL_RECORD";
ALTER TABLE "XJ_WATCH"."WATCH_BIND_HIS" RENAME TO "QH_WAT_BIND_HIS";
ALTER TABLE "XJ_WATCH"."WATCH_BIND_HIS_BAK" RENAME TO "QH_WAT_BIND_HIS_BAK";
ALTER TABLE "XJ_WATCH"."WATCH_BIND_HIS_COPY1" RENAME TO "QH_WAT_BIND_HIS_COPY1";
ALTER TABLE "XJ_WATCH"."WATCH_BIND_HIS_COPY2" RENAME TO "QH_WAT_BIND_HIS_COPY2";
ALTER TABLE "XJ_WATCH"."WATCH_DATA" RENAME TO "QH_WAT_DATA";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_CALORIE" RENAME TO "QH_WAT_DATA_CALORIE";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_DAY" RENAME TO "QH_WAT_DATA_DAY";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_DETAIL" RENAME TO "QH_WAT_DATA_DETAIL";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_DISTANCE" RENAME TO "QH_WAT_DATA_DISTANCE";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_ECG" RENAME TO "QH_WAT_DATA_ECG";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_EXERCISE" RENAME TO "QH_WAT_DATA_EXERCISE";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_GPS" RENAME TO "QH_WAT_DATA_GPS";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_HEART_RATE" RENAME TO "QH_WAT_DATA_HEART_RATE";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_SLEEP" RENAME TO "QH_WAT_DATA_SLEEP";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_SLEEP_NEW" RENAME TO "QH_WAT_DATA_SLEEP_NEW";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_SLEEP_NEW_DAY" RENAME TO "QH_WAT_DATA_SLEEP_NEW_DAY";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_SLEEP_NEW_ERR" RENAME TO "QH_WAT_DATA_SLEEP_NEW_ERR";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_SLEEP_NEW_MINUTE" RENAME TO "QH_WAT_DATA_SLEEP_NEW_MIN";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_SPO2" RENAME TO "QH_WAT_DATA_SPO2";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_STEPS" RENAME TO "QH_WAT_DATA_STEPS";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_STEPS_HF" RENAME TO "QH_WAT_DATA_STEPS_HF";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_STRESS" RENAME TO "QH_WAT_DATA_STRESS";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_TEMPERATURE" RENAME TO "QH_WAT_DATA_TEMP";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_WORKOUT" RENAME TO "QH_WAT_DATA_WORKOUT";
ALTER TABLE "XJ_WATCH"."WATCH_DATA_WORKOUT_TRACE" RENAME TO "QH_WAT_DATA_WORKOUT_TRACE";
ALTER TABLE "XJ_WATCH"."WATCH_DEPART_REPORT" RENAME TO "QH_WAT_DEPART_REPORT";
ALTER TABLE "XJ_WATCH"."WATCH_DEVICE" RENAME TO "QH_WAT_DEVICE";
ALTER TABLE "XJ_WATCH"."WATCH_DEVICE_SWITCH" RENAME TO "QH_WAT_DEVICE_SWITCH";
ALTER TABLE "XJ_WATCH"."WATCH_KEY_USER" RENAME TO "QH_WAT_KEY_USER";
ALTER TABLE "XJ_WATCH"."WATCH_MONITOR_DATA" RENAME TO "QH_WAT_MONITOR_DATA";
ALTER TABLE "XJ_WATCH"."WATCH_MONITOR_MOBILE" RENAME TO "QH_WAT_MONITOR_MOBILE";
ALTER TABLE "XJ_WATCH"."WATCH_MQTT_NOTICE" RENAME TO "QH_WAT_MQTT_NOTICE";
ALTER TABLE "XJ_WATCH"."WATCH_STAT_USER_INFO_DAY_HEART_RATE" RENAME TO "QH_WAT_STAT_USER_DAY_HR";
ALTER TABLE "XJ_WATCH"."WATCH_STAT_USER_INFO_DAY_SDC" RENAME TO "QH_WAT_STAT_USER_DAY_SDC";
ALTER TABLE "XJ_WATCH"."WATCH_STAT_USER_INFO_DAY_SLEEP" RENAME TO "QH_WAT_STAT_USER_DAY_SLE";
ALTER TABLE "XJ_WATCH"."WATCH_STAT_USER_INFO_DAY_SPO2" RENAME TO "QH_WAT_STAT_USER_DAY_SPO2";
ALTER TABLE "XJ_WATCH"."WATCH_STAT_USER_INFO_DAY_STRESS" RENAME TO "QH_WAT_STAT_USER_DAY_STRE";
ALTER TABLE "XJ_WATCH"."WATCH_STAT_USER_INFO_DAY_TEMP" RENAME TO "QH_WAT_STAT_USER_DAY_TEMP";
ALTER TABLE "XJ_WATCH"."WATCH_STAT_USER_INFO_DAY_WORKOUT" RENAME TO "QH_WAT_STAT_USER_DAY_WORK";
ALTER TABLE "XJ_WATCH"."WATCH_SYN_MAX_ID" RENAME TO "QH_WAT_SYN_MAX_ID";
ALTER TABLE "XJ_WATCH"."WATCH_USER_DATA" RENAME TO "QH_WAT_USER_DATA";
@@ -30,6 +30,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
@@ -25,7 +25,6 @@ import org.springframework.core.task.TaskExecutor;
import org.springframework.jdbc.support.JdbcTransactionManager;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.util.StringUtils;
import javax.sql.DataSource;
import java.util.List;
@@ -126,21 +125,8 @@ public class BatchAutoConfiguration {
@BatchDataSource ObjectProvider<DataSource> batchDataSource,
BatchProperties properties
) {
DataSource dataSourceToUse = batchDataSource.getIfAvailable(() -> dataSource);
BatchProperties.Jdbc jdbc = properties.getJdbc();
// 达梦数据库兼容处理:设置platform绕过构造器中的自动类型检测
if (!StringUtils.hasText(jdbc.getPlatform())) {
jdbc.setPlatform("dm");
}
// 重写afterPropertiesSet()跳过SQL脚本初始化:
// 父类会先断言SQL文件存在再检查initializeSchema mode,导致找不到schema-dm.sql时报错
// Batch元数据表已通过数据迁移创建,无需自动建表
return new BatchDataSourceScriptDatabaseInitializer(dataSourceToUse, jdbc) {
@Override
public void afterPropertiesSet() {
// 跳过Batch元数据表的自动建表,防止找不到schema-dm.sql文件报错
}
};
return new BatchDataSourceScriptDatabaseInitializer(batchDataSource.getIfAvailable(() -> dataSource),
properties.getJdbc());
}
}
@@ -34,12 +34,6 @@ public class CustomBatchConfigurer extends BasicBatchConfigurer {
this.taskExecutor = taskExecutor;
}
@Override
public void initialize() {
// 调用父类的 initialize() 方法来初始化 JobRepository 等
super.initialize();
}
@Override
protected JobLauncher createJobLauncher() throws Exception {
SimpleJobLauncher jobLauncher = new SimpleJobLauncher();
@@ -99,7 +99,7 @@ public enum AnYanApiEnum {
/**
* 18.查询关爱联络员信息及急救人员查询接口
*/
QUERY_EMPLOYEE_CARE_PERSON("/aygc-znhpt-sys/0/api/empCareEmp/findPageByIdNo", "", HttpMethod.POST),
QUERY_EMPLOYEE_CARE_PERSON("/aygc-znhpt-sys/0/api/empCareEmp/findPage", "", HttpMethod.POST),
/**
* 19.批量更新员工关键信息接口
@@ -1,5 +1,6 @@
package com.renkang.anyan.model.dto;
import cn.hutool.core.date.DateUtil;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -34,4 +35,6 @@ public class CareUserDetailsParam {
@Schema(title = "pageType")
private String pageType = "plus";
private int year = DateUtil.thisYear();
}
@@ -11,18 +11,19 @@
a.icon,
a.points,
CASE
WHEN a.frequency = 1 THEN
CASE WHEN COUNT(b.id) > 0 THEN 1 ELSE 0 END
WHEN a.frequency = 2 THEN
CASE WHEN COUNT(CASE WHEN TRUNC(b.create_time) = TRUNC(SYSDATE) THEN 1 END) > 0 THEN 1 ELSE 0 END
WHEN a.frequency = 3 THEN
CASE WHEN COUNT(CASE WHEN TO_CHAR(b.create_time, 'IYYY-IW') = TO_CHAR(SYSDATE, 'IYYY-IW') THEN 1 END) > 0 THEN 1 ELSE 0 END
WHEN a.frequency = 4 THEN
CASE WHEN COUNT(CASE WHEN TO_CHAR(b.create_time, 'YYYY-MM') = TO_CHAR(SYSDATE, 'YYYY-MM') THEN 1 END) > 0 THEN 1 ELSE 0 END
WHEN a.frequency = 5 THEN
CASE WHEN COUNT(CASE WHEN TO_CHAR(b.create_time, 'Q') = TO_CHAR(SYSDATE, 'Q') AND EXTRACT(YEAR FROM b.create_time) = EXTRACT(YEAR FROM SYSDATE) THEN 1 END) > 0 THEN 1 ELSE 0 END
WHEN a.frequency = 6 THEN
CASE WHEN COUNT(CASE WHEN EXTRACT(YEAR FROM b.create_time) = EXTRACT(YEAR FROM SYSDATE) THEN 1 END) > 0 THEN 1 ELSE 0 END
WHEN a.frequency = 1 THEN -- 单次
IF(COUNT(b.id) > 0, 1, 0)
WHEN a.frequency = 2 THEN -- 日/次
IF(COUNT(CASE WHEN DATE(b.create_time) = CURDATE() THEN 1 END) > 0, 1, 0)
WHEN a.frequency = 3 THEN -- 周/次
IF(COUNT(CASE WHEN YEARWEEK(b.create_time, 1) = YEARWEEK(CURDATE(), 1) THEN 1 END) > 0, 1, 0)
WHEN a.frequency = 4 THEN -- 月/次
IF(COUNT(CASE WHEN DATE_FORMAT(b.create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m') THEN 1 END) > 0, 1, 0)
WHEN a.frequency = 5 THEN -- 季度/次
IF(COUNT(CASE WHEN QUARTER(b.create_time) = QUARTER(CURDATE()) AND YEAR(b.create_time) = YEAR(CURDATE()) THEN 1
END) > 0, 1, 0)
WHEN a.frequency = 6 THEN -- 年/次
IF(COUNT(CASE WHEN YEAR(b.create_time) = YEAR(CURDATE()) THEN 1 END) > 0, 1, 0)
ELSE 0
END AS clockInStatus
FROM
@@ -459,7 +459,7 @@ public class UserPointsServiceImpl extends ServiceImpl<UserPointsMapper, UserPoi
List<UserPointsDetails> details = userPointsDetailsMapper.selectList(new LambdaQueryWrapper<UserPointsDetails>()
.eq(UserPointsDetails::getUserId, userId)
.eq(UserPointsDetails::getChangeType, HealthBankConstants.CHANGE_TYPE_ADD)
.apply("TO_CHAR(create_time, 'YYYY-MM-DD') = {0}", DateUtil.today())
.apply("DATE_FORMAT(create_time, '%Y-%m-%d') = {0}", DateUtil.today())
);
double sum = details.stream().map(UserPointsDetails::getPoints).mapToDouble(BigDecimal::doubleValue).sum();
userPoints.setLatestAddDaySum(BigDecimal.valueOf(sum).add(pointsRule.getPoints()));
@@ -1,5 +1,6 @@
package com.renkang.consultation.dto;
import cn.hutool.http.HtmlUtil;
import com.renkang.consultation.entity.ConPage;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -11,6 +12,10 @@ public class AccountDTO extends ConPage {
@Schema(title = "专家姓名")
private String doctorName;
public void setDoctorName(String doctorName) {
this.doctorName = doctorName != null ? HtmlUtil.unescape(doctorName) : null;
}
@Schema(title = "医院选择")
private String hospitalName;
@@ -1,5 +1,6 @@
package com.renkang.consultation.dto;
import cn.hutool.http.HtmlUtil;
import com.renkang.consultation.entity.ConPage;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -10,6 +11,10 @@ public class ConDoctorDTO extends ConPage {
@Schema(title = "专家姓名")
private String doctorName;
public void setDoctorName(String doctorName) {
this.doctorName = doctorName != null ? HtmlUtil.unescape(doctorName) : null;
}
@Schema(title = "专家编号")
private String doctorNo;
@@ -1,5 +1,6 @@
package com.renkang.consultation.dto;
import cn.hutool.http.HtmlUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.renkang.consultation.entity.ConPage;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -17,6 +18,9 @@ public class ConEvaluateDTO extends ConPage {
@Schema(title = "咨询人")
private String userName;
public void setUserName(String userName) {
this.userName = userName != null ? HtmlUtil.unescape(userName) : null;
}
@Schema(title = "二级单位id")
private String sysOrgSecondId;
@@ -27,6 +31,10 @@ public class ConEvaluateDTO extends ConPage {
@Schema(title = "咨询专家")
private String expertName;
public void setExpertName(String expertName) {
this.expertName = expertName != null ? HtmlUtil.unescape(expertName) : null;
}
@Schema(title = "专家医院")
private String expertHospital;
@@ -1,5 +1,6 @@
package com.renkang.consultation.dto;
import cn.hutool.http.HtmlUtil;
import com.renkang.consultation.entity.ConPage;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -10,6 +11,10 @@ public class ConHealthInfoAnswerDTO extends ConPage {
@Schema(title = "员工姓名")
private String fromName;
public void setFromName(String fromName) {
this.fromName = fromName != null ? HtmlUtil.unescape(fromName) : null;
}
@Schema(title = "手机号")
private String phone;
@@ -1,5 +1,6 @@
package com.renkang.consultation.dto;
import cn.hutool.http.HtmlUtil;
import com.renkang.consultation.entity.ConPage;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -11,6 +12,10 @@ public class ConHelperDTO extends ConPage {
@Schema(title = "全科医生姓名")
private String userName;
public void setUserName(String userName) {
this.userName = userName != null ? HtmlUtil.unescape(userName) : null;
}
@Schema(title = "状态")
private Integer status;
@@ -1,5 +1,6 @@
package com.renkang.consultation.dto;
import cn.hutool.http.HtmlUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.renkang.consultation.entity.ConPage;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -17,6 +18,10 @@ public class ConSessionDTO extends ConPage {
@Schema(title = "员工姓名")
private String fromName;
public void setFromName(String fromName) {
this.fromName = fromName != null ? HtmlUtil.unescape(fromName) : null;
}
@Schema(title = "员工id")
private String fromAccount;
@@ -26,6 +31,10 @@ public class ConSessionDTO extends ConPage {
@Schema(title = "专家姓名")
private String doctorName;
public void setDoctorName(String doctorName) {
this.doctorName = doctorName != null ? HtmlUtil.unescape(doctorName) : null;
}
@Schema(title = "咨询状态(0待确认 1接收预约 2拒绝预约 3已过期 4已取消 5咨询中 6专家咨询结束 7员工咨询结束 8超时自动结束)")
private String contentStatus;
@@ -15,7 +15,7 @@ import java.math.BigDecimal;
import java.util.Date;
@Data
@TableName("qh_con_cost_log")
@TableName("con_cost_log")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_cost_log对象", description = "con_cost_log")
@@ -21,7 +21,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_cost_stat")
@TableName("con_cost_statistics")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_cost_statistics对象", description = "con_cost_statistics")
@@ -27,7 +27,7 @@ import java.util.List;
* @Version: V1.0
*/
@Data
@TableName("qh_con_dept")
@TableName("con_department")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_department对象", description = "con_department")
@@ -28,7 +28,7 @@ import java.util.Map;
* @Version: V1.0
*/
@Data
@TableName("qh_con_doctor")
@TableName("con_doctor")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_doctor对象", description = "con_doctor")
@@ -18,7 +18,7 @@ import java.io.Serializable;
* @Version: V1.0
*/
@Data
@TableName("qh_con_doc_card")
@TableName("con_doctor_card")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_doctor_card对象", description = "con_doctor_card")
@@ -23,7 +23,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_doc_chg_log")
@TableName("con_doctor_change_log")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title="con_doctor_change_log对象", description="专家信息修改日志")
@@ -22,7 +22,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_doc_follow")
@TableName("con_doctor_follow")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_doctor_follow对象", description = "医生关注")
@@ -7,7 +7,7 @@ import lombok.Data;
import java.io.Serializable;
@Data
@TableName("qh_con_doc_satisfy")
@TableName("con_doctor_satisfy")
public class ConDoctorSatisfy implements Serializable {
private static final long serialVersionUID = 1L;
@@ -22,7 +22,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_doc_schd")
@TableName("con_doctor_scheduling")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_doctor_scheduling对象", description = "专家排班")
@@ -22,7 +22,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_doc_schd_dt")
@TableName("con_doctor_scheduling_date")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_doctor_scheduling_date对象", description = "排班时间")
@@ -22,7 +22,7 @@ import java.util.List;
* @Version: V1.0
*/
@Data
@TableName("qh_con_evaluate")
@TableName("con_evaluate")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_evaluate对象", description = "医生评分")
@@ -68,7 +68,6 @@ public class ConEvaluate implements Serializable {
*/
@Excel(name = "评价", width = 15)
@Schema(title = "评价")
@TableField("EVA_CONTEXT")
private String context;
/**
* 会话id
@@ -20,7 +20,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_fammem")
@TableName("con_family_members")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_family_members对象", description = "家庭成员")
@@ -22,7 +22,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_health")
@TableName("con_health_info")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_health_info对象", description = "健康信息")
@@ -22,7 +22,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_health_ans")
@TableName("con_health_info_answer")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_health_info_answer对象", description = "健康信息答案")
@@ -20,7 +20,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_helper")
@TableName("con_helper")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_helper对象", description = "con_helper")
@@ -22,7 +22,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_helper_onln")
@TableName("con_helper_online")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_helper_online对象", description = "con_helper_online")
@@ -23,7 +23,7 @@ import lombok.experimental.Accessors;
* @Version: V1.0
*/
@Data
@TableName("qh_con_helper_rest")
@TableName("con_helper_rest")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title="con_helper_rest对象", description="全科医生休息")
@@ -22,7 +22,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_helper_schd")
@TableName("con_helper_scheduling")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_helper_scheduling对象", description = "con_helper_scheduling")
@@ -22,7 +22,7 @@ import java.io.Serializable;
* @Version: V1.0
*/
@Data
@TableName("qh_con_helper_schd_his")
@TableName("con_helper_scheduling_history")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_helper_scheduling_history对象", description = "con_helper_scheduling_history")
@@ -22,7 +22,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_hosp_follow")
@TableName("con_hospital_follow")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_hospital_follow对象", description = "医院关注")
@@ -21,7 +21,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_know")
@TableName("con_knowledge")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_knowledge对象", description = "知识库")
@@ -23,7 +23,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_know_cate")
@TableName("con_knowledge_category")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_knowledge_category对象", description = "知识库分类")
@@ -22,7 +22,7 @@ import java.util.Map;
* @Version: V1.0
*/
@Data
@TableName("qh_con_medrec")
@TableName("con_medical_records")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_medical_records对象", description = "疾病档案")
@@ -24,7 +24,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_notice")
@TableName("con_notice")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_notice对象", description = "咨询须知")
@@ -13,7 +13,7 @@ import java.io.Serializable;
import java.util.Date;
@Data
@TableName("qh_con_phrases")
@TableName("con_phrases")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_phrases对象", description = "常用语")
@@ -22,7 +22,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_propose")
@TableName("con_propose")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_propose对象", description = "con_propose")
@@ -26,7 +26,7 @@ import java.util.List;
* @Version: V1.0
*/
@Data
@TableName("qh_con_resource")
@TableName("con_resource")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_resource对象", description = "con_resource")
@@ -23,7 +23,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_srvc")
@TableName("con_service")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_service对象", description = "con_service")
@@ -22,7 +22,7 @@ import java.util.List;
* @Version: V1.0
*/
@Data
@TableName("qh_con_session")
@TableName("con_session")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_session对象", description = "con_session")
@@ -22,7 +22,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_sess_resv_dt")
@TableName("con_session_reservation_date")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_session_reservation_date对象", description = "咨询预约时间")
@@ -22,7 +22,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_sess_vid")
@TableName("con_session_video_info")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_session_video_info对象", description = "con_session_video_info")
@@ -20,7 +20,7 @@ import java.util.Date;
@Builder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "qh_con_session")
@TableName(value = "con_session_view")
public class ConSessionView implements Serializable {
private static final long serialVersionUID = 1L;
@TableField(value = "id")
@@ -77,7 +77,7 @@ public class ConSessionView implements Serializable {
@TableField(value = "medical_records_id")
@Schema(description = "")
private String medicalRecordsId;
@TableField(value = "status")
@TableField(value = "`status`")
@Schema(description = "")
private Integer status;
@TableField(value = "del_flag")
@@ -25,7 +25,7 @@ import java.util.Date;
@Accessors(chain = true)
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "qh_con_stl_cfg_cost")
@TableName(value = "con_settle_config_cost")
public class ConSettleConfigCost implements Serializable {
public static final String COL_ID = "id";
public static final String COL_SETTLE_ID = "settle_id";
@@ -24,7 +24,7 @@ import java.util.Date;
@Accessors(chain = true)
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "qh_con_stl_cfg_prd")
@TableName(value = "con_settle_config_period")
public class ConSettleConfigPeriod implements Serializable {
public static final String COL_ID = "id";
public static final String COL_SETTLE_ID = "settle_id";
@@ -22,7 +22,7 @@ import java.util.Date;
@Accessors(chain = true)
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "qh_con_stl_main")
@TableName(value = "con_settle_main")
public class ConSettleMain implements Serializable {
public static final String COL_ID = "id";
public static final String COL_SETTLE_NAME = "settle_name";
@@ -29,7 +29,7 @@ import java.util.Date;
@AllArgsConstructor
@NoArgsConstructor
@ColumnWidth(25)
@TableName(value = "qh_con_stl_rslt")
@TableName(value = "con_settle_result")
public class ConSettleResult implements Serializable {
public static final String COL_ID = "id";
public static final String COL_SETTLE_ID = "settle_id";
@@ -29,7 +29,7 @@ import java.util.Date;
@AllArgsConstructor
@NoArgsConstructor
@ColumnWidth(25)
@TableName(value = "qh_con_stl_rslt_itm")
@TableName(value = "con_settle_result_item")
public class ConSettleResultItem implements Serializable {
public static final String COL_ID = "id";
public static final String COL_SETTLE_ID = "settle_id";
@@ -29,7 +29,7 @@ import java.util.Date;
@AllArgsConstructor
@NoArgsConstructor
@ColumnWidth(25)
@TableName(value = "qh_con_stl_rslt_prd")
@TableName(value = "con_settle_result_period")
public class ConSettleResultPeriod implements Serializable {
public static final String COL_ID = "id";
public static final String COL_SETTLE_ID = "settle_id";
@@ -27,7 +27,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_sicks")
@TableName("con_sicks")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_sicks对象", description = "con_sicks")
@@ -22,7 +22,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_hosp_dept")
@TableName("hospital_department")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "hospital_department对象", description = "医院部门")
@@ -19,7 +19,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_im_msg_rdlog")
@TableName("im_msg_read_log")
@EqualsAndHashCode(callSuper = false)
@Schema(title = "Im消息已读日志", description = "Im消息已读日志")
public class ImMsgReadLog implements Serializable {
@@ -22,7 +22,7 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("qh_con_im_msg_all")
@TableName("im_msg_record_all")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "im_msg_record_all对象", description = "im_msg_record_all")
@@ -10,7 +10,7 @@ import java.io.Serializable;
import java.util.Date;
@Data
@TableName("qh_con_im_msg_all")
@TableName("im_msg_record_all")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "im_msg_record_all对象", description = "im_msg_record_all")
@@ -12,7 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@Data
@TableName("qh_con_helper")
@TableName("con_helper")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "con_helper对象", description = "con_helper")
@@ -10,7 +10,7 @@ import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
@Data
@TableName("qh_con_resource")
@TableName("con_resource")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "医院列表", description = "医院列表")
@@ -480,4 +480,10 @@ public class ConSessionApiController {
return conSessionApiService.insertUserAndHelperSessionNew();
}
@Operation(summary = "超时关闭视频咨询", description = "超时关闭视频咨询")
@GetMapping("/endVideoSession")
public Result<String> endVideoSession() {
return Result.ok(conSessionApiService.endVideoSession());
}
}
@@ -115,4 +115,6 @@ public interface ConSessionApiService {
UserSessionCount countForUser();
String endVideoSession();
}
@@ -2114,4 +2114,8 @@ public class ConSessionApiServiceImpl implements ConSessionApiService {
return conSessionMapper.selectCount(wrapper).intValue();
}
public String endVideoSession() {
return conSessionMapper.endVideoSession();
}
}
@@ -171,7 +171,7 @@ public class ConCostStatisticsController extends JeecgController<ConCostStatisti
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ConCostStatistics conCostStatistics) {
return super.exportXls(request, conCostStatistics, ConCostStatistics.class, "qh_con_cost_stat");
return super.exportXls(request, conCostStatistics, ConCostStatistics.class, "con_cost_statistics");
}
/**

Some files were not shown because too many files have changed in this diff Show More