From 44180ee779c038ad628fcd847a0b8e2ca9b6f4ee Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 22 十一月 2024 10:46:17 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java | 53 +++--------------------------------------------------
1 files changed, 3 insertions(+), 50 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java
index 38b9743..6541c45 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java
@@ -18,19 +18,12 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.rocketmq.client.exception.MQBrokerException;
import org.apache.rocketmq.client.exception.MQClientException;
-import org.apache.rocketmq.client.producer.DefaultMQProducer;
-import org.apache.rocketmq.client.producer.SendResult;
-import org.apache.rocketmq.common.message.Message;
import org.apache.rocketmq.remoting.exception.RemotingException;
-import org.apache.rocketmq.spring.core.RocketMQTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Objects;
@@ -47,18 +40,6 @@
@RequiredArgsConstructor
public class WorkOrderCtrl {
private final WorkOrderSv workOrderSv;
-
- @Autowired
- private RocketMQTemplate rocketMQTemplate;
-
- @Value("${rocketmq.name-server}")
- protected String nameServer;
-
- @Value("${rocketmq.producer.group}")
- protected String producerGroup;
-
- @Value("${rocketmq.topic}")
- protected String topic;
/**
* 鍒涘缓宸ュ崟
@@ -88,39 +69,11 @@
return BaseResponseUtils.buildErrorMsg("鑾峰彇宸ュ崟澶辫触");
}
- if(!sendWorkOrder(voWorkOrder, workOrderId)) {
- return BaseResponseUtils.buildErrorMsg("宸ュ崟鎺ㄩ�佸け璐�");
- }
+ //if(!sendWorkOrder(voWorkOrder, workOrderId)) {
+ // return BaseResponseUtils.buildErrorMsg("宸ュ崟鎺ㄩ�佸け璐�");
+ //}
return BaseResponseUtils.buildSuccess();
- }
-
- /**
- * 閫氳繃RocketMQ鎺ㄩ�佸伐鍗曚富閿�
- * @param voWorkOrder 宸ュ崟瑙嗗浘瀵硅薄
- * @param workOrderId 宸ュ崟ID
- * @return
- * @throws MQClientException
- * @throws MQBrokerException
- * @throws RemotingException
- * @throws InterruptedException
- */
- private Boolean sendWorkOrder(VoWorkOrder voWorkOrder, Long workOrderId) throws MQClientException, MQBrokerException, RemotingException, InterruptedException {
- String tag = voWorkOrder.getInspector();
- String key = voWorkOrder.getInspectorId().toString();
- //String message = JSON.toJSONString(voWorkOrder);
- String message = workOrderId.toString();
-
- DefaultMQProducer producer = new DefaultMQProducer(producerGroup);
- producer.setNamesrvAddr(nameServer);
- producer.start();
- Message msg = new Message(topic, tag, key, message.getBytes(StandardCharsets.UTF_8));
- SendResult approveSendResult = producer.send(msg);
- if(!approveSendResult.getSendStatus().toString().equals("SEND_OK")) {
- return false;
- }
-
- return true;
}
/**
--
Gitblit v1.8.0