From 642dac3e705380eea241648f875836e64dbc809e Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Thu, 18 May 2023 17:43:06 +0800
Subject: [PATCH] Merge branch 'v1.5.0' What's new? 1. Add new model: DJI Matrices 350 RTK. 2. Update file hms.json. 3. Fixed some issues.
---
src/main/java/com/dji/sample/manage/service/impl/DeviceDictionaryServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/service/impl/DeviceDictionaryServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/DeviceDictionaryServiceImpl.java
index 60da3d5..a4574b7 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/DeviceDictionaryServiceImpl.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/DeviceDictionaryServiceImpl.java
@@ -25,8 +25,7 @@
private IDeviceDictionaryMapper mapper;
@Override
- public Optional<DeviceDictionaryDTO> getOneDictionaryInfoByDomainTypeSubType(
- Integer domain, Integer deviceType, Integer subType) {
+ public Optional<DeviceDictionaryDTO> getOneDictionaryInfoByTypeSubType(Integer domain, Integer deviceType, Integer subType) {
if (domain == null || deviceType == null || subType == null) {
return Optional.empty();
}
@@ -36,7 +35,8 @@
new LambdaQueryWrapper<DeviceDictionaryEntity>()
.eq(DeviceDictionaryEntity::getDomain, domain)
.eq(DeviceDictionaryEntity::getDeviceType, deviceType)
- .eq(DeviceDictionaryEntity::getSubType, subType))));
+ .eq(DeviceDictionaryEntity::getSubType, subType)
+ .last(" limit 1 "))));
}
/**
--
Gitblit v1.9.3