From 8483b667f25b89faceabef4e28932d2c0b0eac15 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Mon, 28 Oct 2024 09:55:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/equipment/controller/SysIotModelController.java  | 5 ++++-
 .../das/modules/equipment/mapper/SysIotModelFieldMapper.java | 2 ++
 .../das/modules/equipment/service/SysIotModelService.java    | 2 ++
 .../equipment/service/impl/SysIotModelServiceImpl.java       | 5 +++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java b/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java
index ab1e7d6b..3120e0fc 100644
--- a/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java
+++ b/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java
@@ -93,7 +93,10 @@ public class SysIotModelController {
     /** 获取物模型属性列表 */
     @PostMapping("/attribute/list")
     public PageDataInfo<SysIotModelFieldVo> querySysIotModelField(@RequestBody SysIotModelFieldDto sysIotModelFieldDto) {
-
+        if (sysIotModelFieldDto.getPageNum() == null && sysIotModelFieldDto.getPageSize() == null){
+            List<SysIotModelFieldVo> sysIotModelFieldVos = sysIotModelService.queryAllModelField(sysIotModelFieldDto);
+            return new PageDataInfo<>(sysIotModelFieldVos,sysIotModelFieldVos.size());
+        }
         return sysIotModelService.querySysIotModelField(sysIotModelFieldDto);
     }
 
diff --git a/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelFieldMapper.java b/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelFieldMapper.java
index 4f68cadc..ba102696 100644
--- a/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelFieldMapper.java
+++ b/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelFieldMapper.java
@@ -18,6 +18,8 @@ public interface SysIotModelFieldMapper extends BaseMapperPlus<SysIotModelField,
 
     Long querySysIotModelFieldByModelId(Long id);
 
+    List<SysIotModelFieldVo> querySysIotModelFieldList(@Param("info") SysIotModelFieldDto sysIotModelFieldDto);
+
     SysIotModelFieldVo selectByAttributeCode(Long iotModelId, String code);
 
     List<String> queryAllFiledNames(@Param("deviceId") Long deviceId);
diff --git a/das/src/main/java/com/das/modules/equipment/service/SysIotModelService.java b/das/src/main/java/com/das/modules/equipment/service/SysIotModelService.java
index ba0bf875..480385c9 100644
--- a/das/src/main/java/com/das/modules/equipment/service/SysIotModelService.java
+++ b/das/src/main/java/com/das/modules/equipment/service/SysIotModelService.java
@@ -25,6 +25,8 @@ public interface SysIotModelService {
 
     PageDataInfo<SysIotModelFieldVo> querySysIotModelField(SysIotModelFieldDto sysIotModelFieldDto);
 
+    List<SysIotModelFieldVo> queryAllModelField(SysIotModelFieldDto sysIotModelFieldDto);
+
     SysIotModelFieldVo creatSysIotModelField(SysIotModelFieldDto sysIotModelFieldDto);
 
     SysIotModelFieldVo updateSysIotModelField(SysIotModelFieldDto sysIotModelFieldDto);
diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
index b0b65162..29ef4447 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
@@ -144,6 +144,11 @@ public class SysIotModelServiceImpl implements SysIotModelService {
         return PageDataInfo.build(iPage.getRecords(), iPage.getTotal());
     }
 
+    @Override
+    public List<SysIotModelFieldVo> queryAllModelField(SysIotModelFieldDto sysIotModelFieldDto) {
+        return sysIotModelFieldMapper.querySysIotModelFieldList(sysIotModelFieldDto);
+    }
+
     @Override
     public SysIotModelFieldVo creatSysIotModelField(SysIotModelFieldDto sysIotModelFieldDto) {
         SysIotModelField sysIotModelField = new SysIotModelField();