Merge branch 'dev.wei' into dev

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();
+    }
+
+
 }

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;
+}

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;
+
+
+}

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();
+    }
 }

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<FirmPermission> {
      * @return
      */
     void updpermission(FirmUpdPermissionReq firmUpdPermissionReq);
+
+    /**
+     * 权限等级列表
+     * @return
+     */
+    List<FirmPermission> permissionlist();
 }

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<FirmManageMapper, SysUser
      */
     @Override
     public void updpermission(FirmUpdPermissionReq firmUpdPermissionReq, long permissionId) {
-
+        LambdaUpdateWrapper<Firm> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(Firm::getPermissionId, permissionId );
+        updateWrapper.eq(Firm::getFirmId, firmUpdPermissionReq.getFirmId());
+        firmService.update(updateWrapper);
     }
 }

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<FirmPermissionMapper, FirmPermission> implements FirmPermissionService {
     @Autowired
     private FirmManageService firmManageService;
-    @Autowired
+
-    private FirmPermissionService firmPermissionService;
     /**
      * 修改企业权限分配
      * @param firmUpdPermissionReq
@@ -43,4 +42,16 @@ public class FirmPermissionServiceImpl extends ServiceImpl<FirmPermissionMapper,
         //修改企业对应权限
         firmManageService.updpermission(firmUpdPermissionReq,permissionId);
     }
+
+
+    /**
+     * 权限等级列表
+     * @return
+     */
+    @Override
+    public List<FirmPermission> permissionlist() {
+        LambdaQueryWrapper<FirmPermission> queryWrapper = new LambdaQueryWrapper<>();
+        List<FirmPermission> list = this.list(queryWrapper);
+        return list;
+    }
 }