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

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数据库类型自动检测
+        // 调用父类的 initialize() 方法来初始化 JobRepository 等
-        // BasicBatchConfigurer.initialize()中DatabaseType.fromProductName()无法识别"DM DBMS"产品名
+        super.initialize();
-        // 保持父类默认隔离级别ISOLATION_SERIALIZABLE，DM8与此兼容
     }
 
     @Override

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 {
 

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);
         //修改绑定用户

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<WatchDataDistance> 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<WatchDataCalorie> 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<WatchDevice> 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());

jeecg-system/jeecg-system-start/pom.xml

@@ -50,7 +50,7 @@
                         <groupId>org.springframework.boot</groupId>
                         <artifactId>spring-boot-maven-plugin</artifactId>
                     </plugin>
-                    <plugin>
+                    <!--<plugin>
                         <groupId>com.google.cloud.tools</groupId>
                         <artifactId>jib-maven-plugin</artifactId>
                         <version>3.4.0</version>
@@ -87,7 +87,7 @@
                             </container>
 
                         </configuration>
-                    </plugin>
+                    </plugin>-->
                 </plugins>
             </build>
         </profile>

pom.xml

@@ -699,10 +699,10 @@
                     </nonFilteredFileExtensions>
                 </configuration>
             </plugin>
-            <plugin>
+            <!--<plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
-            </plugin>
+            </plugin>-->
         </plugins>
         <resources>
             <resource>