sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

获取物模型属性列表修改;

Browse Source 
获取设备列表接口修改;
This commit is contained in:
yu 2024-10-28 10:56:15 +08:00
parent b8655cd351
commit 7fbd133ab8
4 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java
View File

@ -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));
}

8
das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
View File

@ -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);

4
das/src/main/resources/mapper/SysIotModelFieldMapper.xml
View File

@ -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>

29
docs/api/equipment.md
View File

@ -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 | 页码 |
返回报文