将上级平台标识改为serverGBId

Lawrence

2021-01-15 1b200bcc904d088b31ceaf1e9261b5433d9322a6

将上级平台标识改为serverGBId

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

@@ -51,7 +51,7 @@
    @Select("SELECT * FROM parent_platform WHERE enable=#{enable}")
    List<ParentPlatform> getEnableParentPlatformList(boolean enable);

    @Select("SELECT * FROM parent_platform WHERE deviceGBId=#{platformGbId}")
    @Select("SELECT * FROM parent_platform WHERE serverGBId=#{platformGbId}")
    ParentPlatform getParentPlatById(String platformGbId);

    @Update("UPDATE parent_platform SET status=false" )

 src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java

@@ -231,14 +231,14 @@
    @Override
    public boolean updateParentPlatform(ParentPlatform parentPlatform) {
        int result = 0;
        ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getDeviceGBId());
        if ( platformMapper.getParentPlatById(parentPlatform.getDeviceGBId()) == null) {
        ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getServerGBId()); // .getDeviceGBId());
        if ( platformMapper.getParentPlatById(parentPlatform.getServerGBId()) == null) {
            result = platformMapper.addParentPlatform(parentPlatform);

            if (parentPlatformCatch == null) {
                parentPlatformCatch = new ParentPlatformCatch();
                parentPlatformCatch.setParentPlatform(parentPlatform);
                parentPlatformCatch.setId(parentPlatform.getDeviceGBId());
                parentPlatformCatch.setId(parentPlatform.getServerGBId());
            }
        }else {
            result = platformMapper.updateParentPlatform(parentPlatform);

 src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java

@@ -82,7 +82,8 @@
        }
        // TODO 检查是否已经存在,且注册成功, 如果注册成功,需要先注销之前再,修改并注册

        ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getDeviceGBId());
        // ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getDeviceGBId());
        ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getServerGBId());

        boolean updateResult = storager.updateParentPlatform(parentPlatform);