add修改角色方法

src/main/java/com/jkcredit/invoice/hub/controller/web/role/RoleResource.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.hub.controller.base.WebResource;
 import com.jkcredit.invoice.hub.controller.web.role.fb.RoleFB;
+import com.jkcredit.invoice.hub.controller.web.role.fb.RoleUpdateFB;
 import com.jkcredit.invoice.hub.model.dto.role.RoleDto;
 import com.jkcredit.invoice.hub.model.vo.role.RoleVo;
 import com.jkcredit.invoice.hub.service.role.RoleService;
@@ -64,8 +65,6 @@ public class RoleResource extends WebResource {
         }
     }
 
-    // todo 角色附有哪种权限问前台如何展示  是列表还是详情页
-
     @PreAuthorize("hasPermission('role','edit')")
     @PutMapping("/role/{id}")
     public ResponseData deleteRole(@PathVariable("id") Long id) {
@@ -77,4 +76,18 @@ public class RoleResource extends WebResource {
             return ResponseData.failed("删除角色失败，失败原因" + e.getMessage());
         }
     }
+
+    @PreAuthorize("hasPermission('role','edit')")
+    @PutMapping("/role")
+    public ResponseData deleteRole(@RequestBody RoleUpdateFB roleUpdateFB) {
+        try {
+            validate(roleUpdateFB);
+            RoleDto roleDto = mapper.map(roleUpdateFB, RoleDto.class);
+            roleService.updateRole(roleDto);
+            return ResponseData.success("修改角色成功");
+        } catch (ServiceException e) {
+            log.error(e.getMessage());
+            return ResponseData.failed("修改角色失败，失败原因" + e.getMessage());
+        }
+    }
 }

src/main/java/com/jkcredit/invoice/hub/controller/web/role/fb/RoleUpdateFB.java

@@ -14,4 +14,6 @@ import javax.validation.constraints.NotNull;
 public class RoleUpdateFB {
     @NotNull(message = "角色名不能为空")
     private String roleName;
+    @NotNull(message = "角色id不能为空")
+    private Long id;
 }

src/main/java/com/jkcredit/invoice/hub/controller/web/rolePermission/RolePermissionResource.java

@@ -37,4 +37,7 @@ public class RolePermissionResource extends WebResource {
             return ResponseData.failed("添加失败，失败原因" + e.getMessage());
         }
     }
+
+
+    //todo getPermissionByRoleId
 }

src/main/java/com/jkcredit/invoice/hub/enums/ApiResponseCodeEnum.java

@@ -0,0 +1,26 @@
+package com.jkcredit.invoice.hub.enums;
+
+import com.jkcredit.invoice.hub.enums.base.EnumStatus;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ApiResponseCodeEnum implements EnumStatus {
+    CODE_1000(1000, "无效用户!"),
+    CODE_1010(1010, "参数不能为空!"),
+    CODE_1020(1020, "参数类型不正确!"),
+    CODE_1030(1030, "单日查询次数到达上限制!"),
+    CODE_1040(1040, "appkey错误/签名校验失败/商户不存在!"),
+    CODE_1050(1050, "账号使用时间未到!"),
+    CODE_1060(1060, "账号使用时间已过!"),
+    CODE_1070(1070, "总查询次数到达上限制!"),
+    CODE_1080(1080, "商户未配置模块!"),
+    CODE_1090(1090, "商户余额不足!"),
+    CODE_1100(1100, "请求的API模块不存在!"),
+    CODE_1110(1110, "商户单位时间内请求超过限制!"),
+    CODE_9999(9999, "其他异常-");
+
+    private Integer value;
+    private String desc;
+}

src/main/java/com/jkcredit/invoice/hub/model/dto/role/RoleDto.java

@@ -12,6 +12,7 @@ import java.io.Serializable;
  **/
 @Data
 public class RoleDto implements Serializable {
+    private Long id;
     private String role;
     private String roleName;
 }

src/main/java/com/jkcredit/invoice/hub/service/role/RoleService.java

@@ -21,4 +21,6 @@ public interface RoleService {
     List<RoleVo> getRoles();
 
     void deleteRole(Long id);
+
+    void updateRole(RoleDto roleDto);
 }

src/main/java/com/jkcredit/invoice/hub/service/role/RoleServiceImpl.java

@@ -10,7 +10,9 @@ import com.jkcredit.invoice.hub.model.po.role.RolePo;
 import com.jkcredit.invoice.hub.model.vo.role.RoleVo;
 import com.jkcredit.invoice.hub.service.base.BaseService;
 import com.jkcredit.invoice.hub.spi.lang.exception.ServiceException;
+import com.jkcredit.invoice.hub.util.AssertUtils;
 import com.jkcredit.invoice.hub.util.BeanUtil;
+import io.netty.util.internal.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -87,4 +89,21 @@ public class RoleServiceImpl extends BaseService implements RoleService {
             }
         }
     }
+
+    @Override
+    @Transactional(rollbackFor = ServiceException.class)
+    public void updateRole(RoleDto roleDto) {
+        RolePo rolePo = roleMapper.selectById(roleDto.getId());
+        AssertUtils.assertNotNull(rolePo, CommonConstant.USER_NOT_EXIST);
+        if (!StringUtil.isNullOrEmpty(roleDto.getRoleName())) {
+            rolePo.setRoleName(roleDto.getRoleName());
+        }
+        rolePo.setUpdateTime(new Date());
+        try {
+            roleMapper.updateById(rolePo);
+        } catch (ServiceException e) {
+            log.error("更新角色失败，失败原因：{}", e.getMessage());
+            throw new ServiceException("更新角色失败");
+        }
+    }
 }

src/main/java/com/jkcredit/invoice/hub/spi/web/data/ApiRequestParam.java

@@ -1,8 +1,14 @@
 package com.jkcredit.invoice.hub.spi.web.data;
 
+import com.jkcredit.invoice.hub.enums.ApiResponseCodeEnum;
+import com.jkcredit.invoice.hub.util.EnumStatusUtils;
 import lombok.Data;
 import lombok.ToString;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
 /**
  * @description:
  * @author: xusonglin
@@ -12,8 +18,18 @@ import lombok.ToString;
 @Data
 @ToString
 public class ApiRequestParam {
+    @NotNull(message = "参数不能为空!")
+    @NotBlank(message = "参数不能为空!")
     private String api;
+
+    @NotNull(message = "参数不能为空!")
+    @NotBlank(message = "参数不能为空!")
     private String appKey;
+
+    @NotNull(message = "参数不能为空!")
+    @NotBlank(message = "参数不能为空!")
     private String appSecret;
+
+    @NotNull(message = "参数不能为空!")
     private Object data;
 }