生物防控人员

huimv-admin/src/main/java/com/huimv/admin/controller/BaseSpecificVideoController.java

@@ -8,10 +8,11 @@ import com.huimv.admin.entity.BaseSpecificVideo;
 import com.huimv.admin.entity.CameraBase;
 import com.huimv.admin.service.IBaseSpecificVideoService;
 import com.huimv.admin.service.ICameraBaseService;
-import javafx.scene.Camera;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * <p>
  * 前端控制器
@@ -32,8 +33,9 @@ public class BaseSpecificVideoController {
 
     @PostMapping("/add")
     public Result add(@RequestBody BaseSpecificVideo baseFarmX) {
-        CameraBase byId = cameraService.getById(baseFarmX.getVideoId());
+        CameraBase byId = cameraService.getOne(new QueryWrapper<CameraBase>().eq("camera_uuid",baseFarmX.getVideoId()));
         baseFarmX.setVideoName(byId.getCameraName());
+        baseFarmX.setVideoIds(byId.getId());
         baseSpecificVideoService.save(baseFarmX);
         return new Result(ResultCode.SUCCESS);
     }
@@ -55,8 +57,12 @@ public class BaseSpecificVideoController {
 
     @GetMapping("/list")
     public Result list(@RequestParam(name = "farmId") Integer farmId) {
-
-        return new Result(ResultCode.SUCCESS, baseSpecificVideoService.list(new QueryWrapper<BaseSpecificVideo>().eq("farm_id", farmId)));
+        List<BaseSpecificVideo> farm_id = baseSpecificVideoService.list(new QueryWrapper<BaseSpecificVideo>().eq("farm_id", farmId));
+        for (BaseSpecificVideo baseSpecificVideo : farm_id) {
+            CameraBase byId = cameraService.getOne(new QueryWrapper<CameraBase>().eq("camera_uuid",baseSpecificVideo.getVideoId()));
+            baseSpecificVideo.setVideoIds(byId.getId());
+        }
+        return new Result(ResultCode.SUCCESS,farm_id);
     }
 
     @GetMapping("/listSpecif")

huimv-admin/src/main/java/com/huimv/admin/entity/BaseSpecificVideo.java

@@ -25,7 +25,8 @@ public class BaseSpecificVideo extends Model {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    private Integer videoId;
+    private String videoId;
+    private Integer videoIds;
 
     private Integer type;