item：添加摄像头绑定设备

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/VideoOnEquipmentSpecificVo.java

+package com.yeejoin.equipmanage.common.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ProjectName: amos-biz-boot
+ * @Package: com.yeejoin.equipmanage.common.vo
+ * @ClassName: VideoOnEquipmentSpecificVo
+ * @Author: Jianqiang Gao
+ * @Description: 摄像头绑定设备
+ * @Date: 2022/1/7 17:35
+ * @Version: 1.0
+ */
+@Data
+public class VideoOnEquipmentSpecificVo {
+
+    /**
+     * 设备ID
+     */
+    private Long equipmentSpecificId;
+
+    /**
+     * 摄像头Id集合
+     */
+    private List<Long> videoIdList;
+}
\ No newline at end of file

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

 package com.yeejoin.equipmanage.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.equipmanage.common.dto.EquipmentSpecificDto;
 import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
@@ -29,16 +7,28 @@ import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
 import com.yeejoin.equipmanage.common.entity.dto.SourceNameListDTO;
 import com.yeejoin.equipmanage.common.entity.vo.ComplementCodeVO;
-import com.yeejoin.equipmanage.common.entity.vo.DetailPaneVO;
 import com.yeejoin.equipmanage.common.entity.vo.SourceNameByEquipSpeIdVO;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
 import com.yeejoin.equipmanage.common.vo.EquipmentOnCarVo;
+import com.yeejoin.equipmanage.common.vo.VideoOnEquipmentSpecificVo;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
 import com.yeejoin.equipmanage.service.IEquipmentDetailService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author ZeHua Li
@@ -153,8 +143,8 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @RequestMapping(value = "/getOneCard", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "组装组态使用装备卡片数据")
-    public Object getOneCard(Long id , String type) {
-        return equipmentSpecificSerivce.getOneCard(id , type);
+    public Object getOneCard(Long id, String type) {
+        return equipmentSpecificSerivce.getOneCard(id, type);
     }
 
     /**
@@ -240,31 +230,33 @@ public class EquipmentSpecificController extends AbstractBaseController {
 
     /**
      * 根据specificId删除装备相关数据
+     *
      * @param specificId id
      * @return ResponseModel
      */
     @DeleteMapping(value = "/delEquipmentBySpecificId")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation( value = "删除装备相关所有数据", notes = "删除装备相关所有数据")
+    @ApiOperation(value = "删除装备相关所有数据", notes = "删除装备相关所有数据")
     public ResponseModel delEquipmentBySpecificId(@RequestParam Long specificId) {
         return CommonResponseUtil.success(equipmentSpecificSerivce.delEquipmentBySpecificId(specificId));
     }
-    
+
     /**
      * 根据specificIds删除装备相关数据
+     *
      * @param specificIds id
      * @return ResponseModel
      */
     @DeleteMapping(value = "/delAllEquipmentBySpecificIds")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation( value = "批量删除装备相关所有数据", notes = "批量删除装备相关所有数据")
+    @ApiOperation(value = "批量删除装备相关所有数据", notes = "批量删除装备相关所有数据")
     public ResponseModel delEquipmentBySpecificId(@RequestBody List<Long> specificIds) {
-    	if(ObjectUtils.isEmpty(specificIds)){
-    		 return CommonResponseUtil.failure("参数为空");
-    	}
-    	specificIds.forEach(specificId->{
-    		equipmentSpecificSerivce.delEquipmentBySpecificId(specificId);
-    	});
+        if (ObjectUtils.isEmpty(specificIds)) {
+            return CommonResponseUtil.failure("参数为空");
+        }
+        specificIds.forEach(specificId -> {
+            equipmentSpecificSerivce.delEquipmentBySpecificId(specificId);
+        });
         return CommonResponseUtil.success();
     }
 
@@ -274,4 +266,11 @@ public class EquipmentSpecificController extends AbstractBaseController {
     public ResponseModel getFessIndexDetails() {
         return CommonResponseUtil.success(equipmentSpecificSerivce.getFessIndexDetails());
     }
+
+    @RequestMapping(value = "/videoOnEquipmentSpecific", method = RequestMethod.POST)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "摄像头绑定设备", notes = "摄像头绑定设备")
+    public ResponseModel videoOnEquipmentSpecific(@RequestBody VideoOnEquipmentSpecificVo videoOnEquipmentSpecificVo) {
+        return CommonResponseUtil.success(equipmentSpecificSerivce.videoOnEquipmentSpecific(videoOnEquipmentSpecificVo));
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/VideoEquipmentSpecificMapper.java

@@ -3,6 +3,9 @@ package com.yeejoin.equipmanage.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.equipmanage.common.entity.VideoEquipmentSpecific;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @author ZeHua Li
@@ -11,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface VideoEquipmentSpecificMapper extends BaseMapper<VideoEquipmentSpecific> {
+    List<VideoEquipmentSpecific> findBySpecificIdAndVideoIdIn(@Param("equipmentSpecificId") Long equipmentSpecificId, @Param("list") List<Long> videoIdList);
 }

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

 package com.yeejoin.equipmanage.service;
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,14 +12,13 @@ import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
 import com.yeejoin.equipmanage.common.entity.vo.ComplementCodeVO;
-import com.yeejoin.equipmanage.common.entity.vo.DetailPaneVO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
 import com.yeejoin.equipmanage.common.entity.vo.SourceNameByEquipSpeIdVO;
-import com.yeejoin.equipmanage.common.vo.EquipFor3DVO;
-import com.yeejoin.equipmanage.common.vo.EquipmentDate;
-import com.yeejoin.equipmanage.common.vo.EquipmentDetailVo;
-import com.yeejoin.equipmanage.common.vo.EquipmentOnCarVo;
-import com.yeejoin.equipmanage.common.vo.EquipmentSpecific3dVo;
+import com.yeejoin.equipmanage.common.vo.*;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author ZeHua Li
@@ -168,30 +163,41 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
 
     /**
      * 根据specificId删除相关数据
+     *
      * @param specificId specificId
      * @return Boolean
      */
     Boolean delEquipmentBySpecificId(Long specificId);
-    
-	  /**
-	  * 集成页面刷新，发送数据时调用
-	  * @param systemTypeCode
-	  */
-      void integrationPageSysDataRefresh(String systemTypeCode);
-      
-      /**
-       * 更新设备表实时指标状态
-       * @param indexs
-       */
-      void updateEquipmentSpecIndexRealtimeData(List<EquipmentSpecificIndex> indexs);
-    
-   
-    
+
+    /**
+     * 集成页面刷新，发送数据时调用
+     *
+     * @param systemTypeCode
+     */
+    void integrationPageSysDataRefresh(String systemTypeCode);
+
+    /**
+     * 更新设备表实时指标状态
+     *
+     * @param indexs
+     */
+    void updateEquipmentSpecIndexRealtimeData(List<EquipmentSpecificIndex> indexs);
+
+
     List<EquipmentSpecificVo> getEquipAndCarIotcodeByIotcode(String iotCode);
 
     /**
      * 获取中州环境监测指标详情
+     *
      * @return
      */
     Map<String, List<Map<String, String>>> getFessIndexDetails();
+
+    /**
+     * 设备绑定摄像头
+     *
+     * @param videoOnEquipmentSpecificVo
+     * @return
+     */
+    Boolean videoOnEquipmentSpecific(VideoOnEquipmentSpecificVo videoOnEquipmentSpecificVo);
 }

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

@@ -3,10 +3,19 @@ package com.yeejoin.equipmanage.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.equipmanage.common.entity.VideoEquipmentSpecific;
 
+import java.util.List;
+
 /**
  * @author ZeHua Li
  * @date 2020/11/23 15:42
  * @since v2.0
  */
 public interface IVideoEquipmentSpecificService extends IService<VideoEquipmentSpecific> {
+    /**
+     * 获取设备或摄像头ID绑定集合
+     * @param equipmentSpecificId
+     * @param videoIdList
+     * @return
+     */
+    List<VideoEquipmentSpecific> findBySpecificIdAndVideoIdIn(Long equipmentSpecificId, List<Long> videoIdList);
 }

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

@@ -12,6 +12,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.yeejoin.equipmanage.common.entity.*;
+import com.yeejoin.equipmanage.common.vo.*;
+import com.yeejoin.equipmanage.service.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -39,23 +42,6 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipment;
 import com.yeejoin.equipmanage.common.dto.EquipmentSpecificDto;
 import com.yeejoin.equipmanage.common.dto.UserDto;
-import com.yeejoin.equipmanage.common.entity.EquProperty;
-import com.yeejoin.equipmanage.common.entity.Equipment;
-import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
-import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
-import com.yeejoin.equipmanage.common.entity.EquipmentIndex;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
-import com.yeejoin.equipmanage.common.entity.EquipmentSystemSourceStatistics;
-import com.yeejoin.equipmanage.common.entity.Stock;
-import com.yeejoin.equipmanage.common.entity.StockBill;
-import com.yeejoin.equipmanage.common.entity.StockBillDetail;
-import com.yeejoin.equipmanage.common.entity.StockDetail;
-import com.yeejoin.equipmanage.common.entity.UploadFile;
-import com.yeejoin.equipmanage.common.entity.Video;
-import com.yeejoin.equipmanage.common.entity.Warehouse;
-import com.yeejoin.equipmanage.common.entity.WarehouseStructure;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
 import com.yeejoin.equipmanage.common.entity.vo.AlamVideoVO;
 import com.yeejoin.equipmanage.common.entity.vo.AlarmInfoVO;
@@ -85,11 +71,6 @@ import com.yeejoin.equipmanage.common.exception.BaseException;
 import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.utils.QRCodeUtil;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
-import com.yeejoin.equipmanage.common.vo.EquipFor3DVO;
-import com.yeejoin.equipmanage.common.vo.EquipmentDate;
-import com.yeejoin.equipmanage.common.vo.EquipmentDetailVo;
-import com.yeejoin.equipmanage.common.vo.EquipmentOnCarVo;
-import com.yeejoin.equipmanage.common.vo.EquipmentSpecific3dVo;
 import com.yeejoin.equipmanage.config.EquipmentIotMqttReceiveConfig;
 import com.yeejoin.equipmanage.fegin.VideoFeignClient;
 import com.yeejoin.equipmanage.mapper.EquipmentIndexMapper;
@@ -97,25 +78,6 @@ import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmMapper;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
 import com.yeejoin.equipmanage.mapper.UploadFileMapper;
 import com.yeejoin.equipmanage.mapper.VideoMapper;
-import com.yeejoin.equipmanage.service.IEquPropertyService;
-import com.yeejoin.equipmanage.service.IEquipmentCategoryService;
-import com.yeejoin.equipmanage.service.IEquipmentDetailService;
-import com.yeejoin.equipmanage.service.IEquipmentIndexService;
-import com.yeejoin.equipmanage.service.IEquipmentService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexSerivce;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
-import com.yeejoin.equipmanage.service.IEquipmentSystemSourceStatisticsService;
-import com.yeejoin.equipmanage.service.IFireFightingSystemService;
-import com.yeejoin.equipmanage.service.IStockBillDetailService;
-import com.yeejoin.equipmanage.service.IStockBillService;
-import com.yeejoin.equipmanage.service.IStockDetailService;
-import com.yeejoin.equipmanage.service.IStockService;
-import com.yeejoin.equipmanage.service.ISyncDataService;
-import com.yeejoin.equipmanage.service.ISystemDicService;
-import com.yeejoin.equipmanage.service.IUploadFileService;
-import com.yeejoin.equipmanage.service.IVideoService;
-import com.yeejoin.equipmanage.service.IWarehouseService;
-import com.yeejoin.equipmanage.service.IWarehouseStructureService;
 import com.yeejoin.equipmanage.utils.RelationRedisUtil;
 
 /**
@@ -184,6 +146,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Autowired
     private IVideoService videoService;
 
+    @Autowired
+    private IVideoEquipmentSpecificService videoEquipmentSpecificService;
+
     @Value("${systemctl.dict.iot-core-param}")
     private String iotCoreParam;
 
@@ -1659,4 +1624,46 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         map.put("tropics", tropicsIndexDetails);
         return map;
     }
+
+    @Override
+    public Boolean videoOnEquipmentSpecific(VideoOnEquipmentSpecificVo videoOnEquipmentSpecificVo) {
+        Long equipmentSpecificId = videoOnEquipmentSpecificVo.getEquipmentSpecificId();
+        List<Long> videoIdList = videoOnEquipmentSpecificVo.getVideoIdList();
+        if (equipmentSpecificId != null && !CollectionUtils.isEmpty(videoIdList)) {
+            EquipmentSpecific equipmentSpecific = this.baseMapper.selectById(equipmentSpecificId);
+            if (!ObjectUtils.isEmpty(equipmentSpecific)) {
+                 List<VideoEquipmentSpecific> videoSpecificList = new ArrayList<>();
+                List<VideoEquipmentSpecific> list = videoEquipmentSpecificService.findBySpecificIdAndVideoIdIn(equipmentSpecificId, videoIdList);
+                if (!CollectionUtils.isEmpty(list)) {
+                    List<Long> collect = list.stream().map(VideoEquipmentSpecific::getVideoId).collect(Collectors.toList());
+                    //  videoIdList - collect
+                    List<Long> reduce = videoIdList.stream().filter(item -> !collect.contains(item)).collect(Collectors.toList());
+                    if (!CollectionUtils.isEmpty(reduce)) {
+                        reduce.parallelStream().forEach(x -> {
+                            VideoEquipmentSpecific videoEquipmentSpecific = new VideoEquipmentSpecific();
+                            videoEquipmentSpecific.setVideoId(x);
+                            videoEquipmentSpecific.setEquipmentSpecificId(equipmentSpecificId);
+                            videoSpecificList.add(videoEquipmentSpecific);
+                        });
+                        videoEquipmentSpecificService.saveBatch(videoSpecificList);
+                        return Boolean.TRUE;
+                    }
+                } else {
+                    videoIdList.parallelStream().forEach(x -> {
+                        VideoEquipmentSpecific videoEquipmentSpecific = new VideoEquipmentSpecific();
+                        videoEquipmentSpecific.setVideoId(x);
+                        videoEquipmentSpecific.setEquipmentSpecificId(equipmentSpecificId);
+                        videoSpecificList.add(videoEquipmentSpecific);
+                    });
+                    videoEquipmentSpecificService.saveBatch(videoSpecificList);
+                    return Boolean.TRUE;
+                }
+            } else {
+                throw new RuntimeException("未获取到此设备！");
+            }
+        } else {
+            throw new RuntimeException("设备ID或摄像头ID集合为空！");
+        }
+        return Boolean.FALSE;
+    }
 }

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

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.equipmanage.common.entity.VideoEquipmentSpecific;
 import com.yeejoin.equipmanage.mapper.VideoEquipmentSpecificMapper;
 import com.yeejoin.equipmanage.service.IVideoEquipmentSpecificService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author ZeHua Li
  * @date 2020/11/23 15:43
@@ -13,4 +16,11 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class VideoEquipmentSpecificImpl extends ServiceImpl<VideoEquipmentSpecificMapper,VideoEquipmentSpecific> implements IVideoEquipmentSpecificService {
+
+    @Autowired
+    private VideoEquipmentSpecificMapper videoEquipmentSpecificMapper;
+    @Override
+    public List<VideoEquipmentSpecific> findBySpecificIdAndVideoIdIn(Long equipmentSpecificId, List<Long> videoIdList) {
+        return videoEquipmentSpecificMapper.findBySpecificIdAndVideoIdIn(equipmentSpecificId, videoIdList);
+    }
 }

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.equipmanage.mapper.VideoEquipmentSpecificMapper">
+    <select id="findBySpecificIdAndVideoIdIn" resultType="com.yeejoin.equipmanage.common.entity.VideoEquipmentSpecific">
+        SELECT
+            v.id,
+            v.equipment_specific_id AS equipmentSpecificId,
+            v.video_id AS videoId
+        FROM
+            `wl_video_equipment_specific` v
+        <where>
+            <if test="equipmentSpecificId != null">
+                v.equipment_specific_id = #{equipmentSpecificId}
+            </if>
+            <if test="list != null and list.size() >0">
+                AND v.video_id IN
+                <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+</mapper>