diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/CrudRequestMapping.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/CrudRequestMapping.java index 9edc3816..377f7fdd 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/CrudRequestMapping.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/CrudRequestMapping.java @@ -37,7 +37,7 @@ public @interface CrudRequestMapping { /** * API 列表 */ - Api[] api() default Api.ALL; + Api[] api() default {Api.PAGE, Api.DETAIL, Api.CREATE, Api.UPDATE, Api.DELETE}; /** * API 枚举 diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java index 9d05a883..9f181382 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java @@ -44,14 +44,12 @@ import top.charles7c.cnadmin.common.model.vo.R; * @param * 查询条件 * @param - * 创建信息 - * @param - * 修改信息 + * 创建或修改信息 * @author Charles7c * @since 2023/1/26 10:45 */ @NoArgsConstructor -public abstract class BaseController, V, D, Q, C, U> { +public abstract class BaseController, V, D, Q, C extends BaseRequest> { @Autowired protected S baseService; @@ -63,9 +61,10 @@ public abstract class BaseController, V, D, * 查询条件 * @param pageQuery * 分页查询条件 - * @return 分页列表信息 + * @return 分页信息 */ @Operation(summary = "分页查询列表") + @ResponseBody @GetMapping protected R> page(@Validated Q query, @Validated PageQuery pageQuery) { PageDataVO pageDataVO = baseService.page(query, pageQuery); @@ -80,6 +79,7 @@ public abstract class BaseController, V, D, * @return 列表信息 */ @Operation(summary = "查询列表") + @ResponseBody @GetMapping("/all") protected R> list(@Validated Q query) { List list = baseService.list(query); @@ -95,6 +95,7 @@ public abstract class BaseController, V, D, */ @Operation(summary = "查看详情") @Parameter(name = "id", description = "ID", in = ParameterIn.PATH) + @ResponseBody @GetMapping("/{id}") protected R detail(@PathVariable Long id) { D detail = baseService.detail(id); @@ -109,8 +110,9 @@ public abstract class BaseController, V, D, * @return 自增 ID */ @Operation(summary = "新增") + @ResponseBody @PostMapping - protected R create(@Validated @RequestBody C request) { + protected R create(@Validated(BaseRequest.Create.class) @RequestBody C request) { Long id = baseService.create(request); return R.ok("新增成功", id); } @@ -118,17 +120,15 @@ public abstract class BaseController, V, D, /** * 修改 * - * @param id - * ID * @param request * 修改信息 * @return / */ @Operation(summary = "修改") - @Parameter(name = "id", description = "ID", in = ParameterIn.PATH) - @PutMapping("/{id}") - protected R update(@PathVariable Long id, @Validated @RequestBody U request) { - baseService.update(id, request); + @ResponseBody + @PutMapping + protected R update(@Validated(BaseRequest.Update.class) @RequestBody C request) { + baseService.update(request); return R.ok("修改成功"); } @@ -141,6 +141,7 @@ public abstract class BaseController, V, D, */ @Operation(summary = "删除") @Parameter(name = "ids", description = "ID 列表", in = ParameterIn.PATH) + @ResponseBody @DeleteMapping("/{ids}") protected R delete(@PathVariable List ids) { baseService.delete(ids); diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseRequest.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseRequest.java new file mode 100644 index 00000000..9ab50d3f --- /dev/null +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseRequest.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package top.charles7c.cnadmin.common.base; + +import java.io.Serializable; + +import lombok.Data; + +/** + * Request 基类 + * + * @author Charles7c + * @since 2023/1/30 21:51 + */ +@Data +public class BaseRequest implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 分组校验-创建 + */ + public @interface Create {} + + /** + * 分组校验-修改 + */ + public @interface Update {} +} diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseService.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseService.java index 48d7bd8f..892ad29b 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseService.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseService.java @@ -16,7 +16,6 @@ package top.charles7c.cnadmin.common.base; -import java.util.Collections; import java.util.List; import top.charles7c.cnadmin.common.model.query.PageQuery; @@ -32,13 +31,11 @@ import top.charles7c.cnadmin.common.model.vo.PageDataVO; * @param * 查询条件 * @param - * 创建信息 - * @param - * 修改信息 + * 创建或修改信息 * @author Charles7c * @since 2023/1/26 16:54 */ -public interface BaseService { +public interface BaseService { /** * 分页查询列表 @@ -49,9 +46,7 @@ public interface BaseService { * 分页查询条件 * @return 分页列表信息 */ - default PageDataVO page(Q query, PageQuery pageQuery) { - return new PageDataVO<>(); - } + PageDataVO page(Q query, PageQuery pageQuery); /** * 查询列表 @@ -60,9 +55,7 @@ public interface BaseService { * 查询条件 * @return 列表信息 */ - default List list(Q query) { - return Collections.emptyList(); - } + List list(Q query); /** * 查看详情 @@ -71,9 +64,7 @@ public interface BaseService { * ID * @return 详情信息 */ - default D detail(Long id) { - return null; - } + D detail(Long id); /** * 新增 @@ -82,19 +73,15 @@ public interface BaseService { * 创建信息 * @return 自增 ID */ - default Long create(C request) { - return null; - } + Long create(C request); /** * 修改 * - * @param id - * ID * @param request * 修改信息 */ - default void update(Long id, U request) {} + void update(C request); /** * 删除 @@ -102,5 +89,5 @@ public interface BaseService { * @param ids * ID 列表 */ - default void delete(List ids) {} + void delete(List ids); } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java index 0ab8dcf9..2e53cb20 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java @@ -40,10 +40,19 @@ import top.charles7c.cnadmin.common.util.validate.CheckUtils; * Mapper 接口 * @param * 实体类 + * @param + * 列表信息 + * @param + * 详情信息 + * @param + * 查询条件 + * @param + * 创建或修改信息 * @author Charles7c * @since 2023/1/26 21:52 */ -public abstract class BaseServiceImpl, T, V, D, Q, C, U> implements BaseService { +public abstract class BaseServiceImpl, T, V, D, Q, C extends BaseRequest> + implements BaseService { @Autowired protected M baseMapper; @@ -68,8 +77,7 @@ public abstract class BaseServiceImpl, T, V, D, Q, C, U> @Override public D detail(Long id) { - T entity = baseMapper.selectById(id); - CheckUtils.throwIfNull(entity, String.format("ID为 [%s] 的记录已不存在", id)); + T entity = this.getById(id); return BeanUtil.copyProperties(entity, detailVoClass); } @@ -79,7 +87,7 @@ public abstract class BaseServiceImpl, T, V, D, Q, C, U> @Override @Transactional(rollbackFor = Exception.class) - public void update(Long id, U request) { + public void update(C request) { T entity = BeanUtil.copyProperties(request, entityClass); baseMapper.updateById(entity); } @@ -90,6 +98,19 @@ public abstract class BaseServiceImpl, T, V, D, Q, C, U> baseMapper.deleteBatchIds(ids); } + /** + * 根据 ID 查询 + * + * @param id + * ID + * @return 实体信息 + */ + protected T getById(Long id) { + T entity = baseMapper.selectById(id); + CheckUtils.throwIfNull(entity, String.format("ID为 [%s] 的记录已不存在", id)); + return entity; + } + /** * 获取实体类 Class 对象 * diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java index 0058598c..8a3c11fd 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java @@ -153,7 +153,6 @@ public class LogServiceImpl implements LogService { if (createUser == null) { return; } - logVO.setCreateUserString( - ExceptionUtils.exToNull(() -> userService.getById(createUser)).getNickname()); + logVO.setCreateUserString(ExceptionUtils.exToNull(() -> userService.getById(createUser)).getNickname()); } } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java index 3148c873..fabf0fdf 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java @@ -16,9 +16,9 @@ package top.charles7c.cnadmin.system.model.request; -import java.io.Serializable; - import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Null; import lombok.Data; @@ -26,6 +26,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import org.hibernate.validator.constraints.Length; +import top.charles7c.cnadmin.common.base.BaseRequest; +import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; + /** * 创建或修改部门信息 * @@ -34,15 +37,23 @@ import org.hibernate.validator.constraints.Length; */ @Data @Schema(description = "创建或修改部门信息") -public class DeptRequest implements Serializable { +public class DeptRequest extends BaseRequest { private static final long serialVersionUID = 1L; + /** + * 部门 ID + */ + @Schema(description = "部门 ID") + @Null(message = "新增时,ID 必须为空", groups = Create.class) + @NotNull(message = "修改时,ID 不能为空", groups = Update.class) + private Long deptId; + /** * 上级部门 ID */ - @Schema(description = "上级部门 ID", defaultValue = "0") - private Long parentId = 0L; + @Schema(description = "上级部门 ID") + private Long parentId; /** * 部门名称 @@ -54,8 +65,8 @@ public class DeptRequest implements Serializable { /** * 部门排序 */ - @Schema(description = "部门排序", defaultValue = "999") - private Integer deptSort = 999; + @Schema(description = "部门排序") + private Integer deptSort; /** * 描述 @@ -63,4 +74,10 @@ public class DeptRequest implements Serializable { @Schema(description = "描述") @Length(max = 200, message = "描述长度不能超过 200 个字符") private String description; + + /** + * 状态(1启用 2禁用) + */ + @Schema(description = "状态(1启用 2禁用)", type = "Integer", allowableValues = {"1", "2"}) + private DisEnableStatusEnum status; } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/DeptService.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/DeptService.java index c2129125..40713dd6 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/DeptService.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/DeptService.java @@ -21,7 +21,6 @@ import java.util.List; import cn.hutool.core.lang.tree.Tree; import top.charles7c.cnadmin.common.base.BaseService; -import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; import top.charles7c.cnadmin.system.model.query.DeptQuery; import top.charles7c.cnadmin.system.model.request.DeptRequest; import top.charles7c.cnadmin.system.model.vo.DeptVO; @@ -32,7 +31,7 @@ import top.charles7c.cnadmin.system.model.vo.DeptVO; * @author Charles7c * @since 2023/1/22 17:54 */ -public interface DeptService extends BaseService { +public interface DeptService extends BaseService { /** * 构建树 @@ -52,16 +51,6 @@ public interface DeptService extends BaseService> buildTree(List list); - /** - * 修改状态 - * - * @param ids - * ID 列表 - * @param status - * 状态 - */ - void updateStatus(List ids, DisEnableStatusEnum status); - /** * 检查部门名称是否存在 * diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java index 6b3f3e06..c96a4a6c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java @@ -55,8 +55,8 @@ import top.charles7c.cnadmin.system.service.UserService; */ @Service @RequiredArgsConstructor -public class DeptServiceImpl extends - BaseServiceImpl implements DeptService { +public class DeptServiceImpl extends BaseServiceImpl + implements DeptService { private final UserService userService; @@ -112,24 +112,24 @@ public class DeptServiceImpl extends /** * 获取指定部门的子部门列表 * - * @param dept + * @param deptVO * 指定部门 * @param list * 部门列表 * @return 子部门列表 */ - private List getChildren(DeptVO dept, List list) { - return list.stream().filter(d -> Objects.equals(d.getParentId(), dept.getDeptId())) + private List getChildren(DeptVO deptVO, List list) { + return list.stream().filter(d -> Objects.equals(d.getParentId(), deptVO.getDeptId())) .map(d -> d.setChildren(this.getChildren(d, list))).collect(Collectors.toList()); } @Override public List> buildTree(List list) { - return TreeUtils.build(list, (dept, tree) -> { - tree.setId(dept.getDeptId()); - tree.setName(dept.getDeptName()); - tree.setParentId(dept.getParentId()); - tree.setWeight(dept.getDeptSort()); + return TreeUtils.build(list, (d, tree) -> { + tree.setId(d.getDeptId()); + tree.setName(d.getDeptName()); + tree.setParentId(d.getParentId()); + tree.setWeight(d.getDeptSort()); }); } @@ -147,13 +147,6 @@ public class DeptServiceImpl extends return deptDO.getDeptId(); } - @Override - @Transactional(rollbackFor = Exception.class) - public void updateStatus(List ids, DisEnableStatusEnum status) { - baseMapper.update(null, - Wrappers.lambdaUpdate().set(DeptDO::getStatus, status).in(DeptDO::getDeptId, ids)); - } - @Override @Transactional(rollbackFor = Exception.class) public void delete(List ids) { @@ -178,7 +171,6 @@ public class DeptServiceImpl extends if (createUser == null) { return; } - deptVO.setCreateUserString( - ExceptionUtils.exToNull(() -> userService.getById(createUser)).getNickname()); + deptVO.setCreateUserString(ExceptionUtils.exToNull(() -> userService.getById(createUser)).getNickname()); } } diff --git a/continew-admin-ui/src/api/system/dept.ts b/continew-admin-ui/src/api/system/dept.ts index 02822c7b..aacd3598 100644 --- a/continew-admin-ui/src/api/system/dept.ts +++ b/continew-admin-ui/src/api/system/dept.ts @@ -27,21 +27,22 @@ export function getDeptList(params: DeptParams) { }); } -export interface CreateDeptReq { +export interface DeptReq { parentId: number; deptName: string; deptSort: number; description: string; } -export function createDept(req: CreateDeptReq) { +export function createDept(req: DeptReq) { return axios.post('/system/dept', req); } -export interface UpdateDeptStatusReq { - status: number; +export interface UpdateDeptReq extends Partial { + deptId: number; + status?: number; } -export function updateDeptStatus(ids: Array, req: UpdateDeptStatusReq) { - return axios.patch(`/system/dept/${ids}`, req); +export function updateDept(req: UpdateDeptReq) { + return axios.put(`/system/dept`, req); } export function deleteDept(ids: Array) { diff --git a/continew-admin-ui/src/views/system/dept/index.vue b/continew-admin-ui/src/views/system/dept/index.vue index c380e1b1..08a7c636 100644 --- a/continew-admin-ui/src/views/system/dept/index.vue +++ b/continew-admin-ui/src/views/system/dept/index.vue @@ -281,7 +281,7 @@ DeptRecord, DeptParams, createDept, - updateDeptStatus, + updateDept, deleteDept, } from '@/api/system/dept'; import getDeptTree from '@/api/common'; @@ -405,7 +405,7 @@ // 改变状态 const handleChangeStatus = async (record: DeptRecord, val: number) => { if (record.deptId) { - const res = await updateDeptStatus([record.deptId], { status: val }); + const res = await updateDept({ deptId: record.deptId, status: val }); if (res.success) { Message.success(res.msg); } else { diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java index 35d3316e..570723f6 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java @@ -23,7 +23,6 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -53,7 +52,7 @@ import top.charles7c.cnadmin.common.util.validate.ValidationUtils; @Tag(name = "登录 API") @RestController @RequiredArgsConstructor -@RequestMapping(value = "/auth", produces = MediaType.APPLICATION_JSON_VALUE) +@RequestMapping("/auth") public class LoginController { private final LoginService loginService; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java index 4b780619..77e2b193 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java @@ -27,7 +27,6 @@ import lombok.RequiredArgsConstructor; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -60,7 +59,7 @@ import top.charles7c.cnadmin.common.util.validate.CheckUtils; @Validated @RestController @RequiredArgsConstructor -@RequestMapping(value = "/common/captcha", produces = MediaType.APPLICATION_JSON_VALUE) +@RequestMapping("/common/captcha") public class CaptchaController { private final CaptchaProperties captchaProperties; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java index 4e0d3611..31c34589 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java @@ -23,7 +23,6 @@ import lombok.RequiredArgsConstructor; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -45,7 +44,7 @@ import top.charles7c.cnadmin.system.service.DeptService; @Tag(name = "公共 API") @RestController @RequiredArgsConstructor -@RequestMapping(value = "/common", produces = MediaType.APPLICATION_JSON_VALUE) +@RequestMapping("/common") public class CommonController { private final DeptService deptService; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/LogController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/LogController.java index 92d6eb64..dce24edf 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/LogController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/LogController.java @@ -21,7 +21,6 @@ import lombok.RequiredArgsConstructor; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -49,7 +48,7 @@ import top.charles7c.cnadmin.monitor.service.LogService; @Tag(name = "日志管理 API") @RestController @RequiredArgsConstructor -@RequestMapping(value = "/monitor/log", produces = MediaType.APPLICATION_JSON_VALUE) +@RequestMapping("/monitor/log") public class LogController { private final LogService logService; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java index d52ffb5a..6f0b1bd1 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java @@ -26,7 +26,6 @@ import lombok.RequiredArgsConstructor; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -56,7 +55,7 @@ import top.charles7c.cnadmin.monitor.model.vo.*; @Tag(name = "在线用户 API") @RestController @RequiredArgsConstructor -@RequestMapping(value = "/monitor/online/user", produces = MediaType.APPLICATION_JSON_VALUE) +@RequestMapping("/monitor/online/user") public class OnlineUserController { @Operation(summary = "分页查询在线用户列表") diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/DeptController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/DeptController.java index ecf1f972..bac15056 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/DeptController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/DeptController.java @@ -21,8 +21,6 @@ import static top.charles7c.cnadmin.common.annotation.CrudRequestMapping.Api; import java.util.List; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -30,7 +28,6 @@ import org.springframework.web.bind.annotation.*; import top.charles7c.cnadmin.common.annotation.CrudRequestMapping; import top.charles7c.cnadmin.common.base.BaseController; -import top.charles7c.cnadmin.common.model.request.UpdateStatusRequest; import top.charles7c.cnadmin.common.model.vo.R; import top.charles7c.cnadmin.system.model.query.DeptQuery; import top.charles7c.cnadmin.system.model.request.DeptRequest; @@ -45,8 +42,8 @@ import top.charles7c.cnadmin.system.service.DeptService; */ @Tag(name = "部门管理 API") @RestController -@CrudRequestMapping(value = "/system/dept", api = {Api.ALL}) -public class DeptController extends BaseController { +@CrudRequestMapping(value = "/system/dept", api = {Api.LIST, Api.DETAIL, Api.CREATE, Api.UPDATE, Api.DELETE}) +public class DeptController extends BaseController { @Override @Operation(summary = "查询部门列表树") @@ -54,12 +51,4 @@ public class DeptController extends BaseController list = baseService.list(query); return R.ok(baseService.buildListTree(list)); } - - @Operation(summary = "修改部门状态") - @Parameter(name = "ids", description = "ID 列表", in = ParameterIn.PATH) - @PatchMapping("/{ids}") - public R updateStatus(@PathVariable List ids, @Validated @RequestBody UpdateStatusRequest request) { - baseService.updateStatus(ids, request.getStatus()); - return R.ok(String.format("%s成功", request.getStatus().getDescription())); - } } diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java index e35795d9..0c2280b1 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java @@ -23,7 +23,6 @@ import lombok.RequiredArgsConstructor; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -56,7 +55,7 @@ import top.charles7c.cnadmin.system.service.UserService; @Validated @RestController @RequiredArgsConstructor -@RequestMapping(value = "/system/user/center", produces = MediaType.APPLICATION_JSON_VALUE) +@RequestMapping("/system/user/center") public class UserCenterController { private final UserService userService;