From 04c2a2218ac66565a7aebebf868599a25a18e525 Mon Sep 17 00:00:00 2001 From: hejiayang <296714699@qq.com> Date: Fri, 13 Mar 2026 11:16:02 +0800 Subject: [PATCH] =?UTF-8?q?fix(emergency,watch):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E5=90=8D=E5=89=8D=E7=BC=80?= =?UTF-8?q?=E4=B8=BA=E6=A0=87=E5=87=86=E5=8C=96=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更新health-emergency和health-watch模块中的所有实体类和XML映射文件以及mapper文件注解sql， 将数据库表名从原有命名格式统一更改为带项目前缀的标准化格式， 如QH_EME开头用于应急健康模块，QH_WAT开头用于健康监测模块 --- .../emergency/entity/SysNotifySmsPhone.java | 2 +- .../mapper/xml/AedEquipmentMaintainMapper.xml | 12 +- .../mapper/xml/AedEquipmentMangerMapper.xml | 6 +- .../mapper/xml/AedEquipmentTrainMapper.xml | 8 +- .../aed/mapper/xml/AedUseRecordNewMapper.xml | 4 +- .../watch/entity/ArchivesBodyType.java | 2 +- .../watch/entity/DeptStatisticData.java | 2 +- .../watch/entity/UserRecordSportsDay.java | 2 +- .../watch/entity/UserRecordSportsInfo.java | 2 +- .../watch/entity/UserWeChatSportsDay.java | 2 +- .../renkang/watch/entity/WatchBindHis.java | 2 +- .../com/renkang/watch/entity/WatchData.java | 2 +- .../watch/entity/WatchDataCalorie.java | 2 +- .../watch/entity/WatchDataDistance.java | 2 +- .../renkang/watch/entity/WatchDataEcg.java | 2 +- .../watch/entity/WatchDataExercise.java | 2 +- .../renkang/watch/entity/WatchDataGps.java | 2 +- .../watch/entity/WatchDataHeartRate.java | 2 +- .../renkang/watch/entity/WatchDataSleep.java | 2 +- .../watch/entity/WatchDataSleepNew.java | 2 +- .../watch/entity/WatchDataSleepNewDay.java | 2 +- .../watch/entity/WatchDataSleepNewErr.java | 2 +- .../watch/entity/WatchDataSleepNewMinute.java | 2 +- .../renkang/watch/entity/WatchDataSpo2.java | 2 +- .../renkang/watch/entity/WatchDataSteps.java | 2 +- .../watch/entity/WatchDataStepsHf.java | 2 +- .../renkang/watch/entity/WatchDataStress.java | 2 +- .../watch/entity/WatchDataTemperature.java | 2 +- .../watch/entity/WatchDataWorkout.java | 2 +- .../watch/entity/WatchDataWorkoutTrace.java | 2 +- .../watch/entity/WatchDepartReport.java | 2 +- .../com/renkang/watch/entity/WatchDevice.java | 2 +- .../renkang/watch/entity/WatchDeviceDO.java | 2 +- .../watch/entity/WatchDeviceSwitch.java | 2 +- .../renkang/watch/entity/WatchKeyUser.java | 2 +- .../watch/entity/WatchMonitorData.java | 2 +- .../watch/entity/WatchMonitorMobile.java | 2 +- .../renkang/watch/entity/WatchMqttNotice.java | 2 +- .../entity/WatchStatUserInfoDayHeartRate.java | 2 +- .../watch/entity/WatchStatUserInfoDaySdc.java | 2 +- .../entity/WatchStatUserInfoDaySleep.java | 2 +- .../entity/WatchStatUserInfoDaySpo2.java | 2 +- .../entity/WatchStatUserInfoDayStress.java | 2 +- .../entity/WatchStatUserInfoDayTemp.java | 2 +- .../entity/WatchStatUserInfoDayWorkout.java | 2 +- .../renkang/watch/entity/WatchSynMaxId.java | 2 +- .../renkang/watch/entity/WatchUserData.java | 2 +- .../watch/mapper/DeptStatisticDataMapper.java | 5 +- .../watch/mapper/WatchBindHisMapper.java | 2 +- .../watch/mapper/WatchDataCalorieMapper.java | 2 +- .../watch/mapper/WatchDataDistanceMapper.java | 2 +- .../watch/mapper/WatchDataExerciseMapper.java | 2 +- .../watch/mapper/WatchDataGpsMapper.java | 2 +- .../mapper/WatchDataHeartRateMapper.java | 2 +- .../watch/mapper/WatchDataSleepMapper.java | 2 +- .../watch/mapper/WatchDataSpo2Mapper.java | 4 +- .../watch/mapper/WatchDataStepsMapper.java | 2 +- .../watch/mapper/WatchDataStressMapper.java | 4 +- .../mapper/WatchDataTemperatureMapper.java | 4 +- .../watch/mapper/WatchDataWorkoutMapper.java | 2 +- .../mapper/WatchDataWorkoutTraceMapper.java | 2 +- .../watch/mapper/WatchDeviceMapper.java | 4 +- .../watch/mapper/WatchDeviceSwitchMapper.java | 2 +- .../watch/mapper/WatchKeyUserMapper.java | 2 +- .../com/renkang/watch/mapper/WatchMapper.java | 36 +++--- .../watch/mapper/WatchMonitorDataMapper.java | 4 +- .../mapper/WatchMonitorMobileMapper.java | 2 +- .../watch/mapper/WatchMqttNoticeMapper.java | 2 +- .../WatchStatUserInfoDayHeartRateMapper.java | 2 +- .../mapper/WatchStatUserInfoDaySdcMapper.java | 2 +- .../WatchStatUserInfoDaySleepMapper.java | 2 +- .../WatchStatUserInfoDaySpo2Mapper.java | 2 +- .../WatchStatUserInfoDayStressMapper.java | 4 +- .../WatchStatUserInfoDayTempMapper.java | 2 +- .../WatchStatUserInfoDayWorkoutMapper.java | 2 +- .../watch/mapper/WatchSynMaxIdMapper.java | 2 +- .../watch/mapper/WatchUserDataMapper.java | 4 +- .../provider/WatchStatisticsProvider.java | 16 +-- .../mapper/xml/ArchivesBodyTypeMapper.xml | 16 +-- .../mapper/xml/DeptStatisticDataMapper.xml | 20 +-- .../watch/mapper/xml/WatchBindHisMapper.xml | 76 +++++------ .../mapper/xml/WatchDataHeartRateMapper.xml | 4 +- .../watch/mapper/xml/WatchDataMapper.xml | 118 +++++++++--------- .../mapper/xml/WatchDataSleepNewMapper.xml | 16 +-- .../watch/mapper/xml/WatchDataSpo2Mapper.xml | 4 +- .../mapper/xml/WatchDataStressMapper.xml | 2 +- .../mapper/xml/WatchDataTemperatureMapper.xml | 2 +- .../mapper/xml/WatchDataWorkoutMapper.xml | 22 ++-- .../mapper/xml/WatchDepartReportMapper.xml | 2 +- .../watch/mapper/xml/WatchDeviceMapper.xml | 100 +++++++-------- .../renkang/watch/mapper/xml/WatchMapper.xml | 26 ++-- .../mapper/xml/WatchMonitorDataMapper.xml | 24 ++-- .../WatchStatUserInfoDayHeartRateMapper.xml | 38 +++--- .../xml/WatchStatUserInfoDaySdcMapper.xml | 28 ++--- .../xml/WatchStatUserInfoDaySleepMapper.xml | 20 +-- .../xml/WatchStatUserInfoDaySpo2Mapper.xml | 20 +-- .../xml/WatchStatUserInfoDayStressMapper.xml | 18 +-- .../xml/WatchStatUserInfoDayTempMapper.xml | 28 ++--- .../xml/WatchStatUserInfoDayWorkoutMapper.xml | 8 +- .../watch/mapper/xml/WatchUserDataMapper.xml | 34 ++--- 100 files changed, 434 insertions(+), 435 deletions(-) diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/SysNotifySmsPhone.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/SysNotifySmsPhone.java index f2deff0..39e722c 100644 --- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/SysNotifySmsPhone.java +++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/SysNotifySmsPhone.java @@ -17,7 +17,7 @@ import java.io.Serializable; * @date 2023-06-06 17:29:38 */ @Setter -@TableName("QH_SYS_NOTIF_SMS_PHONE") +@TableName("QH_EME_NOTIF_SMS_PHONE") @Data public class SysNotifySmsPhone implements Serializable { /** diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMaintainMapper.xml b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMaintainMapper.xml index 19a88a3..b7ba789 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMaintainMapper.xml +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMaintainMapper.xml @@ -31,8 +31,8 @@ aem.latitude AS latitude FROM - aed_equipment_maintain aem1 - INNER JOIN aed_equipment_manger aem ON aem.id = aem1.equipment_id AND aem.del_flag =0 + QH_EME_AED_EQUIP_MAINTAIN aem1 + INNER JOIN QH_EME_AED_EQUIP_MANGER aem ON aem.id = aem1.equipment_id AND aem.del_flag =0 and aem1.del_flag=0 @@ -70,8 +70,8 @@ aem1.maintain_unit AS maintainUnit, aem.longitude AS longitude, aem.latitude AS latitude - from aed_equipment_maintain aem1 - LEFT join aed_equipment_manger aem on aem.id = aem1.equipment_id and aem.del_flag = 0 + from QH_EME_AED_EQUIP_MAINTAIN aem1 + LEFT join QH_EME_AED_EQUIP_MANGER aem on aem.id = aem1.equipment_id and aem.del_flag = 0 where aem1.id = #{id} @@ -89,8 +89,8 @@ t2.manage_user_name, t2.manage_user_mobile FROM - "aed_equipment_maintain" t1 - LEFT JOIN aed_equipment_manger t2 ON t1.equipment_id = t2.id + "QH_EME_AED_EQUIP_MAINTAIN" t1 + LEFT JOIN QH_EME_AED_EQUIP_MANGER t2 ON t1.equipment_id = t2.id and t2.name like concat('%',#{name},'%') diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml index 9d89b41..039d5ad 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml @@ -39,7 +39,7 @@ camera_num as cameraNum, camera_code as cameraCode from - aed_equipment_manger + QH_EME_AED_EQUIP_MANGER del_flag=0 @@ -95,7 +95,7 @@ camera_num as cameraNum, camera_code as cameraCode from - aed_equipment_manger + QH_EME_AED_EQUIP_MANGER del_flag=0 and publish_flag=1 @@ -124,7 +124,7 @@ - select id from dept_statistic_data where + select id from QH_WAT_DEPT_STAT_DATA where data_date = #{dataDate} AND org_code = #{orgCode} AND org_code_leaf = #{orgCodeLeaf} @@ -110,7 +110,7 @@ SUM(seven_day_num) AS sevenDayNum, SUM(thirty_day_num) AS thirtyDayNum FROM - dept_statistic_data + QH_WAT_DEPT_STAT_DATA WHERE 1=1 @@ -119,6 +119,6 @@ AND org_code_leaf = #{orgCodeLeaf} - AND data_date = (SELECT MAX(data_date) FROM dept_statistic_data) + AND data_date = (SELECT MAX(data_date) FROM QH_WAT_DEPT_STAT_DATA) \ No newline at end of file diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchBindHisMapper.xml b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchBindHisMapper.xml index 9c804f3..69a9051 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchBindHisMapper.xml +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchBindHisMapper.xml @@ -12,8 +12,8 @@ wbh.dept_id as old_dept_id, wd.dept_id FROM - watch_bind_his wbh - LEFT JOIN watch_device wd ON wbh.watch_no = wd.watch_no + QH_WAT_BIND_HIS wbh + LEFT JOIN QH_WAT_DEVICE wd ON wbh.watch_no = wd.watch_no select DISTINCT dept_id - from watch_bind_his where bind_end_date is null + from QH_WAT_BIND_HIS where bind_end_date is null - select count(1) from watch_bind_his where bind_end_date is null and bind_user_id is not null and bind_user_id != '' + select count(1) from QH_WAT_BIND_HIS where bind_end_date is null and bind_user_id is not null and bind_user_id != '' AND org_code like concat(#{orgCode},'_%') @@ -148,14 +148,14 @@ select bind_user_id as "bindUserId", LEFT(org_code,9) as "orgCode" - from watch_bind_his + from QH_WAT_BIND_HIS where bind_end_date is null - SELECT ( LEFT ( org_code, 6 ) ) as orgCode FROM watch_bind_his + SELECT ( LEFT ( org_code, 6 ) ) as orgCode FROM QH_WAT_BIND_HIS @@ -243,7 +243,7 @@ ( LEFT ( org_code, 6 ) ) UNION - SELECT ( LEFT ( org_code, 9 ) ) as orgCode FROM watch_bind_his + SELECT ( LEFT ( org_code, 9 ) ) as orgCode FROM QH_WAT_BIND_HIS @@ -255,7 +255,7 @@ ( LEFT ( org_code, 9 ) ) select org_code AS "orgCode" - from watch_device + from QH_WAT_DEVICE where 1 = 1 and DATE (create_date) #{endDate} @@ -360,7 +360,7 @@ select * - from watch_data_heart_rate + from QH_WAT_DATA_HEART_RATE where bind_user_id = #{userId} and DATE(time_stamp) = DATE(#{dataTime}) 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 4ba7607..98c9419 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 @@ -7,8 +7,8 @@ wd.orgcode, wd.watch_no, device.bind_date - FROM watch_data wd - LEFT JOIN watch_device device ON wd.watch_no = device.watch_no + FROM QH_WAT_DATA wd + LEFT JOIN QH_WAT_DEVICE device ON wd.watch_no = device.watch_no WHERE wd.id = #{id} @@ -89,7 +89,7 @@ @@ -98,14 +98,14 @@ - update watch_data set + update QH_WAT_DATA set orgcode = #{orgcode} where userid = #{userid} @@ -113,48 +113,48 @@ - insert into watch_data(id, userid, username, orgcode, watch_no, type, data_value, last_update_time) + insert into QH_WAT_DATA (id, userid, username, orgcode, watch_no, type, data_value, last_update_time) (select #{id,jdbcType=VARCHAR}, bind_user_id, #{username,jdbcType=VARCHAR}, #{orgcode,jdbcType=VARCHAR}, watch_no, 1, data_value, data_date from (select bind_user_id, watch_no, data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY time_stamp desc) as rn - from watch_data_heart_rate + from QH_WAT_DATA_HEART_RATE where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR}) where rn = 1); - update watch_data wd + update QH_WAT_DATA wd set wd.orgcode = #{orgcode,jdbcType=VARCHAR}, wd.data_value = (select data_value from ( select bind_user_id, data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY time_stamp desc) as rn - from watch_data_heart_rate + from QH_WAT_DATA_HEART_RATE where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} ) where rn = 1), wd.last_update_time = (select data_date from ( select bind_user_id, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY time_stamp desc) as rn - from watch_data_heart_rate + from QH_WAT_DATA_HEART_RATE where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} ) where rn = 1) @@ -164,30 +164,30 @@ - insert into watch_data(id, userid, username, orgcode, watch_no, type, data_value, last_update_time) + insert into QH_WAT_DATA (id, userid, username, orgcode, watch_no, type, data_value, last_update_time) (select #{id,jdbcType=VARCHAR}, bind_user_id, #{username,jdbcType=VARCHAR}, #{orgcode,jdbcType=VARCHAR}, watch_no, 2, data_value, data_date from (select bind_user_id, watch_no, data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY time_stamp desc) as rn - from watch_data_spo2 + from QH_WAT_DATA_SPO2 where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR}) where rn = 1); - update watch_data wd + update QH_WAT_DATA wd set wd.orgcode = #{orgcode,jdbcType=VARCHAR}, wd.data_value = (select data_value from ( select bind_user_id, data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY time_stamp desc) as rn - from watch_data_spo2 + from QH_WAT_DATA_SPO2 where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} ) where rn = 1), wd.last_update_time = (select data_date from ( select bind_user_id, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY time_stamp desc) as rn - from watch_data_spo2 + from QH_WAT_DATA_SPO2 where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} ) where rn = 1) @@ -197,30 +197,30 @@ - insert into watch_data(id, userid, username, orgcode, watch_no, type, data_value, last_update_time) + insert into QH_WAT_DATA (id, userid, username, orgcode, watch_no, type, data_value, last_update_time) (select #{id,jdbcType=VARCHAR}, bind_user_id, #{username,jdbcType=VARCHAR}, #{orgcode,jdbcType=VARCHAR}, watch_no, 3, data_value, data_date from (select bind_user_id, watch_no, data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY start_time_stamp desc) as rn - from watch_data_stress + from QH_WAT_DATA_STRESS where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR}) where rn = 1); - update watch_data wd + update QH_WAT_DATA wd set wd.orgcode = #{orgcode,jdbcType=VARCHAR}, wd.data_value = (select data_value from ( select bind_user_id, data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY start_time_stamp desc) as rn - from watch_data_stress + from QH_WAT_DATA_STRESS where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} ) where rn = 1), wd.last_update_time = (select data_date from ( select bind_user_id, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY start_time_stamp desc) as rn - from watch_data_stress + from QH_WAT_DATA_STRESS where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} ) where rn = 1) @@ -230,12 +230,12 @@ - insert into watch_data(id, userid, username, orgcode, watch_no, type, data_value, last_update_time) + insert into QH_WAT_DATA (id, userid, username, orgcode, watch_no, type, data_value, last_update_time) (select #{id,jdbcType=VARCHAR}, bind_user_id, #{username,jdbcType=VARCHAR}, #{orgcode,jdbcType=VARCHAR}, #{watchNo,jdbcType=VARCHAR}, 4, NVL(SUM(EXTRACT(HOUR FROM (sm.end_time - sm.start_time)) * 60 + EXTRACT(MINUTE FROM (sm.end_time - sm.start_time))), 0) as deep_light_times, data_date - from watch_data_sleep_new s - left join watch_data_sleep_new_minute sm on s.id = sm.sleep_id + from QH_WAT_DATA_SLEEP_NEW s + left join QH_WAT_DATA_SLEEP_NEW_MIN sm on s.id = sm.sleep_id where s.bind_user_id = #{userid,jdbcType=VARCHAR} and s.watch_no = #{watchNo,jdbcType=VARCHAR} and s.sleep_flag = '1' @@ -245,11 +245,11 @@ - update watch_data wd + update QH_WAT_DATA wd set wd.orgcode = #{orgcode,jdbcType=VARCHAR}, wd.data_value = (select NVL(SUM(EXTRACT(HOUR FROM (sm.end_time - sm.start_time)) * 60 + EXTRACT(MINUTE FROM (sm.end_time - sm.start_time))), 0) - from watch_data_sleep_new s - left join watch_data_sleep_new_minute sm on s.id = sm.sleep_id + from QH_WAT_DATA_SLEEP_NEW s + left join QH_WAT_DATA_SLEEP_NEW_MIN sm on s.id = sm.sleep_id where s.bind_user_id = #{userid,jdbcType=VARCHAR} and s.watch_no = #{watchNo,jdbcType=VARCHAR} and s.sleep_flag = '1' @@ -258,7 +258,7 @@ FETCH FIRST 1 ROWS ONLY), wd.last_update_time = (select data_date from ( select data_date - from watch_data_sleep_new + from QH_WAT_DATA_SLEEP_NEW where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} and sleep_flag = '1' @@ -270,30 +270,30 @@ - insert into watch_data(id, userid, username, orgcode, watch_no, type, data_value, last_update_time) + insert into QH_WAT_DATA (id, userid, username, orgcode, watch_no, type, data_value, last_update_time) (select #{id,jdbcType=VARCHAR}, bind_user_id, #{username,jdbcType=VARCHAR}, #{orgcode,jdbcType=VARCHAR}, watch_no, 5, data_value, data_date from (select bind_user_id, watch_no, data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY time_stamp desc) as rn - from watch_data_temperature + from QH_WAT_DATA_TEMP where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR}) where rn = 1); - update watch_data wd + update QH_WAT_DATA wd set wd.orgcode = #{orgcode,jdbcType=VARCHAR}, wd.data_value = (select data_value from ( select bind_user_id, data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY time_stamp desc) as rn - from watch_data_temperature + from QH_WAT_DATA_TEMP where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} ) where rn = 1), wd.last_update_time = (select data_date from ( select bind_user_id, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY time_stamp desc) as rn - from watch_data_temperature + from QH_WAT_DATA_TEMP where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} ) where rn = 1) @@ -303,11 +303,11 @@ - insert into watch_data(id, userid, username, orgcode, watch_no, type, data_value, last_update_time) + insert into QH_WAT_DATA (id, userid, username, orgcode, watch_no, type, data_value, last_update_time) (select #{id,jdbcType=VARCHAR}, bind_user_id, #{username,jdbcType=VARCHAR}, #{orgcode,jdbcType=VARCHAR}, watch_no, 6, sum(calorie), data_date from (select bind_user_id, watch_no, sum(calorie) as calorie, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY data_date desc) as rn - from watch_data_workout + from QH_WAT_DATA_WORKOUT where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} group by bind_user_id, watch_no, data_date) @@ -315,12 +315,12 @@ - update watch_data wd + update QH_WAT_DATA wd set wd.orgcode = #{orgcode,jdbcType=VARCHAR}, wd.data_value = (select sum(calorie) from ( select bind_user_id, watch_no, sum(calorie) as calorie, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY data_date desc) as rn - from watch_data_workout + from QH_WAT_DATA_WORKOUT where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} group by bind_user_id, watch_no, data_date @@ -328,7 +328,7 @@ wd.last_update_time = (select data_date from ( select bind_user_id, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY data_date desc) as rn - from watch_data_workout + from QH_WAT_DATA_WORKOUT where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} group by bind_user_id, watch_no, data_date @@ -339,11 +339,11 @@ - insert into watch_data(id, userid, username, orgcode, watch_no, type, data_value, last_update_time) + insert into QH_WAT_DATA (id, userid, username, orgcode, watch_no, type, data_value, last_update_time) (select #{id,jdbcType=VARCHAR}, bind_user_id, #{username,jdbcType=VARCHAR}, #{orgcode,jdbcType=VARCHAR}, watch_no, 7, max(data_value), data_date from (select bind_user_id, watch_no, max(data_value) as data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY data_date desc) as rn - from watch_data_distance + from QH_WAT_DATA_DISTANCE where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} group by bind_user_id, watch_no, data_date) @@ -351,12 +351,12 @@ - update watch_data wd + update QH_WAT_DATA wd set wd.orgcode = #{orgcode,jdbcType=VARCHAR}, wd.data_value = (select max(data_value) from ( select bind_user_id, watch_no, max(data_value) as data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY data_date desc) as rn - from watch_data_distance + from QH_WAT_DATA_DISTANCE where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} group by bind_user_id, watch_no, data_date @@ -364,7 +364,7 @@ wd.last_update_time = (select data_date from ( select bind_user_id, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY data_date desc) as rn - from watch_data_distance + from QH_WAT_DATA_DISTANCE where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} group by bind_user_id, watch_no, data_date @@ -375,11 +375,11 @@ - insert into watch_data(id, userid, username, orgcode, watch_no, type, data_value, last_update_time) + insert into QH_WAT_DATA (id, userid, username, orgcode, watch_no, type, data_value, last_update_time) (select #{id,jdbcType=VARCHAR}, bind_user_id, #{username,jdbcType=VARCHAR}, #{orgcode,jdbcType=VARCHAR}, watch_no, 8, max(data_value), data_date from (select bind_user_id, watch_no, max(data_value) as data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY data_date desc) as rn - from watch_data_steps + from QH_WAT_DATA_STEPS where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} group by bind_user_id, watch_no, data_date) @@ -387,12 +387,12 @@ - update watch_data wd + update QH_WAT_DATA wd set wd.orgcode = #{orgcode,jdbcType=VARCHAR}, wd.data_value = (select max(data_value) from ( select bind_user_id, watch_no, max(data_value) as data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY data_date desc) as rn - from watch_data_steps + from QH_WAT_DATA_STEPS where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} group by bind_user_id, watch_no, data_date @@ -400,7 +400,7 @@ wd.last_update_time = (select data_date from ( select bind_user_id, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id, watch_no ORDER BY data_date desc) as rn - from watch_data_steps + from QH_WAT_DATA_STEPS where bind_user_id = #{userid,jdbcType=VARCHAR} and watch_no = #{watchNo,jdbcType=VARCHAR} group by bind_user_id, watch_no, data_date diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDataSleepNewMapper.xml b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDataSleepNewMapper.xml index b7088bc..ef454cf 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDataSleepNewMapper.xml +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDataSleepNewMapper.xml @@ -13,8 +13,8 @@ wdsnm.end_time as endTime, wdsnm.sleep_type as sleepType from - watch_data_sleep_new wdsn - left join watch_data_sleep_new_minute wdsnm on wdsnm.sleep_id=wdsn.id + QH_WAT_DATA_SLEEP_NEW wdsn + left join QH_WAT_DATA_SLEEP_NEW_MIN wdsnm on wdsnm.sleep_id=wdsn.id wdsn.bind_user_id=#{userId} and @@ -36,8 +36,8 @@ wdsnm.sleep_type as sleepType, EXTRACT(MINUTE FROM (wdsnm.end_time - wdsnm.start_time)) as times from - watch_data_sleep_new wdsn - inner join watch_data_sleep_new_minute wdsnm on wdsnm.sleep_id=wdsn.id + QH_WAT_DATA_SLEEP_NEW wdsn + inner join QH_WAT_DATA_SLEEP_NEW_MIN wdsnm on wdsnm.sleep_id=wdsn.id wdsn.bind_user_id=#{req.userId} and wdsnm.start_time is not null @@ -81,8 +81,8 @@ wm.status as status, wm.sleep_type as sleepType FROM - watch_data_sleep_new w - inner JOIN watch_data_sleep_new_minute wm ON wm.sleep_id = w.id + QH_WAT_DATA_SLEEP_NEW w + inner JOIN QH_WAT_DATA_SLEEP_NEW_MIN wm ON wm.sleep_id = w.id WHERE w.bind_user_id =#{userId} AND w.data_date= #{dateStr} @@ -100,8 +100,8 @@ wdsnm.sleep_type as sleepType, TIMESTAMPDIFF(MINUTE,wdsnm.start_time,wdsnm.end_time) as times from - watch_data_sleep_new wdsn - inner join watch_data_sleep_new_minute wdsnm on wdsnm.sleep_id=wdsn.id + QH_WAT_DATA_SLEEP_NEW wdsn + inner join QH_WAT_DATA_SLEEP_NEW_MIN wdsnm on wdsnm.sleep_id=wdsn.id wdsn.bind_user_id=#{userId} and wdsnm.start_time is not null diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDataSpo2Mapper.xml b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDataSpo2Mapper.xml index bacaf4b..09ab8b4 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDataSpo2Mapper.xml +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDataSpo2Mapper.xml @@ -5,7 +5,7 @@ SELECT * FROM - "watch_data_spo2" + "QH_WAT_DATA_SPO2" WHERE EXTRACT(YEAR FROM data_date) = #{req.dateYear} AND @@ -17,7 +17,7 @@ @@ -130,7 +130,7 @@ select min(start_time_stamp) from - watch_data_workout + QH_WAT_DATA_WORKOUT WHERE bind_user_id = #{bindUserId} @@ -155,7 +155,7 @@ ) AS sugarCalories, SUM(IFNULL(TIMESTAMPDIFF(SECOND, start_time_stamp, end_time_stamp),0)) as "totalTime" FROM - watch_data_workout + QH_WAT_DATA_WORKOUT WHERE FIND_IN_SET(workout_type,'1,2,3,109,144,6,7,101,113,145') @@ -192,7 +192,7 @@ AS sugarCalories, IFNULL(TIMESTAMPDIFF(SECOND, start_time_stamp, end_time_stamp),0) as "totalTime" from - watch_data_workout + QH_WAT_DATA_WORKOUT WHERE bind_user_id = #{watchDataWorkout.bindUserId} and DATE(start_time_stamp) >= DATE(#{watchDataWorkout.startTime}) @@ -229,7 +229,7 @@ AS sugarCalories, IFNULL(TIMESTAMPDIFF(SECOND, start_time_stamp, end_time_stamp),0) as "totalTime" FROM - watch_data_workout + QH_WAT_DATA_WORKOUT WHERE FIND_IN_SET(workout_type,'1,2,3,109,144,6,7,101,113,145') and bind_user_id = #{watchDataWorkout.bindUserId} @@ -250,10 +250,10 @@ EXTRACT(HOUR FROM (end_time_stamp - start_time_stamp)) * 3600),0) as "totalTime", MIN(start_time_stamp) AS "dataDate" from - watch_data_workout + QH_WAT_DATA_WORKOUT WHERE bind_user_id = #{watchDataWorkout.bindUserId} - and DATE(start_time_stamp) = (SELECT MAX(DATE(start_time_stamp)) FROM watch_data_workout WHERE bind_user_id = #{watchDataWorkout.bindUserId} and FIND_IN_SET(workout_type,'1,2,3,109,144,6,7,101,113,145')) + and DATE(start_time_stamp) = (SELECT MAX(DATE(start_time_stamp)) FROM QH_WAT_DATA_WORKOUT WHERE bind_user_id = #{watchDataWorkout.bindUserId} and FIND_IN_SET(workout_type,'1,2,3,109,144,6,7,101,113,145')) and FIND_IN_SET(workout_type,'1,2,3,109,144,6,7,101,113,145') diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDepartReportMapper.xml b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDepartReportMapper.xml index c3ac15c..1226f43 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDepartReportMapper.xml +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDepartReportMapper.xml @@ -3,7 +3,7 @@ - + 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 361da8b..6d762b3 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 @@ -20,9 +20,9 @@ LISTAGG(wds.switch_flag, ',') WITHIN GROUP (ORDER BY wds.switch_flag) AS switch_flags, LISTAGG(NVL(TO_CHAR(wds.update_date, 'YYYY-MM-DD HH24:MI:SS'), '') || ',') WITHIN GROUP (ORDER BY wds.update_date) AS update_dates FROM - watch_device wd + QH_WAT_DEVICE wd LEFT JOIN - watch_device_switch wds ON wd.watch_no = wds.watch_no + QH_WAT_DEVICE_SWITCH wds ON wd.watch_no = wds.watch_no AND wd.dept_id = #{dto.deptId} @@ -58,10 +58,10 @@ - select count(1) from watch_device where 1=1 + select count(1) from QH_WAT_DEVICE where 1=1 and org_code = #{orgCode} @@ -97,7 +97,7 @@ - update watch_device set + update QH_WAT_DEVICE set org_code = #{orgcode}, dept_id = #{deptId} where bind_user_id = #{bindUserId} @@ -123,7 +123,7 @@ a.dept_id as "deptId", a.org_code as "orgCode" FROM - watch_device a + QH_WAT_DEVICE a and a.bind_date >= #{dto.startTime} @@ -151,7 +151,7 @@ @@ -163,8 +163,8 @@ select count(distinct a.watch_no) - from watch_device a - left join watch_bind_his b on a.watch_no = b.watch_no + from QH_WAT_DEVICE a + left join QH_WAT_BIND_HIS b on a.watch_no = b.watch_no where b.org_code LIKE concat(#{orgCode},'%') and a.org_code = (LEFT(b.org_code,6)) and a.bind_user_id is not null and a.bind_user_id != '' @@ -183,7 +183,7 @@ SELECT ROUND( AVG( total_minutes ) ) AS minutes, - ( SELECT COUNT(*) FROM watch_data_sleep_new_day WHERE sleep_id IN ( SELECT id FROM watch_data_sleep_new WHERE + ( SELECT COUNT(*) FROM QH_WAT_DATA_SLEEP_NEW_DAY WHERE sleep_id IN ( SELECT id FROM QH_WAT_DATA_SLEEP_NEW WHERE bind_user_id = #{id}) ) AS sum FROM ( SELECT ROUND((CAST(wake_up_time AS DATE) - CAST(fall_asleep_time AS DATE)) * 24 * 60) AS total_minutes - FROM watch_data_sleep_new_day - WHERE sleep_id IN ( SELECT id FROM watch_data_sleep_new WHERE bind_user_id = #{id}) ) subquery + FROM QH_WAT_DATA_SLEEP_NEW_DAY + WHERE sleep_id IN ( SELECT id FROM QH_WAT_DATA_SLEEP_NEW WHERE bind_user_id = #{id}) ) subquery 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 571a020..2e0ac36 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 @@ -7,7 +7,7 @@ bind_user_id, count( DISTINCT bind_user_id ) FROM - "watch_monitor_data" + "QH_WAT_MONITOR_DATA" and warn_time >= #{startTime} @@ -23,7 +23,7 @@ SELECT count(*) FROM - "watch_monitor_data" + "QH_WAT_MONITOR_DATA" and org_code like concat(#{orgCode},'%') @@ -59,7 +59,7 @@ SELECT * FROM - watch_monitor_data + QH_WAT_MONITOR_DATA @@ -75,7 +75,7 @@ SELECT * FROM - watch_monitor_data + QH_WAT_MONITOR_DATA bind_user_id in @@ -101,7 +101,7 @@ SELECT a.* FROM - watch_monitor_data a left join watch_device b on a.watch_no=b.watch_no and b.org_code = (LEFT(a.org_code, 6 )) + QH_WAT_MONITOR_DATA a left join QH_WAT_DEVICE b on a.watch_no=b.watch_no and b.org_code = (LEFT(a.org_code, 6 )) @@ -134,13 +134,13 @@ w.large_screen_flag, w.org_code FROM - watch_monitor_data w + QH_WAT_MONITOR_DATA w JOIN ( SELECT bind_user_id, MAX( warn_time ) AS latest_warn_time FROM - watch_monitor_data + QH_WAT_MONITOR_DATA WHERE event_type = #{req.eventType} AND warn_time BETWEEN #{req.startTime} @@ -162,7 +162,7 @@ select data_date as date, EXTRACT(YEAR FROM data_date) as year, EXTRACT(MONTH FROM data_date) as month, EXTRACT(DAY FROM data_date) as day, count(0) as count - from watch_monitor_data + from QH_WAT_MONITOR_DATA where TO_CHAR(data_date, 'YYYY-MM') = TO_CHAR(#{monthDate,jdbcType=DATE}, 'YYYY-MM') and @@ -210,7 +210,7 @@ SELECT * FROM - watch_monitor_data + QH_WAT_MONITOR_DATA WHERE lon_gd IS NOT NULL AND lat_gd IS NOT NULL 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 0768778..78286db 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 - watch_stat_user_info_day_heart_rate + QH_WAT_STA_US_DAY_HEA_RAT WHERE EXTRACT(YEAR FROM data_date) = #{dateYear} and @@ -28,7 +28,7 @@ min(min_value) as heartRateMin, avg(avg_value) as heartRateAvg from - watch_stat_user_info_day_heart_rate + QH_WAT_STA_US_DAY_HEA_RAT org_code like concat(#{#orgCode}, '%') @@ -43,7 +43,7 @@ SELECT COUNT(DISTINCT user_id) FROM - watch_stat_user_info_day_heart_rate + QH_WAT_STA_US_DAY_HEA_RAT org_code like concat(#{#orgCode}, '%') @@ -73,9 +73,9 @@ ELSE 0 END AS risk_count FROM - watch_stat_user_info_day_heart_rate a + QH_WAT_STA_US_DAY_HEA_RAT a LEFT JOIN - (SELECT DISTINCT bind_user_id FROM watch_monitor_data + (SELECT DISTINCT bind_user_id FROM QH_WAT_MONITOR_DATA WHERE warn_time BETWEEN TRUNC(SYSDATE) @@ -121,9 +121,9 @@ ELSE 0 END AS risk_count FROM - watch_stat_user_info_day_spo2 a + QH_WAT_STAT_USER_DAY_SPO2 a LEFT JOIN - (SELECT DISTINCT bind_user_id FROM watch_monitor_data + (SELECT DISTINCT bind_user_id FROM QH_WAT_MONITOR_DATA WHERE warn_time BETWEEN TRUNC(SYSDATE) @@ -168,9 +168,9 @@ ELSE 0 END AS risk_count FROM - watch_stat_user_info_day_stress a + QH_WAT_STAT_USER_DAY_STRE a LEFT JOIN - (SELECT DISTINCT bind_user_id FROM watch_monitor_data + (SELECT DISTINCT bind_user_id FROM QH_WAT_MONITOR_DATA WHERE warn_time BETWEEN TRUNC(SYSDATE) @@ -215,9 +215,9 @@ ELSE 0 END AS risk_count FROM - watch_stat_user_info_day_temp a + QH_WAT_STAT_USER_DAY_TEMP a LEFT JOIN - (SELECT DISTINCT bind_user_id FROM watch_monitor_data + (SELECT DISTINCT bind_user_id FROM QH_WAT_MONITOR_DATA WHERE warn_time BETWEEN TRUNC(SYSDATE) @@ -251,7 +251,7 @@ a.user_id, MAX(a.step_value) AS sdc_value FROM - watch_stat_user_info_day_sdc a + QH_WAT_STAT_USER_DAY_SDC a WHERE a.data_date BETWEEN @@ -278,7 +278,7 @@ AVG(COALESCE(light_sleep_times, 0)) AS avg_long_duration, SUM(COALESCE(light_sleep_times, 0)) + SUM(COALESCE(deep_sleep_times, 0)) AS sleep_duration FROM - watch_stat_user_info_day_sleep + QH_WAT_STAT_USER_DAY_SLE WHERE data_date BETWEEN @@ -301,10 +301,10 @@ SELECT wsd.* FROM - watch_stat_user_info_day_heart_rate wsd + QH_WAT_STA_US_DAY_HEA_RAT wsd JOIN ( SELECT user_id, MAX( data_date ) AS latest_date - FROM watch_stat_user_info_day_heart_rate + FROM QH_WAT_STA_US_DAY_HEA_RAT WHERE user_id in #{id} @@ -315,7 +315,7 @@ - INSERT INTO watch_stat_user_info_day_heart_rate ( 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_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 ) SELECT #{id,jdbcType=VARCHAR}, bind_user_id, @@ -336,7 +336,7 @@ t.*, ROW_NUMBER() OVER ( PARTITION BY bind_user_id, data_date ORDER BY time_stamp DESC ) AS rn FROM - watch_data_heart_rate t + QH_WAT_DATA_HEART_RATE t WHERE bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE} @@ -348,7 +348,7 @@ - MERGE INTO watch_stat_user_info_day_heart_rate stat + MERGE INTO QH_WAT_STA_US_DAY_HEA_RAT stat USING ( SELECT wd.bind_user_id, @@ -364,7 +364,7 @@ MAX( CASE WHEN wd.rn = 1 THEN wd.silence_value END ) AS silence_new_value FROM ( SELECT t.*, ROW_NUMBER() OVER ( PARTITION BY bind_user_id, data_date ORDER BY time_stamp DESC ) AS rn - FROM watch_data_heart_rate t + FROM QH_WAT_DATA_HEART_RATE t WHERE bind_user_id = #{userId,jdbcType=VARCHAR} AND data_date = #{dataDate,jdbcType=DATE} ) wd GROUP BY diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDaySdcMapper.xml b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDaySdcMapper.xml index 3c1263e..877beeb 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDaySdcMapper.xml +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDaySdcMapper.xml @@ -12,7 +12,7 @@ data_date as dataDate, TO_CHAR( data_date, 'MM' ) AS dateStr FROM - "watch_stat_user_info_day_sdc" + "QH_WAT_STAT_USER_DAY_SDC" WHERE EXTRACT(YEAR FROM data_date) = #{dateYear} and @@ -27,7 +27,7 @@ calorie_value as calorieValue, data_date as dataDate FROM - "watch_stat_user_info_day_sdc" + "QH_WAT_STAT_USER_DAY_SDC" WHERE EXTRACT(YEAR FROM data_date) = #{req.dateYear} and @@ -76,9 +76,9 @@ s.calorie_value, COALESCE(w.org_code, s.org_code) AS org_code FROM - watch_stat_user_info_day_workout AS w + QH_WAT_STAT_USER_DAY_WORK AS w LEFT JOIN - watch_stat_user_info_day_sdc AS s ON w.user_id = s.user_id AND w.data_date = s.data_date + QH_WAT_STAT_USER_DAY_SDC AS s ON w.user_id = s.user_id AND w.data_date = s.data_date AND (w.user_id IN @@ -127,9 +127,9 @@ s.calorie_value, COALESCE(s.org_code, w.org_code) AS org_code FROM - watch_stat_user_info_day_sdc AS s + QH_WAT_STAT_USER_DAY_SDC AS s LEFT JOIN - watch_stat_user_info_day_workout AS w ON s.user_id = w.user_id AND s.data_date = w.data_date + QH_WAT_STAT_USER_DAY_WORK AS w ON s.user_id = w.user_id AND s.data_date = w.data_date AND (s.user_id IN @@ -166,27 +166,27 @@ - insert into watch_stat_user_info_day_sdc(id, user_id, step_value, distance_value, calorie_value, last_upload_time, data_date, org_code) + insert into QH_WAT_STAT_USER_DAY_SDC(id, user_id, step_value, distance_value, calorie_value, last_upload_time, data_date, org_code) (select #{id,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, (select max(data_value) from (select data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id ORDER BY data_date desc) as rn - from watch_data_steps + from QH_WAT_DATA_STEPS where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) where rn = 1) as step_value, (select max(data_value) from (select data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id ORDER BY data_date desc) as rn - from watch_data_distance + from QH_WAT_DATA_DISTANCE where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) where rn = 1) as distance_value, (select max(data_value) from (select data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id ORDER BY data_date desc) as rn - from watch_data_calorie + from QH_WAT_DATA_CALORIE where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) where rn = 1) as calorie_value, @@ -197,25 +197,25 @@ - update watch_stat_user_info_day_sdc stat + update QH_WAT_STAT_USER_DAY_SDC stat set stat.step_value = (select max(data_value) from (select data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id ORDER BY data_date desc) as rn - from watch_data_steps + from QH_WAT_DATA_STEPS where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) where rn = 1), stat.distance_value = (select max(data_value) from (select data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id ORDER BY data_date desc) as rn - from watch_data_distance + from QH_WAT_DATA_DISTANCE where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) where rn = 1), stat.calorie_value = (select max(data_value) from (select data_value, data_date, ROW_NUMBER() OVER (PARTITION BY bind_user_id ORDER BY data_date desc) as rn - from watch_data_calorie + from QH_WAT_DATA_CALORIE where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) where rn = 1), diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDaySleepMapper.xml b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDaySleepMapper.xml index f24a7bf..a6d93d1 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDaySleepMapper.xml +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDaySleepMapper.xml @@ -18,7 +18,7 @@ data_date as dataDate, TO_CHAR( data_date, 'MM' ) AS dateStr FROM - "watch_stat_user_info_day_sleep" + "QH_WAT_STAT_USER_DAY_SLE" WHERE EXTRACT(YEAR FROM data_date) = #{dateYear} and @@ -29,7 +29,7 @@ @@ -37,7 +37,7 @@ SELECT COUNT(DISTINCT user_id) - FROM watch_stat_user_info_day_sleep + FROM QH_WAT_STAT_USER_DAY_SLE WHERE data_date BETWEEN #{startDate} AND #{endDate} AND user_id IS NOT NULL diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDaySpo2Mapper.xml b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDaySpo2Mapper.xml index dd1c3e7..5691860 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDaySpo2Mapper.xml +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDaySpo2Mapper.xml @@ -12,7 +12,7 @@ data_date as dataDate, TO_CHAR( data_date, 'MM' ) AS dateStr FROM - "watch_stat_user_info_day_spo2" + "QH_WAT_STAT_USER_DAY_SPO2" WHERE EXTRACT(YEAR FROM data_date) = #{dateYear} and @@ -23,7 +23,7 @@ SELECT COUNT(DISTINCT user_id) FROM - watch_stat_user_info_day_spo2 + QH_WAT_STAT_USER_DAY_SPO2 org_code like concat(#{#orgCode}, '%') @@ -38,7 +38,7 @@ - insert into watch_stat_user_info_day_spo2(id, user_id, max_value, min_value, avg_value, last_upload_time, + insert into QH_WAT_STAT_USER_DAY_SPO2(id, user_id, max_value, min_value, avg_value, last_upload_time, new_value, data_date, org_code) (SELECT #{id,jdbcType=VARCHAR}, bind_user_id, @@ -50,7 +50,7 @@ data_date, #{orgCode,jdbcType=VARCHAR} FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY bind_user_id, data_date ORDER BY time_stamp DESC ) AS rn - FROM watch_data_spo2 + FROM QH_WAT_DATA_SPO2 where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) wd GROUP BY wd.bind_user_id, @@ -59,34 +59,34 @@ - UPDATE watch_stat_user_info_day_spo2 stat + UPDATE QH_WAT_STAT_USER_DAY_SPO2 stat SET stat.max_value = (SELECT NVL(MAX(wd.data_value), 0) AS max_value FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY bind_user_id, data_date ORDER BY time_stamp DESC ) AS rn - FROM watch_data_spo2 + FROM QH_WAT_DATA_SPO2 where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) wd GROUP BY wd.bind_user_id, wd.data_date), stat.min_value = (SELECT NVL(MIN(wd.data_value), 0) AS min_value FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY bind_user_id, data_date ORDER BY time_stamp DESC ) AS rn - FROM watch_data_spo2 + FROM QH_WAT_DATA_SPO2 where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) wd GROUP BY wd.bind_user_id, wd.data_date), stat.avg_value = (SELECT NVL(AVG(wd.data_value), 0) AS avg_value FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY bind_user_id, data_date ORDER BY time_stamp DESC ) AS rn - FROM watch_data_spo2 + FROM QH_WAT_DATA_SPO2 where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) wd GROUP BY wd.bind_user_id, wd.data_date), stat.last_upload_time = (SELECT NVL(MAX(wd.time_stamp), TO_TIMESTAMP('1970-01-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS')) FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY bind_user_id, data_date ORDER BY time_stamp DESC ) AS rn - FROM watch_data_spo2 + FROM QH_WAT_DATA_SPO2 where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) wd GROUP BY wd.bind_user_id, wd.data_date), stat.new_value = (SELECT MAX(CASE WHEN wd.rn = 1 THEN wd.data_value END) FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY bind_user_id, data_date ORDER BY time_stamp DESC ) AS rn - FROM watch_data_spo2 + FROM QH_WAT_DATA_SPO2 where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) wd GROUP BY wd.bind_user_id, wd.data_date), diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDayStressMapper.xml b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDayStressMapper.xml index 25d182d..6c720bd 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDayStressMapper.xml +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDayStressMapper.xml @@ -12,7 +12,7 @@ data_date as dataDate, TO_CHAR( data_date, 'MM' ) AS dateStr FROM - "watch_stat_user_info_day_stress" + "QH_WAT_STAT_USER_DAY_STRE" WHERE EXTRACT(YEAR FROM data_date) = #{dateYear} and @@ -21,7 +21,7 @@ - insert into watch_stat_user_info_day_stress(id, user_id, max_value, min_value, avg_value, data_date, last_upload_time, new_value, org_code) + insert into QH_WAT_STAT_USER_DAY_STRE(id, user_id, max_value, min_value, avg_value, data_date, last_upload_time, new_value, org_code) ( SELECT #{id,jdbcType=VARCHAR}, @@ -34,7 +34,7 @@ MAX(CASE WHEN wd.rn = 1 THEN wd.data_value END), #{orgCode,jdbcType=VARCHAR} FROM - (SELECT *, ROW_NUMBER() OVER (PARTITION BY bind_user_id, data_date ORDER BY end_time_stamp DESC) AS rn FROM watch_data_stress + (SELECT *, ROW_NUMBER() OVER (PARTITION BY bind_user_id, data_date ORDER BY end_time_stamp DESC) AS rn FROM QH_WAT_DATA_STRESS where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) wd GROUP BY @@ -45,34 +45,34 @@ - UPDATE watch_stat_user_info_day_stress stat + UPDATE QH_WAT_STAT_USER_DAY_STRE stat SET stat.max_value = (SELECT NVL(MAX(wd.data_value), 0) FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY bind_user_id, data_date ORDER BY end_time_stamp DESC ) AS rn - FROM watch_data_stress + FROM QH_WAT_DATA_STRESS where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) wd GROUP BY wd.bind_user_id, wd.data_date), stat.min_value = (SELECT NVL(MIN(wd.data_value), 0) FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY bind_user_id, data_date ORDER BY end_time_stamp DESC ) AS rn - FROM watch_data_stress + FROM QH_WAT_DATA_STRESS where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) wd GROUP BY wd.bind_user_id, wd.data_date), stat.avg_value = (SELECT NVL(AVG(wd.data_value), 0) FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY bind_user_id, data_date ORDER BY end_time_stamp DESC ) AS rn - FROM watch_data_stress + FROM QH_WAT_DATA_STRESS where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) wd GROUP BY wd.bind_user_id, wd.data_date), stat.last_upload_time = (SELECT NVL(MAX(wd.end_time_stamp), SYSDATE) FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY bind_user_id, data_date ORDER BY end_time_stamp DESC ) AS rn - FROM watch_data_stress + FROM QH_WAT_DATA_STRESS where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) wd GROUP BY wd.bind_user_id, wd.data_date), stat.new_value = (SELECT MAX(CASE WHEN wd.rn = 1 THEN wd.data_value END) FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY bind_user_id, data_date ORDER BY end_time_stamp DESC ) AS rn - FROM watch_data_stress + FROM QH_WAT_DATA_STRESS where bind_user_id = #{userId,jdbcType=VARCHAR} and data_date = #{dataDate,jdbcType=DATE}) wd GROUP BY wd.bind_user_id, wd.data_date), diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDayTempMapper.xml b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDayTempMapper.xml index fb78450..5e9fbad 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDayTempMapper.xml +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDayTempMapper.xml @@ -16,7 +16,7 @@ data_date as dataDate, TO_CHAR( data_date, 'MM' ) AS dateStr FROM - watch_stat_user_info_day_temp + QH_WAT_STAT_USER_DAY_TEMP WHERE YEAR ( data_date )= #{dateYear} and @@ -28,7 +28,7 @@ SELECT bind_user_id AS bindUserId, watch_no AS watchNo FROM - watch_user_data + QH_WAT_USER_DATA where data_date >=#{start} and @@ -27,7 +27,7 @@ bind_user_id AS bindUserId, watch_no AS watchNo FROM - watch_user_data + QH_WAT_USER_DATA where data_date >=#{start} and @@ -46,7 +46,7 @@ @@ -54,14 +54,14 @@ select data_value dateValue, TO_CHAR(sdc_date, 'YYYY-MM-DD') sdcDate - from watch_data_distance + from QH_WAT_DATA_DISTANCE WHERE sdc_date BETWEEN #{date1} AND #{date2}