Merge remote-tracking branch 'origin/mqy20260511'

iot-platform/src/main/java/com/iot/platform/task/VehicleSyncTask.java

@@ -343,40 +343,40 @@ public class VehicleSyncTask {
      * 更新指标信息
      * 根据公司去查询
      */
-    @Scheduled(fixedDelay = 30000)
-    public void insertIndicators() {
-        String lockKey = "lock:vehicle-sync:insertIndicators";
-        if (!tryLock(lockKey, 60)) {
-            log.debug("获取锁失败，跳过本次执行: {}", lockKey);
-            return;
-        }
-        try {
-            doInsertIndicators();
-        } finally {
-            unlock(lockKey);
-        }
-    }
+//    @Scheduled(fixedDelay = 30000)
+//    public void insertIndicators() {
+//        String lockKey = "lock:vehicle-sync:insertIndicators";
+//        if (!tryLock(lockKey, 60)) {
+//            log.debug("获取锁失败，跳过本次执行: {}", lockKey);
+//            return;
+//        }
+//        try {
+//            doInsertIndicators();
+//        } finally {
+//            unlock(lockKey);
+//        }
+//    }
 
-    private void doInsertIndicators() {
-        try {
-            LocalDate today = LocalDate.now();
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            String day = today.format(formatter);
-            List<SysCompany> sysCompanyList = sysCompanyService.selectcompany();
-            for (SysCompany sysCompany : sysCompanyList) {
-                Integer countworkorder = sysWorkorderService.selectworkordercount(sysCompany.getCompanyId(), day);
-                Double countprofit = sysWorkorderService.selectwokroderprofit(sysCompany.getCompanyId(), day);
-                Integer count = sysIndicatorsService.selectcarcount(sysCompany.getCompanyId(), day);
-                if (count <= 0) {
-                    sysIndicatorsService.insertindicators(countworkorder, countprofit, sysCompany.getCompanyId(), day);
-                } else {
-                    sysIndicatorsService.updateindicators(countworkorder, countprofit, sysCompany.getCompanyId(), day);
-                }
-            }
-        } catch (DataAccessException e) {
-            log.error("数据库操作失败: {}", e.getMessage(), e);
-        } catch (Exception e) {
-            log.error("更新指标信息失败: {}", e.getMessage(), e);
-        }
-    }
+//    private void doInsertIndicators() {
+//        try {
+//            LocalDate today = LocalDate.now();
+//            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//            String day = today.format(formatter);
+//            List<SysCompany> sysCompanyList = sysCompanyService.selectcompany();
+//            for (SysCompany sysCompany : sysCompanyList) {
+//                Integer countworkorder = sysWorkorderService.selectworkordercount(sysCompany.getCompanyId(), day);
+//                Double countprofit = sysWorkorderService.selectwokroderprofit(sysCompany.getCompanyId(), day);
+//                Integer count = sysIndicatorsService.selectcarcount(sysCompany.getCompanyId(), day);
+//                if (count <= 0) {
+//                    sysIndicatorsService.insertindicators(countworkorder, countprofit, sysCompany.getCompanyId(), day);
+//                } else {
+//                    sysIndicatorsService.updateindicators(countworkorder, countprofit, sysCompany.getCompanyId(), day);
+//                }
+//            }
+//        } catch (DataAccessException e) {
+//            log.error("数据库操作失败: {}", e.getMessage(), e);
+//        } catch (Exception e) {
+//            log.error("更新指标信息失败: {}", e.getMessage(), e);
+//        }
+//    }
 }

iot-platform/src/test/java/com/iot/platform/task/VehicleSyncTaskTest.java

@@ -181,17 +181,17 @@ class VehicleSyncTaskTest {
         verify(sysrealtimeService, never()).createrealtime(anyString());
     }
 
-    @Test
-    @DisplayName("insertIndicators: 公司列表为空时不应抛异常")
-    void insertIndicators_emptyCompanyList_noException() {
-        when(valueOps.setIfAbsent(anyString(), eq("1"), anyLong(), any())).thenReturn(true);
-        when(sysCompanyService.selectcompany()).thenReturn(Collections.emptyList());
-        when(stringRedisTemplate.delete(anyString())).thenReturn(true);
-
-        task.insertIndicators();
-
-        verify(sysWorkorderService, never()).selectworkordercount(anyString(), anyString());
-    }
+//    @Test
+//    @DisplayName("insertIndicators: 公司列表为空时不应抛异常")
+//    void insertIndicators_emptyCompanyList_noException() {
+//        when(valueOps.setIfAbsent(anyString(), eq("1"), anyLong(), any())).thenReturn(true);
+//        when(sysCompanyService.selectcompany()).thenReturn(Collections.emptyList());
+//        when(stringRedisTemplate.delete(anyString())).thenReturn(true);
+//
+//        task.insertIndicators();
+//
+//        verify(sysWorkorderService, never()).selectworkordercount(anyString(), anyString());
+//    }
 
     @Test
     @DisplayName("webhook 调用失败时不应中断主流程")