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 395e8f70..c0b8a9f2 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 @@ -245,5 +245,11 @@ public class SysIotModelController { return R.success(sysIotModelService.getSysIotModelByType(sysIotModelDto.getObjectType())); } + /** 物模型属性修改 */ + @PostMapping("/attribute/getAllSubsystem") + public R> getAllSubsystem() { + List allSubsystem = sysIotModelService.getAllSubsystem(); + return R.success(allSubsystem); + } } 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 ba102696..f2b8a4e1 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 @@ -33,4 +33,6 @@ public interface SysIotModelFieldMapper extends BaseMapperPlus selectModelFieldListByModelId(@Param("modelId") Long modelId); + List getAllSubsystem(); + } 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 480385c9..b66abf10 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 @@ -47,4 +47,6 @@ public interface SysIotModelService { List getSysIotModelByType(Integer objectType); + List getAllSubsystem(); + } 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 df5db58e..bb268fdb 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 @@ -544,6 +544,11 @@ public class SysIotModelServiceImpl implements SysIotModelService { return list; } + @Override + public List getAllSubsystem() { + return sysIotModelFieldMapper.getAllSubsystem(); + } + public void createTdStableOrColumn(SysIotModelField sysIotModelField) { //如果type是计算量199,创建单独计算量超级表 if (sysIotModelField.getAttributeType() == 199) { diff --git a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml index 205674cc..c995d95d 100644 --- a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml +++ b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml @@ -28,6 +28,9 @@ and t.attribute_type = #{info.attributeType} + + and t.subsystem = #{info.subSystem} + order by ${info.orderColumn} ${info.orderType} @@ -58,4 +61,7 @@ +