Browse Source

调整格式

pull/29/head
Lawrence 4 years ago
parent
commit
68cad9a953
  1. 9
      src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
  2. 1
      src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
  3. 1
      src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
  4. 4
      web_src/src/components/channelList.vue

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

@ -21,15 +21,6 @@ public interface DeviceChannelMapper {
"'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status})") "'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status})")
int add(DeviceChannel channel); 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(value = {" <script>" +
"UPDATE device_channel " + "UPDATE device_channel " +
"SET deviceId='${deviceId}'" + "SET deviceId='${deviceId}'" +

1
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java

@ -44,7 +44,6 @@ public interface DeviceMapper {
")") ")")
int add(Device device); int add(Device device);
@Update(value = {" <script>" + @Update(value = {" <script>" +
"UPDATE device " + "UPDATE device " +
"SET deviceId='${deviceId}'" + "SET deviceId='${deviceId}'" +

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

@ -169,7 +169,6 @@ public class PlayController {
// 超时处理 // 超时处理
result.onTimeout(()->{ result.onTimeout(()->{
logger.warn(String.format("设备预览/回放停止超时,streamId:%s ", streamId)); logger.warn(String.format("设备预览/回放停止超时,streamId:%s ", streamId));
RequestMessage msg = new RequestMessage(); RequestMessage msg = new RequestMessage();
msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid); msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
msg.setData("Timeout"); msg.setData("Timeout");

4
web_src/src/components/channelList.vue

@ -101,7 +101,7 @@ export default {
total: 0, total: 0,
beforeUrl: "/videoList", beforeUrl: "/videoList",
isLoging: false, isLoging: false,
autoList: false autoList: true
}; };
}, },
@ -181,7 +181,7 @@ export default {
// //
sendDevicePush: function (itemData) { sendDevicePush: function (itemData) {
console.log(itemData) console.log(itemData);
let deviceId = this.deviceId; let deviceId = this.deviceId;
this.isLoging = true; this.isLoging = true;
let channelId = itemData.channelId; let channelId = itemData.channelId;

Loading…
Cancel
Save