对接畜牧监控

baqing-admin/src/main/java/com/ruoyi/web/modules/video/controller/BizLivestockMonitorController.java

@@ -132,6 +132,6 @@ public class BizLivestockMonitorController extends BaseController
     @PostMapping("/sync")
     public AjaxResult sync()
     {
-        return success(bizLivestockMonitorService.syncFromThirdParty());
+        return success(bizLivestockMonitorService.syncFromThirdParty(getUsername()));
     }
 }

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

@@ -54,9 +54,10 @@ public interface IBizLivestockMonitorService
     /**
      * 从第三方生产管理系统同步监控点位。
      *
+     * @param operator 当前操作人（点击同步按钮的用户）
      * @return 新增/更新/失败条数、失败明细、同步完成时间
      */
-    YakAssetSyncResultVo syncFromThirdParty();
+    YakAssetSyncResultVo syncFromThirdParty(String operator);
 
     /**
      * 按摄像头 ID 拉取实时播放地址（调用第三方 play-url 接口，不落库）。

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

@@ -36,10 +36,12 @@ public class LivestockMonitorSyncService
     /**
      * 从第三方拉取监控列表并落库。
      *
+     * @param operator 当前操作人（点击同步的用户名）
      * @return 同步统计（新增/更新/失败条数、失败明细、同步时间）
      */
-    public YakAssetSyncResultVo syncFromThirdParty()
+    public YakAssetSyncResultVo syncFromThirdParty(String operator)
     {
+        String syncBy = StringUtils.isNotEmpty(operator) ? operator.trim() : "";
         if (!syncing.compareAndSet(false, true))
         {
             throw new ServiceException(LivestockMonitorSyncRules.MSG_SYNC_IN_PROGRESS);
@@ -70,7 +72,7 @@ public class LivestockMonitorSyncService
             {
                 try
                 {
-                    boolean inserted = livestockMonitorSyncTxService.persistCamera(dto, syncTime);
+                    boolean inserted = livestockMonitorSyncTxService.persistCamera(dto, syncTime, syncBy);
                     if (inserted)
                     {
                         result.setInsertCount(result.getInsertCount() + 1);

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

@@ -39,11 +39,13 @@ public class LivestockMonitorSyncTxService
      *
      * @param dto      开放接口单条摄像头数据
      * @param syncTime 本次同步批次时间
+     * @param operator 当前操作人（写入 create_by / update_by）
      * @return true=新增，false=更新
      */
     @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
-    public boolean persistCamera(OpenCameraDto dto, Date syncTime)
+    public boolean persistCamera(OpenCameraDto dto, Date syncTime, String operator)
     {
+        String syncBy = StringUtils.isNotEmpty(operator) ? operator.trim() : "";
         if (dto == null || dto.getCameraId() == null)
         {
             throw new ServiceException(LivestockMonitorSyncRules.MSG_CAMERA_ID_REQUIRED);
@@ -61,13 +63,13 @@ public class LivestockMonitorSyncTxService
         row.setVideoSource(videoSource);
         row.setOwnerName(trimToNull(dto.getFarmName(), 64));
         row.setDelFlag(LivestockMonitorRules.DEL_FLAG_NORMAL);
-        row.setUpdateBy("sync");
+        row.setUpdateBy(syncBy);
 
         BizLivestockMonitor existing = bizLivestockMonitorMapper.selectBizLivestockMonitorByMonitorId(monitorId);
         Date now = syncTime != null ? syncTime : new Date();
         if (existing == null)
         {
-            row.setCreateBy("sync");
+            row.setCreateBy(syncBy);
             row.setCreateTime(now);
             bizLivestockMonitorMapper.insertBizLivestockMonitor(row);
             return true;

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

@@ -231,11 +231,11 @@ public class BizLivestockMonitorServiceImpl implements IBizLivestockMonitorServi
                 cleaned.toArray(new Long[0]), updateBy);
     }
 
-    /** {@inheritDoc} 委托 {@link LivestockMonitorSyncService} */
+    /** {@inheritDoc} */
     @Override
-    public YakAssetSyncResultVo syncFromThirdParty()
+    public YakAssetSyncResultVo syncFromThirdParty(String operator)
     {
-        return livestockMonitorSyncService.syncFromThirdParty();
+        return livestockMonitorSyncService.syncFromThirdParty(operator);
     }
 
     /** {@inheritDoc} */

baqing-admin/src/test/java/com/ruoyi/web/modules/video/controller/BizLivestockMonitorControllerApiTest.java

@@ -190,7 +190,7 @@ class BizLivestockMonitorControllerApiTest
     {
         YakAssetSyncResultVo vo = new YakAssetSyncResultVo();
         vo.setInsertCount(2);
-        when(bizLivestockMonitorService.syncFromThirdParty()).thenReturn(vo);
+        when(bizLivestockMonitorService.syncFromThirdParty("tester")).thenReturn(vo);
         mockMvc.perform(post("/videoSurveillance/livestockMonitor/sync"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.code").value(200))

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

@@ -38,7 +38,7 @@ class LivestockMonitorSyncServiceTest
     void syncDisabled()
     {
         when(thirdPartyCameraClient.fetchAllCameras()).thenThrow(new ServiceException("第三方监控同步未启用"));
-        assertThrows(ServiceException.class, () -> livestockMonitorSyncService.syncFromThirdParty());
+        assertThrows(ServiceException.class, () -> livestockMonitorSyncService.syncFromThirdParty("tester"));
     }
 
     @Test
@@ -46,7 +46,7 @@ class LivestockMonitorSyncServiceTest
     void syncEmpty()
     {
         when(thirdPartyCameraClient.fetchAllCameras()).thenReturn(Collections.emptyList());
-        YakAssetSyncResultVo result = livestockMonitorSyncService.syncFromThirdParty();
+        YakAssetSyncResultVo result = livestockMonitorSyncService.syncFromThirdParty("tester");
         assertNotNull(result.getSyncTime());
         assertEquals(0, result.getInsertCount());
     }
@@ -64,8 +64,8 @@ class LivestockMonitorSyncServiceTest
         camera2.setDeviceName("监控2");
         camera2.setVideoSource("ys7");
         when(thirdPartyCameraClient.fetchAllCameras()).thenReturn(Arrays.asList(camera1, camera2));
-        when(livestockMonitorSyncTxService.persistCamera(any(), any())).thenReturn(true, false);
-        YakAssetSyncResultVo result = livestockMonitorSyncService.syncFromThirdParty();
+        when(livestockMonitorSyncTxService.persistCamera(any(), any(), any())).thenReturn(true, false);
+        YakAssetSyncResultVo result = livestockMonitorSyncService.syncFromThirdParty("tester");
         assertEquals(1, result.getInsertCount());
         assertEquals(1, result.getUpdateCount());
         assertEquals(0, result.getFailCount());
@@ -80,9 +80,9 @@ class LivestockMonitorSyncServiceTest
         camera.setDeviceName("监控1");
         camera.setVideoSource("wvp");
         when(thirdPartyCameraClient.fetchAllCameras()).thenReturn(Collections.singletonList(camera));
-        when(livestockMonitorSyncTxService.persistCamera(any(), any()))
+        when(livestockMonitorSyncTxService.persistCamera(any(), any(), any()))
                 .thenThrow(new ServiceException("视频来源不能为空"));
-        YakAssetSyncResultVo result = livestockMonitorSyncService.syncFromThirdParty();
+        YakAssetSyncResultVo result = livestockMonitorSyncService.syncFromThirdParty("tester");
         assertEquals(1, result.getFailCount());
         assertEquals(1, result.getFailMessages().size());
     }
@@ -96,14 +96,14 @@ class LivestockMonitorSyncServiceTest
         camera.setDeviceName("监控1");
         camera.setVideoSource("wvp");
         when(thirdPartyCameraClient.fetchAllCameras()).thenReturn(Collections.singletonList(camera));
-        when(livestockMonitorSyncTxService.persistCamera(any(), any())).thenAnswer(invocation -> {
+        when(livestockMonitorSyncTxService.persistCamera(any(), any(), any())).thenAnswer(invocation -> {
             Thread.sleep(200);
             return true;
         });
-        Thread t1 = new Thread(() -> livestockMonitorSyncService.syncFromThirdParty());
+        Thread t1 = new Thread(() -> livestockMonitorSyncService.syncFromThirdParty("tester"));
         t1.start();
         Thread.sleep(50);
-        ServiceException ex = assertThrows(ServiceException.class, () -> livestockMonitorSyncService.syncFromThirdParty());
+        ServiceException ex = assertThrows(ServiceException.class, () -> livestockMonitorSyncService.syncFromThirdParty("tester2"));
         assertEquals(LivestockMonitorSyncRules.MSG_SYNC_IN_PROGRESS, ex.getMessage());
         t1.join();
     }