对接畜牧监控

baqing-admin/src/main/java/com/ruoyi/web/modules/video/domain/BizLivestockMonitor.java

@@ -45,7 +45,7 @@ public class BizLivestockMonitor extends BaseEntity
     /** 所属主体主键，与 {@code ownerType} 对应 */
     private Long ownerId;
 
-    /** 主体名称冗余，便于列表展示；同步时可能仅写入 farmName 文本 */
+    /** 主体名称冗余，便于列表展示；同步时由 farmName 匹配牧场或保留文本 */
     private String ownerName;
 
     /** 圈舍名称，同步自第三方 {@code enclosureName}，可选 */

baqing-admin/src/main/java/com/ruoyi/web/modules/video/domain/dto/OpenCameraDto.java

@@ -14,7 +14,7 @@ public class OpenCameraDto
     /** 设备名称，落库 monitor_name */
     private String deviceName;
 
-    /** 养殖场名称，落库 owner_name 冗余 */
+    /** 养殖场名称，同步时按名称匹配 {@code biz_pasture} 绑定 owner */
     private String farmName;
 
     /** 圈舍名称，落库 enclosure_name */

baqing-admin/src/main/java/com/ruoyi/web/modules/video/service/LivestockMonitorSyncTxService.java

@@ -7,6 +7,8 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.web.modules.industryservice.domain.BizPasture;
+import com.ruoyi.web.modules.industryservice.mapper.BizPastureMapper;
 import com.ruoyi.web.modules.video.domain.BizLivestockMonitor;
 import com.ruoyi.web.modules.video.domain.dto.OpenCameraDto;
 import com.ruoyi.web.modules.video.mapper.BizLivestockMonitorMapper;
@@ -20,11 +22,11 @@ import com.ruoyi.web.modules.video.support.LivestockMonitorSyncRules;
  * <ul>
  *   <li>{@code cameraId} → {@code monitor_id}</li>
  *   <li>{@code deviceName} → {@code monitor_name}（空则「监控+id」，超长截断至 10 字）</li>
- *   <li>{@code farmName} → {@code owner_name}（仅文本，不绑定 owner_type/id）</li>
+ *   <li>{@code farmName} → 按名称查 {@code biz_pasture}，匹配则 {@code owner_type=1}、{@code owner_id}、{@code owner_name}</li>
  *   <li>{@code enclosureName} → {@code enclosure_name}</li>
  *   <li>{@code videoSource} → {@code video_source}（小写校验 wvp/ys7/url）</li>
  * </ul>
- * 更新时保留本地 {@code owner_type}、{@code owner_id}、{@code install_location}。
+ * 更新时保留本地 {@code install_location}；主体信息随第三方 {@code farmName} 重新解析。
  * 每条记录 {@code REQUIRES_NEW} 独立事务，单条失败不影响其它行。
  * </p>
  */
@@ -34,6 +36,9 @@ public class LivestockMonitorSyncTxService
     @Autowired
     private BizLivestockMonitorMapper bizLivestockMonitorMapper;
 
+    @Autowired
+    private BizPastureMapper bizPastureMapper;
+
     /**
      * 持久化一条第三方监控记录。
      *
@@ -61,7 +66,7 @@ public class LivestockMonitorSyncTxService
         row.setMonitorName(resolveMonitorName(dto.getDeviceName(), monitorId));
         row.setEnclosureName(trimToNull(dto.getEnclosureName(), 64));
         row.setVideoSource(videoSource);
-        row.setOwnerName(trimToNull(dto.getFarmName(), 64));
+        applyOwnerFromFarmName(row, dto.getFarmName());
         row.setDelFlag(LivestockMonitorRules.DEL_FLAG_NORMAL);
         row.setUpdateBy(syncBy);
 
@@ -75,9 +80,7 @@ public class LivestockMonitorSyncTxService
             return true;
         }
         row.setId(existing.getId());
-        // 更新时保留本地维护字段，避免覆盖手工登记的主体与安装位置
-        row.setOwnerType(existing.getOwnerType());
-        row.setOwnerId(existing.getOwnerId());
+        // 更新时保留安装位置；主体随 farmName 重新匹配牧场
         row.setInstallLocation(existing.getInstallLocation());
         row.setCreateTime(existing.getCreateTime());
         row.setCreateBy(existing.getCreateBy());
@@ -117,6 +120,36 @@ public class LivestockMonitorSyncTxService
         return name;
     }
 
+    /**
+     * 按第三方 farmName 精确匹配 {@code biz_pasture.pasture_name}，命中则绑定养殖主体。
+     */
+    private void applyOwnerFromFarmName(BizLivestockMonitor row, String farmName)
+    {
+        String name = StringUtils.trim(farmName);
+        if (StringUtils.isEmpty(name))
+        {
+            row.setOwnerType(null);
+            row.setOwnerId(null);
+            row.setOwnerName(null);
+            return;
+        }
+        if (name.length() > 64)
+        {
+            name = name.substring(0, 64);
+        }
+        BizPasture pasture = bizPastureMapper.selectBizPastureByExactName(name);
+        if (pasture != null)
+        {
+            row.setOwnerType(LivestockMonitorRules.OWNER_TYPE_PASTURE);
+            row.setOwnerId(pasture.getId());
+            row.setOwnerName(pasture.getPastureName());
+            return;
+        }
+        row.setOwnerType(null);
+        row.setOwnerId(null);
+        row.setOwnerName(name);
+    }
+
     private static String trimToNull(String value, int maxLen)
     {
         String text = StringUtils.trim(value);

baqing-admin/src/main/java/com/ruoyi/web/modules/video/support/LivestockMonitorOwnerResolver.java

@@ -17,7 +17,7 @@ import com.ruoyi.web.modules.video.domain.BizLivestockMonitor;
  * <p>
  * 手工保存时根据 {@code ownerType} + {@code ownerId} 查库校验主体有效，
  * 并将展示名称写入 {@code owner_name} 冗余字段（列表无需再 join 牧场/市场表）。
- * 第三方同步仅写入 {@code farmName} 到 {@code owner_name}，不自动绑定 {@code owner_type/id}。
+ * 第三方同步时按 {@code farmName} 查 {@code biz_pasture} 自动绑定 {@code owner_type=1}、{@code owner_id}。
  * </p>
  */
 @Component

baqing-admin/src/test/java/com/ruoyi/web/modules/video/service/LivestockMonitorSyncTxServiceTest.java

@@ -0,0 +1,86 @@
+package com.ruoyi.web.modules.video.service;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+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.web.modules.industryservice.domain.BizPasture;
+import com.ruoyi.web.modules.industryservice.mapper.BizPastureMapper;
+import com.ruoyi.web.modules.video.domain.BizLivestockMonitor;
+import com.ruoyi.web.modules.video.domain.dto.OpenCameraDto;
+import com.ruoyi.web.modules.video.mapper.BizLivestockMonitorMapper;
+import com.ruoyi.web.modules.video.support.LivestockMonitorRules;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayName("畜牧监控同步落库")
+class LivestockMonitorSyncTxServiceTest
+{
+    @Mock
+    private BizLivestockMonitorMapper bizLivestockMonitorMapper;
+
+    @Mock
+    private BizPastureMapper bizPastureMapper;
+
+    @InjectMocks
+    private LivestockMonitorSyncTxService livestockMonitorSyncTxService;
+
+    @Test
+    @DisplayName("farmName 匹配牧场时写入 owner_type=1 与 owner_id")
+    void persistCameraResolvesPastureOwner()
+    {
+        OpenCameraDto dto = new OpenCameraDto();
+        dto.setCameraId(50001L);
+        dto.setDeviceName("1号圈舍监控");
+        dto.setFarmName("示范牧场");
+        dto.setVideoSource("wvp");
+        when(bizLivestockMonitorMapper.selectBizLivestockMonitorByMonitorId("50001")).thenReturn(null);
+        BizPasture pasture = new BizPasture();
+        pasture.setId(101L);
+        pasture.setPastureName("示范牧场");
+        when(bizPastureMapper.selectBizPastureByExactName("示范牧场")).thenReturn(pasture);
+        when(bizLivestockMonitorMapper.insertBizLivestockMonitor(any())).thenReturn(1);
+
+        boolean inserted = livestockMonitorSyncTxService.persistCamera(dto, new Date(), "admin");
+        assertEquals(true, inserted);
+
+        ArgumentCaptor<BizLivestockMonitor> captor = ArgumentCaptor.forClass(BizLivestockMonitor.class);
+        verify(bizLivestockMonitorMapper).insertBizLivestockMonitor(captor.capture());
+        BizLivestockMonitor row = captor.getValue();
+        assertEquals(LivestockMonitorRules.OWNER_TYPE_PASTURE, row.getOwnerType());
+        assertEquals(101L, row.getOwnerId());
+        assertEquals("示范牧场", row.getOwnerName());
+    }
+
+    @Test
+    @DisplayName("farmName 未匹配牧场时仅保留 owner_name 文本")
+    void persistCameraFarmNameWithoutPasture()
+    {
+        OpenCameraDto dto = new OpenCameraDto();
+        dto.setCameraId(50002L);
+        dto.setDeviceName("入口监控");
+        dto.setFarmName("未知牧场");
+        dto.setVideoSource("ys7");
+        when(bizLivestockMonitorMapper.selectBizLivestockMonitorByMonitorId("50002")).thenReturn(null);
+        when(bizPastureMapper.selectBizPastureByExactName("未知牧场")).thenReturn(null);
+        when(bizLivestockMonitorMapper.insertBizLivestockMonitor(any())).thenReturn(1);
+
+        livestockMonitorSyncTxService.persistCamera(dto, new Date(), "admin");
+
+        ArgumentCaptor<BizLivestockMonitor> captor = ArgumentCaptor.forClass(BizLivestockMonitor.class);
+        verify(bizLivestockMonitorMapper).insertBizLivestockMonitor(captor.capture());
+        BizLivestockMonitor row = captor.getValue();
+        assertNull(row.getOwnerType());
+        assertNull(row.getOwnerId());
+        assertEquals("未知牧场", row.getOwnerName());
+    }
+}