增加视频绑定删除功能

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java

@@ -333,7 +333,13 @@ public class EquipmentSpecificController extends AbstractBaseController {
     public ResponseModel videoOnEquipmentSpecific(@RequestBody VideoOnEquipmentSpecificVo videoOnEquipmentSpecificVo) {
         return CommonResponseUtil.success(equipmentSpecificSerivce.videoOnEquipmentSpecific(videoOnEquipmentSpecificVo));
     }
+    @RequestMapping(value = "/delVideoOnEquipmentSpecific/{equipmentSpecificId}/{videoId}", method = RequestMethod.POST)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "摄像头解绑设备", notes = "摄像头绑定设备")
+    public ResponseModel delVideoOnEquipmentSpecific( @PathVariable Long equipmentSpecificId, @PathVariable Long videoId) {
 
+        return CommonResponseUtil.success(equipmentSpecificSerivce.delVideoOnEquipmentSpecific(equipmentSpecificId,videoId));
+    }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/{buildingId}/list")

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentSpecificSerivce.java

@@ -16,6 +16,7 @@ import com.yeejoin.equipmanage.common.entity.vo.ComplementCodeVO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
 import com.yeejoin.equipmanage.common.entity.vo.SourceNameByEquipSpeIdVO;
 import com.yeejoin.equipmanage.common.vo.*;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -215,5 +216,6 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
      * @return
      */
     Boolean videoOnEquipmentSpecific(VideoOnEquipmentSpecificVo videoOnEquipmentSpecificVo);
+    Boolean delVideoOnEquipmentSpecific(Long equipmentSpecificId,  Long videoId);
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1768,6 +1768,15 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         }
     }
 
+    @Override
+    public Boolean delVideoOnEquipmentSpecific(Long equipmentSpecificId, Long videoId) {
+        QueryWrapper<VideoEquipmentSpecific> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("equipment_specific_id", equipmentSpecificId);
+        queryWrapper.eq("video_id", videoId);
+        videoEquipmentSpecificService.remove(queryWrapper);
+        return true;
+    }
+
     private Boolean bingEquipmentRelationshipToVideo(List<Long> videoIdList, Long equipmentSpecificId) {
         List<VideoEquipmentSpecific> videoSpecificList = new ArrayList<>();
         videoIdList.parallelStream().forEach(x -> {

amos-boot-system-equip/src/main/resources/mapper/VideoMapper.xml

@@ -160,7 +160,7 @@
          select
         vid.id,
         vid.token,
-        vid.remark as name,
+        vid.name as name,
         vid.url,
         vid.code,
         vid.preset_position as presetPosition