积分重置 bug修改

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();
 
 }

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/user/ScreenUserPointsResetImpl.java

@@ -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 + "|用户积分季度重置>定时任务结束");
-    }
-
-}

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 + "|用户积分季度重置>定时任务结束");
+    }
 }

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<String> checkRepeatUser(@RequestBody CheckRepeatUserFormDTO checkRepeatUserFormDTO){
+    public Result<String> checkRepeatUser(@RequestBody CheckRepeatUserFormDTO checkRepeatUserFormDTO){
         return userService.checkRepeatUser(checkRepeatUserFormDTO);
     }
     /**
@@ -361,7 +361,7 @@ public class UserController {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
      **/
     @PostMapping(value = "combineVolunteerUser")
-    Result<UserDTO> combineVolunteerUser(@RequestBody CombineVolunteerUserFormDTO formDTO){
+    public Result<UserDTO> 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();
     }