解决冲突

MrShi

2024-11-26 14a20df4699cf3d933e2bdbe1ba2aba15ade1059

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

@@ -8,6 +8,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.YwProject;
import com.doumee.dao.business.model.YwRoom;
import com.doumee.service.business.YwProjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -36,6 +37,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywproject:create")
    public ApiResponse create(@RequestBody YwProject ywProject,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywProject.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywProjectService.create(ywProject));
    }

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

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

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

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

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