From 3e73a8598a31b796b41e05924914f71231a062a8 Mon Sep 17 00:00:00 2001 From: WeiRan <2392355487@qq.com> Date: Tue, 8 Oct 2024 22:40:43 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E5=AE=8C=E5=96=84=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=86=E9=85=8D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/domain/FirmPermission.java | 21 +++++++++ .../muyu/domain/req/FirmPermissionAddReq.java | 39 ++++++++++++++++ .../muyu/domain/req/FirmPermissionUpdReq.java | 46 +++++++++++++++++++ .../controller/FirmPermissionController.java | 43 ++++++++++++++++- .../server/service/FirmPermissionService.java | 8 ++++ .../service/impl/FirmManageServiceImpl.java | 6 ++- .../impl/FirmPermissionServiceImpl.java | 15 +++++- 7 files changed, 174 insertions(+), 4 deletions(-) create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FirmPermissionAddReq.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FirmPermissionUpdReq.java diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FirmPermission.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FirmPermission.java index 4b73c4b..9c4b150 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FirmPermission.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FirmPermission.java @@ -1,6 +1,9 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.TableId; +import com.muyu.domain.req.FaultCodeAddReq; +import com.muyu.domain.req.FirmPermissionAddReq; +import com.muyu.domain.req.FirmPermissionUpdReq; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -42,4 +45,22 @@ public class FirmPermission { private Integer carTypeNumber; + public static FirmPermission addfirmpermission(FirmPermissionAddReq firmPermissionAddReq){ + return FirmPermission.builder() + .permissionLevel(firmPermissionAddReq.getPermissionLevel()) + .carNumber(firmPermissionAddReq.getCarNumber()) + .carTypeNumber(firmPermissionAddReq.getCarTypeNumber()) + .build(); + } + + public static FirmPermission updfirmpermission(FirmPermissionUpdReq firmPermissionUpdReq){ + return FirmPermission.builder() + .permissionId(firmPermissionUpdReq.getPermissionId()) + .permissionLevel(firmPermissionUpdReq.getPermissionLevel()) + .carNumber(firmPermissionUpdReq.getCarNumber()) + .carTypeNumber(firmPermissionUpdReq.getCarTypeNumber()) + .build(); + } + + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FirmPermissionAddReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FirmPermissionAddReq.java new file mode 100644 index 0000000..7aeeca5 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FirmPermissionAddReq.java @@ -0,0 +1,39 @@ +package com.muyu.domain.req; + +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 企业权限新增请求对象 + * @Author：weiran + * @Package：com.muyu.domain.req + * @Project：cloud-server-8 + * @name：FirmPermissionAddReq + * @Date：2024/10/8 19:48 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Tag(name = "企业权限新增请求对象",description = "企业权限新增请求对象") +public class FirmPermissionAddReq { + + /** + * 权限等级 + */ + private String permissionLevel; + + /** + * 车辆数目 + */ + private Integer carNumber; + + /** + * 车辆类型数目 + */ + private Integer carTypeNumber; +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FirmPermissionUpdReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FirmPermissionUpdReq.java new file mode 100644 index 0000000..726c01d --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FirmPermissionUpdReq.java @@ -0,0 +1,46 @@ +package com.muyu.domain.req; + +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 企业权限修改请求对象 + * @Author：weiran + * @Package：com.muyu.domain.req + * @Project：cloud-server-8 + * @name：FirmPermissionUpdReq + * @Date：2024/10/8 20:11 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Tag(name = "企业权限修改请求对象",description = "企业权限修改请求对象") +public class FirmPermissionUpdReq { + + /** + * 企业权限Id + */ + @TableId(value = "permission_id") + private long permissionId; + /** + * 权限等级 + */ + private String permissionLevel; + + /** + * 车辆数目 + */ + private Integer carNumber; + + /** + * 车辆类型数目 + */ + private Integer carTypeNumber; + + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FirmPermissionController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FirmPermissionController.java index 0e061eb..4e2651a 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FirmPermissionController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FirmPermissionController.java @@ -1,12 +1,16 @@ package com.muyu.server.controller; import com.muyu.common.core.domain.Result; +import com.muyu.domain.FirmPermission; +import com.muyu.domain.req.FirmPermissionAddReq; +import com.muyu.domain.req.FirmPermissionUpdReq; import com.muyu.domain.req.FirmUpdPermissionReq; import com.muyu.server.service.FirmPermissionService; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.parameters.RequestBody; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -35,4 +39,41 @@ public class FirmPermissionController { firmPermissionService.updpermission(firmUpdPermissionReq); return Result.success(null,"权限更改成功"); } + + + /** + * 权限等级列表 + * @return + */ + @PostMapping("/permissionlist") + @Operation(summary = "权限等级列表",description = "权限等级列表") + public Result permissionlist(){ + return Result.success(firmPermissionService.permissionlist()); + } + + + /** + * 企业权限新增 + * @param firmPermissionAddReq + * @return + */ + @PostMapping("/addpermission") + @Operation(summary = "企业权限新增",description = "企业权限新增") + public Result addpermission(@RequestBody FirmPermissionAddReq firmPermissionAddReq){ + firmPermissionService.save(FirmPermission.addfirmpermission(firmPermissionAddReq)); + return Result.success(); + } + + + /** + * 企业权限修改 + * @param firmPermissionUpdReq + * @return + */ + @PostMapping("/updpermission") + @Operation(summary = "企业权限修改",description = "企业权限修改") + public Result updpermission(@RequestBody FirmPermissionUpdReq firmPermissionUpdReq){ + firmPermissionService.updateById(FirmPermission.updfirmpermission(firmPermissionUpdReq)); + return Result.success(); + } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FirmPermissionService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FirmPermissionService.java index 2e1d621..b5dcdab 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FirmPermissionService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FirmPermissionService.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.FirmPermission; import com.muyu.domain.req.FirmUpdPermissionReq; +import java.util.List; + /** * 企业权限分配业务层 * @Author：weiran @@ -20,4 +22,10 @@ public interface FirmPermissionService extends IService { * @return */ void updpermission(FirmUpdPermissionReq firmUpdPermissionReq); + + /** + * 权限等级列表 + * @return + */ + List permissionlist(); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmManageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmManageServiceImpl.java index 2244559..7fc991b 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmManageServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmManageServiceImpl.java @@ -2,6 +2,7 @@ package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.muyu.common.core.utils.StringUtils; @@ -80,6 +81,9 @@ public class FirmManageServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(Firm::getPermissionId, permissionId ); + updateWrapper.eq(Firm::getFirmId, firmUpdPermissionReq.getFirmId()); + firmService.update(updateWrapper); } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmPermissionServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmPermissionServiceImpl.java index caf3d6e..5f34084 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmPermissionServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmPermissionServiceImpl.java @@ -24,8 +24,7 @@ import java.util.List; public class FirmPermissionServiceImpl extends ServiceImpl implements FirmPermissionService { @Autowired private FirmManageService firmManageService; - @Autowired - private FirmPermissionService firmPermissionService; + /** * 修改企业权限分配 * @param firmUpdPermissionReq @@ -43,4 +42,16 @@ public class FirmPermissionServiceImpl extends ServiceImpl permissionlist() { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + List list = this.list(queryWrapper); + return list; + } }