去除数据库自动更新，自动更新会导致wvp在arm架构服务上无法启动

648540858

2023-02-06 aa3cec0dfce9a980bfc518172700b5a82ef02ca8

去除数据库自动更新，自动更新会导致wvp在arm架构服务上无法启动

 pom.xml

@@ -242,13 +242,8 @@
            <artifactId>spring-boot-starter-test</artifactId>
<!--            <scope>test</scope>-->
        </dependency>
        <dependency>
            <groupId>org.flywaydb</groupId>
            <artifactId>flyway-core</artifactId>
            <version>7.15.0</version>
        </dependency>
    </dependencies>

    </dependencies>


    <build>

 src/main/java/com/genersoft/iot/vmp/conf/FlywayConfig.java

File was deleted

 src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java

@@ -46,7 +46,6 @@
    private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;

    private Boolean sipLog = Boolean.FALSE;
    private Boolean syncDb = Boolean.TRUE;

    private String serverId = "000000";

@@ -216,13 +215,5 @@

    public void setSipLog(Boolean sipLog) {
        this.sipLog = sipLog;
    }

    public Boolean getSyncDb() {
        return syncDb;
    }

    public void setSyncDb(Boolean syncDb) {
        this.syncDb = syncDb;
    }
}

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

@@ -1,9 +1,10 @@
package com.genersoft.iot.vmp.storager.dao;

import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import org.apache.ibatis.annotations.*;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;

import java.util.List;
@@ -20,7 +21,7 @@
    int add(DeviceAlarm alarm);


    @Select(value = {" <script>" +
    @Select( value = {" <script>" +
            " SELECT * FROM device_alarm " +
            " WHERE 1=1 " +
            " <if test=\"deviceId != null\" >  AND deviceId = #{deviceId}</if>" +