外部接口

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

@@ -17,6 +17,7 @@ import com.ruoyi.web.modules.industryservice.research.domain.dto.ResearchTokenVo
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchCooperativeDevelopmentVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchDisposableIncomeVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchFamilyRanchVo;
+import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchFarmerHouseholdVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchLivestockProductOutputVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchPastureVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchYakAssetVo;
@@ -244,4 +245,28 @@ public class ResearchOpenApiController
             return ResearchOpenApiSupport.error(code, ex.getMessage());
         }
     }
+
+    /**
+     * 农牧户数据列表（村级汇总）。
+     */
+    @GetMapping("/farmer-households")
+    public OpenApiResponse<OpenApiPageResult<ResearchFarmerHouseholdVo>> listFarmerHouseholds(
+            @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.listFarmerHouseholds(
+                    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/ResearchFarmerHouseholdVo.java

@@ -0,0 +1,321 @@
+package com.ruoyi.web.modules.industryservice.research.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * 科研开放接口 — 农牧户填报记录（村级汇总；不含部门 ID / 备注）。
+ */
+public class ResearchFarmerHouseholdVo
+{
+    /** 农牧户记录 ID */
+    private Long householdId;
+
+    /** 所属年份 */
+    private Integer statYear;
+
+    /** 所属月份（1～12） */
+    private Integer statMonth;
+
+    /** 所属乡镇名称 */
+    private String townName;
+
+    /** 所属村名称 */
+    private String villageName;
+
+    /** 户数 */
+    private Integer householdCount;
+
+    /** 人数 */
+    private Integer populationCount;
+
+    /** 草场承包面积（亩，派生：禁牧面积 + 草畜平衡面积） */
+    private BigDecimal pastureContractArea;
+
+    /** 禁牧面积（亩） */
+    private BigDecimal grazingBanArea;
+
+    /** 草畜平衡面积（亩） */
+    private BigDecimal grassBalanceArea;
+
+    /** 核定年末草畜平衡载畜量（绵羊单位） */
+    private BigDecimal approvedCarryingCapacity;
+
+    /** 年底牲畜存栏（绵羊单位） */
+    private BigDecimal yearEndStockSheepUnit;
+
+    /** 是否纯牧户（是/否） */
+    private String isPureHerder;
+
+    /** 是否无畜户（是/否） */
+    private String isNoLivestock;
+
+    /** 是否消亡户（是/否） */
+    private String isExtinctHousehold;
+
+    /** 是否超载牧户（是/否） */
+    private String isOverloadHerder;
+
+    /** 是否需要封顶（是/否） */
+    private String needCap;
+
+    /** 是否需要保底（是/否） */
+    private String needFloor;
+
+    /** 禁牧补助（元） */
+    private BigDecimal grazingBanSubsidy;
+
+    /** 草畜平衡奖励（元） */
+    private BigDecimal grassBalanceReward;
+
+    /** 补助奖励小计（元，派生：禁牧补助 + 草畜平衡奖励） */
+    private BigDecimal subsidyRewardSubtotal;
+
+    /** 封顶保底后享受补助奖励总资金（元） */
+    private BigDecimal afterCapFloorSubsidy;
+
+    /** 村级草原监督员补助（元） */
+    private BigDecimal villageSupervisorSubsidy;
+
+    /** 补助奖励总资金（元，派生） */
+    private BigDecimal subsidyTotal;
+
+    public Long getHouseholdId()
+    {
+        return householdId;
+    }
+
+    public void setHouseholdId(Long householdId)
+    {
+        this.householdId = householdId;
+    }
+
+    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 getHouseholdCount()
+    {
+        return householdCount;
+    }
+
+    public void setHouseholdCount(Integer householdCount)
+    {
+        this.householdCount = householdCount;
+    }
+
+    public Integer getPopulationCount()
+    {
+        return populationCount;
+    }
+
+    public void setPopulationCount(Integer populationCount)
+    {
+        this.populationCount = populationCount;
+    }
+
+    public BigDecimal getPastureContractArea()
+    {
+        return pastureContractArea;
+    }
+
+    public void setPastureContractArea(BigDecimal pastureContractArea)
+    {
+        this.pastureContractArea = pastureContractArea;
+    }
+
+    public BigDecimal getGrazingBanArea()
+    {
+        return grazingBanArea;
+    }
+
+    public void setGrazingBanArea(BigDecimal grazingBanArea)
+    {
+        this.grazingBanArea = grazingBanArea;
+    }
+
+    public BigDecimal getGrassBalanceArea()
+    {
+        return grassBalanceArea;
+    }
+
+    public void setGrassBalanceArea(BigDecimal grassBalanceArea)
+    {
+        this.grassBalanceArea = grassBalanceArea;
+    }
+
+    public BigDecimal getApprovedCarryingCapacity()
+    {
+        return approvedCarryingCapacity;
+    }
+
+    public void setApprovedCarryingCapacity(BigDecimal approvedCarryingCapacity)
+    {
+        this.approvedCarryingCapacity = approvedCarryingCapacity;
+    }
+
+    public BigDecimal getYearEndStockSheepUnit()
+    {
+        return yearEndStockSheepUnit;
+    }
+
+    public void setYearEndStockSheepUnit(BigDecimal yearEndStockSheepUnit)
+    {
+        this.yearEndStockSheepUnit = yearEndStockSheepUnit;
+    }
+
+    public String getIsPureHerder()
+    {
+        return isPureHerder;
+    }
+
+    public void setIsPureHerder(String isPureHerder)
+    {
+        this.isPureHerder = isPureHerder;
+    }
+
+    public String getIsNoLivestock()
+    {
+        return isNoLivestock;
+    }
+
+    public void setIsNoLivestock(String isNoLivestock)
+    {
+        this.isNoLivestock = isNoLivestock;
+    }
+
+    public String getIsExtinctHousehold()
+    {
+        return isExtinctHousehold;
+    }
+
+    public void setIsExtinctHousehold(String isExtinctHousehold)
+    {
+        this.isExtinctHousehold = isExtinctHousehold;
+    }
+
+    public String getIsOverloadHerder()
+    {
+        return isOverloadHerder;
+    }
+
+    public void setIsOverloadHerder(String isOverloadHerder)
+    {
+        this.isOverloadHerder = isOverloadHerder;
+    }
+
+    public String getNeedCap()
+    {
+        return needCap;
+    }
+
+    public void setNeedCap(String needCap)
+    {
+        this.needCap = needCap;
+    }
+
+    public String getNeedFloor()
+    {
+        return needFloor;
+    }
+
+    public void setNeedFloor(String needFloor)
+    {
+        this.needFloor = needFloor;
+    }
+
+    public BigDecimal getGrazingBanSubsidy()
+    {
+        return grazingBanSubsidy;
+    }
+
+    public void setGrazingBanSubsidy(BigDecimal grazingBanSubsidy)
+    {
+        this.grazingBanSubsidy = grazingBanSubsidy;
+    }
+
+    public BigDecimal getGrassBalanceReward()
+    {
+        return grassBalanceReward;
+    }
+
+    public void setGrassBalanceReward(BigDecimal grassBalanceReward)
+    {
+        this.grassBalanceReward = grassBalanceReward;
+    }
+
+    public BigDecimal getSubsidyRewardSubtotal()
+    {
+        return subsidyRewardSubtotal;
+    }
+
+    public void setSubsidyRewardSubtotal(BigDecimal subsidyRewardSubtotal)
+    {
+        this.subsidyRewardSubtotal = subsidyRewardSubtotal;
+    }
+
+    public BigDecimal getAfterCapFloorSubsidy()
+    {
+        return afterCapFloorSubsidy;
+    }
+
+    public void setAfterCapFloorSubsidy(BigDecimal afterCapFloorSubsidy)
+    {
+        this.afterCapFloorSubsidy = afterCapFloorSubsidy;
+    }
+
+    public BigDecimal getVillageSupervisorSubsidy()
+    {
+        return villageSupervisorSubsidy;
+    }
+
+    public void setVillageSupervisorSubsidy(BigDecimal villageSupervisorSubsidy)
+    {
+        this.villageSupervisorSubsidy = villageSupervisorSubsidy;
+    }
+
+    public BigDecimal getSubsidyTotal()
+    {
+        return subsidyTotal;
+    }
+
+    public void setSubsidyTotal(BigDecimal subsidyTotal)
+    {
+        this.subsidyTotal = subsidyTotal;
+    }
+}

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

@@ -5,6 +5,7 @@ import com.ruoyi.web.modules.industryservice.research.domain.dto.ResearchTokenVo
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchCooperativeDevelopmentVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchDisposableIncomeVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchFamilyRanchVo;
+import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchFarmerHouseholdVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchLivestockProductOutputVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchPastureVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchYakAssetVo;
@@ -76,4 +77,13 @@ public interface IResearchOpenApiService
      * @param statYear 所属年份精确匹配
      */
     OpenApiPageResult<ResearchDisposableIncomeVo> listDisposableIncomes(int pageNum, int pageSize, Integer statYear);
+
+    /**
+     * 农牧户填报列表。
+     *
+     * @param townName 所属乡镇名称模糊匹配
+     * @param villageName 所属村名称模糊匹配
+     */
+    OpenApiPageResult<ResearchFarmerHouseholdVo> listFarmerHouseholds(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

@@ -11,6 +11,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.web.modules.industryservice.domain.BizCooperativeDevelopment;
 import com.ruoyi.web.modules.industryservice.domain.BizDisposableIncome;
 import com.ruoyi.web.modules.industryservice.domain.BizFamilyRanch;
+import com.ruoyi.web.modules.industryservice.domain.BizFarmerHousehold;
 import com.ruoyi.web.modules.industryservice.domain.BizLivestockProductOutput;
 import com.ruoyi.web.modules.industryservice.domain.BizPasture;
 import com.ruoyi.web.modules.industryservice.domain.BizYakAsset;
@@ -20,6 +21,7 @@ import com.ruoyi.web.modules.industryservice.domain.dto.OpenApiPageResult;
 import com.ruoyi.web.modules.industryservice.mapper.BizCooperativeDevelopmentMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizDisposableIncomeMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizFamilyRanchMapper;
+import com.ruoyi.web.modules.industryservice.mapper.BizFarmerHouseholdMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizLivestockProductOutputMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakHerdInventoryMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakOutboundReportMapper;
@@ -28,6 +30,7 @@ import com.ruoyi.web.modules.industryservice.research.domain.dto.ResearchTokenVo
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchCooperativeDevelopmentVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchDisposableIncomeVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchFamilyRanchVo;
+import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchFarmerHouseholdVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchLivestockProductOutputVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchPastureVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchYakAssetVo;
@@ -72,6 +75,9 @@ public class ResearchOpenApiServiceImpl implements IResearchOpenApiService
     @Autowired
     private BizDisposableIncomeMapper bizDisposableIncomeMapper;
 
+    @Autowired
+    private BizFarmerHouseholdMapper bizFarmerHouseholdMapper;
+
     @Override
     public ResearchTokenVo authenticate(String appKey, String appSecret)
     {
@@ -272,6 +278,33 @@ public class ResearchOpenApiServiceImpl implements IResearchOpenApiService
                 rows.stream().map(ResearchOpenApiSupport::toDisposableIncomeVo).collect(Collectors.toList()));
     }
 
+    @Override
+    public OpenApiPageResult<ResearchFarmerHouseholdVo> listFarmerHouseholds(int pageNum, int pageSize,
+            Integer statYear, Integer statMonth, String townName, String villageName)
+    {
+        tokenService.assertEnabled();
+        int safePageNum = normalizePageNum(pageNum);
+        int safePageSize = normalizePageSize(pageSize);
+        BizFarmerHousehold query = new BizFarmerHousehold();
+        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<BizFarmerHousehold> rows = bizFarmerHouseholdMapper.selectBizFarmerHouseholdList(query);
+        PageInfo<BizFarmerHousehold> page = new PageInfo<>(rows);
+        return toPageResult(safePageNum, safePageSize, page.getTotal(),
+                rows.stream().map(ResearchOpenApiSupport::toFarmerHouseholdVo).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

@@ -5,6 +5,7 @@ import java.util.UUID;
 import com.ruoyi.web.modules.industryservice.domain.BizCooperativeDevelopment;
 import com.ruoyi.web.modules.industryservice.domain.BizDisposableIncome;
 import com.ruoyi.web.modules.industryservice.domain.BizFamilyRanch;
+import com.ruoyi.web.modules.industryservice.domain.BizFarmerHousehold;
 import com.ruoyi.web.modules.industryservice.domain.BizLivestockProductOutput;
 import com.ruoyi.web.modules.industryservice.domain.BizPasture;
 import com.ruoyi.web.modules.industryservice.domain.BizYakAsset;
@@ -14,6 +15,7 @@ import com.ruoyi.web.modules.industryservice.domain.dto.OpenApiResponse;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchCooperativeDevelopmentVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchDisposableIncomeVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchFamilyRanchVo;
+import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchFarmerHouseholdVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchLivestockProductOutputVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchPastureVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchYakAssetVo;
@@ -290,4 +292,38 @@ public final class ResearchOpenApiSupport
         vo.setIncomeGrowthRate(row.getIncomeGrowthRate());
         return vo;
     }
+
+    public static ResearchFarmerHouseholdVo toFarmerHouseholdVo(BizFarmerHousehold row)
+    {
+        if (row == null)
+        {
+            return null;
+        }
+        ResearchFarmerHouseholdVo vo = new ResearchFarmerHouseholdVo();
+        vo.setHouseholdId(row.getId());
+        vo.setStatYear(row.getStatYear());
+        vo.setStatMonth(row.getStatMonth());
+        vo.setTownName(row.getTownName());
+        vo.setVillageName(row.getVillageName());
+        vo.setHouseholdCount(row.getHouseholdCount());
+        vo.setPopulationCount(row.getPopulationCount());
+        vo.setPastureContractArea(row.getPastureContractArea());
+        vo.setGrazingBanArea(row.getGrazingBanArea());
+        vo.setGrassBalanceArea(row.getGrassBalanceArea());
+        vo.setApprovedCarryingCapacity(row.getApprovedCarryingCapacity());
+        vo.setYearEndStockSheepUnit(row.getYearEndStockSheepUnit());
+        vo.setIsPureHerder(row.getIsPureHerder());
+        vo.setIsNoLivestock(row.getIsNoLivestock());
+        vo.setIsExtinctHousehold(row.getIsExtinctHousehold());
+        vo.setIsOverloadHerder(row.getIsOverloadHerder());
+        vo.setNeedCap(row.getNeedCap());
+        vo.setNeedFloor(row.getNeedFloor());
+        vo.setGrazingBanSubsidy(row.getGrazingBanSubsidy());
+        vo.setGrassBalanceReward(row.getGrassBalanceReward());
+        vo.setSubsidyRewardSubtotal(row.getSubsidyRewardSubtotal());
+        vo.setAfterCapFloorSubsidy(row.getAfterCapFloorSubsidy());
+        vo.setVillageSupervisorSubsidy(row.getVillageSupervisorSubsidy());
+        vo.setSubsidyTotal(row.getSubsidyTotal());
+        return vo;
+    }
 }

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

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

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

@@ -24,6 +24,7 @@ import com.ruoyi.web.modules.industryservice.research.domain.dto.ResearchTokenVo
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchCooperativeDevelopmentVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchDisposableIncomeVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchFamilyRanchVo;
+import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchFarmerHouseholdVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchLivestockProductOutputVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchPastureVo;
 import com.ruoyi.web.modules.industryservice.research.domain.vo.ResearchYakHerdInventoryVo;
@@ -253,4 +254,33 @@ class ResearchOpenApiControllerApiTest
                 .andExpect(jsonPath("$.code").value(200))
                 .andExpect(jsonPath("$.data.records[0].statYear").value(2025));
     }
+
+    @Test
+    @DisplayName("GET /farmer-households 成功")
+    void listFarmerHouseholds() throws Exception
+    {
+        ResearchFarmerHouseholdVo row = new ResearchFarmerHouseholdVo();
+        row.setHouseholdId(1L);
+        row.setStatYear(2026);
+        row.setStatMonth(5);
+        row.setTownName("雅安镇");
+        row.setVillageName("荣嘎村");
+        OpenApiPageResult<ResearchFarmerHouseholdVo> page = new OpenApiPageResult<>();
+        page.setPageNum(1);
+        page.setPageSize(20);
+        page.setTotal(1L);
+        page.setRecords(Collections.singletonList(row));
+        when(researchOpenApiService.listFarmerHouseholds(anyInt(), anyInt(), any(), any(), any(), any()))
+                .thenReturn(page);
+
+        mockMvc.perform(get("/open-api/v1/research/farmer-households")
+                .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

@@ -34,6 +34,7 @@
 | 畜牧产品产量登记列表 | 分页返回村级肉/奶产量 |
 | 家庭牧场数据列表 | 分页返回家庭牧场填报；法人姓名脱敏 |
 | 可支配收入数据列表 | 分页返回县级年度可支配收入填报 |
+| 农牧户数据列表 | 分页返回村级农牧户填报 |
 
 **本期不实现：**
 
@@ -204,6 +205,20 @@ sequenceDiagram
 
 **不返回**：创建人、备注等内部字段。
 
+### 6.10 农牧户数据列表
+
+| 项 | 说明 |
+| --- | --- |
+| 方法 | GET |
+| 路径 | `/farmer-households` |
+| 鉴权 | Bearer Token |
+| 分页 | 同 §6.2 |
+| 筛选 | `statYear`、`statMonth`、`townName`（乡镇模糊）、`villageName`（村模糊） |
+
+**返回字段**：`householdId`、年月、乡镇村、户数人数、草场面积与载畜量、户类型标识、补助奖励等。
+
+**不返回**：部门 ID、创建人、备注等内部字段。
+
 ---
 
 ## 7. 脱敏规则摘要
@@ -247,6 +262,7 @@ sequenceDiagram
 | 畜牧产品产量登记 | 数据源 `biz_livestock_product_output` |
 | 家庭牧场数据填报 | 数据源 `biz_family_ranch` |
 | 可支配收入数据填报 | 数据源 `biz_disposable_income` |
+| 农牧户数据填报 | 数据源 `biz_farmer_household` |
 | 若依权限体系 | **无**关联；开放接口走独立 Token |
 
 ---
@@ -264,5 +280,6 @@ sequenceDiagram
 | 畜牧产品产量列表 | §6.7 |
 | 家庭牧场列表 | §6.8 |
 | 可支配收入列表 | §6.9 |
+| 农牧户列表 | §6.10 |
 | 脱敏合规 | §7 |
 | 本期不实现 | §3 |

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

@@ -9,7 +9,7 @@
 | 项 | 说明 |
 | --- | --- |
 | **后端** | RuoYi **v3.9.2**（**springboot2** 分支）：JDK 8、Spring MVC、MyBatis |
-| **数据库** | 只读查询既有表 `biz_pasture`、`biz_yak_asset`、`biz_yak_herd_inventory`、`biz_yak_outbound_report`、`biz_cooperative_development`、`biz_livestock_product_output`、`biz_family_ranch`、`biz_disposable_income` |
+| **数据库** | 只读查询既有表 `biz_pasture`、`biz_yak_asset`、`biz_yak_herd_inventory`、`biz_yak_outbound_report`、`biz_cooperative_development`、`biz_livestock_product_output`、`biz_family_ranch`、`biz_disposable_income`、`biz_farmer_household` |
 | **鉴权** | 独立 JWT + Servlet Filter；`@Anonymous` 绕过若依登录，Filter 校验 Bearer Token |
 | **响应** | `OpenApiResponse<T>` + `OpenApiPageResult<T>`（与第三方 farming OpenAPI 同结构） |
 
@@ -208,6 +208,19 @@ Authorization: Bearer <accessToken>
 
 实现说明：直接查 `BizDisposableIncomeMapper.selectBizDisposableIncomeList`。
 
+### 3.10 农牧户数据列表
+
+```
+GET /open-api/v1/research/farmer-households?pageNum=1&pageSize=20&statYear=2026&statMonth=5&townName=&villageName=
+Authorization: Bearer <accessToken>
+```
+
+**查询参数：** `statYear` / `statMonth`（精确）；`townName` / `villageName`（模糊）；分页同前。
+
+**`records[]` 元素（ResearchFarmerHouseholdVo）：** 农牧户业务字段；**不含**部门 ID、操作人、备注。
+
+实现说明：直接查 `BizFarmerHouseholdMapper`（清空 `params.dataScope`）。
+
 ---
 
 ## 4. 鉴权流程
@@ -235,8 +248,9 @@ Token 申请：`appKey`/`appSecret` 与配置项精确匹配后签发 JWT（HS51
 | 产量列表 | `BizLivestockProductOutputMapper.selectBizLivestockProductOutputList` | `biz_livestock_product_output` | 年/月精确；乡镇/村名模糊；清空 `params.dataScope` |
 | 家庭牧场列表 | `BizFamilyRanchMapper.selectBizFamilyRanchList` | `biz_family_ranch` | 年/月精确；乡镇/村/企业名模糊；清空 `params.dataScope` |
 | 可支配收入列表 | `BizDisposableIncomeMapper.selectBizDisposableIncomeList` | `biz_disposable_income` | 年份精确 |
+| 农牧户列表 | `BizFarmerHouseholdMapper.selectBizFarmerHouseholdList` | `biz_farmer_household` | 年/月精确；乡镇/村名模糊；清空 `params.dataScope` |
 
-实体 → VO：`ResearchOpenApiSupport.toPastureVo` / `toYakAssetVo` / `toYakHerdInventoryVo` / `toYakOutboundReportVo` / `toCooperativeDevelopmentVo` / `toLivestockProductOutputVo` / `toFamilyRanchVo` / `toDisposableIncomeVo`。
+实体 → VO：`ResearchOpenApiSupport.toPastureVo` / `toYakAssetVo` / `toYakHerdInventoryVo` / `toYakOutboundReportVo` / `toCooperativeDevelopmentVo` / `toLivestockProductOutputVo` / `toFamilyRanchVo` / `toDisposableIncomeVo` / `toFarmerHouseholdVo`。
 
 ---
 
@@ -305,6 +319,10 @@ curl "http://localhost:8010/open-api/v1/research/family-ranches?pageNum=1&pageSi
 # 9. 可支配收入
 curl "http://localhost:8010/open-api/v1/research/disposable-incomes?pageNum=1&pageSize=10&statYear=2025" \
   -H "Authorization: Bearer <accessToken>"
+
+# 10. 农牧户
+curl "http://localhost:8010/open-api/v1/research/farmer-households?pageNum=1&pageSize=10&statYear=2026&townName=雅安" \
+  -H "Authorization: Bearer <accessToken>"
 ```
 
 ---
@@ -332,6 +350,7 @@ curl "http://localhost:8010/open-api/v1/research/disposable-incomes?pageNum=1&pa
 | §6.7 产量 | **§3.7**、**§5** BizLivestockProductOutput |
 | §6.8 家庭牧场 | **§3.8**、**§5** BizFamilyRanch |
 | §6.9 可支配收入 | **§3.9**、**§5** BizDisposableIncome |
+| §6.10 农牧户 | **§3.10**、**§5** BizFarmerHousehold |
 | §7 脱敏 | **§6** Masking |
 | §3 不实现机构区分 | 单一 app-key/secret，JWT 无 clientId |
 
@@ -341,6 +360,7 @@ curl "http://localhost:8010/open-api/v1/research/disposable-incomes?pageNum=1&pa
 
 | 版本 | 日期 | 说明 |
 | --- | --- | --- |
+| 1.7 | 2026-07-22 | 新增农牧户开放列表（年/月/乡镇村模糊+分页） |
 | 1.6 | 2026-07-22 | 新增可支配收入开放列表（年份精确+分页） |
 | 1.5 | 2026-07-22 | 新增家庭牧场开放列表（年/月/乡镇村/企业名模糊+分页；法人脱敏） |
 | 1.4 | 2026-07-22 | 新增畜牧产品产量登记开放列表（年/月/乡镇村模糊+分页） |

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

@@ -55,6 +55,8 @@
 | KYKF-API-022 | 家庭牧场 | 年/月/乡镇村/企业名筛选 | 接口测试 | curl | §6.8 | 已知企业名片段 | GET 带筛选参数 | 条件生效；名称模糊匹配 |
 | KYKF-API-023 | 可支配收入 | 分页列表 | 接口测试 | curl | §6.9 | 有效 Token；库有收入数据 | GET `/disposable-incomes?pageNum=1&pageSize=10` | `code=200`；无操作人/备注 |
 | KYKF-API-024 | 可支配收入 | 年份筛选 | 接口测试 | curl | §6.9 | 已知年份 | GET 带 `statYear` | 仅返回该年记录 |
+| KYKF-API-025 | 农牧户 | 分页列表 | 接口测试 | curl | §6.10 | 有效 Token；库有农牧户数据 | GET `/farmer-households?pageNum=1&pageSize=10` | `code=200`；无部门 ID |
+| KYKF-API-026 | 农牧户 | 年/月/乡镇村筛选 | 接口测试 | curl | §6.10 | 已知年月与乡镇名片段 | GET 带筛选参数 | 条件生效；名称模糊匹配 |
 
 ---
 
@@ -71,11 +73,12 @@
 | §6.7 产量列表 | — | API-019～020 |
 | §6.8 家庭牧场列表 | — | API-021～022 |
 | §6.9 可支配收入列表 | — | API-023～024 |
+| §6.10 农牧户列表 | — | API-025～026 |
 | §7 脱敏 | UT-001～004 | API-012 |
 | §2 分页 | — | API-010 |
 | §3 无机构区分 | UT-005 | API-001（单一凭证） |
 
-**用例统计**：单元 **6**、接口 **24**，合计 **30** 条。
+**用例统计**：单元 **6**、接口 **26**，合计 **32** 条。
 
 ---
 
@@ -96,6 +99,7 @@ curl -s "$BASE/cooperative-developments?pageNum=1&pageSize=5&statYear=2026" -H "
 curl -s "$BASE/livestock-product-outputs?pageNum=1&pageSize=5&statYear=2026" -H "Authorization: Bearer $TOKEN"
 curl -s "$BASE/family-ranches?pageNum=1&pageSize=5&statYear=2026" -H "Authorization: Bearer $TOKEN"
 curl -s "$BASE/disposable-incomes?pageNum=1&pageSize=5&statYear=2025" -H "Authorization: Bearer $TOKEN"
+curl -s "$BASE/farmer-households?pageNum=1&pageSize=5&statYear=2026" -H "Authorization: Bearer $TOKEN"
 ```
 
 （Windows 环境可用 PowerShell `Invoke-RestMethod`，见技术方案 **§8**。）