From c8ffc5ed851f85808aa735a575402ebae4b00da9 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 09 十一月 2024 08:19:21 +0800
Subject: [PATCH] 获取全部取水口接口取消在线情况判断
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java | 90 +++++++++++++++++++++++++++++++++++----------
1 files changed, 70 insertions(+), 20 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java
index 34746ef..356820b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java
@@ -6,6 +6,7 @@
import com.dy.pipIrrGlobal.daoOp.OpeWorkOrderMapper;
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 lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
@@ -53,8 +54,8 @@
* @param workOrderId
* @return
*/
- public OpeWorkOrder getWorkOrder(Long dispatcherId, Long workOrderId) {
- return opeWorkOrderMapper.getWorkOrder(dispatcherId, workOrderId);
+ public OpeWorkOrder getWorkOrder(Long workOrderId, Long dispatcherId) {
+ return opeWorkOrderMapper.getWorkOrder(workOrderId, dispatcherId);
}
/**
@@ -96,27 +97,76 @@
}
/**
- * 鏍规嵁workOrderId鑾峰彇鏈垹闄ょ殑澶勭悊缁撴灉鏁伴噺锛屾坊鍔犵粨鏋滀笂鎶ュ墠鍒ゆ柇浣跨敤
- * @param workOrderId
- * @return
- */
- public Boolean hasValidProcessingResult(Long workOrderId) {
- if (opeProcessingResultMapper.getValidResultCount(workOrderId) == 0) {
- return false;
- }
- return true;
- }
-
- /**
* 涓婃姤宸ュ崟澶勭悊缁撴灉
* @param po
* @return
*/
- public Long insertProcessingResult(OpeProcessingResult po) {
- po.setReportTime(new Date());
- po.setState((byte)1);
- po.setDeleted(0L);
- opeProcessingResultMapper.insert(po);
- return po.getId();
+ public String addProcessingResult(OpeProcessingResult po) {
+ String result = "";
+ OpeProcessingResult processingResult = opeProcessingResultMapper.getByWorkOrderId(po.getWorkOrderId());
+ if(processingResult == null) {
+ // 鏃犲鐞嗙粨鏋滀笂鎶ュ鐞嗙粨鏋�
+ po.setReportTime(new Date());
+ po.setState((byte)1);
+ po.setDeleted(0L);
+ opeProcessingResultMapper.insert(po);
+ if(po.getId() == 0) {
+ result = "宸ュ崟澶勭悊缁撴灉涓婃姤澶辫触";
+ return result;
+ }
+
+ result = "success";
+ return result;
+ }
+
+ switch (processingResult.getState()) {
+ case 1:
+ result = "宸ュ崟澶勭悊缁撴灉宸蹭笂鎶ワ紝璇峰嬁閲嶅涓婃姤";
+ break;
+ case 2:
+ result = "宸ュ崟澶勭悊缁撴灉宸查�氳繃";
+ break;
+ case 3:
+ // 澶勭悊缁撴灉琚┏鍥炴椂锛屽垹闄ゅ綋鍓嶅鐞嗙粨鏋滐紝涓婃姤鏂扮殑澶勭悊缁撴灉
+ processingResult.setDeleted(System.currentTimeMillis()/1000);
+ opeProcessingResultMapper.updateByPrimaryKeySelective(processingResult);
+
+ po.setReportTime(new Date());
+ po.setState((byte)1);
+ po.setDeleted(0L);
+ opeProcessingResultMapper.insert(po);
+ result = "success";
+ break;
+ }
+
+ return result;
+ }
+
+ /**
+ * 鑾峰彇鎸囧畾宸℃鍛樼殑鎸囧畾鏈垹闄や笖鏈鎵圭殑澶勭悊缁撴灉涓婃姤锛屽垹闄ゅ鐞嗙粨鏋滃墠鍒ゆ柇浣跨敤浣跨敤
+ * @param proResultId
+ * @param inspectorId
+ * @return
+ */
+ public OpeProcessingResult getProResult(Long proResultId, Long inspectorId) {
+ return opeProcessingResultMapper.getProResult(proResultId, inspectorId);
+ }
+
+ /**
+ * 閫昏緫鍒犻櫎涓�涓湭鍒犻櫎鐨勫鐞嗙粨鏋�
+ * @param proResultId
+ * @return
+ */
+ public Integer deleteProResult(Long proResultId) {
+ return opeProcessingResultMapper.deleteProResult(proResultId);
+ }
+
+ /**
+ * 鑾峰彇澶勭悊缁撴灉璇︽儏
+ * @param proResultId
+ * @return
+ */
+ public VoProcessingResult getProResultById(Long proResultId) {
+ return opeProcessingResultMapper.getProResultById(proResultId);
}
}
--
Gitblit v1.8.0