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

Merge branch 'main' of https://git.jsspisoft.com/ry-das

Browse Source
This commit is contained in:
谷成伟 2024-10-28 10:17:20 +08:00
commit b8655cd351
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java
View File

@ -93,7 +93,10 @@ public class SysIotModelController {
/** 获取物模型属性列表 */ /** 获取物模型属性列表 */
@PostMapping("/attribute/list") @PostMapping("/attribute/list")
public PageDataInfo<SysIotModelFieldVo> querySysIotModelField(@RequestBody SysIotModelFieldDto sysIotModelFieldDto) { 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); return sysIotModelService.querySysIotModelField(sysIotModelFieldDto);
} }

2
das/src/main/java/com/das/modules/equipment/mapper/SysIotModelFieldMapper.java
View File

@ -18,6 +18,8 @@ public interface SysIotModelFieldMapper extends BaseMapperPlus<SysIotModelField,
Long querySysIotModelFieldByModelId(Long id); Long querySysIotModelFieldByModelId(Long id);
List<SysIotModelFieldVo> querySysIotModelFieldList(@Param("info") SysIotModelFieldDto sysIotModelFieldDto);
SysIotModelFieldVo selectByAttributeCode(Long iotModelId, String code); SysIotModelFieldVo selectByAttributeCode(Long iotModelId, String code);
List<String> queryAllFiledNames(@Param("deviceId") Long deviceId); List<String> queryAllFiledNames(@Param("deviceId") Long deviceId);

2
das/src/main/java/com/das/modules/equipment/service/SysIotModelService.java
View File

@ -25,6 +25,8 @@ public interface SysIotModelService {
PageDataInfo<SysIotModelFieldVo> querySysIotModelField(SysIotModelFieldDto sysIotModelFieldDto); PageDataInfo<SysIotModelFieldVo> querySysIotModelField(SysIotModelFieldDto sysIotModelFieldDto);
List<SysIotModelFieldVo> queryAllModelField(SysIotModelFieldDto sysIotModelFieldDto);
SysIotModelFieldVo creatSysIotModelField(SysIotModelFieldDto sysIotModelFieldDto); SysIotModelFieldVo creatSysIotModelField(SysIotModelFieldDto sysIotModelFieldDto);
SysIotModelFieldVo updateSysIotModelField(SysIotModelFieldDto sysIotModelFieldDto); SysIotModelFieldVo updateSysIotModelField(SysIotModelFieldDto sysIotModelFieldDto);

5
das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
View File

@ -144,6 +144,11 @@ public class SysIotModelServiceImpl implements SysIotModelService {
return PageDataInfo.build(iPage.getRecords(), iPage.getTotal()); return PageDataInfo.build(iPage.getRecords(), iPage.getTotal());
} }
@Override
public List<SysIotModelFieldVo> queryAllModelField(SysIotModelFieldDto sysIotModelFieldDto) {
return sysIotModelFieldMapper.querySysIotModelFieldList(sysIotModelFieldDto);
}
@Override @Override
public SysIotModelFieldVo creatSysIotModelField(SysIotModelFieldDto sysIotModelFieldDto) { public SysIotModelFieldVo creatSysIotModelField(SysIotModelFieldDto sysIotModelFieldDto) {
SysIotModelField sysIotModelField = new SysIotModelField(); SysIotModelField sysIotModelField = new SysIotModelField();