三资具体问题上报

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/research/controller/ResearchOpenApiController.java

@@ -16,6 +16,7 @@ import com.ruoyi.web.modules.industryservice.research.domain.dto.ResearchTokenRe
 import com.ruoyi.web.modules.industryservice.research.domain.dto.ResearchTokenVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchPastureVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchYakAssetVo;
+import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchYakHerdInventoryVo;
 import com.ruoyi.web.modules.industryservice.research.service.IResearchOpenApiService;
 import com.ruoyi.web.modules.industryservice.research.support.ResearchOpenApiSupport;
 
@@ -95,4 +96,28 @@ public class ResearchOpenApiController
             return ResearchOpenApiSupport.error(code, ex.getMessage());
         }
     }
+
+    /**
+     * 牦牛存栏数据列表（村级汇总）。
+     */
+    @GetMapping("/yak-herd-inventories")
+    public OpenApiResponse<OpenApiPageResult<ResearchYakHerdInventoryVo>> listYakHerdInventories(
+            @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+            @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
+            @RequestParam(value = "statYear", required = false) Integer statYear,
+            @RequestParam(value = "statMonth", required = false) Integer statMonth,
+            @RequestParam(value = "townName", required = false) String townName,
+            @RequestParam(value = "villageName", required = false) String villageName)
+    {
+        try
+        {
+            return ResearchOpenApiSupport.success(researchOpenApiService.listYakHerdInventories(
+                    pageNum, pageSize, statYear, statMonth, townName, villageName));
+        }
+        catch (ServiceException ex)
+        {
+            int code = ex.getCode() != null ? ex.getCode() : 500;
+            return ResearchOpenApiSupport.error(code, ex.getMessage());
+        }
+    }
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/research/domain/vo/ResearchYakHerdInventoryVo.java

@@ -0,0 +1,271 @@
+package com.ruoyi.web.modules.industryservice.research.domain.vo;
+
+/**
+ * 科研开放接口 — 牦牛存栏填报记录（村级汇总，无个体敏感字段）。
+ */
+public class ResearchYakHerdInventoryVo
+{
+    private Long inventoryId;
+
+    private Integer statYear;
+
+    private Integer statMonth;
+
+    private String townName;
+
+    private String villageName;
+
+    private Integer villageCount;
+
+    private Integer herdsmanHouseholdCount;
+
+    private Integer breedingBullCount;
+
+    private Integer bullCastratedCount;
+
+    private Integer bullTotal;
+
+    private Integer cowYoungCount;
+
+    private Integer cowAdultCount;
+
+    private Integer cowTotal;
+
+    private Integer milkingCowCount;
+
+    private Integer fertileCowCount;
+
+    private Integer dairyTotal;
+
+    private Integer sheepTotal;
+
+    private Integer milkingSheepCount;
+
+    private Integer insuredYakCount;
+
+    private Integer yakTotal;
+
+    private Integer grandTotal;
+
+    private Integer yakSheepTotal;
+
+    public Long getInventoryId()
+    {
+        return inventoryId;
+    }
+
+    public void setInventoryId(Long inventoryId)
+    {
+        this.inventoryId = inventoryId;
+    }
+
+    public Integer getStatYear()
+    {
+        return statYear;
+    }
+
+    public void setStatYear(Integer statYear)
+    {
+        this.statYear = statYear;
+    }
+
+    public Integer getStatMonth()
+    {
+        return statMonth;
+    }
+
+    public void setStatMonth(Integer statMonth)
+    {
+        this.statMonth = statMonth;
+    }
+
+    public String getTownName()
+    {
+        return townName;
+    }
+
+    public void setTownName(String townName)
+    {
+        this.townName = townName;
+    }
+
+    public String getVillageName()
+    {
+        return villageName;
+    }
+
+    public void setVillageName(String villageName)
+    {
+        this.villageName = villageName;
+    }
+
+    public Integer getVillageCount()
+    {
+        return villageCount;
+    }
+
+    public void setVillageCount(Integer villageCount)
+    {
+        this.villageCount = villageCount;
+    }
+
+    public Integer getHerdsmanHouseholdCount()
+    {
+        return herdsmanHouseholdCount;
+    }
+
+    public void setHerdsmanHouseholdCount(Integer herdsmanHouseholdCount)
+    {
+        this.herdsmanHouseholdCount = herdsmanHouseholdCount;
+    }
+
+    public Integer getBreedingBullCount()
+    {
+        return breedingBullCount;
+    }
+
+    public void setBreedingBullCount(Integer breedingBullCount)
+    {
+        this.breedingBullCount = breedingBullCount;
+    }
+
+    public Integer getBullCastratedCount()
+    {
+        return bullCastratedCount;
+    }
+
+    public void setBullCastratedCount(Integer bullCastratedCount)
+    {
+        this.bullCastratedCount = bullCastratedCount;
+    }
+
+    public Integer getBullTotal()
+    {
+        return bullTotal;
+    }
+
+    public void setBullTotal(Integer bullTotal)
+    {
+        this.bullTotal = bullTotal;
+    }
+
+    public Integer getCowYoungCount()
+    {
+        return cowYoungCount;
+    }
+
+    public void setCowYoungCount(Integer cowYoungCount)
+    {
+        this.cowYoungCount = cowYoungCount;
+    }
+
+    public Integer getCowAdultCount()
+    {
+        return cowAdultCount;
+    }
+
+    public void setCowAdultCount(Integer cowAdultCount)
+    {
+        this.cowAdultCount = cowAdultCount;
+    }
+
+    public Integer getCowTotal()
+    {
+        return cowTotal;
+    }
+
+    public void setCowTotal(Integer cowTotal)
+    {
+        this.cowTotal = cowTotal;
+    }
+
+    public Integer getMilkingCowCount()
+    {
+        return milkingCowCount;
+    }
+
+    public void setMilkingCowCount(Integer milkingCowCount)
+    {
+        this.milkingCowCount = milkingCowCount;
+    }
+
+    public Integer getFertileCowCount()
+    {
+        return fertileCowCount;
+    }
+
+    public void setFertileCowCount(Integer fertileCowCount)
+    {
+        this.fertileCowCount = fertileCowCount;
+    }
+
+    public Integer getDairyTotal()
+    {
+        return dairyTotal;
+    }
+
+    public void setDairyTotal(Integer dairyTotal)
+    {
+        this.dairyTotal = dairyTotal;
+    }
+
+    public Integer getSheepTotal()
+    {
+        return sheepTotal;
+    }
+
+    public void setSheepTotal(Integer sheepTotal)
+    {
+        this.sheepTotal = sheepTotal;
+    }
+
+    public Integer getMilkingSheepCount()
+    {
+        return milkingSheepCount;
+    }
+
+    public void setMilkingSheepCount(Integer milkingSheepCount)
+    {
+        this.milkingSheepCount = milkingSheepCount;
+    }
+
+    public Integer getInsuredYakCount()
+    {
+        return insuredYakCount;
+    }
+
+    public void setInsuredYakCount(Integer insuredYakCount)
+    {
+        this.insuredYakCount = insuredYakCount;
+    }
+
+    public Integer getYakTotal()
+    {
+        return yakTotal;
+    }
+
+    public void setYakTotal(Integer yakTotal)
+    {
+        this.yakTotal = yakTotal;
+    }
+
+    public Integer getGrandTotal()
+    {
+        return grandTotal;
+    }
+
+    public void setGrandTotal(Integer grandTotal)
+    {
+        this.grandTotal = grandTotal;
+    }
+
+    public Integer getYakSheepTotal()
+    {
+        return yakSheepTotal;
+    }
+
+    public void setYakSheepTotal(Integer yakSheepTotal)
+    {
+        this.yakSheepTotal = yakSheepTotal;
+    }
+}

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/research/service/IResearchOpenApiService.java

@@ -4,6 +4,7 @@ import com.ruoyi.web.modules.industryservice.domain.dto.OpenApiPageResult;
 import com.ruoyi.web.modules.industryservice.research.domain.dto.ResearchTokenVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchPastureVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchYakAssetVo;
+import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchYakHerdInventoryVo;
 
 /**
  * 科研开放数据接口服务。
@@ -16,4 +17,13 @@ public interface IResearchOpenApiService
 
     OpenApiPageResult<ResearchYakAssetVo> listYakAssets(int pageNum, int pageSize,
             Integer assetStatus, String gender, Long pastureId);
+
+    /**
+     * 牦牛存栏填报列表。
+     *
+     * @param townName 所属乡镇名称模糊匹配
+     * @param villageName 所属村名称模糊匹配
+     */
+    OpenApiPageResult<ResearchYakHerdInventoryVo> listYakHerdInventories(int pageNum, int pageSize,
+            Integer statYear, Integer statMonth, String townName, String villageName);
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/research/service/impl/ResearchOpenApiServiceImpl.java

@@ -7,13 +7,17 @@ import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.web.modules.industryservice.domain.BizPasture;
 import com.ruoyi.web.modules.industryservice.domain.BizYakAsset;
+import com.ruoyi.web.modules.industryservice.domain.BizYakHerdInventory;
 import com.ruoyi.web.modules.industryservice.domain.dto.OpenApiPageResult;
+import com.ruoyi.web.modules.industryservice.mapper.BizYakHerdInventoryMapper;
 import com.ruoyi.web.modules.industryservice.research.config.ResearchOpenApiProperties;
 import com.ruoyi.web.modules.industryservice.research.domain.dto.ResearchTokenVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchPastureVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchYakAssetVo;
+import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchYakHerdInventoryVo;
 import com.ruoyi.web.modules.industryservice.research.service.IResearchOpenApiService;
 import com.ruoyi.web.modules.industryservice.research.support.ResearchOpenApiSupport;
 import com.ruoyi.web.modules.industryservice.research.support.ResearchOpenApiTokenService;
@@ -35,6 +39,9 @@ public class ResearchOpenApiServiceImpl implements IResearchOpenApiService
     @Autowired
     private IBizYakAssetService bizYakAssetService;
 
+    @Autowired
+    private BizYakHerdInventoryMapper bizYakHerdInventoryMapper;
+
     @Override
     public ResearchTokenVo authenticate(String appKey, String appSecret)
     {
@@ -76,6 +83,33 @@ public class ResearchOpenApiServiceImpl implements IResearchOpenApiService
                 rows.stream().map(ResearchOpenApiSupport::toYakAssetVo).collect(Collectors.toList()));
     }
 
+    @Override
+    public OpenApiPageResult<ResearchYakHerdInventoryVo> listYakHerdInventories(int pageNum, int pageSize,
+            Integer statYear, Integer statMonth, String townName, String villageName)
+    {
+        tokenService.assertEnabled();
+        int safePageNum = normalizePageNum(pageNum);
+        int safePageSize = normalizePageSize(pageSize);
+        BizYakHerdInventory query = new BizYakHerdInventory();
+        query.setStatYear(statYear);
+        query.setStatMonth(statMonth);
+        if (StringUtils.isNotEmpty(townName))
+        {
+            query.setTownName(townName.trim());
+        }
+        if (StringUtils.isNotEmpty(villageName))
+        {
+            query.setVillageName(villageName.trim());
+        }
+        // 开放接口无登录上下文，清空 dataScope，避免走填报部门权限
+        query.getParams().put("dataScope", "");
+        PageHelper.startPage(safePageNum, safePageSize);
+        List<BizYakHerdInventory> rows = bizYakHerdInventoryMapper.selectBizYakHerdInventoryList(query);
+        PageInfo<BizYakHerdInventory> page = new PageInfo<>(rows);
+        return toPageResult(safePageNum, safePageSize, page.getTotal(),
+                rows.stream().map(ResearchOpenApiSupport::toYakHerdInventoryVo).collect(Collectors.toList()));
+    }
+
     private int normalizePageNum(int pageNum)
     {
         return pageNum > 0 ? pageNum : 1;

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

@@ -4,9 +4,11 @@ import java.time.Instant;
 import java.util.UUID;
 import com.ruoyi.web.modules.industryservice.domain.BizPasture;
 import com.ruoyi.web.modules.industryservice.domain.BizYakAsset;
+import com.ruoyi.web.modules.industryservice.domain.BizYakHerdInventory;
 import com.ruoyi.web.modules.industryservice.domain.dto.OpenApiResponse;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchPastureVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchYakAssetVo;
+import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchYakHerdInventoryVo;
 
 /**
  * 科研开放接口响应组装与实体脱敏转换。
@@ -90,4 +92,36 @@ public final class ResearchOpenApiSupport
         vo.setMotherSubjectCode(ResearchOpenApiMasking.pseudonymCode(row.getMotherYakNo(), "YM"));
         return vo;
     }
+
+    public static ResearchYakHerdInventoryVo toYakHerdInventoryVo(BizYakHerdInventory row)
+    {
+        if (row == null)
+        {
+            return null;
+        }
+        ResearchYakHerdInventoryVo vo = new ResearchYakHerdInventoryVo();
+        vo.setInventoryId(row.getId());
+        vo.setStatYear(row.getStatYear());
+        vo.setStatMonth(row.getStatMonth());
+        vo.setTownName(row.getTownName());
+        vo.setVillageName(row.getVillageName());
+        vo.setVillageCount(row.getVillageCount());
+        vo.setHerdsmanHouseholdCount(row.getHerdsmanHouseholdCount());
+        vo.setBreedingBullCount(row.getBreedingBullCount());
+        vo.setBullCastratedCount(row.getBullCastratedCount());
+        vo.setBullTotal(row.getBullTotal());
+        vo.setCowYoungCount(row.getCowYoungCount());
+        vo.setCowAdultCount(row.getCowAdultCount());
+        vo.setCowTotal(row.getCowTotal());
+        vo.setMilkingCowCount(row.getMilkingCowCount());
+        vo.setFertileCowCount(row.getFertileCowCount());
+        vo.setDairyTotal(row.getDairyTotal());
+        vo.setSheepTotal(row.getSheepTotal());
+        vo.setMilkingSheepCount(row.getMilkingSheepCount());
+        vo.setInsuredYakCount(row.getInsuredYakCount());
+        vo.setYakTotal(row.getYakTotal());
+        vo.setGrandTotal(row.getGrandTotal());
+        vo.setYakSheepTotal(row.getYakSheepTotal());
+        return vo;
+    }
 }

baqing-admin/src/main/resources/mapper/industryservice/BizYakHerdInventoryMapper.xml

@@ -108,6 +108,12 @@
             <if test="villageDeptId != null">
                 and h.village_dept_id = #{villageDeptId}
             </if>
+            <if test="townName != null and townName != ''">
+                and h.town_name like concat('%', #{townName}, '%')
+            </if>
+            <if test="villageName != null and villageName != ''">
+                and h.village_name like concat('%', #{villageName}, '%')
+            </if>
             ${params.dataScope}
         </where>
         order by h.stat_year desc, h.stat_month desc, d.order_num asc, v.order_num asc, h.id desc

baqing-admin/src/test/java/com/ruoyi/web/modules/industryservice/research/controller/ResearchOpenApiControllerApiTest.java

@@ -22,6 +22,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import com.ruoyi.web.modules.industryservice.domain.dto.OpenApiPageResult;
 import com.ruoyi.web.modules.industryservice.research.domain.dto.ResearchTokenVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchPastureVo;
+import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchYakHerdInventoryVo;
 import com.ruoyi.web.modules.industryservice.research.service.IResearchOpenApiService;
 
 @ExtendWith(MockitoExtension.class)
@@ -79,4 +80,33 @@ class ResearchOpenApiControllerApiTest
                 .andExpect(jsonPath("$.code").value(200))
                 .andExpect(jsonPath("$.data.records[0].pastureName").value("测试牧场"));
     }
+
+    @Test
+    @DisplayName("GET /yak-herd-inventories 成功")
+    void listYakHerdInventories() throws Exception
+    {
+        ResearchYakHerdInventoryVo row = new ResearchYakHerdInventoryVo();
+        row.setInventoryId(1L);
+        row.setStatYear(2026);
+        row.setStatMonth(5);
+        row.setTownName("雅安镇");
+        row.setVillageName("荣嘎村");
+        OpenApiPageResult<ResearchYakHerdInventoryVo> page = new OpenApiPageResult<>();
+        page.setPageNum(1);
+        page.setPageSize(20);
+        page.setTotal(1L);
+        page.setRecords(Collections.singletonList(row));
+        when(researchOpenApiService.listYakHerdInventories(anyInt(), anyInt(), any(), any(), any(), any()))
+                .thenReturn(page);
+
+        mockMvc.perform(get("/open-api/v1/research/yak-herd-inventories")
+                .param("statYear", "2026")
+                .param("statMonth", "5")
+                .param("townName", "雅安")
+                .param("villageName", "荣嘎"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.data.records[0].townName").value("雅安镇"))
+                .andExpect(jsonPath("$.data.records[0].villageName").value("荣嘎村"));
+    }
 }

doc/产业数据模型及服务/科研开放数据接口/科研开放数据接口功能需求.md

@@ -28,6 +28,7 @@
 | 访问令牌 | 使用全局 `appKey` + `appSecret` 申请 Bearer Token |
 | 牧场列表 | 分页返回脱敏牧场数据 |
 | 牦牛资产档案列表 | 分页返回脱敏档案数据（种群健康研究字段） |
+| 牦牛存栏数据列表 | 分页返回村级存栏填报汇总 |
 
 **本期不实现：**
 
@@ -114,6 +115,20 @@ sequenceDiagram
 
 **不返回**：`yakNo`、耳标号、第三方 ID、登记人、照片 URL、精确 GPS、备注等。
 
+### 6.4 牦牛存栏数据列表
+
+| 项 | 说明 |
+| --- | --- |
+| 方法 | GET |
+| 路径 | `/yak-herd-inventories` |
+| 鉴权 | Bearer Token |
+| 分页 | 同 §6.2 |
+| 筛选 | `statYear`（所属年份）、`statMonth`（所属月份）、`townName`（所属乡镇模糊）、`villageName`（所属村模糊） |
+
+**返回字段**：`inventoryId`、`statYear`、`statMonth`、`townName`、`villageName`、畜群结构汇总数量字段（公牛/母牛/奶牛/羊/保险及各类合计等）。
+
+**不返回**：部门 ID、创建人、备注等内部字段。
+
 ---
 
 ## 7. 脱敏规则摘要
@@ -151,6 +166,7 @@ sequenceDiagram
 | --- | --- |
 | 牧场管理 | 数据源 `biz_pasture` |
 | 牦牛资产档案管理 | 数据源 `biz_yak_asset` |
+| 牦牛存栏数据填报 | 数据源 `biz_yak_herd_inventory` |
 | 若依权限体系 | **无**关联；开放接口走独立 Token |
 
 ---
@@ -162,5 +178,6 @@ sequenceDiagram
 | Token 认证 | §4、§5、§6.1 |
 | 牧场列表 | §6.2、§7 |
 | 牦牛档案列表 | §6.3、§7 |
+| 牦牛存栏列表 | §6.4 |
 | 脱敏合规 | §7 |
 | 本期不实现 | §3 |

doc/产业数据模型及服务/科研开放数据接口/科研开放数据接口技术方案.md

@@ -9,7 +9,7 @@
 | 项 | 说明 |
 | --- | --- |
 | **后端** | RuoYi **v3.9.2**（**springboot2** 分支）：JDK 8、Spring MVC、MyBatis |
-| **数据库** | 只读查询既有表 `biz_pasture`、`biz_yak_asset` |
+| **数据库** | 只读查询既有表 `biz_pasture`、`biz_yak_asset`、`biz_yak_herd_inventory` |
 | **鉴权** | 独立 JWT + Servlet Filter；`@Anonymous` 绕过若依登录，Filter 校验 Bearer Token |
 | **响应** | `OpenApiResponse<T>` + `OpenApiPageResult<T>`（与第三方 farming OpenAPI 同结构） |
 
@@ -122,6 +122,27 @@ Authorization: Bearer <accessToken>
 | `realtimeTemp` / `realtimeSteps` / `envTemp` | number | IoT 快照 |
 | `fatherSubjectCode` / `motherSubjectCode` | string | 系谱 pseudonym |
 
+### 3.4 牦牛存栏数据列表
+
+```
+GET /open-api/v1/research/yak-herd-inventories?pageNum=1&pageSize=20&statYear=2026&statMonth=5&townName=&villageName=
+Authorization: Bearer <accessToken>
+```
+
+**查询参数：**
+
+| 参数 | 说明 |
+| --- | --- |
+| `statYear` | 所属年份（精确） |
+| `statMonth` | 所属月份（精确） |
+| `townName` | 所属乡镇名称模糊匹配 |
+| `villageName` | 所属村名称模糊匹配 |
+| `pageNum` / `pageSize` | 分页，同牧场列表 |
+
+**`records[]` 元素（ResearchYakHerdInventoryVo）：** 含 `inventoryId`、`statYear`、`statMonth`、`townName`、`villageName` 及畜群汇总数量字段；**不含** `townDeptId` / `villageDeptId`、操作人、备注。
+
+实现说明：直接查 `BizYakHerdInventoryMapper`（**不**走填报 Service 的部门数据权限）。
+
 ---
 
 ## 4. 鉴权流程
@@ -143,8 +164,9 @@ Token 申请：`appKey`/`appSecret` 与配置项精确匹配后签发 JWT（HS51
 | --- | --- | --- | --- |
 | 牧场列表 | `IBizPastureService.selectBizPastureList` | `biz_pasture` | `del_flag=0` |
 | 档案列表 | `IBizYakAssetService.selectBizYakAssetList` | `biz_yak_asset` | `del_flag=0`；支持 `assetStatus`、`gender`、`pastureId` |
+| 存栏列表 | `BizYakHerdInventoryMapper.selectBizYakHerdInventoryList` | `biz_yak_herd_inventory` | 年/月精确；乡镇/村名模糊；清空 `params.dataScope` |
 
-实体 → VO：`ResearchOpenApiSupport.toPastureVo` / `toYakAssetVo`（内部调用 `ResearchOpenApiMasking`）。
+实体 → VO：`ResearchOpenApiSupport.toPastureVo` / `toYakAssetVo` / `toYakHerdInventoryVo`。
 
 ---
 
@@ -189,6 +211,10 @@ curl "http://localhost:8010/open-api/v1/research/pastures?pageNum=1&pageSize=10"
 # 3. 牦牛档案
 curl "http://localhost:8010/open-api/v1/research/yak-assets?pageNum=1&pageSize=10&assetStatus=1" \
   -H "Authorization: Bearer <accessToken>"
+
+# 4. 牦牛存栏
+curl "http://localhost:8010/open-api/v1/research/yak-herd-inventories?pageNum=1&pageSize=10&statYear=2026&townName=雅安" \
+  -H "Authorization: Bearer <accessToken>"
 ```
 
 ---
@@ -210,6 +236,7 @@ curl "http://localhost:8010/open-api/v1/research/yak-assets?pageNum=1&pageSize=1
 | §5 认证 | **§2** 配置、**§4** Filter + TokenService |
 | §6.2 牧场 | **§3.2**、**§5** BizPasture |
 | §6.3 档案 | **§3.3**、**§5** BizYakAsset |
+| §6.4 存栏 | **§3.4**、**§5** BizYakHerdInventory |
 | §7 脱敏 | **§6** Masking |
 | §3 不实现机构区分 | 单一 app-key/secret，JWT 无 clientId |
 
@@ -219,4 +246,5 @@ curl "http://localhost:8010/open-api/v1/research/yak-assets?pageNum=1&pageSize=1
 
 | 版本 | 日期 | 说明 |
 | --- | --- | --- |
+| 1.1 | 2026-07-22 | 新增牦牛存栏开放列表（年/月/乡镇村模糊+分页） |
 | 1.0 | 2026-07-04 | 初版：Token + 牧场/档案脱敏列表；全局一对凭证 |

doc/产业数据模型及服务/科研开放数据接口/科研开放数据接口测试用例.md

@@ -43,6 +43,8 @@
 | KYKF-API-010 | 分页 | pageSize 超限 | 接口测试 | curl | 技术§2 | — | GET `pageSize=500` | `code=400` |
 | KYKF-API-011 | 开关 | enabled=false | 接口测试 | curl | §5 | 关闭 enabled 重启 | POST `/auth/token` | HTTP 503 或 `code=503` |
 | KYKF-API-012 | 脱敏 | 响应无敏感原文字段 | 接口测试 | curl | §7 | 库含手机/编号 | GET 两接口 | JSON 无 `yakNo`、`earTagNumber`、`externalId`、`detailAddress` |
+| KYKF-API-013 | 存栏 | 分页列表 | 接口测试 | curl | §6.4 | 有效 Token；库有存栏数据 | GET `/yak-herd-inventories?pageNum=1&pageSize=10` | `code=200`；含 `statYear`/`townName` 等；无部门 ID |
+| KYKF-API-014 | 存栏 | 年/月/乡镇村筛选 | 接口测试 | curl | §6.4 | 已知年月与乡镇名片段 | GET `statYear=&statMonth=&townName=&villageName=` | 条件生效；名称模糊匹配 |
 
 ---
 
@@ -53,11 +55,12 @@
 | §5 Token 认证 | UT-005～006 | API-001～004、011 |
 | §6.2 牧场列表 | UT-003 | API-005～006 |
 | §6.3 档案列表 | UT-004 | API-007～009 |
+| §6.4 存栏列表 | — | API-013～014 |
 | §7 脱敏 | UT-001～004 | API-012 |
 | §2 分页 | — | API-010 |
 | §3 无机构区分 | UT-005 | API-001（单一凭证） |
 
-**用例统计**：单元 **6**、接口 **12**，合计 **18** 条。
+**用例统计**：单元 **6**、接口 **14**，合计 **20** 条。
 
 ---
 
@@ -72,6 +75,7 @@ TOKEN=$(curl -s -X POST "$BASE/auth/token" \
 
 curl -s "$BASE/pastures?pageNum=1&pageSize=5" -H "Authorization: Bearer $TOKEN"
 curl -s "$BASE/yak-assets?pageNum=1&pageSize=5&assetStatus=1" -H "Authorization: Bearer $TOKEN"
+curl -s "$BASE/yak-herd-inventories?pageNum=1&pageSize=5&statYear=2026" -H "Authorization: Bearer $TOKEN"
 ```
 
 （Windows 环境可用 PowerShell `Invoke-RestMethod`，见技术方案 **§8**。）