Merge remote-tracking branch 'origin/master'

lishuai

2023-12-26 70577a6d6cf2bded29e71dcad11a0c2605193d20

 server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java

@@ -6,11 +6,15 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.MemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;    
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -36,6 +40,14 @@
    @RequiresPermissions("business:member:create")
    public ApiResponse create(@RequestBody Member member) {
        return ApiResponse.success(memberService.create(member));
    }

    @PreventRepeat
    @ApiOperation("创建劳务人员信息")
    @PostMapping("/laborMemberCreate")
    @RequiresPermissions("business:member:create")
    public ApiResponse<Integer> laborMemberCreate(@RequestBody LaborMemberDTO member){
        return ApiResponse.success(memberService.laborMemberCreate(member));
    }

    @ApiOperation("根据ID删除")
@@ -67,11 +79,70 @@
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID 禁启用  ")
    @PostMapping("/updateStatusById")
    @RequiresPermissions("business:member:update")
    public ApiResponse updateStatusById(@RequestBody Member member){
        memberService.updateStatusById(member);
        return ApiResponse.success(null);
    }

    @ApiOperation("人员移除/解冻")
    @PostMapping("/updateRemoveStatusById")
    @RequiresPermissions("business:member:update")
    public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list){
        if(list.size()>0){
            memberService.updateRemoveStatusById(list);
            return ApiResponse.success(null);
        }else{
            return ApiResponse.failed("参数错误");
        }

    }

    @ApiOperation("人员拉黑/冻结")
    @PostMapping("/updateVisitsStatusById")
    @RequiresPermissions("business:member:update")
    public ApiResponse updateVisitsStatusById(@RequestBody Member member){
        memberService.updateVisitsStatusById(member);
        return ApiResponse.success(null);
    }


    @ApiOperation("批量拉黑/冻结")
    @GetMapping("/batchBlock")
    @RequiresPermissions("business:member:delete")
    public ApiResponse batchBlock(@RequestParam String ids) {
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        memberService.batchBlock(idList);
        return ApiResponse.success(null);
    }


    @ApiOperation("是否可拜访状态修改")
    @PostMapping("/updateCanVisitById")
    @RequiresPermissions("business:member:update")
    public ApiResponse updateCanVisitById(@RequestBody Member member){
        memberService.updateCanVisitById(member);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap) {
        return ApiResponse.success(memberService.findPage(pageWrap));
    }

    @ApiOperation("分页劳务用户信息查询")
    @PostMapping("/findLaborMemberInfoPage")
    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap){
        return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap));
    }

    @ApiOperation("导出Excel")
@@ -87,4 +158,42 @@
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(memberService.findById(id));
    }


    /**
     *
     * 分页查询内部人员信息
     * @param pageWrap
     * @return
     */
    @ApiOperation("分页查询内部人员信息")
    @PostMapping("/findMemberInfoPage")
    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
        if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
            return ApiResponse.success(memberService.findVisitPage(pageWrap));
        }else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
            return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
        }else {
            return ApiResponse.success(null);
        }
    }

    @ApiOperation("分页查询访客人员信息")
    @PostMapping("/findVisitPage")
    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
        return ApiResponse.success(memberService.findVisitPage(pageWrap));
    }


    @ApiOperation("异常人员冻结/拉黑")
    @PostMapping("/findUnusualPage")
    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
        return ApiResponse.success(memberService.findUnusualPage(pageWrap));
    }



}