From 63a12d1eaaea08d7573e2788156adb7976a8a32d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 11 Oct 2023 14:41:01 +0800
Subject: [PATCH] redbagprod
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java | 8 ++++
src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java | 3 +
src/main/java/cc/mrbird/febs/common/configure/RabbitConfigure.java | 17 ++++++++
src/main/resources/templates/febs/views/modules/chat/userList.html | 30 +++++---------
src/main/java/cc/mrbird/febs/mall/service/IAdminChatService.java | 2 +
src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java | 8 ++--
src/main/java/cc/mrbird/febs/rabbit/producter/AgentProducer.java | 13 ++++++
src/main/java/cc/mrbird/febs/mall/controller/AdminChatController.java | 8 ++++
8 files changed, 65 insertions(+), 24 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/configure/RabbitConfigure.java b/src/main/java/cc/mrbird/febs/common/configure/RabbitConfigure.java
index c744e5e..b09877e 100644
--- a/src/main/java/cc/mrbird/febs/common/configure/RabbitConfigure.java
+++ b/src/main/java/cc/mrbird/febs/common/configure/RabbitConfigure.java
@@ -31,4 +31,21 @@
return new RabbitTemplate(connectionFactory);
}
+ // === 添加机器人 start ===
+ @Bean
+ public DirectExchange imAddRobotExchange() {
+ return new DirectExchange(RabbitQueueEnum.IM_REDBAG_GET_ADD_ROBOT.getExchange());
+ }
+
+ @Bean
+ public Queue imAddRobotQueue() {
+ return new Queue(RabbitQueueEnum.IM_REDBAG_GET_ADD_ROBOT.getQueue());
+ }
+
+ @Bean
+ public Binding imAddRobotBind() {
+ return BindingBuilder.bind(imAddRobotQueue()).to(imAddRobotExchange()).with(RabbitQueueEnum.IM_REDBAG_GET_ADD_ROBOT.getRoute());
+ }
+ // === 添加机器人 end ===
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminChatController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminChatController.java
index 7c0ceed..8da5240 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminChatController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminChatController.java
@@ -198,4 +198,12 @@
public FebsResponse updateGroupInfo(AdminGroupInfoVo adminGroupInfoVo) {
return iAdminChatService.updateGroupInfo(adminGroupInfoVo);
}
+ /**
+ * 添加会员
+ */
+ @GetMapping("registerMember/")
+ @ControllerEndpoint(operation = "会员列表---关闭", exceptionMessage = "操作失败")
+ public FebsResponse registerMember() {
+ return iAdminChatService.registerMember();
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminChatService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminChatService.java
index 436b7be..b03500b 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminChatService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminChatService.java
@@ -41,4 +41,6 @@
FebsResponse openSwitchUseRobot(String id);
FebsResponse updateGroupInfo(AdminGroupInfoVo adminGroupInfoVo);
+
+ FebsResponse registerMember();
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java
index 3c01c3c..2e91adf 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java
@@ -12,6 +12,7 @@
import cc.mrbird.febs.mall.mapper.DataDictionaryMapper;
import cc.mrbird.febs.mall.service.IAdminChatService;
import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,6 +35,7 @@
private final ChatAmountFlowMapper chatAmountFlowMapper;
private final DataDictionaryMapper dataDictionaryMapper;
private final ChatGroupMapper chatGroupMapper;
+ private final AgentProducer agentProducer;
private final RedisUtils redisUtils;
@Override
@@ -218,4 +220,10 @@
chatGroupMapper.updateById(chatGroup);
return new FebsResponse().success();
}
+
+ @Override
+ public FebsResponse registerMember() {
+ agentProducer.sendAddRobotMsg("20845477");
+ return new FebsResponse().success();
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java b/src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java
index 306d6c7..16b5e72 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java
@@ -6,8 +6,8 @@
**/
public class QueueConstants {
- public static final String QUEUE_DEFAULT = "queue_h_default";
- public static final String AGENT_AUTO_LEVEL_UP = "queue_h_agent_auto_level_up";
- public static final String AGENT_RETURN_MONEY = "queue_h_agent_return_money";
- public static final String ORDER_RETURN_MONEY = "queue_h_order_return_money";
+ /**
+ * 添加机器人
+ */
+ public static final String QUEUE_IM_REDBAG_ADD_ROBOT = "queue_im_redbag_add_robot";
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java b/src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java
index 1952f7e..67bbbfe 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java
@@ -1,11 +1,12 @@
package cc.mrbird.febs.rabbit.enumerates;
+import cc.mrbird.febs.rabbit.constants.QueueConstants;
import lombok.Getter;
@Getter
public enum RabbitQueueEnum {
- ORDER_RETURN_MONEY("exchange_h_order_return_money", "route_key_h_order_return_money", "queue_h_order_return_money");
+ IM_REDBAG_GET_ADD_ROBOT("exchange_im_redbag_add_robot", "route_key_im_redbag_add_robot", QueueConstants.QUEUE_IM_REDBAG_ADD_ROBOT);
private String exchange;
diff --git a/src/main/java/cc/mrbird/febs/rabbit/producter/AgentProducer.java b/src/main/java/cc/mrbird/febs/rabbit/producter/AgentProducer.java
index f29cc87..1ccf8ea 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/producter/AgentProducer.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/producter/AgentProducer.java
@@ -3,6 +3,7 @@
import cc.mrbird.febs.rabbit.constants.ExchangeConstants;
import cc.mrbird.febs.rabbit.constants.RouteKeyConstants;
import cc.mrbird.febs.rabbit.enumerates.RabbitQueueEnum;
+import cn.hutool.core.util.IdUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.AmqpException;
import org.springframework.amqp.core.Message;
@@ -45,4 +46,16 @@
}
+ /**
+ * 添加机器人
+ */
+ public void sendAddRobotMsg(String inviteId) {
+ log.info("发送机器人自动抢红包ID:{}", inviteId);
+ CorrelationData correlationData = new CorrelationData(IdUtil.simpleUUID());
+ rabbitTemplate.convertAndSend(RabbitQueueEnum.IM_REDBAG_GET_ADD_ROBOT.getExchange(),
+ RabbitQueueEnum.IM_REDBAG_GET_ADD_ROBOT.getRoute(),
+ inviteId,
+ correlationData);
+ }
+
}
diff --git a/src/main/resources/templates/febs/views/modules/chat/userList.html b/src/main/resources/templates/febs/views/modules/chat/userList.html
index 988ac81..2816edb 100644
--- a/src/main/resources/templates/febs/views/modules/chat/userList.html
+++ b/src/main/resources/templates/febs/views/modules/chat/userList.html
@@ -76,7 +76,7 @@
</style>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="registMember">添加会员</button>-->
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="registerMember">添加机器人</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="balance">拨付余额</button>
</div>
</script>
@@ -149,27 +149,19 @@
var data = obj.data,
layEvent = obj.event;
- // if (layEvent === 'registMember') {
- // febs.modal.open( '添加会员', 'modules/mallMember/addMember', {
- // btn: ['提交', '取消'],
- // yes: function (index, layero) {
- // $('#member-add').find('#submit').trigger('click');
- // },
- // btn2: function () {
- // layer.closeAll();
- // }
- // });
- //
- // return;
- // }
-
- var checkData = table.checkStatus('userChatTable').data;
- if (checkData.length <= 0) {
- febs.alert.warn('请选择需要的用户');
- return;
+ if (layEvent === 'registerMember') {
+ febs.get(ctx + 'admin/chat/registerMember/', null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+ });
}
if (layEvent === 'balance') {
+ var checkData = table.checkStatus('userChatTable').data;
+ if (checkData.length <= 0) {
+ febs.alert.warn('请选择需要的用户');
+ return;
+ }
if (checkData.length > 1) {
febs.alert.warn('请选择一个用户');
return;
--
Gitblit v1.9.1