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

# Conflicts:
#	epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java

epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java

@@ -27,10 +27,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
-import com.elink.esua.epdc.dto.PartyMemberModifyFormDTO;
+import com.elink.esua.epdc.dto.*;
-import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.UserPointResultDTO;
-import com.elink.esua.epdc.dto.UserPointsDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
 import com.elink.esua.epdc.enums.AppUserStatesEnum;
 import com.elink.esua.epdc.excel.*;
@@ -398,6 +395,70 @@ public class UserController {
         return new Result<PageData<UserDTO>>().ok(page);
     }
 
+    /**
+    * @describe: 通过手机号查询人员信息
+    * @author wangtong
+    * @date 2022/2/13 14:35
+    * @params [formDto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getUserInfoByMobile")
+    public Result<UserDTO> 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("操作成功");
+    }
+
     /**
      * @Description  季度重置用户可兑换积分
      * @Author zy

epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java

@@ -457,7 +457,7 @@ public interface UserService extends BaseService<UserEntity> {
      * @params [dto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
-    Result getUserByMobile(String mobile);
+    Result<UserDTO> getUserByMobile(String mobile);
 
     /**
      * @describe: 志愿组织模块获取用户列表

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;
@@ -1693,7 +1691,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     @Override
-    public Result getUserByMobile(String mobile) {
+    public Result<UserDTO> getUserByMobile(String mobile) {
         UserDTO user = baseDao.getUserByMobile(mobile);
         return new Result().ok(user);
     }