role(add)

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/RoleInfoVO.java

@@ -3,9 +3,7 @@ package com.mmc.iuav.user.model.vo;
 import com.mmc.iuav.group.Create;
 import com.mmc.iuav.group.Update;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -18,19 +16,17 @@ import java.io.Serializable;
  * @Version 1.0
  */
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
 public class RoleInfoVO implements Serializable {
     private static final long serialVersionUID = -5814724843819090363L;
     @ApiModelProperty(value = "角色id", example = "1")
     @NotNull(message = "角色ID不能为空", groups = Update.class)
     private Integer id;
     @ApiModelProperty(value = "角色名称", example = "超级管理员")
+    @Size(min = 1, max = 10, message = "权限角色不得超过10个字符")
     @NotBlank(message = "角色名称不能为空", groups = {Create.class, Update.class})
-    @Size(max = 10, message = "权限角色不得超过10个字符")
     private String roleName;
-    @ApiModelProperty(value = "备注", example = "备注")
-    @Size(max = 225, message = "备注不得超过225个字符")
+    @ApiModelProperty(value = "备注", example = "备注", required = false)
+    @Size(max = 255, message = "备注不得超过225个字符", groups = {Create.class, Update.class})
     private String remark;
 
 }

cms-common/cms-common-util/src/main/java/com/mmc/iuav/general/CodeUtil.java

@@ -32,7 +32,7 @@ public class CodeUtil {
 
     public static String createRoleNo() {
         StringBuffer sb = new StringBuffer();
-        sb.append("JS");
+        sb.append("A");
         sb.append(CodeUtil.getRandomNum(4));
         return sb.toString();
     }

cms-common/cms-common-util/src/main/java/com/mmc/iuav/group/Create.java

 package com.mmc.iuav.group;
-/** 
-* @author 作者 geDuo
-* @version 创建时间：2021年8月28日 下午5:37:44 
-* @explain 类说明 
-*/
-public interface Create {
+
+import javax.validation.groups.Default;
+
+/**
+ * @author 作者 geDuo
+ * @version 创建时间：2021年8月28日 下午5:37:44
+ * @explain 类说明
+ */
+public interface Create extends Default {
 
 }

cms-common/cms-common-util/src/main/java/com/mmc/iuav/group/Update.java

 package com.mmc.iuav.group;
 
+import javax.validation.groups.Default;
+
 /**
  * @author: zj
  * @Date: 2023/5/16 16:32
  */
-public interface Update {
+public interface Update extends Default {
 }

cms-common/cms-common-util/src/main/java/com/mmc/iuav/response/ResultBody.java

@@ -70,9 +70,8 @@ public class ResultBody<T> implements Serializable {
 
     /**
      * 成功
-     *
-     * **/
-    public static ResultBody success1(ResultEnum enums){
+     **/
+    public static ResultBody success1(ResultEnum enums) {
         ResultBody rb = new ResultBody();
         rb.setCode("200");
         rb.setMessage(enums.getResultMsg());
@@ -149,4 +148,6 @@ public class ResultBody<T> implements Serializable {
     public String toString() {
         return JSONObject.toJSONString(this);
     }
+
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/RoleController.java

@@ -31,17 +31,16 @@ public class RoleController extends BaseController {
 
 
     @ApiOperation(value = "角色管理-新增")
-
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("insertRoleInfo")
-    public ResultBody insertRoleInfo(HttpServletRequest request, @Validated(value = {Create.class}) @RequestBody RoleInfoVO role) {
+    public ResultBody insertRoleInfo(HttpServletRequest request, @RequestBody @Validated(value = {Create.class}) RoleInfoVO role) {
         return roleService.insertRoleInfo(role, this.getUserLoginInfoFromRedis(request));
     }
 
     @ApiOperation(value = "角色管理-修改")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("updateRoleInfo")
-    public ResultBody updateRoleInfo(HttpServletRequest request, @Validated(value = {Update.class}) @RequestBody RoleInfoVO role) {
+    public ResultBody updateRoleInfo(HttpServletRequest request, @RequestBody @Validated(value = {Update.class}) RoleInfoVO role) {
         return roleService.updateRoleInfo(role, this.getUserLoginInfoFromRedis(request));
     }
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/util/VaildExceptionConfig.java

+package com.mmc.iuav.user.util;
+
+import com.mmc.iuav.response.ResultBody;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @Author small
+ * @Date 2023/7/10 16:24
+ * @Version 1.0
+ */
+@Slf4j
+@ControllerAdvice
+public class VaildExceptionConfig extends ResultBody {
+
+    @ResponseBody
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResultBody throwCustomException(MethodArgumentNotValidException methodArgumentNotValidException) {
+        log.error("[ @Vaild异常捕获 ] " + methodArgumentNotValidException.getMessage());
+        ResultBody resultBody = new ResultBody();
+        resultBody.setCode("400");
+        resultBody.setMessage(methodArgumentNotValidException.getBindingResult().getFieldError().getDefaultMessage());
+        return resultBody;
+    }
+}

csm-service/cms-service-user/src/main/resources/mapper/RoleDao.xml

@@ -16,6 +16,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="userAccountId" column="user_account_id"/>
         <result property="userName" column="user_name"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
 
@@ -115,7 +116,8 @@
         r.remark,
         r.create_time,
         r.user_account_id,
-        ua.user_name
+        ua.user_name,
+        r.update_time
         FROM
         role_info r
         INNER JOIN user_account ua ON r.user_account_id = ua.id
@@ -125,7 +127,7 @@
             and (r.role_no like CONCAT('%',#{NumberOrName},'%') or
             r.role_name like CONCAT('%',#{NumberOrName},'%'))
         </if>
-        order by r.create_time ASC
+        order by r.update_time desc, r.create_time desc
         limit #{pageNo},#{pageSize}
     </select>