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

doum

2 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

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

@@ -4,11 +4,12 @@
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.core.utils.Constants;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.UserAction;
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.service.business.UserActionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -35,7 +36,7 @@
    @ApiOperation("新建")
    @PostMapping("/create")
    @CloudRequiredPermission("business:useraction:create")
    public ApiResponse create(@RequestBody UserAction userAction,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
    public ApiResponse create(@RequestBody UserAction userAction, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(userActionService.create(userAction));
    }

@@ -63,7 +64,7 @@
    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:useraction:update")
    public ApiResponse updateById(@RequestBody UserAction userAction,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
    public ApiResponse updateById(@RequestBody UserAction userAction, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        userActionService.updateById(userAction);
        return ApiResponse.success(null);
    }
@@ -71,14 +72,14 @@
    @ApiOperation("分页查询")
    @PostMapping("/page")
    @CloudRequiredPermission("business:useraction:query")
    public ApiResponse<PageData<UserAction>> findPage (@RequestBody PageWrap<UserAction> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
    public ApiResponse<PageData<UserAction>> findPage (@RequestBody PageWrap<UserAction> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(userActionService.findPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:useraction:exportExcel")
    public void exportExcel (@RequestBody PageWrap<UserAction> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
    public void exportExcel (@RequestBody PageWrap<UserAction> pageWrap, HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        ExcelExporter.build(UserAction.class).export(userActionService.findPage(pageWrap).getRecords(), "人员操作记录日志", response);
    }