This commit is contained in:
张良(004796)
2023-12-22 10:32:45 +08:00
parent b899d480df
commit 80ddfb94f0
18 changed files with 507 additions and 2 deletions

View File

@@ -0,0 +1,96 @@
package com.ruoyi.cai.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.CaiUnion;
import com.ruoyi.cai.service.CaiUnionService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
/**
* 工会列表
*
* @author 77
* @date 2023-12-22
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/cai/userUnion")
public class CaiUnionController extends BaseController {
private final CaiUnionService caiUnionService;
/**
* 查询工会列表列表
*/
@SaCheckPermission("cai:userUnion:list")
@GetMapping("/list")
public TableDataInfo<CaiUnion> list(CaiUnion bo, PageQuery pageQuery) {
Page<CaiUnion> page = caiUnionService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
/**
* 获取工会列表详细信息
*
* @param id 主键
*/
@SaCheckPermission("cai:userUnion:query")
@GetMapping("/{id}")
public R<CaiUnion> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(caiUnionService.getById(id));
}
/**
* 新增工会列表
*/
@SaCheckPermission("cai:userUnion:add")
@Log(title = "工会列表", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiUnion bo) {
return toAjax(caiUnionService.save(bo));
}
/**
* 修改工会列表
*/
@SaCheckPermission("cai:userUnion:edit")
@Log(title = "工会列表", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiUnion bo) {
return toAjax(caiUnionService.updateById(bo));
}
/**
* 删除工会列表
*
* @param ids 主键串
*/
@SaCheckPermission("cai:userUnion:remove")
@Log(title = "工会列表", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(caiUnionService.removeBatchByIds(Arrays.asList(ids)));
}
}

View File

@@ -0,0 +1,95 @@
package com.ruoyi.cai.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.CaiUnionUser;
import com.ruoyi.cai.service.CaiUnionUserService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
/**
* 123
*
* @author ruoyi
* @date 2023-12-22
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/cai/unionUser")
public class CaiUnionUserController extends BaseController {
private final CaiUnionUserService caiUnionUserService;
/**
* 查询123列表
*/
@SaCheckPermission("cai:unionUser:list")
@GetMapping("/list")
public TableDataInfo<CaiUnionUser> list(CaiUnionUser bo, PageQuery pageQuery) {
Page<CaiUnionUser> page = caiUnionUserService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
/**
* 获取123详细信息
*
* @param id 主键
*/
@SaCheckPermission("cai:unionUser:query")
@GetMapping("/{id}")
public R<CaiUnionUser> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(caiUnionUserService.getById(id));
}
/**
* 新增123
*/
@SaCheckPermission("cai:unionUser:add")
@Log(title = "123", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiUnionUser bo) {
return toAjax(caiUnionUserService.save(bo));
}
/**
* 修改123
*/
@SaCheckPermission("cai:unionUser:edit")
@Log(title = "123", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiUnionUser bo) {
return toAjax(caiUnionUserService.updateById(bo));
}
/**
* 删除123
*
* @param ids 主键串
*/
@SaCheckPermission("cai:unionUser:remove")
@Log(title = "123", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(caiUnionUserService.removeBatchByIds(Arrays.asList(ids), true));
}
}

View File

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.CaiUserMember;
import com.ruoyi.cai.dto.admin.vo.CaiUserMemberAdminVo;
import com.ruoyi.cai.service.CaiUserMemberService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +42,8 @@ public class CaiUserMemberController extends BaseController {
*/
@SaCheckPermission("cai:userMember:list")
@GetMapping("/list")
public TableDataInfo<CaiUserMember> list(CaiUserMember bo, PageQuery pageQuery) {
Page<CaiUserMember> page = userMemberService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
public TableDataInfo<CaiUserMemberAdminVo> list(CaiUserMemberAdminVo bo, PageQuery pageQuery) {
Page<CaiUserMemberAdminVo> page = userMemberService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}