From 5b8a52d6cef6f6b1032cc576471b505e69304331 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 08 十一月 2024 15:47:38 +0800
Subject: [PATCH] 上传RTU升级文件接收端增加判断重名文件，重名文件不允许上传

---
 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java |   78 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 2 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 1a01ab6..34746ef 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
@@ -1,13 +1,20 @@
 package com.dy.pipIrrApp.workOrder;
 
+import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrApp.workOrder.qo.QoWorkOrder;
+import com.dy.pipIrrGlobal.daoOp.OpeProcessingResultMapper;
 import com.dy.pipIrrGlobal.daoOp.OpeWorkOrderMapper;
+import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult;
 import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder;
 import com.dy.pipIrrGlobal.voOp.VoWorkOrder;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.common.utils.PojoUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author ZhuBaoMin
@@ -22,6 +29,9 @@
     @Autowired
     private OpeWorkOrderMapper opeWorkOrderMapper;
 
+    @Autowired
+    private OpeProcessingResultMapper opeProcessingResultMapper;
+
     /**
      * 娣诲姞宸ュ崟璁板綍
      * @param po
@@ -29,7 +39,7 @@
      */
     public Long insertWorkOrder(OpeWorkOrder po) {
         po.setDispatchTime(new Date());
-        po.setState((byte)1);
+        po.setState((byte) 1);
         po.setRejectTimes(0);
         po.setDeleted(0L);
 
@@ -38,11 +48,75 @@
     }
 
     /**
-     * 鏍规嵁涓婚敭鑾峰彇宸ュ崟瑙嗗浘瀵硅薄
+     * 鑾峰彇鎸囧畾娲惧崟浜虹殑鎸囧畾鏈垹闄ゅ伐鍗曪紝鍒犻櫎宸ュ崟鍓嶅垽鏂娇鐢ㄤ娇鐢�
+     * @param dispatcherId
+     * @param workOrderId
+     * @return
+     */
+    public OpeWorkOrder getWorkOrder(Long dispatcherId, Long workOrderId) {
+        return opeWorkOrderMapper.getWorkOrder(dispatcherId, workOrderId);
+    }
+
+    /**
+     * 閫昏緫鍒犻櫎涓�涓湭鍒犻櫎鐨勫伐鍗�
+     * @param workOrderId
+     * @return
+     */
+    public Integer deleteWorkOrder(Long workOrderId) {
+        return opeWorkOrderMapper.deleteWorkOrder(workOrderId);
+    }
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇宸ュ崟
+     * @param qo
+     * @return
+     */
+    public QueryResultVo<List<VoWorkOrder>> getWorkOrders(QoWorkOrder qo) {
+        qo.completionTime() ;
+
+        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+        Long itemTotal = opeWorkOrderMapper.getWorkOrdersCount(params);
+
+        QueryResultVo<List<VoWorkOrder>> rsVo = new QueryResultVo<>() ;
+        rsVo.pageSize = qo.pageSize ;
+        rsVo.pageCurr = qo.pageCurr ;
+
+        rsVo.calculateAndSet(itemTotal, params);
+        rsVo.obj = opeWorkOrderMapper.getWorkOrders(params);
+        return rsVo ;
+    }
+
+    /**
+     * 鏍规嵁宸ュ崟涓婚敭鑾峰彇宸ュ崟瑙嗗浘瀵硅薄
      * @param workOrderId
      * @return
      */
     public VoWorkOrder getWorkOrderById(Long workOrderId) {
         return opeWorkOrderMapper.getWorkOrderById(workOrderId);
     }
+
+    /**
+     * 鏍规嵁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();
+    }
 }

--
Gitblit v1.8.0