From 4239f980c5ee918c5ee6a9b77b9042631ac21e8d Mon Sep 17 00:00:00 2001 From: huguanghan Date: Wed, 18 Dec 2024 09:24:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/controller/SysIotModelController.java | 8 ++++++-- .../modules/equipment/mapper/SysIotModelFieldMapper.java | 2 +- .../das/modules/equipment/service/SysIotModelService.java | 2 +- .../equipment/service/impl/SysIotModelServiceImpl.java | 4 ++-- das/src/main/resources/mapper/SysIotModelFieldMapper.xml | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) 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 da45c31e..4c5e3e02 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 @@ -251,8 +251,12 @@ public class SysIotModelController { /** 物模型属性修改 */ @PostMapping("/attribute/getAllSubsystem") - public R> getAllSubsystem() { - List allSubsystem = sysIotModelService.getAllSubsystem(); + public R> getAllSubsystem(@RequestBody SysIotModelFieldDto sysIotModelFieldDto) { + Long iotModelId = sysIotModelFieldDto.getIotModelId(); + if (iotModelId == null){ + throw new ServiceException("参数物模型id不存在"); + } + List allSubsystem = sysIotModelService.getAllSubsystem(iotModelId); 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 f2b8a4e1..4db11198 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,6 +33,6 @@ public interface SysIotModelFieldMapper extends BaseMapperPlus selectModelFieldListByModelId(@Param("modelId") Long modelId); - List getAllSubsystem(); + List getAllSubsystem(@Param("modelId") Long iotModelId); } 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 b66abf10..3bbba875 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,6 +47,6 @@ public interface SysIotModelService { List getSysIotModelByType(Integer objectType); - List getAllSubsystem(); + List getAllSubsystem(Long iotModelId); } 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 bb268fdb..2c289b4c 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 @@ -545,8 +545,8 @@ public class SysIotModelServiceImpl implements SysIotModelService { } @Override - public List getAllSubsystem() { - return sysIotModelFieldMapper.getAllSubsystem(); + public List getAllSubsystem(Long iotModelId) { + return sysIotModelFieldMapper.getAllSubsystem(iotModelId); } public void createTdStableOrColumn(SysIotModelField sysIotModelField) { diff --git a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml index 9cc9a998..39b85f34 100644 --- a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml +++ b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml @@ -65,6 +65,6 @@ select * from sys_iot_model_field where iot_model_id = #{modelId} order by porder From 3b717ced58a791a36e084a19f88a33b22bd6eea8 Mon Sep 17 00:00:00 2001 From: huguanghan Date: Wed, 18 Dec 2024 10:18:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/equipment/service/impl/SysIotModelServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 2c289b4c..afd4033d 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 @@ -146,9 +146,11 @@ public class SysIotModelServiceImpl implements SysIotModelService { @Override public PageDataInfo querySysIotModelField(SysIotModelFieldDto sysIotModelFieldDto) { + PageQuery pageQuery = new PageQuery(); pageQuery.setPageNum(sysIotModelFieldDto.getPageNum()); pageQuery.setPageSize(sysIotModelFieldDto.getPageSize()); + log.info("查询物模型属性参数：{}",sysIotModelFieldDto); IPage iPage = sysIotModelFieldMapper.querySysIotModelFieldList(pageQuery.build(), sysIotModelFieldDto); return PageDataInfo.build(iPage.getRecords(), iPage.getTotal()); } From 57757ae5add1a1a3029bdebd87d9e00b62cad9ea Mon Sep 17 00:00:00 2001 From: huguanghan Date: Wed, 18 Dec 2024 10:34:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/equipment/service/impl/SysIotModelServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 afd4033d..40c56d9a 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 @@ -152,6 +152,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { pageQuery.setPageSize(sysIotModelFieldDto.getPageSize()); log.info("查询物模型属性参数：{}",sysIotModelFieldDto); IPage iPage = sysIotModelFieldMapper.querySysIotModelFieldList(pageQuery.build(), sysIotModelFieldDto); + log.info("查询物模型属性返回总数{}，:{}",iPage.getTotal(),iPage.getRecords()); return PageDataInfo.build(iPage.getRecords(), iPage.getTotal()); }