牦牛资产档案

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

@@ -12,6 +12,7 @@ import com.ruoyi.web.modules.industryservice.domain.BizYakAsset;
 import com.ruoyi.web.modules.industryservice.domain.BizYakGrowthRecord;
 import com.ruoyi.web.modules.industryservice.domain.dto.OpenWeighingDto;
 import com.ruoyi.web.modules.industryservice.domain.vo.YakAssetGrowthChartVo;
+import com.ruoyi.web.modules.industryservice.mapper.BizYakGrowthRecordMapper;
 import com.ruoyi.web.modules.industryservice.support.ThirdPartyFarmingProperties;
 import com.ruoyi.web.modules.industryservice.support.ThirdPartyIotWeighingClient;
 import com.ruoyi.web.modules.industryservice.support.YakAssetGrowthSupport;
@@ -21,7 +22,7 @@ import com.ruoyi.web.modules.industryservice.support.YakAssetRules;
  * 牦牛档案详情「生长性状」实时数据服务。
  * <p>
  * 体重来自 {@code GET /open-api/v1/iot/weighings}：
- * {@code cattleNo} = 档案 {@code external_id} 字符串，
+ * {@code cattleId} = 档案 {@code external_id}，
  * 称重开始/结束时间默认近一年至当前。
  * 采集时间 = {@code weighingTime}。日龄、体高、胸围、体长暂无接口，保持 null。
  * </p>
@@ -34,6 +35,9 @@ public class YakAssetGrowthLiveService
     @Autowired
     private ThirdPartyIotWeighingClient weighingClient;
 
+    @Autowired
+    private BizYakGrowthRecordMapper growthRecordMapper;
+
     @Autowired
     private ThirdPartyFarmingProperties properties;
 
@@ -44,12 +48,25 @@ public class YakAssetGrowthLiveService
                 safeFetchWeighings(asset, YakAssetRules.DEFAULT_GROWTH_LOOKBACK_DAYS));
     }
 
-    /** 生长曲线：仅体重有数据，其余指标返回空 */
+    /** 生长曲线：体重来自称重 OpenAPI；体高/胸围/体长读本地子表（暂无第三方接口） */
     public YakAssetGrowthChartVo fetchGrowthChart(BizYakAsset asset, String metric)
     {
-        List<BizYakGrowthRecord> rows = YakAssetGrowthSupport.toGrowthRecords(
-                safeFetchWeighings(asset, YakAssetRules.DEFAULT_GROWTH_LOOKBACK_DAYS));
-        return YakAssetGrowthSupport.toGrowthChart(rows, metric);
+        if (asset == null || StringUtils.isEmpty(metric))
+        {
+            return new YakAssetGrowthChartVo();
+        }
+        String m = metric.trim().toLowerCase();
+        List<BizYakGrowthRecord> rows;
+        if (YakAssetRules.METRIC_WEIGHT.equals(m))
+        {
+            rows = YakAssetGrowthSupport.toGrowthRecords(
+                    safeFetchWeighings(asset, YakAssetRules.DEFAULT_GROWTH_LOOKBACK_DAYS));
+        }
+        else
+        {
+            rows = growthRecordMapper.selectByYakAssetId(asset.getId());
+        }
+        return YakAssetGrowthSupport.toGrowthChart(rows, m);
     }
 
     private List<OpenWeighingDto> safeFetchWeighings(BizYakAsset asset, int lookbackDays)
@@ -58,8 +75,8 @@ public class YakAssetGrowthLiveService
         {
             return Collections.emptyList();
         }
-        String cattleNo = YakAssetGrowthSupport.resolveWeighingCattleNoParam(asset);
-        if (StringUtils.isEmpty(cattleNo))
+        Long cattleId = YakAssetGrowthSupport.resolveWeighingCattleIdParam(asset);
+        if (cattleId == null)
         {
             return Collections.emptyList();
         }
@@ -67,11 +84,11 @@ public class YakAssetGrowthLiveService
         Date startTime = new Date(endTime.getTime() - lookbackDays * 24L * 60 * 60 * 1000L);
         try
         {
-            return weighingClient.fetchByCattleNo(cattleNo, startTime, endTime);
+            return weighingClient.fetchByCattleId(cattleId, startTime, endTime);
         }
         catch (Exception ex)
         {
-            log.warn("读取牛只称重数据失败 cattleNo={}: {}", cattleNo, ex.getMessage());
+            log.warn("读取牛只称重数据失败 cattleId={}: {}", cattleId, ex.getMessage());
             return Collections.emptyList();
         }
     }

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

@@ -186,15 +186,15 @@ public final class IotSyncSupport
     }
 
     /**
-     * 牛只称重查询参数：{@code cattleNo} 必传（产品约定传档案 {@code external_id} 字符串）；
+     * 牛只称重查询参数：{@code cattleId} 必传（档案 {@code external_id}）；
      * 可选 {@code startTime}/{@code endTime} 称重时间窗口。
      */
-    public static Map<String, String> buildWeighingQueryParams(String cattleNo, Date startTime, Date endTime)
+    public static Map<String, String> buildWeighingQueryParams(Long cattleId, Date startTime, Date endTime)
     {
         Map<String, String> params = new LinkedHashMap<>();
-        if (StringUtils.isNotEmpty(cattleNo))
+        if (cattleId != null)
         {
-            params.put("cattleNo", cattleNo.trim());
+            params.put("cattleId", String.valueOf(cattleId));
         }
         appendTimeRangeParams(params, startTime, endTime);
         return params;

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

@@ -20,7 +20,7 @@ public interface ThirdPartyIotWeighingClient
     /**
      * 按牛只查询称重记录；可选称重时间窗口。
      *
-     * @param cattleNo 开放接口参数名 cattleNo；产品约定值为档案 {@code external_id} 的字符串形式
+     * @param cattleId 开放接口参数 cattleId，值为档案 {@code external_id}
      */
-    List<OpenWeighingDto> fetchByCattleNo(String cattleNo, Date startTime, Date endTime);
+    List<OpenWeighingDto> fetchByCattleId(Long cattleId, Date startTime, Date endTime);
 }

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

@@ -58,30 +58,30 @@ public class ThirdPartyIotWeighingClientImpl implements ThirdPartyIotWeighingCli
     }
 
     @Override
-    public List<OpenWeighingDto> fetchByCattleNo(String cattleNo, Date startTime, Date endTime)
+    public List<OpenWeighingDto> fetchByCattleId(Long cattleId, Date startTime, Date endTime)
     {
         if (!properties.isEnabled())
         {
             throw new ServiceException("第三方 IoT 称重同步未启用");
         }
-        if (com.ruoyi.common.utils.StringUtils.isEmpty(cattleNo))
+        if (cattleId == null)
         {
-            throw new ServiceException("牛只编号不能为空");
+            throw new ServiceException("牛只 ID 不能为空");
         }
         if ("http".equalsIgnoreCase(properties.getMode()))
         {
-            Map<String, String> params = IotSyncSupport.buildWeighingQueryParams(cattleNo, startTime, endTime);
+            Map<String, String> params = IotSyncSupport.buildWeighingQueryParams(cattleId, startTime, endTime);
             return ThirdPartyFarmingPageFetcher.fetchAllPages(properties, objectMapper, LIST_PATH,
                     new TypeReference<OpenApiResponse<OpenApiPageResult<OpenWeighingDto>>>() { }, "牛只称重", params);
         }
         return filterStubRows(ThirdPartyFarmingPageFetcher.fetchFromStub(objectMapper, STUB_RESOURCE,
-                new TypeReference<List<OpenWeighingDto>>() { }, "牛只称重"), cattleNo.trim(), startTime, endTime);
+                new TypeReference<List<OpenWeighingDto>>() { }, "牛只称重"), cattleId, startTime, endTime);
     }
 
-    private static List<OpenWeighingDto> filterStubRows(List<OpenWeighingDto> all, String cattleNo,
+    private static List<OpenWeighingDto> filterStubRows(List<OpenWeighingDto> all, Long cattleId,
             Date startTime, Date endTime)
     {
-        if (startTime == null && endTime == null && cattleNo == null)
+        if (startTime == null && endTime == null && cattleId == null)
         {
             return all;
         }
@@ -92,7 +92,7 @@ public class ThirdPartyIotWeighingClientImpl implements ThirdPartyIotWeighingCli
             {
                 continue;
             }
-            if (cattleNo != null && !matchesCattleNoParam(cattleNo, row))
+            if (cattleId != null && !cattleId.equals(row.getCattleId()))
             {
                 continue;
             }
@@ -104,16 +104,4 @@ public class ThirdPartyIotWeighingClientImpl implements ThirdPartyIotWeighingCli
         }
         return filtered;
     }
-
-    /**
-     * Stub 联调：cattleNo 参数可匹配 DTO 的 cattleNo 或 cattleId（与档案 external_id 传参约定一致）。
-     */
-    private static boolean matchesCattleNoParam(String cattleNoParam, OpenWeighingDto row)
-    {
-        if (cattleNoParam.equalsIgnoreCase(row.getCattleNo() != null ? row.getCattleNo().trim() : null))
-        {
-            return true;
-        }
-        return row.getCattleId() != null && cattleNoParam.equals(String.valueOf(row.getCattleId()));
-    }
 }

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

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.web.modules.industryservice.domain.BizYakAsset;
 import com.ruoyi.web.modules.industryservice.domain.BizYakGrowthRecord;
 import com.ruoyi.web.modules.industryservice.domain.dto.OpenWeighingDto;
@@ -25,15 +26,11 @@ public final class YakAssetGrowthSupport
     }
 
     /**
-     * 称重接口 cattleNo 查询参数：产品约定传档案 {@code external_id} 字符串。
+     * 称重接口 cattleId 查询参数：档案 {@code external_id}。
      */
-    public static String resolveWeighingCattleNoParam(BizYakAsset asset)
+    public static Long resolveWeighingCattleIdParam(BizYakAsset asset)
     {
-        if (asset == null || asset.getExternalId() == null)
-        {
-            return null;
-        }
-        return String.valueOf(asset.getExternalId());
+        return asset == null ? null : asset.getExternalId();
     }
 
     public static Date parseWeighingTime(OpenWeighingDto dto)
@@ -71,27 +68,60 @@ public final class YakAssetGrowthSupport
     }
 
     /**
-     * 组装生长曲线：仅体重指标有实测点；体高/胸围/体长返回空曲线。
+     * 组装生长曲线：按 metric 取对应字段；实测/预测按 dataKind 分组。
      */
     public static YakAssetGrowthChartVo toGrowthChart(List<BizYakGrowthRecord> rows, String metric)
     {
         YakAssetGrowthChartVo chart = new YakAssetGrowthChartVo();
-        if (!YakAssetRules.METRIC_WEIGHT.equals(metric) || rows == null)
+        if (rows == null || StringUtils.isEmpty(metric))
         {
             return chart;
         }
+        String m = metric.trim().toLowerCase();
         for (BizYakGrowthRecord row : rows)
         {
-            if (row == null || row.getWeightKg() == null)
+            if (row == null)
+            {
+                continue;
+            }
+            BigDecimal value = resolveGrowthValue(row, m);
+            if (value == null)
             {
                 continue;
             }
             YakAssetGrowthChartPointVo point = new YakAssetGrowthChartPointVo();
             point.setDayAge(row.getDayAge());
-            point.setValue(row.getWeightKg());
+            point.setValue(value);
             point.setCollectTime(row.getCollectTime());
-            chart.getActual().add(point);
+            if (row.getDataKind() != null && row.getDataKind() == YakAssetRules.DATA_KIND_FORECAST)
+            {
+                chart.getForecast().add(point);
+            }
+            else
+            {
+                chart.getActual().add(point);
+            }
         }
         return chart;
     }
+
+    public static BigDecimal resolveGrowthValue(BizYakGrowthRecord row, String metric)
+    {
+        if (row == null || StringUtils.isEmpty(metric))
+        {
+            return null;
+        }
+        switch (metric.trim().toLowerCase())
+        {
+            case YakAssetRules.METRIC_HEIGHT:
+                return row.getHeightCm();
+            case YakAssetRules.METRIC_CHEST:
+                return row.getChestCm();
+            case YakAssetRules.METRIC_LENGTH:
+                return row.getLengthCm();
+            case YakAssetRules.METRIC_WEIGHT:
+            default:
+                return row.getWeightKg();
+        }
+    }
 }

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

@@ -6,6 +6,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.math.BigDecimal;
 import java.util.Collections;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -14,7 +15,10 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import com.ruoyi.web.modules.industryservice.domain.BizYakAsset;
+import com.ruoyi.web.modules.industryservice.domain.BizYakGrowthRecord;
 import com.ruoyi.web.modules.industryservice.domain.dto.OpenWeighingDto;
+import com.ruoyi.web.modules.industryservice.domain.vo.YakAssetGrowthChartVo;
+import com.ruoyi.web.modules.industryservice.mapper.BizYakGrowthRecordMapper;
 import com.ruoyi.web.modules.industryservice.support.ThirdPartyFarmingProperties;
 import com.ruoyi.web.modules.industryservice.support.ThirdPartyIotWeighingClient;
 import com.ruoyi.web.modules.industryservice.support.YakAssetRules;
@@ -26,6 +30,9 @@ class YakAssetGrowthLiveServiceTest
     @Mock
     private ThirdPartyIotWeighingClient weighingClient;
 
+    @Mock
+    private BizYakGrowthRecordMapper growthRecordMapper;
+
     @Mock
     private ThirdPartyFarmingProperties properties;
 
@@ -40,19 +47,26 @@ class YakAssetGrowthLiveServiceTest
         OpenWeighingDto dto = new OpenWeighingDto();
         dto.setWeight("300");
         dto.setWeighingTime("2026-05-20 08:30:00");
-        when(weighingClient.fetchByCattleNo(eq("4001"), any(), any())).thenReturn(Collections.singletonList(dto));
+        when(weighingClient.fetchByCattleId(eq(4001L), any(), any())).thenReturn(Collections.singletonList(dto));
 
         BizYakAsset asset = new BizYakAsset();
         asset.setExternalId(4001L);
         assertEquals(1, service.fetchGrowthRecords(asset).size());
-        verify(weighingClient).fetchByCattleNo(eq("4001"), any(), any());
+        verify(weighingClient).fetchByCattleId(eq(4001L), any(), any());
     }
 
     @Test
-    @DisplayName("无 external_id 不请求接口")
-    void fetchWhenNoExternalId()
+    @DisplayName("体高曲线读本地生长子表")
+    void fetchGrowthChartHeight()
     {
-        when(properties.isEnabled()).thenReturn(true);
-        assertEquals(0, service.fetchGrowthRecords(new BizYakAsset()).size());
+        BizYakGrowthRecord row = new BizYakGrowthRecord();
+        row.setHeightCm(new BigDecimal("95"));
+        row.setDataKind(YakAssetRules.DATA_KIND_ACTUAL);
+        when(growthRecordMapper.selectByYakAssetId(1L)).thenReturn(Collections.singletonList(row));
+
+        BizYakAsset asset = new BizYakAsset();
+        asset.setId(1L);
+        YakAssetGrowthChartVo chart = service.fetchGrowthChart(asset, "height");
+        assertEquals(1, chart.getActual().size());
     }
 }

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

@@ -16,12 +16,12 @@ import com.ruoyi.web.modules.industryservice.domain.vo.YakAssetGrowthChartVo;
 class YakAssetGrowthSupportTest
 {
     @Test
-    @DisplayName("称重 cattleNo 参数取 external_id")
-    void resolveWeighingCattleNoParam()
+    @DisplayName("称重 cattleId 参数取 external_id")
+    void resolveWeighingCattleIdParam()
     {
         BizYakAsset asset = new BizYakAsset();
         asset.setExternalId(4001L);
-        assertEquals("4001", YakAssetGrowthSupport.resolveWeighingCattleNoParam(asset));
+        assertEquals(4001L, YakAssetGrowthSupport.resolveWeighingCattleIdParam(asset));
     }
 
     @Test
@@ -41,11 +41,24 @@ class YakAssetGrowthSupportTest
     }
 
     @Test
-    @DisplayName("非体重指标曲线为空")
-    void toGrowthChartNonWeight()
+    @DisplayName("体高指标从生长记录组装曲线")
+    void toGrowthChartHeight()
     {
         BizYakGrowthRecord row = new BizYakGrowthRecord();
-        row.setHeightCm(new BigDecimal("120"));
+        row.setDayAge(120);
+        row.setHeightCm(new BigDecimal("95"));
+        row.setDataKind(YakAssetRules.DATA_KIND_ACTUAL);
+        YakAssetGrowthChartVo chart = YakAssetGrowthSupport.toGrowthChart(Collections.singletonList(row), "height");
+        assertEquals(1, chart.getActual().size());
+        assertEquals(new BigDecimal("95"), chart.getActual().get(0).getValue());
+    }
+
+    @Test
+    @DisplayName("体高指标无数据时曲线为空")
+    void toGrowthChartHeightEmpty()
+    {
+        BizYakGrowthRecord row = new BizYakGrowthRecord();
+        row.setWeightKg(new BigDecimal("200"));
         YakAssetGrowthChartVo chart = YakAssetGrowthSupport.toGrowthChart(Collections.singletonList(row), "height");
         assertEquals(0, chart.getActual().size());
     }