dsx пре 2 година
родитељ
комит
710ea09241

+ 3 - 0
src/main/java/com/fdkankan/openApi/aop/ValidateApiAOP.java

@@ -18,18 +18,21 @@ import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 
+@Order(999)
 @Component
 @Aspect
 @Slf4j
 public class ValidateApiAOP {
 
     @Autowired
+
     private RedisUtil redisUtil;
     @Autowired
     private CallApiSender callApiSender;

+ 6 - 0
src/main/java/com/fdkankan/openApi/controller/www/SceneController.java

@@ -46,6 +46,7 @@ public class SceneController extends BaseController {
     @SaIgnore
     @GetMapping("/test")
     @RedisLimit(limitCount = 1, period = 1)
+    @ValidateApi(method = "scene:test")
 //    @ValidateApi(method = "scene:getSceneList")
     public  ResultData test() throws InterruptedException {
         return ResultData.ok();
@@ -57,6 +58,7 @@ public class SceneController extends BaseController {
      */
     @SaIgnore
     @PostMapping("/getSceneList")
+    @RedisLimit(limitCount = 1, period = 1)
     @ValidateApi(method = "scene:getSceneList")
     public ResultData getScenesByUsername(@RequestBody PageScenesParamVo param) {
         PageInfo pageInfo = scenePlusService.getScenesByUserId(this.getUserId(),param);
@@ -69,6 +71,7 @@ public class SceneController extends BaseController {
      */
     @SaIgnore
     @PostMapping("/getScenePointInfo")
+    @RedisLimit(limitCount = 1, period = 1)
     @ValidateApi(method = "scene:getScenePointInfo")
     public ResultData getScenePointInfo(@RequestBody @Validated BaseSceneParamVo param) {
         ScenePlus scenePlus = scenePlusService.getByNumAndUserId(this.getUserId(), param.getSceneCode());
@@ -87,6 +90,7 @@ public class SceneController extends BaseController {
      */
     @SaIgnore
     @PostMapping("/getSceneObj")
+    @RedisLimit(limitCount = 1, period = 1)
     @ValidateApi(method = "scene:getSceneObj")
     public ResultData getSceneObjFiles(@RequestBody @Validated BaseSceneParamVo param) {
         ScenePlus scenePlus = scenePlusService.getByNumAndUserId(this.getUserId(), param.getSceneCode());
@@ -102,6 +106,7 @@ public class SceneController extends BaseController {
      */
     @SaIgnore
     @PostMapping("/getScenePanorama")
+    @RedisLimit(limitCount = 1, period = 1)
     @ValidateApi(method = "scene:getScenePanorama")
     public ResultData getScenePanoramicImageFiles(@RequestBody @Validated BaseSceneParamVo param) {
         ScenePlus scenePlus = scenePlusService.getByNumAndUserId(this.getUserId(), param.getSceneCode());
@@ -117,6 +122,7 @@ public class SceneController extends BaseController {
      */
     @SaIgnore
     @PostMapping("/getSceneViewUserFile")
+    @RedisLimit(limitCount = 1, period = 30)
     @ValidateApi(method = "scene:getSceneViewUserFile")
     public ResultData getSceneViewUserFile(@RequestBody @Validated BaseSceneParamVo param) {
         return ResultData.ok(scenePlusService.getSceneViewUserFile(param.getSceneCode(), this.getUserId()));

+ 1 - 1
src/main/java/com/fdkankan/openApi/entity/system/SystemBaseEntity.java

@@ -53,7 +53,7 @@ public class SystemBaseEntity implements Serializable {
      * 0-有效,1-删除, 2-禁用
      */
     @TableField("tb_status")
-    @TableLogic
+    @TableLogic(value = "0", delval = "1")
     private Integer tbStatus;
 
 }

+ 1 - 1
src/main/java/com/fdkankan/openApi/service/system/impl/UserAuthInfoInfoServiceImpl.java

@@ -128,7 +128,7 @@ public class UserAuthInfoInfoServiceImpl extends ServiceImpl<IUserAuthInfoMapper
         if(CommonStatus.NO.code().intValue() == userAuthInfo.getState()){
             throw new BusinessException(ErrorCode.FAILURE_CODE_10000);
         }
-        if(userAuthInfo.getEffectTime().before(Calendar.getInstance().getTime())){
+        if(userAuthInfo.getEffectTime().after(Calendar.getInstance().getTime())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_10001);
         }
         return userAuthInfo;