From 2c9d1d87812ba18c82012c86aeb73f91fbae4524 Mon Sep 17 00:00:00 2001 From: lianlonggang Date: Tue, 17 Mar 2026 17:35:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E6=9A=82=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=9A=84=E6=89=93=E5=8C=85=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecg-system/jeecg-system-start/pom.xml | 4 ++-- pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jeecg-system/jeecg-system-start/pom.xml b/jeecg-system/jeecg-system-start/pom.xml index c1f2934..d0f5f37 100644 --- a/jeecg-system/jeecg-system-start/pom.xml +++ b/jeecg-system/jeecg-system-start/pom.xml @@ -50,7 +50,7 @@ org.springframework.boot spring-boot-maven-plugin - + diff --git a/pom.xml b/pom.xml index 9b06e87..625553b 100644 --- a/pom.xml +++ b/pom.xml @@ -699,10 +699,10 @@ - + From 7d3ee66a4bbff1f0f2e71a19e9dfc8b00783ff69 Mon Sep 17 00:00:00 2001 From: lianlonggang Date: Tue, 17 Mar 2026 18:55:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=83=A8=E5=88=86=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/renkang/batch/configure/CustomBatchConfigurer.java | 5 ++--- .../java/com/renkang/HealthConsultationCloudApplication.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/functional-modules/renkang-starter-batch/src/main/java/com/renkang/batch/configure/CustomBatchConfigurer.java b/functional-modules/renkang-starter-batch/src/main/java/com/renkang/batch/configure/CustomBatchConfigurer.java index af9867c..1b5519f 100644 --- a/functional-modules/renkang-starter-batch/src/main/java/com/renkang/batch/configure/CustomBatchConfigurer.java +++ b/functional-modules/renkang-starter-batch/src/main/java/com/renkang/batch/configure/CustomBatchConfigurer.java @@ -36,9 +36,8 @@ public class CustomBatchConfigurer extends BasicBatchConfigurer { @Override public void initialize() { - // 达梦数据库兼容处理：跳过Spring Batch数据库类型自动检测 - // BasicBatchConfigurer.initialize()中DatabaseType.fromProductName()无法识别"DM DBMS"产品名 - // 保持父类默认隔离级别ISOLATION_SERIALIZABLE，DM8与此兼容 + // 调用父类的 initialize() 方法来初始化 JobRepository 等 + super.initialize(); } @Override diff --git a/health-consultation/health-consultation-start/src/main/java/com/renkang/HealthConsultationCloudApplication.java b/health-consultation/health-consultation-start/src/main/java/com/renkang/HealthConsultationCloudApplication.java index af7278c..13c55c0 100644 --- a/health-consultation/health-consultation-start/src/main/java/com/renkang/HealthConsultationCloudApplication.java +++ b/health-consultation/health-consultation-start/src/main/java/com/renkang/HealthConsultationCloudApplication.java @@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration; import org.springframework.cloud.openfeign.EnableFeignClients; -@SpringBootApplication(scanBasePackages = {"com.renkang", "org.jeecg"},exclude = QuartzAutoConfiguration .class) +@SpringBootApplication(scanBasePackages = {"com.renkang", "org.jeecg"},exclude = QuartzAutoConfiguration.class) @EnableFeignClients(basePackages = {"com.renkang", "org.jeecg"}) public class HealthConsultationCloudApplication { From 961dc7c1040fe7b52667c0e5a866a49578063ee4 Mon Sep 17 00:00:00 2001 From: hejiayang <296714699@qq.com> Date: Wed, 18 Mar 2026 13:49:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(watch-job):=20=E7=A9=BA=E5=80=BC?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86:=20=E5=9C=A8SyncUserStatJo?= =?UTF-8?q?b=E4=B8=AD=E6=B7=BB=E5=8A=A0=E7=A9=BA=E5=80=BC=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=20=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A7=84=E8=8C=83:=20"l?= =?UTF-8?q?imit=201"=E6=9B=BF=E6=8D=A2=E4=B8=BA"FETCH=20FIRST=201=20ROWS?= =?UTF-8?q?=20ONLY"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../renkang/watch/async/AsyncImportService.java | 2 +- .../com/renkang/watch/task/SyncUserStatJob.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/async/AsyncImportService.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/async/AsyncImportService.java index 9a45c05..41a3ce4 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/async/AsyncImportService.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/async/AsyncImportService.java @@ -613,7 +613,7 @@ public class AsyncImportService { queryWrapper.eq(WatchBindHis::getWatchNo,device.getWatchNo()); queryWrapper.isNull(WatchBindHis::getBindEndDate); queryWrapper.orderByDesc(WatchBindHis::getCreateDate); - queryWrapper.last("limit 1"); + queryWrapper.last("FETCH FIRST 1 ROWS ONLY"); //解绑 WatchBindHis updateHis = watchBindHisMapper.selectOne(queryWrapper); //修改绑定用户 diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/task/SyncUserStatJob.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/task/SyncUserStatJob.java index 3263651..92f85d5 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/task/SyncUserStatJob.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/task/SyncUserStatJob.java @@ -251,7 +251,7 @@ public class SyncUserStatJob { .isNotNull(WatchDataStepsHf::getStepCount) .gt(WatchDataStepsHf::getStepCount, 0) .orderByDesc(WatchDataStepsHf::getStepCount) - .last("limit 1"); + .last("FETCH FIRST 1 ROWS ONLY"); WatchDataStepsHf latest = watchDataStepsHfServiceService.getOne(queryWrapper); if (ObjectUtil.isNull(latest)) { return; @@ -306,21 +306,21 @@ public class SyncUserStatJob { queryWrapper.isNotNull(WatchDataSteps::getDataValue); queryWrapper.gt(WatchDataSteps::getDataValue, 0); queryWrapper.orderByDesc(WatchDataSteps::getMaxId); - queryWrapper.last("limit 1"); + queryWrapper.last("FETCH FIRST 1 ROWS ONLY"); WatchDataSteps list = watchDataStepsService.getOne(queryWrapper); LambdaQueryWrapper watchDataDistanceQueryWrapper = getQueryWrapper(userId, dateStr); watchDataDistanceQueryWrapper.gt(WatchDataDistance::getDataValue, 0); watchDataDistanceQueryWrapper.isNotNull(WatchDataDistance::getDataValue); watchDataDistanceQueryWrapper.orderByDesc(WatchDataDistance::getMaxId); - watchDataDistanceQueryWrapper.last("limit 1"); + watchDataDistanceQueryWrapper.last("FETCH FIRST 1 ROWS ONLY"); WatchDataDistance watchDataDistanceList = watchDataDistanceService.getOne(watchDataDistanceQueryWrapper); LambdaQueryWrapper watchDataCalorieQueryWrapper = getQueryWrapper(userId, dateStr); watchDataCalorieQueryWrapper.gt(WatchDataCalorie::getDataValue, 0); watchDataCalorieQueryWrapper.isNotNull(WatchDataCalorie::getDataValue); watchDataCalorieQueryWrapper.orderByDesc(WatchDataCalorie::getMaxId); - watchDataCalorieQueryWrapper.last("limit 1"); + watchDataCalorieQueryWrapper.last("FETCH FIRST 1 ROWS ONLY"); WatchDataCalorie watchDataCalorieList = watchDataCalorieService.getOne(watchDataCalorieQueryWrapper); if (ObjectUtil.isNull(list) && ObjectUtil.isNull(watchDataDistanceList) && ObjectUtil.isNull(watchDataCalorieList)) { @@ -833,7 +833,9 @@ public class SyncUserStatJob { rate.setSilenceMinValue((int) silenceMin); rate.setSilenceAvgValue((int) silenceSize); rate.setNewValue(currentDataValue.intValue()); - rate.setSilenceNewValue(watchDataHeartRate.getSilenceValue().intValue()); + if(watchDataHeartRate.getSilenceValue() != null){ + rate.setSilenceNewValue(watchDataHeartRate.getSilenceValue().intValue()); + } rate.setLastUploadTime(watchDataHeartRate.getTimeStamp()); SyncUserStatJob bean = SpringContextUtils.getBean(SyncUserStatJob.class); @@ -928,7 +930,7 @@ public class SyncUserStatJob { LambdaQueryWrapper deviceWrapper = new LambdaQueryWrapper<>(); deviceWrapper.eq(WatchDevice::getBindUserId, user.getId()); deviceWrapper.orderByDesc(WatchDevice::getBindDate); - deviceWrapper.last("limit 1"); + deviceWrapper.last("FETCH FIRST 1 ROWS ONLY"); WatchDevice watchDevice = watchDeviceMapper.selectOne(deviceWrapper); if (watchDevice != null) { watchData.setWatchNo(watchDevice.getWatchNo());