Commit 2a2dfbeb authored by 周健威's avatar 周健威

修改bug

parent bfbd50e3
......@@ -24,6 +24,7 @@ import com.xxfc.platform.order.pojo.order.OrderPageVO;
import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
import com.xxfc.platform.tour.feign.TourFeign;
import com.xxfc.platform.universal.constant.DictionaryKey;
import com.xxfc.platform.universal.dto.SendMsgDTO;
import com.xxfc.platform.universal.entity.Dictionary;
import com.xxfc.platform.universal.feign.MQSenderFeign;
import com.xxfc.platform.universal.feign.ThirdFeign;
......@@ -434,19 +435,24 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
private void sendQueue(OrderMQDTO orderMQDTO, Integer sign) {
try {
orderMQDTO.setSign(sign);
SendMsgDTO sendMsgDTO = new SendMsgDTO(){{
setExchange(ORDER_TOPIC);
setJson(JSONUtil.toJsonStr(orderMQDTO));
}};
switch (sign) {
case 2:
mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_CANCEL, JSONUtil.toJsonStr(orderMQDTO));
sendMsgDTO.setRoutKey(KEY_ORDER_CANCEL);
break;
case 4:
mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_PAY, JSONUtil.toJsonStr(orderMQDTO));
sendMsgDTO.setRoutKey(KEY_ORDER_PAY);
break;
case 6:
mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_FINLISH, JSONUtil.toJsonStr(orderMQDTO));
sendMsgDTO.setRoutKey(KEY_ORDER_FINLISH);
break;
default:
break;
}
mqSenderFeign.postSendMessage(BeanUtil.beanToMap(sendMsgDTO, Boolean.FALSE, Boolean.TRUE));
} catch (Exception e) {
log.error(e.getMessage(), e);
}
......
package com.xxfc.platform.universal.dto;
import lombok.Data;
@Data
public class SendMsgDTO {
String exchange;
String routKey;
String json;
}
......@@ -3,12 +3,18 @@ package com.xxfc.platform.universal.feign;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.Map;
@FeignClient(value = "xx-universal", contextId = "sendMessage")
public interface MQSenderFeign {
@GetMapping(value = "/message/sendMessage")
public ObjectRestResponse sendMessage(@RequestParam(value = "exchange") String exchange, @RequestParam(value = "routKey")String routKey, @RequestParam(value = "json") String json);
@PostMapping(value = "/message/sendMessage")
public ObjectRestResponse postSendMessage(@RequestParam("entity") Map<String, Object> entity);
}
......@@ -2,8 +2,10 @@ package com.xxfc.platform.universal.controller;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.xxfc.platform.universal.biz.MQServiceBiZ;
import com.xxfc.platform.universal.dto.SendMsgDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -19,4 +21,10 @@ public class MQSenderController {
return mqServiceBiZ.sendMessage(exchange, routKey, json);
}
@PostMapping(value = "/sendMessage")
public ObjectRestResponse sendMessage(SendMsgDTO dto) {
return mqServiceBiZ.sendMessage(dto.getExchange(), dto.getRoutKey(), dto.getJson());
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment