From 2214aee8b43c8f22e639cd3d847ee578d8b79e51 Mon Sep 17 00:00:00 2001 From: hejiayang <296714699@qq.com> Date: Thu, 19 Mar 2026 14:22:03 +0800 Subject: [PATCH] fix(watch): MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 定时任务数据库配置从 cqyt_watch_prod/cqyt_system_prod 更新为 XJ_WATCH/XJ_SYSTEM; - 定时任务sql表名替换 - 修复了SQL 查询中的逻辑连接符问题 --- .../mapper/xml/WatchMonitorDataMapper.xml | 2 +- .../renkang/watch/task/DepartSyncTask.java | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchMonitorDataMapper.xml b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchMonitorDataMapper.xml index 2e0ac36..376cf41 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchMonitorDataMapper.xml +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchMonitorDataMapper.xml @@ -215,6 +215,6 @@ lon_gd IS NOT NULL AND lat_gd IS NOT NULL AND NVL(address_gd, '') = '' - WHERE ROWNUM <= 100 + and ROWNUM <= 100 diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/task/DepartSyncTask.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/task/DepartSyncTask.java index 91a0578..a46a7a0 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/task/DepartSyncTask.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/task/DepartSyncTask.java @@ -15,9 +15,9 @@ public class DepartSyncTask { @Autowired private JdbcTemplate jdbcTemplate; - @Value("${renkang.db.watch:cqyt_watch_prod}") + @Value("${renkang.db.watch:XJ_WATCH}") private String watchDb; - @Value("${renkang.db.system:cqyt_system_prod}") + @Value("${renkang.db.system:XJ_SYSTEM}") private String systemDb; @XxlJob(value = "sync-data-orgCode") @@ -39,16 +39,16 @@ public class DepartSyncTask { } private interface SqlTemplate { - String WATCH_DATA_UPDATE_TEMPLATE = "update %s.watch_data wd left join %s.sys_user su on wd.userid = su.id set wd.orgcode = su.org_code where wd.orgcode != su.org_code;"; - String WATCH_BIND_HIS_UPDATE_TEMPLATE = "update %s.watch_bind_his wd left join %s.sys_user su on wd.bind_user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; - String WATCH_MONITOR_DATA_UPDATE_TEMPLATE = "update %s.watch_monitor_data wd left join %s.sys_user su on wd.bind_user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; - String WATCH_STAT_HR_UPDATE_TEMPLATE = "update %s.watch_stat_user_info_day_heart_rate wd left join %s.sys_user su on wd.user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; - String WATCH_STAT_SDC_UPDATE_TEMPLATE = "update %s.watch_stat_user_info_day_sdc wd left join %s.sys_user su on wd.user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; - String WATCH_STAT_SPO2_UPDATE_TEMPLATE = "update %s.watch_stat_user_info_day_spo2 wd left join %s.sys_user su on wd.user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; - String WATCH_STAT_SLEEP_UPDATE_TEMPLATE = "update %s.watch_stat_user_info_day_sleep wd left join %s.sys_user su on wd.user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; - String WATCH_STAT_STRESS_UPDATE_TEMPLATE = "update %s.watch_stat_user_info_day_stress wd left join %s.sys_user su on wd.user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; - String WATCH_STAT_TEMP_UPDATE_TEMPLATE = "update %s.watch_stat_user_info_day_temp wd left join %s.sys_user su on wd.user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; - String WATCH_STAT_WORKOUT_UPDATE_TEMPLATE = "update %s.watch_stat_user_info_day_workout wd left join %s.sys_user su on wd.user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; + String WATCH_DATA_UPDATE_TEMPLATE = "update %s.QH_WAT_DATA wd left join %s.QH_SYS_USER su on wd.userid = su.id set wd.orgcode = su.org_code where wd.orgcode != su.org_code;"; + String WATCH_BIND_HIS_UPDATE_TEMPLATE = "update %s.QH_WAT_BIND_HIS wd left join %s.QH_SYS_USER su on wd.bind_user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; + String WATCH_MONITOR_DATA_UPDATE_TEMPLATE = "update %s.QH_WAT_MONITOR_DATA wd left join %s.QH_SYS_USER su on wd.bind_user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; + String WATCH_STAT_HR_UPDATE_TEMPLATE = "update %s.QH_WAT_STAT_USER_DAY_HR wd left join %s.QH_SYS_USER su on wd.user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; + String WATCH_STAT_SDC_UPDATE_TEMPLATE = "update %s.QH_WAT_STAT_USER_DAY_SDC wd left join %s.QH_SYS_USER su on wd.user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; + String WATCH_STAT_SPO2_UPDATE_TEMPLATE = "update %s.QH_WAT_STAT_USER_DAY_SPO2 wd left join %s.QH_SYS_USER su on wd.user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; + String WATCH_STAT_SLEEP_UPDATE_TEMPLATE = "update %s.QH_WAT_STAT_USER_DAY_SLE wd left join %s.QH_SYS_USER su on wd.user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; + String WATCH_STAT_STRESS_UPDATE_TEMPLATE = "update %s.QH_WAT_STAT_USER_DAY_STRE wd left join %s.QH_SYS_USER su on wd.user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; + String WATCH_STAT_TEMP_UPDATE_TEMPLATE = "update %s.QH_WAT_STAT_USER_DAY_TEMP wd left join %s.QH_SYS_USER su on wd.user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; + String WATCH_STAT_WORKOUT_UPDATE_TEMPLATE = "update %s.QH_WAT_STAT_USER_DAY_WORK wd left join %s.QH_SYS_USER su on wd.user_id = su.id set wd.org_code = su.org_code where wd.org_code != su.org_code;"; } } \ No newline at end of file