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 5daa82fcd..be761dcb6 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 @@ -94,17 +94,23 @@ public class EqHomeController extends BaseController { * @return */ @PostMapping("/share") - public R share(@Validated(AddGroup.class) @RequestBody EqShareBo bo) { + public R share( @RequestBody EqShareBo bo) { if (bo.getSharedUserName() == null){ return R.fail("被分享者用户名不能为空"); } SysUserVo sysUserVo = userService.selectUserByUserName(bo.getSharedUserName()); + if (sysUserVo==null) throw new RuntimeException("被分享者用户名不存在"); + if (bo.getShareUserId() == null){ bo.setShareUserId(LoginHelper.getUserId()); - bo.setShareUserName(LoginHelper.getUsername()); + String currentUserName = LoginHelper.getUsername(); + if (currentUserName.equals(bo.getSharedUserName())) throw new RuntimeException("不能分享给自己"); + bo.setShareUserName(currentUserName); } bo.setSharedUserId(sysUserVo.getUserId()); bo.setSharedUserName(sysUserVo.getUserName()); + List eqShareVos = eqShareService.queryList(bo); + if (!eqShareVos.isEmpty()) throw new RuntimeException("该成员已被分享"); return toAjax(eqShareService.insertByBo(bo)); } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqDeviceSetBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqDeviceSetBo.java index 9a5d5ef8a..545534aee 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqDeviceSetBo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqDeviceSetBo.java @@ -29,13 +29,13 @@ public class EqDeviceSetBo implements Serializable { */ private String equipmentCode; /** - * 1. 自动关门功能开关 - * 2. 自动关门功能开关 - * 3. 延时自动关门的延时时长 value - * 4. 运行次数开关 - * 5. 运行次数开关 - * 6. 倒计时设置时间 value - * 7. 提醒关门时间设置 value + * 1.自动关门功能开关 + * 2.自动关门功能开关 + * 3.延时自动关门的延时时长 value + * 4.运行次数开关 + * 5.运行次数开关 + * 6.倒计时设置时间 value + * 7.提醒关门时间设置 value * 8.提醒关门功能开关 * 9.提醒关门功能开关 * 10.半开门高度设置 value @@ -44,7 +44,6 @@ public class EqDeviceSetBo implements Serializable { * 13.遇阻回弹的阻力设置 value * 14.红外感应开关开启 * 15.红外感应开关关闭 - * */ private int operateType;