From 08c0461a3e889306de71047f19b9ba7049147a6d Mon Sep 17 00:00:00 2001 From: puhui999 Date: Sat, 29 Mar 2025 12:53:13 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E3=80=91IoT:=20=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E6=A1=A5?= =?UTF-8?q?=E6=A2=81=E7=9A=84=E7=B2=BE=E7=AE=80=E4=BF=A1=E6=81=AF=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/rule/IotDataBridgeController.java | 14 +++++++++++++- .../iot/dal/mysql/rule/IotDataBridgeMapper.java | 8 ++++++++ .../iot/service/rule/IotDataBridgeService.java | 12 +++++++++++- .../iot/service/rule/IotDataBridgeServiceImpl.java | 9 ++++++++- 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/IotDataBridgeController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/IotDataBridgeController.java index 95e50a4a27..b4839144f0 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/IotDataBridgeController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/IotDataBridgeController.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.iot.controller.admin.rule; +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; @@ -17,7 +18,10 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; + import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; @Tag(name = "管理后台 - IoT 数据桥梁") @RestController @@ -69,4 +73,12 @@ public class IotDataBridgeController { return success(BeanUtils.toBean(pageResult, IotDataBridgeRespVO.class)); } -} \ No newline at end of file + @GetMapping("/simple-list") + @Operation(summary = "获取数据桥梁的精简信息列表", description = "主要用于前端的下拉选项") + public CommonResult> getSimpleDataBridgeList() { + List list = dataBridgeService.getDataBridgeList(CommonStatusEnum.ENABLE.getStatus()); + return success(convertList(list, dataBridge -> // 只返回 id、name 字段 + new IotDataBridgeRespVO().setId(dataBridge.getId()).setName(dataBridge.getName()))); + } + +} diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/rule/IotDataBridgeMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/rule/IotDataBridgeMapper.java index 3035791162..bfaee9acf4 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/rule/IotDataBridgeMapper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/rule/IotDataBridgeMapper.java @@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.databridge.IotDataBr import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotDataBridgeDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * IoT 数据桥梁 Mapper * @@ -23,4 +25,10 @@ public interface IotDataBridgeMapper extends BaseMapperX { .orderByDesc(IotDataBridgeDO::getId)); } + default List selectList(Integer status) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(IotDataBridgeDO::getStatus, status) + .orderByDesc(IotDataBridgeDO::getId)); + } + } \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotDataBridgeService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotDataBridgeService.java index 18069376b0..934bf39570 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotDataBridgeService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotDataBridgeService.java @@ -6,6 +6,8 @@ import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.databridge.IotDataBr import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotDataBridgeDO; import jakarta.validation.Valid; +import java.util.List; + /** * IoT 数据桥梁 Service 接口 * @@ -51,4 +53,12 @@ public interface IotDataBridgeService { */ PageResult getDataBridgePage(IotDataBridgePageReqVO pageReqVO); -} \ No newline at end of file + /** + * 获取数据桥梁列表 + * + * @param status 状态，如果为空，则不进行筛选 + * @return 数据桥梁列表 + */ + List getDataBridgeList(Integer status); + +} diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotDataBridgeServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotDataBridgeServiceImpl.java index 9e439fc996..16fa025669 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotDataBridgeServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotDataBridgeServiceImpl.java @@ -10,6 +10,8 @@ import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; +import java.util.List; + import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.DATA_BRIDGE_NOT_EXISTS; @@ -67,4 +69,9 @@ public class IotDataBridgeServiceImpl implements IotDataBridgeService { return dataBridgeMapper.selectPage(pageReqVO); } -} \ No newline at end of file + @Override + public List getDataBridgeList(Integer status) { + return dataBridgeMapper.selectList(status); + } + +}