更新用户积分-最终版

epdc-cloud-api/pom.xml

@@ -250,7 +250,7 @@
                 <analysis.wx.ma.appId>wxb61fe7aced26ba7b</analysis.wx.ma.appId>
                 <analysis.wx.ma.secret>373c305e69b78f4d575d355fddb05146</analysis.wx.ma.secret>
 
-                <rocketmq.name.server>47.104.85.99:9876</rocketmq.name.server>
+                <rocketmq.name.server>114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.producer.group>yushan-pointsGroup</rocketmq.producer.group>
                 <rocketmq.consumer.points.group>yushan-pointsGroup</rocketmq.consumer.points.group>
             </properties>

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiUserPointsController.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.PointsUpdateFormDTO;
 import com.elink.esua.epdc.service.AppUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +32,9 @@ public class ApiUserPointsController {
     */
     @PostMapping("updateUserPoints")
     public Result updateUserPoints(@RequestBody PointsUpdateFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
         return appUserService.updateUserPoints( formDto);
     }
 
+
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -500,6 +500,47 @@ public interface UserFeignClient {
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
     @GetMapping(value = "app-user/user/getUserInfoByMobile", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result getUserInfoByMobile(PointsUpdateFormDTO formDto);
+    Result<UserDTO> getUserInfoByMobile(PointsUpdateFormDTO formDto);
+
+
+    /**
+     * @describe: 双实信息更新及上报
+     * @author wangtong
+     * @date 2022/2/13 15:20
+     * @params [user]
+     * @return void
+     */
+    @PostMapping(value = "app-user/user/updateBehavior1Points", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result updateBehavior1Points(PointsUpdateFormDTO formDto);
+
+    /**
+     * @describe: 网格巡查
+     * @author wangtong
+     * @date 2022/2/13 15:20
+     * @params [user]
+     * @return void
+     */
+    @PostMapping(value = "app-user/user/updateBehavior2Points", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result updateBehavior2Points(PointsUpdateFormDTO formDto);
+
+    /**
+     * @describe: 网格上报事件
+     * @author wangtong
+     * @date 2022/2/13 15:20
+     * @params [user]
+     * @return void
+     */
+    @PostMapping(value = "app-user/user/updateBehavior3Points", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result updateBehavior3Points(PointsUpdateFormDTO formDto);
+
+    /**
+     * @describe: 网格工作上传
+     * @author wangtong
+     * @date 2022/2/13 15:20
+     * @params [user]
+     * @return void
+     */
+    @PostMapping(value = "app-user/user/updateBehavior4Points", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result updateBehavior4Points(PointsUpdateFormDTO formDto);
 }
 

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -240,7 +240,27 @@ public class UserFeignClientFallback implements UserFeignClient {
     }
 
     @Override
-    public Result getUserInfoByMobile(PointsUpdateFormDTO formDto) {
+    public Result<UserDTO> getUserInfoByMobile(PointsUpdateFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoByMobile", formDto);
     }
+
+    @Override
+    public Result<UserDTO> updateBehavior1Points(PointsUpdateFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateBehavior1Points", formDto);
+    }
+
+    @Override
+    public Result<UserDTO> updateBehavior2Points(PointsUpdateFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateBehavior2Points", formDto);
+    }
+
+    @Override
+    public Result<UserDTO> updateBehavior3Points(PointsUpdateFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateBehavior3Points", formDto);
+    }
+
+    @Override
+    public Result<UserDTO> updateBehavior4Points(PointsUpdateFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateBehavior4Points", formDto);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java

@@ -340,4 +340,5 @@ public interface AppUserService {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     Result updateUserPoints(PointsUpdateFormDTO formDto);
+
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -37,7 +37,6 @@ import com.elink.esua.epdc.feign.*;
 import com.elink.esua.epdc.jwt.JwtTokenProperties;
 import com.elink.esua.epdc.jwt.JwtTokenUtils;
 import com.elink.esua.epdc.modules.points.feign.PointsFeignClient;
-import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior;
 import com.elink.esua.epdc.pointcommons.tools.dto.PointsRuleResultDTO;
 import com.elink.esua.epdc.redis.AppUserRedis;
 import com.elink.esua.epdc.service.AppUserService;
@@ -1484,64 +1483,25 @@ public class AppUserServiceImpl implements AppUserService {
 
     @Override
     public Result updateUserPoints(PointsUpdateFormDTO formDto) {
-        Result userResult = userFeignClient.getUserInfoByMobile(formDto);
+        Result<UserDTO> userResult = userFeignClient.getUserInfoByMobile(formDto);
         if(!userResult.success() || userResult.getData()==null){
-            return new Result().error("未获取到用户信息!");
+            log.info(userResult.toString());
+            throw new RenException("未获取到用户信息!");
         }
-        UserDTO user = (UserDTO) userResult.getData();
+        formDto.setUserId(userResult.getData().getId());
         if("double_info_update".equals(formDto.getBehaviorType())){
-            updateBehavior1Points(user);
+            userFeignClient.updateBehavior1Points(formDto);
         }else if("grid_patrol".equals(formDto.getBehaviorType())){
-            updateBehavior2Points(user);
+            userFeignClient.updateBehavior2Points(formDto);
         }else if("grid_report_event".equals(formDto.getBehaviorType())){
-            updateBehavior3Points(user);
+            userFeignClient.updateBehavior3Points(formDto);
         }else if("grid_work_upload".equals(formDto.getBehaviorType())){
-            updateBehavior4Points(user);
+            userFeignClient.updateBehavior4Points(formDto);
+        }else{
+            throw new RenException("请输入正确的行为类型编码。");
         }
         return new Result().ok("操作成功");
     }
 
-    /**
-     * @describe: 双实信息更新及上报
-     * @author wangtong
-     * @date 2022/2/13 15:20
-     * @params [user]
-     * @return void
-     */
-    @RecordUserBehavior(behavior = BehaviorEnum.DOUBLE_INFO_UPDATE, referenceId = "#{user.getId}", userId = "#{user.getId}")
-    private void updateBehavior1Points(UserDTO user){
-    }
-
-    /**
-     * @describe: 网格巡查
-     * @author wangtong
-     * @date 2022/2/13 15:20
-     * @params [user]
-     * @return void
-     */
-    @RecordUserBehavior(behavior = BehaviorEnum.GRID_PATROL, referenceId = "#{user.getId}", userId = "#{user.getId}")
-    private void updateBehavior2Points(UserDTO user){
-    }
 
-    /**
-     * @describe: 网格上报事件
-     * @author wangtong
-     * @date 2022/2/13 15:20
-     * @params [user]
-     * @return void
-     */
-    @RecordUserBehavior(behavior = BehaviorEnum.GRID_REPORT_EVENT, referenceId = "#{user.getId}", userId = "#{user.getId}")
-    private void updateBehavior3Points(UserDTO user){
-    }
-
-    /**
-     * @describe: 网格工作上传
-     * @author wangtong
-     * @date 2022/2/13 15:20
-     * @params [user]
-     * @return void
-     */
-    @RecordUserBehavior(behavior = BehaviorEnum.GRID_WORK_UPLOAD, referenceId = "#{user.getId}", userId = "#{user.getId}")
-    private void updateBehavior4Points(UserDTO user){
-    }
 }