diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/annotation/PreventRepeatSubmit.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/common/annotation/PreventRepeatSubmit.java similarity index 91% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/annotation/PreventRepeatSubmit.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/common/annotation/PreventRepeatSubmit.java index 1656e5d..b978b2d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/annotation/PreventRepeatSubmit.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/common/annotation/PreventRepeatSubmit.java @@ -1,4 +1,4 @@ -package com.bonus.sgzb.material.annotation; +package com.bonus.sgzb.common.annotation; import java.lang.annotation.*; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/aspect/PreventRepeatSubmitAspect.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/common/aspect/PreventRepeatSubmitAspect.java similarity index 92% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/aspect/PreventRepeatSubmitAspect.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/common/aspect/PreventRepeatSubmitAspect.java index 798a852..20e83c1 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/aspect/PreventRepeatSubmitAspect.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/common/aspect/PreventRepeatSubmitAspect.java @@ -1,10 +1,10 @@ -package com.bonus.sgzb.material.aspect; +package com.bonus.sgzb.common.aspect; import com.alibaba.fastjson2.JSON; -import com.bonus.sgzb.material.annotation.PreventRepeatSubmit; +import com.bonus.sgzb.common.annotation.PreventRepeatSubmit; import com.bonus.sgzb.common.core.exception.BusinessException; import com.bonus.sgzb.common.core.utils.HttpCodeEnum; -import com.bonus.sgzb.material.util.RedisCache; +import com.bonus.sgzb.common.util.RedisCache; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -30,7 +30,7 @@ public class PreventRepeatSubmitAspect { private RedisCache redisCache; // 定义一个切入点 - @Pointcut("@annotation(com.bonus.sgzb.material.annotation.PreventRepeatSubmit)") + @Pointcut("@annotation(com.bonus.sgzb.common.annotation.PreventRepeatSubmit)") public void preventRepeatSubmit() { } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/util/RedisCache.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/common/util/RedisCache.java similarity index 99% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/util/RedisCache.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/common/util/RedisCache.java index 029f3fc..178e343 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/util/RedisCache.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/common/util/RedisCache.java @@ -1,4 +1,4 @@ -package com.bonus.sgzb.material.util; +package com.bonus.sgzb.common.util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.BoundSetOperations; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController.java index 4af7e60..5db6e6d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController.java @@ -1,24 +1,17 @@ package com.bonus.sgzb.material.controller; -import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; -import com.bonus.sgzb.common.log.annotation.Log; -import com.bonus.sgzb.common.log.enums.BusinessType; -import com.bonus.sgzb.material.annotation.PreventRepeatSubmit; -import com.bonus.sgzb.material.domain.AgreementInfo; +import com.bonus.sgzb.common.annotation.PreventRepeatSubmit; import com.bonus.sgzb.material.domain.ToDoBean; -import com.bonus.sgzb.material.service.AgreementInfoService; import com.bonus.sgzb.material.service.ToDoService; import com.bonus.sgzb.material.vo.NoticeInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; import java.util.List; /**