diff --git a/cloud-property-server/src/main/java/com/muyu/server/controller/DataRunNameController.java b/cloud-property-server/src/main/java/com/muyu/server/controller/DataRunNameController.java index 0e6848a..bfc9539 100644 --- a/cloud-property-server/src/main/java/com/muyu/server/controller/DataRunNameController.java +++ b/cloud-property-server/src/main/java/com/muyu/server/controller/DataRunNameController.java @@ -114,7 +114,7 @@ public class DataRunNameController { */ @PostMapping("/extractDataTableNames") public Result extractDataTableNames(@RequestBody AssetAuthorization assetAuthorization){ - List list = dataRunNameService.addDeptAssetAuthorization(assetAuthorization); + List list = dataRunNameService.extractDataTableNames(assetAuthorization); return success(list); } @@ -126,7 +126,7 @@ public class DataRunNameController { @PostMapping("/addUserAssetAuthorization") @Operation(summary = "添加用户权限的信息", description = "添加用户权限的信息") - public Result addDeptAssetAuthorization(@RequestBody AssetAuthorization req){ + public Result addUserAssetAuthorization(@RequestBody AssetAuthorization req){ AssetAuthorization authorization = new AssetAuthorization(); authorization.setUserId(req.getUserId()); authorization.setTableId(req.getTableId()); @@ -140,11 +140,41 @@ public class DataRunNameController { * @param req 响应参数 * @return 返回结果 */ - @PostMapping("/delDeptAssetAuthorization") + @PostMapping("/delUserAssetAuthorization") @Operation(summary = "删除用户权限的信息", description = "删除用户权限的信息") - public Result delDeptAssetAuthorization(@RequestBody AssetAuthorization req){ + public Result delUserAssetAuthorization(@RequestBody AssetAuthorization req){ int i = assetAuthorizationService.delUserAssetAccredit(req); return i>0?Result.success():Result.error(); }; + + /** + * 添加部门权限的信息 + * @param req 响应参数 + * @return 返回结果 + */ + @PostMapping("/addDeptAssetAuthorization") + @Operation(summary = "添加部门权限的信息", + description = "添加部门权限的信息") + public Result addDeptAssetAuthorization(@RequestBody AssetAuthorization req){ + AssetAuthorization authorization = new AssetAuthorization(); + authorization.setDeptId(req.getDeptId()); + authorization.setTableId(req.getTableId()); + authorization.setBasicId(req.getBasicId()); + boolean save = assetAuthorizationService.save(authorization); + return save?Result.success():Result.error(); + } + + /** + * 删除部门权限的信息 + * @param req 响应参数 + * @return 返回结果 + */ + @PostMapping("/delDeptAssetAuthorization") + @Operation(summary = "删除部门权限的信息", + description = "删除部门权限的信息") + public Result delDeptAssetAuthorization(@RequestBody AssetAuthorization req){ + int i = assetAuthorizationService.delDeptAssetAccredit(req); + return i>0?Result.success():Result.error(); + }; } diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/AssetAuthorizationService.java b/cloud-property-server/src/main/java/com/muyu/server/service/AssetAuthorizationService.java index b21e853..63fa234 100644 --- a/cloud-property-server/src/main/java/com/muyu/server/service/AssetAuthorizationService.java +++ b/cloud-property-server/src/main/java/com/muyu/server/service/AssetAuthorizationService.java @@ -17,4 +17,11 @@ public interface AssetAuthorizationService extends IService * @return 返回结果 */ int delUserAssetAccredit(AssetAuthorization req); + + /** + * 删除部门权限的信息 + * @param req 响应参数 + * @return 返回结果 + */ + int delDeptAssetAccredit(AssetAuthorization req); } diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java b/cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java index 5582066..15b0d56 100644 --- a/cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java +++ b/cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java @@ -64,5 +64,5 @@ public interface DataRunNameService { * 获取授权的用户表或者部门 闪闪 * @return 返回结果 */ - List addDeptAssetAuthorization(AssetAuthorization assetAuthorization); + List extractDataTableNames(AssetAuthorization assetAuthorization); } diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/impl/AssetAuthorizationServiceImpl.java b/cloud-property-server/src/main/java/com/muyu/server/service/impl/AssetAuthorizationServiceImpl.java index 98ea0bf..f865b6c 100644 --- a/cloud-property-server/src/main/java/com/muyu/server/service/impl/AssetAuthorizationServiceImpl.java +++ b/cloud-property-server/src/main/java/com/muyu/server/service/impl/AssetAuthorizationServiceImpl.java @@ -42,4 +42,19 @@ public class AssetAuthorizationServiceImpl int delete = assetAuthorizationMapper.delete(queryWrapper); return delete; } + + @Override + public int delDeptAssetAccredit(AssetAuthorization req) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (null==req.getBasicId()){ + queryWrapper.eq(AssetAuthorization::getDeptId,req.getDeptId()) + .eq(AssetAuthorization::getTableId,req.getTableId()); + }else if (null==req.getTableId()){ + queryWrapper.eq(AssetAuthorization::getDeptId,req.getDeptId()) + .eq(AssetAuthorization::getBasicId,req.getBasicId()); + } + + int delete = assetAuthorizationMapper.delete(queryWrapper); + return delete; + } } diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java index 8d94751..b0c0079 100644 --- a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java +++ b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java @@ -373,7 +373,7 @@ public class DataRunNameServiceImpl implements DataRunNameService { * @return 返回结果 */ @Override - public List addDeptAssetAuthorization(AssetAuthorization assetAuthorization) { + public List extractDataTableNames(AssetAuthorization assetAuthorization) { //使用安全管理工具获取当前登录的用户对象 LoginUser loginUser = SecurityUtils.getLoginUser(); //从登录用户对象中获取系统用户对象