From 5ab83b6051caa9ec21b8a87c09c165e7fb240e83 Mon Sep 17 00:00:00 2001 From: zhangzhicheng Date: Mon, 12 Aug 2024 17:51:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/EqDeviceController.java | 20 +++++++++-- .../web/controller/app/EqHomeController.java | 35 +++++++------------ .../dromara/web/domain/bo/EqAppHomeBo.java | 2 +- .../service/impl/EqEquipmentServiceImpl.java | 1 + 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java index 50b1896b5..4847d56de 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java @@ -19,6 +19,7 @@ import org.dromara.web.domain.vo.*; import org.dromara.web.service.*; import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -67,12 +68,25 @@ public class EqDeviceController extends BaseController { public R bindDevice(EqAppHomeBo bo){ String equipmentCode = bo.getEquipmentCode(); if (equipmentCode == null) throw new ServiceException("设备编码不能为空"); - if (bo.getUserId() == null) throw new ServiceException("用户ID不能为空"); - if (bo.getAreaId() == null) throw new ServiceException("分布ID不能为空"); - + if (bo.getUserId() == null) throw new ServiceException("用户ID不能为空");//分享用户要使用家庭主体的用户id return R.ok(eqEquipmentService.bindDevice(bo)); } + /** + * + * 删除设备 + * 传参设备id + */ + @DeleteMapping("/delete") + public R delete(EqAppHomeBo bo){ + if (bo.getEquipmentId() == null) throw new ServiceException("设备ID不能为空"); + Long userId = LoginHelper.getUserId(); + if (!userId.equals(bo.getUserId())){ + return R.fail("删除失败，设备不属于当前用户"); + } + return R.ok(eqEquipmentService.deleteWithValidByIds(Collections.singletonList(bo.getEquipmentId()),Boolean.FALSE)); + } + /** * 控制设备 门 灯光 控制 * 传参设备编码 diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java index 26d5a7ed2..5daa82fcd 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java @@ -95,16 +95,22 @@ public class EqHomeController extends BaseController { */ @PostMapping("/share") public R share(@Validated(AddGroup.class) @RequestBody EqShareBo bo) { + if (bo.getSharedUserName() == null){ + return R.fail("被分享者用户名不能为空"); + } + SysUserVo sysUserVo = userService.selectUserByUserName(bo.getSharedUserName()); if (bo.getShareUserId() == null){ bo.setShareUserId(LoginHelper.getUserId()); bo.setShareUserName(LoginHelper.getUsername()); } + bo.setSharedUserId(sysUserVo.getUserId()); + bo.setSharedUserName(sysUserVo.getUserName()); return toAjax(eqShareService.insertByBo(bo)); } /** * 删除被分享的成员 - * @param sharedId + * @param sharedId 被分享者用户id * @return */ @DeleteMapping("/{sharedId}") @@ -122,15 +128,16 @@ public class EqHomeController extends BaseController { return R.ok(eqAreaService.queryList(bo)); } - /** todo + /** * 首页查看设备列表 */ @GetMapping("/list") public TableDataInfo list(EqAppHomeBo bo, PageQuery pageQuery){ + //当前用户为家庭主体 切换用户后需要传输用户id if (bo.getUserId() == null) bo.setUserId(LoginHelper.getUserId()); //TODO 下面返回的状态 会在设备状态变化时更新设备状态 EqEquipmentBo eqEquipmentBo = new EqEquipmentBo(); - eqEquipmentBo.setCreateBy(bo.getUserId()); + eqEquipmentBo.setUserId(bo.getUserId()); return eqEquipmentService.queryPageList(eqEquipmentBo, pageQuery); //在设备表中增加了分布id } @@ -138,29 +145,11 @@ public class EqHomeController extends BaseController { * 设备详情 (暂时无用) * 传参 设备id */ - @GetMapping("/info") + /*@GetMapping("/info") public R info(EqAppHomeBo bo){ if (bo.getEquipmentId() == null) throw new ServiceException("设备ID不能为空"); return R.ok(eqEquipmentService.queryById(bo.getEquipmentId())); - } - - - - /** - * - * 删除设备 - * 传参设备id - */ - @GetMapping("/delete") - public R delete(EqAppHomeBo bo){ - if (bo.getEquipmentId() == null) throw new ServiceException("设备ID不能为空"); - Long userId = LoginHelper.getUserId(); - if (!userId.equals(bo.getUserId())){ - return R.fail("删除失败，设备不属于当前用户"); - } - return R.ok(eqEquipmentService.deleteWithValidByIds(Collections.singletonList(bo.getEquipmentId()),Boolean.FALSE)); - } - + }*/ /** * 密码验证 diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqAppHomeBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqAppHomeBo.java index 5f2410cae..ce87cdecb 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqAppHomeBo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqAppHomeBo.java @@ -12,7 +12,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; @Data public class EqAppHomeBo extends BaseEntity{ /** - * 选取用户ID（家庭主体ID） + * 选取用户ID（家庭主体ID） 当前登录用户非家庭主体用户时，该字段必传 */ private Long userId; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java index 5eae62410..aa5ba5ae1 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java @@ -89,6 +89,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getAreaId() != null, EqEquipment::getAreaId, bo.getAreaId()); + lqw.eq(bo.getUserId() != null, EqEquipment::getUserId, bo.getUserId()); lqw.eq(bo.getType() != null, EqEquipment::getType, bo.getType()); lqw.like(StringUtils.isNotBlank(bo.getUserName()), EqEquipment::getUserName, bo.getUserName()); lqw.like(StringUtils.isNotBlank(bo.getNickName()), EqEquipment::getNickName, bo.getNickName());