Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

# Conflicts:
#	src/main/java/com/campus/water/service/AreaService.java

src/main/java/com/campus/water/controller/web/AreaController.java

@@ -2,6 +2,7 @@ package com.campus.water.controller.web;
 
 import com.campus.water.entity.Area;
 import com.campus.water.service.AreaService;
+import com.campus.water.entity.vo.AreaDeviceStatsVO;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -148,4 +149,47 @@ public class AreaController {
                     .body(buildResponse(500, "查询区域详情失败：" + e.getMessage(), null));
         }
     }
+
+    /**
+     * 获取指定片区设备统计
+     * 权限：超级管理员/区域管理员（与新增/修改区域权限一致）
+     * 响应：校区返回自身数据，市区返回下属校区汇总数据
+     */
+    @GetMapping("/device-stats/{areaId}")
+    @PreAuthorize("hasAnyRole('SUPER_ADMIN', 'AREA_ADMIN')")
+    public ResponseEntity<Map<String, Object>> getAreaDeviceStats(@PathVariable String areaId) {
+        try {
+            AreaDeviceStatsVO statsVO = areaService.getAreaDeviceStats(areaId);
+            return ResponseEntity.ok(buildResponse(200, "统计成功", statsVO));
+        } catch (RuntimeException e) {
+            // 业务异常（片区不存在、参数错误等）返回400
+            return ResponseEntity.badRequest().body(buildResponse(400, e.getMessage(), null));
+        } catch (Exception e) {
+            // 系统异常返回500
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(buildResponse(500, "统计片区设备失败：" + e.getMessage(), null));
+        }
+    }
+
+    /**
+     * 获取市区下所有校区单独统计
+     * 权限：超级管理员/区域管理员（与新增/修改区域权限一致）
+     * 响应：返回该市区下每个校区的设备统计，不进行汇总
+     */
+    @GetMapping("/device-stats/city/{cityId}/campuses")
+    @PreAuthorize("hasAnyRole('SUPER_ADMIN', 'AREA_ADMIN')")
+    public ResponseEntity<Map<String, Object>> getCampusDeviceStatsUnderCity(@PathVariable String cityId) {
+        try {
+            List<AreaDeviceStatsVO> statsVOList = areaService.getCampusDeviceStatsUnderCity(cityId);
+            return ResponseEntity.ok(buildResponse(200, "统计成功", statsVOList));
+        } catch (RuntimeException e) {
+            // 业务异常（非市区、市区不存在等）返回400
+            return ResponseEntity.badRequest().body(buildResponse(400, e.getMessage(), null));
+        } catch (Exception e) {
+            // 系统异常返回500
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(buildResponse(500, "统计市区下属校区设备失败：" + e.getMessage(), null));
+        }
+    }
+
 }

src/main/java/com/campus/water/entity/vo/AreaDeviceStatsVO.java

@@ -0,0 +1,16 @@
+package com.campus.water.entity.vo;
+
+import lombok.Data;
+
+/**
+ * 片区设备统计VO（适配现有实体，无新增依赖）
+ */
+@Data
+public class AreaDeviceStatsVO {
+    private String areaId; // 对应Area.areaId
+    private String areaName; // 对应Area.areaName
+    private String areaTypeDesc; // 对应Area.AreaType.desc（市区/校园）
+    private int waterMakerCount; // 制水机数量
+    private int waterSupplyCount; // 供水机数量
+    private int terminalCount; // 终端数量（基于DeviceTerminalMapping）
+}

src/main/java/com/campus/water/mapper/DeviceRepository.java

@@ -48,4 +48,6 @@ public interface DeviceRepository extends JpaRepository<Device, String> {
 
     // 按设备类型加载加载设备（支持区域筛选）
     List<Device> findByDeviceTypeAndAreaId(Device.DeviceType deviceType, String areaId);
+
+    long countByAreaIdAndDeviceType(String areaId, Device.DeviceType deviceType);
 }

src/main/java/com/campus/water/mapper/DeviceTerminalMappingRepository.java

@@ -30,4 +30,6 @@ public interface DeviceTerminalMappingRepository extends JpaRepository<DeviceTer
     // 3. 按终端ID删除所有关联映射（删除终端时级联清理映射数据）
     void deleteByTerminalId(String terminalId);
 
+    long countByAreaId(String areaId);
+
 }