From 5da77491ac8c860187aa958f00daee7c0d35fcf1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 23 十一月 2024 11:31:24 +0800
Subject: [PATCH] 屏闭掉升级演示程序，开放正式程序
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java | 84 +++++++++++++++---------------------------
1 files changed, 30 insertions(+), 54 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 e365380..1711a73 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
@@ -8,6 +8,7 @@
import com.dy.pipIrrApp.workOrder.dto.DtoDeleteProResult;
import com.dy.pipIrrApp.workOrder.dto.DtoDeleteWorkOrder;
import com.dy.pipIrrApp.workOrder.qo.QoWorkOrder;
+import com.dy.pipIrrGlobal.pojoOp.OpeApproveResult;
import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult;
import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder;
import com.dy.pipIrrGlobal.voOp.VoProcessingResult;
@@ -15,21 +16,11 @@
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
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 +38,6 @@
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;
-
/**
* 鍒涘缓宸ュ崟
* @param po
@@ -68,7 +47,7 @@
@PostMapping(path = "addWorkOrder", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> addWorkOrder(@RequestBody @Valid OpeWorkOrder po, BindingResult bindingResult) throws MQBrokerException, RemotingException, InterruptedException, MQClientException {
+ public BaseResponse<Boolean> addWorkOrder(@RequestBody @Valid OpeWorkOrder po, BindingResult bindingResult) {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -87,39 +66,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;
}
/**
@@ -169,6 +120,7 @@
* @return
*/
@GetMapping(path = "/getOneWorkOrder")
+ @SsoAop()
public BaseResponse<VoWorkOrder> getOneWorkOrder(@RequestParam("workOrderId") Long workOrderId) {
try {
return BaseResponseUtils.buildSuccess(workOrderSv.getWorkOrderById(workOrderId));
@@ -190,6 +142,7 @@
*/
@PostMapping(path = "addProcessingResult")
@Transactional(rollbackFor = Exception.class)
+ @SsoAop()
public BaseResponse<Boolean> addProcessingResult(@RequestBody @Valid OpeProcessingResult po, BindingResult bindingResult) {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -234,6 +187,7 @@
* @return
*/
@GetMapping(path = "/getProResult")
+ @SsoAop()
public BaseResponse<VoProcessingResult> getProResult(@RequestParam("proResultId") Long proResultId) {
try {
String aa = JSON.toJSONString(workOrderSv.getProResultById(proResultId));
@@ -244,4 +198,26 @@
return BaseResponseUtils.buildException(e.getMessage());
}
}
+
+ /**
+ * 瀹℃牳澶勭悊缁撴灉
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "approveProResult")
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> approveProResult(@RequestBody @Valid OpeApproveResult po, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ String result = workOrderSv.approveProResult(po);
+ if(!result.equals("success")) {
+ return BaseResponseUtils.buildErrorMsg(result);
+ }
+
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
}
--
Gitblit v1.8.0