From 25a977a6408fe6ba20ddacf6f43bee2fe93eb17b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 05 Sep 2023 08:41:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
index f3d7cb4..b65ee17 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
@@ -8,6 +8,7 @@
import com.moral.api.service.DeviceService;
import com.moral.api.service.HistorySecondUavService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.SpecialDeviceService;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
@@ -35,7 +36,7 @@
private HistorySecondUavMapper historySecondUavMapper;
@Autowired
- private DeviceService deviceService;
+ private SpecialDeviceService specialDeviceService;
@Autowired
private RedisTemplate redisTemplate;
@@ -67,7 +68,7 @@
}).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
//������������
- data = deviceService.adjustSpecialDeviceData(data);
+ data = specialDeviceService.adjustSpecialDeviceData(data);
HistorySecondUav historySecondUav = new HistorySecondUav();
historySecondUav.setMac(mac);
--
Gitblit v1.8.0