数字畜牧一张图

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/domain/BizYakAsset.java

@@ -17,16 +17,53 @@ public class BizYakAsset extends BaseEntity
     /** 第三方牛只唯一 ID（OpenYakEntryDto.cattleId） */
     private Long externalId;
 
+    /** 场内牛只编号（OpenYakEntryDto.cattleNo） */
     private String yakNo;
 
+    /** 耳标编号（OpenYakEntryDto.earTagNumber） */
+    private String earTagNumber;
+
     private Long pastureId;
 
     private String pastureName;
 
+    /** 第三方养殖场 ID（OpenYakEntryDto.farmId） */
+    private Long farmExternalId;
+
+    /** 第三方圈舍 ID（OpenYakEntryDto.farmEnclosureId） */
+    private Long enclosureExternalId;
+
+    /** 本地圈舍 ID（biz_farm_enclosure.id） */
+    private Long enclosureId;
+
+    /** 圈舍名称（OpenYakEntryDto.farmEnclosureName） */
+    private String enclosureName;
+
     private String batchNo;
 
+    /** 第三方养殖批次 ID（OpenYakEntryDto.batchId） */
+    private Long batchExternalId;
+
+    /** 本地养殖批次 ID（biz_farming_batch.id） */
+    private Long batchId;
+
+    /** 入栏周期（OpenYakEntryDto.entryCycle） */
+    private String entryCycle;
+
     private String gender;
 
+    /** 牛只品种（OpenYakEntryDto.cattleVariety） */
+    private String cattleVariety;
+
+    /** 牛只图片 URL（OpenYakEntryDto.cattlePicture） */
+    private String cattlePicture;
+
+    /** 登记人（OpenYakEntryDto.registrant） */
+    private String registrant;
+
+    /** 备注（OpenYakEntryDto.remark） */
+    private String remark;
+
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date birthDate;
 
@@ -108,6 +145,16 @@ public class BizYakAsset extends BaseEntity
         this.yakNo = yakNo;
     }
 
+    public String getEarTagNumber()
+    {
+        return earTagNumber;
+    }
+
+    public void setEarTagNumber(String earTagNumber)
+    {
+        this.earTagNumber = earTagNumber;
+    }
+
     public Long getPastureId()
     {
         return pastureId;
@@ -128,6 +175,46 @@ public class BizYakAsset extends BaseEntity
         this.pastureName = pastureName;
     }
 
+    public Long getFarmExternalId()
+    {
+        return farmExternalId;
+    }
+
+    public void setFarmExternalId(Long farmExternalId)
+    {
+        this.farmExternalId = farmExternalId;
+    }
+
+    public Long getEnclosureExternalId()
+    {
+        return enclosureExternalId;
+    }
+
+    public void setEnclosureExternalId(Long enclosureExternalId)
+    {
+        this.enclosureExternalId = enclosureExternalId;
+    }
+
+    public Long getEnclosureId()
+    {
+        return enclosureId;
+    }
+
+    public void setEnclosureId(Long enclosureId)
+    {
+        this.enclosureId = enclosureId;
+    }
+
+    public String getEnclosureName()
+    {
+        return enclosureName;
+    }
+
+    public void setEnclosureName(String enclosureName)
+    {
+        this.enclosureName = enclosureName;
+    }
+
     public String getBatchNo()
     {
         return batchNo;
@@ -138,6 +225,36 @@ public class BizYakAsset extends BaseEntity
         this.batchNo = batchNo;
     }
 
+    public Long getBatchExternalId()
+    {
+        return batchExternalId;
+    }
+
+    public void setBatchExternalId(Long batchExternalId)
+    {
+        this.batchExternalId = batchExternalId;
+    }
+
+    public Long getBatchId()
+    {
+        return batchId;
+    }
+
+    public void setBatchId(Long batchId)
+    {
+        this.batchId = batchId;
+    }
+
+    public String getEntryCycle()
+    {
+        return entryCycle;
+    }
+
+    public void setEntryCycle(String entryCycle)
+    {
+        this.entryCycle = entryCycle;
+    }
+
     public String getGender()
     {
         return gender;
@@ -148,6 +265,46 @@ public class BizYakAsset extends BaseEntity
         this.gender = gender;
     }
 
+    public String getCattleVariety()
+    {
+        return cattleVariety;
+    }
+
+    public void setCattleVariety(String cattleVariety)
+    {
+        this.cattleVariety = cattleVariety;
+    }
+
+    public String getCattlePicture()
+    {
+        return cattlePicture;
+    }
+
+    public void setCattlePicture(String cattlePicture)
+    {
+        this.cattlePicture = cattlePicture;
+    }
+
+    public String getRegistrant()
+    {
+        return registrant;
+    }
+
+    public void setRegistrant(String registrant)
+    {
+        this.registrant = registrant;
+    }
+
+    public String getRemark()
+    {
+        return remark;
+    }
+
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
+    }
+
     public Date getBirthDate()
     {
         return birthDate;

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/domain/dto/OpenYakEntryDto.java

@@ -20,16 +20,16 @@ public class OpenYakEntryDto
     /** 农场名称，落库 pasture_name */
     private String farmName;
 
-    /** 所属圈舍 ID */
+    /** 所属圈舍 ID，落库 enclosure_external_id */
     private Long farmEnclosureId;
 
-    /** 圈舍名称，落库 pen_location */
+    /** 圈舍名称，落库 enclosure_name */
     private String farmEnclosureName;
 
-    /** 所属养殖批次 ID */
+    /** 所属养殖批次 ID，落库 batch_external_id */
     private Long batchId;
 
-    /** 入栏批次周期，落库 batch_no（优先于 batchId） */
+    /** 入栏批次周期，落库 entry_cycle */
     private String entryCycle;
 
     /** 农场地理位置，落库 location */
@@ -38,10 +38,10 @@ public class OpenYakEntryDto
     /** 牛只唯一 ID，落库 external_id */
     private Long cattleId;
 
-    /** 场内牛只编号 */
+    /** 场内牛只编号，落库 yak_no */
     private String cattleNo;
 
-    /** 耳标编号（溯源标识），落库 yak_no（优先于 cattleNo） */
+    /** 耳标编号（溯源标识），落库 ear_tag_number */
     private String earTagNumber;
 
     /** 牛只品种 */
@@ -62,10 +62,10 @@ public class OpenYakEntryDto
     /** 当前体重，落库 entry_weight_kg */
     private Double weight;
 
-    /** 牛只照片 URL（本期不落库） */
+    /** 牛只照片 URL，落库 cattle_picture */
     private String cattlePicture;
 
-    /** 档案登记人（本期不落库） */
+    /** 档案登记人，落库 registrant */
     private String registrant;
 
     /** 入栏时间，落库 entry_date */
@@ -77,7 +77,7 @@ public class OpenYakEntryDto
     /** 档案创建时间 */
     private String createTime;
 
-    /** 备注，落库 status_change_reason */
+    /** 备注，落库 remark */
     private String remark;
 
     public Long getId()

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/mapper/BizYakAssetMapper.java

@@ -9,6 +9,8 @@ public interface BizYakAssetMapper
 
     BizYakAsset selectBizYakAssetByYakNo(String yakNo);
 
+    BizYakAsset selectBizYakAssetByEarTagNumber(String earTagNumber);
+
     BizYakAsset selectBizYakAssetByExternalId(Long externalId);
 
     List<BizYakAsset> selectBizYakAssetList(BizYakAsset query);

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

@@ -8,6 +8,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.web.modules.industryservice.domain.BizFarmingBatch;
 import com.ruoyi.web.modules.industryservice.domain.BizPasture;
 import com.ruoyi.web.modules.industryservice.domain.BizYakAsset;
 import com.ruoyi.web.modules.industryservice.domain.BizYakFeedingRecord;
@@ -16,12 +17,15 @@ import com.ruoyi.web.modules.industryservice.domain.BizYakPhysioSeries;
 import com.ruoyi.web.modules.industryservice.domain.BizYakReproductionRecord;
 import com.ruoyi.web.modules.industryservice.domain.dto.YakAssetBundleDto;
 import com.ruoyi.web.modules.industryservice.mapper.BizPastureMapper;
+import com.ruoyi.web.modules.industryservice.mapper.BizFarmEnclosureMapper;
+import com.ruoyi.web.modules.industryservice.mapper.BizFarmingBatchMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakAssetMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakFeedingRecordMapper;
 import com.ruoyi.web.modules.industryservice.support.YakAssetStatusMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakGrowthRecordMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakPhysioSeriesMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakReproductionRecordMapper;
+import com.ruoyi.web.modules.industryservice.support.FarmingSyncSupport;
 import com.ruoyi.web.modules.industryservice.support.YakAssetRules;
 import com.ruoyi.web.modules.industryservice.support.YakAssetValidation;
 
@@ -56,6 +60,12 @@ public class YakAssetBundleSyncTxService
     @Autowired
     private BizPastureMapper bizPastureMapper;
 
+    @Autowired
+    private BizFarmEnclosureMapper bizFarmEnclosureMapper;
+
+    @Autowired
+    private BizFarmingBatchMapper bizFarmingBatchMapper;
+
     @Autowired
     private BizYakPhysioSeriesMapper physioSeriesMapper;
 
@@ -96,6 +106,8 @@ public class YakAssetBundleSyncTxService
             YakAssetValidation.validateAssetStatus(incoming.getAssetStatus());
         }
         resolvePasture(incoming, bundle);
+        resolveEnclosure(incoming);
+        resolveBatch(incoming);
         if (incoming.getBirthDate() != null)
         {
             incoming.setAgeMonths(YakAssetValidation.resolveAgeMonths(incoming.getBirthDate(), syncTime));
@@ -172,6 +184,35 @@ public class YakAssetBundleSyncTxService
         }
     }
 
+    private void resolveEnclosure(BizYakAsset incoming)
+    {
+        Long enclosureId = FarmingSyncSupport.resolveEnclosureId(
+                bizFarmEnclosureMapper, incoming.getEnclosureExternalId());
+        incoming.setEnclosureId(enclosureId);
+    }
+
+    private void resolveBatch(BizYakAsset incoming)
+    {
+        if (incoming.getBatchExternalId() == null)
+        {
+            incoming.setBatchId(null);
+            incoming.setBatchNo(null);
+            return;
+        }
+        BizFarmingBatch batch = bizFarmingBatchMapper.selectBizFarmingBatchByExternalId(
+                incoming.getBatchExternalId());
+        if (batch != null)
+        {
+            incoming.setBatchId(batch.getId());
+            incoming.setBatchNo(batch.getBatchNo());
+        }
+        else
+        {
+            incoming.setBatchId(null);
+            incoming.setBatchNo(null);
+        }
+    }
+
     /**
      * 子表「按需覆盖」：列表为 null 跳过；非 null 则 delete + batchInsert。
      */

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

@@ -102,7 +102,8 @@ public final class FarmingSyncSupport
      * 解析本地牦牛资产主键，供 IoT 数据关联。
      * <p>
      * 优先按第三方 {@code cattleId} 匹配 {@code biz_yak_asset.external_id}；
-     * 其次按耳标/牛只编号匹配 {@code yak_no}（earTagNumber 优先于 cattleNo）。
+     * 其次按 {@code earTagNumber} 匹配 {@code ear_tag_number}；
+     * 再次按 {@code cattleNo} 匹配 {@code yak_no}。
      * </p>
      *
      * @return {@code biz_yak_asset.id}，未匹配则 null
@@ -122,10 +123,17 @@ public final class FarmingSyncSupport
                 return byExternal.getId();
             }
         }
-        String yakNo = firstNonBlank(earTagNumber, cattleNo);
-        if (StringUtils.isNotEmpty(yakNo))
+        if (StringUtils.isNotEmpty(earTagNumber))
         {
-            BizYakAsset byYakNo = yakAssetMapper.selectBizYakAssetByYakNo(yakNo.trim());
+            BizYakAsset byEarTag = yakAssetMapper.selectBizYakAssetByEarTagNumber(earTagNumber.trim());
+            if (byEarTag != null)
+            {
+                return byEarTag.getId();
+            }
+        }
+        if (StringUtils.isNotEmpty(cattleNo))
+        {
+            BizYakAsset byYakNo = yakAssetMapper.selectBizYakAssetByYakNo(cattleNo.trim());
             return byYakNo != null ? byYakNo.getId() : null;
         }
         return null;

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

@@ -22,19 +22,25 @@ import com.ruoyi.web.modules.industryservice.domain.dto.YakAssetBundleDto;
  *
  * <h3>主表字段映射（OpenYakEntryDto → BizYakAsset）</h3>
  * <ul>
- *   <li>cattleId / id → externalId</li>
- *   <li>earTagNumber（优先）/ cattleNo → yakNo</li>
- *   <li>farmId → thirdPartyPastureCode（字符串，供 pasture_id 解析）</li>
+ *   <li>cattleId → externalId</li>
+ *   <li>cattleNo → yakNo</li>
+ *   <li>earTagNumber → earTagNumber</li>
+ *   <li>farmId → farmExternalId（并供 pasture_id 解析）</li>
  *   <li>farmName → pastureName</li>
- *   <li>entryCycle（优先）/ batchId → batchNo</li>
- *   <li>farmEnclosureName → penLocation</li>
+ *   <li>farmEnclosureId → enclosureExternalId</li>
+ *   <li>farmEnclosureName → enclosureName / penLocation</li>
+ *   <li>batchId → batchExternalId</li>
+ *   <li>entryCycle → entryCycle</li>
  *   <li>farmLocation → location</li>
  *   <li>cattleSex → gender（规范为 公/母）</li>
  *   <li>cattleSource → source</li>
+ *   <li>cattleVariety → cattleVariety</li>
+ *   <li>cattlePicture → cattlePicture</li>
+ *   <li>registrant → registrant</li>
  *   <li>weight → entryWeightKg</li>
  *   <li>entryTime / birthDate → entryDate / birthDate</li>
  *   <li>fatherNumber / motherNumber → fatherYakNo / motherYakNo</li>
- *   <li>remark → statusChangeReason</li>
+ *   <li>remark → remark</li>
  * </ul>
  */
 public final class YakEntryOpenApiMapper
@@ -59,33 +65,37 @@ public final class YakEntryOpenApiMapper
         {
             throw new ServiceException("同步数据无效");
         }
-        String yakNo = resolveYakNo(dto);
-        if (StringUtils.isEmpty(yakNo))
-        {
-            throw new ServiceException("牦牛编号不能为空");
-        }
-        // external_id：优先 cattleId，其次档案 id
-        Long externalId = dto.getCattleId() != null ? dto.getCattleId() : dto.getId();
-        if (externalId == null)
+        if (dto.getCattleId() == null)
         {
             throw new ServiceException("第三方牛只 ID 不能为空");
         }
+        String yakNo = resolveYakNo(dto);
+        YakAssetValidation.validateYakNoForSync(yakNo);
 
         BizYakAsset asset = new BizYakAsset();
-        asset.setExternalId(externalId);
+        asset.setExternalId(dto.getCattleId());
         asset.setYakNo(yakNo);
+        asset.setEarTagNumber(trimToNull(dto.getEarTagNumber()));
+        asset.setFarmExternalId(dto.getFarmId());
         asset.setPastureName(trimToNull(dto.getFarmName()));
-        asset.setBatchNo(resolveBatchNo(dto));
+        asset.setEnclosureExternalId(dto.getFarmEnclosureId());
+        String enclosureName = trimToNull(dto.getFarmEnclosureName());
+        asset.setEnclosureName(enclosureName);
+        asset.setPenLocation(enclosureName);
+        asset.setBatchExternalId(dto.getBatchId());
+        asset.setEntryCycle(trimToNull(dto.getEntryCycle()));
         asset.setGender(normalizeGender(dto.getCattleSex()));
+        asset.setCattleVariety(trimToNull(dto.getCattleVariety()));
+        asset.setCattlePicture(trimToNull(dto.getCattlePicture()));
+        asset.setRegistrant(trimToNull(dto.getRegistrant()));
         asset.setBirthDate(parseDate(dto.getBirthDate()));
         asset.setEntryDate(parseDate(dto.getEntryTime()));
         asset.setEntryWeightKg(toBigDecimal(dto.getWeight()));
         asset.setSource(trimToNull(dto.getCattleSource()));
-        asset.setPenLocation(trimToNull(dto.getFarmEnclosureName()));
         asset.setLocation(trimToNull(dto.getFarmLocation()));
         asset.setFatherYakNo(trimToNull(dto.getFatherNumber()));
         asset.setMotherYakNo(trimToNull(dto.getMotherNumber()));
-        asset.setStatusChangeReason(trimToNull(dto.getRemark()));
+        asset.setRemark(trimToNull(dto.getRemark()));
         asset.setAssetStatus(YakAssetRules.ASSET_STATUS_MIN);
 
         YakAssetBundleDto bundle = new YakAssetBundleDto();
@@ -97,13 +107,9 @@ public final class YakEntryOpenApiMapper
         return bundle;
     }
 
-    /** 耳标号优先，其次牛只编号 */
+    /** 场内牛只编号 cattleNo */
     private static String resolveYakNo(OpenYakEntryDto dto)
     {
-        if (StringUtils.isNotEmpty(dto.getEarTagNumber()))
-        {
-            return dto.getEarTagNumber().trim();
-        }
         if (StringUtils.isNotEmpty(dto.getCattleNo()))
         {
             return dto.getCattleNo().trim();
@@ -111,20 +117,6 @@ public final class YakEntryOpenApiMapper
         return null;
     }
 
-    /** 入栏周期优先，其次 batchId 转字符串 */
-    private static String resolveBatchNo(OpenYakEntryDto dto)
-    {
-        if (StringUtils.isNotEmpty(dto.getEntryCycle()))
-        {
-            return dto.getEntryCycle().trim();
-        }
-        if (dto.getBatchId() != null)
-        {
-            return String.valueOf(dto.getBatchId());
-        }
-        return null;
-    }
-
     private static String normalizeGender(String cattleSex)
     {
         if (StringUtils.isEmpty(cattleSex))

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

@@ -3,44 +3,60 @@
 <mapper namespace="com.ruoyi.web.modules.industryservice.mapper.BizYakAssetMapper">
 
     <resultMap type="com.ruoyi.web.modules.industryservice.domain.BizYakAsset" id="BizYakAssetResult">
-        <id     property="id"                 column="id"/>
-        <result property="externalId"         column="external_id"/>
-        <result property="yakNo"              column="yak_no"/>
-        <result property="pastureId"          column="pasture_id"/>
-        <result property="pastureName"        column="pasture_name"/>
-        <result property="batchNo"            column="batch_no"/>
-        <result property="gender"             column="gender"/>
-        <result property="birthDate"          column="birth_date"/>
-        <result property="ageMonths"          column="age_months"/>
-        <result property="entryDate"          column="entry_date"/>
-        <result property="entryWeightKg"      column="entry_weight_kg"/>
-        <result property="source"             column="source"/>
-        <result property="breedingMethod"     column="breeding_method"/>
-        <result property="assetStatus"        column="asset_status"/>
-        <result property="statusChangeDate"   column="status_change_date"/>
-        <result property="statusChangeReason" column="status_change_reason"/>
-        <result property="penLocation"        column="pen_location"/>
-        <result property="expectedOutDate"    column="expected_out_date"/>
-        <result property="supplementPlan"     column="supplement_plan"/>
-        <result property="realtimeTemp"       column="realtime_temp"/>
-        <result property="realtimeSteps"      column="realtime_steps"/>
-        <result property="envTemp"            column="env_temp"/>
-        <result property="location"           column="location"/>
-        <result property="physioCollectTime"  column="physio_collect_time"/>
-        <result property="fatherYakNo"        column="father_yak_no"/>
-        <result property="motherYakNo"        column="mother_yak_no"/>
-        <result property="lastSyncTime"       column="last_sync_time"/>
-        <result property="delFlag"            column="del_flag"/>
-        <result property="createTime"         column="create_time"/>
-        <result property="updateTime"         column="update_time"/>
+        <id     property="id"                   column="id"/>
+        <result property="externalId"           column="external_id"/>
+        <result property="yakNo"                column="yak_no"/>
+        <result property="earTagNumber"         column="ear_tag_number"/>
+        <result property="pastureId"            column="pasture_id"/>
+        <result property="pastureName"          column="pasture_name"/>
+        <result property="farmExternalId"       column="farm_external_id"/>
+        <result property="enclosureExternalId"  column="enclosure_external_id"/>
+        <result property="enclosureId"          column="enclosure_id"/>
+        <result property="enclosureName"        column="enclosure_name"/>
+        <result property="batchNo"              column="batch_no"/>
+        <result property="batchExternalId"        column="batch_external_id"/>
+        <result property="batchId"              column="batch_id"/>
+        <result property="entryCycle"           column="entry_cycle"/>
+        <result property="gender"               column="gender"/>
+        <result property="cattleVariety"        column="cattle_variety"/>
+        <result property="cattlePicture"        column="cattle_picture"/>
+        <result property="registrant"           column="registrant"/>
+        <result property="remark"               column="remark"/>
+        <result property="birthDate"            column="birth_date"/>
+        <result property="ageMonths"            column="age_months"/>
+        <result property="entryDate"            column="entry_date"/>
+        <result property="entryWeightKg"        column="entry_weight_kg"/>
+        <result property="source"               column="source"/>
+        <result property="breedingMethod"       column="breeding_method"/>
+        <result property="assetStatus"          column="asset_status"/>
+        <result property="statusChangeDate"     column="status_change_date"/>
+        <result property="statusChangeReason"   column="status_change_reason"/>
+        <result property="penLocation"          column="pen_location"/>
+        <result property="expectedOutDate"      column="expected_out_date"/>
+        <result property="supplementPlan"       column="supplement_plan"/>
+        <result property="realtimeTemp"         column="realtime_temp"/>
+        <result property="realtimeSteps"        column="realtime_steps"/>
+        <result property="envTemp"              column="env_temp"/>
+        <result property="location"             column="location"/>
+        <result property="physioCollectTime"    column="physio_collect_time"/>
+        <result property="fatherYakNo"          column="father_yak_no"/>
+        <result property="motherYakNo"          column="mother_yak_no"/>
+        <result property="lastSyncTime"         column="last_sync_time"/>
+        <result property="delFlag"              column="del_flag"/>
+        <result property="createTime"           column="create_time"/>
+        <result property="updateTime"           column="update_time"/>
     </resultMap>
 
     <sql id="selectVo">
-        select id, external_id, yak_no, pasture_id, pasture_name, batch_no, gender, birth_date, age_months,
-               entry_date, entry_weight_kg, source, breeding_method, asset_status, status_change_date,
-               status_change_reason, pen_location, expected_out_date, supplement_plan,
-               realtime_temp, realtime_steps, env_temp, location, physio_collect_time,
-               father_yak_no, mother_yak_no, last_sync_time, del_flag, create_time, update_time
+        select id, external_id, yak_no, ear_tag_number, pasture_id, pasture_name,
+               farm_external_id, enclosure_external_id, enclosure_id, enclosure_name,
+               batch_no, batch_external_id, batch_id, entry_cycle,
+               gender, cattle_variety, cattle_picture, registrant, remark,
+               birth_date, age_months, entry_date, entry_weight_kg, source, breeding_method,
+               asset_status, status_change_date, status_change_reason, pen_location,
+               expected_out_date, supplement_plan, realtime_temp, realtime_steps, env_temp,
+               location, physio_collect_time, father_yak_no, mother_yak_no,
+               last_sync_time, del_flag, create_time, update_time
         from biz_yak_asset
     </sql>
 
@@ -54,6 +70,11 @@
         where yak_no = #{yakNo} and del_flag = '0'
     </select>
 
+    <select id="selectBizYakAssetByEarTagNumber" parameterType="string" resultMap="BizYakAssetResult">
+        <include refid="selectVo"/>
+        where ear_tag_number = #{earTagNumber} and del_flag = '0'
+    </select>
+
     <select id="selectBizYakAssetByExternalId" parameterType="long" resultMap="BizYakAssetResult">
         <include refid="selectVo"/>
         where external_id = #{externalId} and del_flag = '0'
@@ -64,7 +85,8 @@
         <where>
             del_flag = '0'
             <if test="keyword != null and keyword != ''">
-                and yak_no like concat('%', #{keyword}, '%')
+                and (yak_no like concat('%', #{keyword}, '%')
+                  or ear_tag_number like concat('%', #{keyword}, '%'))
             </if>
             <if test="assetStatus != null">
                 and asset_status = #{assetStatus}
@@ -75,17 +97,25 @@
 
     <insert id="insertBizYakAsset" parameterType="com.ruoyi.web.modules.industryservice.domain.BizYakAsset" useGeneratedKeys="true" keyProperty="id">
         insert into biz_yak_asset (
-            external_id, yak_no, pasture_id, pasture_name, batch_no, gender, birth_date, age_months,
-            entry_date, entry_weight_kg, source, breeding_method, asset_status, status_change_date,
-            status_change_reason, pen_location, expected_out_date, supplement_plan,
-            realtime_temp, realtime_steps, env_temp, location, physio_collect_time,
-            father_yak_no, mother_yak_no, last_sync_time, del_flag, create_time
+            external_id, yak_no, ear_tag_number, pasture_id, pasture_name,
+            farm_external_id, enclosure_external_id, enclosure_id, enclosure_name,
+            batch_no, batch_external_id, batch_id, entry_cycle,
+            gender, cattle_variety, cattle_picture, registrant, remark,
+            birth_date, age_months, entry_date, entry_weight_kg, source, breeding_method,
+            asset_status, status_change_date, status_change_reason, pen_location,
+            expected_out_date, supplement_plan, realtime_temp, realtime_steps, env_temp,
+            location, physio_collect_time, father_yak_no, mother_yak_no,
+            last_sync_time, del_flag, create_time
         ) values (
-            #{externalId}, #{yakNo}, #{pastureId}, #{pastureName}, #{batchNo}, #{gender}, #{birthDate}, #{ageMonths},
-            #{entryDate}, #{entryWeightKg}, #{source}, #{breedingMethod}, #{assetStatus}, #{statusChangeDate},
-            #{statusChangeReason}, #{penLocation}, #{expectedOutDate}, #{supplementPlan},
-            #{realtimeTemp}, #{realtimeSteps}, #{envTemp}, #{location}, #{physioCollectTime},
-            #{fatherYakNo}, #{motherYakNo}, #{lastSyncTime}, #{delFlag}, sysdate()
+            #{externalId}, #{yakNo}, #{earTagNumber}, #{pastureId}, #{pastureName},
+            #{farmExternalId}, #{enclosureExternalId}, #{enclosureId}, #{enclosureName},
+            #{batchNo}, #{batchExternalId}, #{batchId}, #{entryCycle},
+            #{gender}, #{cattleVariety}, #{cattlePicture}, #{registrant}, #{remark},
+            #{birthDate}, #{ageMonths}, #{entryDate}, #{entryWeightKg}, #{source}, #{breedingMethod},
+            #{assetStatus}, #{statusChangeDate}, #{statusChangeReason}, #{penLocation},
+            #{expectedOutDate}, #{supplementPlan}, #{realtimeTemp}, #{realtimeSteps}, #{envTemp},
+            #{location}, #{physioCollectTime}, #{fatherYakNo}, #{motherYakNo},
+            #{lastSyncTime}, #{delFlag}, sysdate()
         )
     </insert>
 
@@ -93,10 +123,22 @@
         update biz_yak_asset set
             external_id = #{externalId},
             yak_no = #{yakNo},
+            ear_tag_number = #{earTagNumber},
             pasture_id = #{pastureId},
             pasture_name = #{pastureName},
+            farm_external_id = #{farmExternalId},
+            enclosure_external_id = #{enclosureExternalId},
+            enclosure_id = #{enclosureId},
+            enclosure_name = #{enclosureName},
             batch_no = #{batchNo},
+            batch_external_id = #{batchExternalId},
+            batch_id = #{batchId},
+            entry_cycle = #{entryCycle},
             gender = #{gender},
+            cattle_variety = #{cattleVariety},
+            cattle_picture = #{cattlePicture},
+            registrant = #{registrant},
+            remark = #{remark},
             birth_date = #{birthDate},
             age_months = #{ageMonths},
             entry_date = #{entryDate},

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

@@ -60,6 +60,8 @@ class YakAssetValidationTest
         assertTrueContains(xml, "del_flag = '0'");
         assertTrueContains(xml, "status_change_date desc");
         assertTrueContains(xml, "yak_no like");
+        assertTrueContains(xml, "ear_tag_number like");
+        assertTrueContains(xml, "ear_tag_number");
     }
 
     private static void assertTrueContains(String haystack, String needle)

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

@@ -23,11 +23,16 @@ class YakEntryOpenApiMapperTest
         dto.setCattleNo("CN-001");
         dto.setFarmId(1L);
         dto.setFarmName("示范牧场");
+        dto.setFarmEnclosureId(201L);
         dto.setFarmEnclosureName("1号圈舍");
+        dto.setBatchId(301L);
         dto.setEntryCycle("B2025-01");
         dto.setFarmLocation("东经91.0,北纬32.0");
         dto.setCattleSex("母");
         dto.setCattleSource("自繁");
+        dto.setCattleVariety("牦牛");
+        dto.setCattlePicture("https://example.com/cattle.jpg");
+        dto.setRegistrant("张三");
         dto.setFatherNumber("F-01");
         dto.setMotherNumber("M-01");
         dto.setWeight(220.5);
@@ -39,17 +44,26 @@ class YakEntryOpenApiMapperTest
         BizYakAsset asset = bundle.getAsset();
         assertNotNull(asset);
         assertEquals(90001L, asset.getExternalId());
-        assertEquals("ET-001", asset.getYakNo());
+        assertEquals("CN-001", asset.getYakNo());
+        assertEquals("ET-001", asset.getEarTagNumber());
+        assertEquals(1L, asset.getFarmExternalId().longValue());
         assertEquals("示范牧场", asset.getPastureName());
-        assertEquals("B2025-01", asset.getBatchNo());
+        assertEquals(201L, asset.getEnclosureExternalId().longValue());
+        assertEquals("B2025-01", asset.getEntryCycle());
+        assertEquals(301L, asset.getBatchExternalId().longValue());
+        assertEquals(null, asset.getBatchNo());
         assertEquals("母", asset.getGender());
         assertEquals("自繁", asset.getSource());
+        assertEquals("1号圈舍", asset.getEnclosureName());
         assertEquals("1号圈舍", asset.getPenLocation());
         assertEquals("东经91.0,北纬32.0", asset.getLocation());
+        assertEquals("牦牛", asset.getCattleVariety());
+        assertEquals("https://example.com/cattle.jpg", asset.getCattlePicture());
+        assertEquals("张三", asset.getRegistrant());
         assertEquals("F-01", asset.getFatherYakNo());
         assertEquals("M-01", asset.getMotherYakNo());
         assertEquals(new BigDecimal("220.5"), asset.getEntryWeightKg());
-        assertEquals("测试备注", asset.getStatusChangeReason());
+        assertEquals("测试备注", asset.getRemark());
         assertEquals("1", bundle.getThirdPartyPastureCode());
     }
 }

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

@@ -136,7 +136,7 @@ flowchart TD
 | 范围 | **五段顺序**全量：养殖场 → 圈舍 → 生产计划 → 批次 → **入栏建档（牦牛档案）** |
 | 入栏接口 | `GET /open-api/v1/farming/entry-filings`（字段见草稿 `20260611111807_455_398.jpg`） |
 | 鉴权 | 与牧场管理同源：`third-party.farming` 配置 `base-url`、`app-key`、`app-secret` |
-| 合并键 | 优先 **cattleId**（`external_id`）；辅以 **earTagNumber**（无则 cattleNo）作为 `yak_no` |
+| 合并键 | 优先 **cattleId**（`external_id`）；辅以 **cattleNo** 作为 `yak_no`；**earTagNumber** 独立落库 `ear_tag_number` |
 | 分页 | `pageNum`/`pageSize`≤200 直至取完 |
 | 反馈 | 提示成功/失败；摘要含各段及入栏建档新增/更新/失败头数（前端兼容顶层 `insertCount` 等） |
 | 牧场映射 | `farmId` → `biz_pasture.external_id`；失败则冗余 `farmName` |

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

@@ -38,11 +38,23 @@
 | --- | --- | --- | --- |
 | `id` | `bigint(20)` | Y | 主键 |
 | `external_id` | `bigint(20)` | N | 第三方牛只 ID（`OpenYakEntryDto.cattleId`），**唯一** |
-| `yak_no` | `varchar(64)` | Y | 牦牛编号（优先 `earTagNumber`），**唯一** |
+| `yak_no` | `varchar(64)` | Y | 场内牛只编号（`OpenYakEntryDto.cattleNo`），**唯一** |
+| `ear_tag_number` | `varchar(64)` | N | 耳标编号（`OpenYakEntryDto.earTagNumber`） |
 | `pasture_id` | `bigint(20)` | N | 关联 `biz_pasture.id`（映射成功时） |
 | `pasture_name` | `varchar(128)` | N | 所属牧场名称（同步冗余展示） |
-| `batch_no` | `varchar(64)` | N | 批次编号 |
+| `farm_external_id` | `bigint(20)` | N | 第三方养殖场 ID（`farmId`） |
+| `enclosure_external_id` | `bigint(20)` | N | 第三方圈舍 ID（`farmEnclosureId`） |
+| `enclosure_id` | `bigint(20)` | N | 本地圈舍 `biz_farm_enclosure.id` |
+| `enclosure_name` | `varchar(128)` | N | 圈舍名称 |
+| `batch_no` | `varchar(64)` | N | 批次编号；由 `batch_external_id` 关联 `biz_farming_batch.batch_no` |
+| `batch_external_id` | `bigint(20)` | N | 第三方养殖批次 ID（`batchId`） |
+| `batch_id` | `bigint(20)` | N | 本地养殖批次 `biz_farming_batch.id` |
+| `entry_cycle` | `varchar(64)` | N | 入栏周期（`entryCycle`） |
 | `gender` | `varchar(16)` | N | 性别 |
+| `cattle_variety` | `varchar(128)` | N | 牛只品种 |
+| `cattle_picture` | `varchar(512)` | N | 牛只图片 URL |
+| `registrant` | `varchar(64)` | N | 登记人 |
+| `remark` | `varchar(500)` | N | 备注 |
 | `birth_date` | `date` | N | 出生日期 |
 | `age_months` | `int(11)` | N | 月龄（月） |
 | `entry_date` | `date` | N | 入栏日期 |
@@ -73,21 +85,26 @@
 | OpenAPI 字段 | 库字段 | 说明 |
 | --- | --- | --- |
 | `cattleId` | `external_id` | 同步 upsert 主键 |
-| `earTagNumber` / `cattleNo` | `yak_no` | 优先耳标 |
-| `farmId` | `pasture_id` | 经 `biz_pasture.external_id` 解析 |
+| `cattleNo` | `yak_no` | 场内牛只编号 |
+| `earTagNumber` | `ear_tag_number` | 耳标编号 |
+| `farmId` | `farm_external_id` / `pasture_id` | 前者直存；后者经 `biz_pasture.external_id` 解析 |
 | `farmName` | `pasture_name` | 冗余展示 |
-| `entryCycle` / `batchId` | `batch_no` | 优先 `entryCycle` |
-| `farmEnclosureName` | `pen_location` | 并写入 `biz_yak_pen_rel` |
+| `farmEnclosureId` | `enclosure_external_id` / `enclosure_id` | 后者经 `biz_farm_enclosure.external_id` 解析 |
+| `farmEnclosureName` | `enclosure_name` / `pen_location` | 兼容保留 `pen_location` |
+| `batchId` | `batch_external_id` / `batch_id` / `batch_no` | `batch_id`、`batch_no` 经 `biz_farming_batch.external_id` 解析 |
+| `entryCycle` | `entry_cycle` | |
 | `farmLocation` | `location` | |
 | `cattleSex` | `gender` | 归一公/母 |
 | `cattleSource` | `source` | |
+| `cattleVariety` | `cattle_variety` | |
+| `cattlePicture` | `cattle_picture` | |
+| `registrant` | `registrant` | |
 | `fatherNumber` | `father_yak_no` | |
 | `motherNumber` | `mother_yak_no` | |
 | `weight` | `entry_weight_kg` | 当前体重 |
 | `entryTime` | `entry_date` | |
 | `birthDate` | `birth_date` | 月龄由同步时计算写入 `age_months` |
-| `remark` | `status_change_reason` | |
-| `id` / `cattlePicture` / `registrant` / `cattleVariety` | — | 本期不落库 |
+| `remark` | `remark` | |
 
 列表接口未返回的字段（`asset_status`、实时体温/运动量等）保持库内原值或默认「正常」。
 
@@ -166,7 +183,7 @@
 | `biz_yak_collar_location` | `GET /open-api/v1/iot/collar-locations` | `(yak_no, report_time)` | `sql/biz_yak_collar_location.sql` |
 | `biz_env_monitoring_record` | `GET /open-api/v1/iot/env-monitoring` | `external_id` | `sql/biz_env_monitoring_record.sql` |
 
-关联解析：称重/项圈可关联 `biz_yak_asset`（优先 `cattleId`→`external_id`，其次耳标/`cattleNo`→`yak_no`）；环境/称重可关联 `biz_pasture`、`biz_farm_enclosure`。
+关联解析：称重/项圈可关联 `biz_yak_asset`（优先 `cattleId`→`external_id`，其次 `earTagNumber`→`ear_tag_number`，再次 `cattleNo`→`yak_no`）；环境/称重可关联 `biz_pasture`、`biz_farm_enclosure`。
 
 ### 2.8 枚举 `asset_status`
 

doc/产业数据模型及服务/牧业金融生物资产管理/牦牛资产档案管理测试用例.md

@@ -21,7 +21,7 @@
 | ZCZX-MYNZDA-UT-004 | 列表校验 | 关键字 trim | 单元测试 | JUnit5 | 模糊查询 | 无 | `keyword` 含前后空格 | trim 后参与 `LIKE` |
 | ZCZX-MYNZDA-UT-005 | 同步合并 | 按 external_id 新增 | 单元测试 | JUnit5+Mockito | §5.3 | DB 无该 cattleId | `syncBundle` 新记录 | `insert` 主表；圈舍/批次关联写入 |
 | ZCZX-MYNZDA-UT-006 | 同步合并 | 按 external_id 更新 | 单元测试 | JUnit5+Mockito | §5.3 | DB 已有同 cattleId | `syncBundle` 字段变更 | `update` 主表；圈舍/批次覆盖 |
-| ZCZX-MYNZDA-UT-006A | OpenAPI 映射 | 入栏建档字段 | 单元测试 | JUnit5 | §2.1.1 | `OpenYakEntryDto` 样例 | `YakEntryOpenApiMapper.toBundle` | `yak_no`=耳标；`farmId`→牧场编码；字段与表一致 |
+| ZCZX-MYNZDA-UT-006A | OpenAPI 映射 | 入栏建档字段 | 单元测试 | JUnit5 | §2.1.1 | `OpenYakEntryDto` 样例 | `YakEntryOpenApiMapper.toBundle` | `external_id`=cattleId；`yak_no`=cattleNo；`ear_tag_number`=耳标；扩展字段与表一致 |
 | ZCZX-MYNZDA-UT-007 | 同步安全 | 失败不清库 | 单元测试 | JUnit5+Mockito | §5.3 | 已有档案 A | Mock 第三方抛超时；执行 sync | 档案 A 主表及子表条数不变 |
 | ZCZX-MYNZDA-UT-008 | 同步安全 | 单头失败不回滚全局 | 单元测试 | JUnit5+Mockito | 事务边界 | 批次含 2 头，第 2 头校验失败 | `syncAll` | 第 1 头成功落库；`failCount≥1`；第 1 头数据保留 |
 | ZCZX-MYNZDA-UT-009 | 牧场映射 | 映射成功写 pasture_id | 单元测试 | JUnit5+Mockito | §5.3 | `biz_pasture` 有匹配编码 | 同步带第三方牧场码 | `pasture_id` 非空；`pasture_name` 与主数据一致 |

sql/biz_yak_asset.sql

@@ -4,11 +4,23 @@ SET NAMES utf8mb4;
 CREATE TABLE IF NOT EXISTS `biz_yak_asset` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `external_id` bigint(20) DEFAULT NULL COMMENT '第三方牛只唯一ID OpenYakEntryDto.cattleId',
-  `yak_no` varchar(64) NOT NULL COMMENT '牦牛编号（优先耳标 earTagNumber）',
+  `yak_no` varchar(64) NOT NULL COMMENT '场内牛只编号 OpenYakEntryDto.cattleNo',
+  `ear_tag_number` varchar(64) DEFAULT NULL COMMENT '耳标编号 OpenYakEntryDto.earTagNumber',
   `pasture_id` bigint(20) DEFAULT NULL COMMENT '牧场ID',
   `pasture_name` varchar(128) DEFAULT NULL COMMENT '所属牧场名称',
-  `batch_no` varchar(64) DEFAULT NULL COMMENT '批次编号',
+  `farm_external_id` bigint(20) DEFAULT NULL COMMENT '第三方养殖场ID OpenYakEntryDto.farmId',
+  `enclosure_external_id` bigint(20) DEFAULT NULL COMMENT '第三方圈舍ID OpenYakEntryDto.farmEnclosureId',
+  `enclosure_id` bigint(20) DEFAULT NULL COMMENT '本地圈舍ID biz_farm_enclosure.id',
+  `enclosure_name` varchar(128) DEFAULT NULL COMMENT '圈舍名称 OpenYakEntryDto.farmEnclosureName',
+  `batch_no` varchar(64) DEFAULT NULL COMMENT '批次编号（同步冗余）',
+  `batch_external_id` bigint(20) DEFAULT NULL COMMENT '第三方养殖批次ID OpenYakEntryDto.batchId',
+  `batch_id` bigint(20) DEFAULT NULL COMMENT '本地养殖批次ID biz_farming_batch.id',
+  `entry_cycle` varchar(64) DEFAULT NULL COMMENT '入栏周期 OpenYakEntryDto.entryCycle',
   `gender` varchar(16) DEFAULT NULL COMMENT '性别',
+  `cattle_variety` varchar(128) DEFAULT NULL COMMENT '牛只品种 OpenYakEntryDto.cattleVariety',
+  `cattle_picture` varchar(512) DEFAULT NULL COMMENT '牛只图片URL OpenYakEntryDto.cattlePicture',
+  `registrant` varchar(64) DEFAULT NULL COMMENT '登记人 OpenYakEntryDto.registrant',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注 OpenYakEntryDto.remark',
   `birth_date` date DEFAULT NULL COMMENT '出生日期',
   `age_months` int(11) DEFAULT NULL COMMENT '月龄',
   `entry_date` date DEFAULT NULL COMMENT '入栏日期',
@@ -37,6 +49,10 @@ CREATE TABLE IF NOT EXISTS `biz_yak_asset` (
   UNIQUE KEY `uk_yak_no` (`yak_no`),
   KEY `idx_asset_status` (`asset_status`),
   KEY `idx_pasture_id` (`pasture_id`),
+  KEY `idx_farm_external_id` (`farm_external_id`),
+  KEY `idx_enclosure_id` (`enclosure_id`),
+  KEY `idx_batch_id` (`batch_id`),
+  KEY `idx_ear_tag_number` (`ear_tag_number`),
   KEY `idx_status_change_date` (`status_change_date`),
   KEY `idx_last_sync_time` (`last_sync_time`),
   KEY `idx_del_flag` (`del_flag`)