From 6087346eb6957c64eef4bef7bed4084ba6482dfe Mon Sep 17 00:00:00 2001 From: 777 <123@qwe.com> Date: Tue, 21 Oct 2025 17:38:14 +0800 Subject: [PATCH] nnnn --- .../ruoyi/web/controller/cai/admin/init/CityController.java | 5 +++++ .../ruoyi/web/controller/cai/admin/init/ImController.java | 3 +++ .../web/controller/cai/admin/init/MqControllerTest.java | 2 ++ .../ruoyi/web/controller/cai/admin/op/BusOpController.java | 6 ++++++ .../ruoyi/web/controller/cai/admin/op/ImOpController.java | 6 ++++++ .../web/controller/cai/admin/op/RefreshOpController.java | 6 ++++++ .../java/com/ruoyi/cai/controller/UnionTotalController.java | 4 ++++ .../main/java/com/ruoyi/cai/manager/ProxyUserManager.java | 4 ++-- .../main/java/com/ruoyi/cai/mapper/ConsumeLogMapper.java | 4 ++-- .../src/main/resources/mapper/cai/ConsumeLogMapper.xml | 4 ++-- 10 files changed, 38 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/CityController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/CityController.java index bc78bff6..7f9d812e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/CityController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/CityController.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.cai.admin.init; +import cn.dev33.satoken.annotation.SaCheckRole; import com.alibaba.fastjson2.JSONObject; import com.ruoyi.cai.pay.PayOrderInfoDTO; import com.ruoyi.cai.pay.PayReturnResp; @@ -24,12 +25,14 @@ public class CityController { private PayTrdConfigService payTrdConfigService; @GetMapping("/resetRedis") + @SaCheckRole("admin") public R resetRedis(){ citysService.resetRedis(); return R.ok(); } @GetMapping("/resetOrder") + @SaCheckRole("admin") public R resetOrder(String orderNo,String payType,boolean updateData){ JSONObject jsonObject = payTrdConfigService.resetOrder(orderNo,payType,updateData); return R.ok(jsonObject); @@ -37,12 +40,14 @@ public class CityController { @PostMapping("/createOrder") + @SaCheckRole("admin") public R createOrder(@RequestBody PayOrderInfoDTO dto){ PayReturnResp orderAli = payTrdConfigService.createOrderAli(dto,false); return R.ok(orderAli); } @GetMapping("/queryOrder") + @SaCheckRole("admin") public R queryOrder(String orderNo,String payType){ JSONObject jsonObject = payTrdConfigService.queryOrder(orderNo,payType); return R.ok(jsonObject); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/ImController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/ImController.java index 77122e4b..653f7644 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/ImController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/ImController.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.cai.admin.init; +import cn.dev33.satoken.annotation.SaCheckRole; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.User; @@ -33,6 +34,7 @@ public class ImController { private UserService userService; @GetMapping("/register") + @SaCheckRole("admin") public R registerIm(Long userId){ User user = userService.getById(userId); if(user == null){ @@ -66,6 +68,7 @@ public class ImController { } @GetMapping("/registerAll") + @SaCheckRole("admin") public R registerAllIm(){ int current = 0; int success = 0; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/MqControllerTest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/MqControllerTest.java index f3483464..d3291a55 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/MqControllerTest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/MqControllerTest.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.cai.admin.init; +import cn.dev33.satoken.annotation.SaCheckRole; import com.ruoyi.cai.mq.AmqpHttpProducer; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; @@ -18,6 +19,7 @@ public class MqControllerTest { private AmqpHttpProducer amqpHttpProducer; @GetMapping("/send2") + @SaCheckRole("admin") public void send(String message){ amqpHttpProducer.sendCalculateSales(message); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/BusOpController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/BusOpController.java index c87bd73c..d8a9d2aa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/BusOpController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/BusOpController.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.cai.admin.op; +import cn.dev33.satoken.annotation.SaCheckRole; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.job.op.BusOp; @@ -26,6 +27,7 @@ public class BusOpController { private BusOp busOp; @GetMapping("/copySysLog") + @SaCheckRole("admin") public R copySysLog(int days){ log.info("备份操作日志-开始"); busOp.copySysLog(days); @@ -34,6 +36,7 @@ public class BusOpController { } @GetMapping("/deleteUserCall") + @SaCheckRole("admin") public R deleteUserCall(){ log.info("清洗垃圾通话记录-开始"); busOp.deleteUserCall(16); @@ -43,12 +46,14 @@ public class BusOpController { @GetMapping("/refreshUserVipStatus") + @SaCheckRole("admin") public R refreshUserVipStatus(){ busOp.refreshUserVipStatus(); return R.ok(); } @GetMapping("/checkVipOrder") + @SaCheckRole("admin") public R checkVipOrder(String orderNo,String startTimeStr,String endTimeStr){ LocalDateTime startTime = null; LocalDateTime endTime = null; @@ -63,6 +68,7 @@ public class BusOpController { } @GetMapping("/checkRechargeOrder") + @SaCheckRole("admin") public R checkRechargeOrder(String orderNo,String startTimeStr,String endTimeStr){ LocalDateTime startTime = null; LocalDateTime endTime = null; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/ImOpController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/ImOpController.java index f0c9720c..5234c088 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/ImOpController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/ImOpController.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.cai.admin.op; +import cn.dev33.satoken.annotation.SaCheckRole; import com.alibaba.fastjson.JSON; import com.ruoyi.common.core.domain.R; import com.ruoyi.job.op.ImOp; @@ -30,6 +31,7 @@ public class ImOpController { private ImUserRefClient imUserRefClient; @GetMapping("/getImInfo") + @SaCheckRole("admin") public R getImInfo(String id) { GetUnifoReq getUnifoReq = new GetUnifoReq(); String[] split = id.split(","); @@ -40,24 +42,28 @@ public class ImOpController { @GetMapping("/refreshIm") + @SaCheckRole("admin") public R list() { imOp.refreshIm(); return R.ok(); } @GetMapping("/refreshImUserInfo") + @SaCheckRole("admin") public R refreshImUserInfo(){ imOp.refreshImUserInfo(); return R.ok(); } @GetMapping("/refreshImByUser") + @SaCheckRole("admin") public R refreshImByUser(String usercode){ imOp.refreshImToken(usercode); return R.ok(); } @GetMapping("/refreshImNoSaveToken") + @SaCheckRole("admin") public R refreshImNoSaveToken(){ imOp.refreshImNoSaveToken(); return R.ok(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/RefreshOpController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/RefreshOpController.java index 3338dfd2..44d8fb29 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/RefreshOpController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/RefreshOpController.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.cai.admin.op; +import cn.dev33.satoken.annotation.SaCheckRole; import com.ruoyi.cai.kit.ShareUrlKit; import com.ruoyi.cai.service.RankService; import com.ruoyi.common.core.domain.R; @@ -29,12 +30,14 @@ public class RefreshOpController { private ShareUrlKit shareUrlKit; @GetMapping("/cleanShareUrlCacheByUsercode") + @SaCheckRole("admin") public R cleanShareUrlCacheByUsercode(String usercode){ shareUrlKit.cleanShareUrlCacheByUsercode(usercode); return R.ok(); } @GetMapping("/cleanShareUrlCache") + @SaCheckRole("admin") public R cleanShareUrlCache(){ shareUrlKit.cleanShareUrlCache(); return R.ok(); @@ -42,6 +45,7 @@ public class RefreshOpController { @GetMapping("/day") + @SaCheckRole("admin") public R day(String date,Integer type) { LocalDate localDate = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd")); rankService.saveDayRank(localDate, type); @@ -49,6 +53,7 @@ public class RefreshOpController { } @GetMapping("/week") + @SaCheckRole("admin") public R week(String date,Integer type){ LocalDate localDate = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd")); rankService.saveWeekRank(localDate,type); @@ -56,6 +61,7 @@ public class RefreshOpController { } @GetMapping("/month") + @SaCheckRole("admin") public R month(String date,Integer type){ LocalDate localDate = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd")); rankService.saveMonthRank(localDate,type); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UnionTotalController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UnionTotalController.java index de48a1e0..121a8013 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UnionTotalController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UnionTotalController.java @@ -1,6 +1,7 @@ package com.ruoyi.cai.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaCheckRole; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.Union; @@ -57,6 +58,7 @@ public class UnionTotalController extends BaseController { @Log(title = "刷新工会每日收益", businessType = BusinessType.DELETE) @GetMapping("/refreshData") + @SaCheckRole("admin") public R refreshData(String date) { if(StringUtils.isBlank(date)){ unionTotalService.refreshAll(); @@ -69,6 +71,7 @@ public class UnionTotalController extends BaseController { @Log(title = "刷新所有工会总收益") @GetMapping("/refreshAllUnion") + @SaCheckRole("admin") public R refreshAllUnion() { unionTotalService.refreshUnionTotalAll(); return R.ok(); @@ -76,6 +79,7 @@ public class UnionTotalController extends BaseController { @Log(title = "刷新指定工会总收益") @GetMapping("/refreshUnionTotal") + @SaCheckRole("admin") public R refreshUnionTotal(Long unionId) { unionTotalService.refreshUnionTotal(unionId); return R.ok(); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ProxyUserManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ProxyUserManager.java index aa63c87d..89975045 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ProxyUserManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ProxyUserManager.java @@ -27,7 +27,7 @@ public class ProxyUserManager { public IPage orderLogList(String usercode,PageQuery pageQuery, OrderListDTO query){ User user = getUser(usercode); - return consumeLogMapper.selectProxyUserOrderPage(pageQuery.build(),user.getUsercode(), query); + return consumeLogMapper.selectProxyUserOrderPage(pageQuery.build(),user.getId(), query); } public IPage bindUserList(String userCode, PageQuery pageQuery, BindUserListDTO query) { @@ -37,7 +37,7 @@ public class ProxyUserManager { public ProxyTotalDTO total(String userCode) { User user = getUser(userCode); - BigDecimal priceSum = consumeLogMapper.sumProxyUserOrder(user.getUsercode()); + BigDecimal priceSum = consumeLogMapper.sumProxyUserOrder(user.getId()); Long userCount = userInviteMapper.countProxyBindUser(user.getId()); ProxyTotalDTO proxyTotalDTO = new ProxyTotalDTO(); proxyTotalDTO.setBindUserCount(userCount == null ? 0 : userCount); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ConsumeLogMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ConsumeLogMapper.java index f938057b..f3f3ba8f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ConsumeLogMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ConsumeLogMapper.java @@ -16,8 +16,8 @@ import java.math.BigDecimal; */ public interface ConsumeLogMapper extends BaseMapper { IPage selectProxyUserOrderPage(@Param("page") IPage page, - @Param("proxyUserCode") String proxyUserCode, + @Param("proxyUserId") Long proxyUserId, @Param("query") OrderListDTO query); - BigDecimal sumProxyUserOrder(@Param("userCode") String userCode); + BigDecimal sumProxyUserOrder(@Param("userId") Long userId); } diff --git a/ruoyi-cai/src/main/resources/mapper/cai/ConsumeLogMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/ConsumeLogMapper.xml index 6f2c9c69..d7d08e3a 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/ConsumeLogMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/ConsumeLogMapper.xml @@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from cai_consume_log t1 join cai_recharge_order t2 on t1.trace_id = t2.trace_id left join cai_user t3 on t2.user_id = t3.id - where t1.type = 1 and t1.one_user_id = #{proxyUserCode} and t1.`status` = 1 + where t1.type = 1 and t1.one_user_id = #{proxyUserId} and t1.`status` = 1 and t3.usercode = #{query.usercode} @@ -31,6 +31,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sum(t2.price) from cai_consume_log t1 join cai_recharge_order t2 on t1.trace_id = t2.trace_id - where t1.type = 1 and t1.one_user_id = #{userCode} and t1.`status` = 1 + where t1.type = 1 and t1.one_user_id = #{userId} and t1.`status` = 1