From 1683875a2d39f24e1906d4925286600262f0056e Mon Sep 17 00:00:00 2001 From: Jackwang Date: Sun, 13 Feb 2022 15:26:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiUserPointsController.java | 37 +++++++++++ .../esua/epdc/feign/UserFeignClient.java | 11 +++- .../fallback/UserFeignClientFallback.java | 6 +- .../esua/epdc/service/AppUserService.java | 11 +++- .../epdc/service/impl/AppUserServiceImpl.java | 64 +++++++++++++++++++ 5 files changed, 126 insertions(+), 3 deletions(-) create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiUserPointsController.java diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiUserPointsController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiUserPointsController.java new file mode 100644 index 0000000..f4faf02 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiUserPointsController.java @@ -0,0 +1,37 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +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) { + return appUserService.updateUserPoints( formDto); + } + +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 591d637..47e8972 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/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,15 @@ 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 getUserInfoByMobile(PointsUpdateFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index 6b40b00..9b3c624 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/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,9 @@ public class UserFeignClientFallback implements UserFeignClient { public Result addConsequentSignPoints(UserSignDTO userSignDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "addConsequentSignPoints", userSignDTO); } + + @Override + public Result getUserInfoByMobile(PointsUpdateFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoByMobile", formDto); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java index 5c48fda..d8e1bbc 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/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,13 @@ 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); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 067601f..9413b42 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -37,6 +37,7 @@ 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; @@ -1480,4 +1481,67 @@ public class AppUserServiceImpl implements AppUserService { } return new Result().ok("您已连续签到"+userSignDTO.getConsequentSignDays()+"天，继续努力吧"); } + + @Override + public Result updateUserPoints(PointsUpdateFormDTO formDto) { + Result userResult = userFeignClient.getUserInfoByMobile(formDto); + if(!userResult.success() || userResult.getData()==null){ + return new Result().error("未获取到用户信息!"); + } + UserDTO user = (UserDTO) userResult.getData(); + if("double_info_update".equals(formDto.getBehaviorType())){ + updateBehavior1Points(user); + }else if("grid_patrol".equals(formDto.getBehaviorType())){ + updateBehavior2Points(user); + }else if("grid_report_event".equals(formDto.getBehaviorType())){ + updateBehavior3Points(user); + }else if("grid_work_upload".equals(formDto.getBehaviorType())){ + updateBehavior4Points(user); + } + 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){ + } } From 2585628c7302cb0b7eb9b7328f6488a7ebd85c4e Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 15 Feb 2022 14:31:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=A7=AF=E5=88=86-=E6=9C=80=E7=BB=88=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-api/pom.xml | 2 +- .../controller/ApiUserPointsController.java | 3 + .../esua/epdc/feign/UserFeignClient.java | 43 ++++++++++++- .../fallback/UserFeignClientFallback.java | 22 ++++++- .../esua/epdc/service/AppUserService.java | 1 + .../epdc/service/impl/AppUserServiceImpl.java | 60 ++++--------------- 6 files changed, 78 insertions(+), 53 deletions(-) diff --git a/epdc-cloud-api/pom.xml b/epdc-cloud-api/pom.xml index aaaa0cd..7863f18 100644 --- a/epdc-cloud-api/pom.xml +++ b/epdc-cloud-api/pom.xml @@ -250,7 +250,7 @@ wxb61fe7aced26ba7b 373c305e69b78f4d575d355fddb05146 - 47.104.85.99:9876 + 114.215.125.123:9876 yushan-pointsGroup yushan-pointsGroup diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiUserPointsController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiUserPointsController.java index f4faf02..6c4fc46 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiUserPointsController.java +++ b/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); } + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 47e8972..cae2bd2 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/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 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); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index 9b3c624..7c44acf 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/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 getUserInfoByMobile(PointsUpdateFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoByMobile", formDto); } + + @Override + public Result updateBehavior1Points(PointsUpdateFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateBehavior1Points", formDto); + } + + @Override + public Result updateBehavior2Points(PointsUpdateFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateBehavior2Points", formDto); + } + + @Override + public Result updateBehavior3Points(PointsUpdateFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateBehavior3Points", formDto); + } + + @Override + public Result updateBehavior4Points(PointsUpdateFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateBehavior4Points", formDto); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java index d8e1bbc..dc31d28 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/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); + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 9413b42..3263dd9 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/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 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){ - } }