dictItemList;
+
+ @Schema(description = "字典")
+ @Getter
+ @Setter
+ public static class DictItem {
+
+ @Schema(description = "字典项ID")
+ private Long id;
+
+ @Schema(description = "字典项名称")
+ private String name;
+
+ @Schema(description = "字典项值")
+ private String value;
+
+ @Schema(description = "排序")
+ private Integer sort;
+
+ @Schema(description = "状态（1-启用，0-禁用）")
+ private Integer status;
+
+ }
+
}
diff --git a/src/main/java/com/youlai/system/model/vo/DictTypePageVO.java b/src/main/java/com/youlai/system/model/vo/DictTypePageVO.java
deleted file mode 100644
index a6419988..00000000
--- a/src/main/java/com/youlai/system/model/vo/DictTypePageVO.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.youlai.system.model.vo;
-
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description ="字典类型分页对象")
-@Data
-public class DictTypePageVO {
-
- @Schema(description="字典类型ID")
- private Long id;
-
- @Schema(description="类型名称")
- private String name;
-
- @Schema(description="类型编码")
- private String code;
-
- @Schema(description="状态：1:启用;0:禁用")
- private Integer status;
-
-}
diff --git a/src/main/java/com/youlai/system/plugin/dupsubmit/annotation/PreventDuplicateSubmit.java b/src/main/java/com/youlai/system/plugin/norepeat/annotation/PreventRepeatSubmit.java
similarity index 55%
rename from src/main/java/com/youlai/system/plugin/dupsubmit/annotation/PreventDuplicateSubmit.java
rename to src/main/java/com/youlai/system/plugin/norepeat/annotation/PreventRepeatSubmit.java
index d23ce1b4..a767e2ee 100644
--- a/src/main/java/com/youlai/system/plugin/dupsubmit/annotation/PreventDuplicateSubmit.java
+++ b/src/main/java/com/youlai/system/plugin/norepeat/annotation/PreventRepeatSubmit.java
@@ -1,10 +1,13 @@
-package com.youlai.system.plugin.dupsubmit.annotation;
+package com.youlai.system.plugin.norepeat.annotation;
import java.lang.annotation.*;
/**
* 防止重复提交注解
+ *
+ * 该注解用于方法上，防止在指定时间内的重复提交。
+ * 默认时间为5秒。
*
* @author haoxr
* @since 2.3.0
@@ -13,10 +16,10 @@ import java.lang.annotation.*;
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited
-public @interface PreventDuplicateSubmit {
+public @interface PreventRepeatSubmit {
/**
- * 防重提交锁过期时间(秒)
+ * 锁过期时间（秒）
*
* 默认5秒内不允许重复提交
*/
diff --git a/src/main/java/com/youlai/system/plugin/dupsubmit/aspect/DuplicateSubmitAspect.java b/src/main/java/com/youlai/system/plugin/norepeat/aspect/DuplicateSubmitAspect.java
similarity index 82%
rename from src/main/java/com/youlai/system/plugin/dupsubmit/aspect/DuplicateSubmitAspect.java
rename to src/main/java/com/youlai/system/plugin/norepeat/aspect/DuplicateSubmitAspect.java
index c88766bc..8405bb7a 100644
--- a/src/main/java/com/youlai/system/plugin/dupsubmit/aspect/DuplicateSubmitAspect.java
+++ b/src/main/java/com/youlai/system/plugin/norepeat/aspect/DuplicateSubmitAspect.java
@@ -1,4 +1,4 @@
-package com.youlai.system.plugin.dupsubmit.aspect;
+package com.youlai.system.plugin.norepeat.aspect;
import cn.hutool.core.util.StrUtil;
import cn.hutool.jwt.JWTUtil;
@@ -6,7 +6,7 @@ import cn.hutool.jwt.RegisteredPayload;
import com.youlai.system.common.constant.SecurityConstants;
import com.youlai.system.common.exception.BusinessException;
import com.youlai.system.common.result.ResultCode;
-import com.youlai.system.plugin.dupsubmit.annotation.PreventDuplicateSubmit;
+import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -41,17 +41,17 @@ public class DuplicateSubmitAspect {
/**
* 防重复提交切点
*/
- @Pointcut("@annotation(preventDuplicateSubmit)")
- public void preventDuplicateSubmitPointCut(PreventDuplicateSubmit preventDuplicateSubmit) {
+ @Pointcut("@annotation(preventRepeatSubmit)")
+ public void preventDuplicateSubmitPointCut(PreventRepeatSubmit preventRepeatSubmit) {
log.info("定义防重复提交切点");
}
- @Around("preventDuplicateSubmitPointCut(preventDuplicateSubmit)")
- public Object doAround(ProceedingJoinPoint pjp, PreventDuplicateSubmit preventDuplicateSubmit) throws Throwable {
+ @Around("preventDuplicateSubmitPointCut(preventRepeatSubmit)")
+ public Object doAround(ProceedingJoinPoint pjp, PreventRepeatSubmit preventRepeatSubmit) throws Throwable {
String resubmitLockKey = generateResubmitLockKey();
if (resubmitLockKey != null) {
- int expire = preventDuplicateSubmit.expire(); // 防重提交锁过期时间
+ int expire = preventRepeatSubmit.expire(); // 防重提交锁过期时间
RLock lock = redissonClient.getLock(resubmitLockKey);
boolean lockResult = lock.tryLock(0, expire, TimeUnit.SECONDS); // 获取锁失败，直接返回 false
if (!lockResult) {
diff --git a/src/main/java/com/youlai/system/service/SysDictItemService.java b/src/main/java/com/youlai/system/service/SysDictItemService.java
new file mode 100644
index 00000000..9520937a
--- /dev/null
+++ b/src/main/java/com/youlai/system/service/SysDictItemService.java
@@ -0,0 +1,69 @@
+package com.youlai.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.youlai.system.model.entity.SysDictItem;
+import com.youlai.system.model.form.DictForm;
+import com.youlai.system.model.query.DictPageQuery;
+import com.youlai.system.model.vo.DictPageVO;
+import com.youlai.system.common.model.Option;
+
+import java.util.List;
+
+/**
+ * 字典接口
+ *
+ * @author haoxr
+ * @since 2023/3/4
+ */
+public interface SysDictItemService extends IService {
+ /**
+ * 字典数据项分页列表
+ *
+ * @param queryParams
+ * @return
+ */
+ Page getDictPage(DictPageQuery queryParams);
+
+ /**
+ * 字典数据项表单
+ *
+ * @param id 字典数据项ID
+ * @return
+ */
+ DictForm getDictForm(Long id);
+
+ /**
+ * 新增字典数据项
+ *
+ * @param dictForm 字典数据项表单
+ * @return
+ */
+ boolean saveDict(DictForm dictForm);
+
+ /**
+ * 修改字典数据项
+ *
+ * @param id 字典数据项ID
+ * @param dictForm 字典数据项表单
+ * @return
+ */
+ boolean updateDict(Long id, DictForm dictForm);
+
+ /**
+ * 删除字典数据项
+ *
+ * @param idsStr 字典数据项ID，多个以英文逗号(,)分割
+ * @return
+ */
+ boolean deleteDict(String idsStr);
+
+ /**
+ * 获取字典下拉列表
+ *
+ * @param typeCode
+ * @return
+ */
+ List