Commit 59ab2adb2ecd0af71b36b92f820248da848fc592
1 parent
f89ef3ab
去除flyway配置
Showing
3 changed files
with
2 additions
and
15 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
| @@ -176,6 +176,7 @@ public class PlatformServiceImpl implements IPlatformService { | @@ -176,6 +176,7 @@ public class PlatformServiceImpl implements IPlatformService { | ||
| 176 | // 保存时启用就发送注册 | 176 | // 保存时启用就发送注册 |
| 177 | // 注册成功时由程序直接调用了online方法 | 177 | // 注册成功时由程序直接调用了online方法 |
| 178 | try { | 178 | try { |
| 179 | + logger.info("[国标级联] 平台注册 {}", parentPlatform.getDeviceGBId()); | ||
| 179 | commanderForPlatform.register(parentPlatform, eventResult -> { | 180 | commanderForPlatform.register(parentPlatform, eventResult -> { |
| 180 | logger.info("[国标级联] {},添加向上级注册失败，请确定上级平台可用时重新保存", parentPlatform.getServerGBId()); | 181 | logger.info("[国标级联] {},添加向上级注册失败，请确定上级平台可用时重新保存", parentPlatform.getServerGBId()); |
| 181 | }, null); | 182 | }, null); |
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
| @@ -441,9 +441,6 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { | @@ -441,9 +441,6 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { | ||
| 441 | */ | 441 | */ |
| 442 | @Override | 442 | @Override |
| 443 | public synchronized boolean insertMobilePosition(MobilePosition mobilePosition) { | 443 | public synchronized boolean insertMobilePosition(MobilePosition mobilePosition) { |
| 444 | - if (mobilePosition.getDeviceId().equals(mobilePosition.getChannelId())) { | ||
| 445 | - mobilePosition.setChannelId(null); | ||
| 446 | - } | ||
| 447 | return deviceMobilePositionMapper.insertNewPosition(mobilePosition) > 0; | 444 | return deviceMobilePositionMapper.insertNewPosition(mobilePosition) > 0; |
| 448 | } | 445 | } |
| 449 | 446 |
src/main/resources/application.yml
| @@ -2,15 +2,4 @@ spring: | @@ -2,15 +2,4 @@ spring: | ||
| 2 | application: | 2 | application: |
| 3 | name: wvp | 3 | name: wvp |
| 4 | profiles: | 4 | profiles: |
| 5 | - active: local | ||
| 6 | - # flayway相关配置 | ||
| 7 | - flyway: | ||
| 8 | - enabled: true #是否启用flyway(默认true) | ||
| 9 | - locations: classpath:db/migration #这个路径指的是fly版本控制的sql语句存放的路径,可以多个，可以给每个环境使用不同位置,比如classpath:db/migration,classpath:test/db/migration | ||
| 10 | - baseline-on-migrate: true #开启自动创建flyway元数据表标识 默认: false | ||
| 11 | - # 与 baseline-on-migrate: true 搭配使用,将当前数据库初始版本设置为0 | ||
| 12 | - baseline-version: 0 | ||
| 13 | - clean-disabled: true #禁止flyway执行清理 | ||
| 14 | - # 假如已经执行了版本1和版本3，如果增加了一个版本2，下面这个选项将会允许执行版本2的脚本 | ||
| 15 | - out-of-order: true | ||
| 16 | - table: flyway_schema_history_${spring.application.name} #用于记录所有的版本变化记录 | ||
| 17 | \ No newline at end of file | 5 | \ No newline at end of file |
| 6 | + active: local | ||
| 18 | \ No newline at end of file | 7 | \ No newline at end of file |