添加ffmpeg依赖

表结构调整
This commit is contained in:
shikong 2023-09-12 09:26:50 +08:00
parent 871ed32f43
commit d699ccb6b2
7 changed files with 172 additions and 7 deletions

View File

@ -24,6 +24,9 @@ public final class MockingDeviceDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: mocking_device.gb_device_id")
public static final SqlColumn<byte[]> gbDeviceId = mockingDevice.gbDeviceId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: mocking_device.gb_channel_id")
public static final SqlColumn<byte[]> gbChannelId = mockingDevice.gbChannelId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: mocking_device")
public static final class MockingDevice extends AliasableSqlTable<MockingDevice> {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
@ -36,6 +39,8 @@ public final class MockingDeviceDynamicSqlSupport {
public final SqlColumn<byte[]> gbDeviceId = column("gb_device_id", JDBCType.VARBINARY);
public final SqlColumn<byte[]> gbChannelId = column("gb_channel_id", JDBCType.VARBINARY);
public MockingDevice() {
super("mocking_device", MockingDevice::new);
}

View File

@ -32,7 +32,7 @@ import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
@Mapper
public interface MockingDeviceMapper extends CommonCountMapper, CommonDeleteMapper, CommonInsertMapper<MockingDevice>, CommonUpdateMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: mocking_device")
BasicColumn[] selectList = BasicColumn.columnList(id, deviceCode, name, address, gbDeviceId);
BasicColumn[] selectList = BasicColumn.columnList(id, deviceCode, name, address, gbDeviceId, gbChannelId);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: mocking_device")
@SelectProvider(type=SqlProviderAdapter.class, method="select")
@ -41,7 +41,8 @@ public interface MockingDeviceMapper extends CommonCountMapper, CommonDeleteMapp
@Result(column="device_code", property="deviceCode", jdbcType=JdbcType.VARCHAR),
@Result(column="name", property="name", jdbcType=JdbcType.VARCHAR),
@Result(column="address", property="address", jdbcType=JdbcType.VARCHAR),
@Result(column="gb_device_id", property="gbDeviceId", jdbcType=JdbcType.VARBINARY)
@Result(column="gb_device_id", property="gbDeviceId", jdbcType=JdbcType.VARBINARY),
@Result(column="gb_channel_id", property="gbChannelId", jdbcType=JdbcType.VARBINARY)
})
List<MockingDevice> selectMany(SelectStatementProvider selectStatement);
@ -75,6 +76,7 @@ public interface MockingDeviceMapper extends CommonCountMapper, CommonDeleteMapp
.map(name).toProperty("name")
.map(address).toProperty("address")
.map(gbDeviceId).toProperty("gbDeviceId")
.map(gbChannelId).toProperty("gbChannelId")
);
}
@ -86,6 +88,7 @@ public interface MockingDeviceMapper extends CommonCountMapper, CommonDeleteMapp
.map(name).toProperty("name")
.map(address).toProperty("address")
.map(gbDeviceId).toProperty("gbDeviceId")
.map(gbChannelId).toProperty("gbChannelId")
);
}
@ -97,6 +100,7 @@ public interface MockingDeviceMapper extends CommonCountMapper, CommonDeleteMapp
.map(name).toPropertyWhenPresent("name", row::getName)
.map(address).toPropertyWhenPresent("address", row::getAddress)
.map(gbDeviceId).toPropertyWhenPresent("gbDeviceId", row::getGbDeviceId)
.map(gbChannelId).toPropertyWhenPresent("gbChannelId", row::getGbChannelId)
);
}
@ -133,7 +137,8 @@ public interface MockingDeviceMapper extends CommonCountMapper, CommonDeleteMapp
.set(deviceCode).equalTo(row::getDeviceCode)
.set(name).equalTo(row::getName)
.set(address).equalTo(row::getAddress)
.set(gbDeviceId).equalTo(row::getGbDeviceId);
.set(gbDeviceId).equalTo(row::getGbDeviceId)
.set(gbChannelId).equalTo(row::getGbChannelId);
}
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: mocking_device")
@ -142,7 +147,8 @@ public interface MockingDeviceMapper extends CommonCountMapper, CommonDeleteMapp
.set(deviceCode).equalToWhenPresent(row::getDeviceCode)
.set(name).equalToWhenPresent(row::getName)
.set(address).equalToWhenPresent(row::getAddress)
.set(gbDeviceId).equalToWhenPresent(row::getGbDeviceId);
.set(gbDeviceId).equalToWhenPresent(row::getGbDeviceId)
.set(gbChannelId).equalToWhenPresent(row::getGbChannelId);
}
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: mocking_device")
@ -152,6 +158,7 @@ public interface MockingDeviceMapper extends CommonCountMapper, CommonDeleteMapp
.set(name).equalTo(row::getName)
.set(address).equalTo(row::getAddress)
.set(gbDeviceId).equalTo(row::getGbDeviceId)
.set(gbChannelId).equalTo(row::getGbChannelId)
.where(id, isEqualTo(row::getId))
);
}
@ -163,6 +170,7 @@ public interface MockingDeviceMapper extends CommonCountMapper, CommonDeleteMapp
.set(name).equalToWhenPresent(row::getName)
.set(address).equalToWhenPresent(row::getAddress)
.set(gbDeviceId).equalToWhenPresent(row::getGbDeviceId)
.set(gbChannelId).equalToWhenPresent(row::getGbChannelId)
.where(id, isEqualTo(row::getId))
);
}

View File

@ -23,6 +23,9 @@ public class MockingDevice {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: mocking_device.gb_device_id")
private byte[] gbDeviceId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: mocking_device.gb_channel_id")
private byte[] gbChannelId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: mocking_device.id")
public Long getId() {
return id;
@ -72,4 +75,14 @@ public class MockingDevice {
public void setGbDeviceId(byte[] gbDeviceId) {
this.gbDeviceId = gbDeviceId;
}
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: mocking_device.gb_channel_id")
public byte[] getGbChannelId() {
return gbChannelId;
}
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: mocking_device.gb_channel_id")
public void setGbChannelId(byte[] gbChannelId) {
this.gbChannelId = gbChannelId;
}
}

View File

@ -40,6 +40,124 @@
<artifactId>zlmediakit-service</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/org.bytedeco/javacv -->
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>javacv</artifactId>
<version>1.5.8</version>
<exclusions>
<exclusion>
<groupId>org.openjfx</groupId>
<artifactId>javafx-graphics</artifactId>
</exclusion>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>javacpp</artifactId>
</exclusion>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
</exclusion>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>opencv</artifactId>
</exclusion>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>tesseract</artifactId>
</exclusion>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>flycapture</artifactId>
</exclusion>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>libdc1394</artifactId>
</exclusion>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>libfreenect</artifactId>
</exclusion>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>libfreenect2</artifactId>
</exclusion>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>librealsense</artifactId>
</exclusion>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>librealsense2</artifactId>
</exclusion>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>videoinput</artifactId>
</exclusion>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>artoolkitplus</artifactId>
</exclusion>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>flandmark</artifactId>
</exclusion>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>leptonica</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>javacpp</artifactId>
<version>1.5.8</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.bytedeco/ffmpeg -->
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>ffmpeg</artifactId>
<version>5.1.2-1.5.8</version>
<classifier>windows-x86_64</classifier>
<exclusions>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>javacpp</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>ffmpeg</artifactId>
<version>5.1.2-1.5.8</version>
<classifier>linux-x86_64</classifier>
<exclusions>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>javacpp</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.2-jre</version>
</dependency>
<dependency>
<groupId>com.github.rholder</groupId>
<artifactId>guava-retrying</artifactId>
<version>2.0.0</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>

View File

@ -0,0 +1,15 @@
package cn.skcks.docking.gb28181.mocking.service;
import cn.skcks.docking.gb28181.mocking.orm.mybatis.dynamic.mapper.MockingDeviceMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@RequiredArgsConstructor
@Service
public class DeviceService {
private final MockingDeviceMapper deviceMapper;
}

View File

@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre-alpine
FROM eclipse-temurin:17-jre-focal
MAINTAINER Shikong <919411476@qq.com>

View File

@ -32,8 +32,8 @@ gb28181:
# 如果不明白就使用0.0.0.0,大部分情况都是可以的
# 请不要使用127.0.0.1任何包括localhost在内的域名都是不可以的。
ip:
- 10.27.0.1
- 192.168.0.195
# - 10.27.0.1
- 192.168.10.195
# - 10.10.10.20
# - 10.27.0.6
# [可选] 28181服务监听的端口
@ -47,6 +47,12 @@ gb28181:
id: 44050100002000000002
# [可选] 默认设备认证密码,后续扩展使用设备单独密码, 移除密码将不进行校验
password: 123456
server:
ip: 192.168.10.241
port: 5060
password: 123456
domain: 4405010000
id: 44050100002000000001
media:
ip: 192.168.10.32