1.mq接收数据逻辑修复

blade-service/logpm-factory/src/main/java/com/logpm/factory/config/RabbitMqConfiguration.java

@@ -78,9 +78,9 @@ public class RabbitMqConfiguration {
 	}
 
 
-	@Bean
-	DirectExchange lonelyDirectExchange() {
-		return new DirectExchange("lonelyDirectExchange");
-	}
+//	@Bean
+//	DirectExchange lonelyDirectExchange() {
+//		return new DirectExchange("lonelyDirectExchange");
+//	}
 
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DirectQueueOneHandler.java

@@ -42,7 +42,7 @@ public class DirectQueueOneHandler {
 		} catch (IOException e) {
 			try {
 				// 处理失败,重新压入MQ
-				channel.basicRecover();
+				channel.basicReject(deliveryTag,true);
 			} catch (IOException e1) {
 				e1.printStackTrace();
 			}

blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/PanFactoryDataController.java

@@ -170,6 +170,8 @@ public class PanFactoryDataController extends BladeController {
 			//将消息携带绑定键值：TestDirectRouting 发送到交换机TestDirectExchange
 			rabbitTemplate.convertAndSend(RabbitConstant.ORDER_STATUS_EXCHANGE, RabbitConstant.ORDER_STATUS_ROUTING, map);
 
+			panOrderStatusLog.setStatus(0);
+			panOrderStatusLogService.saveOrUpdate(panOrderStatusLog);
 
 //			R r = factoryDataService.handleData(orderInfoDTO);
 			return R.success("调用成功");

blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/PanFactoryDataServiceImpl.java

@@ -147,8 +147,6 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 			String message = payload.getString("data");
 			if(code.equals(1)){
 				logger.info("##########handleData: 物流状态传递成功");
-				panOrderStatusLog.setStatus(0);
-				panOrderStatusLogService.saveOrUpdate(panOrderStatusLog);
 			}else{
 				return R.fail(400,message);
 			}