Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PositionCloudController.java

@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Position;
import com.doumee.service.business.PositionService;
@@ -34,7 +34,7 @@
    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @CloudRequiredPermission("business:visitreason:create")
    @CloudRequiredPermission("business:position:create")
    public ApiResponse create(@RequestBody Position position,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        position.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(positionService.create(position));
@@ -42,7 +42,7 @@

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:visitreason:delete")
    @CloudRequiredPermission("business:position:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        positionService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
@@ -50,7 +50,7 @@

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @CloudRequiredPermission("business:visitreason:delete")
    @CloudRequiredPermission("business:position:delete")
    public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
@@ -63,7 +63,7 @@

    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:visitreason:update")
    @CloudRequiredPermission("business:position:update")
    public ApiResponse updateById(@RequestBody Position position,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        position.setLoginUserInfo(this.getLoginUser(token));
        positionService.updateById(position);
@@ -72,27 +72,27 @@

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @CloudRequiredPermission("business:visitreason:query")
    @CloudRequiredPermission("business:position:query")
    public ApiResponse<PageData<Position>> findPage (@RequestBody PageWrap<Position> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(positionService.findPage(pageWrap));
    }
    @ApiOperation("查询全部")
    @PostMapping("/list")
    @CloudRequiredPermission("business:visitreason:query")
    @CloudRequiredPermission("business:position:query")
    public ApiResponse<List<Position>> findList (@RequestBody Position  pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(positionService.findList(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:visitreason:exportExcel")
    @CloudRequiredPermission("business:position:exportExcel")
    public void exportExcel (@RequestBody PageWrap<Position> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        ExcelExporter.build(Position.class).export(positionService.findPage(pageWrap).getRecords(), "访客事由信息表", response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @CloudRequiredPermission("business:visitreason:query")
    @CloudRequiredPermission("business:position:query")
    public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(positionService.findById(id));
    }