From b0016073e3a70ae109af6038ebeaf72cdb9ddea9 Mon Sep 17 00:00:00 2001 From: hejiayang <296714699@qq.com> Date: Thu, 19 Mar 2026 11:06:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(watch):=20=E8=A1=A8=E5=90=8D=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/xcsql/watch.sql | 2 +- .../entity/WatchStatUserInfoDayHeartRate.java | 2 +- .../WatchStatUserInfoDayHeartRateMapper.java | 2 +- .../watch/mapper/xml/DeptStatisticDataMapper.xml | 2 +- .../renkang/watch/mapper/xml/WatchDataMapper.xml | 2 +- .../watch/mapper/xml/WatchDeviceMapper.xml | 8 ++++---- .../xml/WatchStatUserInfoDayHeartRateMapper.xml | 16 ++++++++-------- .../watch/mapper/xml/WatchUserDataMapper.xml | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/db/xcsql/watch.sql b/db/xcsql/watch.sql index 8a35272..d0e4cd4 100644 --- a/db/xcsql/watch.sql +++ b/db/xcsql/watch.sql @@ -41,7 +41,7 @@ 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_STA_US_DAY_HEA_RAT"; +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"; diff --git a/health-watch/health-watch-api/src/main/java/com/renkang/watch/entity/WatchStatUserInfoDayHeartRate.java b/health-watch/health-watch-api/src/main/java/com/renkang/watch/entity/WatchStatUserInfoDayHeartRate.java index 59dc4d3..ba82cb0 100644 --- a/health-watch/health-watch-api/src/main/java/com/renkang/watch/entity/WatchStatUserInfoDayHeartRate.java +++ b/health-watch/health-watch-api/src/main/java/com/renkang/watch/entity/WatchStatUserInfoDayHeartRate.java @@ -21,7 +21,7 @@ import java.util.Date; * @Version: V1.0 */ @Data -@TableName("QH_WAT_STA_US_DAY_HEA_RAT") +@TableName("QH_WAT_STAT_USER_DAY_HR") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @Schema(title = "watch_stat_user_info_day_heart_rate对象", description = "watch_stat_user_info_day_heart_rate") diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/WatchStatUserInfoDayHeartRateMapper.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/WatchStatUserInfoDayHeartRateMapper.java index cfd237f..5c102ff 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/WatchStatUserInfoDayHeartRateMapper.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/WatchStatUserInfoDayHeartRateMapper.java @@ -15,7 +15,7 @@ import java.util.Date; import java.util.List; /** - * @Description: QH_WAT_STA_US_DAY_HEA_RAT + * @Description: QH_WAT_STAT_USER_DAY_HR * @Author: jeecg-boot * @Date: 2023-11-06 * @Version: V1.0 diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/DeptStatisticDataMapper.xml b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/DeptStatisticDataMapper.xml index 6afec76..d0086b5 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/DeptStatisticDataMapper.xml +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/DeptStatisticDataMapper.xml @@ -8,7 +8,7 @@ SELECT COUNT(DISTINCT user_id) c FROM - QH_WAT_STA_US_DAY_HEA_RAT + QH_WAT_STAT_USER_DAY_HR org_code like concat(#{orgCode},'%') diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDataMapper.xml b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDataMapper.xml index 98c9419..b4497ec 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDataMapper.xml +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDataMapper.xml @@ -63,7 +63,7 @@ from - QH_WAT_STA_US_DAY_HEA_RAT + QH_WAT_STAT_USER_DAY_HR QH_WAT_STAT_USER_DAY_SPO2 diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDeviceMapper.xml b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDeviceMapper.xml index c31e316..0d2e3c5 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDeviceMapper.xml +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDeviceMapper.xml @@ -260,10 +260,10 @@ LEFT JOIN ( SELECT h1.* - FROM QH_WAT_STA_US_DAY_HEA_RAT h1 + FROM QH_WAT_STAT_USER_DAY_HR h1 INNER JOIN ( SELECT user_id, MAX(last_upload_time) AS max_time - FROM QH_WAT_STA_US_DAY_HEA_RAT + FROM QH_WAT_STAT_USER_DAY_HR WHERE user_id IN #{userId} @@ -449,10 +449,10 @@ LEFT JOIN ( SELECT h1.* - FROM QH_WAT_STA_US_DAY_HEA_RAT h1 + FROM QH_WAT_STAT_USER_DAY_HR h1 INNER JOIN ( SELECT user_id, MAX(last_upload_time) AS max_time - FROM QH_WAT_STA_US_DAY_HEA_RAT + FROM QH_WAT_STAT_USER_DAY_HR WHERE user_id IN #{userId} diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDayHeartRateMapper.xml b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDayHeartRateMapper.xml index 7e8233d..93aedee 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDayHeartRateMapper.xml +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDayHeartRateMapper.xml @@ -15,7 +15,7 @@ data_date as dataDate, TO_CHAR( data_date, 'MM' ) AS dateStr FROM - QH_WAT_STA_US_DAY_HEA_RAT + QH_WAT_STAT_USER_DAY_HR WHERE EXTRACT(YEAR FROM data_date) = EXTRACT(YEAR FROM #{dateYear}) and @@ -28,7 +28,7 @@ min(min_value) as heartRateMin, avg(avg_value) as heartRateAvg from - QH_WAT_STA_US_DAY_HEA_RAT + QH_WAT_STAT_USER_DAY_HR org_code like concat(#{#orgCode}, '%') @@ -43,7 +43,7 @@ SELECT COUNT(DISTINCT user_id) FROM - QH_WAT_STA_US_DAY_HEA_RAT + QH_WAT_STAT_USER_DAY_HR org_code like concat(#{#orgCode}, '%') @@ -73,7 +73,7 @@ ELSE 0 END AS risk_count FROM - QH_WAT_STA_US_DAY_HEA_RAT a + QH_WAT_STAT_USER_DAY_HR a LEFT JOIN (SELECT DISTINCT bind_user_id FROM QH_WAT_MONITOR_DATA WHERE warn_time BETWEEN @@ -301,10 +301,10 @@ SELECT wsd.* FROM - QH_WAT_STA_US_DAY_HEA_RAT wsd + QH_WAT_STAT_USER_DAY_HR wsd JOIN ( SELECT user_id, MAX( data_date ) AS latest_date - FROM QH_WAT_STA_US_DAY_HEA_RAT + FROM QH_WAT_STAT_USER_DAY_HR WHERE user_id in #{id} @@ -315,7 +315,7 @@ - INSERT INTO QH_WAT_STA_US_DAY_HEA_RAT ( id, user_id, max_value, min_value, avg_value, silence_max_value, silence_min_value, silence_avg_value, last_upload_time, new_value, silence_new_value, data_date, org_code ) + INSERT INTO QH_WAT_STAT_USER_DAY_HR ( id, user_id, max_value, min_value, avg_value, silence_max_value, silence_min_value, silence_avg_value, last_upload_time, new_value, silence_new_value, data_date, org_code ) SELECT #{id,jdbcType=VARCHAR}, bind_user_id, @@ -348,7 +348,7 @@ - MERGE INTO QH_WAT_STA_US_DAY_HEA_RAT stat + MERGE INTO QH_WAT_STAT_USER_DAY_HR stat USING ( SELECT wd.bind_user_id, diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchUserDataMapper.xml b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchUserDataMapper.xml index 941dc37..b498fdd 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchUserDataMapper.xml +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchUserDataMapper.xml @@ -100,7 +100,7 @@ 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