修复rabbitmq配置

src/main/java/com/usky/dxtop/controller/web/StaffController.java

@@ -1,11 +1,22 @@
 package com.usky.dxtop.controller.web;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.model.Dept;
+import com.usky.dxtop.model.Staff;
 import com.usky.dxtop.model.StaffRadio;
+import com.usky.dxtop.service.DeptService;
 import com.usky.dxtop.service.StaffRadioService;
 import com.usky.dxtop.service.StaffService;
+import com.usky.dxtop.service.config.rabbitmq.face.FaceConsumeConfig;
+import com.usky.dxtop.service.config.rabbitmq.group.GroupConsumeConfig;
+import com.usky.dxtop.service.config.rabbitmq.profile.ProfileConsumeConfig;
+import com.usky.dxtop.service.job.SmJob;
 import com.usky.dxtop.service.vo.StaffRequest;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -23,7 +34,23 @@ public class StaffController {
 
     @Autowired
     private StaffService staffService;
+    @Autowired
+    private DeptService deptService;
+    @Autowired
+    @Qualifier(ProfileConsumeConfig.TEMPLATE)
+    private RabbitTemplate profileRabbitTemplate;
+
+
+    @Autowired
+    @Qualifier(FaceConsumeConfig.TEMPLATE)
+    private RabbitTemplate faceRabbitTemplate;
 
+    @Autowired
+    @Qualifier(GroupConsumeConfig.TEMPLATE)
+    private RabbitTemplate groupRabbitTemplate;
+
+    @Autowired
+    private SmJob smJob;
 
     /**
      *
@@ -84,4 +111,19 @@ public class StaffController {
         return AjaxResult.success(staffService.one(id,phone,card));
     }
 
+    @GetMapping("send")
+    public String sendDeptAndStaff(@RequestParam Long staffId,
+                                 @RequestParam  String card,
+                                 @RequestParam  Integer type){
+        Staff staff = staffService.getById(staffId);
+        staff.setCardId(card);
+        LambdaQueryWrapper<Dept> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(Dept::getId,staff.getDeptId());
+        Dept dept = deptService.getOne(queryWrapper);
+        smJob.deptSendMessage(dept);
+        smJob.personSendMessage(staff,type);
+        smJob.faceSendMessage(staff);
+        return "sucess";
+    }
+
 }

src/main/java/com/usky/dxtop/service/config/rabbitmq/DishTransConfig.java

@@ -22,7 +22,7 @@ public class DishTransConfig {
 
     @Autowired
     private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "dish_trans_produce";
+    public static final String NAME = "dish_trade_produce";
     private final static String MODULE_NAME = "dishT";
 
     public final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;

src/main/java/com/usky/dxtop/service/config/rabbitmq/cartget/CartGetConsumeConfig.java

@@ -24,7 +24,7 @@ public class CartGetConsumeConfig {
 
     @Autowired
     private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "card_get_consume";
+    public static final String NAME = "balance_get_consume";
     public final static String MODULE_NAME = "cardgetC";
 
     public final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;

src/main/java/com/usky/dxtop/service/config/rabbitmq/cartget/CartGetProduceConfig.java

@@ -23,7 +23,7 @@ public class CartGetProduceConfig {
 
     @Autowired
     private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "card_get_produce";
+    public static final String NAME = "balance_get_produce";
     public final static String MODULE_NAME = "cardgetP";
 
     public final static String CONNECTION = MODULE_NAME+ RabbitmqConfig.CONNECTION;

src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -196,7 +196,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             msgLog.setMsg(JSON.toJSONString(chargeVo));
             msgLogService.updateById(msgLog);
             CorrelationData correlationData = new CorrelationData(msgLog.getId().toString());
-            rabbitTemplate.convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), msgLog.getMsg(),correlationData);
+            rabbitTemplate.convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), chargeVo,correlationData);
         }catch (Exception e){
             b = false;
             log.error("---order---卡充值消息发送异常"+ e.getMessage());

src/main/java/com/usky/dxtop/service/job/SmJob.java

@@ -173,7 +173,7 @@ public class SmJob {
      * 人员消息
      * @param staff
      */
-    private void personSendMessage(Staff staff,Integer type){
+    public void personSendMessage(Staff staff,Integer type){
         Map<String,Object> map = new HashMap<>();
         map.put("type",type);
         map.put("card_type",1);
@@ -193,14 +193,14 @@ public class SmJob {
         msgLog.setMsg(JSON.toJSONString(map));
         msgLogService.updateById(msgLog);
         CorrelationData correlationData = new CorrelationData(msgLog.getId().toString());
-        profileRabbitTemplate.convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), msgLog.getMsg(),correlationData);
+        profileRabbitTemplate.convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), map,correlationData);
     }
 
     /**
      * 部门消息
      * @param dept
      */
-    private void deptSendMessage(Dept dept){
+    public void deptSendMessage(Dept dept){
         Map<String,Object> map = new HashMap<>();
         map.put("parentid",dept.getPid());
         map.put("id",dept.getId());
@@ -214,14 +214,14 @@ public class SmJob {
         msgLog.setMsg(JSON.toJSONString(map));
         msgLogService.updateById(msgLog);
         CorrelationData correlationData = new CorrelationData(msgLog.getId().toString());
-        groupRabbitTemplate.convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), msgLog.getMsg(),correlationData);
+        groupRabbitTemplate.convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), map,correlationData);
     }
 
     /**
      * 人脸
      * @param staff
      */
-    private void faceSendMessage(Staff staff){
+    public void faceSendMessage(Staff staff){
         Map<String,Object> map = new HashMap<>();
         map.put("mob",staff.getId());
         map.put("image",staff.getFaceId());
@@ -235,7 +235,7 @@ public class SmJob {
         msgLog.setMsg(JSON.toJSONString(map));
         msgLogService.updateById(msgLog);
         CorrelationData correlationData = new CorrelationData(msgLog.getId().toString());
-        faceRabbitTemplate.convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), msgLog.getMsg(),correlationData);
+        faceRabbitTemplate.convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), map,correlationData);
     }
 
     @Data

src/main/resources/application-prod.properties

@@ -99,10 +99,10 @@ dx.captchaType: math
 dx.profile: /usr/local/service/dxtop/dxfile
 
 # mq
-spring.rabbitmq.host=10.21.39.1
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=admin
-spring.rabbitmq.password=123456
+spring.rabbitmq.host=10.208.19.5
+spring.rabbitmq.port=11673
+spring.rabbitmq.username=rabbit
+spring.rabbitmq.password=Rabbit!@#$123
 # 开启confirms回调 P -> Exchange
 spring.rabbitmq.publisher-confirm-type=correlated