调整格式

Lawrence

2021-01-10 68cad9a953450069748435e7bf219895c0efaaba

调整格式

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

@@ -21,15 +21,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/storager/dao/DeviceMapper.java

@@ -44,7 +44,6 @@
            ")")
    int add(Device device);


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

 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");

 web_src/src/components/channelList.vue

@@ -101,7 +101,7 @@
            total: 0,
            beforeUrl: "/videoList",
            isLoging: false,
            autoList: false
            autoList: true
        };
    },

@@ -181,7 +181,7 @@

        //通知设备上传媒体流
        sendDevicePush: function (itemData) {
            console.log(itemData)
            console.log(itemData);
            let deviceId = this.deviceId;
            this.isLoging = true;
            let channelId = itemData.channelId;