Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
ca5f1b534e
@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.wjbl.weightlosscamp.api.base.core.ApiResult;
|
||||
import com.wjbl.weightlosscamp.api.base.core.IdParam;
|
||||
import com.wjbl.weightlosscamp.api.base.core.PageParam;
|
||||
import com.wjbl.weightlosscamp.service.api.module.student.dto.AccessRecordDTO;
|
||||
import com.wjbl.weightlosscamp.service.api.module.student.dto.AccessPermitDTO;
|
||||
import com.wjbl.weightlosscamp.service.api.module.student.service.AccessPermitService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@ -30,14 +30,14 @@ public class AccessPermitController {
|
||||
|
||||
@Operation(summary = "新增出入营许可")
|
||||
@PostMapping("/add")
|
||||
public ApiResult<Void> add(@Valid @RequestBody AccessRecordDTO dto) {
|
||||
public ApiResult<Void> add(@Valid @RequestBody AccessPermitDTO dto) {
|
||||
return accessPermitService.add(dto);
|
||||
}
|
||||
|
||||
|
||||
@Operation(summary = "分页查询出入营许可")
|
||||
@PostMapping("/list")
|
||||
public ApiResult<Page<AccessRecordDTO>> list(@Valid @RequestBody PageParam<AccessRecordDTO> param) {
|
||||
public ApiResult<Page<AccessPermitDTO>> list(@Valid @RequestBody PageParam<AccessPermitDTO> param) {
|
||||
return accessPermitService.list(param);
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
package com.wjbl.weightlosscamp.service.api.module.student.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.wjbl.weightlosscamp.api.base.core.ApiResult;
|
||||
import com.wjbl.weightlosscamp.api.base.core.PageParam;
|
||||
import com.wjbl.weightlosscamp.service.api.module.student.dto.ChangeGroupDTO;
|
||||
import com.wjbl.weightlosscamp.service.api.module.student.service.ChangeGroupService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* 换组控制器
|
||||
*/
|
||||
@Tag(name = "换组")
|
||||
@RestController
|
||||
@RequestMapping("/student/change-group")
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class ChangeGroupController {
|
||||
|
||||
private ChangeGroupService changeGroupService;
|
||||
|
||||
@Operation(summary = "新增换组")
|
||||
@PostMapping("/add")
|
||||
public ApiResult<Void> add(@Valid @RequestBody ChangeGroupDTO dto) {
|
||||
return changeGroupService.add(dto);
|
||||
}
|
||||
|
||||
|
||||
@Operation(summary = "分页查询换组")
|
||||
@PostMapping("/list")
|
||||
public ApiResult<Page<ChangeGroupDTO>> list(@Valid @RequestBody PageParam<ChangeGroupDTO> param) {
|
||||
return changeGroupService.list(param);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package com.wjbl.weightlosscamp.service.api.module.student.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@Schema(description = "出入营许可DTO")
|
||||
public class AccessPermitDTO {
|
||||
}
|
||||
@ -1,8 +1,14 @@
|
||||
package com.wjbl.weightlosscamp.service.api.module.student.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author chy
|
||||
* @since 2025-04-19 17:48
|
||||
*/
|
||||
|
||||
@Data
|
||||
@Schema(description = "换组DTO")
|
||||
public class ChangeGroupDTO {
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.wjbl.weightlosscamp.api.base.core.ApiResult;
|
||||
import com.wjbl.weightlosscamp.api.base.core.IdParam;
|
||||
import com.wjbl.weightlosscamp.api.base.core.PageParam;
|
||||
import com.wjbl.weightlosscamp.service.api.module.student.dto.AccessRecordDTO;
|
||||
import com.wjbl.weightlosscamp.service.api.module.student.dto.AccessPermitDTO;
|
||||
import jakarta.validation.Valid;
|
||||
|
||||
public class AccessPermitService {
|
||||
@ -15,7 +15,7 @@ public class AccessPermitService {
|
||||
* @param dto
|
||||
* @return
|
||||
*/
|
||||
public ApiResult<Void> add(@Valid AccessRecordDTO dto) {
|
||||
public ApiResult<Void> add(@Valid AccessPermitDTO dto) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@ public class AccessPermitService {
|
||||
* @param param
|
||||
* @return
|
||||
*/
|
||||
public ApiResult<Page<AccessRecordDTO>> list(@Valid PageParam<AccessRecordDTO> param) {
|
||||
public ApiResult<Page<AccessPermitDTO>> list(@Valid PageParam<AccessPermitDTO> param) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user