Merge remote-tracking branch 'origin/master'

renkang

2024-12-06 b40f8dfb6ce225bbc133d88e26b9166219b64a31

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

@@ -7,6 +7,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.YwContractRoom;
import com.doumee.dao.business.model.YwRoom;
import com.doumee.service.business.YwRoomService;
import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywroom:create")
    public ApiResponse create(@RequestBody YwRoom ywRoom,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywRoom.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywRoomService.create(ywRoom));
    }

@@ -43,7 +45,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywroom:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywRoomService.deleteById(id);
        ywRoomService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -56,7 +58,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywRoomService.deleteByIdInBatch(idList);
        ywRoomService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -64,14 +66,22 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywroom:update")
    public ApiResponse updateById(@RequestBody YwRoom ywRoom,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywRoom.setLoginUserInfo(this.getLoginUser(token));
        ywRoomService.updateById(ywRoom);
        return ApiResponse.success(null);
    }

    @ApiOperation("查询列表")
    @PostMapping("/list")
    @CloudRequiredPermission("business:ywroom:query")
    public ApiResponse<List<YwRoom>> findList (@RequestBody  YwRoom pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywRoomService.findList(pageWrap));
    }
    @ApiOperation("分页查询")
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywroom:query")
    public ApiResponse<PageData<YwRoom>> findPage (@RequestBody PageWrap<YwRoom> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywRoomService.findPage(pageWrap));
    }

@@ -79,6 +89,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywroom:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwRoom> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwRoom.class).export(ywRoomService.findPage(pageWrap).getRecords(), "运维房源信息表", response);
    }