工单流程重构

pipe-network-service/zksy-admin/src/test/java/com/zksy/web/controller/WaterSupply/DeviceAbnormal/DeviceAbnormalControllerTest.java

@@ -10,6 +10,7 @@ import com.zksy.common.core.domain.entity.SysUser;
 import com.zksy.common.core.domain.model.LoginUser;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.zksy.ops.dto.WorkOrderDispatchDTO;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.junit.jupiter.api.BeforeEach;
@@ -78,7 +79,7 @@ class DeviceAbnormalControllerTest {
         order.setOrderNo("WO-T6-001");
         order.setOrderStatus(1);
         when(deviceService.createAbnormalWorkOrder(any())).thenReturn(order);
-        when(businessWorkOrderService.dispatchOrder(12L, 88L, null, 7L, "operator")).thenReturn(true);
+        when(businessWorkOrderService.dispatch(any(WorkOrderDispatchDTO.class))).thenReturn(true);
 
         mockMvc.perform(post("/waterSupply/device/abnormal/order")
                         .contentType("application/json")
@@ -89,10 +90,10 @@ class DeviceAbnormalControllerTest {
                     assertTrue(body.contains("WO-T6-001"));
                     assertTrue(body.contains("orderId"));
                     assertTrue(body.contains("orderStatus"));
-                    assertTrue(body.contains("\"orderStatus\":2"));
-                    assertTrue(body.contains("\"receiveUser\":\"88\""));
+                    assertTrue(body.contains("\"orderStatus\":1"));
+                    assertTrue(body.contains("\"receiveUser\":88"));
                 });
-        verify(businessWorkOrderService).dispatchOrder(12L, 88L, null, 7L, "operator");
+        verify(businessWorkOrderService).dispatch(any(WorkOrderDispatchDTO.class));
     }
 
     @Test
@@ -112,10 +113,9 @@ class DeviceAbnormalControllerTest {
         }}.createAbnormalOrder(request);
 
         assertEquals(200, result.get("code"));
-        assertEquals(1, ((WorkOrder) result.get("data")).getOrderStatus());
-        verify(businessWorkOrderService, org.mockito.Mockito.never())
-                .dispatchOrder(org.mockito.ArgumentMatchers.anyLong(), org.mockito.ArgumentMatchers.anyLong(),
-                        org.mockito.ArgumentMatchers.any(), org.mockito.ArgumentMatchers.any(), org.mockito.ArgumentMatchers.any());
+        assertEquals(0, ((WorkOrder) result.get("data")).getOrderStatus());
+        org.mockito.Mockito.verify(businessWorkOrderService, org.mockito.Mockito.never())
+                .dispatch(org.mockito.ArgumentMatchers.any(WorkOrderDispatchDTO.class));
     }
 
     @Test
@@ -139,7 +139,7 @@ class DeviceAbnormalControllerTest {
         order.setOrderNo("WO-T6-002");
         order.setOrderStatus(1);
         when(deviceService.createAbnormalWorkOrder(any())).thenReturn(order);
-        when(businessWorkOrderService.dispatchOrder(13L, 88L, null, 7L, "operator")).thenReturn(false);
+        when(businessWorkOrderService.dispatch(any(WorkOrderDispatchDTO.class))).thenReturn(false);
 
         mockMvc.perform(post("/waterSupply/device/abnormal/order")
                         .contentType("application/json")