Merge remote-tracking branch 'origin/master'

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/ErrorInfo.java

@@ -42,4 +42,10 @@ public class ErrorInfo implements Serializable {
      * 错误详情
      */
     private String detils;
+
+    public ErrorInfo(Integer code, String type, String message) {
+        this.code = code;
+        this.type = type;
+        this.message = message;
+    }
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/ResultInfo.java

@@ -0,0 +1,52 @@
+package org.dromara.common.core.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.enums.ResultCodeEnum;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * name: ResultInfo
+ * package: org.dromara.common.core.domain.model
+ * description: 接口或服务调用时的返回结果
+ * date: 2024-11-01 16:04:34 16:04
+ *
+ * @author luoyibo
+ * @version 0.1
+ * @since JDK 1.8
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ResultInfo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 结果状态代码
+     */
+    private Integer code;
+
+    /**
+     * 结果状态信息
+     */
+    private String message;
+    /**
+     * 结果详情，一般在出错的情况下将错误详情放入此项
+     */
+    private String detail;
+
+    public ResultInfo(ResultCodeEnum resultCodeEnum) {
+        this.code = resultCodeEnum.code();
+        this.message = resultCodeEnum.message();
+    }
+    public ResultInfo(ResultCodeEnum resultCodeEnum,String detail) {
+        this.code = resultCodeEnum.code();
+        this.message = resultCodeEnum.message();
+        this.detail = detail;
+    }
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/CardOperateEnum.java

@@ -0,0 +1,94 @@
+package org.dromara.common.core.enums;
+
+/**
+ * @ClassName CardOperateEnum
+ * @Description 卡片操作类型枚举
+ * @Author luoyibo
+ * @Date 2024-11-07 10:49
+ * @Version 1.0
+ * @since jdk17
+ */
+public enum CardOperateEnum {
+    /***
+     * 读卡
+     */
+    READ(1,"读卡"),
+
+    ISSUE(2,"发卡"),
+
+    CHANGE(3,"换卡"),
+
+    REISSUE(4,"补卡"),
+
+    LOCK(5,"挂失"),
+
+    UNLOCK(6,"解挂"),
+
+    FREEZE(7,"冻结"),
+
+    THAW(8,"解冻"),
+
+    RECHARGE(9,"充值"),
+
+    REFUND(10,"退款"),
+
+    RETURN_CARD(11,"退卡"),
+
+    CLOSE_CARD(12,"销户"),
+
+    RECYCLE(13,"回收"),
+
+    RESET_EXPIRY_DATE(14,"重置有效期"),
+
+    RESET_TYPE(15,"重置卡类"),
+
+    ROLLBACK(999,"回滚状态");
+
+    private final Integer code;
+    private final String message;
+
+    CardOperateEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public Integer code() {
+        return this.code;
+    }
+
+    public String message() {
+        return this.message;
+    }
+
+    public static String getMessage(String name) {
+        for (CardOperateEnum item : CardOperateEnum.values()) {
+            if (item.name().equals(name)) {
+                return item.message;
+            }
+        }
+        return name;
+    }
+
+    public static Integer getCode(String name) {
+        for (CardOperateEnum item : CardOperateEnum.values()) {
+            if (item.name().equals(name)) {
+                return item.code;
+            }
+        }
+        return null;
+    }
+
+    public static CardOperateEnum getEnum(Integer code) {
+        for (CardOperateEnum item : CardOperateEnum.values()) {
+            if (item.code().equals(code)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return this.name();
+    }
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/ResultCodeEnum.java

@@ -0,0 +1,97 @@
+package org.dromara.common.core.enums;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName ResultCodeEnum
+ * @Description 统一返回结果枚举
+ * @Author luoyibo
+ * @Date 2024-11-07 10:07
+ * @Version 1.0
+ * @since jdk17
+ */
+public enum ResultCodeEnum {
+    /* 成功状态码 */
+    SUCCESS(200, "请求成功"),
+
+    /* 参数错误：10001-19999 */
+    PARAM_IS_INVALID(10001, "参数无效"),
+    PARAM_IS_BLANK(10002, "参数为空"),
+    PARAM_TYPE_BIND_ERROR(10003, "参数类型错误"),
+    PARAM_NOT_COMPLETE(10004, "参数缺失"),
+
+    /* 用户错误：20001-29999*/
+    USER_NOT_LOGGED_IN(20001, "用户未登录"),
+    USER_LOGIN_ERROR(20002, "账号不存在或密码错误"),
+    USER_ACCOUNT_FORBIDDEN(20003, "账号已被禁用"),
+    USER_NOT_EXIST(20004, "用户不存在"),
+    USER_HAS_EXISTED(20005, "用户已存在"),
+    LOGIN_CREDENTIAL_EXISTED(20006, "凭证已存在"),
+
+    /* 业务错误：30001-39999 */
+    SPECIFIED_QUESTIONED_USER_NOT_EXIST(30001, "业务错误"),
+
+    /* 系统错误：40001-49999 */
+    SYSTEM_INNER_ERROR(40001, "系统繁忙，请稍后重试"),
+    BANK_NO_ANSWER(49999, "银行服务器应答超时"),
+
+    /* 数据错误：50001-599999 */
+    DATA_NOT_FOUND(50001, "数据未找到"),
+    DATA_IS_WRONG(50002, "数据有误"),
+    DATA_ALREADY_EXISTED(50003, "数据已存在"),
+
+    /* 接口错误：60001-69999 */
+    INTERFACE_INNER_INVOKE_ERROR(60001, "内部系统接口调用异常"),
+    INTERFACE_OUTER_INVOKE_ERROR(60002, "外部系统接口调用异常"),
+    INTERFACE_FORBID_VISIT(60003, "该接口禁止访问"),
+    INTERFACE_ADDRESS_INVALID(60004, "接口地址无效"),
+    INTERFACE_REQUEST_TIMEOUT(60005, "接口请求超时"),
+    INTERFACE_EXCEED_LOAD(60006, "接口负载过高"),
+
+    /* 权限错误：70001-79999 */
+    PERMISSION_NO_ACCESS(70001, "无访问权限"),
+    RESOURCE_EXISTED(70002, "资源已存在"),
+    RESOURCE_NOT_EXISTED(70003, "资源不存在");
+
+    private final Integer code;
+
+    private final String message;
+
+    ResultCodeEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public Integer code() {
+        return this.code;
+    }
+
+    public String message() {
+        return this.message;
+    }
+
+    public static String getMessage(String name) {
+        for (ResultCodeEnum item : ResultCodeEnum.values()) {
+            if (item.name().equals(name)) {
+                return item.message;
+            }
+        }
+        return name;
+    }
+
+    public static Integer getCode(String name) {
+        for (ResultCodeEnum item : ResultCodeEnum.values()) {
+            if (item.name().equals(name)) {
+                return item.code;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return this.name();
+    }
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/card/CardNoBusiness.java

@@ -27,7 +27,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 public class CardNoBusiness implements CommandLineRunner {
     private final IPtCardService ptCardService;
 
-    private static final LinkedBlockingQueue<Integer> concurrentLinkedQueue = new LinkedBlockingQueue<Integer>();
+    private static final LinkedBlockingQueue<Integer> concurrentLinkedQueue = new LinkedBlockingQueue<>();
 
     @Scheduled(cron = "0 0 1 * * ?")
     public void setCardNo() {