新增分布修改和修改分享删除接口

ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java

@@ -256,13 +256,26 @@ public class EqHomeController extends BaseController {
 
     /**
      * 删除被分享的成员
+     * 用于删除家庭成员
      * @param sharedId 被分享者用户id
      * @return
      */
-    @DeleteMapping("/{sharedId}")
+    @DeleteMapping("/deleteFamily/{sharedId}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable String sharedId) {
-        return toAjax(eqShareService.deleteByShareId(sharedId));
+        return toAjax(eqShareService.deleteBySharedId(sharedId));
+    }
+
+    /**
+     * 删除家庭主体
+     * 用于删除家庭主体
+     * @param shareId 分享者id
+     * @return
+     */
+    @DeleteMapping("/deleteMember/{shareId}")
+    public R<Void> removeShare(@NotEmpty(message = "主键不能为空")
+                          @PathVariable String shareId) {
+        return toAjax(eqShareService.deleteByShareId(shareId));
     }
 
     /**
@@ -286,6 +299,27 @@ public class EqHomeController extends BaseController {
         return toAjax(eqAreaService.insertByBo(bo));
     }
 
+    /**
+     * 修改分布管理
+     */
+    @Log(title = "分布管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("areaEdit")
+    public R<Void> areaEdit(@Validated(EditGroup.class) @RequestBody EqAreaBo bo) {
+        return toAjax(eqAreaService.updateByBo(bo));
+    }
+
+    /**
+     * 删除分布
+     * @param areaIds
+     * @return
+     */
+    @Log(title = "分布管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/areaIdsDelete/{areaIds}")
+    public R<Void> areaIdsDelete(@NotEmpty(message = "主键不能为空") @PathVariable Long[] areaIds) {
+        return toAjax(eqAreaService.deleteWithValidByIds(List.of(areaIds), true));
+    }
+
     /**
      * 首页查看设备列表
      */

ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqAreaBo.java

@@ -45,7 +45,7 @@ public class EqAreaBo extends BaseEntity {
     /**
      * 位置描述
      */
-    @NotBlank(message = "位置描述不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "位置描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String description;
 
     public EqAreaBo(Long userId) {

ruoyi-admin/src/main/java/org/dromara/web/service/IEqShareService.java

@@ -71,5 +71,12 @@ public interface IEqShareService {
      * @param sharedId
      * @return
      */
-    Boolean deleteByShareId(String sharedId);
+    Boolean deleteBySharedId(String sharedId);
+
+    /**
+     * 删除家庭主体
+     * @param shareId
+     * @return
+     */
+    Boolean deleteByShareId(String shareId);
 }

ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqShareServiceImpl.java

@@ -132,11 +132,20 @@ public class EqShareServiceImpl implements IEqShareService {
     }
 
     @Override
-    public Boolean deleteByShareId(String sharedId) {
+    public Boolean deleteBySharedId(String sharedId) {
         Long userId = LoginHelper.getUserId();
         LambdaQueryWrapper<EqShare> query = Wrappers.lambdaQuery();
         query.eq(EqShare::getShareUserId, userId).eq(EqShare::getSharedUserId, sharedId);
         int delete = baseMapper.delete(query);
         return true;
     }
+
+    @Override
+    public Boolean deleteByShareId(String shareId) {
+        Long userId = LoginHelper.getUserId();
+        LambdaQueryWrapper<EqShare> query = Wrappers.lambdaQuery();
+        query.eq(EqShare::getShareUserId, shareId).eq(EqShare::getSharedUserId, userId);
+        int delete = baseMapper.delete(query);
+        return true;
+    }
 }