与2.0同步修改

Lawrence

2021-01-11 8801c7741bc0828425251327a62f6e20dada4132

与2.0同步修改

 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java

@@ -19,15 +19,6 @@
            "'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status})")
    int add(DeviceChannel channel);

//    @Update("UPDATE device_channel " +
//            "SET name=#{name}, manufacture=#{manufacture}, model=#{model}, owner=#{owner}, civilCode=#{civilCode}, " +
//            "block=#{block}, address=#{address}, parental=#{parental}, parentId=#{parentId}, safetyWay=#{safetyWay}, " +
//            "registerWay=#{registerWay}, certNum=#{certNum}, certifiable=#{certifiable}, errCode=#{errCode}, secrecy=#{secrecy}, " +
//            "ipAddress=#{ipAddress}, port=#{port}, password=#{password}, PTZType=#{PTZType}, status=#{status}, streamId=#{streamId}, " +
//            "hasAudio=#{hasAudio}" +
//            "WHERE deviceId=#{deviceId} AND channelId=#{channelId}")


    @Update(value = {" <script>" +
            "UPDATE device_channel " +
            "SET deviceId='${deviceId}'" +

 src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java

@@ -63,13 +63,6 @@

    /**
     * 分页查询通道数
     * @param deviceId 设备id
     * @param page 当前页
     * @param count 每页条数
     * @return 通道列表
     */
    /**
     * 分页查询通道数
     *
     * @param deviceId 设备id
     * @param page 当前页

 src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java

@@ -169,7 +169,6 @@
        // 超时处理
        result.onTimeout(()->{
            logger.warn(String.format("设备预览/回放停止超时，streamId：%s ", streamId));

            RequestMessage msg = new RequestMessage();
            msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
            msg.setData("Timeout");

 src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java

@@ -39,8 +39,6 @@
    @Autowired
    private IRedisCatchStorage redisCatchStorage;

    private boolean closeWaitRTPInfo = false;


    @Autowired
    private ZLMRESTfulUtils zlmresTfulUtils;