diff --git a/gb28181-mocking-orm/src/main/java/cn/skcks/docking/gb28181/mocking/orm/mybatis/dynamic/mapper/MockingDeviceDynamicSqlSupport.java b/gb28181-mocking-orm/src/main/java/cn/skcks/docking/gb28181/mocking/orm/mybatis/dynamic/mapper/MockingDeviceDynamicSqlSupport.java index 3682a1c..95b50df 100644 --- a/gb28181-mocking-orm/src/main/java/cn/skcks/docking/gb28181/mocking/orm/mybatis/dynamic/mapper/MockingDeviceDynamicSqlSupport.java +++ b/gb28181-mocking-orm/src/main/java/cn/skcks/docking/gb28181/mocking/orm/mybatis/dynamic/mapper/MockingDeviceDynamicSqlSupport.java @@ -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 gbDeviceId = mockingDevice.gbDeviceId; + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source field: mocking_device.gb_channel_id") + public static final SqlColumn gbChannelId = mockingDevice.gbChannelId; + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", comments="Source Table: mocking_device") public static final class MockingDevice extends AliasableSqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); @@ -36,6 +39,8 @@ public final class MockingDeviceDynamicSqlSupport { public final SqlColumn gbDeviceId = column("gb_device_id", JDBCType.VARBINARY); + public final SqlColumn gbChannelId = column("gb_channel_id", JDBCType.VARBINARY); + public MockingDevice() { super("mocking_device", MockingDevice::new); } diff --git a/gb28181-mocking-orm/src/main/java/cn/skcks/docking/gb28181/mocking/orm/mybatis/dynamic/mapper/MockingDeviceMapper.java b/gb28181-mocking-orm/src/main/java/cn/skcks/docking/gb28181/mocking/orm/mybatis/dynamic/mapper/MockingDeviceMapper.java index e053fff..b755de7 100644 --- a/gb28181-mocking-orm/src/main/java/cn/skcks/docking/gb28181/mocking/orm/mybatis/dynamic/mapper/MockingDeviceMapper.java +++ b/gb28181-mocking-orm/src/main/java/cn/skcks/docking/gb28181/mocking/orm/mybatis/dynamic/mapper/MockingDeviceMapper.java @@ -32,7 +32,7 @@ import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils; @Mapper public interface MockingDeviceMapper extends CommonCountMapper, CommonDeleteMapper, CommonInsertMapper, 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 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)) ); } diff --git a/gb28181-mocking-orm/src/main/java/cn/skcks/docking/gb28181/mocking/orm/mybatis/dynamic/model/MockingDevice.java b/gb28181-mocking-orm/src/main/java/cn/skcks/docking/gb28181/mocking/orm/mybatis/dynamic/model/MockingDevice.java index 177f114..fd74271 100644 --- a/gb28181-mocking-orm/src/main/java/cn/skcks/docking/gb28181/mocking/orm/mybatis/dynamic/model/MockingDevice.java +++ b/gb28181-mocking-orm/src/main/java/cn/skcks/docking/gb28181/mocking/orm/mybatis/dynamic/model/MockingDevice.java @@ -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; + } } \ No newline at end of file diff --git a/gb28181-mocking-service/pom.xml b/gb28181-mocking-service/pom.xml index a440b90..9e57ae5 100644 --- a/gb28181-mocking-service/pom.xml +++ b/gb28181-mocking-service/pom.xml @@ -40,6 +40,124 @@ zlmediakit-service + + + org.bytedeco + javacv + 1.5.8 + + + org.openjfx + javafx-graphics + + + org.bytedeco + javacpp + + + org.bytedeco + openblas + + + org.bytedeco + opencv + + + org.bytedeco + tesseract + + + org.bytedeco + flycapture + + + org.bytedeco + libdc1394 + + + org.bytedeco + libfreenect + + + org.bytedeco + libfreenect2 + + + org.bytedeco + librealsense + + + org.bytedeco + librealsense2 + + + org.bytedeco + videoinput + + + org.bytedeco + artoolkitplus + + + org.bytedeco + flandmark + + + org.bytedeco + leptonica + + + + + org.bytedeco + javacpp + 1.5.8 + + + + org.bytedeco + ffmpeg + 5.1.2-1.5.8 + windows-x86_64 + + + org.bytedeco + javacpp + + + + + org.bytedeco + ffmpeg + 5.1.2-1.5.8 + linux-x86_64 + + + org.bytedeco + javacpp + + + + + + + com.google.guava + guava + 32.1.2-jre + + + + com.github.rholder + guava-retrying + 2.0.0 + + + com.google.guava + guava + + + + org.springframework.boot spring-boot diff --git a/gb28181-mocking-service/src/main/java/cn/skcks/docking/gb28181/mocking/service/DeviceService.java b/gb28181-mocking-service/src/main/java/cn/skcks/docking/gb28181/mocking/service/DeviceService.java new file mode 100644 index 0000000..30198ee --- /dev/null +++ b/gb28181-mocking-service/src/main/java/cn/skcks/docking/gb28181/mocking/service/DeviceService.java @@ -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; + + +} diff --git a/gb28181-mocking-starter/Dockerfile b/gb28181-mocking-starter/Dockerfile index aca1e04..be8dd4f 100644 --- a/gb28181-mocking-starter/Dockerfile +++ b/gb28181-mocking-starter/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17-jre-alpine +FROM eclipse-temurin:17-jre-focal MAINTAINER Shikong <919411476@qq.com> diff --git a/gb28181-mocking-starter/src/main/resources/application.yml b/gb28181-mocking-starter/src/main/resources/application.yml index d0df5f6..6851563 100644 --- a/gb28181-mocking-starter/src/main/resources/application.yml +++ b/gb28181-mocking-starter/src/main/resources/application.yml @@ -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