Merge remote-tracking branch 'origin/origin/update_points'

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

@@ -0,0 +1,40 @@
+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;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * APP爱心排名
+ *
+ * @author wanggongfeng
+ * @date 2019/12/17 10:30
+ */
+@RestController
+@RequestMapping("points/behavior")
+public class ApiUserPointsController {
+
+    @Autowired
+    private AppUserService appUserService;
+
+    /**
+    * @describe: 更新用户积分(双实信息更新 网格巡查)
+    * @author wangtong
+    * @date 2022/2/13 14:47
+    * @params [formDto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @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

@@ -1,6 +1,5 @@
 package com.elink.esua.epdc.feign;
 
-import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.*;
@@ -492,5 +491,56 @@ public interface UserFeignClient {
      **/
     @GetMapping(value = "app-user/usersign/addConsequentSignPoints", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result addConsequentSignPoints(UserSignDTO userSignDTO);
+
+    /**
+    * @describe: 通过手机号查询人员信息
+    * @author wangtong
+    * @date 2022/2/13 14:52
+    * @params [formDto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping(value = "app-user/user/getUserInfoByMobile", consumes = MediaType.APPLICATION_JSON_VALUE)
+    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

@@ -1,6 +1,5 @@
 package com.elink.esua.epdc.feign.fallback;
 
-import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -239,4 +238,29 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result addConsequentSignPoints(UserSignDTO userSignDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "addConsequentSignPoints", userSignDTO);
     }
+
+    @Override
+    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

@@ -1,8 +1,8 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
-import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.PointsUpdateFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.dto.form.*;
@@ -331,4 +331,14 @@ public interface AppUserService {
      * @Date 10:27 2022-01-25
      **/
     Result userSign(TokenDto userDetail);
+
+    /**
+     * @describe: 更新用户积分(双实信息更新 网格巡查)
+     * @author wangtong
+     * @date 2022/2/13 14:47
+     * @params [formDto]
+     * @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

@@ -1480,4 +1480,28 @@ public class AppUserServiceImpl implements AppUserService {
         }
         return new Result().ok("您已连续签到"+userSignDTO.getConsequentSignDays()+"天，继续努力吧");
     }
+
+    @Override
+    public Result updateUserPoints(PointsUpdateFormDTO formDto) {
+        Result<UserDTO> userResult = userFeignClient.getUserInfoByMobile(formDto);
+        if(!userResult.success() || userResult.getData()==null){
+            log.info(userResult.toString());
+            throw new RenException("未获取到用户信息!");
+        }
+        formDto.setUserId(userResult.getData().getId());
+        if("double_info_update".equals(formDto.getBehaviorType())){
+            userFeignClient.updateBehavior1Points(formDto);
+        }else if("grid_patrol".equals(formDto.getBehaviorType())){
+            userFeignClient.updateBehavior2Points(formDto);
+        }else if("grid_report_event".equals(formDto.getBehaviorType())){
+            userFeignClient.updateBehavior3Points(formDto);
+        }else if("grid_work_upload".equals(formDto.getBehaviorType())){
+            userFeignClient.updateBehavior4Points(formDto);
+        }else{
+            throw new RenException("请输入正确的行为类型编码。");
+        }
+        return new Result().ok("操作成功");
+    }
+
+
 }