对接牦牛资产档案

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

@@ -12,6 +12,7 @@ public class BizYakWeighingRecord extends BaseEntity
     private Long id;
     private Long externalId;
     private Long yakAssetId;
+    private String earTagNumber;
     private Long cattleExternalId;
     private String yakNo;
     private Long pastureId;
@@ -32,6 +33,8 @@ public class BizYakWeighingRecord extends BaseEntity
     public void setExternalId(Long externalId) { this.externalId = externalId; }
     public Long getYakAssetId() { return yakAssetId; }
     public void setYakAssetId(Long yakAssetId) { this.yakAssetId = yakAssetId; }
+    public String getEarTagNumber() { return earTagNumber; }
+    public void setEarTagNumber(String earTagNumber) { this.earTagNumber = earTagNumber; }
     public Long getCattleExternalId() { return cattleExternalId; }
     public void setCattleExternalId(Long cattleExternalId) { this.cattleExternalId = cattleExternalId; }
     public String getYakNo() { return yakNo; }

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

@@ -52,10 +52,12 @@ public class YakWeighingSyncTxService
             throw new ServiceException(FarmingSyncRules.MSG_EXTERNAL_ID_REQUIRED);
         }
         Date now = syncTime != null ? syncTime : new Date();
+        String earTagNumber = StringUtils.isNotEmpty(dto.getEarTagNumber()) ? dto.getEarTagNumber().trim() : null;
         String yakNo = FarmingSyncSupport.firstNonBlank(dto.getEarTagNumber(), dto.getCattleNo());
 
         BizYakWeighingRecord row = new BizYakWeighingRecord();
         row.setExternalId(dto.getId());
+        row.setEarTagNumber(earTagNumber);
         row.setCattleExternalId(dto.getCattleId());
         row.setYakNo(yakNo);
         row.setYakAssetId(FarmingSyncSupport.resolveYakAssetId(yakAssetMapper, dto.getCattleId(),

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

@@ -6,6 +6,7 @@
         <id property="id" column="id"/>
         <result property="externalId" column="external_id"/>
         <result property="yakAssetId" column="yak_asset_id"/>
+        <result property="earTagNumber" column="ear_tag_number"/>
         <result property="cattleExternalId" column="cattle_external_id"/>
         <result property="yakNo" column="yak_no"/>
         <result property="pastureId" column="pasture_id"/>
@@ -27,7 +28,7 @@
     </resultMap>
 
     <select id="selectByExternalId" resultMap="BizYakWeighingRecordResult">
-        select id, external_id, yak_asset_id, cattle_external_id, yak_no, pasture_id, farm_external_id, farm_name,
+        select id, external_id, yak_asset_id, ear_tag_number, cattle_external_id, yak_no, pasture_id, farm_external_id, farm_name,
                enclosure_id, enclosure_external_id, enclosure_name, weight_kg, weighing_time,
                data_source, last_sync_time, del_flag, create_by, create_time, update_by, update_time, remark
         from biz_yak_weighing_record where external_id = #{externalId} limit 1
@@ -43,11 +44,11 @@
 
     <insert id="insertBizYakWeighingRecord" parameterType="com.ruoyi.web.modules.industryservice.domain.BizYakWeighingRecord" useGeneratedKeys="true" keyProperty="id">
         insert into biz_yak_weighing_record (
-            external_id, yak_asset_id, cattle_external_id, yak_no, pasture_id, farm_external_id, farm_name,
+            external_id, yak_asset_id, ear_tag_number, cattle_external_id, yak_no, pasture_id, farm_external_id, farm_name,
             enclosure_id, enclosure_external_id, enclosure_name, weight_kg, weighing_time,
             data_source, last_sync_time, del_flag, create_by, create_time, remark
         ) values (
-            #{externalId}, #{yakAssetId}, #{cattleExternalId}, #{yakNo}, #{pastureId}, #{farmExternalId}, #{farmName},
+            #{externalId}, #{yakAssetId}, #{earTagNumber}, #{cattleExternalId}, #{yakNo}, #{pastureId}, #{farmExternalId}, #{farmName},
             #{enclosureId}, #{enclosureExternalId}, #{enclosureName}, #{weightKg}, #{weighingTime, jdbcType=TIMESTAMP},
             #{dataSource}, #{lastSyncTime}, #{delFlag}, #{createBy}, #{createTime, jdbcType=TIMESTAMP}, #{remark}
         )
@@ -55,7 +56,7 @@
 
     <update id="updateBizYakWeighingRecordFromSync" parameterType="com.ruoyi.web.modules.industryservice.domain.BizYakWeighingRecord">
         update biz_yak_weighing_record set
-            yak_asset_id = #{yakAssetId}, cattle_external_id = #{cattleExternalId}, yak_no = #{yakNo},
+            yak_asset_id = #{yakAssetId}, ear_tag_number = #{earTagNumber}, cattle_external_id = #{cattleExternalId}, yak_no = #{yakNo},
             pasture_id = #{pastureId}, farm_external_id = #{farmExternalId}, farm_name = #{farmName},
             enclosure_id = #{enclosureId}, enclosure_external_id = #{enclosureExternalId}, enclosure_name = #{enclosureName},
             weight_kg = #{weightKg}, weighing_time = #{weighingTime, jdbcType=TIMESTAMP},

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

@@ -0,0 +1,98 @@
+package com.ruoyi.web.modules.industryservice.service;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.web.modules.industryservice.domain.BizYakWeighingRecord;
+import com.ruoyi.web.modules.industryservice.domain.dto.OpenWeighingDto;
+import com.ruoyi.web.modules.industryservice.mapper.BizFarmEnclosureMapper;
+import com.ruoyi.web.modules.industryservice.mapper.BizPastureMapper;
+import com.ruoyi.web.modules.industryservice.mapper.BizYakAssetMapper;
+import com.ruoyi.web.modules.industryservice.mapper.BizYakWeighingRecordMapper;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayName("YakWeighingSyncTxService")
+class YakWeighingSyncTxServiceTest
+{
+    @Mock
+    private BizYakWeighingRecordMapper weighingRecordMapper;
+
+    @Mock
+    private BizPastureMapper pastureMapper;
+
+    @Mock
+    private BizFarmEnclosureMapper enclosureMapper;
+
+    @Mock
+    private BizYakAssetMapper yakAssetMapper;
+
+    @InjectMocks
+    private YakWeighingSyncTxService service;
+
+    @Test
+    @DisplayName("新增称重记录")
+    void persistWeighing_insert()
+    {
+        when(weighingRecordMapper.selectByExternalId(3001L)).thenReturn(null);
+        when(weighingRecordMapper.insertBizYakWeighingRecord(any())).thenReturn(1);
+
+        OpenWeighingDto dto = sampleDto();
+        assertEquals(true, service.persistWeighing(dto, new Date()));
+
+        ArgumentCaptor<BizYakWeighingRecord> captor = ArgumentCaptor.forClass(BizYakWeighingRecord.class);
+        verify(weighingRecordMapper).insertBizYakWeighingRecord(captor.capture());
+        BizYakWeighingRecord row = captor.getValue();
+        assertEquals(3001L, row.getExternalId());
+        assertEquals("YAK20250001", row.getEarTagNumber());
+        assertEquals("YAK20250001", row.getYakNo());
+        assertEquals(0, row.getWeightKg().compareTo(new BigDecimal("385.50")));
+    }
+
+    @Test
+    @DisplayName("更新已有称重记录")
+    void persistWeighing_update()
+    {
+        BizYakWeighingRecord existing = new BizYakWeighingRecord();
+        existing.setId(10L);
+        existing.setCreateTime(new Date(1_000L));
+        when(weighingRecordMapper.selectByExternalId(3001L)).thenReturn(existing);
+
+        assertFalse(service.persistWeighing(sampleDto(), new Date()));
+        verify(weighingRecordMapper).updateBizYakWeighingRecordFromSync(any());
+    }
+
+    @Test
+    @DisplayName("缺少 external id 拒绝")
+    void persistWeighing_missingId()
+    {
+        OpenWeighingDto dto = sampleDto();
+        dto.setId(null);
+        assertThrows(ServiceException.class, () -> service.persistWeighing(dto, new Date()));
+    }
+
+    private static OpenWeighingDto sampleDto()
+    {
+        OpenWeighingDto dto = new OpenWeighingDto();
+        dto.setId(3001L);
+        dto.setCattleId(4001L);
+        dto.setCattleNo("YAK20250001");
+        dto.setEarTagNumber("YAK20250001");
+        dto.setWeight("385.50");
+        dto.setWeighingTime("2026-05-20 08:30:00");
+        return dto;
+    }
+}

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

@@ -158,6 +158,8 @@
 | 表名 | 第三方接口 | 唯一键 | DDL |
 | --- | --- | --- | --- |
 | `biz_yak_weighing_record` | `GET /open-api/v1/iot/weighings` | `external_id` | `sql/biz_yak_weighing_record.sql` |
+
+`biz_yak_weighing_record` 字段映射：`earTagNumber`→`ear_tag_number`，`cattleNo` 参与 `yak_no` 与资产关联解析；`cattleId`→`cattle_external_id`，`farmId`/`enclosureId`/`weight`/`weighingTime` 等按接口落库。
 | `biz_yak_ear_tag_record` | `GET /open-api/v1/iot/ear-tags` | `external_id` | `sql/biz_yak_ear_tag_record.sql` |
 
 `biz_yak_ear_tag_record` 字段映射：`earTagNumber`→`ear_tag_number`，`cattleNo` 参与 `yak_no` 与资产关联解析；`actualTemperature`/`temperature`/`steps`/`reportTime` 同名落库。

sql/biz_yak_weighing_record.sql

@@ -3,8 +3,9 @@ CREATE TABLE IF NOT EXISTS `biz_yak_weighing_record` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '本地主键',
   `external_id` bigint(20) NOT NULL COMMENT '第三方称重记录ID',
   `yak_asset_id` bigint(20) DEFAULT NULL COMMENT '本地牦牛 biz_yak_asset.id',
+  `ear_tag_number` varchar(64) DEFAULT NULL COMMENT '耳标编号（接口 earTagNumber）',
   `cattle_external_id` bigint(20) DEFAULT NULL COMMENT '第三方牛只ID cattleId',
-  `yak_no` varchar(64) DEFAULT NULL COMMENT '牦牛编号（耳标优先）',
+  `yak_no` varchar(64) DEFAULT NULL COMMENT '牦牛编号（关联资产，耳标优先于 cattleNo）',
   `pasture_id` bigint(20) DEFAULT NULL COMMENT '本地养殖场ID',
   `farm_external_id` bigint(20) DEFAULT NULL COMMENT '第三方养殖场ID',
   `farm_name` varchar(128) DEFAULT NULL COMMENT '养殖场名称',
@@ -24,6 +25,7 @@ CREATE TABLE IF NOT EXISTS `biz_yak_weighing_record` (
   PRIMARY KEY (`id`),
   UNIQUE KEY `uk_external_id` (`external_id`),
   KEY `idx_yak_asset_id` (`yak_asset_id`),
+  KEY `idx_ear_tag_number` (`ear_tag_number`),
   KEY `idx_yak_no` (`yak_no`),
   KEY `idx_weighing_time` (`weighing_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='牛只称重数据（第三方同步）';