From f6266aa9cf29575bc1cf0d485203875590c4bd5e Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 21 Apr 2021 14:13:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E9=87=8D=E7=BD=AE=20bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/feign/UserFeignClient.java | 2 +- .../task/user/ScreenUserPointsResetImpl.java | 43 ------------------- .../task/user/ScreenUserPointsResetTask.java | 31 +++++++++---- .../esua/epdc/controller/UserController.java | 10 ++--- 4 files changed, 28 insertions(+), 58 deletions(-) delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/user/ScreenUserPointsResetImpl.java diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index c0959eb8..80d65b4c 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -52,7 +52,7 @@ public interface UserFeignClient { * @author syp * @since 2019/10/25 17:07 */ - @PostMapping("app-user/epdc-app/user/resetPoints") + @PostMapping("app-user/user/resetPoints") Result resetPoints(); } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/user/ScreenUserPointsResetImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/user/ScreenUserPointsResetImpl.java deleted file mode 100644 index 7e3f06d9..00000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/user/ScreenUserPointsResetImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.elink.esua.epdc.task.user; - -import com.alibaba.fastjson.JSONObject; -import com.elink.esua.epdc.dto.ScreenIndexBasicDataParamDTO; -import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO; -import com.elink.esua.epdc.feign.AnalysisFeignClient; -import com.elink.esua.epdc.feign.UserFeignClient; -import com.elink.esua.epdc.task.screen.ScreenIndexDataPushTask; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 用户模块 - * - * @Author：liuchuang - * @Date：2020/9/9 15:19 - */ -@Component("screenUserPointsResetTask") -public class ScreenUserPointsResetImpl implements ScreenUserPointsResetTask { - - private final Logger logger = LoggerFactory.getLogger(getClass()); - - @Autowired - private UserFeignClient userFeignClient; - - @Override - public void run() { - // 用户季度积分重置 - resetUserPoints(); - } - - public void resetUserPoints() { - // 方法名 - String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); - logger.info("<" + methodName + "|用户积分季度重置>定时任务开始"); - userFeignClient.resetPoints(); - logger.info("<" + methodName + "|用户积分季度重置>定时任务结束"); - } - -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/user/ScreenUserPointsResetTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/user/ScreenUserPointsResetTask.java index abbc679f..deb86794 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/user/ScreenUserPointsResetTask.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/user/ScreenUserPointsResetTask.java @@ -1,19 +1,32 @@ package com.elink.esua.epdc.task.user; +import com.elink.esua.epdc.feign.UserFeignClient; +import com.elink.esua.epdc.task.ITask; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + /** * 用户积分重置模块 * * @Author：liuchuang * @Date：2020/9/9 15:20 */ -public interface ScreenUserPointsResetTask { +@Component("screenUserPointsResetTask") +public class ScreenUserPointsResetTask implements ITask { + + private final Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private UserFeignClient userFeignClient; - /** - * 用户积分重置模块 - * @param param 入参 - * @return void - * @author syp - * @since 2020/9/9 15:21 - */ - void run(); + @Override + public void run(String param) { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|用户积分季度重置>定时任务开始"); + userFeignClient.resetPoints(); + logger.info("<" + methodName + "|用户积分季度重置>定时任务结束"); + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java index 400a7a4e..9f0033ef 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -338,7 +338,7 @@ public class UserController { * @Param [dto] **/ @PostMapping(value = "updateUserPoints") - Result updateUserPoints(@RequestBody EpdcUserPointsFormDTO epdcUserPointsFormDTO){ + public Result updateUserPoints(@RequestBody EpdcUserPointsFormDTO epdcUserPointsFormDTO){ return userService.updateUserPoints(epdcUserPointsFormDTO); } @@ -350,7 +350,7 @@ public class UserController { * @Param [dto] **/ @PostMapping(value = "checkRepeatUser") - Result checkRepeatUser(@RequestBody CheckRepeatUserFormDTO checkRepeatUserFormDTO){ + public Result checkRepeatUser(@RequestBody CheckRepeatUserFormDTO checkRepeatUserFormDTO){ return userService.checkRepeatUser(checkRepeatUserFormDTO); } /** @@ -361,7 +361,7 @@ public class UserController { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ @PostMapping(value = "combineVolunteerUser") - Result combineVolunteerUser(@RequestBody CombineVolunteerUserFormDTO formDTO){ + public Result combineVolunteerUser(@RequestBody CombineVolunteerUserFormDTO formDTO){ return userService.combineVolunteerUser(formDTO); } /** @@ -371,8 +371,8 @@ public class UserController { * @Param [] * @return com.elink.esua.epdc.commons.tools.utils.Result **/ - @GetMapping("resetPoints") - private Result resetPoints(){ + @PostMapping("resetPoints") + public Result resetPoints(){ return userService.resetPoints(); }