From 603c3178e64e7a63a1f902f8b2b514317acc4c8d Mon Sep 17 00:00:00 2001
From: rqian <1206436827@qq.com>
Date: Mon, 18 May 2026 09:15:08 +0800
Subject: [PATCH] =?UTF-8?q?#=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WorkOrderServiceImpl.java    | 55 +++++++++++++++++--
 1 file changed, 49 insertions(+), 6 deletions(-)

diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/WorkOrderServiceImpl.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/WorkOrderServiceImpl.java
index 0dffd41..236bac5 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/WorkOrderServiceImpl.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/WorkOrderServiceImpl.java
@@ -253,7 +253,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<IotWorkOrderMapper, IOTWor
         return baseMapper.insert(workOrder);
     }
 
-    @Override
+/*    @Override
     public int updateWorkOrder(IOTWorkOrder workOrder) {
         Long userId = SecurityUtils.getUserId();
         if (!SecurityUtils.isAdmin(userId)) {
@@ -264,8 +264,52 @@ public class WorkOrderServiceImpl extends ServiceImpl<IotWorkOrderMapper, IOTWor
         }
         workOrder.setUpdateTime(LocalDateTime.now());
         return baseMapper.updateById(workOrder);
+    }*/
+
+    @Override
+    public int updateWorkOrder(IOTWorkOrder workOrder) {
+        if (workOrder.getId() == null) {
+            throw new ServiceException("工单ID不能为空");
+        }
+
+        Long userId = SecurityUtils.getUserId();
+        if (!SecurityUtils.isAdmin(userId)) {
+            IOTWorkOrder existWorkOrder = baseMapper.selectById(workOrder.getId());
+            if (existWorkOrder != null) {
+                validateWorkOrderAccess(existWorkOrder);
+            }
+        }
+
+        IOTWorkOrder updateEntity = new IOTWorkOrder();
+        updateEntity.setId(workOrder.getId());
+        updateEntity.setOrderTitle(workOrder.getOrderTitle());
+        updateEntity.setOrderType(workOrder.getOrderType());
+        updateEntity.setPriorityLevel(workOrder.getPriorityLevel());
+        updateEntity.setDeviceId(workOrder.getDeviceId());
+        updateEntity.setDeviceName(workOrder.getDeviceName());
+        updateEntity.setSiteId(workOrder.getSiteId());
+        updateEntity.setSiteName(workOrder.getSiteName());
+        updateEntity.setAssigneeId(workOrder.getAssigneeId());
+        updateEntity.setAssigneeName(workOrder.getAssigneeName());
+        updateEntity.setCollaboratorIds(workOrder.getCollaboratorIds());
+        updateEntity.setCollaboratorNames(workOrder.getCollaboratorNames());
+        updateEntity.setPlanStartTime(workOrder.getPlanStartTime());
+        updateEntity.setPlanEndTime(workOrder.getPlanEndTime());
+        updateEntity.setDeadlineTime(workOrder.getDeadlineTime());
+        updateEntity.setOrderStatus(workOrder.getOrderStatus());
+        updateEntity.setTaskDescription(workOrder.getTaskDescription());
+        updateEntity.setAiSuggestion(workOrder.getAiSuggestion());
+        updateEntity.setRequiredEquipment(workOrder.getRequiredEquipment());
+        updateEntity.setEstimatedImpact(workOrder.getEstimatedImpact());
+        updateEntity.setHandleResult(workOrder.getHandleResult());
+        updateEntity.setHandleRemark(workOrder.getHandleRemark());
+        updateEntity.setUpdateTime(LocalDateTime.now());
+        updateEntity.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName());
+
+        return baseMapper.updateById(updateEntity);
     }
 
+
     @Override
     public int dispatchWorkOrder(WorkOrderDispatchDTO dispatchDTO) {
         IOTWorkOrder workOrder = baseMapper.selectById(dispatchDTO.getOrderId());
@@ -469,10 +513,8 @@ public class WorkOrderServiceImpl extends ServiceImpl<IotWorkOrderMapper, IOTWor
 
 
     private String generateOrderNo() {
-        String dateStr = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-        long count = baseMapper.selectCount(new LambdaQueryWrapper<IOTWorkOrder>()
-                .likeRight(IOTWorkOrder::getOrderNo, "WO" + dateStr));
-        return "WO" + dateStr + String.format("%04d", count + 1);
+        String dateStr = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+        return "WO" + dateStr + String.format("%04d", (int)(Math.random() * 10000));
     }
 
     private synchronized String generateUniqueOrderNo() {
@@ -485,7 +527,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<IotWorkOrderMapper, IOTWor
                 return orderNo;
             }
             try {
-                Thread.sleep(10);
+                Thread.sleep(5);
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
                 throw new ServiceException("生成工单号失败");
@@ -493,5 +535,6 @@ public class WorkOrderServiceImpl extends ServiceImpl<IotWorkOrderMapper, IOTWor
         }
         throw new ServiceException("生成工单号失败，请稍后重试");
     }
+
 }