From 3fdbd0285c393968fdc83b737d2a3af0105ad859 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 08 十一月 2024 08:32:59 +0800
Subject: [PATCH] 工单4个接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 102 insertions(+), 10 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 96f3f92..dbf73c5 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
@@ -1,9 +1,12 @@
package com.dy.pipIrrApp.workOrder;
-import com.alibaba.fastjson2.JSON;
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrApp.workOrder.dto.DtoDeleteWorkOrder;
+import com.dy.pipIrrApp.workOrder.qo.QoWorkOrder;
+import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult;
import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder;
import com.dy.pipIrrGlobal.voOp.VoWorkOrder;
import jakarta.validation.Valid;
@@ -21,12 +24,10 @@
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.nio.charset.StandardCharsets;
+import java.util.List;
import java.util.Objects;
/**
@@ -69,6 +70,10 @@
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
+ if(po.getClientReportId() != null && po.getInspectorReportId() != null) {
+ return BaseResponseUtils.buildErrorMsg("宸ュ崟浠呰兘鍏宠仈涓�涓棶棰樹笂鎶�");
+ }
+
Long workOrderId = workOrderSv.insertWorkOrder(po);
if(workOrderId == null || workOrderId == 0) {
return BaseResponseUtils.buildErrorMsg("鍒涘缓宸ュ崟澶辫触");
@@ -79,7 +84,7 @@
return BaseResponseUtils.buildErrorMsg("鑾峰彇宸ュ崟澶辫触");
}
- if(!sendWorkOrder(voWorkOrder)) {
+ if(!sendWorkOrder(voWorkOrder, workOrderId)) {
return BaseResponseUtils.buildErrorMsg("宸ュ崟鎺ㄩ�佸け璐�");
}
@@ -87,17 +92,20 @@
}
/**
- * 鎺ㄩ�佸伐鍗�
- * @param voWorkOrder
+ * 閫氳繃RocketMQ鎺ㄩ�佸伐鍗曚富閿�
+ * @param voWorkOrder 宸ュ崟瑙嗗浘瀵硅薄
+ * @param workOrderId 宸ュ崟ID
+ * @return
* @throws MQClientException
* @throws MQBrokerException
* @throws RemotingException
* @throws InterruptedException
*/
- private Boolean sendWorkOrder(VoWorkOrder voWorkOrder) throws MQClientException, MQBrokerException, RemotingException, 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 = JSON.toJSONString(voWorkOrder);
+ String message = workOrderId.toString();
DefaultMQProducer producer = new DefaultMQProducer(producerGroup);
producer.setNamesrvAddr(nameServer);
@@ -111,4 +119,88 @@
return true;
}
+ /**
+ * 閫昏緫鍒犻櫎鎸囧畾娲惧崟浜虹殑鎸囧畾鏈垹闄ゅ伐鍗�
+ * 鍏堝垽鏂寚瀹氭淳鍗曚汉銆佹湭鍒犻櫎鐨勬寚瀹氬伐鍗曟槸鍚﹀瓨鍦�
+ * @param deleteWorkOrder 鍒犻櫎宸ュ崟浼犺緭绫�
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "deleteWorkOrder")
+ @SsoAop()
+ public BaseResponse<Boolean> deleteWorkOrder(@RequestBody @Valid DtoDeleteWorkOrder deleteWorkOrder, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ OpeWorkOrder workOrder = workOrderSv.getWorkOrder(deleteWorkOrder.getDispatcherId(), deleteWorkOrder.getWorkOrderId());
+ if(workOrder == null) {
+ return BaseResponseUtils.buildErrorMsg("鎮ㄨ鍒犻櫎鐨勫伐鍗曚笉瀛樺湪");
+ }
+
+ if(workOrderSv.deleteWorkOrder(deleteWorkOrder.getWorkOrderId()) == 0) {
+ return BaseResponseUtils.buildErrorMsg("宸ュ崟鍒犻櫎澶辫触");
+ }
+
+
+ return BaseResponseUtils.buildSuccess();
+ }
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鏈垹闄ょ殑宸ュ崟鍒楄〃
+ * @param qo
+ * @return
+ */
+ @GetMapping(path = "/getWorkOrders")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoWorkOrder>>> getWorkOrders(QoWorkOrder qo){
+ try {
+ return BaseResponseUtils.buildSuccess(workOrderSv.getWorkOrders(qo));
+ } catch (Exception e) {
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+ /**
+ * 鑾峰彇宸ュ崟璇︽儏
+ * @param workOrderId
+ * @return
+ */
+ @GetMapping(path = "/getOneWorkOrder")
+ public BaseResponse<VoWorkOrder> getOneWorkOrder(@RequestParam("workOrderId") Long workOrderId) {
+ try {
+ return BaseResponseUtils.buildSuccess(workOrderSv.getWorkOrderById(workOrderId));
+ } catch (Exception e) {
+ log.error("鑾峰彇宸ュ崟璇︽儏寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
+ * 涓婃姤宸ュ崟澶勭悊缁撴灉
+ * 鍒ゆ柇璇ュ伐鍗曟槸鍚﹀瓨鍦ㄦ湁鏁堢殑澶勭悊缁撴灉锛屽鏋滃瓨鍦ㄥ垯鎻愮ず鐢ㄦ埛璇ュ伐鍗曞凡瀛樺湪澶勭悊缁撴灉
+ * 娣诲姞澶勭悊缁撴灉鍥炲
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "addProcessingResult")
+ @Transactional(rollbackFor = Exception.class)
+ public BaseResponse<Boolean> addProcessingResult(@RequestBody @Valid OpeProcessingResult po, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ if(workOrderSv.hasValidProcessingResult(po.getWorkOrderId())) {
+ return BaseResponseUtils.buildErrorMsg("璇ュ伐鍗曞瓨鍦ㄦ湁鏁堢殑澶勭悊缁撴灉");
+ }
+
+ Long processingResultId = workOrderSv.insertProcessingResult(po);
+ if(processingResultId == null) {
+ return BaseResponseUtils.buildErrorMsg("涓婃姤宸ュ崟澶勭悊缁撴灉澶辫触");
+ }
+
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+
}
--
Gitblit v1.8.0