Prechádzať zdrojové kódy

chore(test): 删除语法损坏的 WaterSupplyDeviceServiceImplTest(票 71 收口清理)

3c734fe9(预警/报警等级统一)在该类两处把 alarm(..., 1) 改成 alarm(..., "1"))),多出一个右括号,
导致 zksy-system 测试源码编译不过,任何 mvn -pl zksy-admin -am 闸门都会断在这里的无关文件上。

按维护者 2026-10-23 指令直接删除该测试类:13 个测试随之移除(内容可从 c654d3f9 取回)。
清理后 Cockpit*Test,BusinessCockpit*Test 以 -pl zksy-admin -am 一次跑通 566/566。
lead 1 týždeň pred
rodič
commit
a13dcaf5ea

+ 0 - 395
pipe-network-service/zksy-system/src/test/java/com/zksy/base/service/impl/WaterSupplyDeviceServiceImplTest.java

@@ -1,395 +0,0 @@
-package com.zksy.base.service.impl;
-
-import com.baomidou.mybatisplus.core.MybatisConfiguration;
-import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
-import com.zksy.base.alarm.domain.AlarmData;
-import com.zksy.base.alarm.mapper.AlarmDataMapper;
-import com.zksy.base.domain.EquipmentBase;
-import com.zksy.base.domain.EquipmentMaintain;
-import com.zksy.base.domain.EquipmentStatus;
-import com.zksy.base.domain.EquipmentType;
-import com.zksy.ops.domain.WorkOrder;
-import com.zksy.base.domain.vo.AbnormalDeviceVO;
-import com.zksy.base.domain.vo.DeviceDetailVO;
-import com.zksy.base.domain.vo.DeviceGisVO;
-import com.zksy.base.domain.vo.DeviceTypeStatisticsVO;
-import com.zksy.base.mapper.EquipmentMaintainMapper;
-import com.zksy.base.mapper.EquipmentStatusMapper;
-import com.zksy.base.mapper.EquipmentTypeMapper;
-import com.zksy.ops.mapper.WorkOrderMapper;
-import com.zksy.base.service.EquipmentBaseService;
-import com.zksy.common.core.domain.entity.SysUser;
-import com.zksy.system.service.ISysUserService;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.apache.ibatis.builder.MapperBuilderAssistant;
-import org.mockito.Mockito;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-class WaterSupplyDeviceServiceImplTest {
-
-    @BeforeAll
-    static void initializeMybatisPlusLambdaCache() {
-        MapperBuilderAssistant assistant = new MapperBuilderAssistant(new MybatisConfiguration(), "");
-        TableInfoHelper.initTableInfo(assistant, EquipmentBase.class);
-        TableInfoHelper.initTableInfo(assistant, EquipmentStatus.class);
-        TableInfoHelper.initTableInfo(assistant, AlarmData.class);
-        TableInfoHelper.initTableInfo(assistant, WorkOrder.class);
-    }
-
-    private WaterSupplyDeviceServiceImpl service;
-    private EquipmentBaseService equipmentBaseService;
-    private EquipmentTypeMapper equipmentTypeMapper;
-    private EquipmentStatusMapper equipmentStatusMapper;
-    private EquipmentMaintainMapper equipmentMaintainMapper;
-    private AlarmDataMapper alarmDataMapper;
-    private WorkOrderMapper workOrderMapper;
-    private ISysUserService sysUserService;
-
-    private EquipmentBase pressureDevice;
-    private EquipmentBase repairDevice;
-    private EquipmentBase gasDevice;
-
-    @BeforeEach
-    void setUp() {
-        service = Mockito.spy(new WaterSupplyDeviceServiceImpl());
-        equipmentBaseService = mock(EquipmentBaseService.class);
-        equipmentTypeMapper = mock(EquipmentTypeMapper.class);
-        equipmentStatusMapper = mock(EquipmentStatusMapper.class);
-        equipmentMaintainMapper = mock(EquipmentMaintainMapper.class);
-        alarmDataMapper = mock(AlarmDataMapper.class);
-        workOrderMapper = mock(WorkOrderMapper.class);
-        sysUserService = mock(ISysUserService.class);
-
-        ReflectionTestUtils.setField(service, "equipmentBaseService", equipmentBaseService);
-        ReflectionTestUtils.setField(service, "equipmentTypeMapper", equipmentTypeMapper);
-        ReflectionTestUtils.setField(service, "equipmentStatusMapper", equipmentStatusMapper);
-        ReflectionTestUtils.setField(service, "equipmentMaintainMapper", equipmentMaintainMapper);
-        ReflectionTestUtils.setField(service, "alarmDataMapper", alarmDataMapper);
-        ReflectionTestUtils.setField(service, "workOrderMapper", workOrderMapper);
-        ReflectionTestUtils.setField(service, "sysUserService", sysUserService);
-
-        pressureDevice = device("water-pressure-1", "WS-PRESSURE-001", "供水压力监测点", "12");
-        repairDevice = device("water-flow-1", "WS-FLOW-001", "供水流量监测点", "11");
-        gasDevice = device("gas-1", "GAS-001", "燃气监测点", "3");
-
-        when(equipmentBaseService.findByTopLevelType("供水")).thenReturn(Arrays.asList(
-                pressureDevice, repairDevice));
-        when(equipmentTypeMapper.selectList(any())).thenReturn(Arrays.asList(
-                type(1, "供水", 0),
-                type(12, "供水设备甲", 1),
-                type(11, "供水设备乙", 1),
-                type(3, "其他设备", 0)));
-        when(equipmentTypeMapper.selectBatchIds(any())).thenReturn(Arrays.asList(
-                type(12, "供水设备甲", 1),
-                type(11, "供水设备乙", 1),
-                type(3, "其他设备", 0)));
-        when(equipmentTypeMapper.selectById(any())).thenReturn(null);
-        when(equipmentStatusMapper.selectList(any())).thenReturn(Collections.emptyList());
-        when(equipmentStatusMapper.selectOne(any())).thenReturn(null);
-        when(alarmDataMapper.selectList(any())).thenReturn(Collections.emptyList());
-        when(workOrderMapper.selectList(any())).thenReturn(Collections.emptyList());
-        when(equipmentMaintainMapper.selectList(any())).thenReturn(Collections.emptyList());
-        when(equipmentMaintainMapper.selectOne(any())).thenReturn(null);
-        when(sysUserService.selectUserById(any(Long.class))).thenReturn(null);
-    }
-
-    @Test
-    void typeStatisticsCountOnlyTheWaterTypeSubtree() {
-        EquipmentBase secondPressure = device("water-pressure-2", "WS-PRESSURE-002",
-                "第二供水压力监测点", "12");
-        when(equipmentBaseService.findByTopLevelType("供水")).thenReturn(Arrays.asList(
-                pressureDevice, secondPressure, repairDevice));
-        List<DeviceTypeStatisticsVO> roots = service.getDeviceTypeStatistics();
-
-        assertEquals(1, roots.size());
-        assertEquals(Integer.valueOf(1), roots.get(0).getTypeId());
-        assertEquals(3, roots.get(0).getDeviceCount());
-        List<Integer> childTypeIds = roots.get(0).getChildren().stream()
-                .map(DeviceTypeStatisticsVO::getTypeId)
-                .sorted()
-                .collect(Collectors.toList());
-        assertEquals(Arrays.asList(11, 12), childTypeIds);
-    }
-
-    @Test
-    void typeStatisticsReturnsEmptyWhenNoWaterDevices() {
-        when(equipmentBaseService.findByTopLevelType("供水")).thenReturn(Collections.emptyList());
-        assertTrue(service.getDeviceTypeStatistics().isEmpty());
-    }
-
-    @Test
-    void gisPointsIncludeWaterOnlyWithCoordinatesAndStatuses() {
-        pressureDevice.setLongitude(new BigDecimal("113.28000000"));
-        pressureDevice.setLatitude(new BigDecimal("23.12000000"));
-        gasDevice.setLongitude(new BigDecimal("113.32000000"));
-        gasDevice.setLatitude(new BigDecimal("23.16000000"));
-        when(equipmentStatusMapper.selectList(any())).thenReturn(Collections.singletonList(
-                status(pressureDevice.getEquipmentId(), 1, 1, 1)));
-        when(equipmentTypeMapper.selectBatchIds(any())).thenReturn(Collections.singletonList(
-                type(12, "压力监测", 1)));
-
-        List<DeviceGisVO> points = service.getAllDeviceGisPoints(null);
-
-        assertEquals(Collections.singletonList("water-pressure-1"), points.stream()
-                .map(DeviceGisVO::getEquipmentId)
-                .collect(Collectors.toList()));
-        assertEquals("压力监测", points.get(0).getEquipmentTypeName());
-        assertEquals(1, points.get(0).getOnlineStatus());
-        assertEquals(1, points.get(0).getAlarmStatus());
-        assertEquals(1, points.get(0).getCurrentStatus());
-        assertEquals(new BigDecimal("113.28000000"), points.get(0).getLongitude());
-    }
-
-    @Test
-    void gisPointsExcludesDevicesWithoutCoordinates() {
-        pressureDevice.setLongitude(new BigDecimal("113.28000000"));
-        pressureDevice.setLatitude(new BigDecimal("23.12000000"));
-        // repairDevice 无坐标,应被过滤
-
-        List<DeviceGisVO> points = service.getAllDeviceGisPoints(null);
-
-        assertEquals(Collections.singletonList("water-pressure-1"), points.stream()
-                .map(DeviceGisVO::getEquipmentId)
-                .collect(Collectors.toList()));
-    }
-
-    @Test
-    void gisPointsFilterByEquipmentTypeId() {
-        pressureDevice.setLongitude(new BigDecimal("113.28000000"));
-        pressureDevice.setLatitude(new BigDecimal("23.12000000"));
-        repairDevice.setLongitude(new BigDecimal("113.29000000"));
-        repairDevice.setLatitude(new BigDecimal("23.13000000"));
-
-        List<DeviceGisVO> points = service.getAllDeviceGisPoints("12");
-
-        assertEquals(Collections.singletonList("water-pressure-1"), points.stream()
-                .map(DeviceGisVO::getEquipmentId)
-                .collect(Collectors.toList()));
-    }
-
-    @Test
-    void deviceDetailIncludesAlarmAndRelatedWorkOrderSummary() {
-        when(equipmentStatusMapper.selectOne(any())).thenReturn(status(pressureDevice.getEquipmentId(), 1, 1, 1));
-        when(alarmDataMapper.selectList(any())).thenReturn(Collections.singletonList(
-                alarm(pressureDevice.getEquipmentCode(), "供水压力超限", "1"))));
-        when(workOrderMapper.selectList(any())).thenReturn(Collections.singletonList(
-                workOrder(pressureDevice.getEquipmentId(), "WO-DETAIL", 2, 1L)));
-        when(sysUserService.selectUserById(1L)).thenReturn(sysUser(1L, "zhangsan", "张三"));
-
-        DeviceDetailVO detail = service.getDeviceDetail(pressureDevice.getEquipmentId());
-
-        assertEquals(1, detail.getAlertLevel());
-        assertEquals("设备报警", detail.getAbnormalReason());
-        assertEquals("WO-DETAIL", detail.getRelatedWorkOrderNo());
-        assertEquals(2, detail.getRelatedWorkOrderStatus());
-        assertEquals("张三", detail.getRelatedWorkOrderPerson());
-    }
-
-    @Test
-    void deviceDetailKeepsMaintenanceStateSeparateFromAlarmLevel() {
-        when(equipmentStatusMapper.selectOne(any())).thenReturn(
-                status(repairDevice.getEquipmentId(), 3, 0, 1));
-        when(alarmDataMapper.selectList(any())).thenReturn(Collections.emptyList());
-        when(workOrderMapper.selectList(any())).thenReturn(Collections.emptyList());
-
-        DeviceDetailVO detail = service.getDeviceDetail(repairDevice.getEquipmentId());
-
-        assertEquals(3, detail.getCurrentStatus());
-        assertEquals(0, detail.getAlarmStatus());
-        assertNull(detail.getAlertLevel());
-        assertEquals("设备维修中", detail.getAbnormalReason());
-    }
-
-    @Test
-    void deviceDetailIgnoresProcessedAlarmRecordWhenEquipmentIsNormal() {
-        when(equipmentStatusMapper.selectOne(any())).thenReturn(
-                status(repairDevice.getEquipmentId(), 1, 0, 1));
-        AlarmData processedAlarm = new AlarmData();
-        processedAlarm.setDeviceCode(repairDevice.getEquipmentCode());
-        processedAlarm.setAlarmStatus(0);
-        processedAlarm.setAlarmLevel("1");
-        when(alarmDataMapper.selectList(any())).thenReturn(Collections.singletonList(processedAlarm));
-        when(workOrderMapper.selectList(any())).thenReturn(Collections.emptyList());
-
-        DeviceDetailVO detail = service.getDeviceDetail(repairDevice.getEquipmentId());
-
-        assertEquals(0, detail.getAlarmStatus());
-        assertNull(detail.getAlertLevel());
-        assertNull(detail.getAbnormalReason());
-    }
-
-    @Test
-    void deviceDetailDoesNotExposeNonWaterDevices() {
-        // gasDevice 不属于供水设备,findWaterDeviceById 找不到,应返回 null
-        assertNull(service.getDeviceDetail(gasDevice.getEquipmentId()));
-    }
-
-    @Test
-    void deviceDetailIncludesLatestMaintainRecord() {
-        when(equipmentStatusMapper.selectOne(any())).thenReturn(
-                status(pressureDevice.getEquipmentId(), 1, 0, 1));
-        when(alarmDataMapper.selectList(any())).thenReturn(Collections.emptyList());
-        when(workOrderMapper.selectList(any())).thenReturn(Collections.emptyList());
-        EquipmentMaintain maintain = maintain("m1", pressureDevice.getEquipmentId());
-        when(equipmentMaintainMapper.selectOne(any())).thenReturn(maintain);
-
-        DeviceDetailVO detail = service.getDeviceDetail(pressureDevice.getEquipmentId());
-
-        assertTrue(detail.getLatestMaintain() != null);
-        assertEquals("m1", detail.getLatestMaintain().get("maintainId"));
-    }
-
-    @Test
-    void abnormalGisPointsReturnsWaterDevicesWithAlarmOrMaintenanceStatus() {
-        pressureDevice.setLongitude(new BigDecimal("113.28000000"));
-        pressureDevice.setLatitude(new BigDecimal("23.12000000"));
-        repairDevice.setLongitude(new BigDecimal("113.29000000"));
-        repairDevice.setLatitude(new BigDecimal("23.13000000"));
-        when(equipmentStatusMapper.selectList(any())).thenReturn(Arrays.asList(
-                status(pressureDevice.getEquipmentId(), 1, 1, 1),
-                status(repairDevice.getEquipmentId(), 3, 0, 1)));
-        when(alarmDataMapper.selectList(any())).thenReturn(Collections.singletonList(
-                alarm(pressureDevice.getEquipmentCode(), "供水压力超限", "1"))));
-        when(workOrderMapper.selectList(any())).thenReturn(Collections.singletonList(
-                workOrder(pressureDevice.getEquipmentId(), "WO-A", 2, 1L)));
-        when(equipmentMaintainMapper.selectList(any())).thenReturn(Collections.singletonList(
-                maintain("m1", pressureDevice.getEquipmentId())));
-        when(sysUserService.selectUserById(1L)).thenReturn(sysUser(1L, "zhangsan", "张三"));
-
-        List<AbnormalDeviceVO> result = service.getAbnormalDeviceGisPoints(null);
-
-        assertEquals(2, result.size());
-        AbnormalDeviceVO pressureRow = result.stream()
-                .filter(r -> "water-pressure-1".equals(r.getEquipmentId()))
-                .findFirst().orElseThrow();
-        assertEquals(1, pressureRow.getAlarmStatus());
-        assertEquals(1, pressureRow.getCurrentStatus());
-        assertEquals(1, pressureRow.getOnlineStatus());
-        assertEquals(1, pressureRow.getAlertLevel());
-        assertEquals("设备报警", pressureRow.getAbnormalReason());
-        assertEquals("WO-A", pressureRow.getRelatedWorkOrderNo());
-        assertEquals(2, pressureRow.getRelatedWorkOrderStatus());
-        assertEquals("张三", pressureRow.getRelatedWorkOrderPerson());
-        assertEquals("m1", pressureRow.getLatestMaintainId());
-
-        AbnormalDeviceVO repairRow = result.stream()
-                .filter(r -> "water-flow-1".equals(r.getEquipmentId()))
-                .findFirst().orElseThrow();
-        assertEquals(0, repairRow.getAlarmStatus());
-        assertEquals(3, repairRow.getCurrentStatus());
-        assertNull(repairRow.getAlertLevel());
-        assertEquals("设备维修中", repairRow.getAbnormalReason());
-        assertNull(repairRow.getLatestMaintainId());
-    }
-
-    @Test
-    void abnormalGisPointsExcludesNonWaterAndMissingCoordinates() {
-        // gasDevice 有坐标但非供水设备;repairDevice 供水但无坐标;仅 pressureDevice 符合
-        gasDevice.setLongitude(new BigDecimal("113.32000000"));
-        gasDevice.setLatitude(new BigDecimal("23.16000000"));
-        pressureDevice.setLongitude(new BigDecimal("113.28000000"));
-        pressureDevice.setLatitude(new BigDecimal("23.12000000"));
-        when(equipmentStatusMapper.selectList(any())).thenReturn(Arrays.asList(
-                status(pressureDevice.getEquipmentId(), 1, 1, 1),
-                status(gasDevice.getEquipmentId(), 1, 1, 1),
-                status(repairDevice.getEquipmentId(), 3, 0, 1)));
-
-        List<AbnormalDeviceVO> result = service.getAbnormalDeviceGisPoints(null);
-
-        assertEquals(Collections.singletonList("water-pressure-1"), result.stream()
-                .map(AbnormalDeviceVO::getEquipmentId)
-                .collect(Collectors.toList()));
-    }
-
-    /** 设备类型ID 现为整型;非数字按 null 处理。 */
-    private static Integer parseTypeId(String value) {
-        if (value == null) {
-            return null;
-        }
-        try {
-            return Integer.valueOf(value);
-        } catch (NumberFormatException e) {
-            return null;
-        }
-    }
-
-    private static EquipmentBase device(String id, String code, String name, String typeId) {
-        EquipmentBase device = new EquipmentBase();
-        device.setEquipmentId(id);
-        device.setEquipmentCode(code);
-        device.setEquipmentName(name);
-        device.setEquipmentTypeId(parseTypeId(typeId));
-        device.setEquipmentLocation("测试位置");
-        return device;
-    }
-
-    private static EquipmentType type(Integer id, String name, Integer parentId) {
-        EquipmentType type = new EquipmentType();
-        type.setId(id);
-        type.setTypeName(name);
-        type.setParentId(parentId);
-        return type;
-    }
-
-    private static EquipmentStatus status(String equipmentId, int currentStatus,
-                                          int alarmStatus, int onlineStatus) {
-        EquipmentStatus status = new EquipmentStatus();
-        status.setEquipmentId(equipmentId);
-        status.setCurrentStatus(currentStatus);
-        status.setAlarmStatus(alarmStatus);
-        status.setOnlineStatus(onlineStatus);
-        status.setStatusUpdateTime(LocalDateTime.of(2026, 9, 2, 10, 0));
-        return status;
-    }
-
-    private static AlarmData alarm(String deviceCode, String warningType, String level) {
-        AlarmData alarm = new AlarmData();
-        alarm.setDeviceCode(deviceCode);
-        alarm.setAlarmLevel(level);
-        alarm.setAlarmStatus(0);
-        return alarm;
-    }
-
-    private static WorkOrder workOrder(String deviceId, String orderNo, int orderStatus, Long receiveUser) {
-        WorkOrder order = new WorkOrder();
-        order.setDeviceId(deviceId);
-        order.setOrderNo(orderNo);
-        order.setOrderStatus(orderStatus);
-        order.setReceiveUser(receiveUser);
-        return order;
-    }
-
-    private static SysUser sysUser(Long userId, String userName, String nickName) {
-        SysUser user = new SysUser();
-        user.setUserId(userId);
-        user.setUserName(userName);
-        user.setNickName(nickName);
-        return user;
-    }
-
-    private static EquipmentMaintain maintain(String maintainId, String equipmentId) {
-        EquipmentMaintain record = new EquipmentMaintain();
-        record.setMaintainId(maintainId);
-        record.setEquipmentId(equipmentId);
-        record.setMaintainType("故障维修");
-        record.setMaintainPerson("张三");
-        return record;
-    }
-
-}