From 45960a2dc110f41460c4f3058aa160f0e30b37e9 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 15 Feb 2022 14:39:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E7=A7=AF?= =?UTF-8?q?=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 --- .../esua/epdc/controller/UserController.java | 54 ++++++++++++++++++- .../elink/esua/epdc/service/UserService.java | 2 +- .../epdc/service/impl/UserServiceImpl.java | 4 +- 3 files changed, 55 insertions(+), 5 deletions(-) diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java index a0504cf..becc5f2 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -403,7 +403,59 @@ public class UserController { * @return com.elink.esua.epdc.commons.tools.utils.Result */ @GetMapping("getUserInfoByMobile") - public Result getUserInfoByMobile(@RequestBody PointsUpdateFormDTO formDto) { + public Result getUserInfoByMobile(@RequestBody PointsUpdateFormDTO formDto) { return userService.getUserByMobile(formDto.getMobile()); } + + /** + * @describe: 双实信息更新及上报 + * @author wangtong + * @date 2022/2/13 15:20 + * @params [user] + * @return void + */ + @PostMapping("updateBehavior1Points") + @RecordUserBehavior(behavior = BehaviorEnum.DOUBLE_INFO_UPDATE, referenceId = "#{formDto.getUserId}", userId = "#{formDto.getUserId}") + public Result updateBehavior1Points(@RequestBody PointsUpdateFormDTO formDto) { + return new Result().ok("操作成功"); + } + + /** + * @describe: 网格巡查 + * @author wangtong + * @date 2022/2/13 15:20 + * @params [user] + * @return void + */ + @PostMapping("updateBehavior2Points") + @RecordUserBehavior(behavior = BehaviorEnum.GRID_PATROL, referenceId = "#{formDto.getUserId}", userId = "#{formDto.getUserId}") + public Result updateBehavior2Points(@RequestBody PointsUpdateFormDTO formDto) { + return new Result().ok("操作成功"); + } + + /** + * @describe: 网格上报事件 + * @author wangtong + * @date 2022/2/13 15:20 + * @params [user] + * @return void + */ + @PostMapping("updateBehavior3Points") + @RecordUserBehavior(behavior = BehaviorEnum.GRID_REPORT_EVENT, referenceId = "#{formDto.getUserId}", userId = "#{formDto.getUserId}") + public Result updateBehavior3Points(@RequestBody PointsUpdateFormDTO formDto) { + return new Result().ok("操作成功"); + } + + /** + * @describe: 网格工作上传 + * @author wangtong + * @date 2022/2/13 15:20 + * @params [user] + * @return void + */ + @PostMapping("updateBehavior4Points") + @RecordUserBehavior(behavior = BehaviorEnum.GRID_WORK_UPLOAD, referenceId = "#{formDto.getUserId}", userId = "#{formDto.getUserId}") + public Result updateBehavior4Points(@RequestBody PointsUpdateFormDTO formDto) { + return new Result().ok("操作成功"); + } } diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java index 4cdc426..d383731 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java @@ -457,7 +457,7 @@ public interface UserService extends BaseService { * @params [dto] * @return com.elink.esua.epdc.commons.tools.utils.Result */ - Result getUserByMobile(String mobile); + Result getUserByMobile(String mobile); /** * @describe: 志愿组织模块获取用户列表 diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 2d2d7bf..c177250 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -33,7 +33,6 @@ import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant; -import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; import com.elink.esua.epdc.commons.tools.constant.StrConstant; import com.elink.esua.epdc.commons.tools.enums.UserAuthTypeEnum; import com.elink.esua.epdc.commons.tools.enums.UserSexEnum; @@ -43,7 +42,6 @@ import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; -import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.*; import com.elink.esua.epdc.config.StreamUtils; import com.elink.esua.epdc.constant.AuthenticatedConsant; @@ -1689,7 +1687,7 @@ public class UserServiceImpl extends BaseServiceImpl implem } @Override - public Result getUserByMobile(String mobile) { + public Result getUserByMobile(String mobile) { UserDTO user = baseDao.getUserByMobile(mobile); return new Result().ok(user); }