From 069e64d2c1fee0202dbd5956d57c502397b641c2 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Tue, 10 Sep 2024 08:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=A0=87=E9=9B=86=E5=90=88=202024?=
 =?UTF-8?q?=E5=B9=B49=E6=9C=8810=E6=97=A508:47:453?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/IotThingDictRelationController.java        | 2 +-
 .../dictRelation/service/IotThingDictRelationService.java | 2 +-
 .../service/impl/IotThingDictRelationServiceImpl.java     | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/thing/src/main/java/com/thing/thing/dictRelation/controller/IotThingDictRelationController.java b/modules/thing/src/main/java/com/thing/thing/dictRelation/controller/IotThingDictRelationController.java
index b41cede..a9e2709 100644
--- a/modules/thing/src/main/java/com/thing/thing/dictRelation/controller/IotThingDictRelationController.java
+++ b/modules/thing/src/main/java/com/thing/thing/dictRelation/controller/IotThingDictRelationController.java
@@ -110,7 +110,7 @@ public class IotThingDictRelationController {
 
     @PostMapping("ids")
     @Operation(summary="信息")
-    public Result<IotThingDictRelationDTO> get(@RequestBody List<Long> ids){
+    public Result<IotThingDictRelationDTO> get(@RequestBody List<String> ids){
         IotThingDictRelationDTO data = service.findByIds(ids);
         return new Result<IotThingDictRelationDTO>().ok(data);
     }
diff --git a/modules/thing/src/main/java/com/thing/thing/dictRelation/service/IotThingDictRelationService.java b/modules/thing/src/main/java/com/thing/thing/dictRelation/service/IotThingDictRelationService.java
index c87490f..66adda8 100644
--- a/modules/thing/src/main/java/com/thing/thing/dictRelation/service/IotThingDictRelationService.java
+++ b/modules/thing/src/main/java/com/thing/thing/dictRelation/service/IotThingDictRelationService.java
@@ -41,7 +41,7 @@ public interface IotThingDictRelationService extends IBaseService<IotThingDictRe
 
     IotThingDictRelationDTO findById(Long id);
 
-    IotThingDictRelationDTO findByIds(List<Long> ids);
+    IotThingDictRelationDTO findByIds(List<String> ids);
 
     List<IotThingDictRelationDTO> findAllByEntityIdAndCodes(Long entityId, Collection<String> codes);
     /** 注意 多个物 有相同的属性code **/
diff --git a/modules/thing/src/main/java/com/thing/thing/dictRelation/service/impl/IotThingDictRelationServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/dictRelation/service/impl/IotThingDictRelationServiceImpl.java
index 8c07e92..c273b73 100644
--- a/modules/thing/src/main/java/com/thing/thing/dictRelation/service/impl/IotThingDictRelationServiceImpl.java
+++ b/modules/thing/src/main/java/com/thing/thing/dictRelation/service/impl/IotThingDictRelationServiceImpl.java
@@ -246,8 +246,12 @@ public class IotThingDictRelationServiceImpl extends BaseServiceImpl<IotThingDic
     }
 
     @Override
-    public IotThingDictRelationDTO findByIds(List<Long> ids) {
-        return mapper.selectOneByQueryAs(new QueryWrapper().in(IotThingDictRelationEntity::getId, ids), IotThingDictRelationDTO.class);
+    public IotThingDictRelationDTO findByIds(List<String> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            throw new SysException("参数不能为空");
+        }
+        List<Long> idList = ids.stream().map(Long::valueOf).toList();
+        return mapper.selectOneByQueryAs(new QueryWrapper().in(IotThingDictRelationEntity::getId, idList), IotThingDictRelationDTO.class);
     }
 
     @Override