相机表字段修改

business-service/src/main/java/com/ozs/entity/BaseCameraManagement.java

@@ -215,7 +215,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 分组
      */
     @Excel(name = "分组")
-    private String grouping;
+    private String grou;
     /**
      * 排序
      */

business-service/src/main/java/com/ozs/entity/vo/BaseCameraManagementVos.java

@@ -102,7 +102,7 @@ public class BaseCameraManagementVos implements Serializable {
      * 分组
      */
     @Excel(name = "分组")
-    private String grouping;
+    private String grou;
     /**
      * 排序
      */

business-service/src/main/java/com/ozs/utils/CameraUtil.java

@@ -1411,7 +1411,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         if (!ObjectUtils.isEmpty(baseCameraManagement)) {
             //找出同一分组的相机
             List<BaseCameraManagement> list = baseCameraManagementService.list(new LambdaQueryWrapper<BaseCameraManagement>()
-                    .eq(BaseCameraManagement::getGrouping, baseCameraManagement.getGrouping()).orderByDesc(BaseCameraManagement::getSort));
+                    .eq(BaseCameraManagement::getGrou, baseCameraManagement.getGrou()).orderByDesc(BaseCameraManagement::getSort));
             if (!ObjectUtils.isEmpty(list)) {
                 return list;
             } else {

vehicle-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -980,7 +980,7 @@ public class GeoHazardMonitorTokenController {
                                 }
                                 BaseCameraManagement idOne = baseCameraManagementService.getById(list1.get(0).getId());
                                 BaseCameraManagement idTwo = baseCameraManagementService.getById(list1.get(1).getId());
-                                if (idOne.getGrouping().equals(idTwo.getGrouping())) {
+                                if (idOne.getGrou().equals(idTwo.getGrou())) {
                                     break;
                                 }
                             }
@@ -1099,7 +1099,7 @@ public class GeoHazardMonitorTokenController {
                             }
                             BaseCameraManagement idOne = baseCameraManagementService.getById(list1.get(0).getId());
                             BaseCameraManagement idTwo = baseCameraManagementService.getById(list1.get(1).getId());
-                            if (idOne.getGrouping().equals(idTwo.getGrouping())) {
+                            if (idOne.getGrou().equals(idTwo.getGrou())) {
                                 break;
                             }
                         }