From 7fbd133ab899bd33b787309cd9369be82ccb02f7 Mon Sep 17 00:00:00 2001
From: yu <tianyu414x@126.com>
Date: Mon, 28 Oct 2024 10:56:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=89=A9=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9;=20?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EquipmentController.java       |  3 ++
 .../service/impl/SysEquipmentServiceImpl.java |  8 +++--
 .../mapper/SysIotModelFieldMapper.xml         |  4 +++
 docs/api/equipment.md                         | 29 ++++++++++++-------
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java b/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java
index 6dc7e755..4373ec1a 100644
--- a/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java
+++ b/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java
@@ -109,6 +109,9 @@ public class EquipmentController {
      */
     @PostMapping("/list")
     public  R<List<SysEquipmentVo>> queryAllSysEquipmentList(@RequestBody SysEquipmentDto sysEquipmentDto) {
+        if (sysEquipmentDto.getObjectType() == null) {
+            throw new ServiceException("参数缺失");
+        }
         return R.success(sysEquipmentService.queryAllSysEquipmentList(sysEquipmentDto));
     }
 
diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
index 159eb70a..ba97840b 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
@@ -125,8 +125,12 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
     public List<SysEquipmentVo> queryAllSysEquipmentList(SysEquipmentDto sysEquipmentDto) {
         // 查询当前账号机构下的子机构和子设备
         QueryWrapper<SysEquipment> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("org_id", sysEquipmentDto.getOrgId());
-        queryWrapper.eq("parent_equipment_id", sysEquipmentDto.getParentEquipmentId());
+        if (sysEquipmentDto.getOrgId() !=null){
+            queryWrapper.eq("org_id", sysEquipmentDto.getOrgId());
+        }
+        if (sysEquipmentDto.getParentEquipmentId() !=null){
+            queryWrapper.eq("parent_equipment_id", sysEquipmentDto.getParentEquipmentId());
+        }
         queryWrapper.eq("object_type", sysEquipmentDto.getObjectType());
         queryWrapper.orderByAsc("name");
         List<SysEquipment> sysEquipmentList = sysEquipmentMapper.selectList(queryWrapper);
diff --git a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
index 8c16429c..48f0a0d4 100644
--- a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
+++ b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
@@ -28,6 +28,10 @@
             <if test="info.orderColumn != null and info.orderType != ''">
                 order by ${info.orderColumn}  ${info.orderType}
             </if>
+            <if test="info.attributeType != null and info.attributeType != ''">
+                and t.attribute_type = #{info.attributeType}
+            </if>
+
             <if test="info.orderColumn == null or info.orderColumn == '' or info.orderType == null or info.orderType == ''">
                 order by t.porder asc
             </if>
diff --git a/docs/api/equipment.md b/docs/api/equipment.md
index 08580555..8dfc83c4 100644
--- a/docs/api/equipment.md
+++ b/docs/api/equipment.md
@@ -245,15 +245,22 @@ POST 请求接口
 
 ```json
 {
-    "iotModelId":"123"
+    "iotModelId":"123",
+    "pageNum":1,
+    "pageSize": 30
 }
 ```
 
 入参描述
 
-| 参数名     | 参数类型 | 可选 | 描述     |
-| ---------- | -------- | ---- | -------- |
-| iotModelId | String   | No   | 物模型ID |
+| 参数名     | 参数类型 | 可选  | 描述    |
+| ---------- | -------- |-----|-------|
+| iotModelId | String   | yes | 物模型ID |
+| attributeName | String   | yes  | 属性名称  |
+| attributeCode | String   | yes  | 属性编码  |
+| attributeType | String   | yes  | 量测类型  |
+| pageSize    | 数值     | No  | 每页显示条数  |
+| pageNum     | 数值     | No  | 页码  |
 
 返回报文
 
@@ -671,13 +678,13 @@ POST请求接口
 
 入参描述
 
-| 参数名      | 参数类型 | 可选 | 描述                       |
-| ----------- | -------- | ---- | -------------------------- |
-| orgId       | 数值     | No   | 所属机构ID                 |
-| parentEquipmentId | 数值   | No   | 上级设备ID                 |
-| iotModelId  | 字符串   | No   | 所属物模型ID               |
-| pageSize    | 数值     | No   | 每页显示条数               |
-| pageNum     | 数值     | No   | 页码                       |
+| 参数名      | 参数类型 | 可选  | 描述                       |
+| ----------- | -------- |-----| -------------------------- |
+| orgId       | 数值     | yes | 所属机构ID                 |
+| parentEquipmentId | 数值   | yes  | 上级设备ID                 |
+| iotModelId  | 字符串   | yes  | 所属物模型ID               |
+| pageSize    | 数值     | No  | 每页显示条数               |
+| pageNum     | 数值     | No  | 页码                       |
 
 返回报文