完善了用户登录

This commit is contained in:
chen-xin-zhi 2024-11-04 15:35:25 +08:00
parent e43b6be4d2
commit 1e7f1c2025
10 changed files with 69 additions and 31 deletions

View File

@ -25,7 +25,7 @@ import java.util.List;
@RestController
@RequestMapping("/address")
@Slf4j
@Tag(name = "地址管理模块")
@Tag(name = "地址信息模块")
public class AddressController {

View File

@ -25,7 +25,7 @@ import java.util.List;
@RestController
@RequestMapping("/contacts")
@Slf4j
@Tag(name = "联系人接口")
@Tag(name = "联系人信息模块")
public class ContactsController {

View File

@ -79,7 +79,7 @@ public class FileController {
@PostMapping("/upload/server")
@Operation(summary = "登录情况下的文件上传", description = "参数文件对象multipartFile), 业务类型(biz)权限所有人方法名uploadServerFile")
@Operation(summary = "登录情况下的文件上传", description = "参数文件对象multipartFile), 业务类型(biz)权限所有人方法名uploadServerFile")
public BaseResponse<String> uploadServerFile(@RequestPart MultipartFile multipartFile, UploadFileRequest uploadFileRequest, HttpServletRequest request) {
//获取业务名称
String biz = uploadFileRequest.getBiz();

View File

@ -28,7 +28,7 @@ import java.util.List;
@RestController
@RequestMapping("/cart")
@Slf4j
@Tag(name = "购物车接口")
@Tag(name = "购物车信息模块")
public class CartRecordController {
@ -58,7 +58,7 @@ public class CartRecordController {
* @return 是否更新成功
*/
@PostMapping("/update")
@Operation(summary = "小程序端用户更新商品至购物车", description = "参数:购物车记录更新请求体")
@Operation(summary = "小程序端用户更新商品至购物车", description = "参数:购物车记录更新请求体权限所有人方法名updateCartRecord")
public BaseResponse<Boolean> updateCartRecord(@RequestBody List<CartRecordUpdateRequest> cartRecordUpdateRequestList) {
if (CollectionUtils.isEmpty(cartRecordUpdateRequestList)) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -80,6 +80,7 @@ public class CartRecordController {
* @return 是否删除成功
*/
@PostMapping("/delete")
@Operation(summary = "小程序端用户删除购物车的物品", description = "参数购物车记录删除请求体权限所有人方法名deleteCart")
public BaseResponse<Boolean> deleteCart(@RequestBody List<Integer> idList) {
if (CollectionUtils.isEmpty(idList)) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -96,6 +97,7 @@ public class CartRecordController {
* @return
*/
@PostMapping("/list")
@Operation(summary = "小程序端用户查询购物车中的商品", description = "参数购物车记录查询请求体权限所有人方法名listUserCartRecord")
public BaseResponse<List<CartRecordVO>> listUserCartRecord(@RequestBody CommonRequest userIdRequest) {
if (userIdRequest == null || userIdRequest.getId() <= 0) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);

View File

@ -1,9 +1,11 @@
package com.cultural.heritage.controller.good;
import com.cultural.heritage.annotation.AuthCheck;
import com.cultural.heritage.common.BaseResponse;
import com.cultural.heritage.common.ErrorCode;
import com.cultural.heritage.common.ResultUtils;
import com.cultural.heritage.constant.UserConstant;
import com.cultural.heritage.exception.BusinessException;
import com.cultural.heritage.exception.ThrowUtils;
import com.cultural.heritage.model.dto.CommonRequest;
@ -12,6 +14,7 @@ import com.cultural.heritage.model.entity.Category;
import com.cultural.heritage.model.entity.Good;
import com.cultural.heritage.service.good.CategoryService;
import com.cultural.heritage.service.good.GoodService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@ -29,7 +32,7 @@ import java.util.Map;
@RestController
@RequestMapping("/category")
@Slf4j
@Tag(name = "商品类别接口")
@Tag(name = "商品类别管理模块")
public class CategoryController {
@Resource
@ -48,6 +51,8 @@ public class CategoryController {
* @return 是否添加成功
*/
@PostMapping("/add")
@Operation(summary = "Web端管理员添加商品类别", description = "参数:类别添加请求体,权限:管理员(admin, boss)方法名addCategory")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<Boolean> addCategory(@RequestBody CategoryAddRequest categoryAddRequest) {
if (categoryAddRequest == null) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -67,6 +72,8 @@ public class CategoryController {
* @return 是否删除成功
*/
@PostMapping("/delete")
@Operation(summary = "Web端管理员删除商品类别", description = "参数:类别删除请求体,权限:管理员(admin, boss)方法名deleteCategory")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<Boolean> deleteCategory(@RequestBody CommonRequest deleteCategoryRequest) {
if (deleteCategoryRequest == null || deleteCategoryRequest.getId() <= 0) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -85,6 +92,8 @@ public class CategoryController {
* @return 是否更新成功
*/
@PostMapping("/update")
@Operation(summary = "Web端管理员更新商品类别", description = "参数:类别更新请求体,权限:管理员(admin, boss)方法名updateCategory")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<Boolean> updateCategory(@RequestBody Category category) {
if (category == null || category.getId() <= 0) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -101,6 +110,8 @@ public class CategoryController {
* @return 商品类别列表
*/
@PostMapping("/list")
@Operation(summary = "Web端管理员查询商品类别", description = "参数:无,权限:管理员(admin, boss)方法名listCategory")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<List<Category>> listCategory() {
List<Category> list = categoryService.list();
return ResultUtils.success(list);

View File

@ -1,11 +1,12 @@
package com.cultural.heritage.controller.good;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cultural.heritage.annotation.AuthCheck;
import com.cultural.heritage.common.BaseResponse;
import com.cultural.heritage.common.ErrorCode;
import com.cultural.heritage.common.ResultUtils;
import com.cultural.heritage.constant.UserConstant;
import com.cultural.heritage.exception.BusinessException;
import com.cultural.heritage.exception.ThrowUtils;
import com.cultural.heritage.model.dto.CommonRequest;
@ -21,21 +22,22 @@ import com.cultural.heritage.service.good.CouponService;
import com.cultural.heritage.service.good.ExchangeService;
import com.cultural.heritage.service.good.UserCouponService;
import com.cultural.heritage.service.user.UserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.xml.transform.Result;
import java.util.List;
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;
@RestController
@RequestMapping("/coupon")
@Slf4j
@Tag(name = "优惠券接口")
@Tag(name = "优惠券管理模块")
public class CouponController {
@Resource
@ -60,6 +62,8 @@ public class CouponController {
* @return 是否添加成功
*/
@PostMapping("/add")
@Operation(summary = "Web端管理员添加优惠券", description = "参数:优惠券添加请求体,权限:管理员(admin, boss)方法名addCoupon")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<Boolean> addCoupon(@RequestBody CouponAddRequest couponAddRequest) {
if (couponAddRequest == null) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -79,6 +83,8 @@ public class CouponController {
* @return 是否更新成功
*/
@PostMapping("/update")
@Operation(summary = "Web端管理员更新优惠券", description = "参数:优惠券更新请求体,权限:管理员(admin, boss)方法名updateCoupon")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<Boolean> updateCoupon(@RequestBody CouponUpdateRequest couponUpdateRequest) {
if (couponUpdateRequest == null || couponUpdateRequest.getId() <= 0) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -98,6 +104,8 @@ public class CouponController {
* @return 是否删除成功
*/
@PostMapping("/delete")
@Operation(summary = "Web端管理员删除优惠券", description = "参数:优惠券删除请求体,权限:管理员(admin, boss)方法名deleteCoupon")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<Boolean> deleteCoupon(@RequestBody CommonRequest couponDeleteRequest) {
if (couponDeleteRequest == null || couponDeleteRequest.getId() <= 0) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -116,6 +124,8 @@ public class CouponController {
* @return 优惠券列表
*/
@PostMapping("/list/page")
@Operation(summary = "Web端管理员分页查询优惠券", description = "参数:优惠券查询请求体,权限:管理员(admin, boss)方法名listCouponVOByPage")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<Page<Coupon>> listCouponVOByPage(@RequestBody CouponQueryRequest couponQueryRequest) {
if (couponQueryRequest == null) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -135,6 +145,7 @@ public class CouponController {
*/
@PostMapping("/exchange")
@Transactional(rollbackFor = Exception.class)
@Operation(summary = "小程序端用户积分兑换优惠券", description = "参数:兑换记录添加请求体,权限:管理员(admin, boss)方法名pointsExchangeCoupon")
public BaseResponse<Boolean> pointsExchangeCoupon(@RequestBody ExchangeAddRequest exchangeAddRequest) {
if (exchangeAddRequest == null) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -199,6 +210,7 @@ public class CouponController {
* @return 是否兑换成功
*/
@PostMapping("/delRecord")
@Operation(summary = "小程序端用户删除兑换记录", description = "参数:兑换记录删除请求体,权限:管理员(admin, boss)方法名deleteExchangeRecord")
public BaseResponse<Boolean> deleteExchangeRecord(@RequestBody CommonRequest commonRequest) {
if (commonRequest == null || commonRequest.getId() <= 0) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);

View File

@ -3,9 +3,11 @@ package com.cultural.heritage.controller.good;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cultural.heritage.annotation.AuthCheck;
import com.cultural.heritage.common.BaseResponse;
import com.cultural.heritage.common.ErrorCode;
import com.cultural.heritage.common.ResultUtils;
import com.cultural.heritage.constant.UserConstant;
import com.cultural.heritage.exception.BusinessException;
import com.cultural.heritage.exception.ThrowUtils;
import com.cultural.heritage.model.dto.CommonDelBatchRequest;
@ -16,6 +18,7 @@ import com.cultural.heritage.model.dto.good.GoodUpdateRequest;
import com.cultural.heritage.model.entity.Good;
import com.cultural.heritage.service.good.CategoryService;
import com.cultural.heritage.service.good.GoodService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@ -34,7 +37,7 @@ import java.util.List;
@RestController
@RequestMapping("/goods")
@Slf4j
@Tag(name = "商品接口")
@Tag(name = "商品管理模块")
public class GoodController {
@Resource
@ -51,7 +54,8 @@ public class GoodController {
* @return
*/
@PostMapping("/add")
// @AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
@Operation(summary = "Web端管理员添加商品", description = "参数:商品添加请求体,权限:管理员(admin, boss)方法名addGood")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<Boolean> addGood(@RequestBody GoodAddRequest goodAddRequest) {
if (goodAddRequest == null) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -70,7 +74,8 @@ public class GoodController {
* @return 是否删除成功
*/
@PostMapping("/delete")
// @AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
@Operation(summary = "Web端管理员删除商品", description = "参数:商品删除请求体,权限:管理员(admin, boss)方法名deleteGood")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<Boolean> deleteGood(@RequestBody CommonRequest deleteRequest) {
if (deleteRequest == null || deleteRequest.getId() <= 0) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -87,7 +92,8 @@ public class GoodController {
* @return 是否更新成功
*/
@PostMapping("/update")
// @AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
@Operation(summary = "Web端管理员更新商品", description = "参数:商品更新请求体,权限:管理员(admin, boss)方法名updateGoods")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<Boolean> updateGoods(@RequestBody GoodUpdateRequest goodUpdateRequest) {
if (goodUpdateRequest == null || goodUpdateRequest.getId() <= 0) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -108,7 +114,8 @@ public class GoodController {
* @return 商品信息列表
*/
@PostMapping("/list/page")
// @AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
@Operation(summary = "Web端管理员分页查询商品", description = "参数:商品查询请求体,权限:管理员(admin, boss)方法名listGoodByPage")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<Page<Good>> listGoodByPage(@RequestBody GoodQueryRequest goodQueryRequest) {
long current = goodQueryRequest.getCurrent();
long pageSize = goodQueryRequest.getPageSize();
@ -126,7 +133,8 @@ public class GoodController {
* @return 是否批量删除成功
*/
@PostMapping("/delBatch")
// @AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
@Operation(summary = "Web端管理员批量删除商品", description = "参数:商品批量删除请求体,权限:管理员(admin, boss)方法名delBatchGoods")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<Boolean> delBatchGoods(@RequestBody CommonDelBatchRequest commonDelBatchRequest) {
List<Integer> idList = commonDelBatchRequest.getIdList();
boolean result = goodService.removeBatchByIds(idList);

View File

@ -3,10 +3,11 @@ package com.cultural.heritage.controller.order;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cultural.heritage.annotation.AuthCheck;
import com.cultural.heritage.common.BaseResponse;
import com.cultural.heritage.common.ErrorCode;
import com.cultural.heritage.common.ResultUtils;
import com.cultural.heritage.constant.CommonConstant;
import com.cultural.heritage.constant.UserConstant;
import com.cultural.heritage.exception.BusinessException;
import com.cultural.heritage.exception.ThrowUtils;
import com.cultural.heritage.model.dto.CommonRequest;
@ -18,6 +19,7 @@ import com.cultural.heritage.model.entity.Order;
import com.cultural.heritage.model.entity.OrderItem;
import com.cultural.heritage.service.order.OrderItemService;
import com.cultural.heritage.service.order.OrderService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@ -34,7 +36,7 @@ import java.util.List;
@RestController
@RequestMapping("/order")
@Slf4j
@Tag(name = "订单接口")
@Tag(name = "订单管理模块")
@Transactional(rollbackFor = Exception.class)
public class OrderController {
@ -53,6 +55,7 @@ public class OrderController {
* @return 是否创建成功
*/
@PostMapping("/add")
@Operation(summary = "小程序端创建用户订单", description = "参数订单创建请求体权限所有人方法名addOrder")
public BaseResponse<Long> addOrder(@RequestBody OrderAddRequest orderAddRequest) {
if (orderAddRequest == null) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -71,6 +74,7 @@ public class OrderController {
* @return 是否添加成功
*/
@PostMapping("/add/item")
@Operation(summary = "小程序端批量添加用户订单明细", description = "参数订单明细添加请求体权限所有人方法名addOrderItem")
public BaseResponse<Boolean> addOrderItem(@RequestBody List<OrderItemAddRequest> orderItemAddRequestList) {
if (CollectionUtils.isEmpty(orderItemAddRequestList)) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -92,6 +96,8 @@ public class OrderController {
* @return 订单列表信息
*/
@PostMapping("/list/page")
@Operation(summary = "Web端管理员分页查询订单", description = "参数:订单查询请求体,权限:管理员(admin, boss)方法名listOrder")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<Page<Order>> listOrder(@RequestBody OrderQueryRequest orderQueryRequest) {
if (orderQueryRequest == null) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -111,6 +117,8 @@ public class OrderController {
* @return 订单明细列表信息
*/
@PostMapping("/list/item")
@Operation(summary = "Web端管理员查询订单明细", description = "参数:订单编号请求体,权限:管理员(admin, boss)方法名listOrderItem")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<List<OrderItem>> listOrderItem(@RequestBody CommonRequest orderIdRequest) {
if (orderIdRequest == null || orderIdRequest.getId() <= 0) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -131,6 +139,8 @@ public class OrderController {
* @return 是否更新成功
*/
@PostMapping("/update")
@Operation(summary = "Web端管理员更新订单状态", description = "参数:订单状态更新请求体,权限:管理员(admin, boss)方法名updateOrderStatus")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<Boolean> updateOrderStatus(@RequestBody OrderUpdateRequest orderUpdateRequest) {
if (orderUpdateRequest == null || orderUpdateRequest.getId() <= 0) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);

View File

@ -60,7 +60,6 @@ public class UserController {
*/
@PostMapping("/login")
@Operation(summary = "Web端用户登录", description = "参数:{账号,密码}, 权限:管理员(admin, boss), 方法名userLogin")
// @AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<UserVO> userLogin(@RequestBody UserLoginRequest userLoginRequest, HttpServletRequest request){
if(userLoginRequest == null) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -110,7 +109,6 @@ public class UserController {
*/
@PostMapping("/logout")
@Operation(summary = "Web端管理员退出登录", description = "参数:无,权限:管理员(admin, boss)方法名userLogout")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
public BaseResponse<Boolean> userLogout(HttpServletRequest request) {
boolean result = userService.userLogout(request);
return ResultUtils.success(result);
@ -122,7 +120,7 @@ public class UserController {
* @return 用户登录信息
*/
@GetMapping("/get/login")
@Operation(summary = "小程序端获取登录信息", description = "参数:无,权限:所有人, 方法名getLoginUser")
@Operation(summary = "小程序端用户获取登录信息", description = "参数:无,权限:所有人, 方法名getLoginUser")
public BaseResponse<UserVO> getLoginUser(HttpServletRequest request) {
User user = userService.getLoginUser(request);
return ResultUtils.success(userService.getUserVO(user));
@ -137,7 +135,7 @@ public class UserController {
* @return 是否更新成功
*/
@PostMapping("/update/my")
@Operation(summary = "小程序端更新用户信息", description = "参数:用户更新请求体,权限:所有人, 方法名updateMyUser")
@Operation(summary = "小程序端用户更新个人信息", description = "参数:用户更新请求体,权限:所有人, 方法名updateMyUser")
public BaseResponse<Boolean> updateMyUser(@RequestBody UserUpdateMyRequest userUpdateMyRequest, HttpServletRequest request) {
if (userUpdateMyRequest == null) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -159,7 +157,7 @@ public class UserController {
*/
@PostMapping("/add")
@Operation(summary = "Web端管理员创建用户", description = "参数:用户添加请求体, 权限:管理员(admin, boss), 方法名addUser")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
@AuthCheck(mustRole = UserConstant.BOSS_ROLE)
public BaseResponse<User> addUser(@RequestBody UserAddRequest userAddRequest) {
if (userAddRequest == null) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -183,7 +181,7 @@ public class UserController {
*/
@PostMapping("/delete")
@Operation(summary = "Web端管理员删除用户", description = "参数:用户删除请求体, 权限:管理员(admin, boss), 方法名deleteUser")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
@AuthCheck(mustRole = UserConstant.BOSS_ROLE)
public BaseResponse<Boolean> deleteUser(@RequestBody CommonRequest deleteRequest) {
if (deleteRequest == null || deleteRequest.getId() <= 0) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -201,7 +199,7 @@ public class UserController {
*/
@PostMapping("/update")
@Operation(summary = "Web端管理员更新用户", description = "参数:用户更新请求体, 权限:管理员(admin, boss), 方法名updateUser")
@AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
@AuthCheck(mustRole = UserConstant.BOSS_ROLE)
public BaseResponse<Boolean> updateUser(@RequestBody UserUpdateRequest userUpdateRequest) {
if (userUpdateRequest == null || userUpdateRequest.getId() <= 0) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);
@ -215,7 +213,7 @@ public class UserController {
/**
* 根据 id 获取用户仅管理员
* 根据 id 获取用户
* @param id
* @return 用户信息
*/