renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'xc' of https://gitea.rk-health.com/renkang/xj-platform into xc

Browse Source
This commit is contained in:
wanghao
2026-03-19 14:34:08 +08:00
parent 96e82801e0 2214aee8b4
commit a975e9d223
10 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/xcsql/watch.sql
+1 -1
View File
@@ -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_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_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_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_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_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_SPO2" RENAME TO "QH_WAT_STAT_USER_DAY_SPO2";
health-watch/health-watch-api/src/main/java/com/renkang/watch/entity/WatchStatUserInfoDayHeartRate.java
+1 -1
View File
@@ -21,7 +21,7 @@ import java.util.Date;
* @Version: V1.0 * @Version: V1.0
*/ */
@Data @Data
@TableName("QH_WAT_STA_US_DAY_HEA_RAT") @TableName("QH_WAT_STAT_USER_DAY_HR")
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Schema(title = "watch_stat_user_info_day_heart_rate对象", description = "watch_stat_user_info_day_heart_rate") @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
+1 -1
View File
@@ -15,7 +15,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* @Description: QH_WAT_STA_US_DAY_HEA_RAT * @Description: QH_WAT_STAT_USER_DAY_HR
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2023-11-06 * @Date: 2023-11-06
* @Version: V1.0 * @Version: V1.0
health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/DeptStatisticDataMapper.xml
+1 -1
View File
@@ -8,7 +8,7 @@
SELECT SELECT
COUNT(DISTINCT user_id) c COUNT(DISTINCT user_id) c
FROM FROM
QH_WAT_STA_US_DAY_HEA_RAT QH_WAT_STAT_USER_DAY_HR
<where> <where>
org_code like concat(#{orgCode},'%') org_code like concat(#{orgCode},'%')
health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDataMapper.xml
+1 -1
View File
@@ -63,7 +63,7 @@
from from
<if test="type==1"> <if test="type==1">
QH_WAT_STA_US_DAY_HEA_RAT QH_WAT_STAT_USER_DAY_HR
</if> </if>
<if test="type==2"> <if test="type==2">
QH_WAT_STAT_USER_DAY_SPO2 QH_WAT_STAT_USER_DAY_SPO2
health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchDeviceMapper.xml
+4 -4
View File
@@ -260,10 +260,10 @@
<!-- 心率数据 --> <!-- 心率数据 -->
LEFT JOIN ( LEFT JOIN (
SELECT h1.* SELECT h1.*
FROM QH_WAT_STA_US_DAY_HEA_RAT h1 FROM QH_WAT_STAT_USER_DAY_HR h1
INNER JOIN ( INNER JOIN (
SELECT user_id, MAX(last_upload_time) AS max_time 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 WHERE user_id IN
<foreach item="userId" collection="userIdList" open="(" separator="," close=")"> <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
#{userId} #{userId}
@@ -449,10 +449,10 @@
<!-- 心率数据 --> <!-- 心率数据 -->
LEFT JOIN ( LEFT JOIN (
SELECT h1.* SELECT h1.*
FROM QH_WAT_STA_US_DAY_HEA_RAT h1 FROM QH_WAT_STAT_USER_DAY_HR h1
INNER JOIN ( INNER JOIN (
SELECT user_id, MAX(last_upload_time) AS max_time 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 WHERE user_id IN
<foreach item="userId" collection="userIdList" open="(" separator="," close=")"> <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
#{userId} #{userId}
health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchMonitorDataMapper.xml
+1 -1
View File
@@ -215,6 +215,6 @@
lon_gd IS NOT NULL lon_gd IS NOT NULL
AND lat_gd IS NOT NULL AND lat_gd IS NOT NULL
AND NVL(address_gd, '') = '' AND NVL(address_gd, '') = ''
WHERE ROWNUM &lt;= 100 and ROWNUM &lt;= 100
</select> </select>
</mapper> </mapper>
health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchStatUserInfoDayHeartRateMapper.xml
+8 -8
View File
@@ -15,7 +15,7 @@
data_date as dataDate, data_date as dataDate,
TO_CHAR( data_date, 'MM' ) AS dateStr TO_CHAR( data_date, 'MM' ) AS dateStr
FROM FROM
QH_WAT_STA_US_DAY_HEA_RAT QH_WAT_STAT_USER_DAY_HR
WHERE WHERE
EXTRACT(YEAR FROM data_date) = EXTRACT(YEAR FROM #{dateYear}) EXTRACT(YEAR FROM data_date) = EXTRACT(YEAR FROM #{dateYear})
and and
@@ -28,7 +28,7 @@
min(min_value) as heartRateMin, min(min_value) as heartRateMin,
avg(avg_value) as heartRateAvg avg(avg_value) as heartRateAvg
from from
QH_WAT_STA_US_DAY_HEA_RAT QH_WAT_STAT_USER_DAY_HR
<where> <where>
org_code like concat(#{#orgCode}, '%') org_code like concat(#{#orgCode}, '%')
<if test="startTime!=null"> <if test="startTime!=null">
@@ -43,7 +43,7 @@
SELECT SELECT
COUNT(DISTINCT user_id) COUNT(DISTINCT user_id)
FROM FROM
QH_WAT_STA_US_DAY_HEA_RAT QH_WAT_STAT_USER_DAY_HR
<where> <where>
org_code like concat(#{#orgCode}, '%') org_code like concat(#{#orgCode}, '%')
<if test="startTime!=null"> <if test="startTime!=null">
@@ -73,7 +73,7 @@
ELSE 0 ELSE 0
END AS risk_count END AS risk_count
FROM FROM
QH_WAT_STA_US_DAY_HEA_RAT a QH_WAT_STAT_USER_DAY_HR a
LEFT JOIN LEFT JOIN
(SELECT DISTINCT bind_user_id FROM QH_WAT_MONITOR_DATA (SELECT DISTINCT bind_user_id FROM QH_WAT_MONITOR_DATA
WHERE warn_time BETWEEN WHERE warn_time BETWEEN
@@ -301,10 +301,10 @@
SELECT SELECT
wsd.* wsd.*
FROM FROM
QH_WAT_STA_US_DAY_HEA_RAT wsd QH_WAT_STAT_USER_DAY_HR wsd
JOIN JOIN
( SELECT user_id, MAX( data_date ) AS latest_date ( 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 WHERE user_id in
<foreach collection="userIds" item="id" open="(" separator="," close=")"> <foreach collection="userIds" item="id" open="(" separator="," close=")">
#{id} #{id}
@@ -315,7 +315,7 @@
</select> </select>
<insert id="insertStat"> <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 SELECT
#{id,jdbcType=VARCHAR}, #{id,jdbcType=VARCHAR},
bind_user_id, bind_user_id,
@@ -348,7 +348,7 @@
<!-- MySQL 的 UPDATE ... LEFT JOIN ... SET 语法已改写为达梦兼容的 MERGE INTO --> <!-- MySQL 的 UPDATE ... LEFT JOIN ... SET 语法已改写为达梦兼容的 MERGE INTO -->
<update id="updateStat"> <update id="updateStat">
MERGE INTO QH_WAT_STA_US_DAY_HEA_RAT stat MERGE INTO QH_WAT_STAT_USER_DAY_HR stat
USING ( USING (
SELECT SELECT
wd.bind_user_id, wd.bind_user_id,
health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/WatchUserDataMapper.xml
+1 -1
View File
@@ -100,7 +100,7 @@
</select> </select>
<select id="getUserDataByWeekly" resultType="java.util.Map"> <select id="getUserDataByWeekly" resultType="java.util.Map">
SELECT 'heart_rate' AS "metric", AVG(avg_value) AS "value" 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} WHERE org_code LIKE CONCAT(#{orgCode}, '%') AND data_date BETWEEN #{monday} AND #{sunday}
UNION ALL UNION ALL
SELECT 'spo2' AS "metric", AVG(avg_value) AS "value" SELECT 'spo2' AS "metric", AVG(avg_value) AS "value"
health-watch/health-watch-biz/src/main/java/com/renkang/watch/task/DepartSyncTask.java
+12 -12
View File
@@ -15,9 +15,9 @@ public class DepartSyncTask {
@Autowired @Autowired
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
@Value("${renkang.db.watch:cqyt_watch_prod}") @Value("${renkang.db.watch:XJ_WATCH}")
private String watchDb; private String watchDb;
@Value("${renkang.db.system:cqyt_system_prod}") @Value("${renkang.db.system:XJ_SYSTEM}")
private String systemDb; private String systemDb;
@XxlJob(value = "sync-data-orgCode") @XxlJob(value = "sync-data-orgCode")
@@ -39,16 +39,16 @@ public class DepartSyncTask {
} }
private interface SqlTemplate { 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_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.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_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.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_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.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_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.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_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.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_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.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_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.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_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.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_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.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_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;";
} }
} }