fix(watch):

表名调整

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";

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")

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

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
         <where>
             org_code like concat(#{orgCode},'%')
 

health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDataMapper.xml

@@ -63,7 +63,7 @@
 
         from
         <if test="type==1">
-            QH_WAT_STA_US_DAY_HEA_RAT
+            QH_WAT_STAT_USER_DAY_HR
         </if>
         <if test="type==2">
             QH_WAT_STAT_USER_DAY_SPO2

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
         <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
             #{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
         <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
             #{userId}

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
         <where>
             org_code like concat(#{#orgCode}, '%')
             <if test="startTime!=null">
@@ -43,7 +43,7 @@
         SELECT
             COUNT(DISTINCT user_id)
         FROM
-            QH_WAT_STA_US_DAY_HEA_RAT
+            QH_WAT_STAT_USER_DAY_HR
         <where>
             org_code like concat(#{#orgCode}, '%')
             <if test="startTime!=null">
@@ -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
                     <foreach collection="userIds" item="id" open="(" separator="," close=")">
                         #{id}
@@ -315,7 +315,7 @@
     </select>
 
     <insert id="insertStat">
-        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 @@
 
     <!-- MySQL 的 UPDATE ... LEFT JOIN ... SET 语法已改写为达梦兼容的 MERGE INTO -->
     <update id="updateStat">
-        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,

health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchUserDataMapper.xml

@@ -100,7 +100,7 @@
     </select>
     <select id="getUserDataByWeekly" resultType="java.util.Map">
         SELECT 'heart_rate' AS "metric", AVG(avg_value) AS "value"
-        FROM QH_WAT_STA_US_DAY_HEA_RAT
+        FROM QH_WAT_STAT_USER_DAY_HR
         WHERE org_code LIKE CONCAT(#{orgCode}, '%') AND data_date BETWEEN #{monday} AND #{sunday}
         UNION ALL
         SELECT 'spo2' AS "metric", AVG(avg_value) AS "value"