Pārlūkot izejas kodu

feat(waterSupply): 异常设备清单返回设备图片字段 (#44)

- AbnormalDeviceVO 补 equipmentImage,与 DeviceGisVO 口径一致

- 异常分页与导出经同一 BeanUtil 映射自动带出图片 URL
Kazerin 1 mēnesi atpakaļ
vecāks
revīzija
5c25637187

+ 3 - 0
pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/vo/AbnormalDeviceVO.java

@@ -44,6 +44,9 @@ public class AbnormalDeviceVO {
     @ApiModelProperty("设备位置")
     private String equipmentLocation;
 
+    @ApiModelProperty("设备图片URL")
+    private String equipmentImage;
+
     @ApiModelProperty("当前状态 1-在用 2-闲置 3-维修 4-报废 5-待入库")
     private Integer currentStatus;
 

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

@@ -178,6 +178,24 @@ class WaterSupplyDeviceServiceImplTest {
                 result.getRecords().get(0).getEquipmentImage());
     }
 
+    @Test
+    void abnormalPageReturnsEquipmentImage() {
+        pressureDevice.setEquipmentImage("https://example.com/pressure-device.jpg");
+        when(equipmentStatusMapper.selectList(any())).thenReturn(Collections.singletonList(
+                status(pressureDevice.getEquipmentId(), 1, 1, 1)));
+        when(alarmDataMapper.selectList(any())).thenReturn(Collections.singletonList(
+                alarm(pressureDevice.getEquipmentCode(), "供水压力超限", 1)));
+        when(equipmentTypeMapper.selectBatchIds(any())).thenReturn(Collections.singletonList(
+                type("water-pressure", "water-pressure", "water-root")));
+
+        Page<AbnormalDeviceVO> result = service.getAbnormalDevicePage(
+                1, 10, null, null, null, null);
+
+        assertEquals(1, result.getTotal());
+        assertEquals("https://example.com/pressure-device.jpg",
+                result.getRecords().get(0).getEquipmentImage());
+    }
+
     @Test
     void ledgerPageAppliesWaterOwnershipAndCurrentStatusFilter() {
         when(equipmentStatusMapper.selectList(any())).thenReturn(Arrays.asList(