交易市场平台（供应商）

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

@@ -2,19 +2,15 @@ package com.ruoyi.web.modules.industryservice.support;
 
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.TimeZone;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StreamUtils;
@@ -39,10 +35,10 @@ public class ThirdPartyFarmClientImpl implements ThirdPartyFarmClient
 
     private static final String LIST_PATH = "/open-api/v1/farming/farms";
 
-    private final ObjectMapper objectMapper = createObjectMapper();
+    private final ObjectMapper objectMapper = ThirdPartyFarmingHttpSupport.createObjectMapper();
 
     @Autowired
-    private ThirdPartyFarmProperties properties;
+    private ThirdPartyFarmingProperties properties;
 
     @Override
     public List<OpenFarmDto> fetchAllFarms()
@@ -87,22 +83,16 @@ public class ThirdPartyFarmClientImpl implements ThirdPartyFarmClient
 
     private List<OpenFarmDto> fetchFromHttp()
     {
-        if (!StringUtils.hasText(properties.getBaseUrl()))
-        {
-            throw new ServiceException("第三方养殖场 base-url 未配置");
-        }
-        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
-        factory.setConnectTimeout(properties.getConnectTimeoutMs());
-        factory.setReadTimeout(properties.getReadTimeoutMs());
-        RestTemplate restTemplate = new RestTemplate(factory);
-        HttpHeaders headers = buildHeaders();
+        ThirdPartyFarmingHttpSupport.requireBaseUrl(properties, "第三方生产管理系统 base-url 未配置");
+        RestTemplate restTemplate = ThirdPartyFarmingHttpSupport.createRestTemplate(properties);
+        HttpHeaders headers = ThirdPartyFarmingHttpSupport.buildOpenApiHeaders(properties);
         List<OpenFarmDto> all = new ArrayList<>();
         int pageNum = 1;
         int pageSize = Math.min(Math.max(properties.getPageSize(), 1), 200);
         Long total = null;
         while (true)
         {
-            String url = UriComponentsBuilder.fromHttpUrl(trimTrailingSlash(properties.getBaseUrl()) + LIST_PATH)
+            String url = UriComponentsBuilder.fromHttpUrl(ThirdPartyFarmingHttpSupport.resolveUrl(properties, LIST_PATH))
                     .queryParam("pageNum", pageNum)
                     .queryParam("pageSize", pageSize)
                     .toUriString();
@@ -159,38 +149,4 @@ public class ThirdPartyFarmClientImpl implements ThirdPartyFarmClient
         return all;
     }
 
-    private HttpHeaders buildHeaders()
-    {
-        HttpHeaders headers = new HttpHeaders();
-        headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
-        if (StringUtils.hasText(properties.getAppKey()))
-        {
-            headers.set("X-App-Key", properties.getAppKey());
-        }
-        if (StringUtils.hasText(properties.getAppSecret()))
-        {
-            headers.set("X-App-Secret", properties.getAppSecret());
-        }
-        return headers;
-    }
-
-    private static String trimTrailingSlash(String baseUrl)
-    {
-        String url = baseUrl.trim();
-        while (url.endsWith("/"))
-        {
-            url = url.substring(0, url.length() - 1);
-        }
-        return url;
-    }
-
-    private static ObjectMapper createObjectMapper()
-    {
-        ObjectMapper mapper = new ObjectMapper();
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        df.setTimeZone(TimeZone.getTimeZone("GMT+8"));
-        mapper.setDateFormat(df);
-        mapper.findAndRegisterModules();
-        return mapper;
-    }
 }

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

@@ -0,0 +1,78 @@
+package com.ruoyi.web.modules.industryservice.support;
+
+import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.TimeZone;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.util.StringUtils;
+import org.springframework.web.client.RestTemplate;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ruoyi.common.exception.ServiceException;
+
+/**
+ * 第三方生产管理系统 HTTP 调用共用工具。
+ */
+public final class ThirdPartyFarmingHttpSupport
+{
+    private ThirdPartyFarmingHttpSupport()
+    {
+    }
+
+    public static void requireBaseUrl(ThirdPartyFarmingProperties properties, String hint)
+    {
+        if (!StringUtils.hasText(properties.getBaseUrl()))
+        {
+            throw new ServiceException(hint);
+        }
+    }
+
+    public static RestTemplate createRestTemplate(ThirdPartyFarmingProperties properties)
+    {
+        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
+        factory.setConnectTimeout(properties.getConnectTimeoutMs());
+        factory.setReadTimeout(properties.getReadTimeoutMs());
+        return new RestTemplate(factory);
+    }
+
+    public static HttpHeaders buildOpenApiHeaders(ThirdPartyFarmingProperties properties)
+    {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+        if (StringUtils.hasText(properties.getAppKey()))
+        {
+            headers.set("X-App-Key", properties.getAppKey());
+        }
+        if (StringUtils.hasText(properties.getAppSecret()))
+        {
+            headers.set("X-App-Secret", properties.getAppSecret());
+        }
+        return headers;
+    }
+
+    public static String resolveUrl(ThirdPartyFarmingProperties properties, String path)
+    {
+        return trimTrailingSlash(properties.getBaseUrl()) + path;
+    }
+
+    public static String trimTrailingSlash(String baseUrl)
+    {
+        String url = baseUrl.trim();
+        while (url.endsWith("/"))
+        {
+            url = url.substring(0, url.length() - 1);
+        }
+        return url;
+    }
+
+    public static ObjectMapper createObjectMapper()
+    {
+        ObjectMapper mapper = new ObjectMapper();
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        df.setTimeZone(TimeZone.getTimeZone("GMT+8"));
+        mapper.setDateFormat(df);
+        mapper.findAndRegisterModules();
+        return mapper;
+    }
+}

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

@@ -4,19 +4,19 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 /**
- * 第三方养殖场开放接口配置，前缀 {@code third-party.farm}。
+ * 第三方生产管理系统（牧场、牦牛资产等同源开放接口）共用连接配置。
  * <p>
- * 对接 {@code GET /open-api/v1/farming/farms}；http 模式需配置 baseUrl 与鉴权头。
+ * 前缀 {@code third-party.farming}；各业务客户端仅使用各自 API 路径，共享 baseUrl 与鉴权。
  * </p>
  */
 @Component
-@ConfigurationProperties(prefix = "third-party.farm")
-public class ThirdPartyFarmProperties
+@ConfigurationProperties(prefix = "third-party.farming")
+public class ThirdPartyFarmingProperties
 {
     /** 拉取模式：stub=classpath 样例 JSON，http=调用远程开放接口 */
     private String mode = "stub";
 
-    /** 是否允许执行同步；false 时调用方收到「第三方养殖场同步未启用」 */
+    /** 是否允许执行同步；false 时各同步接口收到「第三方…同步未启用」 */
     private boolean enabled = true;
 
     /** 第三方服务根地址（不含路径），如 https://api.example.com */

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

@@ -2,21 +2,16 @@ package com.ruoyi.web.modules.industryservice.support;
 
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.List;
-import java.util.TimeZone;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StreamUtils;
-import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -25,17 +20,19 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.web.modules.industryservice.domain.dto.YakDiseaseWarningDto;
 
 /**
- * 第三方预警客户端：stub 读取 classpath JSON；http 调用远程列表。
+ * 第三方牦牛疾病预警客户端：stub 读取 classpath JSON；http 调用同源开放接口。
  */
 @Component
 public class ThirdPartyYakAlertClientImpl implements ThirdPartyYakAlertClient
 {
     private static final String STUB_RESOURCE = "thirdparty/stub-yak-alerts.json";
 
-    private final ObjectMapper objectMapper = createObjectMapper();
+    private static final String LIST_PATH = "/open-api/v1/farming/yak-alerts";
+
+    private final ObjectMapper objectMapper = ThirdPartyFarmingHttpSupport.createObjectMapper();
 
     @Autowired
-    private ThirdPartyYakAlertProperties properties;
+    private ThirdPartyFarmingProperties properties;
 
     @Override
     public List<YakDiseaseWarningDto> fetchAlerts()
@@ -80,23 +77,13 @@ public class ThirdPartyYakAlertClientImpl implements ThirdPartyYakAlertClient
 
     private List<YakDiseaseWarningDto> fetchFromHttp()
     {
-        if (!StringUtils.hasText(properties.getBaseUrl()))
-        {
-            throw new ServiceException("第三方预警 base-url 未配置");
-        }
-        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
-        factory.setConnectTimeout(properties.getConnectTimeoutMs());
-        factory.setReadTimeout(properties.getReadTimeoutMs());
-        RestTemplate restTemplate = new RestTemplate(factory);
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        if (StringUtils.hasText(properties.getApiKey()))
-        {
-            headers.set("Authorization", "Bearer " + properties.getApiKey());
-        }
+        ThirdPartyFarmingHttpSupport.requireBaseUrl(properties, "第三方生产管理系统 base-url 未配置");
+        RestTemplate restTemplate = ThirdPartyFarmingHttpSupport.createRestTemplate(properties);
+        HttpHeaders headers = ThirdPartyFarmingHttpSupport.buildOpenApiHeaders(properties);
+        String url = ThirdPartyFarmingHttpSupport.resolveUrl(properties, LIST_PATH);
         try
         {
-            ResponseEntity<String> response = restTemplate.exchange(properties.getBaseUrl(), HttpMethod.GET,
+            ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.GET,
                     new HttpEntity<>(headers), String.class);
             if (!response.getStatusCode().is2xxSuccessful() || response.getBody() == null)
             {
@@ -119,14 +106,4 @@ public class ThirdPartyYakAlertClientImpl implements ThirdPartyYakAlertClient
             throw new ServiceException("解析第三方预警数据失败：" + e.getMessage());
         }
     }
-
-    private static ObjectMapper createObjectMapper()
-    {
-        ObjectMapper mapper = new ObjectMapper();
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        df.setTimeZone(TimeZone.getTimeZone("GMT+8"));
-        mapper.setDateFormat(df);
-        mapper.findAndRegisterModules();
-        return mapper;
-    }
 }

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

@@ -1,84 +0,0 @@
-package com.ruoyi.web.modules.industryservice.support;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * 第三方牦牛疾病预警配置 third-party.yak-alert.*
- */
-@Component
-@ConfigurationProperties(prefix = "third-party.yak-alert")
-public class ThirdPartyYakAlertProperties
-{
-    private String mode = "stub";
-
-    private boolean enabled = true;
-
-    private String baseUrl = "";
-
-    private String apiKey = "";
-
-    private int connectTimeoutMs = 15000;
-
-    private int readTimeoutMs = 60000;
-
-    public String getMode()
-    {
-        return mode;
-    }
-
-    public void setMode(String mode)
-    {
-        this.mode = mode;
-    }
-
-    public boolean isEnabled()
-    {
-        return enabled;
-    }
-
-    public void setEnabled(boolean enabled)
-    {
-        this.enabled = enabled;
-    }
-
-    public String getBaseUrl()
-    {
-        return baseUrl;
-    }
-
-    public void setBaseUrl(String baseUrl)
-    {
-        this.baseUrl = baseUrl;
-    }
-
-    public String getApiKey()
-    {
-        return apiKey;
-    }
-
-    public void setApiKey(String apiKey)
-    {
-        this.apiKey = apiKey;
-    }
-
-    public int getConnectTimeoutMs()
-    {
-        return connectTimeoutMs;
-    }
-
-    public void setConnectTimeoutMs(int connectTimeoutMs)
-    {
-        this.connectTimeoutMs = connectTimeoutMs;
-    }
-
-    public int getReadTimeoutMs()
-    {
-        return readTimeoutMs;
-    }
-
-    public void setReadTimeoutMs(int readTimeoutMs)
-    {
-        this.readTimeoutMs = readTimeoutMs;
-    }
-}

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

@@ -2,21 +2,16 @@ package com.ruoyi.web.modules.industryservice.support;
 
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.List;
-import java.util.TimeZone;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StreamUtils;
-import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -25,27 +20,20 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.web.modules.industryservice.domain.dto.YakAssetBundleDto;
 
 /**
- * 第三方客户端：stub 读取 classpath JSON；http 调用远程列表接口。
+ * 第三方牦牛资产客户端：stub 读取 classpath JSON；http 调用同源开放接口。
  */
 @Component
 public class ThirdPartyYakClientImpl implements ThirdPartyYakClient
 {
     private static final String STUB_RESOURCE = "thirdparty/stub-yak-bundles.json";
 
-    private final ObjectMapper objectMapper = createObjectMapper();
+    /** 入栏建档列表（与牧场接口同平台，路径以 Apifox 文档为准） */
+    private static final String LIST_PATH = "/open-api/v1/farming/entry-filings";
 
-    private static ObjectMapper createObjectMapper()
-    {
-        ObjectMapper mapper = new ObjectMapper();
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        df.setTimeZone(TimeZone.getTimeZone("GMT+8"));
-        mapper.setDateFormat(df);
-        mapper.findAndRegisterModules();
-        return mapper;
-    }
+    private final ObjectMapper objectMapper = ThirdPartyFarmingHttpSupport.createObjectMapper();
 
     @Autowired
-    private ThirdPartyYakProperties properties;
+    private ThirdPartyFarmingProperties properties;
 
     @Override
     public List<YakAssetBundleDto> fetchAll()
@@ -86,24 +74,14 @@ public class ThirdPartyYakClientImpl implements ThirdPartyYakClient
 
     private List<YakAssetBundleDto> fetchFromHttp()
     {
-        if (!StringUtils.hasText(properties.getBaseUrl()))
-        {
-            throw new ServiceException("第三方接口地址未配置");
-        }
-        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
-        factory.setConnectTimeout(properties.getConnectTimeoutMs());
-        factory.setReadTimeout(properties.getReadTimeoutMs());
-        RestTemplate restTemplate = new RestTemplate(factory);
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        if (StringUtils.hasText(properties.getApiKey()))
-        {
-            headers.set("Authorization", "Bearer " + properties.getApiKey());
-        }
+        ThirdPartyFarmingHttpSupport.requireBaseUrl(properties, "第三方生产管理系统 base-url 未配置");
+        RestTemplate restTemplate = ThirdPartyFarmingHttpSupport.createRestTemplate(properties);
+        HttpHeaders headers = ThirdPartyFarmingHttpSupport.buildOpenApiHeaders(properties);
+        String url = ThirdPartyFarmingHttpSupport.resolveUrl(properties, LIST_PATH);
         try
         {
             ResponseEntity<String> response = restTemplate.exchange(
-                    properties.getBaseUrl(),
+                    url,
                     HttpMethod.GET,
                     new HttpEntity<>(headers),
                     String.class);

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

@@ -1,85 +0,0 @@
-package com.ruoyi.web.modules.industryservice.support;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * 第三方牦牛生产系统配置 third-party.yak.*
- */
-@Component
-@ConfigurationProperties(prefix = "third-party.yak")
-public class ThirdPartyYakProperties
-{
-    /** stub：本地样例；http：调用远程接口 */
-    private String mode = "stub";
-
-    private boolean enabled = true;
-
-    private String baseUrl = "";
-
-    private String apiKey = "";
-
-    private int connectTimeoutMs = 15000;
-
-    private int readTimeoutMs = 120000;
-
-    public String getMode()
-    {
-        return mode;
-    }
-
-    public void setMode(String mode)
-    {
-        this.mode = mode;
-    }
-
-    public boolean isEnabled()
-    {
-        return enabled;
-    }
-
-    public void setEnabled(boolean enabled)
-    {
-        this.enabled = enabled;
-    }
-
-    public String getBaseUrl()
-    {
-        return baseUrl;
-    }
-
-    public void setBaseUrl(String baseUrl)
-    {
-        this.baseUrl = baseUrl;
-    }
-
-    public String getApiKey()
-    {
-        return apiKey;
-    }
-
-    public void setApiKey(String apiKey)
-    {
-        this.apiKey = apiKey;
-    }
-
-    public int getConnectTimeoutMs()
-    {
-        return connectTimeoutMs;
-    }
-
-    public void setConnectTimeoutMs(int connectTimeoutMs)
-    {
-        this.connectTimeoutMs = connectTimeoutMs;
-    }
-
-    public int getReadTimeoutMs()
-    {
-        return readTimeoutMs;
-    }
-
-    public void setReadTimeoutMs(int readTimeoutMs)
-    {
-        this.readTimeoutMs = readTimeoutMs;
-    }
-}

baqing-admin/src/main/resources/application.yml

@@ -45,28 +45,14 @@ bigscreen:
     read-timeout-ms: 15000
     cache-ttl-minutes: 5
 
-# 第三方牦牛生产系统（档案同步）
+# 第三方生产管理系统（牧场、牦牛资产、疾病预警等同源开放接口）
 third-party:
-  yak:
+  farming:
     enabled: true
-    mode: stub
-    base-url: ""
-    api-key: ""
-    connect-timeout-ms: 15000
-    read-timeout-ms: 120000
-  yak-alert:
-    enabled: true
-    mode: stub
-    base-url: ""
-    api-key: ""
-    connect-timeout-ms: 15000
-    read-timeout-ms: 60000
-  farm:
-    enabled: true
-    mode: stub
-    base-url: ""
-    app-key: ""
-    app-secret: ""
+    mode: http
+    base-url: "http://117.180.211.11/api"
+    app-key: "farm-open-b0f2076e3f04f10da"
+    app-secret: "84df79f4d75b6afc89738872b3e41625330b052dcfcf2bc421450df0290a67e0"
     connect-timeout-ms: 15000
     read-timeout-ms: 120000
     page-size: 200

doc/产业数据模型及服务/牦牛疾病预警/牦牛疾病预警技术方案.md

@@ -209,7 +209,7 @@ WHERE alert_time >= ? AND alert_time < ?
 
 | 项 | 说明 |
 | --- | --- |
-| 配置键 | `third-party.yak-alert.base-url`、`api-key`、`connect-timeout`、`read-timeout`（可与资产共用 `third-party.yak` 节点） |
+| 配置键 | `third-party.farming`（与牧场、牦牛资产同源：`base-url`、`app-key`、`app-secret`、超时） |
 | 客户端 | `ThirdPartyYakAlertClient.fetchAlerts()` → `List<YakDiseaseWarningDTO>` |
 | 映射 | 第三方牧场编码 → `biz_pasture.id`；失败仅写 `pasture_name` |
 | 合并 | `INSERT ... ON DUPLICATE KEY UPDATE` 或先 `selectByExternalId` 再 insert/update |

doc/产业数据模型及服务/牧业金融生物资产管理/牦牛资产档案管理功能需求-草稿.md

@@ -4,7 +4,7 @@
 
 1. 查询牦牛资产档案列表：支持牦牛编号模糊匹配、资产状态分页列出牦牛资产档案列表，列表字段包括：牦牛编号、所属牧场、性别、月龄（月）、实时体温、实时运动量、资产状态、变更日期。
 3. 资产状态：正常/死淘/丢失/出栏。
-4. 牦牛资产档案数据可能对接第三方的生产管理系统，所以现有指标不是最终对接的指标。
+4. 牦牛资产档案数据对接第三方的生产管理系统，接口地址：https://s.apifox.cn/f94a7c39-05e1-4fff-996e-2dc0453d57f6/%E6%9F%A5%E8%AF%A2%E5%85%A5%E6%A0%8F%E5%BB%BA%E6%A1%A3%E5%88%97%E8%A1%A8-471164137e0；字段参考：20260611111807_455_398.jpg。
 4. 点击“同步”按钮可以从第三方拉取牦牛资产档案信息。
 5. 查看牦牛资产档案:包括基础信息、系谱信息、个体生理、生长性状、繁殖性能、饲喂数据。
 6. 基础数据：牦牛编号、所属牧场、批次编号、性别（公/母）、出生日期（YYYY-MM-DD ）、月龄（单位为月）、入栏日期（YYYY-MM-DD ）、入栏体重（单位为kg）、来源（自繁/外购/引进）、养殖方式（半舍饲/散养/圈养）、资产状态、状态变更原因、圈舍位置、预计出栏日期、补饲方案。

doc/产业数据模型及服务/牧业金融生物资产管理/牦牛资产档案管理技术方案.md

@@ -253,7 +253,7 @@ CREATE TABLE `biz_yak_asset` (
 
 | 项 | 说明 |
 | --- | --- |
-| 配置 | `application.yml`：`third-party.yak.base-url`、`api-key`、超时 |
+| 配置 | `application.yml`：`third-party.farming`（与牧场管理同源：`base-url`、`app-key`、`app-secret`、超时） |
 | 客户端 | `ThirdPartyYakClient.fetchAll()` → `List<YakAssetBundleDTO>`（主表+子表） |
 | 映射 | `YakAssetStatusMapper`：第三方状态码 → `asset_status` |
 | 牧场 | 第三方牧场编码 → `biz_pasture`；失败则仅写 `pasture_name` |

doc/产业数据模型及服务/牧场管理/牧场管理技术方案.md

@@ -25,7 +25,7 @@
 | 列表/详情 | `del_flag=0`；排序 `create_time DESC, id DESC`；可按角色脱敏手机 |
 | 并发 | `AtomicBoolean` 防重入；重复同步抛「正在同步，请稍候」 |
 
-**配置**（`application.yml` → `third-party.farm`）
+**配置**（`application.yml` → `third-party.farming`，与牦牛资产等同源）
 
 | 键 | 说明 |
 | --- | --- |
@@ -129,7 +129,7 @@
 - [x] `sql/biz_pasture.sql`、`sql/biz_pasture_sync_alter.sql`
 - [x] `BizPasture` Domain / Mapper / Service / Controller
 - [x] `ThirdPartyFarmClient`、`PastureSyncService`、`PastureSyncTxService`
-- [x] `thirdparty/stub-farms.json`、`third-party.farm` 配置
+- [x] `thirdparty/stub-farms.json`、`third-party.farming` 配置
 - [x] 单元测试 / MockMvc（列表、详情、同步）
 
 ---

doc/产业数据模型及服务/牧场管理/牧场管理管理测试用例.md

@@ -3,7 +3,7 @@
 > 依据：`牧场管理功能需求.md`、`牧场管理技术方案.md`  
 > **接口 Base Path**：`/dataModel/pasture`；鉴权与若依一致（Cookie / Token）。
 
-**通用前置**：具备本模块菜单与按钮权限的账号已登录；开发环境 `third-party.farm.mode=stub` 可使用 classpath 样例数据。**牧场性质**：`1` 个体、`2` 企业。
+**通用前置**：具备本模块菜单与按钮权限的账号已登录；开发环境 `third-party.farming.mode=stub` 可使用 classpath 样例数据。**牧场类型**：`1` 个体、`2` 企业。
 
 **界面（UI）测试**：**Playwright** + **Chromium**。