From dd1e0cfc7e2608ffc7348707955073b5d53a20aa Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Mon, 12 May 2025 22:04:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fileInfo/FileInfoController.java | 24 +------------------ .../project/ProjectCommissionController.java | 10 ++++---- .../controller/project/ProjectController.java | 6 ++--- .../project/PromoCodeApplyController.java | 2 +- .../ProjectSettlementController.java | 4 ++-- .../WithdrawalApplyController.java | 6 ++--- .../userInfo/UserAccountController.java | 6 ++--- .../userInfo/UserInfoController.java | 8 +++---- .../userInfo/UserMainInfoController.java | 2 +- 9 files changed, 23 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/greenorange/promotion/controller/fileInfo/FileInfoController.java b/src/main/java/com/greenorange/promotion/controller/fileInfo/FileInfoController.java index beca360..97f45c9 100644 --- a/src/main/java/com/greenorange/promotion/controller/fileInfo/FileInfoController.java +++ b/src/main/java/com/greenorange/promotion/controller/fileInfo/FileInfoController.java @@ -1,41 +1,19 @@ package com.greenorange.promotion.controller.fileInfo; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.greenorange.promotion.annotation.RequiresPermission; -import com.greenorange.promotion.annotation.SysLog; import com.greenorange.promotion.common.BaseResponse; -import com.greenorange.promotion.common.ErrorCode; import com.greenorange.promotion.common.ResultUtils; -import com.greenorange.promotion.constant.UserConstant; -import com.greenorange.promotion.exception.BusinessException; -import com.greenorange.promotion.exception.ThrowUtils; -import com.greenorange.promotion.model.dto.CommonBatchRequest; -import com.greenorange.promotion.model.dto.fileInfo.FileInfoAddRequest; -import com.greenorange.promotion.model.dto.fileInfo.FileInfoQueryRequest; -import com.greenorange.promotion.model.dto.fileInfo.FileInfoUpdateRequest; import com.greenorange.promotion.model.dto.fileInfo.UploadFileRequest; -import com.greenorange.promotion.model.entity.FileInfo; -import com.greenorange.promotion.model.vo.fileInfo.FileInfoVO; -import com.greenorange.promotion.service.common.CommonService; import com.greenorange.promotion.service.file.FileInfoService; -import com.greenorange.promotion.utils.RegexUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotBlank; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.greenorange.promotion.model.dto.CommonRequest; -import jakarta.validation.Valid; import org.springframework.web.multipart.MultipartFile; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.List; +import java.io.IOException; /** diff --git a/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java b/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java index b33c14f..6b27b91 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java @@ -76,7 +76,7 @@ public class ProjectCommissionController { @PostMapping("query/commission") @Operation(summary = "小程序用户查看查询项目的抽佣情况", description = "参数：无，权限：管理员，方法名：queryProjectCommission") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "项目明细抽佣管理", content = "小程序用户查看查询项目的抽佣情况") +// @SysLog(title = "项目明细抽佣管理", content = "小程序用户查看查询项目的抽佣情况") public BaseResponse> queryProjectCommission(HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -140,7 +140,7 @@ public class ProjectCommissionController { @PostMapping("update/rate") @Operation(summary = "小程序用户修改项目的抽佣比例", description = "参数：项目明细抽佣更新请求体，权限：管理员，方法名：updateProjectCommissionRate") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "项目明细抽佣管理", content = "小程序用户修改项目的抽佣比例") +// @SysLog(title = "项目明细抽佣管理", content = "小程序用户修改项目的抽佣比例") public BaseResponse updateProjectCommissionRate(@Valid @RequestBody ProjectCommissionUpdateRequest projectCommissionUpdateRequest, HttpServletRequest request) { Long id = projectCommissionUpdateRequest.getId(); BigDecimal currentCommissionRate = projectCommissionUpdateRequest.getCurrentCommissionRate(); @@ -176,7 +176,7 @@ public class ProjectCommissionController { @PostMapping("query/sub/commission") @Operation(summary = "小程序用户查看下级用户的项目明细抽佣情况", description = "参数：项目明细抽佣添加请求体，权限：管理员，方法名：querySubUserProjectCommission") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "项目明细抽佣管理", content = "小程序用户查看下级用户的项目明细抽佣情况") +// @SysLog(title = "项目明细抽佣管理", content = "小程序用户查看下级用户的项目明细抽佣情况") public BaseResponse> querySubUserProjectCommission(@Valid @RequestBody CommonRequest commonRequest, HttpServletRequest request) { Long projectId = commonRequest.getId(); Long userId = (Long) request.getAttribute("userId"); @@ -248,7 +248,7 @@ public class ProjectCommissionController { @PostMapping("update/sub/rate") @Operation(summary = "小程序用户修改下级用户的项目明细抽佣比例", description = "参数：下级用户项目明细抽佣更新请求体，权限：管理员，方法名：updateSubUserProjectCommissionRate") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "项目明细抽佣管理", content = "小程序用户修改下级用户的项目明细抽佣比例") +// @SysLog(title = "项目明细抽佣管理", content = "小程序用户修改下级用户的项目明细抽佣比例") public BaseResponse updateSubUserProjectCommissionRate(@Valid @RequestBody SubUserProjectCommissionUpdateRequest subUserProjectCommissionUpdateRequest) { Long id = subUserProjectCommissionUpdateRequest.getId(); BigDecimal currentCommissionRate = subUserProjectCommissionUpdateRequest.getCurrentCommissionRate(); @@ -272,7 +272,7 @@ public class ProjectCommissionController { @PostMapping("update/unite/rate") @Operation(summary = "小程序用户一键设置项目的的抽佣比例", description = "参数：统一抽佣比例，权限：管理员，方法名：uniteProjectCommissionRate") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "项目明细抽佣管理", content = "小程序用户一键设置项目的的抽佣比例") +// @SysLog(title = "项目明细抽佣管理", content = "小程序用户一键设置项目的的抽佣比例") public BaseResponse uniteProjectCommissionRate(@Valid @RequestBody ProjectCommissionUniteUpdateRequest projectCommissionUniteUpdateRequest, HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); BigDecimal uniteCommissionRate = projectCommissionUniteUpdateRequest.getUniteCommissionRate(); diff --git a/src/main/java/com/greenorange/promotion/controller/project/ProjectController.java b/src/main/java/com/greenorange/promotion/controller/project/ProjectController.java index 82fefd1..d364740 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/ProjectController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectController.java @@ -89,7 +89,7 @@ public class ProjectController { @PostMapping("query/card") @Operation(summary = "小程序用户查看项目列表", description = "参数：无，权限：管理员，方法名：queryProjectCardList") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "项目管理", content = "小程序用户查看项目列表") +// @SysLog(title = "项目管理", content = "小程序用户查看项目列表") public BaseResponse> queryProjectCardList(HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); // 获取项目明细抽佣列表 @@ -123,7 +123,7 @@ public class ProjectController { @PostMapping("query/id") @Operation(summary = "小程序用户根据id查询项目详情", description = "参数：无，权限：管理员，方法名：queryProjectDetailById") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "项目管理", content = "小程序用户根据id查询项目详情") +// @SysLog(title = "项目管理", content = "小程序用户根据id查询项目详情") public BaseResponse queryProjectDetailById(@Valid @RequestBody CommonRequest commonRequest, HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); Long id = commonRequest.getId(); @@ -174,7 +174,7 @@ public class ProjectController { @PostMapping("get/running") @Operation(summary = "小程序用户查看正在推广的项目", description = "参数：无，权限：管理员，方法名：queryUserProjectList") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "项目管理", content = "小程序用户查看正在推广的项目") +// @SysLog(title = "项目管理", content = "小程序用户查看正在推广的项目") public BaseResponse> queryUserProjectList(HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/greenorange/promotion/controller/project/PromoCodeApplyController.java b/src/main/java/com/greenorange/promotion/controller/project/PromoCodeApplyController.java index 26585fc..849fa30 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/PromoCodeApplyController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/PromoCodeApplyController.java @@ -74,7 +74,7 @@ public class PromoCodeApplyController { @PostMapping("apply") @Operation(summary = "小程序用户申请推广码", description = "参数：无，权限：管理员，方法名：applyPromoCode") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "项目管理", content = "小程序用户申请推广码") +// @SysLog(title = "项目管理", content = "小程序用户申请推广码") public BaseResponse applyPromoCode(@Valid @RequestBody PromoCodeApplyRequest promoCodeApplyRequest, HttpServletRequest request) { // 取出当前项目的推广码 Long projectId = promoCodeApplyRequest.getProjectId(); diff --git a/src/main/java/com/greenorange/promotion/controller/projectSettlement/ProjectSettlementController.java b/src/main/java/com/greenorange/promotion/controller/projectSettlement/ProjectSettlementController.java index 0301233..eebfd33 100644 --- a/src/main/java/com/greenorange/promotion/controller/projectSettlement/ProjectSettlementController.java +++ b/src/main/java/com/greenorange/promotion/controller/projectSettlement/ProjectSettlementController.java @@ -66,7 +66,7 @@ public class ProjectSettlementController { @PostMapping("query/settle") @Operation(summary = "小程序端用户根据推广码申请记录id查询结算记录", description = "参数：项目结算记录添加请求体，权限：管理员，方法名：queryProjectSettlementRecordByPid") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "项目结算记录管理", content = "小程序端用户根据推广码申请记录id查询结算记录") +// @SysLog(title = "项目结算记录管理", content = "小程序端用户根据推广码申请记录id查询结算记录") public BaseResponse> queryProjectSettlementRecordByPid(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -85,7 +85,7 @@ public class ProjectSettlementController { @PostMapping("query/all/settle") @Operation(summary = "小程序端用户查询当前推广项目的所有结算明细", description = "参数：项目结算记录添加请求体，权限：管理员，方法名：queryProjectSettlementRecordByProjectId") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "项目结算记录管理", content = "小程序端用户查询当前推广项目的所有结算明细") +// @SysLog(title = "项目结算记录管理", content = "小程序端用户查询当前推广项目的所有结算明细") public BaseResponse> queryProjectSettlementRecordByProjectId(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/greenorange/promotion/controller/projectSettlement/WithdrawalApplyController.java b/src/main/java/com/greenorange/promotion/controller/projectSettlement/WithdrawalApplyController.java index 376f3d1..38c7f53 100644 --- a/src/main/java/com/greenorange/promotion/controller/projectSettlement/WithdrawalApplyController.java +++ b/src/main/java/com/greenorange/promotion/controller/projectSettlement/WithdrawalApplyController.java @@ -59,7 +59,7 @@ public class WithdrawalApplyController { @PostMapping("add") @Operation(summary = "小程序端用户申请提现", description = "参数：提现申请记录查添加请求体，权限：管理员，方法名：addWithdrawalApply") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "提现申请记录管理", content = "小程序端用户申请提现") +// @SysLog(title = "提现申请记录管理", content = "小程序端用户申请提现") public BaseResponse addWithdrawalApply(@Valid @RequestBody WithdrawalApplyAddRequest withdrawalApplyAddRequest, HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); BigDecimal withdrawnAmount = withdrawalApplyAddRequest.getWithdrawnAmount(); @@ -79,7 +79,7 @@ public class WithdrawalApplyController { @PostMapping("query") @Operation(summary = "小程序端用户查询提现申请记录", description = "参数：无，权限：管理员，方法名：queryWithdrawalApplyByUserId") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "提现申请记录管理", content = "小程序端用户查询提现申请记录") +// @SysLog(title = "提现申请记录管理", content = "小程序端用户查询提现申请记录") public BaseResponse> queryWithdrawalApplyByUserId(HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -97,7 +97,7 @@ public class WithdrawalApplyController { @PostMapping("query/change") @Operation(summary = "小程序端用户查询资金变动记录", description = "参数：无，权限：管理员，方法名：queryFundsChangeByUserId") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "提现申请记录管理", content = "小程序端用户查询资金变动记录") +// @SysLog(title = "提现申请记录管理", content = "小程序端用户查询资金变动记录") public BaseResponse> queryFundsChangeByUserId(HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/greenorange/promotion/controller/userInfo/UserAccountController.java b/src/main/java/com/greenorange/promotion/controller/userInfo/UserAccountController.java index bee8c4b..909f642 100644 --- a/src/main/java/com/greenorange/promotion/controller/userInfo/UserAccountController.java +++ b/src/main/java/com/greenorange/promotion/controller/userInfo/UserAccountController.java @@ -56,7 +56,7 @@ public class UserAccountController { @PostMapping("add") @Operation(summary = "小程序端用户添加用户账户", description = "参数：用户账户添加请求体，权限：管理员，方法名：addUserAccount") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "用户账户管理", content = "小程序端用户添加用户账户") +// @SysLog(title = "用户账户管理", content = "小程序端用户添加用户账户") public BaseResponse addUserAccount(@Valid @RequestBody UserAccountAddRequest userAccountAddRequest, HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); UserAccount userAccount = commonService.copyProperties(userAccountAddRequest, UserAccount.class); @@ -74,7 +74,7 @@ public class UserAccountController { @PostMapping("update") @Operation(summary = "小程序端用户根据id修改用户账户信息", description = "参数：用户账户更新请求体，权限：管理员，方法名：updateUserAccount") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "用户账户管理", content = "小程序端用户根据id修改用户账户信息") +// @SysLog(title = "用户账户管理", content = "小程序端用户根据id修改用户账户信息") public BaseResponse updateUserAccount(@Valid @RequestBody UserAccountUpdateRequest userAccountUpdateRequest, HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); UserAccount userAccount = commonService.copyProperties(userAccountUpdateRequest, UserAccount.class); @@ -91,7 +91,7 @@ public class UserAccountController { @PostMapping("queryById") @Operation(summary = "web端管理员根据id查询用户账户", description = "参数：无，权限：管理员，方法名：queryUserAccountByUserId") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "用户账户管理", content = "web端管理员根据id查询用户账户") +// @SysLog(title = "用户账户管理", content = "web端管理员根据id查询用户账户") public BaseResponse queryUserAccountByUserId(HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java b/src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java index 10fa5e1..b5657f3 100644 --- a/src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java +++ b/src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java @@ -161,7 +161,7 @@ public class UserInfoController { @PostMapping("mini/in/reset/pwd") @Operation(summary = "小程序用户重置密码（内部）", description = "参数：小程序用户密码重置请求体，权限：管理员（boss, admin)，方法名：userInfoMiniInnerResetPwd") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "用户管理", content = "小程序用户重置密码（内部）") +// @SysLog(title = "用户管理", content = "小程序用户重置密码（内部）") public BaseResponse userInfoMiniInnerResetPwd(@Valid @RequestBody UserInfoResetRequest userInfoResetRequest) { userInfoService.userInfoMiniResetPwd(userInfoResetRequest); return ResultUtils.success(true); @@ -192,7 +192,7 @@ public class UserInfoController { @GetMapping("get/jwt") @Operation(summary = "小程序端用户根据jwt获取用户信息", description = "参数：无，权限：管理员（boss, admin)，方法名：getMiniUserInfoByJWT") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "用户管理", content = "小程序端用户根据jwt获取用户信息") +// @SysLog(title = "用户管理", content = "小程序端用户根据jwt获取用户信息") public BaseResponse getMiniUserInfoByJWT(HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); UserInfo userInfo = userInfoService.getById(userId); @@ -208,7 +208,7 @@ public class UserInfoController { @GetMapping("get/main/jwt") @Operation(summary = "小程序端用户根据jwt获取用户主要信息", description = "参数：无，权限：管理员（boss, admin)，方法名：getMiniUserInfoByJWT") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "用户管理", content = "小程序端用户根据jwt获取用户主要信息") +// @SysLog(title = "用户管理", content = "小程序端用户根据jwt获取用户主要信息") public BaseResponse getMiniUserMainInfoByJWT(HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); LambdaQueryWrapper userMainInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -228,7 +228,7 @@ public class UserInfoController { @GetMapping("mini/logout") @Operation(summary = "小程序端用户退出登录", description = "参数：JWT，权限：管理员（boss, admin)，方法名：userInfoMiniLogout") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "用户管理", content = "小程序端用户退出登录") +// @SysLog(title = "用户管理", content = "小程序端用户退出登录") public BaseResponse userInfoMiniLogout(@RequestHeader("Authorization") String token) { // 获取token的过期时间 DecodedJWT decodedJWT = jwtUtils.verify(token); diff --git a/src/main/java/com/greenorange/promotion/controller/userInfo/UserMainInfoController.java b/src/main/java/com/greenorange/promotion/controller/userInfo/UserMainInfoController.java index 2f3c5cd..40b60e7 100644 --- a/src/main/java/com/greenorange/promotion/controller/userInfo/UserMainInfoController.java +++ b/src/main/java/com/greenorange/promotion/controller/userInfo/UserMainInfoController.java @@ -63,7 +63,7 @@ public class UserMainInfoController { @PostMapping("query/team") @Operation(summary = "小程序用户查询团队信息", description = "参数：用户主要信息添加请求体，权限：管理员，方法名：queryUserTeamInfo") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "用户主要信息管理", content = "小程序用户查询团队信息") +// @SysLog(title = "用户主要信息管理", content = "小程序用户查询团队信息") public BaseResponse queryUserTeamInfo(HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); LambdaQueryWrapper userInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();