数字畜牧一张图

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/domain/vo/HomeScreenIndustryOverviewVo.java

@@ -6,11 +6,11 @@ import java.math.BigDecimal;
  */
 public class HomeScreenIndustryOverviewVo
 {
-    /** 截止 statDate 牦牛存栏总头数 */
+    /** 产业总览「牦牛存栏总量」（头）：上一年全县存栏填报 `yak_total` 合计；字段名沿用 `inventoryTotal` */
     private int inventoryTotal;
-    /** 当年出栏总头数 */
+    /** 产业总览「牦牛年出栏量」（头）：当年全县出栏填报 `yak_outbound_count` 合计；字段名沿用 `annualOutbound` */
     private int annualOutbound;
-    /** 有效牧场数 */
+    /** 产业总览「农牧户」展示位（户）：当年全县出栏填报 `farmer_household_count` 合计；字段名沿用 `pastureCount` */
     private int pastureCount;
     /** 草场块数 */
     private int grasslandCount;

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/mapper/HomeScreenStatsMapper.java

@@ -70,4 +70,13 @@ public interface HomeScreenStatsMapper
     List<HomeScreenTownMapMarkerVo> selectTownMapMarkers(
             @Param("herdStatYear") int herdStatYear,
             @Param("outboundStatYear") int outboundStatYear);
+
+    /** 指定年份全县乡镇牦牛存栏填报合计（{@code biz_yak_herd_inventory.yak_total}） */
+    int sumHerdInventoryYakTotalByStatYear(@Param("statYear") int statYear);
+
+    /** 指定年份全县乡镇牦牛出栏填报合计（{@code biz_yak_outbound_report.yak_outbound_count}） */
+    int sumOutboundReportYakCountByStatYear(@Param("statYear") int statYear);
+
+    /** 指定年份全县乡镇农牧户户数填报合计（{@code biz_yak_outbound_report.farmer_household_count}） */
+    int sumOutboundReportFarmerHouseholdCountByStatYear(@Param("statYear") int statYear);
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/service/impl/HomeScreenServiceImpl.java

@@ -68,19 +68,26 @@ public class HomeScreenServiceImpl implements IHomeScreenService
         overview.setSupplierCount(homeScreenStatsMapper.countSupplierForScreen());
         overview.setDistributorCount(homeScreenStatsMapper.countDistributorForScreen());
         overview.setTradeMarketCount(homeScreenStatsMapper.countTradeMarketForScreen());
-        overview.setPastureCount(allowedPastureIds.isEmpty()
-                ? 0
-                : breedingIndustryStatsMapper.countPastureInScope(allowedPastureIds));
+        // 原有效牧场数量口径（暂保留调用，产业总览 pastureCount 已改用农牧户填报合计）
+        if (!allowedPastureIds.isEmpty())
+        {
+            breedingIndustryStatsMapper.countPastureInScope(allowedPastureIds);
+        }
         overview.setGrasslandCount(breedingIndustryStatsMapper.countGrassland());
         BigDecimal area = breedingIndustryStatsMapper.sumGrasslandAreaMu();
         overview.setGrasslandAreaMu(area != null ? area.setScale(2, RoundingMode.HALF_UP) : BigDecimal.ZERO);
 
+        // 产业总览三项：填报合计填入既有字段（字段名不变）；原快照/资产口径见下方暂保留调用
+        int currentCalendarYear = Year.now().getValue();
+        overview.setInventoryTotal(homeScreenStatsMapper.sumHerdInventoryYakTotalByStatYear(currentCalendarYear - 1));
+        overview.setAnnualOutbound(homeScreenStatsMapper.sumOutboundReportYakCountByStatYear(currentCalendarYear));
+        overview.setPastureCount(
+                homeScreenStatsMapper.sumOutboundReportFarmerHouseholdCountByStatYear(currentCalendarYear));
+
         HomeScreenInventoryChangeVo inventoryChange = new HomeScreenInventoryChangeVo();
         if (allowedPastureIds.isEmpty())
         {
             // 无有效牧场时牦牛相关区块全部置零
-            overview.setInventoryTotal(0);
-            overview.setAnnualOutbound(0);
             inventoryChange.setBullCount(0);
             inventoryChange.setCowCount(0);
             inventoryChange.setUnknownGenderCount(0);
@@ -91,14 +98,14 @@ public class HomeScreenServiceImpl implements IHomeScreenService
         }
         else
         {
-            int inventoryTotal = HomeScreenSupport.countInventoryAtDate(snapshots, statDate);
+            // 原时点存栏口径（暂保留，供存栏变动/年龄结构等区块使用）
+            int inventoryTotalAtDate = HomeScreenSupport.countInventoryAtDate(snapshots, statDate);
             int[] gender = HomeScreenSupport.countGenderAtDate(snapshots, statDate);
-            overview.setInventoryTotal(inventoryTotal);
-            overview.setAnnualOutbound(breedingIndustryStatsMapper.countAnnualOutbound(
-                    allowedPastureIds, yearStart, yearEnd));
+            // 原资产出栏口径（暂保留调用）
+            breedingIndustryStatsMapper.countAnnualOutbound(allowedPastureIds, yearStart, yearEnd);
             inventoryChange.setBullCount(gender[0]);
             inventoryChange.setCowCount(gender[1]);
-            inventoryChange.setUnknownGenderCount(Math.max(0, inventoryTotal - gender[0] - gender[1]));
+            inventoryChange.setUnknownGenderCount(Math.max(0, inventoryTotalAtDate - gender[0] - gender[1]));
             inventoryChange.setMonthlyTrend(HomeScreenSupport.buildBullCowMonthlyTrend(snapshots, statDate));
             vo.setAgeStructure(HomeScreenSupport.buildAgeStructureAtDate(snapshots, statDate));
             vo.setOutboundMonthly(HomeScreenSupport.buildOutboundMonthly(

baqing-admin/src/main/resources/mapper/screen/HomeScreenStatsMapper.xml

@@ -163,4 +163,22 @@
           and d.status = '0'
         order by d.order_num asc, d.dept_id asc
     </select>
+
+    <select id="sumHerdInventoryYakTotalByStatYear" resultType="int">
+        select coalesce(sum(yak_total), 0)
+        from biz_yak_herd_inventory
+        where stat_year = #{statYear}
+    </select>
+
+    <select id="sumOutboundReportYakCountByStatYear" resultType="int">
+        select coalesce(sum(yak_outbound_count), 0)
+        from biz_yak_outbound_report
+        where stat_year = #{statYear}
+    </select>
+
+    <select id="sumOutboundReportFarmerHouseholdCountByStatYear" resultType="int">
+        select coalesce(sum(farmer_household_count), 0)
+        from biz_yak_outbound_report
+        where stat_year = #{statYear}
+    </select>
 </mapper>

baqing-admin/src/test/java/com/ruoyi/web/modules/screen/mapper/HomeScreenStatsMapperXmlTest.java

@@ -26,6 +26,9 @@ class HomeScreenStatsMapperXmlTest
         assertTrue(xml.contains("biz_subsidy_grant_record"));
         assertTrue(xml.contains("biz_yak_herd_inventory"));
         assertTrue(xml.contains("biz_yak_outbound_report"));
+        assertTrue(xml.contains("sumHerdInventoryYakTotalByStatYear"));
+        assertTrue(xml.contains("sumOutboundReportYakCountByStatYear"));
+        assertTrue(xml.contains("sumOutboundReportFarmerHouseholdCountByStatYear"));
         assertTrue(xml.contains("status not in (2, 3)"));
     }
 }

baqing-admin/src/test/java/com/ruoyi/web/modules/screen/service/impl/HomeScreenServiceImplTest.java

@@ -5,6 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 import java.math.BigDecimal;
@@ -109,6 +110,37 @@ class HomeScreenServiceImplTest
         assertEquals(50, vo.getMarkers().get(0).getYakOutboundCount().intValue());
     }
 
+    @Test
+    @DisplayName("DP-SY-UT-027 产业总览存栏出栏取自填报合计")
+    void ut027_overviewFromReportTables()
+    {
+        int currentYear = Year.now().getValue();
+        stubBreedingWithOneYak();
+        stubOtherBlocks();
+        when(homeScreenStatsMapper.sumHerdInventoryYakTotalByStatYear(eq(currentYear - 1))).thenReturn(50000);
+        when(homeScreenStatsMapper.sumOutboundReportYakCountByStatYear(eq(currentYear))).thenReturn(3200);
+
+        HomeScreenDashboardVo vo = service.loadDashboard("2024");
+
+        assertEquals(50000, vo.getIndustryOverview().getInventoryTotal());
+        assertEquals(3200, vo.getIndustryOverview().getAnnualOutbound());
+    }
+
+    @Test
+    @DisplayName("DP-SY-UT-028 产业总览农牧户取自出栏填报合计")
+    void ut028_farmerHouseholdFromReportTable()
+    {
+        int currentYear = Year.now().getValue();
+        stubBreedingWithOneYak();
+        stubOtherBlocks();
+        when(homeScreenStatsMapper.sumOutboundReportFarmerHouseholdCountByStatYear(eq(currentYear)))
+                .thenReturn(8988);
+
+        HomeScreenDashboardVo vo = service.loadDashboard("2025");
+
+        assertEquals(8988, vo.getIndustryOverview().getPastureCount());
+    }
+
     private void stubBreedingEmpty()
     {
         when(breedingIndustryStatsMapper.selectActivePastureIds()).thenReturn(Collections.singletonList(1L));
@@ -122,6 +154,11 @@ class HomeScreenServiceImplTest
         when(breedingIndustryStatsMapper.selectDegradationGroupCounts()).thenReturn(Collections.emptyList());
         when(homeScreenStatsMapper.selectOutboundCountByMonth(anyList(), any(), any()))
                 .thenReturn(Collections.emptyList());
+        int currentYear = Year.now().getValue();
+        lenient().when(homeScreenStatsMapper.sumHerdInventoryYakTotalByStatYear(eq(currentYear - 1))).thenReturn(0);
+        lenient().when(homeScreenStatsMapper.sumOutboundReportYakCountByStatYear(eq(currentYear))).thenReturn(0);
+        lenient().when(homeScreenStatsMapper.sumOutboundReportFarmerHouseholdCountByStatYear(eq(currentYear)))
+                .thenReturn(0);
     }
 
     private void stubBreedingWithOneYak()
@@ -143,6 +180,11 @@ class HomeScreenServiceImplTest
         when(breedingIndustryStatsMapper.selectDegradationGroupCounts()).thenReturn(Collections.emptyList());
         when(homeScreenStatsMapper.selectOutboundCountByMonth(anyList(), any(), any()))
                 .thenReturn(Collections.emptyList());
+        int currentYear = Year.now().getValue();
+        lenient().when(homeScreenStatsMapper.sumHerdInventoryYakTotalByStatYear(eq(currentYear - 1))).thenReturn(0);
+        lenient().when(homeScreenStatsMapper.sumOutboundReportYakCountByStatYear(eq(currentYear))).thenReturn(0);
+        lenient().when(homeScreenStatsMapper.sumOutboundReportFarmerHouseholdCountByStatYear(eq(currentYear)))
+                .thenReturn(0);
     }
 
     private void stubOtherBlocks()

doc/大屏/首页/大屏首页功能需求.md

@@ -266,9 +266,9 @@ flowchart TB
 
 | 序号 | 指标名称 | 单位 | 统计口径 |
 | --- | --- | --- | --- |
-| 1 | 牦牛存栏总量 | 头 | **§2.5** 时点存栏 |
-| 2 | 牦牛年出栏量 | 头 | **§2.5** 年内出栏 |
-| 3 | 牧场数量 | 个 | **§2.5** |
+| 1 | 牦牛存栏总量 | 头 | `biz_yak_herd_inventory.yak_total` 全县乡镇合计；统计年 = **当前自然年 − 1**；接口字段沿用 **`inventoryTotal`** |
+| 2 | 牦牛年出栏量 | 头 | `biz_yak_outbound_report.yak_outbound_count` 全县乡镇合计；统计年 = **当前自然年**；接口字段沿用 **`annualOutbound`** |
+| 3 | 农牧户 | 户 | `biz_yak_outbound_report.farmer_household_count` 全县乡镇合计；统计年 = **当前自然年**；接口字段沿用 **`pastureCount`** |
 | 4 | 草场数量 | 个 | **§2.5** |
 | 5 | 草场面积 | 亩 | **§2.5** |
 | 6 | 供应商数量 | 个 | **§2.6** 实时快照 |

doc/大屏/首页/大屏首页技术方案.md

@@ -222,9 +222,10 @@
 
 | 字段 | 说明 |
 | --- | --- |
-| `inventoryTotal` | 牦牛存栏（头），时点 |
-| `annualOutbound` | 年出栏（头），**Y** 年内 |
-| `pastureCount` / `grasslandCount` / `grasslandAreaMu` | 牧场、草场、面积 |
+| `inventoryTotal` | 牦牛存栏（头），`biz_yak_herd_inventory` 全县 `yak_total` 合计；年份 = 当前自然年 **− 1**；**字段名不变** |
+| `annualOutbound` | 年出栏（头），`biz_yak_outbound_report` 全县 `yak_outbound_count` 合计；年份 = 当前自然年；**字段名不变** |
+| `pastureCount` | 农牧户（户），`biz_yak_outbound_report` 全县 `farmer_household_count` 合计；年份 = 当前自然年；**字段名不变** |
+| `grasslandCount` / `grasslandAreaMu` | 草场、面积 |
 | `supplierCount` / `distributorCount` / `tradeMarketCount` | 流通三项**实时**快照 |
 
 #### 3.1.2 `inventoryChange`
@@ -344,7 +345,8 @@
 7. agriClassroom = tech video count + training publish count by year
 8. trainingTrend = training by month; hasTrainingData
 9. availableYears = union(distinct years from各源表, current year)
-10. return AjaxResult.success(vo)
+10. industryOverview 填报合计填入既有字段：`inventoryTotal` / `annualOutbound` / `pastureCount`（农牧户）；原牧场/快照口径在 Service 内暂保留
+11. return AjaxResult.success(vo)
 ```
 
 ---

doc/大屏/首页/大屏首页测试用例.md

@@ -77,6 +77,8 @@
 | DP-SY-UT-024 | 约束 | 无标准详情接口 | 单元测试 | JUnit5 | §5.9 | 检查 Controller 映射 | 无 `GET .../standards/{id}` | 仅列表分页 |
 | DP-SY-UT-025 | 缓存 | forceRefresh | 单元测试 | JUnit5 | 技术§2.3 | 启用缓存未过期 | `loadDashboard(2026,true)` | 跳过缓存重新聚合 |
 | DP-SY-UT-026 | 地图标注 | 年份与字段 | 单元测试 | JUnit5 | §5.12 | Mock Mapper 返回 1 乡镇 | `loadTownMapMarkers()` | `herdStatYear=当前年-1`；`outboundStatYear=当前年`；含 `townDeptId`/`townName`/存栏/出栏 |
+| DP-SY-UT-027 | 产业总览 | 填报合计 | 单元测试 | JUnit5 | §5.2 | Mock 填报合计 | `loadDashboard` | `inventoryTotal`/`annualOutbound` 取自填报表；与 **Y** 无关 |
+| DP-SY-UT-028 | 产业总览 | 农牧户合计 | 单元测试 | JUnit5 | §5.2 | Mock 出栏填报农牧户户数 | `loadDashboard` | `pastureCount` 为当年全县农牧户合计（字段名不变） |
 
 ---