From 29dbf6ba6409e3139e5f2e36588106945dd0cec2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 13 十一月 2024 17:29:29 +0800
Subject: [PATCH] 实现查询RTU远程升级任务执行结果功能
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java | 89 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 78 insertions(+), 11 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 dbf73c5..38b9743 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,13 +1,17 @@
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.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;
import com.dy.pipIrrGlobal.voOp.VoWorkOrder;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
@@ -133,7 +137,7 @@
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- OpeWorkOrder workOrder = workOrderSv.getWorkOrder(deleteWorkOrder.getDispatcherId(), deleteWorkOrder.getWorkOrderId());
+ OpeWorkOrder workOrder = workOrderSv.getWorkOrder(deleteWorkOrder.getWorkOrderId(), deleteWorkOrder.getDispatcherId());
if(workOrder == null) {
return BaseResponseUtils.buildErrorMsg("鎮ㄨ鍒犻櫎鐨勫伐鍗曚笉瀛樺湪");
}
@@ -141,7 +145,6 @@
if(workOrderSv.deleteWorkOrder(deleteWorkOrder.getWorkOrderId()) == 0) {
return BaseResponseUtils.buildErrorMsg("宸ュ崟鍒犻櫎澶辫触");
}
-
return BaseResponseUtils.buildSuccess();
}
@@ -167,6 +170,7 @@
* @return
*/
@GetMapping(path = "/getOneWorkOrder")
+ @SsoAop()
public BaseResponse<VoWorkOrder> getOneWorkOrder(@RequestParam("workOrderId") Long workOrderId) {
try {
return BaseResponseUtils.buildSuccess(workOrderSv.getWorkOrderById(workOrderId));
@@ -178,29 +182,92 @@
/**
* 涓婃姤宸ュ崟澶勭悊缁撴灉
- * 鍒ゆ柇璇ュ伐鍗曟槸鍚﹀瓨鍦ㄦ湁鏁堢殑澶勭悊缁撴灉锛屽鏋滃瓨鍦ㄥ垯鎻愮ず鐢ㄦ埛璇ュ伐鍗曞凡瀛樺湪澶勭悊缁撴灉
- * 娣诲姞澶勭悊缁撴灉鍥炲
+ * 1.鏈笂鎶ョ殑锛岀洿鎺ヤ笂鎶�
+ * 2. 宸蹭笂鎶ョ殑鐨勶紝鎻愮ず鐢ㄦ埛涓嶈兘閲嶅涓婃姤
+ * 3. 宸查�氳繃鐨勶紝鎻愮ず鐢ㄦ埛澶勭悊缁撴灉澶勭悊缁撴灉宸查�氳繃
+ * 4. 椹冲洖鐨勶紝閫昏緫鍒犻櫎鍘熷鐞嗙粨鏋滐紝涓婃姤鏂扮殑澶勭悊缁撴灉
* @param po
* @param bindingResult
* @return
*/
@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());
}
- if(workOrderSv.hasValidProcessingResult(po.getWorkOrderId())) {
- return BaseResponseUtils.buildErrorMsg("璇ュ伐鍗曞瓨鍦ㄦ湁鏁堢殑澶勭悊缁撴灉");
- }
-
- Long processingResultId = workOrderSv.insertProcessingResult(po);
- if(processingResultId == null) {
- return BaseResponseUtils.buildErrorMsg("涓婃姤宸ュ崟澶勭悊缁撴灉澶辫触");
+ String result = workOrderSv.addProcessingResult(po);
+ if(!result.equals("success")) {
+ return BaseResponseUtils.buildErrorMsg(result);
}
return BaseResponseUtils.buildSuccess(true) ;
}
+ /**
+ * 閫昏緫鍒犻櫎涓�涓鐞嗙粨鏋�
+ * @param deleteProResult
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "deleteProResult")
+ @SsoAop()
+ public BaseResponse<Boolean> deleteProResult(@RequestBody @Valid DtoDeleteProResult deleteProResult, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ OpeProcessingResult proResult = workOrderSv.getProResult(deleteProResult.getProResultId(), deleteProResult.getInspectorId());
+ if(proResult == null) {
+ return BaseResponseUtils.buildErrorMsg("鎮ㄨ鍒犻櫎鐨勫鐞嗙粨鏋滀笉瀛樺湪");
+ }
+
+ if(workOrderSv.deleteProResult(deleteProResult.getProResultId()) == 0) {
+ return BaseResponseUtils.buildErrorMsg("澶勭悊缁撴灉鍒犻櫎澶辫触");
+ }
+
+ return BaseResponseUtils.buildSuccess();
+ }
+
+ /**
+ * 鑾峰彇澶勭悊缁撴灉璇︽儏
+ * @param proResultId
+ * @return
+ */
+ @GetMapping(path = "/getProResult")
+ @SsoAop()
+ public BaseResponse<VoProcessingResult> getProResult(@RequestParam("proResultId") Long proResultId) {
+ try {
+ String aa = JSON.toJSONString(workOrderSv.getProResultById(proResultId));
+ System.out.println(aa);
+ return BaseResponseUtils.buildSuccess(workOrderSv.getProResultById(proResultId));
+ } catch (Exception e) {
+ log.error("鑾峰彇澶勭悊缁撴灉璇︽儏寮傚父", e);
+ 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