Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

huanghongfa

2021-06-07 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -4,11 +4,9 @@
import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.MenuVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
import org.springframework.cloud.openfeign.FeignClient;
@@ -703,4 +701,60 @@
     */
    @PostMapping("updateUserArchives")
    R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO);

    /**
     * 修改app用户密码
     * @param userInfoAppDTO    请求参数
     * @return  修改结果
     */
    @PutMapping("updateUserPassByApp")
    R updateUserPassByApp(@RequestBody EditUserInfoPassAppDTO userInfoAppDTO);

    /**
     * 添加网格员
     * @param eventGridMemberAddDTO    请求参数
     * @return  结果
     */
    @PostMapping("addGridUser")
    R addGridUser(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO);

    /**
     * 分页查询网格员
     * @param memberRelationDTO    请求参数
     * @return  结果
     */
    @PostMapping("member/list")
    R getGridMemberList(@RequestBody PageEventGridMemberRelationDTO memberRelationDTO);

    /**
     * 修改网格员信息
     * @param eventGridMemberAddDTO 请求参数
     * @return  修改结果
     */
    @PostMapping("editGridUser")
    R editGridUser(@RequestBody EventGridMemberEditAdminDTO eventGridMemberAddDTO);

    /**
     * 重置网格员密码
     * @param gridMemberDTO 请求参数
     * @return  重置结果
     */
    @PostMapping("passResetUser")
    R gridMemberPassReset(@RequestBody EventGridMemberPassResetDTO gridMemberDTO);

    /**
     * 批量删除网格员
     * @param Ids   网格员id集合
     * @return  删除结果
     */
    @PostMapping("deleteMembers")
    R deleteMembers(@RequestBody List<Long> Ids);

    /**
     * 批量修改网格员状态
     * @param gridMemberEditDTO 请求参数
     * @return  修改结果
     */
    @PostMapping("gridMemberEditStatus")
    R gridMemberEditStatus(@RequestBody EventGridMemberEditStatusDTO gridMemberEditDTO);
}