4 коммитов

Автор SHA1 Сообщение Дата
  lenovo 0c93311599 Merge remote-tracking branch 'origin/mqy20260511' into mqy20260511 4 дней назад
  lenovo 1518869329 Merge remote-tracking branch 'origin/master' into mqy20260511 4 дней назад
  humanleft a8d4903d34 fix: add @Qualifier to TDengineService constructor for explicit bean wiring 4 дней назад
  lenovo e03f53003c docs: update CLAUDE.md with security, MQTT, and lock improvements 4 дней назад

+ 1
- 1
iot-platform/pom.xml Просмотреть файл

@@ -195,4 +195,4 @@
195 195
         </plugins>
196 196
         <finalName>${project.artifactId}</finalName>
197 197
     </build>
198
-</project>
198
+</project>

+ 3
- 1
iot-platform/src/main/java/com/iot/platform/service/TDengineService.java Просмотреть файл

@@ -6,6 +6,7 @@ import com.zaxxer.hikari.HikariDataSource;
6 6
 import org.slf4j.Logger;
7 7
 import org.slf4j.LoggerFactory;
8 8
 import org.springframework.beans.factory.annotation.Autowired;
9
+import org.springframework.beans.factory.annotation.Qualifier;
9 10
 import org.springframework.stereotype.Service;
10 11
 
11 12
 import java.io.ByteArrayOutputStream;
@@ -24,7 +25,8 @@ public class TDengineService {
24 25
     private final ExecutorService batchExecutor;
25 26
 
26 27
     @Autowired
27
-    public TDengineService(ExecutorService tdengineBatchExecutor, IotProperties iotProperties) {
28
+    public TDengineService(@Qualifier("tdengineBatchExecutor") ExecutorService tdengineBatchExecutor,
29
+                           IotProperties iotProperties) {
28 30
         this.batchExecutor = tdengineBatchExecutor;
29 31
         this.iotProperties = iotProperties;
30 32
     }

+ 1
- 13
iot-platform/src/test/java/com/iot/platform/task/VehicleSyncTaskTest.java Просмотреть файл

@@ -46,8 +46,7 @@ class VehicleSyncTaskTest {
46 46
     private SysWorkorderService sysWorkorderService;
47 47
     @Mock
48 48
     private SysIndicatorsService sysIndicatorsService;
49
-    @Mock
50
-    private SysCompanyService sysCompanyService;
49
+
51 50
     @Mock
52 51
     private RestTemplate restTemplate;
53 52
     @Mock
@@ -181,17 +180,6 @@ class VehicleSyncTaskTest {
181 180
         verify(sysrealtimeService, never()).createrealtime(anyString());
182 181
     }
183 182
 
184
-//    @Test
185
-//    @DisplayName("insertIndicators: 公司列表为空时不应抛异常")
186
-//    void insertIndicators_emptyCompanyList_noException() {
187
-//        when(valueOps.setIfAbsent(anyString(), eq("1"), anyLong(), any())).thenReturn(true);
188
-//        when(sysCompanyService.selectcompany()).thenReturn(Collections.emptyList());
189
-//        when(stringRedisTemplate.delete(anyString())).thenReturn(true);
190
-//
191
-//        task.insertIndicators();
192
-//
193
-//        verify(sysWorkorderService, never()).selectworkordercount(anyString(), anyString());
194
-//    }
195 183
 
196 184
     @Test
197 185
     @DisplayName("webhook 调用失败时不应中断主流程")

Загрузка…
Отмена
Сохранить