对接牦牛资产档案

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/support/YakHerdInventoryExcelExporter.java

@@ -30,8 +30,6 @@ public class YakHerdInventoryExcelExporter
 
     private static final int COL_SEQ = 0;
 
-    private static final int COL_F_YAK_MIRROR = 5;
-
     private static final Pattern YEAR_IN_TEXT = Pattern.compile("(\\d{4})年");
 
     public byte[] export(Integer statYear, List<SysDept> towns, Map<Long, BizYakHerdInventory> inventoryByTownId)
@@ -45,8 +43,24 @@ public class YakHerdInventoryExcelExporter
             throw new ServiceException("导出年份不在可选范围内");
         }
         try (InputStream in = new ClassPathResource(TEMPLATE_CLASSPATH).getInputStream();
-                Workbook workbook = WorkbookFactory.create(in);
-                ByteArrayOutputStream out = new ByteArrayOutputStream())
+                Workbook workbook = WorkbookFactory.create(in))
+        {
+            return exportWorkbook(workbook, statYear, towns, inventoryByTownId);
+        }
+        catch (ServiceException ex)
+        {
+            throw ex;
+        }
+        catch (Exception ex)
+        {
+            throw new ServiceException("导出 Excel 失败：" + ex.getMessage());
+        }
+    }
+
+    byte[] exportWorkbook(Workbook workbook, Integer statYear, List<SysDept> towns,
+            Map<Long, BizYakHerdInventory> inventoryByTownId)
+    {
+        try (ByteArrayOutputStream out = new ByteArrayOutputStream())
         {
             Sheet sheet = workbook.getSheetAt(0);
             int headerRowIndex = YakHerdInventoryExcelParser.detectHeaderRow(sheet);
@@ -56,6 +70,7 @@ public class YakHerdInventoryExcelExporter
             }
             updateTitleYear(sheet, statYear);
             int dataStartRow = headerRowIndex + 3;
+            clearTemplateDataRegion(sheet, dataStartRow);
             Totals totals = new Totals();
             int rowIndex = dataStartRow;
             int seq = 1;
@@ -77,16 +92,7 @@ public class YakHerdInventoryExcelExporter
             clearDataCells(totalRow);
             setStringCell(totalRow, YakHerdInventoryExcelParser.COL_TOWN, "合计");
             totals.writeToRow(totalRow);
-            // 清除模板中可能残留的旧数据行
-            for (int i = rowIndex + 1; i <= sheet.getLastRowNum(); i++)
-            {
-                Row stale = sheet.getRow(i);
-                if (stale != null)
-                {
-                    clearDataCells(stale);
-                    setStringCell(stale, YakHerdInventoryExcelParser.COL_TOWN, null);
-                }
-            }
+            clearTemplateDataRegion(sheet, rowIndex + 1);
             workbook.write(out);
             return out.toByteArray();
         }
@@ -100,6 +106,21 @@ public class YakHerdInventoryExcelExporter
         }
     }
 
+    private static void clearTemplateDataRegion(Sheet sheet, int fromRow)
+    {
+        int lastRow = sheet.getLastRowNum();
+        for (int i = fromRow; i <= lastRow; i++)
+        {
+            Row row = sheet.getRow(i);
+            if (row == null)
+            {
+                continue;
+            }
+            clearDataCells(row);
+            setStringCell(row, YakHerdInventoryExcelParser.COL_TOWN, null);
+        }
+    }
+
     static void updateTitleYear(Sheet sheet, int statYear)
     {
         DataFormatter formatter = new DataFormatter();
@@ -139,30 +160,20 @@ public class YakHerdInventoryExcelExporter
 
     private static void clearDataCells(Row row)
     {
-        int[] cols = new int[] {
-            COL_SEQ,
-            YakHerdInventoryExcelParser.COL_TOWN,
-            YakHerdInventoryExcelParser.COL_VILLAGE_COUNT,
-            YakHerdInventoryExcelParser.COL_HERDSMAN,
-            YakHerdInventoryExcelParser.COL_YAK_TOTAL,
-            COL_F_YAK_MIRROR,
-            YakHerdInventoryExcelParser.COL_BULL_TOTAL,
-            YakHerdInventoryExcelParser.COL_BREEDING_BULL,
-            YakHerdInventoryExcelParser.COL_BULL_CASTRATED,
-            YakHerdInventoryExcelParser.COL_COW_TOTAL,
-            YakHerdInventoryExcelParser.COL_COW_UNDER_1,
-            YakHerdInventoryExcelParser.COL_COW_1_3,
-            YakHerdInventoryExcelParser.COL_COW_3_12,
-            YakHerdInventoryExcelParser.COL_COW_OVER_12,
-            YakHerdInventoryExcelParser.COL_REMARK
-        };
-        for (int col : cols)
+        short lastCell = row.getLastCellNum();
+        if (lastCell < 0)
+        {
+            return;
+        }
+        int maxCol = Math.max(lastCell, YakHerdInventoryExcelParser.COL_REMARK + 1);
+        for (int col = 0; col < maxCol; col++)
         {
             Cell cell = row.getCell(col);
-            if (cell != null)
+            if (cell == null)
             {
-                row.removeCell(cell);
+                continue;
             }
+            cell.setBlank();
         }
     }
 
@@ -181,8 +192,10 @@ public class YakHerdInventoryExcelExporter
         setIntegerCell(row, YakHerdInventoryExcelParser.COL_VILLAGE_COUNT, inv.getVillageCount());
         setIntegerCell(row, YakHerdInventoryExcelParser.COL_HERDSMAN, inv.getHerdsmanHouseholdCount());
         setIntegerCell(row, YakHerdInventoryExcelParser.COL_YAK_TOTAL, inv.getYakTotal());
-        setIntegerCell(row, COL_F_YAK_MIRROR, inv.getYakTotal());
+        setIntegerCell(row, YakHerdInventoryExcelParser.COL_YAK_GENDER_TOTAL, inv.getYakTotal());
         setIntegerCell(row, YakHerdInventoryExcelParser.COL_BULL_TOTAL, inv.getBullTotal());
+        setIntegerCell(row, YakHerdInventoryExcelParser.COL_COW_HEAD, inv.getCowTotal());
+        setIntegerCell(row, YakHerdInventoryExcelParser.COL_BULL_SECTION_TOTAL, inv.getBullTotal());
         setIntegerCell(row, YakHerdInventoryExcelParser.COL_BREEDING_BULL, inv.getBreedingBullCount());
         setIntegerCell(row, YakHerdInventoryExcelParser.COL_BULL_CASTRATED, inv.getBullCastratedCount());
         setIntegerCell(row, YakHerdInventoryExcelParser.COL_COW_TOTAL, inv.getCowTotal());
@@ -283,8 +296,10 @@ public class YakHerdInventoryExcelExporter
             setIntegerCell(row, YakHerdInventoryExcelParser.COL_VILLAGE_COUNT, villageCount);
             setIntegerCell(row, YakHerdInventoryExcelParser.COL_HERDSMAN, herdsmanHouseholdCount);
             setIntegerCell(row, YakHerdInventoryExcelParser.COL_YAK_TOTAL, yakTotal);
-            setIntegerCell(row, COL_F_YAK_MIRROR, yakTotal);
+            setIntegerCell(row, YakHerdInventoryExcelParser.COL_YAK_GENDER_TOTAL, yakTotal);
             setIntegerCell(row, YakHerdInventoryExcelParser.COL_BULL_TOTAL, bullTotal);
+            setIntegerCell(row, YakHerdInventoryExcelParser.COL_COW_HEAD, cowTotal);
+            setIntegerCell(row, YakHerdInventoryExcelParser.COL_BULL_SECTION_TOTAL, bullTotal);
             setIntegerCell(row, YakHerdInventoryExcelParser.COL_BREEDING_BULL, breedingBullCount);
             setIntegerCell(row, YakHerdInventoryExcelParser.COL_BULL_CASTRATED, bullCastratedCount);
             setIntegerCell(row, YakHerdInventoryExcelParser.COL_COW_TOTAL, cowTotal);

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/support/YakHerdInventoryExcelParser.java

@@ -26,8 +26,16 @@ public final class YakHerdInventoryExcelParser
 
     static final int COL_YAK_TOTAL = 4;
 
+    static final int COL_YAK_GENDER_TOTAL = 5;
+
     static final int COL_BULL_TOTAL = 6;
 
+    /** 牦牛公母分类 — 母牛（头） */
+    static final int COL_COW_HEAD = 7;
+
+    /** 公牛 — 合计（头），与 {@link #COL_BULL_TOTAL} 同值 */
+    static final int COL_BULL_SECTION_TOTAL = 8;
+
     static final int COL_BREEDING_BULL = 9;
 
     static final int COL_BULL_CASTRATED = 10;

baqing-admin/src/test/java/com/ruoyi/web/modules/industryservice/service/impl/BizYakHerdInventoryImportUpsertTest.java

@@ -0,0 +1,110 @@
+package com.ruoyi.web.modules.industryservice.service.impl;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.InputStream;
+import java.util.concurrent.atomic.AtomicLong;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.mock.web.MockMultipartFile;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.web.modules.industryservice.domain.BizYakHerdInventory;
+import com.ruoyi.web.modules.industryservice.domain.vo.YakHerdInventoryImportResultVo;
+import com.ruoyi.web.modules.industryservice.mapper.BizYakHerdInventoryMapper;
+import com.ruoyi.web.modules.industryservice.support.TownDeptSupport;
+import com.ruoyi.web.modules.industryservice.support.YakHerdInventoryExcelExporter;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+@DisplayName("牦牛存栏导入 upsert")
+class BizYakHerdInventoryImportUpsertTest
+{
+    @Mock
+    private BizYakHerdInventoryMapper mapper;
+
+    @Mock
+    private TownDeptSupport townDeptSupport;
+
+    @Mock
+    private YakHerdInventoryExcelExporter excelExporter;
+
+    @InjectMocks
+    private BizYakHerdInventoryServiceImpl service;
+
+    @Test
+    @DisplayName("ZCZX-MYCLTB-UT-011 首次导入插入")
+    void firstImportInserts() throws Exception
+    {
+        mockTownResolver();
+        when(mapper.selectByYearAndTown(any(), anyLong())).thenReturn(null);
+        when(mapper.insertBizYakHerdInventory(any())).thenReturn(1);
+
+        try (InputStream in = getClass().getResourceAsStream("/excel/yak_herd_inventory_2026.xlsx"))
+        {
+            MockMultipartFile file = new MockMultipartFile("file", "牦牛存栏数据.xlsx",
+                    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", in);
+            YakHerdInventoryImportResultVo result = service.importData(file, 2026, "tester");
+            assertEquals(10, result.getInsertCount());
+            assertEquals(0, result.getUpdateCount());
+            verify(mapper, times(10)).insertBizYakHerdInventory(any());
+        }
+    }
+
+    @Test
+    @DisplayName("ZCZX-MYCLTB-UT-012 重复导入同文件全部更新")
+    void secondImportUpdates() throws Exception
+    {
+        mockTownResolver();
+        when(mapper.selectByYearAndTown(any(), anyLong())).thenAnswer(inv -> {
+            BizYakHerdInventory row = new BizYakHerdInventory();
+            row.setId((Long) inv.getArgument(1));
+            row.setStatYear((Integer) inv.getArgument(0));
+            row.setTownDeptId((Long) inv.getArgument(1));
+            return row;
+        });
+        when(mapper.updateBizYakHerdInventory(any())).thenReturn(1);
+
+        try (InputStream in = getClass().getResourceAsStream("/excel/yak_herd_inventory_2026.xlsx"))
+        {
+            MockMultipartFile file = new MockMultipartFile("file", "牦牛存栏数据.xlsx",
+                    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", in);
+            YakHerdInventoryImportResultVo result = service.importData(file, 2026, "tester");
+            assertEquals(0, result.getInsertCount());
+            assertEquals(10, result.getUpdateCount());
+            verify(mapper, times(10)).updateBizYakHerdInventory(any());
+            verify(mapper, times(0)).insertBizYakHerdInventory(any());
+        }
+    }
+
+    private void mockTownResolver()
+    {
+        AtomicLong seq = new AtomicLong(100);
+        when(townDeptSupport.resolveTownByName(anyString())).thenAnswer(inv -> {
+            SysDept d = new SysDept();
+            long id = seq.incrementAndGet();
+            d.setDeptId(id);
+            d.setDeptName(inv.getArgument(0));
+            d.setOrderNum(13);
+            d.setDelFlag("0");
+            return d;
+        });
+        when(townDeptSupport.requireReportTown(anyLong())).thenAnswer(inv -> {
+            SysDept d = new SysDept();
+            d.setDeptId(inv.getArgument(0));
+            d.setDeptName("乡镇");
+            return d;
+        });
+    }
+}

baqing-admin/src/test/java/com/ruoyi/web/modules/industryservice/support/YakHerdInventoryExcelExporterTest.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.modules.industryservice.support;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -17,6 +18,95 @@ class YakHerdInventoryExcelExporterTest
 {
     private final YakHerdInventoryExcelExporter exporter = new YakHerdInventoryExcelExporter();
 
+    @Test
+    @DisplayName("2026样例表无库数据时导出应清空样例存栏数")
+    void exportFromSampleWorkbookClearsData() throws Exception
+    {
+        try (java.io.InputStream sample = getClass().getResourceAsStream("/excel/yak_herd_inventory_2026.xlsx");
+                org.apache.poi.ss.usermodel.Workbook sampleWb = org.apache.poi.ss.usermodel.WorkbookFactory.create(sample))
+        {
+            org.apache.poi.ss.usermodel.Sheet sheet = sampleWb.getSheetAt(0);
+            int header = YakHerdInventoryExcelParser.detectHeaderRow(sheet);
+            int dataStart = header + 3;
+            org.apache.poi.ss.usermodel.DataFormatter fmt = new org.apache.poi.ss.usermodel.DataFormatter();
+            org.apache.poi.ss.usermodel.Row firstData = sheet.getRow(dataStart);
+            String yakBefore = fmt.formatCellValue(firstData.getCell(YakHerdInventoryExcelParser.COL_YAK_TOTAL));
+            assertTrue(com.ruoyi.common.utils.StringUtils.isNotEmpty(yakBefore), "样例表首行应有存栏数");
+
+            String[] townNames = {
+                "巴青乡", "江绵乡", "岗切乡", "雅安镇", "拉西镇",
+                "本塔乡", "杂色镇", "贡日乡", "玛如乡", "阿秀乡"
+            };
+            java.util.List<SysDept> towns = new java.util.ArrayList<>();
+            for (int i = 0; i < townNames.length; i++)
+            {
+                SysDept d = new SysDept();
+                d.setDeptId(100L + i);
+                d.setDeptName(townNames[i]);
+                d.setOrderNum(13 + i);
+                towns.add(d);
+            }
+            byte[] bytes = exporter.exportWorkbook(sampleWb, 2026, towns, Collections.emptyMap());
+            try (org.apache.poi.ss.usermodel.Workbook out = org.apache.poi.ss.usermodel.WorkbookFactory.create(
+                    new java.io.ByteArrayInputStream(bytes)))
+            {
+                java.util.List<ParsedRow> rows = YakHerdInventoryExcelParser.parse(
+                        new java.io.ByteArrayInputStream(bytes));
+                for (ParsedRow row : rows)
+                {
+                    assertTrue(row.getYakTotal() == null || row.getYakTotal() == 0,
+                            row.getTownName() + " 导出后不应含样例存栏数，实际=" + row.getYakTotal());
+                }
+            }
+        }
+    }
+
+    @Test
+    @DisplayName("无填报数据时全县乡镇导出均不应含存栏数")
+    void exportAllTownsEmptyClearsTemplateSampleData() throws Exception
+    {
+        String[] townNames = {
+            "巴青乡", "江绵乡", "岗切乡", "雅安镇", "拉西镇",
+            "本塔乡", "杂色镇", "贡日乡", "玛如乡", "阿秀乡"
+        };
+        java.util.List<SysDept> towns = new java.util.ArrayList<>();
+        for (int i = 0; i < townNames.length; i++)
+        {
+            SysDept town = new SysDept();
+            town.setDeptId(100L + i);
+            town.setDeptName(townNames[i]);
+            town.setOrderNum(13 + i);
+            towns.add(town);
+        }
+
+        byte[] bytes = exporter.export(2026, towns, Collections.emptyMap());
+        try (java.io.ByteArrayInputStream in = new java.io.ByteArrayInputStream(bytes))
+        {
+            java.util.List<ParsedRow> rows = YakHerdInventoryExcelParser.parse(in);
+            assertEquals(10, rows.size());
+            for (ParsedRow row : rows)
+            {
+                assertTrue(row.getYakTotal() == null || row.getYakTotal() == 0,
+                        row.getTownName() + " 不应有存栏数，实际=" + row.getYakTotal());
+            }
+            try (org.apache.poi.ss.usermodel.Workbook wb = org.apache.poi.ss.usermodel.WorkbookFactory.create(
+                    new java.io.ByteArrayInputStream(bytes)))
+            {
+                org.apache.poi.ss.usermodel.Sheet sheet = wb.getSheetAt(0);
+                int header = YakHerdInventoryExcelParser.detectHeaderRow(sheet);
+                int dataStart = header + 3;
+                org.apache.poi.ss.usermodel.DataFormatter fmt = new org.apache.poi.ss.usermodel.DataFormatter();
+                for (int i = 0; i < townNames.length; i++)
+                {
+                    org.apache.poi.ss.usermodel.Row excelRow = sheet.getRow(dataStart + i);
+                    String yakText = fmt.formatCellValue(excelRow.getCell(YakHerdInventoryExcelParser.COL_YAK_TOTAL));
+                    assertTrue(com.ruoyi.common.utils.StringUtils.isEmpty(yakText) || "0".equals(yakText.trim()),
+                            townNames[i] + " Excel 单元格存栏数应为空，实际=" + yakText);
+                }
+            }
+        }
+    }
+
     @Test
     @DisplayName("按年份导出全县乡镇 Excel")
     void exportByYear() throws Exception
@@ -53,6 +143,15 @@ class YakHerdInventoryExcelExporterTest
             java.util.List<ParsedRow> rows = YakHerdInventoryExcelParser.parse(in);
             assertTrue(rows.size() >= 1);
             assertTrue(rows.stream().anyMatch(r -> Integer.valueOf(21587).equals(r.getYakTotal())));
+            try (org.apache.poi.ss.usermodel.Workbook wb = org.apache.poi.ss.usermodel.WorkbookFactory.create(
+                    new java.io.ByteArrayInputStream(bytes)))
+            {
+                int header = YakHerdInventoryExcelParser.detectHeaderRow(wb.getSheetAt(0));
+                org.apache.poi.ss.usermodel.Row dataRow = wb.getSheetAt(0).getRow(header + 3);
+                org.apache.poi.ss.usermodel.DataFormatter fmt = new org.apache.poi.ss.usermodel.DataFormatter();
+                assertEquals("13430", fmt.formatCellValue(dataRow.getCell(YakHerdInventoryExcelParser.COL_COW_HEAD)));
+                assertEquals("13430", fmt.formatCellValue(dataRow.getCell(YakHerdInventoryExcelParser.COL_COW_TOTAL)));
+            }
         }
     }
 }

doc/产业数据模型及服务/牦牛存栏数据填报/牦牛存栏数据填报技术方案.md

@@ -183,8 +183,10 @@ for (int y = current; y >= current - 5; y--) { ... }
 | 2 | C | `villageCount` |
 | 3 | D | `herdsmanHouseholdCount` |
 | 4 | E | `yakTotal`（存栏数） |
-| 5 | F | 与 E 同值（模板镜像列，导出时同步写入） |
-| 6 | G | `bullTotal` |
+| 5 | F | 与 E 同值（牦牛公母分类合计） |
+| 6 | G | `bullTotal`（公牛（头）） |
+| 7 | H | `cowTotal`（牦牛公母分类 — 母牛（头）） |
+| 8 | I | 与 G 同值（公牛区块合计） |
 | 9 | J | `breedingBullCount` |
 | 10 | K | `bullCastratedCount` |
 | 11 | L | `cowTotal` |