From 1de35281a699b8d2ca90777f63c7e032c3c9dc3d Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期一, 12 十月 2026 13:34:34 +0800
Subject: [PATCH] 对接第 6 台新威上位机（7.6 客户端，走库路线），并修两处对接中暴露的问题
---
ruoyi-admin/src/test/java/com/battery/business/service/impl/TestWarningExceptionServiceTest.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/test/java/com/battery/business/service/impl/TestWarningExceptionServiceTest.java b/ruoyi-admin/src/test/java/com/battery/business/service/impl/TestWarningExceptionServiceTest.java
index 9291f0d..6760c0c 100644
--- a/ruoyi-admin/src/test/java/com/battery/business/service/impl/TestWarningExceptionServiceTest.java
+++ b/ruoyi-admin/src/test/java/com/battery/business/service/impl/TestWarningExceptionServiceTest.java
@@ -3,11 +3,13 @@
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import org.junit.jupiter.api.Test;
+import com.ruoyi.common.exception.ServiceException;
import com.battery.business.domain.TTest;
import com.battery.business.domain.TTestWarningException;
import com.battery.business.domain.TTestWarningThreshold;
@@ -68,18 +70,24 @@
}
@Test
- void closesOpenExceptionAndAppendsAuditInServiceOperation() {
+ void closesOpenExceptionOnlyForTestPrincipalWithHandlingNote() {
TTestMapper mapper = mock(TTestMapper.class);
TestWarningExceptionService service = new TestWarningExceptionService(mapper);
TTestWarningException exception = new TTestWarningException();
exception.setExceptionId(7L);
exception.setTestId(1L);
+ TTest test = new TTest();
+ test.setTestId(1L);
+ test.setPrincipalId(22L);
when(mapper.selectWarningExceptionById(7L)).thenReturn(exception);
+ when(mapper.selectTestById(1L)).thenReturn(test);
when(mapper.closeWarningException(eq(7L), eq(22L), eq("负责人"), any(Date.class), eq("已核实"))).thenReturn(1);
- int rows = service.close(7L, 22L, "负责人", "已核实");
+ assertEquals(exception, service.closeByPrincipal(7L, 22L, "负责人", "已核实"));
- assertEquals(1, rows);
+ // 归属校验与处理结果必填都由服务层负责，Controller 不再判断业务规则。
+ assertThrows(ServiceException.class, () -> service.closeByPrincipal(7L, 23L, "其他人", "已核实"));
+ assertThrows(ServiceException.class, () -> service.closeByPrincipal(7L, 22L, "负责人", " "));
}
private static TTest testWithThreshold(String metric, BigDecimal min, BigDecimal max) {
--
Gitblit v1.7.1